dandri/simplex-chat
1
0
Fork 0
mirror of https://github.com/simplex-chat/simplex-chat.git synced 2026-05-14 21:15:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

ui: do not enable speaker in calls when contact turned on video (#4998)

Browse Source
This commit is contained in:
Stanislav Dmitrenko
2024-10-08 21:57:33 +07:00
committed by GitHub
parent 6907f02ea6
commit 35fc0544a0
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/ios/Shared/Views/Call/ActiveCallView.swift
+3 -3
View File
@@ -434,12 +434,12 @@ struct ActiveCallOverlay: View {
audioDevicePickerButton()
}
}
.onChange(of: call.hasVideo) { hasVideo in
.onChange(of: call.localMediaSources.hasVideo) { hasVideo in
let current = AVAudioSession.sharedInstance().currentRoute.outputs.first?.portType
let speakerEnabled = current == .builtInSpeaker
let receiverEnabled = current == .builtInReceiver
// react automatically only when speaker or receiver were selected, otherwise keep an external device selected
if hasVideo != speakerEnabled && (speakerEnabled || receiverEnabled) {
// react automatically only when receiver were selected, otherwise keep an external device selected
if !speakerEnabled && hasVideo && receiverEnabled {
client.setSpeakerEnabledAndConfigureSession(!speakerEnabled, skipExternalDevice: true)
call.speakerEnabled = !speakerEnabled
}
apps/multiplatform/common/src/androidMain/kotlin/chat/simplex/common/views/call/CallView.android.kt
+3 -2
View File
@@ -226,8 +226,9 @@ actual fun ActiveCallView() {
ActiveCallOverlay(call, chatModel, callAudioDeviceManager)
}
}
KeyChangeEffect(call?.hasVideo) {
if (call != null) {
KeyChangeEffect(call?.localMediaSources?.hasVideo) {
if (call != null && call.hasVideo && callAudioDeviceManager.currentDevice.value?.type == AudioDeviceInfo.TYPE_BUILTIN_EARPIECE) {
// enabling speaker on user action (peer action ignored) and not disabling it again
callAudioDeviceManager.selectLastExternalDeviceOrDefault(call.hasVideo, true)
}
}