mixin

app/src/main/java/net/bluemangoo/indpjsk/ui/CaptureViewModel.kt

@@ -5,15 +5,17 @@ import android.content.Intent
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import net.bluemangoo.indpjsk.data.CaptureProfile
+import net.bluemangoo.indpjsk.data.MixinProfiles
 import net.bluemangoo.indpjsk.data.PredefinedProfiles
 import net.bluemangoo.indpjsk.data.SettingsStore
 import net.bluemangoo.indpjsk.state.CaptureStateHolder
 import net.bluemangoo.indpjsk.state.CaptureStatus
+import net.bluemangoo.indpjsk.upload.UploadStore
 import net.bluemangoo.indpjsk.vpn.CaptureVpnService
 import net.bluemangoo.indpjsk.vpn.VpnLog
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.StateFlow
-import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.stateIn
 import java.io.File
 
@@ -27,24 +29,28 @@ data class CaptureUiState(
 
 class CaptureViewModel : ViewModel() {
 
-    val uiState: StateFlow<CaptureUiState> = CaptureStateHolder.state
-        .map { s ->
-            CaptureUiState(
-                profiles = PredefinedProfiles.all,
-                selectedProfile = s.profile,
-                status = s.status,
-                lastCapturedFile = s.lastCapturedFile,
-                errorMessage = s.errorMessage
-            )
-        }
-        .stateIn(
-            scope = viewModelScope,
-            started = SharingStarted.WhileSubscribed(5_000),
-            initialValue = CaptureUiState(
-                profiles = PredefinedProfiles.all,
-                selectedProfile = PredefinedProfiles.all.firstOrNull()
-            )
+    private fun allProfiles(): List<CaptureProfile> = MixinProfiles.merged()
+
+    val uiState: StateFlow<CaptureUiState> = combine(
+        CaptureStateHolder.state,
+        UploadStore.revision,
+    ) { s, _ ->
+        val profiles = allProfiles()
+        CaptureUiState(
+            profiles = profiles,
+            selectedProfile = profiles.firstOrNull { it.id == s.profile.id } ?: s.profile,
+            status = s.status,
+            lastCapturedFile = s.lastCapturedFile,
+            errorMessage = s.errorMessage
         )
+    }.stateIn(
+        scope = viewModelScope,
+        started = SharingStarted.WhileSubscribed(5_000),
+        initialValue = CaptureUiState(
+            profiles = allProfiles(),
+            selectedProfile = PredefinedProfiles.all.firstOrNull()
+        )
+    )
 
     fun selectProfile(profile: CaptureProfile) {
         CaptureStateHolder.selectProfile(profile)