paginate cloud id fetch in migrate cloud id

i18n/en.json

@@ -561,8 +561,6 @@
   "asset_adding_to_album": "Adding to album…",
   "asset_created": "Asset created",
   "asset_description_updated": "Asset description has been updated",
-  "asset_edit_failed": "Asset edit failed",
-  "asset_edit_success": "Asset edited successfully",
   "asset_filename_is_offline": "Asset {filename} is offline",
   "asset_has_unassigned_faces": "Asset has unassigned faces",
   "asset_hashing": "Hashing…",

mobile/lib/domain/models/asset/base_asset.model.dart

@@ -56,8 +56,6 @@ sealed class BaseAsset {
   bool get isLocalOnly => storage == AssetState.local;
   bool get isRemoteOnly => storage == AssetState.remote;
 
-  bool get isEditable => isImage && !isMotionPhoto && this is RemoteAsset;
-
   // Overridden in subclasses
   AssetState get storage;
   String? get localId;

mobile/lib/domain/models/asset_edit.model.dart

@@ -1,21 +0,0 @@
-import "package:openapi/api.dart" as api show AssetEditAction;
-
-enum AssetEditAction { rotate, crop, mirror, other }
-
-extension AssetEditActionExtension on AssetEditAction {
-  api.AssetEditAction? toDto() {
-    return switch (this) {
-      AssetEditAction.rotate => api.AssetEditAction.rotate,
-      AssetEditAction.crop => api.AssetEditAction.crop,
-      AssetEditAction.mirror => api.AssetEditAction.mirror,
-      AssetEditAction.other => null,
-    };
-  }
-}
-
-class AssetEdit {
-  final AssetEditAction action;
-  final Map<String, dynamic> parameters;
-
-  const AssetEdit({required this.action, required this.parameters});
-}

mobile/lib/domain/models/exif.model.dart

@@ -7,8 +7,6 @@ class ExifInfo {
   final String? timeZone;
   final DateTime? dateTimeOriginal;
   final int? rating;
-  final int? width;
-  final int? height;
 
   // GPS
   final double? latitude;
@@ -50,8 +48,6 @@ class ExifInfo {
     this.timeZone,
     this.dateTimeOriginal,
     this.rating,
-    this.width,
-    this.height,
     this.isFlipped = false,
     this.latitude,
     this.longitude,
@@ -78,8 +74,6 @@ class ExifInfo {
         other.timeZone == timeZone &&
         other.dateTimeOriginal == dateTimeOriginal &&
         other.rating == rating &&
-        other.width == width &&
-        other.height == height &&
         other.latitude == latitude &&
         other.longitude == longitude &&
         other.city == city &&
@@ -104,8 +98,6 @@ class ExifInfo {
         timeZone.hashCode ^
         dateTimeOriginal.hashCode ^
         rating.hashCode ^
-        width.hashCode ^
-        height.hashCode ^
         latitude.hashCode ^
         longitude.hashCode ^
         city.hashCode ^
@@ -131,8 +123,6 @@ isFlipped: $isFlipped,
 timeZone: ${timeZone ?? 'NA'},
 dateTimeOriginal: ${dateTimeOriginal ?? 'NA'},
 rating: ${rating ?? 'NA'},
-width: ${width ?? 'NA'},
-height: ${height ?? 'NA'},
 latitude: ${latitude ?? 'NA'},
 longitude: ${longitude ?? 'NA'},
 city: ${city ?? 'NA'},
@@ -156,8 +146,6 @@ exposureSeconds: ${exposureSeconds ?? 'NA'},
     String? timeZone,
     DateTime? dateTimeOriginal,
     int? rating,
-    int? width,
-    int? height,
     double? latitude,
     double? longitude,
     String? city,
@@ -180,8 +168,6 @@ exposureSeconds: ${exposureSeconds ?? 'NA'},
       timeZone: timeZone ?? this.timeZone,
       dateTimeOriginal: dateTimeOriginal ?? this.dateTimeOriginal,
       rating: rating ?? this.rating,
-      width: width ?? this.width,
-      height: height ?? this.height,
       isFlipped: isFlipped ?? this.isFlipped,
       latitude: latitude ?? this.latitude,
       longitude: longitude ?? this.longitude,

mobile/lib/domain/services/asset.service.dart

@@ -1,6 +1,5 @@
 import 'package:immich_mobile/domain/models/album/local_album.model.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
-import 'package:immich_mobile/domain/models/asset_edit.model.dart';
 import 'package:immich_mobile/domain/models/exif.model.dart';
 import 'package:immich_mobile/extensions/platform_extensions.dart';
 import 'package:immich_mobile/infrastructure/repositories/local_asset.repository.dart';
@@ -117,12 +116,4 @@ class AssetService {
   Future<List<LocalAlbum>> getSourceAlbums(String localAssetId, {BackupSelection? backupSelection}) {
     return _localAssetRepository.getSourceAlbums(localAssetId, backupSelection: backupSelection);
   }
-
-  Future<List<AssetEdit>> getAssetEdits(String assetId) {
-    return _remoteAssetRepository.getAssetEdits(assetId);
-  }
-
-  Future<void> editAsset(String assetId, List<AssetEdit> edits) {
-    return _remoteAssetRepository.editAsset(assetId, edits);
-  }
 }

mobile/lib/domain/services/hash.service.dart

@@ -41,7 +41,7 @@ class HashService {
     final Stopwatch stopwatch = Stopwatch()..start();
     try {
       // Migrate hashes from cloud ID to local ID so we don't have to re-hash them
-      await _migrateHashes();
+      await _localAssetRepository.reconcileHashesFromCloudId();
 
       // Sorted by backupSelection followed by isCloud
       final localAlbums = await _localAlbumRepository.getBackupAlbums();
@@ -78,15 +78,6 @@ class HashService {
     _log.info("Hashing took - ${stopwatch.elapsedMilliseconds}ms");
   }
 
-  Future<void> _migrateHashes() async {
-    final hashMappings = await _localAssetRepository.getHashMappingFromCloudId();
-    if (hashMappings.isEmpty) {
-      return;
-    }
-
-    await _localAssetRepository.updateHashes(hashMappings);
-  }
-
   /// Processes a list of [LocalAsset]s, storing their hash and updating the assets in the DB
   /// with hash for those that were successfully hashed. Hashes are looked up in a table
   /// [LocalAssetHashEntity] by local id. Only missing entries are newly hashed and added to the DB.

mobile/lib/domain/services/sync_stream.service.dart

@@ -118,10 +118,6 @@ class SyncStreamService {
         return _syncStreamRepository.deleteAssetsV1(data.cast());
       case SyncEntityType.assetExifV1:
         return _syncStreamRepository.updateAssetsExifV1(data.cast());
-      case SyncEntityType.assetEditV1:
-        return _syncStreamRepository.updateAssetEditsV1(data.cast());
-      case SyncEntityType.assetEditDeleteV1:
-        return _syncStreamRepository.deleteAssetEditsV1(data.cast());
       case SyncEntityType.assetMetadataV1:
         return _syncStreamRepository.updateAssetsMetadataV1(data.cast());
       case SyncEntityType.assetMetadataDeleteV1:
@@ -257,7 +253,6 @@ class SyncStreamService {
     _logger.info('Processing batch of ${batchData.length} AssetEditReadyV1 events');
 
     final List<SyncAssetV1> assets = [];
-    final List<SyncAssetEditV1> assetEdits = [];
 
     try {
       for (final data in batchData) {
@@ -267,7 +262,6 @@ class SyncStreamService {
 
         final payload = data;
         final assetData = payload['asset'];
-        final editData = payload['edit'];
 
         if (assetData == null) {
           continue;
@@ -277,28 +271,11 @@ class SyncStreamService {
 
         if (asset != null) {
           assets.add(asset);
-
-          // Edits are only send on v2.6.0+
-          if (editData != null) {
-            final edits = (editData as List<dynamic>)
-                .map((e) => SyncAssetEditV1.fromJson(e))
-                .whereType<SyncAssetEditV1>()
-                .toList();
-
-            assetEdits.addAll(edits);
-          }
         }
       }
 
       if (assets.isNotEmpty) {
         await _syncStreamRepository.updateAssetsV1(assets, debugLabel: 'websocket-edit');
-
-        // edits that are sent replace previous edits, so we delete existing ones first
-        await _syncStreamRepository.deleteAssetEditsV1(
-          assets.map((asset) => SyncAssetEditDeleteV1(assetId: asset.id)).toList(),
-          debugLabel: 'websocket-edit',
-        );
-        await _syncStreamRepository.updateAssetEditsV1(assetEdits, debugLabel: 'websocket-edit');
         _logger.info('Successfully processed ${assets.length} edited assets');
       }
     } catch (error, stackTrace) {

mobile/lib/domain/utils/migrate_cloud_ids.dart

@@ -50,24 +50,51 @@ Future<void> syncCloudIds(ProviderContainer ref) async {
     return;
   }
 
-  final mappingsToUpdate = await _fetchCloudIdMappings(db, currentUser.id);
-  // Deduplicate mappings as a single remote asset ID can match multiple local assets
-  final seenRemoteAssetIds = <String>{};
-  final uniqueMapping = mappingsToUpdate.where((mapping) {
-    if (!seenRemoteAssetIds.add(mapping.remoteAssetId)) {
-      logger.fine('Duplicate remote asset ID found: ${mapping.remoteAssetId}. Skipping duplicate entry.');
-      return false;
-    }
-    return true;
-  }).toList();
-
   final assetApi = ref.read(apiServiceProvider).assetsApi;
 
-  if (canBulkUpdateMetadata) {
-    await _bulkUpdateCloudIds(assetApi, uniqueMapping);
-    return;
+  // Process cloud IDs in paginated batches
+  await _processCloudIdMappingsInBatches(db, currentUser.id, assetApi, canBulkUpdateMetadata, logger);
+}
+
+Future<void> _processCloudIdMappingsInBatches(
+  Drift drift,
+  String userId,
+  AssetsApi assetsApi,
+  bool canBulkUpdate,
+  Logger logger,
+) async {
+  const pageSize = 20000;
+  int offset = 0;
+  final seenRemoteAssetIds = <String>{};
+
+  while (true) {
+    final mappings = await _fetchCloudIdMappings(drift, userId, pageSize, offset);
+    if (mappings.isEmpty) {
+      break;
+    }
+
+    final uniqueMappings = <_CloudIdMapping>[];
+    for (final mapping in mappings) {
+      if (seenRemoteAssetIds.add(mapping.remoteAssetId)) {
+        uniqueMappings.add(mapping);
+      } else {
+        logger.fine('Duplicate remote asset ID found: ${mapping.remoteAssetId}. Skipping duplicate entry.');
+      }
+    }
+
+    if (uniqueMappings.isNotEmpty) {
+      if (canBulkUpdate) {
+        await _bulkUpdateCloudIds(assetsApi, uniqueMappings);
+      } else {
+        await _sequentialUpdateCloudIds(assetsApi, uniqueMappings);
+      }
+    }
+
+    offset += pageSize;
+    if (mappings.length < pageSize) {
+      break;
+    }
   }
-  await _sequentialUpdateCloudIds(assetApi, uniqueMapping);
 }
 
 Future<void> _sequentialUpdateCloudIds(AssetsApi assetsApi, List<_CloudIdMapping> mappings) async {
@@ -91,31 +118,26 @@ Future<void> _sequentialUpdateCloudIds(AssetsApi assetsApi, List<_CloudIdMapping
 }
 
 Future<void> _bulkUpdateCloudIds(AssetsApi assetsApi, List<_CloudIdMapping> mappings) async {
-  const batchSize = 10000;
-  for (int i = 0; i < mappings.length; i += batchSize) {
-    final endIndex = (i + batchSize > mappings.length) ? mappings.length : i + batchSize;
-    final batch = mappings.sublist(i, endIndex);
-    final items = <AssetMetadataBulkUpsertItemDto>[];
-    for (final mapping in batch) {
-      items.add(
-        AssetMetadataBulkUpsertItemDto(
-          assetId: mapping.remoteAssetId,
-          key: kMobileMetadataKey,
-          value: RemoteAssetMobileAppMetadata(
-            cloudId: mapping.localAsset.cloudId,
-            createdAt: mapping.localAsset.createdAt.toIso8601String(),
-            adjustmentTime: mapping.localAsset.adjustmentTime?.toIso8601String(),
-            latitude: mapping.localAsset.latitude?.toString(),
-            longitude: mapping.localAsset.longitude?.toString(),
-          ),
+  final items = <AssetMetadataBulkUpsertItemDto>[];
+  for (final mapping in mappings) {
+    items.add(
+      AssetMetadataBulkUpsertItemDto(
+        assetId: mapping.remoteAssetId,
+        key: kMobileMetadataKey,
+        value: RemoteAssetMobileAppMetadata(
+          cloudId: mapping.localAsset.cloudId,
+          createdAt: mapping.localAsset.createdAt.toIso8601String(),
+          adjustmentTime: mapping.localAsset.adjustmentTime?.toIso8601String(),
+          latitude: mapping.localAsset.latitude?.toString(),
+          longitude: mapping.localAsset.longitude?.toString(),
         ),
-      );
-    }
-    try {
-      await assetsApi.updateBulkAssetMetadata(AssetMetadataBulkUpsertDto(items: items));
-    } catch (error, stack) {
-      Logger('migrateCloudIds').warning('Failed to bulk update metadata', error, stack);
-    }
+      ),
+    );
+  }
+  try {
+    await assetsApi.updateBulkAssetMetadata(AssetMetadataBulkUpsertDto(items: items));
+  } catch (error, stack) {
+    Logger('migrateCloudIds').warning('Failed to bulk update metadata', error, stack);
   }
 }
 
@@ -141,31 +163,34 @@ Future<void> _populateCloudIds(Drift drift) async {
 
 typedef _CloudIdMapping = ({String remoteAssetId, LocalAsset localAsset});
 
-Future<List<_CloudIdMapping>> _fetchCloudIdMappings(Drift drift, String userId) async {
+Future<List<_CloudIdMapping>> _fetchCloudIdMappings(Drift drift, String userId, int limit, int offset) async {
   final query =
-      drift.remoteAssetEntity.select().join([
-        leftOuterJoin(
-          drift.localAssetEntity,
-          drift.localAssetEntity.checksum.equalsExp(drift.remoteAssetEntity.checksum),
-        ),
-        leftOuterJoin(
-          drift.remoteAssetCloudIdEntity,
-          drift.remoteAssetEntity.id.equalsExp(drift.remoteAssetCloudIdEntity.assetId),
-          useColumns: false,
-        ),
-      ])..where(
-        // Only select assets that have a local cloud ID but either no remote cloud ID or a mismatched eTag
-        drift.localAssetEntity.id.isNotNull() &
-            drift.localAssetEntity.iCloudId.isNotNull() &
-            drift.remoteAssetEntity.ownerId.equals(userId) &
-            // Skip locked assets as we cannot update them without unlocking first
-            drift.remoteAssetEntity.visibility.isNotValue(AssetVisibility.locked.index) &
-            (drift.remoteAssetCloudIdEntity.cloudId.isNull() |
-                drift.remoteAssetCloudIdEntity.adjustmentTime.isNotExp(drift.localAssetEntity.adjustmentTime) |
-                drift.remoteAssetCloudIdEntity.latitude.isNotExp(drift.localAssetEntity.latitude) |
-                drift.remoteAssetCloudIdEntity.longitude.isNotExp(drift.localAssetEntity.longitude) |
-                drift.remoteAssetCloudIdEntity.createdAt.isNotExp(drift.localAssetEntity.createdAt)),
-      );
+      drift.localAssetEntity.select().join([
+          innerJoin(
+            drift.remoteAssetEntity,
+            drift.localAssetEntity.checksum.equalsExp(drift.remoteAssetEntity.checksum),
+          ),
+          leftOuterJoin(
+            drift.remoteAssetCloudIdEntity,
+            drift.remoteAssetEntity.id.equalsExp(drift.remoteAssetCloudIdEntity.assetId),
+            useColumns: false,
+          ),
+        ])
+        ..where(
+          // Only select assets that have a local cloud ID but either no remote cloud ID or a mismatched eTag
+          drift.localAssetEntity.iCloudId.isNotNull() &
+              drift.remoteAssetEntity.ownerId.equals(userId) &
+              // Skip locked assets as we cannot update them without unlocking first
+              drift.remoteAssetEntity.visibility.isNotValue(AssetVisibility.locked.index) &
+              (drift.remoteAssetCloudIdEntity.cloudId.isNull() |
+                  drift.remoteAssetCloudIdEntity.adjustmentTime.isNotExp(drift.localAssetEntity.adjustmentTime) |
+                  drift.remoteAssetCloudIdEntity.latitude.isNotExp(drift.localAssetEntity.latitude) |
+                  drift.remoteAssetCloudIdEntity.longitude.isNotExp(drift.localAssetEntity.longitude) |
+                  drift.remoteAssetCloudIdEntity.createdAt.isNotExp(drift.localAssetEntity.createdAt)),
+        )
+        ..orderBy([OrderingTerm.asc(drift.localAssetEntity.id)])
+        ..limit(limit, offset: offset);
+
   return query.map((row) {
     return (
       remoteAssetId: row.read(drift.remoteAssetEntity.id)!,

mobile/lib/infrastructure/entities/asset_edit.entity.dart

@@ -1,32 +0,0 @@
-import 'package:drift/drift.dart';
-import 'package:immich_mobile/domain/models/asset_edit.model.dart';
-import 'package:immich_mobile/infrastructure/entities/asset_edit.entity.drift.dart';
-import 'package:immich_mobile/infrastructure/entities/remote_asset.entity.dart';
-import 'package:immich_mobile/infrastructure/utils/drift_default.mixin.dart';
-
-class AssetEditEntity extends Table with DriftDefaultsMixin {
-  const AssetEditEntity();
-
-  TextColumn get id => text()();
-
-  TextColumn get assetId => text().references(RemoteAssetEntity, #id, onDelete: KeyAction.cascade)();
-
-  IntColumn get action => intEnum<AssetEditAction>()();
-
-  BlobColumn get parameters => blob().map(editParameterConverter)();
-
-  IntColumn get sequence => integer()();
-
-  @override
-  Set<Column> get primaryKey => {id};
-}
-
-final JsonTypeConverter2<Map<String, Object?>, Uint8List, Object?> editParameterConverter = TypeConverter.jsonb(
-  fromJson: (json) => json as Map<String, Object?>,
-);
-
-extension AssetEditEntityDataDomainEx on AssetEditEntityData {
-  AssetEdit toDto() {
-    return AssetEdit(action: action, parameters: parameters);
-  }
-}

mobile/lib/infrastructure/entities/asset_edit.entity.drift.dart

@@ -1,748 +0,0 @@
-// dart format width=80
-// ignore_for_file: type=lint
-import 'package:drift/drift.dart' as i0;
-import 'package:immich_mobile/infrastructure/entities/asset_edit.entity.drift.dart'
-    as i1;
-import 'package:immich_mobile/domain/models/asset_edit.model.dart' as i2;
-import 'dart:typed_data' as i3;
-import 'package:immich_mobile/infrastructure/entities/asset_edit.entity.dart'
-    as i4;
-import 'package:immich_mobile/infrastructure/entities/remote_asset.entity.drift.dart'
-    as i5;
-import 'package:drift/internal/modular.dart' as i6;
-
-typedef $$AssetEditEntityTableCreateCompanionBuilder =
-    i1.AssetEditEntityCompanion Function({
-      required String id,
-      required String assetId,
-      required i2.AssetEditAction action,
-      required Map<String, Object?> parameters,
-      required int sequence,
-    });
-typedef $$AssetEditEntityTableUpdateCompanionBuilder =
-    i1.AssetEditEntityCompanion Function({
-      i0.Value<String> id,
-      i0.Value<String> assetId,
-      i0.Value<i2.AssetEditAction> action,
-      i0.Value<Map<String, Object?>> parameters,
-      i0.Value<int> sequence,
-    });
-
-final class $$AssetEditEntityTableReferences
-    extends
-        i0.BaseReferences<
-          i0.GeneratedDatabase,
-          i1.$AssetEditEntityTable,
-          i1.AssetEditEntityData
-        > {
-  $$AssetEditEntityTableReferences(
-    super.$_db,
-    super.$_table,
-    super.$_typedResult,
-  );
-
-  static i5.$RemoteAssetEntityTable _assetIdTable(i0.GeneratedDatabase db) =>
-      i6.ReadDatabaseContainer(db)
-          .resultSet<i5.$RemoteAssetEntityTable>('remote_asset_entity')
-          .createAlias(
-            i0.$_aliasNameGenerator(
-              i6.ReadDatabaseContainer(db)
-                  .resultSet<i1.$AssetEditEntityTable>('asset_edit_entity')
-                  .assetId,
-              i6.ReadDatabaseContainer(
-                db,
-              ).resultSet<i5.$RemoteAssetEntityTable>('remote_asset_entity').id,
-            ),
-          );
-
-  i5.$$RemoteAssetEntityTableProcessedTableManager get assetId {
-    final $_column = $_itemColumn<String>('asset_id')!;
-
-    final manager = i5
-        .$$RemoteAssetEntityTableTableManager(
-          $_db,
-          i6.ReadDatabaseContainer(
-            $_db,
-          ).resultSet<i5.$RemoteAssetEntityTable>('remote_asset_entity'),
-        )
-        .filter((f) => f.id.sqlEquals($_column));
-    final item = $_typedResult.readTableOrNull(_assetIdTable($_db));
-    if (item == null) return manager;
-    return i0.ProcessedTableManager(
-      manager.$state.copyWith(prefetchedData: [item]),
-    );
-  }
-}
-
-class $$AssetEditEntityTableFilterComposer
-    extends i0.Composer<i0.GeneratedDatabase, i1.$AssetEditEntityTable> {
-  $$AssetEditEntityTableFilterComposer({
-    required super.$db,
-    required super.$table,
-    super.joinBuilder,
-    super.$addJoinBuilderToRootComposer,
-    super.$removeJoinBuilderFromRootComposer,
-  });
-  i0.ColumnFilters<String> get id => $composableBuilder(
-    column: $table.id,
-    builder: (column) => i0.ColumnFilters(column),
-  );
-
-  i0.ColumnWithTypeConverterFilters<i2.AssetEditAction, i2.AssetEditAction, int>
-  get action => $composableBuilder(
-    column: $table.action,
-    builder: (column) => i0.ColumnWithTypeConverterFilters(column),
-  );
-
-  i0.ColumnWithTypeConverterFilters<
-    Map<String, Object?>,
-    Map<String, Object>,
-    i3.Uint8List
-  >
-  get parameters => $composableBuilder(
-    column: $table.parameters,
-    builder: (column) => i0.ColumnWithTypeConverterFilters(column),
-  );
-
-  i0.ColumnFilters<int> get sequence => $composableBuilder(
-    column: $table.sequence,
-    builder: (column) => i0.ColumnFilters(column),
-  );
-
-  i5.$$RemoteAssetEntityTableFilterComposer get assetId {
-    final i5.$$RemoteAssetEntityTableFilterComposer composer = $composerBuilder(
-      composer: this,
-      getCurrentColumn: (t) => t.assetId,
-      referencedTable: i6.ReadDatabaseContainer(
-        $db,
-      ).resultSet<i5.$RemoteAssetEntityTable>('remote_asset_entity'),
-      getReferencedColumn: (t) => t.id,
-      builder:
-          (
-            joinBuilder, {
-            $addJoinBuilderToRootComposer,
-            $removeJoinBuilderFromRootComposer,
-          }) => i5.$$RemoteAssetEntityTableFilterComposer(
-            $db: $db,
-            $table: i6.ReadDatabaseContainer(
-              $db,
-            ).resultSet<i5.$RemoteAssetEntityTable>('remote_asset_entity'),
-            $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
-            joinBuilder: joinBuilder,
-            $removeJoinBuilderFromRootComposer:
-                $removeJoinBuilderFromRootComposer,
-          ),
-    );
-    return composer;
-  }
-}
-
-class $$AssetEditEntityTableOrderingComposer
-    extends i0.Composer<i0.GeneratedDatabase, i1.$AssetEditEntityTable> {
-  $$AssetEditEntityTableOrderingComposer({
-    required super.$db,
-    required super.$table,
-    super.joinBuilder,
-    super.$addJoinBuilderToRootComposer,
-    super.$removeJoinBuilderFromRootComposer,
-  });
-  i0.ColumnOrderings<String> get id => $composableBuilder(
-    column: $table.id,
-    builder: (column) => i0.ColumnOrderings(column),
-  );
-
-  i0.ColumnOrderings<int> get action => $composableBuilder(
-    column: $table.action,
-    builder: (column) => i0.ColumnOrderings(column),
-  );
-
-  i0.ColumnOrderings<i3.Uint8List> get parameters => $composableBuilder(
-    column: $table.parameters,
-    builder: (column) => i0.ColumnOrderings(column),
-  );
-
-  i0.ColumnOrderings<int> get sequence => $composableBuilder(
-    column: $table.sequence,
-    builder: (column) => i0.ColumnOrderings(column),
-  );
-
-  i5.$$RemoteAssetEntityTableOrderingComposer get assetId {
-    final i5.$$RemoteAssetEntityTableOrderingComposer composer =
-        $composerBuilder(
-          composer: this,
-          getCurrentColumn: (t) => t.assetId,
-          referencedTable: i6.ReadDatabaseContainer(
-            $db,
-          ).resultSet<i5.$RemoteAssetEntityTable>('remote_asset_entity'),
-          getReferencedColumn: (t) => t.id,
-          builder:
-              (
-                joinBuilder, {
-                $addJoinBuilderToRootComposer,
-                $removeJoinBuilderFromRootComposer,
-              }) => i5.$$RemoteAssetEntityTableOrderingComposer(
-                $db: $db,
-                $table: i6.ReadDatabaseContainer(
-                  $db,
-                ).resultSet<i5.$RemoteAssetEntityTable>('remote_asset_entity'),
-                $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
-                joinBuilder: joinBuilder,
-                $removeJoinBuilderFromRootComposer:
-                    $removeJoinBuilderFromRootComposer,
-              ),
-        );
-    return composer;
-  }
-}
-
-class $$AssetEditEntityTableAnnotationComposer
-    extends i0.Composer<i0.GeneratedDatabase, i1.$AssetEditEntityTable> {
-  $$AssetEditEntityTableAnnotationComposer({
-    required super.$db,
-    required super.$table,
-    super.joinBuilder,
-    super.$addJoinBuilderToRootComposer,
-    super.$removeJoinBuilderFromRootComposer,
-  });
-  i0.GeneratedColumn<String> get id =>
-      $composableBuilder(column: $table.id, builder: (column) => column);
-
-  i0.GeneratedColumnWithTypeConverter<i2.AssetEditAction, int> get action =>
-      $composableBuilder(column: $table.action, builder: (column) => column);
-
-  i0.GeneratedColumnWithTypeConverter<Map<String, Object?>, i3.Uint8List>
-  get parameters => $composableBuilder(
-    column: $table.parameters,
-    builder: (column) => column,
-  );
-
-  i0.GeneratedColumn<int> get sequence =>
-      $composableBuilder(column: $table.sequence, builder: (column) => column);
-
-  i5.$$RemoteAssetEntityTableAnnotationComposer get assetId {
-    final i5.$$RemoteAssetEntityTableAnnotationComposer composer =
-        $composerBuilder(
-          composer: this,
-          getCurrentColumn: (t) => t.assetId,
-          referencedTable: i6.ReadDatabaseContainer(
-            $db,
-          ).resultSet<i5.$RemoteAssetEntityTable>('remote_asset_entity'),
-          getReferencedColumn: (t) => t.id,
-          builder:
-              (
-                joinBuilder, {
-                $addJoinBuilderToRootComposer,
-                $removeJoinBuilderFromRootComposer,
-              }) => i5.$$RemoteAssetEntityTableAnnotationComposer(
-                $db: $db,
-                $table: i6.ReadDatabaseContainer(
-                  $db,
-                ).resultSet<i5.$RemoteAssetEntityTable>('remote_asset_entity'),
-                $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
-                joinBuilder: joinBuilder,
-                $removeJoinBuilderFromRootComposer:
-                    $removeJoinBuilderFromRootComposer,
-              ),
-        );
-    return composer;
-  }
-}
-
-class $$AssetEditEntityTableTableManager
-    extends
-        i0.RootTableManager<
-          i0.GeneratedDatabase,
-          i1.$AssetEditEntityTable,
-          i1.AssetEditEntityData,
-          i1.$$AssetEditEntityTableFilterComposer,
-          i1.$$AssetEditEntityTableOrderingComposer,
-          i1.$$AssetEditEntityTableAnnotationComposer,
-          $$AssetEditEntityTableCreateCompanionBuilder,
-          $$AssetEditEntityTableUpdateCompanionBuilder,
-          (i1.AssetEditEntityData, i1.$$AssetEditEntityTableReferences),
-          i1.AssetEditEntityData,
-          i0.PrefetchHooks Function({bool assetId})
-        > {
-  $$AssetEditEntityTableTableManager(
-    i0.GeneratedDatabase db,
-    i1.$AssetEditEntityTable table,
-  ) : super(
-        i0.TableManagerState(
-          db: db,
-          table: table,
-          createFilteringComposer: () =>
-              i1.$$AssetEditEntityTableFilterComposer($db: db, $table: table),
-          createOrderingComposer: () =>
-              i1.$$AssetEditEntityTableOrderingComposer($db: db, $table: table),
-          createComputedFieldComposer: () => i1
-              .$$AssetEditEntityTableAnnotationComposer($db: db, $table: table),
-          updateCompanionCallback:
-              ({
-                i0.Value<String> id = const i0.Value.absent(),
-                i0.Value<String> assetId = const i0.Value.absent(),
-                i0.Value<i2.AssetEditAction> action = const i0.Value.absent(),
-                i0.Value<Map<String, Object?>> parameters =
-                    const i0.Value.absent(),
-                i0.Value<int> sequence = const i0.Value.absent(),
-              }) => i1.AssetEditEntityCompanion(
-                id: id,
-                assetId: assetId,
-                action: action,
-                parameters: parameters,
-                sequence: sequence,
-              ),
-          createCompanionCallback:
-              ({
-                required String id,
-                required String assetId,
-                required i2.AssetEditAction action,
-                required Map<String, Object?> parameters,
-                required int sequence,
-              }) => i1.AssetEditEntityCompanion.insert(
-                id: id,
-                assetId: assetId,
-                action: action,
-                parameters: parameters,
-                sequence: sequence,
-              ),
-          withReferenceMapper: (p0) => p0
-              .map(
-                (e) => (
-                  e.readTable(table),
-                  i1.$$AssetEditEntityTableReferences(db, table, e),
-                ),
-              )
-              .toList(),
-          prefetchHooksCallback: ({assetId = false}) {
-            return i0.PrefetchHooks(
-              db: db,
-              explicitlyWatchedTables: [],
-              addJoins:
-                  <
-                    T extends i0.TableManagerState<
-                      dynamic,
-                      dynamic,
-                      dynamic,
-                      dynamic,
-                      dynamic,
-                      dynamic,
-                      dynamic,
-                      dynamic,
-                      dynamic,
-                      dynamic,
-                      dynamic
-                    >
-                  >(state) {
-                    if (assetId) {
-                      state =
-                          state.withJoin(
-                                currentTable: table,
-                                currentColumn: table.assetId,
-                                referencedTable: i1
-                                    .$$AssetEditEntityTableReferences
-                                    ._assetIdTable(db),
-                                referencedColumn: i1
-                                    .$$AssetEditEntityTableReferences
-                                    ._assetIdTable(db)
-                                    .id,
-                              )
-                              as T;
-                    }
-
-                    return state;
-                  },
-              getPrefetchedDataCallback: (items) async {
-                return [];
-              },
-            );
-          },
-        ),
-      );
-}
-
-typedef $$AssetEditEntityTableProcessedTableManager =
-    i0.ProcessedTableManager<
-      i0.GeneratedDatabase,
-      i1.$AssetEditEntityTable,
-      i1.AssetEditEntityData,
-      i1.$$AssetEditEntityTableFilterComposer,
-      i1.$$AssetEditEntityTableOrderingComposer,
-      i1.$$AssetEditEntityTableAnnotationComposer,
-      $$AssetEditEntityTableCreateCompanionBuilder,
-      $$AssetEditEntityTableUpdateCompanionBuilder,
-      (i1.AssetEditEntityData, i1.$$AssetEditEntityTableReferences),
-      i1.AssetEditEntityData,
-      i0.PrefetchHooks Function({bool assetId})
-    >;
-
-class $AssetEditEntityTable extends i4.AssetEditEntity
-    with i0.TableInfo<$AssetEditEntityTable, i1.AssetEditEntityData> {
-  @override
-  final i0.GeneratedDatabase attachedDatabase;
-  final String? _alias;
-  $AssetEditEntityTable(this.attachedDatabase, [this._alias]);
-  static const i0.VerificationMeta _idMeta = const i0.VerificationMeta('id');
-  @override
-  late final i0.GeneratedColumn<String> id = i0.GeneratedColumn<String>(
-    'id',
-    aliasedName,
-    false,
-    type: i0.DriftSqlType.string,
-    requiredDuringInsert: true,
-  );
-  static const i0.VerificationMeta _assetIdMeta = const i0.VerificationMeta(
-    'assetId',
-  );
-  @override
-  late final i0.GeneratedColumn<String> assetId = i0.GeneratedColumn<String>(
-    'asset_id',
-    aliasedName,
-    false,
-    type: i0.DriftSqlType.string,
-    requiredDuringInsert: true,
-    defaultConstraints: i0.GeneratedColumn.constraintIsAlways(
-      'REFERENCES remote_asset_entity (id) ON DELETE CASCADE',
-    ),
-  );
-  @override
-  late final i0.GeneratedColumnWithTypeConverter<i2.AssetEditAction, int>
-  action =
-      i0.GeneratedColumn<int>(
-        'action',
-        aliasedName,
-        false,
-        type: i0.DriftSqlType.int,
-        requiredDuringInsert: true,
-      ).withConverter<i2.AssetEditAction>(
-        i1.$AssetEditEntityTable.$converteraction,
-      );
-  @override
-  late final i0.GeneratedColumnWithTypeConverter<
-    Map<String, Object?>,
-    i3.Uint8List
-  >
-  parameters =
-      i0.GeneratedColumn<i3.Uint8List>(
-        'parameters',
-        aliasedName,
-        false,
-        type: i0.DriftSqlType.blob,
-        requiredDuringInsert: true,
-      ).withConverter<Map<String, Object?>>(
-        i1.$AssetEditEntityTable.$converterparameters,
-      );
-  static const i0.VerificationMeta _sequenceMeta = const i0.VerificationMeta(
-    'sequence',
-  );
-  @override
-  late final i0.GeneratedColumn<int> sequence = i0.GeneratedColumn<int>(
-    'sequence',
-    aliasedName,
-    false,
-    type: i0.DriftSqlType.int,
-    requiredDuringInsert: true,
-  );
-  @override
-  List<i0.GeneratedColumn> get $columns => [
-    id,
-    assetId,
-    action,
-    parameters,
-    sequence,
-  ];
-  @override
-  String get aliasedName => _alias ?? actualTableName;
-  @override
-  String get actualTableName => $name;
-  static const String $name = 'asset_edit_entity';
-  @override
-  i0.VerificationContext validateIntegrity(
-    i0.Insertable<i1.AssetEditEntityData> instance, {
-    bool isInserting = false,
-  }) {
-    final context = i0.VerificationContext();
-    final data = instance.toColumns(true);
-    if (data.containsKey('id')) {
-      context.handle(_idMeta, id.isAcceptableOrUnknown(data['id']!, _idMeta));
-    } else if (isInserting) {
-      context.missing(_idMeta);
-    }
-    if (data.containsKey('asset_id')) {
-      context.handle(
-        _assetIdMeta,
-        assetId.isAcceptableOrUnknown(data['asset_id']!, _assetIdMeta),
-      );
-    } else if (isInserting) {
-      context.missing(_assetIdMeta);
-    }
-    if (data.containsKey('sequence')) {
-      context.handle(
-        _sequenceMeta,
-        sequence.isAcceptableOrUnknown(data['sequence']!, _sequenceMeta),
-      );
-    } else if (isInserting) {
-      context.missing(_sequenceMeta);
-    }
-    return context;
-  }
-
-  @override
-  Set<i0.GeneratedColumn> get $primaryKey => {id};
-  @override
-  i1.AssetEditEntityData map(Map<String, dynamic> data, {String? tablePrefix}) {
-    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
-    return i1.AssetEditEntityData(
-      id: attachedDatabase.typeMapping.read(
-        i0.DriftSqlType.string,
-        data['${effectivePrefix}id'],
-      )!,
-      assetId: attachedDatabase.typeMapping.read(
-        i0.DriftSqlType.string,
-        data['${effectivePrefix}asset_id'],
-      )!,
-      action: i1.$AssetEditEntityTable.$converteraction.fromSql(
-        attachedDatabase.typeMapping.read(
-          i0.DriftSqlType.int,
-          data['${effectivePrefix}action'],
-        )!,
-      ),
-      parameters: i1.$AssetEditEntityTable.$converterparameters.fromSql(
-        attachedDatabase.typeMapping.read(
-          i0.DriftSqlType.blob,
-          data['${effectivePrefix}parameters'],
-        )!,
-      ),
-      sequence: attachedDatabase.typeMapping.read(
-        i0.DriftSqlType.int,
-        data['${effectivePrefix}sequence'],
-      )!,
-    );
-  }
-
-  @override
-  $AssetEditEntityTable createAlias(String alias) {
-    return $AssetEditEntityTable(attachedDatabase, alias);
-  }
-
-  static i0.JsonTypeConverter2<i2.AssetEditAction, int, int> $converteraction =
-      const i0.EnumIndexConverter<i2.AssetEditAction>(
-        i2.AssetEditAction.values,
-      );
-  static i0.JsonTypeConverter2<Map<String, Object?>, i3.Uint8List, Object?>
-  $converterparameters = i4.editParameterConverter;
-  @override
-  bool get withoutRowId => true;
-  @override
-  bool get isStrict => true;
-}
-
-class AssetEditEntityData extends i0.DataClass
-    implements i0.Insertable<i1.AssetEditEntityData> {
-  final String id;
-  final String assetId;
-  final i2.AssetEditAction action;
-  final Map<String, Object?> parameters;
-  final int sequence;
-  const AssetEditEntityData({
-    required this.id,
-    required this.assetId,
-    required this.action,
-    required this.parameters,
-    required this.sequence,
-  });
-  @override
-  Map<String, i0.Expression> toColumns(bool nullToAbsent) {
-    final map = <String, i0.Expression>{};
-    map['id'] = i0.Variable<String>(id);
-    map['asset_id'] = i0.Variable<String>(assetId);
-    {
-      map['action'] = i0.Variable<int>(
-        i1.$AssetEditEntityTable.$converteraction.toSql(action),
-      );
-    }
-    {
-      map['parameters'] = i0.Variable<i3.Uint8List>(
-        i1.$AssetEditEntityTable.$converterparameters.toSql(parameters),
-      );
-    }
-    map['sequence'] = i0.Variable<int>(sequence);
-    return map;
-  }
-
-  factory AssetEditEntityData.fromJson(
-    Map<String, dynamic> json, {
-    i0.ValueSerializer? serializer,
-  }) {
-    serializer ??= i0.driftRuntimeOptions.defaultSerializer;
-    return AssetEditEntityData(
-      id: serializer.fromJson<String>(json['id']),
-      assetId: serializer.fromJson<String>(json['assetId']),
-      action: i1.$AssetEditEntityTable.$converteraction.fromJson(
-        serializer.fromJson<int>(json['action']),
-      ),
-      parameters: i1.$AssetEditEntityTable.$converterparameters.fromJson(
-        serializer.fromJson<Object?>(json['parameters']),
-      ),
-      sequence: serializer.fromJson<int>(json['sequence']),
-    );
-  }
-  @override
-  Map<String, dynamic> toJson({i0.ValueSerializer? serializer}) {
-    serializer ??= i0.driftRuntimeOptions.defaultSerializer;
-    return <String, dynamic>{
-      'id': serializer.toJson<String>(id),
-      'assetId': serializer.toJson<String>(assetId),
-      'action': serializer.toJson<int>(
-        i1.$AssetEditEntityTable.$converteraction.toJson(action),
-      ),
-      'parameters': serializer.toJson<Object?>(
-        i1.$AssetEditEntityTable.$converterparameters.toJson(parameters),
-      ),
-      'sequence': serializer.toJson<int>(sequence),
-    };
-  }
-
-  i1.AssetEditEntityData copyWith({
-    String? id,
-    String? assetId,
-    i2.AssetEditAction? action,
-    Map<String, Object?>? parameters,
-    int? sequence,
-  }) => i1.AssetEditEntityData(
-    id: id ?? this.id,
-    assetId: assetId ?? this.assetId,
-    action: action ?? this.action,
-    parameters: parameters ?? this.parameters,
-    sequence: sequence ?? this.sequence,
-  );
-  AssetEditEntityData copyWithCompanion(i1.AssetEditEntityCompanion data) {
-    return AssetEditEntityData(
-      id: data.id.present ? data.id.value : this.id,
-      assetId: data.assetId.present ? data.assetId.value : this.assetId,
-      action: data.action.present ? data.action.value : this.action,
-      parameters: data.parameters.present
-          ? data.parameters.value
-          : this.parameters,
-      sequence: data.sequence.present ? data.sequence.value : this.sequence,
-    );
-  }
-
-  @override
-  String toString() {
-    return (StringBuffer('AssetEditEntityData(')
-          ..write('id: $id, ')
-          ..write('assetId: $assetId, ')
-          ..write('action: $action, ')
-          ..write('parameters: $parameters, ')
-          ..write('sequence: $sequence')
-          ..write(')'))
-        .toString();
-  }
-
-  @override
-  int get hashCode => Object.hash(id, assetId, action, parameters, sequence);
-  @override
-  bool operator ==(Object other) =>
-      identical(this, other) ||
-      (other is i1.AssetEditEntityData &&
-          other.id == this.id &&
-          other.assetId == this.assetId &&
-          other.action == this.action &&
-          other.parameters == this.parameters &&
-          other.sequence == this.sequence);
-}
-
-class AssetEditEntityCompanion
-    extends i0.UpdateCompanion<i1.AssetEditEntityData> {
-  final i0.Value<String> id;
-  final i0.Value<String> assetId;
-  final i0.Value<i2.AssetEditAction> action;
-  final i0.Value<Map<String, Object?>> parameters;
-  final i0.Value<int> sequence;
-  const AssetEditEntityCompanion({
-    this.id = const i0.Value.absent(),
-    this.assetId = const i0.Value.absent(),
-    this.action = const i0.Value.absent(),
-    this.parameters = const i0.Value.absent(),
-    this.sequence = const i0.Value.absent(),
-  });
-  AssetEditEntityCompanion.insert({
-    required String id,
-    required String assetId,
-    required i2.AssetEditAction action,
-    required Map<String, Object?> parameters,
-    required int sequence,
-  }) : id = i0.Value(id),
-       assetId = i0.Value(assetId),
-       action = i0.Value(action),
-       parameters = i0.Value(parameters),
-       sequence = i0.Value(sequence);
-  static i0.Insertable<i1.AssetEditEntityData> custom({
-    i0.Expression<String>? id,
-    i0.Expression<String>? assetId,
-    i0.Expression<int>? action,
-    i0.Expression<i3.Uint8List>? parameters,
-    i0.Expression<int>? sequence,
-  }) {
-    return i0.RawValuesInsertable({
-      if (id != null) 'id': id,
-      if (assetId != null) 'asset_id': assetId,
-      if (action != null) 'action': action,
-      if (parameters != null) 'parameters': parameters,
-      if (sequence != null) 'sequence': sequence,
-    });
-  }
-
-  i1.AssetEditEntityCompanion copyWith({
-    i0.Value<String>? id,
-    i0.Value<String>? assetId,
-    i0.Value<i2.AssetEditAction>? action,
-    i0.Value<Map<String, Object?>>? parameters,
-    i0.Value<int>? sequence,
-  }) {
-    return i1.AssetEditEntityCompanion(
-      id: id ?? this.id,
-      assetId: assetId ?? this.assetId,
-      action: action ?? this.action,
-      parameters: parameters ?? this.parameters,
-      sequence: sequence ?? this.sequence,
-    );
-  }
-
-  @override
-  Map<String, i0.Expression> toColumns(bool nullToAbsent) {
-    final map = <String, i0.Expression>{};
-    if (id.present) {
-      map['id'] = i0.Variable<String>(id.value);
-    }
-    if (assetId.present) {
-      map['asset_id'] = i0.Variable<String>(assetId.value);
-    }
-    if (action.present) {
-      map['action'] = i0.Variable<int>(
-        i1.$AssetEditEntityTable.$converteraction.toSql(action.value),
-      );
-    }
-    if (parameters.present) {
-      map['parameters'] = i0.Variable<i3.Uint8List>(
-        i1.$AssetEditEntityTable.$converterparameters.toSql(parameters.value),
-      );
-    }
-    if (sequence.present) {
-      map['sequence'] = i0.Variable<int>(sequence.value);
-    }
-    return map;
-  }
-
-  @override
-  String toString() {
-    return (StringBuffer('AssetEditEntityCompanion(')
-          ..write('id: $id, ')
-          ..write('assetId: $assetId, ')
-          ..write('action: $action, ')
-          ..write('parameters: $parameters, ')
-          ..write('sequence: $sequence')
-          ..write(')'))
-        .toString();
-  }
-}

mobile/lib/infrastructure/entities/exif.entity.dart

@@ -152,8 +152,6 @@ extension RemoteExifEntityDataDomainEx on RemoteExifEntityData {
     fileSize: fileSize,
     dateTimeOriginal: dateTimeOriginal,
     rating: rating,
-    width: width,
-    height: height,
     timeZone: timeZone,
     make: make,
     model: model,

mobile/lib/infrastructure/entities/remote_asset_cloud_id.entity.dart

@@ -2,6 +2,7 @@ import 'package:drift/drift.dart';
 import 'package:immich_mobile/infrastructure/entities/remote_asset.entity.dart';
 import 'package:immich_mobile/infrastructure/utils/drift_default.mixin.dart';
 
+@TableIndex.sql('CREATE INDEX IF NOT EXISTS idx_remote_asset_cloud_id ON remote_asset_cloud_id_entity (cloud_id)')
 class RemoteAssetCloudIdEntity extends Table with DriftDefaultsMixin {
   TextColumn get assetId => text().references(RemoteAssetEntity, #id, onDelete: KeyAction.cascade)();
 

mobile/lib/infrastructure/entities/remote_asset_cloud_id.entity.drift.dart

@@ -403,6 +403,10 @@ typedef $$RemoteAssetCloudIdEntityTableProcessedTableManager =
       i1.RemoteAssetCloudIdEntityData,
       i0.PrefetchHooks Function({bool assetId})
     >;
+i0.Index get idxRemoteAssetCloudId => i0.Index(
+  'idx_remote_asset_cloud_id',
+  'CREATE INDEX IF NOT EXISTS idx_remote_asset_cloud_id ON remote_asset_cloud_id_entity (cloud_id)',
+);
 
 class $RemoteAssetCloudIdEntityTable extends i2.RemoteAssetCloudIdEntity
     with

mobile/lib/infrastructure/repositories/db.repository.dart

@@ -4,7 +4,6 @@ import 'package:drift/drift.dart';
 import 'package:drift_flutter/drift_flutter.dart';
 import 'package:flutter/foundation.dart';
 import 'package:immich_mobile/domain/interfaces/db.interface.dart';
-import 'package:immich_mobile/infrastructure/entities/asset_edit.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/asset_face.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/auth_user.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/exif.entity.dart';
@@ -67,7 +66,6 @@ class IsarDatabaseRepository implements IDatabaseRepository {
     AssetFaceEntity,
     StoreEntity,
     TrashedLocalAssetEntity,
-    AssetEditEntity,
   ],
   include: {'package:immich_mobile/infrastructure/entities/merged_asset.drift'},
 )
@@ -207,7 +205,7 @@ class Drift extends $Drift implements IDatabaseRepository {
             await m.addColumn(v17.remoteAssetEntity, v17.remoteAssetEntity.isEdited);
           },
           from17To18: (m, v18) async {
-            await m.createTable(v18.assetEditEntity);
+            await m.createIndex(v18.idxRemoteAssetCloudId);
           },
         ),
       );

mobile/lib/infrastructure/repositories/db.repository.drift.dart

@@ -41,11 +41,9 @@ import 'package:immich_mobile/infrastructure/entities/store.entity.drift.dart'
     as i19;
 import 'package:immich_mobile/infrastructure/entities/trashed_local_asset.entity.drift.dart'
     as i20;
-import 'package:immich_mobile/infrastructure/entities/asset_edit.entity.drift.dart'
-    as i21;
 import 'package:immich_mobile/infrastructure/entities/merged_asset.drift.dart'
-    as i22;
-import 'package:drift/internal/modular.dart' as i23;
+    as i21;
+import 'package:drift/internal/modular.dart' as i22;
 
 abstract class $Drift extends i0.GeneratedDatabase {
   $Drift(i0.QueryExecutor e) : super(e);
@@ -87,11 +85,9 @@ abstract class $Drift extends i0.GeneratedDatabase {
   late final i19.$StoreEntityTable storeEntity = i19.$StoreEntityTable(this);
   late final i20.$TrashedLocalAssetEntityTable trashedLocalAssetEntity = i20
       .$TrashedLocalAssetEntityTable(this);
-  late final i21.$AssetEditEntityTable assetEditEntity = i21
-      .$AssetEditEntityTable(this);
-  i22.MergedAssetDrift get mergedAssetDrift => i23.ReadDatabaseContainer(
+  i21.MergedAssetDrift get mergedAssetDrift => i22.ReadDatabaseContainer(
     this,
-  ).accessor<i22.MergedAssetDrift>(i22.MergedAssetDrift.new);
+  ).accessor<i21.MergedAssetDrift>(i21.MergedAssetDrift.new);
   @override
   Iterable<i0.TableInfo<i0.Table, Object?>> get allTables =>
       allSchemaEntities.whereType<i0.TableInfo<i0.Table, Object?>>();
@@ -123,8 +119,8 @@ abstract class $Drift extends i0.GeneratedDatabase {
     assetFaceEntity,
     storeEntity,
     trashedLocalAssetEntity,
-    assetEditEntity,
     i11.idxLatLng,
+    i14.idxRemoteAssetCloudId,
     i20.idxTrashedLocalAssetChecksum,
     i20.idxTrashedLocalAssetAlbum,
   ];
@@ -318,13 +314,6 @@ abstract class $Drift extends i0.GeneratedDatabase {
       ),
       result: [i0.TableUpdate('asset_face_entity', kind: i0.UpdateKind.update)],
     ),
-    i0.WritePropagation(
-      on: i0.TableUpdateQuery.onTableName(
-        'remote_asset_entity',
-        limitUpdateKind: i0.UpdateKind.delete,
-      ),
-      result: [i0.TableUpdate('asset_edit_entity', kind: i0.UpdateKind.delete)],
-    ),
   ]);
   @override
   i0.DriftDatabaseOptions get options =>
@@ -384,6 +373,4 @@ class $DriftManager {
         _db,
         _db.trashedLocalAssetEntity,
       );
-  i21.$$AssetEditEntityTableTableManager get assetEditEntity =>
-      i21.$$AssetEditEntityTableTableManager(_db, _db.assetEditEntity);
 }

mobile/lib/infrastructure/repositories/db.repository.steps.dart

@@ -7439,8 +7439,8 @@ final class Schema18 extends i0.VersionedSchema {
     assetFaceEntity,
     storeEntity,
     trashedLocalAssetEntity,
-    assetEditEntity,
     idxLatLng,
+    idxRemoteAssetCloudId,
     idxTrashedLocalAssetChecksum,
     idxTrashedLocalAssetAlbum,
   ];
@@ -7839,21 +7839,14 @@ final class Schema18 extends i0.VersionedSchema {
     ),
     alias: null,
   );
-  late final Shape29 assetEditEntity = Shape29(
-    source: i0.VersionedTable(
-      entityName: 'asset_edit_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [_column_0, _column_36, _column_102, _column_103, _column_104],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
   final i1.Index idxLatLng = i1.Index(
     'idx_lat_lng',
     'CREATE INDEX IF NOT EXISTS idx_lat_lng ON remote_exif_entity (latitude, longitude)',
   );
+  final i1.Index idxRemoteAssetCloudId = i1.Index(
+    'idx_remote_asset_cloud_id',
+    'CREATE INDEX IF NOT EXISTS idx_remote_asset_cloud_id ON remote_asset_cloud_id_entity (cloud_id)',
+  );
   final i1.Index idxTrashedLocalAssetChecksum = i1.Index(
     'idx_trashed_local_asset_checksum',
     'CREATE INDEX IF NOT EXISTS idx_trashed_local_asset_checksum ON trashed_local_asset_entity (checksum)',
@@ -7864,41 +7857,6 @@ final class Schema18 extends i0.VersionedSchema {
   );
 }
 
-class Shape29 extends i0.VersionedTable {
-  Shape29({required super.source, required super.alias}) : super.aliased();
-  i1.GeneratedColumn<String> get id =>
-      columnsByName['id']! as i1.GeneratedColumn<String>;
-  i1.GeneratedColumn<String> get assetId =>
-      columnsByName['asset_id']! as i1.GeneratedColumn<String>;
-  i1.GeneratedColumn<int> get action =>
-      columnsByName['action']! as i1.GeneratedColumn<int>;
-  i1.GeneratedColumn<i2.Uint8List> get parameters =>
-      columnsByName['parameters']! as i1.GeneratedColumn<i2.Uint8List>;
-  i1.GeneratedColumn<int> get sequence =>
-      columnsByName['sequence']! as i1.GeneratedColumn<int>;
-}
-
-i1.GeneratedColumn<int> _column_102(String aliasedName) =>
-    i1.GeneratedColumn<int>(
-      'action',
-      aliasedName,
-      false,
-      type: i1.DriftSqlType.int,
-    );
-i1.GeneratedColumn<i2.Uint8List> _column_103(String aliasedName) =>
-    i1.GeneratedColumn<i2.Uint8List>(
-      'parameters',
-      aliasedName,
-      false,
-      type: i1.DriftSqlType.blob,
-    );
-i1.GeneratedColumn<int> _column_104(String aliasedName) =>
-    i1.GeneratedColumn<int>(
-      'sequence',
-      aliasedName,
-      false,
-      type: i1.DriftSqlType.int,
-    );
 i0.MigrationStepWithVersion migrationSteps({
   required Future<void> Function(i1.Migrator m, Schema2 schema) from1To2,
   required Future<void> Function(i1.Migrator m, Schema3 schema) from2To3,

mobile/lib/infrastructure/repositories/local_asset.repository.dart

@@ -204,34 +204,24 @@ class DriftLocalAssetRepository extends DriftDatabaseRepository {
     return query.map((row) => row.toDto()).get();
   }
 
-  Future<Map<String, String>> getHashMappingFromCloudId() async {
-    final query =
-        _db.localAssetEntity.selectOnly().join([
-            leftOuterJoin(
-              _db.remoteAssetCloudIdEntity,
-              _db.localAssetEntity.iCloudId.equalsExp(_db.remoteAssetCloudIdEntity.cloudId),
-              useColumns: false,
-            ),
-            leftOuterJoin(
-              _db.remoteAssetEntity,
-              _db.remoteAssetCloudIdEntity.assetId.equalsExp(_db.remoteAssetEntity.id),
-              useColumns: false,
-            ),
-          ])
-          ..addColumns([_db.localAssetEntity.id, _db.remoteAssetEntity.checksum])
-          ..where(
-            _db.remoteAssetCloudIdEntity.cloudId.isNotNull() &
-                _db.localAssetEntity.checksum.isNull() &
-                ((_db.remoteAssetCloudIdEntity.adjustmentTime.isExp(_db.localAssetEntity.adjustmentTime)) &
-                    (_db.remoteAssetCloudIdEntity.latitude.isExp(_db.localAssetEntity.latitude)) &
-                    (_db.remoteAssetCloudIdEntity.longitude.isExp(_db.localAssetEntity.longitude)) &
-                    (_db.remoteAssetCloudIdEntity.createdAt.isExp(_db.localAssetEntity.createdAt))),
-          );
-    final mapping = await query
-        .map(
-          (row) => (assetId: row.read(_db.localAssetEntity.id)!, checksum: row.read(_db.remoteAssetEntity.checksum)!),
-        )
-        .get();
-    return {for (final entry in mapping) entry.assetId: entry.checksum};
+  Future<void> reconcileHashesFromCloudId() async {
+    await _db.customUpdate(
+      '''
+      UPDATE local_asset_entity
+      SET checksum = remote_asset_entity.checksum
+      FROM remote_asset_cloud_id_entity
+      INNER JOIN remote_asset_entity
+        ON remote_asset_cloud_id_entity.asset_id = remote_asset_entity.id
+      WHERE local_asset_entity.i_cloud_id = remote_asset_cloud_id_entity.cloud_id
+        AND local_asset_entity.i_cloud_id IS NOT NULL
+        AND local_asset_entity.checksum IS NULL
+        AND remote_asset_cloud_id_entity.adjustment_time IS local_asset_entity.adjustment_time
+        AND remote_asset_cloud_id_entity.latitude IS local_asset_entity.latitude
+        AND remote_asset_cloud_id_entity.longitude IS local_asset_entity.longitude
+        AND remote_asset_cloud_id_entity.created_at IS local_asset_entity.created_at
+      ''',
+      updates: {_db.localAssetEntity},
+      updateKind: UpdateKind.update,
+    );
   }
 }

mobile/lib/infrastructure/repositories/remote_asset.repository.dart

@@ -1,10 +1,7 @@
 import 'package:drift/drift.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
-import 'package:immich_mobile/domain/models/asset_edit.model.dart';
 import 'package:immich_mobile/domain/models/exif.model.dart';
 import 'package:immich_mobile/domain/models/stack.model.dart';
-import 'package:immich_mobile/infrastructure/entities/asset_edit.entity.dart';
-import 'package:immich_mobile/infrastructure/entities/asset_edit.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/exif.entity.dart' hide ExifInfo;
 import 'package:immich_mobile/infrastructure/entities/exif.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/remote_asset.entity.dart';
@@ -12,7 +9,6 @@ import 'package:immich_mobile/infrastructure/entities/remote_asset.entity.drift.
 import 'package:immich_mobile/infrastructure/entities/stack.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
 import 'package:maplibre_gl/maplibre_gl.dart';
-import 'package:uuid/uuid.dart';
 
 class RemoteAssetRepository extends DriftDatabaseRepository {
   final Drift _db;
@@ -268,35 +264,4 @@ class RemoteAssetRepository extends DriftDatabaseRepository {
   Future<int> getCount() {
     return _db.managers.remoteAssetEntity.count();
   }
-
-  Future<List<AssetEdit>> getAssetEdits(String assetId) async {
-    final query = _db.assetEditEntity.select()
-      ..where((row) => row.assetId.equals(assetId))
-      ..orderBy([(row) => OrderingTerm.asc(row.sequence)]);
-
-    return query.map((row) => row.toDto()).get();
-  }
-
-  Future<void> editAsset(String assetId, List<AssetEdit> edits) async {
-    await _db.transaction(() async {
-      await _db.batch((batch) async {
-        // delete existing edits
-        batch.deleteWhere(_db.assetEditEntity, (row) => row.assetId.equals(assetId));
-
-        // insert new edits
-        for (var i = 0; i < edits.length; i++) {
-          final edit = edits[i];
-          final companion = AssetEditEntityCompanion(
-            id: Value(const Uuid().v4()),
-            assetId: Value(assetId),
-            action: Value(edit.action),
-            parameters: Value(edit.parameters),
-            sequence: Value(i),
-          );
-
-          batch.insert(_db.assetEditEntity, companion);
-        }
-      });
-    });
-  }
 }

mobile/lib/infrastructure/repositories/sync_api.repository.dart

@@ -45,7 +45,6 @@ class SyncApiRepository {
           SyncRequestType.usersV1,
           SyncRequestType.assetsV1,
           SyncRequestType.assetExifsV1,
-          SyncRequestType.assetEditsV1,
           SyncRequestType.assetMetadataV1,
           SyncRequestType.partnersV1,
           SyncRequestType.partnerAssetsV1,
@@ -150,8 +149,6 @@ const _kResponseMap = <SyncEntityType, Function(Object)>{
   SyncEntityType.assetV1: SyncAssetV1.fromJson,
   SyncEntityType.assetDeleteV1: SyncAssetDeleteV1.fromJson,
   SyncEntityType.assetExifV1: SyncAssetExifV1.fromJson,
-  SyncEntityType.assetEditV1: SyncAssetEditV1.fromJson,
-  SyncEntityType.assetEditDeleteV1: SyncAssetEditDeleteV1.fromJson,
   SyncEntityType.assetMetadataV1: SyncAssetMetadataV1.fromJson,
   SyncEntityType.assetMetadataDeleteV1: SyncAssetMetadataDeleteV1.fromJson,
   SyncEntityType.partnerAssetV1: SyncAssetV1.fromJson,

mobile/lib/infrastructure/repositories/sync_stream.repository.dart

@@ -5,11 +5,9 @@ import 'package:drift/drift.dart';
 import 'package:immich_mobile/constants/constants.dart';
 import 'package:immich_mobile/domain/models/album/album.model.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
-import 'package:immich_mobile/domain/models/asset_edit.model.dart';
 import 'package:immich_mobile/domain/models/memory.model.dart';
 import 'package:immich_mobile/domain/models/user.model.dart';
 import 'package:immich_mobile/domain/models/user_metadata.model.dart';
-import 'package:immich_mobile/infrastructure/entities/asset_edit.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/asset_face.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/auth_user.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/exif.entity.drift.dart';
@@ -28,8 +26,8 @@ import 'package:immich_mobile/infrastructure/entities/user_metadata.entity.drift
 import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
 import 'package:immich_mobile/infrastructure/utils/exif.converter.dart';
 import 'package:logging/logging.dart';
-import 'package:openapi/api.dart' as api show AssetVisibility, AlbumUserRole, UserMetadataKey, AssetEditAction;
-import 'package:openapi/api.dart' hide AssetVisibility, AlbumUserRole, UserMetadataKey, AssetEditAction;
+import 'package:openapi/api.dart' as api show AssetVisibility, AlbumUserRole, UserMetadataKey;
+import 'package:openapi/api.dart' hide AssetVisibility, AlbumUserRole, UserMetadataKey;
 
 class SyncStreamRepository extends DriftDatabaseRepository {
   final Logger _logger = Logger('DriftSyncStreamRepository');
@@ -60,7 +58,6 @@ class SyncStreamRepository extends DriftDatabaseRepository {
           await _db.userEntity.deleteAll();
           await _db.userMetadataEntity.deleteAll();
           await _db.remoteAssetCloudIdEntity.deleteAll();
-          await _db.assetEditEntity.deleteAll();
         });
         await _db.customStatement('PRAGMA foreign_keys = ON');
       });
@@ -281,40 +278,6 @@ class SyncStreamRepository extends DriftDatabaseRepository {
     }
   }
 
-  Future<void> updateAssetEditsV1(Iterable<SyncAssetEditV1> data, {String debugLabel = 'user'}) async {
-    try {
-      await _db.batch((batch) {
-        for (final edit in data) {
-          final companion = AssetEditEntityCompanion(
-            id: Value(edit.id),
-            assetId: Value(edit.assetId),
-            action: Value(edit.action.toAssetEditAction()),
-            parameters: Value(edit.parameters as Map<String, Object?>),
-            sequence: Value(edit.sequence),
-          );
-
-          batch.insert(_db.assetEditEntity, companion, onConflict: DoUpdate((_) => companion));
-        }
-      });
-    } catch (error, stack) {
-      _logger.severe('Error: updateAssetEditsV1 - $debugLabel', error, stack);
-      rethrow;
-    }
-  }
-
-  Future<void> deleteAssetEditsV1(Iterable<SyncAssetEditDeleteV1> data, {String debugLabel = 'user'}) async {
-    try {
-      await _db.batch((batch) {
-        for (final edit in data) {
-          batch.deleteWhere(_db.assetEditEntity, (row) => row.assetId.equals(edit.assetId));
-        }
-      });
-    } catch (error, stack) {
-      _logger.severe('Error: deleteAssetEditsV1 - $debugLabel', error, stack);
-      rethrow;
-    }
-  }
-
   Future<void> deleteAssetsMetadataV1(Iterable<SyncAssetMetadataDeleteV1> data) async {
     try {
       await _db.batch((batch) {
@@ -804,12 +767,3 @@ extension on String {
 extension on UserAvatarColor {
   AvatarColor? toAvatarColor() => AvatarColor.values.firstWhereOrNull((c) => c.name == value);
 }
-
-extension on api.AssetEditAction {
-  AssetEditAction toAssetEditAction() => switch (this) {
-    api.AssetEditAction.crop => AssetEditAction.crop,
-    api.AssetEditAction.rotate => AssetEditAction.rotate,
-    api.AssetEditAction.mirror => AssetEditAction.mirror,
-    _ => AssetEditAction.other,
-  };
-}

mobile/lib/presentation/pages/drift_edit.page.dart

@@ -1,476 +0,0 @@
-import 'dart:async';
-import 'dart:math';
-
-import 'package:auto_route/auto_route.dart';
-import 'package:collection/collection.dart';
-import 'package:crop_image/crop_image.dart';
-import 'package:easy_localization/easy_localization.dart';
-import 'package:flutter/material.dart';
-import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/constants/enums.dart';
-import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
-import 'package:immich_mobile/domain/models/asset_edit.model.dart';
-import 'package:immich_mobile/domain/models/exif.model.dart';
-import 'package:immich_mobile/extensions/build_context_extensions.dart';
-import 'package:immich_mobile/providers/infrastructure/action.provider.dart';
-import 'package:immich_mobile/providers/theme.provider.dart';
-import 'package:immich_mobile/providers/websocket.provider.dart';
-import 'package:immich_mobile/theme/theme_data.dart';
-import 'package:immich_mobile/utils/editor.utils.dart';
-import 'package:immich_mobile/widgets/common/immich_toast.dart';
-import 'package:immich_ui/immich_ui.dart';
-import 'package:openapi/api.dart' show CropParameters, RotateParameters, MirrorParameters, MirrorAxis;
-
-@RoutePage()
-class DriftEditImagePage extends ConsumerStatefulWidget {
-  final Image image;
-  final BaseAsset asset;
-  final List<AssetEdit> edits;
-  final ExifInfo exifInfo;
-
-  const DriftEditImagePage({
-    super.key,
-    required this.image,
-    required this.asset,
-    required this.edits,
-    required this.exifInfo,
-  });
-
-  @override
-  ConsumerState<DriftEditImagePage> createState() => _DriftEditImagePageState();
-}
-
-class _DriftEditImagePageState extends ConsumerState<DriftEditImagePage> with TickerProviderStateMixin {
-  late final CropController cropController;
-
-  Duration _rotationAnimationDuration = const Duration(milliseconds: 250);
-
-  int _rotationAngle = 0;
-  bool _flipHorizontal = false;
-  bool _flipVertical = false;
-
-  double? aspectRatio;
-
-  late final originalWidth = widget.exifInfo.isFlipped ? widget.exifInfo.height : widget.exifInfo.width;
-  late final originalHeight = widget.exifInfo.isFlipped ? widget.exifInfo.width : widget.exifInfo.height;
-
-  bool isEditing = false;
-
-  void initEditor() {
-    final existingCrop = widget.edits.firstWhereOrNull((edit) => edit.action == AssetEditAction.crop);
-
-    Rect crop = existingCrop != null && originalWidth != null && originalHeight != null
-        ? convertCropParametersToRect(
-            CropParameters.fromJson(existingCrop.parameters)!,
-            originalWidth!,
-            originalHeight!,
-          )
-        : const Rect.fromLTRB(0, 0, 1, 1);
-
-    cropController = CropController(defaultCrop: crop);
-
-    final (rotationAngle, flipHorizontal, flipVertical) = normalizeTransformEdits(widget.edits);
-
-    // dont animate to initial rotation
-    _rotationAnimationDuration = const Duration(milliseconds: 0);
-    _rotationAngle = rotationAngle.toInt();
-
-    _flipHorizontal = flipHorizontal;
-    _flipVertical = flipVertical;
-  }
-
-  Future<void> _saveEditedImage() async {
-    setState(() {
-      isEditing = true;
-    });
-
-    final cropParameters = convertRectToCropParameters(cropController.crop, originalWidth ?? 0, originalHeight ?? 0);
-    final normalizedRotation = (_rotationAngle % 360 + 360) % 360;
-    final edits = <AssetEdit>[];
-
-    if (cropParameters.width != originalWidth || cropParameters.height != originalHeight) {
-      edits.add(AssetEdit(action: AssetEditAction.crop, parameters: cropParameters.toJson()));
-    }
-
-    if (_flipHorizontal) {
-      edits.add(
-        AssetEdit(
-          action: AssetEditAction.mirror,
-          parameters: MirrorParameters(axis: MirrorAxis.horizontal).toJson(),
-        ),
-      );
-    }
-
-    if (_flipVertical) {
-      edits.add(
-        AssetEdit(
-          action: AssetEditAction.mirror,
-          parameters: MirrorParameters(axis: MirrorAxis.vertical).toJson(),
-        ),
-      );
-    }
-
-    if (normalizedRotation != 0) {
-      edits.add(
-        AssetEdit(
-          action: AssetEditAction.rotate,
-          parameters: RotateParameters(angle: normalizedRotation).toJson(),
-        ),
-      );
-    }
-
-    try {
-      final completer = ref.read(websocketProvider.notifier).waitForEvent("AssetEditReadyV1", (dynamic data) {
-        final eventData = data as Map<String, dynamic>;
-        return eventData["asset"]['id'] == widget.asset.remoteId;
-      }, const Duration(seconds: 10));
-
-      await ref.read(actionProvider.notifier).applyEdits(ActionSource.viewer, edits);
-      await completer;
-
-      ImmichToast.show(context: context, msg: 'asset_edit_success'.tr(), toastType: ToastType.success);
-
-      context.pop();
-    } catch (e) {
-      if (mounted) {
-        ImmichToast.show(context: context, msg: 'asset_edit_failed'.tr(), toastType: ToastType.error);
-      }
-      return;
-    } finally {
-      setState(() {
-        isEditing = false;
-      });
-    }
-  }
-
-  @override
-  void initState() {
-    super.initState();
-    initEditor();
-  }
-
-  @override
-  void dispose() {
-    cropController.dispose();
-    super.dispose();
-  }
-
-  Widget _buildProgressIndicator() {
-    return const Padding(
-      padding: EdgeInsets.all(8.0),
-      child: SizedBox(width: 28, height: 28, child: CircularProgressIndicator(strokeWidth: 2.5)),
-    );
-  }
-
-  void _rotateLeft() {
-    setState(() {
-      _rotationAnimationDuration = const Duration(milliseconds: 150);
-      _rotationAngle -= 90;
-    });
-  }
-
-  void _rotateRight() {
-    setState(() {
-      _rotationAnimationDuration = const Duration(milliseconds: 150);
-      _rotationAngle += 90;
-    });
-  }
-
-  void _flipHorizontally() {
-    setState(() {
-      if (_rotationAngle % 180 != 0) {
-        // When rotated 90 or 270 degrees, flipping horizontally is equivalent to flipping vertically
-        _flipVertical = !_flipVertical;
-      } else {
-        _flipHorizontal = !_flipHorizontal;
-      }
-    });
-  }
-
-  void _flipVertically() {
-    setState(() {
-      if (_rotationAngle % 180 != 0) {
-        // When rotated 90 or 270 degrees, flipping vertically is equivalent to flipping horizontally
-        _flipHorizontal = !_flipHorizontal;
-      } else {
-        _flipVertical = !_flipVertical;
-      }
-    });
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return Theme(
-      data: getThemeData(colorScheme: ref.watch(immichThemeProvider).dark, locale: context.locale),
-      child: Scaffold(
-        appBar: AppBar(
-          backgroundColor: Colors.black,
-          title: Text("edit".tr()),
-          leading: const ImmichCloseButton(),
-          actions: [
-            isEditing
-                ? _buildProgressIndicator()
-                : ImmichIconButton(
-                    icon: Icons.done_rounded,
-                    color: ImmichColor.primary,
-                    variant: ImmichVariant.ghost,
-                    onPressed: _saveEditedImage,
-                  ),
-          ],
-        ),
-        backgroundColor: Colors.black,
-        body: SafeArea(
-          bottom: false,
-          child: LayoutBuilder(
-            builder: (BuildContext context, BoxConstraints constraints) {
-              // Calculate the bounding box size needed for the rotated container
-              final baseWidth = constraints.maxWidth * 0.9;
-              final baseHeight = constraints.maxHeight * 0.8;
-
-              return Column(
-                children: [
-                  SizedBox(
-                    width: constraints.maxWidth,
-                    height: constraints.maxHeight * 0.7,
-                    child: Center(
-                      child: AnimatedRotation(
-                        turns: _rotationAngle / 360,
-                        duration: _rotationAnimationDuration,
-                        curve: Curves.easeInOut,
-                        child: Transform(
-                          alignment: Alignment.center,
-                          transform: Matrix4.identity()
-                            ..scaleByDouble(_flipHorizontal ? -1.0 : 1.0, _flipVertical ? -1.0 : 1.0, 1.0, 1.0),
-                          child: Container(
-                            padding: const EdgeInsets.all(10),
-                            width: (_rotationAngle % 180 == 0) ? baseWidth : baseHeight,
-                            height: (_rotationAngle % 180 == 0) ? baseHeight : baseWidth,
-                            child: CropImage(controller: cropController, image: widget.image, gridColor: Colors.white),
-                          ),
-                        ),
-                      ),
-                    ),
-                  ),
-                  Expanded(
-                    child: Container(
-                      width: double.infinity,
-                      decoration: BoxDecoration(
-                        color: context.scaffoldBackgroundColor,
-                        borderRadius: const BorderRadius.only(
-                          topLeft: Radius.circular(20),
-                          topRight: Radius.circular(20),
-                        ),
-                      ),
-                      child: Center(
-                        child: Column(
-                          mainAxisAlignment: MainAxisAlignment.center,
-                          children: [
-                            Padding(
-                              padding: const EdgeInsets.only(left: 20, right: 20, top: 20, bottom: 10),
-                              child: Row(
-                                mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                                children: [
-                                  Row(
-                                    children: [
-                                      ImmichIconButton(
-                                        icon: Icons.rotate_left,
-                                        variant: ImmichVariant.ghost,
-                                        color: ImmichColor.secondary,
-                                        onPressed: _rotateLeft,
-                                      ),
-                                      const SizedBox(width: 8),
-                                      ImmichIconButton(
-                                        icon: Icons.rotate_right,
-                                        variant: ImmichVariant.ghost,
-                                        color: ImmichColor.secondary,
-                                        onPressed: _rotateRight,
-                                      ),
-                                    ],
-                                  ),
-                                  Row(
-                                    children: [
-                                      ImmichIconButton(
-                                        icon: Icons.flip,
-                                        variant: ImmichVariant.ghost,
-                                        color: _flipHorizontal ? ImmichColor.primary : ImmichColor.secondary,
-                                        onPressed: _flipHorizontally,
-                                      ),
-                                      const SizedBox(width: 8),
-                                      Transform.rotate(
-                                        angle: pi / 2,
-                                        child: ImmichIconButton(
-                                          icon: Icons.flip,
-                                          variant: ImmichVariant.ghost,
-                                          color: _flipVertical ? ImmichColor.primary : ImmichColor.secondary,
-                                          onPressed: _flipVertically,
-                                        ),
-                                      ),
-                                    ],
-                                  ),
-                                ],
-                              ),
-                            ),
-                            SingleChildScrollView(
-                              scrollDirection: Axis.horizontal,
-                              padding: const EdgeInsets.symmetric(horizontal: 20),
-                              child: Row(
-                                spacing: 12,
-                                children: <Widget>[
-                                  _AspectRatioButton(
-                                    cropController: cropController,
-                                    currentAspectRatio: aspectRatio,
-                                    ratio: null,
-                                    label: 'Free',
-                                    onPressed: () {
-                                      setState(() {
-                                        aspectRatio = null;
-                                        cropController.aspectRatio = null;
-                                      });
-                                    },
-                                  ),
-                                  _AspectRatioButton(
-                                    cropController: cropController,
-                                    currentAspectRatio: aspectRatio,
-                                    ratio: 1.0,
-                                    label: '1:1',
-                                    onPressed: () {
-                                      setState(() {
-                                        aspectRatio = 1.0;
-                                        cropController.aspectRatio = 1.0;
-                                      });
-                                    },
-                                  ),
-                                  _AspectRatioButton(
-                                    cropController: cropController,
-                                    currentAspectRatio: aspectRatio,
-                                    ratio: 16.0 / 9.0,
-                                    label: '16:9',
-                                    onPressed: () {
-                                      setState(() {
-                                        aspectRatio = 16.0 / 9.0;
-                                        cropController.aspectRatio = 16.0 / 9.0;
-                                      });
-                                    },
-                                  ),
-                                  _AspectRatioButton(
-                                    cropController: cropController,
-                                    currentAspectRatio: aspectRatio,
-                                    ratio: 3.0 / 2.0,
-                                    label: '3:2',
-                                    onPressed: () {
-                                      setState(() {
-                                        aspectRatio = 3.0 / 2.0;
-                                        cropController.aspectRatio = 3.0 / 2.0;
-                                      });
-                                    },
-                                  ),
-                                  _AspectRatioButton(
-                                    cropController: cropController,
-                                    currentAspectRatio: aspectRatio,
-                                    ratio: 7.0 / 5.0,
-                                    label: '7:5',
-                                    onPressed: () {
-                                      setState(() {
-                                        aspectRatio = 7.0 / 5.0;
-                                        cropController.aspectRatio = 7.0 / 5.0;
-                                      });
-                                    },
-                                  ),
-                                  _AspectRatioButton(
-                                    cropController: cropController,
-                                    currentAspectRatio: aspectRatio,
-                                    ratio: 9.0 / 16.0,
-                                    label: '9:16',
-                                    onPressed: () {
-                                      setState(() {
-                                        aspectRatio = 9.0 / 16.0;
-                                        cropController.aspectRatio = 9.0 / 16.0;
-                                      });
-                                    },
-                                  ),
-                                  _AspectRatioButton(
-                                    cropController: cropController,
-                                    currentAspectRatio: aspectRatio,
-                                    ratio: 2.0 / 3.0,
-                                    label: '2:3',
-                                    onPressed: () {
-                                      setState(() {
-                                        aspectRatio = 2.0 / 3.0;
-                                        cropController.aspectRatio = 2.0 / 3.0;
-                                      });
-                                    },
-                                  ),
-                                  _AspectRatioButton(
-                                    cropController: cropController,
-                                    currentAspectRatio: aspectRatio,
-                                    ratio: 5.0 / 7.0,
-                                    label: '5:7',
-                                    onPressed: () {
-                                      setState(() {
-                                        aspectRatio = 5.0 / 7.0;
-                                        cropController.aspectRatio = 5.0 / 7.0;
-                                      });
-                                    },
-                                  ),
-                                ],
-                              ),
-                            ),
-                            const Spacer(),
-                          ],
-                        ),
-                      ),
-                    ),
-                  ),
-                ],
-              );
-            },
-          ),
-        ),
-      ),
-    );
-  }
-}
-
-class _AspectRatioButton extends StatelessWidget {
-  final CropController cropController;
-  final double? currentAspectRatio;
-  final double? ratio;
-  final String label;
-  final VoidCallback onPressed;
-
-  const _AspectRatioButton({
-    required this.cropController,
-    required this.currentAspectRatio,
-    required this.ratio,
-    required this.label,
-    required this.onPressed,
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    return Column(
-      mainAxisSize: MainAxisSize.max,
-      children: [
-        IconButton(
-          iconSize: 36,
-          icon: Transform.rotate(
-            angle: (ratio ?? 1.0) < 1.0 ? pi / 2 : 0,
-            child: Icon(switch (label) {
-              'Free' => Icons.crop_free_rounded,
-              '1:1' => Icons.crop_square_rounded,
-              '16:9' => Icons.crop_16_9_rounded,
-              '3:2' => Icons.crop_3_2_rounded,
-              '7:5' => Icons.crop_7_5_rounded,
-              '9:16' => Icons.crop_16_9_rounded,
-              '2:3' => Icons.crop_3_2_rounded,
-              '5:7' => Icons.crop_7_5_rounded,
-              _ => Icons.crop_free_rounded,
-            }, color: currentAspectRatio == ratio ? context.primaryColor : context.themeData.iconTheme.color),
-          ),
-          onPressed: onPressed,
-        ),
-        Text(label, style: context.textTheme.displayMedium),
-      ],
-    );
-  }
-}

mobile/lib/presentation/pages/editing/drift_crop.page.dart

@@ -0,0 +1,179 @@
+import 'dart:async';
+
+import 'package:auto_route/auto_route.dart';
+import 'package:crop_image/crop_image.dart';
+import 'package:easy_localization/easy_localization.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_hooks/flutter_hooks.dart';
+import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
+import 'package:immich_mobile/extensions/build_context_extensions.dart';
+import 'package:immich_mobile/routing/router.dart';
+import 'package:immich_mobile/utils/hooks/crop_controller_hook.dart';
+import 'package:immich_ui/immich_ui.dart';
+
+/// A widget for cropping an image.
+/// This widget uses [HookWidget] to manage its lifecycle and state. It allows
+/// users to crop an image and then navigate to the [EditImagePage] with the
+/// cropped image.
+
+@RoutePage()
+class DriftCropImagePage extends HookWidget {
+  final Image image;
+  final BaseAsset asset;
+  const DriftCropImagePage({super.key, required this.image, required this.asset});
+
+  @override
+  Widget build(BuildContext context) {
+    final cropController = useCropController();
+    final aspectRatio = useState<double?>(null);
+
+    return Scaffold(
+      appBar: AppBar(
+        backgroundColor: context.scaffoldBackgroundColor,
+        title: Text("crop".tr()),
+        leading: const ImmichCloseButton(),
+        actions: [
+          ImmichIconButton(
+            icon: Icons.done_rounded,
+            color: ImmichColor.primary,
+            variant: ImmichVariant.ghost,
+            onPressed: () async {
+              final croppedImage = await cropController.croppedImage();
+              unawaited(context.pushRoute(DriftEditImageRoute(asset: asset, image: croppedImage, isEdited: true)));
+            },
+          ),
+        ],
+      ),
+      backgroundColor: context.scaffoldBackgroundColor,
+      body: SafeArea(
+        child: LayoutBuilder(
+          builder: (BuildContext context, BoxConstraints constraints) {
+            return Column(
+              children: [
+                Container(
+                  padding: const EdgeInsets.only(top: 20),
+                  width: constraints.maxWidth * 0.9,
+                  height: constraints.maxHeight * 0.6,
+                  child: CropImage(controller: cropController, image: image, gridColor: Colors.white),
+                ),
+                Expanded(
+                  child: Container(
+                    width: double.infinity,
+                    decoration: BoxDecoration(
+                      color: context.scaffoldBackgroundColor,
+                      borderRadius: const BorderRadius.only(
+                        topLeft: Radius.circular(20),
+                        topRight: Radius.circular(20),
+                      ),
+                    ),
+                    child: Center(
+                      child: Column(
+                        mainAxisAlignment: MainAxisAlignment.center,
+                        children: [
+                          Padding(
+                            padding: const EdgeInsets.only(left: 20, right: 20, bottom: 10),
+                            child: Row(
+                              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                              children: [
+                                ImmichIconButton(
+                                  icon: Icons.rotate_left,
+                                  variant: ImmichVariant.ghost,
+                                  color: ImmichColor.secondary,
+                                  onPressed: () => cropController.rotateLeft(),
+                                ),
+                                ImmichIconButton(
+                                  icon: Icons.rotate_right,
+                                  variant: ImmichVariant.ghost,
+                                  color: ImmichColor.secondary,
+                                  onPressed: () => cropController.rotateRight(),
+                                ),
+                              ],
+                            ),
+                          ),
+                          Row(
+                            mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+                            children: <Widget>[
+                              _AspectRatioButton(
+                                cropController: cropController,
+                                aspectRatio: aspectRatio,
+                                ratio: null,
+                                label: 'Free',
+                              ),
+                              _AspectRatioButton(
+                                cropController: cropController,
+                                aspectRatio: aspectRatio,
+                                ratio: 1.0,
+                                label: '1:1',
+                              ),
+                              _AspectRatioButton(
+                                cropController: cropController,
+                                aspectRatio: aspectRatio,
+                                ratio: 16.0 / 9.0,
+                                label: '16:9',
+                              ),
+                              _AspectRatioButton(
+                                cropController: cropController,
+                                aspectRatio: aspectRatio,
+                                ratio: 3.0 / 2.0,
+                                label: '3:2',
+                              ),
+                              _AspectRatioButton(
+                                cropController: cropController,
+                                aspectRatio: aspectRatio,
+                                ratio: 7.0 / 5.0,
+                                label: '7:5',
+                              ),
+                            ],
+                          ),
+                        ],
+                      ),
+                    ),
+                  ),
+                ),
+              ],
+            );
+          },
+        ),
+      ),
+    );
+  }
+}
+
+class _AspectRatioButton extends StatelessWidget {
+  final CropController cropController;
+  final ValueNotifier<double?> aspectRatio;
+  final double? ratio;
+  final String label;
+
+  const _AspectRatioButton({
+    required this.cropController,
+    required this.aspectRatio,
+    required this.ratio,
+    required this.label,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return Column(
+      mainAxisSize: MainAxisSize.min,
+      children: [
+        IconButton(
+          icon: Icon(switch (label) {
+            'Free' => Icons.crop_free_rounded,
+            '1:1' => Icons.crop_square_rounded,
+            '16:9' => Icons.crop_16_9_rounded,
+            '3:2' => Icons.crop_3_2_rounded,
+            '7:5' => Icons.crop_7_5_rounded,
+            _ => Icons.crop_free_rounded,
+          }, color: aspectRatio.value == ratio ? context.primaryColor : context.themeData.iconTheme.color),
+          onPressed: () {
+            cropController.crop = const Rect.fromLTRB(0.1, 0.1, 0.9, 0.9);
+            aspectRatio.value = ratio;
+            cropController.aspectRatio = ratio;
+          },
+        ),
+        Text(label, style: context.textTheme.displayMedium),
+      ],
+    );
+  }
+}

mobile/lib/presentation/pages/editing/drift_edit.page.dart

@@ -0,0 +1,171 @@
+import 'dart:async';
+import 'dart:ui';
+
+import 'package:auto_route/auto_route.dart';
+import 'package:cancellation_token_http/http.dart';
+import 'package:easy_localization/easy_localization.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
+import 'package:immich_mobile/entities/asset.entity.dart';
+import 'package:immich_mobile/extensions/build_context_extensions.dart';
+import 'package:immich_mobile/providers/background_sync.provider.dart';
+import 'package:immich_mobile/repositories/file_media.repository.dart';
+import 'package:immich_mobile/routing/router.dart';
+import 'package:immich_mobile/services/foreground_upload.service.dart';
+import 'package:immich_mobile/widgets/common/immich_toast.dart';
+import 'package:logging/logging.dart';
+import 'package:path/path.dart' as p;
+
+/// A stateless widget that provides functionality for editing an image.
+///
+/// This widget allows users to edit an image provided either as an [Asset] or
+/// directly as an [Image]. It ensures that exactly one of these is provided.
+///
+/// It also includes a conversion method to convert an [Image] to a [Uint8List] to save the image on the user's phone
+/// They automatically navigate to the [HomePage] with the edited image saved and they eventually get backed up to the server.
+@immutable
+@RoutePage()
+class DriftEditImagePage extends ConsumerWidget {
+  final BaseAsset asset;
+  final Image image;
+  final bool isEdited;
+
+  const DriftEditImagePage({super.key, required this.asset, required this.image, required this.isEdited});
+  Future<Uint8List> _imageToUint8List(Image image) async {
+    final Completer<Uint8List> completer = Completer();
+    image.image
+        .resolve(const ImageConfiguration())
+        .addListener(
+          ImageStreamListener((ImageInfo info, bool _) {
+            info.image.toByteData(format: ImageByteFormat.png).then((byteData) {
+              if (byteData != null) {
+                completer.complete(byteData.buffer.asUint8List());
+              } else {
+                completer.completeError('Failed to convert image to bytes');
+              }
+            });
+          }, onError: (exception, stackTrace) => completer.completeError(exception)),
+        );
+    return completer.future;
+  }
+
+  void _exitEditing(BuildContext context) {
+    // this assumes that the only way to get to this page is from the AssetViewerRoute
+    context.navigator.popUntil((route) => route.data?.name == AssetViewerRoute.name);
+  }
+
+  Future<void> _saveEditedImage(BuildContext context, BaseAsset asset, Image image, WidgetRef ref) async {
+    try {
+      final Uint8List imageData = await _imageToUint8List(image);
+      LocalAsset? localAsset;
+
+      try {
+        localAsset = await ref
+            .read(fileMediaRepositoryProvider)
+            .saveLocalAsset(imageData, title: "${p.withoutExtension(asset.name)}_edited.jpg");
+      } on PlatformException catch (e) {
+        // OS might not return the saved image back, so we handle that gracefully
+        // This can happen if app does not have full library access
+        Logger("SaveEditedImage").warning("Failed to retrieve the saved image back from OS", e);
+      }
+
+      unawaited(ref.read(backgroundSyncProvider).syncLocal(full: true));
+      _exitEditing(context);
+      ImmichToast.show(durationInSecond: 3, context: context, msg: 'Image Saved!');
+
+      if (localAsset == null) {
+        return;
+      }
+
+      await ref.read(foregroundUploadServiceProvider).uploadManual([localAsset], CancellationToken());
+    } catch (e) {
+      ImmichToast.show(
+        durationInSecond: 6,
+        context: context,
+        msg: "error_saving_image".tr(namedArgs: {'error': e.toString()}),
+      );
+    }
+  }
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    return Scaffold(
+      appBar: AppBar(
+        title: Text("edit".tr()),
+        backgroundColor: context.scaffoldBackgroundColor,
+        leading: IconButton(
+          icon: Icon(Icons.close_rounded, color: context.primaryColor, size: 24),
+          onPressed: () => _exitEditing(context),
+        ),
+        actions: <Widget>[
+          TextButton(
+            onPressed: isEdited ? () => _saveEditedImage(context, asset, image, ref) : null,
+            child: Text("save_to_gallery".tr(), style: TextStyle(color: isEdited ? context.primaryColor : Colors.grey)),
+          ),
+        ],
+      ),
+      backgroundColor: context.scaffoldBackgroundColor,
+      body: Center(
+        child: ConstrainedBox(
+          constraints: BoxConstraints(maxHeight: context.height * 0.7, maxWidth: context.width * 0.9),
+          child: Container(
+            decoration: BoxDecoration(
+              borderRadius: const BorderRadius.all(Radius.circular(7)),
+              boxShadow: [
+                BoxShadow(
+                  color: Colors.black.withValues(alpha: 0.2),
+                  spreadRadius: 2,
+                  blurRadius: 10,
+                  offset: const Offset(0, 3),
+                ),
+              ],
+            ),
+            child: ClipRRect(
+              borderRadius: const BorderRadius.all(Radius.circular(7)),
+              child: Image(image: image.image, fit: BoxFit.contain),
+            ),
+          ),
+        ),
+      ),
+      bottomNavigationBar: Container(
+        height: 70,
+        margin: const EdgeInsets.only(bottom: 60, right: 10, left: 10, top: 10),
+        decoration: BoxDecoration(
+          color: context.scaffoldBackgroundColor,
+          borderRadius: const BorderRadius.all(Radius.circular(30)),
+        ),
+        child: Row(
+          mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+          children: <Widget>[
+            Column(
+              mainAxisAlignment: MainAxisAlignment.center,
+              children: <Widget>[
+                IconButton(
+                  icon: Icon(Icons.crop_rotate_rounded, color: context.themeData.iconTheme.color, size: 25),
+                  onPressed: () {
+                    context.pushRoute(DriftCropImageRoute(asset: asset, image: image));
+                  },
+                ),
+                Text("crop".tr(), style: context.textTheme.displayMedium),
+              ],
+            ),
+            Column(
+              mainAxisAlignment: MainAxisAlignment.center,
+              children: <Widget>[
+                IconButton(
+                  icon: Icon(Icons.filter, color: context.themeData.iconTheme.color, size: 25),
+                  onPressed: () {
+                    context.pushRoute(DriftFilterImageRoute(asset: asset, image: image));
+                  },
+                ),
+                Text("filter".tr(), style: context.textTheme.displayMedium),
+              ],
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}

mobile/lib/presentation/pages/editing/drift_filter.page.dart

@@ -0,0 +1,159 @@
+import 'dart:async';
+import 'dart:ui' as ui;
+
+import 'package:auto_route/auto_route.dart';
+import 'package:easy_localization/easy_localization.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_hooks/flutter_hooks.dart';
+import 'package:immich_mobile/constants/filters.dart';
+import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
+import 'package:immich_mobile/extensions/build_context_extensions.dart';
+import 'package:immich_mobile/routing/router.dart';
+
+/// A widget for filtering an image.
+/// This widget uses [HookWidget] to manage its lifecycle and state. It allows
+/// users to add filters to an image and then navigate to the [EditImagePage] with the
+/// final composition.'
+@RoutePage()
+class DriftFilterImagePage extends HookWidget {
+  final Image image;
+  final BaseAsset asset;
+
+  const DriftFilterImagePage({super.key, required this.image, required this.asset});
+
+  @override
+  Widget build(BuildContext context) {
+    final colorFilter = useState<ColorFilter>(filters[0]);
+    final selectedFilterIndex = useState<int>(0);
+
+    Future<ui.Image> createFilteredImage(ui.Image inputImage, ColorFilter filter) {
+      final completer = Completer<ui.Image>();
+      final size = Size(inputImage.width.toDouble(), inputImage.height.toDouble());
+      final recorder = ui.PictureRecorder();
+      final canvas = Canvas(recorder);
+
+      final paint = Paint()..colorFilter = filter;
+      canvas.drawImage(inputImage, Offset.zero, paint);
+
+      recorder.endRecording().toImage(size.width.round(), size.height.round()).then((image) {
+        completer.complete(image);
+      });
+
+      return completer.future;
+    }
+
+    void applyFilter(ColorFilter filter, int index) {
+      colorFilter.value = filter;
+      selectedFilterIndex.value = index;
+    }
+
+    Future<Image> applyFilterAndConvert(ColorFilter filter) async {
+      final completer = Completer<ui.Image>();
+      image.image
+          .resolve(ImageConfiguration.empty)
+          .addListener(
+            ImageStreamListener((ImageInfo info, bool _) {
+              completer.complete(info.image);
+            }),
+          );
+      final uiImage = await completer.future;
+
+      final filteredUiImage = await createFilteredImage(uiImage, filter);
+      final byteData = await filteredUiImage.toByteData(format: ui.ImageByteFormat.png);
+      final pngBytes = byteData!.buffer.asUint8List();
+
+      return Image.memory(pngBytes, fit: BoxFit.contain);
+    }
+
+    return Scaffold(
+      appBar: AppBar(
+        backgroundColor: context.scaffoldBackgroundColor,
+        title: Text("filter".tr()),
+        leading: CloseButton(color: context.primaryColor),
+        actions: [
+          IconButton(
+            icon: Icon(Icons.done_rounded, color: context.primaryColor, size: 24),
+            onPressed: () async {
+              final filteredImage = await applyFilterAndConvert(colorFilter.value);
+              unawaited(context.pushRoute(DriftEditImageRoute(asset: asset, image: filteredImage, isEdited: true)));
+            },
+          ),
+        ],
+      ),
+      backgroundColor: context.scaffoldBackgroundColor,
+      body: Column(
+        children: [
+          SizedBox(
+            height: context.height * 0.7,
+            child: Center(
+              child: ColorFiltered(colorFilter: colorFilter.value, child: image),
+            ),
+          ),
+          SizedBox(
+            height: 120,
+            child: ListView.builder(
+              scrollDirection: Axis.horizontal,
+              itemCount: filters.length,
+              itemBuilder: (context, index) {
+                return Padding(
+                  padding: const EdgeInsets.symmetric(horizontal: 8.0),
+                  child: _FilterButton(
+                    image: image,
+                    label: filterNames[index],
+                    filter: filters[index],
+                    isSelected: selectedFilterIndex.value == index,
+                    onTap: () => applyFilter(filters[index], index),
+                  ),
+                );
+              },
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}
+
+class _FilterButton extends StatelessWidget {
+  final Image image;
+  final String label;
+  final ColorFilter filter;
+  final bool isSelected;
+  final VoidCallback onTap;
+
+  const _FilterButton({
+    required this.image,
+    required this.label,
+    required this.filter,
+    required this.isSelected,
+    required this.onTap,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return Column(
+      children: [
+        GestureDetector(
+          onTap: onTap,
+          child: Container(
+            width: 80,
+            height: 80,
+            decoration: BoxDecoration(
+              borderRadius: const BorderRadius.all(Radius.circular(10)),
+              border: isSelected ? Border.all(color: context.primaryColor, width: 3) : null,
+            ),
+            child: ClipRRect(
+              borderRadius: const BorderRadius.all(Radius.circular(10)),
+              child: ColorFiltered(
+                colorFilter: filter,
+                child: FittedBox(fit: BoxFit.cover, child: image),
+              ),
+            ),
+          ),
+        ),
+        const SizedBox(height: 10),
+        Text(label, style: context.themeData.textTheme.bodyMedium),
+      ],
+    );
+  }
+}

mobile/lib/presentation/widgets/action_buttons/edit_image_action_button.widget.dart

@@ -1,12 +1,9 @@
-import 'dart:async';
-
 import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/images/image_provider.dart';
-import 'package:immich_mobile/providers/infrastructure/asset.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/asset_viewer/current_asset.provider.dart';
 import 'package:immich_mobile/routing/router.dart';
 
@@ -17,22 +14,13 @@ class EditImageActionButton extends ConsumerWidget {
   Widget build(BuildContext context, WidgetRef ref) {
     final currentAsset = ref.watch(currentAssetNotifier);
 
-    Future<void> onPress() async {
-      if (currentAsset == null || currentAsset.remoteId == null) {
+    onPress() {
+      if (currentAsset == null) {
         return;
       }
 
-      final imageProvider = getFullImageProvider(currentAsset, edited: false);
-
-      final image = Image(image: imageProvider);
-      final edits = await ref.read(remoteAssetRepositoryProvider).getAssetEdits(currentAsset.remoteId!);
-      final exifInfo = await ref.read(remoteAssetRepositoryProvider).getExif(currentAsset.remoteId!);
-
-      if (exifInfo == null) {
-        return;
-      }
-
-      await context.pushRoute(DriftEditImageRoute(asset: currentAsset, image: image, edits: edits, exifInfo: exifInfo));
+      final image = Image(image: getFullImageProvider(currentAsset));
+      context.pushRoute(DriftEditImageRoute(asset: currentAsset, image: image, isEdited: false));
     }
 
     return BaseActionButton(

mobile/lib/presentation/widgets/asset_viewer/bottom_bar.widget.dart

@@ -3,12 +3,12 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
-import 'package:immich_mobile/presentation/widgets/action_buttons/add_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/delete_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/delete_local_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/edit_image_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/share_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/upload_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/add_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/asset_viewer/asset_viewer.state.dart';
 import 'package:immich_mobile/providers/infrastructure/asset_viewer/current_asset.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/readonly_mode.provider.dart';
@@ -45,7 +45,7 @@ class ViewerBottomBar extends ConsumerWidget {
 
       if (!isInLockedView) ...[
         if (asset.isLocalOnly) const UploadActionButton(source: ActionSource.viewer),
-        if (asset.isEditable) const EditImageActionButton(),
+        if (asset.type == AssetType.image) const EditImageActionButton(),
         if (asset.hasRemote) AddActionButton(originalTheme: originalTheme),
 
         if (isOwner) ...[

mobile/lib/presentation/widgets/asset_viewer/bottom_sheet.widget.dart

@@ -78,7 +78,7 @@ class _AssetDetailBottomSheet extends ConsumerWidget {
     final date = DateFormat.yMMMEd(ctx.locale.toLanguageTag()).format(dateTime);
     final time = DateFormat.jm(ctx.locale.toLanguageTag()).format(dateTime);
     final timezone = 'GMT${timeZoneOffset.formatAsOffset()}';
-    return '${exifInfo?.width}x${exifInfo?.height}   $date$_kSeparator$time $timezone';
+    return '$date$_kSeparator$time $timezone';
   }
 
   String _getFileInfo(BaseAsset asset, ExifInfo? exifInfo) {

mobile/lib/presentation/widgets/images/image_provider.dart

@@ -102,7 +102,7 @@ mixin CancellableImageProviderMixin<T extends Object> on CancellableImageProvide
   }
 }
 
-ImageProvider getFullImageProvider(BaseAsset asset, {Size size = const Size(1080, 1920), bool edited = true}) {
+ImageProvider getFullImageProvider(BaseAsset asset, {Size size = const Size(1080, 1920)}) {
   // Create new provider and cache it
   final ImageProvider provider;
   if (_shouldUseLocalAsset(asset)) {
@@ -120,13 +120,13 @@ ImageProvider getFullImageProvider(BaseAsset asset, {Size size = const Size(1080
     } else {
       throw ArgumentError("Unsupported asset type: ${asset.runtimeType}");
     }
-    provider = RemoteFullImageProvider(assetId: assetId, thumbhash: thumbhash, assetType: asset.type, edited: edited);
+    provider = RemoteFullImageProvider(assetId: assetId, thumbhash: thumbhash);
   }
 
   return provider;
 }
 
-ImageProvider? getThumbnailImageProvider(BaseAsset asset, {Size size = kThumbnailResolution, bool edited = true}) {
+ImageProvider? getThumbnailImageProvider(BaseAsset asset, {Size size = kThumbnailResolution}) {
   if (_shouldUseLocalAsset(asset)) {
     final id = asset is LocalAsset ? asset.id : (asset as RemoteAsset).localId!;
     return LocalThumbProvider(id: id, size: size, assetType: asset.type);
@@ -134,7 +134,7 @@ ImageProvider? getThumbnailImageProvider(BaseAsset asset, {Size size = kThumbnai
 
   final assetId = asset is RemoteAsset ? asset.id : (asset as LocalAsset).remoteId;
   final thumbhash = asset is RemoteAsset ? asset.thumbHash ?? "" : "";
-  return assetId != null ? RemoteThumbProvider(assetId: assetId, thumbhash: thumbhash, edited: edited) : null;
+  return assetId != null ? RemoteThumbProvider(assetId: assetId, thumbhash: thumbhash) : null;
 }
 
 bool _shouldUseLocalAsset(BaseAsset asset) =>

mobile/lib/presentation/widgets/images/remote_image_provider.dart

@@ -1,6 +1,5 @@
 import 'package:flutter/foundation.dart';
 import 'package:flutter/painting.dart';
-import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/domain/models/setting.model.dart';
 import 'package:immich_mobile/domain/services/setting.service.dart';
 import 'package:immich_mobile/infrastructure/loaders/image_request.dart';
@@ -14,9 +13,8 @@ class RemoteThumbProvider extends CancellableImageProvider<RemoteThumbProvider>
     with CancellableImageProviderMixin<RemoteThumbProvider> {
   final String assetId;
   final String thumbhash;
-  final bool edited;
 
-  RemoteThumbProvider({required this.assetId, required this.thumbhash, this.edited = true});
+  RemoteThumbProvider({required this.assetId, required this.thumbhash});
 
   @override
   Future<RemoteThumbProvider> obtainKey(ImageConfiguration configuration) {
@@ -37,7 +35,7 @@ class RemoteThumbProvider extends CancellableImageProvider<RemoteThumbProvider>
 
   Stream<ImageInfo> _codec(RemoteThumbProvider key, ImageDecoderCallback decode) {
     final request = this.request = RemoteImageRequest(
-      uri: getThumbnailUrlForRemoteId(key.assetId, thumbhash: key.thumbhash, edited: key.edited),
+      uri: getThumbnailUrlForRemoteId(key.assetId, thumbhash: key.thumbhash),
       headers: ApiService.getRequestHeaders(),
     );
     return loadRequest(request, decode);
@@ -47,29 +45,22 @@ class RemoteThumbProvider extends CancellableImageProvider<RemoteThumbProvider>
   bool operator ==(Object other) {
     if (identical(this, other)) return true;
     if (other is RemoteThumbProvider) {
-      return assetId == other.assetId && thumbhash == other.thumbhash && edited == other.edited;
+      return assetId == other.assetId && thumbhash == other.thumbhash;
     }
 
     return false;
   }
 
   @override
-  int get hashCode => assetId.hashCode ^ thumbhash.hashCode ^ edited.hashCode;
+  int get hashCode => assetId.hashCode ^ thumbhash.hashCode;
 }
 
 class RemoteFullImageProvider extends CancellableImageProvider<RemoteFullImageProvider>
     with CancellableImageProviderMixin<RemoteFullImageProvider> {
   final String assetId;
   final String thumbhash;
-  final AssetType assetType;
-  final bool edited;
 
-  RemoteFullImageProvider({
-    required this.assetId,
-    required this.thumbhash,
-    required this.assetType,
-    this.edited = true,
-  });
+  RemoteFullImageProvider({required this.assetId, required this.thumbhash});
 
   @override
   Future<RemoteFullImageProvider> obtainKey(ImageConfiguration configuration) {
@@ -80,9 +71,7 @@ class RemoteFullImageProvider extends CancellableImageProvider<RemoteFullImagePr
   ImageStreamCompleter loadImage(RemoteFullImageProvider key, ImageDecoderCallback decode) {
     return OneFramePlaceholderImageStreamCompleter(
       _codec(key, decode),
-      initialImage: getInitialImage(
-        RemoteThumbProvider(assetId: key.assetId, thumbhash: key.thumbhash, edited: key.edited),
-      ),
+      initialImage: getInitialImage(RemoteThumbProvider(assetId: key.assetId, thumbhash: key.thumbhash)),
       informationCollector: () => <DiagnosticsNode>[
         DiagnosticsProperty<ImageProvider>('Image provider', this),
         DiagnosticsProperty<String>('Asset Id', key.assetId),
@@ -100,43 +89,33 @@ class RemoteFullImageProvider extends CancellableImageProvider<RemoteFullImagePr
     }
 
     final headers = ApiService.getRequestHeaders();
-    final previewRequest = request = RemoteImageRequest(
-      uri: getThumbnailUrlForRemoteId(
-        key.assetId,
-        type: AssetMediaSize.preview,
-        thumbhash: key.thumbhash,
-        edited: key.edited,
-      ),
+    final request = this.request = RemoteImageRequest(
+      uri: getThumbnailUrlForRemoteId(key.assetId, type: AssetMediaSize.preview, thumbhash: key.thumbhash),
       headers: headers,
     );
-    yield* loadRequest(previewRequest, decode);
-
-    if (assetType != AssetType.image || !AppSetting.get(Setting.loadOriginal)) {
-      return;
-    }
+    yield* loadRequest(request, decode);
 
     if (isCancelled) {
       PaintingBinding.instance.imageCache.evict(this);
       return;
     }
 
-    final originalRequest = request = RemoteImageRequest(
-      uri: getOriginalUrlForRemoteId(key.assetId, edited: key.edited),
-      headers: headers,
-    );
-    yield* loadRequest(originalRequest, decode);
+    if (AppSetting.get(Setting.loadOriginal)) {
+      final request = this.request = RemoteImageRequest(uri: getOriginalUrlForRemoteId(key.assetId), headers: headers);
+      yield* loadRequest(request, decode);
+    }
   }
 
   @override
   bool operator ==(Object other) {
     if (identical(this, other)) return true;
     if (other is RemoteFullImageProvider) {
-      return assetId == other.assetId && thumbhash == other.thumbhash && edited == other.edited;
+      return assetId == other.assetId && thumbhash == other.thumbhash;
     }
 
     return false;
   }
 
   @override
-  int get hashCode => assetId.hashCode ^ thumbhash.hashCode ^ edited.hashCode;
+  int get hashCode => assetId.hashCode ^ thumbhash.hashCode;
 }

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

@@ -6,20 +6,19 @@ import 'package:cancellation_token_http/http.dart';
 import 'package:flutter/material.dart';
 import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
-import 'package:immich_mobile/domain/models/asset_edit.model.dart';
 import 'package:immich_mobile/domain/services/asset.service.dart';
 import 'package:immich_mobile/models/download/livephotos_medatada.model.dart';
 import 'package:immich_mobile/presentation/widgets/asset_viewer/asset_viewer.state.dart';
-import 'package:immich_mobile/providers/backup/asset_upload_progress.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/asset.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/asset_viewer/current_asset.provider.dart';
 import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
 import 'package:immich_mobile/providers/user.provider.dart';
 import 'package:immich_mobile/routing/router.dart';
+import 'package:immich_mobile/providers/backup/asset_upload_progress.provider.dart';
 import 'package:immich_mobile/services/action.service.dart';
 import 'package:immich_mobile/services/download.service.dart';
-import 'package:immich_mobile/services/foreground_upload.service.dart';
 import 'package:immich_mobile/services/timeline.service.dart';
+import 'package:immich_mobile/services/foreground_upload.service.dart';
 import 'package:immich_mobile/widgets/asset_grid/delete_dialog.dart';
 import 'package:logging/logging.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
@@ -470,23 +469,6 @@ class ActionNotifier extends Notifier<void> {
       });
     }
   }
-
-  Future<ActionResult> applyEdits(ActionSource source, List<AssetEdit> edits) async {
-    final ids = _getOwnedRemoteIdsForSource(source);
-
-    if (ids.length != 1) {
-      _logger.warning('applyEdits called with multiple assets, expected single asset');
-      return ActionResult(count: ids.length, success: false, error: 'Expected single asset for applying edits');
-    }
-
-    try {
-      await _service.applyEdits(ids.first, edits);
-      return const ActionResult(count: 1, success: true);
-    } catch (error, stack) {
-      _logger.severe('Failed to apply edits to assets', error, stack);
-      return ActionResult(count: ids.length, success: false, error: error.toString());
-    }
-  }
 }
 
 extension on Iterable<RemoteAsset> {

mobile/lib/providers/websocket.provider.dart

@@ -206,27 +206,6 @@ class WebsocketNotifier extends StateNotifier<WebsocketState> {
     state.socket?.on('on_upload_success', _handleOnUploadSuccess);
   }
 
-  Future<void> waitForEvent(String event, bool Function(dynamic)? predicate, Duration timeout) {
-    final completer = Completer<void>();
-
-    void handler(dynamic data) {
-      if (predicate == null || predicate(data)) {
-        completer.complete();
-        state.socket?.off(event, handler);
-      }
-    }
-
-    state.socket?.on(event, handler);
-
-    return completer.future.timeout(
-      timeout,
-      onTimeout: () {
-        state.socket?.off(event, handler);
-        throw TimeoutException("Timeout waiting for event: $event");
-      },
-    );
-  }
-
   void addPendingChange(PendingAction action, dynamic value) {
     final now = DateTime.now();
     state = state.copyWith(

mobile/lib/repositories/asset_api.repository.dart

@@ -1,13 +1,12 @@
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:http/http.dart';
 import 'package:immich_mobile/constants/enums.dart';
-import 'package:immich_mobile/domain/models/asset_edit.model.dart';
 import 'package:immich_mobile/domain/models/stack.model.dart';
 import 'package:immich_mobile/entities/asset.entity.dart';
 import 'package:immich_mobile/providers/api.provider.dart';
 import 'package:immich_mobile/repositories/api.repository.dart';
 import 'package:maplibre_gl/maplibre_gl.dart';
-import 'package:openapi/api.dart' hide AssetEditAction;
+import 'package:openapi/api.dart';
 
 final assetApiRepositoryProvider = Provider(
   (ref) => AssetApiRepository(
@@ -106,25 +105,6 @@ class AssetApiRepository extends ApiRepository {
   Future<void> updateRating(String assetId, int rating) {
     return _api.updateAsset(assetId, UpdateAssetDto(rating: rating));
   }
-
-  Future<void> editAsset(String assetId, List<AssetEdit> edits) async {
-    final editDtos = edits
-        .map((edit) {
-          if (edit.action == AssetEditAction.other) {
-            return null;
-          }
-
-          return AssetEditActionListDtoEditsInner(action: edit.action.toDto()!, parameters: edit.parameters);
-        })
-        .whereType<AssetEditActionListDtoEditsInner>()
-        .toList();
-
-    await _api.editAsset(assetId, AssetEditActionListDto(edits: editDtos));
-  }
-
-  Future<void> removeEdits(String assetId) async {
-    await _api.removeAssetEdits(assetId);
-  }
 }
 
 extension on StackResponseDto {

mobile/lib/routing/router.dart

@@ -4,8 +4,6 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/album/album.model.dart';
 import 'package:immich_mobile/domain/models/album/local_album.model.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
-import 'package:immich_mobile/domain/models/asset_edit.model.dart';
-import 'package:immich_mobile/domain/models/exif.model.dart';
 import 'package:immich_mobile/domain/models/log.model.dart';
 import 'package:immich_mobile/domain/models/memory.model.dart';
 import 'package:immich_mobile/domain/models/person.model.dart';
@@ -80,7 +78,6 @@ import 'package:immich_mobile/pages/search/recently_taken.page.dart';
 import 'package:immich_mobile/pages/search/search.page.dart';
 import 'package:immich_mobile/pages/settings/sync_status.page.dart';
 import 'package:immich_mobile/pages/share_intent/share_intent.page.dart';
-import 'package:immich_mobile/presentation/pages/cleanup_preview.page.dart';
 import 'package:immich_mobile/presentation/pages/dev/main_timeline.page.dart';
 import 'package:immich_mobile/presentation/pages/dev/media_stat.page.dart';
 import 'package:immich_mobile/presentation/pages/dev/ui_showcase.page.dart';
@@ -91,8 +88,8 @@ import 'package:immich_mobile/presentation/pages/drift_album_options.page.dart';
 import 'package:immich_mobile/presentation/pages/drift_archive.page.dart';
 import 'package:immich_mobile/presentation/pages/drift_asset_selection_timeline.page.dart';
 import 'package:immich_mobile/presentation/pages/drift_asset_troubleshoot.page.dart';
+import 'package:immich_mobile/presentation/pages/cleanup_preview.page.dart';
 import 'package:immich_mobile/presentation/pages/drift_create_album.page.dart';
-import 'package:immich_mobile/presentation/pages/drift_edit.page.dart';
 import 'package:immich_mobile/presentation/pages/drift_favorite.page.dart';
 import 'package:immich_mobile/presentation/pages/drift_library.page.dart';
 import 'package:immich_mobile/presentation/pages/drift_local_album.page.dart';
@@ -109,6 +106,9 @@ import 'package:immich_mobile/presentation/pages/drift_remote_album.page.dart';
 import 'package:immich_mobile/presentation/pages/drift_trash.page.dart';
 import 'package:immich_mobile/presentation/pages/drift_user_selection.page.dart';
 import 'package:immich_mobile/presentation/pages/drift_video.page.dart';
+import 'package:immich_mobile/presentation/pages/editing/drift_crop.page.dart';
+import 'package:immich_mobile/presentation/pages/editing/drift_edit.page.dart';
+import 'package:immich_mobile/presentation/pages/editing/drift_filter.page.dart';
 import 'package:immich_mobile/presentation/pages/local_timeline.page.dart';
 import 'package:immich_mobile/presentation/pages/search/drift_search.page.dart';
 import 'package:immich_mobile/presentation/widgets/asset_viewer/asset_viewer.page.dart';
@@ -332,6 +332,8 @@ class AppRouter extends RootStackRouter {
     AutoRoute(page: DriftAlbumOptionsRoute.page, guards: [_authGuard, _duplicateGuard]),
     AutoRoute(page: DriftMapRoute.page, guards: [_authGuard, _duplicateGuard]),
     AutoRoute(page: DriftEditImageRoute.page),
+    AutoRoute(page: DriftCropImageRoute.page),
+    AutoRoute(page: DriftFilterImageRoute.page),
     AutoRoute(page: DriftActivitiesRoute.page, guards: [_authGuard, _duplicateGuard]),
     AutoRoute(page: DriftBackupAssetDetailRoute.page, guards: [_authGuard, _duplicateGuard]),
     AutoRoute(page: AssetTroubleshootRoute.page, guards: [_authGuard, _duplicateGuard]),

mobile/lib/routing/router.gr.dart

@@ -982,24 +982,70 @@ class DriftCreateAlbumRoute extends PageRouteInfo<void> {
   );
 }
 
+/// generated route for
+/// [DriftCropImagePage]
+class DriftCropImageRoute extends PageRouteInfo<DriftCropImageRouteArgs> {
+  DriftCropImageRoute({
+    Key? key,
+    required Image image,
+    required BaseAsset asset,
+    List<PageRouteInfo>? children,
+  }) : super(
+         DriftCropImageRoute.name,
+         args: DriftCropImageRouteArgs(key: key, image: image, asset: asset),
+         initialChildren: children,
+       );
+
+  static const String name = 'DriftCropImageRoute';
+
+  static PageInfo page = PageInfo(
+    name,
+    builder: (data) {
+      final args = data.argsAs<DriftCropImageRouteArgs>();
+      return DriftCropImagePage(
+        key: args.key,
+        image: args.image,
+        asset: args.asset,
+      );
+    },
+  );
+}
+
+class DriftCropImageRouteArgs {
+  const DriftCropImageRouteArgs({
+    this.key,
+    required this.image,
+    required this.asset,
+  });
+
+  final Key? key;
+
+  final Image image;
+
+  final BaseAsset asset;
+
+  @override
+  String toString() {
+    return 'DriftCropImageRouteArgs{key: $key, image: $image, asset: $asset}';
+  }
+}
+
 /// generated route for
 /// [DriftEditImagePage]
 class DriftEditImageRoute extends PageRouteInfo<DriftEditImageRouteArgs> {
   DriftEditImageRoute({
     Key? key,
-    required Image image,
     required BaseAsset asset,
-    required List<AssetEdit> edits,
-    required ExifInfo exifInfo,
+    required Image image,
+    required bool isEdited,
     List<PageRouteInfo>? children,
   }) : super(
          DriftEditImageRoute.name,
          args: DriftEditImageRouteArgs(
            key: key,
-           image: image,
            asset: asset,
-           edits: edits,
-           exifInfo: exifInfo,
+           image: image,
+           isEdited: isEdited,
          ),
          initialChildren: children,
        );
@@ -1012,10 +1058,9 @@ class DriftEditImageRoute extends PageRouteInfo<DriftEditImageRouteArgs> {
       final args = data.argsAs<DriftEditImageRouteArgs>();
       return DriftEditImagePage(
         key: args.key,
-        image: args.image,
         asset: args.asset,
-        edits: args.edits,
-        exifInfo: args.exifInfo,
+        image: args.image,
+        isEdited: args.isEdited,
       );
     },
   );
@@ -1024,25 +1069,22 @@ class DriftEditImageRoute extends PageRouteInfo<DriftEditImageRouteArgs> {
 class DriftEditImageRouteArgs {
   const DriftEditImageRouteArgs({
     this.key,
-    required this.image,
     required this.asset,
-    required this.edits,
-    required this.exifInfo,
+    required this.image,
+    required this.isEdited,
   });
 
   final Key? key;
 
-  final Image image;
-
   final BaseAsset asset;
 
-  final List<AssetEdit> edits;
+  final Image image;
 
-  final ExifInfo exifInfo;
+  final bool isEdited;
 
   @override
   String toString() {
-    return 'DriftEditImageRouteArgs{key: $key, image: $image, asset: $asset, edits: $edits, exifInfo: $exifInfo}';
+    return 'DriftEditImageRouteArgs{key: $key, asset: $asset, image: $image, isEdited: $isEdited}';
   }
 }
 
@@ -1062,6 +1104,54 @@ class DriftFavoriteRoute extends PageRouteInfo<void> {
   );
 }
 
+/// generated route for
+/// [DriftFilterImagePage]
+class DriftFilterImageRoute extends PageRouteInfo<DriftFilterImageRouteArgs> {
+  DriftFilterImageRoute({
+    Key? key,
+    required Image image,
+    required BaseAsset asset,
+    List<PageRouteInfo>? children,
+  }) : super(
+         DriftFilterImageRoute.name,
+         args: DriftFilterImageRouteArgs(key: key, image: image, asset: asset),
+         initialChildren: children,
+       );
+
+  static const String name = 'DriftFilterImageRoute';
+
+  static PageInfo page = PageInfo(
+    name,
+    builder: (data) {
+      final args = data.argsAs<DriftFilterImageRouteArgs>();
+      return DriftFilterImagePage(
+        key: args.key,
+        image: args.image,
+        asset: args.asset,
+      );
+    },
+  );
+}
+
+class DriftFilterImageRouteArgs {
+  const DriftFilterImageRouteArgs({
+    this.key,
+    required this.image,
+    required this.asset,
+  });
+
+  final Key? key;
+
+  final Image image;
+
+  final BaseAsset asset;
+
+  @override
+  String toString() {
+    return 'DriftFilterImageRouteArgs{key: $key, image: $image, asset: $asset}';
+  }
+}
+
 /// generated route for
 /// [DriftLibraryPage]
 class DriftLibraryRoute extends PageRouteInfo<void> {

mobile/lib/services/action.service.dart

@@ -5,7 +5,6 @@ import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
-import 'package:immich_mobile/domain/models/asset_edit.model.dart';
 import 'package:immich_mobile/domain/models/store.model.dart';
 import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:immich_mobile/extensions/platform_extensions.dart';
@@ -241,16 +240,6 @@ class ActionService {
     return _downloadRepository.downloadAllAssets(assets);
   }
 
-  Future<void> applyEdits(String remoteId, List<AssetEdit> edits) async {
-    if (edits.isEmpty) {
-      await _assetApiRepository.removeEdits(remoteId);
-    } else {
-      await _assetApiRepository.editAsset(remoteId, edits);
-    }
-
-    await _remoteAssetRepository.editAsset(remoteId, edits);
-  }
-
   Future<int> _deleteLocalAssets(List<String> localIds) async {
     final deletedIds = await _assetMediaRepository.deleteAll(localIds);
     if (deletedIds.isEmpty) {

mobile/lib/utils/editor.utils.dart

@@ -1,75 +0,0 @@
-import 'dart:math';
-
-import 'package:flutter/widgets.dart';
-import 'package:immich_mobile/domain/models/asset_edit.model.dart';
-import 'package:immich_mobile/utils/matrix.utils.dart';
-import 'package:openapi/api.dart' hide AssetEditAction;
-
-Rect convertCropParametersToRect(CropParameters parameters, int originalWidth, int originalHeight) {
-  return Rect.fromLTWH(
-    parameters.x.toDouble() / originalWidth,
-    parameters.y.toDouble() / originalHeight,
-    parameters.width.toDouble() / originalWidth,
-    parameters.height.toDouble() / originalHeight,
-  );
-}
-
-CropParameters convertRectToCropParameters(Rect rect, int originalWidth, int originalHeight) {
-  final x = (rect.left * originalWidth).round();
-  final y = (rect.top * originalHeight).round();
-  final width = (rect.width * originalWidth).round();
-  final height = (rect.height * originalHeight).round();
-
-  return CropParameters(
-    x: max(x, 0).clamp(0, originalWidth),
-    y: max(y, 0).clamp(0, originalHeight),
-    width: max(width, 0).clamp(0, originalWidth - x),
-    height: max(height, 0).clamp(0, originalHeight - y),
-  );
-}
-
-AffineMatrix buildAffineFromEdits(List<AssetEdit> edits) {
-  return AffineMatrix.compose(
-    edits.map<AffineMatrix>((edit) {
-      switch (edit.action) {
-        case AssetEditAction.rotate:
-          final angleInDegrees = edit.parameters["angle"] as num;
-          final angleInRadians = angleInDegrees * pi / 180;
-          return AffineMatrix.rotate(angleInRadians);
-        case AssetEditAction.mirror:
-          final axis = edit.parameters["axis"] as String;
-          return axis == "horizontal" ? AffineMatrix.flipY() : AffineMatrix.flipX();
-        default:
-          return AffineMatrix.identity();
-      }
-    }).toList(),
-  );
-}
-
-(double, bool, bool) normalizeTransformEdits(List<AssetEdit> edits) {
-  double rotation = 0;
-  bool flipX = false;
-  bool flipY = false;
-
-  final matrix = buildAffineFromEdits(edits);
-
-  // round to avoid floating point precision issues
-  int a = matrix.a.round();
-  int b = matrix.b.round();
-  int c = matrix.c.round();
-  int d = matrix.d.round();
-
-  // [ +/-1, 0, 0, +/-1 ] indicates a 0° or 180° rotation with possible mirrors
-  // [ 0, +/-1, +/-1, 0 ] indicates a 90° or 270° rotation with possible mirrors
-  if (a.abs() == 1 && b.abs() == 0 && c.abs() == 0 && d.abs() == 1) {
-    rotation = a > 0 ? 0 : 180;
-    flipX = rotation == 0 ? a < 0 : a > 0;
-    flipY = rotation == 0 ? d < 0 : d > 0;
-  } else if (a.abs() == 0 && b.abs() == 1 && c.abs() == 1 && d.abs() == 0) {
-    rotation = c > 0 ? 90 : 270;
-    flipX = rotation == 90 ? c < 0 : c > 0;
-    flipY = rotation == 90 ? b > 0 : b < 0;
-  }
-
-  return (rotation, flipX, flipY);
-}

mobile/lib/utils/hooks/crop_controller_hook.dart

@@ -1,14 +1,8 @@
+import 'package:flutter_hooks/flutter_hooks.dart';
+import 'package:crop_image/crop_image.dart';
 import 'dart:ui'; // Import the dart:ui library for Rect
 
-import 'package:crop_image/crop_image.dart';
-import 'package:flutter_hooks/flutter_hooks.dart';
-
 /// A hook that provides a [CropController] instance.
-CropController useCropController({Rect? initialCrop, CropRotation? initialRotation}) {
-  return useMemoized(
-    () => CropController(
-      defaultCrop: initialCrop ?? const Rect.fromLTRB(0, 0, 1, 1),
-      rotation: initialRotation ?? CropRotation.up,
-    ),
-  );
+CropController useCropController() {
+  return useMemoized(() => CropController(defaultCrop: const Rect.fromLTRB(0, 0, 1, 1)));
 }

mobile/lib/utils/matrix.utils.dart

@@ -1,50 +0,0 @@
-import 'dart:math';
-
-class AffineMatrix {
-  final double a;
-  final double b;
-  final double c;
-  final double d;
-  final double e;
-  final double f;
-
-  const AffineMatrix(this.a, this.b, this.c, this.d, this.e, this.f);
-
-  @override
-  String toString() {
-    return 'AffineMatrix(a: $a, b: $b, c: $c, d: $d, e: $e, f: $f)';
-  }
-
-  factory AffineMatrix.identity() {
-    return const AffineMatrix(1, 0, 0, 1, 0, 0);
-  }
-
-  AffineMatrix multiply(AffineMatrix other) {
-    return AffineMatrix(
-      a * other.a + c * other.b,
-      b * other.a + d * other.b,
-      a * other.c + c * other.d,
-      b * other.c + d * other.d,
-      a * other.e + c * other.f + e,
-      b * other.e + d * other.f + f,
-    );
-  }
-
-  factory AffineMatrix.compose([List<AffineMatrix> transformations = const []]) {
-    return transformations.fold<AffineMatrix>(AffineMatrix.identity(), (acc, matrix) => acc.multiply(matrix));
-  }
-
-  factory AffineMatrix.rotate(double angle) {
-    final cosAngle = cos(angle);
-    final sinAngle = sin(angle);
-    return AffineMatrix(cosAngle, -sinAngle, sinAngle, cosAngle, 0, 0);
-  }
-
-  factory AffineMatrix.flipY() {
-    return const AffineMatrix(-1, 0, 0, 1, 0, 0);
-  }
-
-  factory AffineMatrix.flipX() {
-    return const AffineMatrix(1, 0, 0, -1, 0, 0);
-  }
-}

mobile/openapi/README.md

@@ -574,8 +574,6 @@ Class | Method | HTTP request | Description
  - [SyncAlbumUserV1](doc//SyncAlbumUserV1.md)
  - [SyncAlbumV1](doc//SyncAlbumV1.md)
  - [SyncAssetDeleteV1](doc//SyncAssetDeleteV1.md)
- - [SyncAssetEditDeleteV1](doc//SyncAssetEditDeleteV1.md)
- - [SyncAssetEditV1](doc//SyncAssetEditV1.md)
  - [SyncAssetExifV1](doc//SyncAssetExifV1.md)
  - [SyncAssetFaceDeleteV1](doc//SyncAssetFaceDeleteV1.md)
  - [SyncAssetFaceV1](doc//SyncAssetFaceV1.md)

mobile/openapi/lib/api.dart

@@ -314,8 +314,6 @@ part 'model/sync_album_user_delete_v1.dart';
 part 'model/sync_album_user_v1.dart';
 part 'model/sync_album_v1.dart';
 part 'model/sync_asset_delete_v1.dart';
-part 'model/sync_asset_edit_delete_v1.dart';
-part 'model/sync_asset_edit_v1.dart';
 part 'model/sync_asset_exif_v1.dart';
 part 'model/sync_asset_face_delete_v1.dart';
 part 'model/sync_asset_face_v1.dart';

mobile/openapi/lib/api_client.dart

@@ -674,10 +674,6 @@ class ApiClient {
           return SyncAlbumV1.fromJson(value);
         case 'SyncAssetDeleteV1':
           return SyncAssetDeleteV1.fromJson(value);
-        case 'SyncAssetEditDeleteV1':
-          return SyncAssetEditDeleteV1.fromJson(value);
-        case 'SyncAssetEditV1':
-          return SyncAssetEditV1.fromJson(value);
         case 'SyncAssetExifV1':
           return SyncAssetExifV1.fromJson(value);
         case 'SyncAssetFaceDeleteV1':

mobile/openapi/lib/model/asset_edit_action_list_dto_edits_inner.dart

@@ -19,7 +19,7 @@ class AssetEditActionListDtoEditsInner {
 
   AssetEditAction action;
 
-  Map<String, dynamic> parameters;
+  MirrorParameters parameters;
 
   @override
   bool operator ==(Object other) => identical(this, other) || other is AssetEditActionListDtoEditsInner &&
@@ -52,7 +52,7 @@ class AssetEditActionListDtoEditsInner {
 
       return AssetEditActionListDtoEditsInner(
         action: AssetEditAction.fromJson(json[r'action'])!,
-        parameters: json[r'parameters'],
+        parameters: MirrorParameters.fromJson(json[r'parameters'])!,
       );
     }
     return null;

mobile/openapi/lib/model/sync_asset_edit_delete_v1.dart

@@ -1,99 +0,0 @@
-//
-// AUTO-GENERATED FILE, DO NOT MODIFY!
-//
-// @dart=2.18
-
-// ignore_for_file: unused_element, unused_import
-// ignore_for_file: always_put_required_named_parameters_first
-// ignore_for_file: constant_identifier_names
-// ignore_for_file: lines_longer_than_80_chars
-
-part of openapi.api;
-
-class SyncAssetEditDeleteV1 {
-  /// Returns a new [SyncAssetEditDeleteV1] instance.
-  SyncAssetEditDeleteV1({
-    required this.assetId,
-  });
-
-  String assetId;
-
-  @override
-  bool operator ==(Object other) => identical(this, other) || other is SyncAssetEditDeleteV1 &&
-    other.assetId == assetId;
-
-  @override
-  int get hashCode =>
-    // ignore: unnecessary_parenthesis
-    (assetId.hashCode);
-
-  @override
-  String toString() => 'SyncAssetEditDeleteV1[assetId=$assetId]';
-
-  Map<String, dynamic> toJson() {
-    final json = <String, dynamic>{};
-      json[r'assetId'] = this.assetId;
-    return json;
-  }
-
-  /// Returns a new [SyncAssetEditDeleteV1] instance and imports its values from
-  /// [value] if it's a [Map], null otherwise.
-  // ignore: prefer_constructors_over_static_methods
-  static SyncAssetEditDeleteV1? fromJson(dynamic value) {
-    upgradeDto(value, "SyncAssetEditDeleteV1");
-    if (value is Map) {
-      final json = value.cast<String, dynamic>();
-
-      return SyncAssetEditDeleteV1(
-        assetId: mapValueOfType<String>(json, r'assetId')!,
-      );
-    }
-    return null;
-  }
-
-  static List<SyncAssetEditDeleteV1> listFromJson(dynamic json, {bool growable = false,}) {
-    final result = <SyncAssetEditDeleteV1>[];
-    if (json is List && json.isNotEmpty) {
-      for (final row in json) {
-        final value = SyncAssetEditDeleteV1.fromJson(row);
-        if (value != null) {
-          result.add(value);
-        }
-      }
-    }
-    return result.toList(growable: growable);
-  }
-
-  static Map<String, SyncAssetEditDeleteV1> mapFromJson(dynamic json) {
-    final map = <String, SyncAssetEditDeleteV1>{};
-    if (json is Map && json.isNotEmpty) {
-      json = json.cast<String, dynamic>(); // ignore: parameter_assignments
-      for (final entry in json.entries) {
-        final value = SyncAssetEditDeleteV1.fromJson(entry.value);
-        if (value != null) {
-          map[entry.key] = value;
-        }
-      }
-    }
-    return map;
-  }
-
-  // maps a json object with a list of SyncAssetEditDeleteV1-objects as value to a dart map
-  static Map<String, List<SyncAssetEditDeleteV1>> mapListFromJson(dynamic json, {bool growable = false,}) {
-    final map = <String, List<SyncAssetEditDeleteV1>>{};
-    if (json is Map && json.isNotEmpty) {
-      // ignore: parameter_assignments
-      json = json.cast<String, dynamic>();
-      for (final entry in json.entries) {
-        map[entry.key] = SyncAssetEditDeleteV1.listFromJson(entry.value, growable: growable,);
-      }
-    }
-    return map;
-  }
-
-  /// The list of required keys that must be present in a JSON.
-  static const requiredKeys = <String>{
-    'assetId',
-  };
-}
-

mobile/openapi/lib/model/sync_asset_edit_v1.dart

@@ -1,131 +0,0 @@
-//
-// AUTO-GENERATED FILE, DO NOT MODIFY!
-//
-// @dart=2.18
-
-// ignore_for_file: unused_element, unused_import
-// ignore_for_file: always_put_required_named_parameters_first
-// ignore_for_file: constant_identifier_names
-// ignore_for_file: lines_longer_than_80_chars
-
-part of openapi.api;
-
-class SyncAssetEditV1 {
-  /// Returns a new [SyncAssetEditV1] instance.
-  SyncAssetEditV1({
-    required this.action,
-    required this.assetId,
-    required this.id,
-    required this.parameters,
-    required this.sequence,
-  });
-
-  AssetEditAction action;
-
-  String assetId;
-
-  String id;
-
-  Object parameters;
-
-  int sequence;
-
-  @override
-  bool operator ==(Object other) => identical(this, other) || other is SyncAssetEditV1 &&
-    other.action == action &&
-    other.assetId == assetId &&
-    other.id == id &&
-    other.parameters == parameters &&
-    other.sequence == sequence;
-
-  @override
-  int get hashCode =>
-    // ignore: unnecessary_parenthesis
-    (action.hashCode) +
-    (assetId.hashCode) +
-    (id.hashCode) +
-    (parameters.hashCode) +
-    (sequence.hashCode);
-
-  @override
-  String toString() => 'SyncAssetEditV1[action=$action, assetId=$assetId, id=$id, parameters=$parameters, sequence=$sequence]';
-
-  Map<String, dynamic> toJson() {
-    final json = <String, dynamic>{};
-      json[r'action'] = this.action;
-      json[r'assetId'] = this.assetId;
-      json[r'id'] = this.id;
-      json[r'parameters'] = this.parameters;
-      json[r'sequence'] = this.sequence;
-    return json;
-  }
-
-  /// Returns a new [SyncAssetEditV1] instance and imports its values from
-  /// [value] if it's a [Map], null otherwise.
-  // ignore: prefer_constructors_over_static_methods
-  static SyncAssetEditV1? fromJson(dynamic value) {
-    upgradeDto(value, "SyncAssetEditV1");
-    if (value is Map) {
-      final json = value.cast<String, dynamic>();
-
-      return SyncAssetEditV1(
-        action: AssetEditAction.fromJson(json[r'action'])!,
-        assetId: mapValueOfType<String>(json, r'assetId')!,
-        id: mapValueOfType<String>(json, r'id')!,
-        parameters: mapValueOfType<Object>(json, r'parameters')!,
-        sequence: mapValueOfType<int>(json, r'sequence')!,
-      );
-    }
-    return null;
-  }
-
-  static List<SyncAssetEditV1> listFromJson(dynamic json, {bool growable = false,}) {
-    final result = <SyncAssetEditV1>[];
-    if (json is List && json.isNotEmpty) {
-      for (final row in json) {
-        final value = SyncAssetEditV1.fromJson(row);
-        if (value != null) {
-          result.add(value);
-        }
-      }
-    }
-    return result.toList(growable: growable);
-  }
-
-  static Map<String, SyncAssetEditV1> mapFromJson(dynamic json) {
-    final map = <String, SyncAssetEditV1>{};
-    if (json is Map && json.isNotEmpty) {
-      json = json.cast<String, dynamic>(); // ignore: parameter_assignments
-      for (final entry in json.entries) {
-        final value = SyncAssetEditV1.fromJson(entry.value);
-        if (value != null) {
-          map[entry.key] = value;
-        }
-      }
-    }
-    return map;
-  }
-
-  // maps a json object with a list of SyncAssetEditV1-objects as value to a dart map
-  static Map<String, List<SyncAssetEditV1>> mapListFromJson(dynamic json, {bool growable = false,}) {
-    final map = <String, List<SyncAssetEditV1>>{};
-    if (json is Map && json.isNotEmpty) {
-      // ignore: parameter_assignments
-      json = json.cast<String, dynamic>();
-      for (final entry in json.entries) {
-        map[entry.key] = SyncAssetEditV1.listFromJson(entry.value, growable: growable,);
-      }
-    }
-    return map;
-  }
-
-  /// The list of required keys that must be present in a JSON.
-  static const requiredKeys = <String>{
-    'action',
-    'assetId',
-    'id',
-    'parameters',
-    'sequence',
-  };
-}
-

mobile/openapi/lib/model/sync_entity_type.dart

@@ -29,8 +29,6 @@ class SyncEntityType {
   static const assetV1 = SyncEntityType._(r'AssetV1');
   static const assetDeleteV1 = SyncEntityType._(r'AssetDeleteV1');
   static const assetExifV1 = SyncEntityType._(r'AssetExifV1');
-  static const assetEditV1 = SyncEntityType._(r'AssetEditV1');
-  static const assetEditDeleteV1 = SyncEntityType._(r'AssetEditDeleteV1');
   static const assetMetadataV1 = SyncEntityType._(r'AssetMetadataV1');
   static const assetMetadataDeleteV1 = SyncEntityType._(r'AssetMetadataDeleteV1');
   static const partnerV1 = SyncEntityType._(r'PartnerV1');
@@ -81,8 +79,6 @@ class SyncEntityType {
     assetV1,
     assetDeleteV1,
     assetExifV1,
-    assetEditV1,
-    assetEditDeleteV1,
     assetMetadataV1,
     assetMetadataDeleteV1,
     partnerV1,
@@ -168,8 +164,6 @@ class SyncEntityTypeTypeTransformer {
         case r'AssetV1': return SyncEntityType.assetV1;
         case r'AssetDeleteV1': return SyncEntityType.assetDeleteV1;
         case r'AssetExifV1': return SyncEntityType.assetExifV1;
-        case r'AssetEditV1': return SyncEntityType.assetEditV1;
-        case r'AssetEditDeleteV1': return SyncEntityType.assetEditDeleteV1;
         case r'AssetMetadataV1': return SyncEntityType.assetMetadataV1;
         case r'AssetMetadataDeleteV1': return SyncEntityType.assetMetadataDeleteV1;
         case r'PartnerV1': return SyncEntityType.partnerV1;

mobile/openapi/lib/model/sync_request_type.dart

@@ -30,7 +30,6 @@ class SyncRequestType {
   static const albumAssetExifsV1 = SyncRequestType._(r'AlbumAssetExifsV1');
   static const assetsV1 = SyncRequestType._(r'AssetsV1');
   static const assetExifsV1 = SyncRequestType._(r'AssetExifsV1');
-  static const assetEditsV1 = SyncRequestType._(r'AssetEditsV1');
   static const assetMetadataV1 = SyncRequestType._(r'AssetMetadataV1');
   static const authUsersV1 = SyncRequestType._(r'AuthUsersV1');
   static const memoriesV1 = SyncRequestType._(r'MemoriesV1');
@@ -54,7 +53,6 @@ class SyncRequestType {
     albumAssetExifsV1,
     assetsV1,
     assetExifsV1,
-    assetEditsV1,
     assetMetadataV1,
     authUsersV1,
     memoriesV1,
@@ -113,7 +111,6 @@ class SyncRequestTypeTypeTransformer {
         case r'AlbumAssetExifsV1': return SyncRequestType.albumAssetExifsV1;
         case r'AssetsV1': return SyncRequestType.assetsV1;
         case r'AssetExifsV1': return SyncRequestType.assetExifsV1;
-        case r'AssetEditsV1': return SyncRequestType.assetEditsV1;
         case r'AssetMetadataV1': return SyncRequestType.assetMetadataV1;
         case r'AuthUsersV1': return SyncRequestType.authUsersV1;
         case r'MemoriesV1': return SyncRequestType.memoriesV1;

mobile/test/domain/services/hash_service_test.dart

@@ -33,7 +33,7 @@ void main() {
     registerFallbackValue(LocalAssetStub.image1);
     registerFallbackValue(<String, String>{});
 
-    when(() => mockAssetRepo.getHashMappingFromCloudId()).thenAnswer((_) async => {});
+    when(() => mockAssetRepo.reconcileHashesFromCloudId()).thenAnswer((_) async => {});
     when(() => mockAssetRepo.updateHashes(any())).thenAnswer((_) async => {});
   });
 
@@ -191,5 +191,4 @@ void main() {
       verify(() => mockNativeApi.hashAssets([asset2.id], allowNetworkAccess: false)).called(1);
     });
   });
-
 }

mobile/test/drift/main/generated/schema_v18.dart

@@ -8231,299 +8231,6 @@ class TrashedLocalAssetEntityCompanion
   }
 }
 
-class AssetEditEntity extends Table
-    with TableInfo<AssetEditEntity, AssetEditEntityData> {
-  @override
-  final GeneratedDatabase attachedDatabase;
-  final String? _alias;
-  AssetEditEntity(this.attachedDatabase, [this._alias]);
-  late final GeneratedColumn<String> id = GeneratedColumn<String>(
-    'id',
-    aliasedName,
-    false,
-    type: DriftSqlType.string,
-    requiredDuringInsert: true,
-  );
-  late final GeneratedColumn<String> assetId = GeneratedColumn<String>(
-    'asset_id',
-    aliasedName,
-    false,
-    type: DriftSqlType.string,
-    requiredDuringInsert: true,
-    defaultConstraints: GeneratedColumn.constraintIsAlways(
-      'REFERENCES remote_asset_entity (id) ON DELETE CASCADE',
-    ),
-  );
-  late final GeneratedColumn<int> action = GeneratedColumn<int>(
-    'action',
-    aliasedName,
-    false,
-    type: DriftSqlType.int,
-    requiredDuringInsert: true,
-  );
-  late final GeneratedColumn<Uint8List> parameters = GeneratedColumn<Uint8List>(
-    'parameters',
-    aliasedName,
-    false,
-    type: DriftSqlType.blob,
-    requiredDuringInsert: true,
-  );
-  late final GeneratedColumn<int> sequence = GeneratedColumn<int>(
-    'sequence',
-    aliasedName,
-    false,
-    type: DriftSqlType.int,
-    requiredDuringInsert: true,
-  );
-  @override
-  List<GeneratedColumn> get $columns => [
-    id,
-    assetId,
-    action,
-    parameters,
-    sequence,
-  ];
-  @override
-  String get aliasedName => _alias ?? actualTableName;
-  @override
-  String get actualTableName => $name;
-  static const String $name = 'asset_edit_entity';
-  @override
-  Set<GeneratedColumn> get $primaryKey => {id};
-  @override
-  AssetEditEntityData map(Map<String, dynamic> data, {String? tablePrefix}) {
-    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
-    return AssetEditEntityData(
-      id: attachedDatabase.typeMapping.read(
-        DriftSqlType.string,
-        data['${effectivePrefix}id'],
-      )!,
-      assetId: attachedDatabase.typeMapping.read(
-        DriftSqlType.string,
-        data['${effectivePrefix}asset_id'],
-      )!,
-      action: attachedDatabase.typeMapping.read(
-        DriftSqlType.int,
-        data['${effectivePrefix}action'],
-      )!,
-      parameters: attachedDatabase.typeMapping.read(
-        DriftSqlType.blob,
-        data['${effectivePrefix}parameters'],
-      )!,
-      sequence: attachedDatabase.typeMapping.read(
-        DriftSqlType.int,
-        data['${effectivePrefix}sequence'],
-      )!,
-    );
-  }
-
-  @override
-  AssetEditEntity createAlias(String alias) {
-    return AssetEditEntity(attachedDatabase, alias);
-  }
-
-  @override
-  bool get withoutRowId => true;
-  @override
-  bool get isStrict => true;
-}
-
-class AssetEditEntityData extends DataClass
-    implements Insertable<AssetEditEntityData> {
-  final String id;
-  final String assetId;
-  final int action;
-  final Uint8List parameters;
-  final int sequence;
-  const AssetEditEntityData({
-    required this.id,
-    required this.assetId,
-    required this.action,
-    required this.parameters,
-    required this.sequence,
-  });
-  @override
-  Map<String, Expression> toColumns(bool nullToAbsent) {
-    final map = <String, Expression>{};
-    map['id'] = Variable<String>(id);
-    map['asset_id'] = Variable<String>(assetId);
-    map['action'] = Variable<int>(action);
-    map['parameters'] = Variable<Uint8List>(parameters);
-    map['sequence'] = Variable<int>(sequence);
-    return map;
-  }
-
-  factory AssetEditEntityData.fromJson(
-    Map<String, dynamic> json, {
-    ValueSerializer? serializer,
-  }) {
-    serializer ??= driftRuntimeOptions.defaultSerializer;
-    return AssetEditEntityData(
-      id: serializer.fromJson<String>(json['id']),
-      assetId: serializer.fromJson<String>(json['assetId']),
-      action: serializer.fromJson<int>(json['action']),
-      parameters: serializer.fromJson<Uint8List>(json['parameters']),
-      sequence: serializer.fromJson<int>(json['sequence']),
-    );
-  }
-  @override
-  Map<String, dynamic> toJson({ValueSerializer? serializer}) {
-    serializer ??= driftRuntimeOptions.defaultSerializer;
-    return <String, dynamic>{
-      'id': serializer.toJson<String>(id),
-      'assetId': serializer.toJson<String>(assetId),
-      'action': serializer.toJson<int>(action),
-      'parameters': serializer.toJson<Uint8List>(parameters),
-      'sequence': serializer.toJson<int>(sequence),
-    };
-  }
-
-  AssetEditEntityData copyWith({
-    String? id,
-    String? assetId,
-    int? action,
-    Uint8List? parameters,
-    int? sequence,
-  }) => AssetEditEntityData(
-    id: id ?? this.id,
-    assetId: assetId ?? this.assetId,
-    action: action ?? this.action,
-    parameters: parameters ?? this.parameters,
-    sequence: sequence ?? this.sequence,
-  );
-  AssetEditEntityData copyWithCompanion(AssetEditEntityCompanion data) {
-    return AssetEditEntityData(
-      id: data.id.present ? data.id.value : this.id,
-      assetId: data.assetId.present ? data.assetId.value : this.assetId,
-      action: data.action.present ? data.action.value : this.action,
-      parameters: data.parameters.present
-          ? data.parameters.value
-          : this.parameters,
-      sequence: data.sequence.present ? data.sequence.value : this.sequence,
-    );
-  }
-
-  @override
-  String toString() {
-    return (StringBuffer('AssetEditEntityData(')
-          ..write('id: $id, ')
-          ..write('assetId: $assetId, ')
-          ..write('action: $action, ')
-          ..write('parameters: $parameters, ')
-          ..write('sequence: $sequence')
-          ..write(')'))
-        .toString();
-  }
-
-  @override
-  int get hashCode => Object.hash(
-    id,
-    assetId,
-    action,
-    $driftBlobEquality.hash(parameters),
-    sequence,
-  );
-  @override
-  bool operator ==(Object other) =>
-      identical(this, other) ||
-      (other is AssetEditEntityData &&
-          other.id == this.id &&
-          other.assetId == this.assetId &&
-          other.action == this.action &&
-          $driftBlobEquality.equals(other.parameters, this.parameters) &&
-          other.sequence == this.sequence);
-}
-
-class AssetEditEntityCompanion extends UpdateCompanion<AssetEditEntityData> {
-  final Value<String> id;
-  final Value<String> assetId;
-  final Value<int> action;
-  final Value<Uint8List> parameters;
-  final Value<int> sequence;
-  const AssetEditEntityCompanion({
-    this.id = const Value.absent(),
-    this.assetId = const Value.absent(),
-    this.action = const Value.absent(),
-    this.parameters = const Value.absent(),
-    this.sequence = const Value.absent(),
-  });
-  AssetEditEntityCompanion.insert({
-    required String id,
-    required String assetId,
-    required int action,
-    required Uint8List parameters,
-    required int sequence,
-  }) : id = Value(id),
-       assetId = Value(assetId),
-       action = Value(action),
-       parameters = Value(parameters),
-       sequence = Value(sequence);
-  static Insertable<AssetEditEntityData> custom({
-    Expression<String>? id,
-    Expression<String>? assetId,
-    Expression<int>? action,
-    Expression<Uint8List>? parameters,
-    Expression<int>? sequence,
-  }) {
-    return RawValuesInsertable({
-      if (id != null) 'id': id,
-      if (assetId != null) 'asset_id': assetId,
-      if (action != null) 'action': action,
-      if (parameters != null) 'parameters': parameters,
-      if (sequence != null) 'sequence': sequence,
-    });
-  }
-
-  AssetEditEntityCompanion copyWith({
-    Value<String>? id,
-    Value<String>? assetId,
-    Value<int>? action,
-    Value<Uint8List>? parameters,
-    Value<int>? sequence,
-  }) {
-    return AssetEditEntityCompanion(
-      id: id ?? this.id,
-      assetId: assetId ?? this.assetId,
-      action: action ?? this.action,
-      parameters: parameters ?? this.parameters,
-      sequence: sequence ?? this.sequence,
-    );
-  }
-
-  @override
-  Map<String, Expression> toColumns(bool nullToAbsent) {
-    final map = <String, Expression>{};
-    if (id.present) {
-      map['id'] = Variable<String>(id.value);
-    }
-    if (assetId.present) {
-      map['asset_id'] = Variable<String>(assetId.value);
-    }
-    if (action.present) {
-      map['action'] = Variable<int>(action.value);
-    }
-    if (parameters.present) {
-      map['parameters'] = Variable<Uint8List>(parameters.value);
-    }
-    if (sequence.present) {
-      map['sequence'] = Variable<int>(sequence.value);
-    }
-    return map;
-  }
-
-  @override
-  String toString() {
-    return (StringBuffer('AssetEditEntityCompanion(')
-          ..write('id: $id, ')
-          ..write('assetId: $assetId, ')
-          ..write('action: $action, ')
-          ..write('parameters: $parameters, ')
-          ..write('sequence: $sequence')
-          ..write(')'))
-        .toString();
-  }
-}
-
 class DatabaseAtV18 extends GeneratedDatabase {
   DatabaseAtV18(QueryExecutor e) : super(e);
   late final UserEntity userEntity = UserEntity(this);
@@ -8575,11 +8282,14 @@ class DatabaseAtV18 extends GeneratedDatabase {
   late final StoreEntity storeEntity = StoreEntity(this);
   late final TrashedLocalAssetEntity trashedLocalAssetEntity =
       TrashedLocalAssetEntity(this);
-  late final AssetEditEntity assetEditEntity = AssetEditEntity(this);
   late final Index idxLatLng = Index(
     'idx_lat_lng',
     'CREATE INDEX IF NOT EXISTS idx_lat_lng ON remote_exif_entity (latitude, longitude)',
   );
+  late final Index idxRemoteAssetCloudId = Index(
+    'idx_remote_asset_cloud_id',
+    'CREATE INDEX IF NOT EXISTS idx_remote_asset_cloud_id ON remote_asset_cloud_id_entity (cloud_id)',
+  );
   late final Index idxTrashedLocalAssetChecksum = Index(
     'idx_trashed_local_asset_checksum',
     'CREATE INDEX IF NOT EXISTS idx_trashed_local_asset_checksum ON trashed_local_asset_entity (checksum)',
@@ -8619,8 +8329,8 @@ class DatabaseAtV18 extends GeneratedDatabase {
     assetFaceEntity,
     storeEntity,
     trashedLocalAssetEntity,
-    assetEditEntity,
     idxLatLng,
+    idxRemoteAssetCloudId,
     idxTrashedLocalAssetChecksum,
     idxTrashedLocalAssetAlbum,
   ];

mobile/test/infrastructure/repositories/local_asset_repository_test.dart

@@ -1,4 +1,4 @@
-import 'package:drift/drift.dart';
+import 'package:drift/drift.dart' hide isNull;
 import 'package:drift/native.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:immich_mobile/constants/enums.dart';
@@ -8,11 +8,13 @@ import 'package:immich_mobile/infrastructure/entities/local_album.entity.drift.d
 import 'package:immich_mobile/infrastructure/entities/local_album_asset.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/local_asset.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/remote_asset.entity.drift.dart';
+import 'package:immich_mobile/infrastructure/entities/remote_asset_cloud_id.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/user.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/local_asset.repository.dart';
 
 void main() {
+  final now = DateTime(2024, 1, 15);
   late Drift db;
   late DriftLocalAssetRepository repository;
 
@@ -25,68 +27,98 @@ void main() {
     await db.close();
   });
 
+  Future<void> insertLocalAsset({
+    required String id,
+    String? checksum,
+    DateTime? createdAt,
+    AssetType type = AssetType.image,
+    bool isFavorite = false,
+    String? iCloudId,
+    DateTime? adjustmentTime,
+    double? latitude,
+    double? longitude,
+  }) async {
+    final created = createdAt ?? now;
+    await db
+        .into(db.localAssetEntity)
+        .insert(
+          LocalAssetEntityCompanion.insert(
+            id: id,
+            name: 'asset_$id.jpg',
+            checksum: Value(checksum),
+            type: type,
+            createdAt: Value(created),
+            updatedAt: Value(created),
+            isFavorite: Value(isFavorite),
+            iCloudId: Value(iCloudId),
+            adjustmentTime: Value(adjustmentTime),
+            latitude: Value(latitude),
+            longitude: Value(longitude),
+          ),
+        );
+  }
+
+  Future<void> insertRemoteAsset({
+    required String id,
+    required String checksum,
+    required String ownerId,
+    DateTime? deletedAt,
+  }) async {
+    await db
+        .into(db.remoteAssetEntity)
+        .insert(
+          RemoteAssetEntityCompanion.insert(
+            id: id,
+            name: 'remote_$id.jpg',
+            checksum: checksum,
+            type: AssetType.image,
+            createdAt: Value(now),
+            updatedAt: Value(now),
+            ownerId: ownerId,
+            visibility: AssetVisibility.timeline,
+            deletedAt: Value(deletedAt),
+          ),
+        );
+  }
+
+  Future<void> insertRemoteAssetCloudId({
+    required String assetId,
+    required String? cloudId,
+    DateTime? createdAt,
+    DateTime? adjustmentTime,
+    double? latitude,
+    double? longitude,
+  }) async {
+    await db
+        .into(db.remoteAssetCloudIdEntity)
+        .insert(
+          RemoteAssetCloudIdEntityCompanion.insert(
+            assetId: assetId,
+            cloudId: Value(cloudId),
+            createdAt: Value(createdAt),
+            adjustmentTime: Value(adjustmentTime),
+            latitude: Value(latitude),
+            longitude: Value(longitude),
+          ),
+        );
+  }
+
+  Future<void> insertUser(String id, String email) async {
+    await db.into(db.userEntity).insert(UserEntityCompanion.insert(id: id, email: email, name: email));
+  }
+
   group('getRemovalCandidates', () {
     final userId = 'user-123';
     final otherUserId = 'user-456';
-    final now = DateTime(2024, 1, 15);
     final cutoffDate = DateTime(2024, 1, 10);
     final beforeCutoff = DateTime(2024, 1, 5);
     final afterCutoff = DateTime(2024, 1, 12);
 
-    Future<void> insertUser(String id, String email) async {
-      await db.into(db.userEntity).insert(UserEntityCompanion.insert(id: id, email: email, name: email));
-    }
-
     setUp(() async {
       await insertUser(userId, 'user@test.com');
       await insertUser(otherUserId, 'other@test.com');
     });
 
-    Future<void> insertLocalAsset({
-      required String id,
-      required String checksum,
-      required DateTime createdAt,
-      required AssetType type,
-      required bool isFavorite,
-    }) async {
-      await db
-          .into(db.localAssetEntity)
-          .insert(
-            LocalAssetEntityCompanion.insert(
-              id: id,
-              name: 'asset_$id.jpg',
-              checksum: Value(checksum),
-              type: type,
-              createdAt: Value(createdAt),
-              updatedAt: Value(createdAt),
-              isFavorite: Value(isFavorite),
-            ),
-          );
-    }
-
-    Future<void> insertRemoteAsset({
-      required String id,
-      required String checksum,
-      required String ownerId,
-      DateTime? deletedAt,
-    }) async {
-      await db
-          .into(db.remoteAssetEntity)
-          .insert(
-            RemoteAssetEntityCompanion.insert(
-              id: id,
-              name: 'remote_$id.jpg',
-              checksum: checksum,
-              type: AssetType.image,
-              createdAt: Value(now),
-              updatedAt: Value(now),
-              ownerId: ownerId,
-              visibility: AssetVisibility.timeline,
-              deletedAt: Value(deletedAt),
-            ),
-          );
-    }
-
     Future<void> insertLocalAlbum({required String id, required String name, required bool isIosSharedAlbum}) async {
       await db
           .into(db.localAlbumEntity)
@@ -211,11 +243,7 @@ void main() {
       );
       await insertRemoteAsset(id: 'remote-video', checksum: 'checksum-video', ownerId: userId);
 
-      final result = await repository.getRemovalCandidates(
-        userId,
-        cutoffDate,
-        keepMediaType: AssetKeepType.photosOnly,
-      );
+      final result = await repository.getRemovalCandidates(userId, cutoffDate, keepMediaType: AssetKeepType.photosOnly);
 
       expect(result.assets.length, 1);
       expect(result.assets[0].id, 'local-video');
@@ -243,11 +271,7 @@ void main() {
       );
       await insertRemoteAsset(id: 'remote-video', checksum: 'checksum-video', ownerId: userId);
 
-      final result = await repository.getRemovalCandidates(
-        userId,
-        cutoffDate,
-        keepMediaType: AssetKeepType.videosOnly,
-      );
+      final result = await repository.getRemovalCandidates(userId, cutoffDate, keepMediaType: AssetKeepType.videosOnly);
 
       expect(result.assets.length, 1);
       expect(result.assets[0].id, 'local-photo');
@@ -507,11 +531,7 @@ void main() {
       await insertRemoteAsset(id: 'remote-3', checksum: 'checksum-3', ownerId: userId);
       await insertLocalAlbumAsset(albumId: 'album-3', assetId: 'local-3');
 
-      final result = await repository.getRemovalCandidates(
-        userId,
-        cutoffDate,
-        keepAlbumIds: {'album-1', 'album-2'},
-      );
+      final result = await repository.getRemovalCandidates(userId, cutoffDate, keepAlbumIds: {'album-1', 'album-2'});
 
       expect(result.assets.length, 1);
       expect(result.assets[0].id, 'local-3');
@@ -644,4 +664,313 @@ void main() {
       expect(result.assets[0].id, 'local-video');
     });
   });
+
+  group('reconcileHashesFromCloudId', () {
+    final userId = 'user-123';
+    final createdAt = DateTime(2024, 1, 10);
+    final adjustmentTime = DateTime(2024, 1, 11);
+    const latitude = 37.7749;
+    const longitude = -122.4194;
+
+    setUp(() async {
+      await insertUser(userId, 'user@test.com');
+    });
+
+    test('updates local asset checksum when all metadata matches', () async {
+      await insertLocalAsset(
+        id: 'local-1',
+        checksum: null,
+        iCloudId: 'cloud-123',
+        createdAt: createdAt,
+        adjustmentTime: adjustmentTime,
+        latitude: latitude,
+        longitude: longitude,
+      );
+
+      await insertRemoteAsset(id: 'remote-1', checksum: 'hash-abc123', ownerId: userId);
+
+      await insertRemoteAssetCloudId(
+        assetId: 'remote-1',
+        cloudId: 'cloud-123',
+        createdAt: createdAt,
+        adjustmentTime: adjustmentTime,
+        latitude: latitude,
+        longitude: longitude,
+      );
+
+      await repository.reconcileHashesFromCloudId();
+
+      final updated = await repository.getById('local-1');
+      expect(updated?.checksum, 'hash-abc123');
+    });
+
+    test('does not update when local asset already has checksum', () async {
+      await insertLocalAsset(
+        id: 'local-1',
+        checksum: 'existing-checksum',
+        iCloudId: 'cloud-123',
+        createdAt: createdAt,
+        adjustmentTime: adjustmentTime,
+        latitude: latitude,
+        longitude: longitude,
+      );
+
+      await insertRemoteAsset(id: 'remote-1', checksum: 'hash-abc123', ownerId: userId);
+
+      await insertRemoteAssetCloudId(
+        assetId: 'remote-1',
+        cloudId: 'cloud-123',
+        createdAt: createdAt,
+        adjustmentTime: adjustmentTime,
+        latitude: latitude,
+        longitude: longitude,
+      );
+
+      await repository.reconcileHashesFromCloudId();
+
+      final updated = await repository.getById('local-1');
+      expect(updated?.checksum, 'existing-checksum');
+    });
+
+    test('does not update when adjustment_time does not match', () async {
+      await insertLocalAsset(
+        id: 'local-1',
+        checksum: null,
+        iCloudId: 'cloud-123',
+        createdAt: createdAt,
+        adjustmentTime: adjustmentTime,
+        latitude: latitude,
+        longitude: longitude,
+      );
+
+      await insertRemoteAsset(id: 'remote-1', checksum: 'hash-abc123', ownerId: userId);
+
+      await insertRemoteAssetCloudId(
+        assetId: 'remote-1',
+        cloudId: 'cloud-123',
+        createdAt: createdAt,
+        adjustmentTime: DateTime(2024, 1, 12),
+        latitude: latitude,
+        longitude: longitude,
+      );
+
+      await repository.reconcileHashesFromCloudId();
+
+      final updated = await repository.getById('local-1');
+      expect(updated?.checksum, isNull);
+    });
+
+    test('does not update when latitude does not match', () async {
+      await insertLocalAsset(
+        id: 'local-1',
+        checksum: null,
+        iCloudId: 'cloud-123',
+        createdAt: createdAt,
+        adjustmentTime: adjustmentTime,
+        latitude: latitude,
+        longitude: longitude,
+      );
+
+      await insertRemoteAsset(id: 'remote-1', checksum: 'hash-abc123', ownerId: userId);
+
+      await insertRemoteAssetCloudId(
+        assetId: 'remote-1',
+        cloudId: 'cloud-123',
+        createdAt: createdAt,
+        adjustmentTime: adjustmentTime,
+        latitude: 40.7128,
+        longitude: longitude,
+      );
+
+      await repository.reconcileHashesFromCloudId();
+
+      final updated = await repository.getById('local-1');
+      expect(updated?.checksum, isNull);
+    });
+
+    test('does not update when longitude does not match', () async {
+      await insertLocalAsset(
+        id: 'local-1',
+        checksum: null,
+        iCloudId: 'cloud-123',
+        createdAt: createdAt,
+        adjustmentTime: adjustmentTime,
+        latitude: latitude,
+        longitude: longitude,
+      );
+
+      await insertRemoteAsset(id: 'remote-1', checksum: 'hash-abc123', ownerId: userId);
+
+      await insertRemoteAssetCloudId(
+        assetId: 'remote-1',
+        cloudId: 'cloud-123',
+        createdAt: createdAt,
+        adjustmentTime: adjustmentTime,
+        latitude: latitude,
+        longitude: -74.0060,
+      );
+
+      await repository.reconcileHashesFromCloudId();
+
+      final updated = await repository.getById('local-1');
+      expect(updated?.checksum, isNull);
+    });
+
+    test('does not update when createdAt does not match', () async {
+      await insertLocalAsset(
+        id: 'local-1',
+        checksum: null,
+        iCloudId: 'cloud-123',
+        createdAt: createdAt,
+        adjustmentTime: adjustmentTime,
+        latitude: latitude,
+        longitude: longitude,
+      );
+
+      await insertRemoteAsset(id: 'remote-1', checksum: 'hash-abc123', ownerId: userId);
+
+      await insertRemoteAssetCloudId(
+        assetId: 'remote-1',
+        cloudId: 'cloud-123',
+        createdAt: DateTime(2024, 1, 5),
+        adjustmentTime: adjustmentTime,
+        latitude: latitude,
+        longitude: longitude,
+      );
+
+      await repository.reconcileHashesFromCloudId();
+
+      final updated = await repository.getById('local-1');
+      expect(updated?.checksum, isNull);
+    });
+
+    test('does not update when iCloudId is null', () async {
+      await insertLocalAsset(
+        id: 'local-1',
+        checksum: null,
+        iCloudId: null,
+        createdAt: createdAt,
+        adjustmentTime: adjustmentTime,
+        latitude: latitude,
+        longitude: longitude,
+      );
+
+      await insertRemoteAsset(id: 'remote-1', checksum: 'hash-abc123', ownerId: userId);
+
+      await insertRemoteAssetCloudId(
+        assetId: 'remote-1',
+        cloudId: 'cloud-123',
+        createdAt: createdAt,
+        adjustmentTime: adjustmentTime,
+        latitude: latitude,
+        longitude: longitude,
+      );
+
+      await repository.reconcileHashesFromCloudId();
+
+      final updated = await repository.getById('local-1');
+      expect(updated?.checksum, isNull);
+    });
+
+    test('does not update when cloudId does not match iCloudId', () async {
+      await insertLocalAsset(
+        id: 'local-1',
+        checksum: null,
+        iCloudId: 'cloud-123',
+        createdAt: createdAt,
+        adjustmentTime: adjustmentTime,
+        latitude: latitude,
+        longitude: longitude,
+      );
+
+      await insertRemoteAsset(id: 'remote-1', checksum: 'hash-abc123', ownerId: userId);
+
+      await insertRemoteAssetCloudId(
+        assetId: 'remote-1',
+        cloudId: 'cloud-456',
+        createdAt: createdAt,
+        adjustmentTime: adjustmentTime,
+        latitude: latitude,
+        longitude: longitude,
+      );
+
+      await repository.reconcileHashesFromCloudId();
+
+      final updated = await repository.getById('local-1');
+      expect(updated?.checksum, isNull);
+    });
+
+    test('handles partial null metadata fields matching correctly', () async {
+      await insertLocalAsset(
+        id: 'local-1',
+        checksum: null,
+        iCloudId: 'cloud-123',
+        createdAt: createdAt,
+        adjustmentTime: null,
+        latitude: latitude,
+        longitude: longitude,
+      );
+
+      await insertRemoteAsset(id: 'remote-1', checksum: 'hash-abc123', ownerId: userId);
+
+      await insertRemoteAssetCloudId(
+        assetId: 'remote-1',
+        cloudId: 'cloud-123',
+        createdAt: createdAt,
+        adjustmentTime: null,
+        latitude: latitude,
+        longitude: longitude,
+      );
+
+      await repository.reconcileHashesFromCloudId();
+
+      final updated = await repository.getById('local-1');
+      expect(updated?.checksum, 'hash-abc123');
+    });
+
+    test('does not update when one has null and other has value', () async {
+      await insertLocalAsset(
+        id: 'local-1',
+        checksum: null,
+        iCloudId: 'cloud-123',
+        createdAt: createdAt,
+        adjustmentTime: adjustmentTime,
+        latitude: null,
+        longitude: longitude,
+      );
+
+      await insertRemoteAsset(id: 'remote-1', checksum: 'hash-abc123', ownerId: userId);
+
+      await insertRemoteAssetCloudId(
+        assetId: 'remote-1',
+        cloudId: 'cloud-123',
+        createdAt: createdAt,
+        adjustmentTime: adjustmentTime,
+        latitude: latitude,
+        longitude: longitude,
+      );
+
+      await repository.reconcileHashesFromCloudId();
+
+      final updated = await repository.getById('local-1');
+      expect(updated?.checksum, isNull);
+    });
+
+    test('handles no matching assets gracefully', () async {
+      await insertLocalAsset(
+        id: 'local-1',
+        checksum: null,
+        iCloudId: 'cloud-999',
+        createdAt: createdAt,
+        adjustmentTime: adjustmentTime,
+        latitude: latitude,
+        longitude: longitude,
+      );
+
+      await repository.reconcileHashesFromCloudId();
+
+      final updated = await repository.getById('local-1');
+      expect(updated?.checksum, isNull);
+    });
+  });
 }

mobile/test/utils/editor_test.dart

@@ -1,321 +0,0 @@
-import 'package:flutter_test/flutter_test.dart';
-import 'package:immich_mobile/domain/models/asset_edit.model.dart';
-import 'package:immich_mobile/utils/editor.utils.dart';
-
-List<AssetEdit> normalizedToEdits(double rotation, bool mirrorH, bool mirrorV) {
-  List<AssetEdit> edits = [];
-
-  if (mirrorH) {
-    edits.add(const AssetEdit(action: AssetEditAction.mirror, parameters: {"axis": "horizontal"}));
-  }
-
-  if (mirrorV) {
-    edits.add(const AssetEdit(action: AssetEditAction.mirror, parameters: {"axis": "vertical"}));
-  }
-
-  if (rotation != 0) {
-    edits.add(AssetEdit(action: AssetEditAction.rotate, parameters: {"angle": rotation}));
-  }
-
-  return edits;
-}
-
-bool compareEditAffines(List<AssetEdit> editsA, List<AssetEdit> editsB) {
-  final normA = buildAffineFromEdits(editsA);
-  final normB = buildAffineFromEdits(editsB);
-
-  return ((normA.a - normB.a).abs() < 0.0001 &&
-      (normA.b - normB.b).abs() < 0.0001 &&
-      (normA.c - normB.c).abs() < 0.0001 &&
-      (normA.d - normB.d).abs() < 0.0001);
-}
-
-void main() {
-  group('normalizeEdits', () {
-    test('should handle no edits', () {
-      final edits = <AssetEdit>[];
-
-      final result = normalizeTransformEdits(edits);
-      final normalizedEdits = normalizedToEdits(result.$1, result.$2, result.$3);
-
-      expect(compareEditAffines(normalizedEdits, edits), true);
-    });
-
-    test('should handle a single 90° rotation', () {
-      final edits = <AssetEdit>[
-        const AssetEdit(action: AssetEditAction.rotate, parameters: {"angle": 90}),
-      ];
-
-      final result = normalizeTransformEdits(edits);
-      final normalizedEdits = normalizedToEdits(result.$1, result.$2, result.$3);
-
-      expect(compareEditAffines(normalizedEdits, edits), true);
-    });
-
-    test('should handle a single 180° rotation', () {
-      final edits = <AssetEdit>[
-        const AssetEdit(action: AssetEditAction.rotate, parameters: {"angle": 180}),
-      ];
-
-      final result = normalizeTransformEdits(edits);
-      final normalizedEdits = normalizedToEdits(result.$1, result.$2, result.$3);
-
-      expect(compareEditAffines(normalizedEdits, edits), true);
-    });
-
-    test('should handle a single 270° rotation', () {
-      final edits = <AssetEdit>[
-        const AssetEdit(action: AssetEditAction.rotate, parameters: {"angle": 270}),
-      ];
-
-      final result = normalizeTransformEdits(edits);
-      final normalizedEdits = normalizedToEdits(result.$1, result.$2, result.$3);
-
-      expect(compareEditAffines(normalizedEdits, edits), true);
-    });
-
-    test('should handle a single horizontal mirror', () {
-      final edits = <AssetEdit>[
-        const AssetEdit(action: AssetEditAction.mirror, parameters: {"axis": "horizontal"}),
-      ];
-
-      final result = normalizeTransformEdits(edits);
-      final normalizedEdits = normalizedToEdits(result.$1, result.$2, result.$3);
-
-      expect(compareEditAffines(normalizedEdits, edits), true);
-    });
-
-    test('should handle a single vertical mirror', () {
-      final edits = <AssetEdit>[
-        const AssetEdit(action: AssetEditAction.mirror, parameters: {"axis": "vertical"}),
-      ];
-
-      final result = normalizeTransformEdits(edits);
-      final normalizedEdits = normalizedToEdits(result.$1, result.$2, result.$3);
-
-      expect(compareEditAffines(normalizedEdits, edits), true);
-    });
-
-    test('should handle 90° rotation + horizontal mirror', () {
-      final edits = <AssetEdit>[
-        const AssetEdit(action: AssetEditAction.rotate, parameters: {"angle": 90}),
-        const AssetEdit(action: AssetEditAction.mirror, parameters: {"axis": "horizontal"}),
-      ];
-
-      final result = normalizeTransformEdits(edits);
-      final normalizedEdits = normalizedToEdits(result.$1, result.$2, result.$3);
-
-      expect(compareEditAffines(normalizedEdits, edits), true);
-    });
-
-    test('should handle 90° rotation + vertical mirror', () {
-      final edits = <AssetEdit>[
-        const AssetEdit(action: AssetEditAction.rotate, parameters: {"angle": 90}),
-        const AssetEdit(action: AssetEditAction.mirror, parameters: {"axis": "vertical"}),
-      ];
-
-      final result = normalizeTransformEdits(edits);
-      final normalizedEdits = normalizedToEdits(result.$1, result.$2, result.$3);
-
-      expect(compareEditAffines(normalizedEdits, edits), true);
-    });
-
-    test('should handle 90° rotation + both mirrors', () {
-      final edits = <AssetEdit>[
-        const AssetEdit(action: AssetEditAction.rotate, parameters: {"angle": 90}),
-        const AssetEdit(action: AssetEditAction.mirror, parameters: {"axis": "horizontal"}),
-        const AssetEdit(action: AssetEditAction.mirror, parameters: {"axis": "vertical"}),
-      ];
-
-      final result = normalizeTransformEdits(edits);
-      final normalizedEdits = normalizedToEdits(result.$1, result.$2, result.$3);
-
-      expect(compareEditAffines(normalizedEdits, edits), true);
-    });
-
-    test('should handle 180° rotation + horizontal mirror', () {
-      final edits = <AssetEdit>[
-        const AssetEdit(action: AssetEditAction.rotate, parameters: {"angle": 180}),
-        const AssetEdit(action: AssetEditAction.mirror, parameters: {"axis": "horizontal"}),
-      ];
-
-      final result = normalizeTransformEdits(edits);
-      final normalizedEdits = normalizedToEdits(result.$1, result.$2, result.$3);
-
-      expect(compareEditAffines(normalizedEdits, edits), true);
-    });
-
-    test('should handle 180° rotation + vertical mirror', () {
-      final edits = <AssetEdit>[
-        const AssetEdit(action: AssetEditAction.rotate, parameters: {"angle": 180}),
-        const AssetEdit(action: AssetEditAction.mirror, parameters: {"axis": "vertical"}),
-      ];
-
-      final result = normalizeTransformEdits(edits);
-      final normalizedEdits = normalizedToEdits(result.$1, result.$2, result.$3);
-
-      expect(compareEditAffines(normalizedEdits, edits), true);
-    });
-
-    test('should handle 180° rotation + both mirrors', () {
-      final edits = <AssetEdit>[
-        const AssetEdit(action: AssetEditAction.rotate, parameters: {"angle": 180}),
-        const AssetEdit(action: AssetEditAction.mirror, parameters: {"axis": "horizontal"}),
-        const AssetEdit(action: AssetEditAction.mirror, parameters: {"axis": "vertical"}),
-      ];
-
-      final result = normalizeTransformEdits(edits);
-      final normalizedEdits = normalizedToEdits(result.$1, result.$2, result.$3);
-
-      expect(compareEditAffines(normalizedEdits, edits), true);
-    });
-
-    test('should handle 270° rotation + horizontal mirror', () {
-      final edits = <AssetEdit>[
-        const AssetEdit(action: AssetEditAction.rotate, parameters: {"angle": 270}),
-        const AssetEdit(action: AssetEditAction.mirror, parameters: {"axis": "horizontal"}),
-      ];
-
-      final result = normalizeTransformEdits(edits);
-      final normalizedEdits = normalizedToEdits(result.$1, result.$2, result.$3);
-
-      expect(compareEditAffines(normalizedEdits, edits), true);
-    });
-
-    test('should handle 270° rotation + vertical mirror', () {
-      final edits = <AssetEdit>[
-        const AssetEdit(action: AssetEditAction.rotate, parameters: {"angle": 270}),
-        const AssetEdit(action: AssetEditAction.mirror, parameters: {"axis": "vertical"}),
-      ];
-
-      final result = normalizeTransformEdits(edits);
-      final normalizedEdits = normalizedToEdits(result.$1, result.$2, result.$3);
-
-      expect(compareEditAffines(normalizedEdits, edits), true);
-    });
-
-    test('should handle 270° rotation + both mirrors', () {
-      final edits = <AssetEdit>[
-        const AssetEdit(action: AssetEditAction.rotate, parameters: {"angle": 270}),
-        const AssetEdit(action: AssetEditAction.mirror, parameters: {"axis": "horizontal"}),
-        const AssetEdit(action: AssetEditAction.mirror, parameters: {"axis": "vertical"}),
-      ];
-
-      final result = normalizeTransformEdits(edits);
-      final normalizedEdits = normalizedToEdits(result.$1, result.$2, result.$3);
-
-      expect(compareEditAffines(normalizedEdits, edits), true);
-    });
-
-    test('should handle horizontal mirror + 90° rotation', () {
-      final edits = <AssetEdit>[
-        const AssetEdit(action: AssetEditAction.mirror, parameters: {"axis": "horizontal"}),
-        const AssetEdit(action: AssetEditAction.rotate, parameters: {"angle": 90}),
-      ];
-
-      final result = normalizeTransformEdits(edits);
-      final normalizedEdits = normalizedToEdits(result.$1, result.$2, result.$3);
-
-      expect(compareEditAffines(normalizedEdits, edits), true);
-    });
-
-    test('should handle horizontal mirror + 180° rotation', () {
-      final edits = <AssetEdit>[
-        const AssetEdit(action: AssetEditAction.mirror, parameters: {"axis": "horizontal"}),
-        const AssetEdit(action: AssetEditAction.rotate, parameters: {"angle": 180}),
-      ];
-
-      final result = normalizeTransformEdits(edits);
-      final normalizedEdits = normalizedToEdits(result.$1, result.$2, result.$3);
-
-      expect(compareEditAffines(normalizedEdits, edits), true);
-    });
-
-    test('should handle horizontal mirror + 270° rotation', () {
-      final edits = <AssetEdit>[
-        const AssetEdit(action: AssetEditAction.mirror, parameters: {"axis": "horizontal"}),
-        const AssetEdit(action: AssetEditAction.rotate, parameters: {"angle": 270}),
-      ];
-
-      final result = normalizeTransformEdits(edits);
-      final normalizedEdits = normalizedToEdits(result.$1, result.$2, result.$3);
-
-      expect(compareEditAffines(normalizedEdits, edits), true);
-    });
-
-    test('should handle vertical mirror + 90° rotation', () {
-      final edits = <AssetEdit>[
-        const AssetEdit(action: AssetEditAction.mirror, parameters: {"axis": "vertical"}),
-        const AssetEdit(action: AssetEditAction.rotate, parameters: {"angle": 90}),
-      ];
-
-      final result = normalizeTransformEdits(edits);
-      final normalizedEdits = normalizedToEdits(result.$1, result.$2, result.$3);
-
-      expect(compareEditAffines(normalizedEdits, edits), true);
-    });
-
-    test('should handle vertical mirror + 180° rotation', () {
-      final edits = <AssetEdit>[
-        const AssetEdit(action: AssetEditAction.mirror, parameters: {"axis": "vertical"}),
-        const AssetEdit(action: AssetEditAction.rotate, parameters: {"angle": 180}),
-      ];
-
-      final result = normalizeTransformEdits(edits);
-      final normalizedEdits = normalizedToEdits(result.$1, result.$2, result.$3);
-
-      expect(compareEditAffines(normalizedEdits, edits), true);
-    });
-
-    test('should handle vertical mirror + 270° rotation', () {
-      final edits = <AssetEdit>[
-        const AssetEdit(action: AssetEditAction.mirror, parameters: {"axis": "vertical"}),
-        const AssetEdit(action: AssetEditAction.rotate, parameters: {"angle": 270}),
-      ];
-
-      final result = normalizeTransformEdits(edits);
-      final normalizedEdits = normalizedToEdits(result.$1, result.$2, result.$3);
-
-      expect(compareEditAffines(normalizedEdits, edits), true);
-    });
-
-    test('should handle both mirrors + 90° rotation', () {
-      final edits = <AssetEdit>[
-        const AssetEdit(action: AssetEditAction.mirror, parameters: {"axis": "horizontal"}),
-        const AssetEdit(action: AssetEditAction.mirror, parameters: {"axis": "vertical"}),
-        const AssetEdit(action: AssetEditAction.rotate, parameters: {"angle": 90}),
-      ];
-
-      final result = normalizeTransformEdits(edits);
-      final normalizedEdits = normalizedToEdits(result.$1, result.$2, result.$3);
-
-      expect(compareEditAffines(normalizedEdits, edits), true);
-    });
-
-    test('should handle both mirrors + 180° rotation', () {
-      final edits = <AssetEdit>[
-        const AssetEdit(action: AssetEditAction.mirror, parameters: {"axis": "horizontal"}),
-        const AssetEdit(action: AssetEditAction.mirror, parameters: {"axis": "vertical"}),
-        const AssetEdit(action: AssetEditAction.rotate, parameters: {"angle": 180}),
-      ];
-
-      final result = normalizeTransformEdits(edits);
-      final normalizedEdits = normalizedToEdits(result.$1, result.$2, result.$3);
-
-      expect(compareEditAffines(normalizedEdits, edits), true);
-    });
-
-    test('should handle both mirrors + 270° rotation', () {
-      final edits = <AssetEdit>[
-        const AssetEdit(action: AssetEditAction.mirror, parameters: {"axis": "horizontal"}),
-        const AssetEdit(action: AssetEditAction.mirror, parameters: {"axis": "vertical"}),
-        const AssetEdit(action: AssetEditAction.rotate, parameters: {"angle": 270}),
-      ];
-
-      final result = normalizeTransformEdits(edits);
-      final normalizedEdits = normalizedToEdits(result.$1, result.$2, result.$3);
-
-      expect(compareEditAffines(normalizedEdits, edits), true);
-    });
-  });
-}

open-api/bin/generate-open-api.sh

@@ -21,7 +21,6 @@ function dart {
   patch --no-backup-if-mismatch -u ../mobile/openapi/lib/api_client.dart <./patch/api_client.dart.patch
   patch --no-backup-if-mismatch -u ../mobile/openapi/lib/api.dart <./patch/api.dart.patch
   patch --no-backup-if-mismatch -u ../mobile/openapi/pubspec.yaml <./patch/pubspec_immich_mobile.yaml.patch
-  patch --no-backup-if-mismatch -u ../mobile/openapi/lib/model/asset_edit_action_list_dto_edits_inner.dart <./patch/asset_edit_action_list_dto_edits_inner.dart.patch
   # Don't include analysis_options.yaml for the generated openapi files
   # so that language servers can properly exclude the mobile/openapi directory
   rm ../mobile/openapi/analysis_options.yaml

open-api/immich-openapi-specs.json

@@ -21513,48 +21513,6 @@
         ],
         "type": "object"
       },
-      "SyncAssetEditDeleteV1": {
-        "properties": {
-          "assetId": {
-            "type": "string"
-          }
-        },
-        "required": [
-          "assetId"
-        ],
-        "type": "object"
-      },
-      "SyncAssetEditV1": {
-        "properties": {
-          "action": {
-            "allOf": [
-              {
-                "$ref": "#/components/schemas/AssetEditAction"
-              }
-            ]
-          },
-          "assetId": {
-            "type": "string"
-          },
-          "id": {
-            "type": "string"
-          },
-          "parameters": {
-            "type": "object"
-          },
-          "sequence": {
-            "type": "integer"
-          }
-        },
-        "required": [
-          "action",
-          "assetId",
-          "id",
-          "parameters",
-          "sequence"
-        ],
-        "type": "object"
-      },
       "SyncAssetExifV1": {
         "properties": {
           "assetId": {
@@ -21974,8 +21932,6 @@
           "AssetV1",
           "AssetDeleteV1",
           "AssetExifV1",
-          "AssetEditV1",
-          "AssetEditDeleteV1",
           "AssetMetadataV1",
           "AssetMetadataDeleteV1",
           "PartnerV1",
@@ -22238,7 +22194,6 @@
           "AlbumAssetExifsV1",
           "AssetsV1",
           "AssetExifsV1",
-          "AssetEditsV1",
           "AssetMetadataV1",
           "AuthUsersV1",
           "MemoriesV1",

open-api/patch/asset_edit_action_list_dto_edits_inner.dart.patch

@@ -1,20 +0,0 @@
---- /tmp/asset_edit_orig.dart	2026-01-20 10:38:05
-+++ /tmp/asset_edit_final.dart	2026-01-20 10:40:33
-@@ -19,7 +19,7 @@
- 
-   AssetEditAction action;
- 
--  MirrorParameters parameters;
-+  Map<String, dynamic> parameters;
- 
-   @override
-   bool operator ==(Object other) => identical(this, other) || other is AssetEditActionListDtoEditsInner &&
-@@ -62,7 +62,7 @@
- 
-       return AssetEditActionListDtoEditsInner(
-         action: AssetEditAction.fromJson(json[r'action'])!,
--        parameters: MirrorParameters.fromJson(json[r'parameters'])!,
-+        parameters: json[r'parameters'],
-       );
-     }
-     return null;

open-api/typescript-sdk/src/fetch-client.ts

@@ -1912,16 +1912,6 @@ export type SyncAlbumV1 = {
 export type SyncAssetDeleteV1 = {
     assetId: string;
 };
-export type SyncAssetEditDeleteV1 = {
-    assetId: string;
-};
-export type SyncAssetEditV1 = {
-    action: AssetEditAction;
-    assetId: string;
-    id: string;
-    parameters: object;
-    sequence: number;
-};
 export type SyncAssetExifV1 = {
     assetId: string;
     city: string | null;
@@ -6028,8 +6018,6 @@ export enum SyncEntityType {
     AssetV1 = "AssetV1",
     AssetDeleteV1 = "AssetDeleteV1",
     AssetExifV1 = "AssetExifV1",
-    AssetEditV1 = "AssetEditV1",
-    AssetEditDeleteV1 = "AssetEditDeleteV1",
     AssetMetadataV1 = "AssetMetadataV1",
     AssetMetadataDeleteV1 = "AssetMetadataDeleteV1",
     PartnerV1 = "PartnerV1",
@@ -6080,7 +6068,6 @@ export enum SyncRequestType {
     AlbumAssetExifsV1 = "AlbumAssetExifsV1",
     AssetsV1 = "AssetsV1",
     AssetExifsV1 = "AssetExifsV1",
-    AssetEditsV1 = "AssetEditsV1",
     AssetMetadataV1 = "AssetMetadataV1",
     AuthUsersV1 = "AuthUsersV1",
     MemoriesV1 = "MemoriesV1",

server/src/dtos/sync.dto.ts

@@ -2,7 +2,6 @@
 import { ApiProperty } from '@nestjs/swagger';
 import { ArrayMaxSize, IsInt, IsPositive, IsString } from 'class-validator';
 import { AssetResponseDto } from 'src/dtos/asset-response.dto';
-import { AssetEditAction } from 'src/dtos/editing.dto';
 import {
   AlbumUserRole,
   AssetOrder,
@@ -170,24 +169,6 @@ export class SyncAssetExifV1 {
   fps!: number | null;
 }
 
-@ExtraModel()
-export class SyncAssetEditV1 {
-  id!: string;
-  assetId!: string;
-
-  @ValidateEnum({ enum: AssetEditAction, name: 'AssetEditAction' })
-  action!: AssetEditAction;
-  parameters!: object;
-
-  @ApiProperty({ type: 'integer' })
-  sequence!: number;
-}
-
-@ExtraModel()
-export class SyncAssetEditDeleteV1 {
-  assetId!: string;
-}
-
 @ExtraModel()
 export class SyncAssetMetadataV1 {
   assetId!: string;
@@ -373,8 +354,6 @@ export type SyncItem = {
   [SyncEntityType.AssetMetadataV1]: SyncAssetMetadataV1;
   [SyncEntityType.AssetMetadataDeleteV1]: SyncAssetMetadataDeleteV1;
   [SyncEntityType.AssetExifV1]: SyncAssetExifV1;
-  [SyncEntityType.AssetEditV1]: SyncAssetEditV1;
-  [SyncEntityType.AssetEditDeleteV1]: SyncAssetEditDeleteV1;
   [SyncEntityType.PartnerAssetV1]: SyncAssetV1;
   [SyncEntityType.PartnerAssetBackfillV1]: SyncAssetV1;
   [SyncEntityType.PartnerAssetDeleteV1]: SyncAssetDeleteV1;

server/src/enum.ts

@@ -720,7 +720,6 @@ export enum SyncRequestType {
   AlbumAssetExifsV1 = 'AlbumAssetExifsV1',
   AssetsV1 = 'AssetsV1',
   AssetExifsV1 = 'AssetExifsV1',
-  AssetEditsV1 = 'AssetEditsV1',
   AssetMetadataV1 = 'AssetMetadataV1',
   AuthUsersV1 = 'AuthUsersV1',
   MemoriesV1 = 'MemoriesV1',
@@ -745,8 +744,6 @@ export enum SyncEntityType {
   AssetV1 = 'AssetV1',
   AssetDeleteV1 = 'AssetDeleteV1',
   AssetExifV1 = 'AssetExifV1',
-  AssetEditV1 = 'AssetEditV1',
-  AssetEditDeleteV1 = 'AssetEditDeleteV1',
   AssetMetadataV1 = 'AssetMetadataV1',
   AssetMetadataDeleteV1 = 'AssetMetadataDeleteV1',
 

server/src/repositories/asset-edit.repository.ts

@@ -39,16 +39,4 @@ export class AssetEditRepository {
       .orderBy('sequence', 'asc')
       .execute() as Promise<AssetEditActionItem[]>;
   }
-
-  @GenerateSql({
-    params: [DummyValue.UUID],
-  })
-  getWithSyncInfo(assetId: string) {
-    return this.db
-      .selectFrom('asset_edit')
-      .select(['id', 'assetId', 'sequence', 'action', 'parameters'])
-      .where('assetId', '=', assetId)
-      .orderBy('sequence', 'asc')
-      .execute();
-  }
 }

server/src/repositories/sync.repository.ts

@@ -53,7 +53,6 @@ export class SyncRepository {
   albumUser: AlbumUserSync;
   asset: AssetSync;
   assetExif: AssetExifSync;
-  assetEdit: AssetEditSync;
   assetFace: AssetFaceSync;
   assetMetadata: AssetMetadataSync;
   authUser: AuthUserSync;
@@ -76,7 +75,6 @@ export class SyncRepository {
     this.albumUser = new AlbumUserSync(this.db);
     this.asset = new AssetSync(this.db);
     this.assetExif = new AssetExifSync(this.db);
-    this.assetEdit = new AssetEditSync(this.db);
     this.assetFace = new AssetFaceSync(this.db);
     this.assetMetadata = new AssetMetadataSync(this.db);
     this.authUser = new AuthUserSync(this.db);
@@ -501,30 +499,6 @@ class AssetExifSync extends BaseSync {
   }
 }
 
-class AssetEditSync extends BaseSync {
-  @GenerateSql({ params: [dummyQueryOptions, DummyValue.UUID], stream: true })
-  getDeletes(options: SyncQueryOptions) {
-    return this.auditQuery('asset_edit_audit', options)
-      .select(['asset_edit_audit.id', 'assetId'])
-      .leftJoin('asset', 'asset.id', 'asset_edit_audit.assetId')
-      .where('asset.ownerId', '=', options.userId)
-      .stream();
-  }
-
-  cleanupAuditTable(daysAgo: number) {
-    return this.auditCleanup('asset_edit_audit', daysAgo);
-  }
-
-  @GenerateSql({ params: [dummyQueryOptions, DummyValue.UUID], stream: true })
-  getUpserts(options: SyncQueryOptions) {
-    return this.upsertQuery('asset_edit', options)
-      .select(['asset_edit.id', 'assetId', 'action', 'parameters', 'sequence', 'asset_edit.updateId'])
-      .innerJoin('asset', 'asset.id', 'asset_edit.assetId')
-      .where('asset.ownerId', '=', options.userId)
-      .stream();
-  }
-}
-
 class MemorySync extends BaseSync {
   @GenerateSql({ params: [dummyQueryOptions], stream: true })
   getDeletes(options: SyncQueryOptions) {

server/src/repositories/websocket.repository.ts

@@ -11,7 +11,7 @@ import { AssetResponseDto } from 'src/dtos/asset-response.dto';
 import { AuthDto } from 'src/dtos/auth.dto';
 import { NotificationDto } from 'src/dtos/notification.dto';
 import { ReleaseNotification, ServerVersionResponseDto } from 'src/dtos/server.dto';
-import { SyncAssetEditV1, SyncAssetExifV1, SyncAssetV1 } from 'src/dtos/sync.dto';
+import { SyncAssetExifV1, SyncAssetV1 } from 'src/dtos/sync.dto';
 import { AppRestartEvent, ArgsOf, EventRepository } from 'src/repositories/event.repository';
 import { LoggingRepository } from 'src/repositories/logging.repository';
 import { handlePromiseError } from 'src/utils/misc';
@@ -37,7 +37,7 @@ export interface ClientEventMap {
 
   AssetUploadReadyV1: [{ asset: SyncAssetV1; exif: SyncAssetExifV1 }];
   AppRestartV1: [AppRestartEvent];
-  AssetEditReadyV1: [{ asset: SyncAssetV1; edit: SyncAssetEditV1[] }];
+  AssetEditReadyV1: [{ asset: SyncAssetV1 }];
 }
 
 export type AuthFn = (client: Socket) => Promise<AuthDto>;

server/src/schema/functions.ts

@@ -286,16 +286,3 @@ export const asset_edit_delete = registerFunction({
     END
   `,
 });
-
-export const asset_edit_audit = registerFunction({
-  name: 'asset_edit_audit',
-  returnType: 'TRIGGER',
-  language: 'PLPGSQL',
-  body: `
-    BEGIN
-      INSERT INTO asset_edit_audit ("assetId")
-      SELECT "assetId"
-      FROM OLD;
-      RETURN NULL;
-    END`,
-});

server/src/schema/index.ts

@@ -28,7 +28,6 @@ import { AlbumUserTable } from 'src/schema/tables/album-user.table';
 import { AlbumTable } from 'src/schema/tables/album.table';
 import { ApiKeyTable } from 'src/schema/tables/api-key.table';
 import { AssetAuditTable } from 'src/schema/tables/asset-audit.table';
-import { AssetEditAuditTable } from 'src/schema/tables/asset-edit-audit.table';
 import { AssetEditTable } from 'src/schema/tables/asset-edit.table';
 import { AssetExifTable } from 'src/schema/tables/asset-exif.table';
 import { AssetFaceAuditTable } from 'src/schema/tables/asset-face-audit.table';
@@ -89,7 +88,6 @@ export class ImmichDatabase {
     ApiKeyTable,
     AssetAuditTable,
     AssetEditTable,
-    AssetEditAuditTable,
     AssetFaceTable,
     AssetFaceAuditTable,
     AssetMetadataTable,
@@ -184,7 +182,6 @@ export interface DB {
   asset: AssetTable;
   asset_audit: AssetAuditTable;
   asset_edit: AssetEditTable;
-  asset_edit_audit: AssetEditAuditTable;
   asset_exif: AssetExifTable;
   asset_face: AssetFaceTable;
   asset_face_audit: AssetFaceAuditTable;

server/src/schema/migrations/1769026065658-AssetEditSync.ts

@@ -1,47 +0,0 @@
-import { Kysely, sql } from 'kysely';
-
-export async function up(db: Kysely<any>): Promise<void> {
-  await sql`CREATE OR REPLACE FUNCTION asset_edit_audit()
-  RETURNS TRIGGER
-  LANGUAGE PLPGSQL
-  AS $$
-    BEGIN
-      INSERT INTO asset_edit_audit ("assetId")
-      SELECT "assetId"
-      FROM OLD;
-      RETURN NULL;
-    END
-  $$;`.execute(db);
-  await sql`CREATE TABLE "asset_edit_audit" (
-  "id" uuid NOT NULL DEFAULT immich_uuid_v7(),
-  "assetId" uuid NOT NULL,
-  "deletedAt" timestamp with time zone NOT NULL DEFAULT clock_timestamp(),
-  CONSTRAINT "asset_edit_audit_pkey" PRIMARY KEY ("id")
-);`.execute(db);
-  await sql`CREATE INDEX "asset_edit_audit_assetId_idx" ON "asset_edit_audit" ("assetId");`.execute(db);
-  await sql`CREATE INDEX "asset_edit_audit_deletedAt_idx" ON "asset_edit_audit" ("deletedAt");`.execute(db);
-  await sql`ALTER TABLE "asset_edit" ADD "updateId" uuid NOT NULL DEFAULT immich_uuid_v7();`.execute(db);
-  await sql`CREATE INDEX "asset_edit_updateId_idx" ON "asset_edit" ("updateId");`.execute(db);
-  await sql`CREATE OR REPLACE TRIGGER "asset_edit_audit"
-  AFTER DELETE ON "asset_edit"
-  REFERENCING OLD TABLE AS "old"
-  FOR EACH STATEMENT
-  WHEN (pg_trigger_depth() = 0)
-  EXECUTE FUNCTION asset_edit_audit();`.execute(db);
-  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('function_asset_edit_audit', '{"type":"function","name":"asset_edit_audit","sql":"CREATE OR REPLACE FUNCTION asset_edit_audit()\\n  RETURNS TRIGGER\\n  LANGUAGE PLPGSQL\\n  AS $$\\n    BEGIN\\n      INSERT INTO asset_edit_audit (\\"assetId\\")\\n      SELECT \\"assetId\\"\\n      FROM OLD;\\n      RETURN NULL;\\n    END\\n  $$;"}'::jsonb);`.execute(
-    db,
-  );
-  await sql`INSERT INTO "migration_overrides" ("name", "value") VALUES ('trigger_asset_edit_audit', '{"type":"trigger","name":"asset_edit_audit","sql":"CREATE OR REPLACE TRIGGER \\"asset_edit_audit\\"\\n  AFTER DELETE ON \\"asset_edit\\"\\n  REFERENCING OLD TABLE AS \\"old\\"\\n  FOR EACH STATEMENT\\n  WHEN (pg_trigger_depth() = 0)\\n  EXECUTE FUNCTION asset_edit_audit();"}'::jsonb);`.execute(
-    db,
-  );
-}
-
-export async function down(db: Kysely<any>): Promise<void> {
-  await sql`DROP TRIGGER "asset_edit_audit" ON "asset_edit";`.execute(db);
-  await sql`DROP INDEX "asset_edit_updateId_idx";`.execute(db);
-  await sql`ALTER TABLE "asset_edit" DROP COLUMN "updateId";`.execute(db);
-  await sql`DROP TABLE "asset_edit_audit";`.execute(db);
-  await sql`DROP FUNCTION asset_edit_audit;`.execute(db);
-  await sql`DELETE FROM "migration_overrides" WHERE "name" = 'function_asset_edit_audit';`.execute(db);
-  await sql`DELETE FROM "migration_overrides" WHERE "name" = 'trigger_asset_edit_audit';`.execute(db);
-}

server/src/schema/tables/asset-edit-audit.table.ts

@@ -1,14 +0,0 @@
-import { PrimaryGeneratedUuidV7Column } from 'src/decorators';
-import { Column, CreateDateColumn, Generated, Table, Timestamp } from 'src/sql-tools';
-
-@Table('asset_edit_audit')
-export class AssetEditAuditTable {
-  @PrimaryGeneratedUuidV7Column()
-  id!: Generated<string>;
-
-  @Column({ type: 'uuid', index: true })
-  assetId!: string;
-
-  @CreateDateColumn({ default: () => 'clock_timestamp()', index: true })
-  deletedAt!: Generated<Timestamp>;
-}

server/src/schema/tables/asset-edit.table.ts

@@ -1,6 +1,5 @@
-import { UpdateIdColumn } from 'src/decorators';
 import { AssetEditAction, AssetEditActionParameter } from 'src/dtos/editing.dto';
-import { asset_edit_audit, asset_edit_delete, asset_edit_insert } from 'src/schema/functions';
+import { asset_edit_delete, asset_edit_insert } from 'src/schema/functions';
 import { AssetTable } from 'src/schema/tables/asset.table';
 import {
   AfterDeleteTrigger,
@@ -21,12 +20,6 @@ import {
   referencingOldTableAs: 'deleted_edit',
   when: 'pg_trigger_depth() = 0',
 })
-@AfterDeleteTrigger({
-  scope: 'statement',
-  function: asset_edit_audit,
-  referencingOldTableAs: 'old',
-  when: 'pg_trigger_depth() = 0',
-})
 @Unique({ columns: ['assetId', 'sequence'] })
 export class AssetEditTable<T extends AssetEditAction = AssetEditAction> {
   @PrimaryGeneratedColumn()
@@ -43,7 +36,4 @@ export class AssetEditTable<T extends AssetEditAction = AssetEditAction> {
 
   @Column({ type: 'integer' })
   sequence!: number;
-
-  @UpdateIdColumn({ index: true })
-  updateId!: Generated<string>;
 }

server/src/services/asset.service.ts

@@ -540,7 +540,6 @@ export class AssetService extends BaseService {
   async getAssetEdits(auth: AuthDto, id: string): Promise<AssetEditsDto> {
     await this.requireAccess({ auth, permission: Permission.AssetRead, ids: [id] });
     const edits = await this.assetEditRepository.getAll(id);
-
     return {
       assetId: id,
       edits,

server/src/services/job.service.ts

@@ -98,7 +98,6 @@ export class JobService extends BaseService {
 
       case JobName.AssetEditThumbnailGeneration: {
         const asset = await this.assetRepository.getById(item.data.id);
-        const edits = await this.assetEditRepository.getWithSyncInfo(item.data.id);
 
         if (asset) {
           this.websocketRepository.clientSend('AssetEditReadyV1', asset.ownerId, {
@@ -123,7 +122,6 @@ export class JobService extends BaseService {
               height: asset.height,
               isEdited: asset.isEdited,
             },
-            edit: edits,
           });
         }
 

server/src/services/sync.service.ts

@@ -87,7 +87,6 @@ export const SYNC_TYPES_ORDER = [
   SyncRequestType.AssetFacesV1,
   SyncRequestType.UserMetadataV1,
   SyncRequestType.AssetMetadataV1,
-  SyncRequestType.AssetEditsV1,
 ];
 
 const throwSessionRequired = () => {
@@ -174,7 +173,6 @@ export class SyncService extends BaseService {
       [SyncRequestType.PartnersV1]: () => this.syncPartnersV1(options, response, checkpointMap),
       [SyncRequestType.AssetsV1]: () => this.syncAssetsV1(options, response, checkpointMap),
       [SyncRequestType.AssetExifsV1]: () => this.syncAssetExifsV1(options, response, checkpointMap),
-      [SyncRequestType.AssetEditsV1]: () => this.syncAssetEditsV1(options, response, checkpointMap),
       [SyncRequestType.PartnerAssetsV1]: () => this.syncPartnerAssetsV1(options, response, checkpointMap, session.id),
       [SyncRequestType.AssetMetadataV1]: () => this.syncAssetMetadataV1(options, response, checkpointMap, auth),
       [SyncRequestType.PartnerAssetExifsV1]: () =>
@@ -351,21 +349,6 @@ export class SyncService extends BaseService {
     }
   }
 
-  private async syncAssetEditsV1(options: SyncQueryOptions, response: Writable, checkpointMap: CheckpointMap) {
-    const deleteType = SyncEntityType.AssetEditDeleteV1;
-    const deletes = this.syncRepository.assetEdit.getDeletes({ ...options, ack: checkpointMap[deleteType] });
-
-    for await (const { id, ...data } of deletes) {
-      send(response, { type: deleteType, ids: [id], data });
-    }
-    const upsertType = SyncEntityType.AssetEditV1;
-    const upserts = this.syncRepository.assetEdit.getUpserts({ ...options, ack: checkpointMap[upsertType] });
-
-    for await (const { updateId, ...data } of upserts) {
-      send(response, { type: upsertType, ids: [updateId], data });
-    }
-  }
-
   private async syncPartnerAssetExifsV1(
     options: SyncQueryOptions,
     response: Writable,

server/test/medium/specs/sync/sync-asset-edit.spec.ts

@@ -1,306 +0,0 @@
-import { Kysely } from 'kysely';
-import { AssetEditAction, MirrorAxis } from 'src/dtos/editing.dto';
-import { SyncEntityType, SyncRequestType } from 'src/enum';
-import { AssetEditRepository } from 'src/repositories/asset-edit.repository';
-import { DB } from 'src/schema';
-import { SyncTestContext } from 'test/medium.factory';
-import { factory } from 'test/small.factory';
-import { getKyselyDB } from 'test/utils';
-
-let defaultDatabase: Kysely<DB>;
-
-const setup = async (db?: Kysely<DB>) => {
-  const ctx = new SyncTestContext(db || defaultDatabase);
-  const { auth, user, session } = await ctx.newSyncAuthUser();
-  return { auth, user, session, ctx };
-};
-
-beforeAll(async () => {
-  defaultDatabase = await getKyselyDB();
-});
-
-describe(SyncRequestType.AssetEditsV1, () => {
-  it('should detect and sync the first asset edit', async () => {
-    const { auth, ctx } = await setup();
-    const { asset } = await ctx.newAsset({ ownerId: auth.user.id });
-    const assetEditRepo = ctx.get(AssetEditRepository);
-
-    await assetEditRepo.replaceAll(asset.id, [
-      {
-        action: AssetEditAction.Crop,
-        parameters: { x: 10, y: 20, width: 100, height: 200 },
-      },
-    ]);
-
-    const response = await ctx.syncStream(auth, [SyncRequestType.AssetEditsV1]);
-    expect(response).toEqual([
-      {
-        ack: expect.any(String),
-        data: {
-          id: expect.any(String),
-          assetId: asset.id,
-          action: AssetEditAction.Crop,
-          parameters: { x: 10, y: 20, width: 100, height: 200 },
-          sequence: 0,
-        },
-        type: SyncEntityType.AssetEditV1,
-      },
-      expect.objectContaining({ type: SyncEntityType.SyncCompleteV1 }),
-    ]);
-
-    await ctx.syncAckAll(auth, response);
-    await ctx.assertSyncIsComplete(auth, [SyncRequestType.AssetEditsV1]);
-  });
-
-  it('should detect and sync multiple asset edits for the same asset', async () => {
-    const { auth, ctx } = await setup();
-    const { asset } = await ctx.newAsset({ ownerId: auth.user.id });
-    const assetEditRepo = ctx.get(AssetEditRepository);
-
-    await assetEditRepo.replaceAll(asset.id, [
-      {
-        action: AssetEditAction.Crop,
-        parameters: { x: 10, y: 20, width: 100, height: 200 },
-      },
-      {
-        action: AssetEditAction.Rotate,
-        parameters: { angle: 90 },
-      },
-      {
-        action: AssetEditAction.Mirror,
-        parameters: { axis: MirrorAxis.Horizontal },
-      },
-    ]);
-
-    const response = await ctx.syncStream(auth, [SyncRequestType.AssetEditsV1]);
-    expect(response).toEqual(
-      expect.arrayContaining([
-        {
-          ack: expect.any(String),
-          data: {
-            id: expect.any(String),
-            assetId: asset.id,
-            action: AssetEditAction.Crop,
-            parameters: { x: 10, y: 20, width: 100, height: 200 },
-            sequence: 0,
-          },
-          type: SyncEntityType.AssetEditV1,
-        },
-        {
-          ack: expect.any(String),
-          data: {
-            id: expect.any(String),
-            assetId: asset.id,
-            action: AssetEditAction.Rotate,
-            parameters: { angle: 90 },
-            sequence: 1,
-          },
-          type: SyncEntityType.AssetEditV1,
-        },
-        {
-          ack: expect.any(String),
-          data: {
-            id: expect.any(String),
-            assetId: asset.id,
-            action: AssetEditAction.Mirror,
-            parameters: { axis: MirrorAxis.Horizontal },
-            sequence: 2,
-          },
-          type: SyncEntityType.AssetEditV1,
-        },
-        expect.objectContaining({ type: SyncEntityType.SyncCompleteV1 }),
-      ]),
-    );
-
-    await ctx.syncAckAll(auth, response);
-    await ctx.assertSyncIsComplete(auth, [SyncRequestType.AssetEditsV1]);
-  });
-
-  it('should detect and sync updated edits', async () => {
-    const { auth, ctx } = await setup();
-    const { asset } = await ctx.newAsset({ ownerId: auth.user.id });
-    const assetEditRepo = ctx.get(AssetEditRepository);
-
-    // Create initial edit
-    await assetEditRepo.replaceAll(asset.id, [
-      {
-        action: AssetEditAction.Crop,
-        parameters: { x: 10, y: 20, width: 100, height: 200 },
-      },
-    ]);
-
-    const response1 = await ctx.syncStream(auth, [SyncRequestType.AssetEditsV1]);
-    await ctx.syncAckAll(auth, response1);
-    await ctx.assertSyncIsComplete(auth, [SyncRequestType.AssetEditsV1]);
-
-    // Update the edit
-    await assetEditRepo.replaceAll(asset.id, [
-      {
-        action: AssetEditAction.Crop,
-        parameters: { x: 50, y: 60, width: 150, height: 250 },
-      },
-    ]);
-
-    const response2 = await ctx.syncStream(auth, [SyncRequestType.AssetEditsV1]);
-    expect(response2).toEqual(
-      expect.arrayContaining([
-        {
-          ack: expect.any(String),
-          data: {
-            assetId: asset.id,
-          },
-          type: SyncEntityType.AssetEditDeleteV1,
-        },
-        {
-          ack: expect.any(String),
-          data: {
-            id: expect.any(String),
-            assetId: asset.id,
-            action: AssetEditAction.Crop,
-            parameters: { x: 50, y: 60, width: 150, height: 250 },
-            sequence: 0,
-          },
-          type: SyncEntityType.AssetEditV1,
-        },
-        expect.objectContaining({ type: SyncEntityType.SyncCompleteV1 }),
-      ]),
-    );
-
-    await ctx.syncAckAll(auth, response2);
-    await ctx.assertSyncIsComplete(auth, [SyncRequestType.AssetEditsV1]);
-  });
-
-  it('should detect and sync deleted asset edits', async () => {
-    const { auth, ctx } = await setup();
-    const { asset } = await ctx.newAsset({ ownerId: auth.user.id });
-    const assetEditRepo = ctx.get(AssetEditRepository);
-
-    // Create initial edit
-    await assetEditRepo.replaceAll(asset.id, [
-      {
-        action: AssetEditAction.Crop,
-        parameters: { x: 10, y: 20, width: 100, height: 200 },
-      },
-    ]);
-
-    const response1 = await ctx.syncStream(auth, [SyncRequestType.AssetEditsV1]);
-    await ctx.syncAckAll(auth, response1);
-    await ctx.assertSyncIsComplete(auth, [SyncRequestType.AssetEditsV1]);
-
-    // Delete all edits
-    await assetEditRepo.replaceAll(asset.id, []);
-
-    const response2 = await ctx.syncStream(auth, [SyncRequestType.AssetEditsV1]);
-    expect(response2).toEqual(
-      expect.arrayContaining([
-        {
-          ack: expect.any(String),
-          data: {
-            assetId: asset.id,
-          },
-          type: SyncEntityType.AssetEditDeleteV1,
-        },
-        expect.objectContaining({ type: SyncEntityType.SyncCompleteV1 }),
-      ]),
-    );
-
-    await ctx.syncAckAll(auth, response2);
-    await ctx.assertSyncIsComplete(auth, [SyncRequestType.AssetEditsV1]);
-  });
-
-  it('should only sync asset edits for own user', async () => {
-    const { auth, ctx } = await setup();
-    const { user: user2 } = await ctx.newUser();
-    const { asset } = await ctx.newAsset({ ownerId: user2.id });
-    const assetEditRepo = ctx.get(AssetEditRepository);
-    const { session } = await ctx.newSession({ userId: user2.id });
-    const auth2 = factory.auth({ session, user: user2 });
-
-    await assetEditRepo.replaceAll(asset.id, [
-      {
-        action: AssetEditAction.Crop,
-        parameters: { x: 10, y: 20, width: 100, height: 200 },
-      },
-    ]);
-
-    // User 2 should see their own edit
-    await expect(ctx.syncStream(auth2, [SyncRequestType.AssetEditsV1])).resolves.toEqual([
-      expect.objectContaining({ type: SyncEntityType.AssetEditV1 }),
-      expect.objectContaining({ type: SyncEntityType.SyncCompleteV1 }),
-    ]);
-
-    // User 1 should not see user 2's edit
-    await ctx.assertSyncIsComplete(auth, [SyncRequestType.AssetEditsV1]);
-  });
-
-  it('should sync edits for multiple assets', async () => {
-    const { auth, ctx } = await setup();
-    const { asset: asset1 } = await ctx.newAsset({ ownerId: auth.user.id });
-    const { asset: asset2 } = await ctx.newAsset({ ownerId: auth.user.id });
-    const assetEditRepo = ctx.get(AssetEditRepository);
-
-    await assetEditRepo.replaceAll(asset1.id, [
-      {
-        action: AssetEditAction.Crop,
-        parameters: { x: 10, y: 20, width: 100, height: 200 },
-      },
-    ]);
-
-    await assetEditRepo.replaceAll(asset2.id, [
-      {
-        action: AssetEditAction.Rotate,
-        parameters: { angle: 270 },
-      },
-    ]);
-
-    const response = await ctx.syncStream(auth, [SyncRequestType.AssetEditsV1]);
-    expect(response).toEqual(
-      expect.arrayContaining([
-        {
-          ack: expect.any(String),
-          data: {
-            id: expect.any(String),
-            assetId: asset1.id,
-            action: AssetEditAction.Crop,
-            parameters: { x: 10, y: 20, width: 100, height: 200 },
-            sequence: 0,
-          },
-          type: SyncEntityType.AssetEditV1,
-        },
-        {
-          ack: expect.any(String),
-          data: {
-            id: expect.any(String),
-            assetId: asset2.id,
-            action: AssetEditAction.Rotate,
-            parameters: { angle: 270 },
-            sequence: 0,
-          },
-          type: SyncEntityType.AssetEditV1,
-        },
-        expect.objectContaining({ type: SyncEntityType.SyncCompleteV1 }),
-      ]),
-    );
-
-    await ctx.syncAckAll(auth, response);
-    await ctx.assertSyncIsComplete(auth, [SyncRequestType.AssetEditsV1]);
-  });
-
-  it('should not sync edits for partner assets', async () => {
-    const { auth, ctx } = await setup();
-    const { user: partner } = await ctx.newUser();
-    await ctx.newPartner({ sharedById: partner.id, sharedWithId: auth.user.id });
-    const { asset } = await ctx.newAsset({ ownerId: partner.id });
-    const assetEditRepo = ctx.get(AssetEditRepository);
-
-    await assetEditRepo.replaceAll(asset.id, [
-      {
-        action: AssetEditAction.Crop,
-        parameters: { x: 10, y: 20, width: 100, height: 200 },
-      },
-    ]);
-
-    // Should not see partner's asset edits in own sync
-    await ctx.assertSyncIsComplete(auth, [SyncRequestType.AssetEditsV1]);
-  });
-});

web/src/lib/stores/websocket.ts

@@ -12,7 +12,6 @@ import {
   type MaintenanceStatusResponseDto,
   type NotificationDto,
   type ServerVersionResponseDto,
-  type SyncAssetEditV1,
   type SyncAssetV1,
 } from '@immich/sdk';
 import { io, type Socket } from 'socket.io-client';
@@ -42,7 +41,7 @@ export interface Events {
   AppRestartV1: (event: AppRestartEvent) => void;
 
   MaintenanceStatusV1: (event: MaintenanceStatusResponseDto) => void;
-  AssetEditReadyV1: (data: { asset: SyncAssetV1; edits: SyncAssetEditV1[] }) => void;
+  AssetEditReadyV1: (data: { asset: SyncAssetV1 }) => void;
 }
 
 const websocket: Socket<Events> = io({