From af3893cdc9ec4df20b9792be108b821cc0d892f1 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 15 Apr 2021 16:19:24 +0200
Subject: [PATCH] Bugfix

---
 .../main/java/im/vector/app/features/login2/LoginActivity2.kt   | 2 ++
 .../vector/app/features/login2/LoginFragment2SigninPassword.kt  | 2 +-
 .../vector/app/features/login2/LoginResetPasswordFragment2.kt   | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/login2/LoginActivity2.kt b/vector/src/main/java/im/vector/app/features/login2/LoginActivity2.kt
index deb489a34f..b7e726b9e8 100644
--- a/vector/src/main/java/im/vector/app/features/login2/LoginActivity2.kt
+++ b/vector/src/main/java/im/vector/app/features/login2/LoginActivity2.kt
@@ -217,6 +217,7 @@ open class LoginActivity2 : VectorBaseActivity<ActivityLoginBinding>(), ToolbarC
             is LoginViewEvents2.OpenPasswordScreen                         -> {
                 addFragmentToBackstack(R.id.loginFragmentContainer,
                         LoginFragment2SigninPassword::class.java,
+                        tag = FRAGMENT_LOGIN_TAG,
                         option = commonOption)
             }
             is LoginViewEvents2.OpenSignupPasswordScreen                   -> {
@@ -234,6 +235,7 @@ open class LoginActivity2 : VectorBaseActivity<ActivityLoginBinding>(), ToolbarC
             is LoginViewEvents2.OpenSignInWithAnythingScreen               -> {
                 addFragmentToBackstack(R.id.loginFragmentContainer,
                         LoginFragmentToAny2::class.java,
+                        tag = FRAGMENT_LOGIN_TAG,
                         option = commonOption)
             }
             is LoginViewEvents2.OnSendMsisdnSuccess                        ->
diff --git a/vector/src/main/java/im/vector/app/features/login2/LoginFragment2SigninPassword.kt b/vector/src/main/java/im/vector/app/features/login2/LoginFragment2SigninPassword.kt
index 76657db891..6428a15691 100644
--- a/vector/src/main/java/im/vector/app/features/login2/LoginFragment2SigninPassword.kt
+++ b/vector/src/main/java/im/vector/app/features/login2/LoginFragment2SigninPassword.kt
@@ -154,7 +154,7 @@ class LoginFragment2SigninPassword @Inject constructor(
     }
 
     override fun resetViewModel() {
-        loginViewModel.handle(LoginAction2.ResetSignin)
+        // loginViewModel.handle(LoginAction2.ResetSignin)
     }
 
     override fun onError(throwable: Throwable) {
diff --git a/vector/src/main/java/im/vector/app/features/login2/LoginResetPasswordFragment2.kt b/vector/src/main/java/im/vector/app/features/login2/LoginResetPasswordFragment2.kt
index 3a35e0dc91..2ced9b5d20 100644
--- a/vector/src/main/java/im/vector/app/features/login2/LoginResetPasswordFragment2.kt
+++ b/vector/src/main/java/im/vector/app/features/login2/LoginResetPasswordFragment2.kt
@@ -105,12 +105,12 @@ class LoginResetPasswordFragment2 @Inject constructor() : AbstractLoginFragment2
         }
 
         if (showWarning) {
-            showWarning = false
             // Display a warning as Riot-Web does first
             AlertDialog.Builder(requireActivity())
                     .setTitle(R.string.login_reset_password_warning_title)
                     .setMessage(R.string.login_reset_password_warning_content)
                     .setPositiveButton(R.string.login_reset_password_warning_submit) { _, _ ->
+                        showWarning = false
                         doSubmit()
                     }
                     .setNegativeButton(R.string.cancel, null)