Minor fixes to prevent blinking

This commit is contained in:
Sylvain Berfini 2021-09-08 13:42:45 +02:00
parent 70fe94098b
commit bed6ff19c9
2 changed files with 10 additions and 3 deletions

View file

@ -251,9 +251,17 @@ class MasterChatRoomsFragment : MasterFragment<ChatRoomMasterFragmentBinding, Ch
if ((requireActivity() as GenericActivity).isDestructionPending) {
Log.w("[Chat] Activity is pending destruction, don't start navigating now!")
sharedViewModel.destructionPendingChatRoom = chatRoom
} else {
if (chatRoom.peerAddress.asStringUriOnly() == coreContext.notificationsManager.currentlyDisplayedChatRoomAddress) {
Log.w("[Chat] This chat room is already displayed!")
} else {
sharedViewModel.selectedChatRoom.value = chatRoom
navigateToChatRoom(AppUtils.createBundleWithSharedTextAndFiles(sharedViewModel))
navigateToChatRoom(
AppUtils.createBundleWithSharedTextAndFiles(
sharedViewModel
)
)
}
}
}
}

View file

@ -219,7 +219,6 @@ class MasterContactsFragment : MasterFragment<ContactMasterFragmentBinding, Cont
it.consume { contact ->
Log.i("[Contacts] Selected item in list changed: $contact")
sharedViewModel.selectedContact.value = contact
listViewModel.filter.value = ""
if (editOnClick) {
navigateToContactEditor(sipUriToAdd, binding.slidingPane)