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

Fixed crash when merging call into conference with active speaker layout

Browse source
This commit is contained in:
Sylvain Berfini 2022-09-06 11:39:21 +02:00
parent 45d6dd0086
commit e468573551
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
app/src/main/java/org/linphone/activities/voip/fragments/ConferenceCallFragment.kt
View file

@ -95,7 +95,9 @@ class ConferenceCallFragment : GenericFragment<VoipConferenceCallFragmentBinding
coreContext.core.nativeVideoWindowId = window coreContext.core.nativeVideoWindowId = window
val preview = binding.root.findViewById<RoundCornersTextureView>(R.id.local_preview_video_surface) val preview = binding.root.findViewById<RoundCornersTextureView>(R.id.local_preview_video_surface)
conferenceViewModel.meParticipant.value?.setTextureView(preview) if (preview != null) {
conferenceViewModel.meParticipant.value?.setTextureView(preview)
}
} else { } else {
Log.i("[Conference Call] Either not in conference or current layout isn't active speaker, updating Core's native window id") Log.i("[Conference Call] Either not in conference or current layout isn't active speaker, updating Core's native window id")
coreContext.core.nativeVideoWindowId = null coreContext.core.nativeVideoWindowId = null
@ -302,8 +304,13 @@ class ConferenceCallFragment : GenericFragment<VoipConferenceCallFragmentBinding
override fun onResume() { override fun onResume() {
super.onResume() super.onResume()
if (conferenceViewModel.conferenceDisplayMode.value != ConferenceDisplayMode.ACTIVE_SPEAKER)
return
if (conferenceViewModel.conferenceCreationPending.value == false) { if (conferenceViewModel.conferenceCreationPending.value == false) {
when (conferenceViewModel.conferenceParticipantDevices.value.orEmpty().size) { val participantsCount = conferenceViewModel.conferenceParticipantDevices.value.orEmpty().size
Log.i("[Conference Call] Fragment resumed, updating layout for [$participantsCount] participants")
when (participantsCount) {
1 -> switchToActiveSpeakerLayoutWhenAlone() 1 -> switchToActiveSpeakerLayoutWhenAlone()
2 -> switchToActiveSpeakerLayoutForTwoParticipants() 2 -> switchToActiveSpeakerLayoutForTwoParticipants()
else -> switchToActiveSpeakerLayoutForMoreThanTwoParticipants() else -> switchToActiveSpeakerLayoutForMoreThanTwoParticipants()
@ -462,6 +469,7 @@ class ConferenceCallFragment : GenericFragment<VoipConferenceCallFragmentBinding
size size
) )
Log.i("[Conference Call] Updating active speaker layout for 3 or more participants")
if (corePreferences.enableAnimations) { if (corePreferences.enableAnimations) {
animateConstraintLayout(constraintLayout, set) animateConstraintLayout(constraintLayout, set)
} else { } else {
@ -510,6 +518,7 @@ class ConferenceCallFragment : GenericFragment<VoipConferenceCallFragmentBinding
size size
) )
Log.i("[Conference Call] Updating active speaker layout for 2 participants")
if (corePreferences.enableAnimations) { if (corePreferences.enableAnimations) {
animateConstraintLayout(constraintLayout, set) animateConstraintLayout(constraintLayout, set)
} else { } else {
@ -558,6 +567,7 @@ class ConferenceCallFragment : GenericFragment<VoipConferenceCallFragmentBinding
set.constrainWidth(R.id.local_participant_background, 0) set.constrainWidth(R.id.local_participant_background, 0)
set.constrainHeight(R.id.local_participant_background, 0) set.constrainHeight(R.id.local_participant_background, 0)
Log.i("[Conference Call] Updating active speaker layout for 1 participant (myself)")
if (corePreferences.enableAnimations) { if (corePreferences.enableAnimations) {
animateConstraintLayout(constraintLayout, set) animateConstraintLayout(constraintLayout, set)
} else { } else {