chore: replace toast success with toast primary

.github/.nvmrc

@@ -1 +1 @@
-24.13.0
+24.12.0

cli/.nvmrc

@@ -1 +1 @@
-24.13.0
+24.12.0

cli/package.json

@@ -69,6 +69,6 @@
     "micromatch": "^4.0.8"
   },
   "volta": {
-    "node": "24.13.0"
+    "node": "24.12.0"
   }
 }

docker/docker-compose.prod.yml

@@ -85,7 +85,7 @@ services:
     container_name: immich_prometheus
     ports:
       - 9090:9090
-    image: prom/prometheus@sha256:1f0f50f06acaceb0f5670d2c8a658a599affe7b0d8e78b898c1035653849a702
+    image: prom/prometheus@sha256:2b6f734e372c1b4717008f7d0a0152316aedd4d13ae17ef1e3268dbfaf68041b
     volumes:
       - ./prometheus.yml:/etc/prometheus/prometheus.yml
       - prometheus-data:/prometheus

docs/.nvmrc

@@ -1 +1 @@
-24.13.0
+24.12.0

docs/docs/features/mobile-app.mdx

@@ -95,3 +95,11 @@ Enter the cloud on the top right -> cog wheel on the top right -> select the syn
 If you delete/move photos in the local album on your device, it will not be reflected in the album on the server **even if** you click Sync albums
 It will only reflect files you add.
 :::
+
+If the same asset is in more than one album it will only sync to the first album it's in, after that it won't sync again even if the user clicks sync albums manually.
+To overcome this limitation, the files must be removed from the ignore list by
+App settings -> Advanced -> Duplicate Assets -> Clear
+
+:::info
+Cleaning duplicate assets from the list will cause all the previously uploaded duplicate files to be re-uploaded, the files will not actually be uploaded and will be rejected on the server side (due to duplication) but will be synchronized to the album and at the end will be added to the ignore list again at the end of the synchronization.
+:::

docs/docusaurus.config.js

@@ -26,12 +26,6 @@ const config = {
     locales: ['en'],
   },
 
-  // Mermaid diagrams
-  markdown: {
-    mermaid: true,
-  },
-  themes: ['@docusaurus/theme-mermaid'],
-
   plugins: [
     async function myPlugin(context, options) {
       return {

docs/package.json

@@ -20,7 +20,6 @@
     "@docusaurus/core": "~3.9.0",
     "@docusaurus/preset-classic": "~3.9.0",
     "@docusaurus/theme-common": "~3.9.0",
-    "@docusaurus/theme-mermaid": "~3.9.0",
     "@mdi/js": "^7.3.67",
     "@mdi/react": "^1.6.1",
     "@mdx-js/react": "^3.0.0",
@@ -58,6 +57,6 @@
     "node": ">=20"
   },
   "volta": {
-    "node": "24.13.0"
+    "node": "24.12.0"
   }
 }

docs/src/css/custom.css

@@ -8,19 +8,19 @@
 @tailwind utilities;
 
 @font-face {
-  font-family: 'GoogleSans';
-  src: url('/fonts/GoogleSans/GoogleSans.ttf') format('truetype-variations');
-  font-weight: 410 900;
+  font-family: 'Overpass';
+  src: url('/fonts/overpass/Overpass.ttf') format('truetype-variations');
+  font-weight: 1 999;
   font-style: normal;
   ascent-override: 106.25%;
   size-adjust: 106.25%;
 }
 
 @font-face {
-  font-family: 'GoogleSansCode';
-  src: url('/fonts/GoogleSansCode/GoogleSansCode.ttf') format('truetype-variations');
-  font-weight: 1 900;
-  font-style: monospace;
+  font-family: 'Overpass Mono';
+  src: url('/fonts/overpass/OverpassMono.ttf') format('truetype-variations');
+  font-weight: 1 999;
+  font-style: normal;
   ascent-override: 106.25%;
   size-adjust: 106.25%;
 }
@@ -37,8 +37,7 @@ img {
 
 /* You can override the default Infima variables here. */
 :root {
-  font-family: 'GoogleSans', sans-serif;
-  letter-spacing: 0.1px;
+  font-family: 'Overpass', sans-serif;
   --ifm-color-primary: #4250af;
   --ifm-color-primary-dark: #4250af;
   --ifm-color-primary-darker: #4250af;
@@ -49,16 +48,6 @@ img {
   --docusaurus-highlighted-code-line-bg: rgba(0, 0, 0, 0.1);
 }
 
-h1,
-h2,
-h3,
-h4,
-h5,
-h6 {
-  font-family: 'GoogleSans', sans-serif;
-  letter-spacing: 0.1px;
-}
-
 /* For readability concerns, you should choose a lighter palette in dark mode. */
 [data-theme='dark'] {
   --ifm-color-primary: #adcbfa;
@@ -82,22 +71,15 @@ div[class^='announcementBar_'] {
   padding: 10px 10px 10px 16px;
   border-radius: 24px;
   margin-right: 16px;
-  font-weight: 500;
 }
 
 .menu__list-item-collapsible {
   margin-right: 16px;
   border-radius: 24px;
-  font-weight: 500;
 }
 
 .menu__link--active {
-  font-weight: 600;
-}
-
-.table-of-contents__link {
-  font-size: 14px;
-  font-weight: 450;
+  font-weight: 500;
 }
 
 /* workaround for version switcher PR 15894 */
@@ -106,14 +88,13 @@ div[class*='navbar__items'] > li:has(a[class*='version-switcher-34ab39']) {
 }
 
 code {
-  font-weight: 500;
-  font-family: 'GoogleSansCode';
+  font-weight: 600;
 }
 
 .buy-button {
   padding: 8px 14px;
   border: 1px solid transparent;
-  font-family: 'GoogleSans', sans-serif;
+  font-family: 'Overpass', sans-serif;
   font-weight: 500;
   cursor: pointer;
   box-shadow: 0 0 5px 2px rgba(181, 206, 254, 0.4);

e2e/.nvmrc

@@ -1 +1 @@
-24.13.0
+24.12.0

e2e/package.json

@@ -52,6 +52,6 @@
     "vitest": "^3.0.0"
   },
   "volta": {
-    "node": "24.13.0"
+    "node": "24.12.0"
   }
 }

e2e/src/web/specs/asset-viewer/asset-viewer.parallel-e2e-spec.ts

@@ -1,5 +1,5 @@
 import { faker } from '@faker-js/faker';
-import { expect, test } from '@playwright/test';
+import { test } from '@playwright/test';
 import {
   Changes,
   createDefaultTimelineConfig,
@@ -58,120 +58,6 @@ test.describe('asset-viewer', () => {
   });
 
   test.describe('/photos/:id', () => {
-    test('Navigate to next asset via button', async ({ page }) => {
-      const asset = selectRandom(assets, rng);
-      const index = assets.indexOf(asset);
-      await page.goto(`/photos/${asset.id}`);
-      await assetViewerUtils.waitForViewerLoad(page, asset);
-      await expect.poll(() => new URL(page.url()).pathname).toBe(`/photos/${asset.id}`);
-
-      await page.getByLabel('View next asset').click();
-      await assetViewerUtils.waitForViewerLoad(page, assets[index + 1]);
-      await expect.poll(() => new URL(page.url()).pathname).toBe(`/photos/${assets[index + 1].id}`);
-    });
-
-    test('Navigate to previous asset via button', async ({ page }) => {
-      const asset = selectRandom(assets, rng);
-      const index = assets.indexOf(asset);
-      await page.goto(`/photos/${asset.id}`);
-      await assetViewerUtils.waitForViewerLoad(page, asset);
-      await expect.poll(() => new URL(page.url()).pathname).toBe(`/photos/${asset.id}`);
-
-      await page.getByLabel('View previous asset').click();
-      await assetViewerUtils.waitForViewerLoad(page, assets[index - 1]);
-      await expect.poll(() => new URL(page.url()).pathname).toBe(`/photos/${assets[index - 1].id}`);
-    });
-
-    test('Navigate to next asset via keyboard (ArrowRight)', async ({ page }) => {
-      const asset = selectRandom(assets, rng);
-      const index = assets.indexOf(asset);
-      await page.goto(`/photos/${asset.id}`);
-      await assetViewerUtils.waitForViewerLoad(page, asset);
-      await expect.poll(() => new URL(page.url()).pathname).toBe(`/photos/${asset.id}`);
-
-      await page.keyboard.press('ArrowRight');
-      await assetViewerUtils.waitForViewerLoad(page, assets[index + 1]);
-      await expect.poll(() => new URL(page.url()).pathname).toBe(`/photos/${assets[index + 1].id}`);
-    });
-
-    test('Navigate to previous asset via keyboard (ArrowLeft)', async ({ page }) => {
-      const asset = selectRandom(assets, rng);
-      const index = assets.indexOf(asset);
-      await page.goto(`/photos/${asset.id}`);
-      await assetViewerUtils.waitForViewerLoad(page, asset);
-      await expect.poll(() => new URL(page.url()).pathname).toBe(`/photos/${asset.id}`);
-
-      await page.keyboard.press('ArrowLeft');
-      await assetViewerUtils.waitForViewerLoad(page, assets[index - 1]);
-      await expect.poll(() => new URL(page.url()).pathname).toBe(`/photos/${assets[index - 1].id}`);
-    });
-
-    test('Navigate forward 5 times via button', async ({ page }) => {
-      const asset = selectRandom(assets, rng);
-      const index = assets.indexOf(asset);
-      await page.goto(`/photos/${asset.id}`);
-      await assetViewerUtils.waitForViewerLoad(page, asset);
-
-      for (let i = 1; i <= 5; i++) {
-        await page.getByLabel('View next asset').click();
-        await assetViewerUtils.waitForViewerLoad(page, assets[index + i]);
-        await expect.poll(() => new URL(page.url()).pathname).toBe(`/photos/${assets[index + i].id}`);
-      }
-    });
-
-    test('Navigate backward 5 times via button', async ({ page }) => {
-      const asset = selectRandom(assets, rng);
-      const index = assets.indexOf(asset);
-      await page.goto(`/photos/${asset.id}`);
-      await assetViewerUtils.waitForViewerLoad(page, asset);
-
-      for (let i = 1; i <= 5; i++) {
-        await page.getByLabel('View previous asset').click();
-        await assetViewerUtils.waitForViewerLoad(page, assets[index - i]);
-        await expect.poll(() => new URL(page.url()).pathname).toBe(`/photos/${assets[index - i].id}`);
-      }
-    });
-
-    test('Navigate forward then backward via keyboard', async ({ page }) => {
-      const asset = selectRandom(assets, rng);
-      const index = assets.indexOf(asset);
-      await page.goto(`/photos/${asset.id}`);
-      await assetViewerUtils.waitForViewerLoad(page, asset);
-
-      // Navigate forward 3 times
-      for (let i = 1; i <= 3; i++) {
-        await page.keyboard.press('ArrowRight');
-        await assetViewerUtils.waitForViewerLoad(page, assets[index + i]);
-      }
-
-      // Navigate backward 3 times to return to original
-      for (let i = 2; i >= 0; i--) {
-        await page.keyboard.press('ArrowLeft');
-        await assetViewerUtils.waitForViewerLoad(page, assets[index + i]);
-      }
-
-      // Verify we're back at the original asset
-      await expect.poll(() => new URL(page.url()).pathname).toBe(`/photos/${asset.id}`);
-    });
-
-    test('Verify no next button on last asset', async ({ page }) => {
-      const lastAsset = assets.at(-1)!;
-      await page.goto(`/photos/${lastAsset.id}`);
-      await assetViewerUtils.waitForViewerLoad(page, lastAsset);
-
-      // Verify next button doesn't exist
-      await expect(page.getByLabel('View next asset')).toHaveCount(0);
-    });
-
-    test('Verify no previous button on first asset', async ({ page }) => {
-      const firstAsset = assets[0];
-      await page.goto(`/photos/${firstAsset.id}`);
-      await assetViewerUtils.waitForViewerLoad(page, firstAsset);
-
-      // Verify previous button doesn't exist
-      await expect(page.getByLabel('View previous asset')).toHaveCount(0);
-    });
-
     test('Delete photo advances to next', async ({ page }) => {
       const asset = selectRandom(assets, rng);
       await page.goto(`/photos/${asset.id}`);

e2e/src/web/specs/photo-viewer.e2e-spec.ts

@@ -3,7 +3,7 @@ import { Page, expect, test } from '@playwright/test';
 import { utils } from 'src/utils';
 
 function imageLocator(page: Page) {
-  return page.getByAltText('Image taken').locator('visible=true');
+  return page.getByAltText('Image taken on').locator('visible=true');
 }
 test.describe('Photo Viewer', () => {
   let admin: LoginResponseDto;

i18n/en.json

@@ -928,7 +928,6 @@
   "download_include_embedded_motion_videos": "Embedded videos",
   "download_include_embedded_motion_videos_description": "Include videos embedded in motion photos as a separate file",
   "download_notfound": "Download not found",
-  "download_original": "Download original",
   "download_paused": "Download paused",
   "download_settings": "Download",
   "download_settings_description": "Manage settings related to asset download",
@@ -938,7 +937,6 @@
   "download_waiting_to_retry": "Waiting to retry",
   "downloading": "Downloading",
   "downloading_asset_filename": "Downloading asset {filename}",
-  "downloading_from_icloud": "Downloading from iCloud",
   "downloading_media": "Downloading media",
   "drop_files_to_upload": "Drop files anywhere to upload",
   "duplicates": "Duplicates",
@@ -1124,7 +1122,6 @@
     "unable_to_update_workflow": "Unable to update workflow",
     "unable_to_upload_file": "Unable to upload file"
   },
-  "errors_text": "Errors",
   "exclusion_pattern": "Exclusion pattern",
   "exif": "Exif",
   "exif_bottom_sheet_description": "Add Description...",
@@ -2239,6 +2236,7 @@
   "updated_at": "Updated",
   "updated_password": "Updated password",
   "upload": "Upload",
+  "upload_action_prompt": "{count} queued for upload",
   "upload_concurrency": "Upload concurrency",
   "upload_details": "Upload Details",
   "upload_dialog_info": "Do you want to backup the selected Asset(s) to the server?",

machine-learning/Dockerfile

@@ -92,14 +92,14 @@ FROM python:3.13-slim-trixie@sha256:0222b795db95bf7412cede36ab46a266cfb31f632e64
 
 RUN apt-get update && \
     apt-get install --no-install-recommends -yqq ocl-icd-libopencl1 wget && \
-    wget -nv https://github.com/intel/intel-graphics-compiler/releases/download/v2.27.10/intel-igc-core-2_2.27.10+20617_amd64.deb && \
-    wget -nv https://github.com/intel/intel-graphics-compiler/releases/download/v2.27.10/intel-igc-opencl-2_2.27.10+20617_amd64.deb && \
-    wget -nv https://github.com/intel/compute-runtime/releases/download/26.01.36711.4/intel-opencl-icd_26.01.36711.4-0_amd64.deb &&  \
+    wget -nv https://github.com/intel/intel-graphics-compiler/releases/download/v2.24.8/intel-igc-core-2_2.24.8+20344_amd64.deb && \
+    wget -nv https://github.com/intel/intel-graphics-compiler/releases/download/v2.24.8/intel-igc-opencl-2_2.24.8+20344_amd64.deb && \
+    wget -nv https://github.com/intel/compute-runtime/releases/download/25.48.36300.8/intel-opencl-icd_25.48.36300.8-0_amd64.deb &&  \
     wget -nv https://github.com/intel/intel-graphics-compiler/releases/download/igc-1.0.17537.24/intel-igc-core_1.0.17537.24_amd64.deb && \
     wget -nv https://github.com/intel/intel-graphics-compiler/releases/download/igc-1.0.17537.24/intel-igc-opencl_1.0.17537.24_amd64.deb && \
     wget -nv https://github.com/intel/compute-runtime/releases/download/24.35.30872.36/intel-opencl-icd-legacy1_24.35.30872.36_amd64.deb && \
     # TODO: Figure out how to get renovate to manage this differently versioned libigdgmm file
-    wget -nv https://github.com/intel/compute-runtime/releases/download/26.01.36711.4/libigdgmm12_22.9.0_amd64.deb && \
+    wget -nv https://github.com/intel/compute-runtime/releases/download/25.48.36300.8/libigdgmm12_22.8.2_amd64.deb && \
     dpkg -i *.deb && \
     rm *.deb && \
     apt-get remove wget -yqq && \

mise.toml

@@ -1,7 +1,7 @@
 experimental_monorepo_root = true
 
 [tools]
-node = "24.13.0"
+node = "24.12.0"
 flutter = "3.35.7"
 pnpm = "10.27.0"
 terragrunt = "0.93.10"

mobile/android/app/CMakeLists.txt

@@ -8,5 +8,3 @@ project(native_buffer LANGUAGES C)
 add_library(native_buffer SHARED
     src/main/cpp/native_buffer.c
 )
-
-target_link_libraries(native_buffer jnigraphics)

mobile/android/app/build.gradle

@@ -31,7 +31,7 @@ if (keystorePropertiesFile.exists()) {
 
 android {
   compileSdkVersion 35
-  ndkVersion = "28.2.13676358"
+  ndkVersion = "28.1.13356709"
 
   compileOptions {
     sourceCompatibility JavaVersion.VERSION_17
@@ -48,7 +48,6 @@ android {
   }
 
   buildFeatures {
-    buildConfig true
     compose true
   }
 
@@ -106,11 +105,8 @@ dependencies {
   def serialization_version = '1.8.1'
   def compose_version = '1.1.1'
   def gson_version = '2.10.1'
-  def okhttp_version = '4.12.0'
 
   implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
-  implementation "com.squareup.okhttp3:okhttp:$okhttp_version"
-  implementation 'org.chromium.net:cronet-embedded:143.7445.0'
   implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlin_coroutines_version"
   implementation "androidx.work:work-runtime-ktx:$work_version"
   implementation "androidx.concurrent:concurrent-futures:$concurrent_version"

mobile/android/app/src/main/cpp/native_buffer.c

@@ -1,38 +1,40 @@
 #include <jni.h>
 #include <stdlib.h>
-#include <string.h>
 
 JNIEXPORT jlong JNICALL
-Java_app_alextran_immich_NativeBuffer_allocate(
+Java_app_alextran_immich_images_ThumbnailsImpl_00024Companion_allocateNative(
+        JNIEnv *env, jclass clazz, jint size) {
+    void *ptr = malloc(size);
+    return (jlong) ptr;
+}
+
+JNIEXPORT jlong JNICALL
+Java_app_alextran_immich_images_ThumbnailsImpl_allocateNative(
         JNIEnv *env, jclass clazz, jint size) {
     void *ptr = malloc(size);
     return (jlong) ptr;
 }
 
 JNIEXPORT void JNICALL
-Java_app_alextran_immich_NativeBuffer_free(
+Java_app_alextran_immich_images_ThumbnailsImpl_00024Companion_freeNative(
         JNIEnv *env, jclass clazz, jlong address) {
     free((void *) address);
 }
 
-JNIEXPORT jlong JNICALL
-Java_app_alextran_immich_NativeBuffer_realloc(
-        JNIEnv *env, jclass clazz, jlong address, jint size) {
-    void *ptr = realloc((void *) address, size);
-    return (jlong) ptr;
+JNIEXPORT void JNICALL
+Java_app_alextran_immich_images_ThumbnailsImpl_freeNative(
+        JNIEnv *env, jclass clazz, jlong address) {
+    free((void *) address);
 }
 
 JNIEXPORT jobject JNICALL
-Java_app_alextran_immich_NativeBuffer_wrap(
+Java_app_alextran_immich_images_ThumbnailsImpl_00024Companion_wrapAsBuffer(
         JNIEnv *env, jclass clazz, jlong address, jint capacity) {
     return (*env)->NewDirectByteBuffer(env, (void *) address, capacity);
 }
 
-JNIEXPORT void JNICALL
-Java_app_alextran_immich_NativeBuffer_copy(
-        JNIEnv *env, jclass clazz, jobject buffer, jlong destAddress, jint offset, jint length) {
-    void *src = (*env)->GetDirectBufferAddress(env, buffer);
-    if (src != NULL) {
-        memcpy((void *) destAddress, (char *) src + offset, length);
-    }
+JNIEXPORT jobject JNICALL
+Java_app_alextran_immich_images_ThumbnailsImpl_wrapAsBuffer(
+        JNIEnv *env, jclass clazz, jlong address, jint capacity) {
+    return (*env)->NewDirectByteBuffer(env, (void *) address, capacity);
 }

mobile/android/app/src/main/kotlin/app/alextran/immich/HttpSSLOptionsPlugin.kt

@@ -2,7 +2,6 @@ package app.alextran.immich
 
 import android.annotation.SuppressLint
 import android.content.Context
-import app.alextran.immich.core.SSLConfig
 import io.flutter.embedding.engine.plugins.FlutterPlugin
 import io.flutter.plugin.common.BinaryMessenger
 import io.flutter.plugin.common.MethodCall
@@ -52,18 +51,15 @@ class HttpSSLOptionsPlugin : FlutterPlugin, MethodChannel.MethodCallHandler {
       when (call.method) {
         "apply" -> {
           val args = call.arguments<ArrayList<*>>()!!
-          val allowSelfSigned = args[0] as Boolean
-          val serverHost = args[1] as? String
-          val clientCertHash = (args[2] as? ByteArray)
 
           var tm: Array<TrustManager>? = null
-          if (allowSelfSigned) {
-            tm = arrayOf(AllowSelfSignedTrustManager(serverHost))
+          if (args[0] as Boolean) {
+            tm = arrayOf(AllowSelfSignedTrustManager(args[1] as? String))
           }
 
           var km: Array<KeyManager>? = null
-          if (clientCertHash != null) {
-            val cert = ByteArrayInputStream(clientCertHash)
+          if (args[2] != null) {
+            val cert = ByteArrayInputStream(args[2] as ByteArray)
             val password = (args[3] as String).toCharArray()
             val keyStore = KeyStore.getInstance("PKCS12")
             keyStore.load(cert, password)
@@ -73,9 +69,6 @@ class HttpSSLOptionsPlugin : FlutterPlugin, MethodChannel.MethodCallHandler {
             km = keyManagerFactory.keyManagers
           }
 
-          // Update shared SSL config for OkHttp and other HTTP clients
-          SSLConfig.apply(km, tm, allowSelfSigned, serverHost, clientCertHash?.contentHashCode() ?: 0)
-
           val sslContext = SSLContext.getInstance("TLS")
           sslContext.init(km, tm, null)
           HttpsURLConnection.setDefaultSSLSocketFactory(sslContext.socketFactory)

mobile/android/app/src/main/kotlin/app/alextran/immich/MainActivity.kt

@@ -10,10 +10,8 @@ import app.alextran.immich.background.BackgroundWorkerLockApi
 import app.alextran.immich.connectivity.ConnectivityApi
 import app.alextran.immich.connectivity.ConnectivityApiImpl
 import app.alextran.immich.core.ImmichPlugin
-import app.alextran.immich.images.LocalImageApi
-import app.alextran.immich.images.LocalImagesImpl
-import app.alextran.immich.images.RemoteImageApi
-import app.alextran.immich.images.RemoteImagesImpl
+import app.alextran.immich.images.ThumbnailApi
+import app.alextran.immich.images.ThumbnailsImpl
 import app.alextran.immich.sync.NativeSyncApi
 import app.alextran.immich.sync.NativeSyncApiImpl26
 import app.alextran.immich.sync.NativeSyncApiImpl30
@@ -38,9 +36,7 @@ class MainActivity : FlutterFragmentActivity() {
           NativeSyncApiImpl30(ctx)
         }
       NativeSyncApi.setUp(messenger, nativeSyncApiImpl)
-      LocalImageApi.setUp(messenger, LocalImagesImpl(ctx))
-      RemoteImageApi.setUp(messenger, RemoteImagesImpl(ctx))
-
+      ThumbnailApi.setUp(messenger, ThumbnailsImpl(ctx))
       BackgroundWorkerFgHostApi.setUp(messenger, BackgroundWorkerApiImpl(ctx))
       ConnectivityApi.setUp(messenger, ConnectivityApiImpl(ctx))
 

mobile/android/app/src/main/kotlin/app/alextran/immich/NativeBuffer.kt

@@ -1,52 +0,0 @@
-package app.alextran.immich
-
-import java.nio.ByteBuffer
-
-const val INITIAL_BUFFER_SIZE = 32 * 1024
-
-object NativeBuffer {
-  init {
-    System.loadLibrary("native_buffer")
-  }
-
-  @JvmStatic
-  external fun allocate(size: Int): Long
-
-  @JvmStatic
-  external fun free(address: Long)
-
-  @JvmStatic
-  external fun realloc(address: Long, size: Int): Long
-
-  @JvmStatic
-  external fun wrap(address: Long, capacity: Int): ByteBuffer
-
-  @JvmStatic
-  external fun copy(buffer: ByteBuffer, destAddress: Long, offset: Int, length: Int)
-}
-
-class NativeByteBuffer(initialCapacity: Int) {
-  var pointer = NativeBuffer.allocate(initialCapacity)
-  var capacity = initialCapacity
-  var offset = 0
-
-  inline fun ensureHeadroom() {
-    if (offset == capacity) {
-      capacity *= 2
-      pointer = NativeBuffer.realloc(pointer, capacity)
-    }
-  }
-
-  inline fun wrapRemaining() = NativeBuffer.wrap(pointer + offset, capacity - offset)
-
-  inline fun advance(bytesRead: Int) {
-    offset += bytesRead
-  }
-
-  inline fun free() {
-    if (pointer != 0L) {
-      NativeBuffer.free(pointer)
-      pointer = 0L
-    }
-  }
-}

mobile/android/app/src/main/kotlin/app/alextran/immich/core/SSLConfig.kt

@@ -1,73 +0,0 @@
-package app.alextran.immich.core
-
-import java.security.KeyStore
-import javax.net.ssl.KeyManager
-import javax.net.ssl.SSLContext
-import javax.net.ssl.SSLSocketFactory
-import javax.net.ssl.TrustManager
-import javax.net.ssl.TrustManagerFactory
-import javax.net.ssl.X509TrustManager
-
-/**
- * Shared SSL configuration for OkHttp and HttpsURLConnection.
- * Stores the SSLSocketFactory and X509TrustManager configured by HttpSSLOptionsPlugin.
- */
-object SSLConfig {
-  var sslSocketFactory: SSLSocketFactory? = null
-    private set
-
-  var trustManager: X509TrustManager? = null
-    private set
-
-  var requiresCustomSSL: Boolean = false
-    private set
-
-  private val listeners = mutableListOf<() -> Unit>()
-  private var configHash: Int = 0
-
-  fun addListener(listener: () -> Unit) {
-    listeners.add(listener)
-  }
-
-  fun apply(
-    keyManagers: Array<KeyManager>?,
-    trustManagers: Array<TrustManager>?,
-    allowSelfSigned: Boolean,
-    serverHost: String?,
-    clientCertHash: Int
-  ) {
-    synchronized(this) {
-      val newHash = computeHash(allowSelfSigned, serverHost, clientCertHash)
-      val newRequiresCustomSSL = allowSelfSigned || keyManagers != null
-      if (newHash == configHash && sslSocketFactory != null && requiresCustomSSL == newRequiresCustomSSL) {
-        return  // Config unchanged, skip
-      }
-
-      val sslContext = SSLContext.getInstance("TLS")
-      sslContext.init(keyManagers, trustManagers, null)
-      sslSocketFactory = sslContext.socketFactory
-      trustManager = trustManagers?.filterIsInstance<X509TrustManager>()?.firstOrNull()
-        ?: getDefaultTrustManager()
-      requiresCustomSSL = newRequiresCustomSSL
-      configHash = newHash
-      notifyListeners()
-    }
-  }
-
-  private fun computeHash(allowSelfSigned: Boolean, serverHost: String?, clientCertHash: Int): Int {
-    var result = allowSelfSigned.hashCode()
-    result = 31 * result + (serverHost?.hashCode() ?: 0)
-    result = 31 * result + clientCertHash
-    return result
-  }
-
-  private fun notifyListeners() {
-    listeners.forEach { it() }
-  }
-
-  private fun getDefaultTrustManager(): X509TrustManager {
-    val factory = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm())
-    factory.init(null as KeyStore?)
-    return factory.trustManagers.filterIsInstance<X509TrustManager>().first()
-  }
-}

mobile/android/app/src/main/kotlin/app/alextran/immich/images/RemoteImages.g.kt

@@ -1,104 +0,0 @@
-// Autogenerated from Pigeon (v26.0.2), do not edit directly.
-// See also: https://pub.dev/packages/pigeon
-@file:Suppress("UNCHECKED_CAST", "ArrayInDataClass")
-
-package app.alextran.immich.images
-
-import android.util.Log
-import io.flutter.plugin.common.BasicMessageChannel
-import io.flutter.plugin.common.BinaryMessenger
-import io.flutter.plugin.common.EventChannel
-import io.flutter.plugin.common.MessageCodec
-import io.flutter.plugin.common.StandardMethodCodec
-import io.flutter.plugin.common.StandardMessageCodec
-import java.io.ByteArrayOutputStream
-import java.nio.ByteBuffer
-private object RemoteImagesPigeonUtils {
-
-  fun wrapResult(result: Any?): List<Any?> {
-    return listOf(result)
-  }
-
-  fun wrapError(exception: Throwable): List<Any?> {
-    return if (exception is FlutterError) {
-      listOf(
-        exception.code,
-        exception.message,
-        exception.details
-      )
-    } else {
-      listOf(
-        exception.javaClass.simpleName,
-        exception.toString(),
-        "Cause: " + exception.cause + ", Stacktrace: " + Log.getStackTraceString(exception)
-      )
-    }
-  }
-}
-private open class RemoteImagesPigeonCodec : StandardMessageCodec() {
-  override fun readValueOfType(type: Byte, buffer: ByteBuffer): Any? {
-    return     super.readValueOfType(type, buffer)
-  }
-  override fun writeValue(stream: ByteArrayOutputStream, value: Any?)   {
-    super.writeValue(stream, value)
-  }
-}
-
-
-/** Generated interface from Pigeon that represents a handler of messages from Flutter. */
-interface RemoteImageApi {
-  fun requestImage(url: String, headers: Map<String, String>, requestId: Long, callback: (Result<Map<String, Long>?>) -> Unit)
-  fun cancelRequest(requestId: Long)
-
-  companion object {
-    /** The codec used by RemoteImageApi. */
-    val codec: MessageCodec<Any?> by lazy {
-      RemoteImagesPigeonCodec()
-    }
-    /** Sets up an instance of `RemoteImageApi` to handle messages through the `binaryMessenger`. */
-    @JvmOverloads
-    fun setUp(binaryMessenger: BinaryMessenger, api: RemoteImageApi?, messageChannelSuffix: String = "") {
-      val separatedMessageChannelSuffix = if (messageChannelSuffix.isNotEmpty()) ".$messageChannelSuffix" else ""
-      run {
-        val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.immich_mobile.RemoteImageApi.requestImage$separatedMessageChannelSuffix", codec)
-        if (api != null) {
-          channel.setMessageHandler { message, reply ->
-            val args = message as List<Any?>
-            val urlArg = args[0] as String
-            val headersArg = args[1] as Map<String, String>
-            val requestIdArg = args[2] as Long
-            api.requestImage(urlArg, headersArg, requestIdArg) { result: Result<Map<String, Long>?> ->
-              val error = result.exceptionOrNull()
-              if (error != null) {
-                reply.reply(RemoteImagesPigeonUtils.wrapError(error))
-              } else {
-                val data = result.getOrNull()
-                reply.reply(RemoteImagesPigeonUtils.wrapResult(data))
-              }
-            }
-          }
-        } else {
-          channel.setMessageHandler(null)
-        }
-      }
-      run {
-        val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.immich_mobile.RemoteImageApi.cancelRequest$separatedMessageChannelSuffix", codec)
-        if (api != null) {
-          channel.setMessageHandler { message, reply ->
-            val args = message as List<Any?>
-            val requestIdArg = args[0] as Long
-            val wrapped: List<Any?> = try {
-              api.cancelRequest(requestIdArg)
-              listOf(null)
-            } catch (exception: Throwable) {
-              RemoteImagesPigeonUtils.wrapError(exception)
-            }
-            reply.reply(wrapped)
-          }
-        } else {
-          channel.setMessageHandler(null)
-        }
-      }
-    }
-  }
-}

mobile/android/app/src/main/kotlin/app/alextran/immich/images/RemoteImagesImpl.kt

@@ -1,432 +0,0 @@
-package app.alextran.immich.images
-
-import android.content.Context
-import android.os.CancellationSignal
-import android.os.OperationCanceledException
-import app.alextran.immich.BuildConfig
-import app.alextran.immich.INITIAL_BUFFER_SIZE
-import app.alextran.immich.NativeBuffer
-import app.alextran.immich.NativeByteBuffer
-import app.alextran.immich.core.SSLConfig
-import okhttp3.Cache
-import okhttp3.Call
-import okhttp3.Callback
-import okhttp3.ConnectionPool
-import okhttp3.Dispatcher
-import okhttp3.OkHttpClient
-import okhttp3.Request
-import okhttp3.Response
-import org.chromium.net.CronetEngine
-import org.chromium.net.CronetException
-import org.chromium.net.UrlRequest
-import org.chromium.net.UrlResponseInfo
-import java.io.EOFException
-import java.io.File
-import java.io.IOException
-import java.nio.ByteBuffer
-import java.util.concurrent.ConcurrentHashMap
-import java.util.concurrent.Executors
-import java.util.concurrent.TimeUnit
-import javax.net.ssl.SSLSocketFactory
-import javax.net.ssl.X509TrustManager
-
-
-private const val USER_AGENT = "Immich_Android_${BuildConfig.VERSION_NAME}"
-private const val MAX_REQUESTS_PER_HOST = 64
-private const val KEEP_ALIVE_CONNECTIONS = 10
-private const val KEEP_ALIVE_DURATION_MINUTES = 5L
-private const val CACHE_SIZE_BYTES = 1024L * 1024 * 1024
-
-private class RemoteRequest(val cancellationSignal: CancellationSignal)
-
-class RemoteImagesImpl(context: Context) : RemoteImageApi {
-  private val requestMap = ConcurrentHashMap<Long, RemoteRequest>()
-
-  init {
-    ImageFetcherManager.initialize(context)
-  }
-
-  companion object {
-    val CANCELLED = Result.success<Map<String, Long>?>(null)
-  }
-
-  override fun requestImage(
-    url: String,
-    headers: Map<String, String>,
-    requestId: Long,
-    callback: (Result<Map<String, Long>?>) -> Unit
-  ) {
-    val signal = CancellationSignal()
-    requestMap[requestId] = RemoteRequest(signal)
-
-    ImageFetcherManager.fetch(
-      url,
-      headers,
-      signal,
-      onSuccess = { buffer ->
-        requestMap.remove(requestId)
-        if (signal.isCanceled) {
-          NativeBuffer.free(buffer.pointer)
-          return@fetch callback(CANCELLED)
-        }
-
-        callback(
-          Result.success(
-            mapOf(
-              "pointer" to buffer.pointer,
-              "length" to buffer.offset.toLong()
-            )
-          )
-        )
-      },
-      onFailure = { e ->
-        requestMap.remove(requestId)
-        val result = if (signal.isCanceled) CANCELLED else Result.failure(e)
-        callback(result)
-      }
-    )
-  }
-
-  override fun cancelRequest(requestId: Long) {
-    requestMap.remove(requestId)?.cancellationSignal?.cancel()
-  }
-}
-
-private object ImageFetcherManager {
-  private lateinit var appContext: Context
-  private lateinit var cacheDir: File
-  private lateinit var fetcher: ImageFetcher
-  private var initialized = false
-
-  fun initialize(context: Context) {
-    if (initialized) return
-    synchronized(this) {
-      if (initialized) return
-      appContext = context.applicationContext
-      cacheDir = context.cacheDir
-      fetcher = build()
-      SSLConfig.addListener(::invalidate)
-      initialized = true
-    }
-  }
-
-  fun fetch(
-    url: String,
-    headers: Map<String, String>,
-    signal: CancellationSignal,
-    onSuccess: (NativeByteBuffer) -> Unit,
-    onFailure: (Exception) -> Unit,
-  ) {
-    fetcher.fetch(url, headers, signal, onSuccess, onFailure)
-  }
-
-  private fun invalidate() {
-    synchronized(this) {
-      val oldFetcher = fetcher
-      if (oldFetcher is OkHttpImageFetcher && SSLConfig.requiresCustomSSL) {
-        fetcher = oldFetcher.reconfigure(SSLConfig.sslSocketFactory, SSLConfig.trustManager)
-        return
-      }
-      fetcher = build()
-      oldFetcher.drain()
-    }
-  }
-
-  private fun build(): ImageFetcher {
-    return if (SSLConfig.requiresCustomSSL) {
-      OkHttpImageFetcher.create(cacheDir, SSLConfig.sslSocketFactory, SSLConfig.trustManager)
-    } else {
-      CronetImageFetcher(appContext, cacheDir)
-    }
-  }
-}
-
-private sealed interface ImageFetcher {
-  fun fetch(
-    url: String,
-    headers: Map<String, String>,
-    signal: CancellationSignal,
-    onSuccess: (NativeByteBuffer) -> Unit,
-    onFailure: (Exception) -> Unit,
-  )
-
-  fun drain()
-}
-
-private class CronetImageFetcher(context: Context, cacheDir: File) : ImageFetcher {
-  private val engine: CronetEngine
-  private val executor = Executors.newFixedThreadPool(4)
-  private val stateLock = Any()
-  private var activeCount = 0
-  private var draining = false
-
-  init {
-    val storageDir = File(cacheDir, "cronet").apply { mkdirs() }
-    engine = CronetEngine.Builder(context)
-      .enableHttp2(true)
-      .enableQuic(true)
-      .enableBrotli(true)
-      .setStoragePath(storageDir.absolutePath)
-      .setUserAgent(USER_AGENT)
-      .enableHttpCache(CronetEngine.Builder.HTTP_CACHE_DISK, CACHE_SIZE_BYTES)
-      .build()
-  }
-
-  override fun fetch(
-    url: String,
-    headers: Map<String, String>,
-    signal: CancellationSignal,
-    onSuccess: (NativeByteBuffer) -> Unit,
-    onFailure: (Exception) -> Unit,
-  ) {
-    synchronized(stateLock) {
-      if (draining) {
-        onFailure(IllegalStateException("Engine is draining"))
-        return
-      }
-      activeCount++
-    }
-
-    val callback = FetchCallback(onSuccess, onFailure, ::onComplete)
-    val requestBuilder = engine.newUrlRequestBuilder(url, callback, executor)
-    headers.forEach { (key, value) -> requestBuilder.addHeader(key, value) }
-    val request = requestBuilder.build()
-    signal.setOnCancelListener(request::cancel)
-    request.start()
-  }
-
-  private fun onComplete() {
-    val shouldShutdown = synchronized(stateLock) {
-      activeCount--
-      draining && activeCount == 0
-    }
-    if (shouldShutdown) {
-      engine.shutdown()
-      executor.shutdown()
-    }
-  }
-
-  override fun drain() {
-    val shouldShutdown = synchronized(stateLock) {
-      if (draining) return
-      draining = true
-      activeCount == 0
-    }
-    if (shouldShutdown) {
-      engine.shutdown()
-      executor.shutdown()
-    }
-  }
-
-  private class FetchCallback(
-    private val onSuccess: (NativeByteBuffer) -> Unit,
-    private val onFailure: (Exception) -> Unit,
-    private val onComplete: () -> Unit,
-  ) : UrlRequest.Callback() {
-    private var buffer: NativeByteBuffer? = null
-    private var wrapped: ByteBuffer? = null
-    private var httpError: IOException? = null
-
-    override fun onRedirectReceived(request: UrlRequest, info: UrlResponseInfo, newUrl: String) {
-      request.followRedirect()
-    }
-
-    override fun onResponseStarted(request: UrlRequest, info: UrlResponseInfo) {
-      if (info.httpStatusCode !in 200..299) {
-        httpError = IOException("HTTP ${info.httpStatusCode}: ${info.httpStatusText}")
-        return request.cancel()
-      }
-
-      val contentLength = info.allHeaders["content-length"]?.firstOrNull()?.toIntOrNull() ?: 0
-      if (contentLength > 0) {
-        buffer = NativeByteBuffer(contentLength + 1)
-        wrapped = NativeBuffer.wrap(buffer!!.pointer, contentLength + 1)
-        request.read(wrapped)
-      } else {
-        buffer = NativeByteBuffer(INITIAL_BUFFER_SIZE)
-        request.read(buffer!!.wrapRemaining())
-      }
-    }
-
-    override fun onReadCompleted(
-      request: UrlRequest,
-      info: UrlResponseInfo,
-      byteBuffer: ByteBuffer
-    ) {
-      val buf = if (wrapped == null) {
-        buffer!!.run {
-          advance(byteBuffer.position())
-          ensureHeadroom()
-          wrapRemaining()
-        }
-      } else {
-        wrapped
-      }
-      request.read(buf)
-    }
-
-    override fun onSucceeded(request: UrlRequest, info: UrlResponseInfo) {
-      wrapped?.let { buffer!!.advance(it.position()) }
-      onSuccess(buffer!!)
-      onComplete()
-    }
-
-    override fun onFailed(request: UrlRequest, info: UrlResponseInfo?, error: CronetException) {
-      buffer?.free()
-      onFailure(error)
-      onComplete()
-    }
-
-    override fun onCanceled(request: UrlRequest, info: UrlResponseInfo?) {
-      buffer?.free()
-      onFailure(httpError ?: OperationCanceledException())
-      onComplete()
-    }
-  }
-}
-
-private class OkHttpImageFetcher private constructor(
-  private val client: OkHttpClient,
-) : ImageFetcher {
-  private val stateLock = Any()
-  private var activeCount = 0
-  private var draining = false
-
-  companion object {
-    fun create(
-      cacheDir: File,
-      sslSocketFactory: SSLSocketFactory?,
-      trustManager: X509TrustManager?,
-    ): OkHttpImageFetcher {
-      val dir = File(cacheDir, "okhttp")
-      val connectionPool = ConnectionPool(
-        maxIdleConnections = KEEP_ALIVE_CONNECTIONS,
-        keepAliveDuration = KEEP_ALIVE_DURATION_MINUTES,
-        timeUnit = TimeUnit.MINUTES
-      )
-
-      val builder = OkHttpClient.Builder()
-        .addInterceptor { chain ->
-          chain.proceed(
-            chain.request().newBuilder()
-              .header("User-Agent", USER_AGENT)
-              .build()
-          )
-        }
-        .dispatcher(Dispatcher().apply { maxRequestsPerHost = MAX_REQUESTS_PER_HOST })
-        .connectionPool(connectionPool)
-        .cache(Cache(File(dir, "thumbnails"), CACHE_SIZE_BYTES))
-
-      if (sslSocketFactory != null && trustManager != null) {
-        builder.sslSocketFactory(sslSocketFactory, trustManager)
-      }
-
-      return OkHttpImageFetcher(builder.build())
-    }
-  }
-
-  fun reconfigure(
-    sslSocketFactory: SSLSocketFactory?,
-    trustManager: X509TrustManager?,
-  ): OkHttpImageFetcher {
-    val builder = client.newBuilder()
-    if (sslSocketFactory != null && trustManager != null) {
-      builder.sslSocketFactory(sslSocketFactory, trustManager)
-    }
-    // Evict idle connections using old SSL config
-    client.connectionPool.evictAll()
-    return OkHttpImageFetcher(builder.build())
-  }
-
-  private fun onComplete() {
-    val shouldClose = synchronized(stateLock) {
-      activeCount--
-      draining && activeCount == 0
-    }
-    if (shouldClose) {
-      client.cache?.close()
-    }
-  }
-
-  override fun fetch(
-    url: String,
-    headers: Map<String, String>,
-    signal: CancellationSignal,
-    onSuccess: (NativeByteBuffer) -> Unit,
-    onFailure: (Exception) -> Unit,
-  ) {
-    synchronized(stateLock) {
-      if (draining) {
-        return onFailure(IllegalStateException("Client is draining"))
-      }
-      activeCount++
-    }
-
-    val requestBuilder = Request.Builder().url(url)
-    headers.forEach { (key, value) -> requestBuilder.addHeader(key, value) }
-    val call = client.newCall(requestBuilder.build())
-    signal.setOnCancelListener(call::cancel)
-
-    call.enqueue(object : Callback {
-      override fun onFailure(call: Call, e: IOException) {
-        onFailure(e)
-        onComplete()
-      }
-
-      override fun onResponse(call: Call, response: Response) {
-        response.use {
-          if (!response.isSuccessful) {
-            return onFailure(IOException("HTTP ${response.code}: ${response.message}")).also { onComplete() }
-          }
-
-          val body = response.body
-            ?: return onFailure(IOException("Empty response body")).also { onComplete() }
-
-          if (call.isCanceled()) {
-            onFailure(OperationCanceledException())
-            return onComplete()
-          }
-
-          body.source().use { source ->
-            val length = body.contentLength().toInt()
-            val buffer = NativeByteBuffer(if (length > 0) length else INITIAL_BUFFER_SIZE)
-            try {
-              if (length > 0) {
-                val wrapped = NativeBuffer.wrap(buffer.pointer, length)
-                while (wrapped.hasRemaining()) {
-                  if (call.isCanceled()) throw OperationCanceledException()
-                  if (source.read(wrapped) == -1) throw EOFException()
-                }
-                buffer.advance(length)
-              } else {
-                while (true) {
-                  if (call.isCanceled()) throw OperationCanceledException()
-                  val bytesRead = source.read(buffer.wrapRemaining())
-                  if (bytesRead == -1) break
-                  buffer.advance(bytesRead)
-                  buffer.ensureHeadroom()
-                }
-              }
-              onSuccess(buffer)
-            } catch (e: Exception) {
-              buffer.free()
-              onFailure(e)
-            }
-          }
-        }
-      }
-    })
-  }
-
-  override fun drain() {
-    val shouldClose = synchronized(stateLock) {
-      if (draining) return
-      draining = true
-      activeCount == 0
-    }
-    client.connectionPool.evictAll()
-    if (shouldClose) {
-      client.cache?.close()
-    }
-  }
-}

mobile/android/app/src/main/kotlin/app/alextran/immich/images/ThumbHash.java

@@ -7,8 +7,6 @@ package app.alextran.immich.images;
 
 import java.nio.ByteBuffer;
 
-import app.alextran.immich.NativeBuffer;
-
 // modified to use native allocations
 public final class ThumbHash {
   /**
@@ -58,8 +56,8 @@ public final class ThumbHash {
     int w = Math.round(ratio > 1.0f ? 32.0f : 32.0f * ratio);
     int h = Math.round(ratio > 1.0f ? 32.0f / ratio : 32.0f);
     int size = w * h * 4;
-    long pointer = NativeBuffer.allocate(size);
-    ByteBuffer rgba = NativeBuffer.wrap(pointer, size);
+    long pointer = ThumbnailsImpl.allocateNative(size);
+    ByteBuffer rgba = ThumbnailsImpl.wrapAsBuffer(pointer, size);
     int cx_stop = Math.max(lx, hasAlpha ? 5 : 3);
     int cy_stop = Math.max(ly, hasAlpha ? 5 : 3);
     float[] fx = new float[cx_stop];

mobile/android/app/src/main/kotlin/app/alextran/immich/images/Thumbnails.g.kt

@@ -13,7 +13,7 @@ import io.flutter.plugin.common.StandardMethodCodec
 import io.flutter.plugin.common.StandardMessageCodec
 import java.io.ByteArrayOutputStream
 import java.nio.ByteBuffer
-private object LocalImagesPigeonUtils {
+private object ThumbnailsPigeonUtils {
 
   fun wrapResult(result: Any?): List<Any?> {
     return listOf(result)
@@ -47,7 +47,7 @@ class FlutterError (
   override val message: String? = null,
   val details: Any? = null
 ) : Throwable()
-private open class LocalImagesPigeonCodec : StandardMessageCodec() {
+private open class ThumbnailsPigeonCodec : StandardMessageCodec() {
   override fun readValueOfType(type: Byte, buffer: ByteBuffer): Any? {
     return     super.readValueOfType(type, buffer)
   }
@@ -58,22 +58,22 @@ private open class LocalImagesPigeonCodec : StandardMessageCodec() {
 
 
 /** Generated interface from Pigeon that represents a handler of messages from Flutter. */
-interface LocalImageApi {
-  fun requestImage(assetId: String, requestId: Long, width: Long, height: Long, isVideo: Boolean, callback: (Result<Map<String, Long>?>) -> Unit)
-  fun cancelRequest(requestId: Long)
+interface ThumbnailApi {
+  fun requestImage(assetId: String, requestId: Long, width: Long, height: Long, isVideo: Boolean, callback: (Result<Map<String, Long>>) -> Unit)
+  fun cancelImageRequest(requestId: Long)
   fun getThumbhash(thumbhash: String, callback: (Result<Map<String, Long>>) -> Unit)
 
   companion object {
-    /** The codec used by LocalImageApi. */
+    /** The codec used by ThumbnailApi. */
     val codec: MessageCodec<Any?> by lazy {
-      LocalImagesPigeonCodec()
+      ThumbnailsPigeonCodec()
     }
-    /** Sets up an instance of `LocalImageApi` to handle messages through the `binaryMessenger`. */
+    /** Sets up an instance of `ThumbnailApi` to handle messages through the `binaryMessenger`. */
     @JvmOverloads
-    fun setUp(binaryMessenger: BinaryMessenger, api: LocalImageApi?, messageChannelSuffix: String = "") {
+    fun setUp(binaryMessenger: BinaryMessenger, api: ThumbnailApi?, messageChannelSuffix: String = "") {
       val separatedMessageChannelSuffix = if (messageChannelSuffix.isNotEmpty()) ".$messageChannelSuffix" else ""
       run {
-        val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.immich_mobile.LocalImageApi.requestImage$separatedMessageChannelSuffix", codec)
+        val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.immich_mobile.ThumbnailApi.requestImage$separatedMessageChannelSuffix", codec)
         if (api != null) {
           channel.setMessageHandler { message, reply ->
             val args = message as List<Any?>
@@ -82,13 +82,13 @@ interface LocalImageApi {
             val widthArg = args[2] as Long
             val heightArg = args[3] as Long
             val isVideoArg = args[4] as Boolean
-            api.requestImage(assetIdArg, requestIdArg, widthArg, heightArg, isVideoArg) { result: Result<Map<String, Long>?> ->
+            api.requestImage(assetIdArg, requestIdArg, widthArg, heightArg, isVideoArg) { result: Result<Map<String, Long>> ->
               val error = result.exceptionOrNull()
               if (error != null) {
-                reply.reply(LocalImagesPigeonUtils.wrapError(error))
+                reply.reply(ThumbnailsPigeonUtils.wrapError(error))
               } else {
                 val data = result.getOrNull()
-                reply.reply(LocalImagesPigeonUtils.wrapResult(data))
+                reply.reply(ThumbnailsPigeonUtils.wrapResult(data))
               }
             }
           }
@@ -97,16 +97,16 @@ interface LocalImageApi {
         }
       }
       run {
-        val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.immich_mobile.LocalImageApi.cancelRequest$separatedMessageChannelSuffix", codec)
+        val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.immich_mobile.ThumbnailApi.cancelImageRequest$separatedMessageChannelSuffix", codec)
         if (api != null) {
           channel.setMessageHandler { message, reply ->
             val args = message as List<Any?>
             val requestIdArg = args[0] as Long
             val wrapped: List<Any?> = try {
-              api.cancelRequest(requestIdArg)
+              api.cancelImageRequest(requestIdArg)
               listOf(null)
             } catch (exception: Throwable) {
-              LocalImagesPigeonUtils.wrapError(exception)
+              ThumbnailsPigeonUtils.wrapError(exception)
             }
             reply.reply(wrapped)
           }
@@ -115,7 +115,7 @@ interface LocalImageApi {
         }
       }
       run {
-        val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.immich_mobile.LocalImageApi.getThumbhash$separatedMessageChannelSuffix", codec)
+        val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.immich_mobile.ThumbnailApi.getThumbhash$separatedMessageChannelSuffix", codec)
         if (api != null) {
           channel.setMessageHandler { message, reply ->
             val args = message as List<Any?>
@@ -123,10 +123,10 @@ interface LocalImageApi {
             api.getThumbhash(thumbhashArg) { result: Result<Map<String, Long>> ->
               val error = result.exceptionOrNull()
               if (error != null) {
-                reply.reply(LocalImagesPigeonUtils.wrapError(error))
+                reply.reply(ThumbnailsPigeonUtils.wrapError(error))
               } else {
                 val data = result.getOrNull()
-                reply.reply(LocalImagesPigeonUtils.wrapResult(data))
+                reply.reply(ThumbnailsPigeonUtils.wrapResult(data))
               }
             }
           }

mobile/android/app/src/main/kotlin/app/alextran/immich/images/ThumbnailsImpl.kt

@@ -11,8 +11,7 @@ import android.os.OperationCanceledException
 import android.provider.MediaStore.Images
 import android.provider.MediaStore.Video
 import android.util.Size
-import androidx.annotation.RequiresApi
-import app.alextran.immich.NativeBuffer
+import java.nio.ByteBuffer
 import kotlin.math.*
 import java.util.concurrent.Executors
 import com.bumptech.glide.Glide
@@ -27,42 +26,10 @@ import java.util.concurrent.Future
 data class Request(
   val taskFuture: Future<*>,
   val cancellationSignal: CancellationSignal,
-  val callback: (Result<Map<String, Long>?>) -> Unit
+  val callback: (Result<Map<String, Long>>) -> Unit
 )
 
-@RequiresApi(Build.VERSION_CODES.Q)
-inline fun ImageDecoder.Source.decodeBitmap(target: Size = Size(0, 0)): Bitmap {
-  return ImageDecoder.decodeBitmap(this) { decoder, info, _ ->
-    if (target.width > 0 && target.height > 0) {
-      val sample = max(1, min(info.size.width / target.width, info.size.height / target.height))
-      decoder.setTargetSampleSize(sample)
-    }
-    decoder.allocator = ImageDecoder.ALLOCATOR_SOFTWARE
-    decoder.setTargetColorSpace(ColorSpace.get(ColorSpace.Named.SRGB))
-  }
-}
-
-fun Bitmap.toNativeBuffer(): Map<String, Long>  {
-  val size = width * height * 4
-  val pointer = NativeBuffer.allocate(size)
-  try {
-    val buffer = NativeBuffer.wrap(pointer, size)
-    copyPixelsToBuffer(buffer)
-    recycle()
-    return mapOf(
-      "pointer" to pointer,
-      "width" to width.toLong(),
-      "height" to height.toLong(),
-      "rowBytes" to (width * 4).toLong()
-    )
-  } catch (e: Exception) {
-    NativeBuffer.free(pointer)
-    recycle()
-    throw e
-  }
-}
-
-class LocalImagesImpl(context: Context) : LocalImageApi {
+class ThumbnailsImpl(context: Context) : ThumbnailApi {
   private val ctx: Context = context.applicationContext
   private val resolver: ContentResolver = ctx.contentResolver
   private val requestThread = Executors.newSingleThreadExecutor()
@@ -71,8 +38,21 @@ class LocalImagesImpl(context: Context) : LocalImageApi {
   private val requestMap = ConcurrentHashMap<Long, Request>()
 
   companion object {
-    val CANCELLED = Result.success<Map<String, Long>?>(null)
+    val CANCELLED = Result.success<Map<String, Long>>(mapOf())
     val OPTIONS = BitmapFactory.Options().apply { inPreferredConfig = Bitmap.Config.ARGB_8888 }
+
+    init {
+      System.loadLibrary("native_buffer")
+    }
+
+    @JvmStatic
+    external fun allocateNative(size: Int): Long
+
+    @JvmStatic
+    external fun freeNative(pointer: Long)
+
+    @JvmStatic
+    external fun wrapAsBuffer(address: Long, capacity: Int): ByteBuffer
   }
 
   override fun getThumbhash(thumbhash: String, callback: (Result<Map<String, Long>>) -> Unit) {
@@ -83,8 +63,7 @@ class LocalImagesImpl(context: Context) : LocalImageApi {
         val res = mapOf(
           "pointer" to image.pointer,
           "width" to image.width.toLong(),
-          "height" to image.height.toLong(),
-          "rowBytes" to (image.width * 4).toLong()
+          "height" to image.height.toLong()
         )
         callback(Result.success(res))
       } catch (e: Exception) {
@@ -99,7 +78,7 @@ class LocalImagesImpl(context: Context) : LocalImageApi {
     width: Long,
     height: Long,
     isVideo: Boolean,
-    callback: (Result<Map<String, Long>?>) -> Unit
+    callback: (Result<Map<String, Long>>) -> Unit
   ) {
     val signal = CancellationSignal()
     val task = threadPool.submit {
@@ -119,7 +98,7 @@ class LocalImagesImpl(context: Context) : LocalImageApi {
     requestMap[requestId] = request
   }
 
-  override fun cancelRequest(requestId: Long) {
+  override fun cancelImageRequest(requestId: Long) {
     val request = requestMap.remove(requestId) ?: return
     request.taskFuture.cancel(false)
     request.cancellationSignal.cancel()
@@ -138,7 +117,7 @@ class LocalImagesImpl(context: Context) : LocalImageApi {
     width: Long,
     height: Long,
     isVideo: Boolean,
-    callback: (Result<Map<String, Long>?>) -> Unit,
+    callback: (Result<Map<String, Long>>) -> Unit,
     signal: CancellationSignal
   ) {
     signal.throwIfCanceled()
@@ -152,12 +131,31 @@ class LocalImagesImpl(context: Context) : LocalImageApi {
       decodeImage(id, size, signal)
     }
 
+    processBitmap(bitmap, callback, signal)
+  }
+
+  private fun processBitmap(
+    bitmap: Bitmap, callback: (Result<Map<String, Long>>) -> Unit, signal: CancellationSignal
+  ) {
+    signal.throwIfCanceled()
+    val actualWidth = bitmap.width
+    val actualHeight = bitmap.height
+
+    val size = actualWidth * actualHeight * 4
+    val pointer = allocateNative(size)
+
     try {
       signal.throwIfCanceled()
-      val res = bitmap.toNativeBuffer()
+      val buffer = wrapAsBuffer(pointer, size)
+      bitmap.copyPixelsToBuffer(buffer)
+      bitmap.recycle()
       signal.throwIfCanceled()
+      val res = mapOf(
+        "pointer" to pointer, "width" to actualWidth.toLong(), "height" to actualHeight.toLong()
+      )
       callback(Result.success(res))
     } catch (e: Exception) {
+      freeNative(pointer)
       callback(if (e is OperationCanceledException) CANCELLED else Result.failure(e))
     }
   }
@@ -193,7 +191,16 @@ class LocalImagesImpl(context: Context) : LocalImageApi {
   private fun decodeSource(uri: Uri, target: Size, signal: CancellationSignal): Bitmap {
     signal.throwIfCanceled()
     return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-      ImageDecoder.createSource(resolver, uri).decodeBitmap(target)
+      val source = ImageDecoder.createSource(resolver, uri)
+      signal.throwIfCanceled()
+      ImageDecoder.decodeBitmap(source) { decoder, info, _ ->
+        if (target.width > 0 && target.height > 0) {
+          val sample = max(1, min(info.size.width / target.width, info.size.height / target.height))
+          decoder.setTargetSampleSize(sample)
+        }
+        decoder.allocator = ImageDecoder.ALLOCATOR_SOFTWARE
+        decoder.setTargetColorSpace(ColorSpace.get(ColorSpace.Named.SRGB))
+      }
     } else {
       val ref =
         Glide.with(ctx).asBitmap().priority(Priority.IMMEDIATE).load(uri).disallowHardwareConfig()

mobile/android/app/src/main/kotlin/app/alextran/immich/sync/Messages.g.kt

@@ -252,40 +252,6 @@ data class HashResult (
 
   override fun hashCode(): Int = toList().hashCode()
 }
-
-/** Generated class from Pigeon that represents data sent in messages. */
-data class CloudIdResult (
-  val assetId: String,
-  val error: String? = null,
-  val cloudId: String? = null
-)
- {
-  companion object {
-    fun fromList(pigeonVar_list: List<Any?>): CloudIdResult {
-      val assetId = pigeonVar_list[0] as String
-      val error = pigeonVar_list[1] as String?
-      val cloudId = pigeonVar_list[2] as String?
-      return CloudIdResult(assetId, error, cloudId)
-    }
-  }
-  fun toList(): List<Any?> {
-    return listOf(
-      assetId,
-      error,
-      cloudId,
-    )
-  }
-  override fun equals(other: Any?): Boolean {
-    if (other !is CloudIdResult) {
-      return false
-    }
-    if (this === other) {
-      return true
-    }
-    return MessagesPigeonUtils.deepEquals(toList(), other.toList())  }
-
-  override fun hashCode(): Int = toList().hashCode()
-}
 private open class MessagesPigeonCodec : StandardMessageCodec() {
   override fun readValueOfType(type: Byte, buffer: ByteBuffer): Any? {
     return when (type) {
@@ -309,11 +275,6 @@ private open class MessagesPigeonCodec : StandardMessageCodec() {
           HashResult.fromList(it)
         }
       }
-      133.toByte() -> {
-        return (readValue(buffer) as? List<Any?>)?.let {
-          CloudIdResult.fromList(it)
-        }
-      }
       else -> super.readValueOfType(type, buffer)
     }
   }
@@ -335,10 +296,6 @@ private open class MessagesPigeonCodec : StandardMessageCodec() {
         stream.write(132)
         writeValue(stream, value.toList())
       }
-      is CloudIdResult -> {
-        stream.write(133)
-        writeValue(stream, value.toList())
-      }
       else -> super.writeValue(stream, value)
     }
   }
@@ -358,7 +315,6 @@ interface NativeSyncApi {
   fun hashAssets(assetIds: List<String>, allowNetworkAccess: Boolean, callback: (Result<List<HashResult>>) -> Unit)
   fun cancelHashing()
   fun getTrashedAssets(): Map<String, List<PlatformAsset>>
-  fun getCloudIdForAssetIds(assetIds: List<String>): List<CloudIdResult>
 
   companion object {
     /** The codec used by NativeSyncApi. */
@@ -552,23 +508,6 @@ interface NativeSyncApi {
           channel.setMessageHandler(null)
         }
       }
-      run {
-        val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.immich_mobile.NativeSyncApi.getCloudIdForAssetIds$separatedMessageChannelSuffix", codec, taskQueue)
-        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)
-        }
-      }
     }
   }
 }

mobile/android/app/src/main/kotlin/app/alextran/immich/sync/MessagesImplBase.kt

@@ -14,7 +14,6 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.async
 import kotlinx.coroutines.awaitAll
-import kotlinx.coroutines.currentCoroutineContext
 import kotlinx.coroutines.ensureActive
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.sync.Semaphore
@@ -22,6 +21,7 @@ import kotlinx.coroutines.sync.withPermit
 import java.io.File
 import java.security.MessageDigest
 import kotlin.coroutines.cancellation.CancellationException
+import kotlin.coroutines.coroutineContext
 
 sealed class AssetResult {
   data class ValidAsset(val asset: PlatformAsset, val albumId: String) : AssetResult()
@@ -298,7 +298,7 @@ open class NativeSyncApiImplBase(context: Context) : ImmichPlugin() {
         var bytesRead: Int
         val buffer = ByteArray(HASH_BUFFER_SIZE)
         while (inputStream.read(buffer).also { bytesRead = it } > 0) {
-          currentCoroutineContext().ensureActive()
+          coroutineContext.ensureActive()
           digest.update(buffer, 0, bytesRead)
         }
       } ?: return HashResult(assetId, "Cannot open input stream for asset", null)
@@ -316,10 +316,4 @@ open class NativeSyncApiImplBase(context: Context) : ImmichPlugin() {
     hashTask?.cancel()
     hashTask = null
   }
-
-  // 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>): List<CloudIdResult> {
-    return emptyList()
-  }
 }

mobile/ios/Podfile.lock

@@ -6,9 +6,6 @@ PODS:
     - FlutterMacOS
   - connectivity_plus (0.0.1):
     - Flutter
-  - cupertino_http (0.0.1):
-    - Flutter
-    - FlutterMacOS
   - device_info_plus (0.0.1):
     - Flutter
   - DKImagePickerController/Core (4.3.9):
@@ -139,7 +136,6 @@ DEPENDENCIES:
   - background_downloader (from `.symlinks/plugins/background_downloader/ios`)
   - bonsoir_darwin (from `.symlinks/plugins/bonsoir_darwin/darwin`)
   - connectivity_plus (from `.symlinks/plugins/connectivity_plus/ios`)
-  - cupertino_http (from `.symlinks/plugins/cupertino_http/darwin`)
   - device_info_plus (from `.symlinks/plugins/device_info_plus/ios`)
   - file_picker (from `.symlinks/plugins/file_picker/ios`)
   - Flutter (from `Flutter`)
@@ -188,8 +184,6 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/bonsoir_darwin/darwin"
   connectivity_plus:
     :path: ".symlinks/plugins/connectivity_plus/ios"
-  cupertino_http:
-    :path: ".symlinks/plugins/cupertino_http/darwin"
   device_info_plus:
     :path: ".symlinks/plugins/device_info_plus/ios"
   file_picker:
@@ -255,7 +249,6 @@ SPEC CHECKSUMS:
   background_downloader: 50e91d979067b82081aba359d7d916b3ba5fadad
   bonsoir_darwin: 29c7ccf356646118844721f36e1de4b61f6cbd0e
   connectivity_plus: cb623214f4e1f6ef8fe7403d580fdad517d2f7dd
-  cupertino_http: 94ac07f5ff090b8effa6c5e2c47871d48ab7c86c
   device_info_plus: 21fcca2080fbcd348be798aa36c3e5ed849eefbe
   DKImagePickerController: 946cec48c7873164274ecc4624d19e3da4c1ef3c
   DKPhotoGallery: b3834fecb755ee09a593d7c9e389d8b5d6deed60

mobile/ios/Runner.xcodeproj/project.pbxproj

@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 77;
+	objectVersion = 54;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -29,11 +29,9 @@
 		FAC6F89B2D287C890078CB2F /* ShareExtension.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = FAC6F8902D287C890078CB2F /* ShareExtension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
 		FAC6F8B72D287F120078CB2F /* ShareViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = FAC6F8B52D287F120078CB2F /* ShareViewController.swift */; };
 		FAC6F8B92D287F120078CB2F /* MainInterface.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = FAC6F8B32D287F120078CB2F /* MainInterface.storyboard */; };
-		FE5499F32F1197D8006016CB /* LocalImages.g.swift in Sources */ = {isa = PBXBuildFile; fileRef = FE5499F12F1197D8006016CB /* LocalImages.g.swift */; };
-		FE5499F42F1197D8006016CB /* RemoteImages.g.swift in Sources */ = {isa = PBXBuildFile; fileRef = FE5499F22F1197D8006016CB /* RemoteImages.g.swift */; };
-		FE5499F62F11980E006016CB /* LocalImagesImpl.swift in Sources */ = {isa = PBXBuildFile; fileRef = FE5499F52F11980E006016CB /* LocalImagesImpl.swift */; };
-		FE5499F82F1198E2006016CB /* RemoteImagesImpl.swift in Sources */ = {isa = PBXBuildFile; fileRef = FE5499F72F1198DE006016CB /* RemoteImagesImpl.swift */; };
 		FEAFA8732E4D42F4001E47FE /* Thumbhash.swift in Sources */ = {isa = PBXBuildFile; fileRef = FEAFA8722E4D42F4001E47FE /* Thumbhash.swift */; };
+		FED3B1962E253E9B0030FD97 /* ThumbnailsImpl.swift in Sources */ = {isa = PBXBuildFile; fileRef = FED3B1942E253E9B0030FD97 /* ThumbnailsImpl.swift */; };
+		FED3B1972E253E9B0030FD97 /* Thumbnails.g.swift in Sources */ = {isa = PBXBuildFile; fileRef = FED3B1932E253E9B0030FD97 /* Thumbnails.g.swift */; };
 		FEE084F82EC172460045228E /* SQLiteData in Frameworks */ = {isa = PBXBuildFile; productRef = FEE084F72EC172460045228E /* SQLiteData */; };
 		FEE084FB2EC1725A0045228E /* RawStructuredFieldValues in Frameworks */ = {isa = PBXBuildFile; productRef = FEE084FA2EC1725A0045228E /* RawStructuredFieldValues */; };
 		FEE084FD2EC1725A0045228E /* StructuredFieldValues in Frameworks */ = {isa = PBXBuildFile; productRef = FEE084FC2EC1725A0045228E /* StructuredFieldValues */; };
@@ -120,11 +118,9 @@
 		FAC6F8B42D287F120078CB2F /* ShareExtension.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = ShareExtension.entitlements; sourceTree = "<group>"; };
 		FAC6F8B52D287F120078CB2F /* ShareViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShareViewController.swift; sourceTree = "<group>"; };
 		FAC7416727DB9F5500C668D8 /* RunnerProfile.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = RunnerProfile.entitlements; sourceTree = "<group>"; };
-		FE5499F12F1197D8006016CB /* LocalImages.g.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocalImages.g.swift; sourceTree = "<group>"; };
-		FE5499F22F1197D8006016CB /* RemoteImages.g.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RemoteImages.g.swift; sourceTree = "<group>"; };
-		FE5499F52F11980E006016CB /* LocalImagesImpl.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocalImagesImpl.swift; sourceTree = "<group>"; };
-		FE5499F72F1198DE006016CB /* RemoteImagesImpl.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RemoteImagesImpl.swift; sourceTree = "<group>"; };
 		FEAFA8722E4D42F4001E47FE /* Thumbhash.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Thumbhash.swift; sourceTree = "<group>"; };
+		FED3B1932E253E9B0030FD97 /* Thumbnails.g.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Thumbnails.g.swift; sourceTree = "<group>"; };
+		FED3B1942E253E9B0030FD97 /* ThumbnailsImpl.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ThumbnailsImpl.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFileSystemSynchronizedBuildFileExceptionSet section */
@@ -140,11 +136,15 @@
 /* Begin PBXFileSystemSynchronizedRootGroup section */
 		B231F52D2E93A44A00BC45D1 /* Core */ = {
 			isa = PBXFileSystemSynchronizedRootGroup;
+			exceptions = (
+			);
 			path = Core;
 			sourceTree = "<group>";
 		};
 		B2CF7F8C2DDE4EBB00744BF6 /* Sync */ = {
 			isa = PBXFileSystemSynchronizedRootGroup;
+			exceptions = (
+			);
 			path = Sync;
 			sourceTree = "<group>";
 		};
@@ -158,6 +158,8 @@
 		};
 		FEE084F22EC172080045228E /* Schemas */ = {
 			isa = PBXFileSystemSynchronizedRootGroup;
+			exceptions = (
+			);
 			path = Schemas;
 			sourceTree = "<group>";
 		};
@@ -319,11 +321,9 @@
 		FED3B1952E253E9B0030FD97 /* Images */ = {
 			isa = PBXGroup;
 			children = (
-				FE5499F72F1198DE006016CB /* RemoteImagesImpl.swift */,
-				FE5499F52F11980E006016CB /* LocalImagesImpl.swift */,
-				FE5499F12F1197D8006016CB /* LocalImages.g.swift */,
-				FE5499F22F1197D8006016CB /* RemoteImages.g.swift */,
 				FEAFA8722E4D42F4001E47FE /* Thumbhash.swift */,
+				FED3B1932E253E9B0030FD97 /* Thumbnails.g.swift */,
+				FED3B1942E253E9B0030FD97 /* ThumbnailsImpl.swift */,
 			);
 			path = Images;
 			sourceTree = "<group>";
@@ -549,14 +549,10 @@
 			inputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist",
 			);
-			inputPaths = (
-			);
 			name = "[CP] Copy Pods Resources";
 			outputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist",
 			);
-			outputPaths = (
-			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
@@ -585,14 +581,10 @@
 			inputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
 			);
-			inputPaths = (
-			);
 			name = "[CP] Embed Pods Frameworks";
 			outputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
 			);
-			outputPaths = (
-			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
@@ -608,14 +600,12 @@
 				65F32F31299BD2F800CE9261 /* BackgroundServicePlugin.swift in Sources */,
 				74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */,
 				B21E34AC2E5B09190031FDB9 /* BackgroundWorker.swift in Sources */,
-				FE5499F32F1197D8006016CB /* LocalImages.g.swift in Sources */,
-				FE5499F62F11980E006016CB /* LocalImagesImpl.swift in Sources */,
-				FE5499F42F1197D8006016CB /* RemoteImages.g.swift in Sources */,
 				B25D377A2E72CA15008B6CA7 /* Connectivity.g.swift in Sources */,
-				FE5499F82F1198E2006016CB /* RemoteImagesImpl.swift in Sources */,
 				FEAFA8732E4D42F4001E47FE /* Thumbhash.swift in Sources */,
 				B25D377C2E72CA26008B6CA7 /* ConnectivityApiImpl.swift in Sources */,
+				FED3B1962E253E9B0030FD97 /* ThumbnailsImpl.swift in Sources */,
 				B21E34AA2E5AFD2B0031FDB9 /* BackgroundWorkerApiImpl.swift in Sources */,
+				FED3B1972E253E9B0030FD97 /* Thumbnails.g.swift in Sources */,
 				1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */,
 				B2BE315F2E5E5229006EEF88 /* BackgroundWorker.g.swift in Sources */,
 				65F32F33299D349D00CE9261 /* BackgroundSyncWorker.swift in Sources */,

mobile/ios/Runner/AppDelegate.swift

@@ -53,10 +53,8 @@ import UIKit
   
   public static func registerPlugins(with engine: FlutterEngine) {
     NativeSyncApiImpl.register(with: engine.registrar(forPlugin: NativeSyncApiImpl.name)!)
-    LocalImageApiSetup.setUp(binaryMessenger: engine.binaryMessenger, api: LocalImageApiImpl())
-    RemoteImageApiSetup.setUp(binaryMessenger: engine.binaryMessenger, api: RemoteImageApiImpl())
+    ThumbnailApiSetup.setUp(binaryMessenger: engine.binaryMessenger, api: ThumbnailApiImpl())
     BackgroundWorkerFgHostApiSetup.setUp(binaryMessenger: engine.binaryMessenger, api: BackgroundWorkerApiImpl())
-    ConnectivityApiSetup.setUp(binaryMessenger: engine.binaryMessenger, api: ConnectivityApiImpl())
   }
   
   public static func cancelPlugins(with engine: FlutterEngine) {

mobile/ios/Runner/Connectivity/ConnectivityApiImpl.swift

@@ -1,60 +1,6 @@
-import Network
 
 class ConnectivityApiImpl: ConnectivityApi {
-  private let monitor = NWPathMonitor()
-  private let queue = DispatchQueue(label: "ConnectivityMonitor")
-  private var currentPath: NWPath?
-  
-  init() {
-    monitor.pathUpdateHandler = { [weak self] path in
-      self?.currentPath = path
-    }
-    monitor.start(queue: queue)
-    // Get initial state synchronously
-    currentPath = monitor.currentPath
-  }
-  
-  deinit {
-    monitor.cancel()
-  }
-  
   func getCapabilities() throws -> [NetworkCapability] {
-    guard let path = currentPath else {
-      return []
-    }
-    
-    guard path.status == .satisfied else {
-      return []
-    }
-    
-    var capabilities: [NetworkCapability] = []
-    
-    if path.usesInterfaceType(.wifi) {
-      capabilities.append(.wifi)
-    }
-    
-    if path.usesInterfaceType(.cellular) {
-      capabilities.append(.cellular)
-    }
-    
-    // Check for VPN - iOS reports VPN as .other interface type in many cases
-    // or through the path's expensive property when on cellular with VPN
-    if path.usesInterfaceType(.other) {
-      capabilities.append(.vpn)
-    }
-    
-    // Determine if connection is unmetered:
-    // - Must be on WiFi (not cellular)
-    // - Must not be expensive (rules out personal hotspot)
-    // - Must not be constrained (Low Data Mode)
-    // Note: VPN over cellular should still be considered metered
-    let isOnCellular = path.usesInterfaceType(.cellular)
-    let isOnWifi = path.usesInterfaceType(.wifi)
-    
-    if isOnWifi && !isOnCellular && !path.isExpensive && !path.isConstrained {
-      capabilities.append(.unmetered)
-    }
-    
-    return capabilities
+    []
   }
 }

mobile/ios/Runner/Images/RemoteImages.g.swift

@@ -1,118 +0,0 @@
-// Autogenerated from Pigeon (v26.0.2), do not edit directly.
-// See also: https://pub.dev/packages/pigeon
-
-import Foundation
-
-#if os(iOS)
-  import Flutter
-#elseif os(macOS)
-  import FlutterMacOS
-#else
-  #error("Unsupported platform.")
-#endif
-
-private func wrapResult(_ result: Any?) -> [Any?] {
-  return [result]
-}
-
-private func wrapError(_ error: Any) -> [Any?] {
-  if let pigeonError = error as? PigeonError {
-    return [
-      pigeonError.code,
-      pigeonError.message,
-      pigeonError.details,
-    ]
-  }
-  if let flutterError = error as? FlutterError {
-    return [
-      flutterError.code,
-      flutterError.message,
-      flutterError.details,
-    ]
-  }
-  return [
-    "\(error)",
-    "\(type(of: error))",
-    "Stacktrace: \(Thread.callStackSymbols)",
-  ]
-}
-
-private func isNullish(_ value: Any?) -> Bool {
-  return value is NSNull || value == nil
-}
-
-private func nilOrValue<T>(_ value: Any?) -> T? {
-  if value is NSNull { return nil }
-  return value as! T?
-}
-
-
-private class RemoteImagesPigeonCodecReader: FlutterStandardReader {
-}
-
-private class RemoteImagesPigeonCodecWriter: FlutterStandardWriter {
-}
-
-private class RemoteImagesPigeonCodecReaderWriter: FlutterStandardReaderWriter {
-  override func reader(with data: Data) -> FlutterStandardReader {
-    return RemoteImagesPigeonCodecReader(data: data)
-  }
-
-  override func writer(with data: NSMutableData) -> FlutterStandardWriter {
-    return RemoteImagesPigeonCodecWriter(data: data)
-  }
-}
-
-class RemoteImagesPigeonCodec: FlutterStandardMessageCodec, @unchecked Sendable {
-  static let shared = RemoteImagesPigeonCodec(readerWriter: RemoteImagesPigeonCodecReaderWriter())
-}
-
-
-/// Generated protocol from Pigeon that represents a handler of messages from Flutter.
-protocol RemoteImageApi {
-  func requestImage(url: String, headers: [String: String], requestId: Int64, completion: @escaping (Result<[String: Int64]?, Error>) -> Void)
-  func cancelRequest(requestId: Int64) throws
-}
-
-/// Generated setup class from Pigeon to handle messages through the `binaryMessenger`.
-class RemoteImageApiSetup {
-  static var codec: FlutterStandardMessageCodec { RemoteImagesPigeonCodec.shared }
-  /// Sets up an instance of `RemoteImageApi` to handle messages through the `binaryMessenger`.
-  static func setUp(binaryMessenger: FlutterBinaryMessenger, api: RemoteImageApi?, messageChannelSuffix: String = "") {
-    let channelSuffix = messageChannelSuffix.count > 0 ? ".\(messageChannelSuffix)" : ""
-    let requestImageChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.immich_mobile.RemoteImageApi.requestImage\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec)
-    if let api = api {
-      requestImageChannel.setMessageHandler { message, reply in
-        let args = message as! [Any?]
-        let urlArg = args[0] as! String
-        let headersArg = args[1] as! [String: String]
-        let requestIdArg = args[2] as! Int64
-        api.requestImage(url: urlArg, headers: headersArg, requestId: requestIdArg) { result in
-          switch result {
-          case .success(let res):
-            reply(wrapResult(res))
-          case .failure(let error):
-            reply(wrapError(error))
-          }
-        }
-      }
-    } else {
-      requestImageChannel.setMessageHandler(nil)
-    }
-    let cancelRequestChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.immich_mobile.RemoteImageApi.cancelRequest\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec)
-    if let api = api {
-      cancelRequestChannel.setMessageHandler { message, reply in
-        let args = message as! [Any?]
-        let requestIdArg = args[0] as! Int64
-        do {
-          try api.cancelRequest(requestId: requestIdArg)
-          reply(wrapResult(nil))
-        } catch {
-          reply(wrapError(error))
-        }
-      }
-    } else {
-      cancelRequestChannel.setMessageHandler(nil)
-    }
-  }
-}

mobile/ios/Runner/Images/RemoteImagesImpl.swift

@@ -1,171 +0,0 @@
-import Accelerate
-import Flutter
-import MobileCoreServices
-import Photos
-
-class RemoteImageRequest {
-  weak var task: URLSessionDataTask?
-  let id: Int64
-  var isCancelled = false
-  var data: CFMutableData?
-  let completion: (Result<[String: Int64]?, any Error>) -> Void
-  
-  init(id: Int64, task: URLSessionDataTask, completion: @escaping (Result<[String: Int64]?, any Error>) -> Void) {
-    self.id = id
-    self.task = task
-    self.data = nil
-    self.completion = completion
-  }
-}
-
-class RemoteImageApiImpl: NSObject, RemoteImageApi {
-  private static let delegate = RemoteImageApiDelegate()
-  static let session = {
-    let config = URLSessionConfiguration.default
-    let version = Bundle.main.object(forInfoDictionaryKey: "CFBundleShortVersionString") as? String ?? "unknown"
-    config.httpAdditionalHeaders = ["User-Agent": "Immich_iOS_\(version)"]
-    let thumbnailPath = FileManager.default.temporaryDirectory.appendingPathComponent("thumbnails", isDirectory: true)
-    try! FileManager.default.createDirectory(at: thumbnailPath, withIntermediateDirectories: true)
-    config.urlCache = URLCache(
-      memoryCapacity: 0,
-      diskCapacity: 1 << 30,
-      directory: thumbnailPath
-    )
-    config.httpMaximumConnectionsPerHost = 16
-    return URLSession(configuration: config, delegate: delegate, delegateQueue: nil)
-  }()
-  
-  func requestImage(url: String, headers: [String : String], requestId: Int64, completion: @escaping (Result<[String : Int64]?, any Error>) -> Void) {
-    var urlRequest = URLRequest(url: URL(string: url)!)
-    for (key, value) in headers {
-      urlRequest.setValue(value, forHTTPHeaderField: key)
-    }
-    let task = Self.session.dataTask(with: urlRequest)
-    
-    let imageRequest = RemoteImageRequest(id: requestId, task: task, completion: completion)
-    Self.delegate.add(taskId: task.taskIdentifier, request: imageRequest)
-    
-    task.resume()
-  }
-  
-  func cancelRequest(requestId: Int64) {
-    Self.delegate.cancel(requestId: requestId)
-  }
-}
-
-class RemoteImageApiDelegate: NSObject, URLSessionDataDelegate {
-  private static let requestQueue = DispatchQueue(label: "thumbnail.requests", qos: .userInitiated, attributes: .concurrent)
-  private static var rgbaFormat = vImage_CGImageFormat(
-    bitsPerComponent: 8,
-    bitsPerPixel: 32,
-    colorSpace: CGColorSpaceCreateDeviceRGB(),
-    bitmapInfo: CGBitmapInfo(rawValue: CGImageAlphaInfo.premultipliedLast.rawValue),
-    renderingIntent: .perceptual
-  )!
-  private static var requestByTaskId = [Int: RemoteImageRequest]()
-  private static var taskIdByRequestId = [Int64: Int]()
-  private static let cancelledResult = Result<[String: Int64]?, any Error>.success(nil)
-  private static let decodeOptions = [
-    kCGImageSourceShouldCache: false,
-    kCGImageSourceShouldCacheImmediately: true,
-    kCGImageSourceCreateThumbnailWithTransform: true,
-  ] as CFDictionary
-  
-  func urlSession(
-    _ session: URLSession, dataTask: URLSessionDataTask,
-    didReceive response: URLResponse,
-    completionHandler: @escaping (URLSession.ResponseDisposition) -> Void
-  ) {
-    guard let request = get(taskId: dataTask.taskIdentifier)
-    else {
-      return completionHandler(.cancel)
-    }
-    
-    let capacity = max(Int(response.expectedContentLength), 0)
-    request.data = CFDataCreateMutable(nil, capacity)
-    
-    completionHandler(.allow)
-  }
-  
-  func urlSession(_ session: URLSession, dataTask: URLSessionDataTask,
-                  didReceive data: Data) {
-    guard let request = get(taskId: dataTask.taskIdentifier) else { return }
-    
-    data.withUnsafeBytes { bytes in
-      CFDataAppendBytes(request.data, bytes.bindMemory(to: UInt8.self).baseAddress, data.count)
-    }
-  }
-  
-  func urlSession(_ session: URLSession, task: URLSessionTask,
-                  didCompleteWithError error: Error?) {
-    guard let request = get(taskId: task.taskIdentifier) else { return }
-        
-    defer { remove(taskId: task.taskIdentifier, requestId: request.id) }
-    
-    if let error = error {
-      if request.isCancelled || (error as NSError).code == NSURLErrorCancelled {
-        return request.completion(Self.cancelledResult)
-      }
-      return request.completion(.failure(error))
-    }
-    
-    guard let data = request.data else {
-      return request.completion(.failure(PigeonError(code: "", message: "No data received", details: nil)))
-    }
-    
-    guard let imageSource = CGImageSourceCreateWithData(data, nil),
-          let cgImage = CGImageSourceCreateThumbnailAtIndex(imageSource, 0, Self.decodeOptions) else {
-      return request.completion(.failure(PigeonError(code: "", message: "Failed to decode image for request", details: nil)))
-    }
-    
-    if request.isCancelled {
-      return request.completion(Self.cancelledResult)
-    }
-    
-    do {
-      let buffer = try vImage_Buffer(cgImage: cgImage, format: Self.rgbaFormat)
-      
-      if request.isCancelled {
-        buffer.free()
-        return request.completion(Self.cancelledResult)
-      }
-      
-      request.completion(
-        .success([
-          "pointer": Int64(Int(bitPattern: buffer.data)),
-          "width": Int64(buffer.width),
-          "height": Int64(buffer.height),
-          "rowBytes": Int64(buffer.rowBytes),
-        ]))
-    } catch {
-      return request.completion(.failure(PigeonError(code: "", message: "Failed to convert image for request: \(error)", details: nil)))
-    }
-  }
-  
-  @inline(__always) func get(taskId: Int) -> RemoteImageRequest? {
-    Self.requestQueue.sync { Self.requestByTaskId[taskId] }
-  }
-  
-  @inline(__always) func add(taskId: Int, request: RemoteImageRequest) -> Void {
-    Self.requestQueue.async(flags: .barrier) {
-      Self.requestByTaskId[taskId] = request
-      Self.taskIdByRequestId[request.id] = taskId
-    }
-  }
-  
-  @inline(__always) func remove(taskId: Int, requestId: Int64) -> Void {
-    Self.requestQueue.async(flags: .barrier) {
-      Self.taskIdByRequestId[requestId] = nil
-      Self.requestByTaskId[taskId] = nil
-    }
-  }
-  
-  @inline(__always) func cancel(requestId: Int64) -> Void {
-    guard let request: RemoteImageRequest = (Self.requestQueue.sync {
-      guard let taskId = Self.taskIdByRequestId[requestId] else { return nil }
-      return Self.requestByTaskId[taskId]
-    }) else { return }
-    request.isCancelled = true
-    request.task?.cancel()
-  }
-}

mobile/ios/Runner/Images/Thumbnails.g.swift

@@ -47,41 +47,41 @@ private func nilOrValue<T>(_ value: Any?) -> T? {
 }
 
 
-private class LocalImagesPigeonCodecReader: FlutterStandardReader {
+private class ThumbnailsPigeonCodecReader: FlutterStandardReader {
 }
 
-private class LocalImagesPigeonCodecWriter: FlutterStandardWriter {
+private class ThumbnailsPigeonCodecWriter: FlutterStandardWriter {
 }
 
-private class LocalImagesPigeonCodecReaderWriter: FlutterStandardReaderWriter {
+private class ThumbnailsPigeonCodecReaderWriter: FlutterStandardReaderWriter {
   override func reader(with data: Data) -> FlutterStandardReader {
-    return LocalImagesPigeonCodecReader(data: data)
+    return ThumbnailsPigeonCodecReader(data: data)
   }
 
   override func writer(with data: NSMutableData) -> FlutterStandardWriter {
-    return LocalImagesPigeonCodecWriter(data: data)
+    return ThumbnailsPigeonCodecWriter(data: data)
   }
 }
 
-class LocalImagesPigeonCodec: FlutterStandardMessageCodec, @unchecked Sendable {
-  static let shared = LocalImagesPigeonCodec(readerWriter: LocalImagesPigeonCodecReaderWriter())
+class ThumbnailsPigeonCodec: FlutterStandardMessageCodec, @unchecked Sendable {
+  static let shared = ThumbnailsPigeonCodec(readerWriter: ThumbnailsPigeonCodecReaderWriter())
 }
 
 
 /// Generated protocol from Pigeon that represents a handler of messages from Flutter.
-protocol LocalImageApi {
-  func requestImage(assetId: String, requestId: Int64, width: Int64, height: Int64, isVideo: Bool, completion: @escaping (Result<[String: Int64]?, Error>) -> Void)
-  func cancelRequest(requestId: Int64) throws
+protocol ThumbnailApi {
+  func requestImage(assetId: String, requestId: Int64, width: Int64, height: Int64, isVideo: Bool, completion: @escaping (Result<[String: Int64], Error>) -> Void)
+  func cancelImageRequest(requestId: Int64) throws
   func getThumbhash(thumbhash: String, completion: @escaping (Result<[String: Int64], Error>) -> Void)
 }
 
 /// Generated setup class from Pigeon to handle messages through the `binaryMessenger`.
-class LocalImageApiSetup {
-  static var codec: FlutterStandardMessageCodec { LocalImagesPigeonCodec.shared }
-  /// Sets up an instance of `LocalImageApi` to handle messages through the `binaryMessenger`.
-  static func setUp(binaryMessenger: FlutterBinaryMessenger, api: LocalImageApi?, messageChannelSuffix: String = "") {
+class ThumbnailApiSetup {
+  static var codec: FlutterStandardMessageCodec { ThumbnailsPigeonCodec.shared }
+  /// Sets up an instance of `ThumbnailApi` to handle messages through the `binaryMessenger`.
+  static func setUp(binaryMessenger: FlutterBinaryMessenger, api: ThumbnailApi?, messageChannelSuffix: String = "") {
     let channelSuffix = messageChannelSuffix.count > 0 ? ".\(messageChannelSuffix)" : ""
-    let requestImageChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.immich_mobile.LocalImageApi.requestImage\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec)
+    let requestImageChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.immich_mobile.ThumbnailApi.requestImage\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
       requestImageChannel.setMessageHandler { message, reply in
         let args = message as! [Any?]
@@ -102,22 +102,22 @@ class LocalImageApiSetup {
     } else {
       requestImageChannel.setMessageHandler(nil)
     }
-    let cancelRequestChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.immich_mobile.LocalImageApi.cancelRequest\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec)
+    let cancelImageRequestChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.immich_mobile.ThumbnailApi.cancelImageRequest\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
-      cancelRequestChannel.setMessageHandler { message, reply in
+      cancelImageRequestChannel.setMessageHandler { message, reply in
         let args = message as! [Any?]
         let requestIdArg = args[0] as! Int64
         do {
-          try api.cancelRequest(requestId: requestIdArg)
+          try api.cancelImageRequest(requestId: requestIdArg)
           reply(wrapResult(nil))
         } catch {
           reply(wrapError(error))
         }
       }
     } else {
-      cancelRequestChannel.setMessageHandler(nil)
+      cancelImageRequestChannel.setMessageHandler(nil)
     }
-    let getThumbhashChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.immich_mobile.LocalImageApi.getThumbhash\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec)
+    let getThumbhashChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.immich_mobile.ThumbnailApi.getThumbhash\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
       getThumbhashChannel.setMessageHandler { message, reply in
         let args = message as! [Any?]

mobile/ios/Runner/Images/ThumbnailsImpl.swift

@@ -1,19 +1,19 @@
-import Accelerate
+import CryptoKit
 import Flutter
 import MobileCoreServices
 import Photos
 
-class LocalImageRequest {
+class Request {
   weak var workItem: DispatchWorkItem?
   var isCancelled = false
-  let callback: (Result<[String: Int64]?, any Error>) -> Void
+  let callback: (Result<[String: Int64], any Error>) -> Void
   
-  init(callback: @escaping (Result<[String: Int64]?, any Error>) -> Void) {
+  init(callback: @escaping (Result<[String: Int64], any Error>) -> Void) {
     self.callback = callback
   }
 }
 
-class LocalImageApiImpl: LocalImageApi {
+class ThumbnailApiImpl: ThumbnailApi {
   private static let imageManager = PHImageManager.default()
   private static let fetchOptions = {
     let fetchOptions = PHFetchOptions()
@@ -36,39 +36,47 @@ class LocalImageApiImpl: LocalImageApi {
   private static let cancelQueue = DispatchQueue(label: "thumbnail.cancellation", qos: .default)
   private static let processingQueue = DispatchQueue(label: "thumbnail.processing", qos: .userInteractive, attributes: .concurrent)
   
-  private static var rgbaFormat = vImage_CGImageFormat(
-    bitsPerComponent: 8,
-    bitsPerPixel: 32,
-    colorSpace: CGColorSpaceCreateDeviceRGB(),
-    bitmapInfo: CGBitmapInfo(rawValue: CGImageAlphaInfo.premultipliedLast.rawValue),
-    renderingIntent: .defaultIntent
-  )!
-  private static var requests = [Int64: LocalImageRequest]()
-  private static let cancelledResult = Result<[String: Int64]?, any Error>.success(nil)
+  private static let rgbColorSpace = CGColorSpaceCreateDeviceRGB()
+  private static let bitmapInfo = CGBitmapInfo(rawValue: CGImageAlphaInfo.premultipliedLast.rawValue).rawValue
+  private static var requests = [Int64: Request]()
+  private static let cancelledResult = Result<[String: Int64], any Error>.success([:])
   private static let concurrencySemaphore = DispatchSemaphore(value: ProcessInfo.processInfo.activeProcessorCount * 2)
   private static let assetCache = {
     let assetCache = NSCache<NSString, PHAsset>()
     assetCache.countLimit = 10000
     return assetCache
   }()
+  private static let activitySemaphore = DispatchSemaphore(value: 1)
+  private static let willResignActiveObserver = NotificationCenter.default.addObserver(
+    forName: UIApplication.willResignActiveNotification,
+    object: nil,
+    queue: .main
+  ) { _ in
+    processingQueue.suspend()
+    activitySemaphore.wait()
+  }
+  private static let didBecomeActiveObserver = NotificationCenter.default.addObserver(
+    forName: UIApplication.didBecomeActiveNotification,
+    object: nil,
+    queue: .main
+  ) { _ in
+    processingQueue.resume()
+    activitySemaphore.signal()
+  }
   
   func getThumbhash(thumbhash: String, completion: @escaping (Result<[String : Int64], any Error>) -> Void) {
     Self.processingQueue.async {
       guard let data = Data(base64Encoded: thumbhash)
       else { return completion(.failure(PigeonError(code: "", message: "Invalid base64 string: \(thumbhash)", details: nil)))}
-      
+
       let (width, height, pointer) = thumbHashToRGBA(hash: data)
-      completion(.success([
-        "pointer": Int64(Int(bitPattern: pointer.baseAddress)),
-        "width": Int64(width),
-        "height": Int64(height),
-        "rowBytes": Int64(width * 4)
-      ]))
+      self.waitForActiveState()
+      completion(.success(["pointer": Int64(Int(bitPattern: pointer.baseAddress)), "width": Int64(width), "height": Int64(height)]))
     }
   }
   
-  func requestImage(assetId: String, requestId: Int64, width: Int64, height: Int64, isVideo: Bool, completion: @escaping (Result<[String: Int64]?, any Error>) -> Void) {
-    let request = LocalImageRequest(callback: completion)
+  func requestImage(assetId: String, requestId: Int64, width: Int64, height: Int64, isVideo: Bool, completion: @escaping (Result<[String: Int64], any Error>) -> Void) {
+    let request = Request(callback: completion)
     let item = DispatchWorkItem {
       if request.isCancelled {
         return completion(Self.cancelledResult)
@@ -85,7 +93,7 @@ class LocalImageApiImpl: LocalImageApi {
       
       guard let asset = Self.requestAsset(assetId: assetId)
       else {
-        Self.remove(requestId: requestId)
+        Self.removeRequest(requestId: requestId)
         completion(.failure(PigeonError(code: "", message: "Could not get asset data for \(assetId)", details: nil)))
         return
       }
@@ -111,54 +119,70 @@ class LocalImageApiImpl: LocalImageApi {
       
       guard let image = image,
             let cgImage = image.cgImage else {
-        Self.remove(requestId: requestId)
+        Self.removeRequest(requestId: requestId)
         return completion(.failure(PigeonError(code: "", message: "Could not get pixel data for \(assetId)", details: nil)))
       }
       
+      let pointer = UnsafeMutableRawPointer.allocate(
+        byteCount: Int(cgImage.width) * Int(cgImage.height) * 4,
+        alignment: MemoryLayout<UInt8>.alignment
+      )
+      
       if request.isCancelled {
+        pointer.deallocate()
         return completion(Self.cancelledResult)
       }
       
-      do {
-        let buffer = try vImage_Buffer(cgImage: cgImage, format: Self.rgbaFormat)
-        
-        if request.isCancelled {
-          buffer.free()
-          return completion(Self.cancelledResult)
-        }
-        
-        request.callback(.success([
-          "pointer": Int64(Int(bitPattern: buffer.data)),
-          "width": Int64(buffer.width),
-          "height": Int64(buffer.height),
-          "rowBytes": Int64(buffer.rowBytes)
-        ]))
-        print("Successful response for \(requestId)")
-        Self.remove(requestId: requestId)
-      } catch {
-        Self.remove(requestId: requestId)
-        return completion(.failure(PigeonError(code: "", message: "Failed to convert image for \(assetId): \(error)", details: nil)))
+      guard let context = CGContext(
+        data: pointer,
+        width: cgImage.width,
+        height: cgImage.height,
+        bitsPerComponent: 8,
+        bytesPerRow: cgImage.width * 4,
+        space: Self.rgbColorSpace,
+        bitmapInfo: Self.bitmapInfo
+      ) else {
+        pointer.deallocate()
+        Self.removeRequest(requestId: requestId)
+        return completion(.failure(PigeonError(code: "", message: "Could not create context for \(assetId)", details: nil)))
       }
+      
+      if request.isCancelled {
+        pointer.deallocate()
+        return completion(Self.cancelledResult)
+      }
+      
+      context.interpolationQuality = .none
+      context.draw(cgImage, in: CGRect(x: 0, y: 0, width: cgImage.width, height: cgImage.height))
+      
+      if request.isCancelled {
+        pointer.deallocate()
+        return completion(Self.cancelledResult)
+      }
+      
+      self.waitForActiveState()
+      completion(.success(["pointer": Int64(Int(bitPattern: pointer)), "width": Int64(cgImage.width), "height": Int64(cgImage.height)]))
+      Self.removeRequest(requestId: requestId)
     }
     
     request.workItem = item
-    Self.add(requestId: requestId, request: request)
+    Self.addRequest(requestId: requestId, request: request)
     Self.processingQueue.async(execute: item)
   }
   
-  func cancelRequest(requestId: Int64) {
-    Self.cancel(requestId: requestId)
+  func cancelImageRequest(requestId: Int64) {
+    Self.cancelRequest(requestId: requestId)
   }
   
-  private static func add(requestId: Int64, request: LocalImageRequest) -> Void {
+  private static func addRequest(requestId: Int64, request: Request) -> Void {
     requestQueue.sync { requests[requestId] = request }
   }
   
-  private static func remove(requestId: Int64) -> Void {
+  private static func removeRequest(requestId: Int64) -> Void {
     requestQueue.sync { requests[requestId] = nil }
   }
   
-  private static func cancel(requestId: Int64) -> Void {
+  private static func cancelRequest(requestId: Int64) -> Void {
     requestQueue.async {
       guard let request = requests.removeValue(forKey: requestId) else { return }
       request.isCancelled = true
@@ -179,4 +203,9 @@ class LocalImageApiImpl: LocalImageApi {
     assetQueue.async { assetCache.setObject(asset, forKey: assetId as NSString) }
     return asset
   }
+  
+  func waitForActiveState() {
+    Self.activitySemaphore.wait()
+    Self.activitySemaphore.signal()
+  }
 }

mobile/ios/Runner/Sync/Messages.g.swift

@@ -312,39 +312,6 @@ struct HashResult: Hashable {
   }
 }
 
-/// Generated class from Pigeon that represents data sent in messages.
-struct CloudIdResult: Hashable {
-  var assetId: String
-  var error: String? = nil
-  var cloudId: String? = nil
-
-
-  // swift-format-ignore: AlwaysUseLowerCamelCase
-  static func fromList(_ pigeonVar_list: [Any?]) -> CloudIdResult? {
-    let assetId = pigeonVar_list[0] as! String
-    let error: String? = nilOrValue(pigeonVar_list[1])
-    let cloudId: String? = nilOrValue(pigeonVar_list[2])
-
-    return CloudIdResult(
-      assetId: assetId,
-      error: error,
-      cloudId: cloudId
-    )
-  }
-  func toList() -> [Any?] {
-    return [
-      assetId,
-      error,
-      cloudId,
-    ]
-  }
-  static func == (lhs: CloudIdResult, rhs: CloudIdResult) -> Bool {
-    return deepEqualsMessages(lhs.toList(), rhs.toList())  }
-  func hash(into hasher: inout Hasher) {
-    deepHashMessages(value: toList(), hasher: &hasher)
-  }
-}
-
 private class MessagesPigeonCodecReader: FlutterStandardReader {
   override func readValue(ofType type: UInt8) -> Any? {
     switch type {
@@ -356,8 +323,6 @@ private class MessagesPigeonCodecReader: FlutterStandardReader {
       return SyncDelta.fromList(self.readValue() as! [Any?])
     case 132:
       return HashResult.fromList(self.readValue() as! [Any?])
-    case 133:
-      return CloudIdResult.fromList(self.readValue() as! [Any?])
     default:
       return super.readValue(ofType: type)
     }
@@ -378,9 +343,6 @@ private class MessagesPigeonCodecWriter: FlutterStandardWriter {
     } else if let value = value as? HashResult {
       super.writeByte(132)
       super.writeValue(value.toList())
-    } else if let value = value as? CloudIdResult {
-      super.writeByte(133)
-      super.writeValue(value.toList())
     } else {
       super.writeValue(value)
     }
@@ -415,7 +377,6 @@ protocol NativeSyncApi {
   func hashAssets(assetIds: [String], allowNetworkAccess: Bool, completion: @escaping (Result<[HashResult], Error>) -> Void)
   func cancelHashing() throws
   func getTrashedAssets() throws -> [String: [PlatformAsset]]
-  func getCloudIdForAssetIds(assetIds: [String]) throws -> [CloudIdResult]
 }
 
 /// Generated setup class from Pigeon to handle messages through the `binaryMessenger`.
@@ -599,22 +560,5 @@ class NativeSyncApiSetup {
     } else {
       getTrashedAssetsChannel.setMessageHandler(nil)
     }
-    let getCloudIdForAssetIdsChannel = taskQueue == nil
-      ? FlutterBasicMessageChannel(name: "dev.flutter.pigeon.immich_mobile.NativeSyncApi.getCloudIdForAssetIds\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec)
-      : FlutterBasicMessageChannel(name: "dev.flutter.pigeon.immich_mobile.NativeSyncApi.getCloudIdForAssetIds\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec, taskQueue: taskQueue)
-    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)
-    }
   }
 }

mobile/ios/Runner/Sync/MessagesImpl.swift

@@ -19,31 +19,31 @@ struct AssetWrapper: Hashable, Equatable {
 
 class NativeSyncApiImpl: ImmichPlugin, NativeSyncApi, FlutterPlugin {
   static let name = "NativeSyncApi"
-  
+
   static func register(with registrar: any FlutterPluginRegistrar) {
     let instance = NativeSyncApiImpl()
     NativeSyncApiSetup.setUp(binaryMessenger: registrar.messenger(), api: instance)
     registrar.publish(instance)
   }
-  
+
   func detachFromEngine(for registrar: any FlutterPluginRegistrar) {
     super.detachFromEngine()
   }
-  
+
   private let defaults: UserDefaults
   private let changeTokenKey = "immich:changeToken"
   private let albumTypes: [PHAssetCollectionType] = [.album, .smartAlbum]
   private let recoveredAlbumSubType = 1000000219
-  
+
   private var hashTask: Task<Void?, Error>?
   private static let hashCancelledCode = "HASH_CANCELLED"
   private static let hashCancelled = Result<[HashResult], Error>.failure(PigeonError(code: hashCancelledCode, message: "Hashing cancelled", details: nil))
-  
-  
+
+
   init(with defaults: UserDefaults = .standard) {
     self.defaults = defaults
   }
-  
+
   @available(iOS 16, *)
   private func getChangeToken() -> PHPersistentChangeToken? {
     guard let data = defaults.data(forKey: changeTokenKey) else {
@@ -51,7 +51,7 @@ class NativeSyncApiImpl: ImmichPlugin, NativeSyncApi, FlutterPlugin {
     }
     return try? NSKeyedUnarchiver.unarchivedObject(ofClass: PHPersistentChangeToken.self, from: data)
   }
-  
+
   @available(iOS 16, *)
   private func saveChangeToken(token: PHPersistentChangeToken) -> Void {
     guard let data = try? NSKeyedArchiver.archivedData(withRootObject: token, requiringSecureCoding: true) else {
@@ -59,18 +59,18 @@ class NativeSyncApiImpl: ImmichPlugin, NativeSyncApi, FlutterPlugin {
     }
     defaults.set(data, forKey: changeTokenKey)
   }
-  
+
   func clearSyncCheckpoint() -> Void {
     defaults.removeObject(forKey: changeTokenKey)
   }
-  
+
   func checkpointSync() {
     guard #available(iOS 16, *) else {
       return
     }
     saveChangeToken(token: PHPhotoLibrary.shared().currentChangeToken)
   }
-  
+
   func shouldFullSync() -> Bool {
     guard #available(iOS 16, *),
           PHPhotoLibrary.authorizationStatus(for: .readWrite) == .authorized,
@@ -78,36 +78,36 @@ class NativeSyncApiImpl: ImmichPlugin, NativeSyncApi, FlutterPlugin {
       // When we do not have access to photo library, older iOS version or No token available, fallback to full sync
       return true
     }
-    
+
     guard let _ = try? PHPhotoLibrary.shared().fetchPersistentChanges(since: storedToken) else {
       // Cannot fetch persistent changes
       return true
     }
-    
+
     return false
   }
-  
+
   func getAlbums() throws -> [PlatformAlbum] {
     var albums: [PlatformAlbum] = []
-    
+
     albumTypes.forEach { type in
       let collections = PHAssetCollection.fetchAssetCollections(with: type, subtype: .any, options: nil)
       for i in 0..<collections.count {
         let album = collections.object(at: i)
-        
+
         // Ignore recovered album
         if(album.assetCollectionSubtype.rawValue == self.recoveredAlbumSubType) {
           continue;
         }
-        
+
         let options = PHFetchOptions()
         options.sortDescriptors = [NSSortDescriptor(key: "modificationDate", ascending: false)]
         options.includeHiddenAssets = false
-        
+
         let assets = getAssetsFromAlbum(in: album, options: options)
-        
+
         let isCloud = album.assetCollectionSubtype == .albumCloudShared || album.assetCollectionSubtype == .albumMyPhotoStream
-        
+
         var domainAlbum = PlatformAlbum(
           id: album.localIdentifier,
           name: album.localizedTitle!,
@@ -115,57 +115,57 @@ class NativeSyncApiImpl: ImmichPlugin, NativeSyncApi, FlutterPlugin {
           isCloud: isCloud,
           assetCount: Int64(assets.count)
         )
-        
+
         if let firstAsset = assets.firstObject {
           domainAlbum.updatedAt = firstAsset.modificationDate.map { Int64($0.timeIntervalSince1970) }
         }
-        
+
         albums.append(domainAlbum)
       }
     }
     return albums.sorted { $0.id < $1.id }
   }
-  
+
   func getMediaChanges() throws -> SyncDelta {
     guard #available(iOS 16, *) else {
       throw PigeonError(code: "UNSUPPORTED_OS", message: "This feature requires iOS 16 or later.", details: nil)
     }
-    
+
     guard PHPhotoLibrary.authorizationStatus(for: .readWrite) == .authorized else {
       throw PigeonError(code: "NO_AUTH", message: "No photo library access", details: nil)
     }
-    
+
     guard let storedToken = getChangeToken() else {
       // No token exists, definitely need a full sync
       print("MediaManager::getMediaChanges: No token found")
       throw PigeonError(code: "NO_TOKEN", message: "No stored change token", details: nil)
     }
-    
+
     let currentToken = PHPhotoLibrary.shared().currentChangeToken
     if storedToken == currentToken {
       return SyncDelta(hasChanges: false, updates: [], deletes: [], assetAlbums: [:])
     }
-    
+
     do {
       let changes = try PHPhotoLibrary.shared().fetchPersistentChanges(since: storedToken)
-      
+
       var updatedAssets: Set<AssetWrapper> = []
       var deletedAssets: Set<String> = []
-      
+
       for change in changes {
         guard let details = try? change.changeDetails(for: PHObjectType.asset) else { continue }
-        
+
         let updated = details.updatedLocalIdentifiers.union(details.insertedLocalIdentifiers)
         deletedAssets.formUnion(details.deletedLocalIdentifiers)
-        
+
         if (updated.isEmpty) { continue }
-        
+
         let options = PHFetchOptions()
         options.includeHiddenAssets = false
         let result = PHAsset.fetchAssets(withLocalIdentifiers: Array(updated), options: options)
         for i in 0..<result.count {
           let asset = result.object(at: i)
-          
+
           // Asset wrapper only uses the id for comparison. Multiple change can contain the same asset, skip duplicate changes
           let predicate = PlatformAsset(
             id: asset.localIdentifier,
@@ -178,25 +178,25 @@ class NativeSyncApiImpl: ImmichPlugin, NativeSyncApi, FlutterPlugin {
           if (updatedAssets.contains(AssetWrapper(with: predicate))) {
             continue
           }
-          
+
           let domainAsset = AssetWrapper(with: asset.toPlatformAsset())
           updatedAssets.insert(domainAsset)
         }
       }
-      
+
       let updates = Array(updatedAssets.map { $0.asset })
       return SyncDelta(hasChanges: true, updates: updates, deletes: Array(deletedAssets), assetAlbums: buildAssetAlbumsMap(assets: updates))
     }
   }
-  
-  
+
+
   private func buildAssetAlbumsMap(assets: Array<PlatformAsset>) -> [String: [String]] {
     guard !assets.isEmpty else {
       return [:]
     }
-    
+
     var albumAssets: [String: [String]] = [:]
-    
+
     for type in albumTypes {
       let collections = PHAssetCollection.fetchAssetCollections(with: type, subtype: .any, options: nil)
       collections.enumerateObjects { (album, _, _) in
@@ -211,13 +211,13 @@ class NativeSyncApiImpl: ImmichPlugin, NativeSyncApi, FlutterPlugin {
     }
     return albumAssets
   }
-  
+
   func getAssetIdsForAlbum(albumId: String) throws -> [String] {
     let collections = PHAssetCollection.fetchAssetCollections(withLocalIdentifiers: [albumId], options: nil)
     guard let album = collections.firstObject else {
       return []
     }
-    
+
     var ids: [String] = []
     let options = PHFetchOptions()
     options.includeHiddenAssets = false
@@ -227,13 +227,13 @@ class NativeSyncApiImpl: ImmichPlugin, NativeSyncApi, FlutterPlugin {
     }
     return ids
   }
-  
+
   func getAssetsCountSince(albumId: String, timestamp: Int64) throws -> Int64 {
     let collections = PHAssetCollection.fetchAssetCollections(withLocalIdentifiers: [albumId], options: nil)
     guard let album = collections.firstObject else {
       return 0
     }
-    
+
     let date = NSDate(timeIntervalSince1970: TimeInterval(timestamp))
     let options = PHFetchOptions()
     options.predicate = NSPredicate(format: "creationDate > %@ OR modificationDate > %@", date, date)
@@ -241,32 +241,32 @@ class NativeSyncApiImpl: ImmichPlugin, NativeSyncApi, FlutterPlugin {
     let assets = getAssetsFromAlbum(in: album, options: options)
     return Int64(assets.count)
   }
-  
+
   func getAssetsForAlbum(albumId: String, updatedTimeCond: Int64?) throws -> [PlatformAsset] {
     let collections = PHAssetCollection.fetchAssetCollections(withLocalIdentifiers: [albumId], options: nil)
     guard let album = collections.firstObject else {
       return []
     }
-    
+
     let options = PHFetchOptions()
     options.includeHiddenAssets = false
     if(updatedTimeCond != nil) {
       let date = NSDate(timeIntervalSince1970: TimeInterval(updatedTimeCond!))
       options.predicate = NSPredicate(format: "creationDate > %@ OR modificationDate > %@", date, date)
     }
-    
+
     let result = getAssetsFromAlbum(in: album, options: options)
     if(result.count == 0) {
       return []
     }
-    
+
     var assets: [PlatformAsset] = []
     result.enumerateObjects { (asset, _, _) in
       assets.append(asset.toPlatformAsset())
     }
     return assets
   }
-  
+
   func hashAssets(assetIds: [String], allowNetworkAccess: Bool, completion: @escaping (Result<[HashResult], Error>) -> Void) {
     if let prevTask = hashTask {
       prevTask.cancel()
@@ -284,11 +284,11 @@ class NativeSyncApiImpl: ImmichPlugin, NativeSyncApi, FlutterPlugin {
         missingAssetIds.remove(asset.localIdentifier)
         assets.append(asset)
       }
-      
+
       if Task.isCancelled {
         return self?.completeWhenActive(for: completion, with: Self.hashCancelled)
       }
-      
+
       await withTaskGroup(of: HashResult?.self) { taskGroup in
         var results = [HashResult]()
         results.reserveCapacity(assets.count)
@@ -301,28 +301,28 @@ class NativeSyncApiImpl: ImmichPlugin, NativeSyncApi, FlutterPlugin {
             return await self.hashAsset(asset, allowNetworkAccess: allowNetworkAccess)
           }
         }
-        
+
         for await result in taskGroup {
           guard let result = result else {
             return self?.completeWhenActive(for: completion, with: Self.hashCancelled)
           }
           results.append(result)
         }
-        
+
         for missing in missingAssetIds {
           results.append(HashResult(assetId: missing, error: "Asset not found in library", hash: nil))
         }
-        
+
         return self?.completeWhenActive(for: completion, with: .success(results))
       }
     }
   }
-  
+
   func cancelHashing() {
     hashTask?.cancel()
     hashTask = nil
   }
-  
+
   private func hashAsset(_ asset: PHAsset, allowNetworkAccess: Bool) async -> HashResult? {
     class RequestRef {
       var id: PHAssetResourceDataRequestID?
@@ -332,21 +332,21 @@ class NativeSyncApiImpl: ImmichPlugin, NativeSyncApi, FlutterPlugin {
       if Task.isCancelled {
         return nil
       }
-      
+
       guard let resource = asset.getResource() else {
         return HashResult(assetId: asset.localIdentifier, error: "Cannot get asset resource", hash: nil)
       }
-      
+
       if Task.isCancelled {
         return nil
       }
-      
+
       let options = PHAssetResourceRequestOptions()
       options.isNetworkAccessAllowed = allowNetworkAccess
-      
+
       return await withCheckedContinuation { continuation in
         var hasher = Insecure.SHA1()
-        
+
         requestRef.id = PHAssetResourceManager.default().requestData(
           for: resource,
           options: options,
@@ -377,11 +377,11 @@ class NativeSyncApiImpl: ImmichPlugin, NativeSyncApi, FlutterPlugin {
       PHAssetResourceManager.default().cancelDataRequest(requestId)
     })
   }
-  
+
   func getTrashedAssets() throws -> [String: [PlatformAsset]] {
     throw PigeonError(code: "UNSUPPORTED_OS", message: "This feature not supported on iOS.", details: nil)
   }
-  
+
   private func getAssetsFromAlbum(in album: PHAssetCollection, options: PHFetchOptions) -> PHFetchResult<PHAsset> {
     // Ensure to actually getting all assets for the Recents album
     if (album.assetCollectionSubtype == .smartAlbumUserLibrary) {
@@ -390,28 +390,4 @@ class NativeSyncApiImpl: ImmichPlugin, NativeSyncApi, FlutterPlugin {
       return PHAsset.fetchAssets(in: album, options: options)
     }
   }
-  
-  func getCloudIdForAssetIds(assetIds: [String]) throws -> [CloudIdResult] {
-    guard #available(iOS 16, *) else {
-      return assetIds.map { CloudIdResult(assetId: $0) }
-    }
-    
-    var mappings: [CloudIdResult] = []
-    let result = PHPhotoLibrary.shared().cloudIdentifierMappings(forLocalIdentifiers: assetIds)
-    for (key, value) in result {
-      switch value {
-      case .success(let cloudIdentifier):
-        let cloudId = cloudIdentifier.stringValue
-        // Ignores invalid cloud ids of the format "GUID:ID:". Valid Ids are of the form "GUID:ID:HASH"
-        if !cloudId.hasSuffix(":") {
-          mappings.append(CloudIdResult(assetId: key, cloudId: cloudId))
-        } else {
-          mappings.append(CloudIdResult(assetId: key, error: "Incomplete Cloud Id: \(cloudId)"))
-        }
-      case .failure(let error):
-        mappings.append(CloudIdResult(assetId: key, error: "Error getting Cloud Id: \(error.localizedDescription)"))
-      }
-    }
-    return mappings;
-  }
 }

mobile/lib/constants/constants.dart

@@ -4,8 +4,6 @@ const int noDbId = -9223372036854775808; // from Isar
 const double downloadCompleted = -1;
 const double downloadFailed = -2;
 
-const String kMobileMetadataKey = "mobile-app";
-
 // Number of log entries to retain on app start
 const int kLogTruncateLimit = 2000;
 

mobile/lib/constants/locales.dart

@@ -51,4 +51,4 @@ const Map<String, Locale> locales = {
 
 const String translationsPath = 'assets/i18n';
 
-const List<Locale> localesNotSupportedByAppFont = [Locale('el', 'GR'), Locale('sr', 'Cyrl')];
+const List<Locale> localesNotSupportedByOverpass = [Locale('el', 'GR'), Locale('sr', 'Cyrl')];

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

@@ -1,62 +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;
-  final String? createdAt;
-  final String? adjustmentTime;
-  final String? latitude;
-  final String? longitude;
-
-  const RemoteAssetMobileAppMetadata({
-    this.cloudId,
-    this.createdAt,
-    this.adjustmentTime,
-    this.latitude,
-    this.longitude,
-  });
-
-  @override
-  Map<String, dynamic> toJson() {
-    final map = <String, Object?>{};
-    if (cloudId != null) {
-      map["iCloudId"] = cloudId;
-    }
-    if (createdAt != null) {
-      map["createdAt"] = createdAt;
-    }
-    if (adjustmentTime != null) {
-      map["adjustmentTime"] = adjustmentTime;
-    }
-    if (latitude != null) {
-      map["latitude"] = latitude;
-    }
-    if (longitude != null) {
-      map["longitude"] = longitude;
-    }
-
-    return map;
-  }
-}

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

@@ -3,7 +3,6 @@ part of 'base_asset.model.dart';
 class LocalAsset extends BaseAsset {
   final String id;
   final String? remoteAssetId;
-  final String? cloudId;
   final int orientation;
 
   final DateTime? adjustmentTime;
@@ -13,7 +12,6 @@ class LocalAsset extends BaseAsset {
   const LocalAsset({
     required this.id,
     String? remoteId,
-    this.cloudId,
     required super.name,
     super.checksum,
     required super.type,
@@ -55,14 +53,12 @@ class LocalAsset extends BaseAsset {
    width: ${width ?? "<NA>"},
    height: ${height ?? "<NA>"},
    durationInSeconds: ${durationInSeconds ?? "<NA>"},
-   remoteId: ${remoteId ?? "<NA>"},
-   cloudId: ${cloudId ?? "<NA>"},
-   checksum: ${checksum ?? "<NA>"},
+   remoteId: ${remoteId ?? "<NA>"}
    isFavorite: $isFavorite,
-   orientation: $orientation,
-   adjustmentTime: $adjustmentTime,
-   latitude: ${latitude ?? "<NA>"},
-   longitude: ${longitude ?? "<NA>"},
+  orientation: $orientation,
+  adjustmentTime: $adjustmentTime,
+  latitude: ${latitude ?? "<NA>"},
+  longitude: ${longitude ?? "<NA>"},
  }''';
   }
 
@@ -73,7 +69,6 @@ class LocalAsset extends BaseAsset {
     if (identical(this, other)) return true;
     return super == other &&
         id == other.id &&
-        cloudId == other.cloudId &&
         orientation == other.orientation &&
         adjustmentTime == other.adjustmentTime &&
         latitude == other.latitude &&
@@ -93,7 +88,6 @@ class LocalAsset extends BaseAsset {
   LocalAsset copyWith({
     String? id,
     String? remoteId,
-    String? cloudId,
     String? name,
     String? checksum,
     AssetType? type,
@@ -111,7 +105,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,

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

@@ -9,6 +9,7 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/constants/constants.dart';
 import 'package:immich_mobile/domain/services/log.service.dart';
 import 'package:immich_mobile/entities/store.entity.dart';
+import 'package:immich_mobile/extensions/network_capability_extensions.dart';
 import 'package:immich_mobile/extensions/platform_extensions.dart';
 import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/logger_db.repository.dart';
@@ -19,13 +20,13 @@ import 'package:immich_mobile/providers/background_sync.provider.dart';
 import 'package:immich_mobile/providers/backup/drift_backup.provider.dart';
 import 'package:immich_mobile/providers/db.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/db.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/platform.provider.dart' show nativeSyncApiProvider;
+import 'package:immich_mobile/providers/infrastructure/platform.provider.dart';
 import 'package:immich_mobile/providers/user.provider.dart';
 import 'package:immich_mobile/repositories/file_media.repository.dart';
 import 'package:immich_mobile/services/app_settings.service.dart';
 import 'package:immich_mobile/services/auth.service.dart';
 import 'package:immich_mobile/services/localization.service.dart';
-import 'package:immich_mobile/services/foreground_upload.service.dart';
+import 'package:immich_mobile/services/upload.service.dart';
 import 'package:immich_mobile/utils/bootstrap.dart';
 import 'package:immich_mobile/utils/debug_print.dart';
 import 'package:immich_mobile/utils/http_ssl_options.dart';
@@ -242,12 +243,13 @@ class BackgroundWorkerBgService extends BackgroundWorkerFlutterApi {
         }
 
         if (Platform.isIOS) {
-          return _ref?.read(driftBackupProvider.notifier).startBackupWithURLSession(currentUser.id);
+          return _ref?.read(driftBackupProvider.notifier).handleBackupResume(currentUser.id);
         }
 
+        final networkCapabilities = await _ref?.read(connectivityApiProvider).getCapabilities() ?? [];
         return _ref
-            ?.read(foregroundUploadServiceProvider)
-            .uploadCandidates(currentUser.id, _cancellationToken, useSequentialUpload: true);
+            ?.read(uploadServiceProvider)
+            .startBackupWithHttpClient(currentUser.id, networkCapabilities.isUnmetered, _cancellationToken);
       },
       (error, stack) {
         dPrint(() => "Error in backup zone $error, $stack");

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

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

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

@@ -8,7 +8,6 @@ import 'package:immich_mobile/domain/models/store.model.dart';
 import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:immich_mobile/extensions/platform_extensions.dart';
 import 'package:immich_mobile/infrastructure/repositories/local_album.repository.dart';
-import 'package:immich_mobile/infrastructure/repositories/local_asset.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/storage.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/trashed_local_asset.repository.dart';
 import 'package:immich_mobile/platform/native_sync_api.g.dart';
@@ -19,7 +18,6 @@ import 'package:logging/logging.dart';
 
 class LocalSyncService {
   final DriftLocalAlbumRepository _localAlbumRepository;
-  final DriftLocalAssetRepository _localAssetRepository;
   final NativeSyncApi _nativeSyncApi;
   final DriftTrashedLocalAssetRepository _trashedLocalAssetRepository;
   final LocalFilesManagerRepository _localFilesManager;
@@ -28,13 +26,11 @@ class LocalSyncService {
 
   LocalSyncService({
     required DriftLocalAlbumRepository localAlbumRepository,
-    required DriftLocalAssetRepository localAssetRepository,
     required DriftTrashedLocalAssetRepository trashedLocalAssetRepository,
     required LocalFilesManagerRepository localFilesManager,
     required StorageRepository storageRepository,
     required NativeSyncApi nativeSyncApi,
   }) : _localAlbumRepository = localAlbumRepository,
-       _localAssetRepository = localAssetRepository,
        _trashedLocalAssetRepository = trashedLocalAssetRepository,
        _localFilesManager = localFilesManager,
        _storageRepository = storageRepository,
@@ -51,12 +47,6 @@ class LocalSyncService {
           _log.warning("syncTrashedAssets cannot proceed because MANAGE_MEDIA permission is missing");
         }
       }
-
-      if (CurrentPlatform.isIOS) {
-        final assets = await _localAssetRepository.getEmptyCloudIdAssets();
-        await _mapIosCloudIds(assets);
-      }
-
       if (full || await _nativeSyncApi.shouldFullSync()) {
         _log.fine("Full sync request from ${full ? "user" : "native"}");
         return await fullSync();
@@ -73,9 +63,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,
       );
@@ -103,8 +92,6 @@ class LocalSyncService {
           }
           await updateAlbum(dbAlbum, album);
         }
-
-        await _mapIosCloudIds(newAssets);
       }
       await _nativeSyncApi.checkpointSync();
     } catch (e, s) {
@@ -143,12 +130,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);
@@ -218,16 +202,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);
@@ -259,7 +240,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;
       }
 
@@ -297,7 +277,6 @@ class LocalSyncService {
       }
 
       await _localAlbumRepository.upsert(updatedDeviceAlbum, toUpsert: assetsToUpsert, toDelete: assetsToDelete);
-      await _mapIosCloudIds(assetsToUpsert);
 
       return true;
     } catch (e, s) {
@@ -306,29 +285,6 @@ class LocalSyncService {
     return true;
   }
 
-  Future<void> _mapIosCloudIds(List<LocalAsset> assets) async {
-    if (!CurrentPlatform.isIOS || assets.isEmpty) {
-      return;
-    }
-
-    final assetIds = assets.map((a) => a.id).toList();
-    final cloudMapping = <String, String>{};
-    final cloudIds = await _nativeSyncApi.getCloudIdForAssetIds(assetIds);
-    for (int i = 0; i < cloudIds.length; i++) {
-      final cloudIdResult = cloudIds[i];
-      if (cloudIdResult.cloudId != null) {
-        cloudMapping[cloudIdResult.assetId] = cloudIdResult.cloudId!;
-      } else {
-        final asset = assets.firstWhereOrNull((a) => a.id == cloudIdResult.assetId);
-        _log.fine(
-          "Cannot fetch cloudId for asset with id: ${cloudIdResult.assetId}, name: ${asset?.name}, createdAt: ${asset?.createdAt}. Error: ${cloudIdResult.error ?? "unknown"}",
-        );
-      }
-    }
-
-    await _localAlbumRepository.updateCloudMapping(cloudMapping);
-  }
-
   bool _assetsEqual(LocalAsset a, LocalAsset b) {
     if (CurrentPlatform.isAndroid) {
       return a.updatedAt.isAtSameMomentAs(b.updatedAt) &&

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

@@ -118,10 +118,6 @@ class SyncStreamService {
         return _syncStreamRepository.deleteAssetsV1(data.cast());
       case SyncEntityType.assetExifV1:
         return _syncStreamRepository.updateAssetsExifV1(data.cast());
-      case SyncEntityType.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:

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';
@@ -23,13 +22,8 @@ class BackgroundSyncManager {
   final SyncCallback? onHashingComplete;
   final SyncErrorCallback? onHashingError;
 
-  final SyncCallback? onCloudIdSyncStart;
-  final SyncCallback? onCloudIdSyncComplete;
-  final SyncErrorCallback? onCloudIdSyncError;
-
   Cancelable<bool?>? _syncTask;
   Cancelable<void>? _syncWebsocketTask;
-  Cancelable<void>? _cloudIdSyncTask;
   Cancelable<void>? _deviceAlbumSyncTask;
   Cancelable<void>? _linkedAlbumSyncTask;
   Cancelable<void>? _hashTask;
@@ -44,9 +38,6 @@ class BackgroundSyncManager {
     this.onHashingStart,
     this.onHashingComplete,
     this.onHashingError,
-    this.onCloudIdSyncStart,
-    this.onCloudIdSyncComplete,
-    this.onCloudIdSyncError,
   });
 
   Future<void> cancel() async {
@@ -64,12 +55,6 @@ class BackgroundSyncManager {
     _syncWebsocketTask?.cancel();
     _syncWebsocketTask = null;
 
-    if (_cloudIdSyncTask != null) {
-      futures.add(_cloudIdSyncTask!.future);
-    }
-    _cloudIdSyncTask?.cancel();
-    _cloudIdSyncTask = null;
-
     if (_linkedAlbumSyncTask != null) {
       futures.add(_linkedAlbumSyncTask!.future);
     }
@@ -136,6 +121,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;
@@ -206,25 +192,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(

mobile/lib/domain/utils/migrate_cloud_ids.dart

@@ -1,175 +0,0 @@
-import 'package:drift/drift.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/extensions/platform_extensions.dart';
-import 'package:immich_mobile/infrastructure/entities/local_asset.entity.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/server_info.provider.dart';
-import 'package:immich_mobile/providers/user.provider.dart';
-import 'package:logging/logging.dart';
-// ignore: import_rule_openapi
-import 'package:openapi/api.dart' hide AssetVisibility;
-
-Future<void> syncCloudIds(ProviderContainer ref) async {
-  if (!CurrentPlatform.isIOS) {
-    return;
-  }
-  final logger = Logger('migrateCloudIds');
-
-  final db = ref.read(driftProvider);
-  // Populate cloud IDs for local assets that don't have one yet
-  await _populateCloudIds(db);
-
-  final serverInfo = await ref.read(serverInfoProvider.notifier).getServerInfo();
-  final canUpdateMetadata = serverInfo.serverVersion.isAtLeast(major: 2, minor: 4);
-  if (!canUpdateMetadata) {
-    logger.fine('Server version does not support asset metadata updates. Skipping cloudId migration.');
-    return;
-  }
-  final canBulkUpdateMetadata = serverInfo.serverVersion.isAtLeast(major: 2, minor: 5);
-
-  // Wait for remote sync to complete, so we have up-to-date asset metadata entries
-  try {
-    await ref.read(syncStreamServiceProvider).sync();
-  } catch (e, s) {
-    logger.fine('Failed to complete remote sync before cloudId migration.', e, s);
-    return;
-  }
-
-  // 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.warning('Current user is null. Aborting cloudId migration.');
-    return;
-  }
-
-  final mappingsToUpdate = await _fetchCloudIdMappings(db, currentUser.id);
-  // Deduplicate mappings as a single remote asset ID can match multiple local assets
-  final seenRemoteAssetIds = <String>{};
-  final uniqueMapping = mappingsToUpdate.where((mapping) {
-    if (!seenRemoteAssetIds.add(mapping.remoteAssetId)) {
-      logger.fine('Duplicate remote asset ID found: ${mapping.remoteAssetId}. Skipping duplicate entry.');
-      return false;
-    }
-    return true;
-  }).toList();
-
-  final assetApi = ref.read(apiServiceProvider).assetsApi;
-
-  if (canBulkUpdateMetadata) {
-    await _bulkUpdateCloudIds(assetApi, uniqueMapping);
-    return;
-  }
-  await _sequentialUpdateCloudIds(assetApi, uniqueMapping);
-}
-
-Future<void> _sequentialUpdateCloudIds(AssetsApi assetsApi, List<_CloudIdMapping> mappings) async {
-  for (final mapping in mappings) {
-    final item = AssetMetadataUpsertItemDto(
-      key: kMobileMetadataKey,
-      value: RemoteAssetMobileAppMetadata(
-        cloudId: mapping.localAsset.cloudId,
-        createdAt: mapping.localAsset.createdAt.toIso8601String(),
-        adjustmentTime: mapping.localAsset.adjustmentTime?.toIso8601String(),
-        latitude: mapping.localAsset.latitude?.toString(),
-        longitude: mapping.localAsset.longitude?.toString(),
-      ),
-    );
-    try {
-      await assetsApi.updateAssetMetadata(mapping.remoteAssetId, AssetMetadataUpsertDto(items: [item]));
-    } catch (error, stack) {
-      Logger('migrateCloudIds').warning('Failed to update metadata for asset ${mapping.remoteAssetId}', error, stack);
-    }
-  }
-}
-
-Future<void> _bulkUpdateCloudIds(AssetsApi assetsApi, List<_CloudIdMapping> mappings) async {
-  const batchSize = 10000;
-  for (int i = 0; i < mappings.length; i += batchSize) {
-    final endIndex = (i + batchSize > mappings.length) ? mappings.length : i + batchSize;
-    final batch = mappings.sublist(i, endIndex);
-    final items = <AssetMetadataBulkUpsertItemDto>[];
-    for (final mapping in batch) {
-      items.add(
-        AssetMetadataBulkUpsertItemDto(
-          assetId: mapping.remoteAssetId,
-          key: kMobileMetadataKey,
-          value: RemoteAssetMobileAppMetadata(
-            cloudId: mapping.localAsset.cloudId,
-            createdAt: mapping.localAsset.createdAt.toIso8601String(),
-            adjustmentTime: mapping.localAsset.adjustmentTime?.toIso8601String(),
-            latitude: mapping.localAsset.latitude?.toString(),
-            longitude: mapping.localAsset.longitude?.toString(),
-          ),
-        ),
-      );
-    }
-    try {
-      await assetsApi.updateBulkAssetMetadata(AssetMetadataBulkUpsertDto(items: items));
-    } catch (error, stack) {
-      Logger('migrateCloudIds').warning('Failed to bulk update metadata', 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 = <String, String>{};
-  final cloudIds = await NativeSyncApi().getCloudIdForAssetIds(ids);
-  for (int i = 0; i < cloudIds.length; i++) {
-    final cloudIdResult = cloudIds[i];
-    if (cloudIdResult.cloudId != null) {
-      cloudMapping[cloudIdResult.assetId] = cloudIdResult.cloudId!;
-    } else {
-      Logger('migrateCloudIds').fine(
-        "Cannot fetch cloudId for asset with id: ${cloudIdResult.assetId}. Error: ${cloudIdResult.error ?? "unknown"}",
-      );
-    }
-  }
-  await DriftLocalAlbumRepository(drift).updateCloudMapping(cloudMapping);
-}
-
-typedef _CloudIdMapping = ({String remoteAssetId, LocalAsset localAsset});
-
-Future<List<_CloudIdMapping>> _fetchCloudIdMappings(Drift drift, String userId) async {
-  final query =
-      drift.remoteAssetEntity.select().join([
-        leftOuterJoin(
-          drift.localAssetEntity,
-          drift.localAssetEntity.checksum.equalsExp(drift.remoteAssetEntity.checksum),
-        ),
-        leftOuterJoin(
-          drift.remoteAssetCloudIdEntity,
-          drift.remoteAssetEntity.id.equalsExp(drift.remoteAssetCloudIdEntity.assetId),
-          useColumns: false,
-        ),
-      ])..where(
-        // Only select assets that have a local cloud ID but either no remote cloud ID or a mismatched eTag
-        drift.localAssetEntity.id.isNotNull() &
-            drift.localAssetEntity.iCloudId.isNotNull() &
-            drift.remoteAssetEntity.ownerId.equals(userId) &
-            // Skip locked assets as we cannot update them without unlocking first
-            drift.remoteAssetEntity.visibility.isNotValue(AssetVisibility.locked.index) &
-            (drift.remoteAssetCloudIdEntity.cloudId.isNull() |
-                drift.remoteAssetCloudIdEntity.adjustmentTime.isNotExp(drift.localAssetEntity.adjustmentTime) |
-                drift.remoteAssetCloudIdEntity.latitude.isNotExp(drift.localAssetEntity.latitude) |
-                drift.remoteAssetCloudIdEntity.longitude.isNotExp(drift.localAssetEntity.longitude) |
-                drift.remoteAssetCloudIdEntity.createdAt.isNotExp(drift.localAssetEntity.createdAt)),
-      );
-  return query.map((row) {
-    return (
-      remoteAssetId: row.read(drift.remoteAssetEntity.id)!,
-      localAsset: row.readTable(drift.localAssetEntity).toDto(),
-    );
-  }).get();
-}

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()();
-
   DateTimeColumn get adjustmentTime => dateTime().nullable()();
 
   RealColumn get latitude => real().nullable()();
@@ -46,6 +43,5 @@ extension LocalAssetEntityDataDomainExtension on LocalAssetEntityData {
     adjustmentTime: adjustmentTime,
     latitude: latitude,
     longitude: longitude,
-    cloudId: iCloudId,
   );
 }

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,
       i0.Value<DateTime?> adjustmentTime,
       i0.Value<double?> latitude,
       i0.Value<double?> longitude,
@@ -39,7 +38,6 @@ typedef $$LocalAssetEntityTableUpdateCompanionBuilder =
       i0.Value<String?> checksum,
       i0.Value<bool> isFavorite,
       i0.Value<int> orientation,
-      i0.Value<String?> iCloudId,
       i0.Value<DateTime?> adjustmentTime,
       i0.Value<double?> latitude,
       i0.Value<double?> longitude,
@@ -110,11 +108,6 @@ class $$LocalAssetEntityTableFilterComposer
     builder: (column) => i0.ColumnFilters(column),
   );
 
-  i0.ColumnFilters<String> get iCloudId => $composableBuilder(
-    column: $table.iCloudId,
-    builder: (column) => i0.ColumnFilters(column),
-  );
-
   i0.ColumnFilters<DateTime> get adjustmentTime => $composableBuilder(
     column: $table.adjustmentTime,
     builder: (column) => i0.ColumnFilters(column),
@@ -195,11 +188,6 @@ class $$LocalAssetEntityTableOrderingComposer
     builder: (column) => i0.ColumnOrderings(column),
   );
 
-  i0.ColumnOrderings<String> get iCloudId => $composableBuilder(
-    column: $table.iCloudId,
-    builder: (column) => i0.ColumnOrderings(column),
-  );
-
   i0.ColumnOrderings<DateTime> get adjustmentTime => $composableBuilder(
     column: $table.adjustmentTime,
     builder: (column) => i0.ColumnOrderings(column),
@@ -264,9 +252,6 @@ class $$LocalAssetEntityTableAnnotationComposer
     builder: (column) => column,
   );
 
-  i0.GeneratedColumn<String> get iCloudId =>
-      $composableBuilder(column: $table.iCloudId, builder: (column) => column);
-
   i0.GeneratedColumn<DateTime> get adjustmentTime => $composableBuilder(
     column: $table.adjustmentTime,
     builder: (column) => column,
@@ -330,7 +315,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(),
                 i0.Value<DateTime?> adjustmentTime = const i0.Value.absent(),
                 i0.Value<double?> latitude = const i0.Value.absent(),
                 i0.Value<double?> longitude = const i0.Value.absent(),
@@ -346,7 +330,6 @@ class $$LocalAssetEntityTableTableManager
                 checksum: checksum,
                 isFavorite: isFavorite,
                 orientation: orientation,
-                iCloudId: iCloudId,
                 adjustmentTime: adjustmentTime,
                 latitude: latitude,
                 longitude: longitude,
@@ -364,7 +347,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(),
                 i0.Value<DateTime?> adjustmentTime = const i0.Value.absent(),
                 i0.Value<double?> latitude = const i0.Value.absent(),
                 i0.Value<double?> longitude = const i0.Value.absent(),
@@ -380,7 +362,6 @@ class $$LocalAssetEntityTableTableManager
                 checksum: checksum,
                 isFavorite: isFavorite,
                 orientation: orientation,
-                iCloudId: iCloudId,
                 adjustmentTime: adjustmentTime,
                 latitude: latitude,
                 longitude: longitude,
@@ -551,17 +532,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,
-  );
   static const i0.VerificationMeta _adjustmentTimeMeta =
       const i0.VerificationMeta('adjustmentTime');
   @override
@@ -608,7 +578,6 @@ class $LocalAssetEntityTable extends i3.LocalAssetEntity
     checksum,
     isFavorite,
     orientation,
-    iCloudId,
     adjustmentTime,
     latitude,
     longitude,
@@ -692,12 +661,6 @@ class $LocalAssetEntityTable extends i3.LocalAssetEntity
         ),
       );
     }
-    if (data.containsKey('i_cloud_id')) {
-      context.handle(
-        _iCloudIdMeta,
-        iCloudId.isAcceptableOrUnknown(data['i_cloud_id']!, _iCloudIdMeta),
-      );
-    }
     if (data.containsKey('adjustment_time')) {
       context.handle(
         _adjustmentTimeMeta,
@@ -777,10 +740,6 @@ class $LocalAssetEntityTable extends i3.LocalAssetEntity
         i0.DriftSqlType.int,
         data['${effectivePrefix}orientation'],
       )!,
-      iCloudId: attachedDatabase.typeMapping.read(
-        i0.DriftSqlType.string,
-        data['${effectivePrefix}i_cloud_id'],
-      ),
       adjustmentTime: attachedDatabase.typeMapping.read(
         i0.DriftSqlType.dateTime,
         data['${effectivePrefix}adjustment_time'],
@@ -822,7 +781,6 @@ class LocalAssetEntityData extends i0.DataClass
   final String? checksum;
   final bool isFavorite;
   final int orientation;
-  final String? iCloudId;
   final DateTime? adjustmentTime;
   final double? latitude;
   final double? longitude;
@@ -838,7 +796,6 @@ class LocalAssetEntityData extends i0.DataClass
     this.checksum,
     required this.isFavorite,
     required this.orientation,
-    this.iCloudId,
     this.adjustmentTime,
     this.latitude,
     this.longitude,
@@ -869,9 +826,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);
-    }
     if (!nullToAbsent || adjustmentTime != null) {
       map['adjustment_time'] = i0.Variable<DateTime>(adjustmentTime);
     }
@@ -903,7 +857,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']),
       adjustmentTime: serializer.fromJson<DateTime?>(json['adjustmentTime']),
       latitude: serializer.fromJson<double?>(json['latitude']),
       longitude: serializer.fromJson<double?>(json['longitude']),
@@ -926,7 +879,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),
       'adjustmentTime': serializer.toJson<DateTime?>(adjustmentTime),
       'latitude': serializer.toJson<double?>(latitude),
       'longitude': serializer.toJson<double?>(longitude),
@@ -945,7 +897,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(),
     i0.Value<DateTime?> adjustmentTime = const i0.Value.absent(),
     i0.Value<double?> latitude = const i0.Value.absent(),
     i0.Value<double?> longitude = const i0.Value.absent(),
@@ -963,7 +914,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,
     adjustmentTime: adjustmentTime.present
         ? adjustmentTime.value
         : this.adjustmentTime,
@@ -989,7 +939,6 @@ class LocalAssetEntityData extends i0.DataClass
       orientation: data.orientation.present
           ? data.orientation.value
           : this.orientation,
-      iCloudId: data.iCloudId.present ? data.iCloudId.value : this.iCloudId,
       adjustmentTime: data.adjustmentTime.present
           ? data.adjustmentTime.value
           : this.adjustmentTime,
@@ -1012,7 +961,6 @@ class LocalAssetEntityData extends i0.DataClass
           ..write('checksum: $checksum, ')
           ..write('isFavorite: $isFavorite, ')
           ..write('orientation: $orientation, ')
-          ..write('iCloudId: $iCloudId, ')
           ..write('adjustmentTime: $adjustmentTime, ')
           ..write('latitude: $latitude, ')
           ..write('longitude: $longitude')
@@ -1033,7 +981,6 @@ class LocalAssetEntityData extends i0.DataClass
     checksum,
     isFavorite,
     orientation,
-    iCloudId,
     adjustmentTime,
     latitude,
     longitude,
@@ -1053,7 +1000,6 @@ class LocalAssetEntityData extends i0.DataClass
           other.checksum == this.checksum &&
           other.isFavorite == this.isFavorite &&
           other.orientation == this.orientation &&
-          other.iCloudId == this.iCloudId &&
           other.adjustmentTime == this.adjustmentTime &&
           other.latitude == this.latitude &&
           other.longitude == this.longitude);
@@ -1072,7 +1018,6 @@ class LocalAssetEntityCompanion
   final i0.Value<String?> checksum;
   final i0.Value<bool> isFavorite;
   final i0.Value<int> orientation;
-  final i0.Value<String?> iCloudId;
   final i0.Value<DateTime?> adjustmentTime;
   final i0.Value<double?> latitude;
   final i0.Value<double?> longitude;
@@ -1088,7 +1033,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(),
     this.adjustmentTime = const i0.Value.absent(),
     this.latitude = const i0.Value.absent(),
     this.longitude = const i0.Value.absent(),
@@ -1105,7 +1049,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(),
     this.adjustmentTime = const i0.Value.absent(),
     this.latitude = const i0.Value.absent(),
     this.longitude = const i0.Value.absent(),
@@ -1124,7 +1067,6 @@ class LocalAssetEntityCompanion
     i0.Expression<String>? checksum,
     i0.Expression<bool>? isFavorite,
     i0.Expression<int>? orientation,
-    i0.Expression<String>? iCloudId,
     i0.Expression<DateTime>? adjustmentTime,
     i0.Expression<double>? latitude,
     i0.Expression<double>? longitude,
@@ -1141,7 +1083,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,
       if (adjustmentTime != null) 'adjustment_time': adjustmentTime,
       if (latitude != null) 'latitude': latitude,
       if (longitude != null) 'longitude': longitude,
@@ -1160,7 +1101,6 @@ class LocalAssetEntityCompanion
     i0.Value<String?>? checksum,
     i0.Value<bool>? isFavorite,
     i0.Value<int>? orientation,
-    i0.Value<String?>? iCloudId,
     i0.Value<DateTime?>? adjustmentTime,
     i0.Value<double?>? latitude,
     i0.Value<double?>? longitude,
@@ -1177,7 +1117,6 @@ class LocalAssetEntityCompanion
       checksum: checksum ?? this.checksum,
       isFavorite: isFavorite ?? this.isFavorite,
       orientation: orientation ?? this.orientation,
-      iCloudId: iCloudId ?? this.iCloudId,
       adjustmentTime: adjustmentTime ?? this.adjustmentTime,
       latitude: latitude ?? this.latitude,
       longitude: longitude ?? this.longitude,
@@ -1222,9 +1161,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);
-    }
     if (adjustmentTime.present) {
       map['adjustment_time'] = i0.Variable<DateTime>(adjustmentTime.value);
     }
@@ -1251,7 +1187,6 @@ class LocalAssetEntityCompanion
           ..write('checksum: $checksum, ')
           ..write('isFavorite: $isFavorite, ')
           ..write('orientation: $orientation, ')
-          ..write('iCloudId: $iCloudId, ')
           ..write('adjustmentTime: $adjustmentTime, ')
           ..write('latitude: $latitude, ')
           ..write('longitude: $longitude')
@@ -1259,8 +1194,3 @@ class LocalAssetEntityCompanion
         .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)',
-);

mobile/lib/infrastructure/entities/merged_asset.drift

@@ -21,11 +21,7 @@ SELECT
 	rae.owner_id,
 	rae.live_photo_video_id,
 	0 as orientation,
-	rae.stack_id,
-	NULL as i_cloud_id,
-	NULL as latitude,
-	NULL as longitude,
-	NULL as adjustmentTime
+	rae.stack_id
 FROM
 	remote_asset_entity rae
 LEFT JOIN
@@ -57,11 +53,7 @@ SELECT
 	NULL as owner_id,
 	NULL as live_photo_video_id,
 	lae.orientation,
-	NULL as stack_id,
-	lae.i_cloud_id,
-	lae.latitude,
-	lae.longitude,
-	lae.adjustment_time
+	NULL as stack_id
 FROM
 	local_asset_entity lae
 WHERE NOT EXISTS (

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, NULL AS latitude, NULL AS longitude, NULL AS adjustmentTime 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, lae.latitude, lae.longitude, lae.adjustment_time 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,10 +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'),
-        latitude: row.readNullable<double>('latitude'),
-        longitude: row.readNullable<double>('longitude'),
-        adjustmentTime: row.readNullable<DateTime>('adjustmentTime'),
       ),
     );
   }
@@ -133,10 +129,6 @@ class MergedAssetResult {
   final String? livePhotoVideoId;
   final int orientation;
   final String? stackId;
-  final String? iCloudId;
-  final double? latitude;
-  final double? longitude;
-  final DateTime? adjustmentTime;
   MergedAssetResult({
     this.remoteId,
     this.localId,
@@ -154,10 +146,6 @@ class MergedAssetResult {
     this.livePhotoVideoId,
     required this.orientation,
     this.stackId,
-    this.iCloudId,
-    this.latitude,
-    this.longitude,
-    this.adjustmentTime,
   });
 }
 

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

@@ -1,20 +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().nullable()();
-
-  DateTimeColumn get createdAt => dateTime().nullable()();
-
-  DateTimeColumn get adjustmentTime => dateTime().nullable()();
-
-  RealColumn get latitude => real().nullable()();
-
-  RealColumn get longitude => real().nullable()();
-
-  @override
-  Set<Column> get primaryKey => {assetId};
-}

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

@@ -1,826 +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,
-      i0.Value<DateTime?> createdAt,
-      i0.Value<DateTime?> adjustmentTime,
-      i0.Value<double?> latitude,
-      i0.Value<double?> longitude,
-    });
-typedef $$RemoteAssetCloudIdEntityTableUpdateCompanionBuilder =
-    i1.RemoteAssetCloudIdEntityCompanion Function({
-      i0.Value<String> assetId,
-      i0.Value<String?> cloudId,
-      i0.Value<DateTime?> createdAt,
-      i0.Value<DateTime?> adjustmentTime,
-      i0.Value<double?> latitude,
-      i0.Value<double?> longitude,
-    });
-
-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),
-  );
-
-  i0.ColumnFilters<DateTime> get createdAt => $composableBuilder(
-    column: $table.createdAt,
-    builder: (column) => i0.ColumnFilters(column),
-  );
-
-  i0.ColumnFilters<DateTime> get adjustmentTime => $composableBuilder(
-    column: $table.adjustmentTime,
-    builder: (column) => i0.ColumnFilters(column),
-  );
-
-  i0.ColumnFilters<double> get latitude => $composableBuilder(
-    column: $table.latitude,
-    builder: (column) => i0.ColumnFilters(column),
-  );
-
-  i0.ColumnFilters<double> get longitude => $composableBuilder(
-    column: $table.longitude,
-    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),
-  );
-
-  i0.ColumnOrderings<DateTime> get createdAt => $composableBuilder(
-    column: $table.createdAt,
-    builder: (column) => i0.ColumnOrderings(column),
-  );
-
-  i0.ColumnOrderings<DateTime> get adjustmentTime => $composableBuilder(
-    column: $table.adjustmentTime,
-    builder: (column) => i0.ColumnOrderings(column),
-  );
-
-  i0.ColumnOrderings<double> get latitude => $composableBuilder(
-    column: $table.latitude,
-    builder: (column) => i0.ColumnOrderings(column),
-  );
-
-  i0.ColumnOrderings<double> get longitude => $composableBuilder(
-    column: $table.longitude,
-    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);
-
-  i0.GeneratedColumn<DateTime> get createdAt =>
-      $composableBuilder(column: $table.createdAt, builder: (column) => column);
-
-  i0.GeneratedColumn<DateTime> get adjustmentTime => $composableBuilder(
-    column: $table.adjustmentTime,
-    builder: (column) => column,
-  );
-
-  i0.GeneratedColumn<double> get latitude =>
-      $composableBuilder(column: $table.latitude, builder: (column) => column);
-
-  i0.GeneratedColumn<double> get longitude =>
-      $composableBuilder(column: $table.longitude, 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(),
-                i0.Value<DateTime?> createdAt = const i0.Value.absent(),
-                i0.Value<DateTime?> adjustmentTime = const i0.Value.absent(),
-                i0.Value<double?> latitude = const i0.Value.absent(),
-                i0.Value<double?> longitude = const i0.Value.absent(),
-              }) => i1.RemoteAssetCloudIdEntityCompanion(
-                assetId: assetId,
-                cloudId: cloudId,
-                createdAt: createdAt,
-                adjustmentTime: adjustmentTime,
-                latitude: latitude,
-                longitude: longitude,
-              ),
-          createCompanionCallback:
-              ({
-                required String assetId,
-                i0.Value<String?> cloudId = const i0.Value.absent(),
-                i0.Value<DateTime?> createdAt = const i0.Value.absent(),
-                i0.Value<DateTime?> adjustmentTime = const i0.Value.absent(),
-                i0.Value<double?> latitude = const i0.Value.absent(),
-                i0.Value<double?> longitude = const i0.Value.absent(),
-              }) => i1.RemoteAssetCloudIdEntityCompanion.insert(
-                assetId: assetId,
-                cloudId: cloudId,
-                createdAt: createdAt,
-                adjustmentTime: adjustmentTime,
-                latitude: latitude,
-                longitude: longitude,
-              ),
-          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,
-  );
-  static const i0.VerificationMeta _createdAtMeta = const i0.VerificationMeta(
-    'createdAt',
-  );
-  @override
-  late final i0.GeneratedColumn<DateTime> createdAt =
-      i0.GeneratedColumn<DateTime>(
-        'created_at',
-        aliasedName,
-        true,
-        type: i0.DriftSqlType.dateTime,
-        requiredDuringInsert: false,
-      );
-  static const i0.VerificationMeta _adjustmentTimeMeta =
-      const i0.VerificationMeta('adjustmentTime');
-  @override
-  late final i0.GeneratedColumn<DateTime> adjustmentTime =
-      i0.GeneratedColumn<DateTime>(
-        'adjustment_time',
-        aliasedName,
-        true,
-        type: i0.DriftSqlType.dateTime,
-        requiredDuringInsert: false,
-      );
-  static const i0.VerificationMeta _latitudeMeta = const i0.VerificationMeta(
-    'latitude',
-  );
-  @override
-  late final i0.GeneratedColumn<double> latitude = i0.GeneratedColumn<double>(
-    'latitude',
-    aliasedName,
-    true,
-    type: i0.DriftSqlType.double,
-    requiredDuringInsert: false,
-  );
-  static const i0.VerificationMeta _longitudeMeta = const i0.VerificationMeta(
-    'longitude',
-  );
-  @override
-  late final i0.GeneratedColumn<double> longitude = i0.GeneratedColumn<double>(
-    'longitude',
-    aliasedName,
-    true,
-    type: i0.DriftSqlType.double,
-    requiredDuringInsert: false,
-  );
-  @override
-  List<i0.GeneratedColumn> get $columns => [
-    assetId,
-    cloudId,
-    createdAt,
-    adjustmentTime,
-    latitude,
-    longitude,
-  ];
-  @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),
-      );
-    }
-    if (data.containsKey('created_at')) {
-      context.handle(
-        _createdAtMeta,
-        createdAt.isAcceptableOrUnknown(data['created_at']!, _createdAtMeta),
-      );
-    }
-    if (data.containsKey('adjustment_time')) {
-      context.handle(
-        _adjustmentTimeMeta,
-        adjustmentTime.isAcceptableOrUnknown(
-          data['adjustment_time']!,
-          _adjustmentTimeMeta,
-        ),
-      );
-    }
-    if (data.containsKey('latitude')) {
-      context.handle(
-        _latitudeMeta,
-        latitude.isAcceptableOrUnknown(data['latitude']!, _latitudeMeta),
-      );
-    }
-    if (data.containsKey('longitude')) {
-      context.handle(
-        _longitudeMeta,
-        longitude.isAcceptableOrUnknown(data['longitude']!, _longitudeMeta),
-      );
-    }
-    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'],
-      ),
-      createdAt: attachedDatabase.typeMapping.read(
-        i0.DriftSqlType.dateTime,
-        data['${effectivePrefix}created_at'],
-      ),
-      adjustmentTime: attachedDatabase.typeMapping.read(
-        i0.DriftSqlType.dateTime,
-        data['${effectivePrefix}adjustment_time'],
-      ),
-      latitude: attachedDatabase.typeMapping.read(
-        i0.DriftSqlType.double,
-        data['${effectivePrefix}latitude'],
-      ),
-      longitude: attachedDatabase.typeMapping.read(
-        i0.DriftSqlType.double,
-        data['${effectivePrefix}longitude'],
-      ),
-    );
-  }
-
-  @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;
-  final DateTime? createdAt;
-  final DateTime? adjustmentTime;
-  final double? latitude;
-  final double? longitude;
-  const RemoteAssetCloudIdEntityData({
-    required this.assetId,
-    this.cloudId,
-    this.createdAt,
-    this.adjustmentTime,
-    this.latitude,
-    this.longitude,
-  });
-  @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);
-    }
-    if (!nullToAbsent || createdAt != null) {
-      map['created_at'] = i0.Variable<DateTime>(createdAt);
-    }
-    if (!nullToAbsent || adjustmentTime != null) {
-      map['adjustment_time'] = i0.Variable<DateTime>(adjustmentTime);
-    }
-    if (!nullToAbsent || latitude != null) {
-      map['latitude'] = i0.Variable<double>(latitude);
-    }
-    if (!nullToAbsent || longitude != null) {
-      map['longitude'] = i0.Variable<double>(longitude);
-    }
-    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']),
-      createdAt: serializer.fromJson<DateTime?>(json['createdAt']),
-      adjustmentTime: serializer.fromJson<DateTime?>(json['adjustmentTime']),
-      latitude: serializer.fromJson<double?>(json['latitude']),
-      longitude: serializer.fromJson<double?>(json['longitude']),
-    );
-  }
-  @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),
-      'createdAt': serializer.toJson<DateTime?>(createdAt),
-      'adjustmentTime': serializer.toJson<DateTime?>(adjustmentTime),
-      'latitude': serializer.toJson<double?>(latitude),
-      'longitude': serializer.toJson<double?>(longitude),
-    };
-  }
-
-  i1.RemoteAssetCloudIdEntityData copyWith({
-    String? assetId,
-    i0.Value<String?> cloudId = const i0.Value.absent(),
-    i0.Value<DateTime?> createdAt = const i0.Value.absent(),
-    i0.Value<DateTime?> adjustmentTime = const i0.Value.absent(),
-    i0.Value<double?> latitude = const i0.Value.absent(),
-    i0.Value<double?> longitude = const i0.Value.absent(),
-  }) => i1.RemoteAssetCloudIdEntityData(
-    assetId: assetId ?? this.assetId,
-    cloudId: cloudId.present ? cloudId.value : this.cloudId,
-    createdAt: createdAt.present ? createdAt.value : this.createdAt,
-    adjustmentTime: adjustmentTime.present
-        ? adjustmentTime.value
-        : this.adjustmentTime,
-    latitude: latitude.present ? latitude.value : this.latitude,
-    longitude: longitude.present ? longitude.value : this.longitude,
-  );
-  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,
-      createdAt: data.createdAt.present ? data.createdAt.value : this.createdAt,
-      adjustmentTime: data.adjustmentTime.present
-          ? data.adjustmentTime.value
-          : this.adjustmentTime,
-      latitude: data.latitude.present ? data.latitude.value : this.latitude,
-      longitude: data.longitude.present ? data.longitude.value : this.longitude,
-    );
-  }
-
-  @override
-  String toString() {
-    return (StringBuffer('RemoteAssetCloudIdEntityData(')
-          ..write('assetId: $assetId, ')
-          ..write('cloudId: $cloudId, ')
-          ..write('createdAt: $createdAt, ')
-          ..write('adjustmentTime: $adjustmentTime, ')
-          ..write('latitude: $latitude, ')
-          ..write('longitude: $longitude')
-          ..write(')'))
-        .toString();
-  }
-
-  @override
-  int get hashCode => Object.hash(
-    assetId,
-    cloudId,
-    createdAt,
-    adjustmentTime,
-    latitude,
-    longitude,
-  );
-  @override
-  bool operator ==(Object other) =>
-      identical(this, other) ||
-      (other is i1.RemoteAssetCloudIdEntityData &&
-          other.assetId == this.assetId &&
-          other.cloudId == this.cloudId &&
-          other.createdAt == this.createdAt &&
-          other.adjustmentTime == this.adjustmentTime &&
-          other.latitude == this.latitude &&
-          other.longitude == this.longitude);
-}
-
-class RemoteAssetCloudIdEntityCompanion
-    extends i0.UpdateCompanion<i1.RemoteAssetCloudIdEntityData> {
-  final i0.Value<String> assetId;
-  final i0.Value<String?> cloudId;
-  final i0.Value<DateTime?> createdAt;
-  final i0.Value<DateTime?> adjustmentTime;
-  final i0.Value<double?> latitude;
-  final i0.Value<double?> longitude;
-  const RemoteAssetCloudIdEntityCompanion({
-    this.assetId = const i0.Value.absent(),
-    this.cloudId = const i0.Value.absent(),
-    this.createdAt = const i0.Value.absent(),
-    this.adjustmentTime = const i0.Value.absent(),
-    this.latitude = const i0.Value.absent(),
-    this.longitude = const i0.Value.absent(),
-  });
-  RemoteAssetCloudIdEntityCompanion.insert({
-    required String assetId,
-    this.cloudId = const i0.Value.absent(),
-    this.createdAt = const i0.Value.absent(),
-    this.adjustmentTime = const i0.Value.absent(),
-    this.latitude = const i0.Value.absent(),
-    this.longitude = const i0.Value.absent(),
-  }) : assetId = i0.Value(assetId);
-  static i0.Insertable<i1.RemoteAssetCloudIdEntityData> custom({
-    i0.Expression<String>? assetId,
-    i0.Expression<String>? cloudId,
-    i0.Expression<DateTime>? createdAt,
-    i0.Expression<DateTime>? adjustmentTime,
-    i0.Expression<double>? latitude,
-    i0.Expression<double>? longitude,
-  }) {
-    return i0.RawValuesInsertable({
-      if (assetId != null) 'asset_id': assetId,
-      if (cloudId != null) 'cloud_id': cloudId,
-      if (createdAt != null) 'created_at': createdAt,
-      if (adjustmentTime != null) 'adjustment_time': adjustmentTime,
-      if (latitude != null) 'latitude': latitude,
-      if (longitude != null) 'longitude': longitude,
-    });
-  }
-
-  i1.RemoteAssetCloudIdEntityCompanion copyWith({
-    i0.Value<String>? assetId,
-    i0.Value<String?>? cloudId,
-    i0.Value<DateTime?>? createdAt,
-    i0.Value<DateTime?>? adjustmentTime,
-    i0.Value<double?>? latitude,
-    i0.Value<double?>? longitude,
-  }) {
-    return i1.RemoteAssetCloudIdEntityCompanion(
-      assetId: assetId ?? this.assetId,
-      cloudId: cloudId ?? this.cloudId,
-      createdAt: createdAt ?? this.createdAt,
-      adjustmentTime: adjustmentTime ?? this.adjustmentTime,
-      latitude: latitude ?? this.latitude,
-      longitude: longitude ?? this.longitude,
-    );
-  }
-
-  @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);
-    }
-    if (createdAt.present) {
-      map['created_at'] = i0.Variable<DateTime>(createdAt.value);
-    }
-    if (adjustmentTime.present) {
-      map['adjustment_time'] = i0.Variable<DateTime>(adjustmentTime.value);
-    }
-    if (latitude.present) {
-      map['latitude'] = i0.Variable<double>(latitude.value);
-    }
-    if (longitude.present) {
-      map['longitude'] = i0.Variable<double>(longitude.value);
-    }
-    return map;
-  }
-
-  @override
-  String toString() {
-    return (StringBuffer('RemoteAssetCloudIdEntityCompanion(')
-          ..write('assetId: $assetId, ')
-          ..write('cloudId: $cloudId, ')
-          ..write('createdAt: $createdAt, ')
-          ..write('adjustmentTime: $adjustmentTime, ')
-          ..write('latitude: $latitude, ')
-          ..write('longitude: $longitude')
-          ..write(')'))
-        .toString();
-  }
-}

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

@@ -4,13 +4,6 @@ import 'package:immich_mobile/infrastructure/entities/trashed_local_asset.entity
 import 'package:immich_mobile/infrastructure/utils/asset.mixin.dart';
 import 'package:immich_mobile/infrastructure/utils/drift_default.mixin.dart';
 
-enum TrashOrigin {
-  // do not change this order!
-  localSync,
-  remoteSync,
-  localUser,
-}
-
 @TableIndex.sql('CREATE INDEX IF NOT EXISTS idx_trashed_local_asset_checksum ON trashed_local_asset_entity (checksum)')
 @TableIndex.sql('CREATE INDEX IF NOT EXISTS idx_trashed_local_asset_album ON trashed_local_asset_entity (album_id)')
 class TrashedLocalAssetEntity extends Table with DriftDefaultsMixin, AssetEntityMixin {
@@ -26,8 +19,6 @@ class TrashedLocalAssetEntity extends Table with DriftDefaultsMixin, AssetEntity
 
   IntColumn get orientation => integer().withDefault(const Constant(0))();
 
-  IntColumn get source => intEnum<TrashOrigin>()();
-
   @override
   Set<Column> get primaryKey => {id, albumId};
 }

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

@@ -22,7 +22,6 @@ typedef $$TrashedLocalAssetEntityTableCreateCompanionBuilder =
       i0.Value<String?> checksum,
       i0.Value<bool> isFavorite,
       i0.Value<int> orientation,
-      required i3.TrashOrigin source,
     });
 typedef $$TrashedLocalAssetEntityTableUpdateCompanionBuilder =
     i1.TrashedLocalAssetEntityCompanion Function({
@@ -38,7 +37,6 @@ typedef $$TrashedLocalAssetEntityTableUpdateCompanionBuilder =
       i0.Value<String?> checksum,
       i0.Value<bool> isFavorite,
       i0.Value<int> orientation,
-      i0.Value<i3.TrashOrigin> source,
     });
 
 class $$TrashedLocalAssetEntityTableFilterComposer
@@ -111,12 +109,6 @@ class $$TrashedLocalAssetEntityTableFilterComposer
     column: $table.orientation,
     builder: (column) => i0.ColumnFilters(column),
   );
-
-  i0.ColumnWithTypeConverterFilters<i3.TrashOrigin, i3.TrashOrigin, int>
-  get source => $composableBuilder(
-    column: $table.source,
-    builder: (column) => i0.ColumnWithTypeConverterFilters(column),
-  );
 }
 
 class $$TrashedLocalAssetEntityTableOrderingComposer
@@ -188,11 +180,6 @@ class $$TrashedLocalAssetEntityTableOrderingComposer
     column: $table.orientation,
     builder: (column) => i0.ColumnOrderings(column),
   );
-
-  i0.ColumnOrderings<int> get source => $composableBuilder(
-    column: $table.source,
-    builder: (column) => i0.ColumnOrderings(column),
-  );
 }
 
 class $$TrashedLocalAssetEntityTableAnnotationComposer
@@ -246,9 +233,6 @@ class $$TrashedLocalAssetEntityTableAnnotationComposer
     column: $table.orientation,
     builder: (column) => column,
   );
-
-  i0.GeneratedColumnWithTypeConverter<i3.TrashOrigin, int> get source =>
-      $composableBuilder(column: $table.source, builder: (column) => column);
 }
 
 class $$TrashedLocalAssetEntityTableTableManager
@@ -309,7 +293,6 @@ class $$TrashedLocalAssetEntityTableTableManager
                 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<i3.TrashOrigin> source = const i0.Value.absent(),
               }) => i1.TrashedLocalAssetEntityCompanion(
                 name: name,
                 type: type,
@@ -323,7 +306,6 @@ class $$TrashedLocalAssetEntityTableTableManager
                 checksum: checksum,
                 isFavorite: isFavorite,
                 orientation: orientation,
-                source: source,
               ),
           createCompanionCallback:
               ({
@@ -339,7 +321,6 @@ class $$TrashedLocalAssetEntityTableTableManager
                 i0.Value<String?> checksum = const i0.Value.absent(),
                 i0.Value<bool> isFavorite = const i0.Value.absent(),
                 i0.Value<int> orientation = const i0.Value.absent(),
-                required i3.TrashOrigin source,
               }) => i1.TrashedLocalAssetEntityCompanion.insert(
                 name: name,
                 type: type,
@@ -353,7 +334,6 @@ class $$TrashedLocalAssetEntityTableTableManager
                 checksum: checksum,
                 isFavorite: isFavorite,
                 orientation: orientation,
-                source: source,
               ),
           withReferenceMapper: (p0) => p0
               .map((e) => (e.readTable(table), i0.BaseReferences(db, table, e)))
@@ -539,17 +519,6 @@ class $TrashedLocalAssetEntityTable extends i3.TrashedLocalAssetEntity
     defaultValue: const i4.Constant(0),
   );
   @override
-  late final i0.GeneratedColumnWithTypeConverter<i3.TrashOrigin, int> source =
-      i0.GeneratedColumn<int>(
-        'source',
-        aliasedName,
-        false,
-        type: i0.DriftSqlType.int,
-        requiredDuringInsert: true,
-      ).withConverter<i3.TrashOrigin>(
-        i1.$TrashedLocalAssetEntityTable.$convertersource,
-      );
-  @override
   List<i0.GeneratedColumn> get $columns => [
     name,
     type,
@@ -563,7 +532,6 @@ class $TrashedLocalAssetEntityTable extends i3.TrashedLocalAssetEntity
     checksum,
     isFavorite,
     orientation,
-    source,
   ];
   @override
   String get aliasedName => _alias ?? actualTableName;
@@ -714,12 +682,6 @@ class $TrashedLocalAssetEntityTable extends i3.TrashedLocalAssetEntity
         i0.DriftSqlType.int,
         data['${effectivePrefix}orientation'],
       )!,
-      source: i1.$TrashedLocalAssetEntityTable.$convertersource.fromSql(
-        attachedDatabase.typeMapping.read(
-          i0.DriftSqlType.int,
-          data['${effectivePrefix}source'],
-        )!,
-      ),
     );
   }
 
@@ -730,8 +692,6 @@ class $TrashedLocalAssetEntityTable extends i3.TrashedLocalAssetEntity
 
   static i0.JsonTypeConverter2<i2.AssetType, int, int> $convertertype =
       const i0.EnumIndexConverter<i2.AssetType>(i2.AssetType.values);
-  static i0.JsonTypeConverter2<i3.TrashOrigin, int, int> $convertersource =
-      const i0.EnumIndexConverter<i3.TrashOrigin>(i3.TrashOrigin.values);
   @override
   bool get withoutRowId => true;
   @override
@@ -752,7 +712,6 @@ class TrashedLocalAssetEntityData extends i0.DataClass
   final String? checksum;
   final bool isFavorite;
   final int orientation;
-  final i3.TrashOrigin source;
   const TrashedLocalAssetEntityData({
     required this.name,
     required this.type,
@@ -766,7 +725,6 @@ class TrashedLocalAssetEntityData extends i0.DataClass
     this.checksum,
     required this.isFavorite,
     required this.orientation,
-    required this.source,
   });
   @override
   Map<String, i0.Expression> toColumns(bool nullToAbsent) {
@@ -795,11 +753,6 @@ class TrashedLocalAssetEntityData extends i0.DataClass
     }
     map['is_favorite'] = i0.Variable<bool>(isFavorite);
     map['orientation'] = i0.Variable<int>(orientation);
-    {
-      map['source'] = i0.Variable<int>(
-        i1.$TrashedLocalAssetEntityTable.$convertersource.toSql(source),
-      );
-    }
     return map;
   }
 
@@ -823,9 +776,6 @@ class TrashedLocalAssetEntityData extends i0.DataClass
       checksum: serializer.fromJson<String?>(json['checksum']),
       isFavorite: serializer.fromJson<bool>(json['isFavorite']),
       orientation: serializer.fromJson<int>(json['orientation']),
-      source: i1.$TrashedLocalAssetEntityTable.$convertersource.fromJson(
-        serializer.fromJson<int>(json['source']),
-      ),
     );
   }
   @override
@@ -846,9 +796,6 @@ class TrashedLocalAssetEntityData extends i0.DataClass
       'checksum': serializer.toJson<String?>(checksum),
       'isFavorite': serializer.toJson<bool>(isFavorite),
       'orientation': serializer.toJson<int>(orientation),
-      'source': serializer.toJson<int>(
-        i1.$TrashedLocalAssetEntityTable.$convertersource.toJson(source),
-      ),
     };
   }
 
@@ -865,7 +812,6 @@ class TrashedLocalAssetEntityData extends i0.DataClass
     i0.Value<String?> checksum = const i0.Value.absent(),
     bool? isFavorite,
     int? orientation,
-    i3.TrashOrigin? source,
   }) => i1.TrashedLocalAssetEntityData(
     name: name ?? this.name,
     type: type ?? this.type,
@@ -881,7 +827,6 @@ class TrashedLocalAssetEntityData extends i0.DataClass
     checksum: checksum.present ? checksum.value : this.checksum,
     isFavorite: isFavorite ?? this.isFavorite,
     orientation: orientation ?? this.orientation,
-    source: source ?? this.source,
   );
   TrashedLocalAssetEntityData copyWithCompanion(
     i1.TrashedLocalAssetEntityCompanion data,
@@ -905,7 +850,6 @@ class TrashedLocalAssetEntityData extends i0.DataClass
       orientation: data.orientation.present
           ? data.orientation.value
           : this.orientation,
-      source: data.source.present ? data.source.value : this.source,
     );
   }
 
@@ -923,8 +867,7 @@ class TrashedLocalAssetEntityData extends i0.DataClass
           ..write('albumId: $albumId, ')
           ..write('checksum: $checksum, ')
           ..write('isFavorite: $isFavorite, ')
-          ..write('orientation: $orientation, ')
-          ..write('source: $source')
+          ..write('orientation: $orientation')
           ..write(')'))
         .toString();
   }
@@ -943,7 +886,6 @@ class TrashedLocalAssetEntityData extends i0.DataClass
     checksum,
     isFavorite,
     orientation,
-    source,
   );
   @override
   bool operator ==(Object other) =>
@@ -960,8 +902,7 @@ class TrashedLocalAssetEntityData extends i0.DataClass
           other.albumId == this.albumId &&
           other.checksum == this.checksum &&
           other.isFavorite == this.isFavorite &&
-          other.orientation == this.orientation &&
-          other.source == this.source);
+          other.orientation == this.orientation);
 }
 
 class TrashedLocalAssetEntityCompanion
@@ -978,7 +919,6 @@ class TrashedLocalAssetEntityCompanion
   final i0.Value<String?> checksum;
   final i0.Value<bool> isFavorite;
   final i0.Value<int> orientation;
-  final i0.Value<i3.TrashOrigin> source;
   const TrashedLocalAssetEntityCompanion({
     this.name = const i0.Value.absent(),
     this.type = const i0.Value.absent(),
@@ -992,7 +932,6 @@ class TrashedLocalAssetEntityCompanion
     this.checksum = const i0.Value.absent(),
     this.isFavorite = const i0.Value.absent(),
     this.orientation = const i0.Value.absent(),
-    this.source = const i0.Value.absent(),
   });
   TrashedLocalAssetEntityCompanion.insert({
     required String name,
@@ -1007,12 +946,10 @@ class TrashedLocalAssetEntityCompanion
     this.checksum = const i0.Value.absent(),
     this.isFavorite = const i0.Value.absent(),
     this.orientation = const i0.Value.absent(),
-    required i3.TrashOrigin source,
   }) : name = i0.Value(name),
        type = i0.Value(type),
        id = i0.Value(id),
-       albumId = i0.Value(albumId),
-       source = i0.Value(source);
+       albumId = i0.Value(albumId);
   static i0.Insertable<i1.TrashedLocalAssetEntityData> custom({
     i0.Expression<String>? name,
     i0.Expression<int>? type,
@@ -1026,7 +963,6 @@ class TrashedLocalAssetEntityCompanion
     i0.Expression<String>? checksum,
     i0.Expression<bool>? isFavorite,
     i0.Expression<int>? orientation,
-    i0.Expression<int>? source,
   }) {
     return i0.RawValuesInsertable({
       if (name != null) 'name': name,
@@ -1041,7 +977,6 @@ class TrashedLocalAssetEntityCompanion
       if (checksum != null) 'checksum': checksum,
       if (isFavorite != null) 'is_favorite': isFavorite,
       if (orientation != null) 'orientation': orientation,
-      if (source != null) 'source': source,
     });
   }
 
@@ -1058,7 +993,6 @@ class TrashedLocalAssetEntityCompanion
     i0.Value<String?>? checksum,
     i0.Value<bool>? isFavorite,
     i0.Value<int>? orientation,
-    i0.Value<i3.TrashOrigin>? source,
   }) {
     return i1.TrashedLocalAssetEntityCompanion(
       name: name ?? this.name,
@@ -1073,7 +1007,6 @@ class TrashedLocalAssetEntityCompanion
       checksum: checksum ?? this.checksum,
       isFavorite: isFavorite ?? this.isFavorite,
       orientation: orientation ?? this.orientation,
-      source: source ?? this.source,
     );
   }
 
@@ -1118,11 +1051,6 @@ class TrashedLocalAssetEntityCompanion
     if (orientation.present) {
       map['orientation'] = i0.Variable<int>(orientation.value);
     }
-    if (source.present) {
-      map['source'] = i0.Variable<int>(
-        i1.$TrashedLocalAssetEntityTable.$convertersource.toSql(source.value),
-      );
-    }
     return map;
   }
 
@@ -1140,8 +1068,7 @@ class TrashedLocalAssetEntityCompanion
           ..write('albumId: $albumId, ')
           ..write('checksum: $checksum, ')
           ..write('isFavorite: $isFavorite, ')
-          ..write('orientation: $orientation, ')
-          ..write('source: $source')
+          ..write('orientation: $orientation')
           ..write(')'))
         .toString();
   }

mobile/lib/infrastructure/loaders/image_request.dart

@@ -1,12 +1,15 @@
 import 'dart:async';
 import 'dart:ffi';
+import 'dart:io';
 import 'dart:ui' as ui;
 
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:ffi/ffi.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
+import 'package:immich_mobile/providers/image/cache/remote_image_cache_manager.dart';
 import 'package:immich_mobile/providers/infrastructure/platform.provider.dart';
+import 'package:logging/logging.dart';
 
 part 'local_image_request.dart';
 part 'thumbhash_image_request.dart';
@@ -34,53 +37,27 @@ abstract class ImageRequest {
 
   void _onCancelled();
 
-  Future<ui.FrameInfo?> _fromEncodedPlatformImage(int address, int length) async {
+  Future<ui.FrameInfo?> _fromPlatformImage(Map<String, int> info) async {
+    final address = info['pointer'];
+    if (address == null) {
+      return null;
+    }
+
     final pointer = Pointer<Uint8>.fromAddress(address);
     if (_isCancelled) {
       malloc.free(pointer);
       return null;
     }
 
+    final int actualWidth;
+    final int actualHeight;
+    final int actualSize;
     final ui.ImmutableBuffer buffer;
     try {
-      buffer = await ImmutableBuffer.fromUint8List(pointer.asTypedList(length));
-    } finally {
-      malloc.free(pointer);
-    }
-
-    if (_isCancelled) {
-      buffer.dispose();
-      return null;
-    }
-
-    final descriptor = await ui.ImageDescriptor.encoded(buffer);
-    if (_isCancelled) {
-      buffer.dispose();
-      descriptor.dispose();
-      return null;
-    }
-
-    final codec = await descriptor.instantiateCodec();
-    if (_isCancelled) {
-      buffer.dispose();
-      descriptor.dispose();
-      codec.dispose();
-      return null;
-    }
-    return await codec.getNextFrame();
-  }
-
-  Future<ui.FrameInfo?> _fromDecodedPlatformImage(int address, int width, int height, int rowBytes) async {
-    final pointer = Pointer<Uint8>.fromAddress(address);
-    if (_isCancelled) {
-      malloc.free(pointer);
-      return null;
-    }
-
-    final size = rowBytes * height;
-    final ui.ImmutableBuffer buffer;
-    try {
-      buffer = await ImmutableBuffer.fromUint8List(pointer.asTypedList(size));
+      actualWidth = info['width']!;
+      actualHeight = info['height']!;
+      actualSize = actualWidth * actualHeight * 4;
+      buffer = await ImmutableBuffer.fromUint8List(pointer.asTypedList(actualSize));
     } finally {
       malloc.free(pointer);
     }
@@ -92,9 +69,8 @@ abstract class ImageRequest {
 
     final descriptor = ui.ImageDescriptor.raw(
       buffer,
-      width: width,
-      height: height,
-      rowBytes: rowBytes,
+      width: actualWidth,
+      height: actualHeight,
       pixelFormat: ui.PixelFormat.rgba8888,
     );
     final codec = await descriptor.instantiateCodec();

mobile/lib/infrastructure/loaders/local_image_request.dart

@@ -16,23 +16,20 @@ class LocalImageRequest extends ImageRequest {
       return null;
     }
 
-    final info = await localImageApi.requestImage(
+    final Map<String, int> info = await thumbnailApi.requestImage(
       localId,
       requestId: requestId,
       width: width,
       height: height,
       isVideo: assetType == AssetType.video,
     );
-    if (info == null) {
-      return null;
-    }
 
-    final frame = await _fromDecodedPlatformImage(info["pointer"]!, info["width"]!, info["height"]!, info["rowBytes"]!);
+    final frame = await _fromPlatformImage(info);
     return frame == null ? null : ImageInfo(image: frame.image, scale: scale);
   }
 
   @override
   Future<void> _onCancelled() {
-    return localImageApi.cancelRequest(requestId);
+    return thumbnailApi.cancelImageRequest(requestId);
   }
 }

mobile/lib/infrastructure/loaders/remote_image_request.dart

@@ -1,10 +1,14 @@
 part of 'image_request.dart';
 
 class RemoteImageRequest extends ImageRequest {
+  static final log = Logger('RemoteImageRequest');
+  static final client = HttpClient()..maxConnectionsPerHost = 16;
+  final RemoteCacheManager? cacheManager;
   final String uri;
   final Map<String, String> headers;
+  HttpClientRequest? _request;
 
-  RemoteImageRequest({required this.uri, required this.headers});
+  RemoteImageRequest({required this.uri, required this.headers, this.cacheManager});
 
   @override
   Future<ImageInfo?> load(ImageDecoderCallback decode, {double scale = 1.0}) async {
@@ -12,18 +16,164 @@ class RemoteImageRequest extends ImageRequest {
       return null;
     }
 
-    final info = await remoteImageApi.requestImage(uri, headers: headers, requestId: requestId);
-    final frame = switch (info) {
-      {'pointer': int pointer, 'length': int length} => await _fromEncodedPlatformImage(pointer, length),
-      {'pointer': int pointer, 'width': int width, 'height': int height, 'rowBytes': int rowBytes} =>
-        await _fromDecodedPlatformImage(pointer, width, height, rowBytes),
-      _ => null,
-    };
-    return frame == null ? null : ImageInfo(image: frame.image, scale: scale);
+    // TODO: the cache manager makes everything sequential with its DB calls and its operations cannot be cancelled,
+    //  so it ends up being a bottleneck.  We only prefer fetching from it when it can skip the DB call.
+    final cachedFileImage = await _loadCachedFile(uri, decode, scale, inMemoryOnly: true);
+    if (cachedFileImage != null) {
+      return cachedFileImage;
+    }
+
+    try {
+      final buffer = await _downloadImage(uri);
+      if (buffer == null) {
+        return null;
+      }
+
+      return await _decodeBuffer(buffer, decode, scale);
+    } catch (e) {
+      if (_isCancelled) {
+        return null;
+      }
+
+      final cachedFileImage = await _loadCachedFile(uri, decode, scale, inMemoryOnly: false);
+      if (cachedFileImage != null) {
+        return cachedFileImage;
+      }
+
+      rethrow;
+    } finally {
+      _request = null;
+    }
+  }
+
+  Future<ImmutableBuffer?> _downloadImage(String url) async {
+    if (_isCancelled) {
+      return null;
+    }
+
+    final request = _request = await client.getUrl(Uri.parse(url));
+    if (_isCancelled) {
+      request.abort();
+      return _request = null;
+    }
+
+    for (final entry in headers.entries) {
+      request.headers.set(entry.key, entry.value);
+    }
+    final response = await request.close();
+    if (_isCancelled) {
+      return null;
+    }
+
+    final cacheManager = this.cacheManager;
+    final streamController = StreamController<List<int>>(sync: true);
+    final Stream<List<int>> stream;
+    unawaited(cacheManager?.putStreamedFile(url, streamController.stream));
+    stream = response.map((chunk) {
+      if (_isCancelled) {
+        throw StateError('Cancelled request');
+      }
+      if (cacheManager != null) {
+        streamController.add(chunk);
+      }
+      return chunk;
+    });
+
+    try {
+      final Uint8List bytes = await _downloadBytes(stream, response.contentLength);
+      unawaited(streamController.close());
+      return await ImmutableBuffer.fromUint8List(bytes);
+    } catch (e) {
+      streamController.addError(e);
+      unawaited(streamController.close());
+      if (_isCancelled) {
+        return null;
+      }
+      rethrow;
+    }
+  }
+
+  Future<Uint8List> _downloadBytes(Stream<List<int>> stream, int length) async {
+    final Uint8List bytes;
+    int offset = 0;
+    if (length > 0) {
+      // Known content length - use pre-allocated buffer
+      bytes = Uint8List(length);
+      await stream.listen((chunk) {
+        bytes.setAll(offset, chunk);
+        offset += chunk.length;
+      }, cancelOnError: true).asFuture();
+    } else {
+      // Unknown content length - collect chunks dynamically
+      final chunks = <List<int>>[];
+      int totalLength = 0;
+      await stream.listen((chunk) {
+        chunks.add(chunk);
+        totalLength += chunk.length;
+      }, cancelOnError: true).asFuture();
+
+      bytes = Uint8List(totalLength);
+      for (final chunk in chunks) {
+        bytes.setAll(offset, chunk);
+        offset += chunk.length;
+      }
+    }
+
+    return bytes;
+  }
+
+  Future<ImageInfo?> _loadCachedFile(
+    String url,
+    ImageDecoderCallback decode,
+    double scale, {
+    required bool inMemoryOnly,
+  }) async {
+    final cacheManager = this.cacheManager;
+    if (_isCancelled || cacheManager == null) {
+      return null;
+    }
+
+    final file = await (inMemoryOnly ? cacheManager.getFileFromMemory(url) : cacheManager.getFileFromCache(url));
+    if (_isCancelled || file == null) {
+      return null;
+    }
+
+    try {
+      final buffer = await ImmutableBuffer.fromFilePath(file.file.path);
+      return await _decodeBuffer(buffer, decode, scale);
+    } catch (e) {
+      log.severe('Failed to decode cached image', e);
+      unawaited(_evictFile(url));
+      return null;
+    }
+  }
+
+  Future<void> _evictFile(String url) async {
+    try {
+      await cacheManager?.removeFile(url);
+    } catch (e) {
+      log.severe('Failed to remove cached image', e);
+    }
+  }
+
+  Future<ImageInfo?> _decodeBuffer(ImmutableBuffer buffer, ImageDecoderCallback decode, scale) async {
+    if (_isCancelled) {
+      buffer.dispose();
+      return null;
+    }
+    final codec = await decode(buffer);
+    if (_isCancelled) {
+      buffer.dispose();
+      codec.dispose();
+      return null;
+    }
+    final frame = await codec.getNextFrame();
+    return ImageInfo(image: frame.image, scale: scale);
   }
 
   @override
-  Future<void> _onCancelled() {
-    return remoteImageApi.cancelRequest(requestId);
+  void _onCancelled() {
+    _request?.abort();
+    _request = null;
   }
 }

mobile/lib/infrastructure/loaders/thumbhash_image_request.dart

@@ -11,8 +11,8 @@ class ThumbhashImageRequest extends ImageRequest {
       return null;
     }
 
-    final Map<String, int> info = await localImageApi.getThumbhash(thumbhash);
-    final frame = await _fromDecodedPlatformImage(info["pointer"]!, info["width"]!, info["height"]!, info["rowBytes"]!);
+    final Map<String, int> info = await thumbnailApi.getThumbhash(thumbhash);
+    final frame = await _fromPlatformImage(info);
     return frame == null ? null : ImageInfo(image: frame.image, scale: scale);
   }
 

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/trashed_local_asset.entity.dart';
@@ -58,7 +57,6 @@ class IsarDatabaseRepository implements IDatabaseRepository {
     RemoteAlbumEntity,
     RemoteAlbumAssetEntity,
     RemoteAlbumUserEntity,
-    RemoteAssetCloudIdEntity,
     MemoryEntity,
     MemoryAssetEntity,
     StackEntity,
@@ -97,7 +95,7 @@ class Drift extends $Drift implements IDatabaseRepository {
   }
 
   @override
-  int get schemaVersion => 16;
+  int get schemaVersion => 14;
 
   @override
   MigrationStrategy get migration => MigrationStrategy(
@@ -192,15 +190,6 @@ class Drift extends $Drift implements IDatabaseRepository {
             await m.addColumn(v14.localAssetEntity, v14.localAssetEntity.latitude);
             await m.addColumn(v14.localAssetEntity, v14.localAssetEntity.longitude);
           },
-          from14To15: (m, v15) async {
-            await m.addColumn(v15.trashedLocalAssetEntity, v15.trashedLocalAssetEntity.source);
-          },
-          from15To16: (m, v16) async {
-            // Add i_cloud_id to local and remote asset tables
-            await m.addColumn(v16.localAssetEntity, v16.localAssetEntity.iCloudId);
-            await m.createIndex(v16.idxLocalAssetCloudId);
-            await m.createTable(v16.remoteAssetCloudIdEntity);
-          },
         ),
       );
 

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

@@ -27,23 +27,21 @@ 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/trashed_local_asset.entity.drift.dart'
-    as i20;
+    as i19;
 import 'package:immich_mobile/infrastructure/entities/merged_asset.drift.dart'
-    as i21;
-import 'package:drift/internal/modular.dart' as i22;
+    as i20;
+import 'package:drift/internal/modular.dart' as i21;
 
 abstract class $Drift extends i0.GeneratedDatabase {
   $Drift(i0.QueryExecutor e) : super(e);
@@ -74,20 +72,18 @@ 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);
-  late final i20.$TrashedLocalAssetEntityTable trashedLocalAssetEntity = i20
+  late final i18.$StoreEntityTable storeEntity = i18.$StoreEntityTable(this);
+  late final i19.$TrashedLocalAssetEntityTable trashedLocalAssetEntity = i19
       .$TrashedLocalAssetEntityTable(this);
-  i21.MergedAssetDrift get mergedAssetDrift => i22.ReadDatabaseContainer(
+  i20.MergedAssetDrift get mergedAssetDrift => i21.ReadDatabaseContainer(
     this,
-  ).accessor<i21.MergedAssetDrift>(i21.MergedAssetDrift.new);
+  ).accessor<i20.MergedAssetDrift>(i20.MergedAssetDrift.new);
   @override
   Iterable<i0.TableInfo<i0.Table, Object?>> get allTables =>
       allSchemaEntities.whereType<i0.TableInfo<i0.Table, Object?>>();
@@ -101,7 +97,6 @@ abstract class $Drift extends i0.GeneratedDatabase {
     localAlbumEntity,
     localAlbumAssetEntity,
     i4.idxLocalAssetChecksum,
-    i4.idxLocalAssetCloudId,
     i2.idxRemoteAssetOwnerChecksum,
     i2.uQRemoteAssetsOwnerChecksum,
     i2.uQRemoteAssetsOwnerLibraryChecksum,
@@ -112,7 +107,6 @@ abstract class $Drift extends i0.GeneratedDatabase {
     remoteExifEntity,
     remoteAlbumAssetEntity,
     remoteAlbumUserEntity,
-    remoteAssetCloudIdEntity,
     memoryEntity,
     memoryAssetEntity,
     personEntity,
@@ -120,8 +114,8 @@ abstract class $Drift extends i0.GeneratedDatabase {
     storeEntity,
     trashedLocalAssetEntity,
     i11.idxLatLng,
-    i20.idxTrashedLocalAssetChecksum,
-    i20.idxTrashedLocalAssetAlbum,
+    i19.idxTrashedLocalAssetChecksum,
+    i19.idxTrashedLocalAssetAlbum,
   ];
   @override
   i0.StreamQueryUpdateRules
@@ -255,18 +249,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',
@@ -351,24 +333,18 @@ 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);
-  i20.$$TrashedLocalAssetEntityTableTableManager get trashedLocalAssetEntity =>
-      i20.$$TrashedLocalAssetEntityTableTableManager(
+  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);
+  i19.$$TrashedLocalAssetEntityTableTableManager get trashedLocalAssetEntity =>
+      i19.$$TrashedLocalAssetEntityTableTableManager(
         _db,
         _db.trashedLocalAssetEntity,
       );

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

@@ -246,25 +246,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> Function(Iterable<LocalAsset>) get _upsertAssets =>
       CurrentPlatform.isIOS ? _upsertAssetsDarwin : _upsertAssetsAndroid;
 

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

@@ -1,5 +1,3 @@
-import 'dart:async';
-
 import 'package:collection/collection.dart';
 import 'package:drift/drift.dart';
 import 'package:immich_mobile/constants/constants.dart';
@@ -174,40 +172,4 @@ class DriftLocalAssetRepository extends DriftDatabaseRepository {
     final rows = await query.get();
     return rows.map((row) => row.readTable(_db.localAssetEntity).toDto()).toList();
   }
-
-  Future<List<LocalAsset>> getEmptyCloudIdAssets() {
-    final query = _db.localAssetEntity.select()..where((row) => row.iCloudId.isNull());
-    return query.map((row) => row.toDto()).get();
-  }
-
-  Future<Map<String, String>> getHashMappingFromCloudId() async {
-    final query =
-        _db.localAssetEntity.selectOnly().join([
-            leftOuterJoin(
-              _db.remoteAssetCloudIdEntity,
-              _db.localAssetEntity.iCloudId.equalsExp(_db.remoteAssetCloudIdEntity.cloudId),
-              useColumns: false,
-            ),
-            leftOuterJoin(
-              _db.remoteAssetEntity,
-              _db.remoteAssetCloudIdEntity.assetId.equalsExp(_db.remoteAssetEntity.id),
-              useColumns: false,
-            ),
-          ])
-          ..addColumns([_db.localAssetEntity.id, _db.remoteAssetEntity.checksum])
-          ..where(
-            _db.remoteAssetCloudIdEntity.cloudId.isNotNull() &
-                _db.localAssetEntity.checksum.isNull() &
-                ((_db.remoteAssetCloudIdEntity.adjustmentTime.isExp(_db.localAssetEntity.adjustmentTime)) &
-                    (_db.remoteAssetCloudIdEntity.latitude.isExp(_db.localAssetEntity.latitude)) &
-                    (_db.remoteAssetCloudIdEntity.longitude.isExp(_db.localAssetEntity.longitude)) &
-                    (_db.remoteAssetCloudIdEntity.createdAt.isExp(_db.localAssetEntity.createdAt))),
-          );
-    final mapping = await query
-        .map(
-          (row) => (assetId: row.read(_db.localAssetEntity.id)!, checksum: row.read(_db.remoteAssetEntity.checksum)!),
-        )
-        .get();
-    return {for (final entry in mapping) entry.assetId: entry.checksum};
-  }
 }

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

@@ -1,67 +0,0 @@
-import 'dart:io';
-
-import 'package:cronet_http/cronet_http.dart';
-import 'package:cupertino_http/cupertino_http.dart';
-import 'package:http/http.dart' as http;
-import 'package:immich_mobile/utils/user_agent.dart';
-import 'package:path_provider/path_provider.dart';
-
-class NetworkRepository {
-  static late Directory _cachePath;
-  static late String _userAgent;
-  static final _clients = <String, http.Client>{};
-
-  static Future<void> init() {
-    return (
-      getTemporaryDirectory().then((cachePath) => _cachePath = cachePath),
-      getUserAgentString().then((userAgent) => _userAgent = userAgent),
-    ).wait;
-  }
-
-  static void reset() {
-    Future.microtask(init);
-    for (final client in _clients.values) {
-      client.close();
-    }
-    _clients.clear();
-  }
-
-  const NetworkRepository();
-
-  /// Note: when disk caching is enabled, only one client may use a given directory at a time.
-  /// Different isolates or engines must use different directories.
-  http.Client getHttpClient(
-    String directoryName, {
-    CacheMode cacheMode = CacheMode.memory,
-    int diskCapacity = 0,
-    int maxConnections = 6,
-    int memoryCapacity = 10 << 20,
-  }) {
-    final cachedClient = _clients[directoryName];
-    if (cachedClient != null) {
-      return cachedClient;
-    }
-
-    final directory = Directory('${_cachePath.path}/$directoryName');
-    directory.createSync(recursive: true);
-    if (Platform.isAndroid) {
-      final engine = CronetEngine.build(
-        cacheMode: cacheMode,
-        cacheMaxSize: diskCapacity,
-        storagePath: directory.path,
-        userAgent: _userAgent,
-      );
-      return _clients[directoryName] = CronetClient.fromCronetEngine(engine, closeEngine: true);
-    }
-
-    final config = URLSessionConfiguration.defaultSessionConfiguration()
-      ..httpMaximumConnectionsPerHost = maxConnections
-      ..cache = URLCache.withCapacity(
-        diskCapacity: diskCapacity,
-        memoryCapacity: memoryCapacity,
-        directory: directory.uri,
-      )
-      ..httpAdditionalHeaders = {'User-Agent': _userAgent};
-    return _clients[directoryName] = CupertinoClient.fromSessionConfiguration(config);
-  }
-}

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

@@ -6,9 +6,7 @@ import 'package:logging/logging.dart';
 import 'package:photo_manager/photo_manager.dart';
 
 class StorageRepository {
-  final log = Logger('StorageRepository');
-
-  StorageRepository();
+  const StorageRepository();
 
   Future<File?> getFileForAsset(String assetId) async {
     File? file;
@@ -84,51 +82,6 @@ class StorageRepository {
     return entity;
   }
 
-  Future<bool> isAssetAvailableLocally(String assetId) async {
-    try {
-      final entity = await AssetEntity.fromId(assetId);
-      if (entity == null) {
-        log.warning("Cannot get AssetEntity for asset $assetId");
-        return false;
-      }
-
-      return await entity.isLocallyAvailable(isOrigin: true);
-    } catch (error, stackTrace) {
-      log.warning("Error checking if asset is locally available $assetId", error, stackTrace);
-      return false;
-    }
-  }
-
-  Future<File?> loadFileFromCloud(String assetId, {PMProgressHandler? progressHandler}) async {
-    try {
-      final entity = await AssetEntity.fromId(assetId);
-      if (entity == null) {
-        log.warning("Cannot get AssetEntity for asset $assetId");
-        return null;
-      }
-
-      return await entity.loadFile(progressHandler: progressHandler);
-    } catch (error, stackTrace) {
-      log.warning("Error loading file from cloud for asset $assetId", error, stackTrace);
-      return null;
-    }
-  }
-
-  Future<File?> loadMotionFileFromCloud(String assetId, {PMProgressHandler? progressHandler}) async {
-    try {
-      final entity = await AssetEntity.fromId(assetId);
-      if (entity == null) {
-        log.warning("Cannot get AssetEntity for asset $assetId");
-        return null;
-      }
-
-      return await entity.loadFile(withSubtype: true, progressHandler: progressHandler);
-    } catch (error, stackTrace) {
-      log.warning("Error loading motion file from cloud for asset $assetId", error, stackTrace);
-      return null;
-    }
-  }
-
   Future<void> clearCache() async {
     final log = Logger('StorageRepository');
 

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

@@ -45,7 +45,6 @@ class SyncApiRepository {
           SyncRequestType.usersV1,
           SyncRequestType.assetsV1,
           SyncRequestType.assetExifsV1,
-          SyncRequestType.assetMetadataV1,
           SyncRequestType.partnersV1,
           SyncRequestType.partnerAssetsV1,
           SyncRequestType.partnerAssetExifsV1,
@@ -149,8 +148,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,

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

@@ -2,7 +2,6 @@ import 'dart:convert';
 
 import 'package:collection/collection.dart';
 import 'package:drift/drift.dart';
-import 'package:immich_mobile/constants/constants.dart';
 import 'package:immich_mobile/domain/models/album/album.model.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/domain/models/memory.model.dart';
@@ -19,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';
@@ -57,7 +55,6 @@ class SyncStreamRepository extends DriftDatabaseRepository {
           await _db.authUserEntity.deleteAll();
           await _db.userEntity.deleteAll();
           await _db.userMetadataEntity.deleteAll();
-          await _db.remoteAssetCloudIdEntity.deleteAll();
         });
         await _db.customStatement('PRAGMA foreign_keys = ON');
       });
@@ -275,50 +272,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 == kMobileMetadataKey) {
-            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 == kMobileMetadataKey) {
-            final map = metadata.value as Map<String, Object?>;
-            final companion = RemoteAssetCloudIdEntityCompanion(
-              cloudId: Value(map['iCloudId']?.toString()),
-              createdAt: Value(map['createdAt'] != null ? DateTime.parse(map['createdAt'] as String) : null),
-              adjustmentTime: Value(
-                map['adjustmentTime'] != null ? DateTime.parse(map['adjustmentTime'] as String) : null,
-              ),
-              latitude: Value(map['latitude'] != null ? (double.tryParse(map['latitude'] as String)) : null),
-              longitude: Value(map['longitude'] != null ? (double.tryParse(map['longitude'] as String)) : null),
-            );
-            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.batch((batch) {

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

@@ -84,10 +84,6 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
                   isFavorite: row.isFavorite,
                   durationInSeconds: row.durationInSeconds,
                   orientation: row.orientation,
-                  cloudId: row.iCloudId,
-                  latitude: row.latitude,
-                  longitude: row.longitude,
-                  adjustmentTime: row.adjustmentTime,
                 ),
         )
         .get();

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

@@ -48,8 +48,7 @@ class DriftTrashedLocalAssetRepository extends DriftDatabaseRepository {
                 _db.remoteAssetEntity.checksum.equalsExp(_db.trashedLocalAssetEntity.checksum),
               ),
             ])..where(
-              _db.trashedLocalAssetEntity.source.equalsValue(TrashOrigin.remoteSync) &
-                  _db.trashedLocalAssetEntity.albumId.isInQuery(selectedAlbumIds) &
+              _db.trashedLocalAssetEntity.albumId.isInQuery(selectedAlbumIds) &
                   _db.remoteAssetEntity.deletedAt.isNull(),
             ))
             .get();
@@ -85,7 +84,6 @@ class DriftTrashedLocalAssetRepository extends DriftDatabaseRepository {
             durationInSeconds: Value(item.asset.durationInSeconds),
             isFavorite: Value(item.asset.isFavorite),
             orientation: Value(item.asset.orientation),
-            source: TrashOrigin.localSync,
           );
 
           batch.insert<$TrashedLocalAssetEntityTable, TrashedLocalAssetEntityData>(
@@ -126,7 +124,7 @@ class DriftTrashedLocalAssetRepository extends DriftDatabaseRepository {
 
   Future<void> trashLocalAsset(Map<String, List<LocalAsset>> assetsByAlbums) async {
     if (assetsByAlbums.isEmpty) {
-      return Future.value();
+      return;
     }
 
     final companions = <TrashedLocalAssetEntityCompanion>[];
@@ -149,7 +147,6 @@ class DriftTrashedLocalAssetRepository extends DriftDatabaseRepository {
             orientation: Value(asset.orientation),
             createdAt: Value(asset.createdAt),
             updatedAt: Value(asset.updatedAt),
-            source: const Value(TrashOrigin.remoteSync),
           ),
         );
       }
@@ -168,7 +165,7 @@ class DriftTrashedLocalAssetRepository extends DriftDatabaseRepository {
 
   Future<void> applyRestoredAssets(List<String> idList) async {
     if (idList.isEmpty) {
-      return Future.value();
+      return;
     }
 
     final trashedAssets = <TrashedLocalAssetEntityData>[];
@@ -208,58 +205,6 @@ class DriftTrashedLocalAssetRepository extends DriftDatabaseRepository {
     });
   }
 
-  Future<void> applyTrashedAssets(List<String> idList) async {
-    if (idList.isEmpty) {
-      return Future.value();
-    }
-
-    final trashedAssets = <({LocalAssetEntityData asset, String albumId})>[];
-
-    for (final slice in idList.slices(kDriftMaxChunk)) {
-      final rows = await (_db.select(_db.localAlbumAssetEntity).join([
-        innerJoin(_db.localAssetEntity, _db.localAlbumAssetEntity.assetId.equalsExp(_db.localAssetEntity.id)),
-      ])..where(_db.localAlbumAssetEntity.assetId.isIn(slice))).get();
-
-      final assetsWithAlbum = rows.map(
-        (row) =>
-            (albumId: row.readTable(_db.localAlbumAssetEntity).albumId, asset: row.readTable(_db.localAssetEntity)),
-      );
-
-      trashedAssets.addAll(assetsWithAlbum);
-    }
-
-    if (trashedAssets.isEmpty) {
-      return;
-    }
-
-    final companions = trashedAssets.map((e) {
-      return TrashedLocalAssetEntityCompanion.insert(
-        id: e.asset.id,
-        name: e.asset.name,
-        type: e.asset.type,
-        createdAt: Value(e.asset.createdAt),
-        updatedAt: Value(e.asset.updatedAt),
-        width: Value(e.asset.width),
-        height: Value(e.asset.height),
-        durationInSeconds: Value(e.asset.durationInSeconds),
-        checksum: Value(e.asset.checksum),
-        isFavorite: Value(e.asset.isFavorite),
-        orientation: Value(e.asset.orientation),
-        source: TrashOrigin.localUser,
-        albumId: e.albumId,
-      );
-    });
-
-    await _db.transaction(() async {
-      for (final companion in companions) {
-        await _db.into(_db.trashedLocalAssetEntity).insertOnConflictUpdate(companion);
-      }
-      for (final slice in idList.slices(kDriftMaxChunk)) {
-        await (_db.delete(_db.localAssetEntity)..where((t) => t.id.isIn(slice))).go();
-      }
-    });
-  }
-
   Future<Map<String, List<LocalAsset>>> getToTrash() async {
     final result = <String, List<LocalAsset>>{};
 

mobile/lib/main.dart

@@ -19,7 +19,6 @@ import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/generated/codegen_loader.g.dart';
 import 'package:immich_mobile/generated/intl_keys.g.dart';
-import 'package:immich_mobile/infrastructure/repositories/network.repository.dart';
 import 'package:immich_mobile/platform/background_worker_lock_api.g.dart';
 import 'package:immich_mobile/providers/app_life_cycle.provider.dart';
 import 'package:immich_mobile/providers/asset_viewer/share_intent_upload.provider.dart';
@@ -238,14 +237,6 @@ class ImmichAppState extends ConsumerState<ImmichApp> with WidgetsBindingObserve
     super.dispose();
   }
 
-  @override
-  void reassemble() {
-    if (kDebugMode) {
-      NetworkRepository.reset();
-    }
-    super.reassemble();
-  }
-
   @override
   Widget build(BuildContext context) {
     final router = ref.watch(appRouterProvider);

mobile/lib/models/server_info/server_version.model.dart

@@ -10,8 +10,4 @@ class ServerVersion extends SemVer {
   }
 
   ServerVersion.fromDto(ServerVersionResponseDto dto) : super(major: dto.major, minor: dto.minor, patch: dto.patch_);
-
-  bool isAtLeast({int major = 0, int minor = 0, int patch = 0}) {
-    return this >= SemVer(major: major, minor: minor, patch: patch);
-  }
 }

mobile/lib/models/upload/share_intent_attachment.model.dart

@@ -7,7 +7,7 @@ import 'package:path/path.dart';
 
 enum ShareIntentAttachmentType { image, video }
 
-enum UploadStatus { enqueued, running, complete, failed }
+enum UploadStatus { enqueued, running, complete, notFound, failed, canceled, waitingToRetry, paused }
 
 class ShareIntentAttachment {
   final String path;

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

@@ -93,11 +93,11 @@ class _DriftBackupPageState extends ConsumerState<DriftBackupPage> {
         Logger("DriftBackupPage").warning("Remote sync did not complete successfully, skipping backup");
         return;
       }
-      await backupNotifier.startForegroundBackup(currentUser.id);
+      await backupNotifier.startBackup(currentUser.id);
     }
 
     Future<void> stopBackup() async {
-      await backupNotifier.stopForegroundBackup();
+      await backupNotifier.cancel();
     }
 
     return Scaffold(

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

@@ -113,10 +113,10 @@ class _DriftBackupAlbumSelectionPageState extends ConsumerState<DriftBackupAlbum
             unawaited(nativeSync.cancelHashing().whenComplete(() => backgroundSync.hashAssets()));
             if (isBackupEnabled) {
               unawaited(
-                backupNotifier.stopForegroundBackup().whenComplete(
+                backupNotifier.cancel().whenComplete(
                   () => backgroundSync.syncRemote().then((success) {
                     if (success) {
-                      return backupNotifier.startForegroundBackup(user.id);
+                      return backupNotifier.startBackup(user.id);
                     } else {
                       Logger('DriftBackupAlbumSelectionPage').warning('Background sync failed, not starting backup');
                     }

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

@@ -60,10 +60,10 @@ class DriftBackupOptionsPage extends ConsumerWidget {
           final backupNotifier = ref.read(driftBackupProvider.notifier);
           final backgroundSync = ref.read(backgroundSyncProvider);
           unawaited(
-            backupNotifier.stopForegroundBackup().whenComplete(
+            backupNotifier.cancel().whenComplete(
               () => backgroundSync.syncRemote().then((success) {
                 if (success) {
-                  return backupNotifier.startForegroundBackup(currentUser.id);
+                  return backupNotifier.startBackup(currentUser.id);
                 } else {
                   Logger('DriftBackupOptionsPage').warning('Background sync failed, not starting backup');
                 }

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

@@ -11,70 +11,12 @@ import 'package:immich_mobile/utils/bytes_units.dart';
 import 'package:path/path.dart' as path;
 
 @RoutePage()
-class DriftUploadDetailPage extends ConsumerStatefulWidget {
+class DriftUploadDetailPage extends ConsumerWidget {
   const DriftUploadDetailPage({super.key});
 
   @override
-  ConsumerState<DriftUploadDetailPage> createState() => _DriftUploadDetailPageState();
-}
-
-class _DriftUploadDetailPageState extends ConsumerState<DriftUploadDetailPage> {
-  final Set<String> _seenTaskIds = {};
-  final Set<String> _failedTaskIds = {};
-
-  final Map<String, int> _taskSlotAssignments = {};
-  static const int _maxSlots = 3;
-
-  /// Assigns uploading items to fixed slots to prevent jumping when items complete
-  List<DriftUploadStatus?> _assignItemsToSlots(List<DriftUploadStatus> uploadingItems) {
-    final slots = List<DriftUploadStatus?>.filled(_maxSlots, null);
-    final currentTaskIds = uploadingItems.map((e) => e.taskId).toSet();
-
-    _taskSlotAssignments.removeWhere((taskId, _) => !currentTaskIds.contains(taskId));
-
-    for (final item in uploadingItems) {
-      final existingSlot = _taskSlotAssignments[item.taskId];
-      if (existingSlot != null && existingSlot < _maxSlots) {
-        slots[existingSlot] = item;
-      }
-    }
-
-    for (final item in uploadingItems) {
-      if (_taskSlotAssignments.containsKey(item.taskId)) continue;
-
-      for (int i = 0; i < _maxSlots; i++) {
-        if (slots[i] == null) {
-          slots[i] = item;
-          _taskSlotAssignments[item.taskId] = i;
-          break;
-        }
-      }
-    }
-
-    return slots;
-  }
-
-  @override
-  Widget build(BuildContext context) {
+  Widget build(BuildContext context, WidgetRef ref) {
     final uploadItems = ref.watch(driftBackupProvider.select((state) => state.uploadItems));
-    final iCloudProgress = ref.watch(driftBackupProvider.select((state) => state.iCloudDownloadProgress));
-
-    for (final item in uploadItems.values) {
-      if (item.isFailed == true) {
-        _failedTaskIds.add(item.taskId);
-      }
-    }
-
-    for (final item in uploadItems.values) {
-      if (item.progress >= 1.0 && item.isFailed != true && !_failedTaskIds.contains(item.taskId)) {
-        if (!_seenTaskIds.contains(item.taskId)) {
-          _seenTaskIds.add(item.taskId);
-        }
-      }
-    }
-
-    final uploadingItems = uploadItems.values.where((item) => item.progress < 1.0 && item.isFailed != true).toList();
-    final failedItems = uploadItems.values.where((item) => item.isFailed == true).toList();
 
     return Scaffold(
       appBar: AppBar(
@@ -83,411 +25,148 @@ class _DriftUploadDetailPageState extends ConsumerState<DriftUploadDetailPage> {
         elevation: 0,
         scrolledUnderElevation: 1,
       ),
-      body: _buildTwoSectionLayout(context, uploadingItems, failedItems, iCloudProgress),
+      body: uploadItems.isEmpty ? _buildEmptyState(context) : _buildUploadList(uploadItems),
     );
   }
 
-  Widget _buildTwoSectionLayout(
-    BuildContext context,
-    List<DriftUploadStatus> uploadingItems,
-    List<DriftUploadStatus> failedItems,
-    Map<String, double> iCloudProgress,
-  ) {
-    return CustomScrollView(
-      slivers: [
-        // iCloud Downloads Section
-        if (iCloudProgress.isNotEmpty) ...[
-          SliverToBoxAdapter(
-            child: _buildSectionHeader(
-              context,
-              title: "Downloading from iCloud",
-              count: iCloudProgress.length,
-              color: context.colorScheme.tertiary,
-            ),
-          ),
-          SliverPadding(
-            padding: const EdgeInsets.symmetric(horizontal: 16),
-            sliver: SliverList(
-              delegate: SliverChildBuilderDelegate((context, index) {
-                final entry = iCloudProgress.entries.elementAt(index);
-                return Padding(
-                  padding: const EdgeInsets.only(bottom: 8),
-                  child: _buildICloudDownloadCard(context, entry.key, entry.value),
-                );
-              }, childCount: iCloudProgress.length),
-            ),
-          ),
-        ],
-
-        // Uploading Section
-        SliverToBoxAdapter(
-          child: _buildSectionHeader(
-            context,
-            title: "uploading".t(context: context),
-            count: uploadingItems.length,
-            color: context.colorScheme.primary,
-          ),
-        ),
-        SliverPadding(
-          padding: const EdgeInsets.symmetric(horizontal: 16),
-          sliver: SliverList(
-            delegate: SliverChildBuilderDelegate((context, index) {
-              // Use slot-based assignment to prevent items from jumping
-              final slots = _assignItemsToSlots(uploadingItems);
-              final item = slots[index];
-              if (item != null) {
-                return _buildCurrentUploadCard(context, item);
-              } else {
-                return _buildPlaceholderCard(context);
-              }
-            }, childCount: 3),
-          ),
-        ),
-
-        // Errors Section
-        if (failedItems.isNotEmpty) ...[
-          SliverToBoxAdapter(
-            child: _buildSectionHeader(
-              context,
-              title: "errors_text".t(context: context),
-              count: failedItems.length,
-              color: context.colorScheme.error,
-            ),
-          ),
-          SliverPadding(
-            padding: const EdgeInsets.symmetric(horizontal: 16),
-            sliver: SliverList(
-              delegate: SliverChildBuilderDelegate((context, index) {
-                final item = failedItems[index];
-                return Padding(padding: const EdgeInsets.only(bottom: 8), child: _buildErrorCard(context, item));
-              }, childCount: failedItems.length),
-            ),
-          ),
-        ],
-
-        // Bottom padding
-        const SliverToBoxAdapter(child: SizedBox(height: 24)),
-      ],
-    );
-  }
-
-  Widget _buildSectionHeader(BuildContext context, {required String title, int? count, required Color color}) {
-    return Padding(
-      padding: const EdgeInsets.fromLTRB(16, 16, 16, 8),
-      child: Row(
-        crossAxisAlignment: CrossAxisAlignment.start,
+  Widget _buildEmptyState(BuildContext context) {
+    return Center(
+      child: Column(
+        mainAxisAlignment: MainAxisAlignment.center,
         children: [
+          Icon(Icons.cloud_off_rounded, size: 80, color: context.colorScheme.onSurface.withValues(alpha: 0.3)),
+          const SizedBox(height: 16),
           Text(
-            title,
-            style: context.textTheme.titleSmall?.copyWith(fontWeight: FontWeight.w600, color: color),
+            "no_uploads_in_progress".t(context: context),
+            style: context.textTheme.titleMedium?.copyWith(color: context.colorScheme.onSurface.withValues(alpha: 0.6)),
           ),
-          const SizedBox(width: 8),
-          count != null
-              ? Container(
-                  padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 2),
-                  decoration: BoxDecoration(
-                    color: color.withValues(alpha: 0.15),
-                    borderRadius: const BorderRadius.all(Radius.circular(12)),
-                  ),
-                  child: Text(
-                    count.toString(),
-                    style: context.textTheme.labelSmall?.copyWith(fontWeight: FontWeight.bold, color: color),
-                  ),
-                )
-              : const SizedBox.shrink(),
         ],
       ),
     );
   }
 
-  Widget _buildICloudDownloadCard(BuildContext context, String assetId, double progress) {
-    final double progressPercentage = (progress * 100).clamp(0, 100);
+  Widget _buildUploadList(Map<String, DriftUploadStatus> uploadItems) {
+    return ListView.separated(
+      addAutomaticKeepAlives: true,
+      padding: const EdgeInsets.all(16),
+      itemCount: uploadItems.length,
+      separatorBuilder: (context, index) => const SizedBox(height: 4),
+      itemBuilder: (context, index) {
+        final item = uploadItems.values.elementAt(index);
+        return _buildUploadCard(context, item);
+      },
+    );
+  }
+
+  Widget _buildUploadCard(BuildContext context, DriftUploadStatus item) {
+    final isCompleted = item.progress >= 1.0;
+    final double progressPercentage = (item.progress * 100).clamp(0, 100);
 
     return Card(
       elevation: 0,
-      color: context.colorScheme.tertiaryContainer.withValues(alpha: 0.5),
+      color: item.isFailed != null ? context.colorScheme.errorContainer : context.colorScheme.surfaceContainer,
       shape: RoundedRectangleBorder(
-        borderRadius: const BorderRadius.all(Radius.circular(12)),
-        side: BorderSide(color: context.colorScheme.tertiary.withValues(alpha: 0.3), width: 1),
+        borderRadius: const BorderRadius.all(Radius.circular(16)),
+        side: BorderSide(color: context.colorScheme.outline.withValues(alpha: 0.1), width: 1),
       ),
-      child: Padding(
-        padding: const EdgeInsets.all(12),
-        child: Row(
-          children: [
-            Container(
-              width: 40,
-              height: 40,
-              decoration: BoxDecoration(
-                color: context.colorScheme.tertiary.withValues(alpha: 0.2),
-                borderRadius: const BorderRadius.all(Radius.circular(8)),
-              ),
-              child: Icon(Icons.cloud_download_rounded, size: 24, color: context.colorScheme.tertiary),
-            ),
-            const SizedBox(width: 12),
-            Expanded(
-              child: Column(
-                crossAxisAlignment: CrossAxisAlignment.start,
+      child: InkWell(
+        onTap: () => _showFileDetailDialog(context, item),
+        borderRadius: const BorderRadius.all(Radius.circular(16)),
+        child: Padding(
+          padding: const EdgeInsets.all(16),
+          child: Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              Row(
                 children: [
-                  Text(
-                    "downloading_from_icloud".t(context: context),
-                    style: context.textTheme.bodyMedium?.copyWith(fontWeight: FontWeight.w500),
-                    maxLines: 1,
-                    overflow: TextOverflow.ellipsis,
-                  ),
-                  const SizedBox(height: 4),
-                  Text(
-                    assetId,
-                    style: context.textTheme.bodySmall?.copyWith(
-                      color: context.colorScheme.onSurface.withValues(alpha: 0.6),
+                  Expanded(
+                    child: Column(
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      spacing: 4,
+                      children: [
+                        Text(
+                          path.basename(item.filename),
+                          style: context.textTheme.titleSmall?.copyWith(fontWeight: FontWeight.w600),
+                          maxLines: 1,
+                          overflow: TextOverflow.ellipsis,
+                        ),
+                        if (item.error != null)
+                          Text(
+                            item.error!,
+                            style: context.textTheme.bodySmall?.copyWith(
+                              color: context.colorScheme.onErrorContainer.withValues(alpha: 0.6),
+                            ),
+                          ),
+                        Text(
+                          "backup_upload_details_page_more_details".t(context: context),
+                          style: context.textTheme.bodySmall?.copyWith(
+                            color: context.colorScheme.onSurface.withValues(alpha: 0.6),
+                          ),
+                          maxLines: 1,
+                          overflow: TextOverflow.ellipsis,
+                        ),
+                      ],
                     ),
-                    maxLines: 1,
-                    overflow: TextOverflow.ellipsis,
                   ),
-                  const SizedBox(height: 8),
-                  ClipRRect(
-                    borderRadius: const BorderRadius.all(Radius.circular(4)),
-                    child: LinearProgressIndicator(
-                      value: progress,
-                      backgroundColor: context.colorScheme.tertiary.withValues(alpha: 0.2),
-                      valueColor: AlwaysStoppedAnimation(context.colorScheme.tertiary),
-                      minHeight: 4,
-                    ),
+                  _buildProgressIndicator(
+                    context,
+                    item.progress,
+                    progressPercentage,
+                    isCompleted,
+                    item.networkSpeedAsString,
                   ),
                 ],
               ),
-            ),
-            const SizedBox(width: 12),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+
+  Widget _buildProgressIndicator(
+    BuildContext context,
+    double progress,
+    double percentage,
+    bool isCompleted,
+    String networkSpeedAsString,
+  ) {
+    return Column(
+      children: [
+        Stack(
+          alignment: AlignmentDirectional.center,
+          children: [
             SizedBox(
-              width: 48,
-              child: Text(
-                "${progressPercentage.toStringAsFixed(0)}%",
-                textAlign: TextAlign.right,
-                style: context.textTheme.titleMedium?.copyWith(
-                  fontWeight: FontWeight.bold,
-                  color: context.colorScheme.tertiary,
+              width: 36,
+              height: 36,
+              child: TweenAnimationBuilder(
+                tween: Tween<double>(begin: 0.0, end: progress),
+                duration: const Duration(milliseconds: 300),
+                builder: (context, value, _) => CircularProgressIndicator(
+                  backgroundColor: context.colorScheme.outline.withValues(alpha: 0.2),
+                  strokeWidth: 3,
+                  value: value,
+                  color: isCompleted ? context.colorScheme.primary : context.colorScheme.secondary,
                 ),
               ),
             ),
+            if (isCompleted)
+              Icon(Icons.check_circle_rounded, size: 28, color: context.colorScheme.primary)
+            else
+              Text(
+                percentage.toStringAsFixed(0),
+                style: context.textTheme.labelSmall?.copyWith(fontWeight: FontWeight.bold, fontSize: 10),
+              ),
           ],
         ),
-      ),
-    );
-  }
-
-  Widget _buildCurrentUploadCard(BuildContext context, DriftUploadStatus item) {
-    final double progressPercentage = (item.progress * 100).clamp(0, 100);
-    final isFailed = item.isFailed == true;
-
-    return Card(
-      elevation: 0,
-      color: isFailed
-          ? context.colorScheme.errorContainer
-          : context.colorScheme.primaryContainer.withValues(alpha: 0.5),
-      shape: RoundedRectangleBorder(
-        borderRadius: const BorderRadius.all(Radius.circular(12)),
-        side: BorderSide(
-          color: isFailed
-              ? context.colorScheme.error.withValues(alpha: 0.3)
-              : context.colorScheme.primary.withValues(alpha: 0.3),
-          width: 1,
-        ),
-      ),
-      child: InkWell(
-        onTap: () => _showFileDetailDialog(context, item),
-        borderRadius: const BorderRadius.all(Radius.circular(12)),
-        child: Padding(
-          padding: const EdgeInsets.all(12),
-          child: SizedBox(
-            height: 64,
-            child: Row(
-              children: [
-                _CurrentUploadThumbnail(taskId: item.taskId),
-                const SizedBox(width: 12),
-                Expanded(
-                  child: Column(
-                    crossAxisAlignment: CrossAxisAlignment.start,
-                    children: [
-                      Text(
-                        path.basename(item.filename),
-                        style: context.textTheme.bodyMedium?.copyWith(fontWeight: FontWeight.w600),
-                        maxLines: 1,
-                        overflow: TextOverflow.ellipsis,
-                      ),
-                      const SizedBox(height: 2),
-                      Text(
-                        isFailed
-                            ? item.error ?? "unable_to_upload_file".t(context: context)
-                            : "${formatHumanReadableBytes(item.fileSize, 1)} • ${item.networkSpeedAsString}",
-                        style: context.textTheme.labelLarge?.copyWith(
-                          color: isFailed
-                              ? context.colorScheme.error
-                              : context.colorScheme.onSurface.withValues(alpha: 0.6),
-                        ),
-                        maxLines: 2,
-                        overflow: TextOverflow.ellipsis,
-                      ),
-                      if (!isFailed) ...[
-                        const SizedBox(height: 8),
-                        ClipRRect(
-                          borderRadius: const BorderRadius.all(Radius.circular(4)),
-                          child: LinearProgressIndicator(
-                            value: item.progress,
-                            backgroundColor: context.colorScheme.primary.withValues(alpha: 0.2),
-                            valueColor: AlwaysStoppedAnimation(context.colorScheme.primary),
-                            minHeight: 4,
-                          ),
-                        ),
-                      ],
-                    ],
-                  ),
-                ),
-                const SizedBox(width: 12),
-                SizedBox(
-                  width: 48,
-                  child: isFailed
-                      ? Icon(Icons.error_rounded, color: context.colorScheme.error, size: 28)
-                      : Text(
-                          "${progressPercentage.toStringAsFixed(0)}%",
-                          textAlign: TextAlign.right,
-                          style: context.textTheme.titleMedium?.copyWith(
-                            fontWeight: FontWeight.bold,
-                            color: context.colorScheme.primary,
-                          ),
-                        ),
-                ),
-              ],
-            ),
+        Text(
+          networkSpeedAsString,
+          style: context.textTheme.labelSmall?.copyWith(
+            color: context.colorScheme.onSurface.withValues(alpha: 0.6),
+            fontSize: 10,
           ),
         ),
-      ),
-    );
-  }
-
-  Widget _buildErrorCard(BuildContext context, DriftUploadStatus item) {
-    return Card(
-      elevation: 0,
-      color: context.colorScheme.errorContainer,
-      shape: RoundedRectangleBorder(
-        borderRadius: const BorderRadius.all(Radius.circular(12)),
-        side: BorderSide(color: context.colorScheme.error.withValues(alpha: 0.3), width: 1),
-      ),
-      child: InkWell(
-        onTap: () => _showFileDetailDialog(context, item),
-        borderRadius: const BorderRadius.all(Radius.circular(12)),
-        child: Padding(
-          padding: const EdgeInsets.all(12),
-          child: Row(
-            children: [
-              _CurrentUploadThumbnail(taskId: item.taskId),
-              const SizedBox(width: 12),
-              Expanded(
-                child: Column(
-                  crossAxisAlignment: CrossAxisAlignment.start,
-                  mainAxisSize: MainAxisSize.min,
-                  children: [
-                    Text(
-                      path.basename(item.filename),
-                      style: context.textTheme.bodyMedium?.copyWith(fontWeight: FontWeight.w600),
-                      maxLines: 1,
-                      overflow: TextOverflow.ellipsis,
-                    ),
-                    const SizedBox(height: 4),
-                    Text(
-                      item.error ?? "unable_to_upload_file".t(context: context),
-                      style: context.textTheme.bodySmall?.copyWith(color: context.colorScheme.error),
-                      maxLines: 4,
-                      overflow: TextOverflow.ellipsis,
-                    ),
-                  ],
-                ),
-              ),
-              const SizedBox(width: 12),
-              Icon(Icons.error_rounded, color: context.colorScheme.error, size: 28),
-            ],
-          ),
-        ),
-      ),
-    );
-  }
-
-  Widget _buildPlaceholderCard(BuildContext context) {
-    return Card(
-      elevation: 0,
-      color: context.colorScheme.surfaceContainerLow.withValues(alpha: 0.5),
-      shape: RoundedRectangleBorder(
-        borderRadius: const BorderRadius.all(Radius.circular(12)),
-        side: BorderSide(color: context.colorScheme.outline.withValues(alpha: 0.1), width: 1, style: BorderStyle.solid),
-      ),
-      child: Padding(
-        padding: const EdgeInsets.all(12),
-        child: SizedBox(
-          height: 64,
-          child: Row(
-            children: [
-              SizedBox(
-                width: 48,
-                height: 48,
-                child: Container(
-                  decoration: BoxDecoration(
-                    color: context.colorScheme.outline.withValues(alpha: 0.1),
-                    borderRadius: const BorderRadius.all(Radius.circular(8)),
-                  ),
-                  child: Icon(
-                    Icons.hourglass_empty_rounded,
-                    size: 24,
-                    color: context.colorScheme.outline.withValues(alpha: 0.3),
-                  ),
-                ),
-              ),
-              const SizedBox(width: 12),
-              Expanded(
-                child: Column(
-                  crossAxisAlignment: CrossAxisAlignment.start,
-                  children: [
-                    Container(
-                      height: 14,
-                      width: 120,
-                      decoration: BoxDecoration(
-                        color: context.colorScheme.outline.withValues(alpha: 0.1),
-                        borderRadius: const BorderRadius.all(Radius.circular(4)),
-                      ),
-                    ),
-                    const SizedBox(height: 6),
-                    Container(
-                      height: 10,
-                      width: 80,
-                      decoration: BoxDecoration(
-                        color: context.colorScheme.outline.withValues(alpha: 0.08),
-                        borderRadius: const BorderRadius.all(Radius.circular(4)),
-                      ),
-                    ),
-                    const SizedBox(height: 8),
-                    Container(
-                      height: 4,
-                      decoration: BoxDecoration(
-                        color: context.colorScheme.outline.withValues(alpha: 0.1),
-                        borderRadius: const BorderRadius.all(Radius.circular(4)),
-                      ),
-                    ),
-                  ],
-                ),
-              ),
-              const SizedBox(width: 12),
-              SizedBox(
-                width: 48,
-                child: Text(
-                  "0%",
-                  textAlign: TextAlign.right,
-                  style: context.textTheme.titleMedium?.copyWith(
-                    fontWeight: FontWeight.bold,
-                    color: context.colorScheme.outline.withValues(alpha: 0.3),
-                  ),
-                ),
-              ),
-            ],
-          ),
-        ),
-      ),
+      ],
     );
   }
 
@@ -499,44 +178,9 @@ class _DriftUploadDetailPageState extends ConsumerState<DriftUploadDetailPage> {
   }
 }
 
-class _CurrentUploadThumbnail extends ConsumerWidget {
-  final String taskId;
-  const _CurrentUploadThumbnail({required this.taskId});
-
-  @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    return FutureBuilder<LocalAsset?>(
-      future: _getAsset(ref),
-      builder: (context, snapshot) {
-        return SizedBox(
-          width: 48,
-          height: 48,
-          child: Container(
-            decoration: BoxDecoration(
-              color: context.colorScheme.primary.withValues(alpha: 0.2),
-              borderRadius: const BorderRadius.all(Radius.circular(8)),
-            ),
-            clipBehavior: Clip.antiAlias,
-            child: snapshot.data != null
-                ? Thumbnail.fromAsset(asset: snapshot.data!, size: const Size(48, 48), fit: BoxFit.cover)
-                : Icon(Icons.image, size: 24, color: context.colorScheme.primary),
-          ),
-        );
-      },
-    );
-  }
-
-  Future<LocalAsset?> _getAsset(WidgetRef ref) async {
-    try {
-      return await ref.read(localAssetRepository).getById(taskId);
-    } catch (e) {
-      return null;
-    }
-  }
-}
-
 class FileDetailDialog extends ConsumerWidget {
   final DriftUploadStatus uploadStatus;
+
   const FileDetailDialog({super.key, required this.uploadStatus});
 
   @override
@@ -568,12 +212,14 @@ class FileDetailDialog extends ConsumerWidget {
             if (snapshot.connectionState == ConnectionState.waiting) {
               return const SizedBox(height: 200, child: Center(child: CircularProgressIndicator()));
             }
+
             final asset = snapshot.data;
             return SingleChildScrollView(
               child: Column(
                 crossAxisAlignment: CrossAxisAlignment.start,
                 mainAxisSize: MainAxisSize.min,
                 children: [
+                  // Thumbnail at the top center
                   Center(
                     child: ClipRRect(
                       borderRadius: const BorderRadius.all(Radius.circular(12)),
@@ -591,7 +237,7 @@ class FileDetailDialog extends ConsumerWidget {
                     ),
                   ),
                   const SizedBox(height: 24),
-                  if (asset != null)
+                  if (asset != null) ...[
                     _buildInfoSection(context, [
                       _buildInfoRow(context, "filename".t(context: context), path.basename(uploadStatus.filename)),
                       _buildInfoRow(context, "local_id".t(context: context), asset.id),
@@ -608,6 +254,7 @@ class FileDetailDialog extends ConsumerWidget {
                       if (asset.checksum != null)
                         _buildInfoRow(context, "checksum".t(context: context), asset.checksum!),
                     ]),
+                  ],
                 ],
               ),
             );
@@ -635,7 +282,7 @@ class FileDetailDialog extends ConsumerWidget {
         borderRadius: const BorderRadius.all(Radius.circular(12)),
         border: Border.all(color: context.colorScheme.outline.withValues(alpha: 0.1), width: 1),
       ),
-      child: Column(crossAxisAlignment: CrossAxisAlignment.start, children: children),
+      child: Column(crossAxisAlignment: CrossAxisAlignment.start, children: [...children]),
     );
   }
 
@@ -656,7 +303,12 @@ class FileDetailDialog extends ConsumerWidget {
             ),
           ),
           Expanded(
-            child: Text(value, style: context.textTheme.labelMedium, maxLines: 3, overflow: TextOverflow.ellipsis),
+            child: Text(
+              value,
+              style: context.textTheme.labelMedium?.copyWith(),
+              maxLines: 3,
+              overflow: TextOverflow.ellipsis,
+            ),
           ),
         ],
       ),
@@ -665,7 +317,8 @@ class FileDetailDialog extends ConsumerWidget {
 
   Future<LocalAsset?> _getAssetDetails(WidgetRef ref, String localAssetId) async {
     try {
-      return await ref.read(localAssetRepository).getById(localAssetId);
+      final repository = ref.read(localAssetRepository);
+      return await repository.getById(localAssetId);
     } catch (e) {
       return null;
     }

mobile/lib/pages/common/app_log.page.dart

@@ -100,7 +100,7 @@ class AppLogPage extends HookConsumerWidget {
             minLeadingWidth: 10,
             title: Text(
               truncateLogMessage(logMessage.message, 4),
-              style: TextStyle(fontSize: 14.0, color: context.colorScheme.onSurface, fontFamily: "GoogleSansCode"),
+              style: TextStyle(fontSize: 14.0, color: context.colorScheme.onSurface, fontFamily: "Inconsolata"),
             ),
             subtitle: Text(
               "at ${DateFormat("HH:mm:ss.SSS").format(logMessage.createdAt)} in ${logMessage.logger}",

mobile/lib/pages/common/app_log_detail.page.dart

@@ -57,7 +57,7 @@ class AppLogDetailPage extends HookConsumerWidget {
                 padding: const EdgeInsets.all(8.0),
                 child: SelectableText(
                   text,
-                  style: const TextStyle(fontSize: 12.0, fontWeight: FontWeight.bold, fontFamily: "GoogleSansCode"),
+                  style: const TextStyle(fontSize: 12.0, fontWeight: FontWeight.bold, fontFamily: "Inconsolata"),
                 ),
               ),
             ),
@@ -88,7 +88,7 @@ class AppLogDetailPage extends HookConsumerWidget {
                 padding: const EdgeInsets.all(8.0),
                 child: SelectableText(
                   logger.toString(),
-                  style: const TextStyle(fontSize: 12.0, fontWeight: FontWeight.bold, fontFamily: "GoogleSansCode"),
+                  style: const TextStyle(fontSize: 12.0, fontWeight: FontWeight.bold, fontFamily: "Inconsolata"),
                 ),
               ),
             ),

mobile/lib/pages/common/splash_screen.page.dart

@@ -10,6 +10,7 @@ import 'package:immich_mobile/providers/background_sync.provider.dart';
 import 'package:immich_mobile/providers/backup/backup.provider.dart';
 import 'package:immich_mobile/providers/backup/drift_backup.provider.dart';
 import 'package:immich_mobile/providers/gallery_permission.provider.dart';
+import 'package:immich_mobile/providers/server_info.provider.dart';
 import 'package:immich_mobile/providers/websocket.provider.dart';
 import 'package:immich_mobile/routing/router.dart';
 import 'package:logging/logging.dart';
@@ -49,6 +50,7 @@ class SplashScreenPageState extends ConsumerState<SplashScreenPage> {
     final accessToken = Store.tryGet(StoreKey.accessToken);
 
     if (accessToken != null && serverUrl != null && endpoint != null) {
+      final infoProvider = ref.read(serverInfoProvider.notifier);
       final wsProvider = ref.read(websocketProvider.notifier);
       final backgroundManager = ref.read(backgroundSyncProvider);
       final backupProvider = ref.read(driftBackupProvider.notifier);
@@ -58,6 +60,7 @@ class SplashScreenPageState extends ConsumerState<SplashScreenPage> {
           (_) async {
             try {
               wsProvider.connect();
+              unawaited(infoProvider.getServerInfo());
 
               if (Store.isBetaTimelineEnabled) {
                 bool syncSuccess = false;
@@ -72,7 +75,6 @@ class SplashScreenPageState extends ConsumerState<SplashScreenPage> {
                       _resumeBackup(backupProvider);
                     }),
                     _resumeBackup(backupProvider),
-                    backgroundManager.syncCloudIds(),
                   ]);
                 } else {
                   await backgroundManager.hashAssets();
@@ -130,7 +132,7 @@ class SplashScreenPageState extends ConsumerState<SplashScreenPage> {
     if (isEnableBackup) {
       final currentUser = Store.tryGet(StoreKey.currentUser);
       if (currentUser != null) {
-        unawaited(notifier.startForegroundBackup(currentUser.id));
+        unawaited(notifier.handleBackupResume(currentUser.id));
       }
     }
   }

mobile/lib/pages/library/folder/folder.page.dart

@@ -234,7 +234,7 @@ class FolderPath extends StatelessWidget {
               Text(
                 currentFolder.path,
                 style: TextStyle(
-                  fontFamily: 'GoogleSansCode',
+                  fontFamily: 'Inconsolata',
                   fontWeight: FontWeight.bold,
                   fontSize: 14,
                   color: context.colorScheme.onSurface.withAlpha(175),

mobile/lib/pages/login/login.page.dart

@@ -41,7 +41,7 @@ class LoginPage extends HookConsumerWidget {
                   style: TextStyle(
                     color: context.colorScheme.onSurfaceSecondary,
                     fontWeight: FontWeight.bold,
-                    fontFamily: "GoogleSansCode",
+                    fontFamily: "Inconsolata",
                   ),
                 ),
                 const Text(' '),
@@ -51,7 +51,7 @@ class LoginPage extends HookConsumerWidget {
                     style: TextStyle(
                       color: context.primaryColor,
                       fontWeight: FontWeight.bold,
-                      fontFamily: "GoogleSansCode",
+                      fontFamily: "Inconsolata",
                     ),
                   ),
                   onTap: () {