From 7d4c8e52943e64d9e49fab85d04578ddbd938bb0 Mon Sep 17 00:00:00 2001 From: Vlad Date: Thu, 10 Sep 2020 12:37:35 +0300 Subject: [PATCH 1/3] Fix no connection error handling --- .../Alamofire/DataRequest+Extensions.swift | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Sources/Extensions/Alamofire/DataRequest+Extensions.swift b/Sources/Extensions/Alamofire/DataRequest+Extensions.swift index 64ab85d3..68048fe4 100644 --- a/Sources/Extensions/Alamofire/DataRequest+Extensions.swift +++ b/Sources/Extensions/Alamofire/DataRequest+Extensions.swift @@ -123,17 +123,17 @@ private extension ObservableType { case let requestError as RequestError: resultError = requestError - case let urlError as URLError: - switch urlError.code { - case .notConnectedToInternet: - resultError = .noConnection - - default: - resultError = .network(error: urlError, response: response) - } - case let afError as AFError: switch afError { + case let .sessionTaskFailed(error): + switch error { + case let urlError as URLError where urlError.code == .notConnectedToInternet: + resultError = .noConnection + + default: + resultError = .network(error: error, response: response) + } + case .responseSerializationFailed, .responseValidationFailed: resultError = .invalidResponse(error: afError, response: response) From 32c711823ba257ecef38a60b5a63b3f656bc5565 Mon Sep 17 00:00:00 2001 From: Vlad Date: Thu, 10 Sep 2020 12:42:01 +0300 Subject: [PATCH 2/3] Up version --- CHANGELOG.md | 3 +++ LeadKit.podspec | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 95b7505d..62230368 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ # Changelog +### 0.10.4 +- **Fix**: `noConnection` error. + ### 0.10.3 - **Fix**: `mappingQueue` of `SessionManager`. diff --git a/LeadKit.podspec b/LeadKit.podspec index 02549dca..0dc11137 100644 --- a/LeadKit.podspec +++ b/LeadKit.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "LeadKit" - s.version = "0.10.3" + s.version = "0.10.4" s.summary = "iOS framework with a bunch of tools for rapid development" s.homepage = "https://github.com/TouchInstinct/LeadKit" s.license = "Apache License, Version 2.0" From 9a9ebcb627588a2dede7e371e99c93113582dc59 Mon Sep 17 00:00:00 2001 From: Vlad Date: Thu, 10 Sep 2020 12:44:23 +0300 Subject: [PATCH 3/3] Code correction --- .../Extensions/Alamofire/DataRequest+Extensions.swift | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Sources/Extensions/Alamofire/DataRequest+Extensions.swift b/Sources/Extensions/Alamofire/DataRequest+Extensions.swift index 68048fe4..4ecf988f 100644 --- a/Sources/Extensions/Alamofire/DataRequest+Extensions.swift +++ b/Sources/Extensions/Alamofire/DataRequest+Extensions.swift @@ -123,6 +123,15 @@ private extension ObservableType { case let requestError as RequestError: resultError = requestError + case let urlError as URLError: + switch urlError.code { + case .notConnectedToInternet: + resultError = .noConnection + + default: + resultError = .network(error: urlError, response: response) + } + case let afError as AFError: switch afError { case let .sessionTaskFailed(error):