Skip to content

armgit / ente

Public Imported from GitHub
0

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

Fix cross-year On This Day scheduling

laurenspriem3e5632507d32
diff --git a/mobile/apps/photos/lib/services/smart_memories_time_calculator.dart b/mobile/apps/photos/lib/services/smart_memories_time_calculator.dart
index 781bc9fb79..9c64d029a9 100644
--- a/mobile/apps/photos/lib/services/smart_memories_time_calculator.dart
+++ b/mobile/apps/photos/lib/services/smart_memories_time_calculator.dart
@@ -532,7 +532,7 @@ class TimeMemoriesCalculator {
} else if (almostYearEnd) {
final altDiff = fileDate
.copyWith(year: currentYear + 1)
- .difference(currentTime);
+ .difference(startPoint);
if (!altDiff.isNegative && altDiff < diffThreshold) {
daysToMemories
.putIfAbsent(altDiff.inDays, () => [])
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.dart
index 26f55a45bf..7b2aebb657 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
@@ -197,4 +197,29 @@ void main() {
},
);
});
+
+ group("On This Day dates", () {
+ test("On This Day keeps cross-year dates aligned after midnight", () async {
+ final currentTime = DateTime(2026, 12, 30, 12);
+ final files = <EnteFile>[
+ for (int i = 0; i < 3; i++)
+ _file(id: i + 1, createdAt: DateTime(2024, 1, 1, 9 + i)),
+ for (int i = 0; i < 2; i++)
+ _file(id: i + 4, createdAt: DateTime(2025, 1, 1, 9 + i)),
+ ];
+
+ final memories = await TimeMemoriesCalculator.computeOnThisDayMemories(
+ files,
+ currentTime,
+ seenTimes: const <int, int>{},
+ collectionIDsToExclude: const <int>{},
+ );
+
+ expect(memories, hasLength(1));
+ expect(
+ DateTime.fromMicrosecondsSinceEpoch(memories.single.firstDateToShow),
+ DateTime(2027),
+ );
+ });
+ });
}