pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[ios] fix the icloud trashing bug

Browse source 
When the file doesn't exist in the icloud dir and the manager attemps to move this file into the trash the exception is thrown and the sync is stopped. This issue was fixed by the additional file existence check.

Signed-off-by: Kiryl Kaveryn <kirylkaveryn@gmail.com>
This commit is contained in:
Kiryl Kaveryn 2024-08-24 21:09:02 +04:00 • committed by Alexander Borsuk
parent fcb68d0e81
commit 714136e249
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
iphone/Maps/Core/iCloud/SynchronizationFileWriter.swift
View file

@ -14,7 +14,7 @@ final class SynchronizationFileWriter {
self.localDirectoryUrl = localDirectoryUrl
self.cloudDirectoryUrl = cloudDirectoryUrl
}
func processEvent(_ event: OutgoingEvent, completion: @escaping WritingResultCompletionHandler) {
let resultCompletion: WritingResultCompletionHandler = { result in
DispatchQueue.main.sync { completion(result) }
@ -128,8 +128,13 @@ final class SynchronizationFileWriter {
private func removeFromCloudContainer(_ localMetadataItem: LocalMetadataItem, completion: @escaping WritingResultCompletionHandler) {
LOG(.info, "Start trashing file \(localMetadataItem.fileName)...")
let targetCloudFileUrl = localMetadataItem.relatedCloudItemUrl(to: cloudDirectoryUrl)
guard fileManager.fileExists(atPath: targetCloudFileUrl.path) else {
LOG(.warning, "File \(localMetadataItem.fileName) doesn't exist in the cloud directory and cannot be moved to the trash.")
completion(.success)
return
}
do {
let targetCloudFileUrl = localMetadataItem.relatedCloudItemUrl(to: cloudDirectoryUrl)
try removeDuplicatedFileFromTrashDirectoryIfNeeded(cloudDirectoryUrl: cloudDirectoryUrl, fileName: localMetadataItem.fileName)
try self.fileManager.trashItem(at: targetCloudFileUrl, resultingItemURL: nil)
LOG(.debug, "File \(localMetadataItem.fileName) was trashed successfully.")