Fix stream pill flicker when returning to the foreground

Author: akurcubic

app/src/main/kotlin/net/primal/android/user/subscriptions/SubscriptionsManager.kt

@@ -138,6 +138,7 @@ class SubscriptionsManager @Inject constructor(
 
     private fun launchStreamsFromFollowsSubscription(userId: String) =
         scope.launch {
+            streamRepository.syncLiveEventsFromFollows(userId = userId)
             streamRepository.startLiveEventsFromFollowsSubscription(userId = userId)
         }
 

data/caching/remote/src/commonMain/kotlin/net/primal/data/remote/api/stream/LiveStreamApi.kt

@@ -17,5 +17,7 @@ interface LiveStreamApi {
 
     suspend fun subscribeToLiveEventsFromFollows(userId: String): Flow<NostrEvent>
 
+    suspend fun getLiveEventsFromFollows(userId: String): List<NostrEvent>
+
     suspend fun findLiveStream(body: FindLiveStreamRequestBody): FindLiveStreamResponse
 }

data/caching/remote/src/commonMain/kotlin/net/primal/data/remote/api/stream/LiveStreamApiImpl.kt

@@ -73,6 +73,14 @@ class LiveStreamApiImpl(
             }
     }
 
+    override suspend fun getLiveEventsFromFollows(userId: String): List<NostrEvent> =
+        primalApiClient.query(
+            message = PrimalCacheFilter(
+                primalVerb = PrimalVerb.LIVE_EVENTS_FROM_FOLLOWS.id,
+                optionsJson = LiveEventsFromFollowsRequest(pubkey = userId).encodeToJsonString(),
+            ),
+        ).filterNostrEvents(NostrEventKind.LiveActivity)
+
     override suspend fun findLiveStream(body: FindLiveStreamRequestBody): FindLiveStreamResponse {
         val queryResult = primalApiClient.query(
             message = PrimalCacheFilter(

data/caching/repository/src/commonMain/kotlin/net/primal/data/repository/streams/StreamRepositoryImpl.kt

@@ -112,9 +112,35 @@ class StreamRepositoryImpl(
             return@withContext job
         }
 
+    override suspend fun syncLiveEventsFromFollows(userId: String) =
+        withContext(dispatcherProvider.io()) {
+            val currentLiveStreams = liveStreamApi.getLiveEventsFromFollows(userId = userId)
+                .mapNotNull { it.asStreamData() }
+
+            currentLiveStreams.forEach { liveActivity ->
+                scope.launch {
+                    profileRepository.fetchMissingProfiles(profileIds = listOf(liveActivity.mainHostId))
+                }
+            }
+
+            database.withTransaction {
+                database.streams().upsertStreamData(data = currentLiveStreams)
+                database.streamFollows().deleteAllByOwnerId(ownerId = userId)
+                currentLiveStreams
+                    .filter { it.isLive() }
+                    .forEach { liveActivity ->
+                        database.streamFollows().upsert(
+                            data = StreamFollowsCrossRef(
+                                streamATag = liveActivity.aTag,
+                                ownerId = userId,
+                            ),
+                        )
+                    }
+            }
+        }
+
     override suspend fun startLiveEventsFromFollowsSubscription(userId: String) =
         withContext(dispatcherProvider.io()) {
-            database.streamFollows().deleteAllByOwnerId(ownerId = userId)
             liveStreamApi.subscribeToLiveEventsFromFollows(userId = userId)
                 .collect { liveActivityEvent ->
                     val liveActivity = liveActivityEvent.asStreamData() ?: return@collect

domain/primal/src/commonMain/kotlin/net/primal/domain/streams/StreamRepository.kt

@@ -35,6 +35,8 @@ interface StreamRepository {
         streamContentModerationMode: StreamContentModerationMode,
     ): Job
 
+    suspend fun syncLiveEventsFromFollows(userId: String)
+
     suspend fun startLiveEventsFromFollowsSubscription(userId: String)
 
     fun observeLiveEventsFromFollows(userId: String): Flow<List<Stream>>