From 9c8b6d934cf0e3e5efd696f0733eeabc1db985ee Mon Sep 17 00:00:00 2001 From: Kiryl Kaveryn Date: Mon, 10 Feb 2025 14:47:03 +0400 Subject: [PATCH] [ios] start downloading icloud item with coordination Attempt to fix the https://github.com/organicmaps/organicmaps/issues/10042 Signed-off-by: Kiryl Kaveryn --- .../iCloud/SynchronizationFileWriter.swift | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/iphone/Maps/Core/iCloud/SynchronizationFileWriter.swift b/iphone/Maps/Core/iCloud/SynchronizationFileWriter.swift index 09ebd28e81..74666692c0 100644 --- a/iphone/Maps/Core/iCloud/SynchronizationFileWriter.swift +++ b/iphone/Maps/Core/iCloud/SynchronizationFileWriter.swift @@ -39,12 +39,18 @@ final class SynchronizationFileWriter { // MARK: - Read/Write/Downloading/Uploading private func startDownloading(_ cloudMetadataItem: CloudMetadataItem, completion: WritingResultCompletionHandler) { - do { - LOG(.info, "Start downloading file: \(cloudMetadataItem.fileName)...") - try fileManager.startDownloadingUbiquitousItem(at: cloudMetadataItem.fileUrl) - completion(.success) - } catch { - completion(.failure(error)) + var coordinationError: NSError? + fileCoordinator.coordinate(writingItemAt: cloudMetadataItem.fileUrl, options: [], error: &coordinationError) { cloudItemUrl in + do { + LOG(.info, "Start downloading file: \(cloudItemUrl.path)...") + try fileManager.startDownloadingUbiquitousItem(at: cloudItemUrl) + completion(.success) + } catch { + completion(.failure(error)) + } + } + if let coordinationError { + completion(.failure(coordinationError)) } } @@ -242,7 +248,7 @@ final class SynchronizationFileWriter { private extension FileManager { func replaceFileSafe(at targetUrl: URL, with sourceUrl: URL) throws { guard fileExists(atPath: targetUrl.path) else { - LOG(.debug, "Source file \(targetUrl.lastPathComponent) doesn't exist. The file will be copied.") + LOG(.info, "Source file \(targetUrl.lastPathComponent) doesn't exist. The file will be copied.") try copyItem(at: sourceUrl, to: targetUrl) return }