diff options
author | Tom Hennen <TomHennen@users.noreply.github.com> | 2015-08-15 18:43:57 -0400 |
---|---|---|
committer | Tom Hennen <TomHennen@users.noreply.github.com> | 2015-08-15 18:43:57 -0400 |
commit | 22cae7a174d20141d6e6d8f0cc90c3e4195bbac3 (patch) | |
tree | 3ebc38d432844db61d3e2d15166f5aea2ca561fc /app/src/main/java/de/danoeh/antennapod | |
parent | 432054b37ebbfe119fa54cdaa8f055b7e7e7ed53 (diff) | |
parent | 2f552566192739bdeb0944ff28036745e259a650 (diff) | |
download | AntennaPod-22cae7a174d20141d6e6d8f0cc90c3e4195bbac3.zip |
Merge pull request #1099 from AntennaPod/version_1.3
Version 1.3.1 is now live
Diffstat (limited to 'app/src/main/java/de/danoeh/antennapod')
-rw-r--r-- | app/src/main/java/de/danoeh/antennapod/PodcastApp.java | 4 | ||||
-rw-r--r-- | app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/app/src/main/java/de/danoeh/antennapod/PodcastApp.java b/app/src/main/java/de/danoeh/antennapod/PodcastApp.java index f47fe3944..e7283d860 100644 --- a/app/src/main/java/de/danoeh/antennapod/PodcastApp.java +++ b/app/src/main/java/de/danoeh/antennapod/PodcastApp.java @@ -1,13 +1,11 @@ package de.danoeh.antennapod; import android.app.Application; -import android.content.Intent; import android.content.res.Configuration; import de.danoeh.antennapod.core.feed.EventDistributor; import de.danoeh.antennapod.core.preferences.PlaybackPreferences; import de.danoeh.antennapod.core.preferences.UserPreferences; -import de.danoeh.antennapod.core.service.FeedMediaSizeService; import de.danoeh.antennapod.core.util.NetworkUtils; import de.danoeh.antennapod.spa.SPAUtil; @@ -47,7 +45,7 @@ public class PodcastApp extends Application { SPAUtil.sendSPAppsQueryFeedsIntent(this); - startService(new Intent(this, FeedMediaSizeService.class)); + // startService(new Intent(this, FeedMediaSizeService.class)); } public static float getLogicalDensity() { 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 39edfe582..4d4b2be63 100644 --- a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java +++ b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java @@ -428,7 +428,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] = res.getQuantityString(R.plurals.time_seconds_quantified, v); + entries[x] = res.getQuantityString(R.plurals.time_seconds_quantified, v, v); } } pref.setEntries(entries); |