diff --git a/lib/main.dart b/lib/main.dart index 44796f49..56fea02f 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -277,7 +277,7 @@ class _AppState extends State with WidgetsBindingObserver { @override void didChangeAppLifecycleState(AppLifecycleState state) async { - await LocalizationService.processLocals(context); + if(state == AppLifecycleState.resumed) await _initializeNotificationService(); } @override diff --git a/lib/shared/services/localization/localization_service.dart b/lib/shared/services/localization/localization_service.dart index 818a2338..7c974263 100644 --- a/lib/shared/services/localization/localization_service.dart +++ b/lib/shared/services/localization/localization_service.dart @@ -1,4 +1,4 @@ -// ignore_for_file: curly_braces_in_flow_control_structures +// ignore_for_file: curly_braces_in_flow_control_structures, use_build_context_synchronously, unrelated_type_equality_checks import 'dart:developer'; @@ -204,14 +204,6 @@ class LocalizationService { final bool isAuthenticated = userUUID.isNotEmpty && devUUID.isNotEmpty; final bool isDevLinked = !errorMsg.contains('Esse dispositivo nao pertence a esse usuario'); log('() => isLinked: $errorMsg'); - if (isAuthenticated && isDevLinked) await DialogUtil.error(context, errorMsg).whenComplete(() async => await selectLocal(context)); - if (isAuthenticated && !isDevLinked) { - errorMsg = FFLocalizations.of(context).getVariableText( - ptText: 'Não foi possível vincular o dispositivo, tente novamente', - enText: 'Unable to link device, try again', - ); - await DialogUtil.warning(context, errorMsg); - } if (!isAuthenticated) { errorMsg = FFLocalizations.of(context).getVariableText( ptText: 'Erro ao obter credenciais de autenticação', @@ -220,6 +212,15 @@ class LocalizationService { await DialogUtil.error(context, errorMsg); // await DialogUtil.error(context, errorMsg).whenComplete(() async => await AuthenticationService.signOut(context)); } + else if (isAuthenticated && !isDevLinked) { + errorMsg = FFLocalizations.of(context).getVariableText( + ptText: 'Não foi possível vincular o dispositivo, tente novamente', + enText: 'Unable to link device, try again', + ); + await DialogUtil.warning(context, errorMsg); + } + else if (isAuthenticated && isDevLinked) await DialogUtil.error(context, errorMsg).whenComplete(() async => await selectLocal(context)); + } static Future _handleUnavailable(BuildContext context, List locals) async {