implement change password dialog

Author: anotherdev

app/src/main/java/com/anotherdev/sample/firebase/auth/ChangePasswordDialog.java

@@ -4,15 +4,25 @@
 import android.view.View;
 import android.widget.EditText;
 
+@SuppressWarnings("WeakerAccess")
 public class ChangePasswordDialog extends MultipleTextInputDialog {
 
+    public interface OnConfirmClickListener {
+        void onConfirmClick(String oldPassword, String newPassword);
+    }
+
     private EditText currentPasswordEditText;
     private EditText newPasswordEditText;
     private EditText verifyPasswordEditText;
 
+    private OnConfirmClickListener confirmClickListener;
+
 
     public ChangePasswordDialog(Context context) {
         super(context);
+        setTopTitle(R.string.change_password);
+        setTopTitleColor(context.getResources().getColor(android.R.color.white));
+        setIcon(R.drawable.ic_vpn_key_white_24dp);
     }
 
     @Override
@@ -40,8 +50,17 @@ public ChangePasswordDialog setConfirmButtonText(int confirmTextRes) {
         return this;
     }
 
+    public ChangePasswordDialog onConfirm(OnConfirmClickListener listener) {
+        confirmClickListener = listener;
+        return this;
+    }
+
     @Override
     protected void dispatchOnConfirmClick() {
-        // TODO implement this
+        String oldPassword = currentPasswordEditText.getText().toString();
+        String newPassword = newPasswordEditText.getText().toString();
+        if (confirmClickListener != null) {
+            confirmClickListener.onConfirmClick(oldPassword, newPassword);
+        }
     }
 }

app/src/main/java/com/anotherdev/sample/firebase/auth/EmailPasswordDialog.java

@@ -50,6 +50,11 @@ public EmailPasswordDialog setConfirmButtonText(int confirmTextRes) {
         return this;
     }
 
+    public EmailPasswordDialog onConfirm(OnConfirmClickListener listener) {
+        confirmClickListener = listener;
+        return this;
+    }
+
     @Override
     protected void dispatchOnConfirmClick() {
         String email = emailEditText.getText().toString();
@@ -58,9 +63,4 @@ protected void dispatchOnConfirmClick() {
             confirmClickListener.onConfirmClick(email, password);
         }
     }
-
-    public EmailPasswordDialog onConfirm(OnConfirmClickListener listener) {
-        confirmClickListener = listener;
-        return this;
-    }
 }

app/src/main/java/com/anotherdev/sample/firebase/auth/LoginActivity.java

@@ -154,6 +154,7 @@ private void startPasswordChange() {
         FirebaseUser user = firebaseAuth.getCurrentUser();
         if (user != null) {
             new ChangePasswordDialog(this)
+                    .onConfirm(this::changePassword)
                     .show();
         }
     }
@@ -163,16 +164,16 @@ private void changePassword(String oldPassword, String newPassword) {
         FirebaseUser user = auth.getCurrentUser();
 
         if (user != null && user.getEmail() != null) {
-            EmailAuthCredential email = EmailAuthProvider.getCredential(user.getEmail(), oldPassword);
-            onDestroy.add(user.reauthenticate(email)
-                    .flatMapCompletable(response -> {
-                        FirebaseUser reAuthUser = auth.getCurrentUser();
-                        return reAuthUser.updatePassword(newPassword);
-                    })
+            EmailAuthCredential oldCredential = EmailAuthProvider.getCredential(user.getEmail(), oldPassword);
+            //noinspection ResultOfMethodCallIgnored
+            user.reauthenticate(oldCredential)
+                    .flatMapCompletable(response -> auth.getCurrentUser()
+                            .updatePassword(newPassword))
+                    .doOnSubscribe(onDestroy::add)
                     .observeOn(AndroidSchedulers.mainThread())
-                    .doOnComplete(() -> dialog("", "Password changed"))
+                    .doOnComplete(() -> dialog(getString(R.string.change_password), "Password changed"))
                     .doOnError(this::dialog)
-                    .subscribe(Functions.EMPTY_ACTION, RxUtil.ON_ERROR_LOG_V3));
+                    .subscribe(Functions.EMPTY_ACTION, RxUtil.ON_ERROR_LOG_V3);
         }
     }