From 1850366709c7e09233a17e9eb74902aac5c26549 Mon Sep 17 00:00:00 2001 From: krasich74 Date: Mon, 29 Jun 2020 12:57:53 +0300 Subject: [PATCH] Fixed Alamofire precondition --- Sources/Classes/Services/SessionManager.swift | 20 +++++++++++++++---- .../NetworkServiceConfiguration.swift | 3 ++- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/Sources/Classes/Services/SessionManager.swift b/Sources/Classes/Services/SessionManager.swift index 358000f3..ea28770f 100644 --- a/Sources/Classes/Services/SessionManager.swift +++ b/Sources/Classes/Services/SessionManager.swift @@ -45,11 +45,19 @@ open class SessionManager: Alamofire.Session { self.acceptableStatusCodes = acceptableStatusCodes self.mappingQueue = mappingQueue - let session = URLSession(configuration: configuration) + let delegate = SessionDelegate() + + let delegateQueue = OperationQueue() + + let queue = DispatchQueue(label: "org.alamofire.session.rootQueue") + + delegateQueue.underlyingQueue = queue + + let session = URLSession(configuration: configuration, delegate: delegate, delegateQueue: delegateQueue) super.init(session: session, - delegate: SessionDelegate(), - rootQueue: DispatchQueue(label: "org.alamofire.session.rootQueue"), + delegate: delegate, + rootQueue: queue, serverTrustManager: serverTrustManager) } @@ -61,10 +69,14 @@ open class SessionManager: Alamofire.Session { self.acceptableStatusCodes = acceptableStatusCodes self.mappingQueue = mappingQueue + + let queue = DispatchQueue(label: "org.alamofire.session.rootQueue") + + session.delegateQueue.underlyingQueue = queue super.init(session: session, delegate: delegate, - rootQueue: DispatchQueue(label: "org.alamofire.session.rootQueue"), + rootQueue: queue, serverTrustManager: serverTrustManager) } } diff --git a/Sources/Structures/NetworkService/NetworkServiceConfiguration.swift b/Sources/Structures/NetworkService/NetworkServiceConfiguration.swift index 68699f83..fc817739 100644 --- a/Sources/Structures/NetworkService/NetworkServiceConfiguration.swift +++ b/Sources/Structures/NetworkService/NetworkServiceConfiguration.swift @@ -61,7 +61,8 @@ public struct NetworkServiceConfiguration { sessionConfiguration.httpAdditionalHeaders = additionalHttpHeaders let updatedPolicies = Dictionary(uniqueKeysWithValues: trustPolicies.map { ($0.key.asHost, $0.value) }) - serverTrustPolicies = trustPolicies.isEmpty ? [baseUrl.asHost: DisabledTrustEvaluator()] : updatedPolicies + print(baseUrl.asHost) + serverTrustPolicies = trustPolicies.isEmpty ? ["touchin.ru": DisabledTrustEvaluator()] : updatedPolicies } }