Skip to content
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

fix safari file not found error handling #2242

Merged
merged 2 commits into from
Feb 26, 2024
Merged

fix safari file not found error handling #2242

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
b4a9d79
fix safari file not found error handling
mallexxx Feb 22, 2024
b947533
Merge branch 'main' into alex/fix-safari-no-bookmarks-error
ayoy Feb 26, 2024
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
7 changes: 6 additions & 1 deletion DuckDuckGo/DataImport/Bookmarks/Safari/SafariBookmarksReader.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,12 @@ final class SafariBookmarksReader {
let type: OperationType
let underlyingError: Error?

var errorType: DataImport.ErrorType { .dataCorrupted }
var errorType: DataImport.ErrorType {
switch underlyingError {
case let error as CocoaError where error.code == .fileReadNoSuchFile: .noData
default: .dataCorrupted
}
}
}

private let safariBookmarksFileURL: URL
Expand Down
2 changes: 1 addition & 1 deletion DuckDuckGo/DataImport/View/DataImportView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ struct DataImportView: ModalView {

// if no data to import
if model.summary(for: dataType)?.isEmpty == true
|| model.error(for: dataType)?.errorType == .noData {
|| model.error(for: dataType)?.errorType == .noData {

DataImportNoDataView(source: model.importSource, dataType: dataType)
.padding(.bottom, 24)
Expand Down
Loading