kenmirrors/ente
1
0
Fork 0
mirror of https://github.com/ente-io/ente.git synced 2025-08-08 23:39:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

[mobile][photos] Fix: show account owner's email in 'Link email' screen if it's not assigned to any person yet (#5045)

Browse Source
This commit is contained in:
Ashil 2025-02-12 19:46:57 +05:30 committed by GitHub
commit 526b5da40f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mobile/lib/ui/viewer/people/link_email_screen.dart
View File

@ -3,6 +3,7 @@ import "dart:async";
import "package:email_validator/email_validator.dart"; import "package:email_validator/email_validator.dart";
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import "package:logging/logging.dart"; import "package:logging/logging.dart";
import "package:photos/core/configuration.dart";
import "package:photos/core/event_bus.dart"; import "package:photos/core/event_bus.dart";
import "package:photos/events/people_changed_event.dart"; import "package:photos/events/people_changed_event.dart";
import "package:photos/generated/l10n.dart"; import "package:photos/generated/l10n.dart";
@ -245,11 +246,13 @@ class _LinkEmailScreen extends State<LinkEmailScreen> {
} }
List<User> _getContacts() { List<User> _getContacts() {
final usersEmailsToAviod = final userEmailsToAviod =
PersonService.instance.emailToPartialPersonDataMapCache.keys.toSet(); PersonService.instance.emailToPartialPersonDataMapCache.keys.toSet();
final ownerEmail = Configuration.instance.getEmail();
final relevantUsers = UserService.instance.getRelevantContacts() final relevantUsers = UserService.instance.getRelevantContacts()
..add(User(email: ownerEmail!))
..removeWhere( ..removeWhere(
(user) => usersEmailsToAviod.contains(user.email), (user) => userEmailsToAviod.contains(user.email),
); );
relevantUsers.sort( relevantUsers.sort(

6
mobile/lib/ui/viewer/people/save_or_edit_person.dart
View File

@ -986,11 +986,13 @@ class _EmailSectionState extends State<_EmailSection> {
} }
List<User> _getContacts() { List<User> _getContacts() {
final usersEmailsToAviod = final userEmailsToAviod =
PersonService.instance.emailToPartialPersonDataMapCache.keys; PersonService.instance.emailToPartialPersonDataMapCache.keys;
final ownerEmail = Configuration.instance.getEmail();
final relevantUsers = UserService.instance.getRelevantContacts() final relevantUsers = UserService.instance.getRelevantContacts()
..add(User(email: ownerEmail!))
..removeWhere( ..removeWhere(
(user) => usersEmailsToAviod.contains(user.email), (user) => userEmailsToAviod.contains(user.email),
); );
relevantUsers.sort( relevantUsers.sort(