Keep active setup in recent apps screen

2 years ago · 3bc22dc90b
parent 54206988f1
commit 3bc22dc90b
6 changed files with 4 additions and 12 deletions
--- a/app/src/amazon/AndroidManifest.xml
+++ b/app/src/amazon/AndroidManifest.xml
@ -188,7 +188,6 @@

        <activity
            android:name=".ActivitySetup"
-            android:excludeFromRecents="true"
            android:exported="false"
            android:launchMode="singleTask"
            android:parentActivityName=".ActivityMain"
@ -196,7 +195,6 @@

        <activity
            android:name=".ActivitySignature"
-            android:excludeFromRecents="true"
            android:exported="false"
            android:launchMode="singleTask"
            android:parentActivityName=".ActivitySetup"
--- a/app/src/fdroid/AndroidManifest.xml
+++ b/app/src/fdroid/AndroidManifest.xml
@ -192,7 +192,6 @@

        <activity
            android:name=".ActivitySetup"
-            android:excludeFromRecents="true"
            android:exported="false"
            android:launchMode="singleTask"
            android:parentActivityName=".ActivityMain"
@ -200,7 +199,6 @@

        <activity
            android:name=".ActivitySignature"
-            android:excludeFromRecents="true"
            android:exported="false"
            android:launchMode="singleTask"
            android:parentActivityName=".ActivitySetup"
--- a/app/src/github/AndroidManifest.xml
+++ b/app/src/github/AndroidManifest.xml
@ -192,7 +192,6 @@

        <activity
            android:name=".ActivitySetup"
-            android:excludeFromRecents="true"
            android:exported="false"
            android:launchMode="singleTask"
            android:parentActivityName=".ActivityMain"
@ -200,7 +199,6 @@

        <activity
            android:name=".ActivitySignature"
-            android:excludeFromRecents="true"
            android:exported="false"
            android:launchMode="singleTask"
            android:parentActivityName=".ActivitySetup"
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@ -187,7 +187,6 @@

        <activity
            android:name=".ActivitySetup"
-            android:excludeFromRecents="true"
            android:exported="false"
            android:launchMode="singleTask"
            android:parentActivityName=".ActivityMain"
@ -195,7 +194,6 @@

        <activity
            android:name=".ActivitySignature"
-            android:excludeFromRecents="true"
            android:exported="false"
            android:launchMode="singleTask"
            android:parentActivityName=".ActivitySetup"
--- a/app/src/main/java/eu/faircode/email/ActivitySetup.java
+++ b/app/src/main/java/eu/faircode/email/ActivitySetup.java
@ -470,9 +470,11 @@ public class ActivitySetup extends ActivityBase implements FragmentManager.OnBac
    public void onBackStackChanged() {
        int count = getSupportFragmentManager().getBackStackEntryCount();
        if (count == 0) {
-            if (hasAccount)
+            if (hasAccount) {
                startActivity(new Intent(this, ActivityView.class));
-            finish();
+                finishAndRemoveTask();
+            } else
+                finish();
        } else {
            if (drawerLayout.isDrawerOpen(drawerContainer))
                drawerLayout.closeDrawer(drawerContainer);
--- a/app/src/play/AndroidManifest.xml
+++ b/app/src/play/AndroidManifest.xml
@ -188,7 +188,6 @@

        <activity
            android:name=".ActivitySetup"
-            android:excludeFromRecents="true"
            android:exported="false"
            android:launchMode="singleTask"
            android:parentActivityName=".ActivityMain"
@ -196,7 +195,6 @@

        <activity
            android:name=".ActivitySignature"
-            android:excludeFromRecents="true"
            android:exported="false"
            android:launchMode="singleTask"
            android:parentActivityName=".ActivitySetup"