summaryrefslogtreecommitdiff
path: root/app/src/release
diff options
context:
space:
mode:
authorParménides GV <parmegv@sdf.org>2015-03-19 16:59:19 +0100
committerParménides GV <parmegv@sdf.org>2015-03-19 16:59:19 +0100
commit30d92be6e9401926d9efaafc332d764211d882e6 (patch)
tree5887a0e8d3b091ae27293870a70b7ccc67128c61 /app/src/release
parent5ccaa263e3bafd212b8f4f037a87bf0770ee65e3 (diff)
parentd18be7ed1dfc645bd378c2eb0c152f7e0eda42e9 (diff)
Merge branch 'feature/Warn-riseup-users-not-to-use-their-previous-credentials-#6784' into develop
Diffstat (limited to 'app/src/release')
-rw-r--r--app/src/release/java/se/leap/bitmaskclient/ProviderAPI.java9
1 files changed, 5 insertions, 4 deletions
diff --git a/app/src/release/java/se/leap/bitmaskclient/ProviderAPI.java b/app/src/release/java/se/leap/bitmaskclient/ProviderAPI.java
index 184173b2..c8fd0251 100644
--- a/app/src/release/java/se/leap/bitmaskclient/ProviderAPI.java
+++ b/app/src/release/java/se/leap/bitmaskclient/ProviderAPI.java
@@ -138,6 +138,7 @@ public class ProviderAPI extends IntentService {
}
}
} else if (action.equalsIgnoreCase(SIGN_UP)) {
+ UserSessionStatus.updateStatus(UserSessionStatus.SessionStatus.SIGNING_UP);
Bundle result = tryToRegister(parameters);
if(result.getBoolean(RESULT_KEY)) {
receiver.send(SUCCESSFUL_SIGNUP, result);
@@ -193,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);
}
}
@@ -243,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);
}
}