Fix multi device open group syncing

pull/183/head
nielsandriesse 6 years ago
parent 4b595575f6
commit 3889c0af39

@ -152,6 +152,8 @@ final class JoinPublicChatVC : BaseVC, UIPageViewControllerDataSource, UIPageVie
let _ = LokiPublicChatAPI.getMessages(for: channelID, on: urlAsString)
let _ = LokiPublicChatAPI.setDisplayName(to: displayName, on: urlAsString)
let _ = LokiPublicChatAPI.join(channelID, on: urlAsString)
let syncManager = SSKEnvironment.shared.syncManager
let _ = syncManager.syncAllOpenGroups()
self?.presentingViewController!.dismiss(animated: true, completion: nil)
}
.catch(on: .main) { [weak self] _ in

@ -125,7 +125,7 @@ public final class LokiPublicChatManager : NSObject {
refreshChatsAndPollers()
}
private func getChat(server: String, channel: UInt64) -> LokiPublicChat? {
public func getChat(server: String, channel: UInt64) -> LokiPublicChat? {
return chats.values.first { chat in
return chat.server == server && chat.channel == channel
}

@ -223,14 +223,16 @@ public final class SyncMessagesProtocol : NSObject {
public static func handleOpenGroupSyncMessageIfNeeded(_ syncMessage: SSKProtoSyncMessage, wrappedIn envelope: SSKProtoEnvelope, using transaction: YapDatabaseReadTransaction) {
// The envelope source is set during UD decryption
let hexEncodedPublicKey = envelope.source!
guard let masterHexEncodedPublicKey = storage.getMasterHexEncodedPublicKey(for: getUserHexEncodedPublicKey(), in: transaction) else { return }
let wasSentByMasterDevice = (masterHexEncodedPublicKey == hexEncodedPublicKey)
guard wasSentByMasterDevice else { return }
let linkedDevices = LokiDatabaseUtilities.getLinkedDeviceHexEncodedPublicKeys(for: hexEncodedPublicKey, in: transaction)
let wasSentByLinkedDevice = linkedDevices.contains(hexEncodedPublicKey)
guard wasSentByLinkedDevice else { return }
let groups = syncMessage.openGroups
guard groups.count > 0 else { return }
print("[Loki] Open group sync message received.")
for openGroup in groups {
LokiPublicChatManager.shared.addChat(server: openGroup.url, channel: openGroup.channel)
let openGroupManager = LokiPublicChatManager.shared
guard openGroupManager.getChat(server: openGroup.url, channel: openGroup.channel) == nil else { return }
openGroupManager.addChat(server: openGroup.url, channel: openGroup.channel)
}
}
}

Loading…
Cancel
Save