|
|
@ -60,12 +60,7 @@ public class ActivityCompose extends ActivityBase implements FragmentManager.OnB
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|
public void onBackStackChanged() {
|
|
|
|
public void onBackStackChanged() {
|
|
|
|
if (getSupportFragmentManager().getBackStackEntryCount() == 0) {
|
|
|
|
if (getSupportFragmentManager().getBackStackEntryCount() == 0) {
|
|
|
|
Intent intent = getIntent();
|
|
|
|
if (!isShared(getIntent().getAction())) {
|
|
|
|
if (intent != null && isShared(intent.getAction())) {
|
|
|
|
|
|
|
|
finishAffinity();
|
|
|
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Intent parent = getParentActivityIntent();
|
|
|
|
Intent parent = getParentActivityIntent();
|
|
|
|
if (parent != null)
|
|
|
|
if (parent != null)
|
|
|
|
if (shouldUpRecreateTask(parent))
|
|
|
|
if (shouldUpRecreateTask(parent))
|
|
|
@ -76,6 +71,7 @@ public class ActivityCompose extends ActivityBase implements FragmentManager.OnB
|
|
|
|
parent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
|
|
|
|
parent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
|
|
|
|
startActivity(parent);
|
|
|
|
startActivity(parent);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
finishAndRemoveTask();
|
|
|
|
finishAndRemoveTask();
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -85,8 +81,6 @@ public class ActivityCompose extends ActivityBase implements FragmentManager.OnB
|
|
|
|
Bundle args;
|
|
|
|
Bundle args;
|
|
|
|
String action = intent.getAction();
|
|
|
|
String action = intent.getAction();
|
|
|
|
if (isShared(action)) {
|
|
|
|
if (isShared(action)) {
|
|
|
|
Helper.excludeFromRecents(this);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
args = new Bundle();
|
|
|
|
args = new Bundle();
|
|
|
|
args.putString("action", "new");
|
|
|
|
args.putString("action", "new");
|
|
|
|
args.putLong("account", -1);
|
|
|
|
args.putLong("account", -1);
|
|
|
|