diff --git a/mobile/lib/db/files_db.dart b/mobile/lib/db/files_db.dart index f4bb454aa6..f914ce0afe 100644 --- a/mobile/lib/db/files_db.dart +++ b/mobile/lib/db/files_db.dart @@ -1150,16 +1150,6 @@ class FilesDB with SqlDbBase { return count.first['COUNT'] as int; } - Future deleteCollection(int collectionID) async { - final db = await instance.sqliteAsyncDB; - unawaited( - db.execute( - 'DELETE FROM $filesTable WHERE $columnCollectionID = ?', - [collectionID], - ), - ); - } - // todo:rewrite (upload related) Future> getPendingUploadForCollection(int collectionID) async { final db = await instance.sqliteAsyncDB; diff --git a/mobile/lib/db/remote/table/collection_files.dart b/mobile/lib/db/remote/table/collection_files.dart index 0c45a1646d..c593aeab52 100644 --- a/mobile/lib/db/remote/table/collection_files.dart +++ b/mobile/lib/db/remote/table/collection_files.dart @@ -117,14 +117,14 @@ extension CollectionFiles on RemoteDB { ); } - Future deleteCollectionsEnteries(List cIDs) async { + Future deleteCollectionFiles(List cIDs) async { if (cIDs.isEmpty) return; await sqliteDB.execute( "DELETE FROM collection_files WHERE collection_id IN (${cIDs.join(",")})", ); } - Future deleteCollectionEnteries( + Future deleteCFEnteries( int collectionID, List fileIDs, ) async { diff --git a/mobile/lib/services/collections_service.dart b/mobile/lib/services/collections_service.dart index 12387483be..e2b58b6428 100644 --- a/mobile/lib/services/collections_service.dart +++ b/mobile/lib/services/collections_service.dart @@ -150,7 +150,7 @@ class CollectionsService { final Set toDelete = {}; for (final collection in fetchedCollections) { if (collection.isDeleted) { - await _filesDB.deleteCollection(collection.id); + await remoteDB.deleteCollectionFiles([collection.id]); await setCollectionSyncTime(collection.id, null); if (_collectionIDToCollections.containsKey(collection.id)) { shouldFireDeleteEvent = true; @@ -667,7 +667,7 @@ class CollectionsService { } Future _handleCollectionDeletion(Collection collection) async { - await _filesDB.deleteCollection(collection.id); + await remoteDB.deleteCollectionFiles([collection.id]); final deletedCollection = collection.copyWith(isDeleted: true); unawaited(_updateDB([deletedCollection])); _collectionIDToCollections[collection.id] = deletedCollection; @@ -1825,7 +1825,7 @@ class CollectionsService { ); await _filesDB.insertMultiple(files); // remove files from old collection - await remoteDB.deleteCollectionEnteries( + await remoteDB.deleteCFEnteries( fromCollectionID, files.map((e) => e.uploadedFileID!).toList(), ); @@ -1893,7 +1893,7 @@ class CollectionsService { throw Exception("Failed to remove files from collection"); } - await remoteDB.deleteCollectionEnteries(collectionID, params["fileIDs"]); + await remoteDB.deleteCFEnteries(collectionID, params["fileIDs"]); Bus.instance .fire(CollectionUpdatedEvent(collectionID, batch, "removeFrom")); Bus.instance.fire(LocalPhotosUpdatedEvent(batch, source: "removeFrom"));