Fix displayRequests scopes and delete ForegroundScope

urbanairship · Jul 31, 2024 · 079977c · 079977c
1 parent 1a8c125
commit 079977c
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 58 deletions.
diff --git a/...ion-compose/src/main/java/com/urbanairship/automation/compose/AirshipEmbeddedViewState.kt b/...ion-compose/src/main/java/com/urbanairship/automation/compose/AirshipEmbeddedViewState.kt
@@ -10,6 +10,7 @@ import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
 import androidx.compose.runtime.structuralEqualityPolicy
 import androidx.compose.ui.platform.LocalContext
@@ -106,11 +107,12 @@ internal fun rememberAirshipEmbeddedViewState(
 ): AirshipEmbeddedViewState {
     val context = LocalContext.current
     val state = remember { AirshipEmbeddedViewState(embeddedId) }
+    val scope = rememberCoroutineScope()
 
     LaunchedEffect(key1 = embeddedId) {
         // Collect display requests and update the current layout state.
         withContext(Dispatchers.Default) {
-            embeddedViewManager.displayRequests(embeddedId, comparator)
+            embeddedViewManager.displayRequests(embeddedId, comparator, scope)
                 .map { request ->
                     if (request == null) {
                         // Nothing to display.

diff --git a/urbanairship-automation/src/main/java/com/urbanairship/embedded/AirshipEmbeddedView.kt b/urbanairship-automation/src/main/java/com/urbanairship/embedded/AirshipEmbeddedView.kt
@@ -218,7 +218,7 @@ public class AirshipEmbeddedView private constructor(
     private fun collectDisplayRequests() {
         displayRequestsJob = viewScope.launch {
             try {
-                manager.displayRequests(embeddedViewId = id, comparator = comparator)
+                manager.displayRequests(embeddedViewId = id, comparator = comparator, scope = viewScope)
                     .collect(::onUpdate)
             } catch (e: CancellationException) {
                 UALog.v { "Stopped collecting display requests for $logTag" }

diff --git a/urbanairship-core/src/main/java/com/urbanairship/AirshipScope.kt b/urbanairship-core/src/main/java/com/urbanairship/AirshipScope.kt
diff --git a/...irship-layout/src/main/java/com/urbanairship/android/layout/AirshipEmbeddedViewManager.kt b/...irship-layout/src/main/java/com/urbanairship/android/layout/AirshipEmbeddedViewManager.kt
@@ -3,7 +3,6 @@
 package com.urbanairship.android.layout
 
 import androidx.annotation.RestrictTo
-import com.urbanairship.AirshipScopes
 import com.urbanairship.UALog
 import com.urbanairship.android.layout.display.DisplayArgs
 import com.urbanairship.android.layout.info.LayoutInfo
@@ -70,6 +69,6 @@ public interface AirshipEmbeddedViewManager {
     public fun displayRequests(
         embeddedViewId: String,
         comparator: Comparator<AirshipEmbeddedInfo>? = null,
-        scope: CoroutineScope = AirshipScopes.AppForegroundScope,
+        scope: CoroutineScope
     ): Flow<EmbeddedDisplayRequest?>
 }