From af2ded8fe01a0589dc0030c4f981f6924765ef49 Mon Sep 17 00:00:00 2001
From: Martin Fietz <Martin.Fietz@gmail.com>
Date: Tue, 21 Jul 2015 20:04:39 +0200
Subject: Replace Picasso with Glide

---
 .../antennapod/preferences/PreferenceController.java | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

(limited to 'app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java')

diff --git a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
index 3a8abcc40..b869d9c92 100644
--- a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
+++ b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
@@ -364,6 +364,26 @@ public class PreferenceController {
                 return true;
             }
         });
+        ui.findPreference(UserPreferences.PREF_IMAGE_CACHE_SIZE)
+                .setOnPreferenceChangeListener(
+                        new Preference.OnPreferenceChangeListener() {
+                            @Override
+                            public boolean onPreferenceChange(Preference preference, Object o) {
+                                if (o instanceof String) {
+                                    int newValue = Integer.valueOf((String) o) * 1024 * 1024;
+                                    if(newValue != UserPreferences.getImageCacheSize()) {
+                                        AlertDialog.Builder dialog = new AlertDialog.Builder(ui.getActivity());
+                                        dialog.setTitle(android.R.string.dialog_alert_title);
+                                        dialog.setMessage(R.string.pref_restart_required);
+                                        dialog.setPositiveButton(android.R.string.ok, null);
+                                        dialog.show();
+                                    }
+                                    return true;
+                                }
+                                return false;
+                            }
+                        }
+                );
         buildSmartMarkAsPlayedPreference();
         buildAutodownloadSelectedNetworsPreference();
         setSelectedNetworksEnabled(UserPreferences
-- 
cgit v1.2.3


From 65d470043baf7f3f7d7009d16255e33b68af3650 Mon Sep 17 00:00:00 2001
From: Martin Fietz <Martin.Fietz@gmail.com>
Date: Sun, 2 Aug 2015 17:43:41 +0200
Subject: Fix duration overflow and time unit plurals

---
 .../java/de/danoeh/antennapod/preferences/PreferenceController.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java')

diff --git a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
index b869d9c92..5fed228d8 100644
--- a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
+++ b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
@@ -449,7 +449,7 @@ public class PreferenceController {
                 entries[x] = res.getString(R.string.pref_smart_mark_as_played_disabled);
             } else {
                 Integer v = Integer.parseInt(values[x]);
-                entries[x] = v + " " + res.getString(R.string.time_unit_seconds);
+                entries[x] = res.getQuantityString(R.plurals.time_unit_seconds, v);
             }
         }
         pref.setEntries(entries);
-- 
cgit v1.2.3