diff options
| author | cyberta <cyberta@riseup.net> | 2021-02-28 21:29:39 +0000 |
|---|---|---|
| committer | cyberta <cyberta@riseup.net> | 2021-02-28 21:29:39 +0000 |
| commit | 665b965194cf24d01b02789adf286950da2e91b2 (patch) | |
| tree | b31c4d03d8c2511371184d2fe059a94fb1fd2cae /app/src/production | |
| parent | 8bb73089566e78a195f21f4746c9db416abf95a4 (diff) | |
| parent | 401e28431fcd3a093aa34d429f5bc08abca5d422 (diff) | |
Merge branch 'beta-release' into 'master'
Beta release
See merge request leap/bitmask_android!131
Diffstat (limited to 'app/src/production')
| -rw-r--r-- | app/src/production/java/se/leap/bitmaskclient/providersetup/ProviderApiManager.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/src/production/java/se/leap/bitmaskclient/providersetup/ProviderApiManager.java b/app/src/production/java/se/leap/bitmaskclient/providersetup/ProviderApiManager.java index 96d8ea69..70652365 100644 --- a/app/src/production/java/se/leap/bitmaskclient/providersetup/ProviderApiManager.java +++ b/app/src/production/java/se/leap/bitmaskclient/providersetup/ProviderApiManager.java @@ -180,7 +180,7 @@ public class ProviderApiManager extends ProviderApiManagerBase { result.putBoolean(BROADCAST_RESULT_KEY, true); } } catch (NullPointerException | JSONException e) { - setErrorResult(result, eipServiceJsonString); + setErrorResult(result, R.string.error_json_exception_user_message, null); } return result; } |