Always call startAccessingSecurityScopedResource()

Should fix #7
ColdGrub1384 · Nov 21, 2018 · 35710f5 · 35710f5
1 parent ddf5410
commit 35710f5
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 7 deletions.
diff --git a/Pisth.xcworkspace/xcshareddata/xcschemes/Pisth.xcscheme b/Pisth.xcworkspace/xcshareddata/xcschemes/Pisth.xcscheme
@@ -42,7 +42,7 @@
       </AdditionalOptions>
    </TestAction>
    <LaunchAction
-      buildConfiguration = "Debug"
+      buildConfiguration = "Release"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"

diff --git a/Pisth/Info.plist b/Pisth/Info.plist
@@ -2,8 +2,6 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>NSPhotoLibraryUsageDescription</key>
-	<string>This app requires access to the Photo Library for saving downloaded photos.</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>$(DEVELOPMENT_LANGUAGE)</string>
 	<key>CFBundleDocumentTypes</key>
@@ -97,7 +95,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>3</string>
+	<string>5</string>
 	<key>Is Beta</key>
 	<string>$(IS_BETA)</string>
 	<key>LSApplicationQueriesSchemes</key>
@@ -113,6 +111,8 @@
 	</dict>
 	<key>NSFaceIDUsageDescription</key>
 	<string>This app requires Face ID permission to authenticate using Face recognition.</string>
+	<key>NSPhotoLibraryUsageDescription</key>
+	<string>This app requires access to the Photo Library for saving downloaded photos.</string>
 	<key>NSUserActivityTypes</key>
 	<array>
 		<string>ch.marcela.ada.Pisth.openDirectory</string>

diff --git a/Pisth/ViewControllers/Classes/DirectoryCollectionViewController.swift b/Pisth/ViewControllers/Classes/DirectoryCollectionViewController.swift
@@ -1495,7 +1495,7 @@ class DirectoryCollectionViewController: UICollectionViewController, LocalDirect
 
     func documentPicker(_ controller: UIDocumentPickerViewController, didPickDocumentsAt urls: [URL]) {
 
-        if urls.count == 1 {
+        if urls.count == 1 && urls[0].startAccessingSecurityScopedResource() {
             documentPicker(controller, didPickDocumentAt: urls[0])
             return
         }

diff --git a/Pisth/ViewControllers/Classes/LocalDirectoryCollectionViewController.swift b/Pisth/ViewControllers/Classes/LocalDirectoryCollectionViewController.swift
@@ -617,6 +617,7 @@ class LocalDirectoryCollectionViewController: UICollectionViewController, UIDocu
 
     func documentPicker(_ controller: UIDocumentPickerViewController, didPickDocumentsAt urls: [URL]) {
         for url in urls {
+            _ = urls[0].startAccessingSecurityScopedResource()
             do {
                 try FileManager.default.copyItem(atPath: url.path, toPath: directory.appendingPathComponent(url.lastPathComponent).path)
                 reload()

diff --git a/Pisth/ViewControllers/Classes/PisthConnectionInformationViewTableViewController.swift b/Pisth/ViewControllers/Classes/PisthConnectionInformationViewTableViewController.swift
@@ -12,8 +12,8 @@ import MobileCoreServices
 /// `ConnectionInformationTableViewController` that can import keys pair.
 class PisthConnectionInformationTableViewController: ConnectionInformationTableViewController, UIDocumentPickerDelegate, Storyboard {
 
-    private let publicKeyPicker = UIDocumentPickerViewController(documentTypes: [kUTTypeData as String], in: .open)
-    private let privateKeyPicker = UIDocumentPickerViewController(documentTypes: [kUTTypeData as String], in: .open)
+    private let publicKeyPicker = UIDocumentPickerViewController(documentTypes: [kUTTypeItem as String], in: .open)
+    private let privateKeyPicker = UIDocumentPickerViewController(documentTypes: [kUTTypeItem as String], in: .open)
 
     override var isUsernameRequired: Bool {
         return false
@@ -103,6 +103,9 @@ class PisthConnectionInformationTableViewController: ConnectionInformationTableV
     // MARK: - Document picker delegate
 
     func documentPicker(_ controller: UIDocumentPickerViewController, didPickDocumentsAt urls: [URL]) {
+
+        _ = urls[0].startAccessingSecurityScopedResource()
+
         if controller === publicKeyPicker {
             publicKey = (try? String(contentsOf: urls[0]))
             importPublicKeyBtn.setTitle(urls[0].lastPathComponent, for: .normal)