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

Fixed build since LinphoneCore.getConference() no longer exists

Browse source
This commit is contained in:
Sylvain Berfini 2024-09-12 13:14:48 +02:00
parent 92b8a89ba7
commit 047c009256
4 changed files with 10 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -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) {

3
app/src/main/java/org/linphone/activities/voip/viewmodels/ControlsViewModel.kt
View file

@ -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() {

13
app/src/main/java/org/linphone/core/CoreContext.kt
View file

@ -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 {

6
app/src/main/java/org/linphone/utils/AudioRouteUtils.kt
View file

@ -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