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

launch IITCm in singleTask mode, move let preferenceActivity handle plugin installation

Browse Source
This commit is contained in:
Philipp Schaefer 2015-01-13 13:06:39 +01:00
parent c551c41609
commit 86bec261dc
2 changed files with 17 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
mobile/AndroidManifest.xml
View File

@ -29,7 +29,7 @@
android:name="com.cradle.iitc_mobile.IITC_Mobile" android:name="com.cradle.iitc_mobile.IITC_Mobile"
android:configChanges="orientation|keyboard|keyboardHidden|screenSize|uiMode" android:configChanges="orientation|keyboard|keyboardHidden|screenSize|uiMode"
android:label="@string/app_name" android:label="@string/app_name"
android:launchMode="singleTop"> android:launchMode="singleTask">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN"/> <action android:name="android.intent.action.MAIN"/>
@ -72,6 +72,21 @@
<data android:scheme="geo"/> <data android:scheme="geo"/>
</intent-filter> </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 --> <!-- Handles external user plugins -->
<intent-filter> <intent-filter>
<action android:name="android.intent.action.VIEW"/> <action android:name="android.intent.action.VIEW"/>
@ -107,21 +122,8 @@
android:pathPattern=".*\\.user.js" android:pathPattern=".*\\.user.js"
android:scheme="https"/> android:scheme="https"/>
</intent-filter> </intent-filter>
<!-- Points to searchable meta data. -->
<meta-data
android:name="android.app.searchable"
android:resource="@xml/searchable"/>
</activity> </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 <activity
android:name="com.cradle.iitc_mobile.share.ShareActivity" android:name="com.cradle.iitc_mobile.share.ShareActivity"
android:label="@string/activity_share" android:label="@string/activity_share"
@ -146,6 +148,7 @@
<data android:mimeType="text/plain"/> <data android:mimeType="text/plain"/>
</intent-filter> </intent-filter>
</activity> </activity>
<activity <activity
android:name="com.cradle.iitc_mobile.share.SaveToFile" android:name="com.cradle.iitc_mobile.share.SaveToFile"
android:enabled="true" android:enabled="true"

9
mobile/src/com/cradle/iitc_mobile/IITC_Mobile.java
View File

@ -266,15 +266,6 @@ public class IITC_Mobile extends Activity
.show(); .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)) { if (Intent.ACTION_SEARCH.equals(action)) {