Set update interval or time of day

3 files changed, 69 insertions, 18 deletions

diff --git a/core/src/main/java/de/danoeh/antennapod/core/preferences/UserPreferences.java b/core/src/main/java/de/danoeh/antennapod/core/preferences/UserPreferences.java
index 5d53db5b3..d96d25fc2 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/preferences/UserPreferences.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/preferences/UserPreferences.java
@@ -19,6 +19,7 @@ import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Calendar;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
@@ -206,7 +207,24 @@ public class UserPreferences {
     }
 
     public static long getUpdateInterval() {
-        return readUpdateInterval(prefs.getString(PREF_UPDATE_INTERVAL, "0"));
+        String updateInterval = prefs.getString(PREF_UPDATE_INTERVAL, "0");
+        if(false == updateInterval.contains(":")) {
+            return readUpdateInterval(updateInterval);
+        } else {
+            return 0;
+        }
+    }
+
+    public static int[] getUpdateTimeOfDay() {
+        String datetime = prefs.getString(PREF_UPDATE_INTERVAL, "");
+        if(datetime.length() >= 3 && datetime.contains(":")) {
+            String[] parts = datetime.split(":");
+            int hourOfDay = Integer.valueOf(parts[0]);
+            int minute = Integer.valueOf(parts[1]);
+            return new int[] { hourOfDay, minute };
+        } else {
+            return new int[0];
+        }
     }
 
     public static boolean isAllowMobileUpdate() {
@@ -317,6 +335,16 @@ public class UserPreferences {
     }
 
     /**
+     * Sets the update interval value. Should only be used for testing purposes!
+     */
+    public static void setUpdateTimeOfDay(int hourOfDay, int minute) {
+        prefs.edit()
+             .putString(PREF_UPDATE_INTERVAL, hourOfDay + ":" + minute)
+             .apply();
+        restartUpdateAlarm();
+    }
+
+    /**
      * Change the auto-flattr settings
      *
      * @param enabled Whether automatic flattring should be enabled at all
@@ -493,14 +521,19 @@ public class UserPreferences {
     }
 
     public static void restartUpdateAlarm() {
-        long hours = getUpdateInterval();
-        restartUpdateAlarm(TimeUnit.SECONDS.toMillis(10), hours);
+        int[] timeOfDay = getUpdateTimeOfDay();
+        if (timeOfDay.length == 2) {
+            restartUpdateTimeOfDayAlarm(timeOfDay[0], timeOfDay[1]);
+        } else {
+            long hours = getUpdateInterval();
+            restartUpdateIntervalAlarm(TimeUnit.SECONDS.toMillis(10), hours);
+        }
     }
 
     /**
-     * Updates alarm registered with the AlarmManager service or deactivates it.
+     * Sets the interval in which the feeds are refreshed automatically
      */
-    public static void restartUpdateAlarm(long triggerAtMillis, long intervalMillis) {
+    public static void restartUpdateIntervalAlarm(long triggerAtMillis, long intervalMillis) {
         Log.d(TAG, "Restarting update alarm.");
         AlarmManager alarmManager = (AlarmManager) context.getSystemService(Context.ALARM_SERVICE);
         PendingIntent updateIntent = PendingIntent.getBroadcast(context, 0,
@@ -518,6 +551,31 @@ public class UserPreferences {
     }
 
     /**
+     * Sets time of day the feeds are refreshed automatically
+     */
+    public static void restartUpdateTimeOfDayAlarm(int hoursOfDay, int minute) {
+        Log.d(TAG, "Restarting update alarm.");
+        AlarmManager alarmManager = (AlarmManager) context.getSystemService(Context.ALARM_SERVICE);
+        PendingIntent updateIntent = PendingIntent.getBroadcast(context, 0,
+                new Intent(ClientConfig.applicationCallbacks.getApplicationInstance(), FeedUpdateReceiver.class), 0);
+        alarmManager.cancel(updateIntent);
+
+        Calendar now = Calendar.getInstance();
+        Calendar alarm = (Calendar)now.clone();
+        alarm.set(Calendar.HOUR_OF_DAY, hoursOfDay);
+        alarm.set(Calendar.MINUTE, minute);
+        if(alarm.before(now)) {
+            alarm.add(Calendar.DATE, 1);
+        }
+
+        alarmManager.setRepeating(AlarmManager.RTC_WAKEUP,
+                alarm.getTimeInMillis(),
+                AlarmManager.INTERVAL_DAY,
+                updateIntent);
+        Log.d(TAG, "Changed alarm to new time of day " + hoursOfDay + ":" + minute);
+    }
+
+    /**
      * Reads episode cache size as it is saved in the episode_cache_size_values array.
      */
     public static int readEpisodeCacheSize(String valueFromPrefs) {
diff --git a/core/src/main/res/values/arrays.xml b/core/src/main/res/values/arrays.xml
index 4ecf2cf61..afcb31078 100644
--- a/core/src/main/res/values/arrays.xml
+++ b/core/src/main/res/values/arrays.xml
@@ -20,18 +20,7 @@
         <item>60</item>
     </integer-array>
 
-    <string-array name="update_intervall_options">
-        <item>Manual</item>
-        <item>1 hour</item>
-        <item>2 hours</item>
-        <item>4 hours</item>
-        <item>8 hours</item>
-        <item>12 hours</item>
-        <item>24 hours</item>
-    </string-array>
-
     <string-array name="update_intervall_values">
-        <item>0</item>
         <item>1</item>
         <item>2</item>
         <item>4</item>
diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index c2147cccc..0f1830202 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -253,8 +253,12 @@
     <string name="pref_smart_mark_as_played_title">Smart mark as played</string>
     <string name="playback_pref">Playback</string>
     <string name="network_pref">Network</string>
-    <string name="pref_autoUpdateIntervall_title">Update Interval</string>
-    <string name="pref_autoUpdateIntervall_sum">Specify an interval in which the feeds are refreshed automatically or disable it</string>
+    <string name="pref_autoUpdateIntervallOrTime_title">Update Interval or Time of Day</string>
+    <string name="pref_autoUpdateIntervallOrTime_sum">Specify an interval or a specific time of day to refresh the feeds automatically</string>
+    <string name="pref_autoUpdateIntervallOrTime_message">You can set an <i>interval</i> like \"every 2 hours\", set a specific <i>time of day</i> like \"7:00 AM\" or <i>disable</i> automatic updates altogether.\n\n<small>Please note: Update times are inexact. You may encounter a short delay.</small>"</string>
+    <string name="pref_autoUpdateIntervallOrTime_Disable">Disable</string>
+    <string name="pref_autoUpdateIntervallOrTime_Interval">Set Interval</string>
+    <string name="pref_autoUpdateIntervallOrTime_TimeOfDay">Set Time of Day</string>
     <string name="pref_downloadMediaOnWifiOnly_sum">Download media files only over WiFi</string>
     <string name="pref_followQueue_title">Continuous Playback</string>
     <string name="pref_downloadMediaOnWifiOnly_title">WiFi media download</string>