Fix build

pull/55/head
Niels Andriesse 6 years ago
parent 10a6c5e2ea
commit d5d6d65b5c

@ -1,53 +1,53 @@
@objc(LKPairingAuthorisationsIndex) //@objc(LKPairingAuthorisationsIndex)
public final class PairingAuthorisationsIndex : NSObject { //public final class PairingAuthorisationsIndex : NSObject {
private static let name = "loki_index_pairing_authorisations" // private static let name = "loki_index_pairing_authorisations"
//
// Fields // // Fields
@objc public static let primaryDevicePubKey = "pairing_primary_device_pub_key" // @objc public static let primaryDevicePubKey = "pairing_primary_device_pub_key"
@objc public static let secondaryDevicePubKey = "pairing_secondary_device_pub_key" // @objc public static let secondaryDevicePubKey = "pairing_secondary_device_pub_key"
@objc public static let isGranted = "pairing_is_granted" // @objc public static let isGranted = "pairing_is_granted"
//
// MARK: Database Extension // // MARK: Database Extension
//
@objc public static var indexDatabaseExtension: YapDatabaseSecondaryIndex { // @objc public static var indexDatabaseExtension: YapDatabaseSecondaryIndex {
let setup = YapDatabaseSecondaryIndexSetup() // let setup = YapDatabaseSecondaryIndexSetup()
setup.addColumn(primaryDevicePubKey, with: .text) // setup.addColumn(primaryDevicePubKey, with: .text)
setup.addColumn(secondaryDevicePubKey, with: .text) // setup.addColumn(secondaryDevicePubKey, with: .text)
setup.addColumn(isGranted, with: .integer) // setup.addColumn(isGranted, with: .integer)
//
let handler = YapDatabaseSecondaryIndexHandler.withObjectBlock { (transaction, dict, collection, key, object) in // let handler = YapDatabaseSecondaryIndexHandler.withObjectBlock { (transaction, dict, collection, key, object) in
guard let pairing = object as? LokiPairingAuthorisation else { return } // guard let pairing = object as? LokiPairingAuthorisation else { return }
dict[primaryDevicePubKey] = pairing.primaryDevicePubKey // dict[primaryDevicePubKey] = pairing.primaryDevicePubKey
dict[secondaryDevicePubKey] = pairing.secondaryDevicePubKey // dict[secondaryDevicePubKey] = pairing.secondaryDevicePubKey
dict[isGranted] = pairing.isGranted // dict[isGranted] = pairing.isGranted
} // }
//
return YapDatabaseSecondaryIndex(setup: setup, handler: handler) // return YapDatabaseSecondaryIndex(setup: setup, handler: handler)
} // }
//
@objc public static var databaseExtensionName: String { // @objc public static var databaseExtensionName: String {
return name // return name
} // }
//
@objc public static func asyncRegisterDatabaseExtensions(_ storage: OWSStorage) { // @objc public static func asyncRegisterDatabaseExtensions(_ storage: OWSStorage) {
storage.register(indexDatabaseExtension, withName: name) // storage.register(indexDatabaseExtension, withName: name)
} // }
//
// MARK: Helper // // MARK: Helper
//
public static func enumeratePairingAuthorisations(with query: YapDatabaseQuery, transaction: YapDatabaseReadTransaction, block: @escaping (LokiPairingAuthorisation, UnsafeMutablePointer<ObjCBool>) -> Void) { // public static func enumeratePairingAuthorisations(with query: YapDatabaseQuery, transaction: YapDatabaseReadTransaction, block: @escaping (LokiPairingAuthorisation, UnsafeMutablePointer<ObjCBool>) -> Void) {
let ext = transaction.ext(PairingAuthorisationsIndex.name) as? YapDatabaseSecondaryIndexTransaction // let ext = transaction.ext(PairingAuthorisationsIndex.name) as? YapDatabaseSecondaryIndexTransaction
ext?.enumerateKeysAndObjects(matching: query) { (collection, key, object, stop) in // ext?.enumerateKeysAndObjects(matching: query) { (collection, key, object, stop) in
guard let authorisation = object as? LokiPairingAuthorisation else { return } // guard let authorisation = object as? LokiPairingAuthorisation else { return }
block(authorisation, stop) // block(authorisation, stop)
} // }
} // }
//
public static func getPairingAuthorisations(with query: YapDatabaseQuery, transaction: YapDatabaseReadTransaction) -> [LokiPairingAuthorisation] { // public static func getPairingAuthorisations(with query: YapDatabaseQuery, transaction: YapDatabaseReadTransaction) -> [LokiPairingAuthorisation] {
var authorisations = [LokiPairingAuthorisation]() // var authorisations = [LokiPairingAuthorisation]()
enumeratePairingAuthorisations(with: query, transaction: transaction) { (authorisation, _) in // enumeratePairingAuthorisations(with: query, transaction: transaction) { (authorisation, _) in
authorisations.append(authorisation) // authorisations.append(authorisation)
} // }
return authorisations // return authorisations
} // }
} //}

Loading…
Cancel
Save