Don't cache shared preferences anymore. Some refactoring.

5 files changed, 22 insertions, 11 deletions

diff --git a/app/src/androidTest/java/de/test/antennapod/service/download/HttpDownloaderTest.java b/app/src/androidTest/java/de/test/antennapod/service/download/HttpDownloaderTest.java
index 443fbed7e..4a5883c64 100644
--- a/app/src/androidTest/java/de/test/antennapod/service/download/HttpDownloaderTest.java
+++ b/app/src/androidTest/java/de/test/antennapod/service/download/HttpDownloaderTest.java
@@ -43,7 +43,7 @@ public class HttpDownloaderTest extends InstrumentationTestCase {
     @Override
     protected void setUp() throws Exception {
         super.setUp();
-        UserPreferences.createInstance(getInstrumentation().getTargetContext());
+        UserPreferences.init(getInstrumentation().getTargetContext());
         destDir = getInstrumentation().getTargetContext().getExternalFilesDir(DOWNLOAD_DIR);
         assertNotNull(destDir);
         assertTrue(destDir.exists());
diff --git a/app/src/androidTest/java/de/test/antennapod/storage/DBTasksTest.java b/app/src/androidTest/java/de/test/antennapod/storage/DBTasksTest.java
index 16f50cf28..356933367 100644
--- a/app/src/androidTest/java/de/test/antennapod/storage/DBTasksTest.java
+++ b/app/src/androidTest/java/de/test/antennapod/storage/DBTasksTest.java
@@ -12,6 +12,7 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Date;
 import java.util.List;
+import java.util.concurrent.TimeUnit;
 
 import de.danoeh.antennapod.core.feed.Feed;
 import de.danoeh.antennapod.core.feed.FeedItem;
@@ -298,9 +299,8 @@ public class DBTasksTest extends InstrumentationTestCase {
         }
     }
 
-    @FlakyTest(tolerance = 3)
     private void expiredFeedListTestHelper(long lastUpdate, long expirationTime, boolean shouldReturn) {
-        UserPreferences.setUpdateInterval(context, expirationTime);
+        UserPreferences.setUpdateInterval(TimeUnit.MILLISECONDS.toHours(expirationTime));
         Feed feed = new Feed(0, new Date(lastUpdate), "feed", "link", "descr", null,
                 null, null, null, "feed", null, null, "url", false, new FlattrStatus(), false, null, null, false);
         feed.setItems(new ArrayList<FeedItem>());
diff --git a/app/src/androidTest/java/de/test/antennapod/ui/PreferencesTest.java b/app/src/androidTest/java/de/test/antennapod/ui/PreferencesTest.java
index eb1cb9c71..2a6db5611 100644
--- a/app/src/androidTest/java/de/test/antennapod/ui/PreferencesTest.java
+++ b/app/src/androidTest/java/de/test/antennapod/ui/PreferencesTest.java
@@ -39,7 +39,7 @@ public class PreferencesTest extends ActivityInstrumentationTestCase2<Preference
         Timeout.setLargeTimeout(1000);
         context = getInstrumentation().getTargetContext();
         res = getActivity().getResources();
-        UserPreferences.createInstance(context);
+        UserPreferences.init(context);
     }
 
     @Override
diff --git a/app/src/main/java/de/danoeh/antennapod/PodcastApp.java b/app/src/main/java/de/danoeh/antennapod/PodcastApp.java
index 451094909..e843fd0f9 100644
--- a/app/src/main/java/de/danoeh/antennapod/PodcastApp.java
+++ b/app/src/main/java/de/danoeh/antennapod/PodcastApp.java
@@ -38,7 +38,7 @@ public class PodcastApp extends Application {
 		LOGICAL_DENSITY = getResources().getDisplayMetrics().density;
 
         PicassoProvider.setupPicassoInstance(this);
-		UserPreferences.createInstance(this);
+		UserPreferences.init(this);
 		PlaybackPreferences.createInstance(this);
 		EventDistributor.getInstance();
 
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 f387b7524..2c6afd126 100644
--- a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
+++ b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
@@ -24,6 +24,7 @@ import java.io.File;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.concurrent.TimeUnit;
 
 import de.danoeh.antennapod.BuildConfig;
 import de.danoeh.antennapod.R;
@@ -200,6 +201,19 @@ public class PreferenceController {
                     }
                 });
 
+        ui.findPreference(UserPreferences.PREF_UPDATE_INTERVAL)
+                .setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
+                    @Override
+                    public boolean onPreferenceChange(Preference preference, Object newValue) {
+                        if (newValue instanceof String) {
+                            int hours = Integer.valueOf((String)newValue);
+                            long millis = TimeUnit.HOURS.toMillis(hours);
+                            UserPreferences.restartUpdateAlarm(millis, millis);
+                        }
+                        return true;
+                    }
+                });
+
         ui.findPreference(UserPreferences.PREF_ENABLE_AUTODL)
                 .setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
                     @Override
@@ -345,7 +359,7 @@ public class PreferenceController {
 
                             @Override
                             public void onConfirmed(boolean autoFlattrEnabled, float autoFlattrValue) {
-                                UserPreferences.setAutoFlattrSettings(activity, autoFlattrEnabled, autoFlattrValue);
+                                UserPreferences.setAutoFlattrSettings(autoFlattrEnabled, autoFlattrValue);
                                 checkItemVisibility();
                             }
                         });
@@ -389,8 +403,7 @@ public class PreferenceController {
         final Resources res = ui.getActivity().getResources();
 
         ListPreference pref = (ListPreference) ui.findPreference(UserPreferences.PREF_UPDATE_INTERVAL);
-        String[] values = res.getStringArray(
-                R.array.update_intervall_values);
+        String[] values = res.getStringArray(R.array.update_intervall_values);
         String[] entries = new String[values.length];
         for (int x = 0; x < values.length; x++) {
             Integer v = Integer.parseInt(values[x]);
@@ -529,9 +542,7 @@ public class PreferenceController {
                         }
 
                         UserPreferences.setAutodownloadSelectedNetworks(
-                                activity, prefValuesList
-                                        .toArray(new String[prefValuesList
-                                                .size()])
+                                prefValuesList.toArray(new String[prefValuesList.size()])
                         );
                         return true;
                     } else {