TF-3035 Restore identity from draft

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

@@ -9,6 +9,7 @@ import 'package:dio/dio.dart';
 import 'package:email_recovery/email_recovery/email_recovery_action.dart';
 import 'package:email_recovery/email_recovery/email_recovery_action_id.dart';
 import 'package:jmap_dart_client/jmap/account_id.dart';
+import 'package:jmap_dart_client/jmap/core/properties/properties.dart';
 import 'package:jmap_dart_client/jmap/core/session/session.dart';
 import 'package:jmap_dart_client/jmap/core/user_name.dart';
 import 'package:jmap_dart_client/jmap/mail/email/email.dart';
@@ -26,7 +27,11 @@ import 'package:tmail_ui_user/features/mailbox/domain/model/create_new_mailbox_r
 import 'package:tmail_ui_user/features/sending_queue/domain/model/sending_email.dart';
 
 abstract class EmailDataSource {
-  Future<Email> getEmailContent(Session session, AccountId accountId, EmailId emailId);
+  Future<Email> getEmailContent(
+    Session session,
+    AccountId accountId,
+    EmailId emailId,
+    {Properties? additionalProperties});
 
   Future<void> sendEmail(
     Session session,

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

@@ -10,6 +10,7 @@ import 'package:email_recovery/email_recovery/email_recovery_action.dart';
 import 'package:email_recovery/email_recovery/email_recovery_action_id.dart';
 import 'package:get/get.dart';
 import 'package:jmap_dart_client/jmap/account_id.dart';
+import 'package:jmap_dart_client/jmap/core/properties/properties.dart';
 import 'package:jmap_dart_client/jmap/core/session/session.dart';
 import 'package:jmap_dart_client/jmap/core/user_name.dart';
 import 'package:jmap_dart_client/jmap/mail/email/email.dart';
@@ -35,9 +36,18 @@ class EmailDataSourceImpl extends EmailDataSource {
   EmailDataSourceImpl(this.emailAPI, this._exceptionThrower);
 
   @override
-  Future<Email> getEmailContent(Session session, AccountId accountId, EmailId emailId) {
+  Future<Email> getEmailContent(
+    Session session,
+    AccountId accountId,
+    EmailId emailId,
+    {Properties? additionalProperties}
+  ) {
     return Future.sync(() async {
-      return await emailAPI.getEmailContent(session, accountId, emailId);
+      return await emailAPI.getEmailContent(
+        session,
+        accountId,
+        emailId,
+        additionalProperties: additionalProperties);
     }).catchError(_exceptionThrower.throwException);
   }
 

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

@@ -12,6 +12,7 @@ import 'package:dio/dio.dart';
 import 'package:email_recovery/email_recovery/email_recovery_action.dart';
 import 'package:email_recovery/email_recovery/email_recovery_action_id.dart';
 import 'package:jmap_dart_client/jmap/account_id.dart';
+import 'package:jmap_dart_client/jmap/core/properties/properties.dart';
 import 'package:jmap_dart_client/jmap/core/session/session.dart';
 import 'package:jmap_dart_client/jmap/core/user_name.dart';
 import 'package:jmap_dart_client/jmap/mail/email/email.dart';
@@ -109,7 +110,12 @@ class EmailHiveCacheDataSourceImpl extends EmailDataSource {
   }
 
   @override
-  Future<Email> getEmailContent(Session session, AccountId accountId, EmailId emailId) {
+  Future<Email> getEmailContent(
+    Session session,
+    AccountId accountId,
+    EmailId emailId,
+    {Properties? additionalProperties}
+  ) {
     throw UnimplementedError();
   }
 

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

@@ -81,7 +81,12 @@ class EmailAPI with HandleSetErrorMixin {
 
   EmailAPI(this._httpClient, this._downloadManager, this._dioClient, this._uuid);
 
-  Future<Email> getEmailContent(Session session, AccountId accountId, EmailId emailId) async {
+  Future<Email> getEmailContent(
+    Session session,
+    AccountId accountId,
+    EmailId emailId,
+    {Properties? additionalProperties}
+  ) async {
     final processingInvocation = ProcessingInvocation();
 
     final jmapRequestBuilder = JmapRequestBuilder(_httpClient, processingInvocation);
@@ -90,6 +95,9 @@ class EmailAPI with HandleSetErrorMixin {
       ..addIds({emailId.id})
       ..addProperties(ThreadConstants.propertiesGetEmailContent)
       ..addFetchHTMLBodyValues(true);
+    if (additionalProperties != null) {
+      getEmailMethod.addProperties(additionalProperties);
+    }
 
     final getEmailInvocation = jmapRequestBuilder.invocation(getEmailMethod);
 

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

@@ -11,6 +11,7 @@ import 'package:dio/dio.dart';
 import 'package:email_recovery/email_recovery/email_recovery_action.dart';
 import 'package:email_recovery/email_recovery/email_recovery_action_id.dart';
 import 'package:jmap_dart_client/jmap/account_id.dart';
+import 'package:jmap_dart_client/jmap/core/properties/properties.dart';
 import 'package:jmap_dart_client/jmap/core/session/session.dart';
 import 'package:jmap_dart_client/jmap/core/state.dart' as jmap;
 import 'package:jmap_dart_client/jmap/mail/email/email.dart';
@@ -49,8 +50,17 @@ class EmailRepositoryImpl extends EmailRepository {
   );
 
   @override
-  Future<Email> getEmailContent(Session session, AccountId accountId, EmailId emailId) {
-    return emailDataSource[DataSourceType.network]!.getEmailContent(session ,accountId, emailId);
+  Future<Email> getEmailContent(
+    Session session,
+    AccountId accountId,
+    EmailId emailId,
+    {Properties? additionalProperties}
+  ) {
+    return emailDataSource[DataSourceType.network]!.getEmailContent(
+      session,
+      accountId,
+      emailId,
+      additionalProperties: additionalProperties);
   }
 
   @override

lib/features/email/domain/repository/email_repository.dart

@@ -10,6 +10,7 @@ import 'package:dio/dio.dart';
 import 'package:email_recovery/email_recovery/email_recovery_action.dart';
 import 'package:email_recovery/email_recovery/email_recovery_action_id.dart';
 import 'package:jmap_dart_client/jmap/account_id.dart';
+import 'package:jmap_dart_client/jmap/core/properties/properties.dart';
 import 'package:jmap_dart_client/jmap/core/session/session.dart';
 import 'package:jmap_dart_client/jmap/core/state.dart' as jmap;
 import 'package:jmap_dart_client/jmap/mail/email/email.dart';
@@ -28,7 +29,11 @@ import 'package:tmail_ui_user/features/email/domain/model/restore_deleted_messag
 import 'package:tmail_ui_user/features/mailbox/domain/model/create_new_mailbox_request.dart';
 
 abstract class EmailRepository {
-  Future<Email> getEmailContent(Session session, AccountId accountId, EmailId emailId);
+  Future<Email> getEmailContent(
+    Session session,
+    AccountId accountId,
+    EmailId emailId,
+    {Properties? additionalProperties});
 
   Future<void> sendEmail(
     Session session,

lib/features/email/domain/usecases/get_email_content_interactor.dart

@@ -6,6 +6,7 @@ import 'package:core/utils/app_logger.dart';
 import 'package:core/utils/platform_info.dart';
 import 'package:dartz/dartz.dart';
 import 'package:jmap_dart_client/jmap/account_id.dart';
+import 'package:jmap_dart_client/jmap/core/properties/properties.dart';
 import 'package:jmap_dart_client/jmap/core/session/session.dart';
 import 'package:jmap_dart_client/jmap/mail/email/email.dart';
 import 'package:model/model.dart';
@@ -23,14 +24,27 @@ class GetEmailContentInteractor {
     EmailId emailId,
     String baseDownloadUrl,
     TransformConfiguration transformConfiguration,
+    {Properties? additionalProperties}
   ) async* {
     try {
       yield Right<Failure, Success>(GetEmailContentLoading());
 
       if (PlatformInfo.isMobile) {
-        yield* _getStoredOpenedEmail(session, accountId, emailId, baseDownloadUrl, transformConfiguration);
+        yield* _getStoredOpenedEmail(
+          session,
+          accountId,
+          emailId,
+          baseDownloadUrl,
+          transformConfiguration,
+          additionalProperties: additionalProperties);
       } else {
-        yield* _getContentEmailFromServer(session, accountId, emailId, baseDownloadUrl, transformConfiguration);
+        yield* _getContentEmailFromServer(
+          session,
+          accountId,
+          emailId,
+          baseDownloadUrl,
+          transformConfiguration,
+          additionalProperties: additionalProperties);
       }
     } catch (e) {
       log('GetEmailContentInteractor::execute(): exception = $e');
@@ -44,9 +58,14 @@ class GetEmailContentInteractor {
     EmailId emailId,
     String baseDownloadUrl,
     TransformConfiguration transformConfiguration,
+    {Properties? additionalProperties}
   ) async* {
     try {
-      final email = await emailRepository.getEmailContent(session, accountId, emailId);
+      final email = await emailRepository.getEmailContent(
+        session,
+        accountId,
+        emailId,
+        additionalProperties: additionalProperties);
       final listAttachments = email.allAttachments.getListAttachmentsDisplayedOutside(email.htmlBodyAttachments);
       final listInlineImages = email.allAttachments.listAttachmentsDisplayedInContent;
 
@@ -87,6 +106,7 @@ class GetEmailContentInteractor {
     EmailId emailId,
     String baseDownloadUrl,
     TransformConfiguration transformConfiguration,
+    {Properties? additionalProperties}
   ) async* {
     try {
       log('GetEmailContentInteractor::_getStoredOpenedEmail(): CALLED');
@@ -109,7 +129,8 @@ class GetEmailContentInteractor {
         accountId,
         emailId,
         baseDownloadUrl,
-        transformConfiguration
+        transformConfiguration,
+        additionalProperties: additionalProperties
       );
     }
   }
@@ -120,6 +141,7 @@ class GetEmailContentInteractor {
     EmailId emailId,
     String baseDownloadUrl,
     TransformConfiguration transformConfiguration,
+    {Properties? additionalProperties}
   ) async* {
     try {
       log('GetEmailContentInteractor::_getStoredNewEmail():CALLED');
@@ -142,7 +164,8 @@ class GetEmailContentInteractor {
         accountId,
         emailId,
         baseDownloadUrl,
-        transformConfiguration
+        transformConfiguration,
+        additionalProperties: additionalProperties
       );
     }
   }

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

@@ -3,10 +3,10 @@ import 'package:tmail_ui_user/features/email/presentation/model/composer_argumen
 
 extension ComposerArgumentsExtension on ComposerArguments {
 
-  ComposerArguments withIdentity({List<Identity>? identities, Identity? selectedIdentity}) {
+  ComposerArguments withIdentity({List<Identity>? identities, IdentityId? selectedIdentityId}) {
     return copyWith(
       identities: identities,
-      selectedIdentity: selectedIdentity,
+      selectedIdentityId: selectedIdentityId,
     );
   }
 }

lib/features/email/presentation/model/composer_arguments.dart

@@ -26,7 +26,7 @@ class ComposerArguments extends RouterArguments {
   final MessageIdsHeaderValue? references;
   final EmailId? previousEmailId;
   final List<Identity>? identities;
-  final Identity? selectedIdentity;
+  final IdentityId? selectedIdentityId;
   final List<Attachment>? inlineImages;
   final bool? hasRequestReadReceipt;
   final ScreenDisplayMode displayMode;
@@ -46,7 +46,7 @@ class ComposerArguments extends RouterArguments {
     this.references,
     this.previousEmailId,
     this.identities,
-    this.selectedIdentity,
+    this.selectedIdentityId,
     this.inlineImages,
     this.hasRequestReadReceipt,
     this.displayMode = ScreenDisplayMode.normal
@@ -87,7 +87,7 @@ class ComposerArguments extends RouterArguments {
   factory ComposerArguments.editDraftEmail(PresentationEmail presentationEmail) =>
     ComposerArguments(
       emailActionType: EmailActionType.editDraft,
-      presentationEmail: presentationEmail
+      presentationEmail: presentationEmail,
     );
 
   factory ComposerArguments.fromSessionStorageBrowser(ComposerCache composerCache) =>
@@ -96,7 +96,7 @@ class ComposerArguments extends RouterArguments {
       presentationEmail: composerCache.email?.toPresentationEmail(),
       emailContents: composerCache.email?.emailContentList.asHtmlString,
       attachments: composerCache.email?.allAttachments.getListAttachmentsDisplayedOutside(composerCache.email?.htmlBodyAttachments ?? []),
-      selectedIdentity: composerCache.identity,
+      selectedIdentityId: composerCache.email?.identityIdFromHeader,
       inlineImages: composerCache.email?.allAttachments.listAttachmentsDisplayedInContent,
       hasRequestReadReceipt: composerCache.hasRequestReadReceipt,
       displayMode: composerCache.displayMode,
@@ -189,7 +189,7 @@ class ComposerArguments extends RouterArguments {
     references,
     previousEmailId,
     identities,
-    selectedIdentity,
+    selectedIdentityId,
     inlineImages,
     hasRequestReadReceipt,
     displayMode,
@@ -210,7 +210,7 @@ class ComposerArguments extends RouterArguments {
     MessageIdsHeaderValue? references,
     EmailId? previousEmailId,
     List<Identity>? identities,
-    Identity? selectedIdentity,
+    IdentityId? selectedIdentityId,
     List<Attachment>? inlineImages,
     bool? hasRequestReadReceipt,
     ScreenDisplayMode? displayMode,
@@ -230,7 +230,7 @@ class ComposerArguments extends RouterArguments {
       references: references ?? this.references,
       previousEmailId: previousEmailId ?? this.previousEmailId,
       identities: identities ?? this.identities,
-      selectedIdentity: selectedIdentity ?? this.selectedIdentity,
+      selectedIdentityId: selectedIdentityId ?? this.selectedIdentityId,
       inlineImages: inlineImages ?? this.inlineImages,
       hasRequestReadReceipt: hasRequestReadReceipt ?? this.hasRequestReadReceipt,
       displayMode: displayMode ?? this.displayMode,