fix: format, analyze-fix and update mocks

ci/main.go

@@ -181,7 +181,7 @@ func New(
 // Used as the base for pubGetLayer so flutter pub get is execution-cached between runs.
 func (m *Ci) toolchain() *dagger.Container {
 	return dag.Container().
-		From("ghcr.io/cirruslabs/flutter:3.41.6").
+		From("ghcr.io/cirruslabs/flutter:3.44.0").
 		WithExec([]string{"apt-get", "-qq", "update"}).
 		WithExec([]string{"apt-get", "install", "-y", "-qq", "clang", "cmake", "ninja-build", "pkg-config", "libgtk-3-dev", "liblzma-dev", "libsecret-1-dev", "libgcrypt20-dev", "libjsoncpp-dev", "sqlite3", "iproute2", "netcat-openbsd", "xvfb", "libosmesa6", "libegl1", "lld"}).
 		WithExec([]string{"useradd", "-m", "-s", "/bin/bash", "ci"}).

lib/core/models/email.dart

@@ -346,10 +346,10 @@ class SyncEmailsResult {
   );
 
   SyncEmailsResult operator +(SyncEmailsResult other) => SyncEmailsResult(
-    fetched: fetched + other.fetched,
+        fetched: fetched + other.fetched,
-    skipped: skipped + other.skipped,
+        skipped: skipped + other.skipped,
-    bytesTransferred: bytesTransferred + other.bytesTransferred,
+        bytesTransferred: bytesTransferred + other.bytesTransferred,
-  );
+      );
 }
 
 class ReliabilityResult {

lib/core/services/account_discovery_service.dart

@@ -35,9 +35,8 @@ class AccountDiscoveryServiceImpl implements AccountDiscoveryService {
     try {
       final url = Uri.https(domain, '/.well-known/jmap');
       final request = http.Request('GET', url)..followRedirects = false;
-      final streamed = await _client
+      final streamed =
-          .send(request)
+          await _client.send(request).timeout(const Duration(seconds: 5));
-          .timeout(const Duration(seconds: 5));
 
       String sessionUrl;
       if (streamed.statusCode >= 300 && streamed.statusCode < 400) {

lib/core/services/connection_test_service.dart

@@ -6,24 +6,30 @@ import 'package:sharedinbox/core/models/account.dart';
 import 'package:sharedinbox/data/imap/imap_client_factory.dart';
 import 'package:sharedinbox/data/imap/managesieve_client.dart';
 
-typedef ImapConnectForTestFn =
+typedef ImapConnectForTestFn = Future<imap.ImapClient> Function(
-    Future<imap.ImapClient> Function(Account, String username, String password);
+  Account,
+  String username,
+  String password,
+);
 
-typedef SmtpConnectForTestFn =
+typedef SmtpConnectForTestFn = Future<imap.SmtpClient> Function(
-    Future<imap.SmtpClient> Function(Account, String username, String password);
+  Account,
+  String username,
+  String password,
+);
 
-typedef ManageSieveConnectForTestFn =
+typedef ManageSieveConnectForTestFn = Future<ManageSieveClient> Function({
-    Future<ManageSieveClient> Function({
+  required String host,
-      required String host,
+  required int port,
-      required int port,
+  required bool useTls,
-      required bool useTls,
+});
-    });
 
 Future<ManageSieveClient> _defaultManageSieveConnect({
   required String host,
   required int port,
   required bool useTls,
-}) => ManageSieveClient.connect(host: host, port: port, useTls: useTls);
+}) =>
+    ManageSieveClient.connect(host: host, port: port, useTls: useTls);
 
 abstract class ConnectionTestService {
   /// Verifies credentials and returns the effective username used.
@@ -37,9 +43,9 @@ class ConnectionTestServiceImpl implements ConnectionTestService {
     ImapConnectForTestFn imapConnect = connectImap,
     SmtpConnectForTestFn smtpConnect = connectSmtp,
     ManageSieveConnectForTestFn manageSieveConnect = _defaultManageSieveConnect,
-  }) : _imapConnect = imapConnect,
+  })  : _imapConnect = imapConnect,
-       _smtpConnect = smtpConnect,
+        _smtpConnect = smtpConnect,
-       _manageSieveConnect = manageSieveConnect;
+        _manageSieveConnect = manageSieveConnect;
 
   final http.Client _httpClient;
   final ImapConnectForTestFn _imapConnect;
@@ -156,9 +162,12 @@ class ConnectionTestServiceImpl implements ConnectionTestService {
     for (final username in candidates) {
       try {
         final credentials = base64.encode(utf8.encode('$username:$password'));
-        final resp = await _httpClient
+        final resp = await _httpClient.get(
-            .get(sessionUri, headers: {'Authorization': 'Basic $credentials'})
+          sessionUri,
-            .timeout(const Duration(seconds: 10));
+          headers: {
+            'Authorization': 'Basic $credentials',
+          },
+        ).timeout(const Duration(seconds: 10));
         if (resp.statusCode == 401 || resp.statusCode == 403) {
           lastError = Exception(
             'Authentication failed: wrong username or password',

lib/core/services/managesieve_probe_service.dart

@@ -4,12 +4,11 @@ import 'package:sharedinbox/core/utils/logger.dart';
 import 'package:sharedinbox/data/imap/managesieve_client.dart';
 
 /// Returns true if the endpoint accepts a ManageSieve handshake.
-typedef ManageSieveProbeFn =
+typedef ManageSieveProbeFn = Future<bool> Function({
-    Future<bool> Function({
+  required String host,
-      required String host,
+  required int port,
-      required int port,
+  required bool useTls,
-      required bool useTls,
+});
-    });
 
 Future<bool> _defaultManageSieveProbe({
   required String host,
@@ -66,22 +65,22 @@ class ManageSieveProbeService {
   }
 
   Account _withAvailability(Account a, bool available) => Account(
-    id: a.id,
+        id: a.id,
-    displayName: a.displayName,
+        displayName: a.displayName,
-    email: a.email,
+        email: a.email,
-    username: a.username,
+        username: a.username,
-    type: a.type,
+        type: a.type,
-    imapHost: a.imapHost,
+        imapHost: a.imapHost,
-    imapPort: a.imapPort,
+        imapPort: a.imapPort,
-    imapSsl: a.imapSsl,
+        imapSsl: a.imapSsl,
-    smtpHost: a.smtpHost,
+        smtpHost: a.smtpHost,
-    smtpPort: a.smtpPort,
+        smtpPort: a.smtpPort,
-    smtpSsl: a.smtpSsl,
+        smtpSsl: a.smtpSsl,
-    manageSieveHost: a.manageSieveHost,
+        manageSieveHost: a.manageSieveHost,
-    manageSievePort: a.manageSievePort,
+        manageSievePort: a.manageSievePort,
-    manageSieveSsl: a.manageSieveSsl,
+        manageSieveSsl: a.manageSieveSsl,
-    manageSieveAvailable: available,
+        manageSieveAvailable: available,
-    jmapUrl: a.jmapUrl,
+        jmapUrl: a.jmapUrl,
-    verbose: a.verbose,
+        verbose: a.verbose,
-  );
+      );
 }

lib/core/services/notification_service.dart

@@ -18,8 +18,7 @@ Future<void> initNotifications() async {
     );
     await _plugin
         .resolvePlatformSpecificImplementation<
-          AndroidFlutterLocalNotificationsPlugin
+            AndroidFlutterLocalNotificationsPlugin>()
-        >()
         ?.requestNotificationsPermission();
     _initialized = true;
   } on MissingPluginException {

lib/core/services/share_encryption_service.dart

@@ -166,18 +166,17 @@ class ShareEncryptionService {
     final cipherBytes = Uint8List.fromList(box.cipherText);
     final macBytes = Uint8List.fromList(box.mac.bytes);
 
-    final out =
+    final out = Uint8List(
-        Uint8List(
+      _keyIdLen + _pubKeyLen + _nonceLen + cipherBytes.length + _macLen,
-            _keyIdLen + _pubKeyLen + _nonceLen + cipherBytes.length + _macLen,
+    )
-          )
+      ..setAll(0, recipientKeyId)
-          ..setAll(0, recipientKeyId)
+      ..setAll(_keyIdLen, ephPubBytes)
-          ..setAll(_keyIdLen, ephPubBytes)
+      ..setAll(_keyIdLen + _pubKeyLen, nonce)
-          ..setAll(_keyIdLen + _pubKeyLen, nonce)
+      ..setAll(_keyIdLen + _pubKeyLen + _nonceLen, cipherBytes)
-          ..setAll(_keyIdLen + _pubKeyLen + _nonceLen, cipherBytes)
+      ..setAll(
-          ..setAll(
+        _keyIdLen + _pubKeyLen + _nonceLen + cipherBytes.length,
-            _keyIdLen + _pubKeyLen + _nonceLen + cipherBytes.length,
+        macBytes,
-            macBytes,
+      );
-          );
 
     return '$_encAccountsPrefix${base64.encode(out)}';
   }

lib/core/services/undo_service.dart

@@ -62,8 +62,7 @@ class UndoService extends Notifier<List<UndoAction>> {
 
     for (final id in action.emailIds) {
       // 1. Try to cancel the original change (if not started yet).
-      final cancelled =
+      final cancelled = await repo.cancelPendingChange(id, 'delete') ||
-          await repo.cancelPendingChange(id, 'delete') ||
           await repo.cancelPendingChange(id, 'move') ||
           await repo.cancelPendingChange(id, 'snooze');
 

lib/core/services/update_service.dart

@@ -21,8 +21,8 @@ final updateInfoProvider = FutureProvider<UpdateInfo?>((ref) async {
   final platformKey = Platform.isLinux
       ? 'linux'
       : Platform.isWindows
-      ? 'windows'
+          ? 'windows'
-      : null;
+          : null;
   if (platformKey == null || _kAppVersion.isEmpty) return null;
 
   try {

lib/core/sieve/sieve_interpreter.dart

@@ -64,9 +64,8 @@ class SieveInterpreter {
     return switch (rule.joinType) {
       'allof' => rule.conditions.every((c) => _evalCondition(c, email)),
       'anyof' => rule.conditions.any((c) => _evalCondition(c, email)),
-      _ =>
+      _ => rule.conditions.length == 1 &&
-        rule.conditions.length == 1 &&
+          _evalCondition(rule.conditions.first, email),
-            _evalCondition(rule.conditions.first, email),
     };
   }
 

lib/core/sieve/sieve_parser.dart

@@ -421,8 +421,8 @@ class _Scanner {
     if (_isWordChar(ch)) {
       final start = _pos;
       var end = _pos + 1;
-      while (end < _src.length &&
+      while (
-          (_isWordChar(_src[end]) || _src[end] == ':')) {
+          end < _src.length && (_isWordChar(_src[end]) || _src[end] == ':')) {
         // Include trailing colon for "text:" multiline token.
         if (_src[end] == ':') {
           end++;

lib/core/sync/account_sync_manager.dart

@@ -29,10 +29,10 @@ class AccountSyncManager {
     SyncLogRepository syncLog = const NoOpSyncLogRepository(),
     DraftRepository? drafts,
     OnNewMailCallback? onNewMail,
-  }) : _imapConnect = imapConnect,
+  })  : _imapConnect = imapConnect,
-       _syncLog = syncLog,
+        _syncLog = syncLog,
-       _drafts = drafts,
+        _drafts = drafts,
-       _onNewMail = onNewMail;
+        _onNewMail = onNewMail;
 
   final AccountRepository _accounts;
   final MailboxRepository _mailboxes;
@@ -69,26 +69,26 @@ class AccountSyncManager {
         final id = account.id;
         final loop = switch (account.type) {
           AccountType.imap => _AccountSync(
-            account,
+              account,
-            _accounts,
+              _accounts,
-            _mailboxes,
+              _mailboxes,
-            _emails,
+              _emails,
-            _imapConnect,
+              _imapConnect,
-            _syncLog,
+              _syncLog,
-            _drafts,
+              _drafts,
-            _onNewMail,
+              _onNewMail,
-            onSyncStart: () => _emitSyncing(id, syncing: true),
+              onSyncStart: () => _emitSyncing(id, syncing: true),
-            onSyncEnd: () => _emitSyncing(id, syncing: false),
+              onSyncEnd: () => _emitSyncing(id, syncing: false),
-          ),
+            ),
           AccountType.jmap => _JmapAccountSync(
-            account,
+              account,
-            _mailboxes,
+              _mailboxes,
-            _emails,
+              _emails,
-            _accounts,
+              _accounts,
-            _syncLog,
+              _syncLog,
-            onSyncStart: () => _emitSyncing(id, syncing: true),
+              onSyncStart: () => _emitSyncing(id, syncing: true),
-            onSyncEnd: () => _emitSyncing(id, syncing: false),
+              onSyncEnd: () => _emitSyncing(id, syncing: false),
-          ),
+            ),
         };
         _active[account.id] = loop;
         loop.start();
@@ -129,33 +129,33 @@ class AccountSyncManager {
 
     final accounts = await _accounts.observeAccounts().first;
     final account = accounts.cast<Account?>().firstWhere(
-      (a) => a?.id == accountId,
+          (a) => a?.id == accountId,
-      orElse: () => null,
+          orElse: () => null,
-    );
+        );
     if (account == null) return;
 
     final loop = switch (account.type) {
       AccountType.imap => _AccountSync(
-        account,
+          account,
-        _accounts,
+          _accounts,
-        _mailboxes,
+          _mailboxes,
-        _emails,
+          _emails,
-        _imapConnect,
+          _imapConnect,
-        _syncLog,
+          _syncLog,
-        _drafts,
+          _drafts,
-        _onNewMail,
+          _onNewMail,
-        onSyncStart: () => _emitSyncing(accountId, syncing: true),
+          onSyncStart: () => _emitSyncing(accountId, syncing: true),
-        onSyncEnd: () => _emitSyncing(accountId, syncing: false),
+          onSyncEnd: () => _emitSyncing(accountId, syncing: false),
-      ),
+        ),
       AccountType.jmap => _JmapAccountSync(
-        account,
+          account,
-        _mailboxes,
+          _mailboxes,
-        _emails,
+          _emails,
-        _accounts,
+          _accounts,
-        _syncLog,
+          _syncLog,
-        onSyncStart: () => _emitSyncing(accountId, syncing: true),
+          onSyncStart: () => _emitSyncing(accountId, syncing: true),
-        onSyncEnd: () => _emitSyncing(accountId, syncing: false),
+          onSyncEnd: () => _emitSyncing(accountId, syncing: false),
-      ),
+        ),
     };
     _active[accountId] = loop;
     loop.start();
@@ -184,8 +184,8 @@ class _AccountSync implements _SyncLoop {
     this._onNewMail, {
     void Function()? onSyncStart,
     void Function()? onSyncEnd,
-  }) : _onSyncStart = onSyncStart,
+  })  : _onSyncStart = onSyncStart,
-       _onSyncEnd = onSyncEnd;
+        _onSyncEnd = onSyncEnd;
 
   final Account account;
   final AccountRepository _accounts;
@@ -379,9 +379,8 @@ class _AccountSync implements _SyncLoop {
     if (!_running) return;
     _stopSignal = Completer<void>();
     final password = await _accounts.getPassword(account.id);
-    final username = account.username.isNotEmpty
+    final username =
-        ? account.username
+        account.username.isNotEmpty ? account.username : account.email;
-        : account.email;
     final client = await _imapConnect(account, username, password);
     _idleClient = client;
     try {
@@ -397,13 +396,12 @@ class _AccountSync implements _SyncLoop {
                 e is imap.ImapMessagesExistEvent || e is imap.ImapExpungeEvent,
           )
           .listen((e) {
-            if (e is imap.ImapMessagesExistEvent &&
+        if (e is imap.ImapMessagesExistEvent &&
-                e.newMessagesExists > e.oldMessagesExists) {
+            e.newMessagesExists > e.oldMessagesExists) {
-              hasNewMail = true;
+          hasNewMail = true;
-            }
+        }
-            if (!newMessageCompleter.isCompleted)
+        if (!newMessageCompleter.isCompleted) newMessageCompleter.complete();
-              newMessageCompleter.complete();
+      });
-          });
 
       await client.idleStart();
 
@@ -445,8 +443,8 @@ class _JmapAccountSync implements _SyncLoop {
     this._syncLog, {
     void Function()? onSyncStart,
     void Function()? onSyncEnd,
-  }) : _onSyncStart = onSyncStart,
+  })  : _onSyncStart = onSyncStart,
-       _onSyncEnd = onSyncEnd;
+        _onSyncEnd = onSyncEnd;
 
   final Account account;
   final MailboxRepository _mailboxes;
@@ -642,15 +640,13 @@ class _JmapAccountSync implements _SyncLoop {
     // Try JMAP push (RFC 8887 EventSource). Falls back to poll timer when
     // the server doesn't advertise an eventSourceUrl or the connection fails.
     final pushReady = Completer<void>();
-    final pushSub = _emails
+    final pushSub = _emails.watchJmapPush(account.id, password).listen(
-        .watchJmapPush(account.id, password)
+      (_) {
-        .listen(
+        if (!pushReady.isCompleted) pushReady.complete();
-          (_) {
+      },
-            if (!pushReady.isCompleted) pushReady.complete();
+      onDone: () {},
-          },
+      onError: (_) {},
-          onDone: () {},
+    );
-          onError: (_) {},
-        );
 
     final pollTimer = Timer(_pollInterval, () {
       if (_stopSignal != null && !_stopSignal!.isCompleted) {

lib/core/sync/background_sync.dart

@@ -83,9 +83,8 @@ Future<void> _checkAccount(
 ) async {
   try {
     final password = await accountRepo.getPassword(account.id);
-    final username = account.username.isNotEmpty
+    final username =
-        ? account.username
+        account.username.isNotEmpty ? account.username : account.email;
-        : account.email;
     final client = await connectImap(account, username, password);
     try {
       final status = await client.statusMailbox(
@@ -94,18 +93,16 @@ Future<void> _checkAccount(
       );
       final currentUidNext = status.uidNext;
 
-      final stored =
+      final stored = await (db.select(db.syncStates)
-          await (db.select(db.syncStates)..where(
+            ..where(
-                (t) =>
+              (t) =>
-                    t.accountId.equals(account.id) &
+                  t.accountId.equals(account.id) &
-                    t.resourceType.equals(_kResourceType),
+                  t.resourceType.equals(_kResourceType),
-              ))
+            ))
-              .getSingleOrNull();
+          .getSingleOrNull();
       final lastUidNext = _parseUidNext(stored?.state);
 
-      await db
+      await db.into(db.syncStates).insertOnConflictUpdate(
-          .into(db.syncStates)
-          .insertOnConflictUpdate(
             SyncStatesCompanion.insert(
               accountId: account.id,
               resourceType: _kResourceType,

lib/core/sync/reliability_runner.dart

@@ -76,14 +76,11 @@ class ReliabilityRunner {
         }
       }
 
-      final isHealthy =
+      final isHealthy = totalMissingLocally == 0 &&
-          totalMissingLocally == 0 &&
           totalMissingOnServer == 0 &&
           totalFlagMismatches == 0;
 
-      await _db
+      await _db.into(_db.syncHealth).insertOnConflictUpdate(
-          .into(_db.syncHealth)
-          .insertOnConflictUpdate(
             SyncHealthCompanion.insert(
               accountId: accountId,
               lastVerifiedAt: DateTime.now(),

lib/data/db/database.dart

@@ -388,228 +388,231 @@ class AppDatabase extends _$AppDatabase {
 
   @override
   MigrationStrategy get migration => MigrationStrategy(
-    onCreate: (m) async {
+        onCreate: (m) async {
-      await m.createAll();
+          await m.createAll();
-      await _createEmailFts();
+          await _createEmailFts();
-    },
+        },
-    onUpgrade: (m, from, to) async {
+        onUpgrade: (m, from, to) async {
-      // NOTE: m.createTable(T) creates the LATEST version of table T.
+          // NOTE: m.createTable(T) creates the LATEST version of table T.
-      // If you later add a column C to T in version X, you must guard
+          // If you later add a column C to T in version X, you must guard
-      // addColumn(T, T.C) with `if (from >= creationVersionOfT && from < X)`.
+          // addColumn(T, T.C) with `if (from >= creationVersionOfT && from < X)`.
-      if (from < 2) {
+          if (from < 2) {
-        await m.addColumn(accounts, accounts.accountType);
+            await m.addColumn(accounts, accounts.accountType);
-        await m.addColumn(accounts, accounts.jmapUrl);
+            await m.addColumn(accounts, accounts.jmapUrl);
-      }
+          }
-      if (from < 3) {
+          if (from < 3) {
-        await m.addColumn(accounts, accounts.username);
+            await m.addColumn(accounts, accounts.username);
-      }
+          }
-      if (from < 4) {
+          if (from < 4) {
-        await m.createTable(drafts);
+            await m.createTable(drafts);
-      }
+          }
-      if (from < 5) {
+          if (from < 5) {
-        await m.createTable(syncStates);
+            await m.createTable(syncStates);
-      }
+          }
-      if (from < 6) {
+          if (from < 6) {
-        await m.createTable(pendingChanges);
+            await m.createTable(pendingChanges);
-      }
+          }
-      if (from < 7) {
+          if (from < 7) {
-        await m.createTable(syncLogs);
+            await m.createTable(syncLogs);
-      }
+          }
-      if (from < 8) {
+          if (from < 8) {
-        await m.addColumn(mailboxes, mailboxes.role);
+            await m.addColumn(mailboxes, mailboxes.role);
-      }
+          }
-      if (from < 9) {
+          if (from < 9) {
-        await m.addColumn(emailBodies, emailBodies.cachedAt);
+            await m.addColumn(emailBodies, emailBodies.cachedAt);
-      }
+          }
-      if (from >= 7 && from < 10) {
+          if (from >= 7 && from < 10) {
-        await m.addColumn(syncLogs, syncLogs.protocol);
+            await m.addColumn(syncLogs, syncLogs.protocol);
-        await m.addColumn(syncLogs, syncLogs.mailboxesSynced);
+            await m.addColumn(syncLogs, syncLogs.mailboxesSynced);
-        await m.addColumn(syncLogs, syncLogs.pendingFlushed);
+            await m.addColumn(syncLogs, syncLogs.pendingFlushed);
-      }
+          }
-      if (from >= 7 && from < 11) {
+          if (from >= 7 && from < 11) {
-        await m.addColumn(syncLogs, syncLogs.emailsSkipped);
+            await m.addColumn(syncLogs, syncLogs.emailsSkipped);
-        await m.addColumn(syncLogs, syncLogs.bytesTransferred);
+            await m.addColumn(syncLogs, syncLogs.bytesTransferred);
-      }
+          }
-      if (from < 12) {
+          if (from < 12) {
-        await m.createTable(syncLogMailboxes);
+            await m.createTable(syncLogMailboxes);
-      }
+          }
-      if (from < 13) {
+          if (from < 13) {
-        await m.addColumn(accounts, accounts.verbose);
+            await m.addColumn(accounts, accounts.verbose);
-        if (from >= 7) {
+            if (from >= 7) {
-          await m.addColumn(syncLogs, syncLogs.protocolLog);
+              await m.addColumn(syncLogs, syncLogs.protocolLog);
-        }
+            }
-      }
+          }
-      if (from < 14) {
+          if (from < 14) {
-        await m.addColumn(emails, emails.threadId);
+            await m.addColumn(emails, emails.threadId);
-        await m.addColumn(emails, emails.messageId);
+            await m.addColumn(emails, emails.messageId);
-        await m.addColumn(emails, emails.inReplyTo);
+            await m.addColumn(emails, emails.inReplyTo);
-        await m.addColumn(emails, emails.references);
+            await m.addColumn(emails, emails.references);
-      }
+          }
-      if (from < 15) {
+          if (from < 15) {
-        await m.addColumn(accounts, accounts.manageSieveHost);
+            await m.addColumn(accounts, accounts.manageSieveHost);
-        await m.addColumn(accounts, accounts.manageSievePort);
+            await m.addColumn(accounts, accounts.manageSievePort);
-        await m.addColumn(accounts, accounts.manageSieveSsl);
+            await m.addColumn(accounts, accounts.manageSieveSsl);
-      }
+          }
-      if (from < 16) {
+          if (from < 16) {
-        await m.addColumn(accounts, accounts.manageSieveAvailable);
+            await m.addColumn(accounts, accounts.manageSieveAvailable);
-      }
+          }
-      if (from < 17) {
+          if (from < 17) {
-        await m.createTable(threads);
+            await m.createTable(threads);
-        // Populate threads from existing emails.
+            // Populate threads from existing emails.
-        final allRows = await select(emails).get();
+            final allRows = await select(emails).get();
-        final groups = <String, List<Email>>{};
+            final groups = <String, List<Email>>{};
-        for (final row in allRows) {
+            for (final row in allRows) {
-          final key =
+              final key =
-              '${row.accountId}:${row.mailboxPath}:${row.threadId ?? row.id}';
+                  '${row.accountId}:${row.mailboxPath}:${row.threadId ?? row.id}';
-          groups.putIfAbsent(key, () => []).add(row);
+              groups.putIfAbsent(key, () => []).add(row);
-        }
+            }
 
-        for (final threadEmails in groups.values) {
+            for (final threadEmails in groups.values) {
-          threadEmails.sort((a, b) {
+              threadEmails.sort((a, b) {
-            final da = a.sentAt ?? a.receivedAt;
+                final da = a.sentAt ?? a.receivedAt;
-            final db = b.sentAt ?? b.receivedAt;
+                final db = b.sentAt ?? b.receivedAt;
-            return da.compareTo(db);
+                return da.compareTo(db);
-          });
+              });
-          final latest = threadEmails.last;
+              final latest = threadEmails.last;
 
-          await into(threads).insert(
+              await into(threads).insert(
-            ThreadsCompanion.insert(
+                ThreadsCompanion.insert(
-              id: latest.threadId ?? latest.id,
+                  id: latest.threadId ?? latest.id,
-              accountId: latest.accountId,
+                  accountId: latest.accountId,
-              mailboxPath: latest.mailboxPath,
+                  mailboxPath: latest.mailboxPath,
-              subject: Value(latest.subject),
+                  subject: Value(latest.subject),
-              latestDate: latest.sentAt ?? latest.receivedAt,
+                  latestDate: latest.sentAt ?? latest.receivedAt,
-              messageCount: Value(threadEmails.length),
+                  messageCount: Value(threadEmails.length),
-              hasUnread: Value(threadEmails.any((e) => !e.isSeen)),
+                  hasUnread: Value(threadEmails.any((e) => !e.isSeen)),
-              isFlagged: Value(threadEmails.any((e) => e.isFlagged)),
+                  isFlagged: Value(threadEmails.any((e) => e.isFlagged)),
-              preview: Value(latest.preview),
+                  preview: Value(latest.preview),
-              latestEmailId: latest.id,
+                  latestEmailId: latest.id,
-              emailIdsJson: Value(
+                  emailIdsJson: Value(
-                jsonEncode(threadEmails.map((e) => e.id).toList()),
+                    jsonEncode(threadEmails.map((e) => e.id).toList()),
+                  ),
+                  participantsJson: Value(
+                    latest.fromJson,
+                  ), // Good enough for migration
+                ),
+              );
+            }
+          }
+          if (from < 18) {
+            // Index for sorting email list by date.
+            await m.createIndex(
+              Index(
+                'emails_received_at',
+                'CREATE INDEX emails_received_at ON emails (account_id, mailbox_path, received_at DESC);',
               ),
-              participantsJson: Value(
+            );
-                latest.fromJson,
+            // Index for finding emails in a thread.
-              ), // Good enough for migration
+            await m.createIndex(
-            ),
+              Index(
-          );
+                'emails_thread_id',
-        }
+                'CREATE INDEX emails_thread_id ON emails (account_id, mailbox_path, thread_id);',
-      }
+              ),
-      if (from < 18) {
+            );
-        // Index for sorting email list by date.
+            // Index for pending changes queue.
-        await m.createIndex(
+            await m.createIndex(
-          Index(
+              Index(
-            'emails_received_at',
+                'pending_changes_account_id',
-            'CREATE INDEX emails_received_at ON emails (account_id, mailbox_path, received_at DESC);',
+                'CREATE INDEX pending_changes_account_id ON pending_changes (account_id);',
-          ),
+              ),
-        );
+            );
-        // Index for finding emails in a thread.
+          }
-        await m.createIndex(
+          if (from < 19) {
-          Index(
+            await m.createTable(syncHealth);
-            'emails_thread_id',
+          }
-            'CREATE INDEX emails_thread_id ON emails (account_id, mailbox_path, thread_id);',
+          if (from < 20) {
-          ),
+            await m.addColumn(emailBodies, emailBodies.headersJson);
-        );
+          }
-        // Index for pending changes queue.
+          if (from < 21) {
-        await m.createIndex(
+            await m.createTable(undoActions);
-          Index(
+          }
-            'pending_changes_account_id',
+          if (from < 22) {
-            'CREATE INDEX pending_changes_account_id ON pending_changes (account_id);',
+            final check = await customSelect('PRAGMA table_info(emails)').get();
-          ),
+            final names = check.map((row) => row.read<String>('name')).toList();
-        );
-      }
-      if (from < 19) {
-        await m.createTable(syncHealth);
-      }
-      if (from < 20) {
-        await m.addColumn(emailBodies, emailBodies.headersJson);
-      }
-      if (from < 21) {
-        await m.createTable(undoActions);
-      }
-      if (from < 22) {
-        final check = await customSelect('PRAGMA table_info(emails)').get();
-        final names = check.map((row) => row.read<String>('name')).toList();
 
-        if (!names.contains('snoozed_until')) {
+            if (!names.contains('snoozed_until')) {
-          await m.addColumn(emails, emails.snoozedUntil);
+              await m.addColumn(emails, emails.snoozedUntil);
-        }
+            }
-        if (!names.contains('snoozed_from_mailbox_path')) {
+            if (!names.contains('snoozed_from_mailbox_path')) {
-          await m.addColumn(emails, emails.snoozedFromMailboxPath);
+              await m.addColumn(emails, emails.snoozedFromMailboxPath);
-        }
+            }
 
-        await m.createIndex(
+            await m.createIndex(
-          Index(
+              Index(
-            'emails_snoozed_until',
+                'emails_snoozed_until',
-            'CREATE INDEX IF NOT EXISTS emails_snoozed_until ON emails (account_id, snoozed_until) WHERE snoozed_until IS NOT NULL;',
+                'CREATE INDEX IF NOT EXISTS emails_snoozed_until ON emails (account_id, snoozed_until) WHERE snoozed_until IS NOT NULL;',
-          ),
+              ),
-        );
+            );
-      }
+          }
-      if (from < 23) {
+          if (from < 23) {
-        await m.addColumn(emails, emails.listUnsubscribeHeader);
+            await m.addColumn(emails, emails.listUnsubscribeHeader);
-      }
+          }
-      if (from >= 4 && from < 24) {
+          if (from >= 4 && from < 24) {
-        await m.addColumn(drafts, drafts.imapServerId);
+            await m.addColumn(drafts, drafts.imapServerId);
-      }
+          }
-      if (from < 25) {
+          if (from < 25) {
-        // For observeMailboxes: filter by account_id, sort by path.
+            // For observeMailboxes: filter by account_id, sort by path.
-        await m.createIndex(
+            await m.createIndex(
-          Index(
+              Index(
-            'mailboxes_account_id',
+                'mailboxes_account_id',
-            'CREATE INDEX IF NOT EXISTS mailboxes_account_id ON mailboxes (account_id, path);',
+                'CREATE INDEX IF NOT EXISTS mailboxes_account_id ON mailboxes (account_id, path);',
-          ),
+              ),
-        );
+            );
-        // For observeThreads: filter by account_id+mailbox_path, sort by latest_date.
+            // For observeThreads: filter by account_id+mailbox_path, sort by latest_date.
-        await m.createIndex(
+            await m.createIndex(
-          Index(
+              Index(
-            'threads_latest_date',
+                'threads_latest_date',
-            'CREATE INDEX IF NOT EXISTS threads_latest_date ON threads (account_id, mailbox_path, latest_date DESC);',
+                'CREATE INDEX IF NOT EXISTS threads_latest_date ON threads (account_id, mailbox_path, latest_date DESC);',
-          ),
+              ),
-        );
+            );
-      }
+          }
-      if (from < 26) {
+          if (from < 26) {
-        await _createEmailFts();
+            await _createEmailFts();
-        // Backfill FTS index from existing rows.
+            // Backfill FTS index from existing rows.
-        await customStatement('''
+            await customStatement('''
               INSERT INTO email_fts(rowid, subject, preview, from_json)
               SELECT rowid, subject, preview, from_json FROM emails
             ''');
-      }
+          }
-      if (from < 27) {
+          if (from < 27) {
-        await m.createTable(searchHistoryEntries);
+            await m.createTable(searchHistoryEntries);
-      }
+          }
-      if (from < 28) {
+          if (from < 28) {
-        await m.addColumn(emailBodies, emailBodies.mimeTreeJson);
+            await m.addColumn(emailBodies, emailBodies.mimeTreeJson);
-      }
+          }
-      if (from < 29) {
+          if (from < 29) {
-        await m.createTable(localSieveScripts);
+            await m.createTable(localSieveScripts);
-      }
+          }
-      if (from >= 12 && from < 30) {
+          if (from >= 12 && from < 30) {
-        await m.addColumn(syncLogMailboxes, syncLogMailboxes.durationMs);
+            await m.addColumn(syncLogMailboxes, syncLogMailboxes.durationMs);
-      }
+          }
-      if (from < 31) {
+          if (from < 31) {
-        await m.createTable(shareKeys);
+            await m.createTable(shareKeys);
-      }
+          }
-      if (from < 32) {
+          if (from < 32) {
-        await m.createTable(localSieveApplied);
+            await m.createTable(localSieveApplied);
-      }
+          }
-      if (from >= 7 && from < 33) {
+          if (from >= 7 && from < 33) {
-        await m.addColumn(syncLogs, syncLogs.errorStackTrace);
+            await m.addColumn(syncLogs, syncLogs.errorStackTrace);
-        await m.addColumn(syncLogs, syncLogs.isPermanent);
+            await m.addColumn(syncLogs, syncLogs.isPermanent);
-      }
+          }
-      if (from < 34) {
+          if (from < 34) {
-        await m.createTable(userPreferences);
+            await m.createTable(userPreferences);
-      }
+          }
-      if (from >= 34 && from < 35) {
+          if (from >= 34 && from < 35) {
-        await m.addColumn(
+            await m.addColumn(
-          userPreferences,
+              userPreferences,
-          userPreferences.mailViewButtonPosition,
+              userPreferences.mailViewButtonPosition,
-        );
+            );
-      }
+          }
-      if (from >= 34 && from < 36) {
+          if (from >= 34 && from < 36) {
-        await m.addColumn(userPreferences, userPreferences.afterMailViewAction);
+            await m.addColumn(
-      }
+              userPreferences,
-    },
+              userPreferences.afterMailViewAction,
-  );
+            );
+          }
+        },
+      );
 }
 
 // Resolved once in main() via initDatabasePath() before runApp().
@@ -660,8 +663,7 @@ Future<String> _resolveDatabasePath() async {
   }
   throw PlatformException(
     code: 'channel-error',
-    message:
+    message: 'path_provider unavailable after ${delays.length + 1} attempts — '
-        'path_provider unavailable after ${delays.length + 1} attempts — '
         'cannot open database.',
   );
 }

lib/data/db/local_sieve_repository.dart

@@ -11,7 +11,8 @@ class LocalSieveRepository {
   Future<List<SieveScript>> listScripts(String accountId) async {
     final rows = await (_db.select(
       _db.localSieveScripts,
-    )..where((t) => t.accountId.equals(accountId))).get();
+    )..where((t) => t.accountId.equals(accountId)))
+        .get();
     return rows
         .map(
           (r) => SieveScript(
@@ -26,11 +27,10 @@ class LocalSieveRepository {
 
   Future<String> getScriptContent(String accountId, String blobId) async {
     final rowId = int.parse(blobId);
-    final row =
+    final row = await (_db.select(
-        await (_db.select(
+      _db.localSieveScripts,
-              _db.localSieveScripts,
+    )..where((t) => t.id.equals(rowId) & t.accountId.equals(accountId)))
-            )..where((t) => t.id.equals(rowId) & t.accountId.equals(accountId)))
+        .getSingleOrNull();
-            .getSingleOrNull();
     if (row == null) throw Exception('Local script not found: $blobId');
     return row.content;
   }
@@ -46,16 +46,16 @@ class LocalSieveRepository {
       await (_db.update(_db.localSieveScripts)
             ..where((t) => t.id.equals(rowId) & t.accountId.equals(accountId)))
           .write(
-            LocalSieveScriptsCompanion(
+        LocalSieveScriptsCompanion(
-              name: Value(name),
+          name: Value(name),
-              content: Value(content),
+          content: Value(content),
-            ),
+        ),
-          );
+      );
-      final updated =
+      final updated = await (_db.select(_db.localSieveScripts)
-          await (_db.select(_db.localSieveScripts)..where(
+            ..where(
-                (t) => t.id.equals(rowId) & t.accountId.equals(accountId),
+              (t) => t.id.equals(rowId) & t.accountId.equals(accountId),
-              ))
+            ))
-              .getSingleOrNull();
+          .getSingleOrNull();
       return SieveScript(
         id: id,
         name: name,
@@ -63,9 +63,7 @@ class LocalSieveRepository {
         isActive: updated?.isActive ?? false,
       );
     }
-    final rowId = await _db
+    final rowId = await _db.into(_db.localSieveScripts).insert(
-        .into(_db.localSieveScripts)
-        .insert(
           LocalSieveScriptsCompanion.insert(
             accountId: accountId,
             name: name,
@@ -80,7 +78,8 @@ class LocalSieveRepository {
     final rowId = int.parse(scriptId);
     await (_db.delete(
       _db.localSieveScripts,
-    )..where((t) => t.id.equals(rowId) & t.accountId.equals(accountId))).go();
+    )..where((t) => t.id.equals(rowId) & t.accountId.equals(accountId)))
+        .go();
   }
 
   Future<void> activateScript(String accountId, String scriptId) async {

lib/data/imap/imap_client_factory.dart

@@ -6,12 +6,11 @@ import 'package:sharedinbox/core/models/account.dart';
 import 'package:sharedinbox/core/utils/host_utils.dart';
 import 'package:sharedinbox/data/imap/tls_error.dart';
 
-typedef ImapConnectFn =
+typedef ImapConnectFn = Future<ImapClient> Function(
-    Future<ImapClient> Function(
+  Account account,
-      Account account,
+  String username,
-      String username,
+  String password,
-      String password,
+);
-    );
 
 /// Zone value key signalling that a [StringBuffer] for protocol logging is
 /// active. When this key is non-null in the current zone, [connectImap]
@@ -65,9 +64,8 @@ Future<SmtpClient> connectSmtp(
   // clientDomain is the sending domain advertised in EHLO — use the host part
   // of the sender email, falling back to the SMTP host.
   final atIndex = account.email.lastIndexOf('@');
-  final clientDomain = atIndex != -1
+  final clientDomain =
-      ? account.email.substring(atIndex + 1)
+      atIndex != -1 ? account.email.substring(atIndex + 1) : account.smtpHost;
-      : account.smtpHost;
 
   if (!account.smtpSsl && !isLocalhost(account.smtpHost)) {
     throw Exception(

lib/data/jmap/jmap_client.dart

@@ -26,14 +26,14 @@ class JmapClient {
     String? uploadUrl,
     String? downloadUrl,
     String? eventSourceUrl,
-  }) : _httpClient = httpClient,
+  })  : _httpClient = httpClient,
-       _credentials = credentials,
+        _credentials = credentials,
-       _apiUrl = apiUrl,
+        _apiUrl = apiUrl,
-       _accountId = accountId,
+        _accountId = accountId,
-       _capabilities = capabilities,
+        _capabilities = capabilities,
-       _uploadUrl = uploadUrl,
+        _uploadUrl = uploadUrl,
-       _downloadUrl = downloadUrl,
+        _downloadUrl = downloadUrl,
-       _eventSourceUrl = eventSourceUrl;
+        _eventSourceUrl = eventSourceUrl;
 
   final http.Client _httpClient;
   final String _credentials;
@@ -67,9 +67,12 @@ class JmapClient {
     http.Response resp;
     var attempt = 0;
     while (true) {
-      resp = await httpClient
+      resp = await httpClient.get(
-          .get(jmapUrl, headers: {'Authorization': 'Basic $credentials'})
+        jmapUrl,
-          .timeout(const Duration(seconds: 10));
+        headers: {
+          'Authorization': 'Basic $credentials',
+        },
+      ).timeout(const Duration(seconds: 10));
       if (resp.statusCode != 429 || attempt >= 4) {
         break;
       }
@@ -215,9 +218,12 @@ class JmapClient {
           .replaceAll('{name}', Uri.encodeComponent(name))
           .replaceAll('{type}', Uri.encodeComponent(type)),
     );
-    final resp = await _httpClient
+    final resp = await _httpClient.get(
-        .get(url, headers: {'Authorization': 'Basic $_credentials'})
+      url,
-        .timeout(const Duration(seconds: 30));
+      headers: {
+        'Authorization': 'Basic $_credentials',
+      },
+    ).timeout(const Duration(seconds: 30));
     if (resp.statusCode != 200) {
       throw JmapException('Blob download failed (HTTP ${resp.statusCode})');
     }
@@ -240,8 +246,7 @@ class JmapClient {
 
   static String _extractAccountId(Map<String, dynamic> session) {
     final primaryAccounts = session['primaryAccounts'] as Map<String, dynamic>?;
-    final id =
+    final id = primaryAccounts?['urn:ietf:params:jmap:mail'] as String? ??
-        primaryAccounts?['urn:ietf:params:jmap:mail'] as String? ??
         primaryAccounts?['urn:ietf:params:jmap:core'] as String?;
     if (id != null) return id;
 

lib/data/jmap/sieve_repository.dart

@@ -9,18 +9,18 @@ import 'package:sharedinbox/core/repositories/account_repository.dart';
 import 'package:sharedinbox/data/imap/managesieve_client.dart';
 import 'package:sharedinbox/data/jmap/jmap_client.dart';
 
-typedef ManageSieveConnectFn =
+typedef ManageSieveConnectFn = Future<ManageSieveClient> Function({
-    Future<ManageSieveClient> Function({
+  required String host,
-      required String host,
+  required int port,
-      required int port,
+  required bool useTls,
-      required bool useTls,
+});
-    });
 
 Future<ManageSieveClient> _defaultManageSieveConnect({
   required String host,
   required int port,
   required bool useTls,
-}) => ManageSieveClient.connect(host: host, port: port, useTls: useTls);
+}) =>
+    ManageSieveClient.connect(host: host, port: port, useTls: useTls);
 
 class SieveRepository {
   SieveRepository(
@@ -51,13 +51,16 @@ class SieveRepository {
       });
     }
     return _withJmap(account, (jmap) async {
-      final responses = await jmap.call([
+      final responses = await jmap.call(
         [
-          'SieveScript/get',
+          [
-          {'accountId': jmap.accountId, 'ids': null},
+            'SieveScript/get',
-          '0',
+            {'accountId': jmap.accountId, 'ids': null},
+            '0',
+          ],
         ],
-      ], withSieve: true);
+        withSieve: true,
+      );
       final result = _responseArgs(responses, 0, 'SieveScript/get');
       final list = result['list'] as List<dynamic>;
       return list.map((e) {
@@ -123,9 +126,12 @@ class SieveRepository {
                 id: {'name': name, 'blobId': blobId},
               },
             };
-      final responses = await jmap.call([
+      final responses = await jmap.call(
-        ['SieveScript/set', setArgs, '0'],
+        [
-      ], withSieve: true);
+          ['SieveScript/set', setArgs, '0'],
+        ],
+        withSieve: true,
+      );
       final result = _responseArgs(responses, 0, 'SieveScript/set');
       if (id == null) {
         final created = result['created'] as Map<String, dynamic>?;
@@ -164,16 +170,19 @@ class SieveRepository {
       return;
     }
     await _withJmap(account, (jmap) async {
-      final responses = await jmap.call([
+      final responses = await jmap.call(
         [
-          'SieveScript/set',
+          [
-          {
+            'SieveScript/set',
-            'accountId': jmap.accountId,
+            {
-            'destroy': [scriptId],
+              'accountId': jmap.accountId,
-          },
+              'destroy': [scriptId],
-          '0',
+            },
+            '0',
+          ],
         ],
-      ], withSieve: true);
+        withSieve: true,
+      );
       final result = _responseArgs(responses, 0, 'SieveScript/set');
       final notDestroyed = result['notDestroyed'] as Map<String, dynamic>?;
       if (notDestroyed != null && notDestroyed.containsKey(scriptId)) {
@@ -192,13 +201,16 @@ class SieveRepository {
       return;
     }
     await _withJmap(account, (jmap) async {
-      await jmap.call([
+      await jmap.call(
         [
-          'SieveScript/activate',
+          [
-          {'accountId': jmap.accountId, 'id': scriptId},
+            'SieveScript/activate',
-          '0',
+            {'accountId': jmap.accountId, 'id': scriptId},
+            '0',
+          ],
         ],
-      ], withSieve: true);
+        withSieve: true,
+      );
     });
   }
 
@@ -219,9 +231,8 @@ class SieveRepository {
       throw Exception('Account has no JMAP URL');
     }
     final password = await _accounts.getPassword(account.id);
-    final username = account.username.isNotEmpty
+    final username =
-        ? account.username
+        account.username.isNotEmpty ? account.username : account.email;
-        : account.email;
     final jmap = await JmapClient.connect(
       httpClient: _httpClient,
       jmapUrl: Uri.parse(jmapUrl),
@@ -247,9 +258,8 @@ class SieveRepository {
       throw Exception('Account has no ManageSieve host configured');
     }
     final password = await _accounts.getPassword(account.id);
-    final username = account.username.isNotEmpty
+    final username =
-        ? account.username
+        account.username.isNotEmpty ? account.username : account.email;
-        : account.email;
     final client = await _manageSieveConnect(
       host: host,
       port: account.manageSievePort,

lib/data/repositories/account_repository_impl.dart

@@ -23,15 +23,14 @@ class AccountRepositoryImpl implements AccountRepository {
   Future<model.Account?> getAccount(String id) async {
     final row = await (_db.select(
       _db.accounts,
-    )..where((t) => t.id.equals(id))).getSingleOrNull();
+    )..where((t) => t.id.equals(id)))
+        .getSingleOrNull();
     return row == null ? null : _toModel(row);
   }
 
   @override
   Future<void> addAccount(model.Account account, String password) async {
-    await _db
+    await _db.into(_db.accounts).insertOnConflictUpdate(
-        .into(_db.accounts)
-        .insertOnConflictUpdate(
           AccountsCompanion.insert(
             id: account.id,
             displayName: account.displayName,
@@ -59,7 +58,8 @@ class AccountRepositoryImpl implements AccountRepository {
   Future<void> updateAccount(model.Account account, {String? password}) async {
     await (_db.update(
       _db.accounts,
-    )..where((t) => t.id.equals(account.id))).write(
+    )..where((t) => t.id.equals(account.id)))
+        .write(
       AccountsCompanion(
         displayName: Value(account.displayName),
         email: Value(account.email),
@@ -102,22 +102,22 @@ class AccountRepositoryImpl implements AccountRepository {
   String _passwordKey(String accountId) => 'account_password_$accountId';
 
   model.Account _toModel(Account row) => model.Account(
-    id: row.id,
+        id: row.id,
-    displayName: row.displayName,
+        displayName: row.displayName,
-    email: row.email,
+        email: row.email,
-    username: row.username,
+        username: row.username,
-    type: model.AccountType.values.byName(row.accountType),
+        type: model.AccountType.values.byName(row.accountType),
-    imapHost: row.imapHost,
+        imapHost: row.imapHost,
-    imapPort: row.imapPort,
+        imapPort: row.imapPort,
-    imapSsl: row.imapSsl,
+        imapSsl: row.imapSsl,
-    smtpHost: row.smtpHost,
+        smtpHost: row.smtpHost,
-    smtpPort: row.smtpPort,
+        smtpPort: row.smtpPort,
-    smtpSsl: row.smtpSsl,
+        smtpSsl: row.smtpSsl,
-    manageSieveHost: row.manageSieveHost,
+        manageSieveHost: row.manageSieveHost,
-    manageSievePort: row.manageSievePort,
+        manageSievePort: row.manageSievePort,
-    manageSieveSsl: row.manageSieveSsl,
+        manageSieveSsl: row.manageSieveSsl,
-    manageSieveAvailable: row.manageSieveAvailable,
+        manageSieveAvailable: row.manageSieveAvailable,
-    jmapUrl: row.jmapUrl,
+        jmapUrl: row.jmapUrl,
-    verbose: row.verbose,
+        verbose: row.verbose,
-  );
+      );
 }

lib/data/repositories/draft_repository_impl.dart

@@ -10,7 +10,7 @@ import 'package:sharedinbox/data/imap/imap_client_factory.dart';
 
 class DraftRepositoryImpl implements DraftRepository {
   DraftRepositoryImpl(this._db, this._accounts, {ImapConnectFn? imapConnect})
-    : _imapConnect = imapConnect;
+      : _imapConnect = imapConnect;
 
   final AppDatabase _db;
   final AccountRepository _accounts;
@@ -51,9 +51,7 @@ class DraftRepositoryImpl implements DraftRepository {
       );
     }
 
-    final newId = await _db
+    final newId = await _db.into(_db.drafts).insert(
-        .into(_db.drafts)
-        .insert(
           DraftsCompanion.insert(
             accountId: Value(accountId),
             replyToEmailId: Value(replyToEmailId),
@@ -94,7 +92,8 @@ class DraftRepositoryImpl implements DraftRepository {
   Future<SavedDraft?> getDraft(int id) async {
     final row = await (_db.select(
       _db.drafts,
-    )..where((t) => t.id.equals(id))).getSingleOrNull();
+    )..where((t) => t.id.equals(id)))
+        .getSingleOrNull();
     return row == null ? null : _toModel(row);
   }
 
@@ -111,9 +110,8 @@ class DraftRepositoryImpl implements DraftRepository {
     final account = await _accounts.getAccount(accountId);
     if (account == null || account.type != AccountType.imap) return;
 
-    final username = account.username.isNotEmpty
+    final username =
-        ? account.username
+        account.username.isNotEmpty ? account.username : account.email;
-        : account.email;
     imap.ImapClient? client;
     try {
       client = await connect(account, username, password);
@@ -134,11 +132,11 @@ class DraftRepositoryImpl implements DraftRepository {
     final messageCount = selectResult.messagesExists;
 
     // Upload local drafts that have no server counterpart.
-    final localDrafts =
+    final localDrafts = await (_db.select(_db.drafts)
-        await (_db.select(_db.drafts)..where(
+          ..where(
-              (t) => t.accountId.equals(accountId) & t.imapServerId.isNull(),
+            (t) => t.accountId.equals(accountId) & t.imapServerId.isNull(),
-            ))
+          ))
-            .get();
+        .get();
 
     for (final row in localDrafts) {
       final builder = imap.MessageBuilder()
@@ -152,8 +150,8 @@ class DraftRepositoryImpl implements DraftRepository {
         targetMailboxPath: 'Drafts',
         flags: [r'\Draft'],
       );
-      final uidList = appendResult.responseCodeAppendUid?.targetSequence
+      final uidList =
-          .toList();
+          appendResult.responseCodeAppendUid?.targetSequence.toList();
       final uid = (uidList != null && uidList.isNotEmpty)
           ? uidList.first.toString()
           : null;
@@ -166,12 +164,11 @@ class DraftRepositoryImpl implements DraftRepository {
 
     // Download server drafts not tracked locally.
     if (messageCount > 0) {
-      final knownServerIds =
+      final knownServerIds = await (_db.select(_db.drafts)
-          await (_db.select(_db.drafts)..where(
+            ..where(
-                (t) =>
+              (t) => t.accountId.equals(accountId) & t.imapServerId.isNotNull(),
-                    t.accountId.equals(accountId) & t.imapServerId.isNotNull(),
+            ))
-              ))
+          .get();
-              .get();
       final knownIds = knownServerIds.map((r) => r.imapServerId!).toSet();
 
       final seq = imap.MessageSequence.fromAll();
@@ -182,9 +179,7 @@ class DraftRepositoryImpl implements DraftRepository {
         if (msg.flags?.contains(r'\Deleted') ?? false) continue;
         final env = msg.envelope;
         final now = DateTime.now();
-        await _db
+        await _db.into(_db.drafts).insert(
-            .into(_db.drafts)
-            .insert(
               DraftsCompanion.insert(
                 accountId: Value(accountId),
                 toText: Value(_addressListToText(env?.to)),
@@ -210,14 +205,14 @@ class DraftRepositoryImpl implements DraftRepository {
   }
 
   SavedDraft _toModel(Draft row) => SavedDraft(
-    id: row.id,
+        id: row.id,
-    accountId: row.accountId,
+        accountId: row.accountId,
-    replyToEmailId: row.replyToEmailId,
+        replyToEmailId: row.replyToEmailId,
-    toText: row.toText,
+        toText: row.toText,
-    ccText: row.ccText,
+        ccText: row.ccText,
-    subjectText: row.subjectText,
+        subjectText: row.subjectText,
-    bodyText: row.bodyText,
+        bodyText: row.bodyText,
-    updatedAt: row.updatedAt,
+        updatedAt: row.updatedAt,
-    imapServerId: row.imapServerId,
+        imapServerId: row.imapServerId,
-  );
+      );
 }

lib/data/repositories/mailbox_repository_impl.dart

@@ -17,8 +17,8 @@ class MailboxRepositoryImpl implements MailboxRepository {
     this._accounts, {
     ImapConnectFn imapConnect = connectImap,
     http.Client? httpClient,
-  }) : _imapConnect = imapConnect,
+  })  : _imapConnect = imapConnect,
-       _httpClient = httpClient ?? http.Client();
+        _httpClient = httpClient ?? http.Client();
 
   final AppDatabase _db;
   final AccountRepository _accounts;
@@ -45,13 +45,12 @@ class MailboxRepositoryImpl implements MailboxRepository {
     String accountId,
     String role,
   ) async {
-    final row =
+    final row = await (_db.select(_db.mailboxes)
-        await (_db.select(_db.mailboxes)
+          ..where(
-              ..where(
+            (t) => t.accountId.equals(accountId) & t.role.equals(role),
-                (t) => t.accountId.equals(accountId) & t.role.equals(role),
+          )
-              )
+          ..limit(1))
-              ..limit(1))
+        .getSingleOrNull();
-            .getSingleOrNull();
     return row == null ? null : _toModel(row);
   }
 
@@ -85,7 +84,8 @@ class MailboxRepositoryImpl implements MailboxRepository {
       // folders the server doesn't tag with a special-use attribute.
       final existingRows = await (_db.select(
         _db.mailboxes,
-      )..where((t) => t.accountId.equals(account.id))).get();
+      )..where((t) => t.accountId.equals(account.id)))
+          .get();
       final existingRoles = {for (final r in existingRows) r.id: r.role};
 
       for (final mb in mailboxes) {
@@ -111,9 +111,7 @@ class MailboxRepositoryImpl implements MailboxRepository {
         // when the IMAP server does not expose a special-use attribute.
         final role = _imapRole(mb) ?? existingRoles[id];
 
-        await _db
+        await _db.into(_db.mailboxes).insertOnConflictUpdate(
-            .into(_db.mailboxes)
-            .insertOnConflictUpdate(
               MailboxesCompanion.insert(
                 id: id,
                 accountId: account.id,
@@ -218,7 +216,8 @@ class MailboxRepositoryImpl implements MailboxRepository {
     for (final jmapId in destroyed) {
       await (_db.delete(
         _db.mailboxes,
-      )..where((t) => t.id.equals('$accountId:$jmapId'))).go();
+      )..where((t) => t.id.equals('$accountId:$jmapId')))
+          .go();
     }
 
     await _saveSyncState(accountId, 'Mailbox', newState);
@@ -239,9 +238,7 @@ class MailboxRepositoryImpl implements MailboxRepository {
       final dbId = '$accountId:$jmapId';
       // For JMAP accounts, path stores the JMAP mailbox ID so that
       // Email rows can reference it via mailboxPath.
-      await _db
+      await _db.into(_db.mailboxes).insertOnConflictUpdate(
-          .into(_db.mailboxes)
-          .insertOnConflictUpdate(
             MailboxesCompanion.insert(
               id: dbId,
               accountId: accountId,
@@ -258,13 +255,13 @@ class MailboxRepositoryImpl implements MailboxRepository {
   // ── sync_state helpers ────────────────────────────────────────────────────
 
   Future<String?> _loadSyncState(String accountId, String resourceType) async {
-    final row =
+    final row = await (_db.select(_db.syncStates)
-        await (_db.select(_db.syncStates)..where(
+          ..where(
-              (t) =>
+            (t) =>
-                  t.accountId.equals(accountId) &
+                t.accountId.equals(accountId) &
-                  t.resourceType.equals(resourceType),
+                t.resourceType.equals(resourceType),
-            ))
+          ))
-            .getSingleOrNull();
+        .getSingleOrNull();
     return row?.state;
   }
 
@@ -273,9 +270,7 @@ class MailboxRepositoryImpl implements MailboxRepository {
     String resourceType,
     String state,
   ) async {
-    await _db
+    await _db.into(_db.syncStates).insertOnConflictUpdate(
-        .into(_db.syncStates)
-        .insertOnConflictUpdate(
           SyncStatesCompanion.insert(
             accountId: accountId,
             resourceType: resourceType,
@@ -304,14 +299,14 @@ class MailboxRepositoryImpl implements MailboxRepository {
   }
 
   model.Mailbox _toModel(MailboxRow row) => model.Mailbox(
-    id: row.id,
+        id: row.id,
-    accountId: row.accountId,
+        accountId: row.accountId,
-    path: row.path,
+        path: row.path,
-    name: row.name,
+        name: row.name,
-    unreadCount: row.unreadCount,
+        unreadCount: row.unreadCount,
-    totalCount: row.totalCount,
+        totalCount: row.totalCount,
-    role: row.role,
+        role: row.role,
-  );
+      );
 
   /// Maps enough_mail special-use flags (RFC 6154) to JMAP role strings (RFC 8621).
   static String? _imapRole(imap.Mailbox mb) {
@@ -328,7 +323,8 @@ class MailboxRepositoryImpl implements MailboxRepository {
   Future<void> clearForResync(String accountId) async {
     await (_db.delete(
       _db.mailboxes,
-    )..where((t) => t.accountId.equals(accountId))).go();
+    )..where((t) => t.accountId.equals(accountId)))
+        .go();
   }
 
   @override
@@ -364,9 +360,7 @@ class MailboxRepositoryImpl implements MailboxRepository {
       await client.logout();
     }
     final id = '${account.id}:$name';
-    await _db
+    await _db.into(_db.mailboxes).insertOnConflictUpdate(
-        .into(_db.mailboxes)
-        .insertOnConflictUpdate(
           MailboxesCompanion.insert(
             id: id,
             accountId: account.id,
@@ -377,7 +371,8 @@ class MailboxRepositoryImpl implements MailboxRepository {
         );
     final row = await (_db.select(
       _db.mailboxes,
-    )..where((t) => t.id.equals(id))).getSingle();
+    )..where((t) => t.id.equals(id)))
+        .getSingle();
     return _toModel(row);
   }
 
@@ -419,9 +414,7 @@ class MailboxRepositoryImpl implements MailboxRepository {
       );
     }
     final dbId = '${account.id}:$newId';
-    await _db
+    await _db.into(_db.mailboxes).insertOnConflictUpdate(
-        .into(_db.mailboxes)
-        .insertOnConflictUpdate(
           MailboxesCompanion.insert(
             id: dbId,
             accountId: account.id,
@@ -432,7 +425,8 @@ class MailboxRepositoryImpl implements MailboxRepository {
         );
     final row = await (_db.select(
       _db.mailboxes,
-    )..where((t) => t.id.equals(dbId))).getSingle();
+    )..where((t) => t.id.equals(dbId)))
+        .getSingle();
     return _toModel(row);
   }
 }

lib/data/repositories/search_history_repository_impl.dart

@@ -10,11 +10,10 @@ class SearchHistoryRepositoryImpl implements SearchHistoryRepository {
 
   @override
   Future<List<String>> getRecentSearches() async {
-    final rows =
+    final rows = await (_db.select(_db.searchHistoryEntries)
-        await (_db.select(_db.searchHistoryEntries)
+          ..orderBy([(t) => OrderingTerm.desc(t.searchedAt)])
-              ..orderBy([(t) => OrderingTerm.desc(t.searchedAt)])
+          ..limit(_maxEntries))
-              ..limit(_maxEntries))
+        .get();
-            .get();
     return rows.map((r) => r.query).toList();
   }
 
@@ -27,11 +26,10 @@ class SearchHistoryRepositoryImpl implements SearchHistoryRepository {
       // Remove existing entry for same query (deduplication).
       await (_db.delete(
         _db.searchHistoryEntries,
-      )..where((t) => t.query.equals(trimmed))).go();
+      )..where((t) => t.query.equals(trimmed)))
+          .go();
 
-      await _db
+      await _db.into(_db.searchHistoryEntries).insert(
-          .into(_db.searchHistoryEntries)
-          .insert(
             SearchHistoryEntriesCompanion.insert(
               query: trimmed,
               searchedAt: DateTime.now(),
@@ -39,17 +37,17 @@ class SearchHistoryRepositoryImpl implements SearchHistoryRepository {
           );
 
       // Prune to the most recent _maxEntries.
-      final keepIds =
+      final keepIds = await (_db.select(_db.searchHistoryEntries)
-          await (_db.select(_db.searchHistoryEntries)
+            ..orderBy([(t) => OrderingTerm.desc(t.searchedAt)])
-                ..orderBy([(t) => OrderingTerm.desc(t.searchedAt)])
+            ..limit(_maxEntries))
-                ..limit(_maxEntries))
+          .map((r) => r.id)
-              .map((r) => r.id)
+          .get();
-              .get();
 
       if (keepIds.isNotEmpty) {
         await (_db.delete(
           _db.searchHistoryEntries,
-        )..where((t) => t.id.isNotIn(keepIds))).go();
+        )..where((t) => t.id.isNotIn(keepIds)))
+            .go();
       }
     });
   }

lib/data/repositories/share_key_repository_impl.dart

@@ -23,9 +23,7 @@ class ShareKeyRepositoryImpl implements ShareKeyRepository {
     final keyIdHex = _hex(material.keyId);
     final expiresAt = DateTime.now().toUtc().add(const Duration(minutes: 20));
 
-    await _db
+    await _db.into(_db.shareKeys).insert(
-        .into(_db.shareKeys)
-        .insert(
           ShareKeysCompanion.insert(
             id: keyIdHex,
             publicKey: base64.encode(material.publicKeyBytes),
@@ -44,7 +42,8 @@ class ShareKeyRepositoryImpl implements ShareKeyRepository {
     final keyIdHex = _hex(keyId);
     final row = await (_db.select(
       _db.shareKeys,
-    )..where((t) => t.id.equals(keyIdHex))).getSingleOrNull();
+    )..where((t) => t.id.equals(keyIdHex)))
+        .getSingleOrNull();
 
     if (row == null) return null;
     if (row.expiresAt.isBefore(DateTime.now().toUtc())) return null;
@@ -58,8 +57,8 @@ class ShareKeyRepositoryImpl implements ShareKeyRepository {
 
   Future<void> _pruneExpired() async {
     await (_db.delete(
-          _db.shareKeys,
+      _db.shareKeys,
-        )..where((t) => t.expiresAt.isSmallerThanValue(DateTime.now().toUtc())))
+    )..where((t) => t.expiresAt.isSmallerThanValue(DateTime.now().toUtc())))
         .go();
   }
 

lib/data/repositories/sync_log_repository_impl.dart

@@ -27,9 +27,7 @@ class SyncLogRepositoryImpl implements SyncLogRepository {
     String? protocolLog,
   }) async {
     await _db.transaction(() async {
-      final logId = await _db
+      final logId = await _db.into(_db.syncLogs).insert(
-          .into(_db.syncLogs)
-          .insert(
             SyncLogsCompanion.insert(
               accountId: accountId,
               result: success ? 'ok' : 'error',
@@ -48,9 +46,7 @@ class SyncLogRepositoryImpl implements SyncLogRepository {
             ),
           );
       for (final s in mailboxStats) {
-        await _db
+        await _db.into(_db.syncLogMailboxes).insert(
-            .into(_db.syncLogMailboxes)
-            .insert(
               SyncLogMailboxesCompanion.insert(
                 syncLogId: logId,
                 mailboxPath: s.mailboxPath,
@@ -74,11 +70,10 @@ class SyncLogRepositoryImpl implements SyncLogRepository {
     return logsQuery.watch().asyncMap((rows) async {
       final entries = <SyncLogEntry>[];
       for (final r in rows) {
-        final mailboxRows =
+        final mailboxRows = await (_db.select(_db.syncLogMailboxes)
-            await (_db.select(_db.syncLogMailboxes)
+              ..where((t) => t.syncLogId.equals(r.id))
-                  ..where((t) => t.syncLogId.equals(r.id))
+              ..orderBy([(t) => OrderingTerm.asc(t.mailboxPath)]))
-                  ..orderBy([(t) => OrderingTerm.asc(t.mailboxPath)]))
+            .get();
-                .get();
         entries.add(
           SyncLogEntry(
             id: r.id,

lib/data/repositories/undo_repository_impl.dart

@@ -11,9 +11,7 @@ class UndoRepositoryImpl implements UndoRepository {
 
   @override
   Future<void> saveAction(UndoAction action) async {
-    await _db
+    await _db.into(_db.undoActions).insert(
-        .into(_db.undoActions)
-        .insert(
           UndoActionsCompanion.insert(
             id: action.id,
             accountId: action.accountId,
@@ -31,11 +29,10 @@ class UndoRepositoryImpl implements UndoRepository {
 
   @override
   Future<List<UndoAction>> getHistory({int limit = 10}) async {
-    final rows =
+    final rows = await (_db.select(_db.undoActions)
-        await (_db.select(_db.undoActions)
+          ..orderBy([(t) => OrderingTerm.desc(t.createdAt)])
-              ..orderBy([(t) => OrderingTerm.desc(t.createdAt)])
+          ..limit(limit))
-              ..limit(limit))
+        .get();
-            .get();
     return rows.map((row) {
       return UndoAction.fromJson(
         jsonDecode(row.dataJson) as Map<String, dynamic>,

lib/data/repositories/user_preferences_repository_impl.dart

@@ -13,14 +13,14 @@ class UserPreferencesRepositoryImpl implements UserPreferencesRepository {
   Stream<pref.UserPreferences> observePreferences() {
     return (_db.select(
       _db.userPreferences,
-    )..where((t) => t.id.equals(_rowId))).watchSingleOrNull().map(_rowToModel);
+    )..where((t) => t.id.equals(_rowId)))
+        .watchSingleOrNull()
+        .map(_rowToModel);
   }
 
   @override
   Future<void> updateMenuPosition(pref.MenuPosition position) async {
-    await _db
+    await _db.into(_db.userPreferences).insertOnConflictUpdate(
-        .into(_db.userPreferences)
-        .insertOnConflictUpdate(
           UserPreferencesCompanion(
             id: const Value(_rowId),
             menuPosition: Value(position.name),
@@ -30,9 +30,7 @@ class UserPreferencesRepositoryImpl implements UserPreferencesRepository {
 
   @override
   Future<void> updateMailViewButtonPosition(pref.MenuPosition position) async {
-    await _db
+    await _db.into(_db.userPreferences).insertOnConflictUpdate(
-        .into(_db.userPreferences)
-        .insertOnConflictUpdate(
           UserPreferencesCompanion(
             id: const Value(_rowId),
             mailViewButtonPosition: Value(position.name),
@@ -44,9 +42,7 @@ class UserPreferencesRepositoryImpl implements UserPreferencesRepository {
   Future<void> updateAfterMailViewAction(
     pref.AfterMailViewAction action,
   ) async {
-    await _db
+    await _db.into(_db.userPreferences).insertOnConflictUpdate(
-        .into(_db.userPreferences)
-        .insertOnConflictUpdate(
           UserPreferencesCompanion(
             id: const Value(_rowId),
             afterMailViewAction: Value(action.name),

lib/di.dart

@@ -111,10 +111,10 @@ final syncLogRepositoryProvider = Provider<SyncLogRepository>((ref) {
   return SyncLogRepositoryImpl(ref.watch(dbProvider));
 });
 
-final syncLastErrorProvider = StreamProvider.autoDispose
+final syncLastErrorProvider =
-    .family<String?, String>((ref, accountId) {
+    StreamProvider.autoDispose.family<String?, String>((ref, accountId) {
-      return ref.watch(syncLogRepositoryProvider).observeLastError(accountId);
+  return ref.watch(syncLogRepositoryProvider).observeLastError(accountId);
-    });
+});
 
 final reliabilityRunnerProvider = Provider<ReliabilityRunner>((ref) {
   final runner = ReliabilityRunner(
@@ -127,13 +127,14 @@ final reliabilityRunnerProvider = Provider<ReliabilityRunner>((ref) {
   return runner;
 });
 
-final syncHealthProvider = StreamProvider.autoDispose
+final syncHealthProvider =
-    .family<SyncHealthRow?, String>((ref, accountId) {
+    StreamProvider.autoDispose.family<SyncHealthRow?, String>((ref, accountId) {
-      final db = ref.watch(dbProvider);
+  final db = ref.watch(dbProvider);
-      return (db.select(
+  return (db.select(
-        db.syncHealth,
+    db.syncHealth,
-      )..where((t) => t.accountId.equals(accountId))).watchSingleOrNull();
+  )..where((t) => t.accountId.equals(accountId)))
-    });
+      .watchSingleOrNull();
+});
 
 final isSyncingProvider = StreamProvider.autoDispose.family<bool, String>((
   ref,
@@ -195,8 +196,8 @@ final undoServiceProvider = NotifierProvider<UndoService, List<UndoAction>>(
 /// Owned by [EmailDetailScreen]; decouples data loading from the widget tree.
 final emailDetailProvider = AsyncNotifierProvider.autoDispose
     .family<EmailDetailNotifier, (Email?, EmailBody), String>(
-      EmailDetailNotifier.new,
+  EmailDetailNotifier.new,
-    );
+);
 
 class EmailDetailNotifier extends AsyncNotifier<(Email?, EmailBody)> {
   EmailDetailNotifier(this._emailId);
@@ -214,29 +215,26 @@ class EmailDetailNotifier extends AsyncNotifier<(Email?, EmailBody)> {
   }
 }
 
-final accountByIdProvider = StreamProvider.autoDispose
+final accountByIdProvider =
-    .family<model.Account?, String>((ref, accountId) {
+    StreamProvider.autoDispose.family<model.Account?, String>((ref, accountId) {
-      return ref
+  return ref.watch(accountRepositoryProvider).observeAccounts().map(
-          .watch(accountRepositoryProvider)
+        (accounts) => accounts.cast<model.Account?>().firstWhere(
-          .observeAccounts()
-          .map(
-            (accounts) => accounts.cast<model.Account?>().firstWhere(
               (a) => a?.id == accountId,
               orElse: () => null,
             ),
-          );
+      );
-    });
+});
 
-final accountConnectionStatusProvider = FutureProvider.autoDispose
+final accountConnectionStatusProvider =
-    .family<void, String>((ref, accountId) async {
+    FutureProvider.autoDispose.family<void, String>((ref, accountId) async {
-      final repo = ref.read(accountRepositoryProvider);
+  final repo = ref.read(accountRepositoryProvider);
-      final account = await repo.getAccount(accountId);
+  final account = await repo.getAccount(accountId);
-      if (account == null) throw Exception('Account not found');
+  if (account == null) throw Exception('Account not found');
-      final password = await repo.getPassword(accountId);
+  final password = await repo.getPassword(accountId);
-      await ref
+  await ref
-          .read(connectionTestServiceProvider)
+      .read(connectionTestServiceProvider)
-          .testConnection(account, password);
+      .testConnection(account, password);
-    });
+});
 
 final userPreferencesRepositoryProvider = Provider<UserPreferencesRepository>((
   ref,

lib/main.dart

@@ -20,9 +20,9 @@ void main({List<Override> overrides = const []}) async {
 
         // Catch errors during build (e.g. layout exceptions) and show CrashScreen.
         ErrorWidget.builder = (details) => CrashScreen(
-          exception: details.exception,
+              exception: details.exception,
-          stackTrace: details.stack,
+              stackTrace: details.stack,
-        );
+            );
 
         // Catch framework-level errors (e.g. from gestures, timers).
         FlutterError.onError = (details) {

lib/ui/screens/about_screen.dart

@@ -153,12 +153,10 @@ class _AboutScreenState extends ConsumerState<AboutScreen> {
       stream: _accountsStream,
       builder: (context, accountSnapshot) {
         final accounts = accountSnapshot.data ?? [];
-        final imapCount = accounts
+        final imapCount =
-            .where((a) => a.type == AccountType.imap)
+            accounts.where((a) => a.type == AccountType.imap).length;
-            .length;
+        final jmapCount =
-        final jmapCount = accounts
+            accounts.where((a) => a.type == AccountType.jmap).length;
-            .where((a) => a.type == AccountType.jmap)
-            .length;
 
         return Scaffold(
           appBar: AppBar(title: const Text('About')),

lib/ui/screens/account_receive_screen.dart

@@ -209,24 +209,24 @@ class _AccountReceiveScreenState extends ConsumerState<AccountReceiveScreen> {
         _Step.showingPubKey => _buildPubKeyView(context),
         _Step.scanning => _buildScannerView(context),
         _Step.importing => const Center(
-          child: Column(
+            child: Column(
-            mainAxisSize: MainAxisSize.min,
+              mainAxisSize: MainAxisSize.min,
-            children: [
+              children: [
-              CircularProgressIndicator(),
+                CircularProgressIndicator(),
-              SizedBox(height: 16),
+                SizedBox(height: 16),
-              Text('Importing accounts…'),
+                Text('Importing accounts…'),
-            ],
+              ],
+            ),
           ),
-        ),
         _Step.done => const Center(
-          child: Icon(Icons.check_circle, size: 64, color: Colors.green),
+            child: Icon(Icons.check_circle, size: 64, color: Colors.green),
-        ),
+          ),
-        _Step.error => Center(
+        _Step.error => Center(
-          child: Padding(
+            child: Padding(
-            padding: const EdgeInsets.all(16),
+              padding: const EdgeInsets.all(16),
-            child: Text('Error: $_errorMessage'),
+              child: Text('Error: $_errorMessage'),
+            ),
           ),
-        ),
       },
     );
   }

lib/ui/screens/account_send_screen.dart

@@ -117,10 +117,8 @@ class _AccountSendScreenState extends ConsumerState<AccountSendScreen> {
     }
 
     // Load all available accounts.
-    final accounts = await ref
+    final accounts =
-        .read(accountRepositoryProvider)
+        await ref.read(accountRepositoryProvider).observeAccounts().first;
-        .observeAccounts()
-        .first;
 
     if (!mounted) return;
 
@@ -197,11 +195,11 @@ class _AccountSendScreenState extends ConsumerState<AccountSendScreen> {
         _Step.selectAccounts => _buildSelectStep(context),
         _Step.showEncrypted => _buildEncryptedQrStep(context),
         _Step.error => Center(
-          child: Padding(
+            child: Padding(
-            padding: const EdgeInsets.all(16),
+              padding: const EdgeInsets.all(16),
-            child: Text('Error: $_errorMessage'),
+              child: Text('Error: $_errorMessage'),
+            ),
           ),
-        ),
       },
     );
   }

lib/ui/screens/add_account_screen.dart

@@ -94,12 +94,12 @@ class _AddAccountScreenState extends ConsumerState<AddAccountScreen> {
           _jmapApiUrlCtrl.text = sessionUrl;
           setState(() => _step = _Step.jmapForm);
         case ImapSmtpDiscovery(
-          :final imapHost,
+            :final imapHost,
-          :final imapPort,
+            :final imapPort,
-          :final smtpHost,
+            :final smtpHost,
-          :final smtpPort,
+            :final smtpPort,
-          :final smtpSsl,
+            :final smtpSsl,
-        ):
+          ):
           _imapHostCtrl.text = imapHost;
           _imapPortCtrl.text = imapPort.toString();
           _smtpHostCtrl.text = smtpHost;
@@ -116,13 +116,13 @@ class _AddAccountScreenState extends ConsumerState<AddAccountScreen> {
   }
 
   Account _buildJmapAccount() => Account(
-    id: DateTime.now().millisecondsSinceEpoch.toString(),
+        id: DateTime.now().millisecondsSinceEpoch.toString(),
-    displayName: _displayNameCtrl.text.trim(),
+        displayName: _displayNameCtrl.text.trim(),
-    email: _emailCtrl.text.trim(),
+        email: _emailCtrl.text.trim(),
-    username: _usernameCtrl.text.trim(),
+        username: _usernameCtrl.text.trim(),
-    type: AccountType.jmap,
+        type: AccountType.jmap,
-    jmapUrl: _jmapApiUrlCtrl.text.trim(),
+        jmapUrl: _jmapApiUrlCtrl.text.trim(),
-  );
+      );
 
   Account _buildImapAccount() {
     final imapHost = _imapHostCtrl.text.trim();
@@ -494,8 +494,7 @@ class _AddAccountScreenState extends ConsumerState<AddAccountScreen> {
           labelText: label,
           border: const OutlineInputBorder(),
         ),
-        validator:
+        validator: validator ??
-            validator ??
             (required
                 ? (v) => (v == null || v.trim().isEmpty) ? 'Required' : null
                 : null),

lib/ui/screens/address_emails_screen.dart

@@ -51,37 +51,38 @@ class _AddressEmailsScreenState extends ConsumerState<AddressEmailsScreen> {
       body: _loading
           ? const Center(child: CircularProgressIndicator())
           : _emails!.isEmpty
-          ? const Center(child: Text('No emails'))
+              ? const Center(child: Text('No emails'))
-          : ListView.builder(
+              : ListView.builder(
-              itemCount: _emails!.length,
+                  itemCount: _emails!.length,
-              itemBuilder: (ctx, i) {
+                  itemBuilder: (ctx, i) {
-                final e = _emails![i];
+                    final e = _emails![i];
-                final sender = e.from.isNotEmpty
+                    final sender = e.from.isNotEmpty
-                    ? (e.from.first.name ?? e.from.first.email)
+                        ? (e.from.first.name ?? e.from.first.email)
-                    : '(unknown)';
+                        : '(unknown)';
-                return ListTile(
+                    return ListTile(
-                  leading: Icon(
+                      leading: Icon(
-                    e.isSeen ? Icons.mail_outline : Icons.mail,
+                        e.isSeen ? Icons.mail_outline : Icons.mail,
-                    color: e.isSeen ? null : Theme.of(ctx).colorScheme.primary,
+                        color:
-                  ),
+                            e.isSeen ? null : Theme.of(ctx).colorScheme.primary,
-                  title: Text(sender),
+                      ),
-                  subtitle: Text(
+                      title: Text(sender),
-                    e.subject ?? '(no subject)',
+                      subtitle: Text(
-                    maxLines: 1,
+                        e.subject ?? '(no subject)',
-                    overflow: TextOverflow.ellipsis,
+                        maxLines: 1,
-                  ),
+                        overflow: TextOverflow.ellipsis,
-                  trailing: Text(
+                      ),
-                    e.mailboxPath,
+                      trailing: Text(
-                    style: Theme.of(ctx).textTheme.bodySmall,
+                        e.mailboxPath,
-                  ),
+                        style: Theme.of(ctx).textTheme.bodySmall,
-                  onTap: () => context.push(
+                      ),
-                    '/accounts/${widget.accountId}/mailboxes'
+                      onTap: () => context.push(
-                    '/${Uri.encodeComponent(e.mailboxPath)}'
+                        '/accounts/${widget.accountId}/mailboxes'
-                    '/emails/${Uri.encodeComponent(e.id)}',
+                        '/${Uri.encodeComponent(e.mailboxPath)}'
-                  ),
+                        '/emails/${Uri.encodeComponent(e.id)}',
-                );
+                      ),
-              },
+                    );
-            ),
+                  },
+                ),
     );
   }
 }

lib/ui/screens/compose_screen.dart

@@ -70,8 +70,7 @@ class _ComposeScreenState extends ConsumerState<ComposeScreen> {
     unawaited(_loadAccounts());
     // Only restore if no prefill fields were provided (avoids overwriting a
     // fresh reply with an old draft from a previous reply to the same email).
-    final hasPrefill =
+    final hasPrefill = widget.prefillTo != null ||
-        widget.prefillTo != null ||
         widget.prefillSubject != null ||
         widget.prefillBody != null;
     if (!hasPrefill) unawaited(_restoreDraft());
@@ -82,10 +81,8 @@ class _ComposeScreenState extends ConsumerState<ComposeScreen> {
   }
 
   Future<void> _loadAccounts() async {
-    final accounts = await ref
+    final accounts =
-        .read(accountRepositoryProvider)
+        await ref.read(accountRepositoryProvider).observeAccounts().first;
-        .observeAccounts()
-        .first;
     if (!mounted) return;
     setState(() {
       _accounts = accounts;
@@ -224,9 +221,8 @@ class _ComposeScreenState extends ConsumerState<ComposeScreen> {
     }
     setState(() => _sending = true);
     try {
-      final account = (await ref
+      final account =
-          .read(accountRepositoryProvider)
+          (await ref.read(accountRepositoryProvider).getAccount(_accountId!))!;
-          .getAccount(_accountId!))!;
       final draft = EmailDraft(
         from: EmailAddress(name: account.displayName, email: account.email),
         to: _to.text
@@ -399,9 +395,8 @@ class _ComposeScreenState extends ConsumerState<ComposeScreen> {
         displayStringForOption: (option) {
           final text = ctrl.text;
           final lastComma = text.lastIndexOf(',');
-          final prefix = lastComma >= 0
+          final prefix =
-              ? '${text.substring(0, lastComma + 1)} '
+              lastComma >= 0 ? '${text.substring(0, lastComma + 1)} ' : '';
-              : '';
           return '$prefix${option.email}, ';
         },
         optionsBuilder: (value) async {

lib/ui/screens/edit_account_screen.dart

@@ -117,8 +117,7 @@ class _EditAccountScreenState extends ConsumerState<EditAccountScreen> {
         int.tryParse(_sievePortCtrl.text) ?? account.manageSievePort;
     // Reset the cached probe result when any field that affects the probe
     // changed; the post-save probe will refill it.
-    final sieveSettingsChanged =
+    final sieveSettingsChanged = imapHost != account.imapHost ||
-        imapHost != account.imapHost ||
         sieveHost != account.manageSieveHost ||
         sievePort != account.manageSievePort ||
         _sieveSsl != account.manageSieveSsl;
@@ -139,12 +138,10 @@ class _EditAccountScreenState extends ConsumerState<EditAccountScreen> {
       manageSieveHost: sieveHost,
       manageSievePort: sievePort,
       manageSieveSsl: isLocalhost(effectiveSieveHost) ? _sieveSsl : true,
-      manageSieveAvailable: sieveSettingsChanged
+      manageSieveAvailable:
-          ? null
+          sieveSettingsChanged ? null : account.manageSieveAvailable,
-          : account.manageSieveAvailable,
+      jmapUrl:
-      jmapUrl: _jmapUrlCtrl.text.trim().isEmpty
+          _jmapUrlCtrl.text.trim().isEmpty ? null : _jmapUrlCtrl.text.trim(),
-          ? null
-          : _jmapUrlCtrl.text.trim(),
       verbose: _verbose,
     );
   }
@@ -154,8 +151,8 @@ class _EditAccountScreenState extends ConsumerState<EditAccountScreen> {
     final password = _passwordCtrl.text.isNotEmpty
         ? _passwordCtrl.text
         : await ref
-              .read(accountRepositoryProvider)
+            .read(accountRepositoryProvider)
-              .getPassword(widget.accountId);
+            .getPassword(widget.accountId);
     setState(() {
       _tryTesting = true;
       _tryOk = null;
@@ -395,8 +392,7 @@ class _EditAccountScreenState extends ConsumerState<EditAccountScreen> {
           labelText: label,
           border: const OutlineInputBorder(),
         ),
-        validator:
+        validator: validator ??
-            validator ??
             (required
                 ? (v) => (v == null || v.trim().isEmpty) ? 'Required' : null
                 : null),

lib/ui/screens/email_detail_screen.dart

@@ -55,8 +55,7 @@ class _EmailDetailScreenState extends ConsumerState<EmailDetailScreen> {
     final header = detail.value?.$1;
     final body = detail.value?.$2;
 
-    final isMobile =
+    final isMobile = defaultTargetPlatform == TargetPlatform.android ||
-        defaultTargetPlatform == TargetPlatform.android ||
         defaultTargetPlatform == TargetPlatform.iOS;
 
     return Scaffold(
@@ -94,9 +93,7 @@ class _EmailDetailScreenState extends ConsumerState<EmailDetailScreen> {
 
               if (header != null) {
                 unawaited(
-                  ref
+                  ref.read(undoServiceProvider.notifier).pushAction(
-                      .read(undoServiceProvider.notifier)
-                      .pushAction(
                         UndoAction(
                           id: DateTime.now().toIso8601String(),
                           accountId: header.accountId,
@@ -324,9 +321,8 @@ class _EmailDetailScreenState extends ConsumerState<EmailDetailScreen> {
 
   Future<String> _quotedBody(Email header, EmailBody? body) async {
     final date = header.sentAt != null ? _dateFmt.format(header.sentAt!) : '';
-    final from = header.from.isNotEmpty
+    final from =
-        ? header.from.first.toString()
+        header.from.isNotEmpty ? header.from.first.toString() : '(unknown)';
-        : '(unknown)';
     final rawText = body?.textBody;
     final text = (rawText != null && rawText.isNotEmpty)
         ? rawText
@@ -340,9 +336,8 @@ class _EmailDetailScreenState extends ConsumerState<EmailDetailScreen> {
     Email header,
     EmailBody? body,
   ) async {
-    final account = await ref
+    final account =
-        .read(accountRepositoryProvider)
+        await ref.read(accountRepositoryProvider).getAccount(header.accountId);
-        .getAccount(header.accountId);
     final ownEmail = account?.email.toLowerCase() ?? '';
 
     final seen = <String>{};
@@ -445,9 +440,7 @@ class _EmailDetailScreenState extends ConsumerState<EmailDetailScreen> {
         .moveEmail(widget.emailId, mailbox.path);
 
     unawaited(
-      ref
+      ref.read(undoServiceProvider.notifier).pushAction(
-          .read(undoServiceProvider.notifier)
-          .pushAction(
             UndoAction(
               id: DateTime.now().toIso8601String(),
               accountId: header.accountId,
@@ -483,9 +476,7 @@ class _EmailDetailScreenState extends ConsumerState<EmailDetailScreen> {
         .moveEmail(widget.emailId, mailbox.path);
 
     unawaited(
-      ref
+      ref.read(undoServiceProvider.notifier).pushAction(
-          .read(undoServiceProvider.notifier)
-          .pushAction(
             UndoAction(
               id: DateTime.now().toIso8601String(),
               accountId: header.accountId,
@@ -522,14 +513,12 @@ class _EmailDetailScreenState extends ConsumerState<EmailDetailScreen> {
     final nextEmailId = await _getNextEmailIdIfNeeded(header);
 
     final mailboxRepo = ref.read(mailboxRepositoryProvider);
-    final mailboxes = await mailboxRepo
+    final mailboxes =
-        .observeMailboxes(header.accountId)
+        await mailboxRepo.observeMailboxes(header.accountId).first;
-        .first;
 
     // Remove the current mailbox from the list.
-    final destinations = mailboxes
+    final destinations =
-        .where((m) => m.path != header.mailboxPath)
+        mailboxes.where((m) => m.path != header.mailboxPath).toList();
-        .toList();
 
     if (!context.mounted) return;
 
@@ -559,9 +548,7 @@ class _EmailDetailScreenState extends ConsumerState<EmailDetailScreen> {
     await ref.read(emailRepositoryProvider).moveEmail(widget.emailId, chosen);
 
     unawaited(
-      ref
+      ref.read(undoServiceProvider.notifier).pushAction(
-          .read(undoServiceProvider.notifier)
-          .pushAction(
             UndoAction(
               id: DateTime.now().toIso8601String(),
               accountId: header.accountId,
@@ -641,8 +628,8 @@ class _EmailDetailScreenState extends ConsumerState<EmailDetailScreen> {
                 Text(
                   fmtSize(raw.length),
                   style: Theme.of(ctx).textTheme.bodySmall?.copyWith(
-                    color: Theme.of(ctx).colorScheme.outline,
+                        color: Theme.of(ctx).colorScheme.outline,
-                  ),
+                      ),
                 ),
                 const SizedBox(height: 4),
                 Flexible(
@@ -822,8 +809,8 @@ class _EmailDetailScreenState extends ConsumerState<EmailDetailScreen> {
                         child: Text(
                           row.label,
                           style: Theme.of(ctx).textTheme.bodySmall?.copyWith(
-                            fontFamily: 'monospace',
+                                fontFamily: 'monospace',
-                          ),
+                              ),
                         ),
                       ),
                     ],

lib/ui/screens/email_list_screen.dart

@@ -92,9 +92,9 @@ class _EmailListScreenState extends ConsumerState<EmailListScreen> {
   }
 
   void _clearSelection() => setState(() {
-    _selectedThreadIds.clear();
+        _selectedThreadIds.clear();
-    _selectedSearchIds.clear();
+        _selectedSearchIds.clear();
-  });
+      });
 
   void _selectAll() {
     setState(() {
@@ -182,9 +182,8 @@ class _EmailListScreenState extends ConsumerState<EmailListScreen> {
     AsyncValue<Account?> accountAsync, {
     required bool menuAtBottom,
   }) {
-    final selectionCount = _searching
+    final selectionCount =
-        ? _selectedSearchIds.length
+        _searching ? _selectedSearchIds.length : _selectedThreadIds.length;
-        : _selectedThreadIds.length;
 
     return AppBar(
       automaticallyImplyLeading: !menuAtBottom,
@@ -278,8 +277,8 @@ class _EmailListScreenState extends ConsumerState<EmailListScreen> {
       tooltip: isSyncing
           ? 'Syncing…'
           : hasError
-          ? 'Sync error'
+              ? 'Sync error'
-          : 'Sync',
+              : 'Sync',
       icon: isSyncing
           ? const SizedBox(
               width: 20,
@@ -287,8 +286,8 @@ class _EmailListScreenState extends ConsumerState<EmailListScreen> {
               child: CircularProgressIndicator(strokeWidth: 2),
             )
           : hasError
-          ? const Icon(Icons.sync_problem, color: Colors.red)
+              ? const Icon(Icons.sync_problem, color: Colors.red)
-          : const Icon(Icons.sync),
+              : const Icon(Icons.sync),
       onPressed: isSyncing
           ? null
           : () async {
@@ -466,7 +465,9 @@ class _EmailListScreenState extends ConsumerState<EmailListScreen> {
     // Fetch full email data before moving so we can restore them if user clicks Undo.
     final originalEmails = (await Future.wait(
       ids.map((id) => repo.getEmail(id)),
-    )).whereType<Email>().toList();
+    ))
+        .whereType<Email>()
+        .toList();
 
     for (final id in ids) {
       await repo.moveEmail(id, mailbox.path);
@@ -485,10 +486,10 @@ class _EmailListScreenState extends ConsumerState<EmailListScreen> {
   }
 
   Future<void> _batchArchive() => _batchMoveToRole(
-    'archive',
+        'archive',
-    dialogTitle: 'No archive folder found',
+        dialogTitle: 'No archive folder found',
-    createFolderName: 'Archive',
+        createFolderName: 'Archive',
-  );
+      );
 
   Future<void> _refreshSearchAndPopIfEmpty() async {
     if (!mounted || !_searching) return;
@@ -527,7 +528,9 @@ class _EmailListScreenState extends ConsumerState<EmailListScreen> {
     // This is especially important for IMAP where we hard-delete the row locally.
     final originalEmails = (await Future.wait(
       ids.map((id) => repo.getEmail(id)),
-    )).whereType<Email>().toList();
+    ))
+        .whereType<Email>()
+        .toList();
 
     String? lastDestPath;
     for (final id in ids) {
@@ -566,10 +569,10 @@ class _EmailListScreenState extends ConsumerState<EmailListScreen> {
   }
 
   Future<void> _batchMarkSpam() => _batchMoveToRole(
-    'junk',
+        'junk',
-    dialogTitle: 'No spam folder found',
+        dialogTitle: 'No spam folder found',
-    createFolderName: 'Junk',
+        createFolderName: 'Junk',
-  );
+      );
 
   Future<void> _batchMove() async {
     final ids = _selectedEmailIds;
@@ -577,9 +580,8 @@ class _EmailListScreenState extends ConsumerState<EmailListScreen> {
         .read(mailboxRepositoryProvider)
         .observeMailboxes(widget.accountId)
         .first;
-    final destinations = mailboxes
+    final destinations =
-        .where((m) => m.path != widget.mailboxPath)
+        mailboxes.where((m) => m.path != widget.mailboxPath).toList();
-        .toList();
 
     if (!mounted) return;
 
@@ -611,7 +613,9 @@ class _EmailListScreenState extends ConsumerState<EmailListScreen> {
     // Fetch full email data before moving so we can restore them if user clicks Undo.
     final originalEmails = (await Future.wait(
       ids.map((id) => repo.getEmail(id)),
-    )).whereType<Email>().toList();
+    ))
+        .whereType<Email>()
+        .toList();
 
     for (final id in ids) {
       await repo.moveEmail(id, chosen);
@@ -642,7 +646,9 @@ class _EmailListScreenState extends ConsumerState<EmailListScreen> {
     // Fetch full email data before snoozing so we can restore them if user clicks Undo.
     final originalEmails = (await Future.wait(
       ids.map((id) => repo.getEmail(id)),
-    )).whereType<Email>().toList();
+    ))
+        .whereType<Email>()
+        .toList();
 
     for (final id in ids) {
       await repo.snoozeEmail(id, until);
@@ -683,10 +689,8 @@ class _EmailListScreenState extends ConsumerState<EmailListScreen> {
         }
         final t = threads[i];
         final isSelected = _selectedThreadIds.contains(t.threadId);
-        final senderNames = t.participants
+        final senderNames =
-            .map((a) => a.name ?? a.email)
+            t.participants.map((a) => a.name ?? a.email).take(3).join(', ');
-            .take(3)
-            .join(', ');
 
         final tile = ListTile(
           leading: SizedBox(
@@ -698,9 +702,8 @@ class _EmailListScreenState extends ConsumerState<EmailListScreen> {
                   )
                 : Icon(
                     t.hasUnread ? Icons.mail : Icons.mail_outline,
-                    color: t.hasUnread
+                    color:
-                        ? Theme.of(ctx).colorScheme.primary
+                        t.hasUnread ? Theme.of(ctx).colorScheme.primary : null,
-                        : null,
                   ),
           ),
           title: Row(
@@ -760,12 +763,12 @@ class _EmailListScreenState extends ConsumerState<EmailListScreen> {
           onTap: _selecting
               ? () => _toggleThreadSelection(t)
               : t.messageCount > 1
-              ? () => context.push(
+                  ? () => context.push(
-                  '/accounts/${widget.accountId}/mailboxes/${Uri.encodeComponent(widget.mailboxPath)}/threads/${Uri.encodeComponent(t.threadId)}',
+                        '/accounts/${widget.accountId}/mailboxes/${Uri.encodeComponent(widget.mailboxPath)}/threads/${Uri.encodeComponent(t.threadId)}',
-                )
+                      )
-              : () => context.push(
+                  : () => context.push(
-                  '/accounts/${widget.accountId}/mailboxes/${Uri.encodeComponent(widget.mailboxPath)}/emails/${Uri.encodeComponent(t.latestEmailId)}',
+                        '/accounts/${widget.accountId}/mailboxes/${Uri.encodeComponent(widget.mailboxPath)}/emails/${Uri.encodeComponent(t.latestEmailId)}',
-                ),
+                      ),
           onLongPress: () => _toggleThreadSelection(t),
         );
 
@@ -773,9 +776,8 @@ class _EmailListScreenState extends ConsumerState<EmailListScreen> {
         // (single-email threads) or the whole thread.
         return Dismissible(
           key: ValueKey(t.threadId),
-          direction: _selecting
+          direction:
-              ? DismissDirection.none
+              _selecting ? DismissDirection.none : DismissDirection.horizontal,
-              : DismissDirection.horizontal,
           background: _swipeBackground(
             alignment: Alignment.centerLeft,
             color: Colors.green,
@@ -797,7 +799,9 @@ class _EmailListScreenState extends ConsumerState<EmailListScreen> {
             // Fetch full email data before moving/deleting.
             final originalEmails = (await Future.wait(
               t.emailIds.map((id) => repo.getEmail(id)),
-            )).whereType<Email>().toList();
+            ))
+                .whereType<Email>()
+                .toList();
 
             if (direction == DismissDirection.startToEnd) {
               final archive = await ref

lib/ui/screens/search_screen.dart

@@ -84,9 +84,10 @@ class _SearchScreenState extends ConsumerState<SearchScreen> {
         emailRepo.getEmailsByAddress(widget.accountId, query),
       ).wait;
 
-      final matchedMailboxes =
+      final matchedMailboxes = allMailboxes
-          allMailboxes.where((m) => _hasWordPrefix(m.name, ql)).toList()
+          .where((m) => _hasWordPrefix(m.name, ql))
-            ..sort(compareMailboxes);
+          .toList()
+        ..sort(compareMailboxes);
 
       // Collect unique addresses from address-search results where the
       // email or display name contains the query.
@@ -306,9 +307,8 @@ class _FolderTile extends StatelessWidget {
             : null,
       ),
       subtitle: Text(accountId, style: Theme.of(context).textTheme.bodySmall),
-      trailing: mb.unreadCount > 0
+      trailing:
-          ? Badge(label: Text('${mb.unreadCount}'))
+          mb.unreadCount > 0 ? Badge(label: Text('${mb.unreadCount}')) : null,
-          : null,
       onTap: () => context.go(
         '/accounts/$accountId/mailboxes'
         '/${Uri.encodeComponent(mb.path)}/emails',

lib/ui/screens/sieve_script_edit_screen.dart

@@ -56,11 +56,11 @@ class _SieveScriptEditScreenState extends ConsumerState<SieveScriptEditScreen> {
     try {
       final content = widget.isLocal
           ? await ref
-                .read(localSieveRepositoryProvider)
+              .read(localSieveRepositoryProvider)
-                .getScriptContent(widget.accountId, widget.script!.blobId)
+              .getScriptContent(widget.accountId, widget.script!.blobId)
           : await ref
-                .read(sieveRepositoryProvider)
+              .read(sieveRepositoryProvider)
-                .getScriptContent(widget.accountId, widget.script!.blobId);
+              .getScriptContent(widget.accountId, widget.script!.blobId);
       if (mounted) {
         _contentController.text = content;
         setState(() => _loadingContent = false);
@@ -87,18 +87,14 @@ class _SieveScriptEditScreenState extends ConsumerState<SieveScriptEditScreen> {
     });
     try {
       if (widget.isLocal) {
-        await ref
+        await ref.read(localSieveRepositoryProvider).saveScript(
-            .read(localSieveRepositoryProvider)
-            .saveScript(
               widget.accountId,
               id: widget.script?.id,
               name: name,
               content: _contentController.text,
             );
       } else {
-        await ref
+        await ref.read(sieveRepositoryProvider).saveScript(
-            .read(sieveRepositoryProvider)
-            .saveScript(
               widget.accountId,
               id: widget.script?.id,
               name: name,

lib/ui/screens/sieve_scripts_screen.dart

@@ -46,11 +46,11 @@ class _SieveScriptsScreenState extends ConsumerState<SieveScriptsScreen> {
     try {
       final scripts = widget.isLocal
           ? await ref
-                .read(localSieveRepositoryProvider)
+              .read(localSieveRepositoryProvider)
-                .listScripts(widget.accountId)
+              .listScripts(widget.accountId)
           : await ref
-                .read(sieveRepositoryProvider)
+              .read(sieveRepositoryProvider)
-                .listScripts(widget.accountId);
+              .listScripts(widget.accountId);
       if (mounted) {
         setState(() {
           _scripts = scripts;
@@ -207,10 +207,10 @@ class _SieveSourceBanner extends StatelessWidget {
   Widget build(BuildContext context) {
     final text = isLocal
         ? 'Local Filters run Sieve scripts directly on this device. '
-              'Remote Filters, which run on the mail server, are configured separately.'
+            'Remote Filters, which run on the mail server, are configured separately.'
         : 'Remote Filters run Sieve scripts on the mail server '
-              '(ManageSieve or JMAP). '
+            '(ManageSieve or JMAP). '
-              'Local Filters, which run on this device, are configured separately.';
+            'Local Filters, which run on this device, are configured separately.';
     return Container(
       width: double.infinity,
       color: Theme.of(context).colorScheme.surfaceContainerHighest,
@@ -228,8 +228,8 @@ class _SieveSourceBanner extends StatelessWidget {
             child: Text(
               text,
               style: Theme.of(context).textTheme.bodySmall?.copyWith(
-                color: Theme.of(context).colorScheme.onSurfaceVariant,
+                    color: Theme.of(context).colorScheme.onSurfaceVariant,
-              ),
+                  ),
             ),
           ),
         ],

lib/ui/screens/sync_log_screen.dart

@@ -40,8 +40,8 @@ String _buildSyncEntryMarkdown(SyncLogEntry entry) {
   final statusLabel = entry.isOk
       ? 'OK'
       : entry.isPermanent
-      ? 'Error (permanent)'
+          ? 'Error (permanent)'
-      : 'Error';
+          : 'Error';
   buf.writeln('| Status | $statusLabel |');
   buf.writeln('| Emails fetched | ${entry.emailsFetched} |');
   buf.writeln('| Emails up-to-date | ${entry.emailsSkipped} |');
@@ -98,16 +98,16 @@ class _SyncLogScreenState extends ConsumerState<SyncLogScreen> {
         .read(syncLogRepositoryProvider)
         .observeSyncLogs(widget.accountId)
         .listen((entries) {
-          setState(() {
+      setState(() {
-            if (_syncing &&
+        if (_syncing &&
-                _presynCount != null &&
+            _presynCount != null &&
-                entries.length > _presynCount!) {
+            entries.length > _presynCount!) {
-              _syncing = false;
+          _syncing = false;
-              _presynCount = null;
+          _presynCount = null;
-            }
+        }
-            _entries = entries;
+        _entries = entries;
-          });
+      });
-        });
+    });
   }
 
   @override
@@ -125,10 +125,8 @@ class _SyncLogScreenState extends ConsumerState<SyncLogScreen> {
   }
 
   Future<void> _copyEntry(SyncLogEntry entry, BuildContext context) async {
-    final accounts = await ref
+    final accounts =
-        .read(accountRepositoryProvider)
+        await ref.read(accountRepositoryProvider).observeAccounts().first;
-        .observeAccounts()
-        .first;
     final imapCount = accounts.where((a) => a.type == AccountType.imap).length;
     final jmapCount = accounts.where((a) => a.type == AccountType.jmap).length;
 
@@ -206,17 +204,16 @@ class _SyncLogTile extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final durationLabel = _fmtDuration(entry.duration);
-    final proto = entry.protocol.isEmpty
+    final proto =
-        ? ''
+        entry.protocol.isEmpty ? '' : ' · ${entry.protocol.toUpperCase()}';
-        : ' · ${entry.protocol.toUpperCase()}';
     final theme = Theme.of(context);
     final errorColor = theme.colorScheme.error;
 
     final subtitleText = entry.isOk
         ? '${entry.emailsFetched} new · ${entry.emailsSkipped} up-to-date · took $durationLabel'
         : entry.isPermanent
-        ? 'Error (permanent) · took $durationLabel'
+            ? 'Error (permanent) · took $durationLabel'
-        : 'Error · took $durationLabel';
+            : 'Error · took $durationLabel';
 
     return ExpansionTile(
       leading: Icon(
@@ -341,18 +338,18 @@ class _SyncLogTile extends StatelessWidget {
   }
 
   Widget _row(String label, String value) => Padding(
-    padding: const EdgeInsets.symmetric(vertical: 1),
+        padding: const EdgeInsets.symmetric(vertical: 1),
-    child: Row(
+        child: Row(
-      children: [
+          children: [
-        SizedBox(
+            SizedBox(
-          width: 180,
+              width: 180,
-          child: Text(
+              child: Text(
-            label,
+                label,
-            style: const TextStyle(fontSize: 12, color: Colors.grey),
+                style: const TextStyle(fontSize: 12, color: Colors.grey),
-          ),
+              ),
+            ),
+            Expanded(child: Text(value, style: const TextStyle(fontSize: 12))),
+          ],
         ),
-        Expanded(child: Text(value, style: const TextStyle(fontSize: 12))),
+      );
-      ],
-    ),
-  );
 }

lib/ui/screens/thread_detail_screen.dart

@@ -101,9 +101,8 @@ class _EmailMessageCardState extends ConsumerState<_EmailMessageCard> {
   @override
   void initState() {
     super.initState();
-    _bodyFuture = ref
+    _bodyFuture =
-        .read(emailRepositoryProvider)
+        ref.read(emailRepositoryProvider).getEmailBody(widget.email.id);
-        .getEmailBody(widget.email.id);
     _expanded = widget.isLatest;
     if (widget.email.isSeen == false) {
       unawaited(
@@ -230,9 +229,8 @@ class _EmailMessageCardState extends ConsumerState<_EmailMessageCard> {
   }
 
   void _reply(BuildContext context, EmailBody body, {required bool replyAll}) {
-    final to = widget.email.from.isNotEmpty
+    final to =
-        ? widget.email.from.first.email
+        widget.email.from.isNotEmpty ? widget.email.from.first.email : '';
-        : '';
     final subject = (widget.email.subject?.startsWith('Re:') ?? false)
         ? widget.email.subject!
         : 'Re: ${widget.email.subject ?? ''}';
@@ -292,9 +290,7 @@ class _EmailMessageCardState extends ConsumerState<_EmailMessageCard> {
       if (!mounted) return;
       if (original != null) {
         unawaited(
-          ref
+          ref.read(undoServiceProvider.notifier).pushAction(
-              .read(undoServiceProvider.notifier)
-              .pushAction(
                 UndoAction(
                   id: DateTime.now().toIso8601String(),
                   accountId: widget.email.accountId,

lib/ui/screens/undo_log_screen.dart

@@ -25,7 +25,7 @@ class UndoLogScreen extends ConsumerWidget {
             onPressed: history.isEmpty
                 ? null
                 : () =>
-                      unawaited(ref.read(undoServiceProvider.notifier).clear()),
+                    unawaited(ref.read(undoServiceProvider.notifier).clear()),
           ),
         ],
       ),
@@ -59,13 +59,13 @@ class _UndoActionTile extends ConsumerWidget {
         action.type == UndoType.delete
             ? Icons.delete_outline
             : (action.type == UndoType.snooze
-                  ? Icons.access_time
+                ? Icons.access_time
-                  : Icons.move_to_inbox),
+                : Icons.move_to_inbox),
         color: action.type == UndoType.delete
             ? Colors.redAccent
             : (action.type == UndoType.snooze
-                  ? Colors.orangeAccent
+                ? Colors.orangeAccent
-                  : Colors.blueAccent),
+                : Colors.blueAccent),
       ),
       title: Text('$subject$extraCount'),
       subtitle: Column(

lib/ui/utils/about_markdown.dart

@@ -33,9 +33,8 @@ String buildAboutMarkdown({
   final gitCommitLine = _gitHash.isNotEmpty
       ? '| Git Commit | [$_gitHash](https://codeberg.org/guettli/sharedinbox/commit/$_gitHash) |\n'
       : '';
-  final deviceModelLine = deviceModel != null
+  final deviceModelLine =
-      ? '| Device Model | $deviceModel |\n'
+      deviceModel != null ? '| Device Model | $deviceModel |\n' : '';
-      : '';
 
   return '## [sharedinbox.de](https://sharedinbox.de)\n\n'
       '| Property | Value |\n'

lib/ui/widgets/email_tile.dart

@@ -37,17 +37,15 @@ class EmailTile extends StatelessWidget {
     final date = email.sentAt != null ? _dateFmt.format(email.sentAt!) : '';
 
     return ListTile(
-      leading:
+      leading: leading ??
-          leading ??
           Icon(
             email.isSeen ? Icons.mail_outline : Icons.mail,
             color: email.isSeen ? null : Theme.of(context).colorScheme.primary,
           ),
       title: Text(
         sender,
-        style: email.isSeen
+        style:
-            ? null
+            email.isSeen ? null : const TextStyle(fontWeight: FontWeight.bold),
-            : const TextStyle(fontWeight: FontWeight.bold),
         overflow: TextOverflow.ellipsis,
       ),
       subtitle: Column(

lib/ui/widgets/folder_drawer.dart

@@ -43,9 +43,11 @@ class FolderDrawer extends ConsumerWidget {
                     Text(
                       account?.displayName ?? '',
                       style: Theme.of(context).textTheme.titleMedium?.copyWith(
-                        color: Theme.of(context).colorScheme.onPrimaryContainer,
+                            color: Theme.of(context)
-                        fontWeight: FontWeight.bold,
+                                .colorScheme
-                      ),
+                                .onPrimaryContainer,
+                            fontWeight: FontWeight.bold,
+                          ),
                     ),
                     Text(
                       account?.email ?? '',

lib/ui/widgets/secure_email_webview.dart

@@ -16,8 +16,7 @@ String buildEmailHtml(String htmlBody, {bool loadRemoteImages = false}) {
   final imgSrc = loadRemoteImages ? 'https: http: data: blob:' : 'data: blob:';
   // script-src 'none' blocks page scripts; JS mode stays unrestricted so the
   // controller can call runJavaScriptReturningResult for height measurement.
-  const cspBase =
+  const cspBase = "default-src 'none'; "
-      "default-src 'none'; "
       "style-src 'unsafe-inline'; "
       "script-src 'none'; "
       "object-src 'none'; "
@@ -107,9 +106,9 @@ class _SecureEmailWebViewState extends State<SecureEmailWebView> {
   }
 
   String _buildHtml() => buildEmailHtml(
-    widget.htmlBody,
+        widget.htmlBody,
-    loadRemoteImages: widget.loadRemoteImages,
+        loadRemoteImages: widget.loadRemoteImages,
-  );
+      );
 
   Future<void> _measureHeight(String _) async {
     try {
@@ -141,14 +140,13 @@ class _SecureEmailWebViewState extends State<SecureEmailWebView> {
     final host = uri.host;
     final parts = host.split('.');
     // Bold the registered domain (last two DNS labels) to aid phishing detection.
-    final boldStart =
+    final boldStart = (parts.length >= 2
-        (parts.length >= 2
+            ? host.length -
-                ? host.length -
+                parts.last.length -
-                      parts.last.length -
+                1 -
-                      1 -
+                parts[parts.length - 2].length
-                      parts[parts.length - 2].length
+            : 0)
-                : 0)
+        .clamp(0, host.length);
-            .clamp(0, host.length);
 
     final confirmed = await showDialog<bool>(
       context: context,

test/backend/account_sync_manager_test.dart

@@ -16,7 +16,8 @@ Future<imap.ImapClient> _fakeImapConnect(
   Account account,
   String username,
   String password,
-) async => throw const SocketException('fake — no real IMAP server in tests');
+) async =>
+    throw const SocketException('fake — no real IMAP server in tests');
 
 void main() {
   test(
@@ -83,27 +84,27 @@ void main() {
 }
 
 Account _account(String id) => Account(
-  id: id,
+      id: id,
-  displayName: 'Account $id',
+      displayName: 'Account $id',
-  email: '$id@example.com',
+      email: '$id@example.com',
-  imapHost: 'localhost',
+      imapHost: 'localhost',
-  imapPort: 143,
+      imapPort: 143,
-  imapSsl: false,
+      imapSsl: false,
-  smtpHost: 'localhost',
+      smtpHost: 'localhost',
-  smtpPort: 25,
+      smtpPort: 25,
-  smtpSsl: false,
+      smtpSsl: false,
-);
+    );
 
 Account _jmapAccount(String id) => Account(
-  id: id,
+      id: id,
-  displayName: 'Account $id',
+      displayName: 'Account $id',
-  email: '$id@example.com',
+      email: '$id@example.com',
-  type: AccountType.jmap,
+      type: AccountType.jmap,
-  jmapUrl: 'http://localhost:8080/.well-known/jmap',
+      jmapUrl: 'http://localhost:8080/.well-known/jmap',
-  smtpHost: 'localhost',
+      smtpHost: 'localhost',
-  smtpPort: 25,
+      smtpPort: 25,
-  smtpSsl: false,
+      smtpSsl: false,
-);
+    );
 
 class _FakeAccounts implements AccountRepository {
   _FakeAccounts(this.password);
@@ -132,16 +133,16 @@ class _FakeAccounts implements AccountRepository {
 class _FakeMailboxes implements MailboxRepository {
   @override
   Stream<List<Mailbox>> observeMailboxes(String? accountId) => Stream.value([
-    Mailbox(
+        Mailbox(
-      id: '$accountId:INBOX',
+          id: '$accountId:INBOX',
-      accountId: accountId ?? '',
+          accountId: accountId ?? '',
-      path: 'INBOX',
+          path: 'INBOX',
-      name: 'INBOX',
+          name: 'INBOX',
-      unreadCount: 0,
+          unreadCount: 0,
-      totalCount: 0,
+          totalCount: 0,
-      role: 'inbox',
+          role: 'inbox',
-    ),
+        ),
-  ]);
+      ]);
 
   @override
   Future<int> syncMailboxes(String accountId) async => 0;
@@ -158,15 +159,16 @@ class _FakeMailboxes implements MailboxRepository {
     String accountId,
     String name,
     String role,
-  ) async => Mailbox(
+  ) async =>
-    id: '$accountId:$name',
+      Mailbox(
-    accountId: accountId,
+        id: '$accountId:$name',
-    path: name,
+        accountId: accountId,
-    name: name,
+        path: name,
-    role: role,
+        name: name,
-    unreadCount: 0,
+        role: role,
-    totalCount: 0,
+        unreadCount: 0,
-  );
+        totalCount: 0,
+      );
 }
 
 class _FakeEmails implements EmailRepository {
@@ -181,7 +183,8 @@ class _FakeEmails implements EmailRepository {
     String a,
     String m, {
     int limit = 50,
-  }) => Stream.value([]);
+  }) =>
+      Stream.value([]);
 
   @override
   Stream<List<Email>> observeEmailsInThread(String a, String m, String t) =>
@@ -225,7 +228,8 @@ class _FakeEmails implements EmailRepository {
   Future<Email?> findEmailByMessageId(
     String accountId,
     String messageId,
-  ) async => null;
+  ) async =>
+      null;
 
   @override
   Future<String?> deleteEmail(String id) async => null;
@@ -243,7 +247,8 @@ class _FakeEmails implements EmailRepository {
   Future<String> downloadAttachment(
     String emailId,
     EmailAttachment attachment,
-  ) async => '/tmp/${attachment.filename}';
+  ) async =>
+      '/tmp/${attachment.filename}';
 
   @override
   Future<String> fetchRawRfc822(String emailId) async => '';
@@ -262,7 +267,8 @@ class _FakeEmails implements EmailRepository {
     String? a,
     String q, {
     int limit = 10,
-  }) async => [];
+  }) async =>
+      [];
 
   @override
   Stream<void> watchJmapPush(String accountId, String password) =>
@@ -272,7 +278,8 @@ class _FakeEmails implements EmailRepository {
   Future<ReliabilityResult> verifySyncReliability(
     String accountId,
     String mailboxPath,
-  ) async => ReliabilityResult.healthy;
+  ) async =>
+      ReliabilityResult.healthy;
 
   @override
   Stream<List<FailedMutation>> observeFailedMutations(String accountId) =>

test/backend/concurrent_sync_test.dart

@@ -246,9 +246,8 @@ void main() {
       );
 
       // Alice and bob each received at least msgCount messages.
-      final aliceEmails = allEmails
+      final aliceEmails =
-          .where((e) => e.accountId == 'alice')
+          allEmails.where((e) => e.accountId == 'alice').toList();
-          .toList();
       final bobEmails = allEmails.where((e) => e.accountId == 'bob').toList();
       expect(
         aliceEmails.length,

test/backend/email_repository_imap_test.dart

@@ -138,7 +138,7 @@ void main() {
   }
 
   ({AppDatabase db, AccountRepositoryImpl accounts, EmailRepositoryImpl emails})
-  makeRepo() {
+      makeRepo() {
     final db = openTestDatabase();
     final storage = MapSecureStorage();
     final accounts = AccountRepositoryImpl(db, storage);
@@ -346,9 +346,7 @@ void main() {
       final emailId = emails.first.id;
 
       // Simulate a legacy row with no cachedAt.
-      await r.db
+      await r.db.into(r.db.emailBodies).insertOnConflictUpdate(
-          .into(r.db.emailBodies)
-          .insertOnConflictUpdate(
             EmailBodiesCompanion.insert(
               emailId: emailId,
               textBody: const Value('stale text'),
@@ -374,9 +372,7 @@ void main() {
       final emailId = emails.first.id;
 
       // Simulate a row cached 8 days ago.
-      await r.db
+      await r.db.into(r.db.emailBodies).insertOnConflictUpdate(
-          .into(r.db.emailBodies)
-          .insertOnConflictUpdate(
             EmailBodiesCompanion.insert(
               emailId: emailId,
               textBody: const Value('old text'),

test/backend/email_repository_jmap_test.dart

@@ -107,8 +107,7 @@ void main() {
     AccountRepositoryImpl accounts,
     EmailRepositoryImpl emails,
     MailboxRepositoryImpl mailboxes,
-  })
+  }) makeRepo() {
-  makeRepo() {
     final db = openTestDatabase();
     final accounts = AccountRepositoryImpl(db, MapSecureStorage());
     final emails = EmailRepositoryImpl(
@@ -128,13 +127,12 @@ void main() {
   ) async {
     await accounts.addAccount(account, userPass);
     await mailboxes.syncMailboxes('test-jmap');
-    final row =
+    final row = await (db.select(db.mailboxes)
-        await (db.select(db.mailboxes)
+          ..where(
-              ..where(
+            (t) => t.accountId.equals('test-jmap') & t.role.equals('inbox'),
-                (t) => t.accountId.equals('test-jmap') & t.role.equals('inbox'),
+          )
-              )
+          ..limit(1))
-              ..limit(1))
+        .getSingleOrNull();
-            .getSingleOrNull();
     if (row == null) throw StateError('INBOX not found after syncMailboxes');
     return row.path;
   }
@@ -272,21 +270,18 @@ void main() {
       );
 
       // A sent copy should appear in the Sent mailbox.
-      final sentRow =
+      final sentRow = await (r.db.select(r.db.mailboxes)
-          await (r.db.select(r.db.mailboxes)
+            ..where(
-                ..where(
+              (t) => t.accountId.equals('test-jmap') & t.role.equals('sent'),
-                  (t) =>
+            )
-                      t.accountId.equals('test-jmap') & t.role.equals('sent'),
+            ..limit(1))
-                )
+          .getSingleOrNull();
-                ..limit(1))
-              .getSingleOrNull();
       final sentId = sentRow?.path;
 
       if (sentId != null) {
         await r.emails.syncEmails('test-jmap', sentId);
-        final sentEmails = await r.emails
+        final sentEmails =
-            .observeEmails('test-jmap', sentId)
+            await r.emails.observeEmails('test-jmap', sentId).first;
-            .first;
         expect(sentEmails.any((e) => e.subject == subject), isTrue);
       } else {
         // If no Sent mailbox exists, just verify sendEmail didn't throw.
@@ -353,13 +348,12 @@ void main() {
     await r.emails.syncEmails('test-jmap', inboxId);
 
     // Find a destination mailbox (Trash).
-    final trashRow =
+    final trashRow = await (r.db.select(r.db.mailboxes)
-        await (r.db.select(r.db.mailboxes)
+          ..where(
-              ..where(
+            (t) => t.accountId.equals('test-jmap') & t.role.equals('trash'),
-                (t) => t.accountId.equals('test-jmap') & t.role.equals('trash'),
+          )
-              )
+          ..limit(1))
-              ..limit(1))
+        .getSingleOrNull();
-            .getSingleOrNull();
     if (trashRow == null) {
       markTestSkipped('No trash mailbox found on this Stalwart instance');
       return;

test/backend/mailbox_repository_imap_test.dart

@@ -76,8 +76,7 @@ void main() {
     AppDatabase db,
     AccountRepositoryImpl accounts,
     MailboxRepositoryImpl mailboxes,
-  })
+  }) makeRepo() {
-  makeRepo() {
     final db = openTestDatabase();
     final accounts = AccountRepositoryImpl(db, MapSecureStorage());
     final mailboxes = MailboxRepositoryImpl(

test/backend/sync_reliability_test.dart

@@ -107,9 +107,7 @@ void main() {
     'verifySyncReliability identifies extra local emails (missing on server)',
     () async {
       // 1. Manually insert a row into local DB that doesn't exist on server
-      await db
+      await db.into(db.emails).insert(
-          .into(db.emails)
-          .insert(
             EmailsCompanion.insert(
               id: 'test:999',
               accountId: 'test',

test/unit/account_sync_manager_test.dart

@@ -78,7 +78,8 @@ class FakeEmailRepository implements EmailRepository {
     String a,
     String m, {
     int limit = 50,
-  }) => Stream.value([]);
+  }) =>
+      Stream.value([]);
   @override
   Stream<List<Email>> observeEmailsInThread(String a, String m, String t) =>
       Stream.value([]);
@@ -113,7 +114,8 @@ class FakeEmailRepository implements EmailRepository {
   Future<Email?> findEmailByMessageId(
     String accountId,
     String messageId,
-  ) async => null;
+  ) async =>
+      null;
 
   @override
   Future<String?> deleteEmail(String id) async => null;
@@ -138,7 +140,8 @@ class FakeEmailRepository implements EmailRepository {
     String? a,
     String q, {
     int limit = 10,
-  }) async => [];
+  }) async =>
+      [];
   @override
   Stream<void> watchJmapPush(String a, String p) => const Stream.empty();
   @override
@@ -153,7 +156,8 @@ class FakeEmailRepository implements EmailRepository {
   Future<ReliabilityResult> verifySyncReliability(
     String accountId,
     String mailboxPath,
-  ) async => ReliabilityResult.healthy;
+  ) async =>
+      ReliabilityResult.healthy;
 
   @override
   Future<void> clearForResync(String accountId) async {}
@@ -201,16 +205,16 @@ class FakeSyncLogRepository implements SyncLogRepository {
 class FakeMailboxRepositoryWithInbox implements MailboxRepository {
   @override
   Stream<List<Mailbox>> observeMailboxes(String? accountId) => Stream.value([
-    const Mailbox(
+        const Mailbox(
-      id: '1:INBOX',
+          id: '1:INBOX',
-      accountId: '1',
+          accountId: '1',
-      path: 'INBOX',
+          path: 'INBOX',
-      name: 'INBOX',
+          name: 'INBOX',
-      unreadCount: 0,
+          unreadCount: 0,
-      totalCount: 0,
+          totalCount: 0,
-      role: 'inbox',
+          role: 'inbox',
-    ),
+        ),
-  ]);
+      ]);
   @override
   Future<int> syncMailboxes(String id) async => 1;
   @override
@@ -222,15 +226,16 @@ class FakeMailboxRepositoryWithInbox implements MailboxRepository {
     String accountId,
     String name,
     String role,
-  ) async => Mailbox(
+  ) async =>
-    id: '$accountId:$name',
+      Mailbox(
-    accountId: accountId,
+        id: '$accountId:$name',
-    path: name,
+        accountId: accountId,
-    name: name,
+        path: name,
-    role: role,
+        name: name,
-    unreadCount: 0,
+        role: role,
-    totalCount: 0,
+        unreadCount: 0,
-  );
+        totalCount: 0,
+      );
 }
 
 class _AccountRepositoryWithMissingPlugin implements AccountRepository {
@@ -248,11 +253,11 @@ class _AccountRepositoryWithMissingPlugin implements AccountRepository {
 
   @override
   Future<String> getPassword(String accountId) => Future.error(
-    MissingPluginException(
+        MissingPluginException(
-      'No implementation found for method read on channel '
+          'No implementation found for method read on channel '
-      'plugins.it.nomads.com/flutter_secure_storage',
+          'plugins.it.nomads.com/flutter_secure_storage',
-    ),
+        ),
-  );
+      );
 
   @override
   Future<void> addAccount(Account account, String password) async {}

test/unit/apply_sieve_rules_test.dart

@@ -40,9 +40,7 @@ Future<String> _insertInboxEmail(
   String from = 'sender@example.com',
   String mailboxPath = 'INBOX',
 }) async {
-  await db
+  await db.into(db.emails).insert(
-      .into(db.emails)
-      .insert(
         EmailsCompanion.insert(
           id: id,
           accountId: _account.id,
@@ -59,9 +57,7 @@ Future<String> _insertInboxEmail(
         ),
       );
   // Insert a thread row so _updateThread does not throw.
-  await db
+  await db.into(db.threads).insertOnConflictUpdate(
-      .into(db.threads)
-      .insertOnConflictUpdate(
         ThreadsCompanion.insert(
           id: id,
           accountId: _account.id,
@@ -75,9 +71,7 @@ Future<String> _insertInboxEmail(
 
 /// Creates an active Sieve script for the test account.
 Future<void> _insertSieveScript(AppDatabase db, String content) async {
-  await db
+  await db.into(db.localSieveScripts).insert(
-      .into(db.localSieveScripts)
-      .insert(
         LocalSieveScriptsCompanion.insert(
           accountId: _account.id,
           name: 'test-script',
@@ -224,9 +218,7 @@ if header :contains "subject" ["SPAM"] {
 }
 ''');
       // Insert without messageId.
-      await db
+      await db.into(db.emails).insert(
-          .into(db.emails)
-          .insert(
             EmailsCompanion.insert(
               id: 'sieve-acc:2',
               accountId: _account.id,
@@ -236,9 +228,7 @@ if header :contains "subject" ["SPAM"] {
               receivedAt: DateTime.now(),
             ),
           );
-      await db
+      await db.into(db.threads).insertOnConflictUpdate(
-          .into(db.threads)
-          .insertOnConflictUpdate(
             ThreadsCompanion.insert(
               id: 'sieve-acc:2',
               accountId: _account.id,

test/unit/cid_utils_test.dart

@@ -59,8 +59,7 @@ void main() {
 
     test('leaves HTML unchanged when there are no inline parts', () {
       // A plain text-only message.
-      const plainMime =
+      const plainMime = 'MIME-Version: 1.0\r\n'
-          'MIME-Version: 1.0\r\n'
           'Content-Type: text/plain\r\n'
           '\r\n'
           'Hello';

test/unit/connection_test_service_test.dart

@@ -23,8 +23,7 @@ const _jmapAccount = Account(
   jmapUrl: 'https://example.com/jmap/session',
 );
 
-const _jmapSessionJson =
+const _jmapSessionJson = '{'
-    '{'
     '"capabilities":{"urn:ietf:params:jmap:core":{},"urn:ietf:params:jmap:mail":{}},'
     '"accounts":{},"primaryAccounts":{},"username":"alice@example.com",'
     '"apiUrl":"https://example.com/jmap/","downloadUrl":"","uploadUrl":"","state":"0"'
@@ -117,15 +116,14 @@ void main() {
         MockClient((_) async => http.Response('', 200)),
         imapConnect: (_, __, ___) async => FakeImapClient(),
         smtpConnect: (_, __, ___) async => FakeSmtpClient(),
-        manageSieveConnect:
+        manageSieveConnect: ({
-            ({
+          required String host,
-              required String host,
+          required int port,
-              required int port,
+          required bool useTls,
-              required bool useTls,
+        }) async {
-            }) async {
+          sieveCalled = true;
-              sieveCalled = true;
+          throw Exception('should not be called');
-              throw Exception('should not be called');
+        },
-            },
       );
       await svc.testConnection(_imapAccount, 'pw');
       expect(sieveCalled, false);
@@ -144,12 +142,12 @@ void main() {
         MockClient((_) async => http.Response('', 200)),
         imapConnect: (_, __, ___) async => FakeImapClient(),
         smtpConnect: (_, __, ___) async => FakeSmtpClient(),
-        manageSieveConnect:
+        manageSieveConnect: ({
-            ({
+          required String host,
-              required String host,
+          required int port,
-              required int port,
+          required bool useTls,
-              required bool useTls,
+        }) async =>
-            }) async => throw Exception('sieve boom'),
+            throw Exception('sieve boom'),
       );
       expect(
         () => svc.testConnection(accountWithSieve, 'pw'),

test/unit/email_model_test.dart

@@ -8,8 +8,8 @@ import 'package:test/test.dart';
 // Mirrors the encoding logic in EmailRepositoryImpl so we can test it
 // independently without spinning up a database.
 String encodeAddresses(List<EmailAddress> addresses) => jsonEncode(
-  addresses.map((a) => {'name': a.name, 'email': a.email}).toList(),
+      addresses.map((a) => {'name': a.name, 'email': a.email}).toList(),
-);
+    );
 
 List<EmailAddress> decodeAddresses(String json) {
   final list = jsonDecode(json) as List<dynamic>;

test/unit/email_repository_cancel_change_test.dart

@@ -34,9 +34,7 @@ void main() {
   });
 
   test('cancelPendingChange removes an unattempted change', () async {
-    await db
+    await db.into(db.pendingChanges).insert(
-        .into(db.pendingChanges)
-        .insert(
           PendingChangesCompanion.insert(
             accountId: 'acc1',
             resourceType: 'Email',
@@ -55,9 +53,7 @@ void main() {
   });
 
   test('cancelPendingChange does not remove attempted changes', () async {
-    await db
+    await db.into(db.pendingChanges).insert(
-        .into(db.pendingChanges)
-        .insert(
           PendingChangesCompanion.insert(
             accountId: 'acc1',
             resourceType: 'Email',
@@ -78,9 +74,7 @@ void main() {
 
   test('cancelPendingChange only removes the latest matching change', () async {
     final now = DateTime.now();
-    await db
+    await db.into(db.pendingChanges).insert(
-        .into(db.pendingChanges)
-        .insert(
           PendingChangesCompanion.insert(
             accountId: 'acc1',
             resourceType: 'Email',
@@ -90,9 +84,7 @@ void main() {
             createdAt: now,
           ),
         );
-    await db
+    await db.into(db.pendingChanges).insert(
-        .into(db.pendingChanges)
-        .insert(
           PendingChangesCompanion.insert(
             accountId: 'acc1',
             resourceType: 'Email',

test/unit/email_repository_contract_test.dart

@@ -186,9 +186,7 @@ class _EmailRepositoryImplContract extends EmailRepositoryContract {
     bool isFlagged = false,
     DateTime? receivedAt,
   }) async {
-    await _db
+    await _db.into(_db.emails).insert(
-        .into(_db.emails)
-        .insert(
           EmailsCompanion.insert(
             id: id,
             accountId: _account.id,

test/unit/email_repository_impl_test.dart

@@ -68,25 +68,26 @@ Map<String, dynamic> _emailGetResponse({
   required String state,
   required List<Map<String, dynamic>> list,
   int? total,
-}) => {
+}) =>
-  'sessionState': 'sess1',
+    {
-  'methodResponses': [
+      'sessionState': 'sess1',
-    [
+      'methodResponses': [
-      'Email/query',
+        [
-      {
+          'Email/query',
-        'accountId': 'acct1',
+          {
-        'ids': list.map((e) => e['id']).toList(),
+            'accountId': 'acct1',
-        'total': total ?? list.length,
+            'ids': list.map((e) => e['id']).toList(),
-      },
+            'total': total ?? list.length,
-      '0',
+          },
-    ],
+          '0',
-    [
+        ],
-      'Email/get',
+        [
-      {'accountId': 'acct1', 'state': state, 'list': list},
+          'Email/get',
-      '1',
+          {'accountId': 'acct1', 'state': state, 'list': list},
-    ],
+          '1',
-  ],
+        ],
-};
+      ],
+    };
 
 Map<String, dynamic> _emailChangesResponse({
   required String oldState,
@@ -94,38 +95,40 @@ Map<String, dynamic> _emailChangesResponse({
   List<String> created = const [],
   List<String> updated = const [],
   List<String> destroyed = const [],
-}) => {
+}) =>
-  'sessionState': 'sess1',
+    {
-  'methodResponses': [
+      'sessionState': 'sess1',
-    [
+      'methodResponses': [
-      'Email/changes',
+        [
-      {
+          'Email/changes',
-        'accountId': 'acct1',
+          {
-        'oldState': oldState,
+            'accountId': 'acct1',
-        'newState': newState,
+            'oldState': oldState,
-        'hasMoreChanges': false,
+            'newState': newState,
-        'created': created,
+            'hasMoreChanges': false,
-        'updated': updated,
+            'created': created,
-        'destroyed': destroyed,
+            'updated': updated,
-      },
+            'destroyed': destroyed,
-      '0',
+          },
-    ],
+          '0',
-  ],
+        ],
-};
+      ],
+    };
 
 Map<String, dynamic> _emailGetOnly({
   required String state,
   required List<Map<String, dynamic>> list,
-}) => {
+}) =>
-  'sessionState': 'sess1',
+    {
-  'methodResponses': [
+      'sessionState': 'sess1',
-    [
+      'methodResponses': [
-      'Email/get',
+        [
-      {'accountId': 'acct1', 'state': state, 'list': list},
+          'Email/get',
-      '1',
+          {'accountId': 'acct1', 'state': state, 'list': list},
-    ],
+          '1',
-  ],
+        ],
-};
+      ],
+    };
 
 Map<String, dynamic> _jmapEmail({
   required String id,
@@ -133,24 +136,25 @@ Map<String, dynamic> _jmapEmail({
   String subject = 'Hello',
   bool seen = false,
   String? threadId,
-}) => {
+}) =>
-  'id': id,
+    {
-  'mailboxIds': {mailboxId: true},
+      'id': id,
-  'subject': subject,
+      'mailboxIds': {mailboxId: true},
-  'sentAt': '2024-01-01T10:00:00Z',
+      'subject': subject,
-  'receivedAt': '2024-01-01T10:00:01Z',
+      'sentAt': '2024-01-01T10:00:00Z',
-  'from': [
+      'receivedAt': '2024-01-01T10:00:01Z',
-    {'name': 'Sender', 'email': 'sender@example.com'},
+      'from': [
-  ],
+        {'name': 'Sender', 'email': 'sender@example.com'},
-  'to': [
+      ],
-    {'name': 'Alice', 'email': 'alice@example.com'},
+      'to': [
-  ],
+        {'name': 'Alice', 'email': 'alice@example.com'},
-  'cc': [],
+      ],
-  'keywords': seen ? {r'$seen': true} : <String, dynamic>{},
+      'cc': [],
-  'hasAttachment': false,
+      'keywords': seen ? {r'$seen': true} : <String, dynamic>{},
-  'preview': 'Hello world',
+      'hasAttachment': false,
-  'threadId': threadId,
+      'preview': 'Hello world',
-};
+      'threadId': threadId,
+    };
 
 Future<imap.ImapClient> _noImapConnect(Account a, String u, String p) =>
     Future.error(UnsupportedError('IMAP unavailable in unit tests'));
@@ -159,7 +163,7 @@ Future<imap.SmtpClient> _noSmtpConnect(Account a, String u, String p) =>
     Future.error(UnsupportedError('SMTP unavailable in unit tests'));
 
 ({AppDatabase db, AccountRepositoryImpl accounts, EmailRepositoryImpl emails})
-_makeRepos({
+    _makeRepos({
   http.Client? httpClient,
   Future<imap.ImapClient> Function(Account, String, String)? imapConnect,
   Future<imap.SmtpClient> Function(Account, String, String)? smtpConnect,
@@ -199,9 +203,7 @@ void main() {
       final r = _makeRepos();
       await r.accounts.addAccount(_account, 'pw');
 
-      await r.db
+      await r.db.into(r.db.emails).insert(
-          .into(r.db.emails)
-          .insert(
             EmailsCompanion.insert(
               id: 'acc-1:42',
               accountId: 'acc-1',
@@ -221,9 +223,7 @@ void main() {
       final r = _makeRepos();
       await r.accounts.addAccount(_account, 'pw');
 
-      await r.db
+      await r.db.into(r.db.emails).insert(
-          .into(r.db.emails)
-          .insert(
             EmailsCompanion.insert(
               id: 'acc-1:7',
               accountId: 'acc-1',
@@ -247,9 +247,7 @@ void main() {
         (3, DateTime(2024, 3)),
         (2, DateTime(2024, 2)),
       ]) {
-        await r.db
+        await r.db.into(r.db.emails).insert(
-            .into(r.db.emails)
-            .insert(
               EmailsCompanion.insert(
                 id: 'acc-1:$uid',
                 accountId: 'acc-1',
@@ -276,9 +274,7 @@ void main() {
     test('getEmailBody propagates IMAP error when not cached', () async {
       final r = _makeRepos();
       await r.accounts.addAccount(_account, 'pw');
-      await r.db
+      await r.db.into(r.db.emails).insert(
-          .into(r.db.emails)
-          .insert(
             EmailsCompanion.insert(
               id: 'acc-1:1',
               accountId: 'acc-1',
@@ -296,9 +292,7 @@ void main() {
     test('getEmailBody returns cached body without IMAP call', () async {
       final r = _makeRepos();
       await r.accounts.addAccount(_account, 'pw');
-      await r.db
+      await r.db.into(r.db.emails).insert(
-          .into(r.db.emails)
-          .insert(
             EmailsCompanion.insert(
               id: 'acc-1:1',
               accountId: 'acc-1',
@@ -307,9 +301,7 @@ void main() {
               receivedAt: DateTime(2024),
             ),
           );
-      await r.db
+      await r.db.into(r.db.emailBodies).insert(
-          .into(r.db.emailBodies)
-          .insert(
             EmailBodiesCompanion.insert(
               emailId: 'acc-1:1',
               textBody: const Value('Hello'),
@@ -330,9 +322,7 @@ void main() {
       await r.accounts.addAccount(_account, 'pw');
 
       final now = DateTime.now();
-      await r.db
+      await r.db.into(r.db.threads).insert(
-          .into(r.db.threads)
-          .insert(
             ThreadsCompanion.insert(
               id: 'tid1',
               accountId: 'acc-1',
@@ -359,9 +349,7 @@ void main() {
       final r = _makeRepos();
       await r.accounts.addAccount(_account, 'pw');
 
-      await r.db
+      await r.db.into(r.db.emails).insert(
-          .into(r.db.emails)
-          .insert(
             EmailsCompanion.insert(
               id: 'acc-1:1',
               accountId: 'acc-1',
@@ -371,9 +359,7 @@ void main() {
               receivedAt: DateTime(2024),
             ),
           );
-      await r.db
+      await r.db.into(r.db.emails).insert(
-          .into(r.db.emails)
-          .insert(
             EmailsCompanion.insert(
               id: 'acc-1:2',
               accountId: 'acc-1',
@@ -384,9 +370,8 @@ void main() {
             ),
           );
 
-      final emails = await r.emails
+      final emails =
-          .observeEmailsInThread('acc-1', 'INBOX', 'tid1')
+          await r.emails.observeEmailsInThread('acc-1', 'INBOX', 'tid1').first;
-          .first;
       expect(emails, hasLength(2));
       expect(emails.map((e) => e.id).toSet(), {'acc-1:1', 'acc-1:2'});
     });
@@ -401,9 +386,7 @@ void main() {
         'pw',
       );
 
-      await r.db
+      await r.db.into(r.db.emails).insert(
-          .into(r.db.emails)
-          .insert(
             EmailsCompanion.insert(
               id: 'acc-1:1',
               accountId: 'acc-1',
@@ -413,9 +396,7 @@ void main() {
               receivedAt: DateTime(2024),
             ),
           );
-      await r.db
+      await r.db.into(r.db.emails).insert(
-          .into(r.db.emails)
-          .insert(
             EmailsCompanion.insert(
               id: 'acc-2:1',
               accountId: 'acc-2',
@@ -444,9 +425,7 @@ void main() {
       final r = _makeRepos();
       await r.accounts.addAccount(_account, 'pw');
 
-      await r.db
+      await r.db.into(r.db.emails).insert(
-          .into(r.db.emails)
-          .insert(
             EmailsCompanion.insert(
               id: 'acc-1:1',
               accountId: 'acc-1',
@@ -456,9 +435,7 @@ void main() {
               receivedAt: DateTime(2024),
             ),
           );
-      await r.db
+      await r.db.into(r.db.emails).insert(
-          .into(r.db.emails)
-          .insert(
             EmailsCompanion.insert(
               id: 'acc-1:2',
               accountId: 'acc-1',
@@ -486,9 +463,7 @@ void main() {
         final newer = DateTime(2024, 6);
 
         // Two emails — older one has alice@, newer one has bob@.
-        await r.db
+        await r.db.into(r.db.emails).insert(
-            .into(r.db.emails)
-            .insert(
               EmailsCompanion.insert(
                 id: 'acc-1:old',
                 accountId: 'acc-1',
@@ -500,9 +475,7 @@ void main() {
                 ),
               ),
             );
-        await r.db
+        await r.db.into(r.db.emails).insert(
-            .into(r.db.emails)
-            .insert(
               EmailsCompanion.insert(
                 id: 'acc-1:new',
                 accountId: 'acc-1',
@@ -531,9 +504,7 @@ void main() {
       () async {
         final r = _makeRepos();
         await r.accounts.addAccount(_account, 'pw');
-        await r.db
+        await r.db.into(r.db.emails).insert(
-            .into(r.db.emails)
-            .insert(
               EmailsCompanion.insert(
                 id: 'acc-1:5',
                 accountId: 'acc-1',
@@ -559,9 +530,7 @@ void main() {
       () async {
         final r = _makeRepos();
         await r.accounts.addAccount(_account, 'pw');
-        await r.db
+        await r.db.into(r.db.emails).insert(
-            .into(r.db.emails)
-            .insert(
               EmailsCompanion.insert(
                 id: 'acc-1:5',
                 accountId: 'acc-1',
@@ -585,9 +554,7 @@ void main() {
     test('setFlag flagged=true enqueues flag_flagged change', () async {
       final r = _makeRepos();
       await r.accounts.addAccount(_account, 'pw');
-      await r.db
+      await r.db.into(r.db.emails).insert(
-          .into(r.db.emails)
-          .insert(
             EmailsCompanion.insert(
               id: 'acc-1:5',
               accountId: 'acc-1',
@@ -610,9 +577,7 @@ void main() {
       () async {
         final r = _makeRepos();
         await r.accounts.addAccount(_account, 'pw');
-        await r.db
+        await r.db.into(r.db.emails).insert(
-            .into(r.db.emails)
-            .insert(
               EmailsCompanion.insert(
                 id: 'acc-1:5',
                 accountId: 'acc-1',
@@ -636,9 +601,7 @@ void main() {
       () async {
         final r = _makeRepos();
         await r.accounts.addAccount(_account, 'pw');
-        await r.db
+        await r.db.into(r.db.emails).insert(
-            .into(r.db.emails)
-            .insert(
               EmailsCompanion.insert(
                 id: 'acc-1:5',
                 accountId: 'acc-1',
@@ -665,9 +628,7 @@ void main() {
       () async {
         final r = _makeRepos();
         await r.accounts.addAccount(_account, 'pw');
-        await r.db
+        await r.db.into(r.db.emails).insert(
-            .into(r.db.emails)
-            .insert(
               EmailsCompanion.insert(
                 id: 'acc-1:5',
                 accountId: 'acc-1',
@@ -691,9 +652,7 @@ void main() {
       final r = _makeRepos();
       // _makeRepos uses _noImapConnect which throws UnsupportedError
       await r.accounts.addAccount(_account, 'pw');
-      await r.db
+      await r.db.into(r.db.pendingChanges).insert(
-          .into(r.db.pendingChanges)
-          .insert(
             PendingChangesCompanion.insert(
               accountId: 'acc-1',
               resourceType: 'Email',
@@ -714,9 +673,7 @@ void main() {
       final r = _makeRepos();
       await r.accounts.addAccount(_account, 'pw');
       // Pre-seed a flag_seen at attempts=4
-      await r.db
+      await r.db.into(r.db.pendingChanges).insert(
-          .into(r.db.pendingChanges)
-          .insert(
             PendingChangesCompanion.insert(
               accountId: _account.id,
               resourceType: 'Email',
@@ -748,9 +705,7 @@ void main() {
         final spy = SnoozeSpyImapClient();
         final r = _makeRepos(imapConnect: (_, __, ___) async => spy);
         await r.accounts.addAccount(_account, 'pw');
-        await r.db
+        await r.db.into(r.db.emails).insert(
-            .into(r.db.emails)
-            .insert(
               EmailsCompanion.insert(
                 id: 'acc-1:5',
                 accountId: 'acc-1',
@@ -759,9 +714,7 @@ void main() {
                 receivedAt: DateTime(2024),
               ),
             );
-        await r.db
+        await r.db.into(r.db.pendingChanges).insert(
-            .into(r.db.pendingChanges)
-            .insert(
               PendingChangesCompanion.insert(
                 accountId: 'acc-1',
                 resourceType: 'Email',
@@ -793,9 +746,7 @@ void main() {
     test('snoozeEmail enqueues snooze change and updates local DB', () async {
       final r = _makeRepos();
       await r.accounts.addAccount(_account, 'pw');
-      await r.db
+      await r.db.into(r.db.emails).insert(
-          .into(r.db.emails)
-          .insert(
             EmailsCompanion.insert(
               id: 'acc-1:5',
               accountId: 'acc-1',
@@ -823,9 +774,7 @@ void main() {
       final r = _makeRepos();
       await r.accounts.addAccount(_account, 'pw');
       // Seed Inbox mailbox
-      await r.db
+      await r.db.into(r.db.mailboxes).insert(
-          .into(r.db.mailboxes)
-          .insert(
             MailboxesCompanion.insert(
               id: 'acc-1:INBOX',
               accountId: 'acc-1',
@@ -836,9 +785,7 @@ void main() {
           );
 
       final past = DateTime.now().subtract(const Duration(hours: 1));
-      await r.db
+      await r.db.into(r.db.emails).insert(
-          .into(r.db.emails)
-          .insert(
             EmailsCompanion.insert(
               id: 'acc-1:5',
               accountId: 'acc-1',
@@ -867,65 +814,64 @@ void main() {
     http.Client mockBodyClient({
       String text = 'Hello from JMAP',
       String html = '<p>Hello from JMAP</p>',
-    }) => MockClient((req) async {
+    }) =>
-      if (req.url.path.contains('well-known')) {
+        MockClient((req) async {
-        return http.Response(
+          if (req.url.path.contains('well-known')) {
-          jsonEncode({
+            return http.Response(
-            'apiUrl': 'https://jmap.example.com/api/',
+              jsonEncode({
-            'accounts': {
+                'apiUrl': 'https://jmap.example.com/api/',
-              'acct1': {'name': 'alice@example.com', 'isPersonal': true},
+                'accounts': {
-            },
+                  'acct1': {'name': 'alice@example.com', 'isPersonal': true},
-            'primaryAccounts': {
+                },
-              'urn:ietf:params:jmap:core': 'acct1',
+                'primaryAccounts': {
-              'urn:ietf:params:jmap:mail': 'acct1',
+                  'urn:ietf:params:jmap:core': 'acct1',
-            },
+                  'urn:ietf:params:jmap:mail': 'acct1',
-            'capabilities': {},
+                },
-            'username': 'alice@example.com',
+                'capabilities': {},
-            'state': 'sess1',
+                'username': 'alice@example.com',
-          }),
+                'state': 'sess1',
-          200,
+              }),
-        );
+              200,
-      }
+            );
-      return http.Response(
+          }
-        jsonEncode({
+          return http.Response(
-          'sessionState': 'sess1',
+            jsonEncode({
-          'methodResponses': [
+              'sessionState': 'sess1',
-            [
+              'methodResponses': [
-              'Email/get',
+                [
-              {
+                  'Email/get',
-                'accountId': 'acct1',
-                'state': 'es1',
-                'list': [
                   {
-                    'id': 'e1',
+                    'accountId': 'acct1',
-                    'textBody': [
+                    'state': 'es1',
-                      {'partId': '1', 'type': 'text/plain'},
+                    'list': [
+                      {
+                        'id': 'e1',
+                        'textBody': [
+                          {'partId': '1', 'type': 'text/plain'},
+                        ],
+                        'htmlBody': [
+                          {'partId': '2', 'type': 'text/html'},
+                        ],
+                        'bodyValues': {
+                          '1': {'value': text, 'isTruncated': false},
+                          '2': {'value': html, 'isTruncated': false},
+                        },
+                        'attachments': [],
+                      },
                     ],
-                    'htmlBody': [
-                      {'partId': '2', 'type': 'text/html'},
-                    ],
-                    'bodyValues': {
-                      '1': {'value': text, 'isTruncated': false},
-                      '2': {'value': html, 'isTruncated': false},
-                    },
-                    'attachments': [],
                   },
+                  '0',
                 ],
-              },
+              ],
-              '0',
+            }),
-            ],
+            200,
-          ],
+          );
-        }),
+        });
-        200,
-      );
-    });
 
     test('fetches body via JMAP Email/get and caches it', () async {
       final r = _makeRepos(httpClient: mockBodyClient());
       await r.accounts.addAccount(_jmapAccount, 'pw');
-      await r.db
+      await r.db.into(r.db.emails).insert(
-          .into(r.db.emails)
-          .insert(
             EmailsCompanion.insert(
               id: 'jmap-1:e1',
               accountId: 'jmap-1',
@@ -994,9 +940,7 @@ void main() {
         }),
       );
       await r.accounts.addAccount(_jmapAccount, 'pw');
-      await r.db
+      await r.db.into(r.db.emails).insert(
-          .into(r.db.emails)
-          .insert(
             EmailsCompanion.insert(
               id: 'jmap-1:e1',
               accountId: 'jmap-1',
@@ -1075,9 +1019,7 @@ void main() {
         }),
       );
       await r.accounts.addAccount(_jmapAccount, 'pw');
-      await r.db
+      await r.db.into(r.db.emails).insert(
-          .into(r.db.emails)
-          .insert(
             EmailsCompanion.insert(
               id: 'jmap-1:e1',
               accountId: 'jmap-1',
@@ -1107,9 +1049,7 @@ void main() {
     test('mimeTree is null when bodyStructure is absent', () async {
       final r = _makeRepos(httpClient: mockBodyClient());
       await r.accounts.addAccount(_jmapAccount, 'pw');
-      await r.db
+      await r.db.into(r.db.emails).insert(
-          .into(r.db.emails)
-          .insert(
             EmailsCompanion.insert(
               id: 'jmap-1:e1',
               accountId: 'jmap-1',
@@ -1188,9 +1128,7 @@ void main() {
       await r.accounts.addAccount(_jmapAccount, 'pw');
 
       // Pre-populate
-      await r.db
+      await r.db.into(r.db.emails).insertOnConflictUpdate(
-          .into(r.db.emails)
-          .insertOnConflictUpdate(
             EmailsCompanion.insert(
               id: 'jmap-1:e1',
               accountId: 'jmap-1',
@@ -1200,9 +1138,7 @@ void main() {
               receivedAt: DateTime(2024),
             ),
           );
-      await r.db
+      await r.db.into(r.db.emails).insertOnConflictUpdate(
-          .into(r.db.emails)
-          .insertOnConflictUpdate(
             EmailsCompanion.insert(
               id: 'jmap-1:e2',
               accountId: 'jmap-1',
@@ -1212,9 +1148,7 @@ void main() {
               receivedAt: DateTime(2024),
             ),
           );
-      await r.db
+      await r.db.into(r.db.syncStates).insertOnConflictUpdate(
-          .into(r.db.syncStates)
-          .insertOnConflictUpdate(
             SyncStatesCompanion.insert(
               accountId: 'jmap-1',
               resourceType: 'Email',
@@ -1241,9 +1175,7 @@ void main() {
         ),
       );
       await r.accounts.addAccount(_jmapAccount, 'pw');
-      await r.db
+      await r.db.into(r.db.syncStates).insertOnConflictUpdate(
-          .into(r.db.syncStates)
-          .insertOnConflictUpdate(
             SyncStatesCompanion.insert(
               accountId: 'jmap-1',
               resourceType: 'Email',
@@ -1298,9 +1230,7 @@ void main() {
       AccountRepositoryImpl accounts,
     ) async {
       await accounts.addAccount(_jmapAccount, 'pw');
-      await db
+      await db.into(db.emails).insert(
-          .into(db.emails)
-          .insert(
             EmailsCompanion.insert(
               id: 'jmap-1:e1',
               accountId: 'jmap-1',
@@ -1416,9 +1346,7 @@ void main() {
       String payload = '{"seen":true}',
     }) async {
       await accounts.addAccount(_jmapAccount, 'pw');
-      await db
+      await db.into(db.pendingChanges).insert(
-          .into(db.pendingChanges)
-          .insert(
             PendingChangesCompanion.insert(
               accountId: 'jmap-1',
               resourceType: 'Email',
@@ -1532,9 +1460,7 @@ void main() {
 
       final r = _makeRepos(httpClient: client);
       await r.accounts.addAccount(_jmapAccount, 'pw');
-      await r.db
+      await r.db.into(r.db.syncStates).insertOnConflictUpdate(
-          .into(r.db.syncStates)
-          .insertOnConflictUpdate(
             SyncStatesCompanion.insert(
               accountId: 'jmap-1',
               resourceType: 'Email',
@@ -1542,9 +1468,7 @@ void main() {
               syncedAt: DateTime.now(),
             ),
           );
-      await r.db
+      await r.db.into(r.db.pendingChanges).insert(
-          .into(r.db.pendingChanges)
-          .insert(
             PendingChangesCompanion.insert(
               accountId: 'jmap-1',
               resourceType: 'Email',
@@ -1605,9 +1529,7 @@ void main() {
 
         final r = _makeRepos(httpClient: client);
         await r.accounts.addAccount(_jmapAccount, 'pw');
-        await r.db
+        await r.db.into(r.db.syncStates).insertOnConflictUpdate(
-            .into(r.db.syncStates)
-            .insertOnConflictUpdate(
               SyncStatesCompanion.insert(
                 accountId: 'jmap-1',
                 resourceType: 'Email',
@@ -1615,9 +1537,7 @@ void main() {
                 syncedAt: DateTime.now(),
               ),
             );
-        await r.db
+        await r.db.into(r.db.pendingChanges).insert(
-            .into(r.db.pendingChanges)
-            .insert(
               PendingChangesCompanion.insert(
                 accountId: 'jmap-1',
                 resourceType: 'Email',
@@ -1682,9 +1602,7 @@ void main() {
 
         final r = _makeRepos(httpClient: client);
         await r.accounts.addAccount(_jmapAccount, 'pw');
-        await r.db
+        await r.db.into(r.db.pendingChanges).insert(
-            .into(r.db.pendingChanges)
-            .insert(
               PendingChangesCompanion.insert(
                 accountId: 'jmap-1',
                 resourceType: 'Email',
@@ -1706,9 +1624,7 @@ void main() {
       final r = _makeRepos(httpClient: mockFlush(500));
       await r.accounts.addAccount(_jmapAccount, 'pw');
       // Seed a change already at attempts=4 (one below the eviction threshold)
-      await r.db
+      await r.db.into(r.db.pendingChanges).insert(
-          .into(r.db.pendingChanges)
-          .insert(
             PendingChangesCompanion.insert(
               accountId: 'jmap-1',
               resourceType: 'Email',
@@ -1813,12 +1729,10 @@ void main() {
         expect(firstCall, 'Mailbox/set');
 
         // Second call should be Email/set using the newly created mailbox ID.
-        final secondCallArgs =
+        final secondCallArgs = ((capturedBodies[1]['methodCalls'] as List).first
-            ((capturedBodies[1]['methodCalls'] as List).first as List)[1]
+            as List)[1] as Map<String, dynamic>;
-                as Map<String, dynamic>;
+        final update = (secondCallArgs['update'] as Map<String, dynamic>)['e1']
-        final update =
+            as Map<String, dynamic>;
-            (secondCallArgs['update'] as Map<String, dynamic>)['e1']
-                as Map<String, dynamic>;
         expect(update['mailboxIds/mbx-snoozed'], true);
       },
     );
@@ -1853,30 +1767,31 @@ void main() {
       required String mailboxId,
       String? textContent,
       String? htmlContent,
-    }) => {
+    }) =>
-      ..._jmapEmail(id: id, mailboxId: mailboxId),
+        {
-      'textBody': [
+          ..._jmapEmail(id: id, mailboxId: mailboxId),
-        if (textContent != null) {'partId': 'text1', 'type': 'text/plain'},
+          'textBody': [
-      ],
+            if (textContent != null) {'partId': 'text1', 'type': 'text/plain'},
-      'htmlBody': [
+          ],
-        if (htmlContent != null) {'partId': 'html1', 'type': 'text/html'},
+          'htmlBody': [
-      ],
+            if (htmlContent != null) {'partId': 'html1', 'type': 'text/html'},
-      'bodyValues': {
+          ],
-        if (textContent != null)
+          'bodyValues': {
-          'text1': {
+            if (textContent != null)
-            'value': textContent,
+              'text1': {
-            'isEncodingProblem': false,
+                'value': textContent,
-            'isTruncated': false,
+                'isEncodingProblem': false,
+                'isTruncated': false,
+              },
+            if (htmlContent != null)
+              'html1': {
+                'value': htmlContent,
+                'isEncodingProblem': false,
+                'isTruncated': false,
+              },
           },
-        if (htmlContent != null)
+          'attachments': [],
-          'html1': {
+        };
-            'value': htmlContent,
-            'isEncodingProblem': false,
-            'isTruncated': false,
-          },
-      },
-      'attachments': [],
-    };
 
     test('full sync caches bodies when bodyValues are present', () async {
       final r = _makeRepos(
@@ -2164,9 +2079,7 @@ void main() {
       final r = _makeRepos(httpClient: client);
       await r.accounts.addAccount(_jmapAccount, 'pw');
       // Seed a Sent mailbox with role='sent'
-      await r.db
+      await r.db.into(r.db.mailboxes).insert(
-          .into(r.db.mailboxes)
-          .insert(
             MailboxesCompanion.insert(
               id: 'jmap-1:sentMbx',
               accountId: 'jmap-1',
@@ -2267,9 +2180,7 @@ void main() {
       // no IMAP connection was made.
       final r = _makeRepos();
       await r.accounts.addAccount(_account, 'pw');
-      await r.db
+      await r.db.into(r.db.emails).insert(
-          .into(r.db.emails)
-          .insert(
             EmailsCompanion.insert(
               id: 'acc-1:1',
               accountId: 'acc-1',
@@ -2278,9 +2189,7 @@ void main() {
               receivedAt: DateTime(2024),
             ),
           );
-      await r.db
+      await r.db.into(r.db.emailBodies).insertOnConflictUpdate(
-          .into(r.db.emailBodies)
-          .insertOnConflictUpdate(
             EmailBodiesCompanion.insert(
               emailId: 'acc-1:1',
               textBody: const Value('cached text'),
@@ -2300,9 +2209,7 @@ void main() {
     test('observeFailedMutations emits only rows with lastError set', () async {
       final r = _makeRepos();
       await r.accounts.addAccount(_account, 'pw');
-      await r.db
+      await r.db.into(r.db.pendingChanges).insert(
-          .into(r.db.pendingChanges)
-          .insert(
             PendingChangesCompanion.insert(
               accountId: 'acc-1',
               resourceType: 'email',
@@ -2313,9 +2220,7 @@ void main() {
               lastError: const Value('network error'),
             ),
           );
-      await r.db
+      await r.db.into(r.db.pendingChanges).insert(
-          .into(r.db.pendingChanges)
-          .insert(
             PendingChangesCompanion.insert(
               accountId: 'acc-1',
               resourceType: 'email',
@@ -2338,9 +2243,7 @@ void main() {
     test('discardMutation removes the row', () async {
       final r = _makeRepos();
       await r.accounts.addAccount(_account, 'pw');
-      final rowId = await r.db
+      final rowId = await r.db.into(r.db.pendingChanges).insert(
-          .into(r.db.pendingChanges)
-          .insert(
             PendingChangesCompanion.insert(
               accountId: 'acc-1',
               resourceType: 'email',
@@ -2362,9 +2265,7 @@ void main() {
     test('retryMutation resets attempts and clears lastError', () async {
       final r = _makeRepos();
       await r.accounts.addAccount(_account, 'pw');
-      final rowId = await r.db
+      final rowId = await r.db.into(r.db.pendingChanges).insert(
-          .into(r.db.pendingChanges)
-          .insert(
             PendingChangesCompanion.insert(
               accountId: 'acc-1',
               resourceType: 'email',
@@ -2391,9 +2292,7 @@ void main() {
       () async {
         final r = _makeRepos();
         await r.accounts.addAccount(_account, 'pw');
-        await r.db
+        await r.db.into(r.db.emails).insert(
-            .into(r.db.emails)
-            .insert(
               EmailsCompanion.insert(
                 id: 'acc-1:5',
                 accountId: 'acc-1',
@@ -2412,9 +2311,8 @@ void main() {
         expect(changes, hasLength(2));
         expect(changes.map((c) => c.changeType), everyElement('move'));
 
-        final destinations = changes
+        final destinations =
-            .map((c) => (jsonDecode(c.payload) as Map)['dest'])
+            changes.map((c) => (jsonDecode(c.payload) as Map)['dest']).toSet();
-            .toSet();
         expect(destinations, containsAll(['Archive', 'Trash']));
 
         final email = await r.emails.getEmail('acc-1:5');
@@ -2467,9 +2365,7 @@ void main() {
       await r.accounts.addAccount(_account, 'pw');
 
       // Pre-seed two emails from the old server epoch (uidValidity=123).
-      await r.db
+      await r.db.into(r.db.emails).insert(
-          .into(r.db.emails)
-          .insert(
             EmailsCompanion.insert(
               id: 'acc-1:1',
               accountId: 'acc-1',
@@ -2478,9 +2374,7 @@ void main() {
               receivedAt: DateTime(2024),
             ),
           );
-      await r.db
+      await r.db.into(r.db.emails).insert(
-          .into(r.db.emails)
-          .insert(
             EmailsCompanion.insert(
               id: 'acc-1:2',
               accountId: 'acc-1',
@@ -2492,9 +2386,7 @@ void main() {
 
       // Seed an IMAP checkpoint with the old uidValidity so the code detects
       // a mismatch and triggers a full re-sync.
-      await r.db
+      await r.db.into(r.db.syncStates).insertOnConflictUpdate(
-          .into(r.db.syncStates)
-          .insertOnConflictUpdate(
             SyncStatesCompanion.insert(
               accountId: 'acc-1',
               resourceType: 'IMAP:INBOX',
@@ -2510,13 +2402,13 @@ void main() {
       expect(remaining, isEmpty);
 
       // Checkpoint must be updated to the new uidValidity.
-      final stateRow =
+      final stateRow = await (r.db.select(r.db.syncStates)
-          await (r.db.select(r.db.syncStates)..where(
+            ..where(
-                (t) =>
+              (t) =>
-                    t.accountId.equals('acc-1') &
+                  t.accountId.equals('acc-1') &
-                    t.resourceType.equals('IMAP:INBOX'),
+                  t.resourceType.equals('IMAP:INBOX'),
-              ))
+            ))
-              .getSingleOrNull();
+          .getSingleOrNull();
       expect(stateRow, isNotNull);
       final state = jsonDecode(stateRow!.state) as Map<String, dynamic>;
       expect(state['uidValidity'], 456);
@@ -2535,20 +2427,22 @@ class _FakeImapClientUidValidity extends FakeImapClient {
     String path, {
     bool enableCondStore = false,
     imap.QResyncParameters? qresync,
-  }) async => imap.Mailbox(
+  }) async =>
-    encodedName: path,
+      imap.Mailbox(
-    encodedPath: path,
+        encodedName: path,
-    flags: [],
+        encodedPath: path,
-    pathSeparator: '/',
+        flags: [],
-    uidValidity: _uidValidity,
+        pathSeparator: '/',
-  );
+        uidValidity: _uidValidity,
+      );
 
   @override
   Future<imap.SearchImapResult> uidSearchMessages({
     String searchCriteria = 'ALL',
     List<imap.ReturnOption>? returnOptions,
     Duration? responseTimeout,
-  }) async => imap.SearchImapResult();
+  }) async =>
+      imap.SearchImapResult();
 }
 
 // ── SSE test helper ──────────────────────────────────────────────────────────

test/unit/fake_imap.dart

@@ -24,11 +24,11 @@ class SnoozeSpyImapClient extends FakeImapClient {
   String? movedToMailbox;
 
   imap.Mailbox _fakeMailbox(String path) => imap.Mailbox(
-    encodedName: path,
+        encodedName: path,
-    encodedPath: path,
+        encodedPath: path,
-    pathSeparator: '/',
+        pathSeparator: '/',
-    flags: [],
+        flags: [],
-  );
+      );
 
   @override
   Future<imap.Mailbox> selectMailboxByPath(
@@ -53,7 +53,8 @@ class SnoozeSpyImapClient extends FakeImapClient {
     imap.StoreAction? action,
     bool? silent,
     int? unchangedSinceModSequence,
-  }) async => imap.StoreImapResult();
+  }) async =>
+      imap.StoreImapResult();
 
   @override
   Future<imap.GenericImapResult> uidMove(
@@ -71,7 +72,8 @@ class SnoozeSpyImapClient extends FakeImapClient {
     String? fetchContentDefinition, {
     int? changedSinceModSequence,
     Duration? responseTimeout,
-  }) async => const imap.FetchImapResult([], null);
+  }) async =>
+      const imap.FetchImapResult([], null);
 }
 
 /// Minimal fake SMTP client; only `quit` is exercised by ConnectionTestService.

test/unit/html_utils_test.dart

@@ -56,8 +56,7 @@ void main() {
     });
 
     test('real-world HTML email snippet', () {
-      const html =
+      const html = '<p>Hello <b>Alice</b>,</p>'
-          '<p>Hello <b>Alice</b>,</p>'
           '<p>Please find the invoice attached.</p>'
           '<p>Best regards,<br/>Bob</p>';
       final result = htmlToPlain(html);

test/unit/jmap_client_test.dart

@@ -11,23 +11,23 @@ const _apiUrl = 'https://jmap.example.com/api/';
 const _accountId = 'u1';
 
 Map<String, dynamic> _sessionBody({String? apiUrl, String? accountId}) => {
-  'apiUrl': apiUrl ?? _apiUrl,
+      'apiUrl': apiUrl ?? _apiUrl,
-  'accounts': {
+      'accounts': {
-    accountId ?? _accountId: {
+        accountId ?? _accountId: {
-      'name': 'alice@example.com',
+          'name': 'alice@example.com',
-      'isPersonal': true,
+          'isPersonal': true,
-      'isReadOnly': false,
+          'isReadOnly': false,
-      'accountCapabilities': {},
+          'accountCapabilities': {},
-    },
+        },
-  },
+      },
-  'primaryAccounts': {
+      'primaryAccounts': {
-    'urn:ietf:params:jmap:core': accountId ?? _accountId,
+        'urn:ietf:params:jmap:core': accountId ?? _accountId,
-    'urn:ietf:params:jmap:mail': accountId ?? _accountId,
+        'urn:ietf:params:jmap:mail': accountId ?? _accountId,
-  },
+      },
-  'capabilities': {},
+      'capabilities': {},
-  'username': 'alice@example.com',
+      'username': 'alice@example.com',
-  'state': 'st1',
+      'state': 'st1',
-};
+    };
 
 http.Client _sessionClient({
   int sessionStatus = 200,

test/unit/mailbox_repository_contract_test.dart

@@ -111,9 +111,7 @@ class _MailboxRepositoryImplContract extends MailboxRepositoryContract {
     int unread = 0,
     int total = 0,
   }) async {
-    await _db
+    await _db.into(_db.mailboxes).insert(
-        .into(_db.mailboxes)
-        .insert(
           MailboxesCompanion.insert(
             id: id,
             accountId: _account.id,

test/unit/mailbox_repository_impl_test.dart

@@ -66,16 +66,17 @@ http.Client _mockJmap({required List<Map<String, dynamic>> apiResponses}) {
 Map<String, dynamic> _mailboxGetResponse({
   required String state,
   required List<Map<String, dynamic>> list,
-}) => {
+}) =>
-  'sessionState': 'sess1',
+    {
-  'methodResponses': [
+      'sessionState': 'sess1',
-    [
+      'methodResponses': [
-      'Mailbox/get',
+        [
-      {'accountId': 'acct1', 'state': state, 'list': list},
+          'Mailbox/get',
-      '0',
+          {'accountId': 'acct1', 'state': state, 'list': list},
-    ],
+          '0',
-  ],
+        ],
-};
+      ],
+    };
 
 Map<String, dynamic> _mailboxChangesResponse({
   required String oldState,
@@ -83,24 +84,25 @@ Map<String, dynamic> _mailboxChangesResponse({
   List<String> created = const [],
   List<String> updated = const [],
   List<String> destroyed = const [],
-}) => {
+}) =>
-  'sessionState': 'sess1',
+    {
-  'methodResponses': [
+      'sessionState': 'sess1',
-    [
+      'methodResponses': [
-      'Mailbox/changes',
+        [
-      {
+          'Mailbox/changes',
-        'accountId': 'acct1',
+          {
-        'oldState': oldState,
+            'accountId': 'acct1',
-        'newState': newState,
+            'oldState': oldState,
-        'hasMoreChanges': false,
+            'newState': newState,
-        'created': created,
+            'hasMoreChanges': false,
-        'updated': updated,
+            'created': created,
-        'destroyed': destroyed,
+            'updated': updated,
-      },
+            'destroyed': destroyed,
-      '0',
+          },
-    ],
+          '0',
-  ],
+        ],
-};
+      ],
+    };
 
 Future<imap.ImapClient> _noImapConnect(Account a, String u, String p) =>
     Future.error(UnsupportedError('IMAP unavailable in unit tests'));
@@ -109,8 +111,7 @@ Future<imap.ImapClient> _noImapConnect(Account a, String u, String p) =>
   AppDatabase db,
   AccountRepositoryImpl accounts,
   MailboxRepositoryImpl mailboxes,
-})
+}) _makeRepos({http.Client? httpClient}) {
-_makeRepos({http.Client? httpClient}) {
   final db = openTestDatabase();
   final accounts = AccountRepositoryImpl(db, MapSecureStorage());
   final mailboxes = MailboxRepositoryImpl(
@@ -144,9 +145,7 @@ void main() {
         ('INBOX', 'Inbox'),
         ('Drafts', 'Drafts'),
       ]) {
-        await r.db
+        await r.db.into(r.db.mailboxes).insert(
-            .into(r.db.mailboxes)
-            .insert(
               MailboxesCompanion.insert(
                 id: 'acc-1:$path',
                 accountId: 'acc-1',
@@ -179,9 +178,7 @@ void main() {
         );
         await r.accounts.addAccount(other, 'pw2');
 
-        await r.db
+        await r.db.into(r.db.mailboxes).insert(
-            .into(r.db.mailboxes)
-            .insert(
               MailboxesCompanion.insert(
                 id: 'acc-1:INBOX',
                 accountId: 'acc-1',
@@ -189,9 +186,7 @@ void main() {
                 name: 'Inbox',
               ),
             );
-        await r.db
+        await r.db.into(r.db.mailboxes).insert(
-            .into(r.db.mailboxes)
-            .insert(
               MailboxesCompanion.insert(
                 id: 'acc-2:INBOX',
                 accountId: 'acc-2',
@@ -210,9 +205,7 @@ void main() {
       final r = _makeRepos();
       await r.accounts.addAccount(_account, 'pw');
 
-      await r.db
+      await r.db.into(r.db.mailboxes).insert(
-          .into(r.db.mailboxes)
-          .insert(
             MailboxesCompanion.insert(
               id: 'acc-1:INBOX',
               accountId: 'acc-1',
@@ -312,9 +305,7 @@ void main() {
         await r.accounts.addAccount(_jmapAccount, 'pw');
 
         // Pre-populate DB with existing mailboxes and state
-        await r.db
+        await r.db.into(r.db.mailboxes).insertOnConflictUpdate(
-            .into(r.db.mailboxes)
-            .insertOnConflictUpdate(
               MailboxesCompanion.insert(
                 id: 'jmap-1:mbx1',
                 accountId: 'jmap-1',
@@ -324,9 +315,7 @@ void main() {
                 totalCount: const Value(10),
               ),
             );
-        await r.db
+        await r.db.into(r.db.mailboxes).insertOnConflictUpdate(
-            .into(r.db.mailboxes)
-            .insertOnConflictUpdate(
               MailboxesCompanion.insert(
                 id: 'jmap-1:mbx2',
                 accountId: 'jmap-1',
@@ -334,9 +323,7 @@ void main() {
                 name: 'Sent',
               ),
             );
-        await r.db
+        await r.db.into(r.db.syncStates).insertOnConflictUpdate(
-            .into(r.db.syncStates)
-            .insertOnConflictUpdate(
               SyncStatesCompanion.insert(
                 accountId: 'jmap-1',
                 resourceType: 'Mailbox',
@@ -364,9 +351,7 @@ void main() {
           ),
         );
         await r.accounts.addAccount(_jmapAccount, 'pw');
-        await r.db
+        await r.db.into(r.db.syncStates).insertOnConflictUpdate(
-            .into(r.db.syncStates)
-            .insertOnConflictUpdate(
               SyncStatesCompanion.insert(
                 accountId: 'jmap-1',
                 resourceType: 'Mailbox',
@@ -434,9 +419,7 @@ void main() {
     test('findMailboxByRole returns matching mailbox', () async {
       final r = _makeRepos();
       await r.accounts.addAccount(_jmapAccount, 'pw');
-      await r.db
+      await r.db.into(r.db.mailboxes).insert(
-          .into(r.db.mailboxes)
-          .insert(
             MailboxesCompanion.insert(
               id: 'jmap-1:mbx-inbox',
               accountId: 'jmap-1',
@@ -569,9 +552,7 @@ void main() {
           await accounts.addAccount(_account, 'pw');
 
           // Pre-seed the DB with role='archive' (as if user created the folder).
-          await db
+          await db.into(db.mailboxes).insert(
-              .into(db.mailboxes)
-              .insert(
                 MailboxesCompanion.insert(
                   id: 'acc-1:Archive',
                   accountId: 'acc-1',
@@ -608,20 +589,22 @@ class _PlainArchiveImapClient extends SnoozeSpyImapClient {
     List<String>? mailboxPatterns,
     List<String>? selectionOptions,
     List<imap.ReturnOption>? returnOptions,
-  }) async => [
+  }) async =>
-    imap.Mailbox(
+      [
-      encodedName: 'Archive',
+        imap.Mailbox(
-      encodedPath: 'Archive',
+          encodedName: 'Archive',
-      pathSeparator: '/',
+          encodedPath: 'Archive',
-      flags: [], // No \Archive special-use flag
+          pathSeparator: '/',
-    ),
+          flags: [], // No \Archive special-use flag
-  ];
+        ),
+      ];
 
   @override
   Future<imap.Mailbox> statusMailbox(
     imap.Mailbox mailbox,
     List<imap.StatusFlags> flags,
-  ) async => mailbox;
+  ) async =>
+      mailbox;
 
   @override
   Future<dynamic> logout() async {}

test/unit/managesieve_probe_service_test.dart

@@ -27,12 +27,12 @@ class _RecordingRepo implements AccountRepository {
 ManageSieveProbeService _service(_RecordingRepo repo, {required bool result}) {
   return ManageSieveProbeService(
     repo,
-    probeFn:
+    probeFn: ({
-        ({
+      required String host,
-          required String host,
+      required int port,
-          required int port,
+      required bool useTls,
-          required bool useTls,
+    }) async =>
-        }) async => result,
+        result,
   );
 }
 
@@ -71,15 +71,14 @@ void main() {
       var probeCalled = false;
       final svc = ManageSieveProbeService(
         repo,
-        probeFn:
+        probeFn: ({
-            ({
+          required String host,
-              required String host,
+          required int port,
-              required int port,
+          required bool useTls,
-              required bool useTls,
+        }) async {
-            }) async {
+          probeCalled = true;
-              probeCalled = true;
+          return true;
-              return true;
+        },
-            },
       );
       const jmap = Account(
         id: 'acc-2',
@@ -98,15 +97,14 @@ void main() {
       var probeCalled = false;
       final svc = ManageSieveProbeService(
         repo,
-        probeFn:
+        probeFn: ({
-            ({
+          required String host,
-              required String host,
+          required int port,
-              required int port,
+          required bool useTls,
-              required bool useTls,
+        }) async {
-            }) async {
+          probeCalled = true;
-              probeCalled = true;
+          return true;
-              return true;
+        },
-            },
       );
       const blank = Account(
         id: 'acc-3',
@@ -125,17 +123,16 @@ void main() {
       bool? probedTls;
       final svc = ManageSieveProbeService(
         repo,
-        probeFn:
+        probeFn: ({
-            ({
+          required String host,
-              required String host,
+          required int port,
-              required int port,
+          required bool useTls,
-              required bool useTls,
+        }) async {
-            }) async {
+          probedHost = host;
-              probedHost = host;
+          probedPort = port;
-              probedPort = port;
+          probedTls = useTls;
-              probedTls = useTls;
+          return true;
-              return true;
+        },
-            },
       );
       const account = Account(
         id: 'acc-1',
@@ -158,15 +155,14 @@ void main() {
       String? probedHost;
       final svc = ManageSieveProbeService(
         repo,
-        probeFn:
+        probeFn: ({
-            ({
+          required String host,
-              required String host,
+          required int port,
-              required int port,
+          required bool useTls,
-              required bool useTls,
+        }) async {
-            }) async {
+          probedHost = host;
-              probedHost = host;
+          return true;
-              return true;
+        },
-            },
       );
       await svc.probe(_imapAccount);
       expect(probedHost, 'imap.example.com');

test/unit/migration_test.dart

@@ -162,9 +162,8 @@ void main() {
       final allTriggers = await db
           .customSelect("SELECT name FROM sqlite_master WHERE type='trigger'")
           .get();
-      final triggerNames = allTriggers
+      final triggerNames =
-          .map((r) => r.read<String>('name'))
+          allTriggers.map((r) => r.read<String>('name')).toSet();
-          .toSet();
       expect(
         triggerNames,
         containsAll(['email_fts_ai', 'email_fts_au', 'email_fts_ad']),
@@ -361,9 +360,8 @@ void main() {
         final allIndexes = await db
             .customSelect("SELECT name FROM sqlite_master WHERE type='index'")
             .get();
-        final indexNames = allIndexes
+        final indexNames =
-            .map((r) => r.read<String>('name'))
+            allIndexes.map((r) => r.read<String>('name')).toSet();
-            .toSet();
         expect(indexNames, contains('mailboxes_account_id'));
         expect(indexNames, contains('threads_latest_date'));
 
@@ -371,9 +369,8 @@ void main() {
         final allTriggers = await db
             .customSelect("SELECT name FROM sqlite_master WHERE type='trigger'")
             .get();
-        final triggerNames = allTriggers
+        final triggerNames =
-            .map((r) => r.read<String>('name'))
+            allTriggers.map((r) => r.read<String>('name')).toSet();
-            .toSet();
         expect(
           triggerNames,
           containsAll(['email_fts_ai', 'email_fts_au', 'email_fts_ad']),

test/unit/reliability_runner_check_now_test.dart

@@ -67,15 +67,16 @@ class _FakeMailboxes implements MailboxRepository {
     String accountId,
     String name,
     String role,
-  ) async => Mailbox(
+  ) async =>
-    id: '$accountId:$name',
+      Mailbox(
-    accountId: accountId,
+        id: '$accountId:$name',
-    path: name,
+        accountId: accountId,
-    name: name,
+        path: name,
-    role: role,
+        name: name,
-    unreadCount: 0,
+        role: role,
-    totalCount: 0,
+        unreadCount: 0,
-  );
+        totalCount: 0,
+      );
 }
 
 class _FakeEmails implements EmailRepository {
@@ -99,7 +100,8 @@ class _FakeEmails implements EmailRepository {
     String a,
     String m, {
     int limit = 50,
-  }) => Stream.value([]);
+  }) =>
+      Stream.value([]);
   @override
   Stream<List<Email>> observeEmailsInThread(String a, String m, String t) =>
       Stream.value([]);
@@ -136,7 +138,8 @@ class _FakeEmails implements EmailRepository {
     String? a,
     String q, {
     int limit = 10,
-  }) async => [];
+  }) async =>
+      [];
   @override
   Stream<List<FailedMutation>> observeFailedMutations(String a) =>
       Stream.value([]);

test/unit/reliability_runner_test.dart

@@ -13,11 +13,11 @@ import 'package:sharedinbox/core/sync/account_sync_manager.dart';
 // ── helpers ───────────────────────────────────────────────────────────────────
 
 Account _account({String id = 'a1'}) => Account(
-  id: id,
+      id: id,
-  displayName: 'Test',
+      displayName: 'Test',
-  email: 'test@example.com',
+      email: 'test@example.com',
-  imapHost: 'localhost',
+      imapHost: 'localhost',
-);
+    );
 
 class _FakeAccounts implements AccountRepository {
   final List<Account> accounts;
@@ -57,15 +57,16 @@ class _FakeMailboxes implements MailboxRepository {
     String accountId,
     String name,
     String role,
-  ) async => Mailbox(
+  ) async =>
-    id: '$accountId:$name',
+      Mailbox(
-    accountId: accountId,
+        id: '$accountId:$name',
-    path: name,
+        accountId: accountId,
-    name: name,
+        path: name,
-    role: role,
+        name: name,
-    unreadCount: 0,
+        role: role,
-    totalCount: 0,
+        unreadCount: 0,
-  );
+        totalCount: 0,
+      );
 }
 
 class _CountingEmails implements EmailRepository {
@@ -98,7 +99,8 @@ class _CountingEmails implements EmailRepository {
     String a,
     String m, {
     int limit = 50,
-  }) => Stream.value([]);
+  }) =>
+      Stream.value([]);
   @override
   Stream<List<Email>> observeEmailsInThread(String a, String m, String t) =>
       Stream.value([]);
@@ -132,7 +134,8 @@ class _CountingEmails implements EmailRepository {
     String? a,
     String q, {
     int limit = 10,
-  }) async => [];
+  }) async =>
+      [];
   @override
   Stream<List<FailedMutation>> observeFailedMutations(String a) =>
       Stream.value([]);
@@ -150,7 +153,8 @@ class _CountingEmails implements EmailRepository {
   Future<Email?> findEmailByMessageId(
     String accountId,
     String messageId,
-  ) async => null;
+  ) async =>
+      null;
   @override
   Stream<String> get onChangesQueued => const Stream.empty();
   @override
@@ -160,7 +164,8 @@ class _CountingEmails implements EmailRepository {
   Future<ReliabilityResult> verifySyncReliability(
     String accountId,
     String mailboxPath,
-  ) async => ReliabilityResult.healthy;
+  ) async =>
+      ReliabilityResult.healthy;
   @override
   Future<void> clearForResync(String accountId) async {}
   @override
@@ -372,7 +377,7 @@ void main() {
 
 class _OverrideEmails extends _CountingEmails {
   _OverrideEmails({required Future<SyncEmailsResult> Function(String) onSync})
-    : _onSync = onSync;
+      : _onSync = onSync;
 
   final Future<SyncEmailsResult> Function(String) _onSync;
 

test/unit/sync_log_repository_impl_test.dart

@@ -11,9 +11,7 @@ void main() {
   late final db = openTestDatabase();
 
   setUpAll(() async {
-    await db
+    await db.into(db.accounts).insert(
-        .into(db.accounts)
-        .insert(
           AccountsCompanion.insert(
             id: 'acc1',
             displayName: 'Test',
@@ -122,7 +120,8 @@ void main() {
 
     final rows = await (db.select(
       db.syncLogs,
-    )..where((r) => r.result.equals('error'))).get();
+    )..where((r) => r.result.equals('error')))
+        .get();
     expect(rows, hasLength(1));
     expect(rows.first.result, 'error');
     expect(rows.first.errorMessage, 'Connection refused');

test/unit/undo_logic_test.dart

@@ -48,9 +48,7 @@ void main() {
     await accounts.addAccount(account, 'password');
 
     // Setup Inbox and Trash mailboxes
-    await db
+    await db.into(db.mailboxes).insert(
-        .into(db.mailboxes)
-        .insert(
           MailboxesCompanion.insert(
             id: 'acc1:INBOX',
             accountId: 'acc1',
@@ -58,9 +56,7 @@ void main() {
             name: 'Inbox',
           ),
         );
-    await db
+    await db.into(db.mailboxes).insert(
-        .into(db.mailboxes)
-        .insert(
           MailboxesCompanion.insert(
             id: 'acc1:Trash',
             accountId: 'acc1',
@@ -71,9 +67,7 @@ void main() {
         );
 
     // Setup an email in Inbox
-    await db
+    await db.into(db.emails).insert(
-        .into(db.emails)
-        .insert(
           EmailsCompanion.insert(
             id: 'acc1:101',
             accountId: 'acc1',
@@ -100,11 +94,10 @@ void main() {
     await repo.deleteEmail(emailId);
 
     // Verify it moved from INBOX (locally deleted for IMAP move)
-    final inInbox =
+    final inInbox = await (db.select(db.emails)
-        await (db.select(db.emails)
+          ..where((t) => t.id.equals(emailId))
-              ..where((t) => t.id.equals(emailId))
+          ..where((t) => t.mailboxPath.equals('INBOX')))
-              ..where((t) => t.mailboxPath.equals('INBOX')))
+        .get();
-            .get();
     expect(inInbox, isEmpty, reason: 'Email should be gone from Inbox');
 
     // 2. Push undo action and undo
@@ -120,11 +113,10 @@ void main() {
     await container.read(undoServiceProvider.notifier).undo();
 
     // 3. Verify it is back in Inbox
-    final restored =
+    final restored = await (db.select(db.emails)
-        await (db.select(db.emails)
+          ..where((t) => t.id.equals(emailId))
-              ..where((t) => t.id.equals(emailId))
+          ..where((t) => t.mailboxPath.equals('INBOX')))
-              ..where((t) => t.mailboxPath.equals('INBOX')))
+        .get();
-            .get();
 
     expect(
       restored,
@@ -149,9 +141,7 @@ void main() {
     await accounts.addAccount(jmapAccount, 'password');
 
     // Setup Inbox and Trash mailboxes for JMAP
-    await db
+    await db.into(db.mailboxes).insert(
-        .into(db.mailboxes)
-        .insert(
           MailboxesCompanion.insert(
             id: 'jmap1:INBOX',
             accountId: 'jmap1',
@@ -160,9 +150,7 @@ void main() {
             role: const Value('inbox'),
           ),
         );
-    await db
+    await db.into(db.mailboxes).insert(
-        .into(db.mailboxes)
-        .insert(
           MailboxesCompanion.insert(
             id: 'jmap1:Trash',
             accountId: 'jmap1',
@@ -173,9 +161,7 @@ void main() {
         );
 
     // Setup an email in JMAP Inbox
-    await db
+    await db.into(db.emails).insert(
-        .into(db.emails)
-        .insert(
           EmailsCompanion.insert(
             id: emailId,
             accountId: 'jmap1',
@@ -190,11 +176,10 @@ void main() {
     await repo.deleteEmail(emailId);
 
     // Verify it moved to Trash locally (JMAP moveEmail updates mailboxPath)
-    final inTrash =
+    final inTrash = await (db.select(db.emails)
-        await (db.select(db.emails)
+          ..where((t) => t.id.equals(emailId))
-              ..where((t) => t.id.equals(emailId))
+          ..where((t) => t.mailboxPath.equals('Trash')))
-              ..where((t) => t.mailboxPath.equals('Trash')))
+        .get();
-            .get();
     expect(inTrash, isNotEmpty, reason: 'Email should be in Trash');
 
     // 2. Push undo action and undo
@@ -209,11 +194,10 @@ void main() {
     await container.read(undoServiceProvider.notifier).undo();
 
     // 3. Verify it is back in Inbox
-    final restored =
+    final restored = await (db.select(db.emails)
-        await (db.select(db.emails)
+          ..where((t) => t.id.equals(emailId))
-              ..where((t) => t.id.equals(emailId))
+          ..where((t) => t.mailboxPath.equals('INBOX')))
-              ..where((t) => t.mailboxPath.equals('INBOX')))
+        .get();
-            .get();
     expect(
       restored,
       isNotEmpty,
@@ -250,11 +234,10 @@ void main() {
       await container.read(undoServiceProvider.notifier).undo();
 
       // 4. Verify local state
-      final restored =
+      final restored = await (db.select(db.emails)
-          await (db.select(db.emails)
+            ..where((t) => t.id.equals(emailId))
-                ..where((t) => t.id.equals(emailId))
+            ..where((t) => t.mailboxPath.equals('INBOX')))
-                ..where((t) => t.mailboxPath.equals('INBOX')))
+          .get();
-              .get();
       expect(restored, isNotEmpty);
 
       // 5. Verify a NEW pending change was enqueued (Trash -> INBOX)
@@ -290,9 +273,7 @@ void main() {
       // 2. Simulate IMAP sync: the server assigned a new UID (205) in Trash.
       // The old row (acc1:101) is removed and a new row (acc1:205) is inserted.
       await (db.delete(db.emails)..where((t) => t.id.equals(oldEmailId))).go();
-      await db
+      await db.into(db.emails).insert(
-          .into(db.emails)
-          .insert(
             EmailsCompanion.insert(
               id: 'acc1:205',
               accountId: 'acc1',
@@ -325,7 +306,8 @@ void main() {
       // 4. Verify the current email row is now in INBOX.
       final inInbox = await (db.select(
         db.emails,
-      )..where((t) => t.mailboxPath.equals('INBOX'))).get();
+      )..where((t) => t.mailboxPath.equals('INBOX')))
+          .get();
       expect(
         inInbox,
         isNotEmpty,

test/widget/about_screen_test.dart

@@ -37,8 +37,7 @@ class ThrowingUrlLauncher extends Mock
   Future<bool> launchUrl(String? url, LaunchOptions? options) async {
     throw PlatformException(
       code: 'channel-error',
-      message:
+      message: 'Unable to establish connection on channel: '
-          'Unable to establish connection on channel: '
           '"dev.flutter.pigeon.url_launcher_android.UrlLauncherApi.launchUrl".',
     );
   }

test/widget/account_list_screen_test.dart

@@ -227,7 +227,8 @@ void main() {
       expect(find.textContaining('Healthy'), findsOneWidget);
     });
 
-    testWidgets('shows discrepancy details when sync health has discrepancies', (
+    testWidgets('shows discrepancy details when sync health has discrepancies',
+        (
       tester,
     ) async {
       const summary =

test/widget/email_detail_screen_test.dart

@@ -41,19 +41,20 @@ class _FakeFile extends Fake implements File {
     FileMode mode = FileMode.write,
     Encoding encoding = utf8,
     bool flush = false,
-  }) async => this;
+  }) async =>
+      this;
 }
 
 // Shared overrides for email detail tests.
 List<Override> _overrides({required EmailBody body, Email? email}) => [
-  accountRepositoryProvider.overrideWithValue(
+      accountRepositoryProvider.overrideWithValue(
-    FakeAccountRepository([kTestAccount]),
+        FakeAccountRepository([kTestAccount]),
-  ),
+      ),
-  mailboxRepositoryProvider.overrideWithValue(FakeMailboxRepository()),
+      mailboxRepositoryProvider.overrideWithValue(FakeMailboxRepository()),
-  emailRepositoryProvider.overrideWithValue(
+      emailRepositoryProvider.overrideWithValue(
-    FakeEmailRepository(emailDetail: email ?? testEmail(), emailBody: body),
+        FakeEmailRepository(emailDetail: email ?? testEmail(), emailBody: body),
-  ),
+      ),
-];
+    ];
 
 void main() {
   group('EmailDetailScreen', () {

test/widget/email_list_screen_golden_test.dart

@@ -15,42 +15,44 @@ Email _email({
   String subject = 'Hello world',
   bool isSeen = true,
   bool isFlagged = false,
-}) => Email(
+}) =>
-  id: id,
+    Email(
-  accountId: 'acc-1',
+      id: id,
-  mailboxPath: 'INBOX',
+      accountId: 'acc-1',
-  uid: int.parse(id.split(':').last),
+      mailboxPath: 'INBOX',
-  subject: subject,
+      uid: int.parse(id.split(':').last),
-  receivedAt: _kDate,
+      subject: subject,
-  sentAt: _kDate,
+      receivedAt: _kDate,
-  from: const [EmailAddress(name: 'Bob', email: 'bob@example.com')],
+      sentAt: _kDate,
-  to: const [EmailAddress(email: 'alice@example.com')],
+      from: const [EmailAddress(name: 'Bob', email: 'bob@example.com')],
-  cc: const [],
+      to: const [EmailAddress(email: 'alice@example.com')],
-  isSeen: isSeen,
+      cc: const [],
-  isFlagged: isFlagged,
+      isSeen: isSeen,
-  hasAttachment: false,
+      isFlagged: isFlagged,
-);
+      hasAttachment: false,
+    );
 
 List<Override> _overrides({
   List<Email> emails = const [],
   List<Email> searchResults = const [],
   String? syncError,
-}) => [
+}) =>
-  accountRepositoryProvider.overrideWithValue(
+    [
-    FakeAccountRepository([kTestAccount]),
+      accountRepositoryProvider.overrideWithValue(
-  ),
+        FakeAccountRepository([kTestAccount]),
-  mailboxRepositoryProvider.overrideWithValue(
+      ),
-    FakeMailboxRepository([kTestMailbox]),
+      mailboxRepositoryProvider.overrideWithValue(
-  ),
+        FakeMailboxRepository([kTestMailbox]),
-  emailRepositoryProvider.overrideWithValue(
+      ),
-    FakeEmailRepository(emails: emails, searchResults: searchResults),
+      emailRepositoryProvider.overrideWithValue(
-  ),
+        FakeEmailRepository(emails: emails, searchResults: searchResults),
-  draftRepositoryProvider.overrideWithValue(FakeDraftRepository()),
+      ),
-  searchHistoryRepositoryProvider.overrideWithValue(
+      draftRepositoryProvider.overrideWithValue(FakeDraftRepository()),
-    FakeSearchHistoryRepository(),
+      searchHistoryRepositoryProvider.overrideWithValue(
-  ),
+        FakeSearchHistoryRepository(),
-  syncLastErrorProvider.overrideWith((ref, _) => Stream.value(syncError)),
+      ),
-];
+      syncLastErrorProvider.overrideWith((ref, _) => Stream.value(syncError)),
+    ];
 
 void main() {
   group('EmailListScreen goldens', () {

test/widget/email_list_screen_test.dart

@@ -27,7 +27,8 @@ class _MutableFakeEmailRepository extends FakeEmailRepository {
     String accountId,
     String mailboxPath,
     String query,
-  ) async => _results;
+  ) async =>
+      _results;
 }
 
 final _kDate = DateTime(2024, 6);

test/widget/helpers.dart

@@ -49,7 +49,7 @@ import 'package:sharedinbox/ui/screens/user_preferences_screen.dart';
 
 class FakeAccountRepository implements AccountRepository {
   FakeAccountRepository([List<Account>? accounts])
-    : _accounts = List.of(accounts ?? []);
+      : _accounts = List.of(accounts ?? []);
 
   final List<Account> _accounts;
   bool hasPassword = true;
@@ -137,7 +137,8 @@ class FakeDraftRepository implements DraftRepository {
     final matches = _drafts.values.where((d) {
       if (replyToEmailId == null) return d.replyToEmailId == null;
       return d.replyToEmailId == replyToEmailId;
-    }).toList()..sort((a, b) => b.updatedAt.compareTo(a.updatedAt));
+    }).toList()
+      ..sort((a, b) => b.updatedAt.compareTo(a.updatedAt));
     return matches.isEmpty ? null : matches.first;
   }
 
@@ -155,7 +156,7 @@ class FakeMailboxRepository implements MailboxRepository {
   final List<Mailbox> _mailboxes;
 
   FakeMailboxRepository([List<Mailbox>? mailboxes])
-    : _mailboxes = mailboxes ?? [];
+      : _mailboxes = mailboxes ?? [];
 
   @override
   Stream<List<Mailbox>> observeMailboxes(String? accountId) =>
@@ -205,49 +206,52 @@ class FakeEmailRepository implements EmailRepository {
     EmailBody? emailBody,
     List<Email>? searchResults,
     String rawRfc822 = '',
-  }) : _emails = emails ?? [],
+  })  : _emails = emails ?? [],
-       _emailDetail = emailDetail,
+        _emailDetail = emailDetail,
-       _searchResults = searchResults ?? [],
+        _searchResults = searchResults ?? [],
-       _rawRfc822 = rawRfc822,
+        _rawRfc822 = rawRfc822,
-       _emailBody = emailBody ?? const EmailBody(emailId: '', attachments: []);
+        _emailBody = emailBody ?? const EmailBody(emailId: '', attachments: []);
 
   @override
   Stream<List<Email>> observeEmails(
     String accountId,
     String mailboxPath, {
     int limit = 50,
-  }) => Stream.value(List.of(_emails));
+  }) =>
+      Stream.value(List.of(_emails));
 
   @override
   Stream<List<EmailThread>> observeThreads(
     String accountId,
     String mailboxPath, {
     int limit = 50,
-  }) => observeEmails(accountId, mailboxPath).map((emails) {
+  }) =>
-    return emails.map((e) {
+      observeEmails(accountId, mailboxPath).map((emails) {
-      return EmailThread(
+        return emails.map((e) {
-        threadId: e.threadId ?? e.id,
+          return EmailThread(
-        subject: e.subject,
+            threadId: e.threadId ?? e.id,
-        preview: e.preview,
+            subject: e.subject,
-        participants: e.from,
+            preview: e.preview,
-        latestDate: e.sentAt ?? e.receivedAt,
+            participants: e.from,
-        messageCount: 1,
+            latestDate: e.sentAt ?? e.receivedAt,
-        hasUnread: !e.isSeen,
+            messageCount: 1,
-        isFlagged: e.isFlagged,
+            hasUnread: !e.isSeen,
-        latestEmailId: e.id,
+            isFlagged: e.isFlagged,
-        emailIds: [e.id],
+            latestEmailId: e.id,
-        accountId: e.accountId,
+            emailIds: [e.id],
-        mailboxPath: e.mailboxPath,
+            accountId: e.accountId,
-      );
+            mailboxPath: e.mailboxPath,
-    }).toList();
+          );
-  });
+        }).toList();
+      });
 
   @override
   Stream<List<Email>> observeEmailsInThread(
     String accountId,
     String mailboxPath,
     String threadId,
-  ) => Stream.value(_emails.where((e) => e.threadId == threadId).toList());
+  ) =>
+      Stream.value(_emails.where((e) => e.threadId == threadId).toList());
 
   @override
   Future<Email?> getEmail(String emailId) async => _emailDetail;
@@ -259,7 +263,8 @@ class FakeEmailRepository implements EmailRepository {
   Future<SyncEmailsResult> syncEmails(
     String accountId,
     String mailboxPath,
-  ) async => SyncEmailsResult.zero;
+  ) async =>
+      SyncEmailsResult.zero;
 
   @override
   Future<void> setFlag(String emailId, {bool? seen, bool? flagged}) async {}
@@ -285,7 +290,8 @@ class FakeEmailRepository implements EmailRepository {
   Future<Email?> findEmailByMessageId(
     String accountId,
     String messageId,
-  ) async => null;
+  ) async =>
+      null;
 
   @override
   Future<String?> deleteEmail(String emailId) async => null;
@@ -303,7 +309,8 @@ class FakeEmailRepository implements EmailRepository {
   Future<String> downloadAttachment(
     String emailId,
     EmailAttachment attachment,
-  ) async => '/tmp/${attachment.filename}';
+  ) async =>
+      '/tmp/${attachment.filename}';
 
   @override
   Future<String> fetchRawRfc822(String emailId) async => _rawRfc822;
@@ -313,26 +320,30 @@ class FakeEmailRepository implements EmailRepository {
     String accountId,
     String mailboxPath,
     String query,
-  ) async => _searchResults;
+  ) async =>
+      _searchResults;
 
   @override
   Future<List<Email>> searchEmailsGlobal(
     String? accountId,
     String query,
-  ) async => _searchResults;
+  ) async =>
+      _searchResults;
 
   @override
   Future<List<Email>> getEmailsByAddress(
     String? accountId,
     String address,
-  ) async => [];
+  ) async =>
+      [];
 
   @override
   Future<List<EmailAddress>> searchAddresses(
     String? accountId,
     String query, {
     int limit = 10,
-  }) async => [];
+  }) async =>
+      [];
 
   @override
   Stream<void> watchJmapPush(String accountId, String password) =>
@@ -342,7 +353,8 @@ class FakeEmailRepository implements EmailRepository {
   Future<ReliabilityResult> verifySyncReliability(
     String accountId,
     String mailboxPath,
-  ) async => ReliabilityResult.healthy;
+  ) async =>
+      ReliabilityResult.healthy;
 
   @override
   Stream<List<FailedMutation>> observeFailedMutations(String accountId) =>
@@ -541,26 +553,28 @@ List<Override> baseOverrides({
   ShareKeyRepository? shareKeyRepository,
   bool hasStoredPassword = true,
   SyncHealthRow? syncHealth,
-}) => [
+}) =>
-  accountRepositoryProvider.overrideWithValue(
+    [
-    FakeAccountRepository(accounts)..hasPassword = hasStoredPassword,
+      accountRepositoryProvider.overrideWithValue(
-  ),
+        FakeAccountRepository(accounts)..hasPassword = hasStoredPassword,
-  mailboxRepositoryProvider.overrideWithValue(FakeMailboxRepository(mailboxes)),
+      ),
-  emailRepositoryProvider.overrideWithValue(FakeEmailRepository()),
+      mailboxRepositoryProvider
-  draftRepositoryProvider.overrideWithValue(FakeDraftRepository()),
+          .overrideWithValue(FakeMailboxRepository(mailboxes)),
-  accountDiscoveryServiceProvider.overrideWithValue(
+      emailRepositoryProvider.overrideWithValue(FakeEmailRepository()),
-    FakeDiscoveryService(discovery ?? UnknownDiscovery()),
+      draftRepositoryProvider.overrideWithValue(FakeDraftRepository()),
-  ),
+      accountDiscoveryServiceProvider.overrideWithValue(
-  connectionTestServiceProvider.overrideWithValue(
+        FakeDiscoveryService(discovery ?? UnknownDiscovery()),
-    FakeConnectionTestService(error: connectionError),
+      ),
-  ),
+      connectionTestServiceProvider.overrideWithValue(
-  shareKeyRepositoryProvider.overrideWithValue(
+        FakeConnectionTestService(error: connectionError),
-    shareKeyRepository ?? FakeShareKeyRepository(),
+      ),
-  ),
+      shareKeyRepositoryProvider.overrideWithValue(
-  // syncHealthProvider is backed by a Drift StreamQuery; override with a
+        shareKeyRepository ?? FakeShareKeyRepository(),
-  // plain stream to avoid "A Timer is still pending" in tests.
+      ),
-  syncHealthProvider.overrideWith((ref, _) => Stream.value(syncHealth)),
+      // syncHealthProvider is backed by a Drift StreamQuery; override with a
-];
+      // plain stream to avoid "A Timer is still pending" in tests.
+      syncHealthProvider.overrideWith((ref, _) => Stream.value(syncHealth)),
+    ];
 
 // ---------------------------------------------------------------------------
 // Common test fixtures
@@ -590,22 +604,23 @@ Email testEmail({
   bool isFlagged = false,
   bool hasAttachment = false,
   String? listUnsubscribeHeader,
-}) => Email(
+}) =>
-  id: id,
+    Email(
-  accountId: 'acc-1',
+      id: id,
-  mailboxPath: 'INBOX',
+      accountId: 'acc-1',
-  uid: 42,
+      mailboxPath: 'INBOX',
-  subject: subject,
+      uid: 42,
-  receivedAt: DateTime(2024, 6),
+      subject: subject,
-  sentAt: DateTime(2024, 6),
+      receivedAt: DateTime(2024, 6),
-  from: const [EmailAddress(name: 'Bob', email: 'bob@example.com')],
+      sentAt: DateTime(2024, 6),
-  to: const [EmailAddress(email: 'alice@example.com')],
+      from: const [EmailAddress(name: 'Bob', email: 'bob@example.com')],
-  cc: const [],
+      to: const [EmailAddress(email: 'alice@example.com')],
-  isSeen: isSeen,
+      cc: const [],
-  isFlagged: isFlagged,
+      isSeen: isSeen,
-  hasAttachment: hasAttachment,
+      isFlagged: isFlagged,
-  listUnsubscribeHeader: listUnsubscribeHeader,
+      hasAttachment: hasAttachment,
-);
+      listUnsubscribeHeader: listUnsubscribeHeader,
+    );
 
 class FakeUserPreferencesRepository implements UserPreferencesRepository {
   FakeUserPreferencesRepository({
@@ -620,12 +635,12 @@ class FakeUserPreferencesRepository implements UserPreferencesRepository {
 
   @override
   Stream<UserPreferences> observePreferences() => Stream.value(
-    UserPreferences(
+        UserPreferences(
-      menuPosition: menuPosition,
+          menuPosition: menuPosition,
-      mailViewButtonPosition: mailViewButtonPosition,
+          mailViewButtonPosition: mailViewButtonPosition,
-      afterMailViewAction: afterMailViewAction,
+          afterMailViewAction: afterMailViewAction,
-    ),
+        ),
-  );
+      );
 
   @override
   Future<void> updateMenuPosition(MenuPosition position) async {

test/widget/secure_email_webview_test.dart

@@ -11,12 +11,12 @@ void _expectLightMode(String html) {
 }
 
 Widget _wrap(Widget child) => MaterialApp(
-  theme: ThemeData(
+      theme: ThemeData(
-    colorScheme: ColorScheme.fromSeed(seedColor: Colors.indigo),
+        colorScheme: ColorScheme.fromSeed(seedColor: Colors.indigo),
-    useMaterial3: true,
+        useMaterial3: true,
-  ),
+      ),
-  home: Scaffold(body: child),
+      home: Scaffold(body: child),
-);
+    );
 
 void main() {
   group('buildEmailHtml', () {
@@ -44,7 +44,8 @@ void main() {
       _expectLightMode(html);
     });
 
-    test('prevents horizontal overflow so wide HTML emails are not cut off', () {
+    test('prevents horizontal overflow so wide HTML emails are not cut off',
+        () {
       final html = buildEmailHtml(
         '<table width="600"><tr><td>x</td></tr></table>',
       );

test/widget/thread_detail_screen_test.dart

@@ -11,22 +11,23 @@ Email _threadEmail({
   String id = 'acc-1:10',
   bool isFlagged = false,
   bool isSeen = true,
-}) => Email(
+}) =>
-  id: id,
+    Email(
-  accountId: 'acc-1',
+      id: id,
-  mailboxPath: 'INBOX',
+      accountId: 'acc-1',
-  uid: 10,
+      mailboxPath: 'INBOX',
-  threadId: 'thread-1',
+      uid: 10,
-  subject: 'Project update',
+      threadId: 'thread-1',
-  receivedAt: DateTime(2024, 6),
+      subject: 'Project update',
-  sentAt: DateTime(2024, 6, 1, 9),
+      receivedAt: DateTime(2024, 6),
-  from: const [EmailAddress(name: 'Bob', email: 'bob@example.com')],
+      sentAt: DateTime(2024, 6, 1, 9),
-  to: const [EmailAddress(email: 'alice@example.com')],
+      from: const [EmailAddress(name: 'Bob', email: 'bob@example.com')],
-  cc: const [],
+      to: const [EmailAddress(email: 'alice@example.com')],
-  isSeen: isSeen,
+      cc: const [],
-  isFlagged: isFlagged,
+      isSeen: isSeen,
-  hasAttachment: false,
+      isFlagged: isFlagged,
-);
+      hasAttachment: false,
+    );
 
 void main() {
   group('ThreadDetailScreen', () {

test/widget/try_connection_button_test.dart

@@ -4,12 +4,12 @@ import 'package:flutter_test/flutter_test.dart';
 import 'package:sharedinbox/ui/widgets/try_connection_button.dart';
 
 Widget _wrap(Widget child) => MaterialApp(
-  theme: ThemeData(
+      theme: ThemeData(
-    colorScheme: ColorScheme.fromSeed(seedColor: Colors.indigo),
+        colorScheme: ColorScheme.fromSeed(seedColor: Colors.indigo),
-    useMaterial3: true,
+        useMaterial3: true,
-  ),
+      ),
-  home: Scaffold(body: child),
+      home: Scaffold(body: child),
-);
+    );
 
 void main() {
   group('TryConnectionButton', () {

test/widget/user_preferences_screen_test.dart

@@ -88,11 +88,10 @@ void main() {
       await tester.tap(find.text('Top').first);
       await tester.pumpAndSettle();
 
-      final repo =
+      final repo = ProviderScope.containerOf(
-          ProviderScope.containerOf(
+        tester.element(find.byType(UserPreferencesScreen)),
-                tester.element(find.byType(UserPreferencesScreen)),
+      ).read(userPreferencesRepositoryProvider)
-              ).read(userPreferencesRepositoryProvider)
+          as FakeUserPreferencesRepository;
-              as FakeUserPreferencesRepository;
 
       expect(repo.menuPosition, MenuPosition.top);
     });
@@ -111,11 +110,10 @@ void main() {
         await tester.tap(find.text('Top').last);
         await tester.pumpAndSettle();
 
-        final repo =
+        final repo = ProviderScope.containerOf(
-            ProviderScope.containerOf(
+          tester.element(find.byType(UserPreferencesScreen)),
-                  tester.element(find.byType(UserPreferencesScreen)),
+        ).read(userPreferencesRepositoryProvider)
-                ).read(userPreferencesRepositoryProvider)
+            as FakeUserPreferencesRepository;
-                as FakeUserPreferencesRepository;
 
         expect(repo.mailViewButtonPosition, MenuPosition.top);
       },
@@ -175,11 +173,10 @@ void main() {
       await tester.tap(find.text('Return to mailbox'));
       await tester.pumpAndSettle();
 
-      final repo =
+      final repo = ProviderScope.containerOf(
-          ProviderScope.containerOf(
+        tester.element(find.byType(UserPreferencesScreen)),
-                tester.element(find.byType(UserPreferencesScreen)),
+      ).read(userPreferencesRepositoryProvider)
-              ).read(userPreferencesRepositoryProvider)
+          as FakeUserPreferencesRepository;
-              as FakeUserPreferencesRepository;
 
       expect(repo.afterMailViewAction, AfterMailViewAction.showMailbox);
     });