about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorfox <fox@fakecake.org>2026-06-19 19:21:07 +0300
committerfox <fox@fakecake.org>2026-06-19 19:21:07 +0300
commitd2f61f0a913d62665f7fc67d495e287ec1b6a1b4 (patch)
treebbcecdd08a7f4eeecce6de601387edc8736ab00c
parent925b9d748d53d1d8d85c3b22905aa52958623eb3 (diff)
parentb2b66eba1ee295e2a9a00b12d519075d20174ce6 (diff)
downloadtt-rss-android-26.06-d2f61f0a-signed.tar.gz
tt-rss-android-26.06-d2f61f0a-signed.tar.xz
Merge branch 'dev' into 'master' 26.06-d2f61f0a-signed
Dev

See merge request git/tt-rss/tt-rss-android!76
-rw-r--r--.gitlab-ci.yml2
-rw-r--r--org.fox.ttrss/src/main/java/org/fox/ttrss/ApiCommon.java74
-rw-r--r--org.fox.ttrss/src/main/java/org/fox/ttrss/ApiRequest.java2
-rw-r--r--org.fox.ttrss/src/main/java/org/fox/ttrss/ApiV2Client.java48
-rw-r--r--org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleModel.java2
-rw-r--r--org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsModel.java2
-rwxr-xr-xorg.fox.ttrss/src/main/java/org/fox/ttrss/MasterActivity.java4
-rwxr-xr-xorg.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java10
-rw-r--r--org.fox.ttrss/src/main/java/org/fox/ttrss/RootCategoriesModel.java4
-rw-r--r--org.fox.ttrss/src/main/java/org/fox/ttrss/share/ShareActivity.java2
-rwxr-xr-xorg.fox.ttrss/src/main/java/org/fox/ttrss/share/SubscribeActivity.java4
-rw-r--r--org.fox.ttrss/src/main/java/org/fox/ttrss/util/SimpleLoginManager.java2
12 files changed, 83 insertions, 73 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8f89e915..06275135 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -23,7 +23,7 @@ deploy-codeberg:
     - git config --global http.proxy "${INFRA_HTTPS_PROXY}"
     - git config --global https.proxy "${INFRA_HTTPS_PROXY}"
     - git remote add codeberg "https://x-access-token:${CODEBERG_PUSH_TOKEN}@codeberg.org/cthulhoo/tt-rss-android.git"
-    - git push codeberg "HEAD:${CI_COMMIT_BRANCH}"
+    - git push codeberg "HEAD:${CI_COMMIT_BRANCH}" --tags
   rules:
     - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CODEBERG_PUSH_TOKEN != null
     - if: $CI_COMMIT_BRANCH == "dev" && $CODEBERG_PUSH_TOKEN != null
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 a653ac3a..7033cbce 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
@@ -142,19 +142,20 @@ public class ApiCommon {
      * Dispatch a v1-style op-based request to the appropriate v2 endpoint.
      * Returns JsonElement (the "data" field from v2 response) or null on error.
      */
-    private static JsonElement performRequestV2(Context context, @NonNull HashMap<String, String> m_params,
+    private static JsonElement performRequestV2(Context context, @NonNull HashMap<String, Object> params,
                                                 @NonNull ApiCommon.ApiCaller caller) {
-        String op = m_params.get("op");
+        String op = (String) params.get("op");
+
         if (op == null) {
             caller.setLastError(ApiError.API_UNKNOWN_METHOD);
             return null;
         }
 
-        Map<String, String> queryParams = new HashMap<>();
-        Map<String, String> bodyParams = new HashMap<>();
+        Map<String, Object> queryParams = new HashMap<>();
+        Map<String, Object> bodyParams = new HashMap<>();
 
         // Separate sid from params (v2 uses X-Session-ID header instead)
-        m_params.forEach((k, v) -> {
+        params.forEach((k, v) -> {
             if (!"sid".equals(k)) {
                 if (v != null) {
                     bodyParams.put(k, v);
@@ -200,11 +201,11 @@ public class ApiCommon {
                 return ApiV2Client.postForm(context, "feeds", bodyParams, caller);
 
             case "unsubscribeFeed":
-                String feedId = bodyParams.get("feed_id");
+                String feedId = (String) bodyParams.get("feed_id");
                 return ApiV2Client.delete(context, "feeds/" + feedId, caller);
 
             case "updateFeed":
-                String uid = bodyParams.get("feed_id");
+                String uid = (String) bodyParams.get("feed_id");
                 return ApiV2Client.postForm(context, "feeds/" + uid + "/update", bodyParams, caller);
 
             // ── Categories ─────────────────────────────────────────────────
@@ -220,11 +221,16 @@ public class ApiCommon {
             case "getHeadlines":
                 // feed_id, limit, skip, filter, is_cat, view_mode, etc. → query params
                 queryParams.putAll(bodyParams);
+
+                // skip gets replaced with offset in api v2
+                queryParams.remove("skip");
+                queryParams.put("offset", bodyParams.get("skip"));
+
                 bodyParams.clear();
                 return ApiV2Client.get(context, "articles", queryParams, caller);
 
             case "getArticle":
-                String articleIds = bodyParams.get("article_id");
+                String articleIds = (String) bodyParams.get("article_id");
                 if (articleIds != null) {
                     return ApiV2Client.get(context, "articles/" + articleIds, caller);
                 }
@@ -235,22 +241,16 @@ public class ApiCommon {
                 // v1: field (int) + mode (int) + article_ids (csv) + data
                 // v2: batch PATCH with boolean flags per key
                 // Reconstruct v2 batch body from v1 params
-                Map<String, String> v2BatchBody = new HashMap<>();
-                String articleIdsParam = bodyParams.get("article_ids");
+                Map<String, Object> v2BatchBody = new HashMap<>();
+                String articleIdsParam = (String) bodyParams.get("article_ids");
                 if (articleIdsParam != null) {
                     // Convert CSV to JSON array string for v2
                     String[] ids = articleIdsParam.split(",");
-                    StringBuilder idsJson = new StringBuilder("[");
-                    for (int i = 0; i < ids.length; i++) {
-                        if (i > 0) idsJson.append(",");
-                        idsJson.append(ids[i].trim());
-                    }
-                    idsJson.append("]");
-                    v2BatchBody.put("ids", idsJson.toString());
+                    v2BatchBody.put("ids", ids);
                 }
 
-                String fieldStr = bodyParams.get("field");
-                String modeStr = bodyParams.get("mode");
+                String fieldStr = (String) bodyParams.get("field");
+                String modeStr = (String) bodyParams.get("mode");
                 if (fieldStr != null && modeStr != null) {
                     int field, mode;
                     try {
@@ -283,7 +283,7 @@ public class ApiCommon {
 
             // ── Catchup ────────────────────────────────────────────────────
             case "catchupFeed":
-                String cfId = bodyParams.get("feed_id");
+                String cfId = (String) bodyParams.get("feed_id");
                 return ApiV2Client.patchForm(context, "feeds/" + cfId + "/catchup", bodyParams, caller);
 
             // ── Labels ─────────────────────────────────────────────────────
@@ -298,26 +298,22 @@ public class ApiCommon {
             case "setArticleLabel":
                 // v1: label_id + article_ids (csv) + assign (bool)
                 // v2: POST /labels/{id}/articles with article_ids array
-                String labelId = bodyParams.get("label_id");
-                String assign = bodyParams.get("assign");
+                String labelId = (String) bodyParams.get("label_id");
+                String assign = (String) bodyParams.get("assign");
                 if (labelId == null) {
                     caller.setLastError(ApiError.API_INCORRECT_USAGE);
                     return null;
                 }
-                Map<String, String> labelBody = new HashMap<>();
+
+                Map<String, Object> labelBody = new HashMap<>();
+                // Convert CSV to JSON array
+                String articleIdsLbl = (String) bodyParams.get("article_ids");
+                if (articleIdsLbl != null) {
+                    String[] ids = articleIdsLbl.split(",");
+                    labelBody.put("article_ids", ids);
+                }
+
                 if ("true".equals(assign)) {
-                    // Convert CSV to JSON array
-                    String articleIdsLbl = bodyParams.get("article_ids");
-                    if (articleIdsLbl != null) {
-                        String[] ids = articleIdsLbl.split(",");
-                        StringBuilder idsJson = new StringBuilder("[");
-                        for (int i = 0; i < ids.length; i++) {
-                            if (i > 0) idsJson.append(",");
-                            idsJson.append(ids[i].trim());
-                        }
-                        idsJson.append("]");
-                        labelBody.put("article_ids", idsJson.toString());
-                    }
                     return ApiV2Client.postForm(context, "labels/" + labelId + "/articles", labelBody, caller);
                 } else {
                     return ApiV2Client.deleteForm(context, "labels/" + labelId + "/articles", labelBody, caller);
@@ -337,7 +333,7 @@ public class ApiCommon {
 
             // ── Preferences ────────────────────────────────────────────────
             case "getPref":
-                String prefName = bodyParams.get("pref_name");
+                String prefName = (String) bodyParams.get("pref_name");
                 if (prefName != null) {
                     return ApiV2Client.get(context, "preferences/" + prefName, caller);
                 }
@@ -359,13 +355,13 @@ public class ApiCommon {
         }
     }
 
-    static JsonElement performRequest(Context context, @NonNull HashMap<String, String> m_params,
+    static JsonElement performRequest(Context context, @NonNull HashMap<String, Object> params,
                                       @NonNull ApiCommon.ApiCaller caller) {
         // Feature flag: delegate to v2 client if configured
         String apiVersion = getApiVersion(context);
         if ("v2".equals(apiVersion) || "auto".equals(apiVersion)) {
             try {
-                JsonElement result = performRequestV2(context, m_params, caller);
+                JsonElement result = performRequestV2(context, params, caller);
                 if (result != null || caller.getLastError() != ApiError.NETWORK_UNAVAILABLE) {
                     return result;
                 }
@@ -395,7 +391,7 @@ public class ApiCommon {
 
             Gson gson = new Gson();
 
-            String payload = gson.toJson(new HashMap<>(m_params));
+            String payload = gson.toJson(new HashMap<>(params));
             String apiUrl = m_prefs.getString("ttrss_url", "").trim() + "/api/";
 
             if (m_transportDebugging) Log.d(TAG, ">>> " + payload + " -> " + apiUrl);
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/ApiRequest.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/ApiRequest.java
index 6c174adf..1851f6b3 100644
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/ApiRequest.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/ApiRequest.java
@@ -52,7 +52,7 @@ public class ApiRequest implements ApiCommon.ApiCaller {
      * Called on the main thread; work is dispatched to a background executor.
      * Callback is invoked on the main thread upon completion.
      */
-    public void execute(HashMap<String, String> map, ApiCallback callback) {
+    public void execute(HashMap<String, Object> map, ApiCallback callback) {
         EXECUTOR.execute(() -> {
             JsonElement result = ApiCommon.performRequest(m_context, map, this);
             m_mainHandler.post(() -> {
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 340c1461..73c69429 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
@@ -14,6 +14,7 @@ import com.google.gson.JsonElement;
 import org.fox.ttrss.ApiCommon.ApiError;
 
 import java.io.IOException;
+import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 
@@ -59,28 +60,21 @@ public class ApiV2Client {
     /**
      * Execute a GET request with query parameters.
      */
-    public static JsonElement get(Context context, String path, Map<String, String> queryParams, ApiCommon.ApiCaller caller) {
+    public static JsonElement get(Context context, String path, Map<String, Object> queryParams, ApiCommon.ApiCaller caller) {
         return execute(context, "GET", path, null, caller, queryParams);
     }
 
     /**
      * Execute a POST request with form-encoded body.
      */
-    public static JsonElement postForm(Context context, String path, Map<String, String> bodyParams, ApiCommon.ApiCaller caller) {
-        return execute(context, "POST", path, bodyParams, caller, null);
-    }
-
-    /**
-     * Execute a POST request with JSON body.
-     */
-    public static JsonElement postJson(Context context, String path, Map<String, String> bodyParams, ApiCommon.ApiCaller caller) {
+    public static JsonElement postForm(Context context, String path, Map<String, Object> bodyParams, ApiCommon.ApiCaller caller) {
         return execute(context, "POST", path, bodyParams, caller, null);
     }
 
     /**
      * Execute a PATCH request with form-encoded body.
      */
-    public static JsonElement patchForm(Context context, String path, Map<String, String> bodyParams, ApiCommon.ApiCaller caller) {
+    public static JsonElement patchForm(Context context, String path, Map<String, Object> bodyParams, ApiCommon.ApiCaller caller) {
         return execute(context, "PATCH", path, bodyParams, caller, null);
     }
 
@@ -94,16 +88,16 @@ public class ApiV2Client {
     /**
      * Execute a DELETE request with form-encoded body.
      */
-    public static JsonElement deleteForm(Context context, String path, Map<String, String> bodyParams, ApiCommon.ApiCaller caller) {
+    public static JsonElement deleteForm(Context context, String path, Map<String, Object> bodyParams, ApiCommon.ApiCaller caller) {
         return execute(context, "DELETE", path, bodyParams, caller, null);
     }
 
     // ─── Core request execution ───────────────────────────────────────────────
 
     private static JsonElement execute(Context context, String method, String path,
-                                       Map<String, String> bodyParams,
+                                       Map<String, Object> bodyParams,
                                        ApiCommon.ApiCaller caller,
-                                       Map<String, String> queryParams) {
+                                       Map<String, Object> queryParams) {
         try {
             if (!ApiCommon.isNetworkAvailable(context)) {
                 caller.setLastError(ApiError.NETWORK_UNAVAILABLE);
@@ -121,9 +115,10 @@ public class ApiV2Client {
                 queryParams.remove("op");
                 queryParams.remove("method");
 
+                // no arrays for query params
                 HttpUrl.Builder urlBuilder = HttpUrl.parse(fullUrl).newBuilder();
-                for (Map.Entry<String, String> entry : queryParams.entrySet()) {
-                    urlBuilder.addQueryParameter(entry.getKey(), entry.getValue());
+                for (Map.Entry<String, Object> entry : queryParams.entrySet()) {
+                    urlBuilder.addQueryParameter(entry.getKey(), entry.getValue().toString());
                 }
                 fullUrl = urlBuilder.build().toString();
             }
@@ -139,9 +134,28 @@ public class ApiV2Client {
 
                 // Use form-encoded body for v2 API
                 FormBody.Builder formBuilder = new FormBody.Builder();
-                for (Map.Entry<String, String> entry : bodyParams.entrySet()) {
-                    formBuilder.add(entry.getKey(), entry.getValue() != null ? entry.getValue() : "");
+                for (Map.Entry<String, Object> entry : bodyParams.entrySet()) {
+                    Object value = entry.getValue();
+
+                    if (value instanceof List) {
+                        // Handle Java Lists (like ArrayList)
+                        List<?> list = (List<?>) value;
+                        for (Object item : list) {
+                            formBuilder.add(entry.getKey() + "[]", item != null ? item.toString() : "");
+                        }
+                    } else if (value.getClass().isArray()) {
+                        // Handle standard Java Arrays (like String[])
+                        int length = java.lang.reflect.Array.getLength(value);
+                        for (int i = 0; i < length; i++) {
+                            Object item = java.lang.reflect.Array.get(value, i);
+                            formBuilder.add(entry.getKey() + "[]", item != null ? item.toString() : "");
+                        }
+                    } else {
+                        // Handle primitive types (String, Integer, Boolean)
+                        formBuilder.add(entry.getKey(), value.toString());
+                    }
                 }
+
                 requestBody = formBuilder.build();
             }
 
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleModel.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleModel.java
index a4aedca5..e2a51534 100644
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleModel.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleModel.java
@@ -222,7 +222,7 @@ public class ArticleModel extends AndroidViewModel implements ApiCommon.ApiCalle
         final boolean allowForceUpdate = org.fox.ttrss.Application.getInstance().getApiLevel() >= 9 &&
                 !m_feed.is_cat && m_feed.id > 0 && !m_append && skip == 0;
 
-        HashMap<String, String> params = new HashMap<>();
+        HashMap<String, Object> params = new HashMap<>();
 
         params.put("op", "getHeadlines");
         params.put("sid", org.fox.ttrss.Application.getInstance().getSessionId());
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsModel.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsModel.java
index aeefb08b..0083330d 100644
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsModel.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsModel.java
@@ -100,7 +100,7 @@ public class FeedsModel extends AndroidViewModel implements ApiCommon.ApiCaller
         m_isLoading.postValue(true);
 
         m_executor.execute(() -> {
-            final HashMap<String, String> params = new HashMap<>();
+            final HashMap<String, Object> params = new HashMap<>();
 
             params.put("op", "getFeeds");
             params.put("cat_id", String.valueOf(m_feed.id));
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/MasterActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/MasterActivity.java
index c1cea4cd..f1984219 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/MasterActivity.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/MasterActivity.java
@@ -144,7 +144,7 @@ public class MasterActivity extends OnlineActivity implements HeadlinesEventList
                     }
                 });
 
-                HashMap<String, String> map = new HashMap<>();
+                HashMap<String, Object> map = new HashMap<>();
                 map.put("op", "login");
                 map.put("user", m_prefs.getString("login", "").trim());
                 map.put("password", m_prefs.getString("password", "").trim());
@@ -472,7 +472,7 @@ public class MasterActivity extends OnlineActivity implements HeadlinesEventList
     }
 
     public void unsubscribeFeed(final Feed feed) {
-        HashMap<String, String> map = new HashMap<>();
+        HashMap<String, Object> map = new HashMap<>();
         map.put("sid", getSessionId());
         map.put("op", "unsubscribeFeed");
         map.put("feed_id", String.valueOf(feed.id));
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java
index a65a3dc1..b419c581 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java
@@ -247,7 +247,7 @@ public class OnlineActivity extends CommonActivity {
 
             LoginRequest ar = new LoginRequest(getApplicationContext(), refresh, listener);
 
-            HashMap<String, String> map = new HashMap<>();
+            HashMap<String, Object> map = new HashMap<>();
             map.put("op", "login");
             map.put("user", m_prefs.getString("login", "").trim());
             map.put("password", m_prefs.getString("password", "").trim());
@@ -714,7 +714,7 @@ public class OnlineActivity extends CommonActivity {
                         .setMultiChoiceItems(items, checkedItems, (dialog, which, isChecked) -> {
                             final int labelId = itemIds[which];
 
-                            HashMap<String, String> map = new HashMap<>();
+                            HashMap<String, Object> map = new HashMap<>();
                             map.put("sid", getSessionId());
                             map.put("op", "setArticleLabel");
                             map.put("label_id", String.valueOf(labelId));
@@ -741,7 +741,7 @@ public class OnlineActivity extends CommonActivity {
             }
         };
 
-        HashMap<String, String> map = new HashMap<>();
+        HashMap<String, Object> map = new HashMap<>();
         map.put("sid", getSessionId());
         map.put("op", "getLabels");
         map.put("article_id", String.valueOf(articleId));
@@ -939,7 +939,7 @@ public class OnlineActivity extends CommonActivity {
     public void catchupFeed(final Feed feed, final String mode, final boolean refreshAfter, final String searchQuery) {
         Log.d(TAG, "catchupFeed=" + feed + "; mode=" + mode + "; search=" + searchQuery);
 
-        HashMap<String, String> map = new HashMap<>();
+        HashMap<String, Object> map = new HashMap<>();
         map.put("sid", getSessionId());
         map.put("op", "catchupFeed");
         map.put("feed_id", String.valueOf(feed.id));
@@ -1016,7 +1016,7 @@ public class OnlineActivity extends CommonActivity {
     }
 
     public void setArticlesField(final List<Article> articles, int field, int mode) {
-        HashMap<String, String> map = new HashMap<>();
+        HashMap<String, Object> map = new HashMap<>();
         map.put("sid", getSessionId());
         map.put("op", "updateArticle");
         map.put("article_ids", articles.stream()
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/RootCategoriesModel.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/RootCategoriesModel.java
index d1e3a04a..3bdaa528 100644
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/RootCategoriesModel.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/RootCategoriesModel.java
@@ -41,7 +41,7 @@ public class RootCategoriesModel extends FeedsModel {
 
             // get special category with counters for embedding
             if (expandSpecial) {
-                final HashMap<String, String> params = new HashMap<>();
+                final HashMap<String, Object> params = new HashMap<>();
 
                 params.put("op", "getFeeds");
                 params.put("cat_id", String.valueOf(Feed.CAT_SPECIAL));
@@ -78,7 +78,7 @@ public class RootCategoriesModel extends FeedsModel {
             }
 
             // get all root categories
-            final HashMap<String, String> params = new HashMap<>();
+            final HashMap<String, Object> params = new HashMap<>();
 
             params.put("op", "getCategories");
             params.put("sid", ((org.fox.ttrss.Application) getApplication()).getSessionId());
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/share/ShareActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/share/ShareActivity.java
index 2e1e0f90..5c95d0fa 100644
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/share/ShareActivity.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/share/ShareActivity.java
@@ -87,7 +87,7 @@ public class ShareActivity extends CommonShareActivity {
         final EditText content = (EditText) findViewById(R.id.content);
 
         if (url != null && title != null && content != null) {
-            HashMap<String, String> map = new HashMap<>();
+            HashMap<String, Object> map = new HashMap<>();
             map.put("sid", m_sessionId);
             map.put("op", "shareToPublished");
             map.put("title", title.getText().toString());
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/share/SubscribeActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/share/SubscribeActivity.java
index 4d90809a..2477a240 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/share/SubscribeActivity.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/share/SubscribeActivity.java
@@ -150,7 +150,7 @@ public class SubscribeActivity extends CommonShareActivity {
         final EditText feedUrl = findViewById(R.id.feed_url);
 
         if (feedUrl != null) {
-            HashMap<String, String> map = new HashMap<>();
+            HashMap<String, Object> map = new HashMap<>();
             map.put("sid", m_sessionId);
             map.put("op", "subscribeToFeed");
             map.put("feed_url", feedUrl.getText().toString());
@@ -248,7 +248,7 @@ public class SubscribeActivity extends CommonShareActivity {
     }
 
     private void updateCats() {
-        HashMap<String, String> map = new HashMap<>();
+        HashMap<String, Object> map = new HashMap<>();
         map.put("sid", m_sessionId);
         map.put("op", "getCategories");
 
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/util/SimpleLoginManager.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/util/SimpleLoginManager.java
index 11e0026d..84fac86c 100644
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/util/SimpleLoginManager.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/util/SimpleLoginManager.java
@@ -58,7 +58,7 @@ public abstract class SimpleLoginManager {
     public void logIn(Context context, int requestId, final String login, final String password) {
         LoginRequest ar = new LoginRequest(context, requestId);
 
-        HashMap<String, String> map = new HashMap<>();
+        HashMap<String, Object> map = new HashMap<>();
         map.put("op", "login");
         map.put("user", login.trim());
         map.put("password", password.trim());