From 3cb05262a180a1adc3036e6d4de81cd924b7dbe5 Mon Sep 17 00:00:00 2001 From: Juha Heinanen Date: Sun, 15 Feb 2026 00:11:27 +0200 Subject: [PATCH] Avoid possible crash in settings viewmodel --- .../com/tutpro/baresip/SettingsViewModel.kt | 23 +++++++++++-------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/app/src/main/kotlin/com/tutpro/baresip/SettingsViewModel.kt b/app/src/main/kotlin/com/tutpro/baresip/SettingsViewModel.kt index da281b32..0eb1e290 100644 --- a/app/src/main/kotlin/com/tutpro/baresip/SettingsViewModel.kt +++ b/app/src/main/kotlin/com/tutpro/baresip/SettingsViewModel.kt @@ -20,18 +20,10 @@ class SettingsViewModel: ViewModel() { val addressFamily = MutableStateFlow("") val transportProtocols = MutableStateFlow("") - val oldTransportProtocols = Config.variable("sip_transports") + var oldTransportProtocols = "" val dnsServers = MutableStateFlow("") - val oldDnsServers = if (Config.variable("dyn_dns") == "yes") - "" - else { - val servers = Config.variables("dns_server") - var serverList = "" - for (server in servers) - serverList += ", $server" - serverList.trimStart(',').trimStart(' ') - } + var oldDnsServers = "" val tlsCertificateFile = MutableStateFlow(false) val verifyServer = MutableStateFlow(false) @@ -53,6 +45,17 @@ class SettingsViewModel: ViewModel() { fun loadSettings(ctx: Context) { if (isLoaded) return else isLoaded = true + oldTransportProtocols = Config.variable("sip_transports") + oldDnsServers = if (Config.variable("dyn_dns") == "yes") + "" + else { + val servers = Config.variables("dns_server") + var serverList = "" + for (server in servers) + serverList += ", $server" + serverList.trimStart(',').trimStart(' ') + } + autoStart.value = Config.variable("auto_start") == "yes" listenAddress.value = Config.variable("sip_listen")