From 880ae0fe7cd52e84d00112d783d8d7a50d4119c6 Mon Sep 17 00:00:00 2001
From: Alibek Omarov <a1ba.omarov@gmail.com>
Date: Wed, 20 Nov 2024 10:36:53 +0300
Subject: [PATCH] android: change default arguments to -console -log, as -dev
 enables cheats which may be undesired for users

---
 android/app/src/main/java/su/xash/engine/XashActivity.java | 2 +-
 android/app/src/main/java/su/xash/engine/model/Game.kt     | 4 ++--
 android/app/src/main/res/xml/game_preferences.xml          | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/android/app/src/main/java/su/xash/engine/XashActivity.java b/android/app/src/main/java/su/xash/engine/XashActivity.java
index 89d628a7..28123685 100644
--- a/android/app/src/main/java/su/xash/engine/XashActivity.java
+++ b/android/app/src/main/java/su/xash/engine/XashActivity.java
@@ -132,7 +132,7 @@ public class XashActivity extends SDLActivity {
         }
 
         String argv = getIntent().getStringExtra("argv");
-        if (argv == null) argv = "-dev 2 -log";
+        if (argv == null) argv = "-console -log";
         return argv.split(" ");
     }
 }
diff --git a/android/app/src/main/java/su/xash/engine/model/Game.kt b/android/app/src/main/java/su/xash/engine/model/Game.kt
index 89ac48d0..704d2835 100644
--- a/android/app/src/main/java/su/xash/engine/model/Game.kt
+++ b/android/app/src/main/java/su/xash/engine/model/Game.kt
@@ -38,7 +38,7 @@ class Game(val ctx: Context, val basedir: DocumentFile, var installed: Boolean =
         ctx.startActivity(Intent(ctx, XashActivity::class.java).apply {
             flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
             putExtra("gamedir", basedir.name)
-            putExtra("argv", pref.getString("arguments", "-dev 2 -log"))
+            putExtra("argv", pref.getString("arguments", "-console -log"))
             putExtra("usevolume", pref.getBoolean("use_volume_buttons", false))
             //.putExtra("gamelibdir", getGameLibDir(context))
             //.putExtra("package", getPackageName()) }
@@ -126,4 +126,4 @@ class Game(val ctx: Context, val basedir: DocumentFile, var installed: Boolean =
 
 //public void startEngine(Context context) {
 //    context.startActivity(new Intent(context, XashActivity.class).setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP).putExtra("gamedir", getGameDir()).putExtra("argv", getArguments()).putExtra("usevolume", getVolumeState()).putExtra("gamelibdir", getGameLibDir(context)).putExtra("package", getPackageName()));
-//}
\ No newline at end of file
+//}
diff --git a/android/app/src/main/res/xml/game_preferences.xml b/android/app/src/main/res/xml/game_preferences.xml
index 621089d0..0a6cb551 100644
--- a/android/app/src/main/res/xml/game_preferences.xml
+++ b/android/app/src/main/res/xml/game_preferences.xml
@@ -2,7 +2,7 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
     <EditTextPreference
-        app:defaultValue="-dev 2 -log"
+        app:defaultValue="-console -log"
         app:key="arguments"
         app:layout="@layout/edit_text_preference"
         app:title="@string/game_settings_command_line"
@@ -39,4 +39,4 @@
         app:title="@string/preferences_server_package"
         app:useSimpleSummaryProvider="true"
         app:isPreferenceVisible="false"/>
-</PreferenceScreen>
\ No newline at end of file
+</PreferenceScreen>