From 6980aea11cc75be2aab7eccdbe8463f6c025cd02 Mon Sep 17 00:00:00 2001
From: Thore Goebel <goebel.thore@gmail.com>
Date: Wed, 29 Jan 2025 16:27:09 +0100
Subject: [PATCH] Remove unnecessary repoLiveData + use make repoFlow stateful

---
 .../fdroid/views/repos/RepoDetailsActivity.kt | 11 ++++-------
 .../views/repos/RepoDetailsViewModel.kt       | 19 ++++++++++++-------
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/app/src/main/java/org/fdroid/fdroid/views/repos/RepoDetailsActivity.kt b/app/src/main/java/org/fdroid/fdroid/views/repos/RepoDetailsActivity.kt
index abc860736..aeb55d927 100644
--- a/app/src/main/java/org/fdroid/fdroid/views/repos/RepoDetailsActivity.kt
+++ b/app/src/main/java/org/fdroid/fdroid/views/repos/RepoDetailsActivity.kt
@@ -63,9 +63,6 @@ class RepoDetailsActivity : AppCompatActivity() {
 
         initViewModel(repo)
 
-        // Needs an observer because it is lazy
-        viewModel.repoLiveData.observe(this, {})
-
         setContent {
             val repo by viewModel.repoFlow.collectAsState(repo)
             val archiveState by viewModel.archiveStateFlow.collectAsState(ArchiveState.UNKNOWN)
@@ -104,7 +101,7 @@ class RepoDetailsActivity : AppCompatActivity() {
     }
 
     private fun onShareClicked() {
-        val repo = viewModel.repoLiveData.value ?: return
+        val repo = viewModel.repoFlow.value ?: return
         val intent = Intent(Intent.ACTION_SEND).apply {
             type = "text/plain"
             putExtra(Intent.EXTRA_TEXT, repo.shareUri)
@@ -150,7 +147,7 @@ class RepoDetailsActivity : AppCompatActivity() {
     }
 
     private fun onShowAppsClicked() {
-        val repo = viewModel.repoLiveData.value ?: return
+        val repo = viewModel.repoFlow.value ?: return
         if (!repo.enabled) {
             return
         }
@@ -161,7 +158,7 @@ class RepoDetailsActivity : AppCompatActivity() {
     }
 
     private fun onEditCredentialsClicked() {
-        val repo = viewModel.repoLiveData.value ?: return
+        val repo = viewModel.repoFlow.value ?: return
 
         val view = layoutInflater.inflate(R.layout.login, null, false)
         val usernameInput = view.findViewById<TextInputLayout>(R.id.edit_name)
@@ -190,7 +187,7 @@ class RepoDetailsActivity : AppCompatActivity() {
     }
 
     private fun onShareMirror(mirror: Mirror) {
-        val repo = viewModel.repoLiveData.value ?: return
+        val repo = viewModel.repoFlow.value ?: return
         val uri = mirror.getFDroidLinkUrl(repo.fingerprint)
         val intent = Intent(Intent.ACTION_SEND).apply {
             type = "text/plain"
diff --git a/app/src/main/java/org/fdroid/fdroid/views/repos/RepoDetailsViewModel.kt b/app/src/main/java/org/fdroid/fdroid/views/repos/RepoDetailsViewModel.kt
index 0e7bdc6b3..4c6f1bcf6 100644
--- a/app/src/main/java/org/fdroid/fdroid/views/repos/RepoDetailsViewModel.kt
+++ b/app/src/main/java/org/fdroid/fdroid/views/repos/RepoDetailsViewModel.kt
@@ -8,7 +8,6 @@ import android.widget.Toast.LENGTH_SHORT
 import androidx.appcompat.app.AppCompatActivity
 import androidx.lifecycle.AndroidViewModel
 import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.asLiveData
 import androidx.lifecycle.viewModelScope
 import androidx.lifecycle.viewmodel.CreationExtras
 import androidx.lifecycle.viewmodel.initializer
@@ -17,9 +16,12 @@ import info.guardianproject.netcipher.NetCipher
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.flowOn
 import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import org.fdroid.database.Repository
@@ -38,7 +40,7 @@ enum class ArchiveState {
 
 class RepoDetailsViewModel(
     app: Application,
-    private val initialRepo: Repository,
+    initialRepo: Repository,
 ) : AndroidViewModel(app) {
 
     companion object {
@@ -63,10 +65,13 @@ class RepoDetailsViewModel(
     private val repositoryDao = DBHelper.getDb(app).getRepositoryDao()
     private val appDao = DBHelper.getDb(app).getAppDao()
 
-    val repoFlow: Flow<Repository?> = repoManager.repositoriesState.map { reposState ->
+    val repoFlow: StateFlow<Repository?> = repoManager.repositoriesState.map { reposState ->
         reposState.find { repo -> repo.repoId == repoId }
-    }
-    val repoLiveData = repoFlow.asLiveData()
+    }.stateIn(
+        scope = viewModelScope,
+        started = SharingStarted.WhileSubscribed(5000),
+        initialValue = null,
+    )
 
     val numberAppsFlow: Flow<Int> = repoFlow.map { repo ->
         if (repo != null) {
@@ -80,7 +85,7 @@ class RepoDetailsViewModel(
 
     fun setArchiveRepoEnabled(enabled: Boolean) {
         viewModelScope.launch(Dispatchers.IO) {
-            val repo = repoLiveData.value ?: return@launch
+            val repo = repoFlow.value ?: return@launch
             archiveStateFlow.emit(ArchiveState.UNKNOWN)
             try {
                 val repoId = repoManager.setArchiveRepoEnabled(repo, enabled, NetCipher.getProxy())
@@ -141,7 +146,7 @@ class RepoDetailsViewModel(
     // TODO: initialise this once on ViewModel creation, and don't take an Activity, do fixed size
     fun generateQrCode(activity: AppCompatActivity) {
         viewModelScope.launch(Dispatchers.Default) {
-            val repo = repoLiveData.value ?: return@launch
+            val repo = repoFlow.value ?: return@launch
             if (repo.address.startsWith("content://") || repo.address.startsWith("file://")) {
                 // no need to show a QR Code, it is not shareable
                 qrCodeLiveData.value = null