From 31f7a64aa97003874db567b1a78d0fa5d0bdaea9 Mon Sep 17 00:00:00 2001 From: Scott Jackson Date: Thu, 3 Jul 2014 12:49:52 -0700 Subject: Add ability to define whether or not to check for wifi requirement, default to false --- src/github/daneren2005/dsub/util/Util.java | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'src') 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); -- cgit v1.2.3