diff --git a/lib/services/trash_sync_service.dart b/lib/services/trash_sync_service.dart index ff8b0f46a..3952ea71f 100644 --- a/lib/services/trash_sync_service.dart +++ b/lib/services/trash_sync_service.dart @@ -39,9 +39,9 @@ class TrashSyncService { _logger.fine("inserting ${diff.trashedFiles.length} items in trash"); await _trashDB.insertMultiple(diff.trashedFiles); } - if (diff.deletedFilesUploadID.isNotEmpty) { - _logger.fine("discard ${diff.deletedFilesUploadID.length} deleted items"); - await _trashDB.delete(diff.deletedFilesUploadID); + if (diff.deletedUploadIDs.isNotEmpty) { + _logger.fine("discard ${diff.deletedUploadIDs.length} deleted items"); + await _trashDB.delete(diff.deletedUploadIDs); } if (diff.restoredFiles.isNotEmpty) { _logger.fine("discard ${diff.restoredFiles.length} restored items"); diff --git a/lib/utils/trash_diff_fetcher.dart b/lib/utils/trash_diff_fetcher.dart index 788f0f20e..701a028db 100644 --- a/lib/utils/trash_diff_fetcher.dart +++ b/lib/utils/trash_diff_fetcher.dart @@ -27,7 +27,7 @@ class TrashDiffFetcher { ); int latestUpdatedAtTime = 0; final trashedFiles = []; - final deletedFilesUploadID = []; + final deletedUploadIDs = []; final restoredFiles = []; if (response != null) { final diff = response.data["diff"] as List; @@ -35,7 +35,7 @@ class TrashDiffFetcher { final startTime = DateTime.now(); for (final item in diff) { if (item["isDeleted"]) { - deletedFilesUploadID.add(item["file"]["id"]); + deletedUploadIDs.add(item["file"]["id"]); continue; } final trash = TrashFile(); @@ -97,7 +97,7 @@ class TrashDiffFetcher { startTime.microsecondsSinceEpoch)) .inMilliseconds .toString()); - return Diff(trashedFiles, restoredFiles, deletedFilesUploadID, hasMore, + return Diff(trashedFiles, restoredFiles, deletedUploadIDs, hasMore, latestUpdatedAtTime); } else { return Diff([], [], [], false, 0); @@ -112,10 +112,10 @@ class TrashDiffFetcher { class Diff { final List trashedFiles; final List restoredFiles; - final List deletedFilesUploadID; + final List deletedUploadIDs; final bool hasMore; final int lastSyncedTimeStamp; - Diff(this.trashedFiles, this.restoredFiles, this.deletedFilesUploadID, + Diff(this.trashedFiles, this.restoredFiles, this.deletedUploadIDs, this.hasMore, this.lastSyncedTimeStamp); }