TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-04-26 19:00:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

don't update zombie members if current user is removed

Browse Source
This commit is contained in:
Brice-W 2021-05-25 15:45:43 +10:00
parent 1cdbad5eaa
commit 5eaef76b02
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt
View File

@ -451,6 +451,7 @@ private fun MessageReceiver.handleClosedGroupMembersRemoved(message: ClosedGroup
val members = group.members.map { it.serialize() } val members = group.members.map { it.serialize() }
val admins = group.admins.map { it.toString() } val admins = group.admins.map { it.toString() }
val removedMembers = kind.members.map { it.toByteArray().toHexString() } val removedMembers = kind.members.map { it.toByteArray().toHexString() }
val zombies = storage.getZombieMember(groupID)
// Check that the admin wasn't removed // Check that the admin wasn't removed
if (removedMembers.contains(admins.first())) { if (removedMembers.contains(admins.first())) {
Log.d("Loki", "Ignoring invalid closed group update.") Log.d("Loki", "Ignoring invalid closed group update.")
@ -476,12 +477,12 @@ private fun MessageReceiver.handleClosedGroupMembersRemoved(message: ClosedGroup
disableLocalGroupAndUnsubscribe(groupPublicKey, groupID, userPublicKey) disableLocalGroupAndUnsubscribe(groupPublicKey, groupID, userPublicKey)
} else { } else {
storage.updateMembers(groupID, newMembers.map { Address.fromSerialized(it) }) storage.updateMembers(groupID, newMembers.map { Address.fromSerialized(it) })
// Update zombie members
storage.updateZombieMembers(groupID, zombies.minus(removedMembers).map { Address.fromSerialized(it) })
} }
// Update zombie members
val zombies = storage.getZombieMember(groupID)
storage.updateZombieMembers(groupID, zombies.minus(removedMembers).map { Address.fromSerialized(it) })
val type = if (senderLeft) SignalServiceGroup.Type.QUIT else SignalServiceGroup.Type.MEMBER_REMOVED
// Notify the user // Notify the user
val type = if (senderLeft) SignalServiceGroup.Type.QUIT else SignalServiceGroup.Type.MEMBER_REMOVED
// We don't display zombie members in the notification as users have already been notified when those members left // We don't display zombie members in the notification as users have already been notified when those members left
val notificationMembers = removedMembers.minus(zombies) val notificationMembers = removedMembers.minus(zombies)
if (notificationMembers.isNotEmpty()) { if (notificationMembers.isNotEmpty()) {