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

Use Account.text() function

Browse Source
This commit is contained in:
Juha Heinanen
2025-06-12 12:58:51 +03:00
parent 4e365595a6
commit d0569f7b17
6 changed files with 17 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/kotlin/com/tutpro/baresip/Account.kt
View File

@ -10,7 +10,7 @@ import java.net.URLDecoder
class Account(val accp: Long) {
val nickName: MutableState<String> = mutableStateOf("")
var nickName = ""
var displayName = Api.account_display_name(accp)
val aor = Api.account_aor(accp)
val luri = Api.account_luri(accp)
@ -71,7 +71,7 @@ class Account(val accp: Long) {
val extra = Api.account_extra(accp)
if (Utils.paramExists(extra, "nickname"))
nickName.value = Utils.paramValue(extra, "nickname")
nickName = Utils.paramValue(extra, "nickname")
if (Utils.paramExists(extra, "regint"))
configuredRegInt = Utils.paramValue(extra, "regint").toInt()
callHistory = Utils.paramValue(extra, "call_history") == ""
@ -155,8 +155,8 @@ class Account(val accp: Long) {
var extra = ""
if (nickName.value != "")
extra += ";nickname=${nickName.value}"
if (nickName != "")
extra += ";nickname=${nickName}"
if (!callHistory)
extra += ";call_history=no"
@ -215,8 +215,8 @@ class Account(val accp: Long) {
}
fun text(): String {
return if (nickName.value != "")
nickName.value
return if (nickName != "")
nickName
else
aor.split(":")[1].substringBefore(";")
}
@ -286,7 +286,7 @@ class Account(val accp: Long) {
fun uniqueNickName(nickName: String): Boolean {
for (ua in BaresipService.uas.value)
if (ua.account.nickName.value == nickName)
if (ua.account.nickName == nickName)
return false
return true
}

15
app/src/main/kotlin/com/tutpro/baresip/AccountScreen.kt
View File

@ -128,11 +128,6 @@ private fun AccountScreen(
isConfigLoaded = true
}
val title = if (acc.nickName.value != "")
acc.nickName.value
else
acc.aor.substringAfter(":")
Scaffold(
modifier = Modifier.fillMaxSize().imePadding(),
containerColor = LocalCustomColors.current.background,
@ -148,7 +143,7 @@ private fun AccountScreen(
TopAppBar(
title = {
Text(
text = title,
text = acc.text(),
color = LocalCustomColors.current.light,
fontWeight = FontWeight.Bold
)
@ -273,7 +268,7 @@ private fun AccountContent(
horizontalArrangement = Arrangement.Start
) {
val ctx = LocalContext.current
var nickName by remember { mutableStateOf(acc.nickName.value) }
var nickName by remember { mutableStateOf(acc.nickName) }
newNickname = nickName
OutlinedTextField(
value = nickName,
@ -1365,11 +1360,11 @@ private fun checkOnClick(ctx: Context, ua: UserAgent): Boolean {
val acc = ua.account
val nn = newNickname.trim()
if (nn != acc.nickName.value) {
if (nn != acc.nickName) {
if (Account.checkDisplayName(nn)) {
if (nn == "" || Account.uniqueNickName(nn)) {
acc.nickName.value = nn
Log.d(TAG, "New nickname is ${acc.nickName.value}")
acc.nickName = nn
Log.d(TAG, "New nickname is ${acc.nickName}")
}
else {
alertTitle.value = ctx.getString(R.string.notice)

5
app/src/main/kotlin/com/tutpro/baresip/AccountsScreen.kt
View File

@ -144,10 +144,7 @@ fun AccountsContent(contentPadding: PaddingValues, navController: NavController)
for (ua in BaresipService.uas.value) {
val account = ua.account
val aor = account.aor
val text = if (account.nickName.value != "")
account.nickName.value
else
account.aor.substringAfter(":")
val text = account.text()
Row(
verticalAlignment = Alignment.CenterVertically,
) {

7
app/src/main/kotlin/com/tutpro/baresip/CallsScreen.kt
View File

@ -229,13 +229,8 @@ private fun CallsContent(
@Composable
private fun Account(account: Account) {
val headerText = stringResource(R.string.account) + " " +
if (account.nickName.value != "")
account.nickName.value
else
account.aor.split(":")[1]
Text(
text = headerText,
text = stringResource(R.string.account) + " " + account.text(),
modifier = Modifier
.fillMaxWidth()
.padding(top = 8.dp),

7
app/src/main/kotlin/com/tutpro/baresip/ChatScreen.kt
View File

@ -278,13 +278,8 @@ private fun ChatContent(
@Composable
private fun Account(ctx: Context, account: Account) {
val headerText = ctx.getString(R.string.account) + " " +
if (account.nickName.value != "")
account.nickName.value
else
account.aor.substringAfter(":")
Text(
text = headerText,
text = ctx.getString(R.string.account) + " " + account.text(),
modifier = Modifier
.fillMaxWidth()
.padding(top = 8.dp, bottom = 8.dp),

15
app/src/main/kotlin/com/tutpro/baresip/ChatsScreen.kt
View File

@ -167,13 +167,7 @@ private fun TopAppBar(
AlertDialog(
showDialog = showDialog,
title = stringResource(R.string.confirmation),
message = String.format(
stringResource(R.string.delete_chats_alert),
if (account.nickName.value != "")
account.nickName.value
else
account.aor.substringAfter(":")
),
message = String.format(stringResource(R.string.delete_chats_alert), account.text()),
positiveButtonText = stringResource(R.string.delete),
onPositiveClicked = positiveAction.value,
negativeButtonText = stringResource(R.string.cancel),
@ -254,13 +248,8 @@ private fun ChatsContent(
@Composable
private fun Account(account: Account) {
val headerText = stringResource(R.string.account) + " " +
if (account.nickName.value != "")
account.nickName.value
else
account.aor.substringAfter(":")
Text(
text = headerText,
text = stringResource(R.string.account) + " " + account.text(),
modifier = Modifier
.fillMaxWidth()
.padding(top = 8.dp, bottom = 8.dp),