From defd88050d69639ca064c003156fda78c85ad90d Mon Sep 17 00:00:00 2001 From: ashilkn Date: Wed, 12 Feb 2025 19:36:58 +0530 Subject: [PATCH 1/2] [mobile][photos] Fix: show account owner's email in 'Link email' screen if it's not assigned to any person yet --- mobile/lib/ui/viewer/people/link_email_screen.dart | 3 +++ mobile/lib/ui/viewer/people/save_or_edit_person.dart | 2 ++ 2 files changed, 5 insertions(+) diff --git a/mobile/lib/ui/viewer/people/link_email_screen.dart b/mobile/lib/ui/viewer/people/link_email_screen.dart index bec48b4399..9a23c2ccb4 100644 --- a/mobile/lib/ui/viewer/people/link_email_screen.dart +++ b/mobile/lib/ui/viewer/people/link_email_screen.dart @@ -3,6 +3,7 @@ import "dart:async"; import "package:email_validator/email_validator.dart"; import 'package:flutter/material.dart'; import "package:logging/logging.dart"; +import "package:photos/core/configuration.dart"; import "package:photos/core/event_bus.dart"; import "package:photos/events/people_changed_event.dart"; import "package:photos/generated/l10n.dart"; @@ -247,7 +248,9 @@ class _LinkEmailScreen extends State { List _getContacts() { final usersEmailsToAviod = PersonService.instance.emailToPartialPersonDataMapCache.keys.toSet(); + final ownerEmail = Configuration.instance.getEmail(); final relevantUsers = UserService.instance.getRelevantContacts() + ..add(User(email: ownerEmail!)) ..removeWhere( (user) => usersEmailsToAviod.contains(user.email), ); diff --git a/mobile/lib/ui/viewer/people/save_or_edit_person.dart b/mobile/lib/ui/viewer/people/save_or_edit_person.dart index 40e346af38..9a3a158d34 100644 --- a/mobile/lib/ui/viewer/people/save_or_edit_person.dart +++ b/mobile/lib/ui/viewer/people/save_or_edit_person.dart @@ -988,7 +988,9 @@ class _EmailSectionState extends State<_EmailSection> { List _getContacts() { final usersEmailsToAviod = PersonService.instance.emailToPartialPersonDataMapCache.keys; + final ownerEmail = Configuration.instance.getEmail(); final relevantUsers = UserService.instance.getRelevantContacts() + ..add(User(email: ownerEmail!)) ..removeWhere( (user) => usersEmailsToAviod.contains(user.email), ); From 1c6efd4985590e3c1e7771f425b7a387e4fb7266 Mon Sep 17 00:00:00 2001 From: ashilkn Date: Wed, 12 Feb 2025 19:42:21 +0530 Subject: [PATCH 2/2] [mob][photos] Use better names --- mobile/lib/ui/viewer/people/link_email_screen.dart | 4 ++-- mobile/lib/ui/viewer/people/save_or_edit_person.dart | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mobile/lib/ui/viewer/people/link_email_screen.dart b/mobile/lib/ui/viewer/people/link_email_screen.dart index 9a23c2ccb4..bf610d0542 100644 --- a/mobile/lib/ui/viewer/people/link_email_screen.dart +++ b/mobile/lib/ui/viewer/people/link_email_screen.dart @@ -246,13 +246,13 @@ class _LinkEmailScreen extends State { } List _getContacts() { - final usersEmailsToAviod = + final userEmailsToAviod = PersonService.instance.emailToPartialPersonDataMapCache.keys.toSet(); final ownerEmail = Configuration.instance.getEmail(); final relevantUsers = UserService.instance.getRelevantContacts() ..add(User(email: ownerEmail!)) ..removeWhere( - (user) => usersEmailsToAviod.contains(user.email), + (user) => userEmailsToAviod.contains(user.email), ); relevantUsers.sort( diff --git a/mobile/lib/ui/viewer/people/save_or_edit_person.dart b/mobile/lib/ui/viewer/people/save_or_edit_person.dart index 9a3a158d34..9216801a20 100644 --- a/mobile/lib/ui/viewer/people/save_or_edit_person.dart +++ b/mobile/lib/ui/viewer/people/save_or_edit_person.dart @@ -986,13 +986,13 @@ class _EmailSectionState extends State<_EmailSection> { } List _getContacts() { - final usersEmailsToAviod = + final userEmailsToAviod = PersonService.instance.emailToPartialPersonDataMapCache.keys; final ownerEmail = Configuration.instance.getEmail(); final relevantUsers = UserService.instance.getRelevantContacts() ..add(User(email: ownerEmail!)) ..removeWhere( - (user) => usersEmailsToAviod.contains(user.email), + (user) => userEmailsToAviod.contains(user.email), ); relevantUsers.sort(