eduvia/workavia-mail-front
11
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

TF-2464 Remove save email delivery state in dart code

Browse Source 
Signed-off-by: dab246 <tdvu@linagora.com>
(cherry picked from commit 6209b3550d8687aefc1cf92f3fa4e4516686228b)
This commit is contained in:
dab246
2024-01-19 11:32:41 +07:00
committed by Dat PHAM HOANG
parent 1d9cdadefb
commit dd8c6e96d7
3 changed files with 2 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/features/push_notification/data/extensions/keychain_sharing_session_extension.dart
+2 -2
View File
@@ -3,14 +3,14 @@ import 'package:tmail_ui_user/features/push_notification/data/keychain/keychain_
extension KeychainSharingSessionExtension on KeychainSharingSession { extension KeychainSharingSessionExtension on KeychainSharingSession {
KeychainSharingSession updating({String? emailState, String? emailDeliveryState}) { KeychainSharingSession updating({String? emailState}) {
return KeychainSharingSession( return KeychainSharingSession(
accountId: accountId, accountId: accountId,
userName: userName, userName: userName,
authenticationType: authenticationType, authenticationType: authenticationType,
apiUrl: apiUrl, apiUrl: apiUrl,
emailState: emailState ?? emailState, emailState: emailState ?? emailState,
emailDeliveryState: emailDeliveryState ?? emailDeliveryState, emailDeliveryState: emailDeliveryState,
tokenOIDC: tokenOIDC, tokenOIDC: tokenOIDC,
basicAuth: basicAuth, basicAuth: basicAuth,
tokenEndpoint: tokenEndpoint, tokenEndpoint: tokenEndpoint,
lib/features/push_notification/presentation/listener/email_change_listener.dart
-11
View File
@@ -47,7 +47,6 @@ import 'package:tmail_ui_user/features/push_notification/presentation/listener/c
import 'package:tmail_ui_user/features/push_notification/presentation/notification/local_notification_manager.dart'; import 'package:tmail_ui_user/features/push_notification/presentation/notification/local_notification_manager.dart';
import 'package:tmail_ui_user/features/thread/domain/constants/thread_constants.dart'; import 'package:tmail_ui_user/features/thread/domain/constants/thread_constants.dart';
import 'package:tmail_ui_user/main/routes/route_navigation.dart'; import 'package:tmail_ui_user/main/routes/route_navigation.dart';
import 'package:tmail_ui_user/main/utils/ios_sharing_manager.dart';
class EmailChangeListener extends ChangeListener { class EmailChangeListener extends ChangeListener {
@@ -63,7 +62,6 @@ class EmailChangeListener extends ChangeListener {
GetListDetailedEmailByIdInteractor? _getListDetailedEmailByIdInteractor; GetListDetailedEmailByIdInteractor? _getListDetailedEmailByIdInteractor;
DynamicUrlInterceptors? _dynamicUrlInterceptors; DynamicUrlInterceptors? _dynamicUrlInterceptors;
StoreListNewEmailInteractor? _storeListNewEmailInteractor; StoreListNewEmailInteractor? _storeListNewEmailInteractor;
IOSSharingManager? _iosSharingManager;
jmap.State? _newStateEmailDelivery; jmap.State? _newStateEmailDelivery;
AccountId? _accountId; AccountId? _accountId;
@@ -85,7 +83,6 @@ class EmailChangeListener extends ChangeListener {
_getListDetailedEmailByIdInteractor = getBinding<GetListDetailedEmailByIdInteractor>(); _getListDetailedEmailByIdInteractor = getBinding<GetListDetailedEmailByIdInteractor>();
_dynamicUrlInterceptors = getBinding<DynamicUrlInterceptors>(); _dynamicUrlInterceptors = getBinding<DynamicUrlInterceptors>();
_storeListNewEmailInteractor = getBinding<StoreListNewEmailInteractor>(); _storeListNewEmailInteractor = getBinding<StoreListNewEmailInteractor>();
_iosSharingManager = getBinding<IOSSharingManager>();
} catch (e) { } catch (e) {
logError('EmailChangeListener::_internal(): IS NOT REGISTERED: ${e.toString()}'); logError('EmailChangeListener::_internal(): IS NOT REGISTERED: ${e.toString()}');
} }
@@ -140,7 +137,6 @@ class EmailChangeListener extends ChangeListener {
_storeEmailDeliveryStateAction(accountId, userName, _newStateEmailDelivery!); _storeEmailDeliveryStateAction(accountId, userName, _newStateEmailDelivery!);
} else if (PlatformInfo.isIOS) { } else if (PlatformInfo.isIOS) {
_storeEmailDeliveryStateAction(accountId, userName, _newStateEmailDelivery!); _storeEmailDeliveryStateAction(accountId, userName, _newStateEmailDelivery!);
_updateKeychainSharingSession(accountId, _newStateEmailDelivery!.value);
} else if (PlatformInfo.isAndroid) { } else if (PlatformInfo.isAndroid) {
_getStoredEmailDeliveryState(accountId, userName); _getStoredEmailDeliveryState(accountId, userName);
} }
@@ -328,11 +324,4 @@ class EmailChangeListener extends ChangeListener {
)); ));
} }
} }
void _updateKeychainSharingSession(AccountId accountId, String emailDeliveryState) async {
if (_iosSharingManager == null) {
return;
}
await _iosSharingManager!.updateEmailDeliveryStateInKeyChain(accountId, emailDeliveryState);
}
} }
lib/main/utils/ios_sharing_manager.dart
-10
View File
@@ -153,16 +153,6 @@ class IOSSharingManager {
} }
} }
Future updateEmailDeliveryStateInKeyChain(AccountId accountId, String newEmailDeliveryState) async {
final keychainSharingStored = await getKeychainSharingSession(accountId);
log('IOSSharingManager::updateEmailDeliveryStateInKeyChain:keychainSharingStored: $keychainSharingStored | newEmailDeliveryState: $newEmailDeliveryState');
if (keychainSharingStored == null) {
return;
}
final newKeychain = keychainSharingStored.updating(emailDeliveryState: newEmailDeliveryState);
await _keychainSharingManager.save(newKeychain);
}
Future updateEmailStateInKeyChain(AccountId accountId, String newEmailState) async { Future updateEmailStateInKeyChain(AccountId accountId, String newEmailState) async {
final keychainSharingStored = await getKeychainSharingSession(accountId); final keychainSharingStored = await getKeychainSharingSession(accountId);
log('IOSSharingManager::updateEmailStateInKeyChain:keychainSharingStored: $keychainSharingStored | newEmailState: $newEmailState'); log('IOSSharingManager::updateEmailStateInKeyChain:keychainSharingStored: $keychainSharingStored | newEmailState: $newEmailState');