Merge branch 'charlesmchen/disableCDS'
This commit is contained in:
commit
122e138f07
@ -7,6 +7,8 @@ import Foundation
|
||||
@objc(OWSLegacyContactDiscoveryOperation)
|
||||
class LegacyContactDiscoveryBatchOperation: OWSOperation {
|
||||
|
||||
private let isCDSEnabled = false
|
||||
|
||||
@objc
|
||||
var registeredRecipientIds: Set<String>
|
||||
|
||||
@ -83,6 +85,9 @@ class LegacyContactDiscoveryBatchOperation: OWSOperation {
|
||||
|
||||
// Called at most one time.
|
||||
override func didSucceed() {
|
||||
guard isCDSEnabled else {
|
||||
return
|
||||
}
|
||||
// Compare against new CDS service
|
||||
let modernCDSOperation = CDSOperation(recipientIdsToLookup: self.recipientIdsToLookup)
|
||||
let cdsFeedbackOperation = CDSFeedbackOperation(legacyRegisteredRecipientIds: self.registeredRecipientIds)
|
||||
@ -362,7 +367,7 @@ class CDSBatchOperation: OWSOperation {
|
||||
}
|
||||
|
||||
class func boolArray(data: Data) -> [Bool]? {
|
||||
var bools: [Bool]? = nil
|
||||
var bools: [Bool]?
|
||||
data.withUnsafeBytes { (bytes: UnsafePointer<Bool>) -> Void in
|
||||
let buffer = UnsafeBufferPointer(start: bytes, count: data.count)
|
||||
bools = Array(buffer)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user