From 7060e56a6996e77c7f5a177eecccf09e24b8d760 Mon Sep 17 00:00:00 2001 From: Anders Bo Rasmussen Date: Thu, 21 Sep 2017 23:25:18 +0200 Subject: Add auto download on mobile connection option --- .../danoeh/antennapod/core/preferences/UserPreferences.java | 6 ++++++ .../java/de/danoeh/antennapod/core/util/NetworkUtils.java | 12 ++++++++++++ 2 files changed, 18 insertions(+) (limited to 'core/src/main/java/de/danoeh/antennapod') 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 042298e28..036978bf9 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 @@ -83,6 +83,7 @@ public class UserPreferences { public static final String PREF_ENABLE_AUTODL = "prefEnableAutoDl"; public static final String PREF_ENABLE_AUTODL_ON_BATTERY = "prefEnableAutoDownloadOnBattery"; public static final String PREF_ENABLE_AUTODL_WIFI_FILTER = "prefEnableAutoDownloadWifiFilter"; + public static final String PREF_ENABLE_AUTODL_ON_MOBILE = "prefEnableAutoDownloadOnMobile"; public static final String PREF_AUTODL_SELECTED_NETWORKS = "prefAutodownloadSelectedNetworks"; public static final String PREF_PROXY_TYPE = "prefProxyType"; public static final String PREF_PROXY_HOST = "prefProxyHost"; @@ -396,6 +397,11 @@ public class UserPreferences { return prefs.getBoolean(PREF_ENABLE_AUTODL_WIFI_FILTER, false); } + public static boolean isEnableAutodownloadOnMobile() { + return prefs.getBoolean(PREF_ENABLE_AUTODL_ON_MOBILE, false); + } + + public static int getImageCacheSize() { String cacheSizeString = prefs.getString(PREF_IMAGE_CACHE_SIZE, IMAGE_CACHE_DEFAULT_VALUE); int cacheSizeInt = Integer.parseInt(cacheSizeString); diff --git a/core/src/main/java/de/danoeh/antennapod/core/util/NetworkUtils.java b/core/src/main/java/de/danoeh/antennapod/core/util/NetworkUtils.java index 1717bde0e..033503d1b 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/util/NetworkUtils.java +++ b/core/src/main/java/de/danoeh/antennapod/core/util/NetworkUtils.java @@ -66,6 +66,18 @@ public class NetworkUtils { } } } + } else { + if (!UserPreferences.isEnableAutodownloadOnMobile()) + { + Log.d(TAG, "Auto Download not enabled on Mobile"); + return false; + } + if (networkInfo.isRoaming()) + { + Log.d(TAG, "Roaming on foreign network"); + return false; + } + return true; } } Log.d(TAG, "Network for auto-dl is not available"); -- cgit v1.2.3