move istaskroot crap to the separate tiny launch activity

This commit is contained in:
Andrew Dolgov 2015-06-05 11:25:23 +03:00
parent df1dcca834
commit eed69d57e3
3 changed files with 31 additions and 9 deletions

View File

@ -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" />
@ -29,6 +29,10 @@
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity
android:name=".OnlineActivity"
android:label="@string/app_name" >
</activity>
<activity
android:name=".PreferencesActivity"
android:label="@string/preferences" >

View File

@ -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);
}
}

View File

@ -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);