π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
fix(photos): refresh reviewed people suggestions
laurensprieme264995f995e
diff --git a/mobile/apps/photos/lib/events/people_changed_event.dart b/mobile/apps/photos/lib/events/people_changed_event.dartindex bb23f010cf..d421aa8936 100644--- a/mobile/apps/photos/lib/events/people_changed_event.dart+++ b/mobile/apps/photos/lib/events/people_changed_event.dart@@ -28,4 +28,5 @@ enum PeopleEventType {syncDone,saveOrEditPerson,addedClusterToPerson,+ reviewedSuggestion,}diff --git a/mobile/apps/photos/lib/ui/viewer/people/person_cluster_suggestion.dart b/mobile/apps/photos/lib/ui/viewer/people/person_cluster_suggestion.dartindex 5e66b85e72..d223cc4e19 100644--- a/mobile/apps/photos/lib/ui/viewer/people/person_cluster_suggestion.dart+++ b/mobile/apps/photos/lib/ui/viewer/people/person_cluster_suggestion.dart@@ -2,6 +2,7 @@ import "dart:async" show StreamSubscription, unawaited;import "dart:math";import "dart:typed_data";+import "package:ente_components/ente_components.dart";import "package:ente_strings/ente_strings.dart";import "package:flutter/foundation.dart" show kDebugMode;import "package:flutter/material.dart";@@ -15,8 +16,6 @@ import 'package:photos/services/machine_learning/face_ml/feedback/cluster_feedbaimport "package:photos/services/machine_learning/face_ml/person/person_service.dart";import "package:photos/services/machine_learning/ml_result.dart";import "package:photos/theme/ente_theme.dart";-import "package:photos/ui/components/buttons/button_widget.dart";-import "package:photos/ui/components/models/button_type.dart";import "package:photos/ui/viewer/people/cluster_page.dart";import "package:photos/ui/viewer/people/face_thumbnail_squircle.dart";import "package:photos/ui/viewer/people/file_face_widget.dart";@@ -199,33 +198,27 @@ class _PersonClustersState extends State<PersonReviewClusterSuggestion> {Row(children: <Widget>[Expanded(- child: ButtonWidget(- buttonType: ButtonType.tertiaryCritical,- icon: Icons.close,- labelText: context.strings.no,- buttonSize: ButtonSize.large,- onTap: () async => {- await _handleUserClusterChoice(- clusterID,- false,- numberOfDifferentSuggestions,- ),- },+ child: ButtonComponent(+ variant:+ ButtonComponentVariant.tertiaryCritical,+ leading: const Icon(Icons.close),+ label: context.strings.no,+ onTap: () => _handleUserClusterChoice(+ clusterID,+ false,+ numberOfDifferentSuggestions,+ ),),),const SizedBox(width: 12.0),Expanded(- child: ButtonWidget(- buttonType: ButtonType.primary,- labelText: context.strings.yes,- buttonSize: ButtonSize.large,- onTap: () async => {- await _handleUserClusterChoice(- clusterID,- true,- numberOfDifferentSuggestions,- ),- },+ child: ButtonComponent(+ label: context.strings.yes,+ onTap: () => _handleUserClusterChoice(+ clusterID,+ true,+ numberOfDifferentSuggestions,+ ),),),],@@ -288,6 +281,7 @@ class _PersonClustersState extends State<PersonReviewClusterSuggestion> {person: widget.person,clusterID: clusterID,);+ _notifySuggestionReviewed();// Increment the suggestion indexif (mounted) {setState(() => currentSuggestionIndex++);@@ -320,6 +314,7 @@ class _PersonClustersState extends State<PersonReviewClusterSuggestion> {personID: widget.person.remoteID,clusterID: clusterID,);+ _notifySuggestionReviewed();// Recalculate the suggestions when a suggestion is rejectedsetState(() {currentSuggestionIndex = 0;@@ -330,6 +325,16 @@ class _PersonClustersState extends State<PersonReviewClusterSuggestion> {});}+ void _notifySuggestionReviewed() {+ Bus.instance.fire(+ PeopleChangedEvent(+ person: widget.person,+ type: PeopleEventType.reviewedSuggestion,+ source: runtimeType.toString(),+ ),+ );+ }+Future<void> _saveAsAnotherPerson() async {if (!canGiveFeedback ||allSuggestions.isEmpty ||@@ -351,6 +356,7 @@ class _PersonClustersState extends State<PersonReviewClusterSuggestion> {if (result == null || result == false) {return;}+ _notifySuggestionReviewed();if (mounted) {setState(() => currentSuggestionIndex++);}@@ -559,6 +565,7 @@ class _PersonClustersState extends State<PersonReviewClusterSuggestion> {clusterID: lastFeedback.suggestion.clusterIDToMerge,);}+ _notifySuggestionReviewed();futureClusterSuggestions = futureClusterSuggestions.then((list) {return list.sublist(currentSuggestionIndex)diff --git a/mobile/apps/photos/lib/ui/viewer/people/person_gallery_suggestion.dart b/mobile/apps/photos/lib/ui/viewer/people/person_gallery_suggestion.dartindex a633c17ec5..a38be85884 100644--- a/mobile/apps/photos/lib/ui/viewer/people/person_gallery_suggestion.dart+++ b/mobile/apps/photos/lib/ui/viewer/people/person_gallery_suggestion.dart@@ -23,10 +23,13 @@ final _logger = Logger("PersonGallerySuggestion");class PersonGallerySuggestion extends StatefulWidget {final PersonEntity? person;final VoidCallback? onClose;+ final Future<List<ClusterSuggestion>> Function(PersonEntity person)?+ loadSuggestions;const PersonGallerySuggestion({required this.person,this.onClose,+ this.loadSuggestions,super.key,});@@ -45,6 +48,8 @@ class _PersonGallerySuggestionState extends State<PersonGallerySuggestion>bool isPreparingNext = false;bool hasCurrentSuggestion = false;Map<int, Map<int, Uint8List?>> precomputedFaceCrops = {};+ late final StreamSubscription<PeopleChangedEvent> _peopleChangedEvent;+ int _suggestionLoadID = 0;PersonEntity? person;bool get personPage => widget.person != null;@@ -60,6 +65,13 @@ class _PersonGallerySuggestionState extends State<PersonGallerySuggestion>super.initState();person = widget.person;_initializeAnimations();+ _peopleChangedEvent = Bus.instance.on<PeopleChangedEvent>().listen((event) {+ if (personPage &&+ event.type == PeopleEventType.reviewedSuggestion &&+ event.person?.remoteID == widget.person!.remoteID) {+ unawaited(_reloadSuggestions());+ }+ });_loadInitialSuggestion();}@@ -87,11 +99,15 @@ class _PersonGallerySuggestionState extends State<PersonGallerySuggestion>}Future<void> _loadInitialSuggestion() async {+ final loadID = ++_suggestionLoadID;try {late final List<ClusterSuggestion> suggestions;if (personPage) {- suggestions = await ClusterFeedbackService.instance- .getSuggestionForPerson(relevantPerson);+ suggestions =+ await (widget.loadSuggestions?.call(relevantPerson) ??+ ClusterFeedbackService.instance.getSuggestionForPerson(+ relevantPerson,+ ));} else {suggestions = await ClusterFeedbackService.instance.getAllLargePersonSuggestions();@@ -100,7 +116,7 @@ class _PersonGallerySuggestionState extends State<PersonGallerySuggestion>}}- if (suggestions.isNotEmpty && mounted) {+ if (suggestions.isNotEmpty && mounted && loadID == _suggestionLoadID) {allSuggestions = suggestions;currentSuggestionIndex = 0;@@ -109,7 +125,7 @@ class _PersonGallerySuggestionState extends State<PersonGallerySuggestion>allSuggestions[0].clusterIDToMerge,);- if (mounted) {+ if (mounted && loadID == _suggestionLoadID) {setState(() {faceCrops = crops;isLoading = false;@@ -117,23 +133,33 @@ class _PersonGallerySuggestionState extends State<PersonGallerySuggestion>});}- if (mounted && _fadeController != null && _slideController != null) {+ if (mounted &&+ loadID == _suggestionLoadID &&+ _fadeController != null &&+ _slideController != null) {unawaited(_fadeController?.forward());unawaited(_slideController?.forward());}- unawaited(_precomputeNextSuggestions());+ unawaited(_precomputeNextSuggestions(loadID));} else {_logger.info("No suggestions found");- if (mounted) {+ if (mounted && loadID == _suggestionLoadID) {setState(() {+ allSuggestions = [];+ currentSuggestionIndex = 0;+ faceCrops = {};+ precomputedFaceCrops = {};isLoading = false;+ isProcessing = false;+ isPreparingNext = false;+ hasCurrentSuggestion = false;});}}} catch (e, s) {_logger.severe("Error loading suggestion", e, s);- if (mounted) {+ if (mounted && loadID == _suggestionLoadID) {setState(() {isLoading = false;});@@ -141,7 +167,26 @@ class _PersonGallerySuggestionState extends State<PersonGallerySuggestion>}}- Future<void> _precomputeNextSuggestions() async {+ Future<void> _reloadSuggestions() async {+ _slideController?.reset();+ _fadeController?.reset();+ if (mounted) {+ setState(() {+ isLoading = true;+ isProcessing = false;+ isPreparingNext = false;+ hasCurrentSuggestion = false;+ allSuggestions = [];+ currentSuggestionIndex = 0;+ faceCrops = {};+ precomputedFaceCrops = {};+ });+ }+ await _loadInitialSuggestion();+ }++ Future<void> _precomputeNextSuggestions([int? expectedLoadID]) async {+ final loadID = expectedLoadID ?? _suggestionLoadID;try {// Precompute face crops for next two suggestionsconst maxPrecompute = 2;@@ -151,7 +196,7 @@ class _PersonGallerySuggestionState extends State<PersonGallerySuggestion>);for (int i = currentSuggestionIndex + 1; i < endIndex; i++) {- if (!mounted) break;+ if (!mounted || loadID != _suggestionLoadID) break;final suggestion = allSuggestions[i];final crops = await _generateFaceThumbnails(@@ -159,7 +204,7 @@ class _PersonGallerySuggestionState extends State<PersonGallerySuggestion>suggestion.clusterIDToMerge,);- if (mounted) {+ if (mounted && loadID == _suggestionLoadID) {precomputedFaceCrops[i] = crops;}}@@ -421,6 +466,8 @@ class _PersonGallerySuggestionState extends State<PersonGallerySuggestion>@overridevoid dispose() {+ _suggestionLoadID++;+ _peopleChangedEvent.cancel();_slideController?.dispose();_fadeController?.dispose();super.dispose();diff --git a/mobile/apps/photos/test/ui/viewer/people/person_gallery_suggestion_test.dart b/mobile/apps/photos/test/ui/viewer/people/person_gallery_suggestion_test.dartnew file mode 100644index 0000000000..fb512b9699--- /dev/null+++ b/mobile/apps/photos/test/ui/viewer/people/person_gallery_suggestion_test.dart@@ -0,0 +1,134 @@+import "dart:async";++import "package:ente_strings/ente_strings.dart";+import "package:flutter/material.dart";+import "package:flutter_test/flutter_test.dart";+import "package:photos/core/event_bus.dart";+import "package:photos/events/people_changed_event.dart";+import "package:photos/models/ml/face/person.dart";+import "package:photos/services/machine_learning/face_ml/feedback/cluster_feedback.dart";+import "package:photos/ui/viewer/people/person_gallery_suggestion.dart";++void main() {+ testWidgets("reloads after a suggestion is reviewed", (tester) async {+ final person = PersonEntity("person-1", PersonData(name: "Alex"));+ var suggestions = [+ ClusterSuggestion(person, "cluster-1", 0.1, false, [], []),+ ];++ await tester.pumpWidget(+ MaterialApp(+ localizationsDelegates: StringsLocalizations.localizationsDelegates,+ supportedLocales: StringsLocalizations.supportedLocales,+ home: Scaffold(+ body: PersonGallerySuggestion(+ person: person,+ loadSuggestions: (_) async => suggestions,+ ),+ ),+ ),+ );+ await tester.pumpAndSettle();++ expect(find.byKey(const ValueKey("suggestion_0")), findsOneWidget);++ suggestions = [];+ Bus.instance.fire(+ PeopleChangedEvent(+ person: person,+ type: PeopleEventType.reviewedSuggestion,+ ),+ );+ await tester.pumpAndSettle();++ expect(find.byKey(const ValueKey("suggestion_0")), findsNothing);+ });++ testWidgets("ignores reviews for another person", (tester) async {+ final person = PersonEntity("person-1", PersonData(name: "Alex"));+ final otherPerson = PersonEntity("person-2", PersonData(name: "Sam"));+ final suggestions = [+ ClusterSuggestion(person, "cluster-1", 0.1, false, [], []),+ ];+ var loadCount = 0;++ await tester.pumpWidget(+ MaterialApp(+ localizationsDelegates: StringsLocalizations.localizationsDelegates,+ supportedLocales: StringsLocalizations.supportedLocales,+ home: Scaffold(+ body: PersonGallerySuggestion(+ person: person,+ loadSuggestions: (_) async {+ loadCount++;+ return suggestions;+ },+ ),+ ),+ ),+ );+ await tester.pumpAndSettle();++ Bus.instance.fire(+ PeopleChangedEvent(+ person: otherPerson,+ type: PeopleEventType.reviewedSuggestion,+ ),+ );+ await tester.pumpAndSettle();++ expect(loadCount, 1);+ expect(find.byKey(const ValueKey("suggestion_0")), findsOneWidget);+ });++ testWidgets("keeps the latest review reload result", (tester) async {+ final person = PersonEntity("person-1", PersonData(name: "Alex"));+ final suggestion = ClusterSuggestion(+ person,+ "cluster-1",+ 0.1,+ false,+ [],+ [],+ );+ final firstReload = Completer<List<ClusterSuggestion>>();+ final secondReload = Completer<List<ClusterSuggestion>>();+ var loadCount = 0;++ await tester.pumpWidget(+ MaterialApp(+ localizationsDelegates: StringsLocalizations.localizationsDelegates,+ supportedLocales: StringsLocalizations.supportedLocales,+ home: Scaffold(+ body: PersonGallerySuggestion(+ person: person,+ loadSuggestions: (_) {+ loadCount++;+ return switch (loadCount) {+ 1 => Future.value([suggestion]),+ 2 => firstReload.future,+ _ => secondReload.future,+ };+ },+ ),+ ),+ ),+ );+ await tester.pumpAndSettle();++ final event = PeopleChangedEvent(+ person: person,+ type: PeopleEventType.reviewedSuggestion,+ );+ Bus.instance.fire(event);+ Bus.instance.fire(event);+ await tester.pump();++ secondReload.complete([]);+ await tester.pumpAndSettle();+ firstReload.complete([suggestion]);+ await tester.pumpAndSettle();++ expect(find.byKey(const ValueKey("suggestion_0")), findsNothing);+ });+}