summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorMartin Fietz <Martin.Fietz@gmail.com>2015-08-02 17:43:41 +0200
committerMartin Fietz <Martin.Fietz@gmail.com>2015-08-02 17:45:36 +0200
commit65d470043baf7f3f7d7009d16255e33b68af3650 (patch)
treece7bd3a592add54552a944540c4e55653a6430f7 /app
parent759a7bb5acf59ae49550b89528bbcd4489d33b32 (diff)
downloadAntennaPod-65d470043baf7f3f7d7009d16255e33b68af3650.zip
Fix duration overflow and time unit plurals
Diffstat (limited to 'app')
-rw-r--r--app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java2
-rw-r--r--app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java2
2 files changed, 2 insertions, 2 deletions
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);