From a19d2484a29a707a4aed29b525fd7e7d883d1077 Mon Sep 17 00:00:00 2001
From: mertalev <101130780+mertalev@users.noreply.github.com>
Date: Mon, 16 Feb 2026 15:23:34 -0500
Subject: [PATCH] future already completed

---
 mobile/lib/models/backup/backup_state.model.dart              | 2 +-
 mobile/lib/models/backup/manual_upload_state.model.dart       | 4 ++--
 .../widgets/action_buttons/upload_action_button.widget.dart   | 1 +
 .../lib/providers/backup/asset_upload_progress.provider.dart  | 2 +-
 mobile/lib/providers/backup/backup.provider.dart              | 1 +
 mobile/lib/providers/backup/manual_upload.provider.dart       | 1 +
 mobile/lib/services/background.service.dart                   | 1 +
 7 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/mobile/lib/models/backup/backup_state.model.dart b/mobile/lib/models/backup/backup_state.model.dart
index 1671297b88..880afcf629 100644
--- a/mobile/lib/models/backup/backup_state.model.dart
+++ b/mobile/lib/models/backup/backup_state.model.dart
@@ -79,7 +79,7 @@ class BackUpState {
     DateTime? progressInFileSpeedUpdateTime,
     int? progressInFileSpeedUpdateSentBytes,
     double? iCloudDownloadProgress,
-    Completer? cancelToken,
+    Completer<void>? cancelToken,
     ServerDiskInfo? serverInfo,
     bool? autoBackup,
     bool? backgroundBackup,
diff --git a/mobile/lib/models/backup/manual_upload_state.model.dart b/mobile/lib/models/backup/manual_upload_state.model.dart
index 183e11b526..ca6c54ff23 100644
--- a/mobile/lib/models/backup/manual_upload_state.model.dart
+++ b/mobile/lib/models/backup/manual_upload_state.model.dart
@@ -5,7 +5,7 @@ import 'package:collection/collection.dart';
 import 'package:immich_mobile/models/backup/current_upload_asset.model.dart';
 
 class ManualUploadState {
-  final Completer cancelToken;
+  final Completer<void> cancelToken;
 
   // Current Backup Asset
   final CurrentUploadAsset currentUploadAsset;
@@ -45,7 +45,7 @@ class ManualUploadState {
     List<double>? progressInFileSpeeds,
     DateTime? progressInFileSpeedUpdateTime,
     int? progressInFileSpeedUpdateSentBytes,
-    Completer? cancelToken,
+    Completer<void>? cancelToken,
     CurrentUploadAsset? currentUploadAsset,
     int? totalAssetsToUpload,
     int? successfulUploads,
diff --git a/mobile/lib/presentation/widgets/action_buttons/upload_action_button.widget.dart b/mobile/lib/presentation/widgets/action_buttons/upload_action_button.widget.dart
index 92630799a1..98eb09a4aa 100644
--- a/mobile/lib/presentation/widgets/action_buttons/upload_action_button.widget.dart
+++ b/mobile/lib/presentation/widgets/action_buttons/upload_action_button.widget.dart
@@ -102,6 +102,7 @@ class _UploadProgressDialog extends ConsumerWidget {
         ImmichTextButton(
           onPressed: () {
             ref.read(manualUploadCancelTokenProvider)?.complete();
+            ref.read(manualUploadCancelTokenProvider.notifier).state = null;
             Navigator.of(context).pop();
           },
           labelText: 'cancel'.t(context: context),
diff --git a/mobile/lib/providers/backup/asset_upload_progress.provider.dart b/mobile/lib/providers/backup/asset_upload_progress.provider.dart
index 47ccac20f2..60936ef871 100644
--- a/mobile/lib/providers/backup/asset_upload_progress.provider.dart
+++ b/mobile/lib/providers/backup/asset_upload_progress.provider.dart
@@ -31,4 +31,4 @@ final assetUploadProgressProvider = NotifierProvider<AssetUploadProgressNotifier
   AssetUploadProgressNotifier.new,
 );
 
-final manualUploadCancelTokenProvider = StateProvider<Completer?>((ref) => null);
+final manualUploadCancelTokenProvider = StateProvider<Completer<void>?>((ref) => null);
diff --git a/mobile/lib/providers/backup/backup.provider.dart b/mobile/lib/providers/backup/backup.provider.dart
index cd781b69c5..100b1a9107 100644
--- a/mobile/lib/providers/backup/backup.provider.dart
+++ b/mobile/lib/providers/backup/backup.provider.dart
@@ -497,6 +497,7 @@ class BackupNotifier extends StateNotifier<BackUpState> {
     state.cancelToken.complete();
     state = state.copyWith(
       backupProgress: BackUpProgressEnum.idle,
+      cancelToken: Completer<void>(),
       progressInPercentage: 0.0,
       progressInFileSize: "0 B / 0 B",
       progressInFileSpeed: 0,
diff --git a/mobile/lib/providers/backup/manual_upload.provider.dart b/mobile/lib/providers/backup/manual_upload.provider.dart
index 1ee7b9d349..319aa9917e 100644
--- a/mobile/lib/providers/backup/manual_upload.provider.dart
+++ b/mobile/lib/providers/backup/manual_upload.provider.dart
@@ -328,6 +328,7 @@ class ManualUploadNotifier extends StateNotifier<ManualUploadState> {
       _backupProvider.updateBackupProgress(BackUpProgressEnum.idle);
     }
     state = state.copyWith(
+      cancelToken: Completer<void>(),
       progressInPercentage: 0,
       progressInFileSize: "0 B / 0 B",
       progressInFileSpeed: 0,
diff --git a/mobile/lib/services/background.service.dart b/mobile/lib/services/background.service.dart
index 0f2961c151..0edc14664d 100644
--- a/mobile/lib/services/background.service.dart
+++ b/mobile/lib/services/background.service.dart
@@ -320,6 +320,7 @@ class BackgroundService {
       case "systemStop":
         _canceledBySystem = true;
         _cancellationToken?.complete();
+        _cancellationToken = null;
         return true;
       default:
         dPrint(() => "Unknown method ${call.method}");