Pass versions to OnlineModule and update state logic

Refactored OnlineModuleEntity to accept a list of versions when converting to OnlineModule. Updated LocalRepository to provide versions when fetching online modules. Modified OnlineState to use the last version's timestamp for lastUpdated. Updated UI and ViewModel logic to include local updateJson as a version when present, ensuring version lists are accurate and up-to-date.

Author: DerGoogler

app/src/main/kotlin/com/dergoogler/mmrl/database/entity/online/OnlineModuleEntity.kt

@@ -4,6 +4,7 @@ import androidx.room.Embedded
 import androidx.room.Entity
 import com.dergoogler.mmrl.model.online.Blacklist
 import com.dergoogler.mmrl.model.online.OnlineModule
+import com.dergoogler.mmrl.model.online.VersionItem
 
 @Entity(tableName = "onlineModules", primaryKeys = ["id", "repoUrl"])
 data class OnlineModuleEntity(
@@ -79,7 +80,7 @@ data class OnlineModuleEntity(
         blacklist = BlacklistEntity(blacklist)
     )
 
-    fun toModule() = OnlineModule(
+    fun toModule(versions: List<VersionItem> = emptyList()) = OnlineModule(
         repoUrl = repoUrl,
         id = id,
         name = name,
@@ -91,7 +92,7 @@ data class OnlineModuleEntity(
         note = note?.toNote(),
         root = root?.toRoot(),
         features = features?.toFeatures(),
-        versions = listOf(),
+        versions = versions,
         maxApi = maxApi,
         minApi = minApi,
         size = size,

app/src/main/kotlin/com/dergoogler/mmrl/model/state/OnlineState.kt

@@ -18,7 +18,7 @@ data class OnlineState(
             val installed = local != null && local.id.equals(id)
                     && local.author == author
 
-            val updatable = if (installed && hasUpdatableTag) {
+            val updatable = local !== null && if (installed && hasUpdatableTag) {
                 local.versionCode < versionCode
             } else {
                 false
@@ -28,7 +28,7 @@ data class OnlineState(
                 installed = installed,
                 updatable = updatable,
                 hasLicense = license.orEmpty().isNotBlank(),
-                lastUpdated = versions.firstOrNull()?.timestamp ?: 0f
+                lastUpdated = versions.lastOrNull()?.timestamp ?: 0f
             )
         }
 

app/src/main/kotlin/com/dergoogler/mmrl/repository/LocalRepository.kt

@@ -16,9 +16,6 @@ import com.dergoogler.mmrl.ext.merge
 import com.dergoogler.mmrl.model.local.LocalModule
 import com.dergoogler.mmrl.model.online.Blacklist
 import com.dergoogler.mmrl.model.online.OnlineModule
-import dagger.hilt.EntryPoint
-import dagger.hilt.InstallIn
-import dagger.hilt.components.SingletonComponent
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.withContext
@@ -165,15 +162,15 @@ class LocalRepository @Inject constructor(
         }
 
     suspend fun getOnlineByIdAndUrl(id: String, repoUrl: String) = withContext(Dispatchers.IO) {
-        joinDao.getOnlineByIdAndUrl(id, repoUrl).toModule()
+        joinDao.getOnlineByIdAndUrl(id, repoUrl).toModule(getVersionByIdAndUrl(id, repoUrl))
     }
 
     suspend fun getOnlineAllById(id: String) = withContext(Dispatchers.IO) {
-        onlineDao.getAllById(id).map { it.toModule() }
+        onlineDao.getAllById(id).map { it.toModule(getVersionById(it.id)) }
     }
 
     suspend fun getOnlineAllByUrl(url: String) = withContext(Dispatchers.IO) {
-        onlineDao.getAllByUrl(url).map { it.toModule() }
+        onlineDao.getAllByUrl(url).map { it.toModule(getVersionByIdAndUrl(it.id, url)) }
     }
 
     suspend fun getOnlineAllByIdAndUrl(id: String, repoUrl: String) = withContext(Dispatchers.IO) {

app/src/main/kotlin/com/dergoogler/mmrl/ui/remember/rememberOnlineModule.kt

@@ -1,19 +1,20 @@
 package com.dergoogler.mmrl.ui.remember
 
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.State
 import androidx.compose.runtime.derivedStateOf
+import androidx.compose.runtime.getValue
 import androidx.compose.runtime.produceState
 import androidx.compose.runtime.remember
 import com.dergoogler.mmrl.database.entity.Repo
 import com.dergoogler.mmrl.datastore.model.Option
 import com.dergoogler.mmrl.datastore.providable.LocalUserPreferences
+import com.dergoogler.mmrl.model.json.UpdateJson
 import com.dergoogler.mmrl.model.online.OnlineModule
 import com.dergoogler.mmrl.model.state.OnlineState
 import com.dergoogler.mmrl.model.state.OnlineState.Companion.createState
 import com.dergoogler.mmrl.platform.model.ModId
 import com.dergoogler.mmrl.platform.model.ModId.Companion.toModId
-import androidx.compose.runtime.State
-import androidx.compose.runtime.getValue
 
 @Composable
 fun rememberOnlineModules(
@@ -33,10 +34,20 @@ fun rememberOnlineModules(
         val modules = localRepository.getOnlineAllByUrl(repo.url)
 
         val sorted = modules.map {
-            it.createState(
-                local = localRepository.getLocalByIdOrNull(it.id),
+            val local = localRepository.getLocalByIdOrNull(it.id)
+            val versionsList = it.versions.toMutableList()
+
+            if (local != null) {
+                UpdateJson.loadToVersionItem(local.updateJson)?.let { es ->
+                    // no need to define here a repo name since we only need to for the last updated
+                    versionsList.add(0, es)
+                }
+            }
+
+            it.copy(versions = versionsList).createState(
+                local = local,
                 hasUpdatableTag = localRepository.hasUpdatableTag(it.id)
-            ) to it
+            ) to it.copy(versions = versionsList)
         }.sortedWith(
             if (repositoryMenu.descending) {
                 when (repositoryMenu.option) {

app/src/main/kotlin/com/dergoogler/mmrl/viewmodel/RepositoryViewModel.kt

@@ -12,6 +12,7 @@ import com.dergoogler.mmrl.database.entity.Repo
 import com.dergoogler.mmrl.datastore.UserPreferencesRepository
 import com.dergoogler.mmrl.datastore.model.Option
 import com.dergoogler.mmrl.datastore.model.RepositoryMenu
+import com.dergoogler.mmrl.model.json.UpdateJson
 import com.dergoogler.mmrl.model.online.OnlineModule
 import com.dergoogler.mmrl.model.state.OnlineState
 import com.dergoogler.mmrl.model.state.OnlineState.Companion.createState
@@ -73,10 +74,20 @@ class RepositoryViewModel @AssistedInject constructor(
             repositoryMenu
         ) { list, menu ->
             cacheFlow.value = list.map {
-                it.createState(
-                    local = localRepository.getLocalByIdOrNull(it.id),
+                val local = localRepository.getLocalByIdOrNull(it.id)
+                val versionsList = it.versions.toMutableList()
+
+                if (local != null) {
+                    UpdateJson.loadToVersionItem(local.updateJson)?.let { es ->
+                        // no need to define here a repo name since we only need to for the last updated
+                        versionsList.add(0, es)
+                    }
+                }
+
+                it.copy(versions = versionsList).createState(
+                    local = local,
                     hasUpdatableTag = localRepository.hasUpdatableTag(it.id)
-                ) to it
+                ) to it.copy(versions = versionsList)
             }.sortedWith(
                 comparator(menu.option, menu.descending)
             ).let { v ->