show 'show password' toggle for all magically created accounts

4 files changed, 13 insertions, 7 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);
diff --git a/src/main/res/layout/activity_edit_account.xml b/src/main/res/layout/activity_edit_account.xml
index 0742955d3..73ae622be 100644
--- a/src/main/res/layout/activity_edit_account.xml
+++ b/src/main/res/layout/activity_edit_account.xml
@@ -78,7 +78,7 @@
                                     android:layout_height="wrap_content"
                                     android:imeOptions="actionNext"
                                     android:inputType="textEmailAddress"
-                                    android:textColor="?attr/text_Color_Main" />
+                                    android:textColor="?attr/edit_text_color" />
                             </android.support.design.widget.TextInputLayout>
 
                             <android.support.design.widget.TextInputLayout
@@ -97,7 +97,8 @@
                                     android:layout_width="match_parent"
                                     android:layout_height="wrap_content"
                                     android:hint="@string/password"
-                                    android:inputType="textPassword" />
+                                    android:inputType="textPassword"
+                                    android:textColor="?attr/edit_text_color" />
                             </android.support.design.widget.TextInputLayout>
 
                             <LinearLayout
diff --git a/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml
index c537fd248..8c824c7a6 100644
--- a/src/main/res/values/attrs.xml
+++ b/src/main/res/values/attrs.xml
@@ -20,6 +20,7 @@
     <attr name="color_background_tertiary" format="reference|color" />
     <attr name="color_background_secondary" format="reference|color" />
     <attr name="color_background_primary" format="reference|color" />
+    <attr name="edit_text_color" format="reference|color" />
     <attr name="color_warning" format="reference|color" />
     <attr name="EmojiColor" format="reference|color" />
 
diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml
index 342ed8aa1..c10f8bffd 100644
--- a/src/main/res/values/themes.xml
+++ b/src/main/res/values/themes.xml
@@ -16,6 +16,7 @@
         <item name="color_warning">@color/red700</item>
         <item name="TextColorOnline">@color/green500</item>
         <item name="TextColorError">@color/red800</item>
+        <item name="edit_text_color">@color/black87</item>
 
         <item name="activity_background_search">@drawable/search_background_light</item>
         <item name="activity_background_no_results">@drawable/no_results_background_light</item>
@@ -170,6 +171,7 @@
         <item name="color_warning">@color/red700</item>
         <item name="TextColorOnline">@color/green500</item>
         <item name="TextColorError">@color/red500</item>
+        <item name="edit_text_color">@color/white</item>
 
         <item name="activity_background_search">@drawable/search_background_dark</item>
         <item name="activity_background_no_results">@drawable/no_results_background_dark</item>