eduvia/workavia-mail-front
11
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

TF-106 Fix display inlined image CIDs of emails

Browse Source
This commit is contained in:
dab246
2021-10-18 14:46:11 +07:00
committed by Dat H. Pham
parent 1432cb0209
commit 60ffa5ace0
25 changed files with 202 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/features/composer/data/network/composer_api.dart
-8
View File
@@ -2,7 +2,6 @@
import 'dart:io';
import 'package:core/core.dart';
import 'package:dio/dio.dart';
import 'package:model/model.dart';
class ComposerAPI {
@@ -14,14 +13,7 @@ class ComposerAPI {
Future<UploadResponse> uploadAttachment(UploadRequest uploadRequest) async {
final resultJson = await _dioClient.post(
Uri.decodeFull(uploadRequest.uploadUrl.toString()),
options: Options(headers: _buildHeaderRequestParam()),
data: File(uploadRequest.fileInfo.filePath).readAsBytesSync());
return UploadResponse.fromJson(resultJson);
}
Map<String, dynamic> _buildHeaderRequestParam() {
final headerParam = _dioClient.getHeaders();
headerParam[HttpHeaders.acceptHeader] = DioClient.jmapHeader;
return headerParam;
}
}
lib/features/email/data/datasource/html_datasource.dart
+4 -1
View File
@@ -2,5 +2,8 @@
import 'package:model/model.dart';
abstract class HtmlDataSource {
Future<EmailContent> transformEmailContent(EmailContent emailContent);
Future<EmailContent> transformEmailContent(
EmailContent emailContent,
Map<String, String> mapUrlDownloadCID
);
}
lib/features/email/data/datasource_impl/html_datasource_impl.dart
+9 -4
View File
@@ -1,17 +1,22 @@
import 'package:model/email/email_content.dart';
import 'package:core/core.dart';
import 'package:model/model.dart';
import 'package:tmail_ui_user/features/email/data/datasource/html_datasource.dart';
import 'package:tmail_ui_user/features/email/data/local/html_analyzer.dart';
class HtmlDataSourceImpl extends HtmlDataSource {
final HtmlAnalyzer _htmlAnalyzer;
final DioClient _dioClient;
HtmlDataSourceImpl(this._htmlAnalyzer);
HtmlDataSourceImpl(this._htmlAnalyzer, this._dioClient);
@override
Future<EmailContent> transformEmailContent(EmailContent emailContent) {
Future<EmailContent> transformEmailContent(
EmailContent emailContent,
Map<String, String>? mapUrlDownloadCID
) {
return Future.sync(() async {
return await _htmlAnalyzer.transformEmailContent(emailContent);
return await _htmlAnalyzer.transformEmailContent(emailContent, mapUrlDownloadCID, _dioClient);
}).catchError((error) {
throw error;
});
lib/features/email/data/local/html_analyzer.dart
+11 -3
View File
@@ -1,15 +1,23 @@
import 'package:core/core.dart';
import 'package:core/presentation/utils/html_transformer/html_transform.dart';
import 'package:model/email/email_content_type.dart';
import 'package:model/model.dart';
class HtmlAnalyzer {
Future<EmailContent> transformEmailContent(EmailContent emailContent) async {
Future<EmailContent> transformEmailContent(
EmailContent emailContent,
Map<String, String>? mapUrlDownloadCID,
DioClient dioClient
) async {
switch(emailContent.type) {
case EmailContentType.textHtml:
final htmlTransform = HtmlTransform(emailContent.content);
final htmlContent = htmlTransform.transformToHtml();
final htmlTransform = HtmlTransform(
emailContent.content,
dioClient,
mapUrlDownloadCID);
final htmlContent = await htmlTransform.transformToHtml();
return EmailContent(emailContent.type, htmlContent);
default:
return emailContent;
lib/features/email/data/repository/email_repository_impl.dart
+11 -2
View File
@@ -72,10 +72,19 @@ class EmailRepositoryImpl extends EmailRepository {
}
@override
Future<List<EmailContent>> transformEmailContent(List<EmailContent> emailContents) async {
Future<List<EmailContent>> transformEmailContent(
List<EmailContent> emailContents,
List<Attachment> attachmentInlines,
String? baseUrlDownload,
AccountId accountId
) async {
final mapUrlDownloadCID = Map<String, String>.fromIterable(
attachmentInlines,
key: (attachment) => attachment.cid!,
value: (attachment) => attachment.getDownloadUrl(baseUrlDownload, accountId));
return await Future.wait(emailContents
.map((emailContent) async {
return await _htmlDataSource.transformEmailContent(emailContent);
return await _htmlDataSource.transformEmailContent(emailContent, mapUrlDownloadCID);
})
.toList());
}
lib/features/email/domain/repository/email_repository.dart
+6 -1
View File
@@ -35,5 +35,10 @@ abstract class EmailRepository {
MarkStarAction markStarAction
);
Future<List<EmailContent>> transformEmailContent(List<EmailContent> emailContents);
Future<List<EmailContent>> transformEmailContent(
List<EmailContent> emailContents,
List<Attachment> attachmentInlines,
String? baseUrlDownload,
AccountId accountId
);
}
lib/features/email/domain/usecases/get_email_content_interactor.dart
+6 -2
View File
@@ -11,13 +11,17 @@ class GetEmailContentInteractor {
GetEmailContentInteractor(this.emailRepository);
Stream<Either<Failure, Success>> execute(AccountId accountId, EmailId emailId) async* {
Stream<Either<Failure, Success>> execute(AccountId accountId, EmailId emailId, String? baseDownloadUrl) async* {
try {
yield Right<Failure, Success>(LoadingState());
final email = await emailRepository.getEmailContent(accountId, emailId);
if (email.emailContentList.isNotEmpty) {
final newEmailContents = await emailRepository.transformEmailContent(email.emailContentList);
final newEmailContents = await emailRepository.transformEmailContent(
email.emailContentList,
email.allAttachments.attachmentWithDispositionInlines,
baseDownloadUrl,
accountId);
yield Right<Failure, Success>(GetEmailContentSuccess(newEmailContents, email.allAttachments));
} else {
yield Left(GetEmailContentFailure(null));
lib/features/email/presentation/email_bindings.dart
+5 -2
View File
@@ -25,14 +25,17 @@ class EmailBindings extends Bindings {
void dependencies() {
Get.lazyPut(() => EmailDataSourceImpl(Get.find<EmailAPI>()));
Get.lazyPut<EmailDataSource>(() => Get.find<EmailDataSourceImpl>());
Get.lazyPut(() => HtmlDataSourceImpl(Get.find<HtmlAnalyzer>()));
Get.lazyPut(() => HtmlDataSourceImpl(
Get.find<HtmlAnalyzer>(),
Get.find<DioClient>()));
Get.lazyPut<HtmlDataSource>(() => Get.find<HtmlDataSourceImpl>());
Get.lazyPut(() => EmailRepositoryImpl(
Get.find<EmailDataSource>(),
Get.find<HtmlDataSource>()));
Get.lazyPut<EmailRepository>(() => Get.find<EmailRepositoryImpl>());
Get.put(SendEmailInteractor(Get.find<EmailRepository>()));
Get.lazyPut(() => GetEmailContentInteractor(Get.find<EmailRepository>()));
Get.lazyPut(() => GetEmailContentInteractor(
Get.find<EmailRepository>()));
Get.lazyPut(() => MarkAsEmailReadInteractor(Get.find<EmailRepository>()));
Get.lazyPut(() => CredentialRepositoryImpl(Get.find<SharedPreferences>()));
Get.lazyPut<CredentialRepository>(() => Get.find<CredentialRepositoryImpl>());
lib/features/email/presentation/email_controller.dart
+2 -1
View File
@@ -88,7 +88,8 @@ class EmailController extends BaseController {
}
void _getEmailContentAction(AccountId accountId, EmailId emailId) async {
consumeState(_getEmailContentInteractor.execute(accountId, emailId));
final baseDownloadUrl = mailboxDashBoardController.sessionCurrent?.getDownloadUrl();
consumeState(_getEmailContentInteractor.execute(accountId, emailId, baseDownloadUrl));
}
@override
lib/features/email/presentation/email_view.dart
+1 -1
View File
@@ -11,7 +11,7 @@ import 'package:tmail_ui_user/features/email/presentation/widgets/app_bar_mail_w
import 'package:tmail_ui_user/features/email/presentation/widgets/attachment_file_tile_builder.dart';
import 'package:tmail_ui_user/features/email/presentation/widgets/attachments_place_holder_loading_widget.dart';
import 'package:tmail_ui_user/features/email/presentation/widgets/bottom_bar_mail_widget_builder.dart';
import 'package:tmail_ui_user/features/email/presentation/extensions/list_attachment_extension.dart';
import 'package:model/extensions/list_attachment_extension.dart';
import 'package:tmail_ui_user/features/email/presentation/widgets/email_content_item_builder.dart';
import 'package:tmail_ui_user/features/email/presentation/widgets/email_content_place_holder_loading_widget.dart';
import 'package:tmail_ui_user/features/email/presentation/widgets/sender_and_receiver_information_tile_builder.dart';
lib/features/email/presentation/extensions/list_attachment_extension.dart
-22
View File
@@ -1,22 +0,0 @@
import 'package:model/model.dart';
extension ListAttachmentExtension on List<Attachment> {
num totalSize() {
num totalSize = 0;
forEach((attachment) {
if (attachment.size != null) {
totalSize += attachment.size!.value;
}
});
return totalSize;
}
List<Attachment> get attachmentsWithDispositionAttachment {
return where((element) => element.disposition == ContentDisposition.attachment).toList();
}
List<Attachment> get attachmentWithDispositionInlines {
return where((element) => element.disposition == ContentDisposition.inline).toList();
}
}
lib/features/thread/presentation/thread_bindings.dart
+3 -1
View File
@@ -51,7 +51,9 @@ class ThreadBindings extends Bindings {
Get.lazyPut(() => ScrollController());
Get.lazyPut(() => EmailDataSourceImpl(Get.find<EmailAPI>()));
Get.lazyPut<EmailDataSource>(() => Get.find<EmailDataSourceImpl>());
Get.lazyPut(() => HtmlDataSourceImpl(Get.find<HtmlAnalyzer>()));
Get.lazyPut(() => HtmlDataSourceImpl(
Get.find<HtmlAnalyzer>(),
Get.find<DioClient>()));
Get.lazyPut<HtmlDataSource>(() => Get.find<HtmlDataSourceImpl>());
Get.lazyPut(() => EmailRepositoryImpl(
Get.find<EmailDataSource>(),