diff options
author | Scott Jackson <daneren2005@gmail.com> | 2014-07-03 12:49:52 -0700 |
---|---|---|
committer | Scott Jackson <daneren2005@gmail.com> | 2014-07-03 12:49:52 -0700 |
commit | 31f7a64aa97003874db567b1a78d0fa5d0bdaea9 (patch) | |
tree | 592b3e2347458582bee8d460c31f740208c640b5 | |
parent | 48b472cbdb5756d478c3593c735b9249eb45b2be (diff) | |
download | dsub-31f7a64aa97003874db567b1a78d0fa5d0bdaea9.tar.gz dsub-31f7a64aa97003874db567b1a78d0fa5d0bdaea9.tar.bz2 dsub-31f7a64aa97003874db567b1a78d0fa5d0bdaea9.zip |
Add ability to define whether or not to check for wifi requirement, default to false
-rw-r--r-- | src/github/daneren2005/dsub/util/Util.java | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/src/github/daneren2005/dsub/util/Util.java b/src/github/daneren2005/dsub/util/Util.java index 02cb8eb9..27bfa365 100644 --- a/src/github/daneren2005/dsub/util/Util.java +++ b/src/github/daneren2005/dsub/util/Util.java @@ -873,15 +873,22 @@ public final class Util { return Util.getScaledHeight((double) bitmap.getHeight(), (double) bitmap.getWidth(), width); } - public static boolean isNetworkConnected(Context context) { + public static boolean isNetworkConnected(Context context) { + return isNetworkConnected(context, false); + } + public static boolean isNetworkConnected(Context context, boolean streaming) { ConnectivityManager manager = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE); NetworkInfo networkInfo = manager.getActiveNetworkInfo(); boolean connected = networkInfo != null && networkInfo.isConnected(); - boolean wifiConnected = connected && networkInfo.getType() == ConnectivityManager.TYPE_WIFI; - boolean wifiRequired = isWifiRequiredForDownload(context); + if(streaming) { + boolean wifiConnected = connected && networkInfo.getType() == ConnectivityManager.TYPE_WIFI; + boolean wifiRequired = isWifiRequiredForDownload(context); - return connected && (!wifiRequired || wifiConnected); + return connected && (!wifiRequired || wifiConnected); + } else { + return connected; + } } public static boolean isWifiConnected(Context context) { ConnectivityManager manager = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE); |