mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Simplified compose/share workaround

This commit is contained in:
M66B 2021-02-10 19:35:41 +01:00
parent ccd274fe9e
commit 38bfd63a9c
2 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/AndroidManifest.xml
View File

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

28
app/src/main/java/eu/faircode/email/ActivityCompose.java
View File

@ -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);