diff options
| -rw-r--r-- | core/src/main/java/de/danoeh/antennapod/core/glide/ApOkHttpUrlLoader.java | 5 | ||||
| -rw-r--r-- | core/src/main/java/de/danoeh/antennapod/core/preferences/UserPreferences.java | 8 |
2 files changed, 12 insertions, 1 deletions
diff --git a/core/src/main/java/de/danoeh/antennapod/core/glide/ApOkHttpUrlLoader.java b/core/src/main/java/de/danoeh/antennapod/core/glide/ApOkHttpUrlLoader.java index 2e742e979..b75e1630c 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/glide/ApOkHttpUrlLoader.java +++ b/core/src/main/java/de/danoeh/antennapod/core/glide/ApOkHttpUrlLoader.java @@ -139,6 +139,11 @@ class ApOkHttpUrlLoader implements ModelLoader<String, InputStream> { // add authentication String[] auth = authentication.split(":"); + if (auth.length != 2) { + Log.d(TAG, "Invalid credentials for '" + url + "'"); + return chain.proceed(request); + } + String credentials = HttpDownloader.encodeCredentials(auth[0], auth[1], "ISO-8859-1"); Request newRequest = request .newBuilder() 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 118d434f8..60cec25d9 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 @@ -381,6 +381,10 @@ public class UserPreferences { } } + public static boolean isAutoUpdateDisabled() { + return prefs.getString(PREF_UPDATE_INTERVAL, "").equals("0"); + } + public static String getMobileUpdatesEnabled() { return prefs.getString(PREF_MOBILE_UPDATE, "images"); } @@ -832,7 +836,9 @@ public class UserPreferences { } public static void restartUpdateAlarm() { - if (isAutoUpdateTimeOfDay()) { + if (isAutoUpdateDisabled()) { + AutoUpdateManager.disableAutoUpdate(); + } else if (isAutoUpdateTimeOfDay()) { int[] timeOfDay = getUpdateTimeOfDay(); Log.d(TAG, "timeOfDay: " + Arrays.toString(timeOfDay)); AutoUpdateManager.restartUpdateTimeOfDayAlarm(timeOfDay[0], timeOfDay[1]); |