From f342aeab0a3c6de8993b3df8f9797a175d49afd1 Mon Sep 17 00:00:00 2001
From: Philipp Schaefer <trashzopf@gmail.com>
Date: Wed, 24 Jul 2013 00:49:21 +0200
Subject: [PATCH] - added developer preference to disable splash screen -
 disable splash screen on login screen

---
 mobile/.idea/compiler.xml                     |  3 +++
 mobile/AndroidManifest.xml                    |  2 +-
 mobile/plugins/user-location.user.js          |  2 +-
 mobile/res/values/strings.xml                 |  1 +
 mobile/res/xml/preferences.xml                |  5 +++++
 .../com/cradle/iitc_mobile/IITC_Mobile.java   | 13 ++++++++----
 .../iitc_mobile/IITC_WebViewClient.java       | 20 +++++++++++++++++--
 7 files changed, 38 insertions(+), 8 deletions(-)

diff --git a/mobile/.idea/compiler.xml b/mobile/.idea/compiler.xml
index 217af471..1b255f76 100644
--- a/mobile/.idea/compiler.xml
+++ b/mobile/.idea/compiler.xml
@@ -2,6 +2,9 @@
 <project version="4">
   <component name="CompilerConfiguration">
     <option name="DEFAULT_COMPILER" value="Javac" />
+    <excludeFromCompile>
+      <directory url="file://$PROJECT_DIR$/gen" includeSubdirectories="true" />
+    </excludeFromCompile>
     <resourceExtensions />
     <wildcardResourcePatterns>
       <entry name="!?*.java" />
diff --git a/mobile/AndroidManifest.xml b/mobile/AndroidManifest.xml
index 1986ce01..801aa61d 100644
--- a/mobile/AndroidManifest.xml
+++ b/mobile/AndroidManifest.xml
@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.cradle.iitc_mobile"
           android:versionCode="31"
-          android:versionName="0.5.0">
+          android:versionName="0.5">
 
     <uses-sdk
         android:minSdkVersion="14"
diff --git a/mobile/plugins/user-location.user.js b/mobile/plugins/user-location.user.js
index c966ca79..24284130 100644
--- a/mobile/plugins/user-location.user.js
+++ b/mobile/plugins/user-location.user.js
@@ -1,7 +1,7 @@
 // ==UserScript==
 // @id             iitc-plugin-user-location@cradle
 // @name           IITC plugin: User Location
-// @version        0.1.1.@@DATETIMEVERSION@@
+// @version        0.1.2.@@DATETIMEVERSION@@
 // @namespace      https://github.com/jonatkins/ingress-intel-total-conversion
 // @updateURL      @@UPDATEURL@@
 // @downloadURL    @@DOWNLOADURL@@
diff --git a/mobile/res/values/strings.xml b/mobile/res/values/strings.xml
index d486e60e..19c53305 100644
--- a/mobile/res/values/strings.xml
+++ b/mobile/res/values/strings.xml
@@ -50,6 +50,7 @@
 	<string name="pref_enable_dev_mode">Enable developer mode</string>
 	<string name="pref_enable_dev_mode_sum">If enabled, all IITC sources will be loaded from external storage of the Android device.
 	    Please copy all sources from $IITC_folder/build/mobile/ to /sdcard/IITC_Mobile/dev/.</string>
+    <string name="pref_disable_splash">Disable Splash Screen</string>
     <string name="pref_select_iitc">IITC source</string>
     <string name="pref_select_iitc_sum">Load IITC main script from url or use local script. Currently used source:</string>
 
diff --git a/mobile/res/xml/preferences.xml b/mobile/res/xml/preferences.xml
index a4b14c02..0398bddd 100644
--- a/mobile/res/xml/preferences.xml
+++ b/mobile/res/xml/preferences.xml
@@ -67,6 +67,11 @@
 	        android:summary="@string/pref_enable_dev_mode_sum"
 	        android:defaultValue="false" />
 
+        <CheckBoxPreference
+                android:key="pref_disable_splash"
+                android:title="@string/pref_disable_splash"
+                android:defaultValue="false" />
+
         <ListPreference
             android:key="pref_build_version"
             android:title="@string/build_version"
diff --git a/mobile/src/com/cradle/iitc_mobile/IITC_Mobile.java b/mobile/src/com/cradle/iitc_mobile/IITC_Mobile.java
index cd63e8d5..17d0c13a 100644
--- a/mobile/src/com/cradle/iitc_mobile/IITC_Mobile.java
+++ b/mobile/src/com/cradle/iitc_mobile/IITC_Mobile.java
@@ -464,8 +464,7 @@ public class IITC_Mobile extends Activity {
     // inject the iitc-script and load the intel url
     // plugins are injected onPageFinished
     public void loadUrl(String url) {
-        findViewById(R.id.imageLoading).setVisibility(View.VISIBLE);
-        findViewById(R.id.iitc_webview).setVisibility(View.GONE);
+        showSplashScreen();
         url = addUrlParam(url);
         loadIITC();
         iitc_view.loadUrl(url);
@@ -483,8 +482,6 @@ public class IITC_Mobile extends Activity {
     }
 
     public void toggleFullscreen() {
-        // TODO: Figure out how to handle this with new back stack?
-
         if (fullscreen_mode) {
             if (fullscreen_actionbar)
                 this.getActionBar().show();
@@ -546,6 +543,7 @@ public class IITC_Mobile extends Activity {
     public void loginSucceeded() {
         // garbage collection
         mLogin = null;
+        showSplashScreen();
     }
 
     // disable/enable some menu buttons...
@@ -578,4 +576,11 @@ public class IITC_Mobile extends Activity {
             dialogStack.remove(id);
         }
     }
+
+    public void showSplashScreen() {
+        if (!sharedPref.getBoolean("pref_disable_splash", false)) {
+            findViewById(R.id.iitc_webview).setVisibility(View.GONE);
+            findViewById(R.id.imageLoading).setVisibility(View.VISIBLE);
+        }
+    }
 }
diff --git a/mobile/src/com/cradle/iitc_mobile/IITC_WebViewClient.java b/mobile/src/com/cradle/iitc_mobile/IITC_WebViewClient.java
index f2ecec03..16bd51cd 100644
--- a/mobile/src/com/cradle/iitc_mobile/IITC_WebViewClient.java
+++ b/mobile/src/com/cradle/iitc_mobile/IITC_WebViewClient.java
@@ -10,6 +10,7 @@ import android.net.http.SslError;
 import android.os.Environment;
 import android.preference.PreferenceManager;
 import android.util.Log;
+import android.view.View;
 import android.webkit.SslErrorHandler;
 import android.webkit.WebResourceResponse;
 import android.webkit.WebSettings;
@@ -150,8 +151,11 @@ public class IITC_WebViewClient extends WebViewClient {
 
     @Override
     public void onPageFinished(WebView view, String url) {
-        Log.d("iitcm", "injecting iitc..");
-        view.loadUrl("javascript: " + this.js);
+        if (url.startsWith("http://www.ingress.com/intel")
+         || url.startsWith("https://www.ingress.com/intel")) {
+            Log.d("iitcm", "injecting iitc..");
+            view.loadUrl("javascript: " + this.js);
+        }
         super.onPageFinished(view, url);
     }
 
@@ -288,6 +292,18 @@ public class IITC_WebViewClient extends WebViewClient {
         return js;
     }
 
+    @Override
+    public void onLoadResource(WebView view, String url) {
+        if(url.contains("css/basic.css")) {
+            Log.d("iitcm", "basic.css received...should be ingress intel login");
+            // get rid of loading screen to log in
+            IITC_Mobile iitc = (IITC_Mobile) context;
+            iitc.findViewById(R.id.iitc_webview).setVisibility(View.VISIBLE);
+            iitc.findViewById(R.id.imageLoading).setVisibility(View.GONE);
+        }
+        super.onLoadResource(view, url);
+    }
+
     // Check every external resource if it’s okay to load it and maybe replace
     // it
     // with our own content. This is used to block loading Niantic resources