From 38ee50bb212f47d018a51a5200742d4cd7d05b68 Mon Sep 17 00:00:00 2001 From: Niels Andriesse Date: Fri, 15 Nov 2019 14:31:24 +1100 Subject: [PATCH] Debug --- SignalServiceKit/src/Loki/API/LokiStorageAPI.swift | 2 +- .../src/Loki/API/Public Chat/LokiPublicChatPoller.swift | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/SignalServiceKit/src/Loki/API/LokiStorageAPI.swift b/SignalServiceKit/src/Loki/API/LokiStorageAPI.swift index 2a099edcb..f0a03aec6 100644 --- a/SignalServiceKit/src/Loki/API/LokiStorageAPI.swift +++ b/SignalServiceKit/src/Loki/API/LokiStorageAPI.swift @@ -38,7 +38,7 @@ public final class LokiStorageAPI : LokiDotNetAPI { guard let annotations = data["annotations"] as? [JSON], !annotations.isEmpty else { return [] } guard let annotation = annotations.first(where: { $0["type"] as? String == deviceLinkType }), let value = annotation["value"] as? JSON, let rawDeviceLinks = value["authorisations"] as? [JSON], - let user = data["user"] as? JSON, let hexEncodedPublicKey = user["username"] as? String else { + let hexEncodedPublicKey = data["username"] as? String else { print("[Loki] Couldn't parse device links from: \(rawResponse).") return [] } diff --git a/SignalServiceKit/src/Loki/API/Public Chat/LokiPublicChatPoller.swift b/SignalServiceKit/src/Loki/API/Public Chat/LokiPublicChatPoller.swift index 35f49bd13..968507f15 100644 --- a/SignalServiceKit/src/Loki/API/Public Chat/LokiPublicChatPoller.swift +++ b/SignalServiceKit/src/Loki/API/Public Chat/LokiPublicChatPoller.swift @@ -67,9 +67,6 @@ public final class LokiPublicChatPoller : NSObject { OWSPrimaryStorage.shared().dbReadConnection.read { transaction in wasSentByCurrentUser = LokiDatabaseUtilities.isUserLinkedDevice(message.hexEncodedPublicKey, transaction: transaction) } - - - var masterHexEncodedPublicKey: String? = nil storage.dbReadConnection.read { transaction in masterHexEncodedPublicKey = storage.getMasterHexEncodedPublicKey(for: message.hexEncodedPublicKey, in: transaction)