From 65d470043baf7f3f7d7009d16255e33b68af3650 Mon Sep 17 00:00:00 2001 From: Martin Fietz Date: Sun, 2 Aug 2015 17:43:41 +0200 Subject: Fix duration overflow and time unit plurals --- app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java | 2 +- .../java/de/danoeh/antennapod/preferences/PreferenceController.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'app') diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java index ba4ababf5..24c9fc425 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java @@ -476,7 +476,7 @@ public class QueueFragment extends Fragment { // refresh information bar String info = queue.size() + getString(R.string.episodes_suffix); if(queue.size() > 0) { - int duration = 0; + long duration = 0; for(FeedItem item : queue) { if(item.getMedia() != null) { duration += item.getMedia().getDuration(); 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