Skip to content

Commit 2e1cb0a

Browse files
committed
feat: remove direct MailClient usage from MimeMessageDownloader
1 parent f8f222e commit 2e1cb0a

1 file changed

Lines changed: 7 additions & 12 deletions

File tree

lib/src/mime_message_downloader.dart

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@ class MimeMessageDownloader extends StatefulWidget {
1414
const MimeMessageDownloader({
1515
Key? key,
1616
required this.mimeMessage,
17-
required this.mailClient,
18-
this.fetchMessageContents,
17+
required this.fetchMessageContents,
1918
this.maxDownloadSize = 128 * 1024,
2019
this.maxImageWidth,
2120
this.downloadErrorMessage = 'Unable to download message.',
@@ -40,18 +39,16 @@ class MimeMessageDownloader extends StatefulWidget {
4039
/// The partial MIME message
4140
final MimeMessage mimeMessage;
4241

43-
/// The high level mail client to download message contents
44-
final MailClient mailClient;
45-
46-
/// The optional alternative message loader,
47-
/// for example to load the message from disk
42+
/// The required message loader, usually [MailClient.fetchMessageContents].
43+
///
44+
/// Alternative load the message from disk or somewhere else.
4845
final Future<MimeMessage> Function(
4946
MimeMessage message, {
5047
int? maxSize,
5148
bool markAsSeen,
5249
List<MediaToptype>? includedInlineTypes,
5350
Duration? responseTimeout,
54-
})? fetchMessageContents;
51+
}) fetchMessageContents;
5552

5653
/// The maximum size in bytes of messages that are fully downloaded.
5754
/// The defaults to `128*1024` / `128kb`.
@@ -98,7 +95,7 @@ class MimeMessageDownloader extends StatefulWidget {
9895

9996
/// Handler for mailto: links.
10097
///
101-
/// Typically you will want to open a new compose view prepulated with
98+
/// Typically you will want to open a new compose view pre-populated with
10299
/// a `MessageBuilder.prepareMailtoBasedMessage(uri,from)` instance.
103100
final Future Function(Uri mailto, MimeMessage mimeMessage)? mailtoDelegate;
104101

@@ -196,10 +193,8 @@ class _MimeMessageDownloaderState extends State<MimeMessageDownloader> {
196193
Future<MimeMessage> _downloadMessageContents() async {
197194
try {
198195
// print('download message UID ${mimeMessage.uid} for state $this');
199-
final fetchCall =
200-
widget.fetchMessageContents ?? widget.mailClient.fetchMessageContents;
201196

202-
mimeMessage = await fetchCall(
197+
mimeMessage = await widget.fetchMessageContents(
203198
widget.mimeMessage,
204199
maxSize: widget.maxDownloadSize,
205200
markAsSeen: widget.markAsSeen,

0 commit comments

Comments
 (0)