keejef
/
session-ios
mirror of https://github.com/oxen-io/session-ios
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Respond to CR.

Browse Source
pull/1/head
Matthew Chen 7 years ago
parent 2894db0d6e
commit 553d1ac3bc
3 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File

2
Pods

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

5
SignalMessaging/profiles/ProfileFetcherJob.swift
Unescape Escape View File

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

6
SignalServiceKit/src/Messages/UD/OWSRequestMaker.swift
Unescape Escape View File

@ -103,7 +103,7 @@ public class RequestMaker: NSObject {
if canMakeWebsocketRequests { if canMakeWebsocketRequests {
return Promise { resolver in return Promise { resolver in
socketManager.make(request, webSocketType: webSocketType, success: { (responseObject: Any?) 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 }) { (statusCode: Int, responseData: Data?, error: Error) in
resolver.reject(RequestMakerError.websocketRequestError(statusCode: statusCode, responseData: responseData, underlyingError: error)) resolver.reject(RequestMakerError.websocketRequestError(statusCode: statusCode, responseData: responseData, underlyingError: error))
} }
@ -129,9 +129,9 @@ public class RequestMaker: NSObject {
} }
} else { } else {
return self.networkManager.makePromise(request: request) 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. // 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 }.recover { (error: Error) -> Promise<RequestMakerResult> in
switch error { switch error {
case NetworkManagerError.taskError(let task, _): case NetworkManagerError.taskError(let task, _):

Write Preview
Loading…
Cancel
Save