fix(sync): ignore stale cloud-audio fetches after delete

Author: eulicesl

app/lib/pages/conversations/private_cloud_sync_page.dart

@@ -15,7 +15,16 @@ import 'package:omi/utils/l10n_extensions.dart';
 import 'package:omi/utils/logger.dart';
 
 class PrivateCloudSyncPage extends StatefulWidget {
-  const PrivateCloudSyncPage({super.key});
+  const PrivateCloudSyncPage({
+    super.key,
+    this.loadCloudAudioConversations,
+    this.deleteAllCloudAudio,
+    this.confirmDeleteOverride,
+  });
+
+  final Future<List<CloudAudioConversation>> Function()? loadCloudAudioConversations;
+  final Future<bool> Function()? deleteAllCloudAudio;
+  final Future<bool?> Function(BuildContext context)? confirmDeleteOverride;
 
   @override
   State<PrivateCloudSyncPage> createState() => _PrivateCloudSyncPageState();
@@ -30,6 +39,7 @@ class _PrivateCloudSyncPageState extends State<PrivateCloudSyncPage> {
   List<CloudAudioConversation> _conversations = [];
   bool? _lastPrivateCloudSyncEnabled;
   int _playbackGeneration = 0;
+  int _cloudAudioRequestGeneration = 0;
 
   final AudioPlayer _audioPlayer = AudioPlayer();
   StreamSubscription<PlayerState>? _playerStateSubscription;
@@ -77,10 +87,18 @@ class _PrivateCloudSyncPageState extends State<PrivateCloudSyncPage> {
     _currentPlayingConversationId = null;
     _isAudioLoading = false;
     if (clearConversations) {
+      _invalidateCloudAudioRequests(clearLoading: true);
       _conversations = [];
     }
   }
 
+  void _invalidateCloudAudioRequests({bool clearLoading = false}) {
+    _cloudAudioRequestGeneration++;
+    if (clearLoading) {
+      _isLoadingAudio = false;
+    }
+  }
+
   bool _shouldAbortPlaybackStart(String conversationId, int playbackGeneration) {
     return !mounted ||
         _isDeleting ||
@@ -98,17 +116,18 @@ class _PrivateCloudSyncPageState extends State<PrivateCloudSyncPage> {
 
   Future<void> _loadCloudAudioConversations() async {
     if (!mounted) return;
+    final requestGeneration = ++_cloudAudioRequestGeneration;
     setState(() => _isLoadingAudio = true);
     try {
-      final conversations = await getCloudAudioConversations();
-      if (!mounted) return;
+      final conversations = await (widget.loadCloudAudioConversations ?? getCloudAudioConversations)();
+      if (!mounted || requestGeneration != _cloudAudioRequestGeneration) return;
       setState(() {
         _conversations = conversations;
         _isLoadingAudio = false;
       });
     } catch (e) {
       Logger.debug('Error loading cloud audio conversations: $e');
-      if (!mounted) return;
+      if (!mounted || requestGeneration != _cloudAudioRequestGeneration) return;
       setState(() => _isLoadingAudio = false);
     }
   }
@@ -286,14 +305,17 @@ class _PrivateCloudSyncPageState extends State<PrivateCloudSyncPage> {
   }
 
   Future<void> _deleteAllAudio() async {
-    final confirmed = await _showDeleteAllDialog();
+    final confirmed = await (widget.confirmDeleteOverride?.call(context) ?? _showDeleteAllDialog());
     if (confirmed != true) return;
 
-    setState(() => _isDeleting = true);
+    setState(() {
+      _isDeleting = true;
+      _invalidateCloudAudioRequests(clearLoading: true);
+    });
     _cancelPendingPlayback();
 
     try {
-      final success = await deleteAllCloudAudio();
+      final success = await (widget.deleteAllCloudAudio ?? deleteAllCloudAudio)();
       if (!mounted) return;
       setState(() => _isDeleting = false);
       if (success) {

app/test/widgets/private_cloud_sync_page_test.dart

@@ -1,10 +1,13 @@
+import 'dart:async';
+
 import 'package:flutter/material.dart';
 import 'package:flutter_localizations/flutter_localizations.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:provider/provider.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
 import 'package:omi/backend/preferences.dart';
+import 'package:omi/backend/http/api/audio.dart';
 import 'package:omi/l10n/app_localizations.dart';
 import 'package:omi/pages/conversations/private_cloud_sync_page.dart';
 import 'package:omi/providers/user_provider.dart';
@@ -29,7 +32,13 @@ void main() {
     await SharedPreferencesUtil.init();
   });
 
-  Future<void> _pumpPage(WidgetTester tester, UserProvider userProvider) async {
+  Future<void> _pumpPage(
+    WidgetTester tester,
+    UserProvider userProvider, {
+    Future<List<CloudAudioConversation>> Function()? loadCloudAudioConversations,
+    Future<bool> Function()? deleteAllCloudAudioOverride,
+    Future<bool?> Function(BuildContext context)? confirmDeleteOverride,
+  }) async {
     await tester.pumpWidget(
       ChangeNotifierProvider<UserProvider>.value(
         value: userProvider,
@@ -41,7 +50,11 @@ void main() {
             GlobalCupertinoLocalizations.delegate,
           ],
           supportedLocales: AppLocalizations.supportedLocales,
-          home: const PrivateCloudSyncPage(),
+          home: PrivateCloudSyncPage(
+            loadCloudAudioConversations: loadCloudAudioConversations ?? getCloudAudioConversations,
+            deleteAllCloudAudio: deleteAllCloudAudioOverride ?? deleteAllCloudAudio,
+            confirmDeleteOverride: confirmDeleteOverride,
+          ),
         ),
       ),
     );
@@ -60,4 +73,39 @@ void main() {
     expect(find.text(l10n.deleteAllAudio), findsOneWidget);
     expect(find.text(l10n.noCloudAudioFiles), findsOneWidget);
   });
+
+  testWidgets('ignores stale cloud-audio fetches after delete all succeeds', (tester) async {
+    final userProvider = _StubUserProvider(enabled: true);
+    final loadCompleter = Completer<List<CloudAudioConversation>>();
+    addTearDown(userProvider.dispose);
+
+    await _pumpPage(
+      tester,
+      userProvider,
+      loadCloudAudioConversations: () => loadCompleter.future,
+      deleteAllCloudAudioOverride: () async => true,
+      confirmDeleteOverride: (_) async => true,
+    );
+
+    final context = tester.element(find.byType(PrivateCloudSyncPage));
+    final l10n = AppLocalizations.of(context);
+
+    await tester.tap(find.text(l10n.deleteAllAudio));
+    await tester.pump();
+    await tester.pump();
+
+    loadCompleter.complete([
+      CloudAudioConversation(
+        id: 'conv-1',
+        title: 'Phantom conversation',
+        audioFileCount: 1,
+        totalDuration: 42,
+      ),
+    ]);
+    await tester.pump();
+    await tester.pump();
+
+    expect(find.text('Phantom conversation'), findsNothing);
+    expect(find.text(l10n.noCloudAudioFiles), findsOneWidget);
+  });
 }