feat: Check for widgets before rebind

bliss/src/foundation/e/bliss/widgets/BlissAppWidgetHost.kt

@@ -25,8 +25,6 @@ import android.content.Context
 import com.android.launcher3.R
 
 class BlissAppWidgetHost(val context: Context) : AppWidgetHost(context, WIDGET_HOST_ID) {
-    private val widgetsDbHelper = WidgetsDbHelper.getInstance(context)
-
     fun createView(widgetId: Int, widgetInfo: AppWidgetProviderInfo): AppWidgetHostView {
         return createView(context, widgetId, widgetInfo).apply {
             val widgetTopBottom =
@@ -49,7 +47,6 @@ class BlissAppWidgetHost(val context: Context) : AppWidgetHost(context, WIDGET_H
 
     override fun onAppWidgetRemoved(appWidgetId: Int) {
         deleteAppWidgetId(appWidgetId)
-        widgetsDbHelper.delete(appWidgetId)
     }
 
     companion object {

bliss/src/foundation/e/bliss/widgets/WidgetContainer.kt

@@ -223,7 +223,17 @@ class WidgetContainer(context: Context, attrs: AttributeSet?) : FrameLayout(cont
         private val mAppMonitorCallback: LauncherAppMonitorCallback =
             object : LauncherAppMonitorCallback {
                 override fun onPackageRemoved(packageName: String?, user: UserHandle?) {
-                    rebindWidgets()
+                    if (!::widgetsDbHelper.isInitialized) {
+                        return
+                    }
+                    val widgets =
+                        widgetsDbHelper.getWidgets().filter {
+                            it.component.packageName == packageName
+                        }
+                    if (packageName != null && widgets.isNotEmpty()) {
+                        widgets.map { it.widgetId }.forEach { widgetsDbHelper.delete(it) }
+                        rebindWidgets()
+                    }
                 }
             }
 

bliss/src/foundation/e/bliss/widgets/WidgetsActivity.kt

@@ -35,6 +35,7 @@ class WidgetsActivity : Activity(), OnActionClickListener {
     private lateinit var mAddedWidgetsAdapter: AddedWidgetsAdapter
     private lateinit var mAppWidgetManager: AppWidgetManager
     private lateinit var mAppWidgetHost: BlissAppWidgetHost
+    private lateinit var widgetsDbHelper: WidgetsDbHelper
 
     private val mCompositeDisposable = CompositeDisposable()
 
@@ -60,6 +61,7 @@ class WidgetsActivity : Activity(), OnActionClickListener {
 
         mAppWidgetManager = AppWidgetManager.getInstance(this)
         mAppWidgetHost = BlissAppWidgetHost(this)
+        widgetsDbHelper = WidgetsDbHelper.getInstance(this)
 
         val addedWidgets = findViewById<RecyclerView>(R.id.added_widgets_recycler_view)
         addedWidgets.apply {
@@ -86,6 +88,7 @@ class WidgetsActivity : Activity(), OnActionClickListener {
 
     override fun removeWidget(id: Int) {
         mAppWidgetHost.onAppWidgetRemoved(id)
+        widgetsDbHelper.delete(id)
         CoroutineScope(Dispatchers.Main).launch {
             WidgetContainer.WidgetFragment.eventFlow.emit(Unit)
         }