From d14ff9d73c736c0abff9adfd89c84b037d2c0033 Mon Sep 17 00:00:00 2001
From: dab246 <tdvu@linagora.com>
Date: Wed, 22 Nov 2023 08:55:34 +0700
Subject: [PATCH] TF-2345 Fixe attachments are not displayed when cid is
 present

Signed-off-by: dab246 <tdvu@linagora.com>
(cherry picked from commit d4a95bfa305b198f5d3c369e3f49decb495b6fba)
---
 model/lib/email/attachment.dart                     | 2 ++
 model/lib/extensions/list_attachment_extension.dart | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/model/lib/email/attachment.dart b/model/lib/email/attachment.dart
index a0f30e6b1..88420ec5d 100644
--- a/model/lib/email/attachment.dart
+++ b/model/lib/email/attachment.dart
@@ -34,6 +34,8 @@ class Attachment with EquatableMixin {
 
   bool hasCid() => cid != null && cid?.isNotEmpty == true;
 
+  bool isInlined() => disposition == ContentDisposition.inline;
+
   String getDownloadUrl(String baseDownloadUrl, AccountId accountId) {
     final downloadUriTemplate = UriTemplate(baseDownloadUrl);
     final downloadUri = downloadUriTemplate.expand({
diff --git a/model/lib/extensions/list_attachment_extension.dart b/model/lib/extensions/list_attachment_extension.dart
index fa9c02d7a..7babc9f77 100644
--- a/model/lib/extensions/list_attachment_extension.dart
+++ b/model/lib/extensions/list_attachment_extension.dart
@@ -13,7 +13,7 @@ extension ListAttachmentExtension on List<Attachment> {
     return 0;
   }
 
-  List<Attachment> get listAttachmentsDisplayedOutSide => where((attachment) => attachment.noCid()).toList();
+  List<Attachment> get listAttachmentsDisplayedOutSide => where((attachment) => attachment.noCid() || !attachment.isInlined()).toList();
 
   List<Attachment> get listAttachmentsDisplayedInContent => where((attachment) => attachment.hasCid()).toList();