Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Minor fixes to prevent blinking

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/src/main/java/org/linphone/activities/main/chat/fragments/MasterChatRoomsFragment.kt
View file

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

1
app/src/main/java/org/linphone/activities/main/contact/fragments/MasterContactsFragment.kt
View file

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