From 5cd09d7cc41ee46ab53dd2b46c7b2cbd47b78d6e Mon Sep 17 00:00:00 2001 From: Christian Schneppe Date: Thu, 15 Nov 2018 21:15:20 +0100 Subject: do not show up navigation when opening edit account from notification --- .../de/pixart/messenger/ui/EditAccountActivity.java | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) (limited to 'src/main/java/de/pixart/messenger/ui/EditAccountActivity.java') diff --git a/src/main/java/de/pixart/messenger/ui/EditAccountActivity.java b/src/main/java/de/pixart/messenger/ui/EditAccountActivity.java index 426627510..5daaafacd 100644 --- a/src/main/java/de/pixart/messenger/ui/EditAccountActivity.java +++ b/src/main/java/de/pixart/messenger/ui/EditAccountActivity.java @@ -81,6 +81,8 @@ import rocks.xmpp.addr.Jid; public class EditAccountActivity extends OmemoActivity implements OnAccountUpdate, OnUpdateBlocklist, OnKeyStatusUpdated, OnCaptchaRequested, KeyChainAliasCallback, XmppConnectionService.OnShowErrorToast, XmppConnectionService.OnMamPreferencesFetched { + public static final String EXTRA_OPENED_FROM_NOTIFICATION = "opened_from_notification"; + private static final int REQUEST_DATA_SAVER = 0xf244; private static final int REQUEST_CHANGE_STATUS = 0xee11; @@ -673,23 +675,17 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat } } boolean init = intent.getBooleanExtra("init", false); + boolean openedFromNotification = intent.getBooleanExtra(EXTRA_OPENED_FROM_NOTIFICATION, false); this.mInitMode = init || this.jidToEdit == null; this.messageFingerprint = intent.getStringExtra("fingerprint"); if (!mInitMode) { this.binding.accountRegisterNew.setVisibility(View.GONE); - if (getSupportActionBar() != null) { - getSupportActionBar().setTitle(getString(R.string.account_details)); - } + setTitle(getString(R.string.account_details)); + configureActionBar(getSupportActionBar(), !openedFromNotification); } else { - binding.avater.setVisibility(View.GONE); - ActionBar ab = getSupportActionBar(); - if (ab != null) { - if (init && Config.MAGIC_CREATE_DOMAIN == null) { - ab.setDisplayShowHomeEnabled(false); - ab.setDisplayHomeAsUpEnabled(false); - } - ab.setTitle(R.string.action_add_account); - } + this.binding.avater.setVisibility(View.GONE); + configureActionBar(getSupportActionBar(), !(init && Config.MAGIC_CREATE_DOMAIN == null)); + setTitle(R.string.action_add_account); } } SharedPreferences preferences = getPreferences(); -- cgit v1.2.3