From 86bec261dc68baf0300e59d2e54f57206a73ad25 Mon Sep 17 00:00:00 2001
From: Philipp Schaefer <trashzopf@gmail.com>
Date: Tue, 13 Jan 2015 13:06:39 +0100
Subject: [PATCH] launch IITCm in singleTask mode, move let preferenceActivity
 handle plugin installation

---
 mobile/AndroidManifest.xml                    | 31 ++++++++++---------
 .../com/cradle/iitc_mobile/IITC_Mobile.java   |  9 ------
 2 files changed, 17 insertions(+), 23 deletions(-)

diff --git a/mobile/AndroidManifest.xml b/mobile/AndroidManifest.xml
index f0f9d087..e481d2c4 100644
--- a/mobile/AndroidManifest.xml
+++ b/mobile/AndroidManifest.xml
@@ -29,7 +29,7 @@
             android:name="com.cradle.iitc_mobile.IITC_Mobile"
             android:configChanges="orientation|keyboard|keyboardHidden|screenSize|uiMode"
             android:label="@string/app_name"
-            android:launchMode="singleTop">
+            android:launchMode="singleTask">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
 
@@ -72,6 +72,21 @@
                 <data android:scheme="geo"/>
             </intent-filter>
 
+            <!-- Points to searchable meta data. -->
+            <meta-data
+                android:name="android.app.searchable"
+                android:resource="@xml/searchable"/>
+        </activity>
+
+        <activity
+            android:name="com.cradle.iitc_mobile.prefs.PreferenceActivity"
+            android:configChanges="orientation|keyboard|keyboardHidden|screenSize"
+            android:label="@string/activity_settings"/>
+
+        <activity
+            android:name="com.cradle.iitc_mobile.prefs.PluginPreferenceActivity"
+            android:configChanges="orientation|keyboard|keyboardHidden|screenSize"
+            android:label="@string/activity_plugins">
             <!-- Handles external user plugins -->
             <intent-filter>
                 <action android:name="android.intent.action.VIEW"/>
@@ -107,21 +122,8 @@
                     android:pathPattern=".*\\.user.js"
                     android:scheme="https"/>
             </intent-filter>
-
-            <!-- Points to searchable meta data. -->
-            <meta-data
-                android:name="android.app.searchable"
-                android:resource="@xml/searchable"/>
         </activity>
 
-        <activity
-            android:name="com.cradle.iitc_mobile.prefs.PreferenceActivity"
-            android:configChanges="orientation|keyboard|keyboardHidden|screenSize"
-            android:label="@string/activity_settings"/>
-        <activity
-            android:name="com.cradle.iitc_mobile.prefs.PluginPreferenceActivity"
-            android:configChanges="orientation|keyboard|keyboardHidden|screenSize"
-            android:label="@string/activity_plugins"/>
         <activity
             android:name="com.cradle.iitc_mobile.share.ShareActivity"
             android:label="@string/activity_share"
@@ -146,6 +148,7 @@
                 <data android:mimeType="text/plain"/>
             </intent-filter>
         </activity>
+
         <activity
             android:name="com.cradle.iitc_mobile.share.SaveToFile"
             android:enabled="true"
diff --git a/mobile/src/com/cradle/iitc_mobile/IITC_Mobile.java b/mobile/src/com/cradle/iitc_mobile/IITC_Mobile.java
index 447f0fda..45bc83bd 100644
--- a/mobile/src/com/cradle/iitc_mobile/IITC_Mobile.java
+++ b/mobile/src/com/cradle/iitc_mobile/IITC_Mobile.java
@@ -266,15 +266,6 @@ public class IITC_Mobile extends Activity
                             .show();
                 }
             }
-
-            // intent MIME type and uri path may be null
-            final String type = intent.getType() == null ? "" : intent.getType();
-            final String path = uri.getPath() == null ? "" : uri.getPath();
-            if (path.endsWith(".user.js") || type.contains("javascript")) {
-                final Intent prefIntent = new Intent(this, PluginPreferenceActivity.class);
-                prefIntent.setDataAndType(uri, intent.getType());
-                startActivity(prefIntent);
-            }
         }
 
         if (Intent.ACTION_SEARCH.equals(action)) {