Merge branch 'main' into edit-date-time-action

mobile/lib/providers/app_life_cycle.provider.dart

@@ -19,6 +19,7 @@ import 'package:immich_mobile/providers/memory.provider.dart';
 import 'package:immich_mobile/providers/notification_permission.provider.dart';
 import 'package:immich_mobile/providers/server_info.provider.dart';
 import 'package:immich_mobile/providers/tab.provider.dart';
+import 'package:immich_mobile/providers/user.provider.dart';
 import 'package:immich_mobile/providers/websocket.provider.dart';
 import 'package:immich_mobile/services/app_settings.service.dart';
 import 'package:immich_mobile/services/background.service.dart';
@@ -110,7 +111,14 @@ class AppLifeCycleNotifier extends StateNotifier<AppLifeCycleEnum> {
               .getSetting(AppSettingsEnum.enableBackup);
 
           if (isEnableBackup) {
-            await _ref.read(driftBackupProvider.notifier).handleBackupResume();
+            final currentUser = _ref.read(currentUserProvider);
+            if (currentUser == null) {
+              return;
+            }
+
+            await _ref
+                .read(driftBackupProvider.notifier)
+                .handleBackupResume(currentUser.id);
           }
         });
       } catch (e, stackTrace) {

mobile/lib/providers/backup/drift_backup.provider.dart

@@ -329,11 +329,11 @@ class ExpBackupNotifier extends StateNotifier<DriftBackupState> {
     );
   }
 
-  Future<void> getBackupStatus() async {
+  Future<void> getBackupStatus(String userId) async {
     final [totalCount, backupCount, remainderCount] = await Future.wait([
       _backupService.getTotalCount(),
-      _backupService.getBackupCount(),
-      _backupService.getRemainderCount(),
+      _backupService.getBackupCount(userId),
+      _backupService.getRemainderCount(userId),
     ]);
 
     state = state.copyWith(
@@ -343,8 +343,8 @@ class ExpBackupNotifier extends StateNotifier<DriftBackupState> {
     );
   }
 
-  Future<void> backup() {
-    return _backupService.backup(_updateEnqueueCount);
+  Future<void> backup(String userId) {
+    return _backupService.backup(userId, _updateEnqueueCount);
   }
 
   void _updateEnqueueCount(EnqueueStatus status) {
@@ -379,11 +379,11 @@ class ExpBackupNotifier extends StateNotifier<DriftBackupState> {
     }
   }
 
-  Future<void> handleBackupResume() async {
+  Future<void> handleBackupResume(String userId) async {
     final tasks = await FileDownloader().allTasks(group: kBackupGroup);
     if (tasks.isEmpty) {
       // Start a new backup queue
-      await backup();
+      await backup(userId);
     }
 
     debugPrint("Tasks to resume: ${tasks.length}");

mobile/lib/providers/infrastructure/action.provider.dart

@@ -5,6 +5,7 @@ import 'package:immich_mobile/providers/infrastructure/asset_viewer/current_asse
 import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
 import 'package:immich_mobile/providers/user.provider.dart';
 import 'package:immich_mobile/services/action.service.dart';
+import 'package:immich_mobile/services/drift_backup.service.dart';
 import 'package:immich_mobile/services/timeline.service.dart';
 import 'package:logging/logging.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
@@ -32,12 +33,14 @@ class ActionResult {
 class ActionNotifier extends Notifier<void> {
   final Logger _logger = Logger('ActionNotifier');
   late ActionService _service;
+  late DriftBackupService _backupService;
 
   ActionNotifier() : super();
 
   @override
   void build() {
     _service = ref.watch(actionServiceProvider);
+    _backupService = ref.watch(driftBackupServiceProvider);
   }
 
   List<String> _getRemoteIdsForSource(ActionSource source) {
@@ -390,6 +393,21 @@ class ActionNotifier extends Notifier<void> {
       );
     }
   }
+
+  Future<ActionResult> upload(ActionSource source) async {
+    final assets = _getAssets(source).whereType<LocalAsset>().toList();
+    try {
+      await _backupService.manualBackup(assets);
+      return ActionResult(count: assets.length, success: true);
+    } catch (error, stack) {
+      _logger.severe('Failed manually upload assets', error, stack);
+      return ActionResult(
+        count: assets.length,
+        success: false,
+        error: error.toString(),
+      );
+    }
+  }
 }
 
 extension on Iterable<RemoteAsset> {