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

Don't use data1 phone number value from addressbook if it's not a proper phone number

Browse source
This commit is contained in:
Sylvain Berfini 2022-03-07 10:45:17 +01:00
parent 3cd8110db3
commit 9fc2009b76
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -25,6 +25,7 @@ import android.database.Cursor
import android.graphics.Bitmap import android.graphics.Bitmap
import android.net.Uri import android.net.Uri
import android.provider.ContactsContract import android.provider.ContactsContract
import android.util.Patterns
import androidx.core.app.Person import androidx.core.app.Person
import androidx.core.graphics.drawable.IconCompat import androidx.core.graphics.drawable.IconCompat
import org.linphone.LinphoneApplication.Companion.coreContext import org.linphone.LinphoneApplication.Companion.coreContext
@ -124,11 +125,15 @@ class NativeContact(val nativeId: String, private val lookupKey: String? = null)
// data4 = ContactsContract.CommonDataKinds.Phone.NORMALIZED_NUMBER // data4 = ContactsContract.CommonDataKinds.Phone.NORMALIZED_NUMBER
// data1 = ContactsContract.CommonDataKinds.Phone.NUMBER // data1 = ContactsContract.CommonDataKinds.Phone.NUMBER
val number = if (corePreferences.preferNormalizedPhoneNumbersFromAddressBook) { val number = if (corePreferences.preferNormalizedPhoneNumbersFromAddressBook ||
data1.isNullOrEmpty() ||
!Patterns.PHONE.matcher(data1).matches()
) {
data4 ?: data1 data4 ?: data1
} else { } else {
data1 ?: data4 data1
} }
if (number != null && number.isNotEmpty()) { if (number != null && number.isNotEmpty()) {
Log.d("[Native Contact] Found phone number $data1 ($data4), type label is $typeLabel") Log.d("[Native Contact] Found phone number $data1 ($data4), type label is $typeLabel")
if (!rawPhoneNumbers.contains(number)) { if (!rawPhoneNumbers.contains(number)) {