mirror of https://github.com/M66B/FairEmail.git
Finished affinity
This commit is contained in:
parent
e330f73eb3
commit
55b29bced6
|
@ -76,6 +76,7 @@ public class ActivityCompose extends ActivityBase implements FragmentManager.OnB
|
||||||
Intent intent = getIntent();
|
Intent intent = getIntent();
|
||||||
|
|
||||||
String action = intent.getAction();
|
String action = intent.getAction();
|
||||||
|
boolean shared = isShared(action);
|
||||||
boolean widget = (action != null && action.startsWith("widget:"));
|
boolean widget = (action != null && action.startsWith("widget:"));
|
||||||
|
|
||||||
String[] tos = intent.getStringArrayExtra(Intent.EXTRA_EMAIL);
|
String[] tos = intent.getStringArrayExtra(Intent.EXTRA_EMAIL);
|
||||||
|
@ -87,7 +88,7 @@ public class ActivityCompose extends ActivityBase implements FragmentManager.OnB
|
||||||
.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK)
|
.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK)
|
||||||
.putExtra("tab", "backup");
|
.putExtra("tab", "backup");
|
||||||
startActivity(setup);
|
startActivity(setup);
|
||||||
} else if (!isShared(action) && !widget) {
|
} else if (!shared && !widget) {
|
||||||
Intent parent = getParentActivityIntent();
|
Intent parent = getParentActivityIntent();
|
||||||
if (parent != null)
|
if (parent != null)
|
||||||
if (shouldUpRecreateTask(parent))
|
if (shouldUpRecreateTask(parent))
|
||||||
|
@ -103,7 +104,16 @@ public class ActivityCompose extends ActivityBase implements FragmentManager.OnB
|
||||||
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
|
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
|
||||||
prefs.edit().remove("last_composing").apply();
|
prefs.edit().remove("last_composing").apply();
|
||||||
|
|
||||||
finishAndRemoveTask();
|
try {
|
||||||
|
if (shared || widget) {
|
||||||
|
Helper.excludeFromRecents(this);
|
||||||
|
finishAffinity();
|
||||||
|
} else
|
||||||
|
finishAndRemoveTask();
|
||||||
|
} catch (Throwable ex) {
|
||||||
|
Log.e(ex);
|
||||||
|
finish();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue