From 4eb11a05bc205fff3a61fdbc8a7bc383523b1bd1 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Thu, 18 Apr 2024 11:12:32 +0200
Subject: [PATCH] Another fix for in-call navigation

---
 .../java/org/linphone/ui/call/CallActivity.kt   | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 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 6dc42ca83..905c24977 100644
--- a/app/src/main/java/org/linphone/ui/call/CallActivity.kt
+++ b/app/src/main/java/org/linphone/ui/call/CallActivity.kt
@@ -424,6 +424,15 @@ class CallActivity : GenericActivity() {
                     IncomingCallFragmentDirections.actionIncomingCallFragmentToActiveConferenceCallFragment()
                 }
             }
+            R.id.activeCallFragment -> {
+                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()
+                }
+            }
             R.id.activeConferenceCallFragment -> {
                 if (notInConference) {
                     Log.i("$TAG Going from conference call fragment to call fragment")
@@ -437,11 +446,11 @@ class CallActivity : GenericActivity() {
             }
             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 {
+                    Log.i("$TAG Going calls list fragment to conference fragment")
+                    CallsListFragmentDirections.actionCallsListFragmentToActiveConferenceCallFragment()
                 }
             }
             else -> {
@@ -450,7 +459,7 @@ class CallActivity : GenericActivity() {
                     ActiveCallFragmentDirections.actionGlobalActiveCallFragment()
                 } else {
                     Log.i("$TAG Going from call fragment to conference call fragment")
-                    ActiveCallFragmentDirections.actionGlobalActiveConferenceCallFragment()
+                    ActiveConferenceCallFragmentDirections.actionGlobalActiveConferenceCallFragment()
                 }
             }
         }