diff --git a/mobile/lib/ui/viewer/people/link_email_screen.dart b/mobile/lib/ui/viewer/people/link_email_screen.dart index bec48b4399..bf610d0542 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"; @@ -245,11 +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 40e346af38..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,11 +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(