diff options
author | iNPUTmice <daniel@gultsch.de> | 2015-02-22 13:24:29 +0100 |
---|---|---|
committer | iNPUTmice <daniel@gultsch.de> | 2015-02-22 13:24:29 +0100 |
commit | da2da75756f835d6ce299c8c08860317fe747a5d (patch) | |
tree | 916a565bfb23e749891205eec5e3d26857f9bde7 /src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java | |
parent | 7259e666ea5ee8ecc63e3657565c474684e8f4e8 (diff) |
init mode (first start) for StartConversationActivity (no up button) and avoid being started multiple times. fixed #995
Diffstat (limited to 'src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java')
-rw-r--r-- | src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java b/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java index ea45b75e6..12326136f 100644 --- a/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java @@ -221,6 +221,7 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate if (avatar != null) { intent = new Intent(getApplicationContext(), StartConversationActivity.class); + intent.putExtra("init",true); } else { intent = new Intent(getApplicationContext(), PublishProfilePictureActivity.class); @@ -379,6 +380,7 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate if (getActionBar() != null) { getActionBar().setDisplayHomeAsUpEnabled(false); getActionBar().setDisplayShowHomeEnabled(false); + getActionBar().setHomeButtonEnabled(false); } this.mCancelButton.setEnabled(false); this.mCancelButton.setTextColor(getSecondaryTextColor()); |