Simplified compose/share workaround

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" />

app/src/main/java/eu/faircode/email/ActivityCompose.java

@@ -60,12 +60,7 @@ public class ActivityCompose extends ActivityBase implements FragmentManager.OnB
     @Override
     public void onBackStackChanged() {
         if (getSupportFragmentManager().getBackStackEntryCount() == 0) {
-            Intent intent = getIntent();
+            if (!isShared(getIntent().getAction())) {
-            if (intent != null && isShared(intent.getAction())) {
-                finishAffinity();
-                return;
-            }
-
                 Intent parent = getParentActivityIntent();
                 if (parent != null)
                     if (shouldUpRecreateTask(parent))
@@ -76,6 +71,7 @@ public class ActivityCompose extends ActivityBase implements FragmentManager.OnB
                         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);