From 047c0092564728555f8fd64877e76ee28f5da5e0 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Thu, 12 Sep 2024 13:14:48 +0200
Subject: [PATCH] Fixed build since LinphoneCore.getConference() no longer
 exists

---
 .../voip/viewmodels/ConferenceViewModel.kt          |  2 +-
 .../activities/voip/viewmodels/ControlsViewModel.kt |  3 +--
 app/src/main/java/org/linphone/core/CoreContext.kt  | 13 +++++--------
 .../main/java/org/linphone/utils/AudioRouteUtils.kt |  6 +++---
 4 files changed, 10 insertions(+), 14 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 14f41f2ce..d5880757c 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
@@ -306,7 +306,7 @@ class ConferenceViewModel : ViewModel() {
 
         subject.value = AppUtils.getString(R.string.conference_default_title)
 
-        var conference = coreContext.core.conference ?: coreContext.core.currentCall?.conference
+        var conference = coreContext.core.currentCall?.conference
         if (conference == null) {
             for (call in coreContext.core.calls) {
                 if (call.conference != null) {
diff --git a/app/src/main/java/org/linphone/activities/voip/viewmodels/ControlsViewModel.kt b/app/src/main/java/org/linphone/activities/voip/viewmodels/ControlsViewModel.kt
index fc8b58bb4..5087c7300 100644
--- a/app/src/main/java/org/linphone/activities/voip/viewmodels/ControlsViewModel.kt
+++ b/app/src/main/java/org/linphone/activities/voip/viewmodels/ControlsViewModel.kt
@@ -257,7 +257,6 @@ class ControlsViewModel : ViewModel() {
         val core = coreContext.core
         when {
             core.currentCall != null -> core.currentCall?.terminate()
-            core.conference?.isIn == true -> core.terminateConference()
             else -> core.terminateAllCalls()
         }
     }
@@ -519,7 +518,7 @@ class ControlsViewModel : ViewModel() {
         val core = coreContext.core
         val currentCall = core.currentCall
         isVideoAvailable.value = (core.isVideoCaptureEnabled || core.isVideoPreviewEnabled) &&
-            ((currentCall != null && !currentCall.mediaInProgress()) || core.conference?.isIn == true)
+            ((currentCall != null && !currentCall.mediaInProgress()) || currentCall?.conference?.isIn == true)
     }
 
     private fun updateVideoEnabled() {
diff --git a/app/src/main/java/org/linphone/core/CoreContext.kt b/app/src/main/java/org/linphone/core/CoreContext.kt
index eee43e4eb..28c09c9cb 100644
--- a/app/src/main/java/org/linphone/core/CoreContext.kt
+++ b/app/src/main/java/org/linphone/core/CoreContext.kt
@@ -933,15 +933,12 @@ class CoreContext(
             }
         }
 
-        val conference = core.conference
-        if (conference == null || !conference.isIn) {
-            val call = core.currentCall
-            if (call == null) {
-                Log.w("[Context] Switching camera while not in call")
-                return
-            }
-            call.update(null)
+        val call = core.currentCall
+        if (call == null) {
+            Log.w("[Context] Switching camera while not in call")
+            return
         }
+        call.update(null)
     }
 
     fun showSwitchCameraButton(): Boolean {
diff --git a/app/src/main/java/org/linphone/utils/AudioRouteUtils.kt b/app/src/main/java/org/linphone/utils/AudioRouteUtils.kt
index fd95886fd..6e05fcbf6 100644
--- a/app/src/main/java/org/linphone/utils/AudioRouteUtils.kt
+++ b/app/src/main/java/org/linphone/utils/AudioRouteUtils.kt
@@ -40,7 +40,7 @@ class AudioRouteUtils {
                 Log.w("[Audio Route Helper] No call found, setting audio route on Core")
                 null
             }
-            val conference = coreContext.core.conference
+            val conference = currentCall?.conference
             val capability = if (output) {
                 AudioDevice.Capabilities.CapabilityPlay
             } else {
@@ -186,7 +186,7 @@ class AudioRouteUtils {
                 Log.w("[Audio Route Helper] No call found, checking audio route on Core")
                 null
             }
-            val conference = coreContext.core.conference
+            val conference = currentCall?.conference
 
             val audioDevice = if (conference != null && conference.isIn) {
                 conference.outputAudioDevice
@@ -209,7 +209,7 @@ class AudioRouteUtils {
                 return false
             }
             val currentCall = call ?: coreContext.core.currentCall ?: coreContext.core.calls[0]
-            val conference = coreContext.core.conference
+            val conference = currentCall?.conference
 
             val audioDevice = if (conference != null && conference.isIn) {
                 conference.outputAudioDevice