Fix WidgetDataRefreshWorker

Author: w2sv

app/build.gradle.kts

@@ -122,7 +122,6 @@ dependencies {
     implementation(libs.androidx.workmanager)
 
     // Compose libraries
-    implementation(platform(libs.androidx.compose.bom))
     implementation(libs.androidx.compose.material3)
     implementation(libs.androidx.compose.ui)
     implementation(libs.androidx.compose.ui.tooling.preview)

app/src/main/AndroidManifest.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
@@ -26,19 +25,6 @@
             </intent-filter>
         </activity>
 
-        <provider
-            android:name="androidx.startup.InitializationProvider"
-            android:authorities="${applicationId}.androidx-startup"
-            android:exported="false"
-            tools:node="merge">
-
-            <meta-data
-                android:name="androidx.work.WorkManagerInitializer"
-                android:value="androidx.startup"
-                tools:node="remove" />
-
-        </provider>
-
 
         <!--Receivers-->
 

app/src/main/kotlin/com/w2sv/wifiwidget/Application.kt

@@ -1,17 +1,11 @@
 package com.w2sv.wifiwidget
 
 import android.app.Application
-import androidx.hilt.work.HiltWorkerFactory
-import androidx.work.Configuration
 import dagger.hilt.android.HiltAndroidApp
 import timber.log.Timber
-import javax.inject.Inject
 
 @HiltAndroidApp
-class Application : Application(), Configuration.Provider {
-
-    @Inject
-    lateinit var workerFactory: HiltWorkerFactory
+class Application : Application() {
 
     override fun onCreate() {
         super.onCreate()
@@ -20,9 +14,4 @@ class Application : Application(), Configuration.Provider {
             Timber.plant(Timber.DebugTree())
         }
     }
-
-    override val workManagerConfiguration: Configuration
-        get() = Configuration.Builder()
-            .setWorkerFactory(workerFactory)
-            .build()
 }

app/src/main/kotlin/com/w2sv/wifiwidget/ui/viewmodels/WidgetViewModel.kt

@@ -124,7 +124,7 @@ class WidgetViewModel @Inject constructor(
             stateFlowMap = repository.refreshingParametersEnablementMap,
             syncState = {
                 repository.saveRefreshingParametersEnablementMap(it)
-                widgetDataRefreshWorkerManager.applyChangedParameters()
+                widgetDataRefreshWorkerManager.enableWorkerIfRefreshingEnabled()
             },
         ),
         scope = viewModelScope,

domain/src/main/AndroidManifest.xml

@@ -15,7 +15,7 @@ baselineprofile = "1.2.3"
 # Libraries
 androidx-activity-compose = "1.8.2"
 compose-compiler = "1.5.8"
-compose-tooling = "1.6.1"
+compose-tooling = "1.6.2"
 compose-material3 = "1.2.0"
 lifecycle = "2.7.0"
 okhttp = "4.12.0"
@@ -41,10 +41,8 @@ androidx-splashscreen = "androidx.core:core-splashscreen:1.0.1"
 androidx-lifecycle-runtime = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version.ref = "lifecycle" }
 androidx-workmanager = "androidx.work:work-runtime-ktx:2.9.0"
 androidx-datastore-preferences = "androidx.datastore:datastore-preferences:1.0.0"
-androidx-hilt-work = "androidx.hilt:hilt-work:1.1.0"
 
 # .Compose
-androidx-compose-bom = "androidx.compose:compose-bom:2024.02.00"
 androidx-compose-material3 = { module = "androidx.compose.material3:material3", version.ref = "compose-material3" }
 androidx-compose-ui = { module = "androidx.compose.ui:ui", version.ref = "compose-tooling" }
 androidx-compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview", version.ref = "compose-tooling" }

gradle/libs.versions.toml

@@ -12,7 +12,6 @@ class HiltPlugin : Plugin<Project> {
 
             dependencies {
                 "implementation"(libs.findLibrary("google.hilt").get())
-                "implementation"(libs.findLibrary("androidx.hilt.work").get())
                 "ksp"(libs.findLibrary("google.hilt.compiler").get())
             }
         }

plugins/src/main/kotlin/HiltPlugin.kt

@@ -2,7 +2,6 @@ package com.w2sv.widget
 
 import android.content.Context
 import android.os.PowerManager
-import androidx.hilt.work.HiltWorker
 import androidx.work.Constraints
 import androidx.work.ExistingPeriodicWorkPolicy
 import androidx.work.PeriodicWorkRequestBuilder
@@ -11,21 +10,20 @@ import androidx.work.Worker
 import androidx.work.WorkerParameters
 import com.w2sv.domain.repository.WidgetRepository
 import com.w2sv.widget.data.refreshing
-import dagger.assisted.Assisted
-import dagger.assisted.AssistedInject
 import slimber.log.i
 import java.time.Duration
 import javax.inject.Inject
 import javax.inject.Singleton
 
+/**
+ * Minimum interval for periodic work.
+ */
 private val REFRESH_PERIOD = Duration.ofMinutes(15L)
 
-@HiltWorker
-class WidgetDataRefreshWorker @AssistedInject constructor(
-    @Assisted appContext: Context,
-    @Assisted workerParams: WorkerParameters,
-    private val powerManager: PowerManager
-) : Worker(appContext, workerParams) {
+class WidgetDataRefreshWorker(appContext: Context, workerParams: WorkerParameters) :
+    Worker(appContext, workerParams) {
+
+    private val powerManager = appContext.getSystemService(PowerManager::class.java)
 
     override fun doWork(): Result {
         when (powerManager.isInteractive) {
@@ -43,7 +41,7 @@ class WidgetDataRefreshWorker @AssistedInject constructor(
         private val workManager: WorkManager,
         private val widgetRepository: WidgetRepository,
     ) {
-        fun applyChangedParameters() {
+        fun enableWorkerIfRefreshingEnabled() {
             with(widgetRepository.refreshing) {
                 when (refreshPeriodically) {
                     true -> enableWorker(refreshOnLowBattery)

widget/src/main/kotlin/com/w2sv/widget/WidgetDataRefreshWorker.kt

@@ -5,25 +5,15 @@ import android.appwidget.AppWidgetProvider
 import android.content.Context
 import android.content.Intent
 import android.widget.RemoteViews
-import com.w2sv.androidutils.generic.getIntExtraOrNull
 import com.w2sv.widget.ui.WidgetLayoutPopulator
 import com.w2sv.widget.utils.getWifiWidgetIds
 import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.flow.MutableSharedFlow
-import kotlinx.coroutines.flow.asSharedFlow
-import kotlinx.coroutines.launch
 import slimber.log.i
 import javax.inject.Inject
-import javax.inject.Singleton
 
 @AndroidEntryPoint
 class WidgetProvider : AppWidgetProvider() {
 
-    @Inject
-    lateinit var optionsChanged: OptionsChanged
-
     @Inject
     lateinit var widgetDataRefreshWorkerManager: WidgetDataRefreshWorker.Manager
 
@@ -41,7 +31,9 @@ class WidgetProvider : AppWidgetProvider() {
     override fun onEnabled(context: Context?) {
         super.onEnabled(context)
 
-        widgetDataRefreshWorkerManager.applyChangedParameters()
+        i { "onEnabled" }
+
+        widgetDataRefreshWorkerManager.enableWorkerIfRefreshingEnabled()
     }
 
     /**
@@ -52,6 +44,8 @@ class WidgetProvider : AppWidgetProvider() {
     override fun onDisabled(context: Context?) {
         super.onDisabled(context)
 
+        i { "onDisabled" }
+
         widgetDataRefreshWorkerManager.cancelWorker()
     }
 
@@ -61,7 +55,7 @@ class WidgetProvider : AppWidgetProvider() {
         i {
             "${this::class.java.simpleName}.onReceive | ${intent?.action} | ${
                 intent?.extras?.keySet()?.toList()
-            }"
+            } | ${appWidgetManager.getWifiWidgetIds(context!!).toList()}"
         }
 
         when (intent?.action) {
@@ -75,14 +69,6 @@ class WidgetProvider : AppWidgetProvider() {
                     )
                 }
             }
-
-            AppWidgetManager.ACTION_APPWIDGET_OPTIONS_CHANGED -> intent.getIntExtraOrNull(
-                AppWidgetManager.EXTRA_APPWIDGET_ID,
-                -1,
-            )?.let { widgetId ->
-                i { "AppWidgetManager.ACTION_APPWIDGET_OPTIONS_CHANGED | id = $widgetId" }
-                optionsChanged.onOptionsChanged(widgetId)
-            }
         }
     }
 
@@ -112,20 +98,6 @@ class WidgetProvider : AppWidgetProvider() {
         }
     }
 
-    @Singleton
-    class OptionsChanged @Inject constructor() {
-        private val scope = CoroutineScope(Dispatchers.Default)
-
-        val widgetId get() = _widgetId.asSharedFlow()
-        private val _widgetId = MutableSharedFlow<Int>()
-
-        fun onOptionsChanged(widgetId: Int) {
-            scope.launch {
-                _widgetId.emit(widgetId)
-            }
-        }
-    }
-
     companion object {
 
         // ===============

widget/src/main/kotlin/com/w2sv/widget/WidgetProvider.kt

@@ -2,7 +2,6 @@ package com.w2sv.widget.di
 
 import android.appwidget.AppWidgetManager
 import android.content.Context
-import android.os.PowerManager
 import androidx.work.WorkManager
 import com.w2sv.domain.repository.WidgetRepository
 import com.w2sv.widget.data.appearance
@@ -28,11 +27,6 @@ object WidgetModule {
     fun appWidgetManager(@ApplicationContext context: Context): AppWidgetManager =
         AppWidgetManager.getInstance(context)
 
-    @Provides
-    @Singleton
-    fun powerManager(@ApplicationContext context: Context): PowerManager =
-        context.getSystemService(PowerManager::class.java)
-
     @Provides
     fun widgetAppearance(widgetRepository: WidgetRepository): WidgetAppearance =
         widgetRepository.appearance