From 38bfd63a9cade67befc268ac2802b1b77f551c19 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Wed, 10 Feb 2021 19:35:41 +0100
Subject: [PATCH] Simplified compose/share workaround

---
 app/src/main/AndroidManifest.xml              |  1 -
 .../eu/faircode/email/ActivityCompose.java    | 28 ++++++++-----------
 2 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index e9c82bf9e3..1e42c94b56 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -211,7 +211,6 @@
             android:name=".ActivityCompose"
             android:exported="true"
             android:launchMode="singleTask"
-            android:taskAffinity="eu.faircode.email.compose"
             android:parentActivityName=".ActivityView">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
diff --git a/app/src/main/java/eu/faircode/email/ActivityCompose.java b/app/src/main/java/eu/faircode/email/ActivityCompose.java
index 155ed96ea3..c022685d36 100644
--- a/app/src/main/java/eu/faircode/email/ActivityCompose.java
+++ b/app/src/main/java/eu/faircode/email/ActivityCompose.java
@@ -60,23 +60,19 @@ public class ActivityCompose extends ActivityBase implements FragmentManager.OnB
     @Override
     public void onBackStackChanged() {
         if (getSupportFragmentManager().getBackStackEntryCount() == 0) {
-            Intent intent = getIntent();
-            if (intent != null && isShared(intent.getAction())) {
-                finishAffinity();
-                return;
+            if (!isShared(getIntent().getAction())) {
+                Intent parent = getParentActivityIntent();
+                if (parent != null)
+                    if (shouldUpRecreateTask(parent))
+                        TaskStackBuilder.create(this)
+                                .addNextIntentWithParentStack(parent)
+                                .startActivities();
+                    else {
+                        parent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+                        startActivity(parent);
+                    }
             }
 
-            Intent parent = getParentActivityIntent();
-            if (parent != null)
-                if (shouldUpRecreateTask(parent))
-                    TaskStackBuilder.create(this)
-                            .addNextIntentWithParentStack(parent)
-                            .startActivities();
-                else {
-                    parent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
-                    startActivity(parent);
-                }
-
             finishAndRemoveTask();
         }
     }
@@ -85,8 +81,6 @@ public class ActivityCompose extends ActivityBase implements FragmentManager.OnB
         Bundle args;
         String action = intent.getAction();
         if (isShared(action)) {
-            Helper.excludeFromRecents(this);
-
             args = new Bundle();
             args.putString("action", "new");
             args.putLong("account", -1);