diff options
author | cyBerta <cyberta@riseup.net> | 2018-01-28 10:17:12 +0100 |
---|---|---|
committer | cyBerta <cyberta@riseup.net> | 2018-01-28 10:17:12 +0100 |
commit | 298c33b94c8aada449c98a24cdb2c687af40cbbd (patch) | |
tree | c27c162be2fff26538eba1d6ba4db67ed5c4fd9a /app/src/main/java/se/leap/bitmaskclient/ConfigHelper.java | |
parent | 986fe144729b58382641bbf9769a93bf81c06514 (diff) | |
parent | 3bb2c2c219359a6016366c4d3533a5e2ef812ea9 (diff) |
Merge branch 'origin_0.9.8' into fupduck_8819_config_wizard_design
Diffstat (limited to 'app/src/main/java/se/leap/bitmaskclient/ConfigHelper.java')
-rw-r--r-- | app/src/main/java/se/leap/bitmaskclient/ConfigHelper.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/src/main/java/se/leap/bitmaskclient/ConfigHelper.java b/app/src/main/java/se/leap/bitmaskclient/ConfigHelper.java index 3713e198..741a6f56 100644 --- a/app/src/main/java/se/leap/bitmaskclient/ConfigHelper.java +++ b/app/src/main/java/se/leap/bitmaskclient/ConfigHelper.java @@ -304,6 +304,8 @@ public class ConfigHelper { } catch (JSONException e2) { return null; } + } catch (NullPointerException npe) { + return null; } } @@ -322,7 +324,7 @@ public class ConfigHelper { try { JSONObject providerJson = new JSONObject(provider); return providerJson.getString(Provider.DOMAIN); - } catch (JSONException e) { + } catch (JSONException | NullPointerException e) { return null; } } |