diff options
| author | Sean Leonard <meanderingcode@aetherislands.net> | 2013-07-12 13:38:20 -0600 |
|---|---|---|
| committer | Sean Leonard <meanderingcode@aetherislands.net> | 2013-07-12 14:27:04 -0600 |
| commit | 4dcdb0a2a50722e008395e54ff9228c1d39c231e (patch) | |
| tree | 27581731eb125062a2eb5dbbd6ba5d9f627852af | |
| parent | 1ba2d488737bdb84847bbbc7cf9038610b1f094b (diff) | |
| parent | 7202591b0a42cd91a10255720bd80c2218af2093 (diff) | |
Merge branch 'feature/login-error-messages' into develop
| -rwxr-xr-x | res/values/strings.xml | 1 | ||||
| -rw-r--r-- | src/se/leap/leapclient/ProviderAPI.java | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index c7ef6c2b..c8f391ad 100755 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -306,6 +306,7 @@ <string name="authenticating_message">Authenticating with entered login and password.</string> <string name="logout_title">Log out</string> <string name="logout_message">Logging out from this session.</string> + <string name="not_valid_password_message">Your password is not well-formed: it should have at least 8 characters.</string> <string name="succesful_authentication_message">Authentication succeeded.</string> <string name="authentication_failed_message">Authentication failed.</string> <string name="successful_log_out_message">Logged out.</string> diff --git a/src/se/leap/leapclient/ProviderAPI.java b/src/se/leap/leapclient/ProviderAPI.java index 5238224e..f3ea5f2e 100644 --- a/src/se/leap/leapclient/ProviderAPI.java +++ b/src/se/leap/leapclient/ProviderAPI.java @@ -396,6 +396,7 @@ public class ProviderAPI extends IntentService { } else { displayToast(R.string.certificate_error); } + displayToast(R.string.certificate_error); } catch (Exception e) { if(provider_url != null && danger_on) { json_file_content = getStringFromProviderWithoutValidate(provider_url); |