From 275e8dec16b6c7e81969c171dc827d804e25e20b Mon Sep 17 00:00:00 2001 From: Niels Andriesse Date: Mon, 23 Sep 2019 10:45:51 +1000 Subject: [PATCH] Clean --- SignalServiceKit/src/Loki/Database/DeviceLinkIndex.swift | 9 ++++++--- .../src/Loki/Database/OWSPrimaryStorage+Loki.swift | 4 ++++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/SignalServiceKit/src/Loki/Database/DeviceLinkIndex.swift b/SignalServiceKit/src/Loki/Database/DeviceLinkIndex.swift index 896746025..93b9b73eb 100644 --- a/SignalServiceKit/src/Loki/Database/DeviceLinkIndex.swift +++ b/SignalServiceKit/src/Loki/Database/DeviceLinkIndex.swift @@ -22,14 +22,17 @@ public final class DeviceLinkIndex : NSObject { return YapDatabaseSecondaryIndex(setup: setup, handler: handler) }() - @objc public static var databaseExtensionName: String { return name } + @objc public static let databaseExtensionName: String = name @objc public static func asyncRegisterDatabaseExtensions(_ storage: OWSStorage) { - storage.register(indexDatabaseExtension, withName: name) + storage.asyncRegister(indexDatabaseExtension, withName: name) } @objc public static func getDeviceLinks(for query: YapDatabaseQuery, in transaction: YapDatabaseReadTransaction) -> [LokiDeviceLink] { - guard let ext = transaction.ext(DeviceLinkIndex.name) as? YapDatabaseSecondaryIndexTransaction else { return [] } + guard let ext = transaction.ext(DeviceLinkIndex.name) as? YapDatabaseSecondaryIndexTransaction else { + print("[Loki] Couldn't get device link index database extension.") + return [] + } var result: [LokiDeviceLink] = [] ext.enumerateKeysAndObjects(matching: query) { _, _, object, _ in guard let deviceLink = object as? LokiDeviceLink else { return } diff --git a/SignalServiceKit/src/Loki/Database/OWSPrimaryStorage+Loki.swift b/SignalServiceKit/src/Loki/Database/OWSPrimaryStorage+Loki.swift index 57e73015d..c5a32093a 100644 --- a/SignalServiceKit/src/Loki/Database/OWSPrimaryStorage+Loki.swift +++ b/SignalServiceKit/src/Loki/Database/OWSPrimaryStorage+Loki.swift @@ -29,4 +29,8 @@ extension OWSPrimaryStorage { } return deviceLinks.first } + + public func getMasterHexEncodedPublicKey(for slaveHexEncodedPublicKey: String, in transaction: YapDatabaseReadTransaction) -> String? { + return getDeviceLink(for: slaveHexEncodedPublicKey, in: transaction)?.master.hexEncodedPublicKey + } }