Skip to content

armgit / ente

Public Imported from GitHub
0

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

[mobile][photos] Use platform install time for initial memories

aspizubb59ea32725b
diff --git a/mobile/apps/photos/lib/main.dart b/mobile/apps/photos/lib/main.dart
index 7942183f90..5637836155 100644
--- a/mobile/apps/photos/lib/main.dart
+++ b/mobile/apps/photos/lib/main.dart
@@ -491,8 +491,6 @@ Future<void> _init(
await Configuration.instance.init(preferences);
_logger.info("Configuration done $tlog");
- localSettings.getInstallDateTime();
-
_logger.info("Lockscreen init $tlog");
registerCryptoApi(const PhotosCryptoApiAdapter());
await LockScreenSettings.instance.init(
diff --git a/mobile/apps/photos/lib/services/memories_cache_service.dart b/mobile/apps/photos/lib/services/memories_cache_service.dart
index fe80006b00..72867229fa 100644
--- a/mobile/apps/photos/lib/services/memories_cache_service.dart
+++ b/mobile/apps/photos/lib/services/memories_cache_service.dart
@@ -46,6 +46,12 @@ import "package:photos/utils/ml_util.dart";
import "package:shared_preferences/shared_preferences.dart";
import "package:synchronized/synchronized.dart";
+bool _isWithinInitialMemoriesWindow(DateTime? installTime) {
+ if (installTime == null) return false;
+ final installAge = DateTime.now().difference(installTime);
+ return !installAge.isNegative && installAge < const Duration(days: 21);
+}
+
class MemoriesCacheService {
static const _lastMemoriesCacheUpdateTimeKey = "lastMemoriesCacheUpdateTime";
static const _showAnyMemoryKey = "memories.enabled";
@@ -845,8 +851,9 @@ class MemoriesCacheService {
Future<bool> _shouldForceInitialMemoriesRefresh() async {
if (!flagService.internalUser ||
localSettings.hasForcedInitialMemoriesRefresh() ||
- DateTime.now().difference(localSettings.getInstallDateTime()).inDays >=
- 21 ||
+ !_isWithinInitialMemoriesWindow(
+ ServiceLocator.instance.packageInfo.installTime,
+ ) ||
!await _isMlReady()) {
return false;
}
@@ -877,8 +884,9 @@ class MemoriesCacheService {
return;
}
if (localSettings.initialMemoriesNotificationScheduledAt() != null) return;
- if (DateTime.now().difference(localSettings.getInstallDateTime()).inDays >=
- 21) {
+ if (!_isWithinInitialMemoriesWindow(
+ ServiceLocator.instance.packageInfo.installTime,
+ )) {
await localSettings.markInitialMemoriesNotificationScheduled();
return;
}