TF-56 Send email with attachment

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

@@ -1,10 +1,7 @@
 import 'package:dio/dio.dart';
 import 'package:jmap_dart_client/jmap/account_id.dart';
 import 'package:jmap_dart_client/jmap/mail/email/email.dart';
-import 'package:model/email/read_actions.dart';
-import 'package:model/account/account_request.dart';
-import 'package:model/download/download_task_id.dart';
-import 'package:model/email/attachment.dart';
+import 'package:model/model.dart';
 import 'package:tmail_ui_user/features/composer/domain/model/email_request.dart';
 import 'package:tmail_ui_user/features/email/data/datasource/email_datasource.dart';
 import 'package:tmail_ui_user/features/email/data/network/email_api.dart';

lib/features/email/data/network/email_api.dart

@@ -1,5 +1,4 @@
 import 'dart:async';
-import 'dart:convert';
 import 'dart:io';
 
 import 'package:core/core.dart';
@@ -155,14 +154,12 @@ class EmailAPI {
       throw DeviceNotSupportedException();
     }
 
-    final basicAuth = 'Basic ' + base64Encode(utf8.encode('${accountRequest.userName.userName}:${accountRequest.password.value}'));
-
     final taskIds = await Future.wait(
       attachments.map((attachment) async => await FlutterDownloader.enqueue(
         url: attachment.getDownloadUrl(baseDownloadUrl, accountId),
         savedDir: externalStorageDirPath,
         headers: {
-          HttpHeaders.authorizationHeader: basicAuth,
+          HttpHeaders.authorizationHeader: accountRequest.basicAuth,
           HttpHeaders.acceptHeader: DioClient.jmapHeader
         },
         fileName: attachment.name,
@@ -182,13 +179,11 @@ class EmailAPI {
       AccountRequest accountRequest,
       CancelToken cancelToken
   ) async {
-    final basicAuth = 'Basic ' + base64Encode(utf8.encode('${accountRequest.userName.userName}:${accountRequest.password.value}'));
-
     return _downloadManager.downloadFile(
       attachment.getDownloadUrl(baseDownloadUrl, accountId),
       getTemporaryDirectory(),
       attachment.name ?? '',
-      basicAuth,
+      accountRequest.basicAuth,
       cancelToken: cancelToken);
   }
 }

lib/features/email/data/repository/email_repository_impl.dart

@@ -1,11 +1,8 @@
 
-import 'package:dio/src/cancel_token.dart';
+import 'package:dio/dio.dart';
 import 'package:jmap_dart_client/jmap/account_id.dart';
 import 'package:jmap_dart_client/jmap/mail/email/email.dart';
-import 'package:model/email/read_actions.dart';
-import 'package:model/account/account_request.dart';
-import 'package:model/download/download_task_id.dart';
-import 'package:model/email/attachment.dart';
+import 'package:model/model.dart';
 import 'package:tmail_ui_user/features/composer/domain/model/email_request.dart';
 import 'package:tmail_ui_user/features/email/data/datasource/email_datasource.dart';
 import 'package:tmail_ui_user/features/email/domain/repository/email_repository.dart';

lib/features/email/presentation/email_bindings.dart

@@ -1,6 +1,7 @@
 import 'package:core/core.dart';
 import 'package:get/get.dart';
 import 'package:shared_preferences/shared_preferences.dart';
+import 'package:tmail_ui_user/features/composer/domain/usecases/send_email_interactor.dart';
 import 'package:tmail_ui_user/features/email/data/datasource/email_datasource.dart';
 import 'package:tmail_ui_user/features/email/data/datasource_impl/email_datasource_impl.dart';
 import 'package:tmail_ui_user/features/email/data/network/email_api.dart';
@@ -21,6 +22,7 @@ class EmailBindings extends Bindings {
     Get.lazyPut<EmailDataSource>(() => Get.find<EmailDataSourceImpl>());
     Get.lazyPut(() => EmailRepositoryImpl(Get.find<EmailDataSource>()));
     Get.lazyPut<EmailRepository>(() => Get.find<EmailRepositoryImpl>());
+    Get.put(SendEmailInteractor(Get.find<EmailRepository>()));
     Get.lazyPut(() => GetEmailContentInteractor(Get.find<EmailRepository>()));
     Get.lazyPut(() => MarkAsEmailReadInteractor(Get.find<EmailRepository>()));
     Get.lazyPut(() => CredentialRepositoryImpl(Get.find<SharedPreferences>()));

lib/features/email/presentation/email_controller.dart

@@ -204,7 +204,7 @@ class EmailController extends BaseController {
           ..actionText(AppLocalizations.of(context).cancel)
           ..addCancelDownloadActionClick(() {
               cancelToken.cancel([AppLocalizations.of(context).user_cancel_download_file]);
-              Get.back();
+              popBack();
             }))
         .build());
   }

lib/features/email/presentation/extensions/email_body_part_extension.dart

@@ -1,12 +0,0 @@
-import 'package:jmap_dart_client/jmap/mail/email/email_body_part.dart';
-import 'package:model/model.dart';
-
-extension EmailBodyPartExtension on EmailBodyPart {
-  Attachment toAttachment() => Attachment(
-    partId: partId,
-    blobId: blobId,
-    size: size,
-    name: name,
-    type: type,
-    cid: cid);
-}

lib/features/email/presentation/extensions/email_content_extension.dart

@@ -3,7 +3,6 @@ import 'package:tmail_ui_user/features/email/presentation/constants/email_consta
 import 'package:model/model.dart';
 import 'package:tmail_ui_user/features/email/presentation/model/message_content.dart';
 import 'package:tmail_ui_user/features/email/presentation/model/text_format.dart';
-import 'package:tmail_ui_user/features/email/presentation/extensions/email_body_part_extension.dart';
 
 extension EmailContentExtension on EmailContent {
 

lib/features/email/presentation/widgets/attachment_file_tile_builder.dart

@@ -99,20 +99,21 @@ class AttachmentFileTileBuilder {
                   : null,
                 trailing: buttonAction != null
                   ? Transform(
-                      transform: Matrix4.translationValues(6.0, heightItem != null ? -6.0 : 0.0, 0.0),
+                      transform: Matrix4.translationValues(-5.0, heightItem != null ? -6.0 : 0.0, 0.0),
                       child: buttonAction)
                   : null
               ),
-              Transform(
-                transform: Matrix4.translationValues(5.0, 5.0, 0.0),
-                child: IconButton(
-                  icon: SvgPicture.asset(_imagePaths.icDownload, width: 24, height: 24, fit: BoxFit.fill),
-                  onPressed: () {
-                    if (_onDownloadAttachmentFileActionClick != null) {
-                      _onDownloadAttachmentFileActionClick!(_attachment);
+              if (buttonAction == null)
+                Transform(
+                  transform: Matrix4.translationValues(5.0, 5.0, 0.0),
+                  child: IconButton(
+                    icon: SvgPicture.asset(_imagePaths.icDownload, width: 24, height: 24, fit: BoxFit.fill),
+                    onPressed: () {
+                      if (_onDownloadAttachmentFileActionClick != null) {
+                        _onDownloadAttachmentFileActionClick!(_attachment);
+                      }
                     }
-                  }
-                )),
+                  )),
               if (_attachmentSize > _limitDisplayAttachment && _expandMode == ExpandMode.COLLAPSE) _buildItemBackground()
             ]
           )