From 19dc51fa8a8ec73a4c67e1a70deaaec63e58ab78 Mon Sep 17 00:00:00 2001
From: Mathias-Boulay <mathiasboulay@free.fr>
Date: Fri, 22 Nov 2024 20:22:58 +0100
Subject: [PATCH] cleanup: remove unneeded menu entry

It's been a while that everything closes when swiping away the app
---
 .../pojavlaunch/JavaGUILauncherActivity.java  |  4 ++--
 .../net/kdt/pojavlaunch/MainActivity.java     | 22 ++++---------------
 .../main/java/net/kdt/pojavlaunch/Tools.java  | 13 +++++++++++
 .../src/main/res/values/headings_array.xml    |  1 -
 4 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/JavaGUILauncherActivity.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/JavaGUILauncherActivity.java
index 772cdf607..6db1ccbf2 100644
--- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/JavaGUILauncherActivity.java
+++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/JavaGUILauncherActivity.java
@@ -177,7 +177,7 @@ public class JavaGUILauncherActivity extends BaseActivity implements View.OnTouc
         getOnBackPressedDispatcher().addCallback(new OnBackPressedCallback(true) {
             @Override
             public void handleOnBackPressed() {
-                MainActivity.dialogForceClose(JavaGUILauncherActivity.this);
+                Tools.dialogForceClose(JavaGUILauncherActivity.this);
             }
         });
     }
@@ -336,7 +336,7 @@ public class JavaGUILauncherActivity extends BaseActivity implements View.OnTouc
     }
 
     public void forceClose(View v) {
-        MainActivity.dialogForceClose(this);
+        Tools.dialogForceClose(this);
     }
 
     public void openLogOutput(View v) {
diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/MainActivity.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/MainActivity.java
index e615d3b83..bdbab519b 100644
--- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/MainActivity.java
+++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/MainActivity.java
@@ -189,11 +189,10 @@ public class MainActivity extends BaseActivity implements ControlButtonMenuListe
                     android.R.layout.simple_list_item_1, getResources().getStringArray(R.array.menu_ingame));
             gameActionClickListener = (parent, view, position, id) -> {
                 switch(position) {
-                    case 0: dialogForceClose(MainActivity.this); break;
-                    case 1: openLogOutput(); break;
-                    case 2: dialogSendCustomKey(); break;
-                    case 3: openQuickSettings(); break;
-                    case 4: openCustomControls(); break;
+                    case 0: openLogOutput(); break;
+                    case 1: dialogSendCustomKey(); break;
+                    case 2: openQuickSettings(); break;
+                    case 3: openCustomControls(); break;
                 }
                 drawerLayout.closeDrawers();
             };
@@ -419,19 +418,6 @@ public class MainActivity extends BaseActivity implements ControlButtonMenuListe
                 Toast.LENGTH_SHORT).show();
     }
 
-    public static void dialogForceClose(Context ctx) {
-        new AlertDialog.Builder(ctx)
-                .setMessage(R.string.mcn_exit_confirm)
-                .setNegativeButton(android.R.string.cancel, null)
-                .setPositiveButton(android.R.string.ok, (p1, p2) -> {
-                    try {
-                        Tools.fullyExit();
-                    } catch (Throwable th) {
-                        Log.w(Tools.APP_NAME, "Could not enable System.exit() method!", th);
-                    }
-                }).show();
-    }
-
     @Override
     public boolean dispatchKeyEvent(KeyEvent event) {
         if(isInEditor) {
diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/Tools.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/Tools.java
index e1ab76a1d..d9acc1d0a 100644
--- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/Tools.java
+++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/Tools.java
@@ -1292,4 +1292,17 @@ public final class Tools {
         return ((SensorManager)context.getSystemService(Context.SENSOR_SERVICE)).getDefaultSensor(Sensor.TYPE_GYROSCOPE) != null;
 
     }
+
+    public static void dialogForceClose(Context ctx) {
+        new android.app.AlertDialog.Builder(ctx)
+                .setMessage(R.string.mcn_exit_confirm)
+                .setNegativeButton(android.R.string.cancel, null)
+                .setPositiveButton(android.R.string.ok, (p1, p2) -> {
+                    try {
+                        Tools.fullyExit();
+                    } catch (Throwable th) {
+                        Log.w(Tools.APP_NAME, "Could not enable System.exit() method!", th);
+                    }
+                }).show();
+    }
 }
diff --git a/app_pojavlauncher/src/main/res/values/headings_array.xml b/app_pojavlauncher/src/main/res/values/headings_array.xml
index f32663a0d..b8ad18d4b 100644
--- a/app_pojavlauncher/src/main/res/values/headings_array.xml
+++ b/app_pojavlauncher/src/main/res/values/headings_array.xml
@@ -27,7 +27,6 @@
     </string-array>
 
     <string-array name="menu_ingame">
-        <item>@string/control_forceclose</item>
         <item>@string/control_viewout</item>
         <item>@string/control_customkey</item>
         <item>@string/quick_setting_title</item>