From 962521947e654eeb7ed3481cb4729fc206d8eb26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Wed, 1 Jan 2014 01:47:10 +0100
Subject: [PATCH] Last pref summary: notifications

---
 res/values/strings.xml                         |  3 ++-
 res/xml/preferences.xml                        |  2 +-
 src/org/fdroid/fdroid/Preferences.java         |  1 +
 src/org/fdroid/fdroid/PreferencesActivity.java | 12 ++++++++++++
 4 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index fa2d91bf2..2abdf2a68 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -22,7 +22,8 @@
 	<string name="automatic_scan_wifi_on">Update app lists automatically only on wifi</string>
 	<string name="automatic_scan_wifi_off">Always update app lists automatically</string>
 	<string name="notify">Notify</string>
-	<string name="notify_updates_available">Notify when new updates are available</string>
+	<string name="notify_on">Notify when updates are available</string>
+	<string name="notify_off">Do not notify of any updates</string>
 	<string name="update_history">Update history</string>
 	<string name="update_history_summ">Days to consider apps new or recent: %s</string>
 
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index a0d0295b1..1fa61df42 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -9,7 +9,7 @@
 			android:defaultValue="false"
 			android:key="updateOnWifiOnly" />
 		<CheckBoxPreference android:title="@string/notify"
-			android:defaultValue="true" android:summary="@string/notify_updates_available"
+			android:defaultValue="true"
 			android:key="updateNotify" />
 		<EditTextPreference
 			android:defaultValue="14"
diff --git a/src/org/fdroid/fdroid/Preferences.java b/src/org/fdroid/fdroid/Preferences.java
index 563aac289..d90b46de3 100644
--- a/src/org/fdroid/fdroid/Preferences.java
+++ b/src/org/fdroid/fdroid/Preferences.java
@@ -28,6 +28,7 @@ public class Preferences implements SharedPreferences.OnSharedPreferenceChangeLi
 
     public static final String PREF_UPD_INTERVAL = "updateInterval";
     public static final String PREF_UPD_WIFI_ONLY = "updateOnWifiOnly";
+    public static final String PREF_UPD_NOTIFY = "updateNotify";
     public static final String PREF_UPD_HISTORY = "updateHistoryDays";
     public static final String PREF_ROOTED = "rooted";
     public static final String PREF_INCOMP_VER = "incompatibleVersions";
diff --git a/src/org/fdroid/fdroid/PreferencesActivity.java b/src/org/fdroid/fdroid/PreferencesActivity.java
index d0972cb67..38db710eb 100644
--- a/src/org/fdroid/fdroid/PreferencesActivity.java
+++ b/src/org/fdroid/fdroid/PreferencesActivity.java
@@ -44,6 +44,7 @@ public class PreferencesActivity extends PreferenceActivity implements
     private static String[] summariesToUpdate = {
         Preferences.PREF_UPD_INTERVAL,
         Preferences.PREF_UPD_WIFI_ONLY,
+        Preferences.PREF_UPD_NOTIFY,
         Preferences.PREF_UPD_HISTORY,
         Preferences.PREF_ROOTED,
         Preferences.PREF_INCOMP_VER,
@@ -92,6 +93,17 @@ public class PreferencesActivity extends PreferenceActivity implements
             return;
         }
 
+        if (key.equals(Preferences.PREF_UPD_NOTIFY)) {
+            CheckBoxPreference pref = (CheckBoxPreference)findPreference(
+                    Preferences.PREF_UPD_NOTIFY);
+            if (pref.isChecked()) {
+                pref.setSummary(R.string.notify_on);
+            } else {
+                pref.setSummary(R.string.notify_off);
+            }
+            return;
+        }
+
         if (key.equals(Preferences.PREF_UPD_HISTORY)) {
             EditTextPreference pref = (EditTextPreference)findPreference(
                     Preferences.PREF_UPD_HISTORY);