Merge remote-tracking branch 'ryan/fix-open-group-issues' into database-3

Signal/Signal-Info.plist

@@ -7,7 +7,7 @@
 		<key>CarthageVersion</key>
 		<string>0.34.0</string>
 		<key>OSXVersion</key>
-		<string>10.15.4</string>
+		<string>10.15.5</string>
 		<key>WebRTCCommit</key>
 		<string>1445d719bf05280270e9f77576f80f973fd847f8 M73</string>
 	</dict>

Signal/src/Loki/Components/ConversationCell.swift

@@ -141,15 +141,20 @@ final class ConversationCell : UITableViewCell {
                 profilePictureView.hexEncodedPublicKey = ""
                 profilePictureView.isRSSFeed = true
             } else {
-                var users = MentionsManager.userPublicKeyCache[threadViewModel.threadRecord.uniqueId!] ?? []
-                users.remove(getUserHexEncodedPublicKey())
-                let randomUsers = users.sorted().prefix(2) // Sort to provide a level of stability
-                if !randomUsers.isEmpty {
-                    profilePictureView.hexEncodedPublicKey = randomUsers[0]
-                    profilePictureView.additionalHexEncodedPublicKey = randomUsers.count >= 2 ? randomUsers[1] : ""
+                if let groupAvatarImage = (threadViewModel.threadRecord as? TSGroupThread)?.groupModel.groupImage {
+                    profilePictureView.groupAvatarImage = groupAvatarImage
                 } else {
-                    profilePictureView.hexEncodedPublicKey = ""
-                    profilePictureView.additionalHexEncodedPublicKey = ""
+                    profilePictureView.groupAvatarImage = nil
+                    var users = MentionsManager.userPublicKeyCache[threadViewModel.threadRecord.uniqueId!] ?? []
+                    users.remove(getUserHexEncodedPublicKey())
+                    let randomUsers = users.sorted().prefix(2) // Sort to provide a level of stability
+                    if !randomUsers.isEmpty {
+                        profilePictureView.hexEncodedPublicKey = randomUsers[0]
+                        profilePictureView.additionalHexEncodedPublicKey = randomUsers.count >= 2 ? randomUsers[1] : ""
+                    } else {
+                        profilePictureView.hexEncodedPublicKey = ""
+                        profilePictureView.additionalHexEncodedPublicKey = ""
+                    }
                 }
                 profilePictureView.isRSSFeed = (threadViewModel.threadRecord as? TSGroupThread)?.isRSSFeed ?? false
             }

Signal/src/Loki/View Controllers/JoinPublicChatVC.swift

@@ -133,7 +133,10 @@ final class JoinPublicChatVC : BaseVC, UIPageViewControllerDataSource, UIPageVie
         isJoining = true
         let channelID: UInt64 = 1
         let urlAsString = url.absoluteString
-        let displayName = OWSProfileManager.shared().localProfileName()
+        let userHexEncodedPublicKey = UserDefaults.standard[.masterHexEncodedPublicKey] ?? getUserHexEncodedPublicKey()
+        let displayName = OWSProfileManager.shared().profileNameForRecipient(withID: userHexEncodedPublicKey)
+        let profilePictureURL = OWSProfileManager.shared().profilePictureURL()
+        let profileKey = OWSProfileManager.shared().localProfileKey().keyData
         // TODO: Profile picture & profile key
         try! Storage.writeSync { transaction in
             transaction.removeObject(forKey: "\(urlAsString).\(channelID)", inCollection: LokiPublicChatAPI.lastMessageServerIDCollection)
@@ -143,6 +146,7 @@ final class JoinPublicChatVC : BaseVC, UIPageViewControllerDataSource, UIPageVie
         .done(on: .main) { [weak self] _ in
             let _ = LokiPublicChatAPI.getMessages(for: channelID, on: urlAsString)
             let _ = LokiPublicChatAPI.setDisplayName(to: displayName, on: urlAsString)
+            let _ = LokiPublicChatAPI.setProfilePictureURL(to: profilePictureURL, using: profileKey, on: urlAsString)
             let _ = LokiPublicChatAPI.join(channelID, on: urlAsString)
             let syncManager = SSKEnvironment.shared.syncManager
             let _ = syncManager.syncAllOpenGroups()

Signal/src/ViewControllers/ThreadSettings/OWSConversationSettingsViewController.m

@@ -957,8 +957,14 @@ const CGFloat kIconViewLength = 24;
     [stackView setLayoutMarginsRelativeArrangement:YES];
     
     if (self.isGroupThread) {
-        profilePictureView.hexEncodedPublicKey = @"";
-        profilePictureView.isRSSFeed = true; // For now just always show the Session logo
+        TSGroupThread* groupThread = (TSGroupThread*)self.thread;
+        if (groupThread.isPublicChat && groupThread.groupModel.groupImage != nil) {
+            profilePictureView.groupAvatarImage = groupThread.groupModel.groupImage;
+            profilePictureView.isRSSFeed = false;
+        } else {
+            profilePictureView.hexEncodedPublicKey = @"";
+            profilePictureView.isRSSFeed = true; // For now just always show the Session logo
+        }
     } else {
         profilePictureView.hexEncodedPublicKey = self.thread.contactIdentifier;
         

SignalMessaging/Loki/Redesign/Components/ProfilePictureView.swift

@@ -7,6 +7,7 @@ public final class ProfilePictureView : UIView {
     @objc public var isRSSFeed = false
     @objc public var hexEncodedPublicKey: String!
     @objc public var additionalHexEncodedPublicKey: String?
+    @objc public var groupAvatarImage: UIImage?
     
     // MARK: Components
     private lazy var imageView = getImageView()
@@ -61,8 +62,9 @@ public final class ProfilePictureView : UIView {
             additionalImageView.isHidden = true
             additionalImageView.image = nil
         }
-        guard hexEncodedPublicKey != nil else { return } // Can happen in rare cases
-        imageView.image = isRSSFeed ? nil : getProfilePicture(of: size, for: hexEncodedPublicKey)
+        guard hexEncodedPublicKey != nil || groupAvatarImage != nil else { return } // Can happen in rare cases
+        
+        imageView.image = isRSSFeed ? nil : groupAvatarImage != nil ? groupAvatarImage! : getProfilePicture(of: size, for: hexEncodedPublicKey)
         imageView.backgroundColor = isRSSFeed ? UIColor(rgbHex: 0x353535) : UIColor(rgbHex: 0xD8D8D8) // UIColor(rgbHex: 0xD8D8D8) = Colors.unimportant
         imageView.layer.cornerRadius = size / 2
         imageView.contentMode = isRSSFeed ? .center : .scaleAspectFit

SignalServiceKit/src/Loki/API/Open Groups/LokiPublicChatAPI.swift

@@ -19,7 +19,8 @@ public final class LokiPublicChatAPI : LokiDotNetAPI {
 
     // MARK: Convenience
     private static var userDisplayName: String {
-        return SSKEnvironment.shared.contactsManager.displayName(forPhoneIdentifier: getUserHexEncodedPublicKey()) ?? "Anonymous"
+        let userHexEncodedPublicKey = UserDefaults.standard[.masterHexEncodedPublicKey] ?? getUserHexEncodedPublicKey()
+        return SSKEnvironment.shared.profileManager.profileNameForRecipient(withID: userHexEncodedPublicKey) ?? "Anonymous"
     }
     
     // MARK: Database
@@ -349,6 +350,7 @@ public final class LokiPublicChatAPI : LokiDotNetAPI {
                         let annotation = annotations.first,
                         let info = annotation["value"] as? JSON,
                         let displayName = info["name"] as? String,
+                        let profilePictureURL = info["avatar"] as? String,
                         let countInfo = data["counts"] as? JSON,
                         let memberCount = countInfo["subscribers"] as? Int else {
                         print("[Loki] Couldn't parse info for public chat channel with ID: \(channel) on server: \(server) from: \(rawResponse).")
@@ -358,12 +360,61 @@ public final class LokiPublicChatAPI : LokiDotNetAPI {
                     try! Storage.writeSync { transaction in
                         storage.setUserCount(memberCount, forPublicChatWithID: "\(server).\(channel)", in: transaction)
                     }
-                    // TODO: Use this to update open group names as needed
-                    return LokiPublicChatInfo(displayName: displayName, memberCount: memberCount)
+                    let publicChatInfo = LokiPublicChatInfo(displayName: displayName, profilePictureURL: profilePictureURL, memberCount: memberCount)
+                    updateOpenGroupProfileIfNeeded(for: channel, on: server, with: publicChatInfo)
+                    return publicChatInfo
                 }
             }.handlingInvalidAuthTokenIfNeeded(for: server)
         }
     }
+        
+    static func updateOpenGroupProfileIfNeeded(for channel: UInt64, on server: String, with info: LokiPublicChatInfo) {
+        let storage = OWSPrimaryStorage.shared()
+        let publicChatID = "\(server).\(channel)"
+        storage.dbReadWriteConnection.readWrite { transaction in
+            //Save user count
+            storage.setUserCount(info.memberCount, forPublicChatWithID: publicChatID, in: transaction)
+            
+            let groupThread = TSGroupThread.getOrCreateThread(withGroupId: publicChatID.data(using: .utf8)!, groupType: .openGroup, transaction: transaction)
+
+            //Update display name if needed
+            let groupModel = groupThread.groupModel
+            if groupModel.groupName != info.displayName {
+                let newGroupModel = TSGroupModel.init(title: info.displayName, memberIds: groupModel.groupMemberIds, image: groupModel.groupImage, groupId: groupModel.groupId, groupType: groupModel.groupType, adminIds: groupModel.groupAdminIds)
+                groupThread.groupModel = newGroupModel
+                groupThread.save(with: transaction)
+            }
+            
+            //Download and update profile picture if needed
+            let oldAvatarURL = storage.getAvatarURL(forPublicChatWithID: publicChatID, in: transaction)
+            if oldAvatarURL != info.profilePictureURL || groupModel.groupImage == nil {
+                storage.setAvatarURL(info.profilePictureURL, forPublicChatWithID: publicChatID, in: transaction)
+                if let avatarURL = info.profilePictureURL {
+                    let configuration = URLSessionConfiguration.default
+                    let manager = AFURLSessionManager.init(sessionConfiguration: configuration)
+                    let url = URL(string: "\(server)\(avatarURL)")!
+                    let request = URLRequest(url: url)
+                    let task = manager.downloadTask(with: request, progress: nil,
+                                                    destination: {(targetPath: URL, response: URLResponse) -> URL in
+                                                        let tempFilePath = URL(fileURLWithPath: OWSTemporaryDirectoryAccessibleAfterFirstAuth()).appendingPathComponent(UUID().uuidString)
+                                                        return tempFilePath
+                                                        },
+                                                    completionHandler: { (response: URLResponse, filePath: URL?, error: Error?) in
+                                                        if let error = error {
+                                                            print("[Loki] Couldn't download profile picture for public chat channel with ID: \(channel) on server: \(server)")
+                                                            return
+                                                        }
+                                                        if let path = filePath, let avatarData = try? Data.init(contentsOf: path) {
+                                                            let attachmentStream = TSAttachmentStream.init(contentType: OWSMimeTypeImageJpeg, byteCount: UInt32(avatarData.count), sourceFilename: nil, caption: nil, albumMessageId: nil)
+                                                            try! attachmentStream.write(avatarData)
+                                                            groupThread.updateAvatar(with: attachmentStream)
+                                                        }
+                    })
+                    task.resume()
+                }
+            }
+        }
+    }
 
     public static func join(_ channel: UInt64, on server: String) -> Promise<Void> {
         return attempt(maxRetryCount: maxRetryCount, recoveringOn: DispatchQueue.global()) {

SignalServiceKit/src/Loki/API/Open Groups/LokiPublicChatInfo.swift

@@ -1,5 +1,6 @@
 
 public struct LokiPublicChatInfo {
     public let displayName: String
+    public let profilePictureURL: String?
     public let memberCount: Int
 }

SignalServiceKit/src/Loki/API/Open Groups/LokiPublicChatPoller.swift

@@ -150,6 +150,7 @@ public final class LokiPublicChatPoller : NSObject {
                     if !wasSentByCurrentUser {
                         content.setDataMessage(try! dataMessage.build())
                     } else {
+                        SyncMessagesProtocol.addForceSyncMessageTimestamp(message.timestamp, from: senderHexEncodedPublicKey)
                         let syncMessageSentBuilder = SSKProtoSyncMessageSent.builder()
                         syncMessageSentBuilder.setMessage(try! dataMessage.build())
                         syncMessageSentBuilder.setDestination(userHexEncodedPublicKey)

SignalServiceKit/src/Loki/Database/OWSPrimaryStorage+Loki.swift

@@ -139,4 +139,12 @@ public extension OWSPrimaryStorage {
     public func setUserCount(_ userCount: Int, forPublicChatWithID publicChatID: String, in transaction: YapDatabaseReadWriteTransaction) {
         transaction.setObject(userCount, forKey: publicChatID, inCollection: Storage.openGroupUserCountCollection)
     }
+    
+    public func getAvatarURL(forPublicChatWithID publicChatID: String, in transaction: YapDatabaseReadTransaction) -> String? {
+        return transaction.object(forKey: publicChatID, inCollection: Storage.openGroupProfilePictureURLCollection) as? String
+    }
+    
+    public func setAvatarURL(_ avatarURL: String?, forPublicChatWithID publicChatID: String, in transaction: YapDatabaseReadWriteTransaction) {
+        transaction.setObject(avatarURL, forKey: publicChatID, inCollection: Storage.openGroupProfilePictureURLCollection)
+    }
 }

SignalServiceKit/src/Loki/Database/Storage+Collections.swift

@@ -13,6 +13,7 @@
 
     @objc public static let onionRequestPathCollection = "LokiOnionRequestPathCollection"
     @objc public static let openGroupCollection = "LokiPublicChatCollection"
+    @objc public static let openGroupProfilePictureURLCollection = "LokiPublicChatAvatarURLCollection"
     @objc public static let openGroupUserCountCollection = "LokiPublicChatUserCountCollection"
     @objc public static let sessionRequestTimestampCollection = "LokiSessionRequestTimestampCollection"
     @objc public static let snodePoolCollection = "LokiSnodePoolCollection"

SignalServiceKit/src/Loki/Protocol/Sync Messages/SyncMessagesProtocol.swift

@@ -112,6 +112,15 @@ public final class SyncMessagesProtocol : NSObject {
         let hexEncodedPublicKey = envelope.source!
         return LokiDatabaseUtilities.isUserLinkedDevice(hexEncodedPublicKey, transaction: transaction)
     }
+    
+    @objc(addForceSyncMessageTimestamp:from:)
+    public static func addForceSyncMessageTimestamp(_ timestamp: UInt64, from hexEncodedPublicKey: String) {
+        var timestamps: Set<UInt64> = syncMessageTimestamps[hexEncodedPublicKey] ?? []
+        if timestamps.contains(timestamp) {
+            timestamps.remove(timestamp)
+        }
+        syncMessageTimestamps[hexEncodedPublicKey] = timestamps
+    }
 
     // TODO: We should probably look at why sync messages are being duplicated rather than doing this
     @objc(isDuplicateSyncMessage:fromHexEncodedPublicKey:)
@@ -245,6 +254,9 @@ public final class SyncMessagesProtocol : NSObject {
         for openGroup in groups {
             let openGroupManager = LokiPublicChatManager.shared
             guard openGroupManager.getChat(server: openGroup.url, channel: openGroup.channel) == nil else { return }
+            let userHexEncodedPublicKey = UserDefaults.standard[.masterHexEncodedPublicKey] ?? getUserHexEncodedPublicKey()
+            let displayName = SSKEnvironment.shared.profileManager.profileNameForRecipient(withID: userHexEncodedPublicKey)
+            LokiPublicChatAPI.setDisplayName(to: displayName, on: openGroup.url)
             openGroupManager.addChat(server: openGroup.url, channel: openGroup.channel)
         }
     }