diff --git a/Zotero/Controllers/Conflict Resolution/ChangedItemsDeletedAlertQueueHandler.swift b/Zotero/Controllers/Conflict Resolution/ChangedItemsDeletedAlertQueueHandler.swift index f8d3d0a55..9465066b4 100644 --- a/Zotero/Controllers/Conflict Resolution/ChangedItemsDeletedAlertQueueHandler.swift +++ b/Zotero/Controllers/Conflict Resolution/ChangedItemsDeletedAlertQueueHandler.swift @@ -13,7 +13,7 @@ struct ChangedItemsDeletedAlertQueueHandler: ConflictAlertQueueHandler { let alertAction: ConflictAlertQueueAction let completion: () -> Void - init(conflicts: [PerformDeletionsDbRequest.Conflict], completion: @escaping ([String], [String]) -> Void) { + init(conflicts: [PerformItemDeletionsDbRequest.Conflict], completion: @escaping ([String], [String]) -> Void) { self.count = conflicts.count var toDelete: [String] = [] diff --git a/Zotero/Controllers/Sync/SyncController.swift b/Zotero/Controllers/Sync/SyncController.swift index 2bd2cd5b3..69a0f7263 100644 --- a/Zotero/Controllers/Sync/SyncController.swift +++ b/Zotero/Controllers/Sync/SyncController.swift @@ -1433,7 +1433,7 @@ final class SyncController: SynchronizationController { } private func finishDeletionsSync( - result: Result<([PerformDeletionsDbRequest.DeletedItem], [PerformDeletionsDbRequest.Conflict]), Error>, + result: Result<([PerformItemDeletionsDbRequest.DeletedItem], [PerformItemDeletionsDbRequest.Conflict]), Error>, items: [String]?, libraryId: LibraryIdentifier, version: Int? = nil @@ -1454,7 +1454,7 @@ final class SyncController: SynchronizationController { } } - func processNextAction(withConflicts conflicts: [PerformDeletionsDbRequest.Conflict]) { + func processNextAction(withConflicts conflicts: [PerformItemDeletionsDbRequest.Conflict]) { if !conflicts.isEmpty { resolve(conflict: .removedItemsHaveLocalChanges(keys: conflicts, libraryId: libraryId)) } else { @@ -1462,7 +1462,7 @@ final class SyncController: SynchronizationController { } } - func cancelActiveDownloads(deletedItems: [PerformDeletionsDbRequest.DeletedItem], libraryId: LibraryIdentifier) { + func cancelActiveDownloads(deletedItems: [PerformItemDeletionsDbRequest.DeletedItem], libraryId: LibraryIdentifier) { for item in deletedItems { attachmentDownloader.cancel(key: item.key, parentKey: item.parentKey, libraryId: libraryId) } diff --git a/Zotero/Models/Conflict.swift b/Zotero/Models/Conflict.swift index 38d508dbe..196f8b48f 100644 --- a/Zotero/Models/Conflict.swift +++ b/Zotero/Models/Conflict.swift @@ -13,5 +13,5 @@ enum Conflict { case groupMetadataWriteDenied(groupId: Int, name: String) case groupFileWriteDenied(groupId: Int, name: String) case objectsRemovedRemotely(libraryId: LibraryIdentifier, collections: [String], items: [String], searches: [String], tags: [String]) - case removedItemsHaveLocalChanges(keys: [PerformDeletionsDbRequest.Conflict], libraryId: LibraryIdentifier) + case removedItemsHaveLocalChanges(keys: [PerformItemDeletionsDbRequest.Conflict], libraryId: LibraryIdentifier) } diff --git a/Zotero/Scenes/Detail/ItemDetail/Models/ItemDetailState.swift b/Zotero/Scenes/Detail/ItemDetail/Models/ItemDetailState.swift index 6328a9101..ed039b6cb 100644 --- a/Zotero/Scenes/Detail/ItemDetail/Models/ItemDetailState.swift +++ b/Zotero/Scenes/Detail/ItemDetail/Models/ItemDetailState.swift @@ -285,10 +285,10 @@ struct ItemDetailState: ViewModelState { switch libraryId { case .custom: - library = Library(identifier: libraryId, name: L10n.Libraries.myLibrary, metadataEditable: true, filesEditable: true) + library = Library(identifier: libraryId, name: L10n.Libraries.myLibrary, metadataEditable: true, filesEditable: true, fileSyncType: .asNeeded) case .group: - library = Library(identifier: libraryId, name: L10n.unknown, metadataEditable: false, filesEditable: false) + library = Library(identifier: libraryId, name: L10n.unknown, metadataEditable: false, filesEditable: false, fileSyncType: .asNeeded) } } diff --git a/Zotero/Scenes/Detail/Items/Models/ItemsState.swift b/Zotero/Scenes/Detail/Items/Models/ItemsState.swift index cbf3b3606..205096771 100644 --- a/Zotero/Scenes/Detail/Items/Models/ItemsState.swift +++ b/Zotero/Scenes/Detail/Items/Models/ItemsState.swift @@ -153,10 +153,10 @@ struct ItemsState: ViewModelState { switch libraryId { case .custom: - library = Library(identifier: libraryId, name: L10n.Libraries.myLibrary, metadataEditable: true, filesEditable: true) + library = Library(identifier: libraryId, name: L10n.Libraries.myLibrary, metadataEditable: true, filesEditable: true, fileSyncType: .asNeeded) case .group: - library = Library(identifier: libraryId, name: L10n.unknown, metadataEditable: false, filesEditable: false) + library = Library(identifier: libraryId, name: L10n.unknown, metadataEditable: false, filesEditable: false, fileSyncType: .asNeeded) } } diff --git a/Zotero/Scenes/Detail/PDF/Models/PDFReaderState.swift b/Zotero/Scenes/Detail/PDF/Models/PDFReaderState.swift index 5f0db30b9..8afc63245 100644 --- a/Zotero/Scenes/Detail/PDF/Models/PDFReaderState.swift +++ b/Zotero/Scenes/Detail/PDF/Models/PDFReaderState.swift @@ -176,10 +176,10 @@ struct PDFReaderState: ViewModelState { switch libraryId { case .custom: - library = Library(identifier: libraryId, name: L10n.Libraries.myLibrary, metadataEditable: true, filesEditable: true) + library = Library(identifier: libraryId, name: L10n.Libraries.myLibrary, metadataEditable: true, filesEditable: true, fileSyncType: .asNeeded) case .group: - library = Library(identifier: libraryId, name: L10n.unknown, metadataEditable: false, filesEditable: false) + library = Library(identifier: libraryId, name: L10n.unknown, metadataEditable: false, filesEditable: false, fileSyncType: .asNeeded) } }