TF-1865: Modify sending email in composer when tap item and Long press item
(cherry picked from commit 5cfda1d92f38da9e5e4fab1413e6e52229a51639)
This commit is contained in:
@@ -235,7 +235,9 @@ class ComposerController extends BaseController {
|
||||
@override
|
||||
void onReady() async {
|
||||
_initEmail();
|
||||
_getAllIdentities();
|
||||
if (isNetworkConnectionAvailable) {
|
||||
_getAllIdentities();
|
||||
}
|
||||
if (!BuildUtils.isWeb) {
|
||||
Future.delayed(const Duration(milliseconds: 500), () =>
|
||||
_checkContactPermission());
|
||||
@@ -1125,8 +1127,9 @@ class ComposerController extends BaseController {
|
||||
}
|
||||
}
|
||||
|
||||
if(arguments.emailContents != null && arguments.emailContents!.isNotEmpty) {
|
||||
emailContentsViewState.value = Right(GetEmailContentFromCacheSuccess(arguments.emailContents!, []));
|
||||
if (arguments.emailContents != null && arguments.emailContents!.isNotEmpty) {
|
||||
_emailContents = arguments.emailContents;
|
||||
emailContentsViewState.value = Right(GetEmailContentSuccess(_emailContents!, [], [], arguments.presentationEmail?.toEmail()));
|
||||
} else {
|
||||
final session = mailboxDashBoardController.sessionCurrent;
|
||||
final baseDownloadUrl = mailboxDashBoardController.sessionCurrent?.getDownloadUrl(jmapUrl: _dynamicUrlInterceptors.jmapUrl);
|
||||
@@ -1162,11 +1165,9 @@ class ComposerController extends BaseController {
|
||||
success.attachments.listAttachmentsDisplayedOutSide);
|
||||
}
|
||||
emailContentsViewState.value = Right(success);
|
||||
_emailContents = success.emailContents.asHtmlString;
|
||||
_emailContents = success.emailContents;
|
||||
}
|
||||
|
||||
String? getEmailContentDraftsAsHtml() => _emailContents;
|
||||
|
||||
String getEmailAddressSender() {
|
||||
final arguments = composerArguments.value;
|
||||
if (arguments != null) {
|
||||
|
||||
@@ -21,7 +21,6 @@ import 'package:get/get.dart';
|
||||
import 'package:jmap_dart_client/jmap/identities/identity.dart';
|
||||
import 'package:model/email/email_action_type.dart';
|
||||
import 'package:model/email/prefix_email_address.dart';
|
||||
import 'package:model/extensions/list_email_content_extension.dart';
|
||||
import 'package:model/mailbox/expand_mode.dart';
|
||||
import 'package:rich_text_composer/rich_text_composer.dart';
|
||||
import 'package:rich_text_composer/views/widgets/rich_text_keyboard_toolbar.dart';
|
||||
@@ -628,7 +627,7 @@ class ComposerView extends GetWidget<ComposerController>
|
||||
child: loadingWidget,
|
||||
);
|
||||
} else if (success is GetEmailContentSuccess) {
|
||||
var contentHtml = success.emailContents.asHtmlString;
|
||||
var contentHtml = success.emailContents;
|
||||
if (contentHtml.isEmpty == true) {
|
||||
contentHtml = HtmlExtension.editorStartTags;
|
||||
}
|
||||
|
||||
@@ -21,7 +21,6 @@ import 'package:html_editor_enhanced/html_editor.dart';
|
||||
import 'package:jmap_dart_client/jmap/identities/identity.dart';
|
||||
import 'package:model/email/email_action_type.dart';
|
||||
import 'package:model/email/prefix_email_address.dart';
|
||||
import 'package:model/extensions/list_email_content_extension.dart';
|
||||
import 'package:model/mailbox/expand_mode.dart';
|
||||
import 'package:pointer_interceptor/pointer_interceptor.dart';
|
||||
import 'package:tmail_ui_user/features/base/mixin/app_loader_mixin.dart';
|
||||
@@ -773,7 +772,7 @@ class ComposerView extends GetWidget<ComposerController>
|
||||
child: loadingWidget,
|
||||
);
|
||||
} else if (success is GetEmailContentSuccess) {
|
||||
var contentHtml = success.emailContents.asHtmlString;
|
||||
var contentHtml = success.emailContents;
|
||||
if (contentHtml.isEmpty == true) {
|
||||
contentHtml = HtmlExtension.editorStartTags;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user