about summary refs log tree commit diff stats
path: root/org.fox.ttrss/src/main/java
diff options
context:
space:
mode:
authorAndrew Dolgov <fox@fakecake.org>2026-06-06 13:03:58 +0300
committerAndrew Dolgov <fox@fakecake.org>2026-06-06 13:03:58 +0300
commita85ec311eb456e0dabdea32facef5929f45547db (patch)
treeb1828f6760bb6c4b1b7863730cd5b4dcd6fe7095 /org.fox.ttrss/src/main/java
parent09d69aa3654e20303bff5152bd2ae7a56e3e46b0 (diff)
downloadtt-rss-android-a85ec311eb456e0dabdea32facef5929f45547db.tar.gz
tt-rss-android-a85ec311eb456e0dabdea32facef5929f45547db.tar.xz
split testable stuff from ApiRequest into a separate class and add tests
Diffstat (limited to 'org.fox.ttrss/src/main/java')
-rw-r--r--org.fox.ttrss/src/main/java/org/fox/ttrss/ApiResponseParser.java130
-rw-r--r--org.fox.ttrss/src/main/java/org/fox/ttrss/ApiV2Client.java100
2 files changed, 137 insertions, 93 deletions
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/ApiResponseParser.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/ApiResponseParser.java
new file mode 100644
index 00000000..18b2e4a7
--- /dev/null
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/ApiResponseParser.java
@@ -0,0 +1,130 @@
+package org.fox.ttrss;
+
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+
+import org.fox.ttrss.ApiCommon.ApiError;
+
+import java.util.Objects;
+
+/**
+ * Parses TT-RSS API v2 responses and maps error codes to ApiError enum.
+ *
+ * This is a pure-logic class with no Android dependencies, making it
+ * easy to unit test. ApiV2Client delegates to it after receiving HTTP responses.
+ */
+public final class ApiResponseParser {
+
+    /**
+     * Result of parsing a v2 API response.
+     */
+    public static final class ParsedResponse {
+        public final boolean success;
+        public final JsonElement data;
+        public final ApiError error;
+        public final String errorMessage;
+
+        public ParsedResponse(boolean success, JsonElement data, ApiError error, String errorMessage) {
+            this.success = success;
+            this.data = data;
+            this.error = error;
+            this.errorMessage = errorMessage;
+        }
+    }
+
+    private ApiResponseParser() {
+        // no instances
+    }
+
+    /**
+     * Parse a v2 API response payload.
+     *
+     * Response format: {"success": true/false, "data": ..., "error": {"code": "..."}}
+     *
+     * @param payload raw JSON string from the HTTP response body
+     * @return parsed response with success flag, data, and error info
+     */
+    public static ParsedResponse parse(String payload) {
+        try {
+            JsonElement result = JsonParser.parseString(payload);
+            JsonObject resultObj = result.getAsJsonObject();
+            boolean success = resultObj.get("success").getAsBoolean();
+
+            if (success) {
+                JsonElement data = resultObj.get("data");
+                return new ParsedResponse(
+                        true,
+                        data != null ? data : JsonParser.parseString("null"),
+                        ApiError.SUCCESS,
+                        null
+                );
+            } else {
+                JsonObject errorObj = resultObj.getAsJsonObject("error");
+                String errorCode = errorObj != null && errorObj.has("code")
+                        ? errorObj.get("code").getAsString()
+                        : "UNKNOWN";
+
+                return new ParsedResponse(
+                        false,
+                        null,
+                        mapApiError(errorCode),
+                        errorCode
+                );
+            }
+        } catch (Exception e) {
+            return new ParsedResponse(
+                    false,
+                    null,
+                    ApiError.PARSE_ERROR,
+                    "Failed to parse v2 response: " + e.getMessage()
+            );
+        }
+    }
+
+    /**
+     * Map v2 API error codes to the common ApiError enum.
+     *
+     * @param errorCode error code from the v2 API response
+     * @return corresponding ApiError
+     */
+    public static ApiError mapApiError(String errorCode) {
+        switch (Objects.requireNonNull(errorCode)) {
+            case "LOGIN_ERROR":
+            case "NOT_LOGGED_IN":
+                return ApiError.LOGIN_FAILED;
+            case "API_DISABLED":
+                return ApiError.API_DISABLED;
+            case "INCORRECT_USAGE":
+                return ApiError.API_INCORRECT_USAGE;
+            default:
+                return ApiError.API_UNKNOWN;
+        }
+    }
+
+    /**
+     * Map HTTP status codes to the common ApiError enum.
+     *
+     * @param httpCode raw HTTP response status code
+     * @return corresponding ApiError
+     */
+    public static ApiError mapHttpStatusError(int httpCode) {
+        switch (httpCode) {
+            case 400:
+                return ApiError.HTTP_BAD_REQUEST;
+            case 401:
+                return ApiError.HTTP_UNAUTHORIZED;
+            case 403:
+                return ApiError.HTTP_FORBIDDEN;
+            case 404:
+                return ApiError.HTTP_NOT_FOUND;
+            case 405:
+                return ApiError.API_UNKNOWN_METHOD;
+            case 500:
+            case 501:
+                return ApiError.HTTP_SERVER_ERROR;
+            default:
+                return ApiError.HTTP_OTHER_ERROR;
+        }
+    }
+}
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/ApiV2Client.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/ApiV2Client.java
index 12163413..be4e643a 100644
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/ApiV2Client.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/ApiV2Client.java
@@ -10,8 +10,6 @@ import androidx.preference.PreferenceManager;
 
 import com.google.gson.Gson;
 import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
 
 import org.fox.ttrss.ApiCommon.ApiError;
 import org.fox.ttrss.util.KeyChainKeyManager;
@@ -247,11 +245,16 @@ public class ApiV2Client {
                     Log.d(TAG, "<<< " + payload);
                 }
 
-                return parseV2Response(payload, caller);
+                ApiResponseParser.ParsedResponse parsed = ApiResponseParser.parse(payload);
+                caller.setLastError(parsed.error);
+                caller.setLastErrorMessage(parsed.errorMessage);
+                return parsed.data;
             } else {
                 // Handle HTTP error codes
                 response.body().close();
-                mapHttpStatusError(response.code(), caller);
+                ApiError error = ApiResponseParser.mapHttpStatusError(response.code());
+                caller.setLastError(error);
+                caller.setLastErrorMessage("HTTP " + response.code());
                 return null;
             }
 
@@ -278,95 +281,6 @@ public class ApiV2Client {
         }
     }
 
-    /**
-     * Parse the v2 response wrapper: {"success": true/false, "data": ..., "error": {...}}
-     */
-    private static JsonElement parseV2Response(String payload, ApiCommon.ApiCaller caller) {
-        JsonParser parser = new JsonParser();
-        JsonElement result = parser.parse(payload);
-
-        try {
-            JsonObject resultObj = result.getAsJsonObject();
-            boolean success = resultObj.get("success").getAsBoolean();
-
-            if (success) {
-                caller.setLastError(ApiError.SUCCESS);
-                JsonElement data = resultObj.get("data");
-                return data != null ? data : JsonParser.parseString("null");
-            } else {
-                // Error response
-                JsonObject errorObj = resultObj.getAsJsonObject("error");
-                String errorCode = errorObj != null && errorObj.has("code")
-                        ? errorObj.get("code").getAsString()
-                        : "UNKNOWN";
-
-                mapApiError(errorCode, caller);
-                return null;
-            }
-        } catch (Exception e) {
-            caller.setLastError(ApiError.PARSE_ERROR);
-            caller.setLastErrorMessage("Failed to parse v2 response: " + e.getMessage());
-            e.printStackTrace();
-            return null;
-        }
-    }
-
-    /**
-     * Map v2 error codes to the common ApiError enum.
-     */
-    private static void mapApiError(String errorCode, ApiCommon.ApiCaller caller) {
-        switch (errorCode) {
-            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;
-            default:
-                Log.d(TAG, "Unknown APIv2 error: " + errorCode);
-                caller.setLastErrorMessage(errorCode);
-                caller.setLastError(ApiError.API_UNKNOWN);
-                break;
-        }
-    }
-
-    /**
-     * Map HTTP status codes to the common ApiError enum.
-     */
-    private static void mapHttpStatusError(int httpCode, ApiCommon.ApiCaller caller) {
-        switch (httpCode) {
-            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 405:
-                // @todo what about METHOD_NOT_ALLOWED? do these two share status code?
-                caller.setLastError(ApiError.API_UNKNOWN_METHOD);
-                break;
-            case 500:
-            case 501:
-                caller.setLastError(ApiError.HTTP_SERVER_ERROR);
-                break;
-            default:
-                Log.d(TAG, "HTTP error code: " + httpCode);
-                caller.setLastErrorMessage("HTTP " + httpCode);
-                caller.setLastError(ApiError.HTTP_OTHER_ERROR);
-                break;
-        }
-    }
-
     // ─── Progress support ─────────────────────────────────────────────────────
 
     /**