summaryrefslogtreecommitdiff
path: root/app/src/release/java/se
diff options
context:
space:
mode:
authorParménides GV <parmegv@sdf.org>2014-08-14 01:38:16 +0200
committerParménides GV <parmegv@sdf.org>2014-08-14 01:38:16 +0200
commitdcf4b5f63e817a8ebff1ffd8cf1d4f4f4b7295fd (patch)
treea1a0403b974208a11e2252f628ce905442656243 /app/src/release/java/se
parente7ff0b15109060326040f22ac60c4448a55f5667 (diff)
parentf05cf39fd6b18019dfeaf6c19d08ae68bf418fd6 (diff)
Merge branch 'bug/NoSuchElementException-isn't-handled-in-ProviderAPI-#5983' into develop
Diffstat (limited to 'app/src/release/java/se')
-rw-r--r--app/src/release/java/se/leap/bitmaskclient/ProviderAPI.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/app/src/release/java/se/leap/bitmaskclient/ProviderAPI.java b/app/src/release/java/se/leap/bitmaskclient/ProviderAPI.java
index 625125d8..d1627974 100644
--- a/app/src/release/java/se/leap/bitmaskclient/ProviderAPI.java
+++ b/app/src/release/java/se/leap/bitmaskclient/ProviderAPI.java
@@ -48,6 +48,7 @@ import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
import java.util.Scanner;
+import java.util.NoSuchElementException;
import javax.net.ssl.HostnameVerifier;
import javax.net.ssl.HttpsURLConnection;
@@ -765,6 +766,8 @@ public class ProviderAPI extends IntentService {
} catch (KeyManagementException e) {
// TODO Auto-generated catch block
e.printStackTrace();
+ } catch (NoSuchElementException e) {
+ json_file_content = formatErrorMessage(R.string.server_unreachable_message);
}
return json_file_content;
}