use mutex

mobile/lib/domain/utils/background_sync.dart

@@ -9,8 +9,57 @@ class BackgroundSyncManager {
   Cancelable<void>? _deviceAlbumSyncTask;
   Cancelable<void>? _hashTask;
 
+  Completer<void>? _localSyncMutex;
+  Completer<void>? _remoteSyncMutex;
+  Completer<void>? _hashMutex;
+
   BackgroundSyncManager();
 
+  Future<T> _withMutex<T>(
+    Completer<void>? Function() getMutex,
+    void Function(Completer<void>?) setMutex,
+    Future<T> Function() operation,
+  ) async {
+    while (getMutex() != null) {
+      await getMutex()!.future;
+    }
+
+    final mutex = Completer<void>();
+    setMutex(mutex);
+
+    try {
+      final result = await operation();
+      return result;
+    } finally {
+      setMutex(null);
+      mutex.complete();
+    }
+  }
+
+  Future<T> _withLocalSyncMutex<T>(Future<T> Function() operation) {
+    return _withMutex(
+      () => _localSyncMutex,
+      (mutex) => _localSyncMutex = mutex,
+      operation,
+    );
+  }
+
+  Future<T> _withRemoteSyncMutex<T>(Future<T> Function() operation) {
+    return _withMutex(
+      () => _remoteSyncMutex,
+      (mutex) => _remoteSyncMutex = mutex,
+      operation,
+    );
+  }
+
+  Future<T> _withHashMutex<T>(Future<T> Function() operation) {
+    return _withMutex(
+      () => _hashMutex,
+      (mutex) => _hashMutex = mutex,
+      operation,
+    );
+  }
+
   Future<void> cancel() {
     final futures = <Future>[];
 
@@ -25,6 +74,7 @@ class BackgroundSyncManager {
 
   // No need to cancel the task, as it can also be run when the user logs out
   Future<void> syncLocal({bool full = false}) {
+    return _withLocalSyncMutex(() async {
       if (_deviceAlbumSyncTask != null) {
         return _deviceAlbumSyncTask!.future;
       }
@@ -44,10 +94,12 @@ class BackgroundSyncManager {
       return _deviceAlbumSyncTask!.whenComplete(() {
         _deviceAlbumSyncTask = null;
       });
+    });
   }
 
 // No need to cancel the task, as it can also be run when the user logs out
   Future<void> hashAssets() {
+    return _withHashMutex(() async {
       if (_hashTask != null) {
         return _hashTask!.future;
       }
@@ -58,9 +110,11 @@ class BackgroundSyncManager {
       return _hashTask!.whenComplete(() {
         _hashTask = null;
       });
+    });
   }
 
   Future<void> syncRemote() {
+    return _withRemoteSyncMutex(() async {
       if (_syncTask != null) {
         return _syncTask!.future;
       }
@@ -71,5 +125,6 @@ class BackgroundSyncManager {
       return _syncTask!.whenComplete(() {
         _syncTask = null;
       });
+    });
   }
 }

mobile/lib/widgets/common/immich_sliver_app_bar.dart

@@ -73,7 +73,10 @@ class ImmichSliverAppBar extends ConsumerWidget {
             onPressed: () => context.pop(),
           ),
           IconButton(
-            onPressed: () => ref.read(backgroundSyncProvider).syncRemote(),
+            onPressed: () {
+              ref.read(backgroundSyncProvider).syncLocal(full: true);
+              ref.read(backgroundSyncProvider).syncRemote();
+            },
             icon: const Icon(
               Icons.sync,
             ),