From b16ca7325e448595d90dcb7304efe2cee9ebad7f Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Thu, 18 Apr 2024 10:25:11 +0200
Subject: [PATCH] Fixed crash when merging calls into conference

---
 .../main/java/org/linphone/ui/call/CallActivity.kt   | 12 +++++++++++-
 app/src/main/res/navigation/call_nav_graph.xml       |  9 ++++++++-
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/linphone/ui/call/CallActivity.kt b/app/src/main/java/org/linphone/ui/call/CallActivity.kt
index 24d786b9b..6dc42ca83 100644
--- a/app/src/main/java/org/linphone/ui/call/CallActivity.kt
+++ b/app/src/main/java/org/linphone/ui/call/CallActivity.kt
@@ -51,6 +51,7 @@ import org.linphone.ui.call.conference.fragment.ActiveConferenceCallFragmentDire
 import org.linphone.ui.call.conference.fragment.ConferenceLayoutMenuDialogFragment
 import org.linphone.ui.call.fragment.ActiveCallFragmentDirections
 import org.linphone.ui.call.fragment.AudioDevicesMenuDialogFragment
+import org.linphone.ui.call.fragment.CallsListFragmentDirections
 import org.linphone.ui.call.fragment.IncomingCallFragmentDirections
 import org.linphone.ui.call.fragment.OutgoingCallFragmentDirections
 import org.linphone.ui.call.model.AudioDeviceModel
@@ -434,13 +435,22 @@ class CallActivity : GenericActivity() {
                     ActiveConferenceCallFragmentDirections.actionGlobalActiveConferenceCallFragment()
                 }
             }
+            R.id.callsListFragment -> {
+                if (notInConference) {
+                    Log.i("$TAG Going calls list fragment to conference fragment")
+                    CallsListFragmentDirections.actionCallsListFragmentToActiveConferenceCallFragment()
+                } else {
+                    Log.i("$TAG Going calls list fragment to active call fragment")
+                    CallsListFragmentDirections.actionCallsListFragmentToActiveCallFragment()
+                }
+            }
             else -> {
                 if (notInConference) {
                     Log.i("$TAG Going from call fragment to call fragment")
                     ActiveCallFragmentDirections.actionGlobalActiveCallFragment()
                 } else {
                     Log.i("$TAG Going from call fragment to conference call fragment")
-                    ActiveCallFragmentDirections.actionActiveCallFragmentToActiveConferenceCallFragment()
+                    ActiveCallFragmentDirections.actionGlobalActiveConferenceCallFragment()
                 }
             }
         }
diff --git a/app/src/main/res/navigation/call_nav_graph.xml b/app/src/main/res/navigation/call_nav_graph.xml
index 6832aa57a..15ed70513 100644
--- a/app/src/main/res/navigation/call_nav_graph.xml
+++ b/app/src/main/res/navigation/call_nav_graph.xml
@@ -116,7 +116,14 @@
         android:id="@+id/callsListFragment"
         android:name="org.linphone.ui.call.fragment.CallsListFragment"
         android:label="CallsListFragment"
-        tools:layout="@layout/calls_list_fragment" />
+        tools:layout="@layout/calls_list_fragment" >
+        <action
+            android:id="@+id/action_callsListFragment_to_activeConferenceCallFragment"
+            app:destination="@id/activeConferenceCallFragment" />
+        <action
+            android:id="@+id/action_callsListFragment_to_activeCallFragment"
+            app:destination="@id/activeCallFragment" />
+    </fragment>
 
     <fragment
         android:id="@+id/endedCallFragment"