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

Fixed duplicated phone numbers in contact details

Browse source
This commit is contained in:
Sylvain Berfini 2022-03-30 16:03:58 +02:00
parent ad2f2a98df
commit 8b60d5eda1
2 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -36,6 +36,7 @@ import org.linphone.core.SubscribePolicy
import org.linphone.core.tools.Log
import org.linphone.utils.AppUtils
import org.linphone.utils.ImageUtils
import org.linphone.utils.LinphoneUtils
class NativeContact(val nativeId: String, private val lookupKey: String? = null) : Contact() {
override fun compareTo(other: Contact): Int {
@ -136,7 +137,9 @@ class NativeContact(val nativeId: String, private val lookupKey: String? = null)
if (number != null && number.isNotEmpty()) {
Log.d("[Native Contact] Found phone number $data1 ($data4), type label is $typeLabel")
if (!rawPhoneNumbers.contains(number)) {
val trimmedNumber = LinphoneUtils.trimPhoneNumber(number)
val found = rawPhoneNumbers.find { LinphoneUtils.trimPhoneNumber(it) == trimmedNumber }
if (found == null) {
phoneNumbers.add(PhoneNumber(number, typeLabel))
rawPhoneNumbers.add(number)
}

7
app/src/main/java/org/linphone/utils/LinphoneUtils.kt
View file

@ -175,5 +175,12 @@ class LinphoneUtils {
remoteSipUri.clean()
return "${localSipUri.asStringUriOnly()}~${remoteSipUri.asStringUriOnly()}"
}
fun trimPhoneNumber(phoneNumber: String): String {
return phoneNumber.replace(" ", "")
.replace("-", "")
.replace("(", "")
.replace(")", "")
}
}
}