From 852e78c5a66debc515b3c7b88d3609c0b8b46ee7 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Thu, 23 May 2024 10:54:01 +0200
Subject: [PATCH] Fixed build with 5.4 SDK since conferenceAddress can now be
 null

---
 .../activities/voip/viewmodels/ConferenceViewModel.kt       | 6 ++++--
 app/src/main/java/org/linphone/utils/LinphoneUtils.kt       | 3 ++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/org/linphone/activities/voip/viewmodels/ConferenceViewModel.kt b/app/src/main/java/org/linphone/activities/voip/viewmodels/ConferenceViewModel.kt
index 42d31c16a..14f41f2ce 100644
--- a/app/src/main/java/org/linphone/activities/voip/viewmodels/ConferenceViewModel.kt
+++ b/app/src/main/java/org/linphone/activities/voip/viewmodels/ConferenceViewModel.kt
@@ -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)
diff --git a/app/src/main/java/org/linphone/utils/LinphoneUtils.kt b/app/src/main/java/org/linphone/utils/LinphoneUtils.kt
index fbcea8513..85efa1468 100644
--- a/app/src/main/java/org/linphone/utils/LinphoneUtils.kt
+++ b/app/src/main/java/org/linphone/utils/LinphoneUtils.kt
@@ -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