Bläddra i källkod

fix: archived files which are not part of an archived album were coming up in moments (#1524)

Neeraj Gupta 1 år sedan
förälder
incheckning
bfb588ba8f
2 ändrade filer med 5 tillägg och 0 borttagningar
  1. 3 0
      lib/db/files_db.dart
  2. 2 0
      lib/services/memories_service.dart

+ 3 - 0
lib/db/files_db.dart

@@ -699,6 +699,7 @@ class FilesDB {
   Future<List<EnteFile>> getFilesCreatedWithinDurations(
     List<List<int>> durations,
     Set<int> ignoredCollectionIDs, {
+    int? visibility,
     String order = 'ASC',
   }) async {
     if (durations.isEmpty) {
@@ -714,6 +715,8 @@ class FilesDB {
           ")";
       if (index != durations.length - 1) {
         whereClause += " OR ";
+      } else if (visibility != null) {
+        whereClause += ' AND $columnMMdVisibility = $visibility';
       }
     }
     whereClause += ")";

+ 2 - 0
lib/services/memories_service.dart

@@ -8,6 +8,7 @@ import "package:photos/events/files_updated_event.dart";
 import "package:photos/events/memories_setting_changed.dart";
 import 'package:photos/models/filters/important_items_filter.dart';
 import 'package:photos/models/memory.dart';
+import "package:photos/models/metadata/common_keys.dart";
 import 'package:photos/services/collections_service.dart';
 import "package:shared_preferences/shared_preferences.dart";
 
@@ -108,6 +109,7 @@ class MemoriesService extends ChangeNotifier {
     final files = await _filesDB.getFilesCreatedWithinDurations(
       durations,
       ignoredCollections,
+      visibility: visibleVisibility,
     );
     final seenTimes = await _memoriesDB.getSeenTimes();
     final List<Memory> memories = [];