narayana/conversations-classic
3
2
Fork 0
Code Issues 3 Pull requests 2 Actions Packages Projects Releases 4 Wiki Activity

Made the navigateUp override behave like a navigate up

Browse source
This commit is contained in:
Alethea Butler 2014-05-31 12:53:23 -04:00
parent b04fd2337e
commit d67d792409
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/eu/siacs/conversations/ui/ManageAccountActivity.java
View file

@ -407,7 +407,15 @@ public class ManageAccountActivity extends XmppActivity {
@Override
public boolean onNavigateUp() {
if (xmppConnectionService.getConversations().size() == 0) {
startActivity(new Intent(this, ContactsActivity.class));
Intent contactsIntent = new Intent(this, ContactsActivity.class);
contactsIntent.setFlags(
// if activity exists in stack, pop the stack and go back to it
Intent.FLAG_ACTIVITY_CLEAR_TOP |
// otherwise, make a new task for it
Intent.FLAG_ACTIVITY_NEW_TASK |
// don't use the new activity animation; finish animation runs instead
Intent.FLAG_ACTIVITY_NO_ANIMATION);
startActivity(contactsIntent);
finish();
return true;
} else {