From ead46d1b80cb1d8f70f3201f88479221e0173b7b Mon Sep 17 00:00:00 2001 From: Dat PHAM HOANG Date: Thu, 15 Aug 2024 13:53:38 +0700 Subject: [PATCH] Prioritizing junk role instead of spam --- .../rules_filter_creator_controller.dart | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/features/rules_filter_creator/presentation/rules_filter_creator_controller.dart b/lib/features/rules_filter_creator/presentation/rules_filter_creator_controller.dart index 77189e013..3aa9ddaf1 100644 --- a/lib/features/rules_filter_creator/presentation/rules_filter_creator_controller.dart +++ b/lib/features/rules_filter_creator/presentation/rules_filter_creator_controller.dart @@ -37,11 +37,11 @@ import 'package:tmail_ui_user/features/rules_filter_creator/presentation/model/c import 'package:tmail_ui_user/features/rules_filter_creator/presentation/model/email_rule_filter_action.dart'; import 'package:tmail_ui_user/features/rules_filter_creator/presentation/model/rule_filter_action_arguments.dart'; import 'package:tmail_ui_user/features/rules_filter_creator/presentation/model/rules_filter_creator_arguments.dart'; +import 'package:tmail_ui_user/features/rules_filter_creator/presentation/model/rules_filter_input_field_arguments.dart'; import 'package:tmail_ui_user/main/localizations/app_localizations.dart'; import 'package:tmail_ui_user/main/routes/app_routes.dart'; import 'package:tmail_ui_user/main/routes/dialog_router.dart'; import 'package:tmail_ui_user/main/routes/route_navigation.dart'; -import 'package:tmail_ui_user/features/rules_filter_creator/presentation/model/rules_filter_input_field_arguments.dart'; class RulesFilterCreatorController extends BaseMailboxController { @@ -219,8 +219,8 @@ class RulesFilterCreatorController extends BaseMailboxController { listEmailRuleFilterActionSelected.add(newRuleFilterAction); } if (currentAction.appendIn.mailboxIds.isNotEmpty == true) { - final spamMailboxId = findMailboxNodeByRole(PresentationMailbox.roleSpam)?.item.id - ?? findMailboxNodeByRole(PresentationMailbox.roleJunk)?.item.id; + final spamMailboxId = findMailboxNodeByRole(PresentationMailbox.roleJunk)?.item.id + ?? findMailboxNodeByRole(PresentationMailbox.roleSpam)?.item.id; for (var mailboxId in currentAction.appendIn.mailboxIds) { if (mailboxId == spamMailboxId) { EmailRuleFilterAction? action = EmailRuleFilterAction.markAsSpam; @@ -268,8 +268,8 @@ class RulesFilterCreatorController extends BaseMailboxController { void _setUpMailboxSelected() { if (_currentTMailRule != null) { final mailboxIdsOfRule = _currentTMailRule!.action.appendIn.mailboxIds; - final spamMailboxId = findMailboxNodeByRole(PresentationMailbox.roleSpam)?.item.id - ?? findMailboxNodeByRole(PresentationMailbox.roleJunk)?.item.id; + final spamMailboxId = findMailboxNodeByRole(PresentationMailbox.roleJunk)?.item.id + ?? findMailboxNodeByRole(PresentationMailbox.roleSpam)?.item.id; for (var mailboxId in mailboxIdsOfRule) { if (mailboxId == spamMailboxId) { final mailboxNode = findMailboxNodeById(mailboxId); @@ -486,8 +486,8 @@ class RulesFilterCreatorController extends BaseMailboxController { mailboxIds.add(ruleFilterAction.mailbox!.id); } if (ruleFilterAction.action is MarAsSpamActionArguments) { - final spamMailboxId = findMailboxNodeByRole(PresentationMailbox.roleSpam)?.item.id - ?? findMailboxNodeByRole(PresentationMailbox.roleJunk)?.item.id; + final spamMailboxId = findMailboxNodeByRole(PresentationMailbox.roleJunk)?.item.id + ?? findMailboxNodeByRole(PresentationMailbox.roleSpam)?.item.id; if (spamMailboxId != null) { mailboxIds.add(spamMailboxId); }