From ebf9fa9145af0f0432984716659d08ce866a3ef3 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Tue, 30 Apr 2024 16:46:53 +0200
Subject: [PATCH] Fixed waiting room joining screen when rotating device

---
 .../viewmodel/MeetingWaitingRoomViewModel.kt        | 13 ++++++++-----
 .../layout-land/meeting_waiting_room_fragment.xml   |  2 +-
 .../res/layout/meeting_waiting_room_fragment.xml    |  2 +-
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/org/linphone/ui/main/meetings/viewmodel/MeetingWaitingRoomViewModel.kt b/app/src/main/java/org/linphone/ui/main/meetings/viewmodel/MeetingWaitingRoomViewModel.kt
index 2c7162287..826d89c24 100644
--- a/app/src/main/java/org/linphone/ui/main/meetings/viewmodel/MeetingWaitingRoomViewModel.kt
+++ b/app/src/main/java/org/linphone/ui/main/meetings/viewmodel/MeetingWaitingRoomViewModel.kt
@@ -145,8 +145,6 @@ class MeetingWaitingRoomViewModel @UiThread constructor() : ViewModel() {
     }
 
     init {
-        joining.value = false
-
         coreContext.postOnCoreThread { core ->
             core.addListener(coreListener)
 
@@ -178,10 +176,15 @@ class MeetingWaitingRoomViewModel @UiThread constructor() : ViewModel() {
             val address = Factory.instance().createAddress(uri)
             if (address != null) {
                 conferenceAddress = address
-                val found = core.findConferenceInformationFromUri(address)
-                if (found != null) {
+                val callFound = core.calls.find {
+                    it.remoteAddress.weakEqual(conferenceAddress)
+                }
+                joining.postValue(callFound != null)
+
+                val conferenceInfoFound = core.findConferenceInformationFromUri(address)
+                if (conferenceInfoFound != null) {
                     Log.i("$TAG Conference info with SIP URI [$uri] was found")
-                    conferenceInfo = found
+                    conferenceInfo = conferenceInfoFound
                     configureConferenceInfo()
                     configureWaitingRoom()
                     conferenceInfoFoundEvent.postValue(Event(true))
diff --git a/app/src/main/res/layout-land/meeting_waiting_room_fragment.xml b/app/src/main/res/layout-land/meeting_waiting_room_fragment.xml
index 21e02f062..26b1540f1 100644
--- a/app/src/main/res/layout-land/meeting_waiting_room_fragment.xml
+++ b/app/src/main/res/layout-land/meeting_waiting_room_fragment.xml
@@ -242,7 +242,7 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/joining_subtitle"
-                app:layout_constraintBottom_toBottomOf="parent"/>
+                app:layout_constraintBottom_toTopOf="@id/cancel"/>
 
             <androidx.appcompat.widget.AppCompatTextView
                 style="@style/primary_button_label_style"
diff --git a/app/src/main/res/layout/meeting_waiting_room_fragment.xml b/app/src/main/res/layout/meeting_waiting_room_fragment.xml
index be8999327..6d06e21fd 100644
--- a/app/src/main/res/layout/meeting_waiting_room_fragment.xml
+++ b/app/src/main/res/layout/meeting_waiting_room_fragment.xml
@@ -238,7 +238,7 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/joining_subtitle"
-                app:layout_constraintBottom_toBottomOf="parent"/>
+                app:layout_constraintBottom_toTopOf="@id/cancel"/>
 
             <androidx.appcompat.widget.AppCompatTextView
                 style="@style/primary_button_label_style"