Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

Reuse cached files for photo map

Neeraj Guptab68e59756424
diff --git a/mobile/apps/photos/lib/db/files_db.dart b/mobile/apps/photos/lib/db/files_db.dart
index 21ee5dc638..3a3a80ab1f 100644
--- a/mobile/apps/photos/lib/db/files_db.dart
+++ b/mobile/apps/photos/lib/db/files_db.dart
@@ -2006,10 +2006,7 @@ class FilesDB with SqlDbBase {
}
final results = await db.getAll(query, args);
- final List<EnteFile> files = await Computer.shared().compute(
- convertToFilesForIsolate,
- param: {"result": results},
- );
+ final files = convertToFiles(results);
final List<EnteFile> filteredFiles = await applyDBFilters(
files,
filterOptions,
diff --git a/mobile/apps/photos/lib/services/search_service.dart b/mobile/apps/photos/lib/services/search_service.dart
index 252d904721..145fd1eb6d 100644
--- a/mobile/apps/photos/lib/services/search_service.dart
+++ b/mobile/apps/photos/lib/services/search_service.dart
@@ -295,20 +295,6 @@ class SearchService {
return _cachedFilesForSearch!;
}
- Future<List<EnteFile>> getAllFilesWithLocationForSearch() async {
- final result = await FilesDB.instance
- .fetchAllUploadedAndSharedFilesWithLocation(
- galleryLoadStartTime,
- galleryLoadEndTime,
- asc: false,
- filterOptions: DBFilterOptions(
- ignoredCollectionIDs: ignoreCollections(),
- dedupeUploadID: true,
- ),
- );
- return result.files;
- }
-
Future<bool> hasAnyFilesForSearch() async {
if (_cachedFilesFuture != null && _cachedFilesForSearch != null) {
return (await _cachedFilesForSearch!).isNotEmpty;
diff --git a/mobile/apps/photos/lib/ui/viewer/file_details/location_tags_widget.dart b/mobile/apps/photos/lib/ui/viewer/file_details/location_tags_widget.dart
index 9db06667c8..b9f5f7adab 100644
--- a/mobile/apps/photos/lib/ui/viewer/file_details/location_tags_widget.dart
+++ b/mobile/apps/photos/lib/ui/viewer/file_details/location_tags_widget.dart
@@ -343,8 +343,7 @@ class _InfoMapState extends State<InfoMap> {
.push(
MaterialPageRoute(
builder: (context) => MapScreen(
- filesFutureFn:
- SearchService.instance.getAllFilesWithLocationForSearch,
+ filesFutureFn: SearchService.instance.getAllFilesForSearch,
center: LatLng(_fileLat, _fileLng),
initialZoom: 16,
),
diff --git a/mobile/apps/photos/lib/ui/viewer/search/search_map_navigation.dart b/mobile/apps/photos/lib/ui/viewer/search/search_map_navigation.dart
index 8b9ad2c64f..d12a89aec1 100644
--- a/mobile/apps/photos/lib/ui/viewer/search/search_map_navigation.dart
+++ b/mobile/apps/photos/lib/ui/viewer/search/search_map_navigation.dart
@@ -27,8 +27,7 @@ Future<void> openSearchMap(BuildContext context) async {
Navigator.of(context).push(
MaterialPageRoute(
builder: (context) => MapScreen(
- filesFutureFn:
- SearchService.instance.getAllFilesWithLocationForSearch,
+ filesFutureFn: SearchService.instance.getAllFilesForSearch,
),
),
),