Skip to content

armgit / ente

Public Imported from GitHub
0

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

[mobile][photos] simplify task cancellation in memory lane service

Priyanshu Dangare43df0fbfae61
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.dart
index 1cccaaf879..3c735eb76c 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
@@ -121,13 +121,13 @@ class MemoryLaneService {
if (personId.isEmpty) {
return;
}
- _pendingRequests[personId] = _TimelineRequest(
- (_pendingRequests[personId]?.force ?? false) || force,
- );
+ if (_pendingRequests.containsKey(personId)) {
+ return;
+ }
+ final request = _TimelineRequest(force);
+ _pendingRequests[personId] = request;
_precomputeQueue
.addTask(personId, () async {
- final request = _pendingRequests[personId];
- if (request == null) return;
try {
await _recomputeTimelineForPerson(
personId,
@@ -135,9 +135,7 @@ class MemoryLaneService {
request: request,
);
} finally {
- if (identical(_pendingRequests[personId], request)) {
- _pendingRequests.remove(personId);
- }
+ _pendingRequests.remove(personId);
}
})
.catchError((e, s) {
@@ -294,7 +292,7 @@ class MemoryLaneService {
}
Future<void> _removeTimeline(String id) async {
- _pendingRequests.remove(id);
+ _pendingRequests[id]?.cancelled = true;
await _cacheService.removeTimeline(id);
await _refreshReadyPersonIds();
}
@@ -538,7 +536,7 @@ class MemoryLaneService {
_eligibleCreationTimeCutoffMicros(person?.data.birthDate),
isCluster: isCluster,
);
- if (!identical(_pendingRequests[personId], request)) {
+ if (request.cancelled) {
return;
}
await _cacheService.upsertTimeline(timeline);
@@ -890,8 +888,9 @@ class MemoryLaneService {
class _TimelineRequest {
final bool force;
+ bool cancelled = false;
- const _TimelineRequest(this.force);
+ _TimelineRequest(this.force);
}
class _TimelineFaceData {