Fixes crash when opening 'preferences' after upgrading from old version

Fixes #475 Closes #476
termux · Oct 2, 2023 · 4acf4b2 · 4acf4b2
1 parent 18b5751
commit 4acf4b2
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/app/src/main/java/com/termux/x11/LoriePreferences.java b/app/src/main/java/com/termux/x11/LoriePreferences.java
@@ -81,6 +81,14 @@ public boolean onOptionsItemSelected(MenuItem item) {
     public static class LoriePreferenceFragment extends PreferenceFragmentCompat implements OnPreferenceChangeListener, Preference.OnPreferenceClickListener {
         @Override
         public void onCreatePreferences(@Nullable Bundle savedInstanceState, @Nullable String rootKey) {
+            SharedPreferences p = getPreferenceManager().getSharedPreferences();
+            int modeValue = p == null ? 0 : Integer.parseInt(p.getString("touchMode", "1")) - 1;
+            if (modeValue > 2) {
+                SharedPreferences.Editor e = Objects.requireNonNull(p).edit();
+                e.putString("touchMode", "1");
+                e.apply();
+            }
+
             addPreferencesFromResource(R.xml.preferences);
         }
 

diff --git a/app/src/main/java/com/termux/x11/MainActivity.java b/app/src/main/java/com/termux/x11/MainActivity.java
@@ -143,6 +143,13 @@ protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
         SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(this);
+        int modeValue = Integer.parseInt(preferences.getString("touchMode", "1")) - 1;
+        if (modeValue > 2) {
+            SharedPreferences.Editor e = Objects.requireNonNull(preferences).edit();
+            e.putString("touchMode", "1");
+            e.apply();
+        }
+
         preferences.registerOnSharedPreferenceChangeListener((sharedPreferences, key) -> onPreferencesChanged(key));
 
         getWindow().setFlags(FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS | FLAG_KEEP_SCREEN_ON | FLAG_TRANSLUCENT_STATUS, 0);