From 2e49922f352c14d42d68d5b4df3b6453592c70c3 Mon Sep 17 00:00:00 2001
From: Juha Heinanen <jh@tutpro.com>
Date: Wed, 7 May 2025 17:34:26 +0300
Subject: [PATCH] Settings fixes

---
 .../main/kotlin/com/tutpro/baresip/AudioActivity.kt | 13 +++++--------
 .../kotlin/com/tutpro/baresip/ConfigActivity.kt     |  3 +++
 .../main/kotlin/com/tutpro/baresip/MainActivity.kt  |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/src/main/kotlin/com/tutpro/baresip/AudioActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/AudioActivity.kt
index 8a59bc29..ffb27ef2 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/AudioActivity.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/AudioActivity.kt
@@ -48,7 +48,6 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.input.KeyboardType
@@ -109,8 +108,6 @@ class AudioActivity : ComponentActivity() {
             onBackPressedDispatcher.addCallback(this, onBackPressedCallback)
         }
 
-        val title = String.format(getString(R.string.configuration))
-
         Utils.addActivity("audio")
 
         if (!BaresipService.agcAvailable)
@@ -122,21 +119,21 @@ class AudioActivity : ComponentActivity() {
                     modifier = Modifier.fillMaxSize(),
                     color = LocalCustomColors.current.background
                 ) {
-                    AudioScreen(title) { goBack() }
+                    AudioScreen { goBack() }
                 }
             }
         }
     }
 
     @Composable
-    fun AudioScreen(title: String, navigateBack: () -> Unit) {
+    fun AudioScreen(navigateBack: () -> Unit) {
         Scaffold(
             modifier = Modifier
                 .fillMaxHeight()
                 .imePadding()
                 .safeDrawingPadding(),
             containerColor = LocalCustomColors.current.background,
-            topBar = { TopAppBar(title, navigateBack) },
+            topBar = { TopAppBar(navigateBack) },
             content = { contentPadding ->
                 AudioContent(contentPadding)
             }
@@ -145,11 +142,11 @@ class AudioActivity : ComponentActivity() {
 
     @OptIn(ExperimentalMaterial3Api::class)
     @Composable
-    fun TopAppBar(title: String, navigateBack: () -> Unit) {
+    fun TopAppBar(navigateBack: () -> Unit) {
         androidx.compose.material3.TopAppBar(
             title = {
                 Text(
-                    text = title,
+                    text = stringResource(R.string.audio_settings),
                     color = LocalCustomColors.current.light,
                     fontWeight = FontWeight.Bold
                 )
diff --git a/app/src/main/kotlin/com/tutpro/baresip/ConfigActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/ConfigActivity.kt
index 63c5367f..bb9691da 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/ConfigActivity.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/ConfigActivity.kt
@@ -263,6 +263,9 @@ class ConfigActivity : ComponentActivity() {
         val caCertsFile = File(BaresipService.filesPath + "/ca_certs.crt")
         oldCaFile = caCertsFile.exists()
 
+        oldUserAgent = Config.variable("user_agent")
+        newUserAgent = oldUserAgent
+
         powerManager = getSystemService(POWER_SERVICE) as PowerManager
         oldBatteryOptimizations = powerManager
             .isIgnoringBatteryOptimizations(packageName) == false
diff --git a/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt
index e14130a0..d3d80c03 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt
@@ -790,7 +790,7 @@ class MainActivity : ComponentActivity() {
                                 startActivity(Intent(ctx, AboutActivity::class.java))
                             }
                             settings -> {
-                                startActivity(Intent(ctx, ConfigActivity::class.java))
+                                configRequest.launch(Intent(ctx, ConfigActivity::class.java))
                             }
                             accounts -> {
                                 val i = Intent(ctx, AccountsActivity::class.java)