Skip to content

A rootless Android app that boots Alpine Linux: run containers (Podman/Docker/LXC) and GUI desktop apps.

fix(settings): persist extra-args edits beyond the ViewModel lifecycle

ExTvcbd4c6a4fd5e
diff --git a/app/src/main/java/com/excp/podroid/di/AppModule.kt b/app/src/main/java/com/excp/podroid/di/AppModule.kt
index 708d769..435d3f5 100644
--- a/app/src/main/java/com/excp/podroid/di/AppModule.kt
+++ b/app/src/main/java/com/excp/podroid/di/AppModule.kt
@@ -7,12 +7,37 @@
package com.excp.podroid.di
import dagger.Module
+import dagger.Provides
import dagger.hilt.InstallIn
import dagger.hilt.components.SingletonComponent
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.SupervisorJob
+import javax.inject.Qualifier
+import javax.inject.Singleton
+
+/**
+ * Qualifies the application-lifetime [CoroutineScope] — created once and never
+ * cancelled while the process lives. Use it for fire-and-forget persistence that
+ * must finish even when the caller's own scope is torn down mid-write (e.g. a
+ * ViewModel cleared on back-navigation cancelling its viewModelScope before a
+ * DataStore write commits — see issue #46).
+ */
+@Qualifier
+@Retention(AnnotationRetention.BINARY)
+annotation class ApplicationScope
@Module
@InstallIn(SingletonComponent::class)
object AppModule {
- // Podroid doesn't need any provided dependencies.
- // All dependencies use constructor injection.
+ /**
+ * SupervisorJob so one failed write doesn't cancel the scope for every other
+ * consumer; Dispatchers.IO because every consumer here persists to DataStore
+ * or disk.
+ */
+ @Provides
+ @Singleton
+ @ApplicationScope
+ fun provideApplicationScope(): CoroutineScope =
+ CoroutineScope(SupervisorJob() + Dispatchers.IO)
}
diff --git a/app/src/main/java/com/excp/podroid/ui/screens/settings/SettingsViewModel.kt b/app/src/main/java/com/excp/podroid/ui/screens/settings/SettingsViewModel.kt
index 7d56a0f..c9dccd2 100644
--- a/app/src/main/java/com/excp/podroid/ui/screens/settings/SettingsViewModel.kt
+++ b/app/src/main/java/com/excp/podroid/ui/screens/settings/SettingsViewModel.kt
@@ -18,12 +18,14 @@ import com.excp.podroid.data.repository.LanguageManager
import com.excp.podroid.data.repository.PortForwardRepository
import com.excp.podroid.data.repository.PortForwardRule
import com.excp.podroid.data.repository.SettingsRepository
+import com.excp.podroid.di.ApplicationScope
import com.excp.podroid.engine.EngineSelection
import com.excp.podroid.engine.VmEngine
import com.excp.podroid.engine.VmState
import com.excp.podroid.util.NetworkUtils
import dagger.hilt.android.lifecycle.HiltViewModel
import dagger.hilt.android.qualifiers.ApplicationContext
+import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.SharingStarted
@@ -68,6 +70,7 @@ class SettingsViewModel @Inject constructor(
private val portForwardRepository: PortForwardRepository,
private val engine: VmEngine,
private val languageManager: LanguageManager,
+ @ApplicationScope private val externalScope: CoroutineScope,
) : ViewModel() {
val vmRamMb: StateFlow<Int> = settingsRepository.vmRamMb
@@ -127,20 +130,26 @@ class SettingsViewModel @Inject constructor(
)
}.stateIn(viewModelScope, SharingStarted.WhileSubscribed(5000), SettingsUiState())
+ // The Advanced VM-args fields (AdvancedTextSetting) buffer edits locally and
+ // commit them on focus loss or composable disposal. Disposal coincides with
+ // this ViewModel being cleared on back-navigation, which cancels viewModelScope
+ // before a viewModelScope.launch could finish the DataStore write — silently
+ // dropping the edit (issue #46). Persist on the application-lifetime scope so
+ // the write outlives the screen teardown.
fun setQemuExtraArgs(value: String) {
- viewModelScope.launch { settingsRepository.setQemuExtraArgs(value) }
+ externalScope.launch { settingsRepository.setQemuExtraArgs(value) }
}
fun setKernelExtraCmdline(value: String) {
- viewModelScope.launch { settingsRepository.setKernelExtraCmdline(value) }
+ externalScope.launch { settingsRepository.setKernelExtraCmdline(value) }
}
fun resetQemuExtraArgs() {
- viewModelScope.launch { settingsRepository.setQemuExtraArgs(SettingsRepository.DEFAULT_QEMU_EXTRA_ARGS) }
+ externalScope.launch { settingsRepository.setQemuExtraArgs(SettingsRepository.DEFAULT_QEMU_EXTRA_ARGS) }
}
fun resetKernelExtraCmdline() {
- viewModelScope.launch { settingsRepository.setKernelExtraCmdline(SettingsRepository.DEFAULT_KERNEL_EXTRA_CMDLINE) }
+ externalScope.launch { settingsRepository.setKernelExtraCmdline(SettingsRepository.DEFAULT_KERNEL_EXTRA_CMDLINE) }
}
val storageSizeGb: StateFlow<Int> = settingsRepository.storageSizeGb