aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/de/pixart/messenger/ui/EditAccountActivity.java
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2018-11-23 14:40:12 +0100
committerChristian Schneppe <christian@pix-art.de>2018-11-23 14:40:12 +0100
commit28ea64fd8eb923b95cc88b8ada67f81b0757e5bf (patch)
tree0109b3eadfec5449fd7ab13fe4dec2c3c4f5ad7c /src/main/java/de/pixart/messenger/ui/EditAccountActivity.java
parent504715c215605552d5e7771550bc21cc35b1af5d (diff)
show 'show password' toggle for all magically created accounts
Diffstat (limited to 'src/main/java/de/pixart/messenger/ui/EditAccountActivity.java')
-rw-r--r--src/main/java/de/pixart/messenger/ui/EditAccountActivity.java12
1 files changed, 7 insertions, 5 deletions
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);