diff options
author | lalottacontinua <loddatio@posteo.de> | 2018-07-21 03:01:44 -0700 |
---|---|---|
committer | lalottacontinua <loddatio@posteo.de> | 2018-07-21 03:01:44 -0700 |
commit | 7434a53d0c2545375ff9844a510c9fc8b09948f0 (patch) | |
tree | bdf7b4a2ee6043c3c63cce265fa7c52e5eb92273 /app/src/insecure/java/se/leap/bitmaskclient/ProviderApiManager.java | |
parent | ce6f1c9c9b402bc2e92462353bb56cadfb9b2f35 (diff) | |
parent | 9b50dcae236f9f93d24f7991df4d7acf64219b73 (diff) |
Merge branch '#8886_add_provider' into 'master'
#8886 add provider
See merge request leap/bitmask_android!79
Diffstat (limited to 'app/src/insecure/java/se/leap/bitmaskclient/ProviderApiManager.java')
-rw-r--r-- | app/src/insecure/java/se/leap/bitmaskclient/ProviderApiManager.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/src/insecure/java/se/leap/bitmaskclient/ProviderApiManager.java b/app/src/insecure/java/se/leap/bitmaskclient/ProviderApiManager.java index 7e33cd63..e3fb549f 100644 --- a/app/src/insecure/java/se/leap/bitmaskclient/ProviderApiManager.java +++ b/app/src/insecure/java/se/leap/bitmaskclient/ProviderApiManager.java @@ -142,8 +142,7 @@ public class ProviderApiManager extends ProviderApiManagerBase { providerDotJsonString = downloadFromApiUrlWithProviderCA("/provider.json", caCert, providerDefinition, dangerOn); if (ConfigHelper.checkErroneousDownload(providerDotJsonString) || !isValidJson(providerDotJsonString)) { - result.putString(ERRORS, resources.getString(malformed_url)); - result.putBoolean(BROADCAST_RESULT_KEY, false); + setErrorResult(result, malformed_url, null); return result; } |