Use TupleKey(ObjectKey-AccountId-UserName) to store data to hive
(cherry picked from commit e0ace535d5f3af71eb13598d92524caf2c6d9bbf)
This commit is contained in:
@@ -1,6 +1,7 @@
|
||||
import 'package:jmap_dart_client/jmap/account_id.dart';
|
||||
import 'package:jmap_dart_client/jmap/core/session/session.dart';
|
||||
import 'package:jmap_dart_client/jmap/core/unsigned_int.dart';
|
||||
import 'package:jmap_dart_client/jmap/core/user_name.dart';
|
||||
import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox.dart';
|
||||
import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox_filter_condition.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox_dashboard/domain/model/spam_report_state.dart';
|
||||
@@ -28,5 +29,5 @@ abstract class SpamReportDataSource {
|
||||
|
||||
Future<void> deleteSpamReportState();
|
||||
|
||||
Future<Mailbox> getSpamMailboxCached(AccountId accountId);
|
||||
Future<Mailbox> getSpamMailboxCached(AccountId accountId, UserName userName);
|
||||
}
|
||||
+2
-1
@@ -1,6 +1,7 @@
|
||||
import 'package:jmap_dart_client/jmap/account_id.dart';
|
||||
import 'package:jmap_dart_client/jmap/core/session/session.dart';
|
||||
import 'package:jmap_dart_client/jmap/core/unsigned_int.dart';
|
||||
import 'package:jmap_dart_client/jmap/core/user_name.dart';
|
||||
import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox.dart';
|
||||
import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox_filter_condition.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox_dashboard/data/datasource/spam_report_datasource.dart';
|
||||
@@ -70,7 +71,7 @@ class SharePreferenceSpamReportDataSourceImpl extends SpamReportDataSource {
|
||||
}
|
||||
|
||||
@override
|
||||
Future<Mailbox> getSpamMailboxCached(AccountId accountId) {
|
||||
Future<Mailbox> getSpamMailboxCached(AccountId accountId, UserName userName) {
|
||||
throw UnimplementedError();
|
||||
}
|
||||
}
|
||||
|
||||
+3
-2
@@ -2,6 +2,7 @@
|
||||
import 'package:jmap_dart_client/jmap/account_id.dart';
|
||||
import 'package:jmap_dart_client/jmap/core/session/session.dart';
|
||||
import 'package:jmap_dart_client/jmap/core/unsigned_int.dart';
|
||||
import 'package:jmap_dart_client/jmap/core/user_name.dart';
|
||||
import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox.dart';
|
||||
import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox_filter_condition.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox/data/local/mailbox_cache_manager.dart';
|
||||
@@ -37,9 +38,9 @@ class SpamReportCacheDataSourceImpl extends SpamReportDataSource {
|
||||
}
|
||||
|
||||
@override
|
||||
Future<Mailbox> getSpamMailboxCached(AccountId accountId) {
|
||||
Future<Mailbox> getSpamMailboxCached(AccountId accountId, UserName userName) {
|
||||
return Future.sync(() async {
|
||||
return await _mailboxCacheManager.getSpamMailbox(accountId);
|
||||
return await _mailboxCacheManager.getSpamMailbox(accountId, userName);
|
||||
}).catchError(_exceptionThrower.throwException);
|
||||
}
|
||||
|
||||
|
||||
+2
-1
@@ -2,6 +2,7 @@
|
||||
import 'package:jmap_dart_client/jmap/account_id.dart';
|
||||
import 'package:jmap_dart_client/jmap/core/session/session.dart';
|
||||
import 'package:jmap_dart_client/jmap/core/unsigned_int.dart';
|
||||
import 'package:jmap_dart_client/jmap/core/user_name.dart';
|
||||
import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox.dart';
|
||||
import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox_filter_condition.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox_dashboard/data/datasource/spam_report_datasource.dart';
|
||||
@@ -66,7 +67,7 @@ class SpamReportDataSourceImpl extends SpamReportDataSource {
|
||||
}
|
||||
|
||||
@override
|
||||
Future<Mailbox> getSpamMailboxCached(AccountId accountId) {
|
||||
Future<Mailbox> getSpamMailboxCached(AccountId accountId, UserName userName) {
|
||||
throw UnimplementedError();
|
||||
}
|
||||
}
|
||||
+2
-1
@@ -1,6 +1,7 @@
|
||||
import 'package:jmap_dart_client/jmap/account_id.dart';
|
||||
import 'package:jmap_dart_client/jmap/core/session/session.dart';
|
||||
import 'package:jmap_dart_client/jmap/core/unsigned_int.dart';
|
||||
import 'package:jmap_dart_client/jmap/core/user_name.dart';
|
||||
import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox.dart';
|
||||
import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox_filter_condition.dart';
|
||||
import 'package:shared_preferences/shared_preferences.dart';
|
||||
@@ -62,7 +63,7 @@ class SharePreferenceSpamReportDataSource extends SpamReportDataSource {
|
||||
}
|
||||
|
||||
@override
|
||||
Future<Mailbox> getSpamMailboxCached(AccountId accountId) {
|
||||
Future<Mailbox> getSpamMailboxCached(AccountId accountId, UserName userName) {
|
||||
throw UnimplementedError();
|
||||
}
|
||||
}
|
||||
@@ -2,6 +2,7 @@ import 'package:core/data/model/source_type/data_source_type.dart';
|
||||
import 'package:jmap_dart_client/jmap/account_id.dart';
|
||||
import 'package:jmap_dart_client/jmap/core/session/session.dart';
|
||||
import 'package:jmap_dart_client/jmap/core/unsigned_int.dart';
|
||||
import 'package:jmap_dart_client/jmap/core/user_name.dart';
|
||||
import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox.dart';
|
||||
import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox_filter_condition.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox_dashboard/data/datasource/spam_report_datasource.dart';
|
||||
@@ -61,7 +62,7 @@ class SpamReportRepositoryImpl extends SpamReportRepository {
|
||||
}
|
||||
|
||||
@override
|
||||
Future<Mailbox> getSpamMailboxCached(AccountId accountId) {
|
||||
return mapDataSource[DataSourceType.cache]!.getSpamMailboxCached(accountId);
|
||||
Future<Mailbox> getSpamMailboxCached(AccountId accountId, UserName userName) {
|
||||
return mapDataSource[DataSourceType.cache]!.getSpamMailboxCached(accountId, userName);
|
||||
}
|
||||
}
|
||||
@@ -1,6 +1,7 @@
|
||||
import 'package:jmap_dart_client/jmap/account_id.dart';
|
||||
import 'package:jmap_dart_client/jmap/core/session/session.dart';
|
||||
import 'package:jmap_dart_client/jmap/core/unsigned_int.dart';
|
||||
import 'package:jmap_dart_client/jmap/core/user_name.dart';
|
||||
import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox.dart';
|
||||
import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox_filter_condition.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox_dashboard/domain/model/spam_report_state.dart';
|
||||
@@ -28,5 +29,5 @@ abstract class SpamReportRepository {
|
||||
|
||||
Future<void> deleteSpamReportState();
|
||||
|
||||
Future<Mailbox> getSpamMailboxCached(AccountId accountId);
|
||||
Future<Mailbox> getSpamMailboxCached(AccountId accountId, UserName userName);
|
||||
}
|
||||
+3
-2
@@ -3,6 +3,7 @@ import 'package:core/presentation/state/failure.dart';
|
||||
import 'package:core/presentation/state/success.dart';
|
||||
import 'package:dartz/dartz.dart';
|
||||
import 'package:jmap_dart_client/jmap/account_id.dart';
|
||||
import 'package:jmap_dart_client/jmap/core/user_name.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox_dashboard/domain/repository/spam_report_repository.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox_dashboard/domain/state/get_number_of_unread_spam_emails_state.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox_dashboard/domain/state/get_spam_mailbox_cached_state.dart';
|
||||
@@ -13,7 +14,7 @@ class GetSpamMailboxCachedInteractor {
|
||||
|
||||
GetSpamMailboxCachedInteractor(this._spamReportRepository);
|
||||
|
||||
Stream<Either<Failure, Success>> execute(AccountId accountId) async* {
|
||||
Stream<Either<Failure, Success>> execute(AccountId accountId, UserName userName) async* {
|
||||
try {
|
||||
yield Right<Failure, Success>(GetSpamMailboxCachedLoading());
|
||||
|
||||
@@ -22,7 +23,7 @@ class GetSpamMailboxCachedInteractor {
|
||||
final checkTimeCondition = timeLast.inHours > MailboxDashboardConstant.spamReportBannerDisplayTimeOut;
|
||||
|
||||
if (checkTimeCondition) {
|
||||
final spamMailbox = await _spamReportRepository.getSpamMailboxCached(accountId);
|
||||
final spamMailbox = await _spamReportRepository.getSpamMailboxCached(accountId, userName);
|
||||
final countUnreadSpamMailbox = spamMailbox.unreadEmails?.value.value.toInt() ?? 0;
|
||||
if (countUnreadSpamMailbox > 0) {
|
||||
yield Right<Failure, Success>(GetSpamMailboxCachedSuccess(spamMailbox));
|
||||
|
||||
@@ -16,8 +16,8 @@ class RemoveEmailDraftsInteractor {
|
||||
Stream<Either<Failure, Success>> execute(Session session, AccountId accountId, EmailId emailId) async* {
|
||||
try {
|
||||
final listState = await Future.wait([
|
||||
_mailboxRepository.getMailboxState(accountId),
|
||||
_emailRepository.getEmailState(accountId),
|
||||
_mailboxRepository.getMailboxState(session, accountId),
|
||||
_emailRepository.getEmailState(session, accountId),
|
||||
], eagerError: true);
|
||||
|
||||
final currentMailboxState = listState.first;
|
||||
|
||||
+13
-12
@@ -405,9 +405,10 @@ class MailboxDashBoardController extends ReloadableController {
|
||||
log('MailboxDashBoardController::_getSessionCurrent(): arguments = $arguments');
|
||||
if (arguments is Session) {
|
||||
sessionCurrent = arguments;
|
||||
accountId.value = sessionCurrent?.accounts.keys.first;
|
||||
final personalAccount = sessionCurrent!.personalAccount;
|
||||
accountId.value = personalAccount.accountId;
|
||||
_getUserProfile();
|
||||
updateAuthenticationAccount(sessionCurrent!, accountId.value!);
|
||||
updateAuthenticationAccount(sessionCurrent!, accountId.value!, sessionCurrent!.username);
|
||||
injectAutoCompleteBindings(sessionCurrent, accountId.value);
|
||||
injectRuleFilterBindings(sessionCurrent, accountId.value);
|
||||
injectVacationBindings(sessionCurrent, accountId.value);
|
||||
@@ -1428,11 +1429,11 @@ class MailboxDashBoardController extends ReloadableController {
|
||||
} catch (e) {
|
||||
logError('MailboxDashBoardController::_handleRefreshActionWhenBackToApp(): $e');
|
||||
}
|
||||
if (_getEmailStateToRefreshInteractor != null && accountId.value != null) {
|
||||
consumeState(_getEmailStateToRefreshInteractor!.execute(accountId.value!));
|
||||
if (_getEmailStateToRefreshInteractor != null && accountId.value != null && sessionCurrent != null) {
|
||||
consumeState(_getEmailStateToRefreshInteractor!.execute(accountId.value!, sessionCurrent!.username));
|
||||
}
|
||||
if (_getMailboxStateToRefreshInteractor != null && accountId.value != null) {
|
||||
consumeState(_getMailboxStateToRefreshInteractor!.execute(accountId.value!));
|
||||
if (_getMailboxStateToRefreshInteractor != null && accountId.value != null && sessionCurrent != null) {
|
||||
consumeState(_getMailboxStateToRefreshInteractor!.execute(accountId.value!, sessionCurrent!.username));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1443,8 +1444,8 @@ class MailboxDashBoardController extends ReloadableController {
|
||||
} catch (e) {
|
||||
logError('MailboxDashBoardController::_deleteEmailStateToRefreshAction(): $e');
|
||||
}
|
||||
if (_deleteEmailStateToRefreshInteractor != null && accountId.value != null) {
|
||||
consumeState(_deleteEmailStateToRefreshInteractor!.execute(accountId.value!));
|
||||
if (_deleteEmailStateToRefreshInteractor != null && accountId.value != null && sessionCurrent != null) {
|
||||
consumeState(_deleteEmailStateToRefreshInteractor!.execute(accountId.value!, sessionCurrent!.username));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1455,8 +1456,8 @@ class MailboxDashBoardController extends ReloadableController {
|
||||
} catch (e) {
|
||||
logError('MailboxDashBoardController::_deleteMailboxStateToRefreshAction(): $e');
|
||||
}
|
||||
if (_deleteMailboxStateToRefreshInteractor != null && accountId.value != null) {
|
||||
consumeState(_deleteMailboxStateToRefreshInteractor!.execute(accountId.value!));
|
||||
if (_deleteMailboxStateToRefreshInteractor != null && accountId.value != null && sessionCurrent != null) {
|
||||
consumeState(_deleteMailboxStateToRefreshInteractor!.execute(accountId.value!, sessionCurrent!.username));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1579,8 +1580,8 @@ class MailboxDashBoardController extends ReloadableController {
|
||||
}
|
||||
|
||||
void refreshSpamReportBanner() {
|
||||
if (spamReportController.enableSpamReport && accountId.value != null) {
|
||||
spamReportController.getSpamMailboxCached(accountId.value!);
|
||||
if (spamReportController.enableSpamReport && sessionCurrent != null && accountId.value != null) {
|
||||
spamReportController.getSpamMailboxCached(accountId.value!, sessionCurrent!.username);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -3,6 +3,7 @@ import 'package:core/presentation/state/success.dart';
|
||||
import 'package:get/get.dart';
|
||||
import 'package:jmap_dart_client/jmap/account_id.dart';
|
||||
import 'package:jmap_dart_client/jmap/core/session/session.dart';
|
||||
import 'package:jmap_dart_client/jmap/core/user_name.dart';
|
||||
import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox.dart';
|
||||
import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox_filter_condition.dart';
|
||||
import 'package:model/extensions/mailbox_extension.dart';
|
||||
@@ -92,8 +93,8 @@ class SpamReportController extends BaseController {
|
||||
mailboxFilterCondition: MailboxFilterCondition(role: Role('Spam'))));
|
||||
}
|
||||
|
||||
void getSpamMailboxCached(AccountId accountId) {
|
||||
consumeState(_getSpamMailboxCachedInteractor.execute(accountId));
|
||||
void getSpamMailboxCached(AccountId accountId, UserName userName) {
|
||||
consumeState(_getSpamMailboxCachedInteractor.execute(accountId, userName));
|
||||
}
|
||||
|
||||
void _storeLastTimeDismissedSpamReportedAction() {
|
||||
|
||||
Reference in New Issue
Block a user