From 3bf5a50439440b1a7346e6302786c9e809aa7f3f Mon Sep 17 00:00:00 2001 From: nielsandriesse Date: Fri, 4 Jun 2021 16:32:19 +1000 Subject: [PATCH] Fix readability issues & simplify code --- .../sending_receiving/ReceivedMessageHandler.kt | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt index 3c2c95f85..54a4e1b95 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt @@ -266,9 +266,10 @@ private fun handleNewClosedGroup(sender: String, sentTimestamp: Long, groupPubli val groupID = GroupUtil.doubleEncodeGroupID(groupPublicKey) if (storage.getGroup(groupID) != null) { // Update the group - // clearing zombie list if the group was not active before the update is received - if (!storage.isGroupActive(groupID)) - storage.setZombieMembers(groupID, listOf().map { Address.fromSerialized(it) }) + // Clear zombie list if the group wasn't active + if (!storage.isGroupActive(groupID)) { + storage.setZombieMembers(groupID, listOf()) + } storage.updateTitle(groupID, name) storage.updateMembers(groupID, members.map { Address.fromSerialized(it) }) } else { @@ -394,10 +395,11 @@ private fun MessageReceiver.handleClosedGroupMembersAdded(message: ClosedGroupCo val newMembers = members + updateMembers storage.updateMembers(groupID, newMembers.map { Address.fromSerialized(it) }) - // update zombie members in case the added members are zombies + // Update zombie members in case the added members are zombies val zombies = storage.getZombieMembers(groupID) - if (zombies.intersect(updateMembers).isNotEmpty()) + if (zombies.intersect(updateMembers).isNotEmpty()) { storage.setZombieMembers(groupID, zombies.minus(updateMembers).map { Address.fromSerialized(it) }) + } // Notify the user if (userPublicKey == senderPublicKey) {