Refactored widget unified

app/build.gradle

@@ -548,6 +548,7 @@ dependencies {
     def startup_version = "1.2.0"
     def annotation_version_experimental = "1.5.0"
     def core_version = "1.17.0"
+    def core_remoteviews_version = "1.1.0"
     def appcompat_version = "1.7.1"
     def emoji_version = "1.6.0"
     def flatbuffers_version = "2.0.0"
@@ -625,6 +626,9 @@ dependencies {
     // https://mvnrepository.com/artifact/androidx.core/core
     implementation "androidx.core:core:$core_version"
 
+    // https://mvnrepository.com/artifact/androidx.core/core-remoteviews
+    implementation "androidx.core:core-remoteviews:$core_remoteviews_version"
+
     // https://mvnrepository.com/artifact/androidx.appcompat/appcompat
     // https://mvnrepository.com/artifact/androidx.activity/activity
     // https://mvnrepository.com/artifact/androidx.fragment/fragment

app/src/main/java/eu/faircode/email/WidgetUnified.java

@@ -34,18 +34,21 @@ import android.view.View;
 import android.widget.RemoteViews;
 
 import androidx.core.graphics.ColorUtils;
+import androidx.core.widget.RemoteViewsCompat;
 import androidx.preference.PreferenceManager;
 
+import java.util.concurrent.ExecutorService;
+
 public class WidgetUnified extends AppWidgetProvider {
-    @Override
+    private static final ExecutorService executor = Helper.getBackgroundExecutor(1, "widget");
-    public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds) {
+
+    private static RemoteViews getRemoteViews(Context context, int appWidgetId, WidgetUnifiedRemoteViewsFactory factory) {
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
 
         int colorWidgetForeground = context.getResources().getColor(R.color.colorWidgetForeground);
         int lightColorSeparator = context.getResources().getColor(R.color.lightColorSeparator);
         int darkColorSeparator = context.getResources().getColor(R.color.darkColorSeparator);
 
-        for (int appWidgetId : appWidgetIds) {
         String name = prefs.getString("widget." + appWidgetId + ".name", null);
         long account = prefs.getLong("widget." + appWidgetId + ".account", -1L);
         long folder = prefs.getLong("widget." + appWidgetId + ".folder", -1L);
@@ -126,11 +129,16 @@ public class WidgetUnified extends AppWidgetProvider {
         views.setViewPadding(R.id.compose, px, px, px, px);
         views.setOnClickPendingIntent(R.id.compose, piCompose);
 
-            Intent service = new Intent(context, WidgetUnifiedService.class);
+        // https://developer.android.com/reference/kotlin/androidx/core/widget/RemoteViewsCompat.RemoteCollectionItems.Builder
-            service.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, appWidgetId);
+        RemoteViewsCompat.RemoteCollectionItems.Builder builder =
-            service.setData(Uri.parse(service.toUri(Intent.URI_INTENT_SCHEME)));
+                new RemoteViewsCompat.RemoteCollectionItems.Builder()
+                        .setHasStableIds(factory.hasStableIds())
+                        .setViewTypeCount(factory.getViewTypeCount());
+        for (int i = 0; i < factory.getCount(); i++)
+            builder.addItem(factory.getItemId(i), factory.getViewAt(i));
 
-            views.setRemoteAdapter(R.id.lv, service);
+        // https://developer.android.com/reference/kotlin/androidx/core/widget/RemoteViewsCompat#setRemoteAdapter(android.content.Context,android.widget.RemoteViews,kotlin.Int,kotlin.Int,androidx.core.widget.RemoteViewsCompat.RemoteCollectionItems)
+        RemoteViewsCompat.setRemoteAdapter(context, views, appWidgetId, R.id.lv, builder.build());
 
         Intent thread = new Intent(context, ActivityView.class);
         thread.setPackage(BuildConfig.APPLICATION_ID);
@@ -196,17 +204,31 @@ public class WidgetUnified extends AppWidgetProvider {
         int dp6 = Helper.dp2pixels(context, 6);
         views.setViewPadding(R.id.content, dp6, 0, dp6, 0);
 
-            appWidgetManager.updateAppWidget(appWidgetId, views);
+        return views;
+    }
 
-            RunnableEx update = new RunnableEx("widget") {
+    @Override
+    public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds) {
+        executor.submit(new RunnableEx("widget") {
+            @Override
+            protected void delegate() {
+                for (int appWidgetId : appWidgetIds) {
+                    Intent service = new Intent(context, WidgetUnifiedService.class);
+                    service.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, appWidgetId);
+                    service.setData(Uri.parse(service.toUri(Intent.URI_INTENT_SCHEME)));
+                    WidgetUnifiedRemoteViewsFactory factory = new WidgetUnifiedRemoteViewsFactory(context.getApplicationContext(), service);
+                    factory.onDataSetChanged();
+
+                    ApplicationEx.getMainHandler().post(new RunnableEx("widget:" + appWidgetId) {
                         @Override
                         protected void delegate() {
-                    appWidgetManager.notifyAppWidgetViewDataChanged(appWidgetIds, R.id.lv);
+                            RemoteViews views = getRemoteViews(context, appWidgetId, factory);
+                            appWidgetManager.updateAppWidget(appWidgetId, views);
+                        }
+                    });
                 }
-            };
-            ApplicationEx.getMainHandler().removeCallbacks(update);
-            ApplicationEx.getMainHandler().postDelayed(update, 1000L);
             }
+        });
     }
 
     @Override
@@ -278,7 +300,8 @@ public class WidgetUnified extends AppWidgetProvider {
 
             try {
                 int[] appWidgetIds = appWidgetManager.getAppWidgetIds(new ComponentName(context, WidgetUnified.class));
-                appWidgetManager.notifyAppWidgetViewDataChanged(appWidgetIds, R.id.lv);
+                for (int appWidgetId : appWidgetIds)
+                    init(context, appWidgetId);
                 EntityLog.log(context, "Updated widget data count=" + appWidgetIds.length);
             } catch (Throwable ex) {
                 Log.e(ex);