diff --git a/lib/backend/notifications/notification_service.dart b/lib/backend/notifications/notification_service.dart index ca716f72..92aa3cfc 100644 --- a/lib/backend/notifications/notification_service.dart +++ b/lib/backend/notifications/notification_service.dart @@ -181,7 +181,7 @@ Future onMessageReceived(Map payload, String? extra, Stri FFLocalizations.of(context).getVariableText( enText: 'Name', ptText: 'Nome', - ): payload['PES_NOME'].toString(), + ): payload['PES_NOME'] != null ? payload['PES_NOME'].toString() : payload['USR_NOME'].toString(), FFLocalizations.of(context).getVariableText( enText: 'Type', ptText: 'Tipo', diff --git a/lib/components/templates_components/provisional_schedule_template/provisional_shcedule_template_widget.dart b/lib/components/templates_components/provisional_schedule_template/provisional_shcedule_template_widget.dart index f8379f7f..f4266b3f 100644 --- a/lib/components/templates_components/provisional_schedule_template/provisional_shcedule_template_widget.dart +++ b/lib/components/templates_components/provisional_schedule_template/provisional_shcedule_template_widget.dart @@ -1,3 +1,5 @@ +import 'dart:developer'; + import 'package:cached_network_image/cached_network_image.dart'; import 'package:easy_debounce/easy_debounce.dart'; import 'package:flutter/material.dart'; @@ -61,9 +63,7 @@ class _ScheduleProvisionalVisitPageWidgetState extends State { }, ), title: Text( - FFLocalizations.of(context).getVariableText( - enText: 'Delivery Schedule', - ptText: 'Agendar Entregas', - ), + FFLocalizations.of(context).getVariableText(enText: 'Delivery Schedule', ptText: 'Agendar Entregas'), style: FlutterFlowTheme.of(context).headlineMedium.override( fontFamily: 'Nunito', color: FlutterFlowTheme.of(context).primaryText, diff --git a/lib/pages/preferences_settings_page/preferences_settings_model.dart b/lib/pages/preferences_settings_page/preferences_settings_model.dart index c5a5388a..36ffd920 100644 --- a/lib/pages/preferences_settings_page/preferences_settings_model.dart +++ b/lib/pages/preferences_settings_page/preferences_settings_model.dart @@ -1,3 +1,5 @@ +import 'dart:developer'; + import 'package:flutter/material.dart'; import 'package:hub/backend/api_requests/api_calls.dart'; import 'package:hub/components/templates_components/change_passs_qr_code_pass_key_template_component/change_pass_widget.dart'; @@ -45,23 +47,32 @@ class PreferencesPageModel with ChangeNotifier { ); onConfirm() async { String content; - try { - content = FFLocalizations.of(context).getVariableText( - enText: 'Notification changed successfully', - ptText: 'Notificação alterada com sucesso', - ); - context.pop(); - SnackBarUtil.showSnackBar(context, content); - StorageUtil().notify = !StorageUtil().notify; - notifyListeners(); - } catch (err) { + String value = StorageUtil().notify ? 'N' : 'S'; + await PhpGroup.changeNotifica.call(notifica: value).then((value) async { + if (value.jsonBody['error'] == false) { + StorageUtil().notify = !StorageUtil().notify; + notifyListeners(); + content = FFLocalizations.of(context).getVariableText( + enText: 'Notification changed successfully', + ptText: 'Notificação alterada com sucesso', + ); + SnackBarUtil.showSnackBar(context, content); + } else { + content = FFLocalizations.of(context).getVariableText( + enText: 'Error changing notification', + ptText: 'Erro ao alterar notificação', + ); + SnackBarUtil.showSnackBar(context, content, isError: true); + } + }).catchError((e, s) { + log('toggleNotify', error: e, stackTrace: s); content = FFLocalizations.of(context).getVariableText( enText: 'Error changing notification', ptText: 'Erro ao alterar notificação', ); - context.pop(); SnackBarUtil.showSnackBar(context, content, isError: true); - } + }).whenComplete(() => notifyListeners()); + context.pop(); } showAlertDialog(context, title, content, onConfirm); diff --git a/lib/shared/services/authentication/authentication_service.dart b/lib/shared/services/authentication/authentication_service.dart index 90830254..391a625f 100644 --- a/lib/shared/services/authentication/authentication_service.dart +++ b/lib/shared/services/authentication/authentication_service.dart @@ -84,6 +84,7 @@ class AuthenticationService { DialogUtil.errorDefault(context); } else { DialogUtil.error(context, response.jsonBody['error_msg'].toString()); + DialogUtil.error(context, response.jsonBody['error_msg'].toString()); } } } @@ -162,6 +163,7 @@ class AuthenticationService { } catch (e, s) { DialogUtil.errorDefault(context); LogUtil.requestAPIFailed('forgotPassword.php', email, "Forgot Password", e, s); + LogUtil.requestAPIFailed('forgotPassword.php', email, "Forgot Password", e, s); } } @@ -183,6 +185,7 @@ class AuthenticationService { } catch (e, s) { DialogUtil.errorDefault(context); LogUtil.requestAPIFailed('changePassword.php', email, "Change Password", e, s); + LogUtil.requestAPIFailed('changePassword.php', email, "Change Password", e, s); } } diff --git a/lib/shared/utils/storage_util.dart b/lib/shared/utils/storage_util.dart index 72c7ac18..ec0dcb3d 100644 --- a/lib/shared/utils/storage_util.dart +++ b/lib/shared/utils/storage_util.dart @@ -161,6 +161,7 @@ class StorageUtil { Future initSecureStorage() async { log('SecureStorageHelper: Starting initialization'); try { + if (_initialized) _secureStorage = SecureStorageHelper(); if (_initialized) _secureStorage = SecureStorageHelper(); _email = await _secureStorage.getString('fre_email'); _passwd = await _secureStorage.getString('fre_passwd'); @@ -172,6 +173,7 @@ class StorageUtil { _fingerprintPass = await _secureStorage.getString('fre_fingerprintPass'); _haveLocal = await _secureStorage.getBool('fre_have_local') ?? false; _deviceDescription = await _secureStorage.getString('fre_deviceDescription'); + _deviceDescription = await _secureStorage.getString('fre_deviceDescription'); } catch (e, s) { log('SecureStorageHelper: Error during initialization: $e'); LogUtil.requestAPIFailed('$UniqueKey', '$UniqueKey', 'SecureStorageHelper', e, s);