From 03d33731fd3a501dcd3eac3bf7f7430879e6cdfd Mon Sep 17 00:00:00 2001 From: Marcel Hibbe Date: Tue, 26 Mar 2024 15:32:18 +0100 Subject: [PATCH] fix to handle invitation panel when userId is the same with same userId on both servers, the invitation panel could get shown also there were no invitations for the current account Signed-off-by: Marcel Hibbe --- .../viewmodels/ConversationsListViewModel.kt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/nextcloud/talk/conversationlist/viewmodels/ConversationsListViewModel.kt b/app/src/main/java/com/nextcloud/talk/conversationlist/viewmodels/ConversationsListViewModel.kt index 7d95f4754..36096bd37 100644 --- a/app/src/main/java/com/nextcloud/talk/conversationlist/viewmodels/ConversationsListViewModel.kt +++ b/app/src/main/java/com/nextcloud/talk/conversationlist/viewmodels/ConversationsListViewModel.kt @@ -83,7 +83,11 @@ class ConversationsListViewModel @Inject constructor( } override fun onNext(invitationsModel: InvitationsModel) { - if (invitationsModel.user.userId?.equals(userManager.currentUser.blockingGet().userId) == true) { + val currentUser = userManager.currentUser.blockingGet() + + if (invitationsModel.user.userId?.equals(currentUser.userId) == true && + invitationsModel.user.baseUrl?.equals(currentUser.baseUrl) == true + ) { if (invitationsModel.invitations.isNotEmpty()) { _getFederationInvitationsViewState.value = GetFederationInvitationsSuccessState(true) } else {