From 04dcbd6075079b4deaa88866d3a6bd9020f0cdbf Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Tue, 12 Dec 2023 17:23:19 +0100
Subject: [PATCH] Fixed broken active speaker video if when joining conference
 speaking participants info wasn't available

---
 .../voip/viewmodels/ConferenceViewModel.kt           |  2 +-
 .../res/layout/voip_conference_active_speaker.xml    | 12 +++---------
 2 files changed, 4 insertions(+), 10 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 c1a9bfda5..2d9e2e403 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
@@ -595,7 +595,7 @@ class ConferenceViewModel : ViewModel() {
             val deviceData = devices.first()
             speakingParticipant.value = deviceData
             deviceData.isActiveSpeaker.value = true
-            speakingParticipantFound.value = false
+            speakingParticipantFound.value = true
         }
 
         for (device in conference.me.devices) {
diff --git a/app/src/main/res/layout/voip_conference_active_speaker.xml b/app/src/main/res/layout/voip_conference_active_speaker.xml
index d8fc916f0..4047035cb 100644
--- a/app/src/main/res/layout/voip_conference_active_speaker.xml
+++ b/app/src/main/res/layout/voip_conference_active_speaker.xml
@@ -123,12 +123,10 @@
 
         <View
             android:id="@+id/active_speaker_background"
-            android:layout_width="0dp"
+            android:layout_width="match_parent"
             android:layout_height="0dp"
             android:visibility="@{conferenceViewModel.speakingParticipantFound ? View.VISIBLE : View.GONE}"
             app:layout_constraintTop_toBottomOf="@id/top_barrier"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintBottom_toTopOf="@id/miniatures"
             android:layout_marginTop="@{controlsViewModel.fullScreenMode ? @dimen/margin_0dp : @dimen/voip_active_speaker_top_margin, default=@dimen/voip_active_speaker_top_margin}"
             android:background="@{!conferenceViewModel.speakingParticipant.isInConference ? @drawable/shape_remote_paused_background : @drawable/shape_remote_background, default=@drawable/shape_remote_background}"
@@ -180,12 +178,10 @@
 
         <org.linphone.activities.voip.views.RoundCornersTextureView
             android:id="@+id/conference_active_speaker_remote_video"
-            android:layout_width="0dp"
+            android:layout_width="match_parent"
             android:layout_height="0dp"
             android:visibility="@{!conferenceViewModel.isConferenceLocallyPaused &amp;&amp; conferenceViewModel.speakingParticipant.videoEnabled &amp;&amp; conferenceViewModel.speakingParticipant.isInConference ? View.VISIBLE : View.GONE}"
             app:layout_constraintBottom_toBottomOf="@id/active_speaker_background"
-            app:layout_constraintEnd_toEndOf="@id/active_speaker_background"
-            app:layout_constraintStart_toStartOf="@id/active_speaker_background"
             app:layout_constraintTop_toTopOf="@id/active_speaker_background" />
 
         <ImageView
@@ -254,12 +250,10 @@
 
         <View
             android:id="@+id/local_participant_background"
-            android:layout_width="0dp"
+            android:layout_width="match_parent"
             android:layout_height="0dp"
             android:visibility="@{conferenceViewModel.isMeListenerOnly ? View.GONE : View.VISIBLE}"
             app:layout_constraintTop_toBottomOf="@id/top_barrier"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintBottom_toBottomOf="@id/hinge_bottom"
             android:layout_marginTop="@{controlsViewModel.fullScreenMode || conferenceViewModel.twoOrMoreParticipants ? @dimen/margin_0dp : @dimen/voip_active_speaker_top_margin, default=@dimen/voip_active_speaker_top_margin}"
             android:background="@drawable/shape_me_background"