From c97a313edb2be2b94363eac4f6ae447d290a42eb Mon Sep 17 00:00:00 2001 From: Neeraj Gupta <254676+ua741@users.noreply.github.com> Date: Tue, 22 Apr 2025 11:52:34 +0530 Subject: [PATCH] use remoteDb --- mobile/lib/db/files_db.dart | 18 ------------------ .../lib/db/remote/read/collection_files.dart | 8 ++++++++ .../file_details/albums_item_widget.dart | 5 +++-- 3 files changed, 11 insertions(+), 20 deletions(-) diff --git a/mobile/lib/db/files_db.dart b/mobile/lib/db/files_db.dart index 17634ea0a1..8565f144d5 100644 --- a/mobile/lib/db/files_db.dart +++ b/mobile/lib/db/files_db.dart @@ -1509,24 +1509,6 @@ class FilesDB with SqlDbBase { return result; } - Future> getAllCollectionIDsOfFile( - int uploadedFileID, - ) async { - final db = await instance.sqliteAsyncDB; - final results = await db.getAll( - ''' - SELECT DISTINCT $columnCollectionID FROM $filesTable - WHERE $columnUploadedFileID = ? AND $columnCollectionID != -1 - ''', - [uploadedFileID], - ); - final collectionIDsOfFile = {}; - for (var result in results) { - collectionIDsOfFile.add(result['collection_id'] as int); - } - return collectionIDsOfFile; - } - ///Each collectionIDs in list aren't necessarily unique Future> getAllCollectionIDsOfFiles( List uploadedFileIDs, diff --git a/mobile/lib/db/remote/read/collection_files.dart b/mobile/lib/db/remote/read/collection_files.dart index e1fad0edeb..de364b6859 100644 --- a/mobile/lib/db/remote/read/collection_files.dart +++ b/mobile/lib/db/remote/read/collection_files.dart @@ -8,4 +8,12 @@ extension CollectionFileRead on RemoteDB { ); return row["count"] as int; } + + Future> getAllCollectionIDsOfFile(int fileID) async { + final rows = await sqliteDB.getAll( + "SELECT collection_id FROM collection_files WHERE file_id = ?", + [fileID], + ); + return rows.map((row) => row["collection_id"] as int).toSet(); + } } diff --git a/mobile/lib/ui/viewer/file_details/albums_item_widget.dart b/mobile/lib/ui/viewer/file_details/albums_item_widget.dart index 1bf820fadb..dda2c5e772 100644 --- a/mobile/lib/ui/viewer/file_details/albums_item_widget.dart +++ b/mobile/lib/ui/viewer/file_details/albums_item_widget.dart @@ -1,12 +1,13 @@ import "package:flutter/material.dart"; import "package:logging/logging.dart"; import "package:photos/core/event_bus.dart"; -import "package:photos/db/files_db.dart"; +import "package:photos/db/remote/read/collection_files.dart"; import "package:photos/events/pause_video_event.dart"; import "package:photos/generated/l10n.dart"; import 'package:photos/models/collection/collection.dart'; import 'package:photos/models/collection/collection_items.dart'; import 'package:photos/models/file/file.dart'; +import "package:photos/service_locator.dart"; import "package:photos/services/collections_service.dart"; import "package:photos/ui/components/buttons/chip_button_widget.dart"; import "package:photos/ui/components/info_item_widget.dart"; @@ -30,7 +31,7 @@ class AlbumsItemWidget extends StatelessWidget { final Future> allDeviceFoldersOfFile = Future.sync(() => {file.deviceFolder ?? ''}); if (fileIsBackedup) { - allCollectionIDsOfFile = FilesDB.instance.getAllCollectionIDsOfFile( + allCollectionIDsOfFile = remoteDB.getAllCollectionIDsOfFile( file.uploadedFileID!, ); }