diff options
| author | Martin Fietz <Martin.Fietz@gmail.com> | 2017-10-15 21:53:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-15 21:53:40 +0200 |
| commit | c69c48b62fdbcbf91b9a649bbe6ee46e0faa230e (patch) | |
| tree | bed00230f0c7a40be531ccfe7e58cb4a85fea526 /core/src/main/java | |
| parent | 688e123c3450cd077e6592cd47890a01cee0368e (diff) | |
| parent | c2346636cececd3e6891cd9cdcb513f3ddca4351 (diff) | |
| download | AntennaPod-c69c48b62fdbcbf91b9a649bbe6ee46e0faa230e.zip | |
Merge pull request #2426 from fuzzdk/develop
Add auto download on mobile connection option
Diffstat (limited to 'core/src/main/java')
| -rw-r--r-- | core/src/main/java/de/danoeh/antennapod/core/preferences/UserPreferences.java | 6 | ||||
| -rw-r--r-- | core/src/main/java/de/danoeh/antennapod/core/util/NetworkUtils.java | 10 |
2 files changed, 16 insertions, 0 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 48492ced9..20a349055 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 @@ -84,6 +84,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"; @@ -401,6 +402,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..c73d6f6e3 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,16 @@ 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"); |