Use TupleKey(ObjectKey-AccountId-UserName) to store data to hive
(cherry picked from commit e0ace535d5f3af71eb13598d92524caf2c6d9bbf)
This commit is contained in:
+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