diff --git a/mobile/lib/db/files_db.dart b/mobile/lib/db/files_db.dart index 5ffee95df..241ee3096 100644 --- a/mobile/lib/db/files_db.dart +++ b/mobile/lib/db/files_db.dart @@ -628,12 +628,18 @@ class FilesDB { }) async { final db = await instance.sqliteAsyncDB; final order = (asc ?? false ? 'ASC' : 'DESC'); - + final args = [startTime, endTime, visibleVisibility]; + String query = + 'SELECT * FROM $filesTable WHERE $columnCreationTime >= ? AND $columnCreationTime <= ? AND ($columnMMdVisibility IS NULL OR $columnMMdVisibility = ?)' + ' AND ($columnLocalID IS NOT NULL OR ($columnCollectionID IS NOT NULL AND $columnCollectionID IS NOT -1))' + ' ORDER BY $columnCreationTime $order, $columnModificationTime $order'; + if (limit != null) { + query += ' LIMIT ?'; + args.add(limit); + } final results = await db.getAll( - 'SELECT * FROM $filesTable WHERE $columnCreationTime >= ? AND $columnCreationTime <= ? AND ($columnMMdVisibility IS NULL OR $columnMMdVisibility = ?)' - ' AND ($columnLocalID IS NOT NULL OR ($columnCollectionID IS NOT NULL AND $columnCollectionID IS NOT -1))' - ' ORDER BY $columnCreationTime $order, $columnModificationTime $order LIMIT ?', - [startTime, endTime, visibleVisibility, limit], + query, + args, ); final files = convertToFiles(results); final List filteredFiles = diff --git a/mobile/lib/ui/home/home_gallery_widget.dart b/mobile/lib/ui/home/home_gallery_widget.dart index 66556213b..195eb7b95 100644 --- a/mobile/lib/ui/home/home_gallery_widget.dart +++ b/mobile/lib/ui/home/home_gallery_widget.dart @@ -46,7 +46,6 @@ class HomeGalleryWidget extends StatelessWidget { result = await FilesDB.instance.getAllLocalAndUploadedFiles( creationStartTime, creationEndTime, - ownerID!, limit: limit, asc: asc, filterOptions: filterOptions,