Skip to content

fix(ios): mitigation measure for directory reset issue #885

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

Merged
ACTCD merged 2 commits into from
Nov 29, 2025
Merged

fix(ios): mitigation measure for directory reset issue #885

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
77a0ec8
chore: do not use localized description for logger
ACTCD Nov 29, 2025
57467c9
fix(ios): not remove bookmark while resolve fails
ACTCD Nov 29, 2025
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
2 changes: 1 addition & 1 deletion xcode/App-Mac/ViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ class ViewController: NSViewController {
guard let state = state else {
self.enabledText.stringValue = "Safari Extension State Unknown"
if let error = error {
logger?.error("\(#function, privacy: .public) - \(error.localizedDescription, privacy: .public)")
logger?.error("\(#function, privacy: .public) - \(error, privacy: .public)")
} else {
logger?.error("\(#function, privacy: .public) - couldn't get safari extension state in containing app")
}
Expand Down
6 changes: 3 additions & 3 deletions xcode/App-Shared/ViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ class ViewController: PlatformViewController, WKNavigationDelegate, WKScriptMess
self.extensionState = state.isEnabled ? .on : .off
} catch {
self.extensionState = .error
logger?.error("\(#function, privacy: .public) - \(error.localizedDescription, privacy: .public)")
logger?.error("\(#function, privacy: .public) - \(error, privacy: .public)")
}
if #available(macOS 13, *) {
useSettingsInsteadOfPreferences = true
Expand Down Expand Up @@ -193,7 +193,7 @@ class ViewController: PlatformViewController, WKNavigationDelegate, WKScriptMess
do {
try await SFSafariApplication.showPreferencesForExtension(withIdentifier: extIdentifier)
} catch {
logger?.error("\(#function, privacy: .public) - \(error.localizedDescription, privacy: .public)")
logger?.error("\(#function, privacy: .public) - \(error, privacy: .public)")
return (nil, error.localizedDescription)
}
break
Expand Down Expand Up @@ -344,7 +344,7 @@ extension ViewController {
} else {
status = .error
if let error = error {
logger?.error("\(#function, privacy: .public) - \(error.localizedDescription, privacy: .public)")
logger?.error("\(#function, privacy: .public) - \(error, privacy: .public)")
} else {
logger?.error("\(#function, privacy: .public) - couldn't get safari extension state in containing app")
}
Expand Down
14 changes: 7 additions & 7 deletions xcode/Ext-Safari/Functions.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ func updateManifest(with data: Manifest) -> Bool {
try fileContent.write(to: url, atomically: false, encoding: .utf8)
return true
} catch {
logger?.error("\(#function, privacy: .public) - failed to update manifest: \(error.localizedDescription, privacy: .public)")
logger?.error("\(#function, privacy: .public) - failed to update manifest: \(error, privacy: .public)")
return false
}
}
Expand Down Expand Up @@ -742,7 +742,7 @@ func getRequiredCode(_ filename: String, _ resources: [String], _ fileType: Stri
do {
try FileManager.default.removeItem(at: directory)
} catch {
logger?.error("\(#function, privacy: .public) - failed to remove directory: \(error.localizedDescription, privacy: .public)")
logger?.error("\(#function, privacy: .public) - failed to remove directory: \(error, privacy: .public)")
}
}
return true
Expand Down Expand Up @@ -796,11 +796,11 @@ func getRequiredCode(_ filename: String, _ resources: [String], _ fileType: Stri
try FileManager.default.removeItem(at: abandonFileUrl)
logger?.info("\(#function, privacy: .public) - cleanup abandoned resource: \(unsanitize(abandonFileUrl.lastPathComponent), privacy: .public)")
} catch {
logger?.error("\(#function, privacy: .public) - failed to remove abandoned resource: \(error.localizedDescription, privacy: .public)")
logger?.error("\(#function, privacy: .public) - failed to remove abandoned resource: \(error, privacy: .public)")
}
}
} catch {
logger?.error("\(#function, privacy: .public) - failed to cleanup resources: \(error.localizedDescription, privacy: .public)")
logger?.error("\(#function, privacy: .public) - failed to cleanup resources: \(error, privacy: .public)")
}
return true
}
Expand Down Expand Up @@ -877,7 +877,7 @@ func getRemoteFileContents(_ url: String) -> String? {
}
}
if let error = error {
logger?.error("\(#function, privacy: .public) - task error: \(error.localizedDescription, privacy: .public) (\(url, privacy: .public))")
logger?.error("\(#function, privacy: .public) - task error: \(error, privacy: .public) (\(url, privacy: .public))")
}
semaphore.signal()
}
Expand Down Expand Up @@ -984,7 +984,7 @@ func checkDefaultDirectories() -> Bool {
try FileManager.default.createDirectory(at: url, withIntermediateDirectories: false)
} catch {
// could not create the save location directory, show error
logger?.error("\(#function, privacy: .public) - failed at (1) - \(url, privacy: .public) - \(error.localizedDescription, privacy: .public)")
logger?.error("\(#function, privacy: .public) - failed at (1) - \(url, privacy: .public) - \(error, privacy: .public)")
return false
}
}
Expand Down Expand Up @@ -1763,7 +1763,7 @@ func trashFile(_ item: [String: Any]) -> Bool {
do {
try FileManager.default.trashItem(at: url, resultingItemURL: nil)
} catch {
logger?.error("\(#function, privacy: .public) - \(error.localizedDescription, privacy: .public)")
logger?.error("\(#function, privacy: .public) - \(error, privacy: .public)")
return false
}
}
Expand Down
12 changes: 7 additions & 5 deletions xcode/Shared/Preferences.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ private struct SecurityScopedBookmark {
relativeTo: nil
)
} catch {
logger?.error("\(#function, privacy: .public) - \(error.localizedDescription, privacy: .public)")
logger?.error("\(#function, privacy: .public) - \(error, privacy: .public)")
}
return nil
}
Expand All @@ -74,7 +74,7 @@ private struct SecurityScopedBookmark {
bookmarkDataIsStale: &isStale
)
} catch {
logger?.error("\(#function, privacy: .public) - \(error.localizedDescription, privacy: .public)")
logger?.error("\(#function, privacy: .public) - \(error, privacy: .public)")
}
return nil
}
Expand Down Expand Up @@ -202,7 +202,7 @@ private struct SecurityScopedBookmark {
do {
return try url.bookmarkData(options: .minimalBookmark, includingResourceValuesForKeys: nil, relativeTo: nil)
} catch {
logger?.error("\(#function, privacy: .public) - \(error.localizedDescription, privacy: .public)")
logger?.error("\(#function, privacy: .public) - \(error, privacy: .public)")
}
return nil
}
Expand All @@ -211,7 +211,7 @@ private struct SecurityScopedBookmark {
do {
return try URL(resolvingBookmarkData: data, bookmarkDataIsStale: &isStale)
} catch {
logger?.error("\(#function, privacy: .public) - \(error.localizedDescription, privacy: .public)")
logger?.error("\(#function, privacy: .public) - \(error, privacy: .public)")
}
return nil
}
Expand All @@ -237,7 +237,9 @@ private struct SecurityScopedBookmark {
}
var isStale = false
guard let url = resolvBookmark(data, &isStale) else { // get security-scoped URL
SDefaults?.removeObject(forKey: key) // remove data that cannot be resolved
// Note: temporary mitigation measures for occasional failures on some iOS devices
// SDefaults?.removeObject(forKey: key) // remove data that cannot be resolved
logger?.warning("\(#function, privacy: .public) - faild resolv bookmark, return default")
return defaultValue
}
if isStale, url.startAccessingSecurityScopedResource() { // renew URL bookmark
Expand Down