Fix duration overflow and time unit plurals

1 files changed, 8 insertions, 8 deletions

diff --git a/core/src/main/java/de/danoeh/antennapod/core/util/Converter.java b/core/src/main/java/de/danoeh/antennapod/core/util/Converter.java
index 917f99564..2bf88b3f3 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/util/Converter.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/util/Converter.java
@@ -26,7 +26,7 @@ public final class Converter {
     /** Determines the length of the number for best readability.*/
     private static final int NUM_LENGTH = 1024;
     
-    
+    private static final int DAYS_MIL = 86400000;
     private static final int HOURS_MIL = 3600000;
 	private static final int MINUTES_MIL = 60000;
 	private static final int SECONDS_MIL = 1000;
@@ -104,18 +104,18 @@ public final class Converter {
     }
 
     /** Converts milliseconds to a localized string containing hours and minutes */
-    public static String getDurationStringLocalized(Context context, int duration) {
-        int h = duration / HOURS_MIL;
-        int rest = duration - h * HOURS_MIL;
+    public static String getDurationStringLocalized(Context context, long duration) {
+        int h = (int)(duration / HOURS_MIL);
+        int rest = (int)(duration - h * HOURS_MIL);
         int m = rest / MINUTES_MIL;
 
         String result = "";
         if(h > 0) {
-            String hours = context.getString(R.string.time_unit_hours);
-            result += h + " " + hours + " ";
+            String hours = context.getResources().getQuantityString(R.plurals.time_unit_hours, h, h);
+            result += hours + " ";
         }
-        String minutes = context.getString(R.string.time_unit_minutes);
-        result += m + " " + minutes;
+        String minutes = context.getResources().getQuantityString(R.plurals.time_unit_minutes, m, m);
+        result += minutes;
         return result;
     }