Fix AccessingSecurityScopedResource

brave · Dec 18, 2024 · 5710111 · 5710111
1 parent da8e55e
commit 5710111
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 27 deletions.
diff --git a/...ve-ios/Sources/Brave/Frontend/Sync/BraveCore/Bookmarks/BookmarksImportExportUtility.swift b/...ve-ios/Sources/Brave/Frontend/Sync/BraveCore/Bookmarks/BookmarksImportExportUtility.swift
@@ -89,18 +89,19 @@ class BookmarksImportExportUtility {
     // While accessing document URL from UIDocumentPickerViewController to access the file
     // startAccessingSecurityScopedResource should be called for that URL
     // Reference: https://stackoverflow.com/a/73912499/2239348
-    guard path.startAccessingSecurityScopedResource() else {
-      return false
+    let hasSecurityAccess = path.startAccessingSecurityScopedResource()
+    defer {
+      // Each call to startAccessingSecurityScopedResource must be balanced with a call to stopAccessingSecurityScopedResource
+      // (Note: this is not reference counted)
+      if hasSecurityAccess {
+        path.stopAccessingSecurityScopedResource()
+      }
     }
 
     state = .importing
     defer { state = .none }
 
     if path.pathExtension.lowercased() == "zip" {
-      // Each call to startAccessingSecurityScopedResource must be balanced with a call to stopAccessingSecurityScopedResource
-      // (Note: this is not reference counted)
-      defer { path.stopAccessingSecurityScopedResource() }
-
       guard let zipFileExtractedURL = try? await ZipImporter.unzip(path: path) else {
         return false
       }
@@ -125,9 +126,6 @@ class BookmarksImportExportUtility {
       return await doImport(bookmarksFileURL, nativeBookmarksPath)
     }
 
-    // Each call to startAccessingSecurityScopedResource must be balanced with a call to stopAccessingSecurityScopedResource
-    // (Note: this is not reference counted)
-    defer { path.stopAccessingSecurityScopedResource() }
     return await doImport(path, nativePath)
   }
 

diff --git a/ios/brave-ios/Sources/Brave/Frontend/Sync/BraveCore/BraveDataImporterView.swift b/ios/brave-ios/Sources/Brave/Frontend/Sync/BraveCore/BraveDataImporterView.swift
diff --git a/ios/brave-ios/Sources/Brave/Frontend/Sync/BraveCore/History/HistoryImportExportUtility.swift b/ios/brave-ios/Sources/Brave/Frontend/Sync/BraveCore/History/HistoryImportExportUtility.swift
@@ -53,18 +53,19 @@ class HistoryImportExportUtility {
     // While accessing document URL from UIDocumentPickerViewController to access the file
     // startAccessingSecurityScopedResource should be called for that URL
     // Reference: https://stackoverflow.com/a/73912499/2239348
-    guard path.startAccessingSecurityScopedResource() else {
-      return false
+    let hasSecurityAccess = path.startAccessingSecurityScopedResource()
+    defer {
+      // Each call to startAccessingSecurityScopedResource must be balanced with a call to stopAccessingSecurityScopedResource
+      // (Note: this is not reference counted)
+      if hasSecurityAccess {
+        path.stopAccessingSecurityScopedResource()
+      }
     }
 
     state = .importing
     defer { state = .none }
 
     if path.pathExtension.lowercased() == "zip" {
-      // Each call to startAccessingSecurityScopedResource must be balanced with a call to stopAccessingSecurityScopedResource
-      // (Note: this is not reference counted)
-      defer { path.stopAccessingSecurityScopedResource() }
-
       guard let zipFileExtractedURL = try? await ZipImporter.unzip(path: path) else {
         return false
       }
@@ -88,9 +89,6 @@ class HistoryImportExportUtility {
       return await doImport(historyFileURL, nativeHistoryPath)
     }
 
-    // Each call to startAccessingSecurityScopedResource must be balanced with a call to stopAccessingSecurityScopedResource
-    // (Note: this is not reference counted)
-    defer { path.stopAccessingSecurityScopedResource() }
     return await doImport(path, nativePath)
   }
 

diff --git a/...ave-ios/Sources/Brave/Frontend/Sync/BraveCore/Password/PasswordsImportExportUtility.swift b/...ave-ios/Sources/Brave/Frontend/Sync/BraveCore/Password/PasswordsImportExportUtility.swift
@@ -43,18 +43,19 @@ class PasswordsImportExportUtility {
     // While accessing document URL from UIDocumentPickerViewController to access the file
     // startAccessingSecurityScopedResource should be called for that URL
     // Reference: https://stackoverflow.com/a/73912499/2239348
-    guard path.startAccessingSecurityScopedResource() else {
-      return false
+    let hasSecurityAccess = path.startAccessingSecurityScopedResource()
+    defer {
+      // Each call to startAccessingSecurityScopedResource must be balanced with a call to stopAccessingSecurityScopedResource
+      // (Note: this is not reference counted)
+      if hasSecurityAccess {
+        path.stopAccessingSecurityScopedResource()
+      }
     }
 
     state = .importing
     defer { state = .none }
 
     if path.pathExtension.lowercased() == "zip" {
-      // Each call to startAccessingSecurityScopedResource must be balanced with a call to stopAccessingSecurityScopedResource
-      // (Note: this is not reference counted)
-      defer { path.stopAccessingSecurityScopedResource() }
-
       guard let zipFileExtractedURL = try? await ZipImporter.unzip(path: path) else {
         return false
       }
@@ -80,9 +81,6 @@ class PasswordsImportExportUtility {
       return await doImport(passwordsFileURL, nativePasswordsPath)
     }
 
-    // Each call to startAccessingSecurityScopedResource must be balanced with a call to stopAccessingSecurityScopedResource
-    // (Note: this is not reference counted)
-    defer { path.stopAccessingSecurityScopedResource() }
     return await doImport(path, nativePath)
   }