From f0c4fef803215ed631fee4315dbd1277b421b11b Mon Sep 17 00:00:00 2001
From: khanhduytran0 <khanhduytran0@users.noreply.github.com>
Date: Fri, 20 Jan 2023 17:38:03 +0700
Subject: [PATCH] Move the sandbox switch to Java Tweaks, update strings.xml

---
 app_pojavlauncher/src/main/res/values/strings.xml | 4 ++--
 app_pojavlauncher/src/main/res/xml/pref_java.xml  | 6 ++++++
 app_pojavlauncher/src/main/res/xml/pref_misc.xml  | 5 -----
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/app_pojavlauncher/src/main/res/values/strings.xml b/app_pojavlauncher/src/main/res/values/strings.xml
index 2c60b00f4..7e75e9d9f 100644
--- a/app_pojavlauncher/src/main/res/values/strings.xml
+++ b/app_pojavlauncher/src/main/res/values/strings.xml
@@ -111,7 +111,7 @@
     <string name="mcl_setting_veroption_oldalpha">Old-alpha</string>
     <string name="mcl_setting_veroption_oldbeta">Old-beta</string>
     <string name="mcl_setting_java_sandbox">Sandbox .jar installer</string>
-    <string name="mcl_setting_java_sandbox_subtitle">Control the availability sandbox security manager when launching .jar installer.</string>
+    <string name="mcl_setting_java_sandbox_subtitle">Control the availability of sandbox security manager when launching .jar installer.</string>
     <string name="mcl_version_clone">Clone</string>
 
     <!-- Global strings -->
@@ -277,7 +277,7 @@
     <string name="preference_control_title">Control customization</string>
     <string name="preference_control_description">Gestures types, triggers, and scaling</string>
     <string name="preference_java_title">Java Tweaks</string>
-    <string name="preference_java_description">Java versions, JVM Arguments, and RAM amount</string>
+    <string name="preference_java_description">Java versions, JVM Arguments, RAM amount and sandbox</string>
     <string name="preference_misc_title">Miscellaneous settings</string>
     <string name="preference_misc_description">Version list, and libs checks</string>
     <string name="preference_experimental_title">Experimental Stuff</string>
diff --git a/app_pojavlauncher/src/main/res/xml/pref_java.xml b/app_pojavlauncher/src/main/res/xml/pref_java.xml
index 28abae117..63d1d5dd3 100644
--- a/app_pojavlauncher/src/main/res/xml/pref_java.xml
+++ b/app_pojavlauncher/src/main/res/xml/pref_java.xml
@@ -26,6 +26,12 @@
             app2:seekBarIncrement="10"
             app2:selectable="false"/>
 
+        <SwitchPreference
+            android:defaultValue="true"
+            android:key="java_sandbox"
+            android:summary="@string/mcl_setting_java_sandbox_subtitle"
+            android:title="@string/mcl_setting_java_sandbox" />
+
     </PreferenceCategory>
 
 
diff --git a/app_pojavlauncher/src/main/res/xml/pref_misc.xml b/app_pojavlauncher/src/main/res/xml/pref_misc.xml
index be6c9f251..6ecce2806 100644
--- a/app_pojavlauncher/src/main/res/xml/pref_misc.xml
+++ b/app_pojavlauncher/src/main/res/xml/pref_misc.xml
@@ -5,11 +5,6 @@
     <net.kdt.pojavlaunch.prefs.BackButtonPreference/>
 
     <PreferenceCategory android:title="Miscellaneous settings">
-        <SwitchPreference
-            android:defaultValue="true"
-            android:key="java_sandbox"
-            android:summary="@string/mcl_setting_java_sandbox_subtitle"
-            android:title="@string/mcl_setting_java_sandbox" />
         <SwitchPreference
             android:defaultValue="true"
             android:icon="@drawable/ic_setting_hash_verification"