π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
[mobile][photos] Fix memories date windows and photo ordering
laurenspriem7d787dd30bd1
diff --git a/mobile/apps/photos/changes/memories-calendar-fixes.md b/mobile/apps/photos/changes/memories-calendar-fixes.mdnew file mode 100644index 0000000000..ab3a60cfd3--- /dev/null+++ b/mobile/apps/photos/changes/memories-calendar-fixes.md@@ -0,0 +1 @@+- Fixed memories that could match the wrong day, end late, or show their photos out of order.diff --git a/mobile/apps/photos/lib/services/memories/photo_selector.dart b/mobile/apps/photos/lib/services/memories/photo_selector.dartindex 10c4cadcd5..75514ccfb3 100644--- a/mobile/apps/photos/lib/services/memories/photo_selector.dart+++ b/mobile/apps/photos/lib/services/memories/photo_selector.dart@@ -53,10 +53,10 @@ class PhotoSelector {List<Memory> memories,SelectionConfig config,) async {- if (memories.length < config.targetSize) return memories;- if (memories.length == config.targetSize &&- config.distribution != SelectionDistribution.yearRoundRobin) {- return memories;+ if (memories.length < config.targetSize ||+ (memories.length == config.targetSize &&+ config.distribution != SelectionDistribution.yearRoundRobin)) {+ return _sortResult(List.of(memories), config.sort);}final List<Memory> result;@@ -383,18 +383,21 @@ class PhotoSelector {return candidates.first;case SelectionPick.geographicFarthest:- double globalMaxMinDistance = 0;+ final selectedLocations = alreadySelected+ .where((selected) => selected.file.hasLocation)+ .map((selected) => selected.file.location!)+ .toList(growable: false);+ if (selectedLocations.isEmpty) return candidates.first;+ double globalMaxMinDistance = -1;int bestIdx = 0;for (var i = 0; i < candidates.length; i++) {final mem = candidates[i];+ if (!mem.file.hasLocation) continue;double minDistance = double.infinity;- for (final selected in alreadySelected) {- if (selected.file.location == null || mem.file.location == null) {- continue;- }+ for (final selectedLocation in selectedLocations) {final distance = calculateDistance(mem.file.location!,- selected.file.location!,+ selectedLocation,);if (distance < minDistance) {minDistance = distance;@@ -470,7 +473,6 @@ class PhotoSelector {try {final w = (kDebugMode ? EnteWatch('getPeopleResults') : null)?..start();final int targetSize = prefferedSize ?? 10;- if (memories.length <= targetSize) return memories;final Map<int, double> scores = {};for (final mem in memories) {@@ -524,7 +526,9 @@ class PhotoSelector {}) async {final fileCount = memories.length;int targetSize = prefferedSize ?? 10;- if (fileCount <= targetSize) return memories;+ if (fileCount <= targetSize) {+ return _sortResult(List.of(memories), SelectionSort.chronological);+ }if (!mlEnabled) {return _bestSelectionNoMl(@@ -601,7 +605,9 @@ class PhotoSelector {} else {if (prefferedSize == null && (allYears.length * 2) > 10) {targetSize = allYears.length * 3;- if (fileCount < targetSize) return memories;+ if (fileCount < targetSize) {+ return _sortResult(List.of(memories), SelectionSort.chronological);+ }}return select(@@ -629,7 +635,9 @@ class PhotoSelector {final withCreationTime = memories.where((m) => m.file.creationTime != null).toList();- if (withCreationTime.length <= targetSize) return withCreationTime;+ if (withCreationTime.length <= targetSize) {+ return _sortResult(withCreationTime, SelectionSort.chronological);+ }final random = Random();final allYears = withCreationTime@@ -655,7 +663,7 @@ class PhotoSelector {if (distributionOverride == null && (allYears.length * 2) > 10) {effectiveTargetSize = allYears.length * 3;if (withCreationTime.length < effectiveTargetSize) {- return withCreationTime;+ return _sortResult(withCreationTime, SelectionSort.chronological);}}diff --git a/mobile/apps/photos/lib/services/smart_memories_people_calculator.dart b/mobile/apps/photos/lib/services/smart_memories_people_calculator.dartindex f1dc0e5fb9..760911d4c8 100644--- a/mobile/apps/photos/lib/services/smart_memories_people_calculator.dart+++ b/mobile/apps/photos/lib/services/smart_memories_people_calculator.dart@@ -60,7 +60,8 @@ class PeopleMemoriesCalculator {String? meID;for (final personEntity in persons) {- if (personEntity.data.email == currentUserEmail) {+ if (currentUserEmail != null &&+ personEntity.data.email == currentUserEmail) {meID = personEntity.remoteID;break;}@@ -250,41 +251,42 @@ class PeopleMemoriesCalculator {w?.log('doingSomethingTogether setup');}- final lastTimeYouSawThemFiles = <EnteFile>[];- int lastCreationTime = 0;+ final personFiles = <EnteFile>[];bool longAgo = true;for (final fileID in personFileIDs) {final file = allFileIdsToFile[fileID];- if (file != null && file.creationTime != null) {- final creationTime = file.creationTime!;- final creationDateTime = DateTime.fromMicrosecondsSinceEpoch(- creationTime,- );- if (currentTime.difference(creationDateTime).inDays < 365) {- longAgo = false;- break;- }- if (creationTime > lastCreationTime - microSecondsInDay) {- final lastDateTime = DateTime.fromMicrosecondsSinceEpoch(- lastCreationTime,+ if (file == null || file.creationTime == null) continue;+ final creationDateTime = DateTime.fromMicrosecondsSinceEpoch(+ file.creationTime!,+ );+ if (currentTime.difference(creationDateTime).inDays < 365) {+ longAgo = false;+ break;+ }+ personFiles.add(file);+ }+ final lastTimeYouSawThemFiles = <EnteFile>[];+ if (longAgo) {+ personFiles.sort((a, b) => a.creationTime!.compareTo(b.creationTime!));+ for (final file in personFiles) {+ if (lastTimeYouSawThemFiles.isNotEmpty) {+ final gap = Duration(+ microseconds:+ file.creationTime! -+ lastTimeYouSawThemFiles.last.creationTime!,);- if (creationDateTime.difference(lastDateTime).inHours > 24) {+ if (gap > const Duration(hours: 24)) {lastTimeYouSawThemFiles.clear();}- if (creationTime > lastCreationTime) {- lastCreationTime = creationTime;- }- lastTimeYouSawThemFiles.add(file);}+ lastTimeYouSawThemFiles.add(file);}}if (longAgo && lastTimeYouSawThemFiles.length >= 2 && meID != personID) {+ final lastCreationTime = lastTimeYouSawThemFiles.last.creationTime!;final lastTimeMemories = lastTimeYouSawThemFiles.map((f) => Memory.fromFile(f, seenTimes)).toList();- lastTimeMemories.sort(- (a, b) => a.file.creationTime!.compareTo(b.file.creationTime!),- );final filteredLastTimeMemories =SmartMemoriesService._filterNearDuplicates(lastTimeMemories,@@ -348,7 +350,10 @@ class PeopleMemoriesCalculator {final lastMetTime = DateTime.fromMicrosecondsSinceEpoch(lastMetCandidate.lastCreationTime!,).copyWith(year: currentTime.year);- final daysSinceLastMet = lastMetTime.difference(currentTime).inDays;+ final daysSinceLastMet = TimeMemoriesCalculator._calendarDayDifference(+ currentTime,+ lastMetTime,+ );if (daysSinceLastMet < 7 && daysSinceLastMet >= 0) {final lastMetMemory = await lastMetCandidate.realize();if (lastMetMemory != null) {diff --git a/mobile/apps/photos/lib/services/smart_memories_service.dart b/mobile/apps/photos/lib/services/smart_memories_service.dartindex ebead66664..4c2d53cadd 100644--- a/mobile/apps/photos/lib/services/smart_memories_service.dart+++ b/mobile/apps/photos/lib/services/smart_memories_service.dart@@ -625,7 +625,14 @@ class SmartMemoriesService {if (creationTimes.isEmpty) return 0;final uniqueDays =creationTimes- .map((timestamp) => timestamp - (timestamp % microSecondsInDay))+ .map((timestamp) {+ final date = DateTime.fromMicrosecondsSinceEpoch(timestamp);+ return DateTime.utc(+ date.year,+ date.month,+ date.day,+ ).microsecondsSinceEpoch;+ }).toSet().toList(growable: false)..sort();@@ -862,6 +869,7 @@ class SmartMemoriesService {final tripAnalysis = TripMemoriesCalculatorV2.analyze(fileIndex.files,computationContext.allFileIdsToFile,+ computationContext.now,isLocalGalleryMode: computationContext.isLocalGalleryMode,seenTimes: computationContext.seenTimes,citySearchIndex: computationContext.citySearchIndex,diff --git a/mobile/apps/photos/lib/services/smart_memories_time_calculator.dart b/mobile/apps/photos/lib/services/smart_memories_time_calculator.dartindex 1f3dc92601..2b4dfb182c 100644--- a/mobile/apps/photos/lib/services/smart_memories_time_calculator.dart+++ b/mobile/apps/photos/lib/services/smart_memories_time_calculator.dart@@ -228,6 +228,7 @@ class TimeMemoriesCalculator {}const monthSelectionSize = 20;+ final startOfNextMonth = DateTime(currentYear, currentMonth + 1);final historicalMemoryFileIds = <int>{};SmartMemoriesService._markUsedMemories(historicalMemoryFileIds,@@ -265,17 +266,13 @@ class TimeMemoriesCalculator {fileIDToImageEmbedding: fileIDToImageEmbedding,clipPositiveTextVector: clipPositiveTextVector,);- final daysLeftInMonth =- DateTime(currentYear, currentMonth + 1, 0).day - currentTime.day + 1;historicalMemoryResult.add(TimeMemory(photoSelection,month: DateTime(year, currentMonth),yearsAgo: currentTime.year - year,currentTime.microsecondsSinceEpoch,- currentTime- .add(Duration(days: daysLeftInMonth))- .microsecondsSinceEpoch,+ startOfNextMonth.microsecondsSinceEpoch,),);}@@ -295,14 +292,12 @@ class TimeMemoriesCalculator {fileIDToImageEmbedding: fileIDToImageEmbedding,clipPositiveTextVector: clipPositiveTextVector,);- final daysLeftInMonth =- DateTime(currentYear, currentMonth + 1, 0).day - currentTime.day + 1;historicalMemoryResult.add(TimeMemory(photoSelection,month: DateTime(currentYear, currentMonth),currentTime.microsecondsSinceEpoch,- currentTime.add(Duration(days: daysLeftInMonth)).microsecondsSinceEpoch,+ startOfNextMonth.microsecondsSinceEpoch,),);@@ -421,24 +416,12 @@ class TimeMemoriesCalculator {DateTime fileDate,DateTime currentTime,) {- final currentYearDiff = fileDate- .copyWith(year: currentTime.year)- .difference(currentTime);- if (!currentYearDiff.isNegative &&- currentYearDiff < kMemoriesUpdateFrequency) {- return (dayOffset: currentYearDiff.inDays, targetYear: currentTime.year);- }-- final timeTillYearEnd = DateTime(- currentTime.year + 1,- ).difference(currentTime);- if (timeTillYearEnd >= kMemoriesUpdateFrequency) return null;-- final nextYearDiff = fileDate- .copyWith(year: currentTime.year + 1)- .difference(currentTime);- if (!nextYearDiff.isNegative && nextYearDiff < kMemoriesUpdateFrequency) {- return (dayOffset: nextYearDiff.inDays, targetYear: currentTime.year + 1);+ for (final year in [currentTime.year, currentTime.year + 1]) {+ final occurrence = DateTime.utc(year, fileDate.month, fileDate.day);+ final dayOffset = _calendarDayDifference(currentTime, occurrence);+ if (dayOffset >= 0 && dayOffset < kMemoriesUpdateFrequency.inDays) {+ return (dayOffset: dayOffset, targetYear: year);+ }}return null;}@@ -560,17 +543,6 @@ class TimeMemoriesCalculator {return memoryResults;}- static int? _onThisDayOffset(DateTime fileDate, DateTime startPoint) {- for (final year in [startPoint.year, startPoint.year + 1]) {- final occurrence = DateTime.utc(year, fileDate.month, fileDate.day);- final dayOffset = _calendarDayDifference(startPoint, occurrence);- if (dayOffset >= 0 && dayOffset < kMemoriesUpdateFrequency.inDays) {- return dayOffset;- }- }- return null;- }-static Future<List<OnThisDayMemory>> computeOnThisDayMemories(Iterable<EnteFile> allFiles,DateTime currentTime, {@@ -603,7 +575,7 @@ class TimeMemoriesCalculator {if (!historicalCandidates.contains(fileDate.month * 100 + fileDate.day)) {continue;}- final dayOffset = _onThisDayOffset(fileDate, startPoint);+ final dayOffset = _historicalDateMatch(fileDate, startPoint)?.dayOffset;if (dayOffset == null) continue;daysToMemories.putIfAbsent(dayOffset, () => [])diff --git a/mobile/apps/photos/lib/services/smart_memories_trip_calculator_v2.dart b/mobile/apps/photos/lib/services/smart_memories_trip_calculator_v2.dartindex c1e1736643..ad57aa70b4 100644--- a/mobile/apps/photos/lib/services/smart_memories_trip_calculator_v2.dart+++ b/mobile/apps/photos/lib/services/smart_memories_trip_calculator_v2.dart@@ -150,6 +150,7 @@ class TripMemoriesCalculatorV2 {final analysis = analyze(allFiles,allFileIdsToFile,+ currentTime,isLocalGalleryMode: isLocalGalleryMode,seenTimes: seenTimes,citySearchIndex: citySearchIndex,@@ -174,7 +175,8 @@ class TripMemoriesCalculatorV2 {static TripMemoriesAnalysis analyze(Iterable<EnteFile> allFiles,- Map<int, EnteFile> allFileIdsToFile, {+ Map<int, EnteFile> allFileIdsToFile,+ DateTime currentTime, {required bool isLocalGalleryMode,required Map<int, int> seenTimes,required CitySearchIndex citySearchIndex,@@ -191,6 +193,7 @@ class TripMemoriesCalculatorV2 {..sort((a, b) => a.creationTime!.compareTo(b.creationTime!));final baseLocations = _detectBaseLocations(filesWithLocation,+ currentTime,isLocalGalleryMode: isLocalGalleryMode,);final baseCountriesToExclude = _baseCountriesToExcludeFromTripTitles(@@ -334,7 +337,8 @@ class TripMemoriesCalculatorV2 {}static List<BaseLocation> _detectBaseLocations(- List<EnteFile> filesWithLocation, {+ List<EnteFile> filesWithLocation,+ DateTime currentTime, {required bool isLocalGalleryMode,}) {final smallRadiusClusters = _mergeNearbyLocationClusters(@@ -354,7 +358,7 @@ class TripMemoriesCalculatorV2 {creationTimes.last,);final bool isCurrent = lastCreationTime.isAfter(- DateTime.now().subtract(const Duration(days: 90)),+ currentTime.subtract(const Duration(days: 90)),);baseLocations.add(BaseLocation(diff --git a/mobile/apps/photos/test/services/memories/smart_memories_source_selection_test.dart b/mobile/apps/photos/test/services/memories/smart_memories_source_selection_test.dartindex 95dd30089d..2751aeabd7 100644--- a/mobile/apps/photos/test/services/memories/smart_memories_source_selection_test.dart+++ b/mobile/apps/photos/test/services/memories/smart_memories_source_selection_test.dart@@ -167,7 +167,7 @@ void main() {});test(- "MemoryFileIndex is a broad prefilter for exact date windows",+ "MemoryFileIndex is a broad prefilter for calendar date windows",() async {final currentTime = DateTime(2026, 8, 18, 12);final source = [@@ -196,12 +196,12 @@ void main() {.expand((memory) => memory.memories).map((memory) => memory.file.uploadedFileID);expect(selectedIDs(indexedResult), selectedIDs(fullResult));- expect(selectedIDs(indexedResult), [2, 3]);+ expect(selectedIDs(indexedResult), [1, 2]);},);test(- "Filler memories preserve year-boundary, leap-day, and time-window matching",+ "Filler memories preserve year-boundary, leap-day, and calendar-day matching",() async {final yearBoundaryMemories =await TimeMemoriesCalculator.computeFillerMemories(@@ -258,7 +258,7 @@ void main() {sameDayMemories.single.memories.map((memory) => memory.file.uploadedFileID,),- [6, 7],+ [5, 6],);},);