mirror of
https://gitlab.linphone.org/BC/public/linphone-android.git
synced 2026-01-17 11:28:06 +00:00
Fixed back navigation when in conversation opened from meeting call history
This commit is contained in:
parent
9504c6d1ca
commit
15f9d04747
1 changed files with 12 additions and 8 deletions
|
|
@ -389,16 +389,20 @@ open class ConversationFragment : SlidingPaneChildFragment() {
|
|||
}
|
||||
|
||||
override fun goBack(): Boolean {
|
||||
sharedViewModel.closeSlidingPaneEvent.value = Event(true)
|
||||
sharedViewModel.displayedChatRoom = null
|
||||
if (!findNavController().popBackStack()) {
|
||||
sharedViewModel.closeSlidingPaneEvent.value = Event(true)
|
||||
sharedViewModel.displayedChatRoom = null
|
||||
|
||||
if (findNavController().currentDestination?.id == R.id.conversationFragment) {
|
||||
// If not done this fragment won't be paused, which will cause us issues
|
||||
val action = ConversationFragmentDirections.actionConversationFragmentToEmptyFragment()
|
||||
findNavController().navigate(action)
|
||||
return true
|
||||
if (findNavController().currentDestination?.id == R.id.conversationFragment) {
|
||||
// If not done this fragment won't be paused, which will cause us issues
|
||||
val action =
|
||||
ConversationFragmentDirections.actionConversationFragmentToEmptyFragment()
|
||||
findNavController().navigate(action)
|
||||
return true
|
||||
}
|
||||
return false
|
||||
}
|
||||
return false
|
||||
return true
|
||||
}
|
||||
|
||||
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue