X-Git-Url: https://git.saurik.com/apple/security.git/blobdiff_plain/d64be36ead0ce792f249208635bc8db368d6cdd2..02b2aca600d4a0fe6fb259262bd6808ef889acde:/keychain/TrustedPeersHelper/Container.swift diff --git a/keychain/TrustedPeersHelper/Container.swift b/keychain/TrustedPeersHelper/Container.swift index cd3b61e7..86f29eec 100644 --- a/keychain/TrustedPeersHelper/Container.swift +++ b/keychain/TrustedPeersHelper/Container.swift @@ -2558,8 +2558,15 @@ class Container: NSObject { reply(cachedBottles.viableBottles, cachedBottles.partialBottles, nil) return } - - self.cuttlefish.fetchViableBottles { response, error in + + let request = FetchViableBottlesRequest.with { + $0.filterRequest = OctagonPlatformSupportsSOS() ? .unknown : .byOctagonOnly + } + if request.filterRequest == .byOctagonOnly { + os_log("Requesting Cuttlefish sort records by Octagon Only", log: tplogDebug, type: .default) + } + + self.cuttlefish.fetchViableBottles(request) { response, error in guard error == nil else { os_log("fetchViableBottles failed: %{public}@", log: tplogDebug, type: .default, (error as CVarArg?) ?? "no error") reply(nil, nil, error) @@ -2662,7 +2669,14 @@ class Container: NSObject { return } - self.cuttlefish.fetchViableBottles { response, error in + let request = FetchViableBottlesRequest.with { + $0.filterRequest = OctagonPlatformSupportsSOS() ? .unknown : .byOctagonOnly + } + if request.filterRequest == .byOctagonOnly { + os_log("Requesting Cuttlefish sort records by Octagon Only", log: tplogDebug, type: .default) + } + + self.cuttlefish.fetchViableBottles(request) { response, error in guard error == nil else { os_log("fetchViableBottles failed: %{public}@", log: tplogDebug, type: .default, (error as CVarArg?) ?? "no error") reply(nil, error)