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

Minor contact related fixes and improvements

Browse Source
This commit is contained in:
Juha Heinanen
2022-02-21 12:53:47 +02:00
parent 664d857a5d
commit 345498853b
2 changed files with 26 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -89,20 +89,22 @@ sealed class Contact {
}
fun nameExists(name: String, ignoreCase: Boolean): Boolean {
for (c in BaresipService.baresipContacts)
if (c.name.equals(name, ignoreCase = ignoreCase))
return true
for (c in BaresipService.androidContacts)
if (c.name.equals(name, ignoreCase = ignoreCase))
return true
for (c in BaresipService.contacts)
when (c) {
is BaresipContact ->
if (c.name.equals(name, ignoreCase = ignoreCase))
return true
is AndroidContact ->
if (c.name.equals(name, ignoreCase = ignoreCase))
return true
}
return false
}
fun saveBaresipContacts() {
var contents = ""
for (c in BaresipService.contacts)
if (c is BaresipContact)
contents += "\"${c.name}\" <${c.uri}>;id=${c.id};color=${c.color}\n"
for (c in BaresipService.baresipContacts)
contents += "\"${c.name}\" <${c.uri}>;id=${c.id};color=${c.color}\n"
Utils.putFileContents(BaresipService.filesPath + "/contacts",
contents.toByteArray())
}
@ -124,10 +126,6 @@ sealed class Contact {
val mime = cur.getString(2)
val data = cur.getString(3)
val thumb = cur.getString(4)?.toUri()
if (nameExists(name, true)) {
Log.d(TAG, "Skipping Android contact with existing name '$name'")
continue
}
val contact = if (contacts.containsKey(id))
contacts[id]!!
else
@ -200,13 +198,18 @@ sealed class Contact {
if (BaresipService.contactsMode != "Android")
BaresipService.contacts.addAll(BaresipService.baresipContacts)
if (BaresipService.contactsMode != "baresip")
BaresipService.contacts.addAll(BaresipService.androidContacts)
addAndroidContacts()
sortContacts()
generateContactNames()
BaresipService.contactUpdate.postValue(System.nanoTime())
}
fun generateContactNames () {
fun removeBaresipContact(contact: BaresipContact) {
BaresipService.baresipContacts.remove(contact)
saveBaresipContacts()
}
private fun generateContactNames () {
BaresipService.contactNames.clear()
for (c in BaresipService.contacts)
when (c) {
@ -218,6 +221,12 @@ sealed class Contact {
}
}
private fun addAndroidContacts() {
for (c in BaresipService.androidContacts)
if (!nameExists(c.name, true))
BaresipService.contacts.add(c)
}
private fun sortContacts() {
BaresipService.contacts.sortBy{ when (it) {
is BaresipContact -> it.name

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

@ -172,9 +172,8 @@ class ContactListAdapter(private val ctx: Context, private val rows: ArrayList<C
Log.e(TAG, "Could not delete file '$id.img")
}
}
Contact.contacts().removeAt(position)
Contact.generateContactNames()
Contact.saveBaresipContacts()
Contact.removeBaresipContact(contact)
Contact.contactsUpdate()
this.notifyDataSetChanged()
}
is Contact.AndroidContact -> {