Use Account.text() function

app/src/main/kotlin/com/tutpro/baresip/Account.kt

@@ -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 != "")
+        if (nickName != "")
-            extra += ";nickname=${nickName.value}"
+            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 != "")
+        return if (nickName != "")
-            nickName.value
+            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
         }

app/src/main/kotlin/com/tutpro/baresip/AccountScreen.kt

@@ -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
+                acc.nickName = nn
-                Log.d(TAG, "New nickname is ${acc.nickName.value}")
+                Log.d(TAG, "New nickname is ${acc.nickName}")
             }
             else {
                 alertTitle.value = ctx.getString(R.string.notice)

app/src/main/kotlin/com/tutpro/baresip/AccountsScreen.kt

@@ -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 != "")
+                val text = account.text()
-                    account.nickName.value
-                else
-                    account.aor.substringAfter(":")
                 Row(
                     verticalAlignment = Alignment.CenterVertically,
                 ) {

app/src/main/kotlin/com/tutpro/baresip/CallsScreen.kt

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

app/src/main/kotlin/com/tutpro/baresip/ChatScreen.kt

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

app/src/main/kotlin/com/tutpro/baresip/ChatsScreen.kt

@@ -167,13 +167,7 @@ private fun TopAppBar(
     AlertDialog(
         showDialog = showDialog,
         title = stringResource(R.string.confirmation),
-        message = String.format(
+        message = String.format(stringResource(R.string.delete_chats_alert), account.text()),
-            stringResource(R.string.delete_chats_alert),
-            if (account.nickName.value != "")
-                account.nickName.value
-            else
-                account.aor.substringAfter(":")
-        ),
         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),