Remove some usage of throwswrapped_ in udmanager since we don't need to

propogate the wrapped exception anyway.
pull/1/head
Michael Kirk 6 years ago
parent 3d9cd4f4ed
commit 1dea927a3f

@ -479,7 +479,7 @@ NSString *const OWSMessageSenderRateLimitedException = @"RateLimitedException";
failure:(RetryableFailureHandler)failure failure:(RetryableFailureHandler)failure
{ {
[self.udManager [self.udManager
throwswrapped_ensureSenderCertificateWithSuccess:^(SMKSenderCertificate *senderCertificate) { ensureSenderCertificateWithSuccess:^(SMKSenderCertificate *senderCertificate) {
dispatch_async([OWSDispatch sendingQueue], ^{ dispatch_async([OWSDispatch sendingQueue], ^{
[self sendMessageToService:message senderCertificate:senderCertificate success:success failure:failure]; [self sendMessageToService:message senderCertificate:senderCertificate success:success failure:failure];
}); });

@ -65,8 +65,8 @@ private func string(forUnidentifiedAccessMode mode: UnidentifiedAccessMode) -> S
// We use completion handlers instead of a promise so that message sending // We use completion handlers instead of a promise so that message sending
// logic can access the strongly typed certificate data. // logic can access the strongly typed certificate data.
@objc @objc
func throwswrapped_ensureSenderCertificate(success:@escaping (SMKSenderCertificate) -> Void, func ensureSenderCertificate(success:@escaping (SMKSenderCertificate) -> Void,
failure:@escaping (Error) -> Void) failure:@escaping (Error) -> Void)
// MARK: Unrestricted Access // MARK: Unrestricted Access
@ -111,7 +111,7 @@ public class OWSUDManagerImpl: NSObject, OWSUDManager {
} }
// Any error is silently ignored on startup. // Any error is silently ignored on startup.
self.throwswrapped_ensureSenderCertificate().retainUntilComplete() self.ensureSenderCertificate().retainUntilComplete()
} }
NotificationCenter.default.addObserver(self, NotificationCenter.default.addObserver(self,
selector: #selector(registrationStateDidChange), selector: #selector(registrationStateDidChange),
@ -124,7 +124,7 @@ public class OWSUDManagerImpl: NSObject, OWSUDManager {
AssertIsOnMainThread() AssertIsOnMainThread()
// Any error is silently ignored // Any error is silently ignored
throwswrapped_ensureSenderCertificate().retainUntilComplete() ensureSenderCertificate().retainUntilComplete()
} }
// MARK: - // MARK: -
@ -266,12 +266,12 @@ public class OWSUDManagerImpl: NSObject, OWSUDManager {
#if DEBUG #if DEBUG
@objc @objc
public func throwswrapped_hasSenderCertificate() -> Bool { public func hasSenderCertificate() -> Bool {
return throwswrapped_senderCertificate() != nil return senderCertificate() != nil
} }
#endif #endif
private func throwswrapped_senderCertificate() -> SMKSenderCertificate? { private func senderCertificate() -> SMKSenderCertificate? {
guard let certificateData = dbConnection.object(forKey: senderCertificateKey(), inCollection: kUDCollection) as? Data else { guard let certificateData = dbConnection.object(forKey: senderCertificateKey(), inCollection: kUDCollection) as? Data else {
return nil return nil
} }
@ -279,7 +279,7 @@ public class OWSUDManagerImpl: NSObject, OWSUDManager {
do { do {
let certificate = try SMKSenderCertificate.parse(data: certificateData) let certificate = try SMKSenderCertificate.parse(data: certificateData)
guard throwswrapped_isValidCertificate(certificate) else { guard isValidCertificate(certificate) else {
Logger.warn("Current sender certificate is not valid.") Logger.warn("Current sender certificate is not valid.")
return nil return nil
} }
@ -300,10 +300,10 @@ public class OWSUDManagerImpl: NSObject, OWSUDManager {
} }
@objc @objc
public func throwswrapped_ensureSenderCertificate(success:@escaping (SMKSenderCertificate) -> Void, public func ensureSenderCertificate(success:@escaping (SMKSenderCertificate) -> Void,
failure:@escaping (Error) -> Void) { failure:@escaping (Error) -> Void) {
firstly { firstly {
throwswrapped_ensureSenderCertificate() ensureSenderCertificate()
}.map { certificate in }.map { certificate in
success(certificate) success(certificate)
}.catch { error in }.catch { error in
@ -311,15 +311,15 @@ public class OWSUDManagerImpl: NSObject, OWSUDManager {
}.retainUntilComplete() }.retainUntilComplete()
} }
public func throwswrapped_ensureSenderCertificate() -> Promise<SMKSenderCertificate> { public func ensureSenderCertificate() -> Promise<SMKSenderCertificate> {
// If there is a valid cached sender certificate, use that. // If there is a valid cached sender certificate, use that.
if let certificate = throwswrapped_senderCertificate() { if let certificate = senderCertificate() {
return Promise.value(certificate) return Promise.value(certificate)
} }
// Try to obtain a new sender certificate. // Try to obtain a new sender certificate.
return firstly { return firstly {
throwswrapped_requestSenderCertificate() requestSenderCertificate()
}.map { (certificateData: Data, certificate: SMKSenderCertificate) in }.map { (certificateData: Data, certificate: SMKSenderCertificate) in
// Cache the current sender certificate. // Cache the current sender certificate.
@ -329,13 +329,13 @@ public class OWSUDManagerImpl: NSObject, OWSUDManager {
} }
} }
private func throwswrapped_requestSenderCertificate() -> Promise<(certificateData: Data, certificate: SMKSenderCertificate)> { private func requestSenderCertificate() -> Promise<(certificateData: Data, certificate: SMKSenderCertificate)> {
return firstly { return firstly {
SignalServiceRestClient().requestUDSenderCertificate() SignalServiceRestClient().requestUDSenderCertificate()
}.map { certificateData -> (certificateData: Data, certificate: SMKSenderCertificate) in }.map { certificateData -> (certificateData: Data, certificate: SMKSenderCertificate) in
let certificate = try SMKSenderCertificate.parse(data: certificateData) let certificate = try SMKSenderCertificate.parse(data: certificateData)
guard self.throwswrapped_isValidCertificate(certificate) else { guard self.isValidCertificate(certificate) else {
throw OWSUDError.invalidData(description: "Invalid sender certificate returned by server") throw OWSUDError.invalidData(description: "Invalid sender certificate returned by server")
} }
@ -343,7 +343,7 @@ public class OWSUDManagerImpl: NSObject, OWSUDManager {
} }
} }
private func throwswrapped_isValidCertificate(_ certificate: SMKSenderCertificate) -> Bool { private func isValidCertificate(_ certificate: SMKSenderCertificate) -> Bool {
// Ensure that the certificate will not expire in the next hour. // Ensure that the certificate will not expire in the next hour.
// We want a threshold long enough to ensure that any outgoing message // We want a threshold long enough to ensure that any outgoing message
// sends will complete before the expiration. // sends will complete before the expiration.

Loading…
Cancel
Save