diff --git a/lib/face_search_manager.dart b/lib/face_search_manager.dart index 0137f32a8..b6f10b239 100644 --- a/lib/face_search_manager.dart +++ b/lib/face_search_manager.dart @@ -29,7 +29,8 @@ class FaceSearchManager { } Future> getFaceSearchResults( - Face face, int sinceTime, int limit) async { + Face face, int beforeCreationTime, int limit) async { + _logger.info("Fetching since creation " + beforeCreationTime.toString()); final result = await _dio .get( Configuration.instance.getHttpEndpoint() + @@ -37,7 +38,7 @@ class FaceSearchManager { face.faceID.toString(), queryParameters: { "limit": limit, - "sinceTime": sinceTime, + "beforeCreationTime": beforeCreationTime, }, options: Options(headers: {"X-Auth-Token": Configuration.instance.getToken()}), diff --git a/lib/ui/face_search_results_page.dart b/lib/ui/face_search_results_page.dart index 0fd7cb496..4a9451d5f 100644 --- a/lib/ui/face_search_results_page.dart +++ b/lib/ui/face_search_results_page.dart @@ -15,9 +15,12 @@ class FaceSearchResultsPage extends StatelessWidget { @override Widget build(BuildContext context) { var gallery = Gallery( - asyncLoader: (sinceFile, limit) => - _faceSearchManager.getFaceSearchResults( - face, sinceFile == null ? 0 : sinceFile.updationTime, limit), + asyncLoader: (lastFile, limit) => _faceSearchManager.getFaceSearchResults( + face, + lastFile == null + ? DateTime.now().microsecondsSinceEpoch + : lastFile.creationTime, + limit), tagPrefix: "face_search_results", selectedFiles: selectedFiles, ); diff --git a/lib/ui/gallery.dart b/lib/ui/gallery.dart index 9dfd2d38b..ac849c1d3 100644 --- a/lib/ui/gallery.dart +++ b/lib/ui/gallery.dart @@ -16,7 +16,7 @@ import 'package:pull_to_refresh/pull_to_refresh.dart'; class Gallery extends StatefulWidget { final List Function() syncLoader; - final Future> Function(File file, int limit) asyncLoader; + final Future> Function(File lastFile, int limit) asyncLoader; // TODO: Verify why the event is necessary when calling loader post onRefresh // should have done the job. final Stream reloadEvent; @@ -40,7 +40,7 @@ class Gallery extends StatefulWidget { } class _GalleryState extends State { - static final int kLoadLimit = 100; + static final int kLoadLimit = 200; static final int kEagerLoadTrigger = 10; final Logger _logger = Logger("Gallery"); diff --git a/lib/ui/remote_folder_page.dart b/lib/ui/remote_folder_page.dart index 2542ffa39..06111abe3 100644 --- a/lib/ui/remote_folder_page.dart +++ b/lib/ui/remote_folder_page.dart @@ -21,9 +21,9 @@ class _RemoteFolderPageState extends State { @override Widget build(Object context) { var gallery = Gallery( - asyncLoader: (sinceFile, limit) => FileDB.instance.getAllInFolder( + asyncLoader: (lastFile, limit) => FileDB.instance.getAllInFolder( widget.folder.id, - sinceFile == null ? 0 : sinceFile.updationTime, + lastFile == null ? 0 : lastFile.updationTime, limit), onRefresh: () => FolderSharingService.instance.syncDiff(widget.folder), tagPrefix: "remote_folder",