TF-105 [BUG] Fix loading is blinking when reading email

model/lib/email/attachment.dart

@@ -9,15 +9,13 @@ import 'package:uri/uri.dart';
 
 class Attachment with EquatableMixin {
 
-  static final String dispositionAttachment = 'attachment';
-
   final PartId? partId;
   final Id? blobId;
   final UnsignedInt? size;
   final String? name;
   final MediaType? type;
   final String? cid;
-  final String? disposition;
+  final ContentDisposition? disposition;
 
   Attachment({
     this.partId,
@@ -42,4 +40,39 @@ class Attachment with EquatableMixin {
 
   @override
   List<Object?> get props => [partId, blobId, size, name, type, cid, disposition];
+}
+
+enum ContentDisposition {
+  inline,
+  attachment,
+  other
+}
+
+extension ContentDispositionExtension on ContentDisposition {
+  String get value {
+    switch(this) {
+      case ContentDisposition.inline:
+        return 'inline';
+      case ContentDisposition.attachment:
+        return 'attachment';
+      case ContentDisposition.other:
+        return this.toString();
+    }
+  }
+}
+
+extension DispositionStringExtension on String? {
+  ContentDisposition? toContentDisposition() {
+    if (this != null) {
+      switch(this) {
+        case 'inline':
+          return ContentDisposition.inline;
+        case 'attachment':
+          return ContentDisposition.attachment;
+        default:
+          return ContentDisposition.other;
+      }
+    }
+    return null;
+  }
 }

model/lib/email/email_content.dart

@@ -1,30 +1,29 @@
 
 import 'package:equatable/equatable.dart';
-import 'package:jmap_dart_client/jmap/mail/email/email.dart';
-import 'package:jmap_dart_client/jmap/mail/email/email_body_part.dart';
-import 'package:jmap_dart_client/jmap/mail/email/email_body_value.dart';
+import 'package:jmap_dart_client/jmap/account_id.dart';
+import 'package:model/email/email_content_type.dart';
+import 'package:model/model.dart';
 
 class EmailContent with EquatableMixin {
 
-  final EmailId id;
-  final Set<EmailBodyPart>? htmlBody;
-  final Set<EmailBodyPart>? attachments;
-  final Map<PartId, EmailBodyValue>? bodyValues;
+  final String content;
+  final EmailContentType type;
 
-  EmailContent(
-    this.id,
-    {
-      this.htmlBody,
-      this.attachments,
-      this.bodyValues
-    }
-  );
+  EmailContent(this.type, this.content);
+
+  bool hasImageInlineWithCid() => content.contains('cid:');
+
+  String getContentHasInlineAttachment(String baseDownloadUrl, AccountId accountId, List<Attachment> attachments) {
+    var contentValid = content;
+    attachments.forEach((attachment) {
+      if(attachment.cid != null) {
+        final urlDownloadImage = attachment.getDownloadUrl(baseDownloadUrl, accountId);
+        contentValid = content.replaceAll('cid:${attachment.cid}', '$urlDownloadImage');
+      }
+    });
+    return contentValid;
+  }
 
   @override
-  List<Object?> get props => [
-    id,
-    htmlBody,
-    attachments,
-    bodyValues
-  ];
+  List<Object?> get props => [type, content];
 }

model/lib/email/email_content_type.dart

@@ -0,0 +1,6 @@
+
+enum EmailContentType {
+  textHtml,
+  textPlain,
+  other
+}

model/lib/extensions/email_body_part_extension.dart

@@ -9,5 +9,5 @@ extension EmailBodyPartExtension on EmailBodyPart {
     name: name,
     type: type,
     cid: cid,
-    disposition: disposition);
+    disposition: disposition.toContentDisposition());
 }

model/lib/extensions/email_extension.dart

@@ -1,6 +1,8 @@
 
+import 'package:http_parser/http_parser.dart';
 import 'package:jmap_dart_client/jmap/core/properties/properties.dart';
 import 'package:jmap_dart_client/jmap/mail/email/email.dart';
+import 'package:jmap_dart_client/jmap/mail/email/email_body_part.dart';
 import 'package:jmap_dart_client/jmap/mail/email/keyword_identifier.dart';
 import 'package:model/email/email_property.dart';
 import 'package:model/model.dart';
@@ -22,15 +24,6 @@ extension EmailExtension on Email {
     return listEmailAddress;
   }
 
-  EmailContent toEmailContent() {
-    return EmailContent(
-      id,
-      htmlBody: htmlBody,
-      attachments: attachments,
-      bodyValues: bodyValues
-    );
-  }
-
   Email updatedEmail({Map<KeyWordIdentifier, bool>? newKeywords}) {
     return Email(
         id,
@@ -86,4 +79,32 @@ extension EmailExtension on Email {
       mailboxIds: updatedProperties.contain(EmailProperty.mailboxIds) ? newEmail.mailboxIds : mailboxIds,
     );
   }
+
+  List<EmailContent> get emailContentList {
+    final newHtmlBody = htmlBody
+      ?.where((emailBody) => emailBody.partId != null && emailBody.type != null)
+      .toList() ?? <EmailBodyPart>[];
+
+    final mapHtmlBody = Map<PartId, MediaType>.fromIterable(
+      newHtmlBody,
+      key: (emailBody) => emailBody.partId!,
+      value: (emailBody) => emailBody.type!,
+    );
+
+    final emailContents = bodyValues?.entries
+      .map((entries) => EmailContent(mapHtmlBody[entries.key].toEmailContentType(), entries.value.value))
+      .toList();
+
+    return emailContents ?? [];
+  }
+
+  List<Attachment> get allAttachments {
+    if (attachments != null) {
+      return attachments!
+        .where((element) => element.disposition != null)
+        .map((item) => item.toAttachment())
+        .toList();
+    }
+    return [];
+  }
 }

model/lib/extensions/media_type_extension.dart

@@ -0,0 +1,20 @@
+import 'package:http_parser/http_parser.dart';
+import 'package:model/email/email_content_type.dart';
+
+extension MediaTypeExtension on MediaType? {
+
+  EmailContentType toEmailContentType() {
+    if (this == null) {
+      return EmailContentType.textHtml;
+    } else {
+      switch(this!.mimeType) {
+        case 'text/html':
+          return EmailContentType.textHtml;
+        case 'text/plain':
+          return EmailContentType.textPlain;
+        default:
+          return EmailContentType.other;
+      }
+    }
+  }
+}

model/lib/model.dart

@@ -29,6 +29,7 @@ export 'email/move_action.dart';
 export 'email/mark_star_action.dart';
 export 'email/email_property.dart';
 export 'email/email_filter.dart';
+export 'email/email_content_type.dart';
 
 // Extensions
 export 'extensions/email_address_extension.dart';
@@ -50,6 +51,7 @@ export 'extensions/properties_extension.dart';
 export 'extensions/list_mailbox_extension.dart';
 export 'extensions/list_extension.dart';
 export 'extensions/list_email_extension.dart';
+export 'extensions/media_type_extension.dart';
 
 // Download
 export 'download/download_task_id.dart';