merge main

mobile/lib/pages/backup/backup_controller.page.dart

@@ -205,9 +205,9 @@ class BackupControllerPage extends HookConsumerWidget {
     }
 
     buildBackgroundBackupInfo() {
-      return const ListTile(
-        leading: Icon(Icons.info_outline_rounded),
-        title: Text("Background backup is currently running, cannot start manual backup"),
+      return ListTile(
+        leading: const Icon(Icons.info_outline_rounded),
+        title: Text('background_backup_running_error'.tr()),
       );
     }
 

mobile/lib/pages/backup/drift_backup.page.dart

@@ -5,15 +5,19 @@ import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/album/local_album.model.dart';
+import 'package:immich_mobile/domain/models/store.model.dart';
+import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/extensions/theme_extensions.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/presentation/widgets/backup/backup_toggle_button.widget.dart';
+import 'package:immich_mobile/providers/app_settings.provider.dart';
 import 'package:immich_mobile/providers/background_sync.provider.dart';
 import 'package:immich_mobile/providers/backup/backup_album.provider.dart';
 import 'package:immich_mobile/providers/backup/drift_backup.provider.dart';
 import 'package:immich_mobile/providers/user.provider.dart';
 import 'package:immich_mobile/routing/router.dart';
+import 'package:immich_mobile/services/app_settings.service.dart';
 import 'package:immich_mobile/widgets/backup/backup_info_card.dart';
 
 @RoutePage()
@@ -25,6 +29,8 @@ class DriftBackupPage extends ConsumerStatefulWidget {
 }
 
 class _DriftBackupPageState extends ConsumerState<DriftBackupPage> {
+  Timer? _countPoller;
+
   @override
   void initState() {
     super.initState();
@@ -33,22 +39,40 @@ class _DriftBackupPageState extends ConsumerState<DriftBackupPage> {
       return;
     }
 
+    if (ref.read(appSettingsServiceProvider).getSetting(AppSettingsEnum.enableBackup)) {
+      _startCountPolling();
+    }
+
     ref.read(driftBackupProvider.notifier).getBackupStatus(currentUser.id);
   }
 
-  Future<void> startBackup() async {
-    final currentUser = ref.read(currentUserProvider);
-    if (currentUser == null) {
-      return;
-    }
+  void _startCountPolling() {
+    _countPoller?.cancel();
+    _countPoller = Timer.periodic(const Duration(seconds: 5), (timer) async {
+      if (!mounted) {
+        timer.cancel();
+        return;
+      }
 
-    await ref.read(backgroundSyncProvider).syncRemote();
-    await ref.read(driftBackupProvider.notifier).getBackupStatus(currentUser.id);
-    await ref.read(driftBackupProvider.notifier).startBackup(currentUser.id);
+      final currentUser = ref.read(currentUserProvider);
+      if (currentUser == null) {
+        timer.cancel();
+        return;
+      }
+
+      await ref.read(driftBackupProvider.notifier).getBackupStatus(currentUser.id);
+    });
   }
 
-  Future<void> stopBackup() async {
-    await ref.read(driftBackupProvider.notifier).cancel();
+  void _stopCountPolling() {
+    _countPoller?.cancel();
+    _countPoller = null;
+  }
+
+  @override
+  void dispose() {
+    _stopCountPolling();
+    super.dispose();
   }
 
   @override
@@ -58,6 +82,26 @@ class _DriftBackupPageState extends ConsumerState<DriftBackupPage> {
         .where((album) => album.backupSelection == BackupSelection.selected)
         .toList();
 
+    final backupNotifier = ref.read(driftBackupProvider.notifier);
+    final backgroundManager = ref.read(backgroundSyncProvider);
+
+    Future<void> startBackup() async {
+      final currentUser = Store.tryGet(StoreKey.currentUser);
+      if (currentUser == null) {
+        return;
+      }
+
+      await backgroundManager.syncRemote();
+      await backupNotifier.getBackupStatus(currentUser.id);
+      await backupNotifier.startBackup(currentUser.id);
+      _startCountPolling();
+    }
+
+    Future<void> stopBackup() async {
+      await backupNotifier.cancel();
+      _stopCountPolling();
+    }
+
     return Scaffold(
       appBar: AppBar(
         elevation: 0,

mobile/lib/pages/backup/drift_backup_album_selection.page.dart

@@ -1,6 +1,7 @@
 import 'dart:io';
 
 import 'package:auto_route/auto_route.dart';
+import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/album/local_album.model.dart';
@@ -249,7 +250,7 @@ class _DriftBackupAlbumSelectionPageState extends ConsumerState<DriftBackupAlbum
                           mainAxisSize: MainAxisSize.max,
                           children: [
                             const CircularProgressIndicator(strokeWidth: 4),
-                            Text("Creating linked albums...", style: context.textTheme.labelLarge),
+                            Text('creating_linked_albums'.tr(), style: context.textTheme.labelLarge),
                           ],
                         ),
                       ),

mobile/lib/pages/backup/drift_backup_asset_detail.page.dart

@@ -1,4 +1,5 @@
 import 'package:auto_route/auto_route.dart';
+import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
@@ -58,8 +59,10 @@ class DriftBackupAssetDetailPage extends ConsumerWidget {
                           overflow: TextOverflow.ellipsis,
                         );
                       },
-                      error: (error, stackTrace) =>
-                          Text('Error: $error', style: TextStyle(color: context.colorScheme.error)),
+                      error: (error, stackTrace) => Text(
+                        'error_saving_image'.tr(args: [error.toString()]),
+                        style: TextStyle(color: context.colorScheme.error),
+                      ),
                       loading: () => const SizedBox(height: 16, width: 16, child: CircularProgressIndicator.adaptive()),
                     ),
                   ],
@@ -83,7 +86,7 @@ class DriftBackupAssetDetailPage extends ConsumerWidget {
           );
         },
         error: (Object error, StackTrace stackTrace) {
-          return Center(child: Text('Error: $error'));
+          return Center(child: Text('error_saving_image'.tr(args: [error.toString()])));
         },
         loading: () {
           return const SizedBox(height: 48, width: 48, child: Center(child: CircularProgressIndicator.adaptive()));