From a4decf82152a35da5cad0ac4a2212f7be4a3f61f Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Fri, 28 Jan 2022 10:38:25 +0100
Subject: [PATCH] Revert "Finish and remove task"

This reverts commit 00453147d2791e1df79143361129967e79b389a8.
---
 app/src/amazon/AndroidManifest.xml                         | 4 ++++
 app/src/fdroid/AndroidManifest.xml                         | 4 ++++
 app/src/github/AndroidManifest.xml                         | 4 ++++
 app/src/main/AndroidManifest.xml                           | 3 +++
 app/src/main/java/eu/faircode/email/ActivityAnswer.java    | 4 ++--
 app/src/main/java/eu/faircode/email/ActivityRationale.java | 2 +-
 app/src/main/java/eu/faircode/email/ActivitySearch.java    | 2 +-
 app/src/play/AndroidManifest.xml                           | 4 ++++
 8 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/app/src/amazon/AndroidManifest.xml b/app/src/amazon/AndroidManifest.xml
index 9ed9c73727..c995742686 100644
--- a/app/src/amazon/AndroidManifest.xml
+++ b/app/src/amazon/AndroidManifest.xml
@@ -129,6 +129,7 @@
 
         <activity
             android:name=".ActivityMain"
+            android:excludeFromRecents="true"
             android:exported="true"
             android:launchMode="singleInstance"
             android:theme="@style/Theme.AppCompat.Translucent">
@@ -219,6 +220,7 @@
         <activity
             android:name=".ActivitySearch"
             android:enabled="false"
+            android:excludeFromRecents="true"
             android:exported="true"
             android:icon="@mipmap/ic_launcher"
             android:label="@string/app_search"
@@ -244,6 +246,7 @@
         <activity
             android:name=".ActivityAnswer"
             android:enabled="false"
+            android:excludeFromRecents="true"
             android:exported="true"
             android:icon="@drawable/twotone_reply_24"
             android:label="@string/app_answer"
@@ -357,6 +360,7 @@
         <!-- https://developer.android.com/training/permissions/explaining-access -->
         <activity
             android:name=".ActivityRationale"
+            android:excludeFromRecents="true"
             android:exported="true"
             android:icon="@mipmap/ic_launcher"
             android:label="@string/app_name"
diff --git a/app/src/fdroid/AndroidManifest.xml b/app/src/fdroid/AndroidManifest.xml
index 3c929b3f2c..bf7601be36 100644
--- a/app/src/fdroid/AndroidManifest.xml
+++ b/app/src/fdroid/AndroidManifest.xml
@@ -128,6 +128,7 @@
 
         <activity
             android:name=".ActivityMain"
+            android:excludeFromRecents="true"
             android:exported="true"
             android:launchMode="singleInstance"
             android:theme="@style/Theme.AppCompat.Translucent">
@@ -218,6 +219,7 @@
         <activity
             android:name=".ActivitySearch"
             android:enabled="false"
+            android:excludeFromRecents="true"
             android:exported="true"
             android:icon="@mipmap/ic_launcher"
             android:label="@string/app_search"
@@ -243,6 +245,7 @@
         <activity
             android:name=".ActivityAnswer"
             android:enabled="false"
+            android:excludeFromRecents="true"
             android:exported="true"
             android:icon="@drawable/twotone_reply_24"
             android:label="@string/app_answer"
@@ -356,6 +359,7 @@
         <!-- https://developer.android.com/training/permissions/explaining-access -->
         <activity
             android:name=".ActivityRationale"
+            android:excludeFromRecents="true"
             android:exported="true"
             android:icon="@mipmap/ic_launcher"
             android:label="@string/app_name"
diff --git a/app/src/github/AndroidManifest.xml b/app/src/github/AndroidManifest.xml
index 3c929b3f2c..bf7601be36 100644
--- a/app/src/github/AndroidManifest.xml
+++ b/app/src/github/AndroidManifest.xml
@@ -128,6 +128,7 @@
 
         <activity
             android:name=".ActivityMain"
+            android:excludeFromRecents="true"
             android:exported="true"
             android:launchMode="singleInstance"
             android:theme="@style/Theme.AppCompat.Translucent">
@@ -218,6 +219,7 @@
         <activity
             android:name=".ActivitySearch"
             android:enabled="false"
+            android:excludeFromRecents="true"
             android:exported="true"
             android:icon="@mipmap/ic_launcher"
             android:label="@string/app_search"
@@ -243,6 +245,7 @@
         <activity
             android:name=".ActivityAnswer"
             android:enabled="false"
+            android:excludeFromRecents="true"
             android:exported="true"
             android:icon="@drawable/twotone_reply_24"
             android:label="@string/app_answer"
@@ -356,6 +359,7 @@
         <!-- https://developer.android.com/training/permissions/explaining-access -->
         <activity
             android:name=".ActivityRationale"
+            android:excludeFromRecents="true"
             android:exported="true"
             android:icon="@mipmap/ic_launcher"
             android:label="@string/app_name"
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index e7208572bd..cf391cd6d4 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -218,6 +218,7 @@
         <activity
             android:name=".ActivitySearch"
             android:enabled="false"
+            android:excludeFromRecents="true"
             android:exported="true"
             android:icon="@mipmap/ic_launcher"
             android:label="@string/app_search"
@@ -243,6 +244,7 @@
         <activity
             android:name=".ActivityAnswer"
             android:enabled="false"
+            android:excludeFromRecents="true"
             android:exported="true"
             android:icon="@drawable/twotone_reply_24"
             android:label="@string/app_answer"
@@ -356,6 +358,7 @@
         <!-- https://developer.android.com/training/permissions/explaining-access -->
         <activity
             android:name=".ActivityRationale"
+            android:excludeFromRecents="true"
             android:exported="true"
             android:icon="@mipmap/ic_launcher"
             android:label="@string/app_name"
diff --git a/app/src/main/java/eu/faircode/email/ActivityAnswer.java b/app/src/main/java/eu/faircode/email/ActivityAnswer.java
index 9d61ff9f20..2eb79acf09 100644
--- a/app/src/main/java/eu/faircode/email/ActivityAnswer.java
+++ b/app/src/main/java/eu/faircode/email/ActivityAnswer.java
@@ -49,7 +49,7 @@ public class ActivityAnswer extends ActivityBase {
 
         Intent intent = getIntent();
         if (intent == null) {
-            finishAndRemoveTask();
+            finish();
             return;
         }
 
@@ -96,7 +96,7 @@ public class ActivityAnswer extends ActivityBase {
                     setResult(RESULT_OK, result);
                 }
 
-                finishAndRemoveTask();
+                finish();
             }
         });
 
diff --git a/app/src/main/java/eu/faircode/email/ActivityRationale.java b/app/src/main/java/eu/faircode/email/ActivityRationale.java
index 60579f6f2d..021f3c5b8b 100644
--- a/app/src/main/java/eu/faircode/email/ActivityRationale.java
+++ b/app/src/main/java/eu/faircode/email/ActivityRationale.java
@@ -29,6 +29,6 @@ public class ActivityRationale extends ActivityBase {
         // https://developer.android.com/training/permissions/explaining-access
 
         Helper.viewFAQ(this, 1);
-        finishAndRemoveTask();
+        finish();
     }
 }
diff --git a/app/src/main/java/eu/faircode/email/ActivitySearch.java b/app/src/main/java/eu/faircode/email/ActivitySearch.java
index 23a8f9ce24..c457877f77 100644
--- a/app/src/main/java/eu/faircode/email/ActivitySearch.java
+++ b/app/src/main/java/eu/faircode/email/ActivitySearch.java
@@ -50,6 +50,6 @@ public class ActivitySearch extends ActivityBase {
             view.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
         startActivity(view);
 
-        finishAndRemoveTask();
+        finish();
     }
 }
diff --git a/app/src/play/AndroidManifest.xml b/app/src/play/AndroidManifest.xml
index c5b275d1a6..3e56968b6a 100644
--- a/app/src/play/AndroidManifest.xml
+++ b/app/src/play/AndroidManifest.xml
@@ -129,6 +129,7 @@
 
         <activity
             android:name=".ActivityMain"
+            android:excludeFromRecents="true"
             android:exported="true"
             android:launchMode="singleInstance"
             android:theme="@style/Theme.AppCompat.Translucent">
@@ -219,6 +220,7 @@
         <activity
             android:name=".ActivitySearch"
             android:enabled="false"
+            android:excludeFromRecents="true"
             android:exported="true"
             android:icon="@mipmap/ic_launcher"
             android:label="@string/app_search"
@@ -244,6 +246,7 @@
         <activity
             android:name=".ActivityAnswer"
             android:enabled="false"
+            android:excludeFromRecents="true"
             android:exported="true"
             android:icon="@drawable/twotone_reply_24"
             android:label="@string/app_answer"
@@ -357,6 +360,7 @@
         <!-- https://developer.android.com/training/permissions/explaining-access -->
         <activity
             android:name=".ActivityRationale"
+            android:excludeFromRecents="true"
             android:exported="true"
             android:icon="@mipmap/ic_launcher"
             android:label="@string/app_name"