diff --git a/lib/components/organism_components/bottom_arrow_linked_locals_component/bottom_arrow_linked_locals_component_widget.dart b/lib/components/organism_components/bottom_arrow_linked_locals_component/bottom_arrow_linked_locals_component_widget.dart index 6dc7b85b..2286cc0a 100644 --- a/lib/components/organism_components/bottom_arrow_linked_locals_component/bottom_arrow_linked_locals_component_widget.dart +++ b/lib/components/organism_components/bottom_arrow_linked_locals_component/bottom_arrow_linked_locals_component_widget.dart @@ -107,13 +107,13 @@ class _BottomArrowLinkedLocalsComponentWidgetState if (isEnabled) { final local = locals[0]; - await StorageHelper() + await StorageRepositoryImpl() .set(ProfileStorageKey.clientName.key, local['CLI_NOME']); - await StorageHelper() + await StorageRepositoryImpl() .set(ProfileStorageKey.ownerName.key, local['CLU_OWNER_DSC']); - await StorageHelper() + await StorageRepositoryImpl() .set(ProfileStorageKey.clientUUID.key, local['CLI_ID']); - await StorageHelper() + await StorageRepositoryImpl() .set(ProfileStorageKey.ownerUUID.key, local['CLU_OWNER_ID']); context.pop(); @@ -145,7 +145,8 @@ class _BottomArrowLinkedLocalsComponentWidgetState Future _fetchResponseLink(String status, String cliID) async { try { - await StorageHelper().set(ProfileStorageKey.clientUUID.key, cliID); + await StorageRepositoryImpl() + .set(ProfileStorageKey.clientUUID.key, cliID); var response = await PhpGroup.resopndeVinculo.call(tarefa: status); if (response.jsonBody['error'] == false) { @@ -156,7 +157,7 @@ class _BottomArrowLinkedLocalsComponentWidgetState enText: "Link Activated Successfully") }; } else { - await StorageHelper().set(ProfileStorageKey.clientUUID.key, ''); + await StorageRepositoryImpl().set(ProfileStorageKey.clientUUID.key, ''); return response.jsonBody; } } catch (e, s) { @@ -208,13 +209,13 @@ class _BottomArrowLinkedLocalsComponentWidgetState statusHashMap: [_statusHashMap(local)], onTapCardItemAction: () async { if (local['CLU_STATUS'] == 'A') { - await StorageHelper() + await StorageRepositoryImpl() .set(ProfileStorageKey.clientUUID.key, local['CLI_ID']); - await StorageHelper() + await StorageRepositoryImpl() .set(ProfileStorageKey.clientName.key, local['CLI_NOME']); - await StorageHelper() + await StorageRepositoryImpl() .set(ProfileStorageKey.ownerName.key, local['CLU_OWNER_DSC']); - await StorageHelper() + await StorageRepositoryImpl() .set(ProfileStorageKey.ownerUUID.key, local['CLU_OWNER_ID']); context.pop(true); diff --git a/lib/components/organism_components/schedule_visit_detail/schedule_visit_detail_model.dart b/lib/components/organism_components/schedule_visit_detail/schedule_visit_detail_model.dart index 734cb294..a1e4b4bf 100644 --- a/lib/components/organism_components/schedule_visit_detail/schedule_visit_detail_model.dart +++ b/lib/components/organism_components/schedule_visit_detail/schedule_visit_detail_model.dart @@ -58,11 +58,15 @@ class ScheduleVisitDetailModel } Future initDB() async { - devUUID = (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? ''; + devUUID = + (await StorageRepositoryImpl().get(ProfileStorageKey.devUUID.key)) ?? + ''; userUUID = - (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.userUUID.key)) ?? + ''; cliUUID = - (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.clientUUID.key)) ?? + ''; } @override diff --git a/lib/components/organism_components/up_arrow_linked_locals_component/up_arrow_linked_locals_component_model.dart b/lib/components/organism_components/up_arrow_linked_locals_component/up_arrow_linked_locals_component_model.dart index be8b36d1..fd45ad3b 100644 --- a/lib/components/organism_components/up_arrow_linked_locals_component/up_arrow_linked_locals_component_model.dart +++ b/lib/components/organism_components/up_arrow_linked_locals_component/up_arrow_linked_locals_component_model.dart @@ -16,13 +16,18 @@ class UpArrowLinkedLocalsComponentModel } Future initDB() async { - devUUID = (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? ''; + devUUID = + (await StorageRepositoryImpl().get(ProfileStorageKey.devUUID.key)) ?? + ''; userUUID = - (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.userUUID.key)) ?? + ''; cliUUID = - (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.clientUUID.key)) ?? + ''; cliName = - (await StorageHelper().get(ProfileStorageKey.clientName.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.clientName.key)) ?? + ''; } @override diff --git a/lib/components/templates_components/access_notification_modal_template_component/access_notification_modal_template_component_model.dart b/lib/components/templates_components/access_notification_modal_template_component/access_notification_modal_template_component_model.dart index 03352151..1d872c2d 100644 --- a/lib/components/templates_components/access_notification_modal_template_component/access_notification_modal_template_component_model.dart +++ b/lib/components/templates_components/access_notification_modal_template_component/access_notification_modal_template_component_model.dart @@ -32,11 +32,15 @@ class AccessNotificationModalTemplateComponentModel } Future initDB() async { - devUUID = (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? ''; + devUUID = + (await StorageRepositoryImpl().get(ProfileStorageKey.devUUID.key)) ?? + ''; userUUID = - (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.userUUID.key)) ?? + ''; cliUUID = - (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.clientUUID.key)) ?? + ''; } @override diff --git a/lib/components/templates_components/change_passs_qr_code_pass_key_template_component/change_pass_widget.dart b/lib/components/templates_components/change_passs_qr_code_pass_key_template_component/change_pass_widget.dart index d4938cff..9260e4a7 100644 --- a/lib/components/templates_components/change_passs_qr_code_pass_key_template_component/change_pass_widget.dart +++ b/lib/components/templates_components/change_passs_qr_code_pass_key_template_component/change_pass_widget.dart @@ -49,7 +49,8 @@ class _PassKeyTemplateWidgetState extends State { Future _initialize() async { _accessPass = - await StorageHelper().get(SecureStorageKey.accessPass.value) ?? ''; + await StorageRepositoryImpl().get(SecureStorageKey.accessPass.value) ?? + ''; } @override diff --git a/lib/components/templates_components/liberation_history_item_details_template_component/liberation_history_item_details_template_component_model.dart b/lib/components/templates_components/liberation_history_item_details_template_component/liberation_history_item_details_template_component_model.dart index 0fefa607..21be638e 100644 --- a/lib/components/templates_components/liberation_history_item_details_template_component/liberation_history_item_details_template_component_model.dart +++ b/lib/components/templates_components/liberation_history_item_details_template_component/liberation_history_item_details_template_component_model.dart @@ -27,11 +27,15 @@ class LiberationHistoryItemDetailsTemplateComponentModel void initState(BuildContext context) {} Future initDatabase() async { - devUUID = (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? ''; + devUUID = + (await StorageRepositoryImpl().get(ProfileStorageKey.devUUID.key)) ?? + ''; userUUID = - (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.userUUID.key)) ?? + ''; cliUUID = - (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.clientUUID.key)) ?? + ''; ; } diff --git a/lib/components/templates_components/provisional_schedule_template/provisional_schedule_template_model.dart b/lib/components/templates_components/provisional_schedule_template/provisional_schedule_template_model.dart index c1e82767..9d738419 100644 --- a/lib/components/templates_components/provisional_schedule_template/provisional_schedule_template_model.dart +++ b/lib/components/templates_components/provisional_schedule_template/provisional_schedule_template_model.dart @@ -147,15 +147,21 @@ class ScheduleProvisionalVisitPageModel } Future init() async { - devUUID = (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? ''; + devUUID = + (await StorageRepositoryImpl().get(ProfileStorageKey.devUUID.key)) ?? + ''; userUUID = - (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.userUUID.key)) ?? + ''; cliUUID = - (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.clientUUID.key)) ?? + ''; ownerName = - (await StorageHelper().get(ProfileStorageKey.ownerName.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.ownerName.key)) ?? + ''; ownerUUID = - (await StorageHelper().get(ProfileStorageKey.ownerUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.ownerUUID.key)) ?? + ''; setState?.call(); } } diff --git a/lib/components/templates_components/regisiter_vistor_template_component/regisiter_vistor_template_component_model.dart b/lib/components/templates_components/regisiter_vistor_template_component/regisiter_vistor_template_component_model.dart index acff7931..4240befd 100644 --- a/lib/components/templates_components/regisiter_vistor_template_component/regisiter_vistor_template_component_model.dart +++ b/lib/components/templates_components/regisiter_vistor_template_component/regisiter_vistor_template_component_model.dart @@ -135,11 +135,15 @@ class RegisiterVistorTemplateComponentModel } Future initializeDatabase() async { - devUUID = (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? ''; + devUUID = + (await StorageRepositoryImpl().get(ProfileStorageKey.devUUID.key)) ?? + ''; userUUID = - (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.userUUID.key)) ?? + ''; cliUUID = - (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.clientUUID.key)) ?? + ''; ; } diff --git a/lib/components/templates_components/sign_up_template_component/sign_up_template_component_widget.dart b/lib/components/templates_components/sign_up_template_component/sign_up_template_component_widget.dart index 3ad2c626..0b64bf27 100644 --- a/lib/components/templates_components/sign_up_template_component/sign_up_template_component_widget.dart +++ b/lib/components/templates_components/sign_up_template_component/sign_up_template_component_widget.dart @@ -94,8 +94,9 @@ class _SignUpTemplateComponentWidgetState } Future _initialize() async { - _deviceType = - (await StorageHelper().get(SecureStorageKey.deviceType.value)) ?? ''; + _deviceType = (await StorageRepositoryImpl() + .get(SecureStorageKey.deviceType.value)) ?? + ''; } @override diff --git a/lib/components/templates_components/view_visit_detail/view_visit_detail_model.dart b/lib/components/templates_components/view_visit_detail/view_visit_detail_model.dart index d115ada3..dc92ba8f 100644 --- a/lib/components/templates_components/view_visit_detail/view_visit_detail_model.dart +++ b/lib/components/templates_components/view_visit_detail/view_visit_detail_model.dart @@ -36,11 +36,15 @@ class ViewVisitDetailModel extends FlutterFlowModel { } Future initializeDatabase() async { - devUUID = (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? ''; + devUUID = + (await StorageRepositoryImpl().get(ProfileStorageKey.devUUID.key)) ?? + ''; userUUID = - (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.userUUID.key)) ?? + ''; cliUUID = - (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.clientUUID.key)) ?? + ''; ; } diff --git a/lib/components/templates_components/visitor_search_modal_template_component/visitor_search_modal_template_component_model.dart b/lib/components/templates_components/visitor_search_modal_template_component/visitor_search_modal_template_component_model.dart index 17cc8baf..3d573b22 100644 --- a/lib/components/templates_components/visitor_search_modal_template_component/visitor_search_modal_template_component_model.dart +++ b/lib/components/templates_components/visitor_search_modal_template_component/visitor_search_modal_template_component_model.dart @@ -38,11 +38,15 @@ class VisitorSearchModalTemplateComponentModel } Future initDatabase() async { - devUUID = (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? ''; + devUUID = + (await StorageRepositoryImpl().get(ProfileStorageKey.devUUID.key)) ?? + ''; userUUID = - (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.userUUID.key)) ?? + ''; cliUUID = - (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.clientUUID.key)) ?? + ''; ; } diff --git a/lib/features/auth/authentication_service.dart b/lib/features/auth/authentication_service.dart index 12393545..e427a48d 100644 --- a/lib/features/auth/authentication_service.dart +++ b/lib/features/auth/authentication_service.dart @@ -28,10 +28,12 @@ class AuthenticationService { List locals = response.jsonBody['locais'] ?? []; if (locals.isEmpty) { - await StorageHelper().set(SecureStorageKey.haveLocal.value, false); + await StorageRepositoryImpl() + .set(SecureStorageKey.haveLocal.value, false); context.go('/receptionPage'); } else { - await StorageHelper().set(SecureStorageKey.isLogged.value, true); + await StorageRepositoryImpl() + .set(SecureStorageKey.isLogged.value, true); context .go('/homePage', extra: {'update': LocalsRepositoryImpl().update}); } @@ -51,7 +53,7 @@ class AuthenticationService { final ApiCallResponse? response; final LoginCall callback = PhpGroup.loginCall; String deviceDescription = randomString(10, 10, true, false, false); - await StorageHelper() + await StorageRepositoryImpl() .set(SecureStorageKey.deviceDescription.value, deviceDescription); final String? devUUID; @@ -67,9 +69,11 @@ class AuthenticationService { devUUID = await DeviceUtil.getDevUUID(); if ((email != '') && (passwd != '')) { - await StorageHelper().set(SecureStorageKey.email.value, email); - await StorageHelper().set(SecureStorageKey.password.value, passwd); - await StorageHelper().set(ProfileStorageKey.devUUID.key, devUUID!); + await StorageRepositoryImpl().set(SecureStorageKey.email.value, email); + await StorageRepositoryImpl() + .set(SecureStorageKey.password.value, passwd); + await StorageRepositoryImpl() + .set(ProfileStorageKey.devUUID.key, devUUID!); response = await callback.call(); if (response.jsonBody['error'] == false) { @@ -78,11 +82,14 @@ class AuthenticationService { userDevUUID = response.jsonBody['user']['dev_id']; userName = response.jsonBody['user']['name']; - await StorageHelper().set(ProfileStorageKey.userUUID.key, userUUID); - await StorageHelper() + await StorageRepositoryImpl() + .set(ProfileStorageKey.userUUID.key, userUUID); + await StorageRepositoryImpl() .set(ProfileStorageKey.userDevUUID.key, userDevUUID); - await StorageHelper().set(ProfileStorageKey.status.key, status); - await StorageHelper().set(ProfileStorageKey.userName.key, userName); + await StorageRepositoryImpl() + .set(ProfileStorageKey.status.key, status); + await StorageRepositoryImpl() + .set(ProfileStorageKey.userName.key, userName); await login(context); } else { @@ -149,8 +156,8 @@ class AuthenticationService { ), }; - await StorageHelper().clean(Storage.databaseStorage); - await StorageHelper().clean(Storage.secureStorage); + await StorageRepositoryImpl().clean(Storage.databaseStorage); + await StorageRepositoryImpl().clean(Storage.secureStorage); await LicenseRepositoryImpl().cleanLicense(); DatabaseService.isInitialized = false; await DatabaseService.instance.init(); diff --git a/lib/features/backend/api_requests/api_calls.dart b/lib/features/backend/api_requests/api_calls.dart index b5665bea..24f88aa2 100644 --- a/lib/features/backend/api_requests/api_calls.dart +++ b/lib/features/backend/api_requests/api_calls.dart @@ -70,11 +70,14 @@ class GetProvSchedules { Future call(final String page, final String status) async { final String baseUrl = PhpGroup.getBaseUrl(); final String devUUID = - (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.devUUID.key)) ?? + ''; final String userUUID = - (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.userUUID.key)) ?? + ''; final String cliID = - (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.clientUUID.key)) ?? + ''; const String atividade = 'getAgendamentoProv'; const String pageSize = '10'; final bool isFiltered = status != '' && status != '.*'; @@ -108,11 +111,14 @@ class GetOpenedVisits { Future call(final String page) async { final String baseUrl = PhpGroup.getBaseUrl(); final String devUUID = - (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.devUUID.key)) ?? + ''; final String userUUID = - (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.userUUID.key)) ?? + ''; final String cliID = - (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.clientUUID.key)) ?? + ''; const String atividade = 'getOpenedVisits'; const String pageSize = '10'; return await ApiManager.instance.makeApiCall( @@ -143,11 +149,12 @@ class GetResidentsByProperty { Future call(final String page) async { final String baseUrl = PhpGroup.getBaseUrl(); final String devUUID = - await StorageHelper().get(ProfileStorageKey.devUUID.key) ?? ''; + await StorageRepositoryImpl().get(ProfileStorageKey.devUUID.key) ?? ''; final String userUUID = - await StorageHelper().get(ProfileStorageKey.userUUID.key) ?? ''; + await StorageRepositoryImpl().get(ProfileStorageKey.userUUID.key) ?? ''; final String cliID = - await StorageHelper().get(ProfileStorageKey.clientUUID.key) ?? ''; + await StorageRepositoryImpl().get(ProfileStorageKey.clientUUID.key) ?? + ''; const String atividade = 'getResidentsByProperty'; const String pageSize = '10'; return await ApiManager.instance.makeApiCall( @@ -177,11 +184,14 @@ class GetVehiclesByProperty { Future call(final String page) async { final String baseUrl = PhpGroup.getBaseUrl(); final String devUUID = - (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.devUUID.key)) ?? + ''; final String userUUID = - (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.userUUID.key)) ?? + ''; final String cliID = - (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.clientUUID.key)) ?? + ''; const String atividade = 'getVehiclesByProperty'; const String pageSize = '10'; return await ApiManager.instance.makeApiCall( @@ -213,11 +223,14 @@ class GetLicense { Future call() async { final String baseUrl = PhpGroup.getBaseUrl(); final String devUUID = - (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.devUUID.key)) ?? + ''; final String userUUID = - (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.userUUID.key)) ?? + ''; final String cliID = - (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.clientUUID.key)) ?? + ''; return await ApiManager.instance.makeApiCall( callName: 'getLicense', @@ -247,9 +260,11 @@ class UnregisterDevice { Future call() async { final String baseUrl = PhpGroup.getBaseUrl(); final String devUUID = - (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.devUUID.key)) ?? + ''; final String userUUID = - (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.userUUID.key)) ?? + ''; return await ApiManager.instance.makeApiCall( callName: 'unregisterDevice', @@ -277,11 +292,14 @@ class DeletePet { Future call({final int? petID = 0}) async { final String baseUrl = PhpGroup.getBaseUrl(); final String devUUID = - (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.devUUID.key)) ?? + ''; final String userUUID = - (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.userUUID.key)) ?? + ''; final String cliID = - (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.clientUUID.key)) ?? + ''; const String atividade = 'excluirPet'; return await ApiManager.instance.makeApiCall( @@ -325,11 +343,14 @@ class UpdatePet { final String baseUrl = PhpGroup.getBaseUrl(); final String devUUID = - (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.devUUID.key)) ?? + ''; final String userUUID = - (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.userUUID.key)) ?? + ''; final String cliID = - (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.clientUUID.key)) ?? + ''; const String atividade = 'atualizarPet'; return await ApiManager.instance.makeApiCall( @@ -376,11 +397,14 @@ class GetPets { final String baseUrl = PhpGroup.getBaseUrl(); final String devUUID = - (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.devUUID.key)) ?? + ''; final String userUUID = - (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.userUUID.key)) ?? + ''; final String cliID = - (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.clientUUID.key)) ?? + ''; const String atividade = 'consultaPets'; return await ApiManager.instance.makeApiCall( @@ -413,11 +437,14 @@ class GetPetPhoto { final String baseUrl = PhpGroup.getBaseUrl(); final String devUUID = - (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.devUUID.key)) ?? + ''; final String userUUID = - (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.userUUID.key)) ?? + ''; final String cliID = - (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.clientUUID.key)) ?? + ''; const String atividade = 'consultaFotoPet'; return await ApiManager.instance.makeApiCall( @@ -459,11 +486,14 @@ class RegisterPet { final String baseUrl = PhpGroup.getBaseUrl(); final String devUUID = - (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.devUUID.key)) ?? + ''; final String userUUID = - (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.userUUID.key)) ?? + ''; final String cliID = - (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.clientUUID.key)) ?? + ''; const String atividade = 'cadastrarPet'; return await ApiManager.instance.makeApiCall( @@ -509,11 +539,14 @@ class BuscaEnconcomendas { final String? status, }) async { final String devUUID = - (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.devUUID.key)) ?? + ''; final String userUUID = - (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.userUUID.key)) ?? + ''; final String cliID = - (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.clientUUID.key)) ?? + ''; const String atividade = 'getEncomendas'; final String baseUrl = PhpGroup.getBaseUrl(); @@ -556,11 +589,14 @@ class CancelaVisita { final String baseUrl = PhpGroup.getBaseUrl(); final String devUUID = - (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.devUUID.key)) ?? + ''; final String userUUID = - (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.userUUID.key)) ?? + ''; final String cliID = - (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.clientUUID.key)) ?? + ''; const String atividade = 'cancelaVisita'; return await ApiManager.instance.makeApiCall( @@ -593,9 +629,11 @@ class CancelaVisita { class DeleteAccount { Future call() async { final String devUUID = - (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.devUUID.key)) ?? + ''; final String userUUID = - (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.userUUID.key)) ?? + ''; final String baseUrl = PhpGroup.getBaseUrl(); return await ApiManager.instance.makeApiCall( @@ -627,11 +665,14 @@ class ChangePanic { final String baseUrl = PhpGroup.getBaseUrl(); final String devUUID = - (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.devUUID.key)) ?? + ''; final String userUUID = - (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.userUUID.key)) ?? + ''; final String cliID = - (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.clientUUID.key)) ?? + ''; const String atividade = 'updVisitado'; return await ApiManager.instance.makeApiCall( @@ -666,11 +707,14 @@ class ChangePass { final String baseUrl = PhpGroup.getBaseUrl(); final String devUUID = - (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.devUUID.key)) ?? + ''; final String userUUID = - (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.userUUID.key)) ?? + ''; final String cliID = - (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.clientUUID.key)) ?? + ''; const String atividade = 'updVisitado'; return await ApiManager.instance.makeApiCall( @@ -705,11 +749,14 @@ class RespondeVinculo { final String baseUrl = PhpGroup.getBaseUrl(); final String devUUID = - (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.devUUID.key)) ?? + ''; final String userUUID = - (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.userUUID.key)) ?? + ''; final String cliID = - (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.clientUUID.key)) ?? + ''; return await ApiManager.instance.makeApiCall( callName: 'respondeVinculo', @@ -742,11 +789,14 @@ class ChangeNotifica { final String baseUrl = PhpGroup.getBaseUrl(); final String devUUID = - (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.devUUID.key)) ?? + ''; final String userUUID = - (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.userUUID.key)) ?? + ''; final String cliID = - (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.clientUUID.key)) ?? + ''; const String atividade = 'updVisitado'; return await ApiManager.instance.makeApiCall( @@ -779,13 +829,17 @@ class UpdateIDE { final String baseUrl = PhpGroup.getBaseUrl(); final String devUUID = - (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.devUUID.key)) ?? + ''; final String userUUID = - (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.userUUID.key)) ?? + ''; final String cliUUID = - (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? ''; - final String newIde = - (await StorageHelper().get(ProfileStorageKey.userDevUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.clientUUID.key)) ?? + ''; + final String newIde = (await StorageRepositoryImpl() + .get(ProfileStorageKey.userDevUUID.key)) ?? + ''; const String atividade = 'updVisitado'; return await ApiManager.instance.makeApiCall( @@ -818,11 +872,13 @@ class UpdToken { final String baseUrl = PhpGroup.getBaseUrl(); final String devUUID = - (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.devUUID.key)) ?? + ''; final String userUUID = - (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.userUUID.key)) ?? + ''; final String token = - (await StorageHelper().get(SecureStorageKey.token.value)) ?? ''; + (await StorageRepositoryImpl().get(SecureStorageKey.token.value)) ?? ''; return await ApiManager.instance.makeApiCall( callName: 'updToken', @@ -850,16 +906,19 @@ class LoginCall { Future call() async { final String baseUrl = PhpGroup.getBaseUrl(); final String devUUID = - (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? ''; - final String email = - (await StorageHelper().get(SecureStorageKey.email.value)) ?? ''; - final String password = - (await StorageHelper().get(SecureStorageKey.password.value)) ?? ''; - final String type = - (await StorageHelper().get(SecureStorageKey.deviceType.value)) ?? ''; - final String description = - (await StorageHelper().get(SecureStorageKey.deviceDescription.value)) ?? + (await StorageRepositoryImpl().get(ProfileStorageKey.devUUID.key)) ?? ''; + final String email = + (await StorageRepositoryImpl().get(SecureStorageKey.email.value)) ?? ''; + final String password = + (await StorageRepositoryImpl().get(SecureStorageKey.password.value)) ?? + ''; + final String type = (await StorageRepositoryImpl() + .get(SecureStorageKey.deviceType.value)) ?? + ''; + final String description = (await StorageRepositoryImpl() + .get(SecureStorageKey.deviceDescription.value)) ?? + ''; late final String token; try { token = await FirebaseMessagingService.getToken(); @@ -943,11 +1002,14 @@ class ChangePasswordCall { }) async { final String baseUrl = PhpGroup.getBaseUrl(); final String devUUID = - (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.devUUID.key)) ?? + ''; final String userUUID = - (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.userUUID.key)) ?? + ''; final String cliID = - (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.clientUUID.key)) ?? + ''; return await ApiManager.instance.makeApiCall( callName: 'changePassword', @@ -1007,9 +1069,9 @@ class GetLocalsCall { final String baseUrl = PhpGroup.getBaseUrl(); final String devUUID = - await StorageHelper().get(ProfileStorageKey.devUUID.key) ?? ''; + await StorageRepositoryImpl().get(ProfileStorageKey.devUUID.key) ?? ''; final String userUUID = - await StorageHelper().get(ProfileStorageKey.userUUID.key) ?? ''; + await StorageRepositoryImpl().get(ProfileStorageKey.userUUID.key) ?? ''; return await ApiManager.instance .makeApiCall( @@ -1051,11 +1113,14 @@ class PostScheduleVisitorCall { final String baseUrl = PhpGroup.getBaseUrl(); final String devUUID = - (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.devUUID.key)) ?? + ''; final String userUUID = - (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.userUUID.key)) ?? + ''; final String cliID = - (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.clientUUID.key)) ?? + ''; const String atividade = 'putVisitante'; return await ApiManager.instance.makeApiCall( @@ -1109,11 +1174,14 @@ class PostScheduleVisitCall { final String baseUrl = PhpGroup.getBaseUrl(); final String devUUID = - (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.devUUID.key)) ?? + ''; final String userUUID = - (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.userUUID.key)) ?? + ''; final String cliID = - (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.clientUUID.key)) ?? + ''; const String atividade = 'putVisita'; return await ApiManager.instance.makeApiCall( @@ -1166,11 +1234,14 @@ class GetScheduleVisitCall { final String baseUrl = PhpGroup.getBaseUrl(); final String devUUID = - (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.devUUID.key)) ?? + ''; final String userUUID = - (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.userUUID.key)) ?? + ''; final String cliUUID = - (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.clientUUID.key)) ?? + ''; const String atividade = 'getVisitas'; return await ApiManager.instance.makeApiCall( @@ -1443,11 +1514,14 @@ class GetDadosCall { final String baseUrl = PhpGroup.getBaseUrl(); final String devUUID = - (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.devUUID.key)) ?? + ''; final String userUUID = - (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.userUUID.key)) ?? + ''; final String cliUUID = - (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.clientUUID.key)) ?? + ''; const String atividade = 'getDados'; return await ApiManager.instance @@ -1691,11 +1765,14 @@ class GetVisitorByDocCall { final String baseUrl = PhpGroup.getBaseUrl(); final String devUUID = - (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.devUUID.key)) ?? + ''; final String userUUID = - (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.userUUID.key)) ?? + ''; final String cliID = - (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.clientUUID.key)) ?? + ''; const String atividade = 'getVisitante'; return await ApiManager.instance.makeApiCall( @@ -1748,11 +1825,14 @@ class GetFotoVisitanteCall { final String baseUrl = PhpGroup.getBaseUrl(); final String devUUID = - (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.devUUID.key)) ?? + ''; final String userUUID = - (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.userUUID.key)) ?? + ''; final String cliID = - (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.clientUUID.key)) ?? + ''; const String atividade = 'getFotoVisitante'; return await ApiManager.instance.makeApiCall( @@ -1790,11 +1870,14 @@ class PostProvVisitSchedulingCall { final String baseUrl = PhpGroup.getBaseUrl(); final String devUUID = - (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.devUUID.key)) ?? + ''; final String userUUID = - (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.userUUID.key)) ?? + ''; final String cliID = - (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.clientUUID.key)) ?? + ''; const String atividade = 'putAgendamentoProv'; return await ApiManager.instance.makeApiCall( @@ -1842,11 +1925,14 @@ class GetVisitsCall { final String baseUrl = PhpGroup.getBaseUrl(); final String devUUID = - (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.devUUID.key)) ?? + ''; final String userUUID = - (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.userUUID.key)) ?? + ''; final String cliID = - (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.clientUUID.key)) ?? + ''; const String atividade = 'getVisitas'; return await ApiManager.instance.makeApiCall( @@ -2108,11 +2194,14 @@ class DeleteVisitCall { final String baseUrl = PhpGroup.getBaseUrl(); final String devUUID = - (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.devUUID.key)) ?? + ''; final String userUUID = - (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.userUUID.key)) ?? + ''; final String cliID = - (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.clientUUID.key)) ?? + ''; const String atividade = 'cancelaVisita'; return await ApiManager.instance.makeApiCall( @@ -2154,13 +2243,17 @@ class GetPessoasLocalCall { final String baseUrl = PhpGroup.getBaseUrl(); final String devUUID = - (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.devUUID.key)) ?? + ''; final String ownerUUID = - (await StorageHelper().get(ProfileStorageKey.ownerUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.ownerUUID.key)) ?? + ''; final String userUUID = - (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.userUUID.key)) ?? + ''; final String cliUUID = - (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.clientUUID.key)) ?? + ''; return await ApiManager.instance.makeApiCall( callName: 'getPessoasLocal', @@ -2224,11 +2317,14 @@ class RespondeSolicitacaoCall { final String baseUrl = PhpGroup.getBaseUrl(); final String devUUID = - (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.devUUID.key)) ?? + ''; final String userUUID = - (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.userUUID.key)) ?? + ''; final String cliUUID = - (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.clientUUID.key)) ?? + ''; const String atividade = 'respondeSolicitacao'; return await ApiManager.instance.makeApiCall( @@ -2277,11 +2373,14 @@ class GetAccessCall { final String baseUrl = PhpGroup.getBaseUrl(); final String devUUID = - (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.devUUID.key)) ?? + ''; final String userUUID = - (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.userUUID.key)) ?? + ''; final String cliUUID = - (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.clientUUID.key)) ?? + ''; const String atividade = 'getAcessos'; return await ApiManager.instance.makeApiCall( @@ -2529,11 +2628,14 @@ class GetLiberationsCall { Future.microtask(() async { final String devUUID = - (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.devUUID.key)) ?? + ''; final String userUUID = - (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? ''; - final String cliUUID = - (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.userUUID.key)) ?? + ''; + final String cliUUID = (await StorageRepositoryImpl() + .get(ProfileStorageKey.clientUUID.key)) ?? + ''; const String atividade = 'getSolicitacoes'; try { @@ -2724,11 +2826,14 @@ class GetMessagesCall { final String baseUrl = PhpGroup.getBaseUrl(); final String devUUID = - (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.devUUID.key)) ?? + ''; final String userUUID = - (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.userUUID.key)) ?? + ''; final String cliUUID = - (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.clientUUID.key)) ?? + ''; const String atividade = 'getMensagens'; return await ApiManager.instance.makeApiCall( diff --git a/lib/features/history/presentation/blocs/access_history_bloc.dart b/lib/features/history/presentation/blocs/access_history_bloc.dart index 9e5bd113..a1f193ff 100644 --- a/lib/features/history/presentation/blocs/access_history_bloc.dart +++ b/lib/features/history/presentation/blocs/access_history_bloc.dart @@ -32,11 +32,15 @@ class AcessHistoryPageModel extends FlutterFlowModel { } Future initDatabase() async { - devUUID = (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? ''; + devUUID = + (await StorageRepositoryImpl().get(ProfileStorageKey.devUUID.key)) ?? + ''; userUUID = - (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.userUUID.key)) ?? + ''; cliUUID = - (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.clientUUID.key)) ?? + ''; } @override diff --git a/lib/features/history/presentation/blocs/provisional_history_bloc.dart b/lib/features/history/presentation/blocs/provisional_history_bloc.dart index 3c6b0d9e..67e5d0c1 100644 --- a/lib/features/history/presentation/blocs/provisional_history_bloc.dart +++ b/lib/features/history/presentation/blocs/provisional_history_bloc.dart @@ -47,11 +47,14 @@ class ProvisionalHistoryBloc ) async { emit(state.copyWith(isLoading: true)); final devUUID = - (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.devUUID.key)) ?? + ''; final userUUID = - (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.userUUID.key)) ?? + ''; final cliUUID = - (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.clientUUID.key)) ?? + ''; emit(state.copyWith( devUUID: devUUID, userUUID: userUUID, diff --git a/lib/features/home/presentation/blocs/home_bloc.dart b/lib/features/home/presentation/blocs/home_bloc.dart index c7b69418..9a12e337 100644 --- a/lib/features/home/presentation/blocs/home_bloc.dart +++ b/lib/features/home/presentation/blocs/home_bloc.dart @@ -18,15 +18,19 @@ class HomeBloc extends Bloc { Future _onHomeEvent(HomeEvent event, Emitter emit) async { final devUUID = - (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.devUUID.key)) ?? + ''; final userUUID = - (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.userUUID.key)) ?? + ''; final cliUUID = - (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.clientUUID.key)) ?? + ''; final userName = - (await StorageHelper().get(ProfileStorageKey.userName.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.userName.key)) ?? + ''; final userEmail = - (await StorageHelper().get(SecureStorageKey.email.value)) ?? ''; + (await StorageRepositoryImpl().get(SecureStorageKey.email.value)) ?? ''; emit(state.copyWith( devUUID: devUUID, diff --git a/lib/features/local/data/data_sources/locals_local_data_source.dart b/lib/features/local/data/data_sources/locals_local_data_source.dart index cac9e924..660ce5ac 100644 --- a/lib/features/local/data/data_sources/locals_local_data_source.dart +++ b/lib/features/local/data/data_sources/locals_local_data_source.dart @@ -24,7 +24,7 @@ class LocalsLocalDataSourceImpl implements LocalsLocalDataSource { @override Future get(String key) async { final String? local = - await StorageHelper().get(ProfileStorageKey.clientUUID.key); + await StorageRepositoryImpl().get(ProfileStorageKey.clientUUID.key); var response = await DatabaseService.database.query( LocalsConstants.tableLocalsKeychain, where: 'key = ? AND local = ?', @@ -40,7 +40,7 @@ class LocalsLocalDataSourceImpl implements LocalsLocalDataSource { try { var date = DateTime.now().toIso8601String(); final String? local = - await StorageHelper().get(ProfileStorageKey.clientUUID.key); + await StorageRepositoryImpl().get(ProfileStorageKey.clientUUID.key); await DatabaseService.database.insert( LocalsConstants.tableLocalsKeychain, @@ -61,7 +61,7 @@ class LocalsLocalDataSourceImpl implements LocalsLocalDataSource { @override Future delete(String key) async { final String? local = - await StorageHelper().get(ProfileStorageKey.clientUUID.key); + await StorageRepositoryImpl().get(ProfileStorageKey.clientUUID.key); await DatabaseService.database.delete(LocalsConstants.tableLocalsKeychain, where: 'key = ? AND local = ?', whereArgs: [key, local]); } diff --git a/lib/features/local/data/data_sources/locals_remote_data_source.dart b/lib/features/local/data/data_sources/locals_remote_data_source.dart index bf4b710b..a8b2233f 100644 --- a/lib/features/local/data/data_sources/locals_remote_data_source.dart +++ b/lib/features/local/data/data_sources/locals_remote_data_source.dart @@ -56,12 +56,14 @@ class LocalsRemoteDataSourceImpl implements LocalsRemoteDataSource { final bool isEnable = !isEmpty && isActive; if (isEnable) { - await StorageHelper().set(SecureStorageKey.haveLocal.value, true); - await StorageHelper().set(SecureStorageKey.isLogged.value, true); + await StorageRepositoryImpl() + .set(SecureStorageKey.haveLocal.value, true); + await StorageRepositoryImpl() + .set(SecureStorageKey.isLogged.value, true); await WidgetsBinding.instance.endOfFrame; - await StorageHelper().set(ProfileStorageKey.clientUUID.key, ''); - await StorageHelper().set(ProfileStorageKey.ownerUUID.key, ''); - StorageHelper().context?.go('/homePage'); + await StorageRepositoryImpl().set(ProfileStorageKey.clientUUID.key, ''); + await StorageRepositoryImpl().set(ProfileStorageKey.ownerUUID.key, ''); + StorageRepositoryImpl().context?.go('/homePage'); } } catch (e, s) { log(e.toString(), stackTrace: s); @@ -146,9 +148,11 @@ class LocalsRemoteDataSourceImpl implements LocalsRemoteDataSource { @override Future checkLocals(BuildContext context) async { String cliUUID = - (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.clientUUID.key)) ?? + ''; String cliName = - (await StorageHelper().get(ProfileStorageKey.clientName.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.clientName.key)) ?? + ''; return cliUUID.isEmpty && cliName.isEmpty; } @@ -223,9 +227,12 @@ class LocalsRemoteDataSourceImpl implements LocalsRemoteDataSource { final bool status = await PhpGroup.resopndeVinculo.call(tarefa: 'I').then((value) async { if (value.jsonBody['error'] == false) { - await StorageHelper().set(ProfileStorageKey.clientName.key, ''); - await StorageHelper().set(ProfileStorageKey.ownerName.key, ''); - await StorageHelper().set(ProfileStorageKey.clientUUID.key, ''); + await StorageRepositoryImpl() + .set(ProfileStorageKey.clientName.key, ''); + await StorageRepositoryImpl() + .set(ProfileStorageKey.ownerName.key, ''); + await StorageRepositoryImpl() + .set(ProfileStorageKey.clientUUID.key, ''); context.pop(); context.go('/homePage', extra: {'update': LocalsRepositoryImpl().update}); diff --git a/lib/features/local/data/repositories/locals_repository_impl.dart b/lib/features/local/data/repositories/locals_repository_impl.dart index 2dd08bf2..5c5fd0a6 100644 --- a/lib/features/local/data/repositories/locals_repository_impl.dart +++ b/lib/features/local/data/repositories/locals_repository_impl.dart @@ -38,16 +38,16 @@ class LocalsRepositoryImpl implements LocalsRepository { } Future unselect() async { - await StorageHelper().set(ProfileStorageKey.clientUUID.key, ''); - await StorageHelper().set(ProfileStorageKey.clientName.key, ''); - await StorageHelper().set(ProfileStorageKey.ownerName.key, ''); + await StorageRepositoryImpl().set(ProfileStorageKey.clientUUID.key, ''); + await StorageRepositoryImpl().set(ProfileStorageKey.clientName.key, ''); + await StorageRepositoryImpl().set(ProfileStorageKey.ownerName.key, ''); } Future check(BuildContext context) async { final String? cliUUID = - await StorageHelper().get(ProfileStorageKey.clientUUID.key); + await StorageRepositoryImpl().get(ProfileStorageKey.clientUUID.key); final String? ownerUUID = - await StorageHelper().get(ProfileStorageKey.ownerUUID.key); + await StorageRepositoryImpl().get(ProfileStorageKey.ownerUUID.key); final bool haveCli = cliUUID != null && cliUUID.isNotEmpty; final bool haveOwner = ownerUUID != null && ownerUUID.isNotEmpty; if (!haveCli && !haveOwner) { @@ -78,7 +78,7 @@ class LocalsRepositoryImpl implements LocalsRepository { } Future _handleUpdateError(BuildContext context) async { - await StorageHelper().set(ProfileStorageKey.clientUUID.key, ''); + await StorageRepositoryImpl().set(ProfileStorageKey.clientUUID.key, ''); const String errorMsg = 'Erro ao atualizar locais'; await DialogUtil.error(context, errorMsg); } @@ -92,7 +92,7 @@ class LocalsRepositoryImpl implements LocalsRepository { Future unlinkLocal(BuildContext context) async { final bool response = await remoteDataSource.detachLocal(context); if (!response) return; - unselect(); + await unselect(); context.pop(); context.go('/homePage', extra: {'update': update}); await update(context); diff --git a/lib/features/local/presentation/blocs/local_profile_bloc.dart b/lib/features/local/presentation/blocs/local_profile_bloc.dart index bca9c819..3bce66d6 100644 --- a/lib/features/local/presentation/blocs/local_profile_bloc.dart +++ b/lib/features/local/presentation/blocs/local_profile_bloc.dart @@ -41,11 +41,14 @@ class LocalProfileBloc extends Bloc { Future _onLocalProfileEvent( LocalProfileEvent event, Emitter emit) async { final cliName = - (await StorageHelper().get(ProfileStorageKey.clientName.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.clientName.key)) ?? + ''; final ownerName = - (await StorageHelper().get(ProfileStorageKey.ownerName.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.ownerName.key)) ?? + ''; final cliUUID = - (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.clientUUID.key)) ?? + ''; emit(state.copyWith( cliName: cliName, cliUUID: cliUUID, ownerName: ownerName)); } @@ -72,11 +75,14 @@ class LocalProfileComponentModel Future getData() async { cliName = - (await StorageHelper().get(ProfileStorageKey.clientName.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.clientName.key)) ?? + ''; ownerName = - (await StorageHelper().get(ProfileStorageKey.ownerName.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.ownerName.key)) ?? + ''; cliUUID = - (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.clientUUID.key)) ?? + ''; setStateCallback?.call(); } diff --git a/lib/features/local/utils/local_util.dart b/lib/features/local/utils/local_util.dart index 202e911a..c7ab1664 100644 --- a/lib/features/local/utils/local_util.dart +++ b/lib/features/local/utils/local_util.dart @@ -12,9 +12,9 @@ import 'package:hub/shared/utils/log_util.dart'; class LocalUtil { static void handleError(BuildContext context, String errorMsg) async { final String devUUID = - await StorageHelper().get(ProfileStorageKey.devUUID.key) ?? ''; + await StorageRepositoryImpl().get(ProfileStorageKey.devUUID.key) ?? ''; final String userUUID = - await StorageHelper().get(ProfileStorageKey.userUUID.key) ?? ''; + await StorageRepositoryImpl().get(ProfileStorageKey.userUUID.key) ?? ''; final bool isAuthenticated = userUUID.isNotEmpty && devUUID.isNotEmpty; final bool isDevLinked = !errorMsg.contains('Esse dispositivo nao pertence a esse usuario'); @@ -43,21 +43,21 @@ class LocalUtil { BuildContext context, List locals) async { log('() => isUnavailable'); try { - await StorageHelper() + await StorageRepositoryImpl() .set(ProfileStorageKey.clientUUID.key, locals[0]['CLI_ID']); - await StorageHelper() + await StorageRepositoryImpl() .set(ProfileStorageKey.ownerUUID.key, locals[0]['CLU_OWNER_ID']); - await StorageHelper() + await StorageRepositoryImpl() .set(ProfileStorageKey.clientName.key, locals[0]['CLI_NOME']); - await StorageHelper() + await StorageRepositoryImpl() .set(ProfileStorageKey.ownerName.key, locals[0]['CLU_OWNER_DSC']); var response = await PhpGroup.resopndeVinculo.call(tarefa: 'A'); if (response.jsonBody['error'] == true) { - await StorageHelper().set(ProfileStorageKey.clientUUID.key, ''); - await StorageHelper().set(ProfileStorageKey.ownerUUID.key, ''); - await StorageHelper().set(ProfileStorageKey.clientName.key, ''); - await StorageHelper().set(ProfileStorageKey.ownerName.key, ''); + await StorageRepositoryImpl().set(ProfileStorageKey.clientUUID.key, ''); + await StorageRepositoryImpl().set(ProfileStorageKey.ownerUUID.key, ''); + await StorageRepositoryImpl().set(ProfileStorageKey.clientName.key, ''); + await StorageRepositoryImpl().set(ProfileStorageKey.ownerName.key, ''); return false; } @@ -76,15 +76,15 @@ class LocalUtil { static Future handleEnabled(BuildContext context, dynamic local) async { log('() => isEnabled'); - await StorageHelper() + await StorageRepositoryImpl() .set(ProfileStorageKey.clientUUID.key, local['CLI_ID']); - await StorageHelper() + await StorageRepositoryImpl() .set(ProfileStorageKey.ownerUUID.key, local['CLU_OWNER_ID']); - await StorageHelper() + await StorageRepositoryImpl() .set(ProfileStorageKey.clientName.key, local['CLI_NOME']); - await StorageHelper() + await StorageRepositoryImpl() .set(ProfileStorageKey.ownerName.key, local['CLU_OWNER_DSC']); - await StorageHelper() + await StorageRepositoryImpl() .set(ProfileStorageKey.userName.key, local['USU_NOME']); return await LocalsRemoteDataSourceImpl().processData(context); } @@ -106,45 +106,45 @@ class LocalUtil { static Future updateStorageUtil(Map jsonBody) async { try { - await StorageHelper() + await StorageRepositoryImpl() .set(LocalsStorageKey.whatsapp.key, jsonBody['whatsapp'] ?? false); - await StorageHelper().set( + await StorageRepositoryImpl().set( LocalsStorageKey.provisional.key, jsonBody['provisional'] ?? false); - await StorageHelper().set( + await StorageRepositoryImpl().set( LocalsStorageKey.pets.key, jsonBody['pet'] ?? false, ); - await StorageHelper().set( + await StorageRepositoryImpl().set( LocalsStorageKey.notify.key, _processSystemOption( jsonBody['visitado']['VDO_NOTTERCEIROS'], ), ); if (jsonBody['visitado']['VDO_TEM_SENHA_ACESSO'] == '') { - await StorageHelper().set( + await StorageRepositoryImpl().set( LocalsStorageKey.access.key, _processSystemOption(jsonBody['visitado']['VDO_TEM_SENHA_ACESSO']), ); - await StorageHelper().set( + await StorageRepositoryImpl().set( LocalsStorageKey.panic.key, _processSystemOption(jsonBody['visitado']['VDO_TEM_SENHA_PANICO']), ); } - await StorageHelper().set( + await StorageRepositoryImpl().set( LocalsStorageKey.petAmount.key, jsonBody['petAmountRegister']?.toString().isEmpty ?? true ? '0' : jsonBody['petAmountRegister'].toString()); - await StorageHelper().set(ProfileStorageKey.userName.key, + await StorageRepositoryImpl().set(ProfileStorageKey.userName.key, jsonBody['visitado']['VDO_NOME'] ?? ''); - await StorageHelper().set(ProfileStorageKey.userEmail.key, + await StorageRepositoryImpl().set(ProfileStorageKey.userEmail.key, jsonBody['visitado']['VDO_EMAIL'] ?? ''); - await StorageHelper().set( + await StorageRepositoryImpl().set( LocalsStorageKey.provisional.key, jsonBody['provisional'] ?? false); final bool isNewVersion = jsonBody['newVersion'] ?? false; - await StorageHelper() + await StorageRepositoryImpl() .set(LocalsStorageKey.isNewVersion.key, isNewVersion); return isNewVersion; } catch (e, s) { @@ -159,7 +159,8 @@ class LocalUtil { static Future isInactived(List locals) async { String cliUUID = - (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.clientUUID.key)) ?? + ''; return locals .where( (local) => local['CLI_ID'] != cliUUID && local['CLU_STATUS'] == 'A') @@ -175,27 +176,34 @@ class LocalUtil { static Future isUnselected() async { String cliUUID = - (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.clientUUID.key)) ?? + ''; String cliName = - (await StorageHelper().get(ProfileStorageKey.clientName.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.clientName.key)) ?? + ''; String ownerUUID = - (await StorageHelper().get(ProfileStorageKey.ownerUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.ownerUUID.key)) ?? + ''; return cliUUID.isEmpty && cliName.isEmpty && ownerUUID.isEmpty; } static Future isSelected(bool isInactived) async { String cliUUID = - (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.clientUUID.key)) ?? + ''; String cliName = - (await StorageHelper().get(ProfileStorageKey.clientName.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.clientName.key)) ?? + ''; return cliUUID.isNotEmpty && cliName.isNotEmpty && isInactived; } static Future isAvailable() async { String cliUUID = - (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.clientUUID.key)) ?? + ''; String cliName = - (await StorageHelper().get(ProfileStorageKey.clientName.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.clientName.key)) ?? + ''; return cliUUID.isNotEmpty && cliName.isNotEmpty; } } diff --git a/lib/features/module/data/data_sources/license_local_data_source.dart b/lib/features/module/data/data_sources/license_local_data_source.dart index 25251b41..f6b7266c 100644 --- a/lib/features/module/data/data_sources/license_local_data_source.dart +++ b/lib/features/module/data/data_sources/license_local_data_source.dart @@ -41,7 +41,7 @@ class LicenseLocalDataSourceImpl implements LicenseLocalDataSource { @override Future isNewVersion() async { final String? reponse = - await StorageHelper().get(LocalsStorageKey.isNewVersion.key); + await StorageRepositoryImpl().get(LocalsStorageKey.isNewVersion.key); final bool isNewVersion = reponse.toBoolean(); return isNewVersion; } diff --git a/lib/features/module/domain/entities/license.dart b/lib/features/module/domain/entities/license.dart index 17a70650..5a6e74f5 100644 --- a/lib/features/module/domain/entities/license.dart +++ b/lib/features/module/domain/entities/license.dart @@ -60,7 +60,7 @@ class License { } static Future _precessWpp() async { - final bool whatsapp = await StorageHelper() + final bool whatsapp = await StorageRepositoryImpl() .get(LocalsStorageKey.whatsapp.key) .then((v) => v.toBoolean()); if (whatsapp) @@ -70,7 +70,7 @@ class License { } static Future _processProvisional() async { - final bool provisional = await StorageHelper() + final bool provisional = await StorageRepositoryImpl() .get(LocalsStorageKey.provisional.key) .then((v) => v.toBoolean()); if (provisional) @@ -80,7 +80,7 @@ class License { } static Future _processPets() async { - final bool pets = await StorageHelper() + final bool pets = await StorageRepositoryImpl() .get(LocalsStorageKey.pets.key) .then((v) => v.toBoolean()); if (pets) diff --git a/lib/features/notification/deep_link_service.dart b/lib/features/notification/deep_link_service.dart index f7aa1ac0..fdfc4512 100644 --- a/lib/features/notification/deep_link_service.dart +++ b/lib/features/notification/deep_link_service.dart @@ -24,7 +24,7 @@ class DeepLinkService { _appLinks = AppLinks(); print('initDeepLinks'); _linkSubscription = _appLinks.uriLinkStream.listen((uri) async { - if (!StorageHelper().isRecovered) { + if (!StorageRepositoryImpl().isRecovered) { await _handleDeepLink(uri); } }); @@ -37,9 +37,9 @@ class DeepLinkService { Future _handleDeepLink(Uri uri) async { try { print('Handling deep link: $uri'); - if (StorageHelper().isRecovered) return; + if (StorageRepositoryImpl().isRecovered) return; - StorageHelper().isRecovered = true; + StorageRepositoryImpl().isRecovered = true; final email = uri.queryParameters['email'] ?? ''; final token = uri.queryParameters['token'] ?? ''; print('email: $email, token: $token'); @@ -68,7 +68,7 @@ class DeepLinkService { useSafeArea: true, enableDrag: true, ).whenComplete(() { - StorageHelper().isRecovered = false; + StorageRepositoryImpl().isRecovered = false; print('showModalBottomSheet completed'); }); }); diff --git a/lib/features/notification/firebase_messaging_service.dart b/lib/features/notification/firebase_messaging_service.dart index 68fc300a..f753900a 100644 --- a/lib/features/notification/firebase_messaging_service.dart +++ b/lib/features/notification/firebase_messaging_service.dart @@ -45,7 +45,8 @@ class FirebaseMessagingService { final String? deviceToken = await _firebaseMessaging.getToken(); if (deviceToken != null) { - await StorageHelper().set(SecureStorageKey.token.value, deviceToken); + await StorageRepositoryImpl() + .set(SecureStorageKey.token.value, deviceToken); final ApiCallResponse? response; response = await PhpGroup.updToken.call(); diff --git a/lib/features/notification/notification_service.dart b/lib/features/notification/notification_service.dart index 8e1662d6..f6077087 100644 --- a/lib/features/notification/notification_service.dart +++ b/lib/features/notification/notification_service.dart @@ -16,7 +16,8 @@ Future onMessageReceived( final localId = jsonDecode(payload['local']!)['CLI_ID']; final cliUUID = - (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.clientUUID.key)) ?? + ''; answersRequest( {required BuildContext context, @@ -251,7 +252,7 @@ Future onMessageReceived( break; case 'enroll_cond': - await StorageHelper().set(SecureStorageKey.haveLocal.value, true); + await StorageRepositoryImpl().set(SecureStorageKey.haveLocal.value, true); navigatorKey.currentContext!.go('/homePage'); break; default: @@ -288,13 +289,13 @@ class NotificationService { await AwesomeNotifications() .isNotificationAllowed() .then((isAllowed) async { - final bool requestOSnotification = (await StorageHelper() + final bool requestOSnotification = (await StorageRepositoryImpl() .get(LocalsStorageKey.requestOSNotification.key)) == 'true'; if (requestOSnotification == false) { if (isAllowed == false) { - await StorageHelper() + await StorageRepositoryImpl() .set(LocalsStorageKey.requestOSNotification.key, true); await AwesomeNotifications().requestPermissionToSendNotifications(); } diff --git a/lib/features/storage/repositories/storage_repository_impl.dart b/lib/features/storage/repositories/storage_repository_impl.dart index 30f3fd0d..62c06253 100644 --- a/lib/features/storage/repositories/storage_repository_impl.dart +++ b/lib/features/storage/repositories/storage_repository_impl.dart @@ -4,10 +4,11 @@ import 'package:flutter/cupertino.dart'; import 'package:hub/features/profile/data/data_sources/profile_local_data_source.dart'; import 'package:hub/features/storage/index.dart'; -class StorageHelper implements StorageRepository { - static final StorageHelper _instance = StorageHelper._internal(); - factory StorageHelper() => _instance; - StorageHelper._internal(); +class StorageRepositoryImpl implements StorageRepository { + static final StorageRepositoryImpl _instance = + StorageRepositoryImpl._internal(); + factory StorageRepositoryImpl() => _instance; + StorageRepositoryImpl._internal(); late BuildContext? _context; BuildContext? get context => _context; diff --git a/lib/features/storage/services/database_storage_service.dart b/lib/features/storage/services/database_storage_service.dart index 1e7dade9..082a3e7d 100644 --- a/lib/features/storage/services/database_storage_service.dart +++ b/lib/features/storage/services/database_storage_service.dart @@ -49,7 +49,7 @@ class DatabaseService { Future _onCreate(Database database, int version) async { print('Creating database...'); await database.execute(createKeychainTable); - _onUpgrade(database, 1, _dbVersion); + await _onUpgrade(database, 1, _dbVersion); } Future _onUpgrade( diff --git a/lib/flutter_flow/nav/nav.dart b/lib/flutter_flow/nav/nav.dart index 007b1dda..dd644f4f 100644 --- a/lib/flutter_flow/nav/nav.dart +++ b/lib/flutter_flow/nav/nav.dart @@ -86,20 +86,20 @@ GoRouter createRouter(AppStateNotifier appStateNotifier) { builder: (context, _) { return FutureBuilder( future: () async { - final bool isLogged = - await StorageHelper().get(SecureStorageKey.isLogged.value) == - 'true'; - final bool haveLocal = - await StorageHelper().get(SecureStorageKey.haveLocal.value) == - 'true'; - final bool haveUserUUID = - (await StorageHelper().get(ProfileStorageKey.userUUID.key)) - ?.isNotEmpty ?? - false; - final bool haveDevUUID = - (await StorageHelper().get(ProfileStorageKey.devUUID.key)) - ?.isNotEmpty ?? - false; + final bool isLogged = await StorageRepositoryImpl() + .get(SecureStorageKey.isLogged.value) == + 'true'; + final bool haveLocal = await StorageRepositoryImpl() + .get(SecureStorageKey.haveLocal.value) == + 'true'; + final bool haveUserUUID = (await StorageRepositoryImpl() + .get(ProfileStorageKey.userUUID.key)) + ?.isNotEmpty ?? + false; + final bool haveDevUUID = (await StorageRepositoryImpl() + .get(ProfileStorageKey.devUUID.key)) + ?.isNotEmpty ?? + false; if (isLogged && haveDevUUID && haveUserUUID) { return haveLocal diff --git a/lib/initialization.dart b/lib/initialization.dart index 27bdc509..d8458100 100644 --- a/lib/initialization.dart +++ b/lib/initialization.dart @@ -16,7 +16,7 @@ import 'package:hub/flutter_flow/nav/nav.dart'; Future initializeApp() async { WidgetsFlutterBinding.ensureInitialized(); await _initializeTracking(); - await StorageHelper().init(); + await StorageRepositoryImpl().init(); await _initializeFirebase(); await _initializeNotificationService(); diff --git a/lib/main.dart b/lib/main.dart index b97e09e4..d0ed8268 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -29,8 +29,8 @@ void main() async { Future _foregroundHandlerMessage(RemoteMessage message) async { if (message.data['click_action'] == 'enroll_cond') { - await StorageHelper().set(SecureStorageKey.haveLocal.value, true); - StorageHelper().context?.go('/homePage'); + await StorageRepositoryImpl().set(SecureStorageKey.haveLocal.value, true); + StorageRepositoryImpl().context?.go('/homePage'); } if (!Platform.isIOS) { @@ -43,8 +43,8 @@ Future _foregroundHandlerMessage(RemoteMessage message) async { Future _backgroundHandlerMessage(RemoteMessage message) async { if (message.data['click_action'] == 'enroll_cond') { - await StorageHelper().set(SecureStorageKey.haveLocal.value, true); - StorageHelper().context?.go('/homePage'); + await StorageRepositoryImpl().set(SecureStorageKey.haveLocal.value, true); + StorageRepositoryImpl().context?.go('/homePage'); } } @@ -137,7 +137,8 @@ class _AppState extends State { FirebaseMessaging.onMessage.listen(_foregroundHandlerMessage); FirebaseMessaging.onMessageOpenedApp.listen((RemoteMessage message) async { if (message.data['click_action'] == 'enroll_cond') { - await StorageHelper().set(SecureStorageKey.haveLocal.value, true); + await StorageRepositoryImpl() + .set(SecureStorageKey.haveLocal.value, true); log('onMessageOpenedApp'); } else { onMessageReceived(message.data, message.notification!.body, @@ -147,7 +148,8 @@ class _AppState extends State { FirebaseMessaging.instance.getInitialMessage().then((message) async { if (message != null) { if (message.data['click_action'] == 'enroll_cond') { - await StorageHelper().set(SecureStorageKey.haveLocal.value, true); + await StorageRepositoryImpl() + .set(SecureStorageKey.haveLocal.value, true); log('getInitialMessage'); } } diff --git a/lib/pages/fast_pass_page/fast_pass_page_widget.dart b/lib/pages/fast_pass_page/fast_pass_page_widget.dart index 6cc9a845..7005069f 100644 --- a/lib/pages/fast_pass_page/fast_pass_page_widget.dart +++ b/lib/pages/fast_pass_page/fast_pass_page_widget.dart @@ -25,15 +25,19 @@ class _FastPassPageWidgetState extends State { Future> initVariables() async { final email = - (await StorageHelper().get(SecureStorageKey.email.value)) ?? ''; + (await StorageRepositoryImpl().get(SecureStorageKey.email.value)) ?? ''; final name = - (await StorageHelper().get(ProfileStorageKey.userName.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.userName.key)) ?? + ''; final devUUID = - (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.devUUID.key)) ?? + ''; final userUUID = - (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.userUUID.key)) ?? + ''; final cliUUID = - (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.clientUUID.key)) ?? + ''; const createdAt = '0000-00-00 00:00:00'; final url = 'https://hub.freaccess.com.br/hub/fast-pass/$cliUUID'; final freUserData = diff --git a/lib/pages/forgot_password_page/forgot_password_screen.dart b/lib/pages/forgot_password_page/forgot_password_screen.dart index bf737647..9c86037b 100644 --- a/lib/pages/forgot_password_page/forgot_password_screen.dart +++ b/lib/pages/forgot_password_page/forgot_password_screen.dart @@ -112,7 +112,7 @@ class _ForgotPasswordScreenState extends State ), onPressed: () async { context.pop(); - StorageHelper().isRecovered = false; + StorageRepositoryImpl().isRecovered = false; }, ), title: Text( diff --git a/lib/pages/liberation_history/liberation_history_model.dart b/lib/pages/liberation_history/liberation_history_model.dart index dc93f26b..dd6dca6b 100644 --- a/lib/pages/liberation_history/liberation_history_model.dart +++ b/lib/pages/liberation_history/liberation_history_model.dart @@ -36,11 +36,15 @@ class LiberationHistoryModel extends FlutterFlowModel { } Future init() async { - devUUID = (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? ''; + devUUID = + (await StorageRepositoryImpl().get(ProfileStorageKey.devUUID.key)) ?? + ''; userUUID = - (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.userUUID.key)) ?? + ''; cliUUID = - (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.clientUUID.key)) ?? + ''; } Future answersRequest( diff --git a/lib/pages/message_history_page/message_history_page_model.dart b/lib/pages/message_history_page/message_history_page_model.dart index 68efb77d..9152fe73 100644 --- a/lib/pages/message_history_page/message_history_page_model.dart +++ b/lib/pages/message_history_page/message_history_page_model.dart @@ -41,11 +41,15 @@ class MessageHistoryPageModel } Future init() async { - devUUID = (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? ''; + devUUID = + (await StorageRepositoryImpl().get(ProfileStorageKey.devUUID.key)) ?? + ''; userUUID = - (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.userUUID.key)) ?? + ''; cliUUID = - (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.clientUUID.key)) ?? + ''; } @override diff --git a/lib/pages/package_order_page/package_order_page.dart b/lib/pages/package_order_page/package_order_page.dart index 8bbbd340..04efe6ee 100644 --- a/lib/pages/package_order_page/package_order_page.dart +++ b/lib/pages/package_order_page/package_order_page.dart @@ -66,7 +66,8 @@ class _PackageOrderPage extends State { Future initDatabase() async { cliUUID = - (await StorageHelper().get(ProfileStorageKey.clientUUID.key) ?? ''); + (await StorageRepositoryImpl().get(ProfileStorageKey.clientUUID.key) ?? + ''); } @override diff --git a/lib/pages/pets_on_the_property_page/pets_history_screen.dart b/lib/pages/pets_on_the_property_page/pets_history_screen.dart index 98ad75cb..81166b5c 100644 --- a/lib/pages/pets_on_the_property_page/pets_history_screen.dart +++ b/lib/pages/pets_on_the_property_page/pets_history_screen.dart @@ -308,14 +308,18 @@ class _PetsHistoryScreenState extends State } ], onTapCardItemAction: () async { - final devUUID = - (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? ''; - final userUUID = - (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? ''; - final cliUUID = - (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? ''; - final cliName = - (await StorageHelper().get(ProfileStorageKey.clientName.key)) ?? ''; + final devUUID = (await StorageRepositoryImpl() + .get(ProfileStorageKey.devUUID.key)) ?? + ''; + final userUUID = (await StorageRepositoryImpl() + .get(ProfileStorageKey.userUUID.key)) ?? + ''; + final cliUUID = (await StorageRepositoryImpl() + .get(ProfileStorageKey.clientUUID.key)) ?? + ''; + final cliName = (await StorageRepositoryImpl() + .get(ProfileStorageKey.clientName.key)) ?? + ''; await showDialog( useSafeArea: true, context: context, diff --git a/lib/pages/pets_page/pets_page_model.dart b/lib/pages/pets_page/pets_page_model.dart index c8473787..1407a649 100644 --- a/lib/pages/pets_page/pets_page_model.dart +++ b/lib/pages/pets_page/pets_page_model.dart @@ -149,13 +149,18 @@ class PetsPageModel extends FlutterFlowModel { textControllerObservation = TextEditingController(); WidgetsBinding.instance.addPostFrameCallback((_) async { - devUUID = await StorageHelper().get(ProfileStorageKey.devUUID.key) ?? ''; + devUUID = + await StorageRepositoryImpl().get(ProfileStorageKey.devUUID.key) ?? + ''; userUUID = - await StorageHelper().get(ProfileStorageKey.userUUID.key) ?? ''; + await StorageRepositoryImpl().get(ProfileStorageKey.userUUID.key) ?? + ''; cliUUID = - await StorageHelper().get(ProfileStorageKey.clientUUID.key) ?? ''; + await StorageRepositoryImpl().get(ProfileStorageKey.clientUUID.key) ?? + ''; petAmountRegister = - await StorageHelper().get(LocalsStorageKey.petAmount.key) ?? ''; + await StorageRepositoryImpl().get(LocalsStorageKey.petAmount.key) ?? + ''; }); } diff --git a/lib/pages/preferences_settings_page/preferences_settings_model.dart b/lib/pages/preferences_settings_page/preferences_settings_model.dart index 80925889..fa844ec9 100644 --- a/lib/pages/preferences_settings_page/preferences_settings_model.dart +++ b/lib/pages/preferences_settings_page/preferences_settings_model.dart @@ -23,11 +23,16 @@ class PreferencesPageModel with ChangeNotifier { Future _initialize() async { isFingerprint = - await StorageHelper().get(LocalsStorageKey.fingerprint.key) == 'true'; - isPerson = await StorageHelper().get(LocalsStorageKey.person.key) == 'true'; - isNotify = await StorageHelper().get(LocalsStorageKey.notify.key) == 'true'; - isAccess = await StorageHelper().get(LocalsStorageKey.access.key) == 'true'; - isPanic = await StorageHelper().get(LocalsStorageKey.panic.key) == 'true'; + await StorageRepositoryImpl().get(LocalsStorageKey.fingerprint.key) == + 'true'; + isPerson = await StorageRepositoryImpl().get(LocalsStorageKey.person.key) == + 'true'; + isNotify = await StorageRepositoryImpl().get(LocalsStorageKey.notify.key) == + 'true'; + isAccess = await StorageRepositoryImpl().get(LocalsStorageKey.access.key) == + 'true'; + isPanic = + await StorageRepositoryImpl().get(LocalsStorageKey.panic.key) == 'true'; notifyListeners(); } @@ -36,8 +41,9 @@ class PreferencesPageModel with ChangeNotifier { } Future enablePerson(BuildContext context) async { - final String userDevUUID = - (await StorageHelper().get(ProfileStorageKey.userDevUUID.key)) ?? ''; + final String userDevUUID = (await StorageRepositoryImpl() + .get(ProfileStorageKey.userDevUUID.key)) ?? + ''; notifyListeners(); Share.share( FFLocalizations.of(context).getVariableText( @@ -64,7 +70,8 @@ class PreferencesPageModel with ChangeNotifier { .call(notifica: value) .then((value) async { if (value.jsonBody['error'] == false) { - await StorageHelper().set(LocalsStorageKey.notify.key, !isNotify); + await StorageRepositoryImpl() + .set(LocalsStorageKey.notify.key, !isNotify); content = FFLocalizations.of(context).getVariableText( enText: 'Notification changed successfully', ptText: 'Notificação alterada com sucesso', @@ -87,7 +94,8 @@ class PreferencesPageModel with ChangeNotifier { SnackBarUtil.showSnackBar(context, content, isError: true); }) .then((_) async => isNotify = - await StorageHelper().get(LocalsStorageKey.notify.key) == 'true') + await StorageRepositoryImpl().get(LocalsStorageKey.notify.key) == + 'true') .whenComplete(() => notifyListeners()); context.pop(); } @@ -138,13 +146,13 @@ class PreferencesPageModel with ChangeNotifier { Future toggleAccess(BuildContext context) async { onChange(String key) async { - await StorageHelper().set(SecureStorageKey.accessPass.value, key); + await StorageRepositoryImpl().set(SecureStorageKey.accessPass.value, key); await PhpGroup.changePass .call(newSenha: key) .then((value) async { final String content; if (jsonDecode(value.jsonBody['error'].toString()) == false) { - await StorageHelper() + await StorageRepositoryImpl() .set(LocalsStorageKey.access.key, isAccess ? false : true); notifyListeners(); content = FFLocalizations.of(context).getVariableText( @@ -168,7 +176,8 @@ class PreferencesPageModel with ChangeNotifier { SnackBarUtil.showSnackBar(context, content, isError: true); }) .then((_) async => isAccess = - await StorageHelper().get(LocalsStorageKey.access.key) == 'true') + await StorageRepositoryImpl().get(LocalsStorageKey.access.key) == + 'true') .whenComplete(() => notifyListeners()); } @@ -177,13 +186,13 @@ class PreferencesPageModel with ChangeNotifier { Future togglePanic(BuildContext context) async { onChange(String key) async { - await StorageHelper().set(SecureStorageKey.panicPass.value, key); + await StorageRepositoryImpl().set(SecureStorageKey.panicPass.value, key); await PhpGroup.changePanic .call(newSenhaPanico: key) .then((value) async { final String content; if (jsonDecode(value.jsonBody['error'].toString()) == false) { - await StorageHelper() + await StorageRepositoryImpl() .set(LocalsStorageKey.panic.key, isPanic ? 'false' : 'true'); notifyListeners(); content = FFLocalizations.of(context).getVariableText( @@ -207,7 +216,8 @@ class PreferencesPageModel with ChangeNotifier { SnackBarUtil.showSnackBar(context, content, isError: true); }) .then((_) async => isPanic = - await StorageHelper().get(LocalsStorageKey.panic.key) == 'true') + await StorageRepositoryImpl().get(LocalsStorageKey.panic.key) == + 'true') .whenComplete(() => notifyListeners()); } @@ -222,14 +232,15 @@ class PreferencesPageModel with ChangeNotifier { onChange(String? key) async { isFingerprint = !isFingerprint; - await StorageHelper() + await StorageRepositoryImpl() .set(SecureStorageKey.fingerprintPass.value, key ?? ''); - await StorageHelper().set( + await StorageRepositoryImpl().set( LocalsStorageKey.fingerprint.key, isFingerprint ? 'true' : 'false'); notifyListeners(); SnackBarUtil.showSnackBar(context, content); isFingerprint = - await StorageHelper().get(LocalsStorageKey.fingerprint.key) == 'true'; + await StorageRepositoryImpl().get(LocalsStorageKey.fingerprint.key) == + 'true'; } isFingerprint ? onChange(null) : _showPassKey(context, onChange); diff --git a/lib/pages/qr_code_page/qr_code_page_model.dart b/lib/pages/qr_code_page/qr_code_page_model.dart index bec899f0..f5d6a8b0 100644 --- a/lib/pages/qr_code_page/qr_code_page_model.dart +++ b/lib/pages/qr_code_page/qr_code_page_model.dart @@ -30,9 +30,11 @@ class QrCodePageModel extends FlutterFlowModel { Future initVariable() async { isFingerprint = - await StorageHelper().get(LocalsStorageKey.fingerprint.key) == 'true'; + await StorageRepositoryImpl().get(LocalsStorageKey.fingerprint.key) == + 'true'; userDevUUID = - await StorageHelper().get(ProfileStorageKey.userDevUUID.key) ?? ''; + await StorageRepositoryImpl().get(ProfileStorageKey.userDevUUID.key) ?? + ''; safeSetState?.call(); } diff --git a/lib/pages/qr_code_page/qr_code_page_widget.dart b/lib/pages/qr_code_page/qr_code_page_widget.dart index 0fa56484..1c92b82d 100644 --- a/lib/pages/qr_code_page/qr_code_page_widget.dart +++ b/lib/pages/qr_code_page/qr_code_page_widget.dart @@ -396,7 +396,7 @@ class _QrCodePageWidgetState extends State await BiometricHelper.authenticateBiometric().then((value) async { if (value == false) throw Exception('Biometric authentication failed'); - final key = await StorageHelper() + final key = await StorageRepositoryImpl() .get(SecureStorageKey.fingerprintPass.value); if (key == null || key.isEmpty) throw Exception('No key found'); safeSetState(() { diff --git a/lib/pages/reception_page/reception_page_model.dart b/lib/pages/reception_page/reception_page_model.dart index e72e9b96..0cbb2fba 100644 --- a/lib/pages/reception_page/reception_page_model.dart +++ b/lib/pages/reception_page/reception_page_model.dart @@ -5,8 +5,9 @@ import 'package:share_plus/share_plus.dart'; class ReceptionPageModel with ChangeNotifier { Future getIdenfifier(BuildContext context) async { - final String userDevUUID = - (await StorageHelper().get(ProfileStorageKey.userDevUUID.key)) ?? ''; + final String userDevUUID = (await StorageRepositoryImpl() + .get(ProfileStorageKey.userDevUUID.key)) ?? + ''; notifyListeners(); Share.share( diff --git a/lib/pages/reception_page/reception_page_widget.dart b/lib/pages/reception_page/reception_page_widget.dart index e7d5718e..6ba4401e 100644 --- a/lib/pages/reception_page/reception_page_widget.dart +++ b/lib/pages/reception_page/reception_page_widget.dart @@ -61,7 +61,7 @@ class _ReceptionPageWidgetState extends State double limitedBodyFontSize = LimitedFontSizeUtil.getBodyFontSize(context); double limitedInputFontSize = LimitedFontSizeUtil.getInputFontSize(context); - StorageHelper().context = context; + StorageRepositoryImpl().context = context; return ChangeNotifierProvider( create: (context) => ReceptionPageModel(), child: Scaffold( diff --git a/lib/pages/reservation_page/reservation_page_widget.dart b/lib/pages/reservation_page/reservation_page_widget.dart index a75cd567..ce32974a 100644 --- a/lib/pages/reservation_page/reservation_page_widget.dart +++ b/lib/pages/reservation_page/reservation_page_widget.dart @@ -23,15 +23,19 @@ class _ReservationPageWidgetState extends State { Future> initVariables() async { final email = - (await StorageHelper().get(SecureStorageKey.email.value)) ?? ''; + (await StorageRepositoryImpl().get(SecureStorageKey.email.value)) ?? ''; final name = - (await StorageHelper().get(ProfileStorageKey.userName.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.userName.key)) ?? + ''; final devUUID = - (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.devUUID.key)) ?? + ''; final userUUID = - (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.userUUID.key)) ?? + ''; final clientId = - (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.clientUUID.key)) ?? + ''; const createdAt = '0000-00-00 00:00:00'; final url = 'https://hub.freaccess.com.br/hub/reservation/$clientId'; final freUserData = diff --git a/lib/pages/residents_on_the_property/residents_on_the_property_model.dart b/lib/pages/residents_on_the_property/residents_on_the_property_model.dart index 02c42ef4..067f574e 100644 --- a/lib/pages/residents_on_the_property/residents_on_the_property_model.dart +++ b/lib/pages/residents_on_the_property/residents_on_the_property_model.dart @@ -18,9 +18,12 @@ class ResidentsOnThePropertyModel } void initVariables() async { - devUUID = (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? ''; + devUUID = + (await StorageRepositoryImpl().get(ProfileStorageKey.devUUID.key)) ?? + ''; cliUUID = - (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.clientUUID.key)) ?? + ''; onRefresh?.call(); } diff --git a/lib/pages/schedule_complete_visit_page/schedule_complete_visit_page_model.dart b/lib/pages/schedule_complete_visit_page/schedule_complete_visit_page_model.dart index f7248d93..651eae66 100644 --- a/lib/pages/schedule_complete_visit_page/schedule_complete_visit_page_model.dart +++ b/lib/pages/schedule_complete_visit_page/schedule_complete_visit_page_model.dart @@ -230,11 +230,15 @@ class ScheduleCompleteVisitPageModel } Future _initVariables() async { - devUUID = (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? ''; + devUUID = + (await StorageRepositoryImpl().get(ProfileStorageKey.devUUID.key)) ?? + ''; userUUID = - (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.userUUID.key)) ?? + ''; cliUUID = - (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.clientUUID.key)) ?? + ''; } @override diff --git a/lib/pages/schedule_complete_visit_page/visit_history_page_widget.dart b/lib/pages/schedule_complete_visit_page/visit_history_page_widget.dart index bafb04bb..09ed7282 100644 --- a/lib/pages/schedule_complete_visit_page/visit_history_page_widget.dart +++ b/lib/pages/schedule_complete_visit_page/visit_history_page_widget.dart @@ -36,11 +36,15 @@ class _VisitHistoryWidgetState extends State List _visitWrap = []; Future _initVariables() async { - devUUID = (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? ''; + devUUID = + (await StorageRepositoryImpl().get(ProfileStorageKey.devUUID.key)) ?? + ''; userUUID = - (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.userUUID.key)) ?? + ''; cliUUID = - (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.clientUUID.key)) ?? + ''; } @override @@ -265,14 +269,18 @@ class _VisitHistoryWidgetState extends State }, ], onTapCardItemAction: () async { - final devUUID = - (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? ''; - final userUUID = - (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? ''; - final cliUUID = - (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? ''; - final cliName = - (await StorageHelper().get(ProfileStorageKey.clientName.key)) ?? ''; + final devUUID = (await StorageRepositoryImpl() + .get(ProfileStorageKey.devUUID.key)) ?? + ''; + final userUUID = (await StorageRepositoryImpl() + .get(ProfileStorageKey.userUUID.key)) ?? + ''; + final cliUUID = (await StorageRepositoryImpl() + .get(ProfileStorageKey.clientUUID.key)) ?? + ''; + final cliName = (await StorageRepositoryImpl() + .get(ProfileStorageKey.clientName.key)) ?? + ''; await showDialog( useSafeArea: true, diff --git a/lib/pages/sign_in_page/sign_in_page_widget.dart b/lib/pages/sign_in_page/sign_in_page_widget.dart index e632670a..e7e18250 100644 --- a/lib/pages/sign_in_page/sign_in_page_widget.dart +++ b/lib/pages/sign_in_page/sign_in_page_widget.dart @@ -33,7 +33,7 @@ class _SignInPageWidgetState extends State { @override Widget build(BuildContext context) { - StorageHelper().context = context; + StorageRepositoryImpl().context = context; return GestureDetector( onTap: () => _model.unfocusNode.canRequestFocus ? FocusScope.of(context).requestFocus(_model.unfocusNode) diff --git a/lib/pages/sign_up_page/sign_up_page_widget.dart b/lib/pages/sign_up_page/sign_up_page_widget.dart index e91ac753..324b05e0 100644 --- a/lib/pages/sign_up_page/sign_up_page_widget.dart +++ b/lib/pages/sign_up_page/sign_up_page_widget.dart @@ -36,7 +36,7 @@ class _SignUpPageWidgetState extends State { @override Widget build(BuildContext context) { - StorageHelper().context = context; + StorageRepositoryImpl().context = context; return GestureDetector( onTap: () => _model.unfocusNode.canRequestFocus ? FocusScope.of(context).requestFocus(_model.unfocusNode) diff --git a/lib/pages/visits_on_the_property/model.dart b/lib/pages/visits_on_the_property/model.dart index 2ddcd047..c9f031f8 100644 --- a/lib/pages/visits_on_the_property/model.dart +++ b/lib/pages/visits_on_the_property/model.dart @@ -30,9 +30,12 @@ class VisitsModel extends FlutterFlowModel { void dispose() {} Future initAsync() async { - devUUID = (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? ''; + devUUID = + (await StorageRepositoryImpl().get(ProfileStorageKey.devUUID.key)) ?? + ''; cliUUID = - (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? ''; + (await StorageRepositoryImpl().get(ProfileStorageKey.clientUUID.key)) ?? + ''; onRefresh?.call(); } diff --git a/lib/pages/welcome_page/welcome_page_widget.dart b/lib/pages/welcome_page/welcome_page_widget.dart index 5b3f46ea..479a73d6 100644 --- a/lib/pages/welcome_page/welcome_page_widget.dart +++ b/lib/pages/welcome_page/welcome_page_widget.dart @@ -31,13 +31,16 @@ class _WelcomePageWidgetState extends State { // On page load action. SchedulerBinding.instance.addPostFrameCallback((_) async { if (isAndroid == true) { - await StorageHelper().set(SecureStorageKey.deviceType.value, 'Android'); + await StorageRepositoryImpl() + .set(SecureStorageKey.deviceType.value, 'Android'); setState(() {}); } else if (isiOS == true) { - await StorageHelper().set(SecureStorageKey.deviceType.value, 'iOS'); + await StorageRepositoryImpl() + .set(SecureStorageKey.deviceType.value, 'iOS'); setState(() {}); } else { - await StorageHelper().set(SecureStorageKey.deviceType.value, 'Web'); + await StorageRepositoryImpl() + .set(SecureStorageKey.deviceType.value, 'Web'); setState(() {}); } }); @@ -51,7 +54,7 @@ class _WelcomePageWidgetState extends State { @override Widget build(BuildContext context) { - StorageHelper().context = context; + StorageRepositoryImpl().context = context; return GestureDetector( onTap: () => _model.unfocusNode.canRequestFocus ? FocusScope.of(context).requestFocus(_model.unfocusNode) diff --git a/lib/shared/utils/share_util.dart b/lib/shared/utils/share_util.dart index a9c410f7..d4288e70 100644 --- a/lib/shared/utils/share_util.dart +++ b/lib/shared/utils/share_util.dart @@ -3,8 +3,10 @@ import 'package:share_plus/share_plus.dart'; class ShareUtil { static Future showShare(payload) async { - final cliName = await StorageHelper().get(ProfileStorageKey.clientName.key); - final cliUUID = await StorageHelper().get(ProfileStorageKey.clientUUID.key); + final cliName = + await StorageRepositoryImpl().get(ProfileStorageKey.clientName.key); + final cliUUID = + await StorageRepositoryImpl().get(ProfileStorageKey.clientUUID.key); for (var i = 0; i < payload['convites'].length; i++) { await Share.share('''