From b68853c53edc39faa9faa59630fdb7cdd1a15740 Mon Sep 17 00:00:00 2001 From: Jonathan Rainville Date: Tue, 30 May 2023 09:49:46 -0400 Subject: [PATCH] fix(messenger_handler): fix group chat not being set as active (#3545) Fixes an issue where if a group chat was first received from a non-contact, and later received from a contact, it still wouldn't save it as active. That's because we checked if we were **newly** added instead of just if we were added. That meant that in the case I described above, the chat would then never have the chance to be set active. --- VERSION | 2 +- protocol/messenger_handler.go | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/VERSION b/VERSION index be977c52a..7a281cd21 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.152.3 +0.152.4 diff --git a/protocol/messenger_handler.go b/protocol/messenger_handler.go index 77751c3a2..65171ba20 100644 --- a/protocol/messenger_handler.go +++ b/protocol/messenger_handler.go @@ -158,11 +158,10 @@ func (m *Messenger) HandleMembershipUpdate(messageState *ReceivedMessageState, c } chat.updateChatFromGroupMembershipChanges(group) - wasUserAdded = !existingGroup.IsMember(ourKey) && - group.IsMember(ourKey) - // Reactivate deleted group chat on re-invite from contact - chat.Active = chat.Active || (isActive && wasUserAdded) + chat.Active = chat.Active || (isActive && group.IsMember(ourKey)) + + wasUserAdded = !existingGroup.IsMember(ourKey) && group.IsMember(ourKey) // Show push notifications when our key is added to members list and chat is Active showPushNotification = showPushNotification && wasUserAdded