about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorfox <fox@fakecake.org>2026-06-06 11:35:13 +0300
committerfox <fox@fakecake.org>2026-06-06 11:35:13 +0300
commit6b78dec41da6f4b0526191ef52cef7c51cf29aeb (patch)
treee29e938eba5179a2ab538ab2d9d3cf857a455749
parent258dac5460ae5536d4782313c1361ee4f0a9eb86 (diff)
parent76c7e85e0d4d0878559b44925328593a88c2c8fc (diff)
downloadtt-rss-android-6b78dec41da6f4b0526191ef52cef7c51cf29aeb.tar.gz
tt-rss-android-6b78dec41da6f4b0526191ef52cef7c51cf29aeb.tar.xz
Merge branch 'dev' into 'master' 26.06-6b78dec4-signed
Dev

See merge request git/tt-rss/tt-rss-android!72
-rw-r--r--README.md3
-rwxr-xr-xorg.fox.ttrss/src/main/AndroidManifest.xml14
-rw-r--r--org.fox.ttrss/src/main/java/org/fox/ttrss/ApiCommon.java259
-rw-r--r--org.fox.ttrss/src/main/java/org/fox/ttrss/ApiRequest.java66
-rw-r--r--org.fox.ttrss/src/main/java/org/fox/ttrss/ApiV2Client.java461
-rw-r--r--org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleModel.java2
-rwxr-xr-xorg.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java38
-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.java45
-rwxr-xr-xorg.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java400
-rwxr-xr-xorg.fox.ttrss/src/main/java/org/fox/ttrss/share/CommonShareActivity.java3
-rw-r--r--org.fox.ttrss/src/main/java/org/fox/ttrss/share/ShareActivity.java36
-rwxr-xr-xorg.fox.ttrss/src/main/java/org/fox/ttrss/share/SubscribeActivity.java124
-rwxr-xr-xorg.fox.ttrss/src/main/java/org/fox/ttrss/util/DeviceBootReceiver.java5
-rw-r--r--org.fox.ttrss/src/main/java/org/fox/ttrss/util/SimpleLoginManager.java74
-rwxr-xr-xorg.fox.ttrss/src/main/java/org/fox/ttrss/widget/SmallWidgetProvider.java73
-rwxr-xr-xorg.fox.ttrss/src/main/java/org/fox/ttrss/widget/WidgetUpdateService.java219
-rw-r--r--org.fox.ttrss/src/main/res/drawable/widget_border.xml6
-rwxr-xr-xorg.fox.ttrss/src/main/res/layout/widget_small.xml50
-rw-r--r--org.fox.ttrss/src/main/res/values-cs/strings.xml9
-rw-r--r--org.fox.ttrss/src/main/res/values-de/strings.xml9
-rw-r--r--org.fox.ttrss/src/main/res/values-es/strings.xml9
-rw-r--r--org.fox.ttrss/src/main/res/values-et/strings.xml7
-rw-r--r--org.fox.ttrss/src/main/res/values-eu/strings.xml9
-rw-r--r--org.fox.ttrss/src/main/res/values-fi/strings.xml3
-rw-r--r--org.fox.ttrss/src/main/res/values-fr/strings.xml9
-rw-r--r--org.fox.ttrss/src/main/res/values-it/strings.xml9
-rw-r--r--org.fox.ttrss/src/main/res/values-ja/strings.xml9
-rw-r--r--org.fox.ttrss/src/main/res/values-nl/strings.xml9
-rw-r--r--org.fox.ttrss/src/main/res/values-pl/strings.xml9
-rw-r--r--org.fox.ttrss/src/main/res/values-pt-rBR/strings.xml9
-rw-r--r--org.fox.ttrss/src/main/res/values-ru/strings.xml9
-rw-r--r--org.fox.ttrss/src/main/res/values-sk/strings.xml9
-rw-r--r--org.fox.ttrss/src/main/res/values-sq/strings.xml9
-rw-r--r--org.fox.ttrss/src/main/res/values-sv/strings.xml8
-rw-r--r--org.fox.ttrss/src/main/res/values-ta/strings.xml9
-rw-r--r--org.fox.ttrss/src/main/res/values-uk/strings.xml9
-rw-r--r--org.fox.ttrss/src/main/res/values-zh-rCN/strings.xml9
-rw-r--r--org.fox.ttrss/src/main/res/values-zh-rTW/strings.xml9
-rw-r--r--org.fox.ttrss/src/main/res/values/arrays.xml27
-rwxr-xr-xorg.fox.ttrss/src/main/res/values/strings.xml17
-rwxr-xr-xorg.fox.ttrss/src/main/res/xml/preferences.xml30
-rw-r--r--org.fox.ttrss/src/main/res/xml/widget_small.xml7
43 files changed, 1144 insertions, 988 deletions
diff --git a/README.md b/README.md
index 8b280e93..1127d547 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,6 @@
 Tiny Tiny RSS client for Android
 ================================
 
-- https://git.tt-rss.org/fox/tt-rss-android.git
-- https://gitlab.tt-rss.org/tt-rss/tt-rss-android/-/releases
-
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation, either version 3 of the License, or
diff --git a/org.fox.ttrss/src/main/AndroidManifest.xml b/org.fox.ttrss/src/main/AndroidManifest.xml
index f2a209f9..b0b35cd2 100755
--- a/org.fox.ttrss/src/main/AndroidManifest.xml
+++ b/org.fox.ttrss/src/main/AndroidManifest.xml
@@ -191,20 +191,6 @@
             </intent-filter>
         </receiver>
 
-        <receiver android:name=".widget.SmallWidgetProvider" android:exported="true">
-            <intent-filter>
-                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
-                <action android:name="org.fox.ttrss.WIDGET_FORCE_UPDATE" />
-            </intent-filter>
-
-            <meta-data
-                android:name="android.appwidget.provider"
-                android:resource="@xml/widget_small" />
-        </receiver>
-
-        <service
-            android:name=".widget.WidgetUpdateService"
-            android:permission="android.permission.BIND_JOB_SERVICE" />
 
         <activity
             android:name=".GalleryActivity"
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 70de409a..89152121 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
@@ -30,6 +30,7 @@ import java.security.PrivateKey;
 import java.security.cert.X509Certificate;
 import java.util.HashMap;
 import java.util.Locale;
+import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
 import javax.net.ssl.KeyManager;
@@ -56,6 +57,12 @@ import okio.Source;
 public class ApiCommon {
     public static final String TAG = "ApiCommon";
 
+    /**
+     * SharedPreferences key for selecting API version.
+     * Values: "v1" (default), "v2", or "auto" (try v2, fall back to v1).
+     */
+    public static final String PREF_API_VERSION = "api_version";
+
     private static final int API_STATUS_OK = 0;
     private static final int API_STATUS_ERR = 1;
 
@@ -69,6 +76,8 @@ public class ApiCommon {
         void setLastErrorMessage(String message);
 
         void notifyProgress(int progress);
+
+        ApiError getLastError();
     }
 
     public enum ApiError {
@@ -135,8 +144,258 @@ public class ApiCommon {
         return networkInfo != null && networkInfo.isConnected();
     }
 
+    /**
+     * Get the configured API version from SharedPreferences.
+     * Returns "v1" if not set or invalid.
+     */
+    static String getApiVersion(Context context) {
+        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
+        String version = prefs.getString(PREF_API_VERSION, "v1");
+        if (!"v1".equals(version) && !"v2".equals(version) && !"auto".equals(version)) {
+            return "v1";
+        }
+        return version;
+    }
+
+    /**
+     * 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,
+                                                @NonNull ApiCommon.ApiCaller caller) {
+        String op = m_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<>();
+
+        // Separate sid from params (v2 uses X-Session-ID header instead)
+        m_params.forEach((k, v) -> {
+            if (!"sid".equals(k)) {
+                if (v != null) {
+                    bodyParams.put(k, v);
+                }
+            }
+        });
+
+        switch (op) {
+            // ── Auth ───────────────────────────────────────────────────────
+            case "login":
+                return ApiV2Client.postForm(context, "auth/login", bodyParams, caller);
+
+            case "logout":
+                return ApiV2Client.postForm(context, "auth/logout", bodyParams, caller);
+
+            case "isLoggedIn":
+                return ApiV2Client.get(context, "auth/session", caller);
+
+            // ── System ─────────────────────────────────────────────────────
+            case "getVersion":
+                return ApiV2Client.get(context, "version", caller);
+
+            case "getApiLevel":
+                // v2 has no getApiLevel endpoint; use version and extract api_level
+                JsonElement versionResult = ApiV2Client.get(context, "version", caller);
+                if (versionResult != null && caller.getLastError() == ApiError.SUCCESS) {
+                    // v2 version response may include api_level in data
+                    return versionResult;
+                }
+                return null;
+
+            case "getConfig":
+                return ApiV2Client.get(context, "config", caller);
+
+            // ── Feeds ──────────────────────────────────────────────────────
+            case "getFeeds":
+                // cat_id, unread_only, limit, offset, include_nested → query params
+                queryParams.putAll(bodyParams);
+                bodyParams.clear();
+                return ApiV2Client.get(context, "feeds", queryParams, caller);
+
+            case "subscribeToFeed":
+                return ApiV2Client.postForm(context, "feeds", bodyParams, caller);
+
+            case "unsubscribeFeed":
+                String feedId = bodyParams.get("feed_id");
+                return ApiV2Client.delete(context, "feeds/" + feedId, caller);
+
+            case "updateFeed":
+                String uid = bodyParams.get("feed_id");
+                return ApiV2Client.postForm(context, "feeds/" + uid + "/update", bodyParams, caller);
+
+            // ── Categories ─────────────────────────────────────────────────
+            case "getCategories":
+                // enable_nested → include_empty (semantic inversion in v2)
+                if (bodyParams.containsKey("enable_nested")) {
+                    bodyParams.put("include_empty", bodyParams.get("enable_nested"));
+                    bodyParams.remove("enable_nested");
+                }
+                return ApiV2Client.get(context, "categories", bodyParams, caller);
+
+            // ── Articles ───────────────────────────────────────────────────
+            case "getHeadlines":
+                // feed_id, limit, skip, filter, is_cat, view_mode, etc. → query params
+                queryParams.putAll(bodyParams);
+                bodyParams.clear();
+                return ApiV2Client.get(context, "articles", queryParams, caller);
+
+            case "getArticle":
+                String articleIds = bodyParams.get("article_id");
+                if (articleIds != null) {
+                    return ApiV2Client.get(context, "articles/" + articleIds, caller);
+                }
+                caller.setLastError(ApiError.API_INCORRECT_USAGE);
+                return null;
+
+            case "updateArticle":
+                // 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");
+                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());
+                }
+
+                String fieldStr = bodyParams.get("field");
+                String modeStr = bodyParams.get("mode");
+                if (fieldStr != null && modeStr != null) {
+                    int field = Integer.parseInt(fieldStr);
+                    int mode = Integer.parseInt(modeStr);
+
+                    switch (field) {
+                        case 0: // marked
+                            v2BatchBody.put("marked", String.valueOf(mode == 1));
+                            break;
+                        case 1: // published
+                            v2BatchBody.put("published", String.valueOf(mode == 1));
+                            break;
+                        case 2: // unread
+                            v2BatchBody.put("unread", String.valueOf(mode == 1));
+                            break;
+                        case 3: // note
+                            v2BatchBody.put("note", bodyParams.getOrDefault("data", ""));
+                            break;
+                        case 4: // score
+                            v2BatchBody.put("score", bodyParams.getOrDefault("data", "0"));
+                            break;
+                    }
+                }
+                return ApiV2Client.patchForm(context, "articles", v2BatchBody, caller);
+
+            // ── Catchup ────────────────────────────────────────────────────
+            case "catchupFeed":
+                String cfId = bodyParams.get("feed_id");
+                return ApiV2Client.patchForm(context, "feeds/" + cfId + "/catchup", bodyParams, caller);
+
+            // ── Labels ─────────────────────────────────────────────────────
+            case "getLabels":
+                // article_id → query param
+                if (bodyParams.containsKey("article_id")) {
+                    queryParams.put("article_id", bodyParams.get("article_id"));
+                    bodyParams.clear();
+                }
+                return ApiV2Client.get(context, "labels", queryParams, caller);
+
+            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");
+                if (labelId == null) {
+                    caller.setLastError(ApiError.API_INCORRECT_USAGE);
+                    return null;
+                }
+                Map<String, String> labelBody = new HashMap<>();
+                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);
+                }
+
+            // ── Unread / Counters / Feed Tree ──────────────────────────────
+            case "getUnread":
+                queryParams.putAll(bodyParams);
+                bodyParams.clear();
+                return ApiV2Client.get(context, "unread", queryParams, caller);
+
+            case "getCounters":
+                return ApiV2Client.get(context, "counters", caller);
+
+            case "getFeedTree":
+                return ApiV2Client.get(context, "feed-tree", bodyParams, caller);
+
+            // ── Preferences ────────────────────────────────────────────────
+            case "getPref":
+                String prefName = bodyParams.get("pref_name");
+                if (prefName != null) {
+                    return ApiV2Client.get(context, "preferences/" + prefName, caller);
+                }
+                caller.setLastError(ApiError.API_INCORRECT_USAGE);
+                return null;
+
+            // ── v1-only operations (no v2 equivalent) ──────────────────────
+            case "shareToPublished":
+                // v1-only operation; signal to fall back to v1
+                Log.d(TAG, "shareToPublished has no v2 equivalent, falling back");
+                caller.setLastError(ApiError.API_UNKNOWN_METHOD);
+                return null;
+
+            // ── Unknown ────────────────────────────────────────────────────
+            default:
+                Log.d(TAG, "Unknown APIv2 op: " + op);
+                caller.setLastError(ApiError.API_UNKNOWN_METHOD);
+                return null;
+        }
+    }
+
     static JsonElement performRequest(Context context, @NonNull HashMap<String, String> m_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);
+                if (result != null || caller.getLastError() != ApiError.NETWORK_UNAVAILABLE) {
+                    return result;
+                }
+                // auto mode: fall through to v1 if v2 failed
+                if ("auto".equals(apiVersion)) {
+                    Log.d(TAG, "APIv2 failed, falling back to v1");
+                }
+            } catch (Exception e) {
+                Log.e(TAG, "APIv2 exception, falling back to v1: " + e.getMessage());
+                if ("auto".equals(apiVersion)) {
+                    // Continue to v1
+                } else {
+                    throw e;
+                }
+            }
+        }
+
         try {
             if (!ApiCommon.isNetworkAvailable(context)) {
                 caller.setLastError(ApiError.NETWORK_UNAVAILABLE);
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 c213dd86..e2e67459 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
@@ -2,21 +2,24 @@ package org.fox.ttrss;
 
 import static org.fox.ttrss.ApiCommon.ApiError;
 
-import android.annotation.SuppressLint;
 import android.content.Context;
-import android.os.AsyncTask;
+import android.os.Handler;
+import android.os.Looper;
 
 import com.google.gson.JsonElement;
 
 import java.util.HashMap;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 
-public class ApiRequest extends AsyncTask<HashMap<String, String>, Integer, JsonElement> implements ApiCommon.ApiCaller {
+public class ApiRequest implements ApiCommon.ApiCaller {
 
-    protected int m_apiStatusCode = 0;
+    private static final ExecutorService EXECUTOR = Executors.newSingleThreadExecutor();
+    private final Handler m_mainHandler = new Handler(Looper.getMainLooper());
 
-    private final Context m_context;
+    protected final Context m_context;
+    protected int m_apiStatusCode = 0;
     protected String m_lastErrorMessage;
-
     protected ApiError m_lastError;
 
     public ApiRequest(Context context) {
@@ -24,19 +27,44 @@ public class ApiRequest extends AsyncTask<HashMap<String, String>, Integer, Json
         m_lastError = ApiError.UNKNOWN_ERROR;
     }
 
-    @SuppressLint("NewApi")
-    @SuppressWarnings("unchecked")
-    public void execute(HashMap<String, String> map) {
-        super.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, map);
+    /**
+     * Callback interface for API request completion.
+     * Both onSuccess and onError are invoked on the main thread before onApiFinished().
+     */
+    public interface ApiCallback {
+        void onSuccess(JsonElement result);
+        void onError(ApiError error, String message, int statusCode);
     }
 
-    public int getErrorMessage() {
-        return ApiCommon.getErrorMessage(m_lastError);
+    /**
+     * Execute the API request with a callback for the result.
+     * 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) {
+        EXECUTOR.execute(() -> {
+            JsonElement result = ApiCommon.performRequest(m_context, map, this);
+            m_mainHandler.post(() -> {
+                if (result != null && m_lastError == ApiError.SUCCESS) {
+                    callback.onSuccess(result);
+
+                    onApiFinished(result);
+                } else {
+                    callback.onError(m_lastError, m_lastErrorMessage, m_apiStatusCode);
+                }
+            });
+        });
     }
 
-    @Override
-    protected JsonElement doInBackground(HashMap<String, String>... params) {
-        return ApiCommon.performRequest(m_context, params[0], this);
+    /**
+     * Hook for subclasses to handle the result on the main thread.
+     * Override this instead of onPostExecute. Called only on success.
+     * For error handling, use the ApiCallback.onError() method.
+     *
+     * This is invoked after ApiCallback onSuccess().
+     */
+    protected void onApiFinished(JsonElement result) {
+        // no-op by default
     }
 
     @Override
@@ -56,6 +84,12 @@ public class ApiRequest extends AsyncTask<HashMap<String, String>, Integer, Json
 
     @Override
     public void notifyProgress(int progress) {
-        publishProgress(progress);
+        // Progress is no longer tracked via AsyncTask's publishProgress.
+        // Subclasses can override if they need progress notifications.
+    }
+
+    @Override
+    public ApiError getLastError() {
+        return m_lastError;
     }
 }
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
new file mode 100644
index 00000000..12163413
--- /dev/null
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/ApiV2Client.java
@@ -0,0 +1,461 @@
+package org.fox.ttrss;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.util.Log;
+
+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;
+
+import java.io.IOException;
+import java.security.PrivateKey;
+import java.security.cert.X509Certificate;
+import java.util.Locale;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+
+import javax.net.ssl.KeyManager;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.TrustManagerFactory;
+
+import okhttp3.Credentials;
+import okhttp3.FormBody;
+import okhttp3.HttpUrl;
+import okhttp3.Interceptor;
+import okhttp3.MediaType;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.RequestBody;
+import okhttp3.Response;
+import okhttp3.ResponseBody;
+import okio.Buffer;
+import okio.BufferedSource;
+import okio.ForwardingSource;
+import okio.Okio;
+import okio.Source;
+
+/**
+ * RESTful APIv2 client for tt-rss.
+ *
+ * Replaces the old v1 "op-based" POST /api/ endpoint with proper HTTP methods
+ * and X-Session-ID header authentication.
+ *
+ * Response format: {"success": true/false, "data": ..., "error": {...}}
+ * Error codes map to the same ApiError enum as v1 for backward compatibility.
+ */
+public class ApiV2Client {
+    public static final String TAG = "ApiV2Client";
+
+    /**
+     * Build an OkHttpClient with the given progress listener (or null for no progress).
+     * Handles mutual TLS if configured.
+     */
+    private static OkHttpClient buildClient(Context context, ProgressListener progressListener) {
+        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
+        OkHttpClient.Builder builder = new OkHttpClient.Builder()
+                .connectTimeout(10, TimeUnit.SECONDS)
+                .writeTimeout(10, TimeUnit.SECONDS)
+                .readTimeout(30, TimeUnit.SECONDS);
+
+        if (progressListener != null) {
+            builder.addNetworkInterceptor(createProgressInterceptor(progressListener));
+        }
+
+        if (prefs.getBoolean("mtls_enabled", false)) {
+            String clientCertAlias = prefs.getString("mtls_certificate_alias", null);
+            if (clientCertAlias != null) {
+                try {
+                    X509Certificate[] chain = android.security.KeyChain.getCertificateChain(context, clientCertAlias);
+                    PrivateKey privateKey = android.security.KeyChain.getPrivateKey(context, clientCertAlias);
+
+                    KeyManager[] keyManagers = new KeyManager[]{new KeyChainKeyManager(clientCertAlias, chain, privateKey)};
+
+                    TrustManagerFactory trustManagerFactory = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
+                    trustManagerFactory.init((java.security.KeyStore) null);
+                    TrustManager[] trustManagers = trustManagerFactory.getTrustManagers();
+
+                    SSLContext sslContext = SSLContext.getInstance("TLS");
+                    sslContext.init(keyManagers, trustManagers, null);
+                    builder.sslSocketFactory(sslContext.getSocketFactory());
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+
+        return builder.build();
+    }
+
+    /**
+     * Build the base URL for APIv2 requests.
+     */
+    private static String buildBaseUrl(Context context) {
+        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
+        String baseUrl = prefs.getString("ttrss_url", "").trim();
+        return baseUrl + "/api/v2/";
+    }
+
+    /**
+     * Execute a GET request.
+     */
+    public static JsonElement get(Context context, String path, ApiCommon.ApiCaller caller) {
+        return execute(context, "GET", path, null, caller, null);
+    }
+
+    /**
+     * Execute a GET request with query parameters.
+     */
+    public static JsonElement get(Context context, String path, Map<String, String> 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) {
+        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) {
+        return execute(context, "PATCH", path, bodyParams, caller, null);
+    }
+
+    /**
+     * Execute a DELETE request.
+     */
+    public static JsonElement delete(Context context, String path, ApiCommon.ApiCaller caller) {
+        return execute(context, "DELETE", path, null, caller, null);
+    }
+
+    /**
+     * Execute a DELETE request with form-encoded body.
+     */
+    public static JsonElement deleteForm(Context context, String path, Map<String, String> 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,
+                                       ApiCommon.ApiCaller caller,
+                                       Map<String, String> queryParams) {
+        try {
+            if (!ApiCommon.isNetworkAvailable(context)) {
+                caller.setLastError(ApiError.NETWORK_UNAVAILABLE);
+                return null;
+            }
+
+            String baseUrl = buildBaseUrl(context);
+            String fullUrl = baseUrl + path;
+
+            // Build query string
+            if (queryParams != null && !queryParams.isEmpty()) {
+
+                // This uses different notation in V1 api so we can't remove those at the source just yet and keep
+                // compatibility, for now just drop them here (our route should be specified with URL path)
+                queryParams.remove("op");
+                queryParams.remove("method");
+
+                HttpUrl.Builder urlBuilder = HttpUrl.parse(fullUrl).newBuilder();
+                for (Map.Entry<String, String> entry : queryParams.entrySet()) {
+                    urlBuilder.addQueryParameter(entry.getKey(), entry.getValue());
+                }
+                fullUrl = urlBuilder.build().toString();
+            }
+
+            // Build request body (for POST/PATCH/DELETE with body params)
+            RequestBody requestBody = null;
+            if (bodyParams != null && !bodyParams.isEmpty()) {
+
+                // This uses different notation in V1 api so we can't remove those at the source just yet and keep
+                // compatibility, for now just drop them here (our route should be specified with URL path)
+                bodyParams.remove("op");
+                bodyParams.remove("method");
+
+                // 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() : "");
+                }
+                requestBody = formBuilder.build();
+            }
+
+            // Build request
+            Request.Builder requestBuilder = new Request.Builder()
+                    .url(fullUrl)
+                    .header("User-Agent", getUserAgent(context));
+
+            // Add session header for authenticated endpoints
+            String sessionId = org.fox.ttrss.Application.getInstance().getSessionId();
+            if (sessionId != null && !sessionId.isEmpty()) {
+                requestBuilder.header("X-Session-ID", sessionId);
+            }
+
+            // Add HTTP Basic auth if configured
+            SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
+            String httpLogin = prefs.getString("http_login", "").trim();
+            String httpPassword = prefs.getString("http_password", "").trim();
+            if (!httpLogin.isEmpty()) {
+                requestBuilder.header("Authorization", Credentials.basic(httpLogin, httpPassword));
+            }
+
+            // Set HTTP method and body
+            if (requestBody != null) {
+                requestBuilder.method(method, requestBody);
+            } else {
+                requestBuilder.method(method, null);
+            }
+
+            // Debug logging
+            SharedPreferences prefsDebug = PreferenceManager.getDefaultSharedPreferences(context);
+            if (prefsDebug.getBoolean("transport_debugging", false)) {
+                Log.d(TAG, ">>> " + method + " " + fullUrl);
+                if (bodyParams != null && !bodyParams.isEmpty()) {
+                    Log.d(TAG, "    body: " + new Gson().toJson(bodyParams));
+                }
+            }
+
+            // Build client and execute
+            OkHttpClient client = buildClient(context, null);
+            Response response = client.newCall(requestBuilder.build()).execute();
+
+            if (response.isSuccessful()) {
+                String payload = response.body().string();
+
+                if (prefsDebug.getBoolean("transport_debugging", false)) {
+                    Log.d(TAG, "<<< " + payload);
+                }
+
+                return parseV2Response(payload, caller);
+            } else {
+                // Handle HTTP error codes
+                response.body().close();
+                mapHttpStatusError(response.code(), caller);
+                return null;
+            }
+
+        } catch (javax.net.ssl.SSLPeerUnverifiedException e) {
+            caller.setLastError(ApiError.SSL_REJECTED);
+            caller.setLastErrorMessage(e.getMessage());
+            e.printStackTrace();
+            return null;
+        } catch (IOException e) {
+            caller.setLastError(ApiError.IO_ERROR);
+            caller.setLastErrorMessage(e.getMessage());
+
+            if (e.getMessage() != null && e.getMessage().matches("Hostname [^ ]+ was not verified")) {
+                caller.setLastError(ApiError.SSL_HOSTNAME_REJECTED);
+            }
+
+            e.printStackTrace();
+            return null;
+        } catch (Exception e) {
+            caller.setLastError(ApiError.OTHER_ERROR);
+            caller.setLastErrorMessage(e.getMessage());
+            e.printStackTrace();
+            return null;
+        }
+    }
+
+    /**
+     * 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 ─────────────────────────────────────────────────────
+
+    /**
+     * Internal progress callback interface.
+     * Mirrors ApiCommon.ResponseProgressListener (which is private there).
+     */
+    private interface ProgressListener {
+        void update(HttpUrl url, long bytesRead, long contentLength);
+    }
+
+    private static Interceptor createProgressInterceptor(final ProgressListener listener) {
+        return chain -> {
+            Request request = chain.request();
+            Response response = chain.proceed(request);
+            return response.newBuilder()
+                    .body(new ProgressResponseBody(request.url(), response.body(), listener))
+                    .build();
+        };
+    }
+
+    private static class ProgressResponseBody extends ResponseBody {
+        private final HttpUrl url;
+        private final ResponseBody responseBody;
+        private final ProgressListener progressListener;
+        private BufferedSource bufferedSource;
+
+        public ProgressResponseBody(HttpUrl url, ResponseBody responseBody,
+                                    ProgressListener progressListener) {
+            this.url = url;
+            this.responseBody = responseBody;
+            this.progressListener = progressListener;
+        }
+
+        @Override
+        public MediaType contentType() {
+            return responseBody.contentType();
+        }
+
+        @Override
+        public long contentLength() {
+            return responseBody.contentLength();
+        }
+
+        @Override
+        public BufferedSource source() {
+            if (bufferedSource == null) {
+                bufferedSource = Okio.buffer(source(responseBody.source()));
+            }
+            return bufferedSource;
+        }
+
+        private Source source(Source source) {
+            return new ForwardingSource(source) {
+                long totalBytesRead = 0L;
+
+                @Override
+                public long read(Buffer sink, long byteCount) throws IOException {
+                    long bytesRead = super.read(sink, byteCount);
+                    long fullLength = responseBody.contentLength();
+                    if (bytesRead == -1) {
+                        totalBytesRead = fullLength;
+                    } else {
+                        totalBytesRead += bytesRead;
+                    }
+                    progressListener.update(url, totalBytesRead, fullLength);
+                    return bytesRead;
+                }
+            };
+        }
+    }
+
+    // ─── Helpers ──────────────────────────────────────────────────────────────
+
+    private static String getUserAgent(Context context) {
+        try {
+            PackageInfo packageInfo = context.getPackageManager()
+                    .getPackageInfo(context.getPackageName(), 0);
+
+            return String.format(Locale.ENGLISH,
+                    "Tiny Tiny RSS (Android) %1$s (%2$d) %3$s",
+                    packageInfo.versionName,
+                    packageInfo.versionCode,
+                    System.getProperty("http.agent"));
+
+        } catch (PackageManager.NameNotFoundException e) {
+            e.printStackTrace();
+            return String.format(Locale.ENGLISH,
+                    "Tiny Tiny RSS (Android) Unknown %1$s",
+                    System.getProperty("http.agent"));
+        }
+    }
+}
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 66431082..7e1189cd 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
@@ -389,7 +389,7 @@ public class ArticleModel extends AndroidViewModel implements ApiCommon.ApiCalle
         return ApiCommon.getErrorMessage(m_lastError);
     }
 
-    ApiCommon.ApiError getLastError() {
+    public ApiCommon.ApiError getLastError() {
         return m_lastError;
     }
 
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java
index fd5f2188..ef8660ad 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java
@@ -2,7 +2,6 @@ package org.fox.ttrss;
 
 
 import android.annotation.SuppressLint;
-import android.app.AlarmManager;
 import android.app.Dialog;
 import android.app.NotificationChannel;
 import android.app.NotificationManager;
@@ -18,7 +17,6 @@ import android.graphics.BitmapFactory;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
-import android.os.SystemClock;
 import android.text.TextUtils;
 import android.util.DisplayMetrics;
 import android.util.Log;
@@ -37,7 +35,6 @@ import androidx.browser.customtabs.CustomTabsClient;
 import androidx.browser.customtabs.CustomTabsIntent;
 import androidx.browser.customtabs.CustomTabsServiceConnection;
 import androidx.browser.customtabs.CustomTabsSession;
-import androidx.core.app.JobIntentService;
 import androidx.core.content.FileProvider;
 import androidx.preference.PreferenceManager;
 
@@ -48,8 +45,7 @@ import com.bumptech.glide.request.transition.Transition;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.google.android.material.snackbar.Snackbar;
 
-import org.fox.ttrss.widget.SmallWidgetProvider;
-import org.fox.ttrss.widget.WidgetUpdateService;
+
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
 import org.jsoup.select.Elements;
@@ -240,8 +236,6 @@ public class CommonActivity extends AppCompatActivity implements SharedPreferenc
         if (m_prefs.getBoolean("window_secure_mode", false))
             getWindow().setFlags(WindowManager.LayoutParams.FLAG_SECURE, WindowManager.LayoutParams.FLAG_SECURE);
 
-        setupWidgetUpdates(this);
-
         if (savedInstanceState == null) {
             m_theme = m_prefs.getString("theme", CommonActivity.THEME_DEFAULT);
         } else {
@@ -319,7 +313,7 @@ public class CommonActivity extends AppCompatActivity implements SharedPreferenc
             setAppTheme(sharedPreferences);
         }
 
-        String[] filter = new String[]{"enable_dynamic_colors", "enable_cats", "widget_update_interval",
+        String[] filter = new String[]{"enable_dynamic_colors", "enable_cats",
                 "headlines_swipe_to_dismiss", "headlines_mark_read_scroll", "headlines_request_size",
                 "force_phone_layout", "open_on_startup", "window_secure_mode", "enable_icon_tinting",
                 "mtls_enabled"};
@@ -521,30 +515,6 @@ public class CommonActivity extends AppCompatActivity implements SharedPreferenc
         }
     }
 
-    public static void setupWidgetUpdates(Context context) {
-        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
-
-        int updateInterval = Integer.parseInt(prefs.getString("widget_update_interval", "15")) * 60 * 1000;
-
-        Log.d("setupWidgetUpdates", "interval= " + updateInterval);
-
-        AlarmManager alarmManager = (AlarmManager) context.getSystemService(ALARM_SERVICE);
-
-        Intent intentUpdate = new Intent(context, SmallWidgetProvider.class);
-        intentUpdate.setAction(SmallWidgetProvider.ACTION_REQUEST_UPDATE);
-
-        PendingIntent pendingIntentAlarm = PendingIntent.getBroadcast(context,
-                0, intentUpdate, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
-
-        alarmManager.cancel(pendingIntentAlarm);
-
-        alarmManager.setRepeating(AlarmManager.ELAPSED_REALTIME,
-                SystemClock.elapsedRealtime() + updateInterval,
-                updateInterval,
-                pendingIntentAlarm);
-
-    }
-
     public void displayImageCaption(String url, String htmlContent) {
         // Android doesn't give us an easy way to access title tags;
         // we'll use Jsoup on the body text to grab the title text
@@ -586,10 +556,6 @@ public class CommonActivity extends AppCompatActivity implements SharedPreferenc
         Glide.get(this).clearMemory();
     }
 
-    public static void requestWidgetUpdate(Context context) {
-        JobIntentService.enqueueWork(context.getApplicationContext(), WidgetUpdateService.class, 0, new Intent());
-    }
-
     static public int dpToPx(Context context, int dp) {
         DisplayMetrics displayMetrics = context.getResources().getDisplayMetrics();
         return Math.round(dp * (displayMetrics.xdpi / DisplayMetrics.DENSITY_DEFAULT));
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 c6c68281..ff3510ad 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
@@ -160,7 +160,7 @@ public class FeedsModel extends AndroidViewModel implements ApiCommon.ApiCaller
         return ApiCommon.getErrorMessage(m_lastError);
     }
 
-    ApiCommon.ApiError getLastError() {
+    public ApiCommon.ApiError getLastError() {
         return m_lastError;
     }
 
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 cb1fd5db..505310b6 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
@@ -40,7 +40,6 @@ public class MasterActivity extends OnlineActivity implements HeadlinesEventList
 
     protected SharedPreferences m_prefs;
     protected long m_lastRefresh = 0;
-    protected long m_lastWidgetRefresh = 0;
 
     private ActionBarDrawerToggle m_drawerToggle;
     private DrawerLayout m_drawerLayout;
@@ -72,8 +71,6 @@ public class MasterActivity extends OnlineActivity implements HeadlinesEventList
 
         enableActionModeObserver();
 
-        m_lastWidgetRefresh = new Date().getTime();
-
         m_loadingProgress = findViewById(R.id.loading_progress);
 
         m_drawerLayout = findViewById(R.id.headlines_drawer);
@@ -152,7 +149,19 @@ public class MasterActivity extends OnlineActivity implements HeadlinesEventList
                 map.put("user", m_prefs.getString("login", "").trim());
                 map.put("password", m_prefs.getString("password", "").trim());
 
-                lr.execute(map);
+                lr.execute(map, new ApiRequest.ApiCallback() {
+                    @Override
+                    public void onSuccess(JsonElement result) {
+                        // Handled by LoginRequest.onApiFinished
+                    }
+
+                    @Override
+                    public void onError(ApiCommon.ApiError error, String message, int statusCode) {
+                        setSessionId(null);
+                        setLoadingStatus(getString(ApiCommon.getErrorMessage(error)) + "\n\n" + message);
+                        loginFailure();
+                    }
+                });
             }
 
             FragmentTransaction ft = getSupportFragmentManager().beginTransaction();
@@ -424,12 +433,6 @@ public class MasterActivity extends OnlineActivity implements HeadlinesEventList
 
         Date date = new Date();
 
-        if (isFinishing() || date.getTime() - m_lastWidgetRefresh > 60 * 1000) {
-            m_lastWidgetRefresh = date.getTime();
-
-            CommonActivity.requestWidgetUpdate(MasterActivity.this);
-        }
-
     }
 
     @Override
@@ -464,18 +467,26 @@ public class MasterActivity extends OnlineActivity implements HeadlinesEventList
     }
 
     public void unsubscribeFeed(final Feed feed) {
-        ApiRequest req = new ApiRequest(getApplicationContext()) {
-            protected void onPostExecute(JsonElement result) {
-                refresh();
-            }
-        };
-
         HashMap<String, String> map = new HashMap<>();
         map.put("sid", getSessionId());
         map.put("op", "unsubscribeFeed");
         map.put("feed_id", String.valueOf(feed.id));
 
-        req.execute(map);
+        new ApiRequest(getApplicationContext()) {
+            @Override
+            protected void onApiFinished(JsonElement result) {
+                refresh();
+            }
+        }.execute(map, new ApiRequest.ApiCallback() {
+            @Override
+            public void onSuccess(JsonElement result) {
+                // Handled by onApiFinished
+            }
 
+            @Override
+            public void onError(ApiCommon.ApiError error, String message, int statusCode) {
+                toast(getString(ApiCommon.getErrorMessage(error)) + "\n" + message);
+            }
+        });
     }
 }
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 684514d8..45875ec6 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
@@ -252,7 +252,19 @@ public class OnlineActivity extends CommonActivity {
             map.put("user", m_prefs.getString("login", "").trim());
             map.put("password", m_prefs.getString("password", "").trim());
 
-            ar.execute(map);
+            ar.execute(map, new ApiRequest.ApiCallback() {
+                @Override
+                public void onSuccess(JsonElement result) {
+                    // Handled by LoginRequest.onApiFinished
+                }
+
+                @Override
+                public void onError(ApiCommon.ApiError error, String message, int statusCode) {
+                    setSessionId(null);
+                    setLoadingStatus(getString(ApiCommon.getErrorMessage(error)) + "\n\n" + message);
+                    loginFailure();
+                }
+            });
 
             setLoadingStatus(R.string.login_in_progress);
         }
@@ -682,43 +694,50 @@ public class OnlineActivity extends CommonActivity {
 
         ApiRequest req = new ApiRequest(getApplicationContext()) {
             @Override
-            protected void onPostExecute(JsonElement result) {
-                if (result != null) {
-                    Type listType = new TypeToken<List<Label>>() {
-                    }.getType();
-                    final List<Label> labels = new Gson().fromJson(result, listType);
-
-                    CharSequence[] items = new CharSequence[labels.size()];
-                    final int[] itemIds = new int[labels.size()];
-                    boolean[] checkedItems = new boolean[labels.size()];
-
-                    for (int i = 0; i < labels.size(); i++) {
-                        items[i] = labels.get(i).caption;
-                        itemIds[i] = labels.get(i).id;
-                        checkedItems[i] = labels.get(i).checked;
-                    }
-
-                    MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(OnlineActivity.this)
-                            .setTitle(R.string.article_set_labels)
-                            .setMultiChoiceItems(items, checkedItems, (dialog, which, isChecked) -> {
-                                final int labelId = itemIds[which];
+            protected void onApiFinished(JsonElement result) {
+                Type listType = new TypeToken<List<Label>>() {
+                }.getType();
+                final List<Label> labels = new Gson().fromJson(result, listType);
+
+                CharSequence[] items = new CharSequence[labels.size()];
+                final int[] itemIds = new int[labels.size()];
+                boolean[] checkedItems = new boolean[labels.size()];
+
+                for (int i = 0; i < labels.size(); i++) {
+                    items[i] = labels.get(i).caption;
+                    itemIds[i] = labels.get(i).id;
+                    checkedItems[i] = labels.get(i).checked;
+                }
 
-                                HashMap<String, String> map = new HashMap<>();
-                                map.put("sid", getSessionId());
-                                map.put("op", "setArticleLabel");
-                                map.put("label_id", String.valueOf(labelId));
-                                map.put("article_ids", String.valueOf(articleId));
-                                if (isChecked) map.put("assign", "true");
+                MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(OnlineActivity.this)
+                        .setTitle(R.string.article_set_labels)
+                        .setMultiChoiceItems(items, checkedItems, (dialog, which, isChecked) -> {
+                            final int labelId = itemIds[which];
 
-                                ApiRequest req1 = new ApiRequest(OnlineActivity.this);
-                                req1.execute(map);
+                            HashMap<String, String> map = new HashMap<>();
+                            map.put("sid", getSessionId());
+                            map.put("op", "setArticleLabel");
+                            map.put("label_id", String.valueOf(labelId));
+                            map.put("article_ids", String.valueOf(articleId));
+                            if (isChecked) map.put("assign", "true");
+
+                            ApiRequest req1 = new ApiRequest(OnlineActivity.this);
+                            req1.execute(map, new ApiRequest.ApiCallback() {
+                                @Override
+                                public void onSuccess(JsonElement result) {
+                                    // no-op, dialog auto-dismisses
+                                }
 
-                            }).setPositiveButton(R.string.dialog_close, (dialog, which) -> dialog.cancel());
+                                @Override
+                                public void onError(ApiCommon.ApiError error, String message, int statusCode) {
+                                    toast(getString(ApiCommon.getErrorMessage(error)) + "\n" + message);
+                                }
+                            });
 
-                    Dialog dialog = builder.create();
-                    dialog.show();
+                        }).setPositiveButton(R.string.dialog_close, (dialog, which) -> dialog.cancel());
 
-                }
+                Dialog dialog = builder.create();
+                dialog.show();
             }
         };
 
@@ -727,14 +746,24 @@ public class OnlineActivity extends CommonActivity {
         map.put("op", "getLabels");
         map.put("article_id", String.valueOf(articleId));
 
-        req.execute(map);
+        req.execute(map, new ApiRequest.ApiCallback() {
+            @Override
+            public void onSuccess(JsonElement result) {
+                // Handled by LoginRequest.onApiFinished
+            }
+
+            @Override
+            public void onError(ApiCommon.ApiError error, String message, int statusCode) {
+                toast(getString(ApiCommon.getErrorMessage(error)) + "\n" + message);
+            }
+        });
     }
 
-    private void setLoadingStatus(int status) {
+    protected void setLoadingStatus(int status) {
         setLoadingStatus(getString(status));
     }
 
-    private void setLoadingStatus(String status) {
+    protected void setLoadingStatus(String status) {
         TextView tv = findViewById(R.id.loading_message);
 
         if (tv != null) {
@@ -910,13 +939,6 @@ 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);
 
-        ApiRequest req = new ApiRequest(getApplicationContext()) {
-            protected void onPostExecute(JsonElement result) {
-                if (refreshAfter)
-                    refresh();
-            }
-        };
-
         HashMap<String, String> map = new HashMap<>();
         map.put("sid", getSessionId());
         map.put("op", "catchupFeed");
@@ -927,7 +949,23 @@ public class OnlineActivity extends CommonActivity {
         if (feed.is_cat)
             map.put("is_cat", "1");
 
-        req.execute(map);
+        new ApiRequest(getApplicationContext()) {
+            @Override
+            protected void onApiFinished(JsonElement result) {
+                if (refreshAfter)
+                    refresh();
+            }
+        }.execute(map, new ApiRequest.ApiCallback() {
+            @Override
+            public void onSuccess(JsonElement result) {
+                // Handled by onApiFinished
+            }
+
+            @Override
+            public void onError(ApiCommon.ApiError error, String message, int statusCode) {
+                toast(getString(ApiCommon.getErrorMessage(error)) + "\n" + message);
+            }
+        });
     }
 
     public void saveArticleUnread(final Article article) {
@@ -978,102 +1016,104 @@ public class OnlineActivity extends CommonActivity {
     }
 
     public void setArticlesField(final List<Article> articles, int field, int mode) {
-        ApiRequest req = new ApiRequest(getApplicationContext()) {
-            protected void onPostExecute(JsonElement result) {
-                if (m_lastError == ApiCommon.ApiError.SUCCESS) {
+        HashMap<String, String> map = new HashMap<>();
+        map.put("sid", getSessionId());
+        map.put("op", "updateArticle");
+        map.put("article_ids", articles.stream()
+                .map(a -> String.valueOf(a.id))
+                .collect(Collectors.joining(",")));
+        map.put("mode", String.valueOf(mode));
 
-                    if (BuildConfig.DEBUG)
-                        Log.d(TAG, "setArticleField operation complete, field=" + field + " mode=" + mode);
+        if (field == Article.UPDATE_FIELD_NOTE)
+            map.put("data", articles.get(0).note);
+
+        if (field == Article.UPDATE_FIELD_SCORE)
+            map.put("data", String.valueOf(articles.get(0).score));
 
-                    ArticleModel model = Application.getArticlesModel();
+        map.put("field", String.valueOf(field));
 
-                    for (Article a : articles) {
-                        Article articleClone = new Article(a);
+        new ApiRequest(getApplicationContext()) {
+            @Override
+            protected void onApiFinished(JsonElement result) {
 
-                        switch (mode) {
-                            case Article.UPDATE_SET_FALSE:
-                                switch (field) {
-                                    case Article.UPDATE_FIELD_MARKED:
-                                        articleClone.marked = false;
-                                        break;
-                                    case Article.UPDATE_FIELD_PUBLISHED:
-                                        articleClone.published = false;
-                                        break;
-                                    case Article.UPDATE_FIELD_UNREAD:
-                                        articleClone.unread = false;
-                                        break;
-                                }
-                                break;
-                            case Article.UPDATE_SET_TRUE:
-                                switch (field) {
-                                    case Article.UPDATE_FIELD_MARKED:
-                                        articleClone.marked = true;
-                                        break;
-                                    case Article.UPDATE_FIELD_PUBLISHED:
-                                        articleClone.published = true;
-                                        break;
-                                    case Article.UPDATE_FIELD_UNREAD:
-                                        articleClone.unread = true;
-                                        break;
-                                }
-                                break;
-                            case Article.UPDATE_TOGGLE:
-                                switch (field) {
-                                    case Article.UPDATE_FIELD_MARKED:
-                                        articleClone.marked = !articleClone.marked;
-                                        break;
-                                    case Article.UPDATE_FIELD_PUBLISHED:
-                                        articleClone.published = !articleClone.published;
-                                        break;
-                                    case Article.UPDATE_FIELD_UNREAD:
-                                        articleClone.unread = !articleClone.unread;
-                                        break;
-                                }
-                                break;
-                        }
+                if (BuildConfig.DEBUG)
+                    Log.d(TAG, "setArticleField operation complete, field=" + field + " mode=" + mode);
 
+                ArticleModel model = Application.getArticlesModel();
 
-                        if (BuildConfig.DEBUG)
-                            Log.d(TAG, "updating article: " + articleClone);
+                for (Article a : articles) {
+                    Article articleClone = new Article(a);
 
-                        model.update(articleClone);
+                    switch (mode) {
+                        case Article.UPDATE_SET_FALSE:
+                            switch (field) {
+                                case Article.UPDATE_FIELD_MARKED:
+                                    articleClone.marked = false;
+                                    break;
+                                case Article.UPDATE_FIELD_PUBLISHED:
+                                    articleClone.published = false;
+                                    break;
+                                case Article.UPDATE_FIELD_UNREAD:
+                                    articleClone.unread = false;
+                                    break;
+                            }
+                            break;
+                        case Article.UPDATE_SET_TRUE:
+                            switch (field) {
+                                case Article.UPDATE_FIELD_MARKED:
+                                    articleClone.marked = true;
+                                    break;
+                                case Article.UPDATE_FIELD_PUBLISHED:
+                                    articleClone.published = true;
+                                    break;
+                                case Article.UPDATE_FIELD_UNREAD:
+                                    articleClone.unread = true;
+                                    break;
+                            }
+                            break;
+                        case Article.UPDATE_TOGGLE:
+                            switch (field) {
+                                case Article.UPDATE_FIELD_MARKED:
+                                    articleClone.marked = !articleClone.marked;
+                                    break;
+                                case Article.UPDATE_FIELD_PUBLISHED:
+                                    articleClone.published = !articleClone.published;
+                                    break;
+                                case Article.UPDATE_FIELD_UNREAD:
+                                    articleClone.unread = !articleClone.unread;
+                                    break;
+                            }
+                            break;
                     }
 
-                    invalidateOptionsMenu();
 
-                    return;
+                    if (BuildConfig.DEBUG)
+                        Log.d(TAG, "updating article: " + articleClone);
+
+                    model.update(articleClone);
                 }
 
-                if (m_lastError != null && m_lastError == ApiCommon.ApiError.LOGIN_FAILED) {
+                invalidateOptionsMenu();
+            }
+        }.execute(map, new ApiRequest.ApiCallback() {
+            @Override
+            public void onSuccess(JsonElement result) {
+                // Handled by onApiFinished
+            }
+
+            @Override
+            public void onError(ApiCommon.ApiError error, String message, int statusCode) {
+                if (error == ApiCommon.ApiError.LOGIN_FAILED) {
                     login(true);
                 } else {
-                    if (m_lastErrorMessage != null) {
-                        toast(getString(getErrorMessage()) + "\n" + m_lastErrorMessage);
+                    if (message != null) {
+                        toast(getString(ApiCommon.getErrorMessage(error)) + "\n" + message);
                     } else {
-                        toast(getErrorMessage());
+                        toast(ApiCommon.getErrorMessage(error));
                     }
                 }
             }
-        };
-
-        HashMap<String, String> map = new HashMap<>();
-        map.put("sid", getSessionId());
-        map.put("op", "updateArticle");
-        map.put("article_ids", articles.stream()
-                .map(a -> String.valueOf(a.id))
-                .collect(Collectors.joining(",")));
-        map.put("mode", String.valueOf(mode));
-
-        if (field == Article.UPDATE_FIELD_NOTE)
-            map.put("data", articles.get(0).note);
-
-        if (field == Article.UPDATE_FIELD_SCORE)
-            map.put("data", String.valueOf(articles.get(0).score));
-
-        map.put("field", String.valueOf(field));
-
-        req.execute(map);
-
+        });
     }
 
     // this may be called after activity has been destroyed (i.e. long asynctask)
@@ -1163,107 +1203,57 @@ public class OnlineActivity extends CommonActivity {
         }
 
         @SuppressLint("StaticFieldLeak")
-        protected void onPostExecute(JsonElement result) {
-            if (result != null) {
-                try {
-                    JsonObject content = result.getAsJsonObject();
-
-                    if (content != null) {
-                        setSessionId(content.get("session_id").getAsString());
-
-                        JsonElement apiLevel = content.get("api_level");
-
-                        Log.d(TAG, "Authenticated!");
-
-                        if (apiLevel != null) {
-                            setApiLevel(apiLevel.getAsInt());
-                            Log.d(TAG, "Received API level: " + getApiLevel());
-
-                            // get custom sort from configuration object
-                            if (getApiLevel() >= 17) {
-
-                                // daemon_is_running, icons_dir, etc...
-                                JsonObject config = content.get("config").getAsJsonObject();
-
-                                Type hashType = new TypeToken<Map<String, String>>() {
-                                }.getType();
-                                Map<String, String> customSortTypes = new Gson().fromJson(config.get("custom_sort_types"), hashType);
-
-                                setCustomSortModes(customSortTypes);
-                            }
-
-                            if (m_listener != null) {
-                                m_listener.OnLoginSuccess();
-                            } else {
-                                loginSuccess(m_refreshAfterLogin);
-                            }
-
-                        } else {
-
-                            ApiRequest req = new ApiRequest(OnlineActivity.this) {
-                                protected void onPostExecute(JsonElement result) {
-                                    setApiLevel(0);
-
-                                    if (result != null) {
-                                        try {
-                                            setApiLevel(result.getAsJsonObject().get("level").getAsInt());
-                                        } catch (Exception e) {
-                                            e.printStackTrace();
-                                        }
-                                    } else if (m_lastError != ApiCommon.ApiError.API_UNKNOWN_METHOD) {
-                                        // Unknown method means old tt-rss, in that case we assume API 0 and continue
+        @Override
+        protected void onApiFinished(JsonElement result) {
+            try {
+                JsonObject content = result.getAsJsonObject();
 
-                                        setLoadingStatus(getErrorMessage());
+                if (content != null) {
+                    setSessionId(content.get("session_id").getAsString());
 
-                                        if (m_lastErrorMessage != null) {
-                                            setLoadingStatus(getString(getErrorMessage()) + "\n\n" + m_lastErrorMessage);
-                                        } else {
-                                            setLoadingStatus(getErrorMessage());
-                                        }
+                    JsonElement apiLevel = content.get("api_level");
 
-                                        if (m_listener != null) {
-                                            m_listener.OnLoginFailed();
-                                        } else {
-                                            loginFailure();
-                                        }
+                    Log.d(TAG, "Authenticated!");
 
-                                        return;
-                                    }
+                    if (apiLevel != null) {
+                        setApiLevel(apiLevel.getAsInt());
+                    } else {
+                        // Very old tt-rss server without api_level in login response
+                        setApiLevel(0);
+                    }
 
-                                    Log.d(TAG, "Received API level: " + getApiLevel());
+                    Log.d(TAG, "Received API level: " + getApiLevel());
 
-                                    loginSuccess(m_refreshAfterLogin);
-                                }
-                            };
+                    // get custom sort from configuration object
+                    if (getApiLevel() >= 17) {
 
-                            HashMap<String, String> map = new HashMap<>();
-                            map.put("sid", getSessionId());
-                            map.put("op", "getApiLevel");
+                        // daemon_is_running, icons_dir, etc...
+                        JsonObject config = content.get("config").getAsJsonObject();
 
-                            req.execute(map);
+                        Type hashType = new TypeToken<Map<String, String>>() {
+                        }.getType();
+                        Map<String, String> customSortTypes = new Gson().fromJson(config.get("custom_sort_types"), hashType);
 
-                            setLoadingStatus(R.string.loading_message);
-                        }
+                        setCustomSortModes(customSortTypes);
+                    }
 
-                        return;
+                    if (m_listener != null) {
+                        m_listener.OnLoginSuccess();
+                    } else {
+                        loginSuccess(m_refreshAfterLogin);
                     }
 
-                } catch (Exception e) {
-                    e.printStackTrace();
+                    return;
                 }
-            }
-
-            setSessionId(null);
 
-            if (m_lastErrorMessage != null) {
-                setLoadingStatus(getString(getErrorMessage()) + "\n\n" + m_lastErrorMessage);
-            } else {
-                setLoadingStatus(getString(getErrorMessage()) + "\n\n" + m_apiStatusCode);
+            } catch (Exception e) {
+                e.printStackTrace();
             }
 
+            setSessionId(null);
+            setLoadingStatus(getString(ApiCommon.getErrorMessage(m_lastError)) + "\n\n" + m_lastErrorMessage);
             loginFailure();
         }
-
     }
 
     public LinkedHashMap<String, String> getSortModes() {
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/share/CommonShareActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/share/CommonShareActivity.java
index 6df7c226..fbc042e2 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/share/CommonShareActivity.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/share/CommonShareActivity.java
@@ -13,6 +13,7 @@ import androidx.preference.PreferenceManager;
 
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 
+import org.fox.ttrss.ApiCommon;
 import org.fox.ttrss.ApiRequest;
 import org.fox.ttrss.PreferencesActivity;
 import org.fox.ttrss.R;
@@ -83,7 +84,7 @@ public abstract class CommonShareActivity extends CommonActivity {
 
                 @Override
                 protected void onLoginFailed(int requestId, ApiRequest ar) {
-                    toast(ar.getErrorMessage());
+                    toast(ApiCommon.getErrorMessage(ar.getLastError()));
                     setProgressBarIndeterminateVisibility(false);
                 }
 
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 f5b01947..2e1e0f90 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
@@ -82,21 +82,6 @@ public class ShareActivity extends CommonShareActivity {
     private void postData() {
         m_button.setEnabled(false);
 
-        ApiRequest req = new ApiRequest(getApplicationContext()) {
-            protected void onPostExecute(JsonElement result) {
-                setProgressBarIndeterminateVisibility(false);
-
-                if (m_lastError != ApiCommon.ApiError.UNKNOWN_ERROR) {
-                    toast(getErrorMessage());
-                } else {
-                    toast(R.string.share_article_posted);
-                    finish();
-                }
-
-                m_button.setEnabled(true);
-            }
-        };
-
         final EditText url = (EditText) findViewById(R.id.url);
         final EditText title = (EditText) findViewById(R.id.title);
         final EditText content = (EditText) findViewById(R.id.content);
@@ -111,7 +96,26 @@ public class ShareActivity extends CommonShareActivity {
 
             setProgressBarIndeterminateVisibility(true);
 
-            req.execute(map);
+            new ApiRequest(getApplicationContext()) {
+                @Override
+                protected void onApiFinished(JsonElement result) {
+                    setProgressBarIndeterminateVisibility(false);
+                    toast(R.string.share_article_posted);
+                    finish();
+                }
+            }.execute(map, new ApiRequest.ApiCallback() {
+                @Override
+                public void onSuccess(JsonElement result) {
+                    // Handled by onApiFinished
+                }
+
+                @Override
+                public void onError(ApiCommon.ApiError error, String message, int statusCode) {
+                    setProgressBarIndeterminateVisibility(false);
+                    toast(ApiCommon.getErrorMessage(error));
+                    m_button.setEnabled(true);
+                }
+            });
         }
     }
 
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 fdc5915d..4d90809a 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
@@ -144,13 +144,28 @@ public class SubscribeActivity extends CommonShareActivity {
     private void subscribeToFeed() {
         m_postButton.setEnabled(false);
 
-        @SuppressLint("StaticFieldLeak") ApiRequest req = new ApiRequest(getApplicationContext()) {
-            protected void onPostExecute(JsonElement result) {
-                m_progressBar.setVisibility(View.INVISIBLE);
+        Spinner catSpinner = findViewById(R.id.category_spinner);
+
+        final Feed cat = m_catAdapter.getCategory(catSpinner.getSelectedItemPosition());
+        final EditText feedUrl = findViewById(R.id.feed_url);
+
+        if (feedUrl != null) {
+            HashMap<String, String> map = new HashMap<>();
+            map.put("sid", m_sessionId);
+            map.put("op", "subscribeToFeed");
+            map.put("feed_url", feedUrl.getText().toString());
+
+            if (cat != null) {
+                map.put("category_id", String.valueOf(cat.id));
+            }
+
+            m_progressBar.setVisibility(View.VISIBLE);
+
+            new ApiRequest(getApplicationContext()) {
+                @Override
+                protected void onApiFinished(JsonElement result) {
+                    m_progressBar.setVisibility(View.INVISIBLE);
 
-                if (m_lastError != null && m_lastError != ApiCommon.ApiError.SUCCESS) {
-                    toast(getErrorMessage());
-                } else {
                     try {
                         int rc = -1;
 
@@ -163,11 +178,9 @@ public class SubscribeActivity extends CommonShareActivity {
                         switch (rc) {
                             case -1:
                                 toast(R.string.error_api_unknown);
-                                //finish();
                                 break;
                             case 0:
                                 toast(R.string.error_feed_already_exists_);
-                                //finish();
                                 break;
                             case 1:
                                 toast(R.string.subscribed_to_feed);
@@ -180,8 +193,6 @@ public class SubscribeActivity extends CommonShareActivity {
                                 toast(R.string.error_url_is_an_html_page_no_feeds_found);
                                 break;
                             case 4:
-                                //toast(R.string.error_url_contains_multiple_feeds);
-
                                 JsonObject feeds = result.getAsJsonObject().get("status").getAsJsonObject().get("feeds").getAsJsonObject();
 
                                 if (feeds != null) {
@@ -205,30 +216,22 @@ public class SubscribeActivity extends CommonShareActivity {
                     } catch (Exception e) {
                         toast(e.getMessage());
                     }
-                }
-
-                m_postButton.setEnabled(true);
-            }
-        };
-
-        Spinner catSpinner = findViewById(R.id.category_spinner);
-
-        final Feed cat = m_catAdapter.getCategory(catSpinner.getSelectedItemPosition());
-        final EditText feedUrl = findViewById(R.id.feed_url);
 
-        if (feedUrl != null) {
-            HashMap<String, String> map = new HashMap<>();
-            map.put("sid", m_sessionId);
-            map.put("op", "subscribeToFeed");
-            map.put("feed_url", feedUrl.getText().toString());
-
-            if (cat != null) {
-                map.put("category_id", String.valueOf(cat.id));
-            }
-
-            m_progressBar.setVisibility(View.VISIBLE);
+                    m_postButton.setEnabled(true);
+                }
+            }.execute(map, new ApiRequest.ApiCallback() {
+                @Override
+                public void onSuccess(JsonElement result) {
+                    // Handled by onApiFinished
+                }
 
-            req.execute(map);
+                @Override
+                public void onError(ApiCommon.ApiError error, String message, int statusCode) {
+                    m_progressBar.setVisibility(View.INVISIBLE);
+                    toast(ApiCommon.getErrorMessage(error));
+                    m_postButton.setEnabled(true);
+                }
+            });
         }
     }
 
@@ -245,44 +248,51 @@ public class SubscribeActivity extends CommonShareActivity {
     }
 
     private void updateCats() {
-        @SuppressLint("StaticFieldLeak") ApiRequest req = new ApiRequest(getApplicationContext()) {
-            protected void onPostExecute(JsonElement result) {
+        HashMap<String, String> map = new HashMap<>();
+        map.put("sid", m_sessionId);
+        map.put("op", "getCategories");
+
+        m_progressBar.setVisibility(View.VISIBLE);
+
+        new ApiRequest(getApplicationContext()) {
+            @Override
+            protected void onApiFinished(JsonElement result) {
                 m_progressBar.setVisibility(View.INVISIBLE);
 
-                if (m_lastError != null && m_lastError != ApiCommon.ApiError.SUCCESS) {
-                    toast(getErrorMessage());
-                } else {
-                    JsonArray content = result.getAsJsonArray();
+                JsonArray content = result.getAsJsonArray();
 
-                    if (content != null) {
-                        Type listType = new TypeToken<List<Feed>>() {
-                        }.getType();
-                        final List<Feed> catsJson = new Gson().fromJson(content, listType);
+                if (content != null) {
+                    Type listType = new TypeToken<List<Feed>>() {
+                    }.getType();
+                    final List<Feed> catsJson = new Gson().fromJson(content, listType);
 
-                        m_cats.clear();
-                        m_cats.addAll(catsJson.stream().filter(f -> f.id > 0).collect(Collectors.toList()));
+                    m_cats.clear();
+                    m_cats.addAll(catsJson.stream().filter(f -> f.id > 0).collect(Collectors.toList()));
 
-                        sortCats();
+                    sortCats();
 
-                        m_cats.add(0, new Feed(0, "Uncategorized", true));
+                    m_cats.add(0, new Feed(0, "Uncategorized", true));
 
-                        m_catAdapter.notifyDataSetChanged();
+                    m_catAdapter.notifyDataSetChanged();
 
-                        toast(R.string.category_list_updated);
-                    }
+                    toast(R.string.category_list_updated);
                 }
 
                 m_catButton.setEnabled(true);
             }
-        };
-
-        HashMap<String, String> map = new HashMap<>();
-        map.put("sid", m_sessionId);
-        map.put("op", "getCategories");
-
-        m_progressBar.setVisibility(View.VISIBLE);
+        }.execute(map, new ApiRequest.ApiCallback() {
+            @Override
+            public void onSuccess(JsonElement result) {
+                // Handled by onApiFinished
+            }
 
-        req.execute(map);
+            @Override
+            public void onError(ApiCommon.ApiError error, String message, int statusCode) {
+                m_progressBar.setVisibility(View.INVISIBLE);
+                toast(ApiCommon.getErrorMessage(error));
+                m_catButton.setEnabled(true);
+            }
+        });
     }
 
     @Override
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/util/DeviceBootReceiver.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/util/DeviceBootReceiver.java
index 953c7124..e961b499 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/util/DeviceBootReceiver.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/util/DeviceBootReceiver.java
@@ -4,14 +4,11 @@ import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 
-import org.fox.ttrss.CommonActivity;
-
 public class DeviceBootReceiver extends BroadcastReceiver {
     @Override
     public void onReceive(Context context, Intent intent) {
         if (intent.getAction().equals(Intent.ACTION_BOOT_COMPLETED)) {
-            CommonActivity.requestWidgetUpdate(context);
-            CommonActivity.setupWidgetUpdates(context);
+
         }
     }
 }
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 94ead554..9693a9b6 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
@@ -6,6 +6,7 @@ import android.util.Log;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 
+import org.fox.ttrss.ApiCommon;
 import org.fox.ttrss.ApiRequest;
 
 import java.util.HashMap;
@@ -17,63 +18,41 @@ public abstract class SimpleLoginManager {
         private final int m_requestId;
         protected String m_sessionId;
         protected int m_apiLevel;
-        protected Context m_context;
 
         public LoginRequest(Context context, int requestId) {
             super(context);
-            m_context = context;
             m_requestId = requestId;
         }
 
-        protected void onPostExecute(JsonElement result) {
-            Log.d(TAG, "onPostExecute");
+        @Override
+        protected void onApiFinished(JsonElement result) {
+            Log.d(TAG, "onApiFinished");
 
-            if (result != null) {
-                try {
-                    JsonObject content = result.getAsJsonObject();
-                    if (content != null) {
-                        m_sessionId = content.get("session_id").getAsString();
+            try {
+                JsonObject content = result.getAsJsonObject();
+                if (content != null) {
+                    m_sessionId = content.get("session_id").getAsString();
 
-                        Log.d(TAG, "[SLM] Authenticated!");
-
-                        ApiRequest req = new ApiRequest(m_context) {
-                            protected void onPostExecute(JsonElement result) {
-                                m_apiLevel = 0;
-
-                                if (result != null) {
-                                    try {
-                                        m_apiLevel = result.getAsJsonObject()
-                                                .get("level").getAsInt();
-                                    } catch (Exception e) {
-                                        e.printStackTrace();
-                                    }
-                                }
-
-                                Log.d(TAG, "[SLM] Received API level: " + m_apiLevel);
-
-                                onLoginSuccess(m_requestId, m_sessionId, m_apiLevel);
-                            }
-                        };
-
-                        HashMap<String, String> map = new HashMap<>();
-                        map.put("sid", m_sessionId);
-                        map.put("op", "getApiLevel");
-
-                        req.execute(map);
-
-                        return;
+                    JsonElement apiLevelEl = content.get("api_level");
+                    if (apiLevelEl != null) {
+                        m_apiLevel = apiLevelEl.getAsInt();
+                    } else {
+                        m_apiLevel = 0;
                     }
 
-                } catch (Exception e) {
-                    e.printStackTrace();
+                    Log.d(TAG, "[SLM] Authenticated! api_level=" + m_apiLevel);
+
+                    onLoginSuccess(m_requestId, m_sessionId, m_apiLevel);
+                    return;
                 }
+
+            } catch (Exception e) {
+                e.printStackTrace();
             }
 
             m_sessionId = null;
-
             onLoginFailed(m_requestId, this);
         }
-
     }
 
     public void logIn(Context context, int requestId, final String login, final String password) {
@@ -86,7 +65,18 @@ public abstract class SimpleLoginManager {
 
         onLoggingIn(requestId);
 
-        ar.execute(map);
+        ar.execute(map, new ApiRequest.ApiCallback() {
+            @Override
+            public void onSuccess(JsonElement result) {
+                // Handled by LoginRequest.onApiFinished
+            }
+
+            @Override
+            public void onError(ApiCommon.ApiError error, String message, int statusCode) {
+                ar.m_sessionId = null;
+                onLoginFailed(requestId, ar);
+            }
+        });
     }
 
     protected abstract void onLoggingIn(int requestId);
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/widget/SmallWidgetProvider.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/widget/SmallWidgetProvider.java
deleted file mode 100755
index 677b2670..00000000
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/widget/SmallWidgetProvider.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package org.fox.ttrss.widget;
-
-import android.app.PendingIntent;
-import android.appwidget.AppWidgetManager;
-import android.appwidget.AppWidgetProvider;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.util.Log;
-import android.view.View;
-import android.widget.RemoteViews;
-
-import androidx.preference.PreferenceManager;
-
-import org.fox.ttrss.CommonActivity;
-import org.fox.ttrss.OnlineActivity;
-import org.fox.ttrss.R;
-
-public class SmallWidgetProvider extends AppWidgetProvider {
-    private final String TAG = this.getClass().getSimpleName();
-
-    public static final String ACTION_REQUEST_UPDATE = "org.fox.ttrss.WIDGET_FORCE_UPDATE";
-
-    @Override
-    public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds) {
-        Log.d(TAG, "onUpdate");
-
-        Intent intent = new Intent(context, OnlineActivity.class);
-        PendingIntent pendingIntent = PendingIntent.getActivity(context, 0, intent, PendingIntent.FLAG_IMMUTABLE);
-
-        RemoteViews views = new RemoteViews(context.getPackageName(), R.layout.widget_small);
-        views.setOnClickPendingIntent(R.id.widget_main, pendingIntent);
-
-        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
-        String widgetBackground = prefs.getString("widget_background", "WB_LIGHT");
-
-        Log.d(TAG, "widget bg: " + widgetBackground);
-
-        if ("WB_LIGHT".equals(widgetBackground)) {
-            views.setViewVisibility(R.id.widget_dark, View.INVISIBLE);
-            views.setViewVisibility(R.id.widget_light, View.VISIBLE);
-        } else if ("WB_DARK".equals(widgetBackground)) {
-            views.setViewVisibility(R.id.widget_dark, View.VISIBLE);
-            views.setViewVisibility(R.id.widget_light, View.INVISIBLE);
-        } else {
-            views.setViewVisibility(R.id.widget_dark, View.INVISIBLE);
-            views.setViewVisibility(R.id.widget_light, View.INVISIBLE);
-        }
-
-        appWidgetManager.updateAppWidget(appWidgetIds, views);
-    }
-
-    @Override
-    public void onReceive(Context context, Intent intent) {
-        Log.d(TAG, "onReceive: " + intent);
-
-        AppWidgetManager appWidgetManager = AppWidgetManager.getInstance(context);
-        ComponentName thisAppWidget = new ComponentName(context.getPackageName(), SmallWidgetProvider.class.getName());
-        int[] appWidgetIds = appWidgetManager.getAppWidgetIds(thisAppWidget);
-
-        onUpdate(context, appWidgetManager, appWidgetIds);
-
-        if (AppWidgetManager.ACTION_APPWIDGET_UPDATE.equals(intent.getAction()) ||
-                ACTION_REQUEST_UPDATE.equals(intent.getAction())) {
-
-            Log.d(TAG, "sheduling widget update...");
-
-            CommonActivity.requestWidgetUpdate(context);
-        }
-    }
-
-}
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/widget/WidgetUpdateService.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/widget/WidgetUpdateService.java
deleted file mode 100755
index 59e7ccf3..00000000
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/widget/WidgetUpdateService.java
+++ /dev/null
@@ -1,219 +0,0 @@
-package org.fox.ttrss.widget;
-
-import android.app.PendingIntent;
-import android.appwidget.AppWidgetManager;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.net.ConnectivityManager;
-import android.net.NetworkInfo;
-import android.os.Build;
-import android.os.Handler;
-import android.util.Log;
-import android.widget.RemoteViews;
-
-import androidx.annotation.NonNull;
-import androidx.core.app.JobIntentService;
-import androidx.preference.PreferenceManager;
-
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-
-import org.fox.ttrss.ApiRequest;
-import org.fox.ttrss.OnlineActivity;
-import org.fox.ttrss.R;
-import org.fox.ttrss.util.SimpleLoginManager;
-
-import java.util.HashMap;
-
-public class WidgetUpdateService extends JobIntentService {
-    private final String TAG = this.getClass().getSimpleName();
-    private SharedPreferences m_prefs;
-
-    public static final int UPDATE_RESULT_OK = 0;
-    public static final int UPDATE_RESULT_ERROR_LOGIN = 1;
-    public static final int UPDATE_RESULT_ERROR_OTHER = 2;
-    public static final int UPDATE_RESULT_ERROR_NEED_CONF = 3;
-    public static final int UPDATE_IN_PROGRESS = 4;
-
-    @Override
-    protected void onHandleWork(@NonNull Intent intent) {
-
-        Log.d(TAG, "onHandleWork: " + intent);
-
-        if (getWidgetCount(getApplicationContext()) == 0) {
-            Log.d(TAG, "no widgets to work on, bailing out");
-
-            stopSelf();
-            return;
-        }
-
-        try {
-            updateWidgets(-1, UPDATE_IN_PROGRESS);
-
-            if (!isNetworkAvailable()) {
-                final int retryCount = intent.getIntExtra("retryCount", 0);
-
-                Log.d(TAG, "service update requested but network is not available, try: " + retryCount);
-
-                if (retryCount < 10) {
-                    new Handler().postDelayed(() -> {
-                        Intent serviceIntent = new Intent(getApplicationContext(), WidgetUpdateService.class);
-                        serviceIntent.putExtra("retryCount", retryCount + 1);
-
-                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                            startForegroundService(serviceIntent);
-                        } else {
-                            startService(serviceIntent);
-                        }
-
-                    }, 3 * 1000);
-                } else {
-                    updateWidgets(-1, UPDATE_RESULT_ERROR_OTHER);
-                }
-
-                stopSelf();
-                return;
-            }
-
-            m_prefs = PreferenceManager
-                    .getDefaultSharedPreferences(getApplicationContext());
-
-            if (m_prefs.getString("ttrss_url", "").trim().isEmpty()) {
-
-                updateWidgets(-1, UPDATE_RESULT_ERROR_NEED_CONF);
-
-            } else {
-
-                final int feedId = m_prefs.getBoolean("widget_show_fresh", true) ? -3 : 0;
-
-                final SimpleLoginManager loginManager = new SimpleLoginManager() {
-
-                    @Override
-                    protected void onLoginSuccess(int requestId, String sessionId, int apiLevel) {
-
-                        ApiRequest aru = new ApiRequest(getApplicationContext()) {
-                            @Override
-                            protected void onPostExecute(JsonElement result) {
-
-                                if (result != null) {
-                                    try {
-                                        JsonObject content = result.getAsJsonObject();
-
-                                        if (content != null) {
-
-                                            int unread = content.get("unread").getAsInt();
-                                            updateWidgets(unread, UPDATE_RESULT_OK);
-
-                                            return;
-                                        }
-                                    } catch (Exception e) {
-                                        e.printStackTrace();
-                                    }
-                                } else {
-                                    Log.d(TAG, "request failed: " + getErrorMessage());
-                                }
-
-                                updateWidgets(-1, UPDATE_RESULT_ERROR_OTHER);
-                            }
-                        };
-
-                        final String fSessionId = sessionId;
-
-                        HashMap<String, String> umap = new HashMap<>();
-                        umap.put("op", "getUnread");
-                        umap.put("feed_id", String.valueOf(feedId));
-                        umap.put("sid", fSessionId);
-
-                        aru.execute(umap);
-                    }
-
-                    @Override
-                    protected void onLoginFailed(int requestId, ApiRequest ar) {
-                        Log.d(TAG, "login failed: " + getString(ar.getErrorMessage()));
-
-                        updateWidgets(-1, UPDATE_RESULT_ERROR_LOGIN);
-                    }
-
-                    @Override
-                    protected void onLoggingIn(int requestId) {
-
-
-                    }
-                };
-
-                String login = m_prefs.getString("login", "").trim();
-                String password = m_prefs.getString("password", "").trim();
-
-                loginManager.logIn(getApplicationContext(), 1, login, password);
-
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-
-            updateWidgets(-1, UPDATE_RESULT_ERROR_OTHER);
-        }
-
-        stopSelf();
-
-    }
-
-    private int getWidgetCount(Context context) {
-        AppWidgetManager appWidgetManager = AppWidgetManager.getInstance(context);
-        ComponentName thisAppWidget = new ComponentName(context.getPackageName(), SmallWidgetProvider.class.getName());
-
-        return appWidgetManager.getAppWidgetIds(thisAppWidget).length;
-    }
-
-    protected boolean isNetworkAvailable() {
-        ConnectivityManager cm = (ConnectivityManager)
-                getSystemService(Context.CONNECTIVITY_SERVICE);
-        NetworkInfo networkInfo = cm.getActiveNetworkInfo();
-
-        // if no network is available networkInfo will be null
-        // otherwise check if we are connected
-        return networkInfo != null && networkInfo.isConnected();
-    }
-
-    public void updateWidgets(int unread, int resultCode) {
-        Log.d(TAG, "updateWidgets:" + unread + " " + resultCode);
-
-        Context context = getApplicationContext();
-
-        AppWidgetManager appWidgetManager = AppWidgetManager.getInstance(context);
-        ComponentName thisAppWidget = new ComponentName(context.getPackageName(), SmallWidgetProvider.class.getName());
-        int[] appWidgetIds = appWidgetManager.getAppWidgetIds(thisAppWidget);
-
-        updateWidgetsText(context, appWidgetManager, appWidgetIds, unread, resultCode);
-
-        if (resultCode != UPDATE_IN_PROGRESS) stopSelf();
-    }
-
-    private void updateWidgetsText(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds, int unread, int resultCode) {
-
-        Intent intent = new Intent(context, OnlineActivity.class);
-        PendingIntent pendingIntent = PendingIntent.getActivity(context, 0, intent, PendingIntent.FLAG_IMMUTABLE);
-
-        RemoteViews views = new RemoteViews(context.getPackageName(), R.layout.widget_small);
-        views.setOnClickPendingIntent(R.id.widget_main, pendingIntent);
-
-        String viewText;
-
-        switch (resultCode) {
-            case WidgetUpdateService.UPDATE_RESULT_OK:
-                viewText = String.valueOf(unread);
-                break;
-            case WidgetUpdateService.UPDATE_IN_PROGRESS:
-                viewText = "...";
-                break;
-            default:
-                viewText = "?";
-        }
-
-        views.setTextViewText(R.id.widget_unread_counter, viewText);
-
-        appWidgetManager.updateAppWidget(appWidgetIds, views);
-    }
-
-}
diff --git a/org.fox.ttrss/src/main/res/drawable/widget_border.xml b/org.fox.ttrss/src/main/res/drawable/widget_border.xml
deleted file mode 100644
index c51cd83c..00000000
--- a/org.fox.ttrss/src/main/res/drawable/widget_border.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
-    <corners android:radius="0dp"/>
-    <padding android:left="1dp" android:right="1dp" android:top="1dp" android:bottom="1dp"/>
-    <stroke android:width="1dp" android:color="#6482af"/>
-</shape>
\ No newline at end of file
diff --git a/org.fox.ttrss/src/main/res/layout/widget_small.xml b/org.fox.ttrss/src/main/res/layout/widget_small.xml
deleted file mode 100755
index 06302799..00000000
--- a/org.fox.ttrss/src/main/res/layout/widget_small.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/widget_main"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:background="@drawable/widget_border"
-    android:padding="@dimen/widget_margin" >
-
-    <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@+id/widget_light"
-        android:background="@color/cardview_light_background"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent" />
-
-    <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@+id/widget_dark"
-        android:visibility="invisible"
-        android:background="@color/cardview_dark_background"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent" />
-
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:foreground="@drawable/ripple"
-        android:orientation="vertical" >
-
-        <ImageView
-            android:padding="8dp"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:layout_gravity="center_horizontal"
-            android:src="@drawable/ic_launcher" />
-
-        <TextView
-            android:padding="4dp"
-            android:background="#6482af"
-            android:id="@+id/widget_unread_counter"
-            android:layout_weight="0"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="bottom|center"
-            android:gravity="center_horizontal"
-            android:text=""
-            android:textColor="@android:color/primary_text_dark"
-            android:textSize="13sp" />
-
-    </LinearLayout>
-
-</FrameLayout>
diff --git a/org.fox.ttrss/src/main/res/values-cs/strings.xml b/org.fox.ttrss/src/main/res/values-cs/strings.xml
index 974dc3d1..a63b1201 100644
--- a/org.fox.ttrss/src/main/res/values-cs/strings.xml
+++ b/org.fox.ttrss/src/main/res/values-cs/strings.xml
@@ -219,9 +219,6 @@
     <string name="prefs_build_timestamp">%1$s</string>
     <string name="prefs_build_timestamp_title">Časové razítko sestavení</string>
     <string name="crash_dialog_text">Bohužel, Tiny Tiny RSS se zastavilo. Odeslat hlášení o pádu tt-rss.org\?</string>
-    <string name="prefs_widget_show_fresh">Zobrazit nové články</string>
-    <string name="prefs_widget_show_fresh_summary">Namísto celkového počtu nepřečtených zobrazit počet nových článků</string>
-    <string name="prefs_widget">Widget</string>
     <string name="title_activity_video_player">Přehrávač videa</string>
     <string name="action_settings">Nastavení</string>
     <string name="video_player_share">Sdílet video</string>
@@ -238,12 +235,6 @@
     <string name="headline_undo_row_prompt">Označit jako přečtené</string>
     <string name="pref_headlines_swipe_to_dismiss">Potáhnout pro zrušení</string>
     <string name="pref_headlines_swipe_to_dismiss_long">Zakáže místní nabídku nadpisů</string>
-    <string name="pref_widget_update_interval">Interval aktualizace (v minutách)</string>
-    <string name="widget_background_light">Světlý</string>
-    <string name="widget_background_dark">Tmavý</string>
-    <string name="widget_background_transparent">Průhledný</string>
-    <string name="pref_widget_background">Motiv widgetu</string>
-    <string name="pref_widget_update_interval_summary">Tento interval je nepřesný kvůli omezením Androidu</string>
     <string name="prefs_offline_sort_by_feed">Seskupit nadpisy podle kanálů</string>
     <string name="reload">Znovu načíst</string>
     <string name="offline_sync_try_again">Zkusit znovu</string>
diff --git a/org.fox.ttrss/src/main/res/values-de/strings.xml b/org.fox.ttrss/src/main/res/values-de/strings.xml
index 4507a361..d16390e6 100644
--- a/org.fox.ttrss/src/main/res/values-de/strings.xml
+++ b/org.fox.ttrss/src/main/res/values-de/strings.xml
@@ -212,9 +212,6 @@
     <string name="prefs_build_timestamp">%1$s</string>
     <string name="prefs_build_timestamp_title">Zeitpunkt des Kompilierens</string>
     <string name="crash_dialog_text">Tiny Tiny RSS ist leider abgestürzt. Absturzbericht an tt-rss.org senden?</string>
-    <string name="prefs_widget_show_fresh">Zeige Anzahl neuer Artikel</string>
-    <string name="prefs_widget_show_fresh_summary">Zeigt die Anzahl neuer Artikel anstatt aller ungelesener Artikel</string>
-    <string name="prefs_widget">Widget</string>
     <string name="title_activity_video_player">Video-Player</string>
     <string name="hello_world">Hallo Welt!</string>
     <string name="action_settings">Einstellungen</string>
@@ -239,12 +236,6 @@
     <string name="headline_undo_row_prompt">als gelesen markiert</string>
     <string name="pref_headlines_swipe_to_dismiss">Swipen zum verwerfen</string>
     <string name="pref_headlines_swipe_to_dismiss_long">Deaktiviere das Kontextmenü für Überschriften</string>
-    <string name="pref_widget_update_interval">Aktualisierungsintervall (in Minuten)</string>
-    <string name="widget_background_light">Hell</string>
-    <string name="widget_background_dark">Dunkel</string>
-    <string name="widget_background_transparent">Transparent</string>
-    <string name="pref_widget_background">Widget Theme</string>
-    <string name="pref_widget_update_interval_summary">Dieses Intervall ist aufgrund der Einschränkungen von Android ungenau</string>
     <string name="prefs_offline_sort_by_feed">Gruppiere Überschriften nach Feeds</string>
     <string name="reload">Aktualisieren</string>
     <string name="offline_sync_try_again">Nochmal versuchen</string>
diff --git a/org.fox.ttrss/src/main/res/values-es/strings.xml b/org.fox.ttrss/src/main/res/values-es/strings.xml
index c53df58c..dd447a0f 100644
--- a/org.fox.ttrss/src/main/res/values-es/strings.xml
+++ b/org.fox.ttrss/src/main/res/values-es/strings.xml
@@ -215,9 +215,6 @@
     <string name="prefs_version">%1$s (%2$d)</string>
     <string name="prefs_build_timestamp_title">Fecha de compilación</string>
     <string name="crash_dialog_text">Lamentablemente, Tiny Tiny RSS se ha detenido. ¿Enviar informe de fallo a tt-rss.org?</string>
-    <string name="prefs_widget_show_fresh">Mostrar artículos nuevos</string>
-    <string name="prefs_widget_show_fresh_summary">Mostrar el número de artículos nuevos en lugar del número total de no leídos</string>
-    <string name="prefs_widget">Widget</string>
     <string name="title_activity_video_player">Reproductor de video</string>
     <string name="action_settings">Ajustes</string>
     <string name="video_player_share">Compartir el vídeo</string>
@@ -233,12 +230,6 @@
     <string name="confirm_catchup_above">¿Marcar artículos como leídos?</string>
     <string name="dialog_ok">De acuerdo</string>
     <string name="headline_undo_row_prompt">Marcado como leído</string>
-    <string name="pref_widget_update_interval">Intervalo de actualización (en minutos)</string>
-    <string name="widget_background_light">Claro</string>
-    <string name="widget_background_dark">Oscuro</string>
-    <string name="widget_background_transparent">Transparente</string>
-    <string name="pref_widget_background">Tema del widget</string>
-    <string name="pref_widget_update_interval_summary">Este intervalo es impreciso debido a las limitaciones de Android</string>
     <string name="prefs_offline_sort_by_feed">Titulares de grupos por feeds</string>
     <string name="reload">Recargar</string>
     <string name="offline_sync_try_again">Volver a intentar</string>
diff --git a/org.fox.ttrss/src/main/res/values-et/strings.xml b/org.fox.ttrss/src/main/res/values-et/strings.xml
index bc4be652..215f4e62 100644
--- a/org.fox.ttrss/src/main/res/values-et/strings.xml
+++ b/org.fox.ttrss/src/main/res/values-et/strings.xml
@@ -149,8 +149,6 @@
     <string name="tasker_save_and_close">Salvesta ja sulge</string>
     <string name="headline_undo_row_button">VÕTA TAGASI</string>
     <string name="headline_undo_row_prompt">Märgi loetuks</string>
-    <string name="widget_background_dark">Tume kujundus</string>
-    <string name="widget_background_transparent">Läbipaistev kujundus</string>
     <string name="reload">Laadi uuesti</string>
     <string name="offline_sync_try_again">Proovi uuesti</string>
     <string name="article_media_share">Jaga</string>
@@ -173,7 +171,6 @@
     <string name="unsubscribe">Loobu tellimusest</string>
     <string name="unsubscribe_from_prompt">Kas lõpetame %1$s tellimuse?</string>
     <string name="error_loading_image">Viga pildi laadimisel.</string>
-    <string name="prefs_widget">Vidin</string>
     <string name="title_activity_video_player">Videomängija</string>
     <string name="action_settings">Seadistused</string>
     <string name="video_player_share">Jaga videot</string>
@@ -181,10 +178,6 @@
     <string name="open_with">Ava rakendusega…</string>
     <string name="confirm_catchup_above">Kas märgime artiklid loetuks?</string>
     <string name="dialog_ok">Sobib</string>
-    <string name="widget_background_light">Hele kujundus</string>
-    <string name="pref_widget_update_interval">Uuenduse välp (minutites)</string>
-    <string name="pref_widget_background">Vidina taust</string>
-    <string name="pref_widget_update_interval_summary">Androidist johtuvate piirangute tõttu pole see välp täpne</string>
     <string name="prefs_offline_sort_by_feed">Rühmita pealkirjad uudisvoogude kaupa</string>
     <string name="synchronize_read_articles_and_go_online">Sünkroniseeri loetud artiklid ja kasuta võrgurežiimi</string>
     <string name="pref_headlines_mark_read_scroll_long">Pealkirjad märgitakse loetuks neist mööda kerimisel</string>
diff --git a/org.fox.ttrss/src/main/res/values-eu/strings.xml b/org.fox.ttrss/src/main/res/values-eu/strings.xml
index dc45436f..31b76531 100644
--- a/org.fox.ttrss/src/main/res/values-eu/strings.xml
+++ b/org.fox.ttrss/src/main/res/values-eu/strings.xml
@@ -4,11 +4,9 @@
     <string name="toggle_sort_order">Txandakatu lehenbizi zaharrenak</string>
     <string name="prefs_enable_image_downsampling_long">Eskatu kontrol-panelari irudiak murrizteko, WiFi batera konektatuta ez bazaude. Gehigarri bat behar du (ttrss-api-resize).</string>
     <string name="pref_headlines_swipe_to_dismiss">Arrastatu baztertzeko</string>
-    <string name="prefs_widget_show_fresh_summary">Irakurri gabeko azken artikuluen kopuru osoaren ordez</string>
     <string name="prefs_inline_video_player">Esperimentala. Ukitu luzea jotzaile bereizian irekitzeko</string>
     <string name="offline_tap_to_switch">Ukitu lineaz kanpo aldatzeko</string>
     <string name="prefs_opening_links">Ireki lotura honekin</string>
-    <string name="prefs_widget_show_fresh">Ikusi azken artikuluak</string>
     <string name="prefs_open_fresh_on_startup">Ireki azken artikuluak hasieran</string>
     <string name="prefs_enable_fab">FAB gaitu</string>
     <string name="shortcut_has_been_placed_on_the_home_screen">Lasterbidea hasierako pantailan jarri da</string>
@@ -42,12 +40,6 @@
     <string name="offline_sync_try_again">Saiatu berriz</string>
     <string name="reload">Birkargatu</string>
     <string name="prefs_offline_sort_by_feed">Taldekatu jarioa titularren arabera</string>
-    <string name="pref_widget_update_interval_summary">Tarte hori ez da zehatza Android-en mugak direla eta</string>
-    <string name="pref_widget_background">Widget-aren itxura</string>
-    <string name="widget_background_transparent">Gardena</string>
-    <string name="widget_background_dark">Iluna</string>
-    <string name="widget_background_light">Argia</string>
-    <string name="pref_widget_update_interval">Eguneratze-tartea (minututan)</string>
     <string name="pref_headlines_swipe_to_dismiss_long">Testuinguru-menuaren titularrak desaktibatzen ditu</string>
     <string name="headline_undo_row_prompt">Markatu irakurritako gisa</string>
     <string name="headline_undo_row_button">Desegin</string>
@@ -64,7 +56,6 @@
     <string name="video_player_share">Partekatu bideoa</string>
     <string name="action_settings">Ezarpnak</string>
     <string name="title_activity_video_player">Bideo jotzailea</string>
-    <string name="prefs_widget">Widget</string>
     <string name="crash_dialog_text">Tamalez, Tiny Tiny RSS gelditu egin da. Errore-txostena tt-rss.org helbidera bidali\?</string>
     <string name="prefs_version">%1$s (%2$d)</string>
     <string name="prefs_build_timestamp">%1$s</string>
diff --git a/org.fox.ttrss/src/main/res/values-fi/strings.xml b/org.fox.ttrss/src/main/res/values-fi/strings.xml
index 10882b07..cdbb9ee5 100644
--- a/org.fox.ttrss/src/main/res/values-fi/strings.xml
+++ b/org.fox.ttrss/src/main/res/values-fi/strings.xml
@@ -44,9 +44,6 @@
     <string name="prefs_build_timestamp">%1$s</string>
     <string name="action_settings">Asetukset</string>
     <string name="dialog_ok">OK</string>
-    <string name="widget_background_light">Vaalea</string>
-    <string name="widget_background_dark">Tumma</string>
-    <string name="widget_background_transparent">Läpinäkyvä</string>
     <string name="reload">Lataa uudelleen</string>
     <string name="offline_sync_try_again">Yritä uudelleen</string>
     <string name="prefs_network_settings">Lisäasetukset…</string>
diff --git a/org.fox.ttrss/src/main/res/values-fr/strings.xml b/org.fox.ttrss/src/main/res/values-fr/strings.xml
index 1826572b..536f81da 100644
--- a/org.fox.ttrss/src/main/res/values-fr/strings.xml
+++ b/org.fox.ttrss/src/main/res/values-fr/strings.xml
@@ -216,9 +216,6 @@
     <string name="prefs_build_timestamp">%1$s</string>
     <string name="prefs_build_timestamp_title">Horodatage de compilation</string>
     <string name="crash_dialog_text">Malheureusement, Tiny Tiny RSS s\'est arrêté. Envoyer un rapport de crash à tt-rss.org \?</string>
-    <string name="prefs_widget_show_fresh">Afficher les articles récents</string>
-    <string name="prefs_widget_show_fresh_summary">Afficher le nombre d\'articles récents plutôt que le total d\'articles non lus</string>
-    <string name="prefs_widget">Widget</string>
     <string name="title_activity_video_player">Lecteur Vidéo</string>
     <string name="hello_world">Hello world!</string>
     <string name="action_settings">Paramètres</string>
@@ -250,12 +247,6 @@
     <string name="headline_undo_row_prompt">Marquer comme lu</string>
     <string name="pref_headlines_swipe_to_dismiss">Glisser pour rejeter</string>
     <string name="pref_headlines_swipe_to_dismiss_long">Désactiver le menu contextuel des articles</string>
-    <string name="pref_widget_update_interval">Intervalle de mise à jour (en minutes)</string>
-    <string name="widget_background_light">Clair</string>
-    <string name="widget_background_dark">Sombre</string>
-    <string name="widget_background_transparent">Transparent</string>
-    <string name="pref_widget_background">Thème du widget</string>
-    <string name="pref_widget_update_interval_summary">Cet intervalle est imprécis en raison des limitations d\'Android</string>
     <string name="prefs_offline_sort_by_feed">Grouper les articles par flux</string>
     <string name="reload">Recharger</string>
     <string name="offline_sync_try_again">Réessayer</string>
diff --git a/org.fox.ttrss/src/main/res/values-it/strings.xml b/org.fox.ttrss/src/main/res/values-it/strings.xml
index 85a99708..24a25d48 100644
--- a/org.fox.ttrss/src/main/res/values-it/strings.xml
+++ b/org.fox.ttrss/src/main/res/values-it/strings.xml
@@ -215,9 +215,6 @@
     <string name="prefs_build_timestamp">%1$s</string>
     <string name="prefs_build_timestamp_title">Ora della compilazione</string>
     <string name="crash_dialog_text">Sfortunatamente, Tiny Tiny RSS si è arrestato. Inviare il report dell\'arresto a tt-rss.org?</string>
-    <string name="prefs_widget_show_fresh">Mostra nuovi articoli</string>
-    <string name="prefs_widget_show_fresh_summary">Invece del totale degli articoli non letti, mostra il numero di nuovi articoli</string>
-    <string name="prefs_widget">Widget</string>
     <string name="title_activity_video_player">Riproduttore Video</string>
     <string name="hello_world">Ciao Mondo!</string>
     <string name="action_settings">Preferenze</string>
@@ -244,12 +241,6 @@
     <string name="headline_undo_row_prompt">Segna come letto</string>
     <string name="pref_headlines_swipe_to_dismiss">Scorri per eliminare</string>
     <string name="pref_headlines_swipe_to_dismiss_long">Disabilita il menù contestuale per i titoli</string>
-    <string name="pref_widget_update_interval">Intervallo di aggiornamento (in minuti)</string>
-    <string name="widget_background_light">Chiaro</string>
-    <string name="widget_background_dark">Scuro</string>
-    <string name="widget_background_transparent">Trasparente</string>
-    <string name="pref_widget_background">Tema del widget</string>
-    <string name="pref_widget_update_interval_summary">Questo intervallo è impreciso a causa di limitazioni di Android</string>
     <string name="prefs_offline_sort_by_feed">Raggruppa titoli per notiziario</string>
     <string name="reload">Ricarica</string>
     <string name="offline_sync_try_again">Prova ancora</string>
diff --git a/org.fox.ttrss/src/main/res/values-ja/strings.xml b/org.fox.ttrss/src/main/res/values-ja/strings.xml
index 6d293788..9092ba6a 100644
--- a/org.fox.ttrss/src/main/res/values-ja/strings.xml
+++ b/org.fox.ttrss/src/main/res/values-ja/strings.xml
@@ -210,9 +210,6 @@
     <string name="prefs_build_timestamp">%1$s</string>
     <string name="prefs_build_timestamp_title">ビルドタイムスタンプ</string>
     <string name="crash_dialog_text">残念ながら、Tiny Tiny RSSが停止しました。クラッシュレポートをtt-rss.orgに送信しますか?</string>
-    <string name="prefs_widget_show_fresh">新着記事数を表示</string>
-    <string name="prefs_widget_show_fresh_summary">全未読記事数の代わりに新着記事数を表示する</string>
-    <string name="prefs_widget">ウィジェット</string>
     <string name="prefs_network_settings">その他の設定…</string>
     <string name="prefs_opening_links">リンクを開く</string>
     <string name="open_with">で開く…</string>
@@ -234,11 +231,6 @@
     <string name="confirm_catchup_above">既読にしますか?</string>
     <string name="headline_undo_row_button">元に戻す</string>
     <string name="pref_headlines_swipe_to_dismiss_long">ヘッドラインのコンテキストメニューを無効にする</string>
-    <string name="pref_widget_update_interval">更新間隔 (分単位)</string>
-    <string name="pref_widget_background">ウィジットテーマ</string>
-    <string name="widget_background_dark">ダーク</string>
-    <string name="pref_widget_update_interval_summary">更新間隔はAndroidの制限で不正確です</string>
-    <string name="widget_background_transparent">透過</string>
     <string name="prefs_offline_sort_by_feed">ヘッドラインをフィードでグループ</string>
     <string name="reload">リロード</string>
     <string name="offline_sync_try_again">再試行</string>
@@ -285,7 +277,6 @@
     <string name="prefs_always_downsample_images">常に画像をリサイズ</string>
     <string name="headlines_row_top_changed">新着記事があります。フィードをリロードしてください。</string>
     <string name="headline_undo_row_prompt">既読にする</string>
-    <string name="widget_background_light">ライト</string>
     <string name="article_edit_note">注釈を編集</string>
     <string name="error_success">オペレーションは正常に完了しました</string>
     <string name="error_bad_request">エラー: 400 bad request</string>
diff --git a/org.fox.ttrss/src/main/res/values-nl/strings.xml b/org.fox.ttrss/src/main/res/values-nl/strings.xml
index 58aa807a..ca6d9487 100644
--- a/org.fox.ttrss/src/main/res/values-nl/strings.xml
+++ b/org.fox.ttrss/src/main/res/values-nl/strings.xml
@@ -203,9 +203,6 @@
     <string name="prefs_build_timestamp">%1$s</string>
     <string name="prefs_build_timestamp_title">Build tijdstip</string>
     <string name="crash_dialog_text">Helaas, Tiny Tiny RSS is gestopt. Crashrapport indienen bij tt-rss.org\?</string>
-    <string name="prefs_widget_show_fresh">Laat Nieuwe artikelen zien</string>
-    <string name="prefs_widget_show_fresh_summary">In plaats van totaal ongelezen laat aantal Nieuwe artikelen zien</string>
-    <string name="prefs_widget">Widget</string>
     <string name="title_activity_video_player">Videospeler</string>
     <string name="action_settings">Instellingen</string>
     <string name="video_player_share">Deel video</string>
@@ -222,12 +219,6 @@
     <string name="headline_undo_row_prompt">Markeer al gelezen</string>
     <string name="pref_headlines_swipe_to_dismiss">Swipe om te verwijderen</string>
     <string name="pref_headlines_swipe_to_dismiss_long">Schakel koptekst-contextmenu uit</string>
-    <string name="pref_widget_update_interval">Ververs-interval (in minuten)</string>
-    <string name="widget_background_light">Licht</string>
-    <string name="widget_background_dark">Donker</string>
-    <string name="widget_background_transparent">Transparant</string>
-    <string name="pref_widget_background">Widget-thema</string>
-    <string name="pref_widget_update_interval_summary">Dit interval in niet precies door beperkingen van Android</string>
     <string name="prefs_offline_sort_by_feed">Groepeer kopteksten op feed</string>
     <string name="reload">Herlaad</string>
     <string name="offline_sync_try_again">Probeer opnieuw</string>
diff --git a/org.fox.ttrss/src/main/res/values-pl/strings.xml b/org.fox.ttrss/src/main/res/values-pl/strings.xml
index 80964de0..7d2a2d4d 100644
--- a/org.fox.ttrss/src/main/res/values-pl/strings.xml
+++ b/org.fox.ttrss/src/main/res/values-pl/strings.xml
@@ -187,9 +187,6 @@
     <string name="prefs_build_timestamp">%1$s</string>
     <string name="prefs_build_timestamp_title">Znacznik czasu kompilacji</string>
     <string name="crash_dialog_text">Niestety, Tiny Tiny RSS przestał działać. Przesłać raport o awarii do tt-rss.org?</string>
-    <string name="prefs_widget_show_fresh">Pokaż najnowsze artykuły</string>
-    <string name="prefs_widget_show_fresh_summary">Zamiast łącznej liczby nieprzeczytanych artykułów wyświetl liczbę najnowszych artykułów</string>
-    <string name="prefs_widget">Widżet</string>
     <string name="title_activity_video_player">Odtwarzacz wideo</string>
     <string name="action_settings">Ustawienia</string>
     <string name="video_player_share">Udostępnij wideo</string>
@@ -201,11 +198,6 @@
     <string name="quick_preview">Szybki podgląd</string>
     <string name="prefs_opening_links">Otwieranie linków</string>
     <string name="pref_headlines_swipe_to_dismiss">Przesuń, aby odrzucić</string>
-    <string name="widget_background_dark">Ciemny</string>
-    <string name="widget_background_light">Jasny</string>
-    <string name="widget_background_transparent">Przezroczysty</string>
-    <string name="pref_widget_background">Motyw widżetu</string>
-    <string name="pref_widget_update_interval_summary">Ten przedział jest nieprecyzyjny ze względu na ograniczenia systemu Android</string>
     <string name="prefs_offline_sort_by_feed">Grupuj nagłówki według kanałów</string>
     <string name="reload">Przeładuj</string>
     <string name="offline_sync_try_again">Spróbuj ponownie</string>
@@ -296,7 +288,6 @@
     <string name="headline_undo_row_button">Cofnij</string>
     <string name="headline_undo_row_prompt">Oznaczono jako przeczytane</string>
     <string name="pref_headlines_swipe_to_dismiss_long">Wyłącza menu kontekstowe nagłówków</string>
-    <string name="pref_widget_update_interval">Częstotliwość aktualizacji (w minutach)</string>
     <string name="logcat_refresh">Odśwież</string>
     <string name="logcat_title">Przeglądarka logów</string>
     <string name="prefs_headline_request_size">Ile nagłówków zażądać</string>
diff --git a/org.fox.ttrss/src/main/res/values-pt-rBR/strings.xml b/org.fox.ttrss/src/main/res/values-pt-rBR/strings.xml
index 6476c901..8f80288f 100644
--- a/org.fox.ttrss/src/main/res/values-pt-rBR/strings.xml
+++ b/org.fox.ttrss/src/main/res/values-pt-rBR/strings.xml
@@ -211,9 +211,6 @@
     <string name="prefs_build_timestamp">%1$s</string>
     <string name="prefs_build_timestamp_title">Hora da compilação</string>
     <string name="crash_dialog_text">Infelizmente, o Tiny Tiny RSS parou. Enviar registro da falha para tt-rss.org?</string>
-    <string name="prefs_widget_show_fresh">Mostrar artigos recentes</string>
-    <string name="prefs_widget_show_fresh_summary">Ao invés do total de artigos não lidos, exibir a quantidade de artigos recentes</string>
-    <string name="prefs_widget">Widget</string>
     <string name="title_activity_video_player">Reprodutor de vídeos</string>
     <!-- <string name="hello_world">Olá, mundo!</string> -->
     <string name="action_settings">Configurações</string>
@@ -235,12 +232,6 @@
     <string name="headline_undo_row_prompt">Marcar como lido</string>
     <string name="pref_headlines_swipe_to_dismiss">Deslizar para marcar como lido</string>
     <string name="pref_headlines_swipe_to_dismiss_long">Desabilita menu de contexto dos títulos</string>
-    <string name="pref_widget_update_interval">Intervalo de atualização (em minutos)</string>
-    <string name="widget_background_light">Claro</string>
-    <string name="widget_background_dark">Escuro</string>
-    <string name="widget_background_transparent">Transparente</string>
-    <string name="pref_widget_background">Tema do widget</string>
-    <string name="pref_widget_update_interval_summary">Esse intervalo não é preciso devido a limitações do Android</string>
     <string name="prefs_offline_sort_by_feed">Agrupar títulos por feeds</string>
     <string name="reload">Recarregar</string>
     <string name="offline_sync_try_again">Tentar novamente</string>
diff --git a/org.fox.ttrss/src/main/res/values-ru/strings.xml b/org.fox.ttrss/src/main/res/values-ru/strings.xml
index 7bc55bc6..24682a08 100644
--- a/org.fox.ttrss/src/main/res/values-ru/strings.xml
+++ b/org.fox.ttrss/src/main/res/values-ru/strings.xml
@@ -188,9 +188,6 @@
     <string name="headline_display_mode_compact">Компактный</string>
     <string name="headline_display_mode_compact_noimages">Компактный (без изображений)</string>
     <string name="prefs_version_title">Версия</string>
-    <string name="prefs_widget_show_fresh">Показывать Свежие статьи</string>
-    <string name="prefs_widget_show_fresh_summary">Показывать количество Свежих статей вместо непрочитанных</string>
-    <string name="prefs_widget">Виджет</string>
     <string name="title_activity_video_player">Видео проигрыватель</string>
     <string name="action_settings">Настройки</string>
     <string name="video_player_share">Поделиться видео</string>
@@ -205,12 +202,6 @@
     <string name="dialog_ok">ОК</string>
     <string name="headline_undo_row_button">ОТМЕНА</string>
     <string name="headline_undo_row_prompt">Помечены как прочитанные</string>
-    <string name="pref_widget_update_interval">Интервал обновления (в минутах)</string>
-    <string name="widget_background_light">Светлый</string>
-    <string name="widget_background_dark">Темный</string>
-    <string name="widget_background_transparent">Прозрачный</string>
-    <string name="pref_widget_background">Фон виджета</string>
-    <string name="pref_widget_update_interval_summary">В силу ограничений Android этот интервал неточен</string>
     <string name="prefs_offline_sort_by_feed">Группировать заголовки по каналам</string>
     <string name="reload">Обновить</string>
     <string name="offline_sync_try_again">Попробовать еще раз</string>
diff --git a/org.fox.ttrss/src/main/res/values-sk/strings.xml b/org.fox.ttrss/src/main/res/values-sk/strings.xml
index 50add40d..7f298fc3 100644
--- a/org.fox.ttrss/src/main/res/values-sk/strings.xml
+++ b/org.fox.ttrss/src/main/res/values-sk/strings.xml
@@ -184,9 +184,6 @@
     <string name="pref_font_size">Veľkosť textu článku</string>
     <string name="pref_headlines_swipe_to_dismiss">Posunúť pre zrušenie</string>
     <string name="pref_headlines_swipe_to_dismiss_long">Zablokuje kontextové menu nadpisov</string>
-    <string name="pref_widget_background">Vzhľad widgetu</string>
-    <string name="pref_widget_update_interval">Interval aktualizácií (v minútach)</string>
-    <string name="pref_widget_update_interval_summary">Tento interval je nepresný z dôvodu obmedzení Androidu</string>
     <string name="prefs_build_timestamp">%1$s</string>
     <string name="prefs_build_timestamp_title">Čas zostavenia</string>
     <string name="prefs_custom_tabs_summary">Otvoriť externé odkadzy vo vlastných kartách Chrome (rýchlejšie, použité ak je dostupné)</string>
@@ -200,9 +197,6 @@
     <string name="prefs_use_custom_tabs">Použiť rýchly náhľad</string>
     <string name="prefs_version">%1$s (%2$d)</string>
     <string name="prefs_version_title">Verzia</string>
-    <string name="prefs_widget">Widget</string>
-    <string name="prefs_widget_show_fresh">Zobraziť nové články</string>
-    <string name="prefs_widget_show_fresh_summary">Namiesto úplného počtu neprečítaných zobraz počet nových článkov</string>
     <string name="quick_preview">Rýchly náhľad</string>
     <string name="reload">Obnoviť</string>
     <string name="server_function_not_available">Prepáčte, táto funkcia nie je dostupná on Vašej verzii tt-rss.</string>
@@ -215,9 +209,6 @@
     <string name="unsubscribe">Odhlásiť</string>
     <string name="unsubscribe_from_prompt">Odhlásiť z %1$s?</string>
     <string name="video_player_share">Zdieľať video</string>
-    <string name="widget_background_dark">Tmavý</string>
-    <string name="widget_background_light">Svetlý</string>
-    <string name="widget_background_transparent">Transparentný</string>
     <string name="accel_webview_summary">Zákažte, ak vidíte blikanie alebo vizuálne závady</string>
     <string name="accel_webview_title">Akcelerované zobrazenie web (3.0+)</string>
     <string name="action_settings">Nastavenia</string>
diff --git a/org.fox.ttrss/src/main/res/values-sq/strings.xml b/org.fox.ttrss/src/main/res/values-sq/strings.xml
index 9b95bf1b..b51ccb83 100644
--- a/org.fox.ttrss/src/main/res/values-sq/strings.xml
+++ b/org.fox.ttrss/src/main/res/values-sq/strings.xml
@@ -205,9 +205,6 @@
     <string name="prefs_build_timestamp">%1$s</string>
     <string name="prefs_build_timestamp_title">Vulë kohore montimi</string>
     <string name="crash_dialog_text">Mjerisht, Tiny Tiny RSS është ndalur. Të parashtrohet njoftim vithisje te tt-rss.org?</string>
-    <string name="prefs_widget_show_fresh">Shfaq artikuj të Freskët</string>
-    <string name="prefs_widget_show_fresh_summary">Në vend të artikujve të palexuar gjithsej, shfaq sasi artikujsh të Freskët</string>
-    <string name="prefs_widget">Widget</string>
     <string name="title_activity_video_player">Lojtës Videosh</string>
     <string name="action_settings">Rregullime</string>
     <string name="video_player_share">Ndani video me të tjerë</string>
@@ -221,12 +218,6 @@
     <string name="headline_undo_row_prompt">Iu vu shenjë si ië lexuar</string>
     <string name="pref_headlines_swipe_to_dismiss">Fërkojeni që të hidhet tej</string>
     <string name="pref_headlines_swipe_to_dismiss_long">Çaktivizon menu konteksi kryesh</string>
-    <string name="pref_widget_update_interval">Interval përditësimi (në minuta)</string>
-    <string name="widget_background_light">E çelët</string>
-    <string name="widget_background_dark">E errët</string>
-    <string name="widget_background_transparent">E tejdukshme</string>
-    <string name="pref_widget_background">Temë widget-esh</string>
-    <string name="pref_widget_update_interval_summary">Ky interval është i pasaktë për shkak kufizimesh të Android-it</string>
     <string name="prefs_offline_sort_by_feed">Grupoji titujt sipas prurjesh</string>
     <string name="reload">Ringarkoje</string>
     <string name="offline_sync_try_again">Riprovoni</string>
diff --git a/org.fox.ttrss/src/main/res/values-sv/strings.xml b/org.fox.ttrss/src/main/res/values-sv/strings.xml
index 7faa923a..25a85bf5 100644
--- a/org.fox.ttrss/src/main/res/values-sv/strings.xml
+++ b/org.fox.ttrss/src/main/res/values-sv/strings.xml
@@ -205,8 +205,6 @@
     <string name="prefs_build_timestamp">%1$s</string>
     <string name="prefs_build_timestamp_title">Tidpunkt för kompilering</string>
     <string name="crash_dialog_text">Tiny Tiny RSS har dessvärre slutat fungera. Skicka kraschrapport till tt-rss.org\?</string>
-    <string name="prefs_widget_show_fresh">Visa Färska artiklar</string>
-    <string name="prefs_widget_show_fresh_summary">Visa antal Färska artiklar iställar för totalt antal olästa</string>
     <string name="title_activity_video_player">Videospelare</string>
 
     <string name="action_settings">Inställningar</string>
@@ -224,13 +222,7 @@
     <string name="headline_undo_row_prompt">Markerad som läst</string>
     <string name="pref_headlines_swipe_to_dismiss">Svep för att avvisa</string>
     <string name="pref_headlines_swipe_to_dismiss_long">Inaktiverar kontextmeny för rubriker</string>
-    <string name="pref_widget_update_interval">Uppdateringsintervall (i minuter)</string>
 
-    <string name="widget_background_light">Ljus</string>
-    <string name="widget_background_dark">Mörk</string>
-    <string name="widget_background_transparent">Transparent</string>
-    <string name="pref_widget_background">Tema för widget</string>
-    <string name="pref_widget_update_interval_summary">Detta intervall är oprecist på grund av begränsningar i Android.</string>
     <string name="prefs_offline_sort_by_feed">Gruppera rubriker efter flöden</string>
     <string name="reload">Ladda om</string>
     <string name="offline_sync_try_again">Försök igen</string>
diff --git a/org.fox.ttrss/src/main/res/values-ta/strings.xml b/org.fox.ttrss/src/main/res/values-ta/strings.xml
index 1df0a703..b0b0cfbf 100644
--- a/org.fox.ttrss/src/main/res/values-ta/strings.xml
+++ b/org.fox.ttrss/src/main/res/values-ta/strings.xml
@@ -86,15 +86,12 @@
     <string name="prefs_version">%1$s (%2$d)</string>
     <string name="prefs_version_title">பதிப்பு</string>
     <string name="prefs_build_timestamp">%1$s</string>
-    <string name="prefs_widget_show_fresh">புதிய கட்டுரைகளைக் காட்டு</string>
-    <string name="prefs_widget_show_fresh_summary">புதிய கட்டுரைகளின் மொத்த படிக்காத காட்சி அளவு</string>
     <string name="prefs_custom_tabs_summary">உலாவி தனிப்பயன் தாவல்களுடன் வெளிப்புற இணைப்புகளைத் திறக்கவும் (விரைவாக, கிடைத்தால் பயன்படுத்தப்படுகிறது)</string>
     <string name="prefs_use_custom_tabs">விரைவான முன்னோட்டத்தைப் பயன்படுத்தவும்</string>
     <string name="prefs_always_open_uri">எப்போதும் உலாவியில் திறக்கவும்</string>
     <string name="quick_preview">விரைவான முன்னோட்டம்</string>
     <string name="prefs_opening_links">இணைப்புகளைத் திறக்கும்</string>
     <string name="pref_headlines_swipe_to_dismiss">தள்ளுபடி செய்ய ச்வைப் செய்யவும்</string>
-    <string name="pref_widget_update_interval">புதுப்பிப்பு இடைவெளி (நிமிடங்களில்)</string>
     <string name="prefs_network_settings">மேலும் அமைப்புகள் ...</string>
     <string name="cat_labels">சிட்டைகள்</string>
     <string name="cat_uncategorized">வகைப்படுத்தப்படாதது</string>
@@ -233,7 +230,6 @@
     <string name="prefs_enable_fab_long">படிக்கும்போது மிதக்கும் செயல் பொத்தானைக் காட்டு</string>
     <string name="prefs_build_timestamp_title">நேர முத்திரையை உருவாக்குங்கள்</string>
     <string name="crash_dialog_text">துரதிர்ச்டவசமாக, சிறிய சிறிய ஆர்.எச்.எச் நிறுத்தப்பட்டுள்ளது. செயலிழப்பு அறிக்கையை TT-RSS.org க்கு சமர்ப்பிக்கவா?</string>
-    <string name="prefs_widget">விட்செட்</string>
     <string name="title_activity_video_player">வீடியோ பிளேயர்</string>
     <string name="action_settings">அமைப்புகள்</string>
     <string name="video_player_share">வீடியோவைப் பகிரவும்</string>
@@ -246,11 +242,6 @@
     <string name="headline_undo_row_button">செயல்தவிர்</string>
     <string name="headline_undo_row_prompt">வாசிப்பு என குறிக்கப்பட்டுள்ளது</string>
     <string name="pref_headlines_swipe_to_dismiss_long">தலைப்புச் செய்திகளான சூழல் மெனுவை முடக்குகிறது</string>
-    <string name="widget_background_light">ஒளி</string>
-    <string name="widget_background_dark">இருண்ட</string>
-    <string name="widget_background_transparent">வெளிப்படையானது</string>
-    <string name="pref_widget_background">விட்செட் கருப்பொருள்</string>
-    <string name="pref_widget_update_interval_summary">ஆண்ட்ராய்டு வரம்புகள் காரணமாக இந்த இடைவெளி துல்லியமற்றது</string>
     <string name="prefs_offline_sort_by_feed">ஊட்டங்கள் மூலம் குழு தலைப்புச் செய்திகள்</string>
     <string name="reload">ஏற்றவும்</string>
     <string name="offline_sync_try_again">மீண்டும் முயற்சிக்கவும்</string>
diff --git a/org.fox.ttrss/src/main/res/values-uk/strings.xml b/org.fox.ttrss/src/main/res/values-uk/strings.xml
index 2a971b50..57748013 100644
--- a/org.fox.ttrss/src/main/res/values-uk/strings.xml
+++ b/org.fox.ttrss/src/main/res/values-uk/strings.xml
@@ -207,9 +207,6 @@
     <string name="prefs_build_timestamp">%1$s</string>
     <string name="prefs_build_timestamp_title">Дата збірки</string>
     <string name="crash_dialog_text">На жаль, Tiny Tiny RSS перестав працювати. Відправити звіт про збій до tt-rss.org\?</string>
-    <string name="prefs_widget_show_fresh">Показувати Свіжі статті</string>
-    <string name="prefs_widget_show_fresh_summary">Показувати кількість Свіжих статей, а не загальну</string>
-    <string name="prefs_widget">Віджет</string>
     <string name="title_activity_video_player">Відео програвач</string>
     <string name="action_settings">Налаштування</string>
     <string name="video_player_share">Поширити відео</string>
@@ -226,12 +223,6 @@
     <string name="headline_undo_row_prompt">Позначити прочитаними</string>
     <string name="pref_headlines_swipe_to_dismiss">Зсунути заголовки</string>
     <string name="pref_headlines_swipe_to_dismiss_long">Вимикає контекстне меню заголовків</string>
-    <string name="pref_widget_update_interval">Інтервал оновлення (у хвилинах)</string>
-    <string name="widget_background_light">Світлий</string>
-    <string name="widget_background_dark">Темний</string>
-    <string name="widget_background_transparent">Прозорий</string>
-    <string name="pref_widget_background">Фон віджета</string>
-    <string name="pref_widget_update_interval_summary">Інтервал неточний через обмеження Android</string>
     <string name="prefs_offline_sort_by_feed">Групувати заголовки за каналами</string>
     <string name="reload">Оновити</string>
     <string name="offline_sync_try_again">Спробувати ще</string>
diff --git a/org.fox.ttrss/src/main/res/values-zh-rCN/strings.xml b/org.fox.ttrss/src/main/res/values-zh-rCN/strings.xml
index 4c69a418..0fe88c4b 100644
--- a/org.fox.ttrss/src/main/res/values-zh-rCN/strings.xml
+++ b/org.fox.ttrss/src/main/res/values-zh-rCN/strings.xml
@@ -143,9 +143,6 @@
     <string name="prefs_use_custom_tabs">使用快速预览</string>
     <string name="prefs_version">%1$s (%2$d)</string>
     <string name="prefs_version_title">版本</string>
-    <string name="prefs_widget">小部件</string>
-    <string name="prefs_widget_show_fresh">显示最新文章</string>
-    <string name="prefs_widget_show_fresh_summary">显示最新文章数量而不是未读文章数量</string>
     <string name="quick_preview">快速预览</string>
     <string name="reading">阅读</string>
     <string name="search">搜索</string>
@@ -198,12 +195,6 @@
     <string name="headline_undo_row_prompt">已标记为已读</string>
     <string name="pref_headlines_swipe_to_dismiss">轻扫以忽略</string>
     <string name="pref_headlines_swipe_to_dismiss_long">停用指定文章标题上下文菜单</string>
-    <string name="pref_widget_update_interval">更新间隔(分钟)</string>
-    <string name="widget_background_light">明亮</string>
-    <string name="widget_background_dark">黑暗</string>
-    <string name="widget_background_transparent">透明</string>
-    <string name="pref_widget_background">小部件主题</string>
-    <string name="pref_widget_update_interval_summary">由于Android系统限制,此间隔不精确</string>
     <string name="prefs_offline_sort_by_feed">按供稿分组文章标题</string>
     <string name="reload">重新载入</string>
     <string name="offline_sync_try_again">重试</string>
diff --git a/org.fox.ttrss/src/main/res/values-zh-rTW/strings.xml b/org.fox.ttrss/src/main/res/values-zh-rTW/strings.xml
index 0541ae60..a34471b8 100644
--- a/org.fox.ttrss/src/main/res/values-zh-rTW/strings.xml
+++ b/org.fox.ttrss/src/main/res/values-zh-rTW/strings.xml
@@ -32,9 +32,6 @@
     <string name="headline_display_mode_default">預設</string>
     <string name="title_activity_video_player">視訊播放器</string>
     <string name="headline_undo_row_button">復原</string>
-    <string name="widget_background_light">亮色系</string>
-    <string name="widget_background_dark">暗色系</string>
-    <string name="widget_background_transparent">透明</string>
     <string name="logcat_refresh">重新整理</string>
     <string name="headlines">標題</string>
     <string name="cat_labels">標籤</string>
@@ -143,10 +140,6 @@
     <string name="theme_amber">琥珀色</string>
     <string name="prefs_confirm_headlines_catchup">確認標示為已讀取</string>
     <string name="logcat_copy">複製到剪貼簿</string>
-    <string name="pref_widget_background">小工具主題</string>
-    <string name="prefs_widget">小工具</string>
-    <string name="pref_widget_update_interval">更新間隔(分鐘)</string>
-    <string name="pref_widget_update_interval_summary">由於 Android 系統限制,因此此間隔並不精確</string>
     <string name="sort_feeds_by_unread">依未讀取數量排序摘要</string>
     <string name="shortcut_has_been_placed_on_the_home_screen">捷徑已新增至主螢幕</string>
     <string name="place_shortcut">新增捷徑</string>
@@ -159,7 +152,6 @@
     <string name="error_url_is_an_html_page_no_feeds_found">錯誤:網址是一個 HTML 頁面,找不到摘要。</string>
     <string name="error_while_subscribing">訂閱時發生錯誤。</string>
     <string name="error_api_disabled">錯誤:請在 tt-rss 設定中啟用 API 存取</string>
-    <string name="prefs_widget_show_fresh">顯示最近更新的文章</string>
     <string name="prefs_open_fresh_on_startup">啟動時開啟最近更新的文章列表</string>
     <string name="prefs_always_downsample_images">一律調整影像大小</string>
     <string name="prefs_enable_image_downsampling">自動調整影像大小</string>
@@ -255,7 +247,6 @@
     <string name="offline_articles_to_download_long">為離線模式所下載的文章數量(按時間排序)</string>
     <string name="download_articles_and_go_offline">下載文章並進入離線模式</string>
     <string name="synchronize_read_articles_and_go_online">同步已讀文章並進入線上模式</string>
-    <string name="prefs_widget_show_fresh_summary">顯示最近更新的文章數(而非未讀文章數)</string>
     <string name="headlines_row_top_changed">針測到新文章,請重新整理。</string>
     <string name="prefs_always_open_uri_summary">一律在瀏覽器中開啟,不檢視詳細內容</string>
     <string name="prefs_offline_sort_by_feed">按摘要分組</string>
diff --git a/org.fox.ttrss/src/main/res/values/arrays.xml b/org.fox.ttrss/src/main/res/values/arrays.xml
index f05b1d27..f7e236bf 100644
--- a/org.fox.ttrss/src/main/res/values/arrays.xml
+++ b/org.fox.ttrss/src/main/res/values/arrays.xml
@@ -31,23 +31,6 @@
         <item>5000</item>
         <item>10000</item>
     </string-array>
-    <string-array name="pref_widget_update_intervals" translatable="false">
-        <item>10</item>
-        <item>15</item>
-        <item>30</item>
-        <item>45</item>
-        <item>60</item>
-    </string-array>
-    <string-array name="pref_widget_bgs_values" translatable="false">
-        <item>WB_LIGHT</item>
-        <item>WB_DARK</item>
-        <item>WB_TRANSPARENT</item>
-    </string-array>
-    <string-array name="pref_widget_bgs">
-        <item>@string/widget_background_light</item>
-        <item>@string/widget_background_dark</item>
-        <item>@string/widget_background_transparent</item>
-    </string-array>
     <string-array name="pref_headlines_request_values" translatable="false">
         <item>10</item>
         <item>15</item>
@@ -67,4 +50,14 @@
         <item>-1</item>
         <item>0</item>
     </string-array>
+    <string-array name="pref_api_version_names">
+        <item>@string/pref_api_version_auto</item>
+        <item>@string/pref_api_version_v1</item>
+        <item>@string/pref_api_version_v2</item>
+    </string-array>
+    <string-array name="pref_api_version_values" translatable="false">
+        <item>auto</item>
+        <item>v1</item>
+        <item>v2</item>
+    </string-array>
 </resources>
diff --git a/org.fox.ttrss/src/main/res/values/strings.xml b/org.fox.ttrss/src/main/res/values/strings.xml
index 6406b6f3..4bbd87c9 100755
--- a/org.fox.ttrss/src/main/res/values/strings.xml
+++ b/org.fox.ttrss/src/main/res/values/strings.xml
@@ -227,9 +227,6 @@
     <string name="prefs_build_timestamp_title">Build timestamp</string>
     <string name="crash_dialog_text">Unfortunately, Tiny Tiny RSS has stopped. Submit crash report to tt-rss.org?</string>
     <string name="crash_dialog_text_email">Unfortunately, Tiny Tiny RSS has stopped. Submit crash report via email?</string>
-    <string name="prefs_widget_show_fresh">Show Fresh articles</string>
-    <string name="prefs_widget_show_fresh_summary">Instead of total unread display amount of Fresh articles</string>
-    <string name="prefs_widget">Widget</string>
     <string name="title_activity_video_player">Video Player</string>
 
     <!-- <string name="hello_world">Hello world!</string> -->
@@ -256,13 +253,6 @@
     <string name="headline_undo_row_prompt">Marked as read</string>
     <string name="pref_headlines_swipe_to_dismiss">Swipe to dismiss</string>
     <string name="pref_headlines_swipe_to_dismiss_long">Disables headlines context menu</string>
-    <string name="pref_widget_update_interval">Update interval (in minutes)</string>
-
-    <string name="widget_background_light">Light</string>
-    <string name="widget_background_dark">Dark</string>
-    <string name="widget_background_transparent">Transparent</string>
-    <string name="pref_widget_background">Widget theme</string>
-    <string name="pref_widget_update_interval_summary">This interval is imprecise due to Android limitations</string>
     <string name="prefs_offline_sort_by_feed">Group headlines by feeds</string>
     <string name="reload">Reload</string>
     <string name="offline_sync_try_again">Try again</string>
@@ -322,4 +312,11 @@
     <string name="prefs_mtls_pick_certificate">Choose client certificate</string>
     <string name="prefs_loop_videos">Loop videos</string>
     <string name="error_mtls_cert_not_available">Client certificate requested but it\'s not available.</string>
+
+    <!-- API version preference -->
+    <string name="pref_api_version">API version</string>
+    <string name="pref_api_version_summary">Use the new RESTful API (v2) for server communication</string>
+    <string name="pref_api_version_auto">Auto (try v2, fall back to v1)</string>
+    <string name="pref_api_version_v1">v1 (legacy)</string>
+    <string name="pref_api_version_v2">v2 (RESTful)</string>
 </resources>
diff --git a/org.fox.ttrss/src/main/res/xml/preferences.xml b/org.fox.ttrss/src/main/res/xml/preferences.xml
index 36777fec..d2b1af34 100755
--- a/org.fox.ttrss/src/main/res/xml/preferences.xml
+++ b/org.fox.ttrss/src/main/res/xml/preferences.xml
@@ -27,6 +27,14 @@
             android:key="network_settings"
             android:title="@string/prefs_network_settings" />
 
+        <ListPreference
+            android:defaultValue="auto"
+            android:entries="@array/pref_api_version_names"
+            android:entryValues="@array/pref_api_version_values"
+            android:key="api_version"
+            android:summary="@string/pref_api_version_summary"
+            android:title="@string/pref_api_version" />
+
     </PreferenceCategory>
     <PreferenceCategory
         android:key="category_look_and_feel"
@@ -215,28 +223,6 @@
             android:summary="@string/prefs_always_open_uri_summary"
             android:title="@string/prefs_always_open_uri" />
     </PreferenceCategory>
-    <PreferenceCategory android:title="@string/prefs_widget" >
-        <ListPreference
-            android:defaultValue="15"
-            android:entries="@array/pref_widget_update_intervals"
-            android:entryValues="@array/pref_widget_update_intervals"
-            android:key="widget_update_interval"
-            android:summary="@string/pref_widget_update_interval_summary"
-            android:title="@string/pref_widget_update_interval" />
-
-        <ListPreference
-            android:defaultValue="WB_LIGHT"
-            android:entries="@array/pref_widget_bgs"
-            android:entryValues="@array/pref_widget_bgs_values"
-            android:key="widget_background"
-            android:title="@string/pref_widget_background" />
-
-        <SwitchPreferenceCompat
-            android:defaultValue="true"
-            android:key="widget_show_fresh"
-            android:title="@string/prefs_widget_show_fresh"
-            android:summary="@string/prefs_widget_show_fresh_summary" />
-    </PreferenceCategory>
     <PreferenceCategory android:title="@string/debugging" >
 
         <Preference
diff --git a/org.fox.ttrss/src/main/res/xml/widget_small.xml b/org.fox.ttrss/src/main/res/xml/widget_small.xml
deleted file mode 100644
index 99d5e538..00000000
--- a/org.fox.ttrss/src/main/res/xml/widget_small.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
-    android:minWidth="40dp"
-    android:minHeight="40dp"
-    android:initialLayout="@layout/widget_small"
-    android:resizeMode="none"
-    android:widgetCategory="home_screen">
-</appwidget-provider>
\ No newline at end of file