TF-2602 Set charset for attachment with mimeType=text/plain when sent email on mobile

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

lib/features/composer/presentation/composer_bindings.dart

@@ -81,7 +81,11 @@ class ComposerBindings extends BaseBindings {
   }
 
   void _bindingsUtils() {
-    Get.lazyPut(() => FileUploader(Get.find<DioClient>(tag: BindingTag.isolateTag), Get.find<Executor>()));
+    Get.lazyPut(() => FileUploader(
+      Get.find<DioClient>(tag: BindingTag.isolateTag),
+      Get.find<Executor>(),
+      Get.find<FileUtils>(),
+    ));
   }
 
   @override

lib/features/upload/data/model/upload_file_arguments.dart

@@ -1,5 +1,6 @@
 
 import 'package:core/data/network/dio_client.dart';
+import 'package:core/utils/file_utils.dart';
 import 'package:equatable/equatable.dart';
 import 'package:tmail_ui_user/features/base/isolate/background_isolate_binary_messenger/background_isolate_binary_messenger.dart';
 import 'package:tmail_ui_user/features/upload/domain/model/mobile_file_upload.dart';
@@ -8,6 +9,7 @@ import 'package:tmail_ui_user/features/upload/domain/model/upload_task_id.dart';
 class UploadFileArguments with EquatableMixin {
 
   final DioClient dioClient;
+  final FileUtils fileUtils;
   final UploadTaskId uploadId;
   final MobileFileUpload mobileFileUpload;
   final Uri uploadUri;
@@ -15,6 +17,7 @@ class UploadFileArguments with EquatableMixin {
 
   UploadFileArguments(
     this.dioClient,
+    this.fileUtils,
     this.uploadId,
     this.mobileFileUpload,
     this.uploadUri,
@@ -24,6 +27,7 @@ class UploadFileArguments with EquatableMixin {
   @override
   List<Object?> get props => [
     dioClient,
+    fileUtils,
     uploadId,
     mobileFileUpload,
     uploadUri,

lib/features/upload/data/network/file_uploader.dart

@@ -7,6 +7,7 @@ import 'package:core/data/network/dio_client.dart';
 import 'package:core/presentation/state/failure.dart';
 import 'package:core/presentation/state/success.dart';
 import 'package:core/utils/app_logger.dart';
+import 'package:core/utils/file_utils.dart';
 import 'package:core/utils/platform_info.dart';
 import 'package:dartz/dartz.dart';
 import 'package:dio/dio.dart';
@@ -32,10 +33,15 @@ class FileUploader {
 
   final DioClient _dioClient;
   final worker.Executor _isolateExecutor;
+  final FileUtils _fileUtils;
 
-  FileUploader(this._dioClient, this._isolateExecutor);
+  FileUploader(
+    this._dioClient,
+    this._isolateExecutor,
+    this._fileUtils,
+  );
 
-  Future<Attachment?> uploadAttachment(
+  Future<Attachment> uploadAttachment(
       UploadTaskId uploadId,
       StreamController<Either<Failure, Success>> onSendController,
       FileInfo fileInfo,
@@ -59,6 +65,7 @@ class FileUploader {
       return await _isolateExecutor.execute(
         arg1: UploadFileArguments(
           _dioClient,
+          _fileUtils,
           uploadId,
           mobileFileUpload,
           uploadUri,
@@ -77,7 +84,7 @@ class FileUploader {
     }
   }
 
-  static Future<Attachment?> _handleUploadAttachmentAction(
+  static Future<Attachment> _handleUploadAttachmentAction(
       UploadFileArguments argsUpload,
       worker.TypeSendPort sendPort
   ) async {
@@ -104,7 +111,7 @@ class FileUploader {
         ),
         data: File(argsUpload.mobileFileUpload.filePath).openRead(),
         onSendProgress: (count, total) {
-          log('FileUploader::_handleUploadAttachmentAction():onSendProgress: [${argsUpload.uploadId.id}] = $count');
+          log('FileUploader::_handleUploadAttachmentAction():onSendProgress: FILE[${argsUpload.uploadId.id}] : { PROGRESS = $count | TOTAL = $total}');
           sendPort.send(
             UploadingAttachmentUploadState(
               argsUpload.uploadId,
@@ -114,11 +121,18 @@ class FileUploader {
           );
         }
       );
-      log('FileUploader::_handleUploadAttachmentAction():resultJson: $resultJson');
+      log('FileUploader::_handleUploadAttachmentAction(): RESULT_JSON = $resultJson');
-      return _parsingResponse(
+      if (argsUpload.mobileFileUpload.mimeType == FileUtils.TEXT_PLAIN_MIME_TYPE) {
-        resultJson: resultJson,
+        final fileCharset = await argsUpload.fileUtils.getFileCharset(argsUpload.mobileFileUpload.filePath);
-        fileName: argsUpload.mobileFileUpload.fileName
+        return _parsingResponse(
-      );
+          resultJson: resultJson,
+          fileName: argsUpload.mobileFileUpload.fileName,
+          fileCharset: fileCharset);
+      } else {
+        return _parsingResponse(
+          resultJson: resultJson,
+          fileName: argsUpload.mobileFileUpload.fileName);
+      }
     } on DioError catch (exception) {
       logError('FileUploader::_handleUploadAttachmentAction():DioError: $exception');
 
@@ -131,7 +145,7 @@ class FileUploader {
     }
   }
 
-  Future<Attachment?> _handleUploadAttachmentActionOnWeb(
+  Future<Attachment> _handleUploadAttachmentActionOnWeb(
     UploadTaskId uploadId,
     StreamController<Either<Failure, Success>> onSendController,
     FileInfo fileInfo,
@@ -171,13 +185,18 @@ class FileUploader {
     return _parsingResponse(resultJson: resultJson, fileName: fileInfo.fileName);
   }
 
-  static Attachment? _parsingResponse({dynamic resultJson, required String fileName}) {
+  static Attachment _parsingResponse({
-    log('FileUploader::_parsingResponse():resultJson: $resultJson');
+    dynamic resultJson,
+    required String fileName,
+    String? fileCharset
+  }) {
     if (resultJson != null) {
       final decodeJson = resultJson is Map ? resultJson : jsonDecode(resultJson);
       final uploadResponse = UploadResponse.fromJson(decodeJson);
-      log('FileUploader::_parsingResponse():uploadResponse: ${uploadResponse.toString()}');
+      log('FileUploader::_parsingResponse(): UploadResponse = $uploadResponse');
-      return uploadResponse.toAttachment(fileName);
+      return uploadResponse.toAttachment(
+        nameFile: fileName,
+        charset: fileCharset);
     } else {
       logError('FileUploader::_parsingResponse(): DataResponseIsNullException');
       throw DataResponseIsNullException();

lib/features/upload/domain/model/upload_attachment.dart

@@ -5,12 +5,12 @@ import 'package:core/presentation/state/failure.dart';
 import 'package:core/presentation/state/success.dart';
 import 'package:core/utils/app_logger.dart';
 import 'package:dartz/dartz.dart';
+import 'package:dio/dio.dart';
 import 'package:equatable/equatable.dart';
 import 'package:model/upload/file_info.dart';
 import 'package:tmail_ui_user/features/upload/data/network/file_uploader.dart';
 import 'package:tmail_ui_user/features/upload/domain/model/upload_task_id.dart';
 import 'package:tmail_ui_user/features/upload/domain/state/attachment_upload_state.dart';
-import 'package:dio/dio.dart';
 
 class UploadAttachment with EquatableMixin {
 
@@ -48,17 +48,15 @@ class UploadAttachment with EquatableMixin {
         cancelToken: cancelToken
       );
 
+      log('UploadAttachment::upload: ATTACHMENT_UPLOADED = $attachment');
+
       if (cancelToken?.isCancelled == true) {
         _updateEvent(Left(CancelAttachmentUploadState(uploadTaskId)));
         await _progressStateController.close();
         return;
       }
 
-      if (attachment != null) {
+      _updateEvent(Right(SuccessAttachmentUploadState(uploadTaskId, attachment, fileInfo)));
-        _updateEvent(Right(SuccessAttachmentUploadState(uploadTaskId, attachment, fileInfo)));
-      } else {
-        _updateEvent(Left(ErrorAttachmentUploadState(uploadId: uploadTaskId)));
-      }
     } catch (e) {
       logError('UploadAttachment::upload():ERROR: $e');
       if (e is DioError && e.type == DioErrorType.cancel) {

model/lib/email/attachment.dart

@@ -20,6 +20,7 @@ class Attachment with EquatableMixin {
   final MediaType? type;
   final String? cid;
   final ContentDisposition? disposition;
+  final String? charset;
 
   Attachment({
     this.partId,
@@ -29,6 +30,7 @@ class Attachment with EquatableMixin {
     this.type,
     this.cid,
     this.disposition,
+    this.charset,
   });
 
   bool noCid() => cid == null || cid?.isEmpty == true;
@@ -59,7 +61,16 @@ class Attachment with EquatableMixin {
   }
 
   @override
-  List<Object?> get props => [partId, blobId, size, name, type, cid, disposition];
+  List<Object?> get props => [
+    partId,
+    blobId,
+    size,
+    name,
+    type,
+    cid,
+    disposition,
+    charset
+  ];
 }
 
 enum ContentDisposition {

model/lib/extensions/attachment_extension.dart

@@ -11,7 +11,7 @@ extension AttachmentExtension on Attachment {
     name: name,
     type: type,
     cid: cid,
-    charset: charset,
+    charset: charset ?? this.charset,
     disposition: disposition?.name ?? ContentDisposition.attachment.name);
 
   Attachment toAttachmentWithDisposition({
@@ -25,7 +25,8 @@ extension AttachmentExtension on Attachment {
         name: name,
         type: type,
         cid: cid ?? this.cid,
-        disposition: disposition ?? this.disposition
+        disposition: disposition ?? this.disposition,
+        charset: charset
     );
   }
 

model/lib/extensions/email_body_part_extension.dart

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

model/lib/upload/upload_response.dart

@@ -34,7 +34,13 @@ class UploadResponse with EquatableMixin  {
 }
 
 extension UploadResponseExtension on UploadResponse {
-  Attachment toAttachment(String nameFile) {
+  Attachment toAttachment({required String nameFile, String? charset}) {
-    return Attachment(blobId: blobId, size: UnsignedInt(size), name: nameFile, type: type);
+    return Attachment(
+      blobId: blobId,
+      size: UnsignedInt(size),
+      name: nameFile,
+      type: type,
+      charset: charset
+    );
   }
 }