diff options
author | Martin Fietz <Martin.Fietz@gmail.com> | 2015-06-23 14:40:37 +0200 |
---|---|---|
committer | Martin Fietz <Martin.Fietz@gmail.com> | 2015-06-24 11:05:41 +0200 |
commit | f123c61f213148898f0e16094cb10962a00c9c85 (patch) | |
tree | 72a29f93079fdd68af5d9e96303dc2dc4cf51e98 /app/src/main/java/de | |
parent | 33778e30ac156e22c9d748f905ddb26c65eadd78 (diff) | |
parent | 5e8c75a1da7375cd5a48902e6bd0bc5d175d0001 (diff) | |
download | AntennaPod-f123c61f213148898f0e16094cb10962a00c9c85.zip |
Merge branch 'develop' of https://github.com/AntennaPod/AntennaPod into issue/940-user-preferences
Diffstat (limited to 'app/src/main/java/de')
-rw-r--r-- | app/src/main/java/de/danoeh/antennapod/PodcastApp.java | 2 | ||||
-rw-r--r-- | app/src/main/java/de/danoeh/antennapod/config/ApplicationCallbacksImpl.java | 5 |
2 files changed, 1 insertions, 6 deletions
diff --git a/app/src/main/java/de/danoeh/antennapod/PodcastApp.java b/app/src/main/java/de/danoeh/antennapod/PodcastApp.java index e843fd0f9..f79ac49ed 100644 --- a/app/src/main/java/de/danoeh/antennapod/PodcastApp.java +++ b/app/src/main/java/de/danoeh/antennapod/PodcastApp.java @@ -39,7 +39,7 @@ public class PodcastApp extends Application { PicassoProvider.setupPicassoInstance(this); UserPreferences.init(this); - PlaybackPreferences.createInstance(this); + PlaybackPreferences.init(this); EventDistributor.getInstance(); SPAUtil.sendSPAppsQueryFeedsIntent(this); diff --git a/app/src/main/java/de/danoeh/antennapod/config/ApplicationCallbacksImpl.java b/app/src/main/java/de/danoeh/antennapod/config/ApplicationCallbacksImpl.java index 4d9be5d78..008aacfa5 100644 --- a/app/src/main/java/de/danoeh/antennapod/config/ApplicationCallbacksImpl.java +++ b/app/src/main/java/de/danoeh/antennapod/config/ApplicationCallbacksImpl.java @@ -8,7 +8,6 @@ import android.content.Intent; import de.danoeh.antennapod.PodcastApp; import de.danoeh.antennapod.activity.StorageErrorActivity; import de.danoeh.antennapod.core.ApplicationCallbacks; -import de.danoeh.antennapod.core.preferences.UserPreferences; public class ApplicationCallbacksImpl implements ApplicationCallbacks { @@ -22,8 +21,4 @@ public class ApplicationCallbacksImpl implements ApplicationCallbacks { return new Intent(context, StorageErrorActivity.class); } - @Override - public void setUpdateInterval(long updateInterval) { - UserPreferences.restartUpdateAlarm(updateInterval, updateInterval); - } } |