Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed duplicated SIP address when store presence in native contact setting is enabled

Browse source
This commit is contained in:
Sylvain Berfini 2020-10-28 14:44:19 +01:00
parent 1d15724a33
commit aab38ad176
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/src/main/java/org/linphone/contact/NativeContact.kt
View file

@ -104,7 +104,7 @@ class NativeContact(val nativeId: String, private val lookupKey: String? = null)
when (mime) { when (mime) {
ContactsContract.CommonDataKinds.Phone.CONTENT_ITEM_TYPE -> { ContactsContract.CommonDataKinds.Phone.CONTENT_ITEM_TYPE -> {
if (data1 == null && data4 == null) { if (data1 == null && data4 == null) {
Log.e("[Native Contact] Phone number data is empty") Log.d("[Native Contact] Phone number data is empty")
return return
} }
@ -114,7 +114,7 @@ class NativeContact(val nativeId: String, private val lookupKey: String? = null)
} }
linphoneMime, ContactsContract.CommonDataKinds.SipAddress.CONTENT_ITEM_TYPE -> { linphoneMime, ContactsContract.CommonDataKinds.SipAddress.CONTENT_ITEM_TYPE -> {
if (data1 == null) { if (data1 == null) {
Log.e("[Native Contact] SIP address is null !") Log.d("[Native Contact] SIP address is null")
return return
} }
@ -133,12 +133,12 @@ class NativeContact(val nativeId: String, private val lookupKey: String? = null)
val stringAddress = address.asStringUriOnly() val stringAddress = address.asStringUriOnly()
if (!rawSipAddresses.contains(stringAddress)) { if (!rawSipAddresses.contains(stringAddress)) {
sipAddresses.add(address) sipAddresses.add(address)
rawSipAddresses.add(data1) rawSipAddresses.add(stringAddress)
} }
} }
ContactsContract.CommonDataKinds.Organization.CONTENT_ITEM_TYPE -> { ContactsContract.CommonDataKinds.Organization.CONTENT_ITEM_TYPE -> {
if (data1 == null) { if (data1 == null) {
Log.e("[Native Contact] Organization is null !") Log.d("[Native Contact] Organization is null")
return return
} }
@ -147,7 +147,7 @@ class NativeContact(val nativeId: String, private val lookupKey: String? = null)
} }
ContactsContract.CommonDataKinds.StructuredName.CONTENT_ITEM_TYPE -> { ContactsContract.CommonDataKinds.StructuredName.CONTENT_ITEM_TYPE -> {
if (data2 == null && data3 == null) { if (data2 == null && data3 == null) {
Log.e("[Native Contact] First name and last name are both null !") Log.d("[Native Contact] First name and last name are both null")
return return
} }