fix(web): geolocation utility start year

chore(deps): update terraform cloudflare to v4.52.3 (#21701 )
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-09-09 13:39:26 -04:00 · 2025-09-09 10:18:26 +01:00 · 2025-09-08 17:28:40 -04:00
46 changed files with 174 additions and 9078 deletions
--- a/deployment/modules/cloudflare/docs-release/.terraform.lock.hcl
+++ b/deployment/modules/cloudflare/docs-release/.terraform.lock.hcl
@@ -2,37 +2,37 @@
 # Manual edits may be lost in future updates.

 provider "registry.opentofu.org/cloudflare/cloudflare" {
-  version     = "4.52.1"
-  constraints = "4.52.1"
+  version     = "4.52.3"
+  constraints = "4.52.3"
  hashes = [
-    "h1:2lHvafwGbLdmc9lYkuJFw3nsInaQjRpjX/JfIRKmq/M=",
-    "h1:596JomwjrtUrOSreq9NNCS+rj70+jOV+0pfja5MXiTI=",
-    "h1:7mBOA5TVAIt3qAwPXKCtE0RSYeqij9v30mnksuBbpEg=",
-    "h1:ELVgzh4kHKBCYdL+2A8JjWS0E1snLUN3Mmz3Vo6qSfw=",
-    "h1:FGGM5yLFf72g3kSXM3LAN64Gf/AkXr5WCmhixgnP+l4=",
-    "h1:JupkJbQALcIVoMhHImrLeLDsQR1ET7VJLGC7ONxjqGU=",
-    "h1:KsaE4JNq+1uV1nJsuTcYar/8lyY6zKS5UBEpfYg3wvc=",
-    "h1:NHZ5RJIzQDLhie/ykl3uI6UPfNQR9Lu5Ti7JPR6X904=",
-    "h1:NfAuMbn6LQPLDtJhbzO1MX9JMIGLMa8K6CpekvtsuX8=",
-    "h1:e+vNKokamDsp/kJvFr2pRudzwEz2r49iZ/oSggw+1LY=",
-    "h1:jnb4VdfNZ79I3yj7Q8x+JmOT+FxbfjjRfrF0dL0yCW8=",
-    "h1:kmF//O539d7NuHU7qIxDj7Wz4eJmLKFiI5glwQivldU=",
-    "h1:s6XriaKwOgV4jvKAGPXkrxhhOQxpNU5dceZwi9Z/1k8=",
-    "h1:wt3WBEBAeSGTlC9OlnTlAALxRiK4SQgLy0KgBIS7qzs=",
-    "zh:2fb95e1d3229b9b6c704e1a413c7481c60f139780d9641f657b6eb9b633b90f2",
-    "zh:379c7680983383862236e9e6e720c3114195c40526172188e88d0ffcf50dfe2e",
-    "zh:55533beb6cfc02d22ffda8cba8027bc2c841bb172cd637ed0d28323d41395f8f",
-    "zh:5abd70760e4eb1f37a1c307cbd2989ea7c9ba0afb93818c67c1d363a31f75703",
-    "zh:699f1c8cd66129176fe659ebf0e6337632a8967a28d2630b6ae5948665c0c2ae",
-    "zh:69c15acd73c451e89de6477059cda2f3ec200b48ae4b9ff3646c4d389fd3205e",
-    "zh:6e02b687de21b844f8266dff99e93e7c61fc8eb688f4bbb23803caceb251839e",
-    "zh:7a51d17b87ed87b7bebf2ad9fc7c3a74f16a1b44eee92c779c08eb89258c0496",
-    "zh:88ad84436837b0f55302f22748505972634e87400d6902260fd6b7ba1610f937",
+    "h1:3jU62KY4Oj3xzMwkTQWon1nlIvFkgTCqI93IzUGaa0c=",
+    "h1:BWimtYXrvbzbbuoVcyobjQnXjjOb9X69JFTw+GuPxfk=",
+    "h1:C/KvLEm8dVQ6zG2X4asLDtmw2JW/xu7E8MddtaXniO0=",
+    "h1:Doo0xcLFf+CnfDWjsA7G1NvSLURuwcgyVy8k0NF1gJA=",
+    "h1:Gc3FGDtR8lUWsi9VImnnE5/USDXiIwYsv4Hbl+d2lwY=",
+    "h1:HsDY6s1gup5fW9TeuTUy85QMIld1nDOUFlwsfxIq1ig=",
+    "h1:MnHkB56E4b/kT6WZigsZJnB5rgnCfDVbrLBNxIsEXPY=",
+    "h1:O/FUQEqhtknJNdsaMbIBi2pLWBds2VvN5FsTVVntzb0=",
+    "h1:OKQBynkp0J5DIf5FOl/NR3S2rvh89pY+t5wevYxdTJs=",
+    "h1:On+vPsYV8U/J/8wFZPXjeAgNJqFFQj42vNOKuNKURkY=",
+    "h1:SPkrMRJahxK0uum7FnUugbGN/JepHMH8M71DBtYrvG0=",
+    "h1:bEh1ASPMiin3F36+hTfjMQTBnuDl2DzjzSCdova3JEM=",
+    "h1:dtIK+x5Q1sh5SMPaHBHXhL9XDIqbRW0EBmVZ+KHQB8E=",
+    "h1:kZcwWfODMWWyauZ66oaO/X+xXkqBtrbYwfUFEtspwEc=",
+    "zh:53946fce4a631f1d98c61550821c88edede9169dfe5cc254e09a2ab207f76b3f",
+    "zh:61654a21f1dd4331492d4ef77e9ebff066bc01e1281f92b925e5697c9138d681",
+    "zh:6a54e9d129b276f052a2f1b73ad0b8735fe6a7403c6a8f6aa111e525eeefaf35",
+    "zh:7692374e655c346a630b5a7cd776c5e0b2388900dcd7ab69a3af85d0c31c6c43",
    "zh:890df766e9b839623b1f0437355032a3c006226a6c200cd911e15ee1a9014e9f",
-    "zh:8d46c3d9f4f7ad20ac6ef01daa63f4e30a2d16dcb1bb5c7c7ee3dc6be38e9ca1",
-    "zh:913d64e72a4929dae1d4793e2004f4f9a58b138ea337d9d94fa35cafbf06550a",
-    "zh:c8d93cf86e2e49f6cec665cfe78b82c144cce15a8b2e30f343385fadd1251849",
-    "zh:cc4f69397d9bc34a528a5609a024c3a48f54f21616c0008792dd417297add955",
-    "zh:df99cdb8b064aad35ffea77e645cf6541d0b1b2ebc51b6d26c42031de60ab69e",
+    "zh:8fe5b792a4d2b1c3a0e573649642962494faa00299baa6aaf813b9a43203dc02",
+    "zh:a0f403a4862df90f09de65c6e939d6cfd069a8dda2dd33f82948bf6f5f1124ef",
+    "zh:a25dc3eb60777b600f8f125d321fe7c50b811c5302b58e9a727ceb749a04e35d",
+    "zh:a2f2ac7dc703c69d2e8c67c9cb5620b5348cb4fd6b98515fbe3f478517b56602",
+    "zh:d452e7bd24445ee14166470cf50f3aca566d46cab5f26f1c5c988c0f3106b697",
+    "zh:e10a52b0294735659eb3f0821ad2006ec097918efe58d31d37a5e3c47efef5f6",
+    "zh:e28dd0954cef9f05adf4d4b440d6f134f605344dfa56307181996675e6550af2",
+    "zh:f1e3b2f43a472280442f01ba71a3c06c9167432e553381132ea5c4a77e0b6dd5",
+    "zh:f71fd63718d38fd43829861e91fe79e16d7b4c7c3d508ae3d077368d89b8e5a0",
+    "zh:faf8d3da4b819c4ae8e565d2b1a684c6a948a086cb299189a5e7b30b2178409d",
  ]
 }
--- a/deployment/modules/cloudflare/docs-release/config.tf
+++ b/deployment/modules/cloudflare/docs-release/config.tf
@@ -5,7 +5,7 @@ terraform {
  required_providers {
    cloudflare = {
      source = "cloudflare/cloudflare"
-      version = "4.52.1"
+      version = "4.52.3"
    }
  }
 }
--- a/deployment/modules/cloudflare/docs/.terraform.lock.hcl
+++ b/deployment/modules/cloudflare/docs/.terraform.lock.hcl
@@ -2,37 +2,37 @@
 # Manual edits may be lost in future updates.

 provider "registry.opentofu.org/cloudflare/cloudflare" {
-  version     = "4.52.1"
-  constraints = "4.52.1"
+  version     = "4.52.3"
+  constraints = "4.52.3"
  hashes = [
-    "h1:2lHvafwGbLdmc9lYkuJFw3nsInaQjRpjX/JfIRKmq/M=",
-    "h1:596JomwjrtUrOSreq9NNCS+rj70+jOV+0pfja5MXiTI=",
-    "h1:7mBOA5TVAIt3qAwPXKCtE0RSYeqij9v30mnksuBbpEg=",
-    "h1:ELVgzh4kHKBCYdL+2A8JjWS0E1snLUN3Mmz3Vo6qSfw=",
-    "h1:FGGM5yLFf72g3kSXM3LAN64Gf/AkXr5WCmhixgnP+l4=",
-    "h1:JupkJbQALcIVoMhHImrLeLDsQR1ET7VJLGC7ONxjqGU=",
-    "h1:KsaE4JNq+1uV1nJsuTcYar/8lyY6zKS5UBEpfYg3wvc=",
-    "h1:NHZ5RJIzQDLhie/ykl3uI6UPfNQR9Lu5Ti7JPR6X904=",
-    "h1:NfAuMbn6LQPLDtJhbzO1MX9JMIGLMa8K6CpekvtsuX8=",
-    "h1:e+vNKokamDsp/kJvFr2pRudzwEz2r49iZ/oSggw+1LY=",
-    "h1:jnb4VdfNZ79I3yj7Q8x+JmOT+FxbfjjRfrF0dL0yCW8=",
-    "h1:kmF//O539d7NuHU7qIxDj7Wz4eJmLKFiI5glwQivldU=",
-    "h1:s6XriaKwOgV4jvKAGPXkrxhhOQxpNU5dceZwi9Z/1k8=",
-    "h1:wt3WBEBAeSGTlC9OlnTlAALxRiK4SQgLy0KgBIS7qzs=",
-    "zh:2fb95e1d3229b9b6c704e1a413c7481c60f139780d9641f657b6eb9b633b90f2",
-    "zh:379c7680983383862236e9e6e720c3114195c40526172188e88d0ffcf50dfe2e",
-    "zh:55533beb6cfc02d22ffda8cba8027bc2c841bb172cd637ed0d28323d41395f8f",
-    "zh:5abd70760e4eb1f37a1c307cbd2989ea7c9ba0afb93818c67c1d363a31f75703",
-    "zh:699f1c8cd66129176fe659ebf0e6337632a8967a28d2630b6ae5948665c0c2ae",
-    "zh:69c15acd73c451e89de6477059cda2f3ec200b48ae4b9ff3646c4d389fd3205e",
-    "zh:6e02b687de21b844f8266dff99e93e7c61fc8eb688f4bbb23803caceb251839e",
-    "zh:7a51d17b87ed87b7bebf2ad9fc7c3a74f16a1b44eee92c779c08eb89258c0496",
-    "zh:88ad84436837b0f55302f22748505972634e87400d6902260fd6b7ba1610f937",
+    "h1:3jU62KY4Oj3xzMwkTQWon1nlIvFkgTCqI93IzUGaa0c=",
+    "h1:BWimtYXrvbzbbuoVcyobjQnXjjOb9X69JFTw+GuPxfk=",
+    "h1:C/KvLEm8dVQ6zG2X4asLDtmw2JW/xu7E8MddtaXniO0=",
+    "h1:Doo0xcLFf+CnfDWjsA7G1NvSLURuwcgyVy8k0NF1gJA=",
+    "h1:Gc3FGDtR8lUWsi9VImnnE5/USDXiIwYsv4Hbl+d2lwY=",
+    "h1:HsDY6s1gup5fW9TeuTUy85QMIld1nDOUFlwsfxIq1ig=",
+    "h1:MnHkB56E4b/kT6WZigsZJnB5rgnCfDVbrLBNxIsEXPY=",
+    "h1:O/FUQEqhtknJNdsaMbIBi2pLWBds2VvN5FsTVVntzb0=",
+    "h1:OKQBynkp0J5DIf5FOl/NR3S2rvh89pY+t5wevYxdTJs=",
+    "h1:On+vPsYV8U/J/8wFZPXjeAgNJqFFQj42vNOKuNKURkY=",
+    "h1:SPkrMRJahxK0uum7FnUugbGN/JepHMH8M71DBtYrvG0=",
+    "h1:bEh1ASPMiin3F36+hTfjMQTBnuDl2DzjzSCdova3JEM=",
+    "h1:dtIK+x5Q1sh5SMPaHBHXhL9XDIqbRW0EBmVZ+KHQB8E=",
+    "h1:kZcwWfODMWWyauZ66oaO/X+xXkqBtrbYwfUFEtspwEc=",
+    "zh:53946fce4a631f1d98c61550821c88edede9169dfe5cc254e09a2ab207f76b3f",
+    "zh:61654a21f1dd4331492d4ef77e9ebff066bc01e1281f92b925e5697c9138d681",
+    "zh:6a54e9d129b276f052a2f1b73ad0b8735fe6a7403c6a8f6aa111e525eeefaf35",
+    "zh:7692374e655c346a630b5a7cd776c5e0b2388900dcd7ab69a3af85d0c31c6c43",
    "zh:890df766e9b839623b1f0437355032a3c006226a6c200cd911e15ee1a9014e9f",
-    "zh:8d46c3d9f4f7ad20ac6ef01daa63f4e30a2d16dcb1bb5c7c7ee3dc6be38e9ca1",
-    "zh:913d64e72a4929dae1d4793e2004f4f9a58b138ea337d9d94fa35cafbf06550a",
-    "zh:c8d93cf86e2e49f6cec665cfe78b82c144cce15a8b2e30f343385fadd1251849",
-    "zh:cc4f69397d9bc34a528a5609a024c3a48f54f21616c0008792dd417297add955",
-    "zh:df99cdb8b064aad35ffea77e645cf6541d0b1b2ebc51b6d26c42031de60ab69e",
+    "zh:8fe5b792a4d2b1c3a0e573649642962494faa00299baa6aaf813b9a43203dc02",
+    "zh:a0f403a4862df90f09de65c6e939d6cfd069a8dda2dd33f82948bf6f5f1124ef",
+    "zh:a25dc3eb60777b600f8f125d321fe7c50b811c5302b58e9a727ceb749a04e35d",
+    "zh:a2f2ac7dc703c69d2e8c67c9cb5620b5348cb4fd6b98515fbe3f478517b56602",
+    "zh:d452e7bd24445ee14166470cf50f3aca566d46cab5f26f1c5c988c0f3106b697",
+    "zh:e10a52b0294735659eb3f0821ad2006ec097918efe58d31d37a5e3c47efef5f6",
+    "zh:e28dd0954cef9f05adf4d4b440d6f134f605344dfa56307181996675e6550af2",
+    "zh:f1e3b2f43a472280442f01ba71a3c06c9167432e553381132ea5c4a77e0b6dd5",
+    "zh:f71fd63718d38fd43829861e91fe79e16d7b4c7c3d508ae3d077368d89b8e5a0",
+    "zh:faf8d3da4b819c4ae8e565d2b1a684c6a948a086cb299189a5e7b30b2178409d",
  ]
 }
--- a/deployment/modules/cloudflare/docs/config.tf
+++ b/deployment/modules/cloudflare/docs/config.tf
@@ -5,7 +5,7 @@ terraform {
  required_providers {
    cloudflare = {
      source = "cloudflare/cloudflare"
-      version = "4.52.1"
+      version = "4.52.3"
    }
  }
 }
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -1921,7 +1921,6 @@
  "sync": "Sync",
  "sync_albums": "Sync albums",
  "sync_albums_manual_subtitle": "Sync all uploaded videos and photos to the selected backup albums",
-  "sync_cloud_ids": "Sync Cloud IDs",
  "sync_local": "Sync Local",
  "sync_remote": "Sync Remote",
  "sync_upload_album_setting_subtitle": "Create and upload your photos and videos to the selected albums on Immich",
--- a/mobile/android/app/src/main/kotlin/app/alextran/immich/sync/Messages.g.kt
+++ b/mobile/android/app/src/main/kotlin/app/alextran/immich/sync/Messages.g.kt
@@ -260,7 +260,6 @@ interface NativeSyncApi {
  fun getAssetsCountSince(albumId: String, timestamp: Long): Long
  fun getAssetsForAlbum(albumId: String, updatedTimeCond: Long?): List<PlatformAsset>
  fun hashPaths(paths: List<String>): List<ByteArray?>
-  fun getCloudIdForAssetIds(assetIds: List<String>): Map<String, String?>

  companion object {
    /** The codec used by NativeSyncApi. */
@@ -419,23 +418,6 @@ interface NativeSyncApi {
          channel.setMessageHandler(null)
        }
      }
-      run {
-        val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.immich_mobile.NativeSyncApi.getCloudIdForAssetIds$separatedMessageChannelSuffix", codec)
-        if (api != null) {
-          channel.setMessageHandler { message, reply ->
-            val args = message as List<Any?>
-            val assetIdsArg = args[0] as List<String>
-            val wrapped: List<Any?> = try {
-              listOf(api.getCloudIdForAssetIds(assetIdsArg))
-            } catch (exception: Throwable) {
-              MessagesPigeonUtils.wrapError(exception)
-            }
-            reply.reply(wrapped)
-          }
-        } else {
-          channel.setMessageHandler(null)
-        }
-      }
    }
  }
 }
--- a/mobile/android/app/src/main/kotlin/app/alextran/immich/sync/MessagesImplBase.kt
+++ b/mobile/android/app/src/main/kotlin/app/alextran/immich/sync/MessagesImplBase.kt
@@ -234,10 +234,4 @@ open class NativeSyncApiImplBase(context: Context) {
      }
    }
  }
-
-  // This method is only implemented on iOS; on Android, we do not have a concept of cloud IDs
-  @Suppress("unused", "UNUSED_PARAMETER")
-  fun getCloudIdForAssetIds(assetIds: List<String>): Map<String, String?> {
-    return emptyMap()
-  }
 }
--- a/mobile/drift_schemas/main/drift_schema_v11.json
+++ b/mobile/drift_schemas/main/drift_schema_v11.json
--- a/mobile/ios/Runner/Sync/Messages.g.swift
+++ b/mobile/ios/Runner/Sync/Messages.g.swift
@@ -324,7 +324,6 @@ protocol NativeSyncApi {
  func getAssetsCountSince(albumId: String, timestamp: Int64) throws -> Int64
  func getAssetsForAlbum(albumId: String, updatedTimeCond: Int64?) throws -> [PlatformAsset]
  func hashPaths(paths: [String]) throws -> [FlutterStandardTypedData?]
-  func getCloudIdForAssetIds(assetIds: [String]) throws -> [String: String?]
 }

 /// Generated setup class from Pigeon to handle messages through the `binaryMessenger`.
@@ -477,20 +476,5 @@ class NativeSyncApiSetup {
    } else {
      hashPathsChannel.setMessageHandler(nil)
    }
-    let getCloudIdForAssetIdsChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.immich_mobile.NativeSyncApi.getCloudIdForAssetIds\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec)
-    if let api = api {
-      getCloudIdForAssetIdsChannel.setMessageHandler { message, reply in
-        let args = message as! [Any?]
-        let assetIdsArg = args[0] as! [String]
-        do {
-          let result = try api.getCloudIdForAssetIds(assetIds: assetIdsArg)
-          reply(wrapResult(result))
-        } catch {
-          reply(wrapError(error))
-        }
-      }
-    } else {
-      getCloudIdForAssetIdsChannel.setMessageHandler(nil)
-    }
  }
 }
--- a/mobile/ios/Runner/Sync/MessagesImpl.swift
+++ b/mobile/ios/Runner/Sync/MessagesImpl.swift
@@ -286,20 +286,4 @@ class NativeSyncApiImpl: NativeSyncApi {
          return FlutterStandardTypedData(bytes: Data(digest))
      }
  }
-  
-  func getCloudIdForAssetIds(assetIds: [String]) throws -> [String : String?] {
-    guard #available(iOS 16, *) else {
-      return Dictionary(
-        uniqueKeysWithValues: assetIds.map { ($0, nil as String?) }
-      )
-    }
-    
-    var mappings: [String: String?] = [:]
-    let result = PHPhotoLibrary.shared().cloudIdentifierMappings(forLocalIdentifiers: assetIds)
-    for (key, value) in result {
-      let id = try? value.get().stringValue
-      mappings[key] = id
-    }
-    return mappings;
-  }
 }
--- a/mobile/lib/domain/models/asset/asset_metadata.model.dart
+++ b/mobile/lib/domain/models/asset/asset_metadata.model.dart
@@ -1,40 +0,0 @@
-enum RemoteAssetMetadataKey {
-  mobileApp("mobile-app");
-
-  final String key;
-
-  const RemoteAssetMetadataKey(this.key);
-}
-
-abstract class RemoteAssetMetadataValue {
-  const RemoteAssetMetadataValue();
-
-  Map<String, dynamic> toJson();
-}
-
-class RemoteAssetMetadataItem {
-  final RemoteAssetMetadataKey key;
-  final RemoteAssetMetadataValue value;
-
-  const RemoteAssetMetadataItem({required this.key, required this.value});
-
-  Map<String, Object?> toJson() {
-    return {'key': key.key, 'value': value};
-  }
-}
-
-class RemoteAssetMobileAppMetadata extends RemoteAssetMetadataValue {
-  final String? cloudId;
-
-  const RemoteAssetMobileAppMetadata({this.cloudId});
-
-  @override
-  Map<String, dynamic> toJson() {
-    final map = <String, Object?>{};
-    if (cloudId != null) {
-      map["iCloudId"] = cloudId;
-    }
-
-    return map;
-  }
-}
--- a/mobile/lib/domain/models/asset/local_asset.model.dart
+++ b/mobile/lib/domain/models/asset/local_asset.model.dart
@@ -3,13 +3,11 @@ part of 'base_asset.model.dart';
 class LocalAsset extends BaseAsset {
  final String id;
  final String? remoteId;
-  final String? cloudId;
  final int orientation;

  const LocalAsset({
    required this.id,
    this.remoteId,
-    this.cloudId,
    required super.name,
    super.checksum,
    required super.type,
@@ -33,8 +31,6 @@ class LocalAsset extends BaseAsset {
  String toString() {
    return '''LocalAsset {
   id: $id,
-   remoteId: ${remoteId ?? "<NA>"},
-   cloudId: ${cloudId ?? "<NA>"},
   name: $name,
   type: $type,
   createdAt: $createdAt,
@@ -53,7 +49,7 @@ class LocalAsset extends BaseAsset {
  bool operator ==(Object other) {
    if (other is! LocalAsset) return false;
    if (identical(this, other)) return true;
-    return super == other && id == other.id && orientation == other.orientation && cloudId == other.cloudId;
+    return super == other && id == other.id && orientation == other.orientation;
  }

  @override
@@ -62,7 +58,6 @@ class LocalAsset extends BaseAsset {
  LocalAsset copyWith({
    String? id,
    String? remoteId,
-    String? cloudId,
    String? name,
    String? checksum,
    AssetType? type,
@@ -77,7 +72,6 @@ class LocalAsset extends BaseAsset {
    return LocalAsset(
      id: id ?? this.id,
      remoteId: remoteId ?? this.remoteId,
-      cloudId: cloudId ?? this.cloudId,
      name: name ?? this.name,
      checksum: checksum ?? this.checksum,
      type: type ?? this.type,
--- a/mobile/lib/domain/services/background_worker.service.dart
+++ b/mobile/lib/domain/services/background_worker.service.dart
@@ -212,10 +212,9 @@ class BackgroundWorkerBgService extends BackgroundWorkerFlutterApi {
  }

  Future<void> _syncAssets({Duration? hashTimeout}) async {
-    await (
-      _ref.read(backgroundSyncProvider).syncLocal(),
-      _ref.read(backgroundSyncProvider).syncRemote(),
-    ).wait.whenComplete(() async {
+    final futures = <Future<void>>[];
+
+    final localSyncFuture = _ref.read(backgroundSyncProvider).syncLocal().then((_) async {
      if (_isCleanedUp) {
        return;
      }
@@ -232,6 +231,11 @@ class BackgroundWorkerBgService extends BackgroundWorkerFlutterApi {

      return hashFuture;
    });
+
+    futures.add(localSyncFuture);
+    futures.add(_ref.read(backgroundSyncProvider).syncRemote());
+
+    await Future.wait(futures);
  }
 }

--- a/mobile/lib/domain/services/hash.service.dart
+++ b/mobile/lib/domain/services/hash.service.dart
@@ -38,10 +38,6 @@ class HashService {
  Future<void> hashAssets() async {
    _log.info("Starting hashing of assets");
    final Stopwatch stopwatch = Stopwatch()..start();
-
-    // Migrate hashes from cloud ID to local ID so we don't have to re-hash them
-    await _migrateHashes();
-
    // Sorted by backupSelection followed by isCloud
    final localAlbums = await _localAlbumRepository.getAll(
      sortBy: {SortLocalAlbumsBy.backupSelection, SortLocalAlbumsBy.isIosSharedAlbum},
@@ -63,15 +59,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.
@@ -114,7 +101,7 @@ class HashService {

    _log.fine("Hashing ${toHash.length} files");

-    final hashed = <LocalAssetHashMapping>[];
+    final hashed = <LocalAsset>[];
    final hashes = await _nativeSyncApi.hashPaths(toHash.map((e) => e.path).toList());
    assert(
      hashes.length == toHash.length,
@@ -130,7 +117,7 @@ class HashService {
      final hash = hashes[i];
      final asset = toHash[i].asset;
      if (hash?.length == 20) {
-        hashed.add((assetId: asset.id, checksum: base64.encode(hash!)));
+        hashed.add(asset.copyWith(checksum: base64.encode(hash!)));
      } else {
        _log.warning(
          "Failed to hash file for ${asset.id}: ${asset.name} created at ${asset.createdAt} from album: ${album.name}",
--- a/mobile/lib/domain/services/local_sync.service.dart
+++ b/mobile/lib/domain/services/local_sync.service.dart
@@ -44,9 +44,8 @@ class LocalSyncService {

      final deviceAlbums = await _nativeSyncApi.getAlbums();
      await _localAlbumRepository.updateAll(deviceAlbums.toLocalAlbums());
-      final newAssets = delta.updates.toLocalAssets();
      await _localAlbumRepository.processDelta(
-        updates: newAssets,
+        updates: delta.updates.toLocalAssets(),
        deletes: delta.deletes,
        assetAlbums: delta.assetAlbums,
      );
@@ -74,8 +73,6 @@ class LocalSyncService {
          }
          await updateAlbum(dbAlbum, album);
        }
-
-        await _mapIosCloudIds(newAssets);
      }

      await _nativeSyncApi.checkpointSync();
@@ -115,12 +112,9 @@ class LocalSyncService {
    try {
      _log.fine("Adding device album ${album.name}");

-      final assets = album.assetCount > 0
-          ? await _nativeSyncApi.getAssetsForAlbum(album.id).then((a) => a.toLocalAssets())
-          : <LocalAsset>[];
+      final assets = album.assetCount > 0 ? await _nativeSyncApi.getAssetsForAlbum(album.id) : <PlatformAsset>[];

-      await _localAlbumRepository.upsert(album, toUpsert: assets);
-      await _mapIosCloudIds(assets);
+      await _localAlbumRepository.upsert(album, toUpsert: assets.toLocalAssets());
      _log.fine("Successfully added device album ${album.name}");
    } catch (e, s) {
      _log.warning("Error while adding device album", e, s);
@@ -190,16 +184,13 @@ class LocalSyncService {
        return false;
      }

-      final newAssets = await _nativeSyncApi
-          .getAssetsForAlbum(deviceAlbum.id, updatedTimeCond: updatedTime)
-          .then((a) => a.toLocalAssets());
+      final newAssets = await _nativeSyncApi.getAssetsForAlbum(deviceAlbum.id, updatedTimeCond: updatedTime);

      await _localAlbumRepository.upsert(
        deviceAlbum.copyWith(backupSelection: dbAlbum.backupSelection),
-        toUpsert: newAssets,
+        toUpsert: newAssets.toLocalAssets(),
      );

-      await _mapIosCloudIds(newAssets);
      return true;
    } catch (e, s) {
      _log.warning("Error on fast syncing local album: ${dbAlbum.name}", e, s);
@@ -231,7 +222,6 @@ class LocalSyncService {
      if (dbAlbum.assetCount == 0) {
        _log.fine("Device album ${deviceAlbum.name} is empty. Adding assets to DB.");
        await _localAlbumRepository.upsert(updatedDeviceAlbum, toUpsert: assetsInDevice);
-        await _mapIosCloudIds(assetsInDevice);
        return true;
      }

@@ -269,7 +259,6 @@ class LocalSyncService {
      }

      await _localAlbumRepository.upsert(updatedDeviceAlbum, toUpsert: assetsToUpsert, toDelete: assetsToDelete);
-      await _mapIosCloudIds(assetsToUpsert);

      return true;
    } catch (e, s) {
@@ -278,16 +267,6 @@ class LocalSyncService {
    return true;
  }

-  Future<void> _mapIosCloudIds(List<LocalAsset> assets) async {
-    if (!_platform.isIOS || assets.isEmpty) {
-      return;
-    }
-
-    final assetIds = assets.map((a) => a.id).toList();
-    final cloudMapping = await _nativeSyncApi.getCloudIdForAssetIds(assetIds);
-    await _localAlbumRepository.updateCloudMapping(cloudMapping);
-  }
-
  bool _assetsEqual(LocalAsset a, LocalAsset b) {
    return a.updatedAt.isAtSameMomentAs(b.updatedAt) &&
        a.createdAt.isAtSameMomentAs(b.createdAt) &&
--- a/mobile/lib/domain/services/sync_stream.service.dart
+++ b/mobile/lib/domain/services/sync_stream.service.dart
@@ -86,10 +86,6 @@ class SyncStreamService {
        return _syncStreamRepository.deleteAssetsV1(data.cast());
      case SyncEntityType.assetExifV1:
        return _syncStreamRepository.updateAssetsExifV1(data.cast());
-      case SyncEntityType.assetMetadataV1:
-        return _syncStreamRepository.updateAssetsMetadataV1(data.cast());
-      case SyncEntityType.assetMetadataDeleteV1:
-        return _syncStreamRepository.deleteAssetsMetadataV1(data.cast());
      case SyncEntityType.partnerAssetV1:
        return _syncStreamRepository.updateAssetsV1(data.cast(), debugLabel: 'partner');
      case SyncEntityType.partnerAssetBackfillV1:
--- a/mobile/lib/domain/utils/background_sync.dart
+++ b/mobile/lib/domain/utils/background_sync.dart
@@ -1,6 +1,5 @@
 import 'dart:async';

-import 'package:immich_mobile/domain/utils/migrate_cloud_ids.dart' as m;
 import 'package:immich_mobile/domain/utils/sync_linked_album.dart';
 import 'package:immich_mobile/providers/infrastructure/sync.provider.dart';
 import 'package:immich_mobile/utils/isolate.dart';
@@ -22,13 +21,8 @@ class BackgroundSyncManager {
  final SyncCallback? onHashingComplete;
  final SyncErrorCallback? onHashingError;

-  final SyncCallback? onCloudIdSyncStart;
-  final SyncCallback? onCloudIdSyncComplete;
-  final SyncErrorCallback? onCloudIdSyncError;
-
  Cancelable<void>? _syncTask;
  Cancelable<void>? _syncWebsocketTask;
-  Cancelable<void>? _cloudIdSyncTask;
  Cancelable<void>? _deviceAlbumSyncTask;
  Cancelable<void>? _linkedAlbumSyncTask;
  Cancelable<void>? _hashTask;
@@ -43,9 +37,6 @@ class BackgroundSyncManager {
    this.onHashingStart,
    this.onHashingComplete,
    this.onHashingError,
-    this.onCloudIdSyncStart,
-    this.onCloudIdSyncComplete,
-    this.onCloudIdSyncError,
  });

  Future<void> cancel() async {
@@ -63,11 +54,6 @@ class BackgroundSyncManager {
    _syncWebsocketTask?.cancel();
    _syncWebsocketTask = null;

-    if (_cloudIdSyncTask != null) {
-      futures.add(_cloudIdSyncTask!.future);
-    }
-    _cloudIdSyncTask?.cancel();
-
    if (_linkedAlbumSyncTask != null) {
      futures.add(_linkedAlbumSyncTask!.future);
    }
@@ -128,6 +114,7 @@ class BackgroundSyncManager {
        });
  }

+  // No need to cancel the task, as it can also be run when the user logs out
  Future<void> hashAssets() {
    if (_hashTask != null) {
      return _hashTask!.future;
@@ -187,25 +174,6 @@ class BackgroundSyncManager {
      _linkedAlbumSyncTask = null;
    });
  }
-
-  Future<void> syncCloudIds() {
-    if (_cloudIdSyncTask != null) {
-      return _cloudIdSyncTask!.future;
-    }
-
-    onCloudIdSyncStart?.call();
-
-    _cloudIdSyncTask = runInIsolateGentle(computation: m.syncCloudIds);
-    return _cloudIdSyncTask!
-        .whenComplete(() {
-          onCloudIdSyncComplete?.call();
-          _cloudIdSyncTask = null;
-        })
-        .catchError((error) {
-          onCloudIdSyncError?.call(error.toString());
-          _cloudIdSyncTask = null;
-        });
-  }
 }

 Cancelable<void> _handleWsAssetUploadReadyV1Batch(List<dynamic> batchData) => runInIsolateGentle(
--- a/mobile/lib/domain/utils/migrate_cloud_ids.dart
+++ b/mobile/lib/domain/utils/migrate_cloud_ids.dart
@@ -1,82 +0,0 @@
-import 'package:drift/drift.dart';
-import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/domain/models/asset/asset_metadata.model.dart';
-import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
-import 'package:immich_mobile/infrastructure/repositories/local_album.repository.dart';
-import 'package:immich_mobile/platform/native_sync_api.g.dart';
-import 'package:immich_mobile/providers/api.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/db.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/sync.provider.dart';
-import 'package:immich_mobile/providers/user.provider.dart';
-import 'package:logging/logging.dart';
-// ignore: import_rule_openapi
-import 'package:openapi/api.dart';
-
-Future<void> syncCloudIds(ProviderContainer ref) async {
-  final db = ref.read(driftProvider);
-  // Populate cloud IDs for local assets that don't have one yet
-  await _populateCloudIds(db);
-
-  // Wait for remote sync to complete, so we have up-to-date asset metadata entries
-  await ref.read(syncStreamServiceProvider).sync();
-
-  // Fetch the mapping for backed up assets that have a cloud ID locally but do not have a cloud ID on the server
-  final currentUser = ref.read(currentUserProvider);
-  if (currentUser == null) {
-    Logger('migrateCloudIds').warning('Current user is null. Aborting cloudId migration.');
-    return;
-  }
-
-  final mappingsToUpdate = await _fetchCloudIdMappings(db, currentUser.id);
-  final assetApi = ref.read(apiServiceProvider).assetsApi;
-  for (final mapping in mappingsToUpdate) {
-    final mobileMeta = AssetMetadataUpsertItemDto(
-      key: AssetMetadataKey.mobileApp,
-      value: RemoteAssetMobileAppMetadata(cloudId: mapping.cloudId),
-    );
-    try {
-      await assetApi.updateAssetMetadata(mapping.assetId, AssetMetadataUpsertDto(items: [mobileMeta]));
-    } catch (error, stack) {
-      Logger('migrateCloudIds').warning('Failed to update metadata for asset ${mapping.assetId}', error, stack);
-    }
-  }
-}
-
-Future<void> _populateCloudIds(Drift drift) async {
-  final query = drift.localAssetEntity.selectOnly()
-    ..addColumns([drift.localAssetEntity.id])
-    ..where(drift.localAssetEntity.iCloudId.isNull());
-  final ids = await query.map((row) => row.read(drift.localAssetEntity.id)!).get();
-  final cloudMapping = await NativeSyncApi().getCloudIdForAssetIds(ids);
-  await DriftLocalAlbumRepository(drift).updateCloudMapping(cloudMapping);
-}
-
-typedef _CloudIdMapping = ({String assetId, String cloudId});
-
-Future<List<_CloudIdMapping>> _fetchCloudIdMappings(Drift drift, String userId) async {
-  final query =
-      drift.remoteAssetEntity.selectOnly().join([
-          leftOuterJoin(
-            drift.localAssetEntity,
-            drift.localAssetEntity.checksum.equalsExp(drift.remoteAssetEntity.checksum),
-            useColumns: false,
-          ),
-          leftOuterJoin(
-            drift.remoteAssetCloudIdEntity,
-            drift.localAssetEntity.iCloudId.equalsExp(drift.remoteAssetCloudIdEntity.cloudId),
-            useColumns: false,
-          ),
-        ])
-        ..addColumns([drift.remoteAssetEntity.id, drift.localAssetEntity.iCloudId])
-        ..where(
-          drift.localAssetEntity.id.isNotNull() &
-              drift.localAssetEntity.iCloudId.isNotNull() &
-              drift.remoteAssetEntity.ownerId.equals(userId) &
-              drift.remoteAssetCloudIdEntity.cloudId.isNull(),
-        );
-  return query
-      .map(
-        (row) => (assetId: row.read(drift.remoteAssetEntity.id)!, cloudId: row.read(drift.localAssetEntity.iCloudId)!),
-      )
-      .get();
-}
--- a/mobile/lib/infrastructure/entities/local_asset.entity.dart
+++ b/mobile/lib/infrastructure/entities/local_asset.entity.dart
@@ -5,7 +5,6 @@ import 'package:immich_mobile/infrastructure/utils/asset.mixin.dart';
 import 'package:immich_mobile/infrastructure/utils/drift_default.mixin.dart';

@TableIndex.sql('CREATE INDEX IF NOT EXISTS idx_local_asset_checksum ON local_asset_entity (checksum)')
-@TableIndex.sql('CREATE INDEX IF NOT EXISTS idx_local_asset_cloud_id ON local_asset_entity (i_cloud_id)')
 class LocalAssetEntity extends Table with DriftDefaultsMixin, AssetEntityMixin {
  const LocalAssetEntity();

@@ -17,8 +16,6 @@ class LocalAssetEntity extends Table with DriftDefaultsMixin, AssetEntityMixin {

  IntColumn get orientation => integer().withDefault(const Constant(0))();

-  TextColumn get iCloudId => text().nullable()();
-
  @override
  Set<Column> get primaryKey => {id};
 }
@@ -37,6 +34,5 @@ extension LocalAssetEntityDataDomainExtension on LocalAssetEntityData {
    width: width,
    remoteId: null,
    orientation: orientation,
-    cloudId: iCloudId,
  );
 }
--- a/mobile/lib/infrastructure/entities/local_asset.entity.drift.dart
+++ b/mobile/lib/infrastructure/entities/local_asset.entity.drift.dart
@@ -21,7 +21,6 @@ typedef $$LocalAssetEntityTableCreateCompanionBuilder =
      i0.Value<String?> checksum,
      i0.Value<bool> isFavorite,
      i0.Value<int> orientation,
-      i0.Value<String?> iCloudId,
    });
 typedef $$LocalAssetEntityTableUpdateCompanionBuilder =
    i1.LocalAssetEntityCompanion Function({
@@ -36,7 +35,6 @@ typedef $$LocalAssetEntityTableUpdateCompanionBuilder =
      i0.Value<String?> checksum,
      i0.Value<bool> isFavorite,
      i0.Value<int> orientation,
-      i0.Value<String?> iCloudId,
    });

 class $$LocalAssetEntityTableFilterComposer
@@ -103,11 +101,6 @@ class $$LocalAssetEntityTableFilterComposer
    column: $table.orientation,
    builder: (column) => i0.ColumnFilters(column),
  );
-
-  i0.ColumnFilters<String> get iCloudId => $composableBuilder(
-    column: $table.iCloudId,
-    builder: (column) => i0.ColumnFilters(column),
-  );
 }

 class $$LocalAssetEntityTableOrderingComposer
@@ -173,11 +166,6 @@ class $$LocalAssetEntityTableOrderingComposer
    column: $table.orientation,
    builder: (column) => i0.ColumnOrderings(column),
  );
-
-  i0.ColumnOrderings<String> get iCloudId => $composableBuilder(
-    column: $table.iCloudId,
-    builder: (column) => i0.ColumnOrderings(column),
-  );
 }

 class $$LocalAssetEntityTableAnnotationComposer
@@ -227,9 +215,6 @@ class $$LocalAssetEntityTableAnnotationComposer
    column: $table.orientation,
    builder: (column) => column,
  );
-
-  i0.GeneratedColumn<String> get iCloudId =>
-      $composableBuilder(column: $table.iCloudId, builder: (column) => column);
 }

 class $$LocalAssetEntityTableTableManager
@@ -283,7 +268,6 @@ class $$LocalAssetEntityTableTableManager
                i0.Value<String?> checksum = const i0.Value.absent(),
                i0.Value<bool> isFavorite = const i0.Value.absent(),
                i0.Value<int> orientation = const i0.Value.absent(),
-                i0.Value<String?> iCloudId = const i0.Value.absent(),
              }) => i1.LocalAssetEntityCompanion(
                name: name,
                type: type,
@@ -296,7 +280,6 @@ class $$LocalAssetEntityTableTableManager
                checksum: checksum,
                isFavorite: isFavorite,
                orientation: orientation,
-                iCloudId: iCloudId,
              ),
          createCompanionCallback:
              ({
@@ -311,7 +294,6 @@ class $$LocalAssetEntityTableTableManager
                i0.Value<String?> checksum = const i0.Value.absent(),
                i0.Value<bool> isFavorite = const i0.Value.absent(),
                i0.Value<int> orientation = const i0.Value.absent(),
-                i0.Value<String?> iCloudId = const i0.Value.absent(),
              }) => i1.LocalAssetEntityCompanion.insert(
                name: name,
                type: type,
@@ -324,7 +306,6 @@ class $$LocalAssetEntityTableTableManager
                checksum: checksum,
                isFavorite: isFavorite,
                orientation: orientation,
-                iCloudId: iCloudId,
              ),
          withReferenceMapper: (p0) => p0
              .map((e) => (e.readTable(table), i0.BaseReferences(db, table, e)))
@@ -492,17 +473,6 @@ class $LocalAssetEntityTable extends i3.LocalAssetEntity
    requiredDuringInsert: false,
    defaultValue: const i4.Constant(0),
  );
-  static const i0.VerificationMeta _iCloudIdMeta = const i0.VerificationMeta(
-    'iCloudId',
-  );
-  @override
-  late final i0.GeneratedColumn<String> iCloudId = i0.GeneratedColumn<String>(
-    'i_cloud_id',
-    aliasedName,
-    true,
-    type: i0.DriftSqlType.string,
-    requiredDuringInsert: false,
-  );
  @override
  List<i0.GeneratedColumn> get $columns => [
    name,
@@ -516,7 +486,6 @@ class $LocalAssetEntityTable extends i3.LocalAssetEntity
    checksum,
    isFavorite,
    orientation,
-    iCloudId,
  ];
  @override
  String get aliasedName => _alias ?? actualTableName;
@@ -597,12 +566,6 @@ class $LocalAssetEntityTable extends i3.LocalAssetEntity
        ),
      );
    }
-    if (data.containsKey('i_cloud_id')) {
-      context.handle(
-        _iCloudIdMeta,
-        iCloudId.isAcceptableOrUnknown(data['i_cloud_id']!, _iCloudIdMeta),
-      );
-    }
    return context;
  }

@@ -661,10 +624,6 @@ class $LocalAssetEntityTable extends i3.LocalAssetEntity
        i0.DriftSqlType.int,
        data['${effectivePrefix}orientation'],
      )!,
-      iCloudId: attachedDatabase.typeMapping.read(
-        i0.DriftSqlType.string,
-        data['${effectivePrefix}i_cloud_id'],
-      ),
    );
  }

@@ -694,7 +653,6 @@ class LocalAssetEntityData extends i0.DataClass
  final String? checksum;
  final bool isFavorite;
  final int orientation;
-  final String? iCloudId;
  const LocalAssetEntityData({
    required this.name,
    required this.type,
@@ -707,7 +665,6 @@ class LocalAssetEntityData extends i0.DataClass
    this.checksum,
    required this.isFavorite,
    required this.orientation,
-    this.iCloudId,
  });
  @override
  Map<String, i0.Expression> toColumns(bool nullToAbsent) {
@@ -735,9 +692,6 @@ class LocalAssetEntityData extends i0.DataClass
    }
    map['is_favorite'] = i0.Variable<bool>(isFavorite);
    map['orientation'] = i0.Variable<int>(orientation);
-    if (!nullToAbsent || iCloudId != null) {
-      map['i_cloud_id'] = i0.Variable<String>(iCloudId);
-    }
    return map;
  }

@@ -760,7 +714,6 @@ class LocalAssetEntityData extends i0.DataClass
      checksum: serializer.fromJson<String?>(json['checksum']),
      isFavorite: serializer.fromJson<bool>(json['isFavorite']),
      orientation: serializer.fromJson<int>(json['orientation']),
-      iCloudId: serializer.fromJson<String?>(json['iCloudId']),
    );
  }
  @override
@@ -780,7 +733,6 @@ class LocalAssetEntityData extends i0.DataClass
      'checksum': serializer.toJson<String?>(checksum),
      'isFavorite': serializer.toJson<bool>(isFavorite),
      'orientation': serializer.toJson<int>(orientation),
-      'iCloudId': serializer.toJson<String?>(iCloudId),
    };
  }

@@ -796,7 +748,6 @@ class LocalAssetEntityData extends i0.DataClass
    i0.Value<String?> checksum = const i0.Value.absent(),
    bool? isFavorite,
    int? orientation,
-    i0.Value<String?> iCloudId = const i0.Value.absent(),
  }) => i1.LocalAssetEntityData(
    name: name ?? this.name,
    type: type ?? this.type,
@@ -811,7 +762,6 @@ class LocalAssetEntityData extends i0.DataClass
    checksum: checksum.present ? checksum.value : this.checksum,
    isFavorite: isFavorite ?? this.isFavorite,
    orientation: orientation ?? this.orientation,
-    iCloudId: iCloudId.present ? iCloudId.value : this.iCloudId,
  );
  LocalAssetEntityData copyWithCompanion(i1.LocalAssetEntityCompanion data) {
    return LocalAssetEntityData(
@@ -832,7 +782,6 @@ class LocalAssetEntityData extends i0.DataClass
      orientation: data.orientation.present
          ? data.orientation.value
          : this.orientation,
-      iCloudId: data.iCloudId.present ? data.iCloudId.value : this.iCloudId,
    );
  }

@@ -849,8 +798,7 @@ class LocalAssetEntityData extends i0.DataClass
          ..write('id: $id, ')
          ..write('checksum: $checksum, ')
          ..write('isFavorite: $isFavorite, ')
-          ..write('orientation: $orientation, ')
-          ..write('iCloudId: $iCloudId')
+          ..write('orientation: $orientation')
          ..write(')'))
        .toString();
  }
@@ -868,7 +816,6 @@ class LocalAssetEntityData extends i0.DataClass
    checksum,
    isFavorite,
    orientation,
-    iCloudId,
  );
  @override
  bool operator ==(Object other) =>
@@ -884,8 +831,7 @@ class LocalAssetEntityData extends i0.DataClass
          other.id == this.id &&
          other.checksum == this.checksum &&
          other.isFavorite == this.isFavorite &&
-          other.orientation == this.orientation &&
-          other.iCloudId == this.iCloudId);
+          other.orientation == this.orientation);
 }

 class LocalAssetEntityCompanion
@@ -901,7 +847,6 @@ class LocalAssetEntityCompanion
  final i0.Value<String?> checksum;
  final i0.Value<bool> isFavorite;
  final i0.Value<int> orientation;
-  final i0.Value<String?> iCloudId;
  const LocalAssetEntityCompanion({
    this.name = const i0.Value.absent(),
    this.type = const i0.Value.absent(),
@@ -914,7 +859,6 @@ class LocalAssetEntityCompanion
    this.checksum = const i0.Value.absent(),
    this.isFavorite = const i0.Value.absent(),
    this.orientation = const i0.Value.absent(),
-    this.iCloudId = const i0.Value.absent(),
  });
  LocalAssetEntityCompanion.insert({
    required String name,
@@ -928,7 +872,6 @@ class LocalAssetEntityCompanion
    this.checksum = const i0.Value.absent(),
    this.isFavorite = const i0.Value.absent(),
    this.orientation = const i0.Value.absent(),
-    this.iCloudId = const i0.Value.absent(),
  }) : name = i0.Value(name),
       type = i0.Value(type),
       id = i0.Value(id);
@@ -944,7 +887,6 @@ class LocalAssetEntityCompanion
    i0.Expression<String>? checksum,
    i0.Expression<bool>? isFavorite,
    i0.Expression<int>? orientation,
-    i0.Expression<String>? iCloudId,
  }) {
    return i0.RawValuesInsertable({
      if (name != null) 'name': name,
@@ -958,7 +900,6 @@ class LocalAssetEntityCompanion
      if (checksum != null) 'checksum': checksum,
      if (isFavorite != null) 'is_favorite': isFavorite,
      if (orientation != null) 'orientation': orientation,
-      if (iCloudId != null) 'i_cloud_id': iCloudId,
    });
  }

@@ -974,7 +915,6 @@ class LocalAssetEntityCompanion
    i0.Value<String?>? checksum,
    i0.Value<bool>? isFavorite,
    i0.Value<int>? orientation,
-    i0.Value<String?>? iCloudId,
  }) {
    return i1.LocalAssetEntityCompanion(
      name: name ?? this.name,
@@ -988,7 +928,6 @@ class LocalAssetEntityCompanion
      checksum: checksum ?? this.checksum,
      isFavorite: isFavorite ?? this.isFavorite,
      orientation: orientation ?? this.orientation,
-      iCloudId: iCloudId ?? this.iCloudId,
    );
  }

@@ -1030,9 +969,6 @@ class LocalAssetEntityCompanion
    if (orientation.present) {
      map['orientation'] = i0.Variable<int>(orientation.value);
    }
-    if (iCloudId.present) {
-      map['i_cloud_id'] = i0.Variable<String>(iCloudId.value);
-    }
    return map;
  }

@@ -1049,14 +985,8 @@ class LocalAssetEntityCompanion
          ..write('id: $id, ')
          ..write('checksum: $checksum, ')
          ..write('isFavorite: $isFavorite, ')
-          ..write('orientation: $orientation, ')
-          ..write('iCloudId: $iCloudId')
+          ..write('orientation: $orientation')
          ..write(')'))
        .toString();
  }
 }
-
-i0.Index get idxLocalAssetCloudId => i0.Index(
-  'idx_local_asset_cloud_id',
-  'CREATE INDEX IF NOT EXISTS idx_local_asset_cloud_id ON local_asset_entity (i_cloud_id)',
-);
--- a/mobile/lib/infrastructure/entities/merged_asset.drift
+++ b/mobile/lib/infrastructure/entities/merged_asset.drift
@@ -21,8 +21,7 @@ SELECT
 	rae.owner_id,
 	rae.live_photo_video_id,
 	0 as orientation,
-	rae.stack_id,
-	NULL as i_cloud_id
+	rae.stack_id
 FROM
 	remote_asset_entity rae
 LEFT JOIN
@@ -54,8 +53,7 @@ SELECT
 	NULL as owner_id,
 	NULL as live_photo_video_id,
 	lae.orientation,
-	NULL as stack_id,
-	lae.i_cloud_id
+	NULL as stack_id
 FROM
 	local_asset_entity lae
 WHERE NOT EXISTS (
--- a/mobile/lib/infrastructure/entities/merged_asset.drift.dart
+++ b/mobile/lib/infrastructure/entities/merged_asset.drift.dart
@@ -29,7 +29,7 @@ class MergedAssetDrift extends i1.ModularAccessor {
    );
    $arrayStartIndex += generatedlimit.amountOfVariables;
    return customSelect(
-      'SELECT rae.id AS remote_id, (SELECT lae.id FROM local_asset_entity AS lae WHERE lae.checksum = rae.checksum LIMIT 1) AS local_id, rae.name, rae.type, rae.created_at AS created_at, rae.updated_at, rae.width, rae.height, rae.duration_in_seconds, rae.is_favorite, rae.thumb_hash, rae.checksum, rae.owner_id, rae.live_photo_video_id, 0 AS orientation, rae.stack_id, NULL AS i_cloud_id FROM remote_asset_entity AS rae LEFT JOIN stack_entity AS se ON rae.stack_id = se.id WHERE rae.deleted_at IS NULL AND rae.visibility = 0 AND rae.owner_id IN ($expandeduserIds) AND(rae.stack_id IS NULL OR rae.id = se.primary_asset_id)UNION ALL SELECT NULL AS remote_id, lae.id AS local_id, lae.name, lae.type, lae.created_at AS created_at, lae.updated_at, lae.width, lae.height, lae.duration_in_seconds, lae.is_favorite, NULL AS thumb_hash, lae.checksum, NULL AS owner_id, NULL AS live_photo_video_id, lae.orientation, NULL AS stack_id, lae.i_cloud_id FROM local_asset_entity AS lae WHERE NOT EXISTS (SELECT 1 FROM remote_asset_entity AS rae WHERE rae.checksum = lae.checksum AND rae.owner_id IN ($expandeduserIds)) AND EXISTS (SELECT 1 FROM local_album_asset_entity AS laa INNER JOIN local_album_entity AS la ON laa.album_id = la.id WHERE laa.asset_id = lae.id AND la.backup_selection = 0) AND NOT EXISTS (SELECT 1 FROM local_album_asset_entity AS laa INNER JOIN local_album_entity AS la ON laa.album_id = la.id WHERE laa.asset_id = lae.id AND la.backup_selection = 2) ORDER BY created_at DESC ${generatedlimit.sql}',
+      'SELECT rae.id AS remote_id, (SELECT lae.id FROM local_asset_entity AS lae WHERE lae.checksum = rae.checksum LIMIT 1) AS local_id, rae.name, rae.type, rae.created_at AS created_at, rae.updated_at, rae.width, rae.height, rae.duration_in_seconds, rae.is_favorite, rae.thumb_hash, rae.checksum, rae.owner_id, rae.live_photo_video_id, 0 AS orientation, rae.stack_id FROM remote_asset_entity AS rae LEFT JOIN stack_entity AS se ON rae.stack_id = se.id WHERE rae.deleted_at IS NULL AND rae.visibility = 0 AND rae.owner_id IN ($expandeduserIds) AND(rae.stack_id IS NULL OR rae.id = se.primary_asset_id)UNION ALL SELECT NULL AS remote_id, lae.id AS local_id, lae.name, lae.type, lae.created_at AS created_at, lae.updated_at, lae.width, lae.height, lae.duration_in_seconds, lae.is_favorite, NULL AS thumb_hash, lae.checksum, NULL AS owner_id, NULL AS live_photo_video_id, lae.orientation, NULL AS stack_id FROM local_asset_entity AS lae WHERE NOT EXISTS (SELECT 1 FROM remote_asset_entity AS rae WHERE rae.checksum = lae.checksum AND rae.owner_id IN ($expandeduserIds)) AND EXISTS (SELECT 1 FROM local_album_asset_entity AS laa INNER JOIN local_album_entity AS la ON laa.album_id = la.id WHERE laa.asset_id = lae.id AND la.backup_selection = 0) AND NOT EXISTS (SELECT 1 FROM local_album_asset_entity AS laa INNER JOIN local_album_entity AS la ON laa.album_id = la.id WHERE laa.asset_id = lae.id AND la.backup_selection = 2) ORDER BY created_at DESC ${generatedlimit.sql}',
      variables: [
        for (var $ in userIds) i0.Variable<String>($),
        ...generatedlimit.introducedVariables,
@@ -62,7 +62,6 @@ class MergedAssetDrift extends i1.ModularAccessor {
        livePhotoVideoId: row.readNullable<String>('live_photo_video_id'),
        orientation: row.read<int>('orientation'),
        stackId: row.readNullable<String>('stack_id'),
-        iCloudId: row.readNullable<String>('i_cloud_id'),
      ),
    );
  }
@@ -130,7 +129,6 @@ class MergedAssetResult {
  final String? livePhotoVideoId;
  final int orientation;
  final String? stackId;
-  final String? iCloudId;
  MergedAssetResult({
    this.remoteId,
    this.localId,
@@ -148,7 +146,6 @@ class MergedAssetResult {
    this.livePhotoVideoId,
    required this.orientation,
    this.stackId,
-    this.iCloudId,
  });
 }

--- a/mobile/lib/infrastructure/entities/remote_asset_cloud_id.entity.dart
+++ b/mobile/lib/infrastructure/entities/remote_asset_cloud_id.entity.dart
@@ -1,12 +0,0 @@
-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';
-
-class RemoteAssetCloudIdEntity extends Table with DriftDefaultsMixin {
-  TextColumn get assetId => text().references(RemoteAssetEntity, #id, onDelete: KeyAction.cascade)();
-
-  TextColumn get cloudId => text().unique().nullable()();
-
-  @override
-  Set<Column> get primaryKey => {assetId};
-}
--- a/mobile/lib/infrastructure/entities/remote_asset_cloud_id.entity.drift.dart
+++ b/mobile/lib/infrastructure/entities/remote_asset_cloud_id.entity.drift.dart
@@ -1,548 +0,0 @@
-// dart format width=80
-// ignore_for_file: type=lint
-import 'package:drift/drift.dart' as i0;
-import 'package:immich_mobile/infrastructure/entities/remote_asset_cloud_id.entity.drift.dart'
-    as i1;
-import 'package:immich_mobile/infrastructure/entities/remote_asset_cloud_id.entity.dart'
-    as i2;
-import 'package:immich_mobile/infrastructure/entities/remote_asset.entity.drift.dart'
-    as i3;
-import 'package:drift/internal/modular.dart' as i4;
-
-typedef $$RemoteAssetCloudIdEntityTableCreateCompanionBuilder =
-    i1.RemoteAssetCloudIdEntityCompanion Function({
-      required String assetId,
-      i0.Value<String?> cloudId,
-    });
-typedef $$RemoteAssetCloudIdEntityTableUpdateCompanionBuilder =
-    i1.RemoteAssetCloudIdEntityCompanion Function({
-      i0.Value<String> assetId,
-      i0.Value<String?> cloudId,
-    });
-
-final class $$RemoteAssetCloudIdEntityTableReferences
-    extends
-        i0.BaseReferences<
-          i0.GeneratedDatabase,
-          i1.$RemoteAssetCloudIdEntityTable,
-          i1.RemoteAssetCloudIdEntityData
-        > {
-  $$RemoteAssetCloudIdEntityTableReferences(
-    super.$_db,
-    super.$_table,
-    super.$_typedResult,
-  );
-
-  static i3.$RemoteAssetEntityTable _assetIdTable(i0.GeneratedDatabase db) =>
-      i4.ReadDatabaseContainer(db)
-          .resultSet<i3.$RemoteAssetEntityTable>('remote_asset_entity')
-          .createAlias(
-            i0.$_aliasNameGenerator(
-              i4.ReadDatabaseContainer(db)
-                  .resultSet<i1.$RemoteAssetCloudIdEntityTable>(
-                    'remote_asset_cloud_id_entity',
-                  )
-                  .assetId,
-              i4.ReadDatabaseContainer(
-                db,
-              ).resultSet<i3.$RemoteAssetEntityTable>('remote_asset_entity').id,
-            ),
-          );
-
-  i3.$$RemoteAssetEntityTableProcessedTableManager get assetId {
-    final $_column = $_itemColumn<String>('asset_id')!;
-
-    final manager = i3
-        .$$RemoteAssetEntityTableTableManager(
-          $_db,
-          i4.ReadDatabaseContainer(
-            $_db,
-          ).resultSet<i3.$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 $$RemoteAssetCloudIdEntityTableFilterComposer
-    extends
-        i0.Composer<i0.GeneratedDatabase, i1.$RemoteAssetCloudIdEntityTable> {
-  $$RemoteAssetCloudIdEntityTableFilterComposer({
-    required super.$db,
-    required super.$table,
-    super.joinBuilder,
-    super.$addJoinBuilderToRootComposer,
-    super.$removeJoinBuilderFromRootComposer,
-  });
-  i0.ColumnFilters<String> get cloudId => $composableBuilder(
-    column: $table.cloudId,
-    builder: (column) => i0.ColumnFilters(column),
-  );
-
-  i3.$$RemoteAssetEntityTableFilterComposer get assetId {
-    final i3.$$RemoteAssetEntityTableFilterComposer composer = $composerBuilder(
-      composer: this,
-      getCurrentColumn: (t) => t.assetId,
-      referencedTable: i4.ReadDatabaseContainer(
-        $db,
-      ).resultSet<i3.$RemoteAssetEntityTable>('remote_asset_entity'),
-      getReferencedColumn: (t) => t.id,
-      builder:
-          (
-            joinBuilder, {
-            $addJoinBuilderToRootComposer,
-            $removeJoinBuilderFromRootComposer,
-          }) => i3.$$RemoteAssetEntityTableFilterComposer(
-            $db: $db,
-            $table: i4.ReadDatabaseContainer(
-              $db,
-            ).resultSet<i3.$RemoteAssetEntityTable>('remote_asset_entity'),
-            $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
-            joinBuilder: joinBuilder,
-            $removeJoinBuilderFromRootComposer:
-                $removeJoinBuilderFromRootComposer,
-          ),
-    );
-    return composer;
-  }
-}
-
-class $$RemoteAssetCloudIdEntityTableOrderingComposer
-    extends
-        i0.Composer<i0.GeneratedDatabase, i1.$RemoteAssetCloudIdEntityTable> {
-  $$RemoteAssetCloudIdEntityTableOrderingComposer({
-    required super.$db,
-    required super.$table,
-    super.joinBuilder,
-    super.$addJoinBuilderToRootComposer,
-    super.$removeJoinBuilderFromRootComposer,
-  });
-  i0.ColumnOrderings<String> get cloudId => $composableBuilder(
-    column: $table.cloudId,
-    builder: (column) => i0.ColumnOrderings(column),
-  );
-
-  i3.$$RemoteAssetEntityTableOrderingComposer get assetId {
-    final i3.$$RemoteAssetEntityTableOrderingComposer composer =
-        $composerBuilder(
-          composer: this,
-          getCurrentColumn: (t) => t.assetId,
-          referencedTable: i4.ReadDatabaseContainer(
-            $db,
-          ).resultSet<i3.$RemoteAssetEntityTable>('remote_asset_entity'),
-          getReferencedColumn: (t) => t.id,
-          builder:
-              (
-                joinBuilder, {
-                $addJoinBuilderToRootComposer,
-                $removeJoinBuilderFromRootComposer,
-              }) => i3.$$RemoteAssetEntityTableOrderingComposer(
-                $db: $db,
-                $table: i4.ReadDatabaseContainer(
-                  $db,
-                ).resultSet<i3.$RemoteAssetEntityTable>('remote_asset_entity'),
-                $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
-                joinBuilder: joinBuilder,
-                $removeJoinBuilderFromRootComposer:
-                    $removeJoinBuilderFromRootComposer,
-              ),
-        );
-    return composer;
-  }
-}
-
-class $$RemoteAssetCloudIdEntityTableAnnotationComposer
-    extends
-        i0.Composer<i0.GeneratedDatabase, i1.$RemoteAssetCloudIdEntityTable> {
-  $$RemoteAssetCloudIdEntityTableAnnotationComposer({
-    required super.$db,
-    required super.$table,
-    super.joinBuilder,
-    super.$addJoinBuilderToRootComposer,
-    super.$removeJoinBuilderFromRootComposer,
-  });
-  i0.GeneratedColumn<String> get cloudId =>
-      $composableBuilder(column: $table.cloudId, builder: (column) => column);
-
-  i3.$$RemoteAssetEntityTableAnnotationComposer get assetId {
-    final i3.$$RemoteAssetEntityTableAnnotationComposer composer =
-        $composerBuilder(
-          composer: this,
-          getCurrentColumn: (t) => t.assetId,
-          referencedTable: i4.ReadDatabaseContainer(
-            $db,
-          ).resultSet<i3.$RemoteAssetEntityTable>('remote_asset_entity'),
-          getReferencedColumn: (t) => t.id,
-          builder:
-              (
-                joinBuilder, {
-                $addJoinBuilderToRootComposer,
-                $removeJoinBuilderFromRootComposer,
-              }) => i3.$$RemoteAssetEntityTableAnnotationComposer(
-                $db: $db,
-                $table: i4.ReadDatabaseContainer(
-                  $db,
-                ).resultSet<i3.$RemoteAssetEntityTable>('remote_asset_entity'),
-                $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
-                joinBuilder: joinBuilder,
-                $removeJoinBuilderFromRootComposer:
-                    $removeJoinBuilderFromRootComposer,
-              ),
-        );
-    return composer;
-  }
-}
-
-class $$RemoteAssetCloudIdEntityTableTableManager
-    extends
-        i0.RootTableManager<
-          i0.GeneratedDatabase,
-          i1.$RemoteAssetCloudIdEntityTable,
-          i1.RemoteAssetCloudIdEntityData,
-          i1.$$RemoteAssetCloudIdEntityTableFilterComposer,
-          i1.$$RemoteAssetCloudIdEntityTableOrderingComposer,
-          i1.$$RemoteAssetCloudIdEntityTableAnnotationComposer,
-          $$RemoteAssetCloudIdEntityTableCreateCompanionBuilder,
-          $$RemoteAssetCloudIdEntityTableUpdateCompanionBuilder,
-          (
-            i1.RemoteAssetCloudIdEntityData,
-            i1.$$RemoteAssetCloudIdEntityTableReferences,
-          ),
-          i1.RemoteAssetCloudIdEntityData,
-          i0.PrefetchHooks Function({bool assetId})
-        > {
-  $$RemoteAssetCloudIdEntityTableTableManager(
-    i0.GeneratedDatabase db,
-    i1.$RemoteAssetCloudIdEntityTable table,
-  ) : super(
-        i0.TableManagerState(
-          db: db,
-          table: table,
-          createFilteringComposer: () =>
-              i1.$$RemoteAssetCloudIdEntityTableFilterComposer(
-                $db: db,
-                $table: table,
-              ),
-          createOrderingComposer: () =>
-              i1.$$RemoteAssetCloudIdEntityTableOrderingComposer(
-                $db: db,
-                $table: table,
-              ),
-          createComputedFieldComposer: () =>
-              i1.$$RemoteAssetCloudIdEntityTableAnnotationComposer(
-                $db: db,
-                $table: table,
-              ),
-          updateCompanionCallback:
-              ({
-                i0.Value<String> assetId = const i0.Value.absent(),
-                i0.Value<String?> cloudId = const i0.Value.absent(),
-              }) => i1.RemoteAssetCloudIdEntityCompanion(
-                assetId: assetId,
-                cloudId: cloudId,
-              ),
-          createCompanionCallback:
-              ({
-                required String assetId,
-                i0.Value<String?> cloudId = const i0.Value.absent(),
-              }) => i1.RemoteAssetCloudIdEntityCompanion.insert(
-                assetId: assetId,
-                cloudId: cloudId,
-              ),
-          withReferenceMapper: (p0) => p0
-              .map(
-                (e) => (
-                  e.readTable(table),
-                  i1.$$RemoteAssetCloudIdEntityTableReferences(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
-                                    .$$RemoteAssetCloudIdEntityTableReferences
-                                    ._assetIdTable(db),
-                                referencedColumn: i1
-                                    .$$RemoteAssetCloudIdEntityTableReferences
-                                    ._assetIdTable(db)
-                                    .id,
-                              )
-                              as T;
-                    }
-
-                    return state;
-                  },
-              getPrefetchedDataCallback: (items) async {
-                return [];
-              },
-            );
-          },
-        ),
-      );
-}
-
-typedef $$RemoteAssetCloudIdEntityTableProcessedTableManager =
-    i0.ProcessedTableManager<
-      i0.GeneratedDatabase,
-      i1.$RemoteAssetCloudIdEntityTable,
-      i1.RemoteAssetCloudIdEntityData,
-      i1.$$RemoteAssetCloudIdEntityTableFilterComposer,
-      i1.$$RemoteAssetCloudIdEntityTableOrderingComposer,
-      i1.$$RemoteAssetCloudIdEntityTableAnnotationComposer,
-      $$RemoteAssetCloudIdEntityTableCreateCompanionBuilder,
-      $$RemoteAssetCloudIdEntityTableUpdateCompanionBuilder,
-      (
-        i1.RemoteAssetCloudIdEntityData,
-        i1.$$RemoteAssetCloudIdEntityTableReferences,
-      ),
-      i1.RemoteAssetCloudIdEntityData,
-      i0.PrefetchHooks Function({bool assetId})
-    >;
-
-class $RemoteAssetCloudIdEntityTable extends i2.RemoteAssetCloudIdEntity
-    with
-        i0.TableInfo<
-          $RemoteAssetCloudIdEntityTable,
-          i1.RemoteAssetCloudIdEntityData
-        > {
-  @override
-  final i0.GeneratedDatabase attachedDatabase;
-  final String? _alias;
-  $RemoteAssetCloudIdEntityTable(this.attachedDatabase, [this._alias]);
-  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',
-    ),
-  );
-  static const i0.VerificationMeta _cloudIdMeta = const i0.VerificationMeta(
-    'cloudId',
-  );
-  @override
-  late final i0.GeneratedColumn<String> cloudId = i0.GeneratedColumn<String>(
-    'cloud_id',
-    aliasedName,
-    true,
-    type: i0.DriftSqlType.string,
-    requiredDuringInsert: false,
-    defaultConstraints: i0.GeneratedColumn.constraintIsAlways('UNIQUE'),
-  );
-  @override
-  List<i0.GeneratedColumn> get $columns => [assetId, cloudId];
-  @override
-  String get aliasedName => _alias ?? actualTableName;
-  @override
-  String get actualTableName => $name;
-  static const String $name = 'remote_asset_cloud_id_entity';
-  @override
-  i0.VerificationContext validateIntegrity(
-    i0.Insertable<i1.RemoteAssetCloudIdEntityData> instance, {
-    bool isInserting = false,
-  }) {
-    final context = i0.VerificationContext();
-    final data = instance.toColumns(true);
-    if (data.containsKey('asset_id')) {
-      context.handle(
-        _assetIdMeta,
-        assetId.isAcceptableOrUnknown(data['asset_id']!, _assetIdMeta),
-      );
-    } else if (isInserting) {
-      context.missing(_assetIdMeta);
-    }
-    if (data.containsKey('cloud_id')) {
-      context.handle(
-        _cloudIdMeta,
-        cloudId.isAcceptableOrUnknown(data['cloud_id']!, _cloudIdMeta),
-      );
-    }
-    return context;
-  }
-
-  @override
-  Set<i0.GeneratedColumn> get $primaryKey => {assetId};
-  @override
-  i1.RemoteAssetCloudIdEntityData map(
-    Map<String, dynamic> data, {
-    String? tablePrefix,
-  }) {
-    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
-    return i1.RemoteAssetCloudIdEntityData(
-      assetId: attachedDatabase.typeMapping.read(
-        i0.DriftSqlType.string,
-        data['${effectivePrefix}asset_id'],
-      )!,
-      cloudId: attachedDatabase.typeMapping.read(
-        i0.DriftSqlType.string,
-        data['${effectivePrefix}cloud_id'],
-      ),
-    );
-  }
-
-  @override
-  $RemoteAssetCloudIdEntityTable createAlias(String alias) {
-    return $RemoteAssetCloudIdEntityTable(attachedDatabase, alias);
-  }
-
-  @override
-  bool get withoutRowId => true;
-  @override
-  bool get isStrict => true;
-}
-
-class RemoteAssetCloudIdEntityData extends i0.DataClass
-    implements i0.Insertable<i1.RemoteAssetCloudIdEntityData> {
-  final String assetId;
-  final String? cloudId;
-  const RemoteAssetCloudIdEntityData({required this.assetId, this.cloudId});
-  @override
-  Map<String, i0.Expression> toColumns(bool nullToAbsent) {
-    final map = <String, i0.Expression>{};
-    map['asset_id'] = i0.Variable<String>(assetId);
-    if (!nullToAbsent || cloudId != null) {
-      map['cloud_id'] = i0.Variable<String>(cloudId);
-    }
-    return map;
-  }
-
-  factory RemoteAssetCloudIdEntityData.fromJson(
-    Map<String, dynamic> json, {
-    i0.ValueSerializer? serializer,
-  }) {
-    serializer ??= i0.driftRuntimeOptions.defaultSerializer;
-    return RemoteAssetCloudIdEntityData(
-      assetId: serializer.fromJson<String>(json['assetId']),
-      cloudId: serializer.fromJson<String?>(json['cloudId']),
-    );
-  }
-  @override
-  Map<String, dynamic> toJson({i0.ValueSerializer? serializer}) {
-    serializer ??= i0.driftRuntimeOptions.defaultSerializer;
-    return <String, dynamic>{
-      'assetId': serializer.toJson<String>(assetId),
-      'cloudId': serializer.toJson<String?>(cloudId),
-    };
-  }
-
-  i1.RemoteAssetCloudIdEntityData copyWith({
-    String? assetId,
-    i0.Value<String?> cloudId = const i0.Value.absent(),
-  }) => i1.RemoteAssetCloudIdEntityData(
-    assetId: assetId ?? this.assetId,
-    cloudId: cloudId.present ? cloudId.value : this.cloudId,
-  );
-  RemoteAssetCloudIdEntityData copyWithCompanion(
-    i1.RemoteAssetCloudIdEntityCompanion data,
-  ) {
-    return RemoteAssetCloudIdEntityData(
-      assetId: data.assetId.present ? data.assetId.value : this.assetId,
-      cloudId: data.cloudId.present ? data.cloudId.value : this.cloudId,
-    );
-  }
-
-  @override
-  String toString() {
-    return (StringBuffer('RemoteAssetCloudIdEntityData(')
-          ..write('assetId: $assetId, ')
-          ..write('cloudId: $cloudId')
-          ..write(')'))
-        .toString();
-  }
-
-  @override
-  int get hashCode => Object.hash(assetId, cloudId);
-  @override
-  bool operator ==(Object other) =>
-      identical(this, other) ||
-      (other is i1.RemoteAssetCloudIdEntityData &&
-          other.assetId == this.assetId &&
-          other.cloudId == this.cloudId);
-}
-
-class RemoteAssetCloudIdEntityCompanion
-    extends i0.UpdateCompanion<i1.RemoteAssetCloudIdEntityData> {
-  final i0.Value<String> assetId;
-  final i0.Value<String?> cloudId;
-  const RemoteAssetCloudIdEntityCompanion({
-    this.assetId = const i0.Value.absent(),
-    this.cloudId = const i0.Value.absent(),
-  });
-  RemoteAssetCloudIdEntityCompanion.insert({
-    required String assetId,
-    this.cloudId = const i0.Value.absent(),
-  }) : assetId = i0.Value(assetId);
-  static i0.Insertable<i1.RemoteAssetCloudIdEntityData> custom({
-    i0.Expression<String>? assetId,
-    i0.Expression<String>? cloudId,
-  }) {
-    return i0.RawValuesInsertable({
-      if (assetId != null) 'asset_id': assetId,
-      if (cloudId != null) 'cloud_id': cloudId,
-    });
-  }
-
-  i1.RemoteAssetCloudIdEntityCompanion copyWith({
-    i0.Value<String>? assetId,
-    i0.Value<String?>? cloudId,
-  }) {
-    return i1.RemoteAssetCloudIdEntityCompanion(
-      assetId: assetId ?? this.assetId,
-      cloudId: cloudId ?? this.cloudId,
-    );
-  }
-
-  @override
-  Map<String, i0.Expression> toColumns(bool nullToAbsent) {
-    final map = <String, i0.Expression>{};
-    if (assetId.present) {
-      map['asset_id'] = i0.Variable<String>(assetId.value);
-    }
-    if (cloudId.present) {
-      map['cloud_id'] = i0.Variable<String>(cloudId.value);
-    }
-    return map;
-  }
-
-  @override
-  String toString() {
-    return (StringBuffer('RemoteAssetCloudIdEntityCompanion(')
-          ..write('assetId: $assetId, ')
-          ..write('cloudId: $cloudId')
-          ..write(')'))
-        .toString();
-  }
-}
--- a/mobile/lib/infrastructure/repositories/db.repository.dart
+++ b/mobile/lib/infrastructure/repositories/db.repository.dart
@@ -18,7 +18,6 @@ import 'package:immich_mobile/infrastructure/entities/remote_album.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/remote_album_asset.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/remote_album_user.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/remote_asset.entity.dart';
-import 'package:immich_mobile/infrastructure/entities/remote_asset_cloud_id.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/stack.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/store.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/user.entity.dart';
@@ -57,7 +56,6 @@ class IsarDatabaseRepository implements IDatabaseRepository {
    RemoteAlbumEntity,
    RemoteAlbumAssetEntity,
    RemoteAlbumUserEntity,
-    RemoteAssetCloudIdEntity,
    MemoryEntity,
    MemoryAssetEntity,
    StackEntity,
@@ -72,7 +70,7 @@ class Drift extends $Drift implements IDatabaseRepository {
    : super(executor ?? driftDatabase(name: 'immich', native: const DriftNativeOptions(shareAcrossIsolates: true)));

  @override
-  int get schemaVersion => 11;
+  int get schemaVersion => 10;

  @override
  MigrationStrategy get migration => MigrationStrategy(
@@ -135,12 +133,6 @@ class Drift extends $Drift implements IDatabaseRepository {
            await m.addColumn(v10.userEntity, v10.userEntity.avatarColor);
            await m.alterTable(TableMigration(v10.userEntity));
          },
-          from10To11: (m, v11) async {
-            // Add i_cloud_id to local and remote asset tables
-            await m.addColumn(v11.localAssetEntity, v11.localAssetEntity.iCloudId);
-            await m.createIndex(v11.idxLocalAssetCloudId);
-            await m.createTable(v11.remoteAssetCloudIdEntity);
-          },
        ),
      );

--- a/mobile/lib/infrastructure/repositories/db.repository.drift.dart
+++ b/mobile/lib/infrastructure/repositories/db.repository.drift.dart
@@ -27,21 +27,19 @@ import 'package:immich_mobile/infrastructure/entities/remote_album_asset.entity.
    as i12;
 import 'package:immich_mobile/infrastructure/entities/remote_album_user.entity.drift.dart'
    as i13;
-import 'package:immich_mobile/infrastructure/entities/remote_asset_cloud_id.entity.drift.dart'
-    as i14;
 import 'package:immich_mobile/infrastructure/entities/memory.entity.drift.dart'
-    as i15;
+    as i14;
 import 'package:immich_mobile/infrastructure/entities/memory_asset.entity.drift.dart'
-    as i16;
+    as i15;
 import 'package:immich_mobile/infrastructure/entities/person.entity.drift.dart'
-    as i17;
+    as i16;
 import 'package:immich_mobile/infrastructure/entities/asset_face.entity.drift.dart'
-    as i18;
+    as i17;
 import 'package:immich_mobile/infrastructure/entities/store.entity.drift.dart'
-    as i19;
+    as i18;
 import 'package:immich_mobile/infrastructure/entities/merged_asset.drift.dart'
-    as i20;
-import 'package:drift/internal/modular.dart' as i21;
+    as i19;
+import 'package:drift/internal/modular.dart' as i20;

 abstract class $Drift extends i0.GeneratedDatabase {
  $Drift(i0.QueryExecutor e) : super(e);
@@ -72,18 +70,16 @@ abstract class $Drift extends i0.GeneratedDatabase {
      .$RemoteAlbumAssetEntityTable(this);
  late final i13.$RemoteAlbumUserEntityTable remoteAlbumUserEntity = i13
      .$RemoteAlbumUserEntityTable(this);
-  late final i14.$RemoteAssetCloudIdEntityTable remoteAssetCloudIdEntity = i14
-      .$RemoteAssetCloudIdEntityTable(this);
-  late final i15.$MemoryEntityTable memoryEntity = i15.$MemoryEntityTable(this);
-  late final i16.$MemoryAssetEntityTable memoryAssetEntity = i16
+  late final i14.$MemoryEntityTable memoryEntity = i14.$MemoryEntityTable(this);
+  late final i15.$MemoryAssetEntityTable memoryAssetEntity = i15
      .$MemoryAssetEntityTable(this);
-  late final i17.$PersonEntityTable personEntity = i17.$PersonEntityTable(this);
-  late final i18.$AssetFaceEntityTable assetFaceEntity = i18
+  late final i16.$PersonEntityTable personEntity = i16.$PersonEntityTable(this);
+  late final i17.$AssetFaceEntityTable assetFaceEntity = i17
      .$AssetFaceEntityTable(this);
-  late final i19.$StoreEntityTable storeEntity = i19.$StoreEntityTable(this);
-  i20.MergedAssetDrift get mergedAssetDrift => i21.ReadDatabaseContainer(
+  late final i18.$StoreEntityTable storeEntity = i18.$StoreEntityTable(this);
+  i19.MergedAssetDrift get mergedAssetDrift => i20.ReadDatabaseContainer(
    this,
-  ).accessor<i20.MergedAssetDrift>(i20.MergedAssetDrift.new);
+  ).accessor<i19.MergedAssetDrift>(i19.MergedAssetDrift.new);
  @override
  Iterable<i0.TableInfo<i0.Table, Object?>> get allTables =>
      allSchemaEntities.whereType<i0.TableInfo<i0.Table, Object?>>();
@@ -97,7 +93,6 @@ abstract class $Drift extends i0.GeneratedDatabase {
    localAlbumEntity,
    localAlbumAssetEntity,
    i4.idxLocalAssetChecksum,
-    i4.idxLocalAssetCloudId,
    i2.idxRemoteAssetOwnerChecksum,
    i2.uQRemoteAssetsOwnerChecksum,
    i2.uQRemoteAssetsOwnerLibraryChecksum,
@@ -108,7 +103,6 @@ abstract class $Drift extends i0.GeneratedDatabase {
    remoteExifEntity,
    remoteAlbumAssetEntity,
    remoteAlbumUserEntity,
-    remoteAssetCloudIdEntity,
    memoryEntity,
    memoryAssetEntity,
    personEntity,
@@ -248,18 +242,6 @@ abstract class $Drift extends i0.GeneratedDatabase {
        i0.TableUpdate('remote_album_user_entity', kind: i0.UpdateKind.delete),
      ],
    ),
-    i0.WritePropagation(
-      on: i0.TableUpdateQuery.onTableName(
-        'remote_asset_entity',
-        limitUpdateKind: i0.UpdateKind.delete,
-      ),
-      result: [
-        i0.TableUpdate(
-          'remote_asset_cloud_id_entity',
-          kind: i0.UpdateKind.delete,
-        ),
-      ],
-    ),
    i0.WritePropagation(
      on: i0.TableUpdateQuery.onTableName(
        'user_entity',
@@ -344,20 +326,14 @@ class $DriftManager {
      );
  i13.$$RemoteAlbumUserEntityTableTableManager get remoteAlbumUserEntity => i13
      .$$RemoteAlbumUserEntityTableTableManager(_db, _db.remoteAlbumUserEntity);
-  i14.$$RemoteAssetCloudIdEntityTableTableManager
-  get remoteAssetCloudIdEntity =>
-      i14.$$RemoteAssetCloudIdEntityTableTableManager(
-        _db,
-        _db.remoteAssetCloudIdEntity,
-      );
-  i15.$$MemoryEntityTableTableManager get memoryEntity =>
-      i15.$$MemoryEntityTableTableManager(_db, _db.memoryEntity);
-  i16.$$MemoryAssetEntityTableTableManager get memoryAssetEntity =>
-      i16.$$MemoryAssetEntityTableTableManager(_db, _db.memoryAssetEntity);
-  i17.$$PersonEntityTableTableManager get personEntity =>
-      i17.$$PersonEntityTableTableManager(_db, _db.personEntity);
-  i18.$$AssetFaceEntityTableTableManager get assetFaceEntity =>
-      i18.$$AssetFaceEntityTableTableManager(_db, _db.assetFaceEntity);
-  i19.$$StoreEntityTableTableManager get storeEntity =>
-      i19.$$StoreEntityTableTableManager(_db, _db.storeEntity);
+  i14.$$MemoryEntityTableTableManager get memoryEntity =>
+      i14.$$MemoryEntityTableTableManager(_db, _db.memoryEntity);
+  i15.$$MemoryAssetEntityTableTableManager get memoryAssetEntity =>
+      i15.$$MemoryAssetEntityTableTableManager(_db, _db.memoryAssetEntity);
+  i16.$$PersonEntityTableTableManager get personEntity =>
+      i16.$$PersonEntityTableTableManager(_db, _db.personEntity);
+  i17.$$AssetFaceEntityTableTableManager get assetFaceEntity =>
+      i17.$$AssetFaceEntityTableTableManager(_db, _db.assetFaceEntity);
+  i18.$$StoreEntityTableTableManager get storeEntity =>
+      i18.$$StoreEntityTableTableManager(_db, _db.storeEntity);
 }
--- a/mobile/lib/infrastructure/repositories/db.repository.steps.dart
+++ b/mobile/lib/infrastructure/repositories/db.repository.steps.dart
@@ -4270,455 +4270,6 @@ i1.GeneratedColumn<String> _column_94(String aliasedName) =>
      true,
      type: i1.DriftSqlType.string,
    );
-
-final class Schema11 extends i0.VersionedSchema {
-  Schema11({required super.database}) : super(version: 11);
-  @override
-  late final List<i1.DatabaseSchemaEntity> entities = [
-    userEntity,
-    remoteAssetEntity,
-    stackEntity,
-    localAssetEntity,
-    remoteAlbumEntity,
-    localAlbumEntity,
-    localAlbumAssetEntity,
-    idxLocalAssetChecksum,
-    idxLocalAssetCloudId,
-    idxRemoteAssetOwnerChecksum,
-    uQRemoteAssetsOwnerChecksum,
-    uQRemoteAssetsOwnerLibraryChecksum,
-    idxRemoteAssetChecksum,
-    authUserEntity,
-    userMetadataEntity,
-    partnerEntity,
-    remoteExifEntity,
-    remoteAlbumAssetEntity,
-    remoteAlbumUserEntity,
-    remoteAssetCloudIdEntity,
-    memoryEntity,
-    memoryAssetEntity,
-    personEntity,
-    assetFaceEntity,
-    storeEntity,
-    idxLatLng,
-  ];
-  late final Shape20 userEntity = Shape20(
-    source: i0.VersionedTable(
-      entityName: 'user_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_0,
-        _column_1,
-        _column_3,
-        _column_84,
-        _column_85,
-        _column_91,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape17 remoteAssetEntity = Shape17(
-    source: i0.VersionedTable(
-      entityName: 'remote_asset_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_1,
-        _column_8,
-        _column_9,
-        _column_5,
-        _column_10,
-        _column_11,
-        _column_12,
-        _column_0,
-        _column_13,
-        _column_14,
-        _column_15,
-        _column_16,
-        _column_17,
-        _column_18,
-        _column_19,
-        _column_20,
-        _column_21,
-        _column_86,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape3 stackEntity = Shape3(
-    source: i0.VersionedTable(
-      entityName: 'stack_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [_column_0, _column_9, _column_5, _column_15, _column_75],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape22 localAssetEntity = Shape22(
-    source: i0.VersionedTable(
-      entityName: 'local_asset_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_1,
-        _column_8,
-        _column_9,
-        _column_5,
-        _column_10,
-        _column_11,
-        _column_12,
-        _column_0,
-        _column_22,
-        _column_14,
-        _column_23,
-        _column_95,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape9 remoteAlbumEntity = Shape9(
-    source: i0.VersionedTable(
-      entityName: 'remote_album_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_0,
-        _column_1,
-        _column_56,
-        _column_9,
-        _column_5,
-        _column_15,
-        _column_57,
-        _column_58,
-        _column_59,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape19 localAlbumEntity = Shape19(
-    source: i0.VersionedTable(
-      entityName: 'local_album_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_0,
-        _column_1,
-        _column_5,
-        _column_31,
-        _column_32,
-        _column_90,
-        _column_33,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape7 localAlbumAssetEntity = Shape7(
-    source: i0.VersionedTable(
-      entityName: 'local_album_asset_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(asset_id, album_id)'],
-      columns: [_column_34, _column_35],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  final i1.Index idxLocalAssetChecksum = i1.Index(
-    'idx_local_asset_checksum',
-    'CREATE INDEX IF NOT EXISTS idx_local_asset_checksum ON local_asset_entity (checksum)',
-  );
-  final i1.Index idxLocalAssetCloudId = i1.Index(
-    'idx_local_asset_cloud_id',
-    'CREATE INDEX IF NOT EXISTS idx_local_asset_cloud_id ON local_asset_entity (i_cloud_id)',
-  );
-  final i1.Index idxRemoteAssetOwnerChecksum = i1.Index(
-    'idx_remote_asset_owner_checksum',
-    'CREATE INDEX IF NOT EXISTS idx_remote_asset_owner_checksum ON remote_asset_entity (owner_id, checksum)',
-  );
-  final i1.Index uQRemoteAssetsOwnerChecksum = i1.Index(
-    'UQ_remote_assets_owner_checksum',
-    'CREATE UNIQUE INDEX IF NOT EXISTS UQ_remote_assets_owner_checksum ON remote_asset_entity (owner_id, checksum) WHERE(library_id IS NULL)',
-  );
-  final i1.Index uQRemoteAssetsOwnerLibraryChecksum = i1.Index(
-    'UQ_remote_assets_owner_library_checksum',
-    'CREATE UNIQUE INDEX IF NOT EXISTS UQ_remote_assets_owner_library_checksum ON remote_asset_entity (owner_id, library_id, checksum) WHERE(library_id IS NOT NULL)',
-  );
-  final i1.Index idxRemoteAssetChecksum = i1.Index(
-    'idx_remote_asset_checksum',
-    'CREATE INDEX IF NOT EXISTS idx_remote_asset_checksum ON remote_asset_entity (checksum)',
-  );
-  late final Shape21 authUserEntity = Shape21(
-    source: i0.VersionedTable(
-      entityName: 'auth_user_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_0,
-        _column_1,
-        _column_3,
-        _column_2,
-        _column_84,
-        _column_85,
-        _column_92,
-        _column_93,
-        _column_7,
-        _column_94,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape4 userMetadataEntity = Shape4(
-    source: i0.VersionedTable(
-      entityName: 'user_metadata_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(user_id, "key")'],
-      columns: [_column_25, _column_26, _column_27],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape5 partnerEntity = Shape5(
-    source: i0.VersionedTable(
-      entityName: 'partner_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(shared_by_id, shared_with_id)'],
-      columns: [_column_28, _column_29, _column_30],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape8 remoteExifEntity = Shape8(
-    source: i0.VersionedTable(
-      entityName: 'remote_exif_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(asset_id)'],
-      columns: [
-        _column_36,
-        _column_37,
-        _column_38,
-        _column_39,
-        _column_40,
-        _column_41,
-        _column_11,
-        _column_10,
-        _column_42,
-        _column_43,
-        _column_44,
-        _column_45,
-        _column_46,
-        _column_47,
-        _column_48,
-        _column_49,
-        _column_50,
-        _column_51,
-        _column_52,
-        _column_53,
-        _column_54,
-        _column_55,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape7 remoteAlbumAssetEntity = Shape7(
-    source: i0.VersionedTable(
-      entityName: 'remote_album_asset_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(asset_id, album_id)'],
-      columns: [_column_36, _column_60],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape10 remoteAlbumUserEntity = Shape10(
-    source: i0.VersionedTable(
-      entityName: 'remote_album_user_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(album_id, user_id)'],
-      columns: [_column_60, _column_25, _column_61],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape23 remoteAssetCloudIdEntity = Shape23(
-    source: i0.VersionedTable(
-      entityName: 'remote_asset_cloud_id_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(asset_id)'],
-      columns: [_column_36, _column_96],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape11 memoryEntity = Shape11(
-    source: i0.VersionedTable(
-      entityName: 'memory_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_0,
-        _column_9,
-        _column_5,
-        _column_18,
-        _column_15,
-        _column_8,
-        _column_62,
-        _column_63,
-        _column_64,
-        _column_65,
-        _column_66,
-        _column_67,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape12 memoryAssetEntity = Shape12(
-    source: i0.VersionedTable(
-      entityName: 'memory_asset_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(asset_id, memory_id)'],
-      columns: [_column_36, _column_68],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape14 personEntity = Shape14(
-    source: i0.VersionedTable(
-      entityName: 'person_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_0,
-        _column_9,
-        _column_5,
-        _column_15,
-        _column_1,
-        _column_69,
-        _column_71,
-        _column_72,
-        _column_73,
-        _column_74,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape15 assetFaceEntity = Shape15(
-    source: i0.VersionedTable(
-      entityName: 'asset_face_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_0,
-        _column_36,
-        _column_76,
-        _column_77,
-        _column_78,
-        _column_79,
-        _column_80,
-        _column_81,
-        _column_82,
-        _column_83,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape18 storeEntity = Shape18(
-    source: i0.VersionedTable(
-      entityName: 'store_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [_column_87, _column_88, _column_89],
-      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)',
-  );
-}
-
-class Shape22 extends i0.VersionedTable {
-  Shape22({required super.source, required super.alias}) : super.aliased();
-  i1.GeneratedColumn<String> get name =>
-      columnsByName['name']! as i1.GeneratedColumn<String>;
-  i1.GeneratedColumn<int> get type =>
-      columnsByName['type']! as i1.GeneratedColumn<int>;
-  i1.GeneratedColumn<DateTime> get createdAt =>
-      columnsByName['created_at']! as i1.GeneratedColumn<DateTime>;
-  i1.GeneratedColumn<DateTime> get updatedAt =>
-      columnsByName['updated_at']! as i1.GeneratedColumn<DateTime>;
-  i1.GeneratedColumn<int> get width =>
-      columnsByName['width']! as i1.GeneratedColumn<int>;
-  i1.GeneratedColumn<int> get height =>
-      columnsByName['height']! as i1.GeneratedColumn<int>;
-  i1.GeneratedColumn<int> get durationInSeconds =>
-      columnsByName['duration_in_seconds']! as i1.GeneratedColumn<int>;
-  i1.GeneratedColumn<String> get id =>
-      columnsByName['id']! as i1.GeneratedColumn<String>;
-  i1.GeneratedColumn<String> get checksum =>
-      columnsByName['checksum']! as i1.GeneratedColumn<String>;
-  i1.GeneratedColumn<bool> get isFavorite =>
-      columnsByName['is_favorite']! as i1.GeneratedColumn<bool>;
-  i1.GeneratedColumn<int> get orientation =>
-      columnsByName['orientation']! as i1.GeneratedColumn<int>;
-  i1.GeneratedColumn<String> get iCloudId =>
-      columnsByName['i_cloud_id']! as i1.GeneratedColumn<String>;
-}
-
-i1.GeneratedColumn<String> _column_95(String aliasedName) =>
-    i1.GeneratedColumn<String>(
-      'i_cloud_id',
-      aliasedName,
-      true,
-      type: i1.DriftSqlType.string,
-    );
-
-class Shape23 extends i0.VersionedTable {
-  Shape23({required super.source, required super.alias}) : super.aliased();
-  i1.GeneratedColumn<String> get assetId =>
-      columnsByName['asset_id']! as i1.GeneratedColumn<String>;
-  i1.GeneratedColumn<String> get cloudId =>
-      columnsByName['cloud_id']! as i1.GeneratedColumn<String>;
-}
-
-i1.GeneratedColumn<String> _column_96(String aliasedName) =>
-    i1.GeneratedColumn<String>(
-      'cloud_id',
-      aliasedName,
-      true,
-      type: i1.DriftSqlType.string,
-      defaultConstraints: i1.GeneratedColumn.constraintIsAlways('UNIQUE'),
-    );
 i0.MigrationStepWithVersion migrationSteps({
  required Future<void> Function(i1.Migrator m, Schema2 schema) from1To2,
  required Future<void> Function(i1.Migrator m, Schema3 schema) from2To3,
@@ -4729,7 +4280,6 @@ i0.MigrationStepWithVersion migrationSteps({
  required Future<void> Function(i1.Migrator m, Schema8 schema) from7To8,
  required Future<void> Function(i1.Migrator m, Schema9 schema) from8To9,
  required Future<void> Function(i1.Migrator m, Schema10 schema) from9To10,
-  required Future<void> Function(i1.Migrator m, Schema11 schema) from10To11,
 }) {
  return (currentVersion, database) async {
    switch (currentVersion) {
@@ -4778,11 +4328,6 @@ i0.MigrationStepWithVersion migrationSteps({
        final migrator = i1.Migrator(database, schema);
        await from9To10(migrator, schema);
        return 10;
-      case 10:
-        final schema = Schema11(database: database);
-        final migrator = i1.Migrator(database, schema);
-        await from10To11(migrator, schema);
-        return 11;
      default:
        throw ArgumentError.value('Unknown migration from $currentVersion');
    }
@@ -4799,7 +4344,6 @@ i1.OnUpgrade stepByStep({
  required Future<void> Function(i1.Migrator m, Schema8 schema) from7To8,
  required Future<void> Function(i1.Migrator m, Schema9 schema) from8To9,
  required Future<void> Function(i1.Migrator m, Schema10 schema) from9To10,
-  required Future<void> Function(i1.Migrator m, Schema11 schema) from10To11,
 }) => i0.VersionedSchema.stepByStepHelper(
  step: migrationSteps(
    from1To2: from1To2,
@@ -4811,6 +4355,5 @@ i1.OnUpgrade stepByStep({
    from7To8: from7To8,
    from8To9: from8To9,
    from9To10: from9To10,
-    from10To11: from10To11,
  ),
 );
--- a/mobile/lib/infrastructure/repositories/local_album.repository.dart
+++ b/mobile/lib/infrastructure/repositories/local_album.repository.dart
@@ -231,25 +231,6 @@ class DriftLocalAlbumRepository extends DriftDatabaseRepository {
    return query.map((row) => row.readTable(_db.localAssetEntity).toDto()).get();
  }

-  Future<void> updateCloudMapping(Map<String, String?> cloudMapping) {
-    if (cloudMapping.isEmpty) {
-      return Future.value();
-    }
-
-    return _db.batch((batch) {
-      for (final entry in cloudMapping.entries) {
-        final assetId = entry.key;
-        final cloudId = entry.value;
-
-        batch.update(
-          _db.localAssetEntity,
-          LocalAssetEntityCompanion(iCloudId: Value(cloudId)),
-          where: (f) => f.id.equals(assetId),
-        );
-      }
-    });
-  }
-
  Future<void> _upsertAssets(Iterable<LocalAsset> localAssets) {
    if (localAssets.isEmpty) {
      return Future.value();
--- a/mobile/lib/infrastructure/repositories/local_asset.repository.dart
+++ b/mobile/lib/infrastructure/repositories/local_asset.repository.dart
@@ -5,8 +5,6 @@ import 'package:immich_mobile/infrastructure/entities/local_asset.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/local_asset.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';

-typedef LocalAssetHashMapping = ({String assetId, String checksum});
-
 class DriftLocalAssetRepository extends DriftDatabaseRepository {
  final Drift _db;
  const DriftLocalAssetRepository(this._db) : super(_db);
@@ -30,17 +28,17 @@ class DriftLocalAssetRepository extends DriftDatabaseRepository {

  Stream<LocalAsset?> watch(String id) => _assetSelectable(id).watchSingleOrNull();

-  Future<void> updateHashes(Iterable<LocalAssetHashMapping> hashes) {
+  Future<void> updateHashes(Iterable<LocalAsset> hashes) {
    if (hashes.isEmpty) {
      return Future.value();
    }

    return _db.batch((batch) async {
-      for (final mapping in hashes) {
+      for (final asset in hashes) {
        batch.update(
          _db.localAssetEntity,
-          LocalAssetEntityCompanion(checksum: Value(mapping.checksum)),
-          where: (e) => e.id.equals(mapping.assetId),
+          LocalAssetEntityCompanion(checksum: Value(asset.checksum)),
+          where: (e) => e.id.equals(asset.id),
        );
      }
    });
@@ -71,27 +69,4 @@ class DriftLocalAssetRepository extends DriftDatabaseRepository {
  Future<int> getHashedCount() {
    return _db.managers.localAssetEntity.filter((e) => e.checksum.isNull().not()).count();
  }
-
-  Future<List<LocalAssetHashMapping>> 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());
-    return query
-        .map(
-          (row) => (assetId: row.read(_db.localAssetEntity.id)!, checksum: row.read(_db.remoteAssetEntity.checksum)!),
-        )
-        .get();
-  }
 }
--- a/mobile/lib/infrastructure/repositories/sync_api.repository.dart
+++ b/mobile/lib/infrastructure/repositories/sync_api.repository.dart
@@ -42,7 +42,6 @@ class SyncApiRepository {
          SyncRequestType.usersV1,
          SyncRequestType.assetsV1,
          SyncRequestType.assetExifsV1,
-          SyncRequestType.assetMetadataV1,
          SyncRequestType.partnersV1,
          SyncRequestType.partnerAssetsV1,
          SyncRequestType.partnerAssetExifsV1,
@@ -143,8 +142,6 @@ const _kResponseMap = <SyncEntityType, Function(Object)>{
  SyncEntityType.assetV1: SyncAssetV1.fromJson,
  SyncEntityType.assetDeleteV1: SyncAssetDeleteV1.fromJson,
  SyncEntityType.assetExifV1: SyncAssetExifV1.fromJson,
-  SyncEntityType.assetMetadataV1: SyncAssetMetadataV1.fromJson,
-  SyncEntityType.assetMetadataDeleteV1: SyncAssetMetadataDeleteV1.fromJson,
  SyncEntityType.partnerAssetV1: SyncAssetV1.fromJson,
  SyncEntityType.partnerAssetBackfillV1: SyncAssetV1.fromJson,
  SyncEntityType.partnerAssetDeleteV1: SyncAssetDeleteV1.fromJson,
--- a/mobile/lib/infrastructure/repositories/sync_stream.repository.dart
+++ b/mobile/lib/infrastructure/repositories/sync_stream.repository.dart
@@ -18,7 +18,6 @@ import 'package:immich_mobile/infrastructure/entities/remote_album.entity.drift.
 import 'package:immich_mobile/infrastructure/entities/remote_album_asset.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/remote_album_user.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/stack.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/user.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/user_metadata.entity.drift.dart';
@@ -242,42 +241,6 @@ class SyncStreamRepository extends DriftDatabaseRepository {
    }
  }

-  Future<void> deleteAssetsMetadataV1(Iterable<SyncAssetMetadataDeleteV1> data) async {
-    try {
-      await _db.batch((batch) {
-        for (final metadata in data) {
-          if (metadata.key == AssetMetadataKey.mobileApp) {
-            batch.deleteWhere(_db.remoteAssetCloudIdEntity, (row) => row.assetId.equals(metadata.assetId));
-          }
-        }
-      });
-    } catch (error, stack) {
-      _logger.severe('Error: deleteAssetsMetadataV1', error, stack);
-      rethrow;
-    }
-  }
-
-  Future<void> updateAssetsMetadataV1(Iterable<SyncAssetMetadataV1> data) async {
-    try {
-      await _db.batch((batch) {
-        for (final metadata in data) {
-          if (metadata.key == AssetMetadataKey.mobileApp) {
-            final map = metadata.value as Map<String, Object?>;
-            final companion = RemoteAssetCloudIdEntityCompanion(cloudId: Value(map['iCloudId']?.toString()));
-            batch.insert(
-              _db.remoteAssetCloudIdEntity,
-              companion.copyWith(assetId: Value(metadata.assetId)),
-              onConflict: DoUpdate((_) => companion),
-            );
-          }
-        }
-      });
-    } catch (error, stack) {
-      _logger.severe('Error: updateAssetsMetadataV1', error, stack);
-      rethrow;
-    }
-  }
-
  Future<void> deleteAlbumsV1(Iterable<SyncAlbumDeleteV1> data) async {
    try {
      await _db.remoteAlbumEntity.deleteWhere((row) => row.id.isIn(data.map((e) => e.albumId)));
--- a/mobile/lib/infrastructure/repositories/timeline.repository.dart
+++ b/mobile/lib/infrastructure/repositories/timeline.repository.dart
@@ -87,7 +87,6 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
                  isFavorite: row.isFavorite,
                  durationInSeconds: row.durationInSeconds,
                  orientation: row.orientation,
-                  cloudId: row.iCloudId,
                ),
        )
        .get();
--- a/mobile/lib/platform/native_sync_api.g.dart
+++ b/mobile/lib/platform/native_sync_api.g.dart
@@ -495,32 +495,4 @@ class NativeSyncApi {
      return (pigeonVar_replyList[0] as List<Object?>?)!.cast<Uint8List?>();
    }
  }
-
-  Future<Map<String, String?>> getCloudIdForAssetIds(List<String> assetIds) async {
-    final String pigeonVar_channelName =
-        'dev.flutter.pigeon.immich_mobile.NativeSyncApi.getCloudIdForAssetIds$pigeonVar_messageChannelSuffix';
-    final BasicMessageChannel<Object?> pigeonVar_channel = BasicMessageChannel<Object?>(
-      pigeonVar_channelName,
-      pigeonChannelCodec,
-      binaryMessenger: pigeonVar_binaryMessenger,
-    );
-    final Future<Object?> pigeonVar_sendFuture = pigeonVar_channel.send(<Object?>[assetIds]);
-    final List<Object?>? pigeonVar_replyList = await pigeonVar_sendFuture as List<Object?>?;
-    if (pigeonVar_replyList == null) {
-      throw _createConnectionError(pigeonVar_channelName);
-    } else if (pigeonVar_replyList.length > 1) {
-      throw PlatformException(
-        code: pigeonVar_replyList[0]! as String,
-        message: pigeonVar_replyList[1] as String?,
-        details: pigeonVar_replyList[2],
-      );
-    } else if (pigeonVar_replyList[0] == null) {
-      throw PlatformException(
-        code: 'null-error',
-        message: 'Host platform returned null value for non-null return value.',
-      );
-    } else {
-      return (pigeonVar_replyList[0] as Map<Object?, Object?>?)!.cast<String, String?>();
-    }
-  }
 }
--- a/mobile/lib/providers/app_life_cycle.provider.dart
+++ b/mobile/lib/providers/app_life_cycle.provider.dart
@@ -161,6 +161,15 @@ class AppLifeCycleNotifier extends StateNotifier<AppLifeCycleEnum> {
        }
      }

+      // Check if app is still active before hashing
+      if (_shouldContinueOperation()) {
+        try {
+          await backgroundManager.hashAssets();
+        } catch (e, stackTrace) {
+          _log.warning("Failed hashAssets: $e", e, stackTrace);
+        }
+      }
+
      // Check if app is still active before remote sync
      if (_shouldContinueOperation()) {
        try {
@@ -178,15 +187,6 @@ class AppLifeCycleNotifier extends StateNotifier<AppLifeCycleEnum> {
        }
      }

-      // Check if app is still active before hashing
-      if (_shouldContinueOperation()) {
-        try {
-          await backgroundManager.hashAssets();
-        } catch (e, stackTrace) {
-          _log.warning("Failed hashAssets: $e", e, stackTrace);
-        }
-      }
-
      // Handle backup resume only if still active
      if (_shouldContinueOperation()) {
        final isEnableBackup = _ref.read(appSettingsServiceProvider).getSetting(AppSettingsEnum.enableBackup);
--- a/mobile/lib/providers/background_sync.provider.dart
+++ b/mobile/lib/providers/background_sync.provider.dart
@@ -15,9 +15,6 @@ final backgroundSyncProvider = Provider<BackgroundSyncManager>((ref) {
    onHashingStart: syncStatusNotifier.startHashJob,
    onHashingComplete: syncStatusNotifier.completeHashJob,
    onHashingError: syncStatusNotifier.errorHashJob,
-    onCloudIdSyncStart: syncStatusNotifier.startCloudIdSync,
-    onCloudIdSyncComplete: syncStatusNotifier.completeCloudIdSync,
-    onCloudIdSyncError: syncStatusNotifier.errorCloudIdSync,
  );
  ref.onDispose(manager.cancel);
  return manager;
--- a/mobile/lib/providers/sync_status.provider.dart
+++ b/mobile/lib/providers/sync_status.provider.dart
@@ -21,7 +21,6 @@ class SyncStatusState {
  final SyncStatus remoteSyncStatus;
  final SyncStatus localSyncStatus;
  final SyncStatus hashJobStatus;
-  final SyncStatus cloudIdSyncStatus;

  final String? errorMessage;

@@ -29,7 +28,6 @@ class SyncStatusState {
    this.remoteSyncStatus = SyncStatus.idle,
    this.localSyncStatus = SyncStatus.idle,
    this.hashJobStatus = SyncStatus.idle,
-    this.cloudIdSyncStatus = SyncStatus.idle,
    this.errorMessage,
  });

@@ -37,14 +35,12 @@ class SyncStatusState {
    SyncStatus? remoteSyncStatus,
    SyncStatus? localSyncStatus,
    SyncStatus? hashJobStatus,
-    SyncStatus? cloudIdSyncStatus,
    String? errorMessage,
  }) {
    return SyncStatusState(
      remoteSyncStatus: remoteSyncStatus ?? this.remoteSyncStatus,
      localSyncStatus: localSyncStatus ?? this.localSyncStatus,
      hashJobStatus: hashJobStatus ?? this.hashJobStatus,
-      cloudIdSyncStatus: cloudIdSyncStatus ?? this.cloudIdSyncStatus,
      errorMessage: errorMessage ?? this.errorMessage,
    );
  }
@@ -52,7 +48,6 @@ class SyncStatusState {
  bool get isRemoteSyncing => remoteSyncStatus == SyncStatus.syncing;
  bool get isLocalSyncing => localSyncStatus == SyncStatus.syncing;
  bool get isHashing => hashJobStatus == SyncStatus.syncing;
-  bool get isCloudIdSyncing => cloudIdSyncStatus == SyncStatus.syncing;

  @override
  bool operator ==(Object other) {
@@ -61,12 +56,11 @@ class SyncStatusState {
        other.remoteSyncStatus == remoteSyncStatus &&
        other.localSyncStatus == localSyncStatus &&
        other.hashJobStatus == hashJobStatus &&
-        other.cloudIdSyncStatus == cloudIdSyncStatus &&
        other.errorMessage == errorMessage;
  }

  @override
-  int get hashCode => Object.hash(remoteSyncStatus, localSyncStatus, hashJobStatus, cloudIdSyncStatus, errorMessage);
+  int get hashCode => Object.hash(remoteSyncStatus, localSyncStatus, hashJobStatus, errorMessage);
 }

 class SyncStatusNotifier extends Notifier<SyncStatusState> {
@@ -77,7 +71,6 @@ class SyncStatusNotifier extends Notifier<SyncStatusState> {
      remoteSyncStatus: SyncStatus.idle,
      localSyncStatus: SyncStatus.idle,
      hashJobStatus: SyncStatus.idle,
-      cloudIdSyncStatus: SyncStatus.idle,
    );
  }

@@ -116,18 +109,6 @@ class SyncStatusNotifier extends Notifier<SyncStatusState> {
  void startHashJob() => setHashJobStatus(SyncStatus.syncing);
  void completeHashJob() => setHashJobStatus(SyncStatus.success);
  void errorHashJob(String error) => setHashJobStatus(SyncStatus.error, error);
-
-  ///
-  /// Cloud ID Sync Job
-  ///
-
-  void setCloudIdSyncStatus(SyncStatus status, [String? errorMessage]) {
-    state = state.copyWith(cloudIdSyncStatus: status, errorMessage: status == SyncStatus.error ? errorMessage : null);
-  }
-
-  void startCloudIdSync() => setCloudIdSyncStatus(SyncStatus.syncing);
-  void completeCloudIdSync() => setCloudIdSyncStatus(SyncStatus.success);
-  void errorCloudIdSync(String error) => setCloudIdSyncStatus(SyncStatus.error, error);
 }

 final syncStatusProvider = NotifierProvider<SyncStatusNotifier, SyncStatusState>(SyncStatusNotifier.new);
--- a/mobile/lib/services/upload.service.dart
+++ b/mobile/lib/services/upload.service.dart
@@ -6,7 +6,6 @@ import 'package:background_downloader/background_downloader.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/constants/constants.dart';
-import 'package:immich_mobile/domain/models/asset/asset_metadata.model.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/domain/models/store.model.dart';
 import 'package:immich_mobile/entities/store.entity.dart';
@@ -292,7 +291,6 @@ class UploadService {
      priority: priority,
      isFavorite: asset.isFavorite,
      requiresWiFi: requiresWiFi,
-      cloudId: asset.cloudId,
    );
  }

@@ -322,7 +320,6 @@ class UploadService {
      priority: 0, // Highest priority to get upload immediately
      isFavorite: asset.isFavorite,
      requiresWiFi: requiresWiFi,
-      cloudId: asset.cloudId,
    );
  }

@@ -349,7 +346,6 @@ class UploadService {
    String? metadata,
    int? priority,
    bool? isFavorite,
-    String? cloudId,
    bool requiresWiFi = true,
  }) async {
    final serverEndpoint = Store.get(StoreKey.serverEndpoint);
@@ -365,12 +361,6 @@ class UploadService {
      'fileModifiedAt': modifiedAt.toUtc().toIso8601String(),
      'isFavorite': isFavorite?.toString() ?? 'false',
      'duration': '0',
-      'metadata': jsonEncode([
-        RemoteAssetMetadataItem(
-          key: RemoteAssetMetadataKey.mobileApp,
-          value: RemoteAssetMobileAppMetadata(cloudId: cloudId),
-        ),
-      ]),
      if (fields != null) ...fields,
    };

--- a/mobile/lib/utils/migration.dart
+++ b/mobile/lib/utils/migration.dart
@@ -29,6 +29,7 @@ import 'package:immich_mobile/providers/backup/backup.provider.dart';
 import 'package:immich_mobile/services/app_settings.service.dart';
 import 'package:immich_mobile/utils/diff.dart';
 import 'package:isar/isar.dart';
+import 'package:logging/logging.dart';
 // ignore: import_rule_photo_manager
 import 'package:photo_manager/photo_manager.dart';

@@ -265,16 +266,21 @@ class _DeviceAsset {
  const _DeviceAsset({required this.assetId, this.hash, this.dateTime});
 }

-Future<void> runNewSync(WidgetRef ref, {bool full = false}) {
+Future<List<void>> runNewSync(WidgetRef ref, {bool full = false}) {
  ref.read(backupProvider.notifier).cancelBackup();

  final backgroundManager = ref.read(backgroundSyncProvider);
  final isAlbumLinkedSyncEnable = ref.read(appSettingsServiceProvider).getSetting(AppSettingsEnum.syncAlbums);

-  return (backgroundManager.syncLocal(full: full), backgroundManager.syncRemote()).wait.whenComplete(() async {
-    await backgroundManager.hashAssets();
-    if (isAlbumLinkedSyncEnable) {
-      await backgroundManager.syncLinkedAlbum();
-    }
-  });
+  return Future.wait([
+    backgroundManager.syncLocal(full: full).then((_) {
+      Logger("runNewSync").fine("Hashing assets after syncLocal");
+      return backgroundManager.hashAssets();
+    }),
+    backgroundManager.syncRemote().then((_) {
+      if (isAlbumLinkedSyncEnable) {
+        return backgroundManager.syncLinkedAlbum();
+      }
+    }),
+  ]);
 }
--- a/mobile/lib/widgets/settings/beta_sync_settings/beta_sync_settings.dart
+++ b/mobile/lib/widgets/settings/beta_sync_settings/beta_sync_settings.dart
@@ -6,8 +6,8 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/providers/background_sync.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/album.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/asset.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/album.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/db.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/memory.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/storage.provider.dart';
@@ -301,17 +301,6 @@ class BetaSyncSettings extends HookConsumerWidget {
                  ref.read(backgroundSyncProvider).hashAssets();
                },
              ),
-              if (Platform.isIOS)
-                ListTile(
-                  title: Text(
-                    "sync_cloud_ids".t(context: context),
-                    style: const TextStyle(fontWeight: FontWeight.w500),
-                  ),
-                  leading: const Icon(Icons.keyboard_command_key_rounded),
-                  subtitle: Text("tap_to_run_job".t(context: context)),
-                  trailing: _SyncStatusIcon(status: ref.watch(syncStatusProvider).cloudIdSyncStatus),
-                  onTap: ref.read(backgroundSyncProvider).syncCloudIds,
-                ),
              const Divider(height: 1, indent: 16, endIndent: 16),
              const SizedBox(height: 24),
              _SectionHeaderText(text: "actions".t(context: context)),
@@ -358,7 +347,7 @@ class _SyncStatusIcon extends StatelessWidget {
  @override
  Widget build(BuildContext context) {
    return switch (status) {
-      SyncStatus.idle => const SizedBox.shrink(),
+      SyncStatus.idle => const Icon(Icons.pause_circle_outline_rounded),
      SyncStatus.syncing => const SizedBox(height: 24, width: 24, child: CircularProgressIndicator(strokeWidth: 2)),
      SyncStatus.success => const Icon(Icons.check_circle_outline, color: Colors.green),
      SyncStatus.error => Icon(Icons.error_outline, color: context.colorScheme.error),
--- a/mobile/pigeon/native_sync_api.dart
+++ b/mobile/pigeon/native_sync_api.dart
@@ -96,6 +96,4 @@ abstract class NativeSyncApi {

  @TaskQueue(type: TaskQueueType.serialBackgroundThread)
  List<Uint8List?> hashPaths(List<String> paths);
-
-  Map<String, String?> getCloudIdForAssetIds(List<String> assetIds);
 }
--- a/mobile/test/domain/services/hash_service_test.dart
+++ b/mobile/test/domain/services/hash_service_test.dart
@@ -3,9 +3,9 @@ import 'dart:io';
 import 'dart:typed_data';

 import 'package:flutter_test/flutter_test.dart';
+import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/domain/services/hash.service.dart';
 import 'package:immich_mobile/infrastructure/repositories/local_album.repository.dart';
-import 'package:immich_mobile/infrastructure/repositories/local_asset.repository.dart';
 import 'package:mocktail/mocktail.dart';

 import '../../fixtures/album.stub.dart';
@@ -39,7 +39,6 @@ void main() {
    registerFallbackValue(LocalAlbumStub.recent);
    registerFallbackValue(LocalAssetStub.image1);

-    when(() => mockAssetRepo.getHashMappingFromCloudId()).thenAnswer((_) async => []);
    when(() => mockAssetRepo.updateHashes(any())).thenAnswer((_) async => {});
    when(() => mockStorageRepo.clearCache()).thenAnswer((_) async => {});
  });
@@ -88,8 +87,7 @@ void main() {
      await sut.hashAssets();

      verify(() => mockNativeApi.hashPaths(['image-path'])).called(1);
-      final captured =
-          verify(() => mockAssetRepo.updateHashes(captureAny())).captured.first as List<LocalAssetHashMapping>;
+      final captured = verify(() => mockAssetRepo.updateHashes(captureAny())).captured.first as List<LocalAsset>;
      expect(captured.length, 1);
      expect(captured[0].checksum, base64.encode(hash));
    });
@@ -109,8 +107,7 @@ void main() {

      await sut.hashAssets();

-      final captured =
-          verify(() => mockAssetRepo.updateHashes(captureAny())).captured.first as List<LocalAssetHashMapping>;
+      final captured = verify(() => mockAssetRepo.updateHashes(captureAny())).captured.first as List<LocalAsset>;
      expect(captured.length, 0);
    });

@@ -131,8 +128,7 @@ void main() {

      await sut.hashAssets();

-      final captured =
-          verify(() => mockAssetRepo.updateHashes(captureAny())).captured.first as List<LocalAssetHashMapping>;
+      final captured = verify(() => mockAssetRepo.updateHashes(captureAny())).captured.first as List<LocalAsset>;
      expect(captured.length, 0);
    });

@@ -228,10 +224,9 @@ void main() {

      await sut.hashAssets();

-      final captured =
-          verify(() => mockAssetRepo.updateHashes(captureAny())).captured.first as List<LocalAssetHashMapping>;
+      final captured = verify(() => mockAssetRepo.updateHashes(captureAny())).captured.first as List<LocalAsset>;
      expect(captured.length, 1);
-      expect(captured.first.assetId, asset1.id);
+      expect(captured.first.id, asset1.id);
    });
  });
 }
--- a/mobile/test/drift/main/generated/schema.dart
+++ b/mobile/test/drift/main/generated/schema.dart
@@ -13,7 +13,6 @@ import 'schema_v7.dart' as v7;
 import 'schema_v8.dart' as v8;
 import 'schema_v9.dart' as v9;
 import 'schema_v10.dart' as v10;
-import 'schema_v11.dart' as v11;

 class GeneratedHelper implements SchemaInstantiationHelper {
  @override
@@ -39,12 +38,10 @@ class GeneratedHelper implements SchemaInstantiationHelper {
        return v9.DatabaseAtV9(db);
      case 10:
        return v10.DatabaseAtV10(db);
-      case 11:
-        return v11.DatabaseAtV11(db);
      default:
        throw MissingSchemaException(version, versions);
    }
  }

-  static const versions = const [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11];
+  static const versions = const [1, 2, 3, 4, 5, 6, 7, 8, 9, 10];
 }
--- a/mobile/test/drift/main/generated/schema_v11.dart
+++ b/mobile/test/drift/main/generated/schema_v11.dart
--- a/server/src/cores/storage.core.ts
+++ b/server/src/cores/storage.core.ts
@@ -43,7 +43,9 @@ export class StorageCore {
    private storageRepository: StorageRepository,
    private systemMetadataRepository: SystemMetadataRepository,
    private logger: LoggingRepository,
-  ) {}
+  ) {
+    this.logger.setContext(StorageCore.name);
+  }

  static create(
    assetRepository: AssetRepository,
--- a/web/src/lib/components/shared-components/date-picker.svelte
+++ b/web/src/lib/components/shared-components/date-picker.svelte
@@ -6,16 +6,17 @@
    onDateChange: (year?: number, month?: number, day?: number) => Promise<void>;
    onClearFilters?: () => void;
    defaultDate?: string;
+    startYear: number;
  }

-  let { onDateChange, onClearFilters, defaultDate }: Props = $props();
+  let { onDateChange, onClearFilters, defaultDate, startYear }: Props = $props();

  let selectedYear = $state<number | undefined>(undefined);
  let selectedMonth = $state<number | undefined>(undefined);
  let selectedDay = $state<number | undefined>(undefined);

  const currentYear = new Date().getFullYear();
-  const yearOptions = Array.from({ length: 30 }, (_, i) => currentYear - i);
+  let yearOptions = $derived(Array.from({ length: currentYear - startYear + 1 }, (_, i) => currentYear - i));

  const monthOptions = Array.from({ length: 12 }, (_, i) => ({
    value: i + 1,
--- a/web/src/routes/(user)/utilities/geolocation/+page.svelte
+++ b/web/src/routes/(user)/utilities/geolocation/+page.svelte
@@ -12,7 +12,7 @@
  import { setQueryValue } from '$lib/utils/navigation';
  import { buildDateString } from '$lib/utils/string-utils';
  import { toTimelineAsset } from '$lib/utils/timeline-util';
-  import { searchAssets, updateAssets, type AssetResponseDto } from '@immich/sdk';
+  import { AssetOrder, searchAssets, updateAssets, type AssetResponseDto } from '@immich/sdk';
  import { Button, LoadingSpinner, modalManager, Text } from '@immich/ui';
  import {
    mdiMapMarkerMultipleOutline,
@@ -32,6 +32,7 @@
  let partialDate = $state<string | null>(data.partialDate);
  let isLoading = $state(false);
  let assets = $state<AssetResponseDto[]>([]);
+  let startYear = $state(2000);
  let shiftKeyIsDown = $state(false);
  let assetInteraction = new AssetInteraction();
  let location = $state<{ latitude: number; longitude: number }>({ latitude: 0, longitude: 0 });
@@ -64,6 +65,25 @@
    }
  }

+  const getEarliestAsset = async () => {
+    const earliest = await searchAssets({
+      metadataSearchDto: {
+        withExif: true,
+        size: 1,
+        order: AssetOrder.Asc,
+      },
+    });
+
+    const asset = earliest.assets.items[0];
+    if (!asset) {
+      return;
+    }
+
+    startYear = new Date(asset.localDateTime).getFullYear();
+  };
+
+  void getEarliestAsset();
+
  const loadAssets = async () => {
    if (takenRange) {
      isLoading = true;
@@ -262,6 +282,7 @@
        onDateChange={handleDateChange}
        onClearFilters={handleClearFilters}
        defaultDate={partialDate || undefined}
+        {startYear}
      />
    </div>
Author	SHA1	Message	Date
Jason Rasmussen	3f82cd45d0	fix(web): geolocation utility start year	2025-09-09 13:39:26 -04:00
renovate[bot]	27bc8eba7b	chore(deps): update terraform cloudflare to v4.52.3 (#21701 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2025-09-09 10:18:26 +01:00
Sergey Katsubo	23fb2e0fae	chore(server): fix logger context in StorageCore (#21534 ) * Fix logging context in StorageCore * Revert "Fix logging context in StorageCore" This reverts commit `0aa540afd1`. * Fix logging context in StorageCore - one line change	2025-09-08 17:28:40 -04:00