aboutsummaryrefslogtreecommitdiffstats
path: root/src/eu/siacs
diff options
context:
space:
mode:
authorAlethea Butler <alethea@alethea.io>2014-05-31 12:53:23 -0400
committerAlethea Butler <alethea@alethea.io>2014-05-31 12:53:23 -0400
commitd67d792409d2f7ab990be2f698c8e00bf7e787b9 (patch)
tree7053339dc3ae98bf81f92488e6a6896406c3d118 /src/eu/siacs
parentb04fd2337ef1e37309f634f41b0d07f16f4e64ab (diff)
Made the navigateUp override behave like a navigate up
Diffstat (limited to 'src/eu/siacs')
-rw-r--r--src/eu/siacs/conversations/ui/ManageAccountActivity.java10
1 files changed, 9 insertions, 1 deletions
diff --git a/src/eu/siacs/conversations/ui/ManageAccountActivity.java b/src/eu/siacs/conversations/ui/ManageAccountActivity.java
index c61c1b82..8a26d907 100644
--- a/src/eu/siacs/conversations/ui/ManageAccountActivity.java
+++ b/src/eu/siacs/conversations/ui/ManageAccountActivity.java
@@ -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 {