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

Fixed build with 5.4 SDK since conferenceAddress can now be null

Browse source
This commit is contained in:
Sylvain Berfini 2024-05-23 10:54:01 +02:00
parent dad4af5c34
commit 852e78c5a6
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/src/main/java/org/linphone/activities/voip/viewmodels/ConferenceViewModel.kt
View file

@ -558,8 +558,9 @@ class ConferenceViewModel : ViewModel() {
speakingParticipantFound.value = false
speakingParticipantVideoEnabled.value = false
val conferenceAddress = conference.conferenceAddress ?: return
val conferenceInfo = conference.core.findConferenceInformationFromUri(
conference.conferenceAddress
conferenceAddress
)
var allSpeaker = true
for (info in conferenceInfo?.participantInfos.orEmpty()) {
@ -668,8 +669,9 @@ class ConferenceViewModel : ViewModel() {
"[Conference] New participant device found: ${device.name} (${device.address.asStringUriOnly()})"
)
val conferenceAddress = conference.conferenceAddress ?: return
val conferenceInfo = conference.core.findConferenceInformationFromUri(
conference.conferenceAddress
conferenceAddress
)
val info = conferenceInfo?.participantInfos?.find {
it.address.weakEqual(device.address)

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

@ -93,8 +93,9 @@ class LinphoneUtils {
fun getConferenceSubject(conference: Conference): String? {
return if (conference.subject.isNullOrEmpty()) {
val conferenceAddress = conference.conferenceAddress ?: return conference.subject
val conferenceInfo = coreContext.core.findConferenceInformationFromUri(
conference.conferenceAddress
conferenceAddress
)
if (conferenceInfo != null) {
conferenceInfo.subject