From d5d6d65b5c46ba6e3bded3ac50fe7a7ae83de9ea Mon Sep 17 00:00:00 2001 From: Niels Andriesse Date: Fri, 20 Sep 2019 14:11:46 +1000 Subject: [PATCH] Fix build --- .../Database/PairingAuthorisationsIndex.swift | 106 +++++++++--------- 1 file changed, 53 insertions(+), 53 deletions(-) diff --git a/SignalServiceKit/src/Loki/Database/PairingAuthorisationsIndex.swift b/SignalServiceKit/src/Loki/Database/PairingAuthorisationsIndex.swift index ec718fd95..4413a9cc5 100644 --- a/SignalServiceKit/src/Loki/Database/PairingAuthorisationsIndex.swift +++ b/SignalServiceKit/src/Loki/Database/PairingAuthorisationsIndex.swift @@ -1,53 +1,53 @@ -@objc(LKPairingAuthorisationsIndex) -public final class PairingAuthorisationsIndex : NSObject { - private static let name = "loki_index_pairing_authorisations" - - // Fields - @objc public static let primaryDevicePubKey = "pairing_primary_device_pub_key" - @objc public static let secondaryDevicePubKey = "pairing_secondary_device_pub_key" - @objc public static let isGranted = "pairing_is_granted" - - // MARK: Database Extension - - @objc public static var indexDatabaseExtension: YapDatabaseSecondaryIndex { - let setup = YapDatabaseSecondaryIndexSetup() - setup.addColumn(primaryDevicePubKey, with: .text) - setup.addColumn(secondaryDevicePubKey, with: .text) - setup.addColumn(isGranted, with: .integer) - - let handler = YapDatabaseSecondaryIndexHandler.withObjectBlock { (transaction, dict, collection, key, object) in - guard let pairing = object as? LokiPairingAuthorisation else { return } - dict[primaryDevicePubKey] = pairing.primaryDevicePubKey - dict[secondaryDevicePubKey] = pairing.secondaryDevicePubKey - dict[isGranted] = pairing.isGranted - } - - return YapDatabaseSecondaryIndex(setup: setup, handler: handler) - } - - @objc public static var databaseExtensionName: String { - return name - } - - @objc public static func asyncRegisterDatabaseExtensions(_ storage: OWSStorage) { - storage.register(indexDatabaseExtension, withName: name) - } - - // MARK: Helper - - public static func enumeratePairingAuthorisations(with query: YapDatabaseQuery, transaction: YapDatabaseReadTransaction, block: @escaping (LokiPairingAuthorisation, UnsafeMutablePointer) -> Void) { - let ext = transaction.ext(PairingAuthorisationsIndex.name) as? YapDatabaseSecondaryIndexTransaction - ext?.enumerateKeysAndObjects(matching: query) { (collection, key, object, stop) in - guard let authorisation = object as? LokiPairingAuthorisation else { return } - block(authorisation, stop) - } - } - - public static func getPairingAuthorisations(with query: YapDatabaseQuery, transaction: YapDatabaseReadTransaction) -> [LokiPairingAuthorisation] { - var authorisations = [LokiPairingAuthorisation]() - enumeratePairingAuthorisations(with: query, transaction: transaction) { (authorisation, _) in - authorisations.append(authorisation) - } - return authorisations - } -} +//@objc(LKPairingAuthorisationsIndex) +//public final class PairingAuthorisationsIndex : NSObject { +// private static let name = "loki_index_pairing_authorisations" +// +// // Fields +// @objc public static let primaryDevicePubKey = "pairing_primary_device_pub_key" +// @objc public static let secondaryDevicePubKey = "pairing_secondary_device_pub_key" +// @objc public static let isGranted = "pairing_is_granted" +// +// // MARK: Database Extension +// +// @objc public static var indexDatabaseExtension: YapDatabaseSecondaryIndex { +// let setup = YapDatabaseSecondaryIndexSetup() +// setup.addColumn(primaryDevicePubKey, with: .text) +// setup.addColumn(secondaryDevicePubKey, with: .text) +// setup.addColumn(isGranted, with: .integer) +// +// let handler = YapDatabaseSecondaryIndexHandler.withObjectBlock { (transaction, dict, collection, key, object) in +// guard let pairing = object as? LokiPairingAuthorisation else { return } +// dict[primaryDevicePubKey] = pairing.primaryDevicePubKey +// dict[secondaryDevicePubKey] = pairing.secondaryDevicePubKey +// dict[isGranted] = pairing.isGranted +// } +// +// return YapDatabaseSecondaryIndex(setup: setup, handler: handler) +// } +// +// @objc public static var databaseExtensionName: String { +// return name +// } +// +// @objc public static func asyncRegisterDatabaseExtensions(_ storage: OWSStorage) { +// storage.register(indexDatabaseExtension, withName: name) +// } +// +// // MARK: Helper +// +// public static func enumeratePairingAuthorisations(with query: YapDatabaseQuery, transaction: YapDatabaseReadTransaction, block: @escaping (LokiPairingAuthorisation, UnsafeMutablePointer) -> Void) { +// let ext = transaction.ext(PairingAuthorisationsIndex.name) as? YapDatabaseSecondaryIndexTransaction +// ext?.enumerateKeysAndObjects(matching: query) { (collection, key, object, stop) in +// guard let authorisation = object as? LokiPairingAuthorisation else { return } +// block(authorisation, stop) +// } +// } +// +// public static func getPairingAuthorisations(with query: YapDatabaseQuery, transaction: YapDatabaseReadTransaction) -> [LokiPairingAuthorisation] { +// var authorisations = [LokiPairingAuthorisation]() +// enumeratePairingAuthorisations(with: query, transaction: transaction) { (authorisation, _) in +// authorisations.append(authorisation) +// } +// return authorisations +// } +//}