diff options
| author | Parménides GV <parmegv@sdf.org> | 2014-06-24 10:30:51 +0200 |
|---|---|---|
| committer | Parménides GV <parmegv@sdf.org> | 2014-06-24 10:30:51 +0200 |
| commit | 37243f843ff5064f4b2612f470aeb281d0a4c828 (patch) | |
| tree | 63ccd991686c73be366ee3ae96cd03c8a4d15ff7 /app | |
| parent | 51c0835bcdd793bb01a4e013feb6d0892488f2d4 (diff) | |
| parent | 55e9c0c60b94c09f8321dccd2971b32d92ec72a1 (diff) | |
Merge branch 'bug/When-you-logout-it-incorrectly-reports-that-now-you-are-using-an-anonymous-certificate-#5812' into develop
Diffstat (limited to 'app')
| -rw-r--r-- | app/src/main/java/se/leap/bitmaskclient/Dashboard.java | 4 | ||||
| -rw-r--r-- | app/src/main/res/values/strings.xml | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/app/src/main/java/se/leap/bitmaskclient/Dashboard.java b/app/src/main/java/se/leap/bitmaskclient/Dashboard.java index f2763d84..66c305e6 100644 --- a/app/src/main/java/se/leap/bitmaskclient/Dashboard.java +++ b/app/src/main/java/se/leap/bitmaskclient/Dashboard.java @@ -507,9 +507,9 @@ public class Dashboard extends Activity implements LogInDialog.LogInDialogInterf case ProviderAPI.SRP_AUTHENTICATION_SUCCESSFUL: eipStatus.setText(R.string.succesful_authentication_message); break; case ProviderAPI.SRP_AUTHENTICATION_FAILED: eipStatus.setText(R.string.authentication_failed_message); break; - case ProviderAPI.CORRECTLY_DOWNLOADED_CERTIFICATE: eipStatus.setText(R.string.future_authed_secured_status); break; + case ProviderAPI.CORRECTLY_DOWNLOADED_CERTIFICATE: break; case ProviderAPI.INCORRECTLY_DOWNLOADED_CERTIFICATE: eipStatus.setText(R.string.incorrectly_downloaded_certificate_message); break; - case ProviderAPI.LOGOUT_SUCCESSFUL: eipStatus.setText(R.string.future_anonymous_secured_status); break; + case ProviderAPI.LOGOUT_SUCCESSFUL: break; case ProviderAPI.LOGOUT_FAILED: eipStatus.setText(R.string.log_out_failed_message); break; } } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index bb68b942..6db6962f 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -17,9 +17,7 @@ <string name="provider_label_none">No provider configured</string> <string name="eip_settings_button_description">Access EIP connection settings</string> <string name="status_unknown">Status unknown.</string> - <string name="future_anonymous_secured_status">Connection will be secure using an anonymous certificate.</string> <string name="anonymous_secured_status">Connection secure using an anonymous certificate.</string> - <string name="future_authed_secured_status">Connection will be secure using your own certificate.</string> <string name="authed_secured_status">Connection secure using your own certificate.</string> <string name="eip_service_label">Encrypted Internet</string> <string name="title_activity_configuration_wizard">Select a service provider</string> |