Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ import 'package:jmap_dart_client/jmap/mail/calendar/properties/attendee/calendar
import 'package:jmap_dart_client/jmap/mail/calendar/properties/calendar_organizer.dart';
import 'package:jmap_dart_client/jmap/mail/email/email.dart';
import 'package:jmap_dart_client/jmap/mail/email/email_address.dart';
import 'package:jmap_dart_client/jmap/mail/email/keyword_identifier.dart';
import 'package:jmap_dart_client/jmap/mdn/disposition.dart';
import 'package:jmap_dart_client/jmap/mdn/mdn.dart';
import 'package:model/error_type_handler/unknown_uri_exception.dart';
Expand Down Expand Up @@ -65,6 +64,7 @@ import 'package:tmail_ui_user/features/email/presentation/bindings/calendar_even
import 'package:tmail_ui_user/features/email/presentation/bindings/mdn_interactor_bindings.dart';
import 'package:tmail_ui_user/features/email/presentation/extensions/calendar_attendee_extension.dart';
import 'package:tmail_ui_user/features/email/presentation/extensions/calendar_organizer_extension.dart';
import 'package:tmail_ui_user/features/email/presentation/extensions/handle_email_action_extension.dart';
import 'package:tmail_ui_user/features/email/presentation/extensions/handle_mail_action_by_shortcut_action_extension.dart';
import 'package:tmail_ui_user/features/email/presentation/extensions/handle_open_attachment_list_extension.dart';
import 'package:tmail_ui_user/features/email/presentation/extensions/update_attendance_status_extension.dart';
Expand All @@ -82,7 +82,6 @@ import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/controller
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/extensions/handle_download_attachment_extension.dart';
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/extensions/handle_preview_attachment_extension.dart';
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/extensions/open_and_close_composer_extension.dart';
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/extensions/update_current_emails_flags_extension.dart';
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/model/dashboard_routes.dart';
import 'package:tmail_ui_user/features/manage_account/domain/state/create_new_rule_filter_state.dart';
import 'package:tmail_ui_user/features/manage_account/domain/state/get_all_identities_state.dart';
Expand Down Expand Up @@ -223,7 +222,7 @@ class SingleEmailController extends BaseController with AppLoaderMixin {
} else if (success is MarkAsEmailReadSuccess) {
_handleMarkAsEmailReadCompleted(success);
} else if (success is MarkAsStarEmailSuccess) {
_markAsEmailStarSuccess(success);
markAsEmailStarSuccess(success);
} else if (success is GetAllIdentitiesSuccess) {
_getAllIdentitiesSuccess(success);
} else if (success is SendReceiptToSenderSuccess) {
Expand Down Expand Up @@ -783,30 +782,6 @@ class SingleEmailController extends BaseController with AppLoaderMixin {
}
}

void _markAsEmailStarSuccess(MarkAsStarEmailSuccess success) {
final newKeywords = {
KeyWordIdentifier.emailFlagged:
success.markStarAction == MarkStarAction.markStar,
};

final newEmail = currentEmail?.updateKeywords(newKeywords);
final emailId = newEmail?.id;
if (emailId == null) return;

if (PlatformInfo.isMobile && !isThreadDetailEnabled) {
mailboxDashBoardController.selectedEmail.value?.resyncKeywords(newKeywords);
} else {
_threadDetailController?.emailIdsPresentation[emailId] = newEmail;
}

mailboxDashBoardController.updateEmailFlagByEmailIds(
[emailId],
markStarAction: success.markStarAction,
);

toastManager.showMessageSuccess(success);
}

void handleEmailAction(
PresentationEmail presentationEmail,
EmailActionType actionType,
Expand Down
17 changes: 15 additions & 2 deletions lib/features/email/presentation/extensions/email_extension.dart
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@

import 'package:core/utils/app_logger.dart';
import 'package:jmap_dart_client/jmap/mail/email/email.dart';
import 'package:jmap_dart_client/jmap/mail/email/keyword_identifier.dart';
import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox.dart';
import 'package:model/extensions/email_extension.dart';
import 'package:model/extensions/list_email_header_extension.dart';
import 'package:tmail_ui_user/features/email/presentation/model/smime_signature_status.dart';
import 'package:tmail_ui_user/features/email/presentation/utils/smime_signature_constant.dart';
import 'package:tmail_ui_user/features/thread/data/extensions/map_keywords_extension.dart';

extension EmailExtension on Email {

Expand Down Expand Up @@ -39,7 +41,7 @@ extension EmailExtension on Email {

bool fromMe(String ownEmailAddress) {
return from?.any(
(emailAdress) => emailAdress.email == ownEmailAddress
(emailAddress) => emailAddress.email == ownEmailAddress
) == true;
}

Expand All @@ -50,7 +52,18 @@ extension EmailExtension on Email {
...bcc ?? {},
};
return recipients.any(
(emailAdress) => emailAdress.email == ownEmailAddress
(emailAddress) => emailAddress.email == ownEmailAddress
) == true;
}

Email toggleKeyword({
required KeyWordIdentifier keyword,
required bool remove,
}) {
return copyWith(
keywords: remove
? keywords.withoutKeyword(keyword)
: keywords.withKeyword(keyword),
);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
import 'package:jmap_dart_client/jmap/mail/email/email.dart';
import 'package:jmap_dart_client/jmap/mail/email/keyword_identifier.dart';
import 'package:tmail_ui_user/features/email/presentation/extensions/email_extension.dart';
import 'package:tmail_ui_user/features/email/presentation/model/email_loaded.dart';

extension EmailLoadedExtension on EmailLoaded {
EmailLoaded toggleEmailKeyword({
required EmailId emailId,
required KeyWordIdentifier keyword,
required bool remove,
}) {
if (emailCurrent == null || emailCurrent!.id != emailId) {
return this;
}
return copyWith(
emailCurrent: emailCurrent!.toggleKeyword(
keyword: keyword,
remove: remove,
),
);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
import 'package:core/utils/platform_info.dart';
import 'package:jmap_dart_client/jmap/mail/email/email.dart';
import 'package:jmap_dart_client/jmap/mail/email/keyword_identifier.dart';
import 'package:model/email/mark_star_action.dart';
import 'package:tmail_ui_user/features/email/domain/state/mark_as_email_star_state.dart';
import 'package:tmail_ui_user/features/email/presentation/controller/single_email_controller.dart';
import 'package:tmail_ui_user/features/email/presentation/extensions/email_loaded_extension.dart';
import 'package:tmail_ui_user/features/email/presentation/extensions/presentation_email_extension.dart';
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/extensions/update_current_emails_flags_extension.dart';
import 'package:tmail_ui_user/features/thread_detail/domain/extensions/list_email_in_thread_detail_info_extension.dart';
import 'package:tmail_ui_user/features/thread_detail/domain/extensions/presentation_email_map_extension.dart';

extension HandleEmailActionExtension on SingleEmailController {
void markAsEmailStarSuccess(MarkAsStarEmailSuccess success) {
_autoSyncStarToSelectedEmailOnMemory(
markStarAction: success.markStarAction,
emailId: success.emailId,
starKeyword: KeyWordIdentifier.emailFlagged,
);

toastManager.showMessageSuccess(success);
}

void _autoSyncStarToSelectedEmailOnMemory({
required MarkStarAction markStarAction,
required EmailId emailId,
required KeyWordIdentifier starKeyword,
}) {
_updateStarInEmailOnMemory(
emailId: emailId,
starKeyword: starKeyword,
markStarAction: markStarAction,
isMobileThreadDisabled: PlatformInfo.isMobile && !isThreadDetailEnabled,
);
}

void _updateStarInEmailOnMemory({
required MarkStarAction markStarAction,
required EmailId emailId,
required KeyWordIdentifier starKeyword,
required bool isMobileThreadDisabled,
}) {
final remove = markStarAction == MarkStarAction.unMarkStar;

if (isMobileThreadDisabled) {
final selectedEmail = mailboxDashBoardController.selectedEmail.value;
if (selectedEmail?.id == emailId) {
mailboxDashBoardController.selectedEmail.value =
selectedEmail?.toggleKeyword(keyword: starKeyword, remove: remove);
}
} else {
final controller = threadDetailController;
if (controller != null) {
controller.emailIdsPresentation.value =
controller.emailIdsPresentation.toggleEmailKeywordById(
emailId: emailId,
keyword: starKeyword,
remove: remove,
);

controller.emailsInThreadDetailInfo.value =
controller.emailsInThreadDetailInfo.toggleEmailKeywordById(
emailId: emailId,
keyword: starKeyword,
remove: remove,
);
}
}

final emailLoaded = currentEmailLoaded.value;
if (emailLoaded != null && emailLoaded.emailCurrent?.id == emailId) {
currentEmailLoaded.value = emailLoaded.toggleEmailKeyword(
emailId: emailId,
keyword: starKeyword,
remove: remove,
);
}

mailboxDashBoardController.updateEmailFlagByEmailIds(
[emailId],
markStarAction: markStarAction,
);
}
}
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
import 'package:jmap_dart_client/jmap/mail/email/email_address.dart';
import 'package:jmap_dart_client/jmap/mail/email/keyword_identifier.dart';
import 'package:model/email/email_action_type.dart';
import 'package:model/email/presentation_email.dart';
import 'package:model/extensions/list_email_address_extension.dart';
import 'package:tmail_ui_user/features/email/presentation/utils/email_utils.dart';
import 'package:tmail_ui_user/features/thread/data/extensions/map_keywords_extension.dart';

extension PresentationEmailExtension on PresentationEmail {
({
Expand Down Expand Up @@ -153,4 +155,15 @@ extension PresentationEmailExtension on PresentationEmail {
replyTo: [],
);
}

PresentationEmail toggleKeyword({
required KeyWordIdentifier keyword,
required bool remove,
}) {
return copyWith(
keywords: remove
? keywords.withoutKeyword(keyword)
: keywords.withKeyword(keyword),
);
}
}
14 changes: 14 additions & 0 deletions lib/features/email/presentation/model/email_loaded.dart
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,20 @@ class EmailLoaded with EquatableMixin {
this.emailCurrent,
});

EmailLoaded copyWith({
String? htmlContent,
List<Attachment>? attachments,
List<Attachment>? inlineImages,
Email? emailCurrent,
}) {
return EmailLoaded(
htmlContent: htmlContent ?? this.htmlContent,
attachments: attachments ?? this.attachments,
inlineImages: inlineImages ?? this.inlineImages,
emailCurrent: emailCurrent ?? this.emailCurrent,
);
}

SMimeSignatureStatus? get sMimeStatus => emailCurrent?.sMimeStatus;

@override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -455,12 +455,14 @@ class MailboxDashBoardController extends ReloadableController
success.markStarAction,
success.countMarkStarSuccess,
success.emailIds,
isThread: success.isThread,
);
} else if (success is MarkAsStarMultipleEmailHasSomeEmailFailure) {
_markAsStarMultipleEmailSuccess(
success.markStarAction,
success.countMarkStarSuccess,
success.successEmailIds,
isThread: success.isThread,
);
} else if (success is MoveMultipleEmailToMailboxAllSuccess ||
success is MoveMultipleEmailToMailboxHasSomeEmailFailure) {
Expand Down Expand Up @@ -1271,10 +1273,11 @@ class MailboxDashBoardController extends ReloadableController
void _markAsStarMultipleEmailSuccess(
MarkStarAction markStarAction,
int countMarkStarSuccess,
List<EmailId> emailIds,
) {
List<EmailId> emailIds, {
bool isThread = false,
}) {
updateEmailFlagByEmailIds(emailIds, markStarAction: markStarAction);
if (currentOverlayContext != null && currentContext != null) {
if (!isThread && currentOverlayContext != null && currentContext != null) {
final message = markStarAction == MarkStarAction.unMarkStar
? AppLocalizations.of(currentContext!).marked_unstar_multiple_item(countMarkStarSuccess)
: AppLocalizations.of(currentContext!).marked_star_multiple_item(countMarkStarSuccess);
Expand Down
17 changes: 13 additions & 4 deletions lib/features/thread/data/extensions/map_keywords_extension.dart
Original file line number Diff line number Diff line change
@@ -1,7 +1,16 @@

import 'package:jmap_dart_client/jmap/mail/email/keyword_identifier.dart';

extension MapKeywordsExtension on Map<KeyWordIdentifier, bool> {
extension MapKeywordsExtension on Map<KeyWordIdentifier, bool>? {
Map<String, bool> toMapString() => Map.fromIterables(
this?.keys.map((keyword) => keyword.value) ?? const <String>[],
this?.values ?? const <bool>[],
);

Map<KeyWordIdentifier, bool> withKeyword(KeyWordIdentifier keyword) {
return Map<KeyWordIdentifier, bool>.from(this ?? {})..[keyword] = true;
}

Map<String, bool> toMapString() => Map.fromIterables(keys.map((keyword) => keyword.value), values);
}
Map<KeyWordIdentifier, bool> withoutKeyword(KeyWordIdentifier keyword) {
return Map<KeyWordIdentifier, bool>.from(this ?? {})..remove(keyword);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,28 @@ import 'package:core/presentation/state/success.dart';
import 'package:jmap_dart_client/jmap/mail/email/email.dart';
import 'package:model/email/mark_star_action.dart';

class LoadingMarkAsStarMultipleEmailAll extends UIState {}
class LoadingMarkAsStarMultipleEmailAll extends LoadingState {}

class MarkAsStarMultipleEmailAllSuccess extends UIState {
final int countMarkStarSuccess;
final MarkStarAction markStarAction;
final List<EmailId> emailIds;
final bool isThread;

MarkAsStarMultipleEmailAllSuccess(
this.countMarkStarSuccess,
this.markStarAction,
this.emailIds,
);
this.emailIds, {
this.isThread = false,
});

@override
List<Object?> get props => [countMarkStarSuccess, markStarAction, emailIds];
List<Object?> get props => [
countMarkStarSuccess,
markStarAction,
emailIds,
isThread,
];
}

class MarkAsStarMultipleEmailAllFailure extends FeatureFailure {
Expand All @@ -33,22 +40,32 @@ class MarkAsStarMultipleEmailHasSomeEmailFailure extends UIState {
final int countMarkStarSuccess;
final MarkStarAction markStarAction;
final List<EmailId> successEmailIds;
final bool isThread;

MarkAsStarMultipleEmailHasSomeEmailFailure(
this.countMarkStarSuccess,
this.markStarAction,
this.successEmailIds,
);
this.successEmailIds, {
this.isThread = false,
});

@override
List<Object?> get props => [countMarkStarSuccess, markStarAction, successEmailIds];
List<Object?> get props => [
countMarkStarSuccess,
markStarAction,
successEmailIds,
isThread,
];
}

class MarkAsStarMultipleEmailFailure extends FeatureFailure {
final MarkStarAction markStarAction;

MarkAsStarMultipleEmailFailure(this.markStarAction, dynamic exception) : super(exception: exception);
MarkAsStarMultipleEmailFailure(
this.markStarAction,
dynamic exception,
) : super(exception: exception);

@override
List<Object?> get props => [markStarAction, exception];
}
}
Loading
Loading