From abef4f36e03f9a8819ee42f356e5976b6a208be8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Wed, 1 Jan 2014 01:20:21 +0100
Subject: [PATCH] Do incompatible versions and permissions settings too

---
 res/values/strings.xml                        |  6 ++++--
 res/xml/preferences.xml                       |  4 ++--
 src/org/fdroid/fdroid/Preferences.java        |  1 +
 .../fdroid/fdroid/PreferencesActivity.java    | 19 +++++++++++++++++++
 4 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index d2cdf27a8..0b9630e5a 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -127,7 +127,8 @@
 
 	<string name="appcompatibility">Application compatibility</string>
 	<string name="show_incompat_versions">Incompatible versions</string>
-	<string name="show_incompat_versions_l">Show versions of apps that are incompatible with the device</string>
+	<string name="show_incompat_versions_on">Show app versions incompatible with the device</string>
+	<string name="show_incompat_versions_off">Hide app versions incompatible with the device</string>
 	<string name="rooted">Root</string>
 	<string name="rooted_on">Do not grey out apps requiring root privileges</string>
 	<string name="rooted_off">Grey out apps requiring root privileges</string>
@@ -153,7 +154,8 @@
 	<string name="no_permissions">No permissions are used.</string>
 	<string name="permissions_for_long">Permissions for version %s</string>
 	<string name="showPermissions">Show permissions</string>
-	<string name="showPermissions_long">Display a list of permissions an app needs</string>
+	<string name="showPermissions_on">Display a list of permissions an app requires</string>
+	<string name="showPermissions_off">Don\'t show permissions before downloading</string>
 	<string name="no_handler_app">You don\'t have any available app that can handle %s</string>
 	<string name="compactlayout">Compact Layout</string>
 	<string name="compactlayout_on">Show icons at a smaller size</string>
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index 53e431811..9bd3fa208 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -21,7 +21,7 @@
 	</PreferenceCategory>
 	<PreferenceCategory android:title="@string/display">
         <CheckBoxPreference android:title="@string/showPermissions"
-            android:defaultValue="false" android:summary="@string/showPermissions_long"
+            android:defaultValue="false"
             android:key="showPermissions"/>
         <CheckBoxPreference android:title="@string/compactlayout"
             android:defaultValue="false"
@@ -34,7 +34,7 @@
 	</PreferenceCategory>
 	<PreferenceCategory android:title="@string/appcompatibility">
        <CheckBoxPreference android:title="@string/show_incompat_versions"
-           android:defaultValue="false" android:summary="@string/show_incompat_versions_l"
+           android:defaultValue="false"
            android:key="incompatibleVersions" />
 		<CheckBoxPreference android:title="@string/rooted"
 			android:defaultValue="true"
diff --git a/src/org/fdroid/fdroid/Preferences.java b/src/org/fdroid/fdroid/Preferences.java
index 19b934e16..8751279c7 100644
--- a/src/org/fdroid/fdroid/Preferences.java
+++ b/src/org/fdroid/fdroid/Preferences.java
@@ -32,6 +32,7 @@ public class Preferences implements SharedPreferences.OnSharedPreferenceChangeLi
     public static final String PREF_ROOTED = "rooted";
     public static final String PREF_INCOMP_VER = "incompatibleVersions";
     public static final String PREF_THEME = "theme";
+    public static final String PREF_PERMISSIONS = "showPermissions";
     public static final String PREF_COMPACT_LAYOUT = "compactlayout";
     public static final String PREF_IGN_TOUCH = "ignoreTouchscreen";
 
diff --git a/src/org/fdroid/fdroid/PreferencesActivity.java b/src/org/fdroid/fdroid/PreferencesActivity.java
index 3d7a5290d..31b195839 100644
--- a/src/org/fdroid/fdroid/PreferencesActivity.java
+++ b/src/org/fdroid/fdroid/PreferencesActivity.java
@@ -48,6 +48,7 @@ public class PreferencesActivity extends PreferenceActivity implements
                     Preferences.PREF_ROOTED,
                     Preferences.PREF_INCOMP_VER,
                     Preferences.PREF_THEME,
+                    Preferences.PREF_PERMISSIONS,
                     Preferences.PREF_COMPACT_LAYOUT,
                     Preferences.PREF_IGN_TOUCH };
 
@@ -109,6 +110,13 @@ public class PreferencesActivity extends PreferenceActivity implements
         if (key.equals(Preferences.PREF_INCOMP_VER)) {
             result ^= RESULT_RELOAD;
             setResult(result);
+            CheckBoxPreference pref = (CheckBoxPreference)findPreference(
+                    Preferences.PREF_INCOMP_VER);
+            if (pref.isChecked()) {
+                pref.setSummary(R.string.show_incompat_versions_on);
+            } else {
+                pref.setSummary(R.string.show_incompat_versions_off);
+            }
             return;
         }
 
@@ -144,6 +152,17 @@ public class PreferencesActivity extends PreferenceActivity implements
             theme.setSummary(theme.getEntry());
             return;
         }
+
+        if (key.equals(Preferences.PREF_PERMISSIONS)) {
+            CheckBoxPreference pref = (CheckBoxPreference)findPreference(
+                    Preferences.PREF_PERMISSIONS);
+            if (pref.isChecked()) {
+                pref.setSummary(R.string.showPermissions_on);
+            } else {
+                pref.setSummary(R.string.showPermissions_off);
+            }
+            return;
+        }
     }
 
     @Override