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

Allow contact with just name plus contact screen improvements

Browse Source
This commit is contained in:
Juha Heinanen
2026-07-22 14:22:48 +03:00
parent 14fd7efb21
commit 2978ddc8af
3 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -260,7 +260,7 @@ sealed class Contact {
cur?.close()
val newList = mutableListOf<AndroidContact>()
for ((_, value) in contacts)
if (value.name != "" && (value.uris.isNotEmpty() || value.email != ""))
if (value.name != "")
newList.add(value)
BaresipService.androidContacts.value = newList.toList()
}

16
app/src/main/kotlin/com/tutpro/baresip/ContactScreen.kt
View File

@ -178,7 +178,7 @@ private fun ContactScreen(
new = true,
isEditing = true,
name = "",
uris = if (uriOrNameArg == "") emptyList() else listOf(Contact.ContactUri(uriOrNameArg, "")),
uris = listOf(Contact.ContactUri(uriOrNameArg, "")),
email = "",
favorite = false,
android = BaresipService.contactsMode == "android",
@ -288,8 +288,10 @@ private fun ContactScreen(
}
val onEdit: () -> Unit = {
if (screenState.isBaresipContact)
screenState = screenState.copy(isEditing = true)
if (screenState.isBaresipContact) {
val uris = screenState.uris.ifEmpty { listOf(Contact.ContactUri("", "")) }
screenState = screenState.copy(isEditing = true, uris = uris)
}
else {
val intent = Intent(Intent.ACTION_EDIT).apply {
val contactUri = ContentUris.withAppendedId(ContactsContract.Contacts.CONTENT_URI, screenState.id)
@ -908,16 +910,10 @@ private fun checkOnClick(
newUris.add(Contact.ContactUri(u, contactUri.label))
}
if (newUris.isEmpty() && currentState.email.trim().isEmpty()) {
alertTitle.value = ctx.getString(R.string.notice)
alertMessage.value = ctx.getString(R.string.sip_or_tel_uri)
showAlert.value = true
return false
}
var newName = currentState.name.trim()
if (newName == "")
newName = if (newUris.isNotEmpty()) newUris[0].uri.substringAfter(":") else currentState.email
if (!Utils.checkName(newName)) {
alertTitle.value = ctx.getString(R.string.notice)
alertMessage.value = String.format(ctx.getString(R.string.invalid_contact), newName)

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

@ -241,7 +241,7 @@ private fun ContactsScreen(navController: NavController) {
photoBase64 = line.substringAfter(":").trim()
}
line.startsWith("END:VCARD", ignoreCase = true) -> {
if (name.isNotEmpty() && (uris.isNotEmpty() || email.isNotEmpty())) {
if (name.isNotEmpty()) {
val existingContact = newBaresipContacts.find { it.name == name }
val contactId = existingContact?.id ?: (System.currentTimeMillis() + contactNo++)
if (photoBase64.isNotEmpty())