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

Fix readability issues & simplify code

Browse Source
This commit is contained in:
nielsandriesse 2021-06-04 16:32:19 +10:00
parent 7ea399b55d
commit 3bf5a50439
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -266,9 +266,10 @@ private fun handleNewClosedGroup(sender: String, sentTimestamp: Long, groupPubli
val groupID = GroupUtil.doubleEncodeGroupID(groupPublicKey) val groupID = GroupUtil.doubleEncodeGroupID(groupPublicKey)
if (storage.getGroup(groupID) != null) { if (storage.getGroup(groupID) != null) {
// Update the group // Update the group
// clearing zombie list if the group was not active before the update is received // Clear zombie list if the group wasn't active
if (!storage.isGroupActive(groupID)) if (!storage.isGroupActive(groupID)) {
storage.setZombieMembers(groupID, listOf<String>().map { Address.fromSerialized(it) }) storage.setZombieMembers(groupID, listOf())
}
storage.updateTitle(groupID, name) storage.updateTitle(groupID, name)
storage.updateMembers(groupID, members.map { Address.fromSerialized(it) }) storage.updateMembers(groupID, members.map { Address.fromSerialized(it) })
} else { } else {
@ -394,10 +395,11 @@ private fun MessageReceiver.handleClosedGroupMembersAdded(message: ClosedGroupCo
val newMembers = members + updateMembers val newMembers = members + updateMembers
storage.updateMembers(groupID, newMembers.map { Address.fromSerialized(it) }) 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) 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) }) storage.setZombieMembers(groupID, zombies.minus(updateMembers).map { Address.fromSerialized(it) })
}
// Notify the user // Notify the user
if (userPublicKey == senderPublicKey) { if (userPublicKey == senderPublicKey) {