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
+}