From 0fc57f8cfc38293488f31d1e0da3ee9cafccfa04 Mon Sep 17 00:00:00 2001
From: Philipp Schaefer <trashzopf@gmail.com>
Date: Tue, 19 Aug 2014 02:29:02 +0200
Subject: [PATCH] moved reset calls into new reset method of main activity

---
 mobile/src/com/cradle/iitc_mobile/IITC_Mobile.java     | 10 +++++++---
 .../src/com/cradle/iitc_mobile/IITC_WebViewClient.java |  7 ++++---
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/mobile/src/com/cradle/iitc_mobile/IITC_Mobile.java b/mobile/src/com/cradle/iitc_mobile/IITC_Mobile.java
index 5304002d..9653dbc5 100644
--- a/mobile/src/com/cradle/iitc_mobile/IITC_Mobile.java
+++ b/mobile/src/com/cradle/iitc_mobile/IITC_Mobile.java
@@ -632,15 +632,19 @@ public class IITC_Mobile extends Activity
         return url + (url.contains("?") ? '&' : '?') + "vp=" + (mDesktopMode ? 'f' : 'm');
     }
 
-    // inject the iitc-script and load the intel url
-    // plugins are injected onPageFinished
-    public void loadUrl(String url) {
+    public void reset() {
         mNavigationHelper.reset();
         mMapSettings.reset();
         mUserLocation.reset();
         mIitcWebView.getWebViewClient().reset();
         mBackStack.clear();
         mCurrentPane = Pane.MAP;
+    }
+
+    // inject the iitc-script and load the intel url
+    // plugins are injected onPageFinished
+    public void loadUrl(String url) {
+        reset();
         setLoadingState(true);
         url = addUrlParam(url);
         mIitcWebView.loadUrl(url);
diff --git a/mobile/src/com/cradle/iitc_mobile/IITC_WebViewClient.java b/mobile/src/com/cradle/iitc_mobile/IITC_WebViewClient.java
index 0c7db014..263863b1 100644
--- a/mobile/src/com/cradle/iitc_mobile/IITC_WebViewClient.java
+++ b/mobile/src/com/cradle/iitc_mobile/IITC_WebViewClient.java
@@ -225,13 +225,14 @@ public class IITC_WebViewClient extends WebViewClient {
     @Override
     public boolean shouldOverrideUrlLoading(final WebView view, final String url) {
         if (url.contains("conflogin") || url.contains("ServiceLogin") || url.contains("appengine.google.com")) {
-            mIitcInjected = false;
             Log.d("Google login");
             return false;
         }
         else if (url.contains("ingress.com")) {
-            if (!mIitcInjected) return false;
-            mIitc.loadUrl(url);
+            Log.d("intel link requested, reset app and load " + url);
+            mIitc.reset();
+            mIitc.setLoadingState(true);
+            return false;
         } 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));