Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed issue where we could return on conference waiting room after hanging up a conference call

Browse source
This commit is contained in:
Sylvain Berfini 2023-06-15 10:28:17 +02:00
parent 463ade0ade
commit 7519c69de1
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/src/main/java/org/linphone/activities/GenericFragment.kt
View file

@ -83,7 +83,9 @@ abstract class GenericFragment<T : ViewDataBinding> : Fragment() {
} }
} }
} catch (ise: IllegalStateException) { } catch (ise: IllegalStateException) {
Log.e("[Generic Fragment] ${getFragmentRealClassName()} Can't go back: $ise") Log.e(
"[Generic Fragment] ${getFragmentRealClassName()}.handleOnBackPressed() Can't go back: $ise"
)
} }
} }
} }
@ -137,7 +139,8 @@ abstract class GenericFragment<T : ViewDataBinding> : Fragment() {
try { try {
requireActivity().onBackPressedDispatcher.onBackPressed() requireActivity().onBackPressedDispatcher.onBackPressed()
} catch (ise: IllegalStateException) { } catch (ise: IllegalStateException) {
Log.e("[Generic Fragment] ${getFragmentRealClassName()} can't go back: $ise") Log.w("[Generic Fragment] ${getFragmentRealClassName()}.goBack() can't go back: $ise")
onBackPressedCallback.handleOnBackPressed()
} }
} }

8
app/src/main/java/org/linphone/activities/main/conference/viewmodels/ConferenceWaitingRoomViewModel.kt
View file

@ -398,13 +398,15 @@ class ConferenceWaitingRoomViewModel : MessageNotifierViewModel() {
private fun onAudioDevicesListUpdated() { private fun onAudioDevicesListUpdated() {
val bluetoothDeviceAvailable = AudioRouteUtils.isBluetoothAudioRouteAvailable() val bluetoothDeviceAvailable = AudioRouteUtils.isBluetoothAudioRouteAvailable()
if (!bluetoothDeviceAvailable && audioRoutesEnabled.value == true) {
Log.w(
"[Conference Waiting Room] Bluetooth device no longer available, switching back to default microphone & earpiece/speaker"
)
}
audioRoutesEnabled.value = bluetoothDeviceAvailable audioRoutesEnabled.value = bluetoothDeviceAvailable
if (!bluetoothDeviceAvailable) { if (!bluetoothDeviceAvailable) {
audioRoutesSelected.value = false audioRoutesSelected.value = false
Log.w(
"[Conference Waiting Room] Bluetooth device no longer available, switching back to default microphone & earpiece/speaker"
)
if (isBluetoothHeadsetSelected.value == true) { if (isBluetoothHeadsetSelected.value == true) {
for (audioDevice in coreContext.core.audioDevices) { for (audioDevice in coreContext.core.audioDevices) {
if (isVideoEnabled.value == true) { if (isVideoEnabled.value == true) {