From 058f28b40205dd56976eae744f64dbc98099e7e3 Mon Sep 17 00:00:00 2001 From: dab246 Date: Thu, 5 Oct 2023 16:00:52 +0700 Subject: [PATCH] TF-2188 Disable sending queue on iOS (cherry picked from commit cec4ccba1a4e4667db008796bbf89a166d3b333f) --- .../presentation/composer_controller.dart | 2 +- .../mailbox_dashboard_controller.dart | 36 ++++++++++--------- 2 files changed, 20 insertions(+), 18 deletions(-) diff --git a/lib/features/composer/presentation/composer_controller.dart b/lib/features/composer/presentation/composer_controller.dart index 31116764b..f36bfa9a3 100644 --- a/lib/features/composer/presentation/composer_controller.dart +++ b/lib/features/composer/presentation/composer_controller.dart @@ -874,7 +874,7 @@ class ComposerController extends BaseController { ? CreateNewMailboxRequest(Id(_uuid.v1()), PresentationMailbox.outboxMailboxName) : null; - if (PlatformInfo.isMobile && !networkConnectionController.isNetworkConnectionAvailable()) { + if (PlatformInfo.isAndroid && !networkConnectionController.isNetworkConnectionAvailable()) { switch(arguments.sendingEmailActionType) { case SendingEmailActionType.create: _showConfirmDialogStoreSendingEmail( diff --git a/lib/features/mailbox_dashboard/presentation/controller/mailbox_dashboard_controller.dart b/lib/features/mailbox_dashboard/presentation/controller/mailbox_dashboard_controller.dart index fd1ec1db2..b6a9470c6 100644 --- a/lib/features/mailbox_dashboard/presentation/controller/mailbox_dashboard_controller.dart +++ b/lib/features/mailbox_dashboard/presentation/controller/mailbox_dashboard_controller.dart @@ -366,23 +366,25 @@ class MailboxDashBoardController extends ReloadableController { @override void handleExceptionAction({Failure? failure, Exception? exception}) { super.handleExceptionAction(failure: failure, exception: exception); - if (PlatformInfo.isMobile && - failure is SendEmailFailure && - exception is NoNetworkError) { - if (failure.emailRequest.storedSendingId != null) { - _handleStoreSendingEmail( - failure.session, - failure.accountId, - failure.emailRequest, - failure.mailboxRequest - ); - } else { - _handleUpdateSendingEmail( - failure.session, - failure.accountId, - failure.emailRequest, - failure.mailboxRequest - ); + if (failure is SendEmailFailure && exception is NoNetworkError) { + if (PlatformInfo.isIOS && currentContext != null) { + _showToastSendMessageFailure(AppLocalizations.of(currentContext!).sendMessageFailure); + } else if (PlatformInfo.isAndroid) { + if (failure.emailRequest.storedSendingId != null) { + _handleStoreSendingEmail( + failure.session, + failure.accountId, + failure.emailRequest, + failure.mailboxRequest + ); + } else { + _handleUpdateSendingEmail( + failure.session, + failure.accountId, + failure.emailRequest, + failure.mailboxRequest + ); + } } } }