diff --git a/mobile/src/com/cradle/iitc_mobile/IITC_WebViewClient.java b/mobile/src/com/cradle/iitc_mobile/IITC_WebViewClient.java index 830a2bd3..74df77e3 100644 --- a/mobile/src/com/cradle/iitc_mobile/IITC_WebViewClient.java +++ b/mobile/src/com/cradle/iitc_mobile/IITC_WebViewClient.java @@ -157,7 +157,6 @@ public class IITC_WebViewClient extends WebViewClient { */ @Override public void onReceivedLoginRequest(final WebView view, final String realm, final String account, final String args) { - mIitcInjected = false; // Log.d("iitcm", "Login requested: " + realm + " " + account + " " + args); // mIitc.onReceivedLoginRequest(this, view, realm, account, args); } @@ -225,13 +224,15 @@ public class IITC_WebViewClient extends WebViewClient { // start non-ingress-intel-urls in another app... @Override public boolean shouldOverrideUrlLoading(final WebView view, final String url) { - if (url.contains("ingress.com") || url.contains("appengine.google.com")) { - // reload iitc if a poslink is clicked inside the app - if (url.contains("intel?ll=") - || (url.contains("latE6") && url.contains("lngE6"))) { - Log.d("should be an internal clicked position link...reload script for: " + url); - mIitc.loadUrl(url); - } + if (url.contains("conflogin") || url.contains("ServiceLogin") || url.contains("appengine.google.com")) { + mIitcInjected = false; + Log.d("Google login"); + view.loadUrl(url); + return false; + } + else if (url.contains("ingress.com")) { + if (!mIitcInjected) return false; + mIitc.loadUrl(url); } else { Log.d("no ingress intel link, start external app to load url: " + url); final Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(url));