Move more database queries away from the main thread

2 files changed, 39 insertions, 37 deletions

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/widget/singlenote/SingleNoteWidget.java b/app/src/main/java/it/niedermann/owncloud/notes/widget/singlenote/SingleNoteWidget.java
index 9791594a..3637f72d 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/widget/singlenote/SingleNoteWidget.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/widget/singlenote/SingleNoteWidget.java
@@ -27,36 +27,38 @@ public class SingleNoteWidget extends AppWidgetProvider {
         final NotesDatabase db = NotesDatabase.getInstance(context);
 
         for (int appWidgetId : appWidgetIds) {
-            final SingleNoteWidgetData data = db.getWidgetSingleNoteDao().getSingleNoteWidgetData(appWidgetId);
-            if (data != null) {
-                templateIntent.putExtra(BaseNoteFragment.PARAM_ACCOUNT_ID, data.getAccountId());
-
-                final PendingIntent templatePendingIntent = PendingIntent.getActivity(context, appWidgetId, templateIntent,
-                        PendingIntent.FLAG_UPDATE_CURRENT);
-
-                Intent serviceIntent = new Intent(context, SingleNoteWidgetService.class);
-                serviceIntent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, appWidgetId);
-                serviceIntent.setData(Uri.parse(serviceIntent.toUri(Intent.URI_INTENT_SCHEME)));
-
-                RemoteViews views;
-
-                if (NotesApplication.isDarkThemeActive(context, DarkModeSetting.fromModeID(data.getThemeMode()))) {
-                    views = new RemoteViews(context.getPackageName(), R.layout.widget_single_note_dark);
-                    views.setPendingIntentTemplate(R.id.single_note_widget_lv_dark, templatePendingIntent);
-                    views.setRemoteAdapter(R.id.single_note_widget_lv_dark, serviceIntent);
-                    views.setEmptyView(R.id.single_note_widget_lv_dark, R.id.widget_single_note_placeholder_tv_dark);
-                    awm.notifyAppWidgetViewDataChanged(appWidgetId, R.id.single_note_widget_lv_dark);
+            new Thread(() -> {
+                final SingleNoteWidgetData data = db.getWidgetSingleNoteDao().getSingleNoteWidgetData(appWidgetId);
+                if (data != null) {
+                    templateIntent.putExtra(BaseNoteFragment.PARAM_ACCOUNT_ID, data.getAccountId());
+
+                    final PendingIntent templatePendingIntent = PendingIntent.getActivity(context, appWidgetId, templateIntent,
+                            PendingIntent.FLAG_UPDATE_CURRENT);
+
+                    Intent serviceIntent = new Intent(context, SingleNoteWidgetService.class);
+                    serviceIntent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, appWidgetId);
+                    serviceIntent.setData(Uri.parse(serviceIntent.toUri(Intent.URI_INTENT_SCHEME)));
+
+                    RemoteViews views;
+
+                    if (NotesApplication.isDarkThemeActive(context, DarkModeSetting.fromModeID(data.getThemeMode()))) {
+                        views = new RemoteViews(context.getPackageName(), R.layout.widget_single_note_dark);
+                        views.setPendingIntentTemplate(R.id.single_note_widget_lv_dark, templatePendingIntent);
+                        views.setRemoteAdapter(R.id.single_note_widget_lv_dark, serviceIntent);
+                        views.setEmptyView(R.id.single_note_widget_lv_dark, R.id.widget_single_note_placeholder_tv_dark);
+                        awm.notifyAppWidgetViewDataChanged(appWidgetId, R.id.single_note_widget_lv_dark);
+                    } else {
+                        views = new RemoteViews(context.getPackageName(), R.layout.widget_single_note);
+                        views.setPendingIntentTemplate(R.id.single_note_widget_lv, templatePendingIntent);
+                        views.setRemoteAdapter(R.id.single_note_widget_lv, serviceIntent);
+                        views.setEmptyView(R.id.single_note_widget_lv, R.id.widget_single_note_placeholder_tv);
+                        awm.notifyAppWidgetViewDataChanged(appWidgetId, R.id.single_note_widget_lv);
+                    }
+                    awm.updateAppWidget(appWidgetId, views);
                 } else {
-                    views = new RemoteViews(context.getPackageName(), R.layout.widget_single_note);
-                    views.setPendingIntentTemplate(R.id.single_note_widget_lv, templatePendingIntent);
-                    views.setRemoteAdapter(R.id.single_note_widget_lv, serviceIntent);
-                    views.setEmptyView(R.id.single_note_widget_lv, R.id.widget_single_note_placeholder_tv);
-                    awm.notifyAppWidgetViewDataChanged(appWidgetId, R.id.single_note_widget_lv);
+                    Log.i(TAG, "onUpdate has been triggered before the user finished configuring the widget");
                 }
-                awm.updateAppWidget(appWidgetId, views);
-            } else {
-                Log.i(TAG, "onUpdate has been triggered before the user finished configuring the widget");
-            }
+            }).start();
         }
     }
 
@@ -80,7 +82,7 @@ public class SingleNoteWidget extends AppWidgetProvider {
         final NotesDatabase db = NotesDatabase.getInstance(context);
 
         for (int appWidgetId : appWidgetIds) {
-            db.getWidgetSingleNoteDao().removeSingleNoteWidget(appWidgetId);
+            new Thread(() -> db.getWidgetSingleNoteDao().removeSingleNoteWidget(appWidgetId)).start();
         }
         super.onDeleted(context, appWidgetIds);
     }
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/widget/singlenote/SingleNoteWidgetFactory.java b/app/src/main/java/it/niedermann/owncloud/notes/widget/singlenote/SingleNoteWidgetFactory.java
index 49783eae..ea36d705 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/widget/singlenote/SingleNoteWidgetFactory.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/widget/singlenote/SingleNoteWidgetFactory.java
@@ -31,15 +31,14 @@ public class SingleNoteWidgetFactory implements RemoteViewsService.RemoteViewsFa
 
     SingleNoteWidgetFactory(Context context, Intent intent) {
         this.context = context;
-        this.appWidgetId = intent.getIntExtra(AppWidgetManager.EXTRA_APPWIDGET_ID,
-                AppWidgetManager.INVALID_APPWIDGET_ID);
+        this.appWidgetId = intent.getIntExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, AppWidgetManager.INVALID_APPWIDGET_ID);
         this.db = NotesDatabase.getInstance(context);
-        final SingleNoteWidgetData data = db.getWidgetSingleNoteDao().getSingleNoteWidgetData(appWidgetId);
-        if (data != null) {
-            darkModeActive = NotesApplication.isDarkThemeActive(context, DarkModeSetting.fromModeID(data.getThemeMode()));
-        } else {
-            Log.w(TAG, "Widget with ID " + appWidgetId + " seems to be not configured yet.");
-        }
+//        final SingleNoteWidgetData data = db.getWidgetSingleNoteDao().getSingleNoteWidgetData(appWidgetId);
+//        if (data != null) {
+//            darkModeActive = NotesApplication.isDarkThemeActive(context, DarkModeSetting.fromModeID(data.getThemeMode()));
+//        } else {
+//            Log.w(TAG, "Widget with ID " + appWidgetId + " seems to be not configured yet.");
+//        }
     }
 
     @Override
@@ -51,6 +50,7 @@ public class SingleNoteWidgetFactory implements RemoteViewsService.RemoteViewsFa
     public void onDataSetChanged() {
         final SingleNoteWidgetData data = db.getWidgetSingleNoteDao().getSingleNoteWidgetData(appWidgetId);
         if (data != null) {
+            darkModeActive = NotesApplication.isDarkThemeActive(context, DarkModeSetting.fromModeID(data.getThemeMode()));
             final long noteId = data.getNoteId();
             Log.v(TAG, "Fetch note with id " + noteId);
             note = db.getNoteDao().getNoteById(noteId);