fix: increase Play Store upload timeout and add retries

The httplib2 default timeout (60s) was too short for AAB uploads, causing
transient TimeoutError failures in CI. Switch to an AuthorizedHttp with
a 300s timeout and pass num_retries=3 to all .execute() calls.

Also add google-auth-httplib2 and httplib2 to the Nix devshell Python
packages so the imports resolve at runtime.

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

flake.nix

@@ -84,6 +84,8 @@
             # python3 base + Google Play API client (for scripts/deploy_playstore.py)
             (python3.withPackages (ps: with ps; [
               google-api-python-client
+              google-auth-httplib2
+              httplib2
             ]))  # used by stalwart-dev/start and deploy_playstore.py
             fgj      # Codeberg/Forgejo CLI (like gh for GitHub)
           ]);

lib/di.dart

@@ -3,7 +3,6 @@ import 'dart:async';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:http/http.dart' as http;
 import 'package:sharedinbox/core/models/account.dart' as model;
-import 'package:sharedinbox/core/models/email.dart';
 import 'package:sharedinbox/core/models/undo_action.dart';
 import 'package:sharedinbox/core/repositories/account_repository.dart';
 import 'package:sharedinbox/core/repositories/draft_repository.dart';
@@ -18,7 +17,7 @@ import 'package:sharedinbox/core/services/undo_service.dart';
 import 'package:sharedinbox/core/storage/secure_storage.dart';
 import 'package:sharedinbox/core/sync/account_sync_manager.dart';
 import 'package:sharedinbox/core/sync/reliability_runner.dart';
-import 'package:sharedinbox/data/db/database.dart' hide Email, EmailBody;
+import 'package:sharedinbox/data/db/database.dart';
 import 'package:sharedinbox/data/imap/imap_client_factory.dart';
 import 'package:sharedinbox/data/jmap/sieve_repository.dart';
 import 'package:sharedinbox/data/repositories/account_repository_impl.dart';
@@ -169,27 +168,6 @@ final undoServiceProvider =
   return service;
 });
 
-/// Loads email header + body and marks the email as seen.
-/// Owned by [EmailDetailScreen]; decouples data loading from the widget tree.
-final emailDetailProvider = AsyncNotifierProvider.autoDispose
-    .family<EmailDetailNotifier, (Email?, EmailBody), String>(
-  EmailDetailNotifier.new,
-);
-
-class EmailDetailNotifier
-    extends AutoDisposeFamilyAsyncNotifier<(Email?, EmailBody), String> {
-  @override
-  Future<(Email?, EmailBody)> build(String emailId) async {
-    final repo = ref.read(emailRepositoryProvider);
-    final results = await Future.wait([
-      repo.getEmail(emailId),
-      repo.getEmailBody(emailId),
-    ]);
-    unawaited(repo.setFlag(emailId, seen: true));
-    return (results[0] as Email?, results[1] as EmailBody);
-  }
-}
-
 final accountByIdProvider =
     StreamProvider.autoDispose.family<model.Account?, String>((ref, accountId) {
   return ref.watch(accountRepositoryProvider).observeAccounts().map(

lib/ui/screens/email_detail_screen.dart

@@ -26,130 +26,144 @@ class EmailDetailScreen extends ConsumerStatefulWidget {
 }
 
 class _EmailDetailScreenState extends ConsumerState<EmailDetailScreen> {
+  late final Future<(Email?, EmailBody)> _dataFuture;
   bool _isFlagged = false;
   bool _loadRemoteImages = false;
   final Set<String> _downloading = {};
 
+  @override
+  void initState() {
+    super.initState();
+    final repo = ref.read(emailRepositoryProvider);
+    _dataFuture = Future.wait([
+      repo.getEmail(widget.emailId),
+      repo.getEmailBody(widget.emailId),
+    ]).then((results) {
+      final email = results[0] as Email?;
+      if (email != null && mounted) {
+        setState(() => _isFlagged = email.isFlagged);
+      }
+      return (email, results[1] as EmailBody);
+    });
+    unawaited(repo.setFlag(widget.emailId, seen: true));
+  }
+
   @override
   Widget build(BuildContext context) {
     final repo = ref.watch(emailRepositoryProvider);
-    final detail = ref.watch(emailDetailProvider(widget.emailId));
+    return FutureBuilder<(Email?, EmailBody)>(
+      future: _dataFuture,
+      builder: (ctx, snap) {
+        final header = snap.data?.$1;
+        final body = snap.data?.$2;
 
-    ref.listen<AsyncValue<(Email?, EmailBody)>>(
-      emailDetailProvider(widget.emailId),
-      (_, next) {
-        final email = next.valueOrNull?.$1;
-        if (email != null && mounted) {
-          setState(() => _isFlagged = email.isFlagged);
-        }
-      },
-    );
-
-    final header = detail.valueOrNull?.$1;
-    final body = detail.valueOrNull?.$2;
-
-    return Scaffold(
-      appBar: AppBar(
-        title: Text(
-          header?.subject ?? '(loading…)',
-          overflow: TextOverflow.ellipsis,
-        ),
-        actions: [
-          IconButton(
-            icon: const Icon(Icons.reply),
-            tooltip: 'Reply',
-            onPressed: header == null
-                ? null
-                : () => _reply(context, header, body, replyAll: false),
-          ),
-          IconButton(
-            icon: const Icon(Icons.reply_all),
-            tooltip: 'Reply all',
-            onPressed: header == null
-                ? null
-                : () => _reply(context, header, body, replyAll: true),
-          ),
-          IconButton(
-            icon: const Icon(Icons.forward),
-            tooltip: 'Forward',
-            onPressed:
-                header == null ? null : () => _forward(context, header, body),
-          ),
-          IconButton(
-            icon: const Icon(Icons.mark_email_unread_outlined),
-            tooltip: 'Mark as unread',
-            onPressed: () async {
-              await repo.setFlag(widget.emailId, seen: false);
-              if (context.mounted) context.pop();
-            },
-          ),
-          IconButton(
-            icon: Icon(
-              _isFlagged ? Icons.star : Icons.star_border,
-              color: _isFlagged ? Colors.amber : null,
+        return Scaffold(
+          appBar: AppBar(
+            title: Text(
+              header?.subject ?? '(loading…)',
+              overflow: TextOverflow.ellipsis,
             ),
-            tooltip: _isFlagged ? 'Unflag' : 'Flag',
-            onPressed: () async {
-              final next = !_isFlagged;
-              await repo.setFlag(widget.emailId, flagged: next);
-              if (mounted) setState(() => _isFlagged = next);
-            },
-          ),
-          IconButton(
-            icon: const Icon(Icons.drive_file_move_outline),
-            tooltip: 'Move to folder',
-            onPressed: header == null ? null : () => _moveTo(context, header),
-          ),
-          IconButton(
-            icon: const Icon(Icons.access_time),
-            tooltip: 'Snooze',
-            onPressed: header == null ? null : () => _snooze(context, header),
-          ),
-          IconButton(
-            icon: const Icon(Icons.delete),
-            tooltip: 'Delete',
-            onPressed: () async {
-              final destPath = await repo.deleteEmail(widget.emailId);
+            actions: [
+              IconButton(
+                icon: const Icon(Icons.reply),
+                tooltip: 'Reply',
+                onPressed: header == null
+                    ? null
+                    : () => _reply(context, header, body, replyAll: false),
+              ),
+              IconButton(
+                icon: const Icon(Icons.reply_all),
+                tooltip: 'Reply all',
+                onPressed: header == null
+                    ? null
+                    : () => _reply(context, header, body, replyAll: true),
+              ),
+              IconButton(
+                icon: const Icon(Icons.forward),
+                tooltip: 'Forward',
+                onPressed: header == null
+                    ? null
+                    : () => _forward(context, header, body),
+              ),
+              IconButton(
+                icon: const Icon(Icons.mark_email_unread_outlined),
+                tooltip: 'Mark as unread',
+                onPressed: () async {
+                  await repo.setFlag(widget.emailId, seen: false);
+                  if (context.mounted) context.pop();
+                },
+              ),
+              IconButton(
+                icon: Icon(
+                  _isFlagged ? Icons.star : Icons.star_border,
+                  color: _isFlagged ? Colors.amber : null,
+                ),
+                tooltip: _isFlagged ? 'Unflag' : 'Flag',
+                onPressed: () async {
+                  final next = !_isFlagged;
+                  await repo.setFlag(widget.emailId, flagged: next);
+                  if (mounted) setState(() => _isFlagged = next);
+                },
+              ),
+              IconButton(
+                icon: const Icon(Icons.drive_file_move_outline),
+                tooltip: 'Move to folder',
+                onPressed:
+                    header == null ? null : () => _moveTo(context, header),
+              ),
+              IconButton(
+                icon: const Icon(Icons.access_time),
+                tooltip: 'Snooze',
+                onPressed:
+                    header == null ? null : () => _snooze(context, header),
+              ),
+              IconButton(
+                icon: const Icon(Icons.delete),
+                tooltip: 'Delete',
+                onPressed: () async {
+                  final destPath = await repo.deleteEmail(widget.emailId);
 
-              if (header != null) {
-                unawaited(
-                  ref.read(undoServiceProvider.notifier).pushAction(
-                        UndoAction(
-                          id: DateTime.now().toIso8601String(),
-                          accountId: header.accountId,
-                          type: UndoType.delete,
-                          emailIds: [widget.emailId],
-                          sourceMailboxPath: header.mailboxPath,
-                          destinationMailboxPath: destPath,
-                          originalEmails: [header],
-                        ),
-                      ),
-                );
-              }
+                  if (header != null) {
+                    unawaited(
+                      ref.read(undoServiceProvider.notifier).pushAction(
+                            UndoAction(
+                              id: DateTime.now().toIso8601String(),
+                              accountId: header.accountId,
+                              type: UndoType.delete,
+                              emailIds: [widget.emailId],
+                              sourceMailboxPath: header.mailboxPath,
+                              destinationMailboxPath: destPath,
+                              originalEmails: [header],
+                            ),
+                          ),
+                    );
+                  }
 
-              if (context.mounted) context.pop();
-            },
-          ),
-          PopupMenuButton<String>(
-            itemBuilder: (ctx) => [
-              const PopupMenuItem(
-                value: 'headers',
-                child: Text('Show Mail Headers'),
+                  if (context.mounted) context.pop();
+                },
+              ),
+              PopupMenuButton<String>(
+                itemBuilder: (ctx) => [
+                  const PopupMenuItem(
+                    value: 'headers',
+                    child: Text('Show Mail Headers'),
+                  ),
+                ],
+                onSelected: (value) {
+                  if (value == 'headers' && body != null) {
+                    _showHeaders(context, body);
+                  }
+                },
               ),
             ],
-            onSelected: (value) {
-              if (value == 'headers' && body != null) {
-                _showHeaders(context, body);
-              }
-            },
           ),
-        ],
-      ),
-      body: detail.when(
-        loading: () => const Center(child: CircularProgressIndicator()),
-        error: (e, _) => Center(child: Text('Error: $e')),
-        data: (d) => _buildBody(context, d.$1, d.$2),
-      ),
+          body: snap.connectionState == ConnectionState.waiting
+              ? const Center(child: CircularProgressIndicator())
+              : snap.hasError
+                  ? Center(child: Text('Error: ${snap.error}'))
+                  : _buildBody(ctx, header, body!),
+        );
+      },
     );
   }
 

scripts/deploy_playstore.py

@@ -5,6 +5,8 @@ import json
 import os
 import sys
 
+import google_auth_httplib2
+import httplib2
 from google.oauth2 import service_account
 from googleapiclient.discovery import build
 from googleapiclient.http import MediaFileUpload
@@ -12,6 +14,7 @@ from googleapiclient.http import MediaFileUpload
 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
 
 
 def main():
@@ -29,9 +32,12 @@ def main():
         scopes=["https://www.googleapis.com/auth/androidpublisher"],
     )
 
-    service = build("androidpublisher", "v3", credentials=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()
+    edit = service.edits().insert(body={}, packageName=PACKAGE_NAME).execute(num_retries=3)
     edit_id = edit["id"]
 
     media = MediaFileUpload(AAB_PATH, mimetype="application/octet-stream", resumable=True)
@@ -39,7 +45,7 @@ def main():
         service.edits()
         .bundles()
         .upload(packageName=PACKAGE_NAME, editId=edit_id, media_body=media)
-        .execute()
+        .execute(num_retries=3)
     )
     version_code = bundle["versionCode"]
     print(f"Uploaded AAB, version code: {version_code}")
@@ -49,9 +55,9 @@ def main():
         editId=edit_id,
         track=TRACK,
         body={"releases": [{"versionCodes": [version_code], "status": "completed"}]},
-    ).execute()
+    ).execute(num_retries=3)
 
-    service.edits().commit(packageName=PACKAGE_NAME, editId=edit_id).execute()
+    service.edits().commit(packageName=PACKAGE_NAME, editId=edit_id).execute(num_retries=3)
     print(f"Deployed version {version_code} to {TRACK} track")