kiwix/kiwix-apple
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-apple.git synced 2025-09-24 04:03:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #896 from kiwix/895-wkurlschemehandler-crash

Browse Source 
WebKitHandler concurrency fix
This commit is contained in:
Kelson 2024-08-02 11:55:31 +02:00 committed by GitHub
commit 9f441b7c38
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 21 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
Model/Utilities/WebKitHandler.swift
View File

@ -25,50 +25,45 @@ import WebKit
/// until WebKit behavior is changed.
final class KiwixURLSchemeHandler: NSObject, WKURLSchemeHandler {
static let KiwixScheme = "kiwix"
private let inSync = InSync(label: "org.kiwix.url.scheme.sync")
private var startedTasks: [Int: Bool] = [:]
@MainActor private var startedTasks: [Int: Bool] = [:]
// MARK: Life cycle
private func startFor(_ hashValue: Int) async {
await withCheckedContinuation { continuation in
inSync.execute {
self.startedTasks[hashValue] = true
continuation.resume()
}
}
@MainActor
private func startFor(_ hashValue: Int) {
startedTasks[hashValue] = true
}
@MainActor
private func isStartedFor(_ hashValue: Int) -> Bool {
return inSync.read {
self.startedTasks[hashValue] != nil
}
startedTasks[hashValue] != nil
}
@MainActor
private func stopFor(_ hashValue: Int) {
inSync.execute {
self.startedTasks.removeValue(forKey: hashValue)
}
startedTasks.removeValue(forKey: hashValue)
}
@MainActor
private func stopAll() {
inSync.execute {
self.startedTasks.removeAll()
}
startedTasks.removeAll()
}
@MainActor
func webView(_ webView: WKWebView, stop urlSchemeTask: WKURLSchemeTask) {
stopFor(urlSchemeTask.hash)
}
@MainActor
func didFailProvisionalNavigation() {
stopAll()
}
@MainActor
func webView(_ webView: WKWebView, start urlSchemeTask: WKURLSchemeTask) {
guard isStartedFor(urlSchemeTask.hash) == false else { return }
Task {
await startFor(urlSchemeTask.hash)
startFor(urlSchemeTask.hash)
Task { @MainActor in
await handle(task: urlSchemeTask)
}
}

2
ViewModel/BrowserViewModel.swift
View File

@ -397,10 +397,12 @@ final class BrowserViewModel: NSObject, ObservableObject,
withError error: Error
) {
let error = error as NSError
Task { @MainActor in
webView.stopLoading()
(webView.configuration
.urlSchemeHandler(forURLScheme: KiwixURLSchemeHandler.KiwixScheme) as? KiwixURLSchemeHandler)?
.didFailProvisionalNavigation()
}
guard error.code != NSURLErrorCancelled else { return }
guard canShowMimeType else {
guard let kiwixURL = error.userInfo[NSURLErrorFailingURLErrorKey] as? URL else {