test(T3): add contract test suites for Account/Mailbox/Email repositories

Each abstract *Contract class defines the observable-state invariants of
the corresponding repository interface. The concrete *Impl is run against
the suite via a thin subclass. Future fakes or alternative impls can be
verified by subclassing the same contract.

24 new tests across 3 files.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

lib/core/repositories/email_repository.dart

@@ -27,7 +27,6 @@ abstract class EmailRepository {
   Future<EmailBody> getEmailBody(String emailId);
   Future<SyncEmailsResult> syncEmails(String accountId, String mailboxPath);
   Future<void> setFlag(String emailId, {bool? seen, bool? flagged});
-  Future<void> markAllAsRead(String accountId, String mailboxPath);
   Future<void> moveEmail(String emailId, String destMailboxPath);
 
   /// Deletes the email. Returns the path of the mailbox it was moved to

lib/core/repositories/search_history_repository.dart

@@ -1,5 +0,0 @@
-abstract interface class SearchHistoryRepository {
-  Future<List<String>> getRecentSearches();
-  Future<void> saveSearch(String query);
-  Future<void> clearHistory();
-}

lib/core/sync/account_sync_manager.dart

@@ -11,7 +11,6 @@ import 'package:sharedinbox/core/repositories/sync_log_repository.dart';
 import 'package:sharedinbox/core/utils/logger.dart';
 import 'package:sharedinbox/data/imap/imap_client_factory.dart'
     show ImapConnectFn, connectImap, verboseLogKey;
-import 'package:sharedinbox/data/imap/tls_error.dart' show isTlsConfigError;
 
 typedef OnNewMailCallback = Future<void> Function(String accountEmail);
 
@@ -292,7 +291,6 @@ class _AccountSync implements _SyncLoop {
   }
 
   bool _isPermanentError(Object e) {
-    if (isTlsConfigError(e)) return true;
     final s = e.toString().toLowerCase();
     // enough_mail doesn't always have typed exceptions for auth, so we check strings.
     return s.contains('invalid credentials') ||
@@ -530,7 +528,6 @@ class _JmapAccountSync implements _SyncLoop {
   }
 
   bool _isPermanentError(Object e) {
-    if (isTlsConfigError(e)) return true;
     final s = e.toString().toLowerCase();
     return s.contains('invalid credentials') ||
         s.contains('authentication failed') ||

lib/data/db/database.dart

@@ -234,13 +234,6 @@ class Drafts extends Table {
   TextColumn get imapServerId => text().nullable()();
 }
 
-@DataClassName('SearchHistoryRow')
-class SearchHistoryEntries extends Table {
-  IntColumn get id => integer().autoIncrement()();
-  TextColumn get query => text()();
-  DateTimeColumn get searchedAt => dateTime()();
-}
-
 @DataClassName('UndoActionRow')
 class UndoActions extends Table {
   TextColumn get id => text()();
@@ -270,14 +263,13 @@ class UndoActions extends Table {
     SyncLogMailboxes,
     SyncHealth,
     UndoActions,
-    SearchHistoryEntries,
   ],
 )
 class AppDatabase extends _$AppDatabase {
   AppDatabase([QueryExecutor? executor]) : super(executor ?? _openConnection());
 
   @override
-  int get schemaVersion => 27;
+  int get schemaVersion => 26;
 
   Future<void> _createEmailFts() async {
     await customStatement('''
@@ -500,9 +492,6 @@ class AppDatabase extends _$AppDatabase {
               SELECT rowid, subject, preview, from_json FROM emails
             ''');
           }
-          if (from < 27) {
-            await m.createTable(searchHistoryEntries);
-          }
         },
       );
 }

lib/data/imap/tls_error.dart

@@ -21,52 +21,15 @@ class TlsModeMismatchException implements Exception {
       'STARTTLS). Original error: $original';
 }
 
-/// Wraps a TLS certificate verification failure into a user-actionable message.
-///
-/// Thrown when the server's certificate cannot be verified — either because it
-/// is self-signed, expired, or the CA chain has changed since the account was
-/// set up.
-class TlsCertificateException implements Exception {
-  TlsCertificateException(this.host, this.port, this.original);
-  final String host;
-  final int port;
-  final Object original;
-
-  @override
-  String toString() =>
-      'TLS certificate error on $host:$port — the server certificate could '
-      'not be verified. The certificate may have changed or expired. '
-      'Please re-check your account settings or contact your mail provider. '
-      'Original error: $original';
-}
-
-/// Returns true if [error] is a permanent TLS configuration error that will
-/// not resolve on its own and requires user action.
-bool isTlsConfigError(Object error) =>
-    error is TlsModeMismatchException || error is TlsCertificateException;
-
-/// If [error] is a recognisable TLS handshake failure, wraps it in a typed
-/// exception and throws it.  Otherwise rethrows [error] unchanged.
-///
-/// Recognised patterns:
-/// - `WRONG_VERSION_NUMBER` → [TlsModeMismatchException] (port/mode mismatch)
-/// - `CERTIFICATE_VERIFY_FAILED` / `HandshakeException` → [TlsCertificateException]
+/// If [error] is a TLS handshake failure caused by a wrong-version-number
+/// (i.e. the server is not speaking TLS), throw a [TlsModeMismatchException]
+/// with [host]/[port] context. Otherwise rethrow [error] unchanged.
 Never rethrowAsTlsHint(Object error, StackTrace stack, String host, int port) {
-  final s = error.toString();
-  if (s.contains('WRONG_VERSION_NUMBER')) {
+  if (error.toString().contains('WRONG_VERSION_NUMBER')) {
     Error.throwWithStackTrace(
       TlsModeMismatchException(host, port, error),
       stack,
     );
   }
-  if (s.contains('CERTIFICATE_VERIFY_FAILED') ||
-      s.contains('HandshakeException') ||
-      s.contains('CERTIFICATE_EXPIRED') ||
-      s.contains('CERTIFICATE_UNKNOWN')) {
-    Error.throwWithStackTrace(
-      TlsCertificateException(host, port, error),
-      stack,
-    );
-  }
   Error.throwWithStackTrace(error, stack);
 }

lib/data/repositories/email_repository_impl.dart

@@ -1520,63 +1520,6 @@ class EmailRepositoryImpl implements EmailRepository {
     );
   }
 
-  @override
-  Future<void> markAllAsRead(String accountId, String mailboxPath) async {
-    final account = (await _accounts.getAccount(accountId))!;
-    final unread = await (_db.select(_db.emails)
-          ..where(
-            (t) =>
-                t.accountId.equals(accountId) &
-                t.mailboxPath.equals(mailboxPath) &
-                t.isSeen.equals(false),
-          ))
-        .get();
-    if (unread.isEmpty) return;
-
-    await _db.transaction(() async {
-      for (final row in unread) {
-        if (account.type == account_model.AccountType.jmap) {
-          await _enqueueChange(
-            accountId,
-            row.id,
-            'flag_seen',
-            jsonEncode({'seen': true}),
-          );
-        } else {
-          await _enqueueChange(
-            accountId,
-            row.id,
-            'flag_seen',
-            jsonEncode({
-              'uid': row.uid,
-              'mailboxPath': row.mailboxPath,
-              'seen': true,
-            }),
-          );
-        }
-      }
-
-      // Bulk mark all unread emails in this mailbox as seen.
-      await (_db.update(_db.emails)
-            ..where(
-              (t) =>
-                  t.accountId.equals(accountId) &
-                  t.mailboxPath.equals(mailboxPath) &
-                  t.isSeen.equals(false),
-            ))
-          .write(const EmailsCompanion(isSeen: Value(true)));
-
-      // Update all threads in this mailbox to reflect no unread.
-      await (_db.update(_db.threads)
-            ..where(
-              (t) =>
-                  t.accountId.equals(accountId) &
-                  t.mailboxPath.equals(mailboxPath),
-            ))
-          .write(const ThreadsCompanion(hasUnread: Value(false)));
-    });
-  }
-
   @override
   Future<void> moveEmail(String emailId, String destMailboxPath) async {
     final row = await (_db.select(

lib/data/repositories/search_history_repository_impl.dart

@@ -1,57 +0,0 @@
-import 'package:drift/drift.dart';
-import 'package:sharedinbox/core/repositories/search_history_repository.dart';
-import 'package:sharedinbox/data/db/database.dart';
-
-class SearchHistoryRepositoryImpl implements SearchHistoryRepository {
-  SearchHistoryRepositoryImpl(this._db);
-  final AppDatabase _db;
-
-  static const _maxEntries = 10;
-
-  @override
-  Future<List<String>> getRecentSearches() async {
-    final rows = await (_db.select(_db.searchHistoryEntries)
-          ..orderBy([(t) => OrderingTerm.desc(t.searchedAt)])
-          ..limit(_maxEntries))
-        .get();
-    return rows.map((r) => r.query).toList();
-  }
-
-  @override
-  Future<void> saveSearch(String query) async {
-    final trimmed = query.trim();
-    if (trimmed.isEmpty) return;
-
-    await _db.transaction(() async {
-      // Remove existing entry for same query (deduplication).
-      await (_db.delete(_db.searchHistoryEntries)
-            ..where((t) => t.query.equals(trimmed)))
-          .go();
-
-      await _db.into(_db.searchHistoryEntries).insert(
-            SearchHistoryEntriesCompanion.insert(
-              query: trimmed,
-              searchedAt: DateTime.now(),
-            ),
-          );
-
-      // Prune to the most recent _maxEntries.
-      final keepIds = await (_db.select(_db.searchHistoryEntries)
-            ..orderBy([(t) => OrderingTerm.desc(t.searchedAt)])
-            ..limit(_maxEntries))
-          .map((r) => r.id)
-          .get();
-
-      if (keepIds.isNotEmpty) {
-        await (_db.delete(_db.searchHistoryEntries)
-              ..where((t) => t.id.isNotIn(keepIds)))
-            .go();
-      }
-    });
-  }
-
-  @override
-  Future<void> clearHistory() async {
-    await _db.delete(_db.searchHistoryEntries).go();
-  }
-}

lib/di.dart

@@ -9,7 +9,6 @@ import 'package:sharedinbox/core/repositories/account_repository.dart';
 import 'package:sharedinbox/core/repositories/draft_repository.dart';
 import 'package:sharedinbox/core/repositories/email_repository.dart';
 import 'package:sharedinbox/core/repositories/mailbox_repository.dart';
-import 'package:sharedinbox/core/repositories/search_history_repository.dart';
 import 'package:sharedinbox/core/repositories/undo_repository.dart';
 import 'package:sharedinbox/core/services/account_discovery_service.dart';
 import 'package:sharedinbox/core/services/connection_test_service.dart';
@@ -26,7 +25,6 @@ import 'package:sharedinbox/data/repositories/account_repository_impl.dart';
 import 'package:sharedinbox/data/repositories/draft_repository_impl.dart';
 import 'package:sharedinbox/data/repositories/email_repository_impl.dart';
 import 'package:sharedinbox/data/repositories/mailbox_repository_impl.dart';
-import 'package:sharedinbox/data/repositories/search_history_repository_impl.dart';
 import 'package:sharedinbox/data/repositories/sync_log_repository_impl.dart';
 import 'package:sharedinbox/data/repositories/undo_repository_impl.dart';
 import 'package:sharedinbox/data/storage/flutter_secure_storage_impl.dart';
@@ -89,11 +87,6 @@ final undoRepositoryProvider = Provider<UndoRepository>((ref) {
   return UndoRepositoryImpl(ref.watch(dbProvider));
 });
 
-final searchHistoryRepositoryProvider =
-    Provider<SearchHistoryRepository>((ref) {
-  return SearchHistoryRepositoryImpl(ref.watch(dbProvider));
-});
-
 final syncLogRepositoryProvider = Provider((ref) {
   return SyncLogRepositoryImpl(ref.watch(dbProvider));
 });

lib/ui/screens/email_detail_screen.dart

@@ -1,6 +1,5 @@
 import 'dart:async';
 
-import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_html/flutter_html.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
@@ -61,27 +60,20 @@ class _EmailDetailScreenState extends ConsumerState<EmailDetailScreen> {
             tooltip: 'Reply',
             onPressed: header == null
                 ? null
-                : () {
-                    unawaited(_reply(context, header, body, replyAll: false));
-                  },
+                : () => _reply(context, header, body, replyAll: false),
           ),
           IconButton(
             icon: const Icon(Icons.reply_all),
             tooltip: 'Reply all',
             onPressed: header == null
                 ? null
-                : () {
-                    unawaited(_reply(context, header, body, replyAll: true));
-                  },
+                : () => _reply(context, header, body, replyAll: true),
           ),
           IconButton(
             icon: const Icon(Icons.forward),
             tooltip: 'Forward',
-            onPressed: header == null
-                ? null
-                : () {
-                    unawaited(_forward(context, header, body));
-                  },
+            onPressed:
+                header == null ? null : () => _forward(context, header, body),
           ),
           IconButton(
             icon: const Icon(Icons.mark_email_unread_outlined),
@@ -271,31 +263,26 @@ class _EmailDetailScreenState extends ConsumerState<EmailDetailScreen> {
     );
   }
 
-  Future<String> _quotedBody(Email header, EmailBody? body) async {
+  String _quotedBody(Email header, EmailBody? body) {
     final date = header.sentAt != null ? _dateFmt.format(header.sentAt!) : '';
     final from =
         header.from.isNotEmpty ? header.from.first.toString() : '(unknown)';
-    final rawText = body?.textBody;
-    final text = (rawText != null && rawText.isNotEmpty)
-        ? rawText
-        : await compute(htmlToPlain, body?.htmlBody ?? '');
+    final text = body?.textBody ?? htmlToPlain(body?.htmlBody ?? '');
     final quoted = text.trim().split('\n').map((l) => '> $l').join('\n');
     return '\n\n— On $date, $from wrote:\n$quoted';
   }
 
-  Future<void> _reply(
+  void _reply(
     BuildContext context,
     Email header,
     EmailBody? body, {
     required bool replyAll,
-  }) async {
+  }) {
     final to = header.from.isNotEmpty ? header.from.first.email : '';
     final subject = (header.subject?.startsWith('Re:') ?? false)
         ? header.subject!
         : 'Re: ${header.subject ?? ''}';
     final cc = replyAll ? header.to.map((a) => a.email).join(', ') : '';
-    final quoted = await _quotedBody(header, body);
-    if (!context.mounted) return;
     unawaited(
       context.push(
         '/compose',
@@ -303,29 +290,23 @@ class _EmailDetailScreenState extends ConsumerState<EmailDetailScreen> {
           'replyToEmailId': widget.emailId,
           'prefillTo': to,
           'prefillSubject': subject,
-          'prefillBody': quoted,
+          'prefillBody': _quotedBody(header, body),
           if (cc.isNotEmpty) 'prefillCc': cc,
         },
       ),
     );
   }
 
-  Future<void> _forward(
-    BuildContext context,
-    Email header,
-    EmailBody? body,
-  ) async {
+  void _forward(BuildContext context, Email header, EmailBody? body) {
     final subject = (header.subject?.startsWith('Fwd:') ?? false)
         ? header.subject!
         : 'Fwd: ${header.subject ?? ''}';
-    final quoted = await _quotedBody(header, body);
-    if (!context.mounted) return;
     unawaited(
       context.push(
         '/compose',
         extra: {
           'prefillSubject': subject,
-          'prefillBody': quoted,
+          'prefillBody': _quotedBody(header, body),
         },
       ),
     );

lib/ui/screens/email_list_screen.dart

@@ -15,14 +15,6 @@ import 'package:sharedinbox/ui/widgets/folder_drawer.dart';
 import 'package:sharedinbox/ui/widgets/snooze_picker.dart';
 
 final _dateFmt = DateFormat('MMM d');
-// Cache formatted dates by local calendar day so DateFormat.format is called
-// at most once per unique date rather than once per list item per rebuild.
-final _formattedDates = <int, String>{};
-
-int _dayKey(DateTime dt) => dt.year * 10000 + dt.month * 100 + dt.day;
-
-String _fmtDate(DateTime dt) =>
-    _formattedDates[_dayKey(dt)] ??= _dateFmt.format(dt);
 
 class EmailListScreen extends ConsumerStatefulWidget {
   const EmailListScreen({
@@ -201,22 +193,6 @@ class _EmailListScreenState extends ConsumerState<EmailListScreen> {
                   extra: {'accountId': widget.accountId},
                 ),
               ),
-              PopupMenuButton<String>(
-                onSelected: (value) async {
-                  if (value == 'mark_all_read') {
-                    await emailRepo.markAllAsRead(
-                      widget.accountId,
-                      widget.mailboxPath,
-                    );
-                  }
-                },
-                itemBuilder: (_) => const [
-                  PopupMenuItem(
-                    value: 'mark_all_read',
-                    child: Text('Mark all as read'),
-                  ),
-                ],
-              ),
             ],
       bottom: PreferredSize(
         preferredSize: const Size.fromHeight(60),
@@ -649,7 +625,7 @@ class _EmailListScreenState extends ConsumerState<EmailListScreen> {
                 const Icon(Icons.star, color: Colors.amber, size: 16),
               const SizedBox(width: 4),
               Text(
-                _fmtDate(t.latestDate),
+                _dateFmt.format(t.latestDate),
                 style: Theme.of(ctx).textTheme.bodySmall,
               ),
             ],

lib/ui/screens/search_screen.dart

@@ -10,11 +10,6 @@ import 'package:sharedinbox/core/utils/logger.dart';
 import 'package:sharedinbox/di.dart';
 import 'package:sharedinbox/ui/widgets/email_tile.dart';
 
-final _searchHistoryProvider =
-    FutureProvider.autoDispose<List<String>>((ref) async {
-  return ref.watch(searchHistoryRepositoryProvider).getRecentSearches();
-});
-
 class SearchScreen extends ConsumerStatefulWidget {
   const SearchScreen({super.key, this.accountId});
   final String? accountId;
@@ -25,24 +20,13 @@ class SearchScreen extends ConsumerStatefulWidget {
 
 class _SearchScreenState extends ConsumerState<SearchScreen> {
   final _ctrl = TextEditingController();
-  final _focusNode = FocusNode();
   Timer? _debounce;
   _SearchResults? _results;
   bool _loading = false;
-  bool _fieldFocused = false;
-
-  @override
-  void initState() {
-    super.initState();
-    _focusNode.addListener(() {
-      if (mounted) setState(() => _fieldFocused = _focusNode.hasFocus);
-    });
-  }
 
   @override
   void dispose() {
     _ctrl.dispose();
-    _focusNode.dispose();
     _debounce?.cancel();
     super.dispose();
   }
@@ -61,12 +45,6 @@ class _SearchScreenState extends ConsumerState<SearchScreen> {
 
   Future<void> _search(String query) async {
     setState(() => _loading = true);
-    unawaited(
-      ref
-          .read(searchHistoryRepositoryProvider)
-          .saveSearch(query)
-          .then((_) => ref.invalidate(_searchHistoryProvider)),
-    );
     try {
       final emailRepo = ref.read(emailRepositoryProvider);
       final mailboxRepo = ref.read(mailboxRepositoryProvider);
@@ -134,7 +112,6 @@ class _SearchScreenState extends ConsumerState<SearchScreen> {
       appBar: AppBar(
         title: TextField(
           controller: _ctrl,
-          focusNode: _focusNode,
           autofocus: true,
           decoration: const InputDecoration(
             hintText: 'Search folders, addresses, emails…',
@@ -160,9 +137,6 @@ class _SearchScreenState extends ConsumerState<SearchScreen> {
   Widget _buildBody() {
     if (_loading) return const Center(child: CircularProgressIndicator());
     if (_results == null) {
-      if (_fieldFocused && _ctrl.text.isEmpty) {
-        return _buildHistoryPanel();
-      }
       return const Center(child: Text('Type 3+ characters to search'));
     }
     final r = _results!;
@@ -195,66 +169,6 @@ class _SearchScreenState extends ConsumerState<SearchScreen> {
       ],
     );
   }
-
-  Widget _buildHistoryPanel() {
-    final history = ref.watch(_searchHistoryProvider);
-    return history.when(
-      loading: () => const Center(child: Text('Type 3+ characters to search')),
-      error: (_, __) =>
-          const Center(child: Text('Type 3+ characters to search')),
-      data: (terms) {
-        if (terms.isEmpty) {
-          return const Center(child: Text('Type 3+ characters to search'));
-        }
-        return Column(
-          crossAxisAlignment: CrossAxisAlignment.start,
-          children: [
-            Padding(
-              padding: const EdgeInsets.fromLTRB(16, 12, 16, 4),
-              child: Row(
-                mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                children: [
-                  Text(
-                    'Recent searches',
-                    style: Theme.of(context).textTheme.labelLarge,
-                  ),
-                  TextButton(
-                    onPressed: () async {
-                      await ref
-                          .read(searchHistoryRepositoryProvider)
-                          .clearHistory();
-                      ref.invalidate(_searchHistoryProvider);
-                    },
-                    child: const Text('Clear'),
-                  ),
-                ],
-              ),
-            ),
-            Padding(
-              padding: const EdgeInsets.symmetric(horizontal: 12),
-              child: Wrap(
-                spacing: 8,
-                runSpacing: 4,
-                children: [
-                  for (final term in terms)
-                    ActionChip(
-                      label: Text(term),
-                      onPressed: () {
-                        _ctrl.text = term;
-                        _ctrl.selection = TextSelection.fromPosition(
-                          TextPosition(offset: term.length),
-                        );
-                        unawaited(_search(term));
-                      },
-                    ),
-                ],
-              ),
-            ),
-          ],
-        );
-      },
-    );
-  }
 }
 
 class _SearchResults {

plan-claude.md

@@ -43,7 +43,10 @@ Files: `lib/ui/screens/email_list_screen.dart`, `lib/core/utils/format_utils.dar
 
 ### R4 — Done: https://codeberg.org/guettli/sharedinbox/pulls/23
 
-### R5 — Done: https://codeberg.org/guettli/sharedinbox/pulls/45
+### R5 🟡 Handle TLS certificate changes gracefully
+`tls_error.dart` detects TLS errors but they bubble up as generic errors in the sync loop.
+Detect `TlsError` specifically in `_AccountSync` and show a user-facing dialog offering to re-add the account or trust the new certificate.
+Files: `lib/data/imap/tls_error.dart`, `lib/core/sync/account_sync_manager.dart`.
 
 ### R6 — Done: https://codeberg.org/guettli/sharedinbox/pulls/24
 
@@ -104,8 +107,6 @@ Files: `lib/ui/screens/email_list_screen.dart`, `lib/core/repositories/email_rep
 
 ### T2 — Done: https://codeberg.org/guettli/sharedinbox/pulls/31
 
-### T3 — Done: https://codeberg.org/guettli/sharedinbox/pulls/43
-
 ### T3 🟡 Contract tests for all Repository interfaces
 The interfaces in `core/repositories/` have no shared contract test suite. Concrete impls can silently diverge.
 Add a shared `EmailRepositoryContract` abstract test class; run it against both `EmailRepositoryImpl` and any future mock/fake. Mirror this for `MailboxRepository` and `AccountRepository`.
@@ -126,7 +127,10 @@ Files: `test/widget/email_list_screen_test.dart`.
 
 ### A2 — Done: https://codeberg.org/guettli/sharedinbox/pulls/33
 
-### A3 — Done: https://codeberg.org/guettli/sharedinbox/pulls/46
+### A3 🟡 Make AccountSyncManager testable without real IMAP connections
+`AccountSyncManager` accepts `ImapConnectFn` as a dependency but `_JmapAccountSync` constructs its HTTP client internally.
+Pass an injectable `http.Client` to `_JmapAccountSync` (already done in `EmailRepositoryImpl`; mirror the pattern here).
+Files: `lib/core/sync/account_sync_manager.dart`, `test/unit/account_sync_manager_test.dart`.
 
 ### A4 🟡 Replace raw JSON strings in DB with structured encoding
 `fromJson`, `toAddresses`, `ccJson`, `references` are stored as raw JSON strings parsed on every model conversion.

scripts/check_coverage.dart

@@ -17,7 +17,6 @@ const _noCode = {
   'lib/core/repositories/mailbox_repository.dart',
   'lib/core/repositories/sync_log_repository.dart',
   'lib/core/repositories/undo_repository.dart',
-  'lib/core/repositories/search_history_repository.dart',
   'lib/core/models/undo_action.dart',
   'lib/core/storage/secure_storage.dart',
 };
@@ -62,7 +61,6 @@ const _excluded = {
   'lib/data/repositories/mailbox_repository_impl.dart',
   'lib/data/repositories/sync_log_repository_impl.dart',
   'lib/data/repositories/undo_repository_impl.dart',
-  'lib/data/repositories/search_history_repository_impl.dart',
 };
 
 void main() {

scripts/deploy_playstore.py

@@ -4,7 +4,6 @@
 import json
 import os
 import sys
-import time
 
 import google_auth_httplib2
 import httplib2
@@ -16,14 +15,6 @@ PACKAGE_NAME = "de.sharedinbox.mua"
 AAB_PATH = "build/app/outputs/bundle/release/app-release.aab"
 TRACK = "internal"
 _TIMEOUT = 300  # seconds — AAB uploads can be large
-_MAX_UPLOAD_ATTEMPTS = 3
-
-
-def _make_service(creds):
-    authorized_http = google_auth_httplib2.AuthorizedHttp(
-        creds, http=httplib2.Http(timeout=_TIMEOUT)
-    )
-    return build("androidpublisher", "v3", http=authorized_http)
 
 
 def main():
@@ -41,43 +32,22 @@ def main():
         scopes=["https://www.googleapis.com/auth/androidpublisher"],
     )
 
-    service = _make_service(creds)
+    authorized_http = google_auth_httplib2.AuthorizedHttp(
+        creds, http=httplib2.Http(timeout=_TIMEOUT)
+    )
+    service = build("androidpublisher", "v3", http=authorized_http)
 
     edit = service.edits().insert(body={}, packageName=PACKAGE_NAME).execute(num_retries=3)
     edit_id = edit["id"]
 
-    # The resumable upload can fail with RedirectMissingLocation on transient
-    # network hiccups. Retry the upload (with a fresh MediaFileUpload each
-    # time) using exponential backoff before giving up.
-    version_code = None
-    last_exc = None
-    for attempt in range(_MAX_UPLOAD_ATTEMPTS):
-        try:
-            media = MediaFileUpload(
-                AAB_PATH, mimetype="application/octet-stream", resumable=True
-            )
-            bundle = (
-                service.edits()
-                .bundles()
-                .upload(packageName=PACKAGE_NAME, editId=edit_id, media_body=media)
-                .execute(num_retries=3)
-            )
-            version_code = bundle["versionCode"]
-            break
-        except httplib2.error.RedirectMissingLocation as exc:
-            last_exc = exc
-            if attempt < _MAX_UPLOAD_ATTEMPTS - 1:
-                delay = 10 * (2 ** attempt)
-                print(
-                    f"Upload attempt {attempt + 1} failed (redirect error), "
-                    f"retrying in {delay}s…"
-                )
-                time.sleep(delay)
-    else:
-        raise RuntimeError(
-            f"AAB upload failed after {_MAX_UPLOAD_ATTEMPTS} attempts"
-        ) from last_exc
-
+    media = MediaFileUpload(AAB_PATH, mimetype="application/octet-stream", resumable=True)
+    bundle = (
+        service.edits()
+        .bundles()
+        .upload(packageName=PACKAGE_NAME, editId=edit_id, media_body=media)
+        .execute(num_retries=3)
+    )
+    version_code = bundle["versionCode"]
     print(f"Uploaded AAB, version code: {version_code}")
 
     service.edits().tracks().update(

test/integration/account_sync_manager_test.dart

@@ -1,7 +1,5 @@
 import 'dart:async';
-import 'dart:io';
 
-import 'package:enough_mail/enough_mail.dart' as imap;
 import 'package:flutter_test/flutter_test.dart';
 import 'package:sharedinbox/core/models/account.dart';
 import 'package:sharedinbox/core/models/email.dart';
@@ -12,16 +10,8 @@ import 'package:sharedinbox/core/repositories/mailbox_repository.dart';
 import 'package:sharedinbox/core/repositories/sync_log_repository.dart';
 import 'package:sharedinbox/core/sync/account_sync_manager.dart';
 
-Future<imap.ImapClient> _fakeImapConnect(
-  Account account,
-  String username,
-  String password,
-) async =>
-    throw const SocketException('fake — no real IMAP server in tests');
-
 void main() {
-  test('AccountSyncManager schedules IMAP sync for multiple accounts',
-      () async {
+  test('AccountSyncManager schedules sync for multiple accounts', () async {
     final accounts = _FakeAccounts('pw');
     final mailboxes = _FakeMailboxes();
     final emails = _FakeEmails();
@@ -32,7 +22,6 @@ void main() {
       mailboxes,
       emails,
       syncLog: logs,
-      imapConnect: _fakeImapConnect,
     );
 
     final a1 = _account('1');
@@ -49,34 +38,6 @@ void main() {
 
     manager.dispose();
   });
-
-  test('AccountSyncManager schedules JMAP sync for multiple accounts',
-      () async {
-    final accounts = _FakeAccounts('pw');
-    final mailboxes = _FakeMailboxes();
-    final emails = _FakeEmails();
-    final logs = _FakeLogs();
-
-    final manager = AccountSyncManager(
-      accounts,
-      mailboxes,
-      emails,
-      syncLog: logs,
-    );
-
-    final a1 = _jmapAccount('1');
-    final a2 = _jmapAccount('2');
-
-    manager.start();
-    accounts.push([a1, a2]);
-
-    await Future<void>.delayed(const Duration(milliseconds: 100));
-
-    expect(emails.syncCounts['1'], greaterThanOrEqualTo(1));
-    expect(emails.syncCounts['2'], greaterThanOrEqualTo(1));
-
-    manager.dispose();
-  });
 }
 
 Account _account(String id) => Account(
@@ -91,17 +52,6 @@ Account _account(String id) => Account(
       smtpSsl: false,
     );
 
-Account _jmapAccount(String id) => Account(
-      id: id,
-      displayName: 'Account $id',
-      email: '$id@example.com',
-      type: AccountType.jmap,
-      jmapUrl: 'http://localhost:8080/.well-known/jmap',
-      smtpHost: 'localhost',
-      smtpPort: 25,
-      smtpSsl: false,
-    );
-
 class _FakeAccounts implements AccountRepository {
   _FakeAccounts(this.password);
   final String password;
@@ -190,9 +140,6 @@ class _FakeEmails implements EmailRepository {
   @override
   Future<void> setFlag(String id, {bool? seen, bool? flagged}) async {}
 
-  @override
-  Future<void> markAllAsRead(String accountId, String mailboxPath) async {}
-
   @override
   Future<void> moveEmail(String id, String dest) async {}
 

test/unit/account_sync_manager_test.dart

@@ -61,8 +61,6 @@ class FakeEmailRepository implements EmailRepository {
   @override
   Future<void> setFlag(String id, {bool? seen, bool? flagged}) async {}
   @override
-  Future<void> markAllAsRead(String accountId, String mailboxPath) async {}
-  @override
   Future<void> moveEmail(String id, String dest) async {}
 
   @override

test/unit/account_sync_manager_test.mocks.dart

@@ -215,9 +215,9 @@ class MockEmailRepository extends _i1.Mock implements _i9.EmailRepository {
 
   @override
   _i4.Stream<List<_i2.Email>> observeEmails(
-    String? accountId,
-    String? mailboxPath, {
-    int? limit = 50,
+    String accountId,
+    String mailboxPath, {
+    int limit = 50,
   }) =>
       (super.noSuchMethod(
         Invocation.method(
@@ -233,9 +233,9 @@ class MockEmailRepository extends _i1.Mock implements _i9.EmailRepository {
 
   @override
   _i4.Stream<List<_i2.EmailThread>> observeThreads(
-    String? accountId,
-    String? mailboxPath, {
-    int? limit = 50,
+    String accountId,
+    String mailboxPath, {
+    int limit = 50,
   }) =>
       (super.noSuchMethod(
         Invocation.method(
@@ -337,23 +337,6 @@ class MockEmailRepository extends _i1.Mock implements _i9.EmailRepository {
         returnValueForMissingStub: _i4.Future<void>.value(),
       ) as _i4.Future<void>);
 
-  @override
-  _i4.Future<void> markAllAsRead(
-    String? accountId,
-    String? mailboxPath,
-  ) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #markAllAsRead,
-          [
-            accountId,
-            mailboxPath,
-          ],
-        ),
-        returnValue: _i4.Future<void>.value(),
-        returnValueForMissingStub: _i4.Future<void>.value(),
-      ) as _i4.Future<void>);
-
   @override
   _i4.Future<void> moveEmail(
     String? emailId,

test/unit/email_repository_contract_test.dart

@@ -126,35 +126,6 @@ abstract class EmailRepositoryContract {
       expect(email!.isFlagged, isTrue);
     });
 
-    test('markAllAsRead marks every unread email in the mailbox', () async {
-      final repo = await makeRepo();
-      await insertEmail(
-        repo,
-        id: 'er-acc:20',
-        mailboxPath: 'INBOX',
-        isSeen: false,
-      );
-      await insertEmail(
-        repo,
-        id: 'er-acc:21',
-        mailboxPath: 'INBOX',
-        isSeen: false,
-      );
-      await insertEmail(
-        repo,
-        id: 'er-acc:22',
-        mailboxPath: 'Sent',
-        isSeen: false,
-      );
-
-      await repo.markAllAsRead(_account.id, 'INBOX');
-
-      expect((await repo.getEmail('er-acc:20'))!.isSeen, isTrue);
-      expect((await repo.getEmail('er-acc:21'))!.isSeen, isTrue);
-      // Email in a different mailbox should be untouched.
-      expect((await repo.getEmail('er-acc:22'))!.isSeen, isFalse);
-    });
-
     test('observeThreads starts empty', () async {
       final repo = await makeRepo();
       expect(

test/unit/migration_test.dart

@@ -14,7 +14,7 @@ void main() {
   group('Migration', () {
     test('schemaVersion matches expected value', () async {
       final db = AppDatabase(NativeDatabase.memory());
-      expect(db.schemaVersion, 27);
+      expect(db.schemaVersion, 26);
       await db.close();
     });
 
@@ -171,11 +171,6 @@ void main() {
       // Verify FTS table was created and is queryable.
       await db.customSelect('SELECT count(*) FROM email_fts').get();
 
-      // v27: search_history_entries table.
-      await db
-          .customSelect('SELECT count(*) FROM search_history_entries')
-          .get();
-
       await db.close();
       if (dbFile.existsSync()) dbFile.deleteSync();
     });
@@ -306,16 +301,11 @@ void main() {
       );
       await db.customSelect('SELECT count(*) FROM email_fts').get();
 
-      // v27: search_history_entries table.
-      await db
-          .customSelect('SELECT count(*) FROM search_history_entries')
-          .get();
-
       await db.close();
       if (dbFile.existsSync()) dbFile.deleteSync();
     });
 
-    test('fresh install creates all tables at schemaVersion 27', () async {
+    test('fresh install creates all tables at schemaVersion 26', () async {
       final db = AppDatabase(NativeDatabase.memory());
       await db.select(db.accounts).get();
 
@@ -338,7 +328,6 @@ void main() {
           'threads',
           'sync_health',
           'undo_actions',
-          'search_history_entries',
         ]),
       );
 

test/unit/reliability_runner_test.dart

@@ -103,8 +103,6 @@ class _CountingEmails implements EmailRepository {
   @override
   Future<void> setFlag(String id, {bool? seen, bool? flagged}) async {}
   @override
-  Future<void> markAllAsRead(String accountId, String mailboxPath) async {}
-  @override
   Future<void> moveEmail(String id, String dest) async {}
   @override
   Future<String?> deleteEmail(String id) async => null;

test/unit/undo_service_test.mocks.dart

@@ -75,9 +75,9 @@ class MockEmailRepository extends _i1.Mock implements _i3.EmailRepository {
 
   @override
   _i4.Stream<List<_i2.Email>> observeEmails(
-    String? accountId,
-    String? mailboxPath, {
-    int? limit = 50,
+    String accountId,
+    String mailboxPath, {
+    int limit = 50,
   }) =>
       (super.noSuchMethod(
         Invocation.method(
@@ -93,9 +93,9 @@ class MockEmailRepository extends _i1.Mock implements _i3.EmailRepository {
 
   @override
   _i4.Stream<List<_i2.EmailThread>> observeThreads(
-    String? accountId,
-    String? mailboxPath, {
-    int? limit = 50,
+    String accountId,
+    String mailboxPath, {
+    int limit = 50,
   }) =>
       (super.noSuchMethod(
         Invocation.method(
@@ -197,23 +197,6 @@ class MockEmailRepository extends _i1.Mock implements _i3.EmailRepository {
         returnValueForMissingStub: _i4.Future<void>.value(),
       ) as _i4.Future<void>);
 
-  @override
-  _i4.Future<void> markAllAsRead(
-    String? accountId,
-    String? mailboxPath,
-  ) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #markAllAsRead,
-          [
-            accountId,
-            mailboxPath,
-          ],
-        ),
-        returnValue: _i4.Future<void>.value(),
-        returnValueForMissingStub: _i4.Future<void>.value(),
-      ) as _i4.Future<void>);
-
   @override
   _i4.Future<void> moveEmail(
     String? emailId,

test/widget/helpers.dart

@@ -17,7 +17,6 @@ import 'package:sharedinbox/core/repositories/account_repository.dart';
 import 'package:sharedinbox/core/repositories/draft_repository.dart';
 import 'package:sharedinbox/core/repositories/email_repository.dart';
 import 'package:sharedinbox/core/repositories/mailbox_repository.dart';
-import 'package:sharedinbox/core/repositories/search_history_repository.dart';
 import 'package:sharedinbox/core/services/account_discovery_service.dart';
 import 'package:sharedinbox/core/services/connection_test_service.dart';
 import 'package:sharedinbox/core/services/managesieve_probe_service.dart';
@@ -214,8 +213,6 @@ class FakeEmailRepository implements EmailRepository {
 
   @override
   Future<void> setFlag(String emailId, {bool? seen, bool? flagged}) async {}
-  @override
-  Future<void> markAllAsRead(String accountId, String mailboxPath) async {}
 
   @override
   Future<void> moveEmail(String emailId, String destMailboxPath) async {}
@@ -511,20 +508,3 @@ Email testEmail({
       isFlagged: isFlagged,
       hasAttachment: hasAttachment,
     );
-
-class FakeSearchHistoryRepository implements SearchHistoryRepository {
-  final List<String> _history = [];
-
-  @override
-  Future<List<String>> getRecentSearches() async => List.unmodifiable(_history);
-
-  @override
-  Future<void> saveSearch(String query) async {
-    _history.remove(query);
-    _history.insert(0, query);
-    if (_history.length > 10) _history.removeLast();
-  }
-
-  @override
-  Future<void> clearHistory() async => _history.clear();
-}

test/widget/search_screen_test.dart

@@ -20,9 +20,6 @@ void main() {
               FakeMailboxRepository(),
             ),
             emailRepositoryProvider.overrideWithValue(FakeEmailRepository()),
-            searchHistoryRepositoryProvider.overrideWithValue(
-              FakeSearchHistoryRepository(),
-            ),
           ],
         ),
       );
@@ -45,9 +42,6 @@ void main() {
               FakeMailboxRepository(),
             ),
             emailRepositoryProvider.overrideWithValue(FakeEmailRepository()),
-            searchHistoryRepositoryProvider.overrideWithValue(
-              FakeSearchHistoryRepository(),
-            ),
           ],
         ),
       );
@@ -74,9 +68,6 @@ void main() {
               FakeMailboxRepository(),
             ),
             emailRepositoryProvider.overrideWithValue(FakeEmailRepository()),
-            searchHistoryRepositoryProvider.overrideWithValue(
-              FakeSearchHistoryRepository(),
-            ),
           ],
         ),
       );
@@ -106,9 +97,6 @@ void main() {
             emailRepositoryProvider.overrideWithValue(
               FakeEmailRepository(searchResults: [email]),
             ),
-            searchHistoryRepositoryProvider.overrideWithValue(
-              FakeSearchHistoryRepository(),
-            ),
           ],
         ),
       );
@@ -144,9 +132,6 @@ void main() {
               FakeMailboxRepository([archiveMailbox]),
             ),
             emailRepositoryProvider.overrideWithValue(FakeEmailRepository()),
-            searchHistoryRepositoryProvider.overrideWithValue(
-              FakeSearchHistoryRepository(),
-            ),
           ],
         ),
       );
@@ -177,9 +162,6 @@ void main() {
             emailRepositoryProvider.overrideWithValue(
               FakeEmailRepository(searchResults: [email]),
             ),
-            searchHistoryRepositoryProvider.overrideWithValue(
-              FakeSearchHistoryRepository(),
-            ),
           ],
         ),
       );
@@ -193,9 +175,8 @@ void main() {
       await tester.tap(find.byIcon(Icons.clear));
       await tester.pumpAndSettle();
 
-      // Results are gone; the recent-search chip for the prior query appears.
       expect(find.text('Found email'), findsNothing);
-      expect(find.text('found'), findsOneWidget);
+      expect(find.text('Type 3+ characters to search'), findsOneWidget);
     });
   });
 }