From 28963e252e7c8621ff02500e11abad48d0a05f5a Mon Sep 17 00:00:00 2001 From: Niels Andriesse Date: Thu, 7 Jan 2021 14:39:07 +1100 Subject: [PATCH] Debug --- SessionMessagingKit/Database/Storage+ClosedGroups.swift | 4 ++++ .../Sending & Receiving/MessageReceiver+Handling.swift | 1 + .../Sending & Receiving/MessageSender+ClosedGroups.swift | 1 + 3 files changed, 6 insertions(+) diff --git a/SessionMessagingKit/Database/Storage+ClosedGroups.swift b/SessionMessagingKit/Database/Storage+ClosedGroups.swift index 96d76e8bf..cda71072d 100644 --- a/SessionMessagingKit/Database/Storage+ClosedGroups.swift +++ b/SessionMessagingKit/Database/Storage+ClosedGroups.swift @@ -41,6 +41,10 @@ extension Storage { (transaction as! YapDatabaseReadWriteTransaction).setObject(groupPublicKey, forKey: groupPublicKey, inCollection: Storage.closedGroupPublicKeyCollection) } + public func removeClosedGroupPublicKey(_ groupPublicKey: String, using transaction: Any) { + (transaction as! YapDatabaseReadWriteTransaction).removeObject(forKey: groupPublicKey, inCollection: Storage.closedGroupPublicKeyCollection) + } + // MARK: - Ratchets diff --git a/SessionMessagingKit/Sending & Receiving/MessageReceiver+Handling.swift b/SessionMessagingKit/Sending & Receiving/MessageReceiver+Handling.swift index 045456410..c061c72c3 100644 --- a/SessionMessagingKit/Sending & Receiving/MessageReceiver+Handling.swift +++ b/SessionMessagingKit/Sending & Receiving/MessageReceiver+Handling.swift @@ -290,6 +290,7 @@ extension MessageReceiver { let wasCurrentUserRemoved = !members.contains(userPublicKey) if wasCurrentUserRemoved { Storage.shared.removeAllClosedGroupEncryptionKeyPairs(for: groupPublicKey, using: transaction) + Storage.shared.removeClosedGroupPublicKey(groupPublicKey, using: transaction) // Notify the PN server let _ = PushNotificationAPI.performOperation(.unsubscribe, for: groupPublicKey, publicKey: userPublicKey) } diff --git a/SessionMessagingKit/Sending & Receiving/MessageSender+ClosedGroups.swift b/SessionMessagingKit/Sending & Receiving/MessageSender+ClosedGroups.swift index 0c3f4fbc0..0ce60bb13 100644 --- a/SessionMessagingKit/Sending & Receiving/MessageSender+ClosedGroups.swift +++ b/SessionMessagingKit/Sending & Receiving/MessageSender+ClosedGroups.swift @@ -84,6 +84,7 @@ extension MessageSender : SharedSenderKeysDelegate { SNMessagingKitConfiguration.shared.storage.write { transaction in // Remove the group private key and unsubscribe from PNs Storage.shared.removeAllClosedGroupEncryptionKeyPairs(for: groupPublicKey, using: transaction) + Storage.shared.removeClosedGroupPublicKey(groupPublicKey, using: transaction) let _ = PushNotificationAPI.performOperation(.unsubscribe, for: groupPublicKey, publicKey: userPublicKey) } }