diff options
author | cyberta <cyberta@riseup.net> | 2021-02-18 13:46:49 +0000 |
---|---|---|
committer | cyberta <cyberta@riseup.net> | 2021-02-18 13:46:49 +0000 |
commit | 2b1dcf4f6b4ed7405a14c5dfb50ef16dfa416fbf (patch) | |
tree | 67efca7589d9834e79d7b72069c661edda17593b /app/src/main/java/se/leap/bitmaskclient/eip | |
parent | efd90a35caf042d7955727e4a5d9a12927714ca8 (diff) | |
parent | e5d71c8dd60f10a5fcb9dbeab3158207932905e2 (diff) |
Merge branch 'massive_error_logging' into 'master'
API error logging
See merge request leap/bitmask_android!127
Diffstat (limited to 'app/src/main/java/se/leap/bitmaskclient/eip')
-rw-r--r-- | app/src/main/java/se/leap/bitmaskclient/eip/EIP.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/app/src/main/java/se/leap/bitmaskclient/eip/EIP.java b/app/src/main/java/se/leap/bitmaskclient/eip/EIP.java index e5cf70be..66b7c6cf 100644 --- a/app/src/main/java/se/leap/bitmaskclient/eip/EIP.java +++ b/app/src/main/java/se/leap/bitmaskclient/eip/EIP.java @@ -352,11 +352,14 @@ public final class EIP extends JobIntentService implements Observer { void setErrorResult(Bundle result, String errorId, @StringRes int errorMessageId, Object... args) { JSONObject errorJson = new JSONObject(); try { + String errorMessage; if (args != null) { - errorJson.put(ERRORS, getResources().getString(errorMessageId, args)); + errorMessage = getResources().getString(errorMessageId, args); } else { - errorJson.put(ERRORS, getResources().getString(errorMessageId)); + errorMessage = getResources().getString(errorMessageId); } + VpnStatus.logWarning("[EIP] error: " + errorMessage); + errorJson.put(ERRORS, errorMessage); errorJson.put(ERRORID, errorId); } catch (JSONException e) { e.printStackTrace(); |