From 2255bd9a566accae08c0cd79e6105e270c7e0299 Mon Sep 17 00:00:00 2001
From: ShridharGoel <35566748+ShridharGoel@users.noreply.github.com>
Date: Thu, 24 May 2018 18:57:13 +0530
Subject: [PATCH] Fix for issue #1508  (#1512)

* Made changes to the error message when user enters wrong login credentials.

* Used a single string for the error message when user enters wrong login credentials.
---
 app/src/main/java/fr/free/nrw/commons/auth/LoginActivity.java | 4 ++--
 app/src/main/res/values/strings.xml                           | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/fr/free/nrw/commons/auth/LoginActivity.java b/app/src/main/java/fr/free/nrw/commons/auth/LoginActivity.java
index d0fb628e3..b19d70a4e 100644
--- a/app/src/main/java/fr/free/nrw/commons/auth/LoginActivity.java
+++ b/app/src/main/java/fr/free/nrw/commons/auth/LoginActivity.java
@@ -271,11 +271,11 @@ public class LoginActivity extends AccountAuthenticatorActivity {
             showMessageAndCancelDialog(R.string.login_failed_network);
         } else if (result.toLowerCase(Locale.getDefault()).contains("nosuchuser".toLowerCase()) || result.toLowerCase().contains("noname".toLowerCase())) {
             // Matches nosuchuser, nosuchusershort, noname
-            showMessageAndCancelDialog(R.string.login_failed_username);
+            showMessageAndCancelDialog(R.string.login_failed_wrong_credentials);
             emptySensitiveEditFields();
         } else if (result.toLowerCase(Locale.getDefault()).contains("wrongpassword".toLowerCase())) {
             // Matches wrongpassword, wrongpasswordempty
-            showMessageAndCancelDialog(R.string.login_failed_password);
+            showMessageAndCancelDialog(R.string.login_failed_wrong_credentials);
             emptySensitiveEditFields();
         } else if (result.toLowerCase(Locale.getDefault()).contains("throttle".toLowerCase())) {
             // Matches unknown throttle error codes
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6e30baa10..ba982e625 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -46,8 +46,7 @@
   <string name="add_title_toast">Please provide a title for this file</string>
   <string name="share_description_hint">Description</string>
   <string name="login_failed_network">Unable to login - network failure</string>
-  <string name="login_failed_username">Unable to login - please check your username</string>
-  <string name="login_failed_password">Unable to login - please check your password</string>
+  <string name="login_failed_wrong_credentials">Unable to login - please check your username and password</string>
   <string name="login_failed_throttled">Too many unsuccessful attempts. Please try again in a few minutes.</string>
   <string name="login_failed_blocked">Sorry, this user has been blocked on Commons</string>
   <string name="login_failed_2fa_needed">You must provide your two factor authentication code.</string>