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

Use getPhoneNumbers method when labels aren't needed

Browse source
This commit is contained in:
Sylvain Berfini 2022-05-02 10:29:26 +02:00
parent b70b2e4127
commit d51affda59
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/org/linphone/activities/main/contact/viewmodels/ContactEditorViewModel.kt
View file

@ -211,8 +211,8 @@ class ContactEditorViewModel(val c: Friend?) : ViewModel(), ContactDataInterface
private fun updateNumbersAndAddresses() { private fun updateNumbersAndAddresses() {
val phoneNumbers = arrayListOf<NumberOrAddressEditorData>() val phoneNumbers = arrayListOf<NumberOrAddressEditorData>()
for (number in c?.phoneNumbersWithLabel.orEmpty()) { for (number in c?.phoneNumbers.orEmpty()) {
phoneNumbers.add(NumberOrAddressEditorData(number.phoneNumber, false)) phoneNumbers.add(NumberOrAddressEditorData(number, false))
} }
if (phoneNumbers.isEmpty()) { if (phoneNumbers.isEmpty()) {
phoneNumbers.add(NumberOrAddressEditorData("", false)) phoneNumbers.add(NumberOrAddressEditorData("", false))

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

@ -291,8 +291,8 @@ class ContactsManager(private val context: Context) {
} }
private fun storePresenceInNativeContact(friend: Friend) { private fun storePresenceInNativeContact(friend: Friend) {
for (phoneNumber in friend.phoneNumbersWithLabel) { for (phoneNumber in friend.phoneNumbers) {
val sipAddress = friend.getContactForPhoneNumberOrAddress(phoneNumber.phoneNumber) val sipAddress = friend.getContactForPhoneNumberOrAddress(phoneNumber)
if (sipAddress != null) { if (sipAddress != null) {
Log.d("[Contacts Manager] Found presence information to store in native contact $friend under Linphone sync account") Log.d("[Contacts Manager] Found presence information to store in native contact $friend under Linphone sync account")
val contactEditor = NativeContactEditor(friend) val contactEditor = NativeContactEditor(friend)
@ -301,7 +301,7 @@ class ContactsManager(private val context: Context) {
val deferred = async { val deferred = async {
withContext(Dispatchers.IO) { withContext(Dispatchers.IO) {
contactEditor.setPresenceInformation( contactEditor.setPresenceInformation(
phoneNumber.phoneNumber, phoneNumber,
sipAddress sipAddress
).commit() ).commit()
} }
@ -347,8 +347,8 @@ fun Friend.hasPresence(): Boolean {
val presenceModel = getPresenceModelForUriOrTel(address.asStringUriOnly()) val presenceModel = getPresenceModelForUriOrTel(address.asStringUriOnly())
if (presenceModel != null && presenceModel.basicStatus == PresenceBasicStatus.Open) return true if (presenceModel != null && presenceModel.basicStatus == PresenceBasicStatus.Open) return true
} }
for (number in phoneNumbersWithLabel) { for (number in phoneNumbers) {
val presenceModel = getPresenceModelForUriOrTel(number.phoneNumber) val presenceModel = getPresenceModelForUriOrTel(number)
if (presenceModel != null && presenceModel.basicStatus == PresenceBasicStatus.Open) return true if (presenceModel != null && presenceModel.basicStatus == PresenceBasicStatus.Open) return true
} }
return false return false