TF-3372 Handling error for empty trash failure
This commit is contained in:
committed by
Dat H. Pham
parent
b07a142bcc
commit
7efe5ed31d
@@ -131,7 +131,7 @@ mixin MailboxActionHandlerMixin {
|
||||
..onConfirmAction(AppLocalizations.of(context).delete_all, () {
|
||||
popBack();
|
||||
if (mailbox.countTotalEmails > 0) {
|
||||
dashboardController.emptySpamFolderAction(spamFolderId: mailbox.id);
|
||||
dashboardController.emptySpamFolderAction(spamFolderId: mailbox.id, totalEmails: mailbox.countTotalEmails);
|
||||
} else {
|
||||
appToast.showToastWarningMessage(
|
||||
context,
|
||||
@@ -156,7 +156,7 @@ mixin MailboxActionHandlerMixin {
|
||||
..onConfirmButtonAction(AppLocalizations.of(context).delete_all, () {
|
||||
popBack();
|
||||
if (mailbox.countTotalEmails > 0) {
|
||||
dashboardController.emptySpamFolderAction(spamFolderId: mailbox.id);
|
||||
dashboardController.emptySpamFolderAction(spamFolderId: mailbox.id, totalEmails: mailbox.countTotalEmails);
|
||||
} else {
|
||||
appToast.showToastWarningMessage(
|
||||
context,
|
||||
|
||||
+5
-3
@@ -1396,12 +1396,14 @@ class MailboxDashBoardController extends ReloadableController
|
||||
onCancelSelectionEmail?.call();
|
||||
|
||||
final trashMailboxId = trashFolderId ?? mapDefaultMailboxIdByRole[PresentationMailbox.roleTrash];
|
||||
final trashMailbox = mapMailboxById[trashMailboxId];
|
||||
final totalEmailsInTrash = totalEmails == 0 ? trashMailbox?.countTotalEmails : totalEmails;
|
||||
if (sessionCurrent != null && accountId.value != null && trashMailboxId != null) {
|
||||
consumeState(_emptyTrashFolderInteractor.execute(
|
||||
sessionCurrent!,
|
||||
accountId.value!,
|
||||
trashMailboxId,
|
||||
totalEmails,
|
||||
totalEmailsInTrash ?? 0,
|
||||
_progressStateController
|
||||
));
|
||||
}
|
||||
@@ -2458,7 +2460,7 @@ class MailboxDashBoardController extends ReloadableController
|
||||
..onConfirmAction(AppLocalizations.of(context).delete_all, () {
|
||||
popBack();
|
||||
if (spamMailbox.countTotalEmails > 0) {
|
||||
emptySpamFolderAction(spamFolderId: spamMailbox.id);
|
||||
emptySpamFolderAction(spamFolderId: spamMailbox.id, totalEmails: spamMailbox.countTotalEmails);
|
||||
} else {
|
||||
appToast.showToastWarningMessage(
|
||||
context,
|
||||
@@ -2483,7 +2485,7 @@ class MailboxDashBoardController extends ReloadableController
|
||||
..onConfirmButtonAction(AppLocalizations.of(context).delete_all, () {
|
||||
popBack();
|
||||
if (spamMailbox.countTotalEmails > 0) {
|
||||
emptySpamFolderAction(spamFolderId: spamMailbox.id);
|
||||
emptySpamFolderAction(spamFolderId: spamMailbox.id, totalEmails: spamMailbox.countTotalEmails);
|
||||
} else {
|
||||
appToast.showToastWarningMessage(
|
||||
context,
|
||||
|
||||
+4
-5
@@ -25,11 +25,9 @@ class MarkMailboxAsReadLoadingBanner extends StatelessWidget with AppLoaderMixin
|
||||
padding: MarkMailboxAsReadLoadingBannerStyle.bannerMargin,
|
||||
child: horizontalLoadingWidget);
|
||||
} else if (success is UpdatingMarkAsMailboxReadState) {
|
||||
final percent = success.countRead / success.totalUnread;
|
||||
return _buildProgressBanner(percent);
|
||||
return _buildProgressBanner(success.countRead, success.totalUnread);
|
||||
} else if (success is EmptyingFolderState) {
|
||||
final percent = success.countEmailsDeleted / success.totalEmails;
|
||||
return _buildProgressBanner(percent);
|
||||
return _buildProgressBanner(success.countEmailsDeleted, success.totalEmails);
|
||||
} else {
|
||||
return const SizedBox.shrink();
|
||||
}
|
||||
@@ -37,7 +35,8 @@ class MarkMailboxAsReadLoadingBanner extends StatelessWidget with AppLoaderMixin
|
||||
);
|
||||
}
|
||||
|
||||
Padding _buildProgressBanner(double percent) {
|
||||
Padding _buildProgressBanner(int progress, int total) {
|
||||
final percent = total > 0 ? progress / total : 0.68;
|
||||
return Padding(
|
||||
padding: MarkMailboxAsReadLoadingBannerStyle.bannerMargin,
|
||||
child: horizontalPercentLoadingWidget(percent)
|
||||
|
||||
@@ -61,7 +61,7 @@ class ThreadIsolateWorker {
|
||||
fun1: _emptyMailboxFolderAction,
|
||||
notification: (value) {
|
||||
if (value is List<EmailId>) {
|
||||
log('ThreadIsolateWorker::emptyMailboxFolder(): onUpdateProgress ${value.length / totalEmails}');
|
||||
log('ThreadIsolateWorker::emptyMailboxFolder(): processed ${value.length} - totalEmails $totalEmails');
|
||||
onProgressController.add(Right<Failure, Success>(EmptyingFolderState(
|
||||
mailboxId, value.length, totalEmails
|
||||
)));
|
||||
@@ -120,7 +120,7 @@ class ThreadIsolateWorker {
|
||||
args.accountId,
|
||||
newEmailList.listEmailIds);
|
||||
emailListCompleted.addAll(listEmailIdDeleted);
|
||||
sendPort.send(listEmailIdDeleted);
|
||||
sendPort.send(emailListCompleted);
|
||||
} else {
|
||||
hasEmails = false;
|
||||
}
|
||||
@@ -176,7 +176,7 @@ class ThreadIsolateWorker {
|
||||
emailListCompleted.addAll(listEmailIdDeleted);
|
||||
|
||||
onProgressController.add(Right<Failure, Success>(EmptyingFolderState(
|
||||
mailboxId, listEmailIdDeleted.length, totalEmails
|
||||
mailboxId, emailListCompleted.length, totalEmails
|
||||
)));
|
||||
} else {
|
||||
hasEmails = false;
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
import 'package:core/core.dart';
|
||||
import 'package:dartz/dartz.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_portal/flutter_portal.dart';
|
||||
import 'package:flutter_svg/flutter_svg.dart';
|
||||
@@ -164,7 +165,7 @@ class ThreadView extends GetWidget<ThreadController>
|
||||
}
|
||||
}),
|
||||
if (!controller.responsiveUtils.isDesktop(context))
|
||||
_buildMarkAsMailboxReadLoading(context),
|
||||
_buildMailboxActionProgressBanner(context),
|
||||
Obx(() => ThreadViewLoadingBarWidget(viewState: controller.viewState.value)),
|
||||
Expanded(
|
||||
child: Container(
|
||||
@@ -864,42 +865,68 @@ class ThreadView extends GetWidget<ThreadController>
|
||||
);
|
||||
}
|
||||
|
||||
Widget _buildMarkAsMailboxReadLoading(BuildContext context) {
|
||||
Widget _buildMailboxActionProgressBanner(BuildContext context) {
|
||||
return Obx(() {
|
||||
final viewState = controller.mailboxDashBoardController.viewStateMailboxActionProgress.value;
|
||||
return viewState.fold(
|
||||
(failure) => const SizedBox.shrink(),
|
||||
(success) {
|
||||
if (success is MarkAsMailboxReadLoading
|
||||
|| success is EmptySpamFolderLoading
|
||||
|| success is EmptyTrashFolderLoading
|
||||
) {
|
||||
return Padding(
|
||||
padding: EdgeInsets.only(
|
||||
top: controller.responsiveUtils.isDesktop(context) ? 16 : 0,
|
||||
left: 16,
|
||||
right: 16,
|
||||
bottom: controller.responsiveUtils.isDesktop(context) ? 0 : 16),
|
||||
child: horizontalLoadingWidget);
|
||||
} else if (success is UpdatingMarkAsMailboxReadState) {
|
||||
final percent = success.countRead / success.totalUnread;
|
||||
return _buildProgressBanner(context, percent);
|
||||
} else if (success is EmptyingFolderState) {
|
||||
final percent = success.countEmailsDeleted / success.totalEmails;
|
||||
return _buildProgressBanner(context, percent);
|
||||
}
|
||||
return const SizedBox.shrink();
|
||||
});
|
||||
return _MailboxActionProgressBanner(
|
||||
viewState: controller.mailboxDashBoardController.viewStateMailboxActionProgress.value,
|
||||
responsiveUtils: controller.responsiveUtils,
|
||||
);
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
Padding _buildProgressBanner(BuildContext context, double percent) {
|
||||
class _MailboxActionProgressBanner extends StatelessWidget with AppLoaderMixin {
|
||||
final Either<Failure, Success> viewState;
|
||||
final ResponsiveUtils responsiveUtils;
|
||||
|
||||
const _MailboxActionProgressBanner({
|
||||
required this.viewState,
|
||||
required this.responsiveUtils,
|
||||
});
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return viewState.fold(
|
||||
(failure) => const SizedBox.shrink(),
|
||||
(success) {
|
||||
if (success is MarkAsMailboxReadLoading ||
|
||||
success is EmptySpamFolderLoading ||
|
||||
success is EmptyTrashFolderLoading) {
|
||||
return Padding(
|
||||
padding: EdgeInsets.only(
|
||||
top: responsiveUtils.isDesktop(context) ? 16 : 0,
|
||||
left: 16,
|
||||
right: 16,
|
||||
bottom: responsiveUtils.isDesktop(context) ? 0 : 16,
|
||||
),
|
||||
child: horizontalLoadingWidget,
|
||||
);
|
||||
} else if (success is UpdatingMarkAsMailboxReadState) {
|
||||
return _buildProgressBanner(
|
||||
context,
|
||||
success.countRead,
|
||||
success.totalUnread,
|
||||
);
|
||||
} else if (success is EmptyingFolderState) {
|
||||
return _buildProgressBanner(
|
||||
context,
|
||||
success.countEmailsDeleted,
|
||||
success.totalEmails,
|
||||
);
|
||||
}
|
||||
return const SizedBox.shrink();
|
||||
},
|
||||
);
|
||||
}
|
||||
|
||||
Padding _buildProgressBanner(BuildContext context, int progress, int total) {
|
||||
final percent = total > 0 ? progress / total : 0.68;
|
||||
return Padding(
|
||||
padding: EdgeInsets.only(
|
||||
top: controller.responsiveUtils.isDesktop(context) ? 16 : 0,
|
||||
top: responsiveUtils.isDesktop(context) ? 16 : 0,
|
||||
left: 16,
|
||||
right: 16,
|
||||
bottom: controller.responsiveUtils.isDesktop(context) ? 0 : 16),
|
||||
bottom: responsiveUtils.isDesktop(context) ? 0 : 16),
|
||||
child: horizontalPercentLoadingWidget(percent));
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user