diff options
| author | Sean Leonard <meanderingcode@aetherislands.net> | 2014-03-05 11:52:54 -0800 |
|---|---|---|
| committer | Sean Leonard <meanderingcode@aetherislands.net> | 2014-03-05 11:52:54 -0800 |
| commit | 2cafcae1008125d7d237a9fe6fe1299b356cd554 (patch) | |
| tree | 2ae4fc1b2c15076349b3d81e6d4df3c6c6b498b4 /src | |
| parent | b9f91a8ae571f5df95ece0d666f50fb7ebc809bc (diff) | |
| parent | 726569f0b9d18c311b307f6a108f6749f96423c5 (diff) | |
Merge branch 'bug/inaccurate-server-down-msg' into develop
Diffstat (limited to 'src')
| -rw-r--r-- | src/se/leap/bitmaskclient/ProviderAPI.java | 6 |
1 files changed, 3 insertions, 3 deletions
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(); |