TF-3385 Fix move and delete emails not work properly
This commit is contained in:
+19
-8
@@ -253,6 +253,7 @@ class MailboxDashBoardController extends ReloadableController
|
||||
StreamSubscription? _pendingSharedFileInfoSubscription;
|
||||
StreamSubscription? _receivingFileSharingStreamSubscription;
|
||||
StreamSubscription? _currentEmailIdInNotificationIOSStreamSubscription;
|
||||
List<PresentationEmail> emailsToBeUndo = [];
|
||||
|
||||
final StreamController<Either<Failure, Success>> _progressStateController =
|
||||
StreamController<Either<Failure, Success>>.broadcast();
|
||||
@@ -836,12 +837,22 @@ class MailboxDashBoardController extends ReloadableController
|
||||
MoveToMailboxRequest moveRequest,
|
||||
Map<EmailId, bool> emailIdsWithReadStatus,
|
||||
) {
|
||||
consumeState(_moveToMailboxInteractor.execute(
|
||||
session,
|
||||
accountId,
|
||||
moveRequest,
|
||||
emailIdsWithReadStatus,
|
||||
));
|
||||
final currentMailboxes = moveRequest.currentMailboxes;
|
||||
if (currentMailboxes.length == 1 && currentMailboxes.values.first.length == 1) {
|
||||
consumeState(_moveToMailboxInteractor.execute(
|
||||
session,
|
||||
accountId,
|
||||
moveRequest,
|
||||
emailIdsWithReadStatus,
|
||||
));
|
||||
} else {
|
||||
consumeState(_moveMultipleEmailToMailboxInteractor.execute(
|
||||
session,
|
||||
accountId,
|
||||
moveRequest,
|
||||
emailIdsWithReadStatus,
|
||||
));
|
||||
}
|
||||
}
|
||||
|
||||
void _moveToMailboxSuccess(MoveToMailboxSuccess success) {
|
||||
@@ -873,12 +884,12 @@ class MailboxDashBoardController extends ReloadableController
|
||||
final currentAccountId = accountId.value;
|
||||
final session = sessionCurrent;
|
||||
if (currentAccountId != null && session != null) {
|
||||
consumeState(_moveToMailboxInteractor.execute(
|
||||
moveToMailbox(
|
||||
session,
|
||||
currentAccountId,
|
||||
newMoveRequest,
|
||||
emailIdsWithReadStatus,
|
||||
));
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+14
-4
@@ -1,15 +1,15 @@
|
||||
import 'package:jmap_dart_client/jmap/mail/email/email.dart';
|
||||
import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox.dart';
|
||||
import 'package:model/email/presentation_email.dart';
|
||||
import 'package:tmail_ui_user/features/email/domain/model/move_action.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/controller/mailbox_dashboard_controller.dart';
|
||||
|
||||
extension MoveEmailsToMailboxExtension on MailboxDashBoardController {
|
||||
void handleMoveEmailsToMailbox({
|
||||
required Map<MailboxId,List<EmailId>> originalMailboxIdsWithEmailIds,
|
||||
required MailboxId destinationMailboxId,
|
||||
required MoveAction moveAction,
|
||||
}) {
|
||||
if (destinationMailboxId == selectedMailbox.value?.id) return;
|
||||
|
||||
final currentEmails = List<PresentationEmail>.from(
|
||||
emailsInCurrentMailbox,
|
||||
);
|
||||
@@ -20,7 +20,17 @@ extension MoveEmailsToMailboxExtension on MailboxDashBoardController {
|
||||
return emailIds;
|
||||
},
|
||||
).toList();
|
||||
currentEmails.removeWhere((email) => movedEmailIds.contains(email.id));
|
||||
updateEmailList(currentEmails);
|
||||
final currentEmailsToBeMoved = currentEmails
|
||||
.where((email) => movedEmailIds.contains(email.id))
|
||||
.toList();
|
||||
if (currentEmailsToBeMoved.isNotEmpty && destinationMailboxId != selectedMailbox.value?.id) {
|
||||
emailsToBeUndo = currentEmailsToBeMoved;
|
||||
currentEmails.removeWhere(currentEmailsToBeMoved.contains);
|
||||
updateEmailList(currentEmails);
|
||||
} else if (moveAction == MoveAction.undo && destinationMailboxId == selectedMailbox.value?.id) {
|
||||
currentEmails.addAll(emailsToBeUndo);
|
||||
currentEmails.sort((a, b) => b.receivedAt?.value.compareTo(a.receivedAt?.value ?? DateTime.now()) ?? -1);
|
||||
updateEmailList(currentEmails);
|
||||
}
|
||||
}
|
||||
}
|
||||
+4
-3
@@ -18,13 +18,14 @@ extension UpdateEmailsWithNewMailboxIdExtension on MailboxDashBoardController {
|
||||
return emailIds;
|
||||
},
|
||||
).toList();
|
||||
for (var email in currentEmails) {
|
||||
if (!movedEmailIds.contains(email.id)) continue;
|
||||
for (int i = 0; i < currentEmails.length; i++) {
|
||||
if (!movedEmailIds.contains(currentEmails[i].id)) continue;
|
||||
|
||||
email = email.copyWith(
|
||||
currentEmails[i] = currentEmails[i].copyWith(
|
||||
mailboxIds: {destinationMailboxId: true},
|
||||
mailboxContain: mapMailboxById[destinationMailboxId],
|
||||
);
|
||||
}
|
||||
updateEmailList(currentEmails);
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user