Merge remote-tracking branch 'upstream/dev' into identity_key_encryption

3 years ago · 51061cac0e
parent f10a99ce41 411a0dee6f
commit 51061cac0e
2 changed files with 2 additions and 2 deletions
--- a/app/build.gradle
+++ b/app/build.gradle
@ -143,7 +143,7 @@ dependencies {
    testImplementation 'org.robolectric:shadows-multidex:4.2'
 }

-def canonicalVersionCode = 181
+def canonicalVersionCode = 182
 def canonicalVersionName = "1.10.13"

 def postFixSize = 10
--- 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
@ -267,7 +267,7 @@ private fun handleNewClosedGroup(sender: String, sentTimestamp: Long, groupPubli
    if (storage.getGroup(groupID) != null) {
        // Update the group
        // Clear zombie list if the group wasn't active
-        if (!storage.isGroupActive(groupID)) {
+        if (!storage.isGroupActive(groupPublicKey)) {
            storage.setZombieMembers(groupID, listOf())
        }
        storage.updateTitle(groupID, name)