renun/NetNewsWire
1
0
Fork 0
mirror of https://github.com/Ranchero-Software/NetNewsWire synced 2025-08-12 06:26:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixes ArticleTheme Import on SwiftUI

Browse Source 
Adds startAccessingSecurityScopedResource and stopAccessingSecurityScopedResource to `.fileImporter`s.
This commit is contained in:
Stuart Breckenridge
2022-12-21 12:31:54 +08:00
parent 1a1f86febd
commit 31768eb274
3 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Shared/Importers/NNWThemeDocument.swift
View File

@@ -7,7 +7,6 @@
//
import SwiftUI
import Account
import UniformTypeIdentifiers
public struct NNWThemeDocument: FileDocument {
@@ -21,7 +20,10 @@ public struct NNWThemeDocument: FileDocument {
}
public init(configuration: ReadConfiguration) throws {
guard let _ = configuration.file.regularFileContents else {
throw CocoaError(.fileReadCorruptFile)
}
return
}
public func fileWrapper(configuration: WriteConfiguration) throws -> FileWrapper {

8
iOS/Settings/Appearance/ArticleThemeManagerView.swift
View File

@@ -44,8 +44,12 @@ struct ArticleThemeManagerView: View {
switch result {
case .success(let success):
do {
let theme = try ArticleTheme(path: success.path, isAppTheme: false)
showImportConfirmationAlert = (theme, true)
let url = URL(fileURLWithPath: success.path)
if url.startAccessingSecurityScopedResource() {
let theme = try ArticleTheme(path: success.path, isAppTheme: false)
showImportConfirmationAlert = (theme, true)
url.stopAccessingSecurityScopedResource()
}
} catch {
showImportErrorAlert = (error, true)
}

18
iOS/Settings/General/SettingsView.swift
View File

@@ -117,13 +117,17 @@ struct SettingsView: View {
.fileImporter(isPresented: $viewModel.showImportView, allowedContentTypes: OPMLDocument.readableContentTypes) { result in
switch result {
case .success(let url):
viewModel.importAccount!.importOPML(url) { importResult in
switch importResult {
case .success(_):
viewModel.showImportSuccess = true
case .failure(let error):
viewModel.importExportError = error
viewModel.showImportExportError = true
if url.startAccessingSecurityScopedResource() {
viewModel.importAccount!.importOPML(url) { importResult in
switch importResult {
case .success(_):
viewModel.showImportSuccess = true
url.stopAccessingSecurityScopedResource()
case .failure(let error):
viewModel.importExportError = error
viewModel.showImportExportError = true
url.stopAccessingSecurityScopedResource()
}
}
}
case .failure(let error):