From 2af9174cfec73e24f1da4c1097a8d999c210f461 Mon Sep 17 00:00:00 2001 From: hastarin Date: Tue, 14 May 2013 12:41:07 +1000 Subject: [PATCH 1/2] Use cache on Android 4.1+ if using Wi-Fi tethering. --- mobile/src/com/cradle/iitc_mobile/IITC_WebView.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/mobile/src/com/cradle/iitc_mobile/IITC_WebView.java b/mobile/src/com/cradle/iitc_mobile/IITC_WebView.java index a81efb67..8da1b74d 100644 --- a/mobile/src/com/cradle/iitc_mobile/IITC_WebView.java +++ b/mobile/src/com/cradle/iitc_mobile/IITC_WebView.java @@ -1,10 +1,12 @@ package com.cradle.iitc_mobile; import android.annotation.SuppressLint; +import android.annotation.TargetApi; import android.content.Context; import android.content.SharedPreferences; import android.net.ConnectivityManager; import android.net.NetworkInfo; +import android.os.Build; import android.preference.PreferenceManager; import android.util.AttributeSet; import android.util.Log; @@ -122,10 +124,14 @@ public class IITC_WebView extends WebView { } } + @TargetApi(16) private boolean isConnectedToWifi() { ConnectivityManager conMan = (ConnectivityManager) getContext() .getSystemService(Context.CONNECTIVITY_SERVICE); NetworkInfo wifi = conMan.getNetworkInfo(ConnectivityManager.TYPE_WIFI); + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) { + return wifi.getState() == NetworkInfo.State.CONNECTED && conMan.isActiveNetworkMetered(); + } return wifi.getState() == NetworkInfo.State.CONNECTED; } From aa46d8690326711224075805df276e2eb3a91425 Mon Sep 17 00:00:00 2001 From: hastarin Date: Tue, 14 May 2013 12:47:42 +1000 Subject: [PATCH 2/2] Corrected logic. Don't forget the ! --- mobile/src/com/cradle/iitc_mobile/IITC_WebView.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mobile/src/com/cradle/iitc_mobile/IITC_WebView.java b/mobile/src/com/cradle/iitc_mobile/IITC_WebView.java index 8da1b74d..7241596e 100644 --- a/mobile/src/com/cradle/iitc_mobile/IITC_WebView.java +++ b/mobile/src/com/cradle/iitc_mobile/IITC_WebView.java @@ -130,7 +130,7 @@ public class IITC_WebView extends WebView { .getSystemService(Context.CONNECTIVITY_SERVICE); NetworkInfo wifi = conMan.getNetworkInfo(ConnectivityManager.TYPE_WIFI); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) { - return wifi.getState() == NetworkInfo.State.CONNECTED && conMan.isActiveNetworkMetered(); + return wifi.getState() == NetworkInfo.State.CONNECTED && !conMan.isActiveNetworkMetered(); } return wifi.getState() == NetworkInfo.State.CONNECTED; }