π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
[mobile][photos] simplify memory lane eligibility status state
Priyanshu Dangare2095fd417dd6
diff --git a/mobile/apps/photos/lib/models/memory_lane/memory_lane_models.dart b/mobile/apps/photos/lib/models/memory_lane/memory_lane_models.dartindex ed07d9b846..421c8734c8 100644--- a/mobile/apps/photos/lib/models/memory_lane/memory_lane_models.dart+++ b/mobile/apps/photos/lib/models/memory_lane/memory_lane_models.dart@@ -1,27 +1,5 @@import "dart:convert";-enum MemoryLaneStatus { ready, ineligible }--MemoryLaneStatus memoryLaneStatusFromString(String value) {- switch (value) {- case "ready":- return MemoryLaneStatus.ready;- case "ineligible":- return MemoryLaneStatus.ineligible;- default:- throw ArgumentError.value(value, "value", "Unsupported timeline status");- }-}--String memoryLaneStatusToString(MemoryLaneStatus status) {- switch (status) {- case MemoryLaneStatus.ready:- return "ready";- case MemoryLaneStatus.ineligible:- return "ineligible";- }-}-class MemoryLaneEntry {final String faceId;final int fileId;@@ -55,23 +33,21 @@ class MemoryLaneEntry {class MemoryLanePersonTimeline {final String personId;late final bool isCluster;- final MemoryLaneStatus status;+ final bool isEligible;final int updatedAtMicros;final List<MemoryLaneEntry> entries;MemoryLanePersonTimeline({required this.personId,- required this.status,+ required this.isEligible,required this.updatedAtMicros,required this.entries,this.isCluster = false,});- bool get isReady => status == MemoryLaneStatus.ready;-Map<String, dynamic> toJson() => {"personId": personId,- "status": memoryLaneStatusToString(status),+ "status": isEligible ? "ready" : "ineligible","updatedAt": updatedAtMicros,"entries": entries.map((entry) => entry.toJson()).toList(),"isCluster": isCluster,@@ -81,7 +57,7 @@ class MemoryLanePersonTimeline {final Iterable entriesJson = json["entries"] as Iterable? ?? [];return MemoryLanePersonTimeline(personId: json["personId"] as String,- status: memoryLaneStatusFromString(json["status"] as String),+ isEligible: json["status"] == "ready",updatedAtMicros: json["updatedAt"] as int,entries: entriesJson.map(@@ -93,13 +69,13 @@ class MemoryLanePersonTimeline {}MemoryLanePersonTimeline copyWith({- MemoryLaneStatus? status,+ bool? isEligible,int? updatedAtMicros,List<MemoryLaneEntry>? entries,}) {return MemoryLanePersonTimeline(personId: personId,- status: status ?? this.status,+ isEligible: isEligible ?? this.isEligible,updatedAtMicros: updatedAtMicros ?? this.updatedAtMicros,entries: entries ?? this.entries,isCluster: isCluster,diff --git a/mobile/apps/photos/lib/services/memory_lane/memory_lane_service.dart b/mobile/apps/photos/lib/services/memory_lane/memory_lane_service.dartindex 3c4111ab34..9c5a78d246 100644--- a/mobile/apps/photos/lib/services/memory_lane/memory_lane_service.dart+++ b/mobile/apps/photos/lib/services/memory_lane/memory_lane_service.dart@@ -152,7 +152,7 @@ class MemoryLaneService {return;}final timeline = await _cacheService.getTimeline(personId);- if (timeline == null || !timeline.isReady || timeline.entries.isEmpty) {+ if (timeline == null || !timeline.isEligible || timeline.entries.isEmpty) {await _refreshReadyPersonIds();schedulePersonRecompute(personId);return;@@ -183,7 +183,7 @@ class MemoryLaneService {(entry) => hiddenFileIds.contains(entry.fileId),);if (!containsHiddenEntry) {- if (timeline.isReady && !await _areTimelineFaceCropsCached(timeline)) {+ if (timeline.isEligible && !await _areTimelineFaceCropsCached(timeline)) {_logger.info("Missing face crops for $personId");_queueTimelineCropReadiness(personId);await _refreshReadyPersonIds();@@ -209,7 +209,7 @@ class MemoryLaneService {Future<bool> _areTimelineFaceCropsCached(MemoryLanePersonTimeline timeline,) async {- if (!timeline.isReady || timeline.entries.isEmpty) {+ if (!timeline.isEligible || timeline.entries.isEmpty) {return false;}return areFullFaceCropsCached(@@ -248,7 +248,7 @@ class MemoryLaneService {return;}final timeline = await _cacheService.getTimeline(personId);- if (timeline == null || !timeline.isReady || timeline.entries.isEmpty) {+ if (timeline == null || !timeline.isEligible || timeline.entries.isEmpty) {await _refreshReadyPersonIds();return;}@@ -532,7 +532,7 @@ class MemoryLaneService {logicVersion: _timelineLogicVersion,),);- if (!timeline.isReady) {+ if (!timeline.isEligible) {await _refreshReadyPersonIds();return;}@@ -558,7 +558,7 @@ class MemoryLaneService {return (MemoryLanePersonTimeline(personId: personId,- status: MemoryLaneStatus.ineligible,+ isEligible: false,updatedAtMicros: nowMicros,entries: const [],),@@ -628,7 +628,7 @@ class MemoryLaneService {return (MemoryLanePersonTimeline(personId: personId,- status: MemoryLaneStatus.ineligible,+ isEligible: false,updatedAtMicros: nowMicros,entries: const [],),@@ -647,11 +647,11 @@ class MemoryLaneService {taskName: "faces_timeline_select",);- if (selectionResult["status"] != "ready") {+ if (!(selectionResult["isEligible"] as bool)) {return (MemoryLanePersonTimeline(personId: personId,- status: MemoryLaneStatus.ineligible,+ isEligible: false,updatedAtMicros: nowMicros,entries: const [],),@@ -675,7 +675,7 @@ class MemoryLaneService {return (MemoryLanePersonTimeline(personId: personId,- status: MemoryLaneStatus.ready,+ isEligible: true,updatedAtMicros: nowMicros,entries: entries,),@@ -749,7 +749,9 @@ class MemoryLaneService {}try {final timeline = await _cacheService.getTimeline(personId);- if (timeline == null || !timeline.isReady || timeline.entries.isEmpty) {+ if (timeline == null ||+ !timeline.isEligible ||+ timeline.entries.isEmpty) {return;}final entries = timeline.entries.take(frameCount).toList();@@ -794,7 +796,7 @@ class MemoryLaneService {final cache = await _cacheService.getCache();final current = <String>{};for (final timeline in cache.allTimelines) {- if (!timeline.isReady) {+ if (!timeline.isEligible) {continue;}if (await _areTimelineFaceCropsCached(timeline)) {@@ -860,7 +862,7 @@ Map<String, dynamic> _selectTimelineEntriesTask(Map<String, dynamic> param) {}if (faces.isEmpty) {- return {"status": "ineligible", "eligibleYearCount": 0};+ return {"isEligible": false, "eligibleYearCount": 0};}final eligible = groupBy(faces, (face) => face.year).entries@@ -868,7 +870,7 @@ Map<String, dynamic> _selectTimelineEntriesTask(Map<String, dynamic> param) {.sortedBy((a) => a.key);if (eligible.length < minYears) {- return {"status": "ineligible", "eligibleYearCount": eligible.length};+ return {"isEligible": false, "eligibleYearCount": eligible.length};}final selected = eligible@@ -879,7 +881,7 @@ Map<String, dynamic> _selectTimelineEntriesTask(Map<String, dynamic> param) {final years = eligible.map((entry) => entry.key).toList();- return {"status": "ready", "entries": selected, "years": years};+ return {"isEligible": true, "entries": selected, "years": years};}List<_TimelineFaceData> _pickFacesForYear(List<_TimelineFaceData> faces) {diff --git a/mobile/apps/photos/lib/ui/viewer/people/memory_lane_banner.dart b/mobile/apps/photos/lib/ui/viewer/people/memory_lane_banner.dartindex 7209511eb8..64f6e9ed69 100644--- a/mobile/apps/photos/lib/ui/viewer/people/memory_lane_banner.dart+++ b/mobile/apps/photos/lib/ui/viewer/people/memory_lane_banner.dart@@ -264,7 +264,7 @@ class _MemoryLaneBannerSectionState extends State<MemoryLaneBannerSection> {final loader =widget.loadTimeline ?? MemoryLaneService.instance.getTimeline;final timeline = await loader(widget.personId);- if (!mounted || timeline == null || !timeline.isReady) {+ if (!mounted || timeline == null || !timeline.isEligible) {_markThumbnailResolved();return;}diff --git a/mobile/apps/photos/lib/ui/viewer/people/memory_lane_page.dart b/mobile/apps/photos/lib/ui/viewer/people/memory_lane_page.dartindex 315d42c2b6..ad7a3135f6 100644--- a/mobile/apps/photos/lib/ui/viewer/people/memory_lane_page.dart+++ b/mobile/apps/photos/lib/ui/viewer/people/memory_lane_page.dart@@ -166,7 +166,9 @@ class _MemoryLanePageState extends State<MemoryLanePage>if (!mounted) {return;}- if (timeline == null || !timeline.isReady || timeline.entries.isEmpty) {+ if (timeline == null ||+ !timeline.isEligible ||+ timeline.entries.isEmpty) {setState(() {_timelineUnavailable = true;_allFramesLoaded = true;@@ -1125,7 +1127,9 @@ class _MemoryLanePageState extends State<MemoryLanePage>final timeline = await MemoryLaneService.instance.getTimeline(widget.person.remoteID,);- if (timeline == null || !timeline.isReady || timeline.entries.isEmpty) {+ if (timeline == null ||+ !timeline.isEligible ||+ timeline.entries.isEmpty) {await dialog.hide();if (context.mounted) {showShortToast(context, l10n.somethingWentWrong);