diff --git a/app/src/main/kotlin/com/tutpro/baresip/ChatsActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/ChatsActivity.kt index c8510558..3c3c41e8 100644 --- a/app/src/main/kotlin/com/tutpro/baresip/ChatsActivity.kt +++ b/app/src/main/kotlin/com/tutpro/baresip/ChatsActivity.kt @@ -112,7 +112,7 @@ class ChatsActivity: AppCompatActivity() { with (builder) { setTitle(R.string.confirmation) setMessage(String.format(getString(R.string.long_chat_question), - Utils.friendlyUri(this@ChatsActivity, peer, account))) + peer)) setNeutralButton(getText(R.string.cancel), dialogClickListener) setNegativeButton(getText(R.string.delete), dialogClickListener) setPositiveButton(getText(R.string.add_contact), dialogClickListener) diff --git a/app/src/main/kotlin/com/tutpro/baresip/Contact.kt b/app/src/main/kotlin/com/tutpro/baresip/Contact.kt index a3949a18..5bc153e6 100644 --- a/app/src/main/kotlin/com/tutpro/baresip/Contact.kt +++ b/app/src/main/kotlin/com/tutpro/baresip/Contact.kt @@ -122,6 +122,8 @@ sealed class Contact { } fun loadAndroidContacts(ctx: Context) { + // If phone type is needed, add DATA2 to projection. Then phone type can be get from + // cursor using getColumnIndex(ContactsContract.CommonDataKinds.Phone.TYPE val projection = arrayOf(ContactsContract.Data.CONTACT_ID, ContactsContract.Data.DISPLAY_NAME, ContactsContract.Data.MIMETYPE, ContactsContract.Data.DATA1, ContactsContract.Data.PHOTO_THUMBNAIL_URI) diff --git a/app/src/main/kotlin/com/tutpro/baresip/ContactActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/ContactActivity.kt index 1ae73c74..b3ee2a9f 100644 --- a/app/src/main/kotlin/com/tutpro/baresip/ContactActivity.kt +++ b/app/src/main/kotlin/com/tutpro/baresip/ContactActivity.kt @@ -207,7 +207,7 @@ class ContactActivity : AppCompatActivity() { R.id.checkIcon -> { var newName = nameView.text.toString().trim() - var newUri = uriView.text.toString().filterNot{setOf('-', ' ').contains(it)} + var newUri = uriView.text.toString().filterNot{setOf('-', ' ', '(', ')').contains(it)} if (newName == "") newName = newUri