Merge branch 'bug/inaccurate-server-down-msg' into develop

2 files changed, 4 insertions, 4 deletions

diff --git a/res/values/strings.xml b/res/values/strings.xml
index fd451c00..d4e84d3a 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -122,7 +122,7 @@
     <string name="setup_error_configure_button">Configure</string>
     <string name="setup_error_close_button">Exit</string>
     <string name="setup_error_text">There was an error configuring Bitmask with your chosen provider.\n\nYou may choose to reconfigure, or exit and configure a provider upon next launch.</string>
-    <string name="server_is_down_message">Server is down.</string>
+    <string name="server_unreachable_message">Server is unreachable, please try again.</string>
     <string name="malformed_url">It doesn\'t seem to be a Bitmask provider.</string>
     <string name="certificate_error">This is not a trusted Bitmask provider.</string>
     <string name="configuring_provider">Configuring provider</string>
diff --git a/src/se/leap/bitmaskclient/ProviderAPI.java b/src/se/leap/bitmaskclient/ProviderAPI.java
index 5344e471..62d86455 100644
--- a/src/se/leap/bitmaskclient/ProviderAPI.java
+++ b/src/se/leap/bitmaskclient/ProviderAPI.java
@@ -606,7 +606,7 @@ public class ProviderAPI extends IntentService {
 		} catch (MalformedURLException e) {
 			json_file_content = formatErrorMessage(R.string.malformed_url);
 		} catch(SocketTimeoutException e) {
-			json_file_content = formatErrorMessage(R.string.server_is_down_message);
+			json_file_content = formatErrorMessage(R.string.server_unreachable_message);
 		} catch (IOException e) {
 			if(provider_url != null) {
 				json_file_content = downloadWithProviderCA(string_url, danger_on);
@@ -644,7 +644,7 @@ public class ProviderAPI extends IntentService {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
 		} catch (UnknownHostException e) {
-			json_file_content = formatErrorMessage(R.string.server_is_down_message);
+			json_file_content = formatErrorMessage(R.string.server_unreachable_message);
 		} catch (IOException e) {
 			// The downloaded certificate doesn't validate our https connection.
 			if(danger_on) {
@@ -727,7 +727,7 @@ public class ProviderAPI extends IntentService {
 			System.out.println("String ignoring certificate = " + string);
 		} catch (FileNotFoundException e) {
 			e.printStackTrace();
-			string = formatErrorMessage(R.string.server_is_down_message);
+			string = formatErrorMessage(R.string.server_unreachable_message);
 		} catch (IOException e) {
 			// The downloaded certificate doesn't validate our https connection.
 			e.printStackTrace();