TouchInstinct
/
LeadKit
306
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactoring

This commit is contained in:
Ivan Babkin 2018-10-26 16:48:37 +03:00
parent 50f24e82b6
commit 7fe405539e
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Sources/Enums/RequestError.swift
View File

@ -33,7 +33,7 @@ public enum RequestError: Error {
case noConnection
case network(error: Error, response: Data?)
case invalidResponse(error: AFError, response: Data)
case invalidResponse(error: AFError, response: Data?)
case mapping(error: Error, response: Data)
}

8
Sources/Extensions/Alamofire/SessionManager+Extensions.swift
View File

@ -79,11 +79,11 @@ public extension Reactive where Base: SessionManager {
private extension ObservableType {
func catchErrorAndWrap(with request: DataRequest? = nil) -> Observable<E> {
return catchError {
return catchError { error in
let resultError: RequestError
let response = request?.delegate.data
switch $0 {
switch error {
case let requestError as RequestError:
resultError = requestError
case let urlError as URLError:
@ -96,12 +96,12 @@ private extension ObservableType {
case let afError as AFError:
switch afError {
case .responseSerializationFailed, .responseValidationFailed:
resultError = .invalidResponse(error: afError, response: response ?? Data())
resultError = .invalidResponse(error: afError, response: response)
default:
resultError = .network(error: afError, response: response)
}
default:
resultError = .network(error: $0, response: response)
resultError = .network(error: error, response: response)
}
throw resultError