Merge branch 'fix/tweaks-to-config-message-generation' of https://github.com/mpretty-cyro/session-ios into bug-fix-for-call

SessionMessagingKit/Database/Storage+ClosedGroups.swift

@@ -10,13 +10,19 @@ extension Storage {
     private static let closedGroupZombieMembersCollection = "SNClosedGroupZombieMembersCollection"
 
     public func getClosedGroupEncryptionKeyPairs(for groupPublicKey: String) -> [ECKeyPair] {
+        var result: [ECKeyPair] = []
+        Storage.read { transaction in
+            result = self.getClosedGroupEncryptionKeyPairs(for: groupPublicKey, using: transaction)
+        }
+        return result
+    }
+    
+    public func getClosedGroupEncryptionKeyPairs(for groupPublicKey: String, using transaction: YapDatabaseReadTransaction) -> [ECKeyPair] {
         let collection = Storage.getClosedGroupEncryptionKeyPairCollection(for: groupPublicKey)
         var timestampsAndKeyPairs: [(timestamp: Double, keyPair: ECKeyPair)] = []
-        Storage.read { transaction in
+        transaction.enumerateKeysAndObjects(inCollection: collection) { key, object, _ in
-            transaction.enumerateKeysAndObjects(inCollection: collection) { key, object, _ in
+            guard let timestamp = Double(key), let keyPair = object as? ECKeyPair else { return }
-                guard let timestamp = Double(key), let keyPair = object as? ECKeyPair else { return }
+            timestampsAndKeyPairs.append((timestamp, keyPair))
-                timestampsAndKeyPairs.append((timestamp, keyPair))
-            }
         }
         return timestampsAndKeyPairs.sorted { $0.timestamp < $1.timestamp }.map { $0.keyPair }
     }
@@ -24,6 +30,10 @@ extension Storage {
     public func getLatestClosedGroupEncryptionKeyPair(for groupPublicKey: String) -> ECKeyPair? {
         return getClosedGroupEncryptionKeyPairs(for: groupPublicKey).last
     }
+    
+    public func getLatestClosedGroupEncryptionKeyPair(for groupPublicKey: String, using transaction: YapDatabaseReadTransaction) -> ECKeyPair? {
+        return getClosedGroupEncryptionKeyPairs(for: groupPublicKey, using: transaction).last
+    }
 
     public func addClosedGroupEncryptionKeyPair(_ keyPair: ECKeyPair, for groupPublicKey: String, using transaction: Any) {
         let collection = Storage.getClosedGroupEncryptionKeyPairCollection(for: groupPublicKey)
@@ -39,10 +49,14 @@ extension Storage {
     public func getUserClosedGroupPublicKeys() -> Set<String> {
         var result: Set<String> = []
         Storage.read { transaction in
-            result = Set(transaction.allKeys(inCollection: Storage.closedGroupPublicKeyCollection))
+            result = self.getUserClosedGroupPublicKeys(using: transaction)
         }
         return result
     }
+    
+    public func getUserClosedGroupPublicKeys(using transaction: YapDatabaseReadTransaction) -> Set<String> {
+        return Set(transaction.allKeys(inCollection: Storage.closedGroupPublicKeyCollection))
+    }
 
     public func addClosedGroupPublicKey(_ groupPublicKey: String, using transaction: Any) {
         (transaction as! YapDatabaseReadWriteTransaction).setObject(groupPublicKey, forKey: groupPublicKey, inCollection: Storage.closedGroupPublicKeyCollection)
@@ -81,4 +95,8 @@ extension Storage {
     public func isClosedGroup(_ publicKey: String) -> Bool {
         getUserClosedGroupPublicKeys().contains(publicKey)
     }
+    
+    public func isClosedGroup(_ publicKey: String, using transaction: YapDatabaseReadTransaction) -> Bool {
+        getUserClosedGroupPublicKeys(using: transaction).contains(publicKey)
+    }
 }

SessionMessagingKit/Database/Storage+Shared.swift

@@ -36,11 +36,21 @@ extension Storage {
     }
 
     @objc public func getUser() -> Contact? {
+        return getUser(using: nil)
+    }
+    
+    public func getUser(using transaction: YapDatabaseReadTransaction?) -> Contact? {
         guard let userPublicKey = getUserPublicKey() else { return nil }
         var result: Contact?
-        Storage.read { transaction in
+        
+        if let transaction = transaction {
             result = Storage.shared.getContact(with: userPublicKey, using: transaction)
         }
+        else {
+            Storage.read { transaction in
+                result = Storage.shared.getContact(with: userPublicKey, using: transaction)
+            }
+        }
         return result
     }
 }

SessionMessagingKit/Messages/Control Messages/ConfigurationMessage+Convenience.swift

@@ -4,7 +4,7 @@ extension ConfigurationMessage {
 
     public static func getCurrent(with transaction: YapDatabaseReadWriteTransaction? = nil) -> ConfigurationMessage? {
         let storage = Storage.shared
-        guard let user = storage.getUser() else { return nil }
+        guard let user = storage.getUser(using: transaction) else { return nil }
         
         let displayName = user.name
         let profilePictureURL = user.profilePictureURL
@@ -24,13 +24,16 @@ extension ConfigurationMessage {
                         let groupID = thread.groupModel.groupId
                         let groupPublicKey = LKGroupUtilities.getDecodedGroupID(groupID)
                         
-                        guard storage.isClosedGroup(groupPublicKey), let encryptionKeyPair = storage.getLatestClosedGroupEncryptionKeyPair(for: groupPublicKey) else {
+                        guard
+                            storage.isClosedGroup(groupPublicKey, using: transaction),
+                            let encryptionKeyPair = storage.getLatestClosedGroupEncryptionKeyPair(for: groupPublicKey, using: transaction)
+                        else {
                             return
                         }
                         
                         let closedGroup = ClosedGroup(
                             publicKey: groupPublicKey,
-                            name: thread.groupModel.groupName!,
+                            name: (thread.groupModel.groupName ?? ""),
                             encryptionKeyPair: encryptionKeyPair,
                             members: Set(thread.groupModel.groupMemberIds),
                             admins: Set(thread.groupModel.groupAdminIds),
@@ -39,7 +42,7 @@ extension ConfigurationMessage {
                         closedGroups.insert(closedGroup)
                         
                     case .openGroup:
-                        if let v2OpenGroup = storage.getV2OpenGroup(for: thread.uniqueId!) {
+                        if let threadId: String = thread.uniqueId, let v2OpenGroup = storage.getV2OpenGroup(for: threadId) {
                             openGroups.insert("\(v2OpenGroup.server)/\(v2OpenGroup.room)?public_key=\(v2OpenGroup.publicKey)")
                         }
                         

SessionMessagingKit/Storage.swift

@@ -17,15 +17,18 @@ public protocol SessionMessagingKitStorageProtocol {
     func getUserKeyPair() -> ECKeyPair?
     func getUserED25519KeyPair() -> Box.KeyPair?
     func getUser() -> Contact?
+    func getUser(using transaction: YapDatabaseReadTransaction?) -> Contact?
     func getAllContacts() -> Set<Contact>
     func getAllContacts(with transaction: YapDatabaseReadTransaction) -> Set<Contact>
 
     // MARK: - Closed Groups
 
     func getUserClosedGroupPublicKeys() -> Set<String>
+    func getUserClosedGroupPublicKeys(using transaction: YapDatabaseReadTransaction) -> Set<String>
     func getZombieMembers(for groupPublicKey: String) -> Set<String>
     func setZombieMembers(for groupPublicKey: String, to zombies: Set<String>, using transaction: Any)
     func isClosedGroup(_ publicKey: String) -> Bool
+    func isClosedGroup(_ publicKey: String, using transaction: YapDatabaseReadTransaction) -> Bool
 
     // MARK: - Jobs