From 76b0b88d00cde44e2da9cbf6663b051e563637ec Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Thu, 27 Dec 2018 19:58:02 +0100
Subject: fix crash in ChangePasswordActivity

---
 src/main/java/de/pixart/messenger/ui/ChangePasswordActivity.java | 9 +++++----
 src/main/res/layout/activity_change_password.xml                 | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/main/java/de/pixart/messenger/ui/ChangePasswordActivity.java b/src/main/java/de/pixart/messenger/ui/ChangePasswordActivity.java
index ca4c01183..e2021e7ea 100644
--- a/src/main/java/de/pixart/messenger/ui/ChangePasswordActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/ChangePasswordActivity.java
@@ -12,6 +12,7 @@ import de.pixart.messenger.R;
 import de.pixart.messenger.entities.Account;
 import de.pixart.messenger.services.XmppConnectionService;
 import de.pixart.messenger.ui.widget.DisabledActionModeCallback;
+import de.pixart.messenger.ui.widget.TextInputEditText;
 
 public class ChangePasswordActivity extends XmppActivity implements XmppConnectionService.OnAccountPasswordChanged {
 
@@ -40,11 +41,11 @@ public class ChangePasswordActivity extends XmppActivity implements XmppConnecti
             }
         }
     };
-    private EditText mCurrentPassword;
-    private EditText mNewPassword;
-    private Account mAccount;
+    private TextInputEditText mCurrentPassword;
+    private TextInputEditText mNewPassword;
     private TextInputLayout mNewPasswordLayout;
-	private TextInputLayout mCurrentPasswordLayout;
+    private TextInputLayout mCurrentPasswordLayout;
+    private Account mAccount;
 
     @Override
     void onBackendConnected() {
diff --git a/src/main/res/layout/activity_change_password.xml b/src/main/res/layout/activity_change_password.xml
index 7f79bffc8..c16bc07be 100644
--- a/src/main/res/layout/activity_change_password.xml
+++ b/src/main/res/layout/activity_change_password.xml
@@ -39,7 +39,7 @@
                     app:passwordToggleEnabled="true"
                     app:passwordToggleTint="?android:textColorSecondary">
 
-                    <de.pixart.messenger.ui.widget.TextInputEditText.widget.TextInputEditText
+                    <de.pixart.messenger.ui.widget.TextInputEditText
                         android:id="@+id/current_password"
                         style="@style/Widget.Conversations.EditText"
                         android:layout_width="match_parent"
-- 
cgit v1.2.3