chore: improve line breaks / code style

Enough-Software · Oct 26, 2023 · b073b7a · b073b7a
1 parent 405539a
commit b073b7a
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 10 deletions.
diff --git a/lib/src/codecs/base64_mail_codec.dart b/lib/src/codecs/base64_mail_codec.dart
@@ -129,6 +129,7 @@ class Base64MailCodec extends MailCodec {
       }
       cleaned = buffer.toString();
     }
+
     return base64.decode(cleaned);
   }
 

diff --git a/lib/src/codecs/mail_codec.dart b/lib/src/codecs/mail_codec.dart
@@ -281,7 +281,9 @@ abstract class MailCodec {
 
   /// Decodes the given binary [text]
   static Uint8List decodeBinary(
-      final String text, final String? transferEncoding) {
+    final String text,
+    final String? transferEncoding,
+  ) {
     final tEncoding = transferEncoding ?? contentTransferEncodingNone;
     final decoder = _binaryDecodersByName[tEncoding.toLowerCase()];
     if (decoder == null) {

diff --git a/lib/src/mail/mail_authentication.dart b/lib/src/mail/mail_authentication.dart
@@ -151,6 +151,7 @@ class OauthToken {
     if (json['created'] == null) {
       json['created'] = DateTime.now().toUtc().toIso8601String();
     }
+
     return OauthToken.fromJson(json);
   }
 

diff --git a/lib/src/mime_data.dart b/lib/src/mime_data.dart
@@ -1,6 +1,8 @@
+import 'dart:convert';
 import 'dart:typed_data';
 
 import 'package:collection/collection.dart' show IterableExtension;
+
 import 'codecs/mail_codec.dart';
 import 'mime_message.dart';
 import 'private/imap/parser_helper.dart';
@@ -252,7 +254,9 @@ class BinaryMimeData extends MimeData {
   }
 
   List<BinaryMimeData> _splitAndParse(
-      final String boundaryText, final Uint8List bodyData) {
+    final String boundaryText,
+    final Uint8List bodyData,
+  ) {
     final boundary = '--$boundaryText\r\n'.codeUnits;
     final result = <BinaryMimeData>[];
     // end is expected to be \r\n for all but the last one, where -- is expected, possibly followed by \r\n
@@ -300,18 +304,22 @@ class BinaryMimeData extends MimeData {
         }
       }
     }
+
     return result;
   }
 
   @override
   String decodeText(
-      ContentTypeHeader? contentTypeHeader, String? contentTransferEncoding) {
-    if (_bodyStartIndex == null) {
-      return '';
-    }
-    return MailCodec.decodeAsText(
-        _bodyData, contentTransferEncoding, contentTypeHeader?.charset);
-  }
+    ContentTypeHeader? contentTypeHeader,
+    String? contentTransferEncoding,
+  ) =>
+      _bodyStartIndex == null
+          ? ''
+          : MailCodec.decodeAsText(
+              _bodyData,
+              contentTransferEncoding,
+              contentTypeHeader?.charset,
+            );
 
   @override
   Uint8List decodeBinary(String? contentTransferEncoding) {
@@ -326,7 +334,8 @@ class BinaryMimeData extends MimeData {
     // even with a 'binary' content transfer encoding there are \r\n
     // characters that need to be handled,
     // so translate to text first
-    final dataText = String.fromCharCodes(_bodyData);
+    final dataText = utf8.decode(_bodyData);
+
     return MailCodec.decodeBinary(dataText, contentTransferEncodingLC);
   }
 
@@ -353,6 +362,7 @@ class BinaryMimeData extends MimeData {
     }
     // the whole data is just headers:
     final headerLines = String.fromCharCodes(headerData).split('\r\n');
+
     return ParserHelper.parseHeaderLines(headerLines).headersList;
   }