Fix fetch the release everytime.

oxyroid · Jun 9, 2024 · f2be41d · f2be41d
1 parent f675604
commit f2be41d
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 11 deletions.
diff --git a/data/src/main/java/com/m3u/data/repository/other/OtherRepository.kt b/data/src/main/java/com/m3u/data/repository/other/OtherRepository.kt
@@ -3,5 +3,5 @@ package com.m3u.data.repository.other
 import com.m3u.data.api.dto.github.Release
 
 interface OtherRepository {
-    suspend fun getRelease(): Release?
+    suspend fun release(): Release?
 }
diff --git a/data/src/main/java/com/m3u/data/repository/other/OtherRepositoryImpl.kt b/data/src/main/java/com/m3u/data/repository/other/OtherRepositoryImpl.kt
@@ -16,15 +16,17 @@ internal class OtherRepositoryImpl @Inject constructor(
     delegate: Logger
 ) : OtherRepository {
     private val logger = delegate.install(Profiles.REPOS_OTHER)
-    override suspend fun getRelease(): Release? {
-        if (publisher.snapshot) return null
+    private var releases: List<Release>? = null
+    override suspend fun release(): Release? {
+        if (releases == null) {
+            // cannot use lazy because the suspension
+            releases = logger.execute { githubApi.releases("oxyroid", "M3UAndroid") } ?: emptyList()
+        }
         val versionName = publisher.versionName
-        val releases = logger
-            .execute { githubApi.releases("oxyroid", "M3UAndroid") }
-            ?: emptyList()
-        if (releases.isEmpty()) return null
-        val i = releases.indexOf { it.name == versionName }
-//        if (i <= 0) return null
-        return releases.first()
+        val currentReleases = releases ?: emptyList()
+        if (currentReleases.isEmpty()) return null
+        val i = currentReleases.indexOf { it.name == versionName }
+        if (i <= 0 && !publisher.snapshot) return null
+        return currentReleases.first()
     }
 }
diff --git a/feature/foryou/src/main/java/com/m3u/feature/foryou/ForyouViewModel.kt b/feature/foryou/src/main/java/com/m3u/feature/foryou/ForyouViewModel.kt
@@ -100,7 +100,7 @@ class ForyouViewModel @Inject constructor(
         )
 
     private val newRelease: StateFlow<Release?> = flow {
-        emit(otherRepository.getRelease())
+        emit(otherRepository.release())
     }
         .stateIn(
             scope = viewModelScope,