From 6ada10858719786e489938b3124d1d6015a70421 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@ma.sdf.org>
Date: Tue, 25 Jun 2013 17:55:22 +0200
Subject: The added provider is selected automatically.

I've also removed a lot of finishes when things go wrong (so that it should be returning to the previous activity/fragment).
---
 res/values/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'res/values')

diff --git a/res/values/strings.xml b/res/values/strings.xml
index c0ba6ebd..a7c2cdfd 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -262,7 +262,7 @@
     <string name="eip_service_label">EIP:</string>
     <string name="eip_type_active">EIP</string>
     <string name="title_activity_configuration_wizard">Configure LEAP</string>
-    <string name="new_provider_button">Add new Provider</string>
+    <string name="new_provider_button">Select new Provider</string>
     <string name="introduce_new_provider">Introduce new provider</string>
     <string name="save">Save</string>
     <string name="new_provider_uri">New provider\'s main URL</string>
@@ -297,4 +297,4 @@
     <string name="authed_cert_download_failed_message">Your own cert has incorrectly been downloaded.</string>
     
 
-</resources>
\ No newline at end of file
+</resources>
-- 
cgit v1.2.3


From abd581dd08ec50d8b93b244e5e09596b6acb8a0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@ma.sdf.org>
Date: Tue, 25 Jun 2013 18:29:08 +0200
Subject: Changed user message when a provider is down.

I was assuming that if the app wasn't able to download provider.json from the web, it meant that the preseeded provider was wrong thus the app needed an upgrade. But it can happen (as right now, with bitmask.net) that the provider is simply down.
---
 res/values/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'res/values')

diff --git a/res/values/strings.xml b/res/values/strings.xml
index a7c2cdfd..80dd85bd 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -287,7 +287,7 @@
     <string name="incorrectly_downloaded_json_files_message">You have not entered a LEAP provider URL or it is unavailable</string>
     <string name="correctly_downloaded_json_files_message">Your anon cert has been correctly downloaded</string>
     <string name="incorrectly_downloaded_certificate_message">Your anon cert was not downloaded</string>
-    <string name="incorrectly_updated_provider_dot_json_message">Install a new version of this app.</string>
+    <string name="incorrectly_updated_provider_dot_json_message">Server is down.</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>
-- 
cgit v1.2.3