summaryrefslogtreecommitdiff
path: root/app/src
diff options
context:
space:
mode:
authorParménides GV <parmegv@sdf.org>2015-03-19 15:56:30 +0100
committerParménides GV <parmegv@sdf.org>2015-03-19 15:56:30 +0100
commit2c44ba2678c6b3367a119d1e857dd5d5723f7681 (patch)
tree3304ccb6908285ef05693567cafaaf3fe59f07de /app/src
parent6dfae9951be275ccf33a05f4980a977b5b634e3e (diff)
Warn riseup users about credentials, as an error in the username field.
I haven't still decided how to show that warning, I'm talking to gus about it. This is just the first idea, but the core mechanism is implemented at least.
Diffstat (limited to 'app/src')
-rw-r--r--app/src/debug/java/se/leap/bitmaskclient/ProviderAPI.java8
-rw-r--r--app/src/main/java/se/leap/bitmaskclient/Dashboard.java2
-rw-r--r--app/src/main/java/se/leap/bitmaskclient/SessionDialog.java13
-rw-r--r--app/src/release/java/se/leap/bitmaskclient/ProviderAPI.java8
4 files changed, 19 insertions, 12 deletions
diff --git a/app/src/debug/java/se/leap/bitmaskclient/ProviderAPI.java b/app/src/debug/java/se/leap/bitmaskclient/ProviderAPI.java
index 47451a70..57c4d067 100644
--- a/app/src/debug/java/se/leap/bitmaskclient/ProviderAPI.java
+++ b/app/src/debug/java/se/leap/bitmaskclient/ProviderAPI.java
@@ -199,11 +199,11 @@ public class ProviderAPI extends IntentService {
if(!wellFormedPassword(password)) {
result.putBoolean(RESULT_KEY, false);
result.putString(SessionDialog.USERNAME, username);
- result.putBoolean(SessionDialog.PASSWORD_INVALID_LENGTH, true);
+ result.putBoolean(SessionDialog.ERRORS.PASSWORD_INVALID_LENGTH.toString(), true);
}
if(!validUsername(username)) {
result.putBoolean(RESULT_KEY, false);
- result.putBoolean(SessionDialog.USERNAME_MISSING, true);
+ result.putBoolean(SessionDialog.ERRORS.USERNAME_MISSING.toString(), true);
}
}
@@ -248,11 +248,11 @@ public class ProviderAPI extends IntentService {
if(!wellFormedPassword(password)) {
result.putBoolean(RESULT_KEY, false);
result.putString(SessionDialog.USERNAME, username);
- result.putBoolean(SessionDialog.PASSWORD_INVALID_LENGTH, true);
+ result.putBoolean(SessionDialog.ERRORS.PASSWORD_INVALID_LENGTH.toString(), true);
}
if(!validUsername(username)) {
result.putBoolean(RESULT_KEY, false);
- result.putBoolean(SessionDialog.USERNAME_MISSING, true);
+ result.putBoolean(SessionDialog.ERRORS.USERNAME_MISSING.toString(), true);
}
}
diff --git a/app/src/main/java/se/leap/bitmaskclient/Dashboard.java b/app/src/main/java/se/leap/bitmaskclient/Dashboard.java
index c043821f..14d79bc0 100644
--- a/app/src/main/java/se/leap/bitmaskclient/Dashboard.java
+++ b/app/src/main/java/se/leap/bitmaskclient/Dashboard.java
@@ -426,6 +426,8 @@ public class Dashboard extends Activity implements SessionDialog.SessionDialogIn
} else if(resultCode == ProviderAPI.SUCCESSFUL_LOGIN) {
downloadVpnCertificate();
} else if(resultCode == ProviderAPI.FAILED_LOGIN) {
+ if(provider.getName().equalsIgnoreCase("riseup"))
+ resultData.putBoolean(SessionDialog.ERRORS.CONFUSING_CREDENTIALS.toString(), true);
sessionDialog(resultData);
} else if(resultCode == ProviderAPI.SUCCESSFUL_LOGOUT) {
if(switching_provider) switchProvider();
diff --git a/app/src/main/java/se/leap/bitmaskclient/SessionDialog.java b/app/src/main/java/se/leap/bitmaskclient/SessionDialog.java
index 9025564b..e32bca8e 100644
--- a/app/src/main/java/se/leap/bitmaskclient/SessionDialog.java
+++ b/app/src/main/java/se/leap/bitmaskclient/SessionDialog.java
@@ -48,8 +48,11 @@ public class SessionDialog extends DialogFragment{
final public static String USERNAME = "username";
final public static String PASSWORD = "password";
- final public static String USERNAME_MISSING = "username missing";
- final public static String PASSWORD_INVALID_LENGTH = "password_invalid_length";
+ public static enum ERRORS {
+ USERNAME_MISSING,
+ PASSWORD_INVALID_LENGTH,
+ CONFUSING_CREDENTIALS
+ }
@InjectView(R.id.user_message)
TextView user_message;
@@ -105,13 +108,15 @@ public class SessionDialog extends DialogFragment{
private void setUp(Bundle arguments) {
is_eip_pending = arguments.getBoolean(EipFragment.IS_PENDING, false);
- if (arguments.containsKey(PASSWORD_INVALID_LENGTH))
+ if (arguments.containsKey(ERRORS.PASSWORD_INVALID_LENGTH.toString()))
password_field.setError(getString(R.string.error_not_valid_password_user_message));
+ else if(arguments.containsKey(ERRORS.CONFUSING_CREDENTIALS.toString()))
+ username_field.setError("Perhaps you used your non LEAP credentials");
if (arguments.containsKey(USERNAME)) {
String username = arguments.getString(USERNAME);
username_field.setText(username);
}
- if (arguments.containsKey(USERNAME_MISSING)) {
+ if (arguments.containsKey(ERRORS.USERNAME_MISSING.toString())) {
username_field.setError(getString(R.string.username_ask));
}
if(arguments.containsKey(getString(R.string.user_message)))
diff --git a/app/src/release/java/se/leap/bitmaskclient/ProviderAPI.java b/app/src/release/java/se/leap/bitmaskclient/ProviderAPI.java
index 3117ea6f..c8fd0251 100644
--- a/app/src/release/java/se/leap/bitmaskclient/ProviderAPI.java
+++ b/app/src/release/java/se/leap/bitmaskclient/ProviderAPI.java
@@ -194,11 +194,11 @@ public class ProviderAPI extends IntentService {
if(!wellFormedPassword(password)) {
result.putBoolean(RESULT_KEY, false);
result.putString(SessionDialog.USERNAME, username);
- result.putBoolean(SessionDialog.PASSWORD_INVALID_LENGTH, true);
+ result.putBoolean(SessionDialog.ERRORS.PASSWORD_INVALID_LENGTH.toString(), true);
}
if(!validUsername(username)) {
result.putBoolean(RESULT_KEY, false);
- result.putBoolean(SessionDialog.USERNAME_MISSING, true);
+ result.putBoolean(SessionDialog.ERRORS.USERNAME_MISSING.toString(), true);
}
}
@@ -244,11 +244,11 @@ public class ProviderAPI extends IntentService {
if(!wellFormedPassword(password)) {
result.putBoolean(RESULT_KEY, false);
result.putString(SessionDialog.USERNAME, username);
- result.putBoolean(SessionDialog.PASSWORD_INVALID_LENGTH, true);
+ result.putBoolean(SessionDialog.ERRORS.PASSWORD_INVALID_LENGTH.toString(), true);
}
if(!validUsername(username)) {
result.putBoolean(RESULT_KEY, false);
- result.putBoolean(SessionDialog.USERNAME_MISSING, true);
+ result.putBoolean(SessionDialog.ERRORS.USERNAME_MISSING.toString(), true);
}
}