From 3878400fbfd67c41f4dff06a792fffc7d80befc9 Mon Sep 17 00:00:00 2001 From: dab246 Date: Fri, 26 Jan 2024 08:35:07 +0700 Subject: [PATCH] TF-2461 Fix warning when run dart analyze Signed-off-by: dab246 --- .../presentation/views/image/avatar_builder.dart | 2 +- .../identity_creator_controller.dart | 16 +++++++++------- .../data/extensions/mailbox_cache_extension.dart | 4 ++-- .../data/extensions/mailbox_extension.dart | 2 +- 4 files changed, 13 insertions(+), 11 deletions(-) diff --git a/core/lib/presentation/views/image/avatar_builder.dart b/core/lib/presentation/views/image/avatar_builder.dart index 8cdc26857..e662a5686 100644 --- a/core/lib/presentation/views/image/avatar_builder.dart +++ b/core/lib/presentation/views/image/avatar_builder.dart @@ -64,7 +64,7 @@ class AvatarBuilder { Widget build() { return InkWell( - onTap: () => _onTapAvatarActionClick != null ? _onTapAvatarActionClick!.call() : null, + onTap: _onTapAvatarActionClick, onTapDown: (detail) { if (_onTapAvatarActionWithPositionClick != null && _context != null) { final screenSize = MediaQuery.of(_context!).size; diff --git a/lib/features/identity_creator/presentation/identity_creator_controller.dart b/lib/features/identity_creator/presentation/identity_creator_controller.dart index e44d27a51..302ac7837 100644 --- a/lib/features/identity_creator/presentation/identity_creator_controller.dart +++ b/lib/features/identity_creator/presentation/identity_creator_controller.dart @@ -1,9 +1,10 @@ import 'dart:io'; -import 'dart:typed_data'; import 'dart:math' as math; -import 'package:core/presentation/utils/keyboard_utils.dart'; +import 'dart:typed_data'; + import 'package:core/presentation/state/failure.dart'; import 'package:core/presentation/state/success.dart'; +import 'package:core/presentation/utils/keyboard_utils.dart'; import 'package:core/utils/app_logger.dart'; import 'package:core/utils/platform_info.dart'; import 'package:file_picker/file_picker.dart'; @@ -21,6 +22,7 @@ import 'package:jmap_dart_client/jmap/identities/identity.dart'; import 'package:jmap_dart_client/jmap/mail/email/email_address.dart'; import 'package:model/extensions/email_address_extension.dart'; import 'package:model/extensions/identity_extension.dart'; +import 'package:model/extensions/session_extension.dart'; import 'package:model/user/user_profile.dart'; import 'package:path_provider/path_provider.dart'; import 'package:rich_text_composer/rich_text_composer.dart'; @@ -45,7 +47,6 @@ import 'package:tmail_ui_user/features/manage_account/presentation/profiles/iden import 'package:tmail_ui_user/main/error/capability_validator.dart'; import 'package:tmail_ui_user/main/localizations/app_localizations.dart'; import 'package:tmail_ui_user/main/routes/route_navigation.dart'; -import 'package:model/extensions/session_extension.dart'; class IdentityCreatorController extends BaseController { @@ -528,10 +529,11 @@ class IdentityCreatorController extends BaseController { } catch (e) { logError("IdentityCreatorController::_insertInlineImage: compress image error: $e"); isCompressingInlineImage.value = false; - appToast.showToastErrorMessage( - context, - AppLocalizations.of(context).cannotCompressInlineImage - ); + if (context.mounted) { + appToast.showToastErrorMessage( + context, + AppLocalizations.of(context).cannotCompressInlineImage); + } return; } if (_isExceedMaxSizeInlineImage(file.size) || _isExceedMaxUploadSize(file.size)) { diff --git a/lib/features/mailbox/data/extensions/mailbox_cache_extension.dart b/lib/features/mailbox/data/extensions/mailbox_cache_extension.dart index e68331cd2..84652e112 100644 --- a/lib/features/mailbox/data/extensions/mailbox_cache_extension.dart +++ b/lib/features/mailbox/data/extensions/mailbox_cache_extension.dart @@ -3,8 +3,8 @@ import 'package:jmap_dart_client/jmap/core/id.dart'; import 'package:jmap_dart_client/jmap/core/unsigned_int.dart'; import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox.dart'; import 'package:jmap_dart_client/jmap/mail/mailbox/namespace.dart'; -import 'package:tmail_ui_user/features/mailbox/data/model/mailbox_cache.dart'; import 'package:tmail_ui_user/features/mailbox/data/extensions/mailbox_rights_cache_extension.dart'; +import 'package:tmail_ui_user/features/mailbox/data/model/mailbox_cache.dart'; extension MailboxCacheExtension on MailboxCache { Mailbox toMailbox() { @@ -18,7 +18,7 @@ extension MailboxCacheExtension on MailboxCache { unreadEmails: unreadEmails != null ? UnreadEmails(UnsignedInt(unreadEmails!)) : null, totalThreads: totalThreads != null ? TotalThreads(UnsignedInt(totalThreads!)) : null, unreadThreads: unreadThreads != null ? UnreadThreads(UnsignedInt(unreadThreads!)) : null, - myRights: myRights != null ? myRights!.toMailboxRights() : null, + myRights: myRights?.toMailboxRights(), isSubscribed: isSubscribed != null ? IsSubscribed(isSubscribed!) : null, namespace: namespace != null ? Namespace(namespace!) : null ); diff --git a/lib/features/mailbox/data/extensions/mailbox_extension.dart b/lib/features/mailbox/data/extensions/mailbox_extension.dart index ecbfa169f..6735803fe 100644 --- a/lib/features/mailbox/data/extensions/mailbox_extension.dart +++ b/lib/features/mailbox/data/extensions/mailbox_extension.dart @@ -15,7 +15,7 @@ extension MailboxExtension on Mailbox { unreadEmails: unreadEmails?.value.value.round(), totalThreads: totalThreads?.value.value.round(), unreadThreads: unreadThreads?.value.value.round(), - myRights: myRights != null ? myRights!.toMailboxRightsCache() : null, + myRights: myRights?.toMailboxRightsCache(), isSubscribed: isSubscribed?.value, namespace: namespace?.value );