Merge branch 'main' of https://github.com/Enough-Software/enough_mail_flutter

Author: robert-virkus

CHANGELOG.md

@@ -1,3 +1,7 @@
+## [2.1.1] - (2024-05-22)
+- Remove direct MailClient usage from MimeMessageDownloader
+- Update dependencies
+
 ## [2.1.0] - 2023-10-05
 - Switch to inapp_webview 6 (beta)
 - Feat: support to specify own fetching method, Setting your own fetching method can be useful for downloading the message contents e.g. from disk. 

lib/src/mime_message_viewer.dart

@@ -120,7 +120,6 @@ class _HtmlGenerationArguments {
     required this.enableDarkMode,
     required this.preferPlainText,
     required this.blockExternalImages,
-    required this.logger,
   });
 
   final MimeMessage mimeMessage;
@@ -129,7 +128,6 @@ class _HtmlGenerationArguments {
   final bool enableDarkMode;
   final String? emptyMessageText;
   final int? maxImageWidth;
-  final Logger logger;
 }
 
 class _HtmlGenerationResult {
@@ -185,13 +183,13 @@ class _HtmlViewerState extends State<_HtmlMimeMessageViewer> {
       preferPlainText: preferPlainText,
       enableDarkMode: enableDarkMode,
       blockExternalImages: blockExternalImages,
-      logger: widget.config.logger ?? defaultLogger,
     );
     final result = await compute(_generateHtmlImpl, args);
     _htmlData = result.html;
     if (_htmlData == null) {
       widget.config.onError?.call(result.errorDetails, null);
     }
+    widget.config.logger?.d('generated html: $_htmlData');
     if (mounted) {
       setState(() {
         _isGenerating = false;
@@ -210,14 +208,11 @@ class _HtmlViewerState extends State<_HtmlMimeMessageViewer> {
         emptyMessageText: args.emptyMessageText,
         maxImageWidth: args.maxImageWidth,
       );
-      args.logger.d(html);
 
       return _HtmlGenerationResult.success(html);
     } catch (e, s) {
-      args.logger.e(
+      debugPrint(
         'unable to transform mime message to HTML: $e',
-        error: e,
-        stackTrace: s,
       );
       final errorDetails = '$e\n\n$s';
 

pubspec.yaml

@@ -1,6 +1,6 @@
 name: enough_mail_flutter
 description: Widgets for email apps that use the `enough_mail` library. Licensed commercially friendly under MPL 2.0.
-version: 2.1.0
+version: 2.1.1
 homepage: https://github.com/enough-software/enough_mail_flutter
 topics:
  - mime
@@ -13,15 +13,14 @@ environment:
 dependencies:
   enough_mail: ^2.1.2
   enough_mail_html: ^2.0.1
-  enough_media: ^2.2.1
+  enough_media: ^2.3.1
   flutter:
     sdk: flutter
-  flutter_inappwebview: '^6.0.0'
+  flutter_inappwebview: ^6.0.0
   logger: ^2.0.0
   url_launcher: ^6.0.0
 
 dependency_overrides:
-  http: ^1.1.0 #for dart_code_metrics
   # xml: ^6.0.1
   # out-comment the following to enable local development:
   # enough_mail:
@@ -40,7 +39,6 @@ dependency_overrides:
 
 
 dev_dependencies:
-  dart_code_metrics: 5.7.6
   flutter_lints: ^4.0.0
   flutter_test:
     sdk: flutter