From dd26a6059b7afb4f547985a77d16f4e82517b27e Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Fri, 20 May 2022 15:55:24 +0200
Subject: [PATCH] Fixed navigating out of conference chat room

---
 .../main/java/org/linphone/activities/Navigation.kt    | 10 +---------
 .../fragments/ConferenceWaitingRoomFragment.kt         |  3 +--
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/org/linphone/activities/Navigation.kt b/app/src/main/java/org/linphone/activities/Navigation.kt
index d8357d8f6..3d46cc2c1 100644
--- a/app/src/main/java/org/linphone/activities/Navigation.kt
+++ b/app/src/main/java/org/linphone/activities/Navigation.kt
@@ -225,14 +225,6 @@ internal fun ConferenceSchedulingSummaryFragment.navigateToDialer() {
     )
 }
 
-internal fun ConferenceWaitingRoomFragment.navigateToDialer() {
-    findNavController().navigate(
-        R.id.action_global_dialerFragment,
-        null,
-        popupTo(R.id.dialerFragment, true)
-    )
-}
-
 internal fun DetailChatRoomFragment.navigateToConferenceWaitingRoom(
     address: String,
     subject: String?
@@ -638,7 +630,7 @@ internal fun MasterCallLogsFragment.navigateToConferenceWaitingRoom(
     findMasterNavController().navigate(
         R.id.action_global_conferenceWaitingRoomFragment,
         bundle,
-        popupTo(R.id.dialerFragment, false)
+        popupTo(R.id.conferenceWaitingRoomFragment, true)
     )
 }
 
diff --git a/app/src/main/java/org/linphone/activities/main/conference/fragments/ConferenceWaitingRoomFragment.kt b/app/src/main/java/org/linphone/activities/main/conference/fragments/ConferenceWaitingRoomFragment.kt
index 0ee22ceda..e6a771719 100644
--- a/app/src/main/java/org/linphone/activities/main/conference/fragments/ConferenceWaitingRoomFragment.kt
+++ b/app/src/main/java/org/linphone/activities/main/conference/fragments/ConferenceWaitingRoomFragment.kt
@@ -29,7 +29,6 @@ import org.linphone.R
 import org.linphone.activities.GenericFragment
 import org.linphone.activities.main.MainActivity
 import org.linphone.activities.main.conference.viewmodels.ConferenceWaitingRoomViewModel
-import org.linphone.activities.navigateToDialer
 import org.linphone.compatibility.Compatibility
 import org.linphone.core.tools.Log
 import org.linphone.databinding.ConferenceWaitingRoomFragmentBinding
@@ -70,7 +69,7 @@ class ConferenceWaitingRoomFragment : GenericFragment<ConferenceWaitingRoomFragm
                         Log.w("[Conference Waiting Room] Call to conference server with URI [$conferenceUri] wasn't found!")
                     }
                 }
-                navigateToDialer()
+                goBack()
             }
         }