jp/baresip-studio
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Settings fixes

Browse Source
This commit is contained in:
Juha Heinanen
2025-05-07 17:34:26 +03:00
parent b891432b16
commit 2e49922f35
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/main/kotlin/com/tutpro/baresip/AudioActivity.kt
View File

@ -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
)

3
app/src/main/kotlin/com/tutpro/baresip/ConfigActivity.kt
View File

@ -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

2
app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt
View File

@ -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)