Skip to content

Fixed main thread checker errors. #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MussaCharles wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixed main thread checker errors. #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added .DS_Store
View file
Open in desktop
Binary file not shown.
7 changes: 7 additions & 0 deletions .swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

50 changes: 31 additions & 19 deletions WKCookieWebView/WKCookieWebView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,17 +97,20 @@ open class WKCookieWebView: WKWebView {

let httpCookies = HTTPCookieStorage.shared.cookies(for: url)

configuration.websiteDataStore.httpCookieStore.getAllCookies { [weak self] (cookies) in
let wkCookies = cookies.filter { host.range(of: $0.domain) != nil || $0.domain.range(of: host) != nil }
for wkCookie in wkCookies {
httpCookies?
.filter { $0.name == wkCookie.name }
.forEach { HTTPCookieStorage.shared.deleteCookie($0) }
DispatchQueue.main.async { [weak self] in
guard let self else {return}
self.configuration.websiteDataStore.httpCookieStore.getAllCookies { [weak self] (cookies) in
let wkCookies = cookies.filter { host.range(of: $0.domain) != nil || $0.domain.range(of: host) != nil }
for wkCookie in wkCookies {
httpCookies?
.filter { $0.name == wkCookie.name }
.forEach { HTTPCookieStorage.shared.deleteCookie($0) }

HTTPCookieStorage.shared.setCookie(wkCookie)
}

HTTPCookieStorage.shared.setCookie(wkCookie)
self.flatMap { $0.onUpdateCookieStorage?($0) }
}

self.flatMap { $0.onUpdateCookieStorage?($0) }
}
}

Expand Down Expand Up @@ -143,7 +146,10 @@ extension WKCookieWebView {
set(httpCookieStorage: cookie)

if #available(iOS 11.0, *) {
configuration.websiteDataStore.httpCookieStore.setCookie(cookie, completionHandler: completion)
DispatchQueue.main.async { [weak self] in
guard let self else {return}
self.configuration.websiteDataStore.httpCookieStore.setCookie(cookie, completionHandler: completion)
}
} else {
completion?()
}
Expand All @@ -157,7 +163,10 @@ extension WKCookieWebView {
HTTPCookieStorage.shared.deleteCookie(cookie)

if #available(iOS 11.0, *) {
configuration.websiteDataStore.httpCookieStore.delete(cookie, completionHandler: completion)
DispatchQueue.main.async { [weak self] in
guard let self else {return}
self.configuration.websiteDataStore.httpCookieStore.delete(cookie, completionHandler: completion)
}
} else {
completion?()
}
Expand Down Expand Up @@ -239,16 +248,19 @@ extension WKCookieWebView: WKNavigationDelegate {
var disposition: URLSession.AuthChallengeDisposition = .performDefaultHandling
var credential: URLCredential?

if challenge.protectionSpace.authenticationMethod == NSURLAuthenticationMethodServerTrust {
if let serverTrust = challenge.protectionSpace.serverTrust {
credential = URLCredential(trust: serverTrust)
disposition = .useCredential
DispatchQueue.global(qos: .default).async { [weak webView] in
guard webView != nil else {return}
if challenge.protectionSpace.authenticationMethod == NSURLAuthenticationMethodServerTrust {
if let serverTrust = challenge.protectionSpace.serverTrust {
credential = URLCredential(trust: serverTrust)
disposition = .useCredential
}
} else {
disposition = .cancelAuthenticationChallenge
}
} else {
disposition = .cancelAuthenticationChallenge
completionHandler(disposition, credential)
}

completionHandler(disposition, credential)
}

@available(iOS 9.0, *)
Expand Down