mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-26 20:33:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix for issue #1508 (#1512)

Browse source 
* 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.
This commit is contained in:
ShridharGoel 2018-05-24 18:57:13 +05:30 • committed by neslihanturan
parent 2a0b9d8a0b
commit 2255bd9a56
2 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/fr/free/nrw/commons/auth/LoginActivity.java
View file

@ -271,11 +271,11 @@ public class LoginActivity extends AccountAuthenticatorActivity {
showMessageAndCancelDialog(R.string.login_failed_network); showMessageAndCancelDialog(R.string.login_failed_network);
} else if (result.toLowerCase(Locale.getDefault()).contains("nosuchuser".toLowerCase()) || result.toLowerCase().contains("noname".toLowerCase())) { } else if (result.toLowerCase(Locale.getDefault()).contains("nosuchuser".toLowerCase()) || result.toLowerCase().contains("noname".toLowerCase())) {
// Matches nosuchuser, nosuchusershort, noname // Matches nosuchuser, nosuchusershort, noname
showMessageAndCancelDialog(R.string.login_failed_username); showMessageAndCancelDialog(R.string.login_failed_wrong_credentials);
emptySensitiveEditFields(); emptySensitiveEditFields();
} else if (result.toLowerCase(Locale.getDefault()).contains("wrongpassword".toLowerCase())) { } else if (result.toLowerCase(Locale.getDefault()).contains("wrongpassword".toLowerCase())) {
// Matches wrongpassword, wrongpasswordempty // Matches wrongpassword, wrongpasswordempty
showMessageAndCancelDialog(R.string.login_failed_password); showMessageAndCancelDialog(R.string.login_failed_wrong_credentials);
emptySensitiveEditFields(); emptySensitiveEditFields();
} else if (result.toLowerCase(Locale.getDefault()).contains("throttle".toLowerCase())) { } else if (result.toLowerCase(Locale.getDefault()).contains("throttle".toLowerCase())) {
// Matches unknown throttle error codes // Matches unknown throttle error codes

3
app/src/main/res/values/strings.xml
View file

@ -46,8 +46,7 @@
<string name="add_title_toast">Please provide a title for this file</string> <string name="add_title_toast">Please provide a title for this file</string>
<string name="share_description_hint">Description</string> <string name="share_description_hint">Description</string>
<string name="login_failed_network">Unable to login - network failure</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_wrong_credentials">Unable to login - please check your username and password</string>
<string name="login_failed_password">Unable to login - please check your password</string>
<string name="login_failed_throttled">Too many unsuccessful attempts. Please try again in a few minutes.</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_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> <string name="login_failed_2fa_needed">You must provide your two factor authentication code.</string>