diff options
| author | Andrew Dolgov <fox@fakecake.org> | 2026-06-06 14:02:02 +0300 |
|---|---|---|
| committer | Andrew Dolgov <fox@fakecake.org> | 2026-06-06 14:02:02 +0300 |
| commit | 4fd1af483c7c8cb723277cd113fcbfb2e3a360bc (patch) | |
| tree | 9376405ea3eaec4a3586e81a0b5a84735479b9ed | |
| parent | 53439265b63fcbd18c68f4401b0ae35f7f8d3993 (diff) | |
| download | tt-rss-android-4fd1af483c7c8cb723277cd113fcbfb2e3a360bc.tar.gz tt-rss-android-4fd1af483c7c8cb723277cd113fcbfb2e3a360bc.tar.xz | |
deal with legacy api leaking okhttp response body
| -rw-r--r-- | org.fox.ttrss/src/main/java/org/fox/ttrss/ApiCommon.java | 140 |
1 files changed, 70 insertions, 70 deletions
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/ApiCommon.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/ApiCommon.java index cafe28ce..4302077c 100644 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/ApiCommon.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/ApiCommon.java @@ -477,79 +477,79 @@ public class ApiCommon { OkHttpClient client = builder.build(); - Response response = client.newCall(request).execute(); - - if (response.isSuccessful()) { - String payloadReceived = response.body().string(); - - if (m_transportDebugging) Log.d(TAG, "<<< " + payloadReceived); - - JsonParser parser = new JsonParser(); - - JsonElement result = parser.parse(payloadReceived); - JsonObject resultObj = result.getAsJsonObject(); - - int statusCode = resultObj.get("status").getAsInt(); - - caller.setStatusCode(statusCode); - - switch (statusCode) { - case API_STATUS_OK: - caller.setLastError(ApiError.SUCCESS); - return result.getAsJsonObject().get("content"); - case API_STATUS_ERR: - JsonObject contentObj = resultObj.get("content").getAsJsonObject(); - String error = contentObj.get("error").getAsString(); - - switch (error) { - case "LOGIN_ERROR": - case "NOT_LOGGED_IN": - caller.setLastError(ApiError.LOGIN_FAILED); - break; - case "API_DISABLED": - caller.setLastError(ApiError.API_DISABLED); - break; - case "INCORRECT_USAGE": - caller.setLastError(ApiError.API_INCORRECT_USAGE); - break; - case "UNKNOWN_METHOD": - caller.setLastError(ApiError.API_UNKNOWN_METHOD); - break; - default: - Log.d(TAG, "Unknown API error: " + error); - caller.setLastErrorMessage(error); - caller.setLastError(ApiError.API_UNKNOWN); - break; - } - } + try (Response response = client.newCall(request).execute()) { + if (response.isSuccessful()) { + String payloadReceived = response.body().string(); + + if (m_transportDebugging) Log.d(TAG, "<<< " + payloadReceived); + + JsonParser parser = new JsonParser(); + + JsonElement result = parser.parse(payloadReceived); + JsonObject resultObj = result.getAsJsonObject(); + + int statusCode = resultObj.get("status").getAsInt(); + + caller.setStatusCode(statusCode); + + switch (statusCode) { + case API_STATUS_OK: + caller.setLastError(ApiError.SUCCESS); + return result.getAsJsonObject().get("content"); + case API_STATUS_ERR: + JsonObject contentObj = resultObj.get("content").getAsJsonObject(); + String error = contentObj.get("error").getAsString(); + + switch (error) { + case "LOGIN_ERROR": + case "NOT_LOGGED_IN": + caller.setLastError(ApiError.LOGIN_FAILED); + break; + case "API_DISABLED": + caller.setLastError(ApiError.API_DISABLED); + break; + case "INCORRECT_USAGE": + caller.setLastError(ApiError.API_INCORRECT_USAGE); + break; + case "UNKNOWN_METHOD": + caller.setLastError(ApiError.API_UNKNOWN_METHOD); + break; + default: + Log.d(TAG, "Unknown API error: " + error); + caller.setLastErrorMessage(error); + caller.setLastError(ApiError.API_UNKNOWN); + break; + } + } - } else { - switch (response.code()) { - case 400: - caller.setLastError(ApiError.HTTP_BAD_REQUEST); - break; - case 401: - caller.setLastError(ApiError.HTTP_UNAUTHORIZED); - break; - case 403: - caller.setLastError(ApiError.HTTP_FORBIDDEN); - break; - case 404: - caller.setLastError(ApiError.HTTP_NOT_FOUND); - break; - case 500: - case 501: - caller.setLastError(ApiError.HTTP_SERVER_ERROR); - break; - default: - Log.d(TAG, "HTTP response code: " + response.code()); - caller.setLastErrorMessage("HTTP response code: " + response.code()); - caller.setLastError(ApiError.HTTP_OTHER_ERROR); - break; + } else { + switch (response.code()) { + case 400: + caller.setLastError(ApiError.HTTP_BAD_REQUEST); + break; + case 401: + caller.setLastError(ApiError.HTTP_UNAUTHORIZED); + break; + case 403: + caller.setLastError(ApiError.HTTP_FORBIDDEN); + break; + case 404: + caller.setLastError(ApiError.HTTP_NOT_FOUND); + break; + case 500: + case 501: + caller.setLastError(ApiError.HTTP_SERVER_ERROR); + break; + default: + Log.d(TAG, "HTTP response code: " + response.code()); + caller.setLastErrorMessage("HTTP response code: " + response.code()); + caller.setLastError(ApiError.HTTP_OTHER_ERROR); + break; + } } - } - return null; + return null; + } } catch (javax.net.ssl.SSLPeerUnverifiedException e) { caller.setLastError(ApiError.SSL_REJECTED); caller.setLastErrorMessage(e.getMessage()); |
