mirrors/linphone-android
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-android.git synced 2026-01-17 11:28:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed issue in number picker

Browse source
This commit is contained in:
Sylvain Berfini 2023-09-07 11:09:26 +02:00
parent db3117b92e
commit f0e39e92b7
2 changed files with 101 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/src/main/java/org/linphone/ui/main/calls/fragment/StartCallFragment.kt
View file

@ -195,16 +195,27 @@ class StartCallFragment : GenericFragment() {
val enablePhoneNumbers = core.defaultAccount?.isInSecureMode() != true
if (addressesCount == 1 && (numbersCount == 0 || !enablePhoneNumbers)) {
Log.i(
"$TAG Only 1 SIP address found for contact [${friend.name}], starting call directly"
)
val address = friend.addresses.first()
coreContext.startCall(address)
} else if (addressesCount == 0 && numbersCount == 1 && enablePhoneNumbers) {
val number = friend.phoneNumbers.first()
val address = core.interpretUrl(number, true)
if (address != null) {
Log.i(
"$TAG Only 1 phone number found for contact [${friend.name}], starting call directly"
)
coreContext.startCall(address)
} else {
Log.e("$TAG Failed to interpret phone number [$number] as SIP address")
}
} else {
val list = friend.getListOfSipAddressesAndPhoneNumbers(listener)
Log.i(
"$TAG [${list.size}] numbers or addresses found for contact [${friend.name}], showing selection dialog"
)
coreContext.postOnMainThread {
val model = NumberOrAddressPickerDialogModel(list)

133
app/src/main/java/org/linphone/ui/main/contacts/viewmodel/ContactViewModel.kt
View file

@ -34,6 +34,7 @@ import org.linphone.ui.main.contacts.model.ContactAvatarModel
import org.linphone.ui.main.contacts.model.ContactDeviceModel
import org.linphone.ui.main.contacts.model.ContactNumberOrAddressClickListener
import org.linphone.ui.main.contacts.model.ContactNumberOrAddressModel
import org.linphone.ui.main.model.isInSecureMode
import org.linphone.utils.Event
import org.linphone.utils.FileUtils
@ -259,66 +260,112 @@ class ContactViewModel @UiThread constructor() : ViewModel() {
@UiThread
fun startAudioCall() {
val numbersAndAddresses = sipAddressesAndPhoneNumbers.value.orEmpty()
val count = numbersAndAddresses.size
if (count == 1) {
Log.i(
"$TAG Only 1 number or address found for contact [${friend.name}], starting audio call directly"
)
val address = numbersAndAddresses.first().address
if (address != null) {
coreContext.postOnCoreThread { core ->
val params = core.createCallParams(null)
params?.isVideoEnabled = false
coreContext.startCall(address, params)
coreContext.postOnCoreThread { core ->
val addressesCount = friend.addresses.size
val numbersCount = friend.phoneNumbers.size
// Do not consider phone numbers if default account is in secure mode
val enablePhoneNumbers = core.defaultAccount?.isInSecureMode() != true
if (addressesCount == 1 && (numbersCount == 0 || !enablePhoneNumbers)) {
Log.i(
"$TAG Only 1 SIP address found for contact [${friend.name}], starting audio call directly"
)
val address = friend.addresses.first()
coreContext.startCall(address)
} else if (addressesCount == 0 && numbersCount == 1 && enablePhoneNumbers) {
val number = friend.phoneNumbers.first()
val address = core.interpretUrl(number, true)
if (address != null) {
Log.i(
"$TAG Only 1 phone number found for contact [${friend.name}], starting audio call directly"
)
coreContext.startCall(address)
} else {
Log.e("$TAG Failed to interpret phone number [$number] as SIP address")
}
} else {
val list = sipAddressesAndPhoneNumbers.value.orEmpty()
Log.i(
"$TAG [${list.size}] numbers or addresses found for contact [${friend.name}], showing selection dialog"
)
showNumberOrAddressPickerDialogEvent.postValue(Event(true))
}
} else {
Log.i(
"$TAG [$count] numbers or addresses found for contact [${friend.name}], showing selection dialog"
)
showNumberOrAddressPickerDialogEvent.value = Event(true)
}
}
@UiThread
fun startVideoCall() {
val numbersAndAddresses = sipAddressesAndPhoneNumbers.value.orEmpty()
val count = numbersAndAddresses.size
if (count == 1) {
Log.i(
"$TAG Only 1 number or address found for contact [${friend.name}], starting video call directly"
)
val address = numbersAndAddresses.first().address
if (address != null) {
coreContext.postOnCoreThread { core ->
coreContext.postOnCoreThread { core ->
val addressesCount = friend.addresses.size
val numbersCount = friend.phoneNumbers.size
// Do not consider phone numbers if default account is in secure mode
val enablePhoneNumbers = core.defaultAccount?.isInSecureMode() != true
if (addressesCount == 1 && (numbersCount == 0 || !enablePhoneNumbers)) {
Log.i(
"$TAG Only 1 SIP address found for contact [${friend.name}], starting video call directly"
)
val address = friend.addresses.first()
val params = core.createCallParams(null)
params?.isVideoEnabled = true
coreContext.startCall(address, params)
} else if (addressesCount == 0 && numbersCount == 1 && enablePhoneNumbers) {
val number = friend.phoneNumbers.first()
val address = core.interpretUrl(number, true)
if (address != null) {
Log.i(
"$TAG Only 1 phone number found for contact [${friend.name}], starting video call directly"
)
val params = core.createCallParams(null)
params?.isVideoEnabled = true
coreContext.startCall(address, params)
} else {
Log.e("$TAG Failed to interpret phone number [$number] as SIP address")
}
} else {
val list = sipAddressesAndPhoneNumbers.value.orEmpty()
Log.i(
"$TAG [${list.size}] numbers or addresses found for contact [${friend.name}], showing selection dialog"
)
showNumberOrAddressPickerDialogEvent.postValue(Event(true))
}
} else {
Log.i(
"$TAG [$count] numbers or addresses found for contact [${friend.name}], showing selection dialog"
)
showNumberOrAddressPickerDialogEvent.value = Event(true)
}
}
@UiThread
fun sendMessage() {
val numbersAndAddresses = sipAddressesAndPhoneNumbers.value.orEmpty()
val count = numbersAndAddresses.size
if (count == 1) {
Log.i(
"$TAG Only 1 number or address found for contact [${friend.name}], sending message directly"
)
// TODO
} else {
Log.i(
"$TAG [$count] numbers or addresses found for contact [${friend.name}], showing selection dialog"
)
showNumberOrAddressPickerDialogEvent.value = Event(true)
coreContext.postOnCoreThread { core ->
val addressesCount = friend.addresses.size
val numbersCount = friend.phoneNumbers.size
// Do not consider phone numbers if default account is in secure mode
val enablePhoneNumbers = core.defaultAccount?.isInSecureMode() != true
if (addressesCount == 1 && (numbersCount == 0 || !enablePhoneNumbers)) {
Log.i(
"$TAG Only 1 SIP address found for contact [${friend.name}], sending message directly"
)
// TODO
} else if (addressesCount == 0 && numbersCount == 1 && enablePhoneNumbers) {
val number = friend.phoneNumbers.first()
val address = core.interpretUrl(number, true)
if (address != null) {
Log.i(
"$TAG Only 1 phone number found for contact [${friend.name}], sending message directly"
)
// TODO
} else {
Log.e("$TAG Failed to interpret phone number [$number] as SIP address")
}
} else {
val list = sipAddressesAndPhoneNumbers.value.orEmpty()
Log.i(
"$TAG [${list.size}] numbers or addresses found for contact [${friend.name}], showing selection dialog"
)
showNumberOrAddressPickerDialogEvent.postValue(Event(true))
}
}
}
}