phillip/ingress-intel-total-conversion
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

disable splash screen on JS error and HTTP response error code (fixes #475)

Browse Source
This commit is contained in:
Philipp Schaefer
2013-08-10 17:34:18 +02:00
parent e85af06559
commit 855ad003a2
7 changed files with 76 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
mobile/src/com/cradle/iitc_mobile/IITC_WebView.java
View File

@ -11,11 +11,14 @@ import android.os.Build;
import android.preference.PreferenceManager;
import android.util.AttributeSet;
import android.util.Log;
import android.webkit.ConsoleMessage;
import android.webkit.GeolocationPermissions;
import android.webkit.WebChromeClient;
import android.webkit.WebSettings;
import android.webkit.WebView;
import com.cradle.iitc_mobile.async.CheckHttpResponse;
@SuppressLint("SetJavaScriptEnabled")
public class IITC_WebView extends WebView {
@ -63,6 +66,18 @@ public class IITC_WebView extends WebView {
// maximum for setProgress is 10,000
((Activity) getContext()).setProgress(newProgress * 100);
}
/**
* remove splash screen if any JS error occurs
*/
@Override
public boolean onConsoleMessage(ConsoleMessage consoleMessage) {
if (consoleMessage.messageLevel() == ConsoleMessage.MessageLevel.ERROR) {
Log.d("iitcm", consoleMessage.message());
mJsInterface.removeSplashScreen();
}
return super.onConsoleMessage(consoleMessage);
}
});
mIitcWebViewClient = new IITC_WebViewClient(c);
@ -117,6 +132,9 @@ public class IITC_WebView extends WebView {
url = url.replace("http://", "https://");
else
url = url.replace("https://", "http://");
// disable splash screen if a http error code is responded
new CheckHttpResponse(mJsInterface).execute(url);
Log.d("iitcm", "loading url: " + url);
}
super.loadUrl(url);