diff --git a/lib/generated/intl/messages_cs.dart b/lib/generated/intl/messages_cs.dart index 0799f30d7..58141f05f 100644 --- a/lib/generated/intl/messages_cs.dart +++ b/lib/generated/intl/messages_cs.dart @@ -24,6 +24,8 @@ class MessageLookup extends MessageLookupByLibrary { static Map _notInlinedMessages(_) => { "addToHiddenAlbum": MessageLookupByLibrary.simpleMessage("Add to hidden album"), + "deleteConfirmDialogBody": MessageLookupByLibrary.simpleMessage( + "This account is linked to other ente apps, if you use any.\\n\\nYour uploaded data, across all ente apps, will be scheduled for deletion, and your account will be permanently deleted."), "moveToHiddenAlbum": MessageLookupByLibrary.simpleMessage("Move to hidden album") }; diff --git a/lib/generated/intl/messages_de.dart b/lib/generated/intl/messages_de.dart index a16f83776..a8418a01e 100644 --- a/lib/generated/intl/messages_de.dart +++ b/lib/generated/intl/messages_de.dart @@ -503,6 +503,8 @@ class MessageLookup extends MessageLookupByLibrary { "deleteAlbumsDialogBody": MessageLookupByLibrary.simpleMessage( "Damit werden alle leeren Alben gelöscht. Dies ist nützlich, wenn du das Durcheinander in deiner Albenliste verringern möchtest."), "deleteAll": MessageLookupByLibrary.simpleMessage("Alle löschen"), + "deleteConfirmDialogBody": MessageLookupByLibrary.simpleMessage( + "This account is linked to other ente apps, if you use any.\\n\\nYour uploaded data, across all ente apps, will be scheduled for deletion, and your account will be permanently deleted."), "deleteEmailRequest": MessageLookupByLibrary.simpleMessage( "Bitte sende eine E-Mail an account-deletion@ente.io von Deiner bei uns hinterlegten E-Mail-Adresse."), "deleteEmptyAlbums": diff --git a/lib/generated/intl/messages_en.dart b/lib/generated/intl/messages_en.dart index 5362df384..f78d8c8d9 100644 --- a/lib/generated/intl/messages_en.dart +++ b/lib/generated/intl/messages_en.dart @@ -486,6 +486,8 @@ class MessageLookup extends MessageLookupByLibrary { "deleteAlbumsDialogBody": MessageLookupByLibrary.simpleMessage( "This will delete all empty albums. This is useful when you want to reduce the clutter in your album list."), "deleteAll": MessageLookupByLibrary.simpleMessage("Delete All"), + "deleteConfirmDialogBody": MessageLookupByLibrary.simpleMessage( + "This account is linked to other ente apps, if you use any.\\n\\nYour uploaded data, across all ente apps, will be scheduled for deletion, and your account will be permanently deleted."), "deleteEmailRequest": MessageLookupByLibrary.simpleMessage( "Please send an email to account-deletion@ente.io from your registered email address."), "deleteEmptyAlbums": diff --git a/lib/generated/intl/messages_es.dart b/lib/generated/intl/messages_es.dart index b8b63a78d..d7047bfff 100644 --- a/lib/generated/intl/messages_es.dart +++ b/lib/generated/intl/messages_es.dart @@ -451,6 +451,8 @@ class MessageLookup extends MessageLookupByLibrary { "deleteAlbumsDialogBody": MessageLookupByLibrary.simpleMessage( "Esto eliminará todos los álbunes vacíos. Esto es útil cuando quieres reducir el desorden en tu lista de álbumes."), "deleteAll": MessageLookupByLibrary.simpleMessage("Borrar Todo"), + "deleteConfirmDialogBody": MessageLookupByLibrary.simpleMessage( + "This account is linked to other ente apps, if you use any.\\n\\nYour uploaded data, across all ente apps, will be scheduled for deletion, and your account will be permanently deleted."), "deleteEmailRequest": MessageLookupByLibrary.simpleMessage( "Por favor, envíe un correo electrónico a account-deletion@ente.io desde su dirección de correo electrónico registrada."), "deleteEmptyAlbums": diff --git a/lib/generated/intl/messages_fr.dart b/lib/generated/intl/messages_fr.dart index 25c7cadff..fe1181277 100644 --- a/lib/generated/intl/messages_fr.dart +++ b/lib/generated/intl/messages_fr.dart @@ -509,6 +509,8 @@ class MessageLookup extends MessageLookupByLibrary { "deleteAlbumsDialogBody": MessageLookupByLibrary.simpleMessage( "Ceci supprimera tous les albums vides. Ceci est utile lorsque vous voulez réduire l\'encombrement dans votre liste d\'albums."), "deleteAll": MessageLookupByLibrary.simpleMessage("Tout Supprimer"), + "deleteConfirmDialogBody": MessageLookupByLibrary.simpleMessage( + "This account is linked to other ente apps, if you use any.\\n\\nYour uploaded data, across all ente apps, will be scheduled for deletion, and your account will be permanently deleted."), "deleteEmailRequest": MessageLookupByLibrary.simpleMessage( "Veuillez envoyer un e-mail à account-deletion@ente.io à partir de votre adresse e-mail enregistrée."), "deleteEmptyAlbums": diff --git a/lib/generated/intl/messages_it.dart b/lib/generated/intl/messages_it.dart index 72a088ace..3b5069230 100644 --- a/lib/generated/intl/messages_it.dart +++ b/lib/generated/intl/messages_it.dart @@ -501,6 +501,8 @@ class MessageLookup extends MessageLookupByLibrary { "deleteAlbumsDialogBody": MessageLookupByLibrary.simpleMessage( "Questo eliminerà tutti gli album vuoti. È utile quando si desidera ridurre l\'ingombro nella lista degli album."), "deleteAll": MessageLookupByLibrary.simpleMessage("Elimina tutto"), + "deleteConfirmDialogBody": MessageLookupByLibrary.simpleMessage( + "Questo account è collegato ad altre app di ente, se ne utilizzi.\\n\\nI tuoi dati caricati, su tutte le app di ente, saranno pianificati per la cancellazione e il tuo account verrà eliminato definitivamente."), "deleteEmailRequest": MessageLookupByLibrary.simpleMessage( "Invia un\'email a account-deletion@ente.io dal tuo indirizzo email registrato."), "deleteEmptyAlbums": diff --git a/lib/generated/intl/messages_ko.dart b/lib/generated/intl/messages_ko.dart index eeb3867f5..28c1bfbc5 100644 --- a/lib/generated/intl/messages_ko.dart +++ b/lib/generated/intl/messages_ko.dart @@ -24,6 +24,8 @@ class MessageLookup extends MessageLookupByLibrary { static Map _notInlinedMessages(_) => { "addToHiddenAlbum": MessageLookupByLibrary.simpleMessage("Add to hidden album"), + "deleteConfirmDialogBody": MessageLookupByLibrary.simpleMessage( + "This account is linked to other ente apps, if you use any.\\n\\nYour uploaded data, across all ente apps, will be scheduled for deletion, and your account will be permanently deleted."), "moveToHiddenAlbum": MessageLookupByLibrary.simpleMessage("Move to hidden album") }; diff --git a/lib/generated/intl/messages_nl.dart b/lib/generated/intl/messages_nl.dart index 10c93b8cd..b43dfe48a 100644 --- a/lib/generated/intl/messages_nl.dart +++ b/lib/generated/intl/messages_nl.dart @@ -501,6 +501,8 @@ class MessageLookup extends MessageLookupByLibrary { "deleteAlbumsDialogBody": MessageLookupByLibrary.simpleMessage( "Hiermee worden alle lege albums verwijderd. Dit is handig wanneer je rommel in je albumlijst wilt verminderen."), "deleteAll": MessageLookupByLibrary.simpleMessage("Alles Verwijderen"), + "deleteConfirmDialogBody": MessageLookupByLibrary.simpleMessage( + "Dit account is gekoppeld aan andere ente apps, als je er gebruik van maakt.\\n\\nJe geüploade gegevens worden in alle ente apps gepland voor verwijdering, en je account wordt permanent verwijderd voor alle ente diensten."), "deleteEmailRequest": MessageLookupByLibrary.simpleMessage( "Stuur een e-mail naar account-deletion@ente.io vanaf het door jou geregistreerde e-mailadres."), "deleteEmptyAlbums": diff --git a/lib/generated/intl/messages_no.dart b/lib/generated/intl/messages_no.dart index 78cba6687..55ad0641f 100644 --- a/lib/generated/intl/messages_no.dart +++ b/lib/generated/intl/messages_no.dart @@ -36,6 +36,8 @@ class MessageLookup extends MessageLookupByLibrary { "deleteAccount": MessageLookupByLibrary.simpleMessage("Slett konto"), "deleteAccountFeedbackPrompt": MessageLookupByLibrary.simpleMessage( "Vi er lei oss for at du forlater oss. Gi oss gjerne en tilbakemelding så vi kan forbedre oss."), + "deleteConfirmDialogBody": MessageLookupByLibrary.simpleMessage( + "This account is linked to other ente apps, if you use any.\\n\\nYour uploaded data, across all ente apps, will be scheduled for deletion, and your account will be permanently deleted."), "email": MessageLookupByLibrary.simpleMessage("E-post"), "enterValidEmail": MessageLookupByLibrary.simpleMessage( "Vennligst skriv inn en gyldig e-postadresse."), diff --git a/lib/generated/intl/messages_pl.dart b/lib/generated/intl/messages_pl.dart index 1d83300f3..6d1603c69 100644 --- a/lib/generated/intl/messages_pl.dart +++ b/lib/generated/intl/messages_pl.dart @@ -61,6 +61,8 @@ class MessageLookup extends MessageLookupByLibrary { "Przykro nam, że odchodzisz. Wyjaśnij nam, dlaczego nas opuszczasz, aby pomóc ulepszać nasze usługi."), "deleteAccountPermanentlyButton": MessageLookupByLibrary.simpleMessage("Usuń konto na stałe"), + "deleteConfirmDialogBody": MessageLookupByLibrary.simpleMessage( + "This account is linked to other ente apps, if you use any.\\n\\nYour uploaded data, across all ente apps, will be scheduled for deletion, and your account will be permanently deleted."), "deleteEmailRequest": MessageLookupByLibrary.simpleMessage( "Wyślij wiadomość e-mail na account-deletion@ente.io z zarejestrowanego adresu e-mail."), "deleteReason1": MessageLookupByLibrary.simpleMessage( diff --git a/lib/generated/intl/messages_pt.dart b/lib/generated/intl/messages_pt.dart index 22fa65dbc..73efa6ff3 100644 --- a/lib/generated/intl/messages_pt.dart +++ b/lib/generated/intl/messages_pt.dart @@ -157,6 +157,8 @@ class MessageLookup extends MessageLookupByLibrary { "deleteAlbum": MessageLookupByLibrary.simpleMessage("Excluir álbum"), "deleteAlbumDialog": MessageLookupByLibrary.simpleMessage( "Também excluir as fotos (e vídeos) presentes neste álbum de todos os outros álbuns dos quais eles fazem parte?"), + "deleteConfirmDialogBody": MessageLookupByLibrary.simpleMessage( + "This account is linked to other ente apps, if you use any.\\n\\nYour uploaded data, across all ente apps, will be scheduled for deletion, and your account will be permanently deleted."), "deleteEmailRequest": MessageLookupByLibrary.simpleMessage( "Por favor, envie um e-mail para account-deletion@ente.io a partir do seu endereço de e-mail registrado."), "deletePhotos": MessageLookupByLibrary.simpleMessage("Excluir fotos"), diff --git a/lib/generated/intl/messages_zh.dart b/lib/generated/intl/messages_zh.dart index fb91a7c24..5ed11e539 100644 --- a/lib/generated/intl/messages_zh.dart +++ b/lib/generated/intl/messages_zh.dart @@ -415,6 +415,8 @@ class MessageLookup extends MessageLookupByLibrary { "deleteAlbumsDialogBody": MessageLookupByLibrary.simpleMessage( "这将删除所有空相册。 当您想减少相册列表中的混乱时，这很有用。"), "deleteAll": MessageLookupByLibrary.simpleMessage("全部删除"), + "deleteConfirmDialogBody": MessageLookupByLibrary.simpleMessage( + "此账户已链接到其他 ente 旗下的应用程序（如果您使用任何 ente 旗下的应用程序）。\\n\\n您在所有 ente 旗下的应用程序中上传的数据将被安排删除，并且您的账户将被永久删除。"), "deleteEmailRequest": MessageLookupByLibrary.simpleMessage( "请从您注册的电子邮件地址发送电子邮件到 account-delettion@ente.io。"), "deleteEmptyAlbums": MessageLookupByLibrary.simpleMessage("删除空相册"), diff --git a/lib/generated/l10n.dart b/lib/generated/l10n.dart index 3ce3051b7..a38a81b41 100644 --- a/lib/generated/l10n.dart +++ b/lib/generated/l10n.dart @@ -190,17 +190,6 @@ class S { ); } - /// `This account is linked to other ente apps, if you use any.` - /// `Your uploaded data, across all ente apps, will be scheduled for deletion, and your account will be permanently deleted.` - String get deleteConfirmDialogBody { - return Intl.message( - 'This account is linked to other ente apps, if you use any.\n\nYour uploaded data, across all ente apps, will be scheduled for deletion, and your account will be permanently deleted.', - name: 'deleteConfirmDialogBody', - desc: '', - args: [], - ); - } - /// `Delete Account Permanently` String get deleteAccountPermanentlyButton { return Intl.message( @@ -7715,6 +7704,16 @@ class S { args: [], ); } + + /// `This account is linked to other ente apps, if you use any.\n\nYour uploaded data, across all ente apps, will be scheduled for deletion, and your account will be permanently deleted.` + String get deleteConfirmDialogBody { + return Intl.message( + 'This account is linked to other ente apps, if you use any.\\n\\nYour uploaded data, across all ente apps, will be scheduled for deletion, and your account will be permanently deleted.', + name: 'deleteConfirmDialogBody', + desc: '', + args: [], + ); + } } class AppLocalizationDelegate extends LocalizationsDelegate { diff --git a/lib/ui/tools/lock_screen.dart b/lib/ui/tools/lock_screen.dart index eb31be4d4..781700b62 100644 --- a/lib/ui/tools/lock_screen.dart +++ b/lib/ui/tools/lock_screen.dart @@ -23,10 +23,8 @@ class _LockScreenState extends State with WidgetsBindingObserver { void initState() { _logger.info("initState"); super.initState(); + _showLockScreen(source: "initState"); WidgetsBinding.instance.addObserver(this); - WidgetsBinding.instance!.addPostFrameCallback((_) { - _showLockScreen(source: "initState"); - }); } @override @@ -65,7 +63,7 @@ class _LockScreenState extends State with WidgetsBindingObserver { @override void didChangeAppLifecycleState(AppLifecycleState state) { _logger.info(state.toString()); - if (state == AppLifecycleState.resumed) { + if (state == AppLifecycleState.resumed && !_isShowingLockScreen) { // This is triggered either when the lock screen is dismissed or when // the app is brought to foreground _hasPlacedAppInBackground = false; @@ -97,19 +95,20 @@ class _LockScreenState extends State with WidgetsBindingObserver { } Future _showLockScreen({String source = ''}) async { - _logger.info("Showing lock screen $source"); + final int id = DateTime.now().millisecondsSinceEpoch; + _logger.info("Showing lock screen $source $id"); try { _isShowingLockScreen = true; final result = await requestAuthentication( context, S.of(context).authToViewYourMemories, ); + _logger.finest("LockScreen Result $result $id"); _isShowingLockScreen = false; if (result) { lastAuthenticatingTime = DateTime.now().millisecondsSinceEpoch; AppLock.of(context)!.didUnlock(); } else { - _logger.info("Dismissed"); if (!_hasPlacedAppInBackground) { // Treat this as a failure only if user did not explicitly // put the app in background