Fix appear save draft dialog when reload editing composer

Signed-off-by: dab246 <tdvu@linagora.com>

core/lib/data/network/download/download_client.dart

@@ -39,6 +39,7 @@ class DownloadClient {
       String cid,
       String fileExtension,
       String fileName,
+      String mimeType,
       {
         String? filePath,
         double? maxWidth,
@@ -58,10 +59,14 @@ class DownloadClient {
         return null;
       }
 
+      final imageType = mimeType == 'application/octet-stream'
+        ? 'image/$fileExtension'
+        : mimeType;
+
       if (PlatformInfo.isWeb) {
         final base64Uri = encodeToBase64Uri({
           'bytesData': bytesData,
-          'mimeType': 'image/$fileExtension',
+          'mimeType': imageType,
           'cid': cid,
           'fileName': fileName,
           'maxWidth': maxWidth
@@ -76,7 +81,7 @@ class DownloadClient {
 
           final base64Uri = await compute(encodeToBase64Uri, {
             'bytesData': bytesDataCompressed,
-            'mimeType': 'image/$fileExtension',
+            'mimeType': imageType,
             'cid': cid,
             'fileName': fileName,
             'maxWidth': maxWidth
@@ -86,7 +91,7 @@ class DownloadClient {
         }  else {
           final base64Uri = await compute(encodeToBase64Uri, {
             'bytesData': bytesData,
-            'mimeType': 'image/$fileExtension',
+            'mimeType': imageType,
             'cid': cid,
             'fileName': fileName,
             'maxWidth': maxWidth
@@ -113,7 +118,8 @@ class DownloadClient {
     if (fileName.contains('.')) {
       fileName = fileName.split('.').first;
     }
-    final base64Uri = '<img src="${HtmlUtils.convertBase64ToImageResourceData(base64Data: base64Data, mimeType: mimeType)}" alt="$fileName" id="cid:$cid" style="max-width: $maxWidth;" />';
+    mimeType = HtmlUtils.validateHtmlImageResourceMimeType(mimeType);
+    final base64Uri = '<img src="${HtmlUtils.convertBase64ToImageResourceData(base64Data: base64Data, mimeType: mimeType)}" alt="$fileName" style="max-width: $maxWidth;" data-mimetype="$mimeType" id="cid:$cid" />';
     return base64Uri;
   }
 }

core/lib/presentation/utils/html_transformer/dom/image_transformers.dart

@@ -45,12 +45,13 @@ class ImageTransformer extends DomTransformer {
         final src = imageElement.attributes['src'];
 
         if (src == null) return;
-
+        final mimeType = imageElement.attributes['data-mimetype'];
         if (src.startsWith('cid:') && mapUrlDownloadCID != null) {
           final imageBase64 = await _convertCidToBase64Image(
             dioClient: dioClient,
             mapUrlDownloadCID: mapUrlDownloadCID,
-            imageSource: src
+            imageSource: src,
+            mimeType: mimeType,
           );
           imageElement.attributes['src'] = imageBase64 ?? src;
           imageElement.attributes['id'] ??= src;
@@ -68,7 +69,8 @@ class ImageTransformer extends DomTransformer {
   Future<String?> _convertCidToBase64Image({
     required DioClient dioClient,
     required Map<String, String> mapUrlDownloadCID,
-    required String imageSource
+    required String imageSource,
+    required String? mimeType,
   }) async {
     final cid = imageSource.replaceFirst('cid:', '').trim();
     final urlDownloadCid = mapUrlDownloadCID[cid];
@@ -79,7 +81,8 @@ class ImageTransformer extends DomTransformer {
     final imgBase64Uri = await loadAsyncNetworkImageToBase64(
       dioClient,
       compressFileUtils,
-      urlDownloadCid
+      urlDownloadCid,
+      mimeType,
     );
 
     if (imgBase64Uri.isEmpty) return null;
@@ -90,7 +93,8 @@ class ImageTransformer extends DomTransformer {
   Future<String> loadAsyncNetworkImageToBase64(
       DioClient dioClient,
       CompressFileUtils compressFileUtils,
-      String imageUrl
+      String imageUrl,
+      String? mimeType,
   ) async {
     try {
       var responseData = await dioClient.get(
@@ -99,10 +103,16 @@ class ImageTransformer extends DomTransformer {
 
       if (responseData != null) {
         if (PlatformInfo.isWeb) {
-          return encodeToBase64Uri(responseData);
+          return encodeToBase64Uri({
+            'bytesData': responseData,
+            'mimeType': mimeType,
+          });
         } else {
           final bytesCompressed = await compressFileUtils.compressBytesDataImage(responseData);
-          final base64Uri = await compute(encodeToBase64Uri, bytesCompressed);
+          final base64Uri = await compute(encodeToBase64Uri, {
+            'bytesData': bytesCompressed,
+            'mimeType': mimeType,
+          });
           return base64Uri;
         }
       } else {
@@ -113,12 +123,12 @@ class ImageTransformer extends DomTransformer {
     }
   }
 
-  static String encodeToBase64Uri(dynamic bytesData) {
+  static String encodeToBase64Uri(Map<String, dynamic> entryParam) {
-    final base64Data = base64Encode(bytesData);
+    final base64Data = base64Encode(entryParam['bytesData']);
     if (!base64Data.endsWith('==')) {
       base64Data.append('==');
     }
-    final base64Uri = 'data:image/jpeg;base64,$base64Data';
+    final mimeType = entryParam['mimeType'] ?? 'image/jpeg';
-    return base64Uri;
+    return 'data:$mimeType;base64,$base64Data';
   }
 }

core/lib/presentation/utils/html_transformer/text/standardize_html_sanitizing_transformers.dart

@@ -11,6 +11,7 @@ class StandardizeHtmlSanitizingTransformers extends TextTransformer {
     'bgcolor',
     'id',
     'class',
+    'data-mimetype',
   ];
 
   static const List<String> mailAllowedHtmlTags = [

core/lib/utils/html/html_utils.dart

@@ -99,13 +99,10 @@ class HtmlUtils {
     required String base64Data,
     required String mimeType
   }) {
-    log('HtmlUtils::convertBase64ToImageResourceData:');
-    mimeType = validateHtmlImageResourceMimeType(mimeType);
     if (!base64Data.endsWith('==')) {
       base64Data.append('==');
     }
-    final imageResource = 'data:$mimeType;base64,$base64Data';
+    return 'data:$mimeType;base64,$base64Data';
-    return imageResource;
   }
 
   static String generateHtmlDocument({

lib/features/composer/data/datasource_impl/composer_datasource_impl.dart

@@ -27,6 +27,7 @@ class ComposerDataSourceImpl extends ComposerDataSource {
         cid,
         fileInfo.fileExtension,
         fileInfo.fileName,
+        fileInfo.mimeType,
         filePath: fileInfo.filePath,
         maxWidth: maxWidth,
         compress: compress);

lib/features/composer/data/repository/composer_repository_impl.dart

@@ -113,4 +113,14 @@ class ComposerRepositoryImpl extends ComposerRepository {
       return Future.value(emailContent);
     }
   }
+
+  @override
+  Future<String> removeStyleLazyLoadDisplayInlineImages({required String emailContent}) {
+    try {
+      return _htmlDataSource.removeStyleLazyLoadDisplayInlineImages(emailContent: emailContent);
+    } catch (e) {
+      logError('ComposerRepositoryImpl::removeStyleLazyLoadDisplayInlineImages: Exception: $e');
+      return Future.value(emailContent);
+    }
+  }
 }

lib/features/composer/domain/repository/composer_repository.dart

@@ -17,4 +17,6 @@ abstract class ComposerRepository {
   Future<String?> downloadImageAsBase64(String url, String cid, FileInfo fileInfo, {double? maxWidth, bool? compress});
 
   Future<String> removeCollapsedExpandedSignatureEffect({required String emailContent});
+
+  Future<String> removeStyleLazyLoadDisplayInlineImages({required String emailContent});
 }

lib/features/composer/presentation/composer_controller.dart

@@ -1112,6 +1112,13 @@ class ComposerController extends BaseController
     emailContent = await _composerRepository.removeCollapsedExpandedSignatureEffect(
       emailContent: emailContent,
     );
+    if (emailIdEditing != null &&
+        savedActionType == EmailActionType.compose &&
+        currentEmailActionType == EmailActionType.reopenComposerBrowser) {
+      emailContent = await _composerRepository.removeStyleLazyLoadDisplayInlineImages(
+        emailContent: emailContent,
+      );
+    }
 
     final savedEmailDraft = SavedEmailDraft(
       subject: subjectEmail.value ?? '',

lib/features/composer/presentation/controller/rich_text_web_controller.dart

@@ -282,8 +282,9 @@ class RichTextWebController extends BaseRichTextController {
   void insertImageAsBase64({required PlatformFile platformFile, int? maxWidth}) {
     if (platformFile.bytes != null) {
       final base64Data = base64Encode(platformFile.bytes!);
+      final mimeType = HtmlUtils.validateHtmlImageResourceMimeType('image/${platformFile.extension}');
       editorController.insertHtml(
-        '<img src="${HtmlUtils.convertBase64ToImageResourceData(base64Data: base64Data, mimeType: 'image/${platformFile.extension}')}" data-filename="${platformFile.name}" alt="Image in my signature" style="max-width: ${maxWidth != null ? '${maxWidth}px' : '100%'};"/>'
+        '<img src="${HtmlUtils.convertBase64ToImageResourceData(base64Data: base64Data, mimeType: mimeType)}" data-filename="${platformFile.name}" alt="Image in my signature" style="max-width: ${maxWidth != null ? '${maxWidth}px' : '100%'};" data-mimetype="$mimeType"/>'
       );
     } else {
       logError("RichTextWebController::insertImageAsBase64: bytes is null");

lib/features/email/data/datasource/html_datasource.dart

@@ -23,4 +23,6 @@ abstract class HtmlDataSource {
   });
 
   Future<String> removeCollapsedExpandedSignatureEffect({required String emailContent});
+
+  Future<String> removeStyleLazyLoadDisplayInlineImages({required String emailContent});
 }

lib/features/email/data/datasource_impl/html_datasource_impl.dart

@@ -62,4 +62,13 @@ class HtmlDataSourceImpl extends HtmlDataSource {
       );
     }).catchError(_exceptionThrower.throwException);
   }
+
+  @override
+  Future<String> removeStyleLazyLoadDisplayInlineImages({required String emailContent}) {
+    return Future.sync(() async {
+      return await _htmlAnalyzer.removeStyleLazyLoadDisplayInlineImages(
+        emailContent: emailContent,
+      );
+    }).catchError(_exceptionThrower.throwException);
+  }
 }

lib/features/email/data/local/html_analyzer.dart

@@ -237,4 +237,30 @@ class HtmlAnalyzer {
       return null;
     }
   }
+
+  Future<String> removeStyleLazyLoadDisplayInlineImages({required String emailContent}) async {
+    try {
+      final document = parse(emailContent);
+      final imgElements = document.querySelectorAll('img[style], img[loading]');
+      await Future.wait(imgElements.map((img) async {
+        String? style = img.attributes['style'];
+        if (style != null) {
+          style = style.replaceAll(RegExp(r'display\s*:\s*inline;?'), '').trim();
+          if (style.isEmpty) {
+            img.attributes.remove('style');
+          } else {
+            img.attributes['style'] = style;
+          }
+        }
+
+        if (img.attributes['loading'] == 'lazy') {
+          img.attributes.remove('loading');
+        }
+      }));
+      return document.body?.innerHtml ?? emailContent;
+    } catch (e) {
+      logError('HtmlAnalyzer::removeStyleLazyLoadDisplayInlineImages:Exception = $e');
+      return emailContent;
+    }
+  }
 }

lib/features/public_asset/presentation/public_asset_controller.dart

@@ -186,7 +186,7 @@ class PublicAssetController extends BaseController {
     newlyPickedPublicAssetIds.add(publicAsset.id!);
     final imageTag = '<img '
       'src="${publicAsset.publicURI!}" '
-      'style="max-width: 100%" '
+      'style="max-width: 100%;" '
       'public-asset-id="${publicAsset.id!.value}">';
     if (PlatformInfo.isWeb) {
       Get