do not put setup activites on stack twice
This commit is contained in:
parent
4a98d330f0
commit
5335cda50c
|
@ -1215,6 +1215,7 @@ public class ConversationActivity extends XmppActivity
|
|||
startActivity(startConversationActivity);
|
||||
} else {
|
||||
switchToAccount(pendingAccount, true);
|
||||
return;
|
||||
}
|
||||
finish();
|
||||
}
|
||||
|
@ -1237,15 +1238,19 @@ public class ConversationActivity extends XmppActivity
|
|||
if (xmppConnectionService.getAccounts().size() == 0) {
|
||||
if (mRedirected.compareAndSet(false, true)) {
|
||||
if (Config.X509_VERIFICATION) {
|
||||
startActivity(new Intent(this, ManageAccountActivity.class));
|
||||
Intent redirectionIntent = new Intent(this, ManageAccountActivity.class);
|
||||
redirectionIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NO_ANIMATION);
|
||||
startActivity(redirectionIntent);
|
||||
} else if (Config.MAGIC_CREATE_DOMAIN != null) {
|
||||
startActivity(new Intent(this, WelcomeActivity.class));
|
||||
Intent redirectionIntent =new Intent(this, WelcomeActivity.class);
|
||||
redirectionIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NO_ANIMATION);
|
||||
startActivity(redirectionIntent);
|
||||
} else {
|
||||
Intent editAccount = new Intent(this, EditAccountActivity.class);
|
||||
editAccount.putExtra("init",true);
|
||||
editAccount.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NO_ANIMATION);
|
||||
startActivity(editAccount);
|
||||
}
|
||||
finish();
|
||||
}
|
||||
} else if (conversationList.size() <= 0) {
|
||||
if (mRedirected.compareAndSet(false, true)) {
|
||||
|
|
|
@ -522,6 +522,9 @@ public abstract class XmppActivity extends Activity {
|
|||
Intent intent = new Intent(this, EditAccountActivity.class);
|
||||
intent.putExtra("jid", account.getJid().toBareJid().toString());
|
||||
intent.putExtra("init", init);
|
||||
if (init) {
|
||||
intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NO_ANIMATION);
|
||||
}
|
||||
startActivity(intent);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue