1 files changed, 29 insertions, 12 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/ChangePasswordActivity.java b/src/main/java/de/pixart/messenger/ui/ChangePasswordActivity.java
index b73393b0c..f6bec9838 100644
--- a/src/main/java/de/pixart/messenger/ui/ChangePasswordActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/ChangePasswordActivity.java
@@ -2,6 +2,7 @@ package de.pixart.messenger.ui;
 
 import android.content.Intent;
 import android.os.Bundle;
+import android.support.design.widget.TextInputLayout;
 import android.view.View;
 import android.widget.Button;
 import android.widget.EditText;
@@ -10,6 +11,7 @@ import android.widget.Toast;
 import de.pixart.messenger.R;
 import de.pixart.messenger.entities.Account;
 import de.pixart.messenger.services.XmppConnectionService;
+import de.pixart.messenger.ui.widget.DisabledActionModeCallback;
 
 public class ChangePasswordActivity extends XmppActivity implements XmppConnectionService.OnAccountPasswordChanged {
 
@@ -22,13 +24,15 @@ public class ChangePasswordActivity extends XmppActivity implements XmppConnecti
                 final String newPassword = mNewPassword.getText().toString();
                 if (!mAccount.isOptionSet(Account.OPTION_MAGIC_CREATE) && !currentPassword.equals(mAccount.getPassword())) {
                     mCurrentPassword.requestFocus();
-                    mCurrentPassword.setError(getString(R.string.account_status_unauthorized));
+                    mCurrentPasswordLayout.setError(getString(R.string.account_status_unauthorized));
+                    removeErrorsOnAllBut(mCurrentPasswordLayout);
                 } else if (newPassword.trim().isEmpty()) {
                     mNewPassword.requestFocus();
-                    mNewPassword.setError(getString(R.string.password_should_not_be_empty));
+                    mNewPasswordLayout.setError(getString(R.string.password_should_not_be_empty));
+                    removeErrorsOnAllBut(mNewPasswordLayout);
                 } else {
-                    mCurrentPassword.setError(null);
-                    mNewPassword.setError(null);
+                    mCurrentPasswordLayout.setError(null);
+                    mNewPasswordLayout.setError(null);
                     xmppConnectionService.updateAccountPasswordOnServer(mAccount, newPassword, ChangePasswordActivity.this);
                     mChangePasswordButton.setEnabled(false);
                     mChangePasswordButton.setTextColor(getSecondaryTextColor());
@@ -40,6 +44,8 @@ public class ChangePasswordActivity extends XmppActivity implements XmppConnecti
     private EditText mCurrentPassword;
     private EditText mNewPassword;
     private Account mAccount;
+    private TextInputLayout mNewPasswordLayout;
+	private TextInputLayout mCurrentPasswordLayout;
 
     @Override
     void onBackendConnected() {
@@ -65,7 +71,9 @@ public class ChangePasswordActivity extends XmppActivity implements XmppConnecti
         this.mChangePasswordButton = findViewById(R.id.right_button);
         this.mChangePasswordButton.setOnClickListener(this.mOnChangePasswordButtonClicked);
         this.mCurrentPassword = findViewById(R.id.current_password);
+        this.mCurrentPassword.setCustomSelectionActionModeCallback(new DisabledActionModeCallback());
         this.mNewPassword = findViewById(R.id.new_password);
+        this.mNewPassword.setCustomSelectionActionModeCallback(new DisabledActionModeCallback());
     }
 
     @Override
@@ -92,18 +100,27 @@ public class ChangePasswordActivity extends XmppActivity implements XmppConnecti
 
     @Override
     public void onPasswordChangeFailed() {
-        runOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                mNewPassword.setError(getString(R.string.could_not_change_password));
-                mChangePasswordButton.setEnabled(true);
-                mChangePasswordButton.setTextColor(getPrimaryTextColor());
-                mChangePasswordButton.setText(R.string.change_password);
-            }
+        runOnUiThread(() -> {
+            mNewPasswordLayout.setError(getString(R.string.could_not_change_password));
+            mChangePasswordButton.setEnabled(true);
+            mChangePasswordButton.setTextColor(getPrimaryTextColor());
+            mChangePasswordButton.setText(R.string.change_password);
         });
 
     }
 
+    private void removeErrorsOnAllBut(TextInputLayout exception) {
+        if (this.mCurrentPasswordLayout != exception) {
+            this.mCurrentPasswordLayout.setErrorEnabled(false);
+            this.mCurrentPasswordLayout.setError(null);
+        }
+        if (this.mNewPasswordLayout != exception) {
+            this.mNewPasswordLayout.setErrorEnabled(false);
+            this.mNewPasswordLayout.setError(null);
+        }
+
+    }
+
     public void refreshUiReal() {
 
     }