Merge pull request #238 from PermanentOrg/vsp-842

VSP-842 [iOS] iCloud files fail to upload sometimes
PermanentOrg · Jul 29, 2022 · ae251c4 · ae251c4
2 parents b0c5030 + 579e816
commit ae251c4
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 11 deletions.
diff --git a/Permanent/Managers/Upload/UploadManager.swift b/Permanent/Managers/Upload/UploadManager.swift
@@ -80,12 +80,6 @@ class UploadManager {
         if let fileContents = file.fileContents {
             file.url = fileHelper.saveFile(fileContents, named: file.id, withExtension: "jpeg", isDownload: false) ?? URL(fileURLWithPath: "")
             file.fileContents = nil
-        } else {
-            do {
-                file.url = try fileHelper.copyFile(withURL: file.url)
-            } catch {
-                print(error)
-            }
         }
 
         // Save file metadata

diff --git a/Permanent/ViewControllers/MainViewController.swift b/Permanent/ViewControllers/MainViewController.swift
@@ -1157,12 +1157,16 @@ extension MainViewController: FilePreviewNavigationControllerDelegate {
 // MARK: - PhotoPickerViewControllerDelegate
 extension MainViewController: PhotoPickerViewControllerDelegate {
     func photoTabBarViewControllerDidPickAssets(_ vc: PhotoTabBarViewController?, assets: [PHAsset]) {
+        let alert = UIAlertController(title: "Preparing Files...".localized(), message: nil, preferredStyle: .alert)
+        present(alert, animated: true)
         viewModel?.didChooseFromPhotoLibrary(assets, completion: { [self] urls in
-            guard let currentFolder = viewModel?.currentFolder else {
-                return showErrorAlert(message: .cannotUpload)
+            dismiss(animated: true) { [self] in
+                guard let currentFolder = viewModel?.currentFolder else {
+                    return showErrorAlert(message: .cannotUpload)
+                }
+
+                processUpload(toFolder: currentFolder, forURLS: urls)
             }
-
-            processUpload(toFolder: currentFolder, forURLS: urls)
         })
     }
 }
diff --git a/Permanent/ViewModels/FilesViewModel.swift b/Permanent/ViewModels/FilesViewModel.swift
@@ -360,7 +360,13 @@ class FilesViewModel: NSObject, ViewModelInterface {
                     return
                 }
 
-                urls.append(imageURL)
+                do {
+                    let localURL = try FileHelper().copyFile(withURL: imageURL)
+                    urls.append(localURL)
+                } catch {
+                    print(error)
+                }
+
                 dispatchGroup.leave()
             }
         }