oxen-io/session-ios
1
0
Fork 0
mirror of https://github.com/oxen-io/session-ios.git synced 2023-12-13 21:30:14 +01:00
Code Issues Projects Releases Wiki Activity

Respond to CR.

Browse source
This commit is contained in:
Matthew Chen 2018-10-19 16:43:14 -04:00
parent 2894db0d6e
commit 553d1ac3bc
3 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Pods

@ -1 +1 @@
Subproject commit 217e71e8943e33bc683a4977ca297f431afb02c8
Subproject commit 17be5b4abbf7aa6acb63755be86bbb17cd072b78

5
SignalMessaging/profiles/ProfileFetcherJob.swift
View file

@ -144,9 +144,8 @@ public class ProfileFetcherJob: NSObject {
}, recipientId: recipientId,
unidentifiedAccess: unidentifiedAccess)
return requestMaker.makeRequest()
.then { (result: RequestMakerResult) -> Promise<SignalServiceProfile> in
let responseObject: Any? = result.responseObject
return Promise.value(try SignalServiceProfile(recipientId: recipientId, responseObject: responseObject))
.map { (result: RequestMakerResult) -> SignalServiceProfile in
try SignalServiceProfile(recipientId: recipientId, responseObject: result.responseObject)
}
}

12
SignalServiceKit/src/Messages/UD/OWSRequestMaker.swift
View file

@ -80,7 +80,7 @@ public class RequestMaker: NSObject {
default:
throw error
}
}
}
let anyPromise = AnyPromise(promise)
anyPromise.retainUntilComplete()
return anyPromise
@ -103,7 +103,7 @@ public class RequestMaker: NSObject {
if canMakeWebsocketRequests {
return Promise { resolver in
socketManager.make(request, webSocketType: webSocketType, success: { (responseObject: Any?) in
_ = resolver.fulfill(RequestMakerResult(responseObject: responseObject, wasSentByUD: isUDSend))
resolver.fulfill(RequestMakerResult(responseObject: responseObject, wasSentByUD: isUDSend))
}) { (statusCode: Int, responseData: Data?, error: Error) in
resolver.reject(RequestMakerError.websocketRequestError(statusCode: statusCode, responseData: responseData, underlyingError: error))
}
@ -126,12 +126,12 @@ public class RequestMaker: NSObject {
self.websocketFailureBlock()
Logger.info("Non-UD Web socket request failed; failing over to REST request: \(error).")
return self.makeRequestInternal(skipUD: skipUD, skipWebsocket: true)
}
}
} else {
return self.networkManager.makePromise(request: request)
.then { (networkManagerResult: TSNetworkManager.NetworkManagerResult) -> Promise<RequestMakerResult> in
.map { (networkManagerResult: TSNetworkManager.NetworkManagerResult) -> RequestMakerResult in
// Unwrap the network manager promise into a request maker promise.
return Promise.value(RequestMakerResult(responseObject: networkManagerResult.responseObject, wasSentByUD: isUDSend))
RequestMakerResult(responseObject: networkManagerResult.responseObject, wasSentByUD: isUDSend)
}.recover { (error: Error) -> Promise<RequestMakerResult> in
switch error {
case NetworkManagerError.taskError(let task, _):
@ -151,7 +151,7 @@ public class RequestMaker: NSObject {
Logger.debug("Non-UD REST request failed: \(error).")
throw error
}
}
}
}
}