move istaskroot crap to the separate tiny launch activity

3 files changed, 31 insertions, 9 deletions

diff --git a/org.fox.ttrss/src/main/AndroidManifest.xml b/org.fox.ttrss/src/main/AndroidManifest.xml
index 0d41c8b9..aa2a9f9b 100755
--- a/org.fox.ttrss/src/main/AndroidManifest.xml
+++ b/org.fox.ttrss/src/main/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.fox.ttrss"
-    android:versionCode="338"
-    android:versionName="1.112" >
+    android:versionCode="339"
+    android:versionName="1.113" >
 
     <uses-sdk
         android:minSdkVersion="15"
@@ -21,7 +21,7 @@
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name" >
         <activity
-            android:name=".OnlineActivity"
+            android:name=".LaunchActivity"
             android:label="@string/app_name" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -30,6 +30,10 @@
             </intent-filter>
         </activity>
         <activity
+            android:name=".OnlineActivity"
+            android:label="@string/app_name" >
+        </activity>
+        <activity
             android:name=".PreferencesActivity"
             android:label="@string/preferences" >
         </activity>
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/LaunchActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/LaunchActivity.java
new file mode 100755
index 00000000..cfe71e4c
--- /dev/null
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/LaunchActivity.java
@@ -0,0 +1,24 @@
+package org.fox.ttrss;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Bundle;
+
+public class LaunchActivity extends Activity {
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        // https://code.google.com/p/android/issues/detail?id=26658
+        if (!isTaskRoot()) {
+            finish();
+            return;
+        }
+
+        Intent main = new Intent(LaunchActivity.this, OnlineActivity.class);
+        startActivity(main);
+
+    }
+
+}
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java
index 86a9214b..8766d3cd 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java
@@ -155,12 +155,6 @@ public class OnlineActivity extends CommonActivity {
 
 		super.onCreate(savedInstanceState);
 
-		// https://code.google.com/p/android/issues/detail?id=26658
-		if (!isTaskRoot()) {
-			finish();
-			return;
-		}
-
 //		SharedPreferences localPrefs = getSharedPreferences("localprefs", Context.MODE_PRIVATE);
 
 		SharedPreferences localPrefs = getSharedPreferences("localprefs", Context.MODE_PRIVATE);