From 5a7365b3ecd0194323f887fd1f38d4111dafe975 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Thu, 25 Aug 2022 07:28:06 +0200
Subject: [PATCH] Changed setup affinity

---
 app/src/amazon/AndroidManifest.xml                        | 6 ++++--
 app/src/fdroid/AndroidManifest.xml                        | 6 ++++--
 app/src/github/AndroidManifest.xml                        | 6 ++++--
 app/src/main/AndroidManifest.xml                          | 6 ++++--
 app/src/main/java/eu/faircode/email/ActivityView.java     | 8 ++++----
 app/src/main/java/eu/faircode/email/AdapterFolder.java    | 2 +-
 app/src/main/java/eu/faircode/email/AdapterMessage.java   | 2 +-
 app/src/main/java/eu/faircode/email/FragmentAccounts.java | 2 +-
 .../java/eu/faircode/email/FragmentDialogForwardRaw.java  | 2 +-
 .../java/eu/faircode/email/FragmentDialogOpenLink.java    | 2 +-
 .../main/java/eu/faircode/email/FragmentDialogTheme.java  | 2 +-
 app/src/main/java/eu/faircode/email/FragmentFolders.java  | 2 +-
 app/src/main/java/eu/faircode/email/FragmentMessages.java | 8 ++++----
 app/src/play/AndroidManifest.xml                          | 6 ++++--
 14 files changed, 35 insertions(+), 25 deletions(-)

diff --git a/app/src/amazon/AndroidManifest.xml b/app/src/amazon/AndroidManifest.xml
index 1b7e0cc5e7..c169ee3cf9 100644
--- a/app/src/amazon/AndroidManifest.xml
+++ b/app/src/amazon/AndroidManifest.xml
@@ -190,13 +190,15 @@
             android:name=".ActivitySetup"
             android:exported="false"
             android:launchMode="singleTask"
-            android:parentActivityName=".ActivityMain" />
+            android:parentActivityName=".ActivityMain"
+            android:taskAffinity="${applicationId}.SETUP" />
 
         <activity
             android:name=".ActivitySignature"
             android:exported="false"
             android:launchMode="singleTask"
-            android:parentActivityName=".ActivitySetup" />
+            android:parentActivityName=".ActivitySetup"
+            android:taskAffinity="${applicationId}.SETUP" />
 
         <activity
             android:name=".ActivityWidget"
diff --git a/app/src/fdroid/AndroidManifest.xml b/app/src/fdroid/AndroidManifest.xml
index 00245967de..b2ca766df3 100644
--- a/app/src/fdroid/AndroidManifest.xml
+++ b/app/src/fdroid/AndroidManifest.xml
@@ -194,13 +194,15 @@
             android:name=".ActivitySetup"
             android:exported="false"
             android:launchMode="singleTask"
-            android:parentActivityName=".ActivityMain" />
+            android:parentActivityName=".ActivityMain"
+            android:taskAffinity="${applicationId}.SETUP" />
 
         <activity
             android:name=".ActivitySignature"
             android:exported="false"
             android:launchMode="singleTask"
-            android:parentActivityName=".ActivitySetup" />
+            android:parentActivityName=".ActivitySetup"
+            android:taskAffinity="${applicationId}.SETUP" />
 
         <activity
             android:name=".ActivityWidget"
diff --git a/app/src/github/AndroidManifest.xml b/app/src/github/AndroidManifest.xml
index 5cbe78b1f8..5b0f45a71d 100644
--- a/app/src/github/AndroidManifest.xml
+++ b/app/src/github/AndroidManifest.xml
@@ -194,13 +194,15 @@
             android:name=".ActivitySetup"
             android:exported="false"
             android:launchMode="singleTask"
-            android:parentActivityName=".ActivityMain" />
+            android:parentActivityName=".ActivityMain"
+            android:taskAffinity="${applicationId}.SETUP" />
 
         <activity
             android:name=".ActivitySignature"
             android:exported="false"
             android:launchMode="singleTask"
-            android:parentActivityName=".ActivitySetup" />
+            android:parentActivityName=".ActivitySetup"
+            android:taskAffinity="${applicationId}.SETUP" />
 
         <activity
             android:name=".ActivityWidget"
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 8782021680..99382a8635 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -189,13 +189,15 @@
             android:name=".ActivitySetup"
             android:exported="false"
             android:launchMode="singleTask"
-            android:parentActivityName=".ActivityMain" />
+            android:parentActivityName=".ActivityMain"
+            android:taskAffinity="${applicationId}.SETUP" />
 
         <activity
             android:name=".ActivitySignature"
             android:exported="false"
             android:launchMode="singleTask"
-            android:parentActivityName=".ActivitySetup" />
+            android:parentActivityName=".ActivitySetup"
+            android:taskAffinity="${applicationId}.SETUP" />
 
         <activity
             android:name=".ActivityWidget"
diff --git a/app/src/main/java/eu/faircode/email/ActivityView.java b/app/src/main/java/eu/faircode/email/ActivityView.java
index fb6f068f20..96278532f2 100644
--- a/app/src/main/java/eu/faircode/email/ActivityView.java
+++ b/app/src/main/java/eu/faircode/email/ActivityView.java
@@ -441,7 +441,7 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
                     public boolean onMenuItemClick(MenuItem item) {
                         String tab = FragmentOptions.TAB_LABELS.get(item.getOrder());
                         startActivity(new Intent(ActivityView.this, ActivitySetup.class)
-                                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK)
                                 .putExtra("tab", tab));
                         return true;
                     }
@@ -455,7 +455,7 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
             @Override
             public boolean onLongClick(View view) {
                 startActivity(new Intent(ActivityView.this, ActivitySetup.class)
-                        .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
+                        .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK));
                 return true;
             }
         });
@@ -1635,7 +1635,7 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
 
                 Intent manage = new Intent(ActivityView.this, ActivitySetup.class)
                         .setAction("misc")
-                        .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                        .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK)
                         .putExtra("tab", "misc");
                 PendingIntent piManage = PendingIntentCompat.getActivity(
                         ActivityView.this, ActivitySetup.PI_MISC, manage, PendingIntent.FLAG_UPDATE_CURRENT);
@@ -1929,7 +1929,7 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
 
     private void onMenuSetup() {
         startActivity(new Intent(ActivityView.this, ActivitySetup.class)
-                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
+                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK));
     }
 
     private void onMenuLegend() {
diff --git a/app/src/main/java/eu/faircode/email/AdapterFolder.java b/app/src/main/java/eu/faircode/email/AdapterFolder.java
index dd233f59c1..95f9ab21da 100644
--- a/app/src/main/java/eu/faircode/email/AdapterFolder.java
+++ b/app/src/main/java/eu/faircode/email/AdapterFolder.java
@@ -839,7 +839,7 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
                                     @Override
                                     public void onClick(View v) {
                                         v.getContext().startActivity(new Intent(v.getContext(), ActivitySetup.class)
-                                                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                                                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK)
                                                 .putExtra("tab", "connection"));
                                     }
                                 });
diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 99be67fc4c..7c0128a77e 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -5108,7 +5108,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                         @Override
                         public void onClick(DialogInterface dialog, int which) {
                             context.startActivity(new Intent(context, ActivitySetup.class)
-                                    .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                                    .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK)
                                     .putExtra("tab", "privacy"));
                         }
                     })
diff --git a/app/src/main/java/eu/faircode/email/FragmentAccounts.java b/app/src/main/java/eu/faircode/email/FragmentAccounts.java
index 0e97f7bb92..36faf3f034 100644
--- a/app/src/main/java/eu/faircode/email/FragmentAccounts.java
+++ b/app/src/main/java/eu/faircode/email/FragmentAccounts.java
@@ -516,7 +516,7 @@ public class FragmentAccounts extends FragmentBase {
                         @Override
                         public void onClick(View v) {
                             v.getContext().startActivity(new Intent(v.getContext(), ActivitySetup.class)
-                                    .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                                    .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK)
                                     .putExtra("tab", "connection"));
                         }
                     });
diff --git a/app/src/main/java/eu/faircode/email/FragmentDialogForwardRaw.java b/app/src/main/java/eu/faircode/email/FragmentDialogForwardRaw.java
index 1583aaa57f..0d97d4a233 100644
--- a/app/src/main/java/eu/faircode/email/FragmentDialogForwardRaw.java
+++ b/app/src/main/java/eu/faircode/email/FragmentDialogForwardRaw.java
@@ -87,7 +87,7 @@ public class FragmentDialogForwardRaw extends FragmentDialogBase {
             @Override
             public void onClick(View v) {
                 v.getContext().startActivity(new Intent(v.getContext(), ActivitySetup.class)
-                        .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                        .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK)
                         .putExtra("tab", "connection"));
             }
         });
diff --git a/app/src/main/java/eu/faircode/email/FragmentDialogOpenLink.java b/app/src/main/java/eu/faircode/email/FragmentDialogOpenLink.java
index 9ca1c812f8..1058b7559e 100644
--- a/app/src/main/java/eu/faircode/email/FragmentDialogOpenLink.java
+++ b/app/src/main/java/eu/faircode/email/FragmentDialogOpenLink.java
@@ -418,7 +418,7 @@ public class FragmentDialogOpenLink extends FragmentDialogBase {
             @Override
             public void onClick(View v) {
                 v.getContext().startActivity(new Intent(v.getContext(), ActivitySetup.class)
-                        .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                        .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK)
                         .putExtra("tab", "privacy"));
             }
         });
diff --git a/app/src/main/java/eu/faircode/email/FragmentDialogTheme.java b/app/src/main/java/eu/faircode/email/FragmentDialogTheme.java
index 93908a815b..52414b1d3a 100644
--- a/app/src/main/java/eu/faircode/email/FragmentDialogTheme.java
+++ b/app/src/main/java/eu/faircode/email/FragmentDialogTheme.java
@@ -242,7 +242,7 @@ public class FragmentDialogTheme extends FragmentDialogBase {
             public void onClick(View v) {
                 dismiss();
                 v.getContext().startActivity(new Intent(v.getContext(), ActivitySetup.class)
-                        .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                        .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK)
                         .putExtra("tab", "display"));
             }
         });
diff --git a/app/src/main/java/eu/faircode/email/FragmentFolders.java b/app/src/main/java/eu/faircode/email/FragmentFolders.java
index 13e6003262..b2e2a8f272 100644
--- a/app/src/main/java/eu/faircode/email/FragmentFolders.java
+++ b/app/src/main/java/eu/faircode/email/FragmentFolders.java
@@ -583,7 +583,7 @@ public class FragmentFolders extends FragmentBase {
                         @Override
                         public void onClick(View v) {
                             v.getContext().startActivity(new Intent(v.getContext(), ActivitySetup.class)
-                                    .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                                    .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK)
                                     .putExtra("tab", "connection"));
                         }
                     });
diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index a305008332..5c3c826f08 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -633,7 +633,7 @@ public class FragmentMessages extends FragmentBase
             @Override
             public void onClick(View v) {
                 Intent intent = new Intent(v.getContext(), ActivitySetup.class)
-                        .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                        .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
                 v.getContext().startActivity(intent);
             }
         });
@@ -2109,7 +2109,7 @@ public class FragmentMessages extends FragmentBase
                         @Override
                         public void onClick(View v) {
                             v.getContext().startActivity(new Intent(v.getContext(), ActivitySetup.class)
-                                    .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                                    .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK)
                                     .putExtra("tab", "connection"));
                         }
                     });
@@ -4748,7 +4748,7 @@ public class FragmentMessages extends FragmentBase
             @Override
             public void onClick(View v) {
                 v.getContext().startActivity(new Intent(v.getContext(), ActivitySetup.class)
-                        .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
+                        .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK));
             }
         });
         snackbar.show();
@@ -6248,7 +6248,7 @@ public class FragmentMessages extends FragmentBase
                         @Override
                         public void onClick(View v) {
                             v.getContext().startActivity(new Intent(v.getContext(), ActivitySetup.class)
-                                    .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                                    .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK)
                                     .putExtra("tab", "connection"));
                         }
                     });
diff --git a/app/src/play/AndroidManifest.xml b/app/src/play/AndroidManifest.xml
index 17aafc23d7..2945dada05 100644
--- a/app/src/play/AndroidManifest.xml
+++ b/app/src/play/AndroidManifest.xml
@@ -190,13 +190,15 @@
             android:name=".ActivitySetup"
             android:exported="false"
             android:launchMode="singleTask"
-            android:parentActivityName=".ActivityMain" />
+            android:parentActivityName=".ActivityMain"
+            android:taskAffinity="${applicationId}.SETUP" />
 
         <activity
             android:name=".ActivitySignature"
             android:exported="false"
             android:launchMode="singleTask"
-            android:parentActivityName=".ActivitySetup" />
+            android:parentActivityName=".ActivitySetup"
+            android:taskAffinity="${applicationId}.SETUP" />
 
         <activity
             android:name=".ActivityWidget"