additional state

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

@@ -1,10 +1,13 @@
+// ignore_for_file: public_member_api_docs, sort_constructors_first
+import 'dart:convert';
+
 import 'package:cancellation_token_http/http.dart';
 import 'package:collection/collection.dart';
-import 'package:immich_mobile/shared/models/server_info/server_disk_info.model.dart';
 import 'package:photo_manager/photo_manager.dart';
 
 import 'package:immich_mobile/modules/backup/models/available_album.model.dart';
 import 'package:immich_mobile/modules/backup/models/current_upload_asset.model.dart';
+import 'package:immich_mobile/shared/models/server_info/server_disk_info.model.dart';
 
 enum BackUpProgressEnum {
   idle,
@@ -19,6 +22,7 @@ class BackUpState {
   final BackUpProgressEnum backupProgress;
   final List<String> allAssetsInDatabase;
   final double progressInPercentage;
+  final double iCloudDownloadProgress;
   final CancellationToken cancelToken;
   final ServerDiskInfo serverInfo;
   final bool autoBackup;
@@ -45,6 +49,7 @@ class BackUpState {
     required this.backupProgress,
     required this.allAssetsInDatabase,
     required this.progressInPercentage,
+    required this.iCloudDownloadProgress,
     required this.cancelToken,
     required this.serverInfo,
     required this.autoBackup,
@@ -64,6 +69,7 @@ class BackUpState {
     BackUpProgressEnum? backupProgress,
     List<String>? allAssetsInDatabase,
     double? progressInPercentage,
+    double? iCloudDownloadProgress,
     CancellationToken? cancelToken,
     ServerDiskInfo? serverInfo,
     bool? autoBackup,
@@ -82,6 +88,8 @@ class BackUpState {
       backupProgress: backupProgress ?? this.backupProgress,
       allAssetsInDatabase: allAssetsInDatabase ?? this.allAssetsInDatabase,
       progressInPercentage: progressInPercentage ?? this.progressInPercentage,
+      iCloudDownloadProgress:
+          iCloudDownloadProgress ?? this.iCloudDownloadProgress,
       cancelToken: cancelToken ?? this.cancelToken,
       serverInfo: serverInfo ?? this.serverInfo,
       autoBackup: autoBackup ?? this.autoBackup,
@@ -102,18 +110,18 @@ class BackUpState {
 
   @override
   String toString() {
-    return 'BackUpState(backupProgress: $backupProgress, allAssetsInDatabase: $allAssetsInDatabase, progressInPercentage: $progressInPercentage, 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, 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)';
   }
 
   @override
-  bool operator ==(Object other) {
+  bool operator ==(covariant BackUpState other) {
     if (identical(this, other)) return true;
     final collectionEquals = const DeepCollectionEquality().equals;
 
-    return other is BackUpState &&
-        other.backupProgress == backupProgress &&
+    return other.backupProgress == backupProgress &&
         collectionEquals(other.allAssetsInDatabase, allAssetsInDatabase) &&
         other.progressInPercentage == progressInPercentage &&
+        other.iCloudDownloadProgress == iCloudDownloadProgress &&
         other.cancelToken == cancelToken &&
         other.serverInfo == serverInfo &&
         other.autoBackup == autoBackup &&
@@ -125,10 +133,8 @@ class BackUpState {
         collectionEquals(other.selectedBackupAlbums, selectedBackupAlbums) &&
         collectionEquals(other.excludedBackupAlbums, excludedBackupAlbums) &&
         collectionEquals(other.allUniqueAssets, allUniqueAssets) &&
-        collectionEquals(
-          other.selectedAlbumsBackupAssetsIds,
-          selectedAlbumsBackupAssetsIds,
-        ) &&
+        collectionEquals(other.selectedAlbumsBackupAssetsIds,
+            selectedAlbumsBackupAssetsIds) &&
         other.currentUploadAsset == currentUploadAsset;
   }
 
@@ -137,6 +143,7 @@ class BackUpState {
     return backupProgress.hashCode ^
         allAssetsInDatabase.hashCode ^
         progressInPercentage.hashCode ^
+        iCloudDownloadProgress.hashCode ^
         cancelToken.hashCode ^
         serverInfo.hashCode ^
         autoBackup.hashCode ^

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

@@ -1,3 +1,4 @@
+// ignore_for_file: public_member_api_docs, sort_constructors_first
 import 'dart:convert';
 
 class CurrentUploadAsset {
@@ -5,12 +6,14 @@ class CurrentUploadAsset {
   final DateTime fileCreatedAt;
   final String fileName;
   final String fileType;
+  final bool? iCloudAsset;
 
   CurrentUploadAsset({
     required this.id,
     required this.fileCreatedAt,
     required this.fileName,
     required this.fileType,
+    this.iCloudAsset,
   });
 
   CurrentUploadAsset copyWith({
@@ -18,54 +21,58 @@ class CurrentUploadAsset {
     DateTime? fileCreatedAt,
     String? fileName,
     String? fileType,
+    bool? iCloudAsset,
   }) {
     return CurrentUploadAsset(
       id: id ?? this.id,
       fileCreatedAt: fileCreatedAt ?? this.fileCreatedAt,
       fileName: fileName ?? this.fileName,
       fileType: fileType ?? this.fileType,
+      iCloudAsset: iCloudAsset ?? this.iCloudAsset,
     );
   }
 
   Map<String, dynamic> toMap() {
-    final result = <String, dynamic>{};
-
-    result.addAll({'id': id});
-    result.addAll({'fileCreatedAt': fileCreatedAt.millisecondsSinceEpoch});
-    result.addAll({'fileName': fileName});
-    result.addAll({'fileType': fileType});
-
-    return result;
+    return <String, dynamic>{
+      'id': id,
+      'fileCreatedAt': fileCreatedAt.millisecondsSinceEpoch,
+      'fileName': fileName,
+      'fileType': fileType,
+      'iCloudAsset': iCloudAsset,
+    };
   }
 
   factory CurrentUploadAsset.fromMap(Map<String, dynamic> map) {
     return CurrentUploadAsset(
-      id: map['id'] ?? '',
-      fileCreatedAt: DateTime.fromMillisecondsSinceEpoch(map['fileCreatedAt']),
-      fileName: map['fileName'] ?? '',
-      fileType: map['fileType'] ?? '',
+      id: map['id'] as String,
+      fileCreatedAt:
+          DateTime.fromMillisecondsSinceEpoch(map['fileCreatedAt'] as int),
+      fileName: map['fileName'] as String,
+      fileType: map['fileType'] as String,
+      iCloudAsset:
+          map['iCloudAsset'] != null ? map['iCloudAsset'] as bool : null,
     );
   }
 
   String toJson() => json.encode(toMap());
 
   factory CurrentUploadAsset.fromJson(String source) =>
-      CurrentUploadAsset.fromMap(json.decode(source));
+      CurrentUploadAsset.fromMap(json.decode(source) as Map<String, dynamic>);
 
   @override
   String toString() {
-    return 'CurrentUploadAsset(id: $id, fileCreatedAt: $fileCreatedAt, fileName: $fileName, fileType: $fileType)';
+    return 'CurrentUploadAsset(id: $id, fileCreatedAt: $fileCreatedAt, fileName: $fileName, fileType: $fileType, iCloudAsset: $iCloudAsset)';
   }
 
   @override
-  bool operator ==(Object other) {
+  bool operator ==(covariant CurrentUploadAsset other) {
     if (identical(this, other)) return true;
 
-    return other is CurrentUploadAsset &&
-        other.id == id &&
+    return other.id == id &&
         other.fileCreatedAt == fileCreatedAt &&
         other.fileName == fileName &&
-        other.fileType == fileType;
+        other.fileType == fileType &&
+        other.iCloudAsset == iCloudAsset;
   }
 
   @override
@@ -73,6 +80,7 @@ class CurrentUploadAsset {
     return id.hashCode ^
         fileCreatedAt.hashCode ^
         fileName.hashCode ^
-        fileType.hashCode;
+        fileType.hashCode ^
+        iCloudAsset.hashCode;
   }
 }

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

@@ -61,7 +61,9 @@ class BackupNotifier extends StateNotifier<BackUpState> {
               fileCreatedAt: DateTime.parse('2020-10-04'),
               fileName: '...',
               fileType: '...',
+              iCloudAsset: false,
             ),
+            iCloudDownloadProgress: 0.0,
           ),
         );
 
@@ -447,7 +449,10 @@ class BackupNotifier extends StateNotifier<BackUpState> {
 
       final pmProgressHandler = PMProgressHandler();
 
-      pmProgressHandler.stream.listen((event) {});
+      pmProgressHandler.stream.listen((event) {
+        final double progress = event.progress;
+        state = state.copyWith(iCloudDownloadProgress: progress);
+      });
 
       await _backupService.backupAsset(
         assetsWillBeBackup,

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

@@ -246,6 +246,18 @@ class BackupService {
 
         // Handle getting files from iCloud
         if (!isAvailableLocally && Platform.isIOS) {
+          setCurrentUploadAssetCb(
+            CurrentUploadAsset(
+              id: entity.id,
+              fileCreatedAt: entity.createDateTime.year == 1970
+                  ? entity.modifiedDateTime
+                  : entity.createDateTime,
+              fileName: "File from iCloud",
+              fileType: _getAssetType(entity.type),
+              iCloudAsset: true,
+            ),
+          );
+
           file = await entity.loadFile(progressHandler: pmProgressHandler);
         } else {
           if (entity.type == AssetType.video) {
@@ -294,6 +306,7 @@ class BackupService {
                   : entity.createDateTime,
               fileName: originalFileName,
               fileType: _getAssetType(entity.type),
+              iCloudAsset: false,
             ),
           );