Moved service initialization to Compose

Signed-off-by: Arnau Mora Gras <[email protected]>
bitfireAT · Mar 25, 2024 · a78505a · a78505a
1 parent fa00a11
commit a78505a
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/app/src/main/java/at/bitfire/icsdroid/ui/views/CalendarListActivity.kt b/app/src/main/java/at/bitfire/icsdroid/ui/views/CalendarListActivity.kt
@@ -76,10 +76,10 @@ import at.bitfire.icsdroid.ui.partials.CalendarListItem
 import at.bitfire.icsdroid.ui.partials.ExtendedTopAppBar
 import at.bitfire.icsdroid.ui.partials.SyncIntervalDialog
 import at.bitfire.icsdroid.ui.theme.setContentThemed
+import java.util.ServiceLoader
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
-import java.util.ServiceLoader
 
 @OptIn(ExperimentalFoundationApi::class)
 class CalendarListActivity: AppCompatActivity() {
@@ -124,11 +124,12 @@ class CalendarListActivity: AppCompatActivity() {
         if (requestPermissions && !PermissionUtils.haveCalendarPermissions(this))
             requestCalendarPermissions()
 
-        // Init and collect all ComposableStartupServices
-        val compStartupServices = ServiceLoader.load(ComposableStartupService::class.java)
-            .onEach { it.initialize(this) }
-
         setContentThemed {
+            // Init and collect all ComposableStartupServices
+            val compStartupServices = remember {
+                ServiceLoader.load(ComposableStartupService::class.java)
+                    .onEach { it.initialize(this) }
+            }
             compStartupServices.forEach { service ->
                 val show: Boolean by service.shouldShow().observeAsState(false)
                 if (show) service.Content()