#697 - fix toast message is showing when navigating back to login (#766)

project-travel-mate · Oct 19, 2019 · e1d0de8 · e1d0de8
1 parent 7a6d2ce
commit e1d0de8
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/Android/app/src/main/java/io/github/project_travel_mate/login/LoginActivity.java b/Android/app/src/main/java/io/github/project_travel_mate/login/LoginActivity.java
@@ -177,7 +177,7 @@ public void onClick(View view) {
                 mForgotPasswordText.setVisibility(View.VISIBLE);
                 mBackToLogin.setVisibility(View.GONE);
                 login.setVisibility(View.GONE);
-                mLoginPresenter.login();
+                mLoginPresenter.login(false);
                 break;
             // Call login
             case R.id.ok_login:
@@ -237,7 +237,7 @@ public void onClick(View view) {
                 mForgotPasswordText.setVisibility(View.VISIBLE);
                 mBackToLogin.setVisibility(View.GONE);
                 login.setVisibility(View.GONE);
-                mLoginPresenter.login();
+                mLoginPresenter.login(false);
                 break;
                 // Call resend reset code request
             case R.id.resend_code:
@@ -327,8 +327,10 @@ public void openSignUp() {
     }
 
     @Override
-    public void openLogin() {
-        showMessage(getString(R.string.text_password_updated_alert));
+    public void openLogin(boolean showToastMessage) {
+        if (showToastMessage) {
+            showMessage(getString(R.string.text_password_updated_alert));
+        }
         mForgotPasswordLayout.setVisibility(View.GONE);
         mNewPasswordLayout.setVisibility(View.GONE);
         sig.setVisibility(View.GONE);

diff --git a/Android/app/src/main/java/io/github/project_travel_mate/login/LoginPresenter.java b/Android/app/src/main/java/io/github/project_travel_mate/login/LoginPresenter.java
@@ -94,7 +94,7 @@ public void onResponse(Call call, final Response response) throws IOException {
                         String successfulMessage = "\"Successfully registered\"";
                         if (responseCode == HttpsURLConnection.HTTP_CREATED && res.equals(successfulMessage)) {
                             //if successful redirect to login
-                            mView.openLogin();
+                            mView.openLogin(false);
                             mView.setLoginEmail(email);
                             mView.showMessage("signup succeeded! please login");
                         } else {
@@ -111,8 +111,8 @@ public void onResponse(Call call, final Response response) throws IOException {
         });
     }
 
-    public void login() {
-        mView.openLogin();
+    public void login(boolean showToastMessage) {
+        mView.openLogin(showToastMessage);
     }
 
     /**
@@ -282,7 +282,7 @@ public void onResponse(Call call, final Response response) throws IOException {
                     mView.dismissLoadingDialog();
                     if (response.isSuccessful()) {
                         //display the login UI to login with the new password
-                        mView.openLogin();
+                        mView.openLogin(true);
                     } else if (response.code() == 400) {
                         mView.showMessage("Wrong 4-digit code or wrong password format");
                     } else if (response.code() == 404) {

diff --git a/Android/app/src/main/java/io/github/project_travel_mate/login/LoginView.java b/Android/app/src/main/java/io/github/project_travel_mate/login/LoginView.java
@@ -24,7 +24,7 @@ interface LoginView {
 
     void openSignUp();
 
-    void openLogin();
+    void openLogin(boolean showToastMessage);
 
     void setLoginEmail(String email);