From 28ea64fd8eb923b95cc88b8ada67f81b0757e5bf Mon Sep 17 00:00:00 2001 From: Christian Schneppe Date: Fri, 23 Nov 2018 14:40:12 +0100 Subject: show 'show password' toggle for all magically created accounts --- .../java/de/pixart/messenger/ui/EditAccountActivity.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 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 113d0ed23..123f2ceb1 100644 --- a/src/main/java/de/pixart/messenger/ui/EditAccountActivity.java +++ b/src/main/java/de/pixart/messenger/ui/EditAccountActivity.java @@ -980,11 +980,13 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat this.binding.accountJid.setFocusable(editable); this.binding.accountJid.setFocusableInTouchMode(editable); - if (mAccount.isOptionSet(Account.OPTION_MAGIC_CREATE) || !mAccount.isOptionSet(Account.OPTION_LOGGED_IN_SUCCESSFULLY)) { - this.binding.accountPasswordLayout.setPasswordVisibilityToggleEnabled(true); - } else { - this.binding.accountPasswordLayout.setPasswordVisibilityToggleEnabled(false); - } + final boolean tooglePassword = mAccount.isOptionSet(Account.OPTION_MAGIC_CREATE) || !mAccount.isOptionSet(Account.OPTION_LOGGED_IN_SUCCESSFULLY); + final boolean editPassword = !mAccount.isOptionSet(Account.OPTION_MAGIC_CREATE) || (!mAccount.isOptionSet(Account.OPTION_LOGGED_IN_SUCCESSFULLY) && QuickConversationsService.isConversations()); + this.binding.accountPasswordLayout.setPasswordVisibilityToggleEnabled(tooglePassword); + this.binding.accountPassword.setFocusable(editPassword); + this.binding.accountPassword.setFocusableInTouchMode(editPassword); + this.binding.accountPassword.setCursorVisible(editPassword); + this.binding.accountPassword.setEnabled(editPassword); if (!mInitMode) { binding.avater.setVisibility(View.VISIBLE); -- cgit v1.2.3