about summary refs log tree commit diff stats
path: root/org.fox.ttrss/src/main/java
diff options
context:
space:
mode:
authorAndrew Dolgov <fox@fakecake.org>2026-06-06 09:41:00 +0300
committerAndrew Dolgov <fox@fakecake.org>2026-06-06 09:41:00 +0300
commitb43f176da51cde4b7e0e4e53341b39492a522bc5 (patch)
treebe1691ea31efdda0eabdb87510f7496c846fcebc /org.fox.ttrss/src/main/java
parenta88236b42177131b6708d1daea345c633f71dfc8 (diff)
downloadtt-rss-android-b43f176da51cde4b7e0e4e53341b39492a522bc5.tar.gz
tt-rss-android-b43f176da51cde4b7e0e4e53341b39492a522bc5.tar.xz
drop everything related to widgets
Diffstat (limited to 'org.fox.ttrss/src/main/java')
-rwxr-xr-xorg.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java38
-rwxr-xr-xorg.fox.ttrss/src/main/java/org/fox/ttrss/MasterActivity.java9
-rwxr-xr-xorg.fox.ttrss/src/main/java/org/fox/ttrss/util/DeviceBootReceiver.java5
-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
5 files changed, 3 insertions, 341 deletions
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/MasterActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/MasterActivity.java
index cb1fd5db..48104a1a 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);
@@ -424,12 +421,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
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/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);
-    }
-
-}