From 20b75d5edc573d769ca69a7f4e181541256dddc5 Mon Sep 17 00:00:00 2001
From: dkanada <dkanada@users.noreply.github.com>
Date: Sun, 28 Jan 2018 12:27:10 -0700
Subject: [PATCH] fix crash in settings and make variable names the same

---
 app/src/main/java/org/fdroid/fdroid/Preferences.java      | 6 +++---
 .../fdroid/views/fragments/PreferencesFragment.java       | 8 ++++----
 app/src/main/res/values/strings.xml                       | 8 ++++----
 app/src/main/res/xml/preferences.xml                      | 6 +++---
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/app/src/main/java/org/fdroid/fdroid/Preferences.java b/app/src/main/java/org/fdroid/fdroid/Preferences.java
index cff456dad..bd3309e88 100644
--- a/app/src/main/java/org/fdroid/fdroid/Preferences.java
+++ b/app/src/main/java/org/fdroid/fdroid/Preferences.java
@@ -45,7 +45,7 @@ public final class Preferences implements SharedPreferences.OnSharedPreferenceCh
     public static final String PREF_AUTO_DOWNLOAD_INSTALL_UPDATES = "updateAutoDownload";
     public static final String PREF_UPD_NOTIFY = "updateNotify";
     public static final String PREF_THEME = "theme";
-    public static final String PREF_SHOW_INCOMP_VERSIONS = "incompatibleVersions";
+    public static final String PREF_SHOW_INCOMPAT_VERSIONS = "incompatibleVersions";
     public static final String PREF_SHOW_ROOT_APPS = "rooted";
     public static final String PREF_SHOW_ANTI_FEATURE_APPS = "showAntiFeatureApps";
     public static final String PREF_FORCE_TOUCH_APPS = "ignoreTouchscreen";
@@ -71,7 +71,7 @@ public final class Preferences implements SharedPreferences.OnSharedPreferenceCh
     public static final String PREF_PANIC_HIDE = "pref_panic_hide";
     public static final String PREF_HIDE_ON_LONG_PRESS_SEARCH = "hideOnLongPressSearch";
 
-    private static final boolean DEFAULT_SHOW_INCOMP_VERSIONS = false;
+    private static final boolean DEFAULT_SHOW_INCOMPAT_VERSIONS = false;
     private static final boolean DEFAULT_SHOW_ROOT_APPS = true;
     private static final boolean DEFAULT_SHOW_ANTI_FEATURE_APPS = true;
     private static final boolean DEFAULT_PRIVILEGED_INSTALLER = true;
@@ -221,7 +221,7 @@ public final class Preferences implements SharedPreferences.OnSharedPreferenceCh
     }
 
     public boolean showIncompatibleVersions() {
-        return preferences.getBoolean(PREF_SHOW_INCOMP_VERSIONS, DEFAULT_SHOW_INCOMP_VERSIONS);
+        return preferences.getBoolean(PREF_SHOW_INCOMPAT_VERSIONS, DEFAULT_SHOW_INCOMPAT_VERSIONS);
     }
 
     public boolean showNfcDuringSwap() {
diff --git a/app/src/main/java/org/fdroid/fdroid/views/fragments/PreferencesFragment.java b/app/src/main/java/org/fdroid/fdroid/views/fragments/PreferencesFragment.java
index d91773118..c52250bec 100644
--- a/app/src/main/java/org/fdroid/fdroid/views/fragments/PreferencesFragment.java
+++ b/app/src/main/java/org/fdroid/fdroid/views/fragments/PreferencesFragment.java
@@ -37,7 +37,7 @@ public class PreferencesFragment extends PreferenceFragment
             Preferences.PREF_UPD_NOTIFY,
             Preferences.PREF_SHOW_ROOT_APPS,
             Preferences.PREF_SHOW_ANTI_FEATURE_APPS,
-            Preferences.PREF_SHOW_INCOMP_VERSIONS,
+            Preferences.PREF_SHOW_INCOMPAT_VERSIONS,
             Preferences.PREF_THEME,
             Preferences.PREF_FORCE_TOUCH_APPS,
             Preferences.PREF_LOCAL_REPO_NAME,
@@ -132,16 +132,16 @@ public class PreferencesFragment extends PreferenceFragment
                 }
                 break;
 
-            case Preferences.PREF_SHOW_INCOMP_VERSIONS:
+            case Preferences.PREF_SHOW_INCOMPAT_VERSIONS:
                 checkSummary(key, R.string.show_incompat_versions_on);
                 break;
 
             case Preferences.PREF_SHOW_ROOT_APPS:
-                checkSummary(key, R.string.rooted_on);
+                checkSummary(key, R.string.show_root_apps_on);
                 break;
 
             case Preferences.PREF_SHOW_ANTI_FEATURE_APPS:
-                checkSummary(key, R.string.hide_anti_feature_apps_on);
+                checkSummary(key, R.string.show_anti_feature_apps_on);
                 break;
 
             case Preferences.PREF_FORCE_TOUCH_APPS:
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 4d19af5f1..626b136f4 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -212,10 +212,10 @@ This often occurs with apps installed via Google Play or other sources, if they
     <string name="appcompatibility">App compatibility</string>
     <string name="show_incompat_versions">Include incompatible versions</string>
     <string name="show_incompat_versions_on">Show app versions that are incompatible with the device</string>
-    <string name="rooted">Include root apps</string>
-    <string name="rooted_on">Show apps that require root privileges</string>
-    <string name="hide_anti_feature_apps">Include anti-feature apps</string>
-    <string name="hide_anti_feature_apps_on">Show apps that require anti-features</string>
+    <string name="show_root_apps">Include root apps</string>
+    <string name="show_root_apps_on">Show apps that require root privileges</string>
+    <string name="show_anti_feature_apps">Include anti-feature apps</string>
+    <string name="show_anti_feature_apps_on">Show apps that require anti-features</string>
     <string name="force_touch_apps">Include touchscreen apps</string>
     <string name="force_touch_apps_on">Show apps that require touchscreen regardless of hardware support</string>
 
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index afd16ea34..cd4f7cb98 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -53,12 +53,12 @@
         <CheckBoxPreference android:title="@string/show_incompat_versions"
             android:defaultValue="false"
             android:key="incompatibleVersions" />
-        <CheckBoxPreference android:title="@string/rooted"
+        <CheckBoxPreference android:title="@string/show_root_apps"
             android:defaultValue="true"
             android:key="rooted" />
-        <CheckBoxPreference android:title="@string/hide_anti_feature_apps"
+        <CheckBoxPreference android:title="@string/show_anti_feature_apps"
             android:defaultValue="false"
-            android:key="hideAntiFeatureApps" />
+            android:key="showAntiFeatureApps" />
         <CheckBoxPreference android:title="@string/force_touch_apps"
             android:defaultValue="false"
             android:key="ignoreTouchscreen" />