Improve backup UX

mobile/assets/i18n/en-US.json

@@ -62,6 +62,9 @@
   "backup_background_service_in_progress_notification": "Backing up your assets…",
   "backup_background_service_upload_failure_notification": "Failed to upload {}",
   "backup_controller_page_albums": "Backup Albums",
+  "backup_controller_page_asset_backed_up": "backed up",
+  "backup_controller_page_automatic_backup_disabled": "Automatic backup is disabled.",
+  "backup_controller_page_backed_up": "Backed Up",
   "backup_controller_page_background_app_refresh_disabled_content": "Enable background app refresh in Settings > General > Background App Refresh in order to use background backup.",
   "backup_controller_page_background_app_refresh_disabled_title": "Background app refresh disabled",
   "backup_controller_page_background_app_refresh_enable_button_text": "Go to settings",
@@ -87,9 +90,17 @@
   "backup_controller_page_excluded": "Excluded: ",
   "backup_controller_page_failed": "Failed ({})",
   "backup_controller_page_filename": "File name: {} [{}]",
+  "backup_controller_page_icloud_download": "iCloud Download",
   "backup_controller_page_id": "ID: {}",
+  "backup_controller_page_in_background": "Running in background",
+  "backup_controller_page_in_background_interact": "Background backup is currently running, cannot start manual backup.",
+  "backup_controller_page_in_background_interact_ok": "Ok",
   "backup_controller_page_info": "Backup Information",
+  "backup_controller_page_immich_upload": "Immich Upload ({})",
   "backup_controller_page_none_selected": "None selected",
+  "backup_controller_page_no_albums_selected_body": "To begin backing up, select some albums!",
+  "backup_controller_page_no_albums_selected_header": "No albums selected",
+  "backup_controller_page_quota_used": "Quota Used",
   "backup_controller_page_remainder": "Remainder",
   "backup_controller_page_remainder_sub": "Remaining photos and videos to back up from selection",
   "backup_controller_page_select": "Select",

mobile/lib/modules/backup/models/backup_state.model.dart

@@ -34,6 +34,7 @@ class BackUpState {
   final bool backupRequireWifi;
   final bool backupRequireCharging;
   final int backupTriggerDelay;
+  final DateTime? lastBackupTimestamp;
 
   /// All available albums on the device
   final List<AvailableAlbum> availableAlbums;
@@ -46,6 +47,9 @@ class BackUpState {
   /// All assets from the selected albums that have been backup
   final Set<String> selectedAlbumsBackupAssetsIds;
 
+  /// All assets from the selected albums that have errored on backup
+  final Set<String> selectedAlbumsBackupErrorAssetsIds;
+
   // Current Backup Asset
   final CurrentUploadAsset currentUploadAsset;
 
@@ -66,11 +70,13 @@ class BackUpState {
     required this.backupRequireWifi,
     required this.backupRequireCharging,
     required this.backupTriggerDelay,
+    required this.lastBackupTimestamp,
     required this.availableAlbums,
     required this.selectedBackupAlbums,
     required this.excludedBackupAlbums,
     required this.allUniqueAssets,
     required this.selectedAlbumsBackupAssetsIds,
+    required this.selectedAlbumsBackupErrorAssetsIds,
     required this.currentUploadAsset,
   });
 
@@ -91,11 +97,13 @@ class BackUpState {
     bool? backupRequireWifi,
     bool? backupRequireCharging,
     int? backupTriggerDelay,
+    DateTime? lastBackupTimestamp,
     List<AvailableAlbum>? availableAlbums,
     Set<AvailableAlbum>? selectedBackupAlbums,
     Set<AvailableAlbum>? excludedBackupAlbums,
     Set<AssetEntity>? allUniqueAssets,
     Set<String>? selectedAlbumsBackupAssetsIds,
+    Set<String>? selectedAlbumsBackupErrorAssetsIds,
     CurrentUploadAsset? currentUploadAsset,
   }) {
     return BackUpState(
@@ -119,19 +127,22 @@ class BackUpState {
       backupRequireCharging:
           backupRequireCharging ?? this.backupRequireCharging,
       backupTriggerDelay: backupTriggerDelay ?? this.backupTriggerDelay,
+      lastBackupTimestamp: lastBackupTimestamp ?? this.lastBackupTimestamp,
       availableAlbums: availableAlbums ?? this.availableAlbums,
       selectedBackupAlbums: selectedBackupAlbums ?? this.selectedBackupAlbums,
       excludedBackupAlbums: excludedBackupAlbums ?? this.excludedBackupAlbums,
       allUniqueAssets: allUniqueAssets ?? this.allUniqueAssets,
       selectedAlbumsBackupAssetsIds:
           selectedAlbumsBackupAssetsIds ?? this.selectedAlbumsBackupAssetsIds,
+      selectedAlbumsBackupErrorAssetsIds: selectedAlbumsBackupErrorAssetsIds ??
+          this.selectedAlbumsBackupErrorAssetsIds,
       currentUploadAsset: currentUploadAsset ?? this.currentUploadAsset,
     );
   }
 
   @override
   String toString() {
-    return 'BackUpState(backupProgress: $backupProgress, allAssetsInDatabase: $allAssetsInDatabase, progressInPercentage: $progressInPercentage, progressInFileSize: $progressInFileSize, progressInFileSpeed: $progressInFileSpeed, progressInFileSpeeds: $progressInFileSpeeds, progressInFileSpeedUpdateTime: $progressInFileSpeedUpdateTime, progressInFileSpeedUpdateSentBytes: $progressInFileSpeedUpdateSentBytes, iCloudDownloadProgress: $iCloudDownloadProgress, cancelToken: $cancelToken, serverInfo: $serverInfo, autoBackup: $autoBackup, backgroundBackup: $backgroundBackup, backupRequireWifi: $backupRequireWifi, backupRequireCharging: $backupRequireCharging, backupTriggerDelay: $backupTriggerDelay, availableAlbums: $availableAlbums, selectedBackupAlbums: $selectedBackupAlbums, excludedBackupAlbums: $excludedBackupAlbums, allUniqueAssets: $allUniqueAssets, selectedAlbumsBackupAssetsIds: $selectedAlbumsBackupAssetsIds, currentUploadAsset: $currentUploadAsset)';
+    return 'BackUpState(backupProgress: $backupProgress, allAssetsInDatabase: $allAssetsInDatabase, progressInPercentage: $progressInPercentage, progressInFileSize: $progressInFileSize, progressInFileSpeed: $progressInFileSpeed, progressInFileSpeeds: $progressInFileSpeeds, progressInFileSpeedUpdateTime: $progressInFileSpeedUpdateTime, progressInFileSpeedUpdateSentBytes: $progressInFileSpeedUpdateSentBytes, iCloudDownloadProgress: $iCloudDownloadProgress, cancelToken: $cancelToken, serverInfo: $serverInfo, autoBackup: $autoBackup, backgroundBackup: $backgroundBackup, backupRequireWifi: $backupRequireWifi, backupRequireCharging: $backupRequireCharging, backupTriggerDelay: $backupTriggerDelay, availableAlbums: $availableAlbums, selectedBackupAlbums: $selectedBackupAlbums, excludedBackupAlbums: $excludedBackupAlbums, allUniqueAssets: $allUniqueAssets, selectedAlbumsBackupAssetsIds: $selectedAlbumsBackupAssetsIds, selectedAlbumsBackupErrorAssetsIds: $selectedAlbumsBackupErrorAssetsIds, currentUploadAsset: $currentUploadAsset)';
   }
 
   @override

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

@@ -53,6 +53,7 @@ class BackupNotifier extends StateNotifier<BackUpState> {
             backupRequireCharging:
                 Store.get(StoreKey.backupRequireCharging, false),
             backupTriggerDelay: Store.get(StoreKey.backupTriggerDelay, 5000),
+            lastBackupTimestamp: Store.tryGet(StoreKey.lastBackupTimestamp),
             serverInfo: const ServerDiskInfo(
               diskAvailable: "0",
               diskSize: "0",
@@ -64,6 +65,7 @@ class BackupNotifier extends StateNotifier<BackUpState> {
             excludedBackupAlbums: const {},
             allUniqueAssets: const {},
             selectedAlbumsBackupAssetsIds: const {},
+            selectedAlbumsBackupErrorAssetsIds: const {},
             currentUploadAsset: CurrentUploadAsset(
               id: '...',
               fileCreatedAt: DateTime.parse('2020-10-04'),
@@ -406,8 +408,14 @@ class BackupNotifier extends StateNotifier<BackUpState> {
   /// Invoke backup process
   Future<void> startBackupProcess() async {
     debugPrint("Start backup process");
-    assert(state.backupProgress == BackUpProgressEnum.idle);
-    state = state.copyWith(backupProgress: BackUpProgressEnum.inProgress);
+    assert(
+      state.backupProgress == BackUpProgressEnum.idle ||
+          state.backupProgress == BackUpProgressEnum.done,
+    );
+    state = state.copyWith(
+      backupProgress: BackUpProgressEnum.inProgress,
+      selectedAlbumsBackupErrorAssetsIds: const {},
+    );
 
     await getBackupInfo();
 
@@ -450,6 +458,9 @@ class BackupNotifier extends StateNotifier<BackUpState> {
         _onSetCurrentBackupAsset,
         _onBackupError,
       );
+      var timestamp = DateTime.now();
+      Store.put(StoreKey.lastBackupTimestamp, timestamp);
+      state = state.copyWith(lastBackupTimestamp: timestamp);
       await notifyBackgroundServiceCanRun();
     } else {
       openAppSettings();
@@ -463,7 +474,14 @@ class BackupNotifier extends StateNotifier<BackUpState> {
   }
 
   void _onBackupError(ErrorUploadAsset errorAssetInfo) {
+    state = state.copyWith(
+      selectedAlbumsBackupErrorAssetsIds: {
+        ...state.selectedAlbumsBackupErrorAssetsIds,
+        errorAssetInfo.id,
+      },
+    );
     ref.watch(errorBackupListProvider.notifier).add(errorAssetInfo);
+    _checkBackupFinished();
   }
 
   void _onSetCurrentBackupAsset(CurrentUploadAsset currentUploadAsset) {
@@ -506,8 +524,15 @@ class BackupNotifier extends StateNotifier<BackUpState> {
       );
     }
 
+    _checkBackupFinished();
+
+    updateServerInfo();
+  }
+
+  void _checkBackupFinished() {
     if (state.allUniqueAssets.length -
-            state.selectedAlbumsBackupAssetsIds.length ==
+            state.selectedAlbumsBackupAssetsIds.length -
+            state.selectedAlbumsBackupErrorAssetsIds.length ==
         0) {
       final latestAssetBackup =
           state.allUniqueAssets.map((e) => e.modifiedDateTime).reduce(
@@ -529,8 +554,6 @@ class BackupNotifier extends StateNotifier<BackUpState> {
       );
       _updatePersistentAlbumsSelection();
     }
-
-    updateServerInfo();
   }
 
   void _onUploadProgress(int sent, int total) {

mobile/lib/modules/backup/services/backup.service.dart

@@ -2,6 +2,7 @@ import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
 
+import 'package:cancellation_token_http/http.dart';
 import 'package:collection/collection.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
@@ -353,8 +354,30 @@ class BackupService {
             ),
           );
 
-          var response =
-              await httpClient.send(req, cancellationToken: cancelToken);
+          StreamedResponse response;
+
+          try {
+            response =
+                await httpClient.send(req, cancellationToken: cancelToken);
+          } catch (err) {
+            debugPrint(
+              "Error(network) uploading ${entity.id} | $originalFileName | Created on ${entity.createDateTime} | $err",
+            );
+
+            errorCb(
+              ErrorUploadAsset(
+                asset: entity,
+                id: entity.id,
+                fileCreatedAt: entity.createDateTime,
+                fileName: originalFileName,
+                fileType: _getAssetType(entity.type),
+                errorMessage: err.toString(),
+              ),
+            );
+
+            anyErrors = true;
+            continue;
+          }
 
           if (response.statusCode == 200) {
             // asset is a duplicate (already exists on the server)
@@ -365,12 +388,22 @@ class BackupService {
             uploadSuccessCb(entity.id, deviceId, false);
           } else {
             var data = await response.stream.bytesToString();
-            var error = jsonDecode(data);
-            var errorMessage = error['message'] ?? error['error'];
+            String errorMessage;
 
-            debugPrint(
-              "Error(${error['statusCode']}) uploading ${entity.id} | $originalFileName | Created on ${entity.createDateTime} | ${error['error']}",
-            );
+            try {
+              var error = jsonDecode(data);
+              errorMessage = error['message'] ?? error['error'];
+              debugPrint(
+                "Error(${error['statusCode']}) uploading ${entity.id} | $originalFileName | Created on ${entity.createDateTime} | ${error['error']}",
+              );
+            } catch (err) {
+              // server returned invalid response
+              debugPrint(
+                "Error(HTTP ${response.statusCode}) uploading ${entity.id} | $originalFileName | Created on ${entity.createDateTime} | $data",
+              );
+
+              errorMessage = "HTTP ${response.statusCode}: $data";
+            }
 
             errorCb(
               ErrorUploadAsset(