remove button from sync status page

* feat(web): search type selection dropdown

* chore: implement suggestions

* lint

---------

Co-authored-by: Alex <alex.tran1502@gmail.com>

.github/.nvmrc

@@ -1 +1 @@
-24.11.0
+24.11.1

.github/workflows/cli.yml

@@ -105,7 +105,7 @@ jobs:
 
       - name: Generate docker image tags
         id: metadata
-        uses: docker/metadata-action@318604b99e75e41977312d83839a89be02ca4893 # v5.9.0
+        uses: docker/metadata-action@c299e40c65443455700f0fdfc63efafe5b349051 # v5.10.0
         with:
           flavor: |
             latest=false

.github/workflows/close-duplicates.yml

@@ -35,7 +35,7 @@ jobs:
     needs: [get_body, should_run]
     if: ${{ needs.should_run.outputs.should_run == 'true' }}
     container:
-      image: ghcr.io/immich-app/mdq:main@sha256:9c905a4ff69f00c4b2f98b40b6090ab3ab18d1a15ed1379733b8691aa1fcb271
+      image: ghcr.io/immich-app/mdq:main@sha256:237cdae7783609c96f18037a513d38088713cf4a2e493a3aa136d0c45490749a
     outputs:
       checked: ${{ steps.get_checkbox.outputs.checked }}
     steps:

.github/workflows/codeql-analysis.yml

@@ -57,7 +57,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@014f16e7ab1402f30e7c3329d33797e7948572db # v4.31.3
+        uses: github/codeql-action/init@fdbfb4d2750291e159f0156def62b853c2798ca2 # v4.31.5
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -70,7 +70,7 @@ jobs:
       # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@014f16e7ab1402f30e7c3329d33797e7948572db # v4.31.3
+        uses: github/codeql-action/autobuild@fdbfb4d2750291e159f0156def62b853c2798ca2 # v4.31.5
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -83,6 +83,6 @@ jobs:
       #   ./location_of_script_within_repo/buildscript.sh
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@014f16e7ab1402f30e7c3329d33797e7948572db # v4.31.3
+        uses: github/codeql-action/analyze@fdbfb4d2750291e159f0156def62b853c2798ca2 # v4.31.5
         with:
           category: '/language:${{matrix.language}}'

.github/workflows/docker.yml

@@ -132,7 +132,7 @@ jobs:
             suffixes: '-rocm'
             platforms: linux/amd64
             runner-mapping: '{"linux/amd64": "mich"}'
-    uses: immich-app/devtools/.github/workflows/multi-runner-build.yml@47a2ee86898ccff51592d6572391fb1abcd7f782 # multi-runner-build-workflow-v2.0.1
+    uses: immich-app/devtools/.github/workflows/multi-runner-build.yml@0477486d82313fba68f7c82c034120a4b8981297 # multi-runner-build-workflow-v2.1.0
     permissions:
       contents: read
       actions: read
@@ -155,7 +155,7 @@ jobs:
     name: Build and Push Server
     needs: pre-job
     if: ${{ fromJSON(needs.pre-job.outputs.should_run).server == true }}
-    uses: immich-app/devtools/.github/workflows/multi-runner-build.yml@47a2ee86898ccff51592d6572391fb1abcd7f782 # multi-runner-build-workflow-v2.0.1
+    uses: immich-app/devtools/.github/workflows/multi-runner-build.yml@0477486d82313fba68f7c82c034120a4b8981297 # multi-runner-build-workflow-v2.1.0
     permissions:
       contents: read
       actions: read

.github/workflows/fix-format.yml

@@ -16,7 +16,7 @@ jobs:
     steps:
       - name: Generate a token
         id: generate-token
-        uses: actions/create-github-app-token@67018539274d69449ef7c02e8e71183d1719ab42 # v2.1.4
+        uses: actions/create-github-app-token@7e473efe3cb98aa54f8d4bac15400b15fad77d94 # v2.2.0
         with:
           app-id: ${{ secrets.PUSH_O_MATIC_APP_ID }}
           private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}

.github/workflows/merge-translations.yml

@@ -31,7 +31,7 @@ jobs:
       - name: Generate a token
         id: generate_token
         if: ${{ inputs.skip != true }}
-        uses: actions/create-github-app-token@67018539274d69449ef7c02e8e71183d1719ab42 # v2.1.4
+        uses: actions/create-github-app-token@7e473efe3cb98aa54f8d4bac15400b15fad77d94 # v2.2.0
         with:
           app-id: ${{ secrets.PUSH_O_MATIC_APP_ID }}
           private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}

.github/workflows/prepare-release.yml

@@ -49,7 +49,7 @@ jobs:
     steps:
       - name: Generate a token
         id: generate-token
-        uses: actions/create-github-app-token@67018539274d69449ef7c02e8e71183d1719ab42 # v2.1.4
+        uses: actions/create-github-app-token@7e473efe3cb98aa54f8d4bac15400b15fad77d94 # v2.2.0
         with:
           app-id: ${{ secrets.PUSH_O_MATIC_APP_ID }}
           private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
@@ -62,7 +62,7 @@ jobs:
           ref: main
 
       - name: Install uv
-        uses: astral-sh/setup-uv@5a7eac68fb9809dea845d802897dc5c723910fa3 # v7.1.3
+        uses: astral-sh/setup-uv@1e862dfacbd1d6d858c55d9b792c756523627244 # v7.1.4
 
       - name: Setup pnpm
         uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
@@ -126,7 +126,7 @@ jobs:
     steps:
       - name: Generate a token
         id: generate-token
-        uses: actions/create-github-app-token@67018539274d69449ef7c02e8e71183d1719ab42 # v2.1.4
+        uses: actions/create-github-app-token@7e473efe3cb98aa54f8d4bac15400b15fad77d94 # v2.2.0
         with:
           app-id: ${{ secrets.PUSH_O_MATIC_APP_ID }}
           private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}

.github/workflows/release-pr.yml

@@ -17,7 +17,7 @@ jobs:
     steps:
       - name: Generate a token
         id: generate-token
-        uses: actions/create-github-app-token@67018539274d69449ef7c02e8e71183d1719ab42 # v2.1.4
+        uses: actions/create-github-app-token@7e473efe3cb98aa54f8d4bac15400b15fad77d94 # v2.2.0
         with:
           app-id: ${{ secrets.PUSH_O_MATIC_APP_ID }}
           private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
@@ -30,7 +30,7 @@ jobs:
           ref: main
 
       - name: Install uv
-        uses: astral-sh/setup-uv@5a7eac68fb9809dea845d802897dc5c723910fa3 # v7.1.3
+        uses: astral-sh/setup-uv@1e862dfacbd1d6d858c55d9b792c756523627244 # v7.1.4
 
       - name: Setup pnpm
         uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
@@ -159,7 +159,7 @@ jobs:
 
       - name: Create PR
         id: create-pr
-        uses: peter-evans/create-pull-request@271a8d0340265f705b14b6d32b9829c1cb33d45e # v7.0.8
+        uses: peter-evans/create-pull-request@84ae59a2cdc2258d6fa0732dd66352dddae2a412 # v7.0.9
         with:
           token: ${{ steps.generate-token.outputs.token }}
           commit-message: 'chore: release ${{ steps.bump-type.outputs.next }}'

.github/workflows/release.yml

@@ -52,7 +52,7 @@ jobs:
     steps:
       - name: Generate a token
         id: generate-token
-        uses: actions/create-github-app-token@67018539274d69449ef7c02e8e71183d1719ab42 # v2.1.4
+        uses: actions/create-github-app-token@7e473efe3cb98aa54f8d4bac15400b15fad77d94 # v2.2.0
         with:
           app-id: ${{ secrets.PUSH_O_MATIC_APP_ID }}
           private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
@@ -74,7 +74,7 @@ jobs:
           echo "version=$VERSION" >> $GITHUB_OUTPUT
 
       - name: Download APK
-        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
+        uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
         with:
           name: release-apk-signed
           github-token: ${{ steps.generate-token.outputs.token }}

.github/workflows/test.yml

@@ -571,8 +571,8 @@ jobs:
           persist-credentials: false
           token: ${{ steps.token.outputs.token }}
       - name: Install uv
-        uses: astral-sh/setup-uv@5a7eac68fb9809dea845d802897dc5c723910fa3 # v7.1.3
-      - uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
+        uses: astral-sh/setup-uv@1e862dfacbd1d6d858c55d9b792c756523627244 # v7.1.4
+      - uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548 # v6.1.0
         # TODO: add caching when supported (https://github.com/actions/setup-python/pull/818)
         # with:
         #   python-version: 3.11

.vscode/settings.json

@@ -52,7 +52,7 @@
   },
   "cSpell.words": ["immich"],
   "editor.formatOnSave": true,
-  "eslint.validate": ["javascript", "svelte"],
+  "eslint.validate": ["javascript", "typescript", "svelte"],
   "explorer.fileNesting.enabled": true,
   "explorer.fileNesting.patterns": {
     "*.dart": "${capture}.g.dart,${capture}.gr.dart,${capture}.drift.dart",

cli/.nvmrc

@@ -1 +1 @@
-24.11.0
+24.11.1

cli/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:22.16.0-alpine3.20@sha256:2289fb1fba0f4633b08ec47b94a89c7e20b829fc5679f9b7b298eaa2f1ed8b7e AS core
+FROM node:24.1.0-alpine3.20@sha256:8fe019e0d57dbdce5f5c27c0b63d2775cf34b00e3755a7dea969802d7e0c2b25 AS core
 
 WORKDIR /usr/src/app
 COPY package* pnpm* .pnpmfile.cjs ./

cli/package.json

@@ -20,7 +20,7 @@
     "@types/lodash-es": "^4.17.12",
     "@types/micromatch": "^4.0.9",
     "@types/mock-fs": "^4.13.1",
-    "@types/node": "^22.19.1",
+    "@types/node": "^24.10.1",
     "@vitest/coverage-v8": "^3.0.0",
     "byte-size": "^9.0.0",
     "cli-progress": "^3.12.0",
@@ -28,7 +28,7 @@
     "eslint": "^9.14.0",
     "eslint-config-prettier": "^10.1.8",
     "eslint-plugin-prettier": "^5.1.3",
-    "eslint-plugin-unicorn": "^60.0.0",
+    "eslint-plugin-unicorn": "^62.0.0",
     "globals": "^16.0.0",
     "mock-fs": "^5.2.0",
     "prettier": "^3.2.5",
@@ -69,6 +69,6 @@
     "micromatch": "^4.0.8"
   },
   "volta": {
-    "node": "24.11.0"
+    "node": "24.11.1"
   }
 }

cli/src/utils.spec.ts

@@ -299,7 +299,7 @@ describe('crawl', () => {
           .map(([file]) => file);
 
         // Compare file's content instead of path since a file can be represent in multiple ways.
-        expect(actual.map((path) => readContent(path)).sort()).toEqual(expected.sort());
+        expect(actual.map((path) => readContent(path)).toSorted()).toEqual(expected.toSorted());
       });
     }
   });

cli/src/utils.ts

@@ -160,7 +160,7 @@ export const crawl = async (options: CrawlOptions): Promise<string[]> => {
     ignore: [`**/${exclusionPattern}`],
   });
   globbedFiles.push(...crawledFiles);
-  return globbedFiles.sort();
+  return globbedFiles.toSorted();
 };
 
 export const sha1 = (filepath: string) => {

cli/tsconfig.json

@@ -9,7 +9,7 @@
     "experimentalDecorators": true,
     "allowSyntheticDefaultImports": true,
     "resolveJsonModule": true,
-    "target": "es2022",
+    "target": "es2023",
     "sourceMap": true,
     "outDir": "./dist",
     "incremental": true,

deployment/mise.toml

@@ -1,6 +1,6 @@
 [tools]
-terragrunt = "0.91.2"
-opentofu = "1.10.6"
+terragrunt = "0.93.10"
+opentofu = "1.10.7"
 
 [tasks."tg:fmt"]
 run = "terragrunt hclfmt"

docker/docker-compose.dev.yml

@@ -135,7 +135,7 @@ services:
 
   redis:
     container_name: immich_redis
-    image: docker.io/valkey/valkey:8@sha256:81db6d39e1bba3b3ff32bd3a1b19a6d69690f94a3954ec131277b9a26b95b3aa
+    image: docker.io/valkey/valkey:9@sha256:4503e204c900a00ad393bec83c8c7c4c76b0529cd629e23b34b52011aefd1d27
     healthcheck:
       test: redis-cli ping || exit 1
 

docker/docker-compose.prod.yml

@@ -56,7 +56,7 @@ services:
 
   redis:
     container_name: immich_redis
-    image: docker.io/valkey/valkey:8@sha256:81db6d39e1bba3b3ff32bd3a1b19a6d69690f94a3954ec131277b9a26b95b3aa
+    image: docker.io/valkey/valkey:9@sha256:4503e204c900a00ad393bec83c8c7c4c76b0529cd629e23b34b52011aefd1d27
     healthcheck:
       test: redis-cli ping || exit 1
     restart: always
@@ -95,7 +95,7 @@ services:
     command: ['./run.sh', '-disable-reporting']
     ports:
       - 3000:3000
-    image: grafana/grafana:12.2.1-ubuntu@sha256:797530c642f7b41ba7848c44cfda5e361ef1f3391a98bed1e5d448c472b6826a
+    image: grafana/grafana:12.3.0-ubuntu@sha256:cee936306135e1925ab21dffa16f8a411535d16ab086bef2309339a8e74d62df
     volumes:
       - grafana-data:/var/lib/grafana
 

docker/docker-compose.yml

@@ -49,7 +49,7 @@ services:
 
   redis:
     container_name: immich_redis
-    image: docker.io/valkey/valkey:8@sha256:81db6d39e1bba3b3ff32bd3a1b19a6d69690f94a3954ec131277b9a26b95b3aa
+    image: docker.io/valkey/valkey:9@sha256:4503e204c900a00ad393bec83c8c7c4c76b0529cd629e23b34b52011aefd1d27
     healthcheck:
       test: redis-cli ping || exit 1
     restart: always

docs/.nvmrc

@@ -1 +1 @@
-24.11.0
+24.11.1

docs/docs/FAQ.mdx

@@ -133,9 +133,9 @@ There are a few different scenarios that can lead to this situation. The solutio
 The job is only automatically run once per asset after upload. If metadata extraction originally failed, the jobs were cleared/canceled, etc.,
 the job may not have run automatically the first time.
 
-### How can I hide photos from the timeline?
+### How can I hide a photo or video from the timeline?
 
-You can _archive_ them.
+You can _archive_ them. This will hide the asset from the main timeline and folder view, but it will still show up in searches. All archived assets can be found in the _Archive_ view
 
 ### How can I backup data from Immich?
 

docs/docs/administration/backup-and-restore.md

@@ -41,7 +41,7 @@ By default, Immich will keep the last 14 database dumps and create a new dump ev
 
 #### Trigger Dump
 
-You are able to trigger a database dump in the [admin job status page](http://my.immich.app/admin/jobs-status).
+You are able to trigger a database dump in the [admin job status page](http://my.immich.app/admin/queues).
 Visit the page, open the "Create job" modal from the top right, select "Create Database Dump" and click "Confirm".
 A job will run and trigger a dump, you can verify this worked correctly by checking the logs or the `backups/` folder.
 This dumps will count towards the last `X` dumps that will be kept based on your settings.

docs/docs/administration/reverse-proxy.md

@@ -21,6 +21,9 @@ server {
     # allow large file uploads
     client_max_body_size 50000M;
 
+    # disable buffering uploads to prevent OOM on reverse proxy server and make uploads twice as fast (no pause)
+    proxy_request_buffering off;
+
     # Set headers
     proxy_set_header Host              $host;
     proxy_set_header X-Real-IP         $remote_addr;

docs/docs/developer/pr-checklist.md

@@ -14,15 +14,15 @@ When contributing code through a pull request, please check the following:
 - [ ] `pnpm run check:typescript` (check typescript)
 - [ ] `pnpm test` (unit tests)
 
+:::tip AIO
+Run all web checks with `pnpm run check:all`
+:::
+
 ## Documentation
 
 - [ ] `pnpm run format` (formatting via Prettier)
 - [ ] Update the `_redirects` file if you have renamed a page or removed it from the documentation.
 
-:::tip AIO
-Run all web checks with `pnpm run check:all`
-:::
-
 ## Server Checks
 
 - [ ] `pnpm run lint` (linting via ESLint)

docs/docs/developer/setup.md

@@ -48,7 +48,6 @@ You can access the web from `http://your-machine-ip:3000` or `http://localhost:3
 **Notes:**
 
 - The "web" development container runs with uid 1000. If that uid does not have read/write permissions on the mounted volumes, you may encounter errors
-- In case of rootless docker setup, you need to use root within the container, otherwise you will encounter read/write permission related errors, see comments in `docker/docker-compose.dev.yml`.
 
 #### Connect web to a remote backend
 

docs/docs/developer/testing.md

@@ -18,6 +18,7 @@ make e2e
 Before you can run the tests, you need to run the following commands _once_:
 
 - `pnpm install` (in `e2e/`)
+- `pnpm run build` (in `cli/`)
 - `make open-api` (in the project root `/`)
 
 Once the test environment is running, the e2e tests can be run via:

docs/docs/features/searching.md

@@ -1222,4 +1222,4 @@ Feel free to make a feature request if there's a model you want to use that we d
 [huggingface-clip]: https://huggingface.co/collections/immich-app/clip-654eaefb077425890874cd07
 [huggingface-multilingual-clip]: https://huggingface.co/collections/immich-app/multilingual-clip-654eb08c2382f591eeb8c2a7
 [smart-search-settings]: https://my.immich.app/admin/system-settings?isOpen=machine-learning+smart-search
-[job-status-page]: https://my.immich.app/admin/jobs-status
+[job-status-page]: https://my.immich.app/admin/queues

docs/docs/guides/remote-machine-learning.md

@@ -53,7 +53,7 @@ Version mismatches between both hosts may cause bugs and instability, so remembe
 
 Adding a new URL to the settings is recommended over replacing the existing URL. This is because it will allow machine learning tasks to be processed successfully when the remote server is down by falling back to the local machine learning container. If you do not want machine learning tasks to be processed locally when the remote server is not available, you can instead replace the existing URL and only provide the remote container's URL. If doing this, you can remove the `immich-machine-learning` section of the local `docker-compose.yml` file to save resources, as this service will never be used.
 
-Do note that this will mean that Smart Search and Face Detection jobs will fail to be processed when the remote instance is not available. This in turn means that tasks dependent on these features—Duplicate Detection and Facial Recognition—will not run for affected assets. If this occurs, you must manually click the _Missing_ button next to Smart Search and Face Detection in the [Job Status](http://my.immich.app/admin/jobs-status) page for the jobs to be retried.
+Do note that this will mean that Smart Search and Face Detection jobs will fail to be processed when the remote instance is not available. This in turn means that tasks dependent on these features—Duplicate Detection and Facial Recognition—will not run for affected assets. If this occurs, you must manually click the _Missing_ button next to Smart Search and Face Detection in the [Job Status](http://my.immich.app/admin/queues) page for the jobs to be retried.
 
 ## Load balancing
 

docs/docs/install/environment-variables.md

@@ -62,10 +62,10 @@ Information on the current workers can be found [here](/administration/jobs-work
 
 ## Ports
 
-| Variable      | Description    |                  Default                   |
-| :------------ | :------------- | :----------------------------------------: |
-| `IMMICH_HOST` | Listening host |                 `0.0.0.0`                  |
-| `IMMICH_PORT` | Listening port | `2283` (server), `3003` (machine learning) |
+| Variable      | Description    |                  Default                   | Containers               |
+| :------------ | :------------- | :----------------------------------------: | :----------------------- |
+| `IMMICH_HOST` | Listening host |                 `0.0.0.0`                  | server, machine learning |
+| `IMMICH_PORT` | Listening port | `2283` (server), `3003` (machine learning) | server, machine learning |
 
 ## Database
 
@@ -80,7 +80,7 @@ Information on the current workers can be found [here](/administration/jobs-work
 | `DB_SSL_MODE`                       | Database SSL mode                                                                      |            | server                         |
 | `DB_VECTOR_EXTENSION`<sup>\*2</sup> | Database vector extension (one of [`vectorchord`, `pgvector`, `pgvecto.rs`])           |            | server                         |
 | `DB_SKIP_MIGRATIONS`                | Whether to skip running migrations on startup (one of [`true`, `false`])               |  `false`   | server                         |
-| `DB_STORAGE_TYPE`                   | Optimize concurrent IO on SSDs or sequential IO on HDDs ([`SSD`, `HDD`])<sup>\*3</sup> |   `SSD`    | server                         |
+| `DB_STORAGE_TYPE`                   | Optimize concurrent IO on SSDs or sequential IO on HDDs ([`SSD`, `HDD`])<sup>\*3</sup> |   `SSD`    | database                       |
 
 \*1: The values of `DB_USERNAME`, `DB_PASSWORD`, and `DB_DATABASE_NAME` are passed to the Postgres container as the variables `POSTGRES_USER`, `POSTGRES_PASSWORD`, and `POSTGRES_DB` in `docker-compose.yml`.
 
@@ -93,7 +93,7 @@ Information on the current workers can be found [here](/administration/jobs-work
 All `DB_` variables must be provided to all Immich workers, including `api` and `microservices`.
 
 `DB_URL` must be in the format `postgresql://immichdbusername:immichdbpassword@postgreshost:postgresport/immichdatabasename`.
-You can require SSL by adding `?sslmode=require` to the end of the `DB_URL` string, or require SSL and skip certificate verification by adding `?sslmode=require&sslmode=no-verify`.
+You can require SSL by adding `?sslmode=require` to the end of the `DB_URL` string, or require SSL and skip certificate verification by adding `?sslmode=require&uselibpqcompat=true`. This allows both immich and `pg_dumpall` (the utility used for database backups) to [properly connect](https://github.com/brianc/node-postgres/tree/master/packages/pg-connection-string#tcp-connections) to your database.
 
 When `DB_URL` is defined, the `DB_HOSTNAME`, `DB_PORT`, `DB_USERNAME`, `DB_PASSWORD` and `DB_DATABASE_NAME` database variables are ignored.
 

docs/package.json

@@ -57,6 +57,6 @@
     "node": ">=20"
   },
   "volta": {
-    "node": "24.11.0"
+    "node": "24.11.1"
   }
 }

e2e/.nvmrc

@@ -1 +1 @@
-24.11.0
+24.11.1

e2e/package.json

@@ -26,7 +26,7 @@
     "@playwright/test": "^1.44.1",
     "@socket.io/component-emitter": "^3.1.2",
     "@types/luxon": "^3.4.2",
-    "@types/node": "^22.19.1",
+    "@types/node": "^24.10.1",
     "@types/oidc-provider": "^9.0.0",
     "@types/pg": "^8.15.1",
     "@types/pngjs": "^6.0.4",
@@ -35,8 +35,8 @@
     "eslint": "^9.14.0",
     "eslint-config-prettier": "^10.1.8",
     "eslint-plugin-prettier": "^5.1.3",
-    "eslint-plugin-unicorn": "^60.0.0",
-    "exiftool-vendored": "^31.1.0",
+    "eslint-plugin-unicorn": "^62.0.0",
+    "exiftool-vendored": "^33.0.0",
     "globals": "^16.0.0",
     "jose": "^5.6.3",
     "luxon": "^3.4.4",
@@ -45,7 +45,7 @@
     "pngjs": "^7.0.0",
     "prettier": "^3.2.5",
     "prettier-plugin-organize-imports": "^4.0.0",
-    "sharp": "^0.34.4",
+    "sharp": "^0.34.5",
     "socket.io-client": "^4.7.4",
     "supertest": "^7.0.0",
     "typescript": "^5.3.3",
@@ -54,6 +54,6 @@
     "vitest": "^3.0.0"
   },
   "volta": {
-    "node": "24.11.0"
+    "node": "24.11.1"
   }
 }

e2e/src/api/specs/library.e2e-spec.ts

@@ -1006,7 +1006,7 @@ describe('/libraries', () => {
         rmSync(`${testAssetDir}/temp/xmp`, { recursive: true, force: true });
       });
 
-      it('should switch from using file metadata to file.xmp metadata when asset refreshes', async () => {
+      it('should switch from using file metadata to file.ext.xmp metadata when asset refreshes', async () => {
         const library = await utils.createLibrary(admin.accessToken, {
           ownerId: admin.userId,
           importPaths: [`${testAssetDirInternal}/temp/xmp`],

e2e/src/generators/timeline/utils.ts

@@ -61,7 +61,7 @@ export function selectRandomDays(daysInMonth: number, numDays: number, rng: Seed
     }
   }
 
-  return [...selectedDays].sort((a, b) => b - a);
+  return [...selectedDays].toSorted((a, b) => b - a);
 }
 
 /**

e2e/src/mock-network/timeline-network.ts

@@ -62,50 +62,60 @@ export const setupTimelineMockApiRoutes = async (
     return route.continue();
   });
 
-  await context.route('**/api/assets/**', async (route, request) => {
+  await context.route('**/api/assets/*', async (route, request) => {
+    const url = new URL(request.url());
+    const pathname = url.pathname;
+    const assetId = basename(pathname);
+    const asset = getAsset(timelineRestData, assetId);
+    return route.fulfill({
+      status: 200,
+      contentType: 'application/json',
+      json: asset,
+    });
+  });
+
+  await context.route('**/api/assets/*/ocr', async (route) => {
+    return route.fulfill({ status: 200, contentType: 'application/json', json: [] });
+  });
+
+  await context.route('**/api/assets/*/thumbnail?size=*', async (route, request) => {
     const pattern = /\/api\/assets\/(?<assetId>[^/]+)\/thumbnail\?size=(?<size>preview|thumbnail)/;
     const match = request.url().match(pattern);
-    if (!match) {
-      const url = new URL(request.url());
-      const pathname = url.pathname;
-      const assetId = basename(pathname);
-      const asset = getAsset(timelineRestData, assetId);
-      return route.fulfill({
-        status: 200,
-        contentType: 'application/json',
-        json: asset,
-      });
+    if (!match?.groups) {
+      throw new Error(`Invalid URL for thumbnail endpoint: ${request.url()}`);
     }
-    if (match.groups?.size === 'preview') {
+
+    if (match.groups.size === 'preview') {
       if (!route.request().serviceWorker()) {
         return route.continue();
       }
-      const asset = getAsset(timelineRestData, match.groups?.assetId);
+      const asset = getAsset(timelineRestData, match.groups.assetId);
       return route.fulfill({
         status: 200,
         headers: { 'content-type': 'image/jpeg', ETag: 'abc123', 'Cache-Control': 'public, max-age=3600' },
         body: await randomPreview(
-          match.groups?.assetId,
+          match.groups.assetId,
           (asset?.exifInfo?.exifImageWidth ?? 0) / (asset?.exifInfo?.exifImageHeight ?? 1),
         ),
       });
     }
-    if (match.groups?.size === 'thumbnail') {
+    if (match.groups.size === 'thumbnail') {
       if (!route.request().serviceWorker()) {
         return route.continue();
       }
-      const asset = getAsset(timelineRestData, match.groups?.assetId);
+      const asset = getAsset(timelineRestData, match.groups.assetId);
       return route.fulfill({
         status: 200,
         headers: { 'content-type': 'image/jpeg' },
         body: await randomThumbnail(
-          match.groups?.assetId,
+          match.groups.assetId,
           (asset?.exifInfo?.exifImageWidth ?? 0) / (asset?.exifInfo?.exifImageHeight ?? 1),
         ),
       });
     }
     return route.continue();
   });
+
   await context.route('**/api/albums/**', async (route, request) => {
     const pattern = /\/api\/albums\/(?<albumId>[^/?]+)/;
     const match = request.url().match(pattern);

e2e/src/utils.ts

@@ -12,7 +12,7 @@ import {
   PersonCreateDto,
   QueueCommandDto,
   QueueName,
-  QueuesResponseDto,
+  QueuesResponseLegacyDto,
   SharedLinkCreateDto,
   UpdateLibraryDto,
   UserAdminCreateDto,
@@ -564,13 +564,13 @@ export const utils = {
     await updateConfig({ systemConfigDto: defaultConfig }, { headers: asBearerAuth(accessToken) });
   },
 
-  isQueueEmpty: async (accessToken: string, queue: keyof QueuesResponseDto) => {
+  isQueueEmpty: async (accessToken: string, queue: keyof QueuesResponseLegacyDto) => {
     const queues = await getQueuesLegacy({ headers: asBearerAuth(accessToken) });
     const jobCounts = queues[queue].jobCounts;
     return !jobCounts.active && !jobCounts.waiting;
   },
 
-  waitForQueueFinish: (accessToken: string, queue: keyof QueuesResponseDto, ms?: number) => {
+  waitForQueueFinish: (accessToken: string, queue: keyof QueuesResponseLegacyDto, ms?: number) => {
     // eslint-disable-next-line no-async-promise-executor
     return new Promise<void>(async (resolve, reject) => {
       const timeout = setTimeout(() => reject(new Error('Timed out waiting for queue to empty')), ms || 10_000);

e2e/src/web/specs/timeline/timeline.parallel-e2e-spec.ts

@@ -611,6 +611,53 @@ test.describe('Timeline', () => {
       await page.getByText('Photos', { exact: true }).click();
       await thumbnailUtils.expectInViewport(page, assetToArchive.id);
     });
+    test('open /archive, favorite photo, unfavorite', async ({ page }) => {
+      const assetToFavorite = assets[0];
+      changes.assetArchivals.push(assetToFavorite.id);
+      await pageUtils.openArchivePage(page);
+      const favorite = pageRoutePromise(page, '**/api/assets', async (route, request) => {
+        const requestJson = request.postDataJSON();
+        if (requestJson.isFavorite === undefined) {
+          return await route.continue();
+        }
+        const isFavorite = requestJson.isFavorite;
+        if (isFavorite) {
+          changes.assetFavorites.push(...requestJson.ids);
+        }
+        await route.fulfill({
+          status: 204,
+        });
+      });
+      await thumbnailUtils.withAssetId(page, assetToFavorite.id).hover();
+      await thumbnailUtils.selectButton(page, assetToFavorite.id).click();
+      await page.getByLabel('Favorite').click();
+      await expect(favorite).resolves.toEqual({
+        isFavorite: true,
+        ids: [assetToFavorite.id],
+      });
+      await expect(thumbnailUtils.withAssetId(page, assetToFavorite.id)).toHaveCount(1);
+      await thumbnailUtils.expectInViewport(page, assetToFavorite.id);
+      await thumbnailUtils.expectThumbnailIsFavorite(page, assetToFavorite.id);
+      await thumbnailUtils.withAssetId(page, assetToFavorite.id).hover();
+      await thumbnailUtils.selectButton(page, assetToFavorite.id).click();
+      const unFavoriteRequest = pageRoutePromise(page, '**/api/assets', async (route, request) => {
+        const requestJson = request.postDataJSON();
+        if (requestJson.isFavorite === undefined) {
+          return await route.continue();
+        }
+        changes.assetFavorites = changes.assetFavorites.filter((id) => !requestJson.ids.includes(id));
+        await route.fulfill({
+          status: 204,
+        });
+      });
+      await page.getByLabel('Remove from favorites').click();
+      await expect(unFavoriteRequest).resolves.toEqual({
+        isFavorite: false,
+        ids: [assetToFavorite.id],
+      });
+      await expect(thumbnailUtils.withAssetId(page, assetToFavorite.id)).toHaveCount(1);
+      await thumbnailUtils.expectThumbnailIsNotFavorite(page, assetToFavorite.id);
+    });
     test('open album, archive photo, open album, unarchive', async ({ page }) => {
       const album = timelineRestData.album;
       await pageUtils.openAlbumPage(page, album.id);
@@ -633,8 +680,7 @@ test.describe('Timeline', () => {
         visibility: 'archive',
         ids: [assetToArchive.id],
       });
-      console.log('Skipping assertion - TODO - fix that archiving in album doesnt add icon');
-      // await thumbnail.expectThumbnailIsArchive(page, assetToArchive.id);
+      await thumbnailUtils.expectThumbnailIsArchive(page, assetToArchive.id);
       await page.locator('#asset-selection-app-bar').getByLabel('Close').click();
       await page.getByRole('link').getByText('Archive').click();
       await timelineUtils.waitForTimelineLoad(page);
@@ -656,8 +702,7 @@ test.describe('Timeline', () => {
         visibility: 'timeline',
         ids: [assetToArchive.id],
       });
-      console.log('Skipping assertion - TODO - fix bug with not removing asset from timeline-manager after unarchive');
-      // await expect(thumbnail.withAssetId(page, assetToArchive.id)).toHaveCount(0);
+      await expect(thumbnailUtils.withAssetId(page, assetToArchive.id)).toHaveCount(0);
       await pageUtils.openAlbumPage(page, album.id);
       await thumbnailUtils.expectInViewport(page, assetToArchive.id);
     });
@@ -712,6 +757,50 @@ test.describe('Timeline', () => {
       await page.getByText('Photos', { exact: true }).click();
       await thumbnailUtils.expectInViewport(page, assetToFavorite.id);
     });
+    test('open /favorites, archive photo, unarchive photo', async ({ page }) => {
+      await pageUtils.openFavorites(page);
+      const assetToArchive = getAsset(timelineRestData, 'ad31e29f-2069-4574-b9a9-ad86523c92cb')!;
+      await thumbnailUtils.withAssetId(page, assetToArchive.id).hover();
+      await thumbnailUtils.selectButton(page, assetToArchive.id).click();
+      await page.getByLabel('Menu').click();
+      const archive = pageRoutePromise(page, '**/api/assets', async (route, request) => {
+        const requestJson = request.postDataJSON();
+        if (requestJson.visibility !== 'archive') {
+          return await route.continue();
+        }
+        await route.fulfill({
+          status: 204,
+        });
+        changes.assetArchivals.push(...requestJson.ids);
+      });
+      await page.getByRole('menuitem').getByText('Archive').click();
+      await expect(archive).resolves.toEqual({
+        visibility: 'archive',
+        ids: [assetToArchive.id],
+      });
+      await page.getByRole('link').getByText('Archive').click();
+      await thumbnailUtils.expectInViewport(page, assetToArchive.id);
+      await thumbnailUtils.expectThumbnailIsNotArchive(page, assetToArchive.id);
+      await thumbnailUtils.withAssetId(page, assetToArchive.id).hover();
+      await thumbnailUtils.selectButton(page, assetToArchive.id).click();
+      const unarchiveRequest = pageRoutePromise(page, '**/api/assets', async (route, request) => {
+        const requestJson = request.postDataJSON();
+        if (requestJson.visibility !== 'timeline') {
+          return await route.continue();
+        }
+        changes.assetArchivals = changes.assetArchivals.filter((id) => !requestJson.ids.includes(id));
+        await route.fulfill({
+          status: 204,
+        });
+      });
+      await page.getByLabel('Unarchive').click();
+      await expect(unarchiveRequest).resolves.toEqual({
+        visibility: 'timeline',
+        ids: [assetToArchive.id],
+      });
+      await expect(thumbnailUtils.withAssetId(page, assetToArchive.id)).toHaveCount(0);
+      await thumbnailUtils.expectThumbnailIsNotArchive(page, assetToArchive.id);
+    });
     test('Open album, favorite photo, open /favorites, remove favorite, Open album', async ({ page }) => {
       const album = timelineRestData.album;
       await pageUtils.openAlbumPage(page, album.id);

e2e/src/web/specs/timeline/utils.ts

@@ -105,20 +105,16 @@ export const thumbnailUtils = {
     return await poll(page, () => thumbnailUtils.queryThumbnailInViewport(page, collector));
   },
   async expectThumbnailIsFavorite(page: Page, assetId: string) {
-    await expect(
-      thumbnailUtils
-        .withAssetId(page, assetId)
-        .locator(
-          'path[d="M12,21.35L10.55,20.03C5.4,15.36 2,12.27 2,8.5C2,5.41 4.42,3 7.5,3C9.24,3 10.91,3.81 12,5.08C13.09,3.81 14.76,3 16.5,3C19.58,3 22,5.41 22,8.5C22,12.27 18.6,15.36 13.45,20.03L12,21.35Z"]',
-        ),
-    ).toHaveCount(1);
+    await expect(thumbnailUtils.withAssetId(page, assetId).locator('[data-icon-favorite]')).toHaveCount(1);
+  },
+  async expectThumbnailIsNotFavorite(page: Page, assetId: string) {
+    await expect(thumbnailUtils.withAssetId(page, assetId).locator('[data-icon-favorite]')).toHaveCount(0);
   },
   async expectThumbnailIsArchive(page: Page, assetId: string) {
-    await expect(
-      thumbnailUtils
-        .withAssetId(page, assetId)
-        .locator('path[d="M20 21H4V10H6V19H18V10H20V21M3 3H21V9H3V3M5 5V7H19V5M10.5 11V14H8L12 18L16 14H13.5V11"]'),
-    ).toHaveCount(1);
+    await expect(thumbnailUtils.withAssetId(page, assetId).locator('[data-icon-archive]')).toHaveCount(1);
+  },
+  async expectThumbnailIsNotArchive(page: Page, assetId: string) {
+    await expect(thumbnailUtils.withAssetId(page, assetId).locator('[data-icon-archive]')).toHaveCount(0);
   },
   async expectSelectedReadonly(page: Page, assetId: string) {
     // todo - need a data attribute for selected
@@ -208,10 +204,18 @@ export const pageUtils = {
     await page.goto(`/photos`);
     await timelineUtils.waitForTimelineLoad(page);
   },
+  async openFavorites(page: Page) {
+    await page.goto(`/favorites`);
+    await timelineUtils.waitForTimelineLoad(page);
+  },
   async openAlbumPage(page: Page, albumId: string) {
     await page.goto(`/albums/${albumId}`);
     await timelineUtils.waitForTimelineLoad(page);
   },
+  async openArchivePage(page: Page) {
+    await page.goto(`/archive`);
+    await timelineUtils.waitForTimelineLoad(page);
+  },
   async deepLinkAlbumPage(page: Page, albumId: string, assetId: string) {
     await page.goto(`/albums/${albumId}?at=${assetId}`);
     await timelineUtils.waitForTimelineLoad(page);

e2e/src/web/specs/user-admin.e2e-spec.ts

@@ -54,7 +54,7 @@ test.describe('User Administration', () => {
 
     await page.getByRole('button', { name: 'Edit' }).click();
     await expect(page.getByLabel('Admin User')).not.toBeChecked();
-    await page.getByText('Admin User').click();
+    await page.getByLabel('Admin User').click();
     await expect(page.getByLabel('Admin User')).toBeChecked();
     await page.getByRole('button', { name: 'Confirm' }).click();
 
@@ -83,7 +83,7 @@ test.describe('User Administration', () => {
 
     await page.getByRole('button', { name: 'Edit' }).click();
     await expect(page.getByLabel('Admin User')).toBeChecked();
-    await page.getByText('Admin User').click();
+    await page.getByLabel('Admin User').click();
     await expect(page.getByLabel('Admin User')).not.toBeChecked();
     await page.getByRole('button', { name: 'Confirm' }).click();
 

e2e/tsconfig.json

@@ -9,7 +9,7 @@
     "experimentalDecorators": true,
     "allowSyntheticDefaultImports": true,
     "resolveJsonModule": true,
-    "target": "es2022",
+    "target": "es2023",
     "sourceMap": true,
     "outDir": "./dist",
     "incremental": true,

i18n/en.json

@@ -7,6 +7,7 @@
   "action_common_update": "Update",
   "actions": "Actions",
   "active": "Active",
+  "active_count": "Active: {count}",
   "activity": "Activity",
   "activity_changed": "Activity is {enabled, select, true {enabled} other {disabled}}",
   "add": "Add",
@@ -67,6 +68,7 @@
     "confirm_reprocess_all_faces": "Are you sure you want to reprocess all faces? This will also clear named people.",
     "confirm_user_password_reset": "Are you sure you want to reset {user}'s password?",
     "confirm_user_pin_code_reset": "Are you sure you want to reset {user}'s PIN code?",
+    "copy_config_to_clipboard_description": "Copy the current system config as a JSON object to the clipboard",
     "create_job": "Create job",
     "cron_expression": "Cron expression",
     "cron_expression_description": "Set the scanning interval using the cron format. For more information please refer to e.g. <link>Crontab Guru</link>",
@@ -74,6 +76,8 @@
     "disable_login": "Disable login",
     "duplicate_detection_job_description": "Run machine learning on assets to detect similar images. Relies on Smart Search",
     "exclusion_pattern_description": "Exclusion patterns lets you ignore files and folders when scanning your library. This is useful if you have folders that contain files you don't want to import, such as RAW files.",
+    "export_config_as_json_description": "Download the current system config as a JSON file",
+    "external_libraries_page_description": "Admin external library page",
     "external_library_management": "External Library Management",
     "face_detection": "Face detection",
     "face_detection_description": "Detect the faces in assets using machine learning. For videos, only the thumbnail is considered. \"Refresh\" (re-)processes all assets. \"Reset\" additionally clears all current face data. \"Missing\" queues assets that haven't been processed yet. Detected faces will be queued for Facial Recognition after Face Detection is complete, grouping them into existing or new people.",
@@ -102,14 +106,15 @@
     "image_thumbnail_description": "Small thumbnail with stripped metadata, used when viewing groups of photos like the main timeline",
     "image_thumbnail_quality_description": "Thumbnail quality from 1-100. Higher is better, but produces larger files and can reduce app responsiveness.",
     "image_thumbnail_title": "Thumbnail Settings",
+    "import_config_from_json_description": "Import system config by uploading a JSON config file",
     "job_concurrency": "{job} concurrency",
     "job_created": "Job created",
     "job_not_concurrency_safe": "This job is not concurrency-safe.",
     "job_settings": "Job Settings",
     "job_settings_description": "Manage job concurrency",
-    "job_status": "Job Status",
     "jobs_delayed": "{jobCount, plural, other {# delayed}}",
     "jobs_failed": "{jobCount, plural, other {# failed}}",
+    "jobs_over_time": "Jobs over time",
     "library_created": "Created library: {library}",
     "library_deleted": "Library deleted",
     "library_details": "Library details",
@@ -182,6 +187,7 @@
     "maintenance_start": "Start maintenance mode",
     "maintenance_start_error": "Failed to start maintenance mode.",
     "manage_concurrency": "Manage Concurrency",
+    "manage_concurrency_description": "Navigate to the jobs page to manage job concurrency",
     "manage_log_settings": "Manage log settings",
     "map_dark_style": "Dark style",
     "map_enable_description": "Enable map features",
@@ -271,10 +277,14 @@
     "password_settings_description": "Manage password login settings",
     "paths_validated_successfully": "All paths validated successfully",
     "person_cleanup_job": "Person cleanup",
+    "queue_details": "Queue Details",
+    "queues": "Job Queues",
+    "queues_page_description": "Admin job queues page",
     "quota_size_gib": "Quota Size (GiB)",
     "refreshing_all_libraries": "Refreshing all libraries",
     "registration": "Admin Registration",
     "registration_description": "Since you are the first user on the system, you will be assigned as the Admin and are responsible for administrative tasks, and additional users will be created by you.",
+    "remove_failed_jobs": "Remove failed jobs",
     "require_password_change_on_login": "Require user to change password on first login",
     "reset_settings_to_default": "Reset settings to default",
     "reset_settings_to_recent_saved": "Reset settings to the recent saved settings",
@@ -287,8 +297,10 @@
     "server_public_users_description": "All users (name and email) are listed when adding a user to shared albums. When disabled, the user list will only be available to admin users.",
     "server_settings": "Server Settings",
     "server_settings_description": "Manage server settings",
+    "server_stats_page_description": "Admin server statistics page",
     "server_welcome_message": "Welcome message",
     "server_welcome_message_description": "A message that is displayed on the login page.",
+    "settings_page_description": "Admin settings page",
     "sidecar_job": "Sidecar metadata",
     "sidecar_job_description": "Discover or synchronize sidecar metadata from the filesystem",
     "slideshow_duration_description": "Number of seconds to display each image",
@@ -407,6 +419,8 @@
     "user_restore_scheduled_removal": "Restore user - scheduled removal on {date, date, long}",
     "user_settings": "User Settings",
     "user_settings_description": "Manage user settings",
+    "user_successfully_removed": "User {email} has been successfully removed.",
+    "users_page_description": "Admin users page",
     "version_check_enabled_description": "Enable version check",
     "version_check_implications": "The version check feature relies on periodic communication with github.com",
     "version_check_settings": "Version Check",
@@ -727,6 +741,7 @@
   "collapse_all": "Collapse all",
   "color": "Color",
   "color_theme": "Color theme",
+  "command": "Command",
   "comment_deleted": "Comment deleted",
   "comment_options": "Comment options",
   "comments_and_likes": "Comments & likes",
@@ -1091,6 +1106,7 @@
   "external_network_sheet_info": "When not on the preferred Wi-Fi network, the app will connect to the server through the first of the below URLs it can reach, starting from top to bottom",
   "face_unassigned": "Unassigned",
   "failed": "Failed",
+  "failed_count": "Failed: {count}",
   "failed_to_authenticate": "Failed to authenticate",
   "failed_to_load_assets": "Failed to load assets",
   "failed_to_load_folder": "Failed to load folder",
@@ -1511,6 +1527,7 @@
   "other_variables": "Other variables",
   "owned": "Owned",
   "owner": "Owner",
+  "page": "Page",
   "partner": "Partner",
   "partner_can_access": "{partner} can access",
   "partner_can_access_assets": "All your photos and videos except those in Archived and Deleted",
@@ -2022,6 +2039,7 @@
   "sync": "Sync",
   "sync_albums": "Sync albums",
   "sync_albums_manual_subtitle": "Sync all uploaded videos and photos to the selected backup albums",
+  "sync_cloud_ids": "Sync Cloud IDs",
   "sync_local": "Sync Local",
   "sync_remote": "Sync Remote",
   "sync_status": "Sync Status",
@@ -2071,6 +2089,7 @@
   "to_select": "to select",
   "to_trash": "Trash",
   "toggle_settings": "Toggle settings",
+  "toggle_theme_description": "Toggle theme",
   "total": "Total",
   "total_usage": "Total usage",
   "trash": "Trash",
@@ -2179,6 +2198,7 @@
   "view_album": "View Album",
   "view_all": "View All",
   "view_all_users": "View all users",
+  "view_asset_owners": "View asset owners",
   "view_details": "View Details",
   "view_in_timeline": "View in timeline",
   "view_link": "View link",
@@ -2195,6 +2215,7 @@
   "viewer_unstack": "Un-Stack",
   "visibility_changed": "Visibility changed for {count, plural, one {# person} other {# people}}",
   "waiting": "Waiting",
+  "waiting_count": "Waiting: {count}",
   "warning": "Warning",
   "week": "Week",
   "welcome": "Welcome",

machine-learning/Dockerfile

@@ -1,6 +1,6 @@
 ARG DEVICE=cpu
 
-FROM python:3.11-bookworm@sha256:fc1f2e357c307c4044133952b203e66a47e7726821a664f603a180a0c5823844 AS builder-cpu
+FROM python:3.11-bookworm@sha256:e39286476f84ffedf7c3564b0b74e32c9e1193ec9ca32ee8a11f8c09dbf6aafe AS builder-cpu
 
 FROM builder-cpu AS builder-openvino
 
@@ -22,10 +22,10 @@ FROM builder-cpu AS builder-rknn
 
 # Warning: 25GiB+ disk space required to pull this image
 # TODO: find a way to reduce the image size
-FROM rocm/dev-ubuntu-22.04:6.4.3-complete@sha256:1f7e92ca7e3a3785680473329ed1091fc99db3e90fcb3a1688f2933e870ed76b AS builder-rocm
+FROM rocm/dev-ubuntu-22.04:6.4.3-complete@sha256:6cda50e312f3aac068cea9ec06c560ca1f522ad546bc8b3d2cf06da0fe8e8a76 AS builder-rocm
 
 # renovate: datasource=github-releases depName=Microsoft/onnxruntime
-ARG ONNXRUNTIME_VERSION="v1.20.1"
+ARG ONNXRUNTIME_VERSION="v1.22.1"
 WORKDIR /code
 
 RUN apt-get update && apt-get install -y --no-install-recommends wget git python3.10-venv
@@ -68,12 +68,12 @@ RUN if [ "$DEVICE" = "rocm" ]; then \
     uv pip install /opt/onnxruntime_rocm-*.whl; \
     fi
 
-FROM python:3.11-slim-bookworm@sha256:873f91540d53b36327ed4fb018c9669107a4e2a676719720edb4209c4b15d029 AS prod-cpu
+FROM python:3.11-slim-bookworm@sha256:2c5bc243b1cc47985ee4fb768bb0bbd4490481c5d0897a62da31b7f30b7304a7 AS prod-cpu
 
 ENV LD_PRELOAD=/usr/lib/libmimalloc.so.2 \
     MACHINE_LEARNING_MODEL_ARENA=false
 
-FROM python:3.11-slim-bookworm@sha256:873f91540d53b36327ed4fb018c9669107a4e2a676719720edb4209c4b15d029 AS prod-openvino
+FROM python:3.11-slim-bookworm@sha256:2c5bc243b1cc47985ee4fb768bb0bbd4490481c5d0897a62da31b7f30b7304a7 AS prod-openvino
 
 RUN apt-get update && \
     apt-get install --no-install-recommends -yqq ocl-icd-libopencl1 wget && \
@@ -102,7 +102,7 @@ COPY --from=builder-cuda /usr/local/bin/python3 /usr/local/bin/python3
 COPY --from=builder-cuda /usr/local/lib/python3.11 /usr/local/lib/python3.11
 COPY --from=builder-cuda /usr/local/lib/libpython3.11.so /usr/local/lib/libpython3.11.so
 
-FROM rocm/dev-ubuntu-22.04:6.4.3-complete@sha256:1f7e92ca7e3a3785680473329ed1091fc99db3e90fcb3a1688f2933e870ed76b AS prod-rocm
+FROM rocm/dev-ubuntu-22.04:6.4.3-complete@sha256:6cda50e312f3aac068cea9ec06c560ca1f522ad546bc8b3d2cf06da0fe8e8a76 AS prod-rocm
 
 FROM prod-cpu AS prod-armnn
 

machine-learning/immich_ml/models/ocr/detection.py

@@ -82,6 +82,7 @@ class TextDetector(InferenceModel):
             ratio = float(self.max_resolution) / img.height
         else:
             ratio = float(self.max_resolution) / img.width
+        ratio = min(ratio, 1.0)
 
         resize_h = int(img.height * ratio)
         resize_w = int(img.width * ratio)

machine-learning/patches/0002-target-gfx900-gfx1102.patch

@@ -1,13 +1,13 @@
 diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
-index d90a2a355..bb1a7de12 100644
+index 2714e6f59..a69da76b4 100644
 --- a/cmake/CMakeLists.txt
 +++ b/cmake/CMakeLists.txt
-@@ -295,7 +295,7 @@ if (onnxruntime_USE_ROCM)
+@@ -338,7 +338,7 @@ if (onnxruntime_USE_ROCM)
+     if (ROCM_VERSION_DEV VERSION_LESS "6.2")
+       message(FATAL_ERROR "CMAKE_HIP_ARCHITECTURES is not set when ROCm version < 6.2")
+     else()
+-      set(CMAKE_HIP_ARCHITECTURES "gfx908;gfx90a;gfx1030;gfx1100;gfx1101;gfx940;gfx941;gfx942;gfx1200;gfx1201")
++      set(CMAKE_HIP_ARCHITECTURES "gfx900;gfx908;gfx90a;gfx1030;gfx1100;gfx1101;gfx1102;gfx940;gfx941;gfx942;gfx1200;gfx1201")
+     endif()
    endif()
-
-   if (NOT CMAKE_HIP_ARCHITECTURES)
--    set(CMAKE_HIP_ARCHITECTURES "gfx908;gfx90a;gfx1030;gfx1100;gfx1101;gfx940;gfx941;gfx942;gfx1200;gfx1201")
-+    set(CMAKE_HIP_ARCHITECTURES "gfx900;gfx908;gfx90a;gfx1030;gfx1100;gfx1101;gfx1102;gfx940;gfx941;gfx942;gfx1200;gfx1201")
-   endif()
-
-   file(GLOB rocm_cmake_components ${onnxruntime_ROCM_HOME}/lib/cmake/*)
+ 

mise.toml

@@ -1,11 +1,12 @@
 experimental_monorepo_root = true
 
 [tools]
-node = "24.11.0"
+node = "24.11.1"
 flutter = "3.35.7"
-pnpm = "10.20.0"
-terragrunt = "0.91.2"
-opentofu = "1.10.6"
+pnpm = "10.24.0"
+terragrunt = "0.93.10"
+opentofu = "1.10.7"
+java = "25.0.1"
 
 [tools."github:CQLabs/homebrew-dcm"]
 version = "1.30.0"

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

@@ -89,7 +89,10 @@ data class PlatformAsset (
   val height: Long? = null,
   val durationInSeconds: Long,
   val orientation: Long,
-  val isFavorite: Boolean
+  val isFavorite: Boolean,
+  val adjustmentTime: Long? = null,
+  val latitude: Double? = null,
+  val longitude: Double? = null
 )
  {
   companion object {
@@ -104,7 +107,10 @@ data class PlatformAsset (
       val durationInSeconds = pigeonVar_list[7] as Long
       val orientation = pigeonVar_list[8] as Long
       val isFavorite = pigeonVar_list[9] as Boolean
-      return PlatformAsset(id, name, type, createdAt, updatedAt, width, height, durationInSeconds, orientation, isFavorite)
+      val adjustmentTime = pigeonVar_list[10] as Long?
+      val latitude = pigeonVar_list[11] as Double?
+      val longitude = pigeonVar_list[12] as Double?
+      return PlatformAsset(id, name, type, createdAt, updatedAt, width, height, durationInSeconds, orientation, isFavorite, adjustmentTime, latitude, longitude)
     }
   }
   fun toList(): List<Any?> {
@@ -119,6 +125,9 @@ data class PlatformAsset (
       durationInSeconds,
       orientation,
       isFavorite,
+      adjustmentTime,
+      latitude,
+      longitude,
     )
   }
   override fun equals(other: Any?): Boolean {
@@ -306,6 +315,7 @@ 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>): Map<String, String?>
 
   companion object {
     /** The codec used by NativeSyncApi. */
@@ -499,6 +509,23 @@ 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

@@ -4,7 +4,6 @@ import android.annotation.SuppressLint
 import android.content.ContentUris
 import android.content.Context
 import android.database.Cursor
-import android.net.Uri
 import android.os.Bundle
 import android.provider.MediaStore
 import android.util.Base64
@@ -317,4 +316,10 @@ 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>): Map<String, String?> {
+    return emptyMap()
+  }
 }

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

@@ -140,6 +140,9 @@ struct PlatformAsset: Hashable {
   var durationInSeconds: Int64
   var orientation: Int64
   var isFavorite: Bool
+  var adjustmentTime: Int64? = nil
+  var latitude: Double? = nil
+  var longitude: Double? = nil
 
 
   // swift-format-ignore: AlwaysUseLowerCamelCase
@@ -154,6 +157,9 @@ struct PlatformAsset: Hashable {
     let durationInSeconds = pigeonVar_list[7] as! Int64
     let orientation = pigeonVar_list[8] as! Int64
     let isFavorite = pigeonVar_list[9] as! Bool
+    let adjustmentTime: Int64? = nilOrValue(pigeonVar_list[10])
+    let latitude: Double? = nilOrValue(pigeonVar_list[11])
+    let longitude: Double? = nilOrValue(pigeonVar_list[12])
 
     return PlatformAsset(
       id: id,
@@ -165,7 +171,10 @@ struct PlatformAsset: Hashable {
       height: height,
       durationInSeconds: durationInSeconds,
       orientation: orientation,
-      isFavorite: isFavorite
+      isFavorite: isFavorite,
+      adjustmentTime: adjustmentTime,
+      latitude: latitude,
+      longitude: longitude
     )
   }
   func toList() -> [Any?] {
@@ -180,6 +189,9 @@ struct PlatformAsset: Hashable {
       durationInSeconds,
       orientation,
       isFavorite,
+      adjustmentTime,
+      latitude,
+      longitude,
     ]
   }
   static func == (lhs: PlatformAsset, rhs: PlatformAsset) -> Bool {
@@ -365,6 +377,7 @@ 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 -> [String: String?]
 }
 
 /// Generated setup class from Pigeon to handle messages through the `binaryMessenger`.
@@ -548,5 +561,22 @@ 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

@@ -390,4 +390,22 @@ class NativeSyncApiImpl: ImmichPlugin, NativeSyncApi, FlutterPlugin {
       return PHAsset.fetchAssets(in: album, options: options)
     }
   }
+  
+  func getCloudIdForAssetIds(assetIds: [String]) throws -> [String : String?] {
+    guard #available(iOS 16, *) else {
+      return Dictionary(
+        uniqueKeysWithValues: assetIds.map { ($0, nil as String?) }
+      )
+    }
+    
+    var mappings: [String: String?] = [:]
+    let result = PHPhotoLibrary.shared().cloudIdentifierMappings(forLocalIdentifiers: assetIds)
+    for (key, value) in result {
+      // Ignores invalid cloud ids of the format "GUID:ID:". Valid Ids are of the form "GUID:ID:HASH"
+      if let cloudId = try? value.get().stringValue, !cloudId.hasSuffix(":") {
+        mappings[key] = cloudId
+      }
+    }
+    return mappings;
+  }
 }

mobile/ios/Runner/Sync/PHAssetExtensions.swift

@@ -12,7 +12,10 @@ extension PHAsset {
       height: Int64(pixelHeight),
       durationInSeconds: Int64(duration),
       orientation: 0,
-      isFavorite: isFavorite
+      isFavorite: isFavorite,
+      adjustmentTime: adjustmentTimestamp,
+      latitude: location?.coordinate.latitude,
+      longitude: location?.coordinate.longitude
     )
   }
 
@@ -23,6 +26,13 @@ extension PHAsset {
   var filename: String? {
     return value(forKey: "filename") as? String
   }
+  
+  var adjustmentTimestamp: Int64? {
+    if let date = value(forKey: "adjustmentTimestamp") as? Date {
+      return Int64(date.timeIntervalSince1970)
+    }
+    return nil
+  }
 
   // This method is expected to be slow as it goes through the asset resources to fetch the originalFilename
   var originalFilename: String? {

mobile/lib/constants/constants.dart

@@ -47,6 +47,7 @@ const List<(String, String)> kWidgetNames = [
 
 const double kUploadStatusFailed = -1.0;
 const double kUploadStatusCanceled = -2.0;
+const String kUploadETagDelimiter = "_";
 
 const int kMinMonthsToEnableScrubberSnap = 12;
 

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

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

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

@@ -1,3 +1,6 @@
+import 'package:immich_mobile/constants/constants.dart';
+import 'package:immich_mobile/extensions/num_extensions.dart';
+
 part 'local_asset.model.dart';
 part 'remote_asset.model.dart';
 

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

@@ -3,11 +3,17 @@ 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;
+  final double? latitude;
+  final double? longitude;
+
   const LocalAsset({
     required this.id,
     String? remoteId,
+    this.cloudId,
     required super.name,
     super.checksum,
     required super.type,
@@ -19,6 +25,9 @@ class LocalAsset extends BaseAsset {
     super.isFavorite = false,
     super.livePhotoVideoId,
     this.orientation = 0,
+    this.adjustmentTime,
+    this.latitude,
+    this.longitude,
   }) : remoteAssetId = remoteId;
 
   @override
@@ -33,6 +42,16 @@ class LocalAsset extends BaseAsset {
   @override
   String get heroTag => '${id}_${remoteId ?? checksum}';
 
+  String get eTag {
+    final createdAt = this.createdAt.millisecondsSinceEpoch ~/ 1000;
+    final adjustmentTime = this.adjustmentTime?.millisecondsSinceEpoch ?? 0;
+    final latitude = this.latitude?.truncateTo(2).toStringAsFixed(2) ?? "0.00";
+    final longitude = this.longitude?.truncateTo(2).toStringAsFixed(2) ?? "0.00";
+    return "$createdAt$kUploadETagDelimiter$adjustmentTime$kUploadETagDelimiter$latitude$kUploadETagDelimiter$longitude";
+  }
+
+  bool get hasCoordinates => latitude != null && longitude != null && latitude != 0 && longitude != 0;
+
   @override
   String toString() {
     return '''LocalAsset {
@@ -45,8 +64,13 @@ class LocalAsset extends BaseAsset {
    height: ${height ?? "<NA>"},
    durationInSeconds: ${durationInSeconds ?? "<NA>"},
    remoteId: ${remoteId ?? "<NA>"}
+   cloudId: ${cloudId ?? "<NA>"}
+   checksum: ${checksum ?? "<NA>"},
    isFavorite: $isFavorite,
-  orientation: $orientation,
+   orientation: $orientation,
+   adjustmentTime: $adjustmentTime,
+   latitude: ${latitude ?? "<NA>"},
+   longitude: ${longitude ?? "<NA>"},
  }''';
   }
 
@@ -55,15 +79,29 @@ class LocalAsset extends BaseAsset {
   bool operator ==(Object other) {
     if (other is! LocalAsset) return false;
     if (identical(this, other)) return true;
-    return super == other && id == other.id && orientation == other.orientation;
+    return super == other &&
+        id == other.id &&
+        cloudId == other.cloudId &&
+        orientation == other.orientation &&
+        adjustmentTime == other.adjustmentTime &&
+        latitude == other.latitude &&
+        longitude == other.longitude;
   }
 
   @override
-  int get hashCode => super.hashCode ^ id.hashCode ^ remoteId.hashCode ^ orientation.hashCode;
+  int get hashCode =>
+      super.hashCode ^
+      id.hashCode ^
+      remoteId.hashCode ^
+      orientation.hashCode ^
+      adjustmentTime.hashCode ^
+      latitude.hashCode ^
+      longitude.hashCode;
 
   LocalAsset copyWith({
     String? id,
     String? remoteId,
+    String? cloudId,
     String? name,
     String? checksum,
     AssetType? type,
@@ -74,10 +112,14 @@ class LocalAsset extends BaseAsset {
     int? durationInSeconds,
     bool? isFavorite,
     int? orientation,
+    DateTime? adjustmentTime,
+    double? latitude,
+    double? longitude,
   }) {
     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,
@@ -88,6 +130,9 @@ class LocalAsset extends BaseAsset {
       durationInSeconds: durationInSeconds ?? this.durationInSeconds,
       isFavorite: isFavorite ?? this.isFavorite,
       orientation: orientation ?? this.orientation,
+      adjustmentTime: adjustmentTime ?? this.adjustmentTime,
+      latitude: latitude ?? this.latitude,
+      longitude: longitude ?? this.longitude,
     );
   }
 }

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

@@ -0,0 +1,32 @@
+import 'package:immich_mobile/domain/utils/event_stream.dart';
+
+// Timeline Events
+class TimelineReloadEvent extends Event {
+  const TimelineReloadEvent();
+}
+
+class ScrollToTopEvent extends Event {
+  const ScrollToTopEvent();
+}
+
+class ScrollToDateEvent extends Event {
+  final DateTime date;
+
+  const ScrollToDateEvent(this.date);
+}
+
+// Asset Viewer Events
+class ViewerOpenBottomSheetEvent extends Event {
+  final bool activitiesMode;
+  const ViewerOpenBottomSheetEvent({this.activitiesMode = false});
+}
+
+class ViewerReloadAssetEvent extends Event {
+  const ViewerReloadAssetEvent();
+}
+
+// Multi-Select Events
+class MultiSelectToggleEvent extends Event {
+  final bool isEnabled;
+  const MultiSelectToggleEvent(this.isEnabled);
+}

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

@@ -37,7 +37,7 @@ class ExifInfo {
 
   String get fNumber => f == null ? "" : f!.toStringAsFixed(1);
 
-  String get focalLength => mm == null ? "" : mm!.toStringAsFixed(1);
+  String get focalLength => mm == null ? "" : mm!.toStringAsFixed(3);
 
   const ExifInfo({
     this.assetId,

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

@@ -71,6 +71,7 @@ enum StoreKey<T> {
   readonlyModeEnabled<bool>._(138),
 
   autoPlayVideo<bool>._(139),
+  albumGridView<bool>._(140),
 
   // Experimental stuff
   photoManagerCustomFilter<bool>._(1000),

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

@@ -1,5 +1,3 @@
-import 'package:immich_mobile/domain/utils/event_stream.dart';
-
 enum GroupAssetsBy { day, month, auto, none }
 
 enum HeaderType { none, month, day, monthAndDay }
@@ -31,17 +29,3 @@ class TimeBucket extends Bucket {
   @override
   int get hashCode => super.hashCode ^ date.hashCode;
 }
-
-class TimelineReloadEvent extends Event {
-  const TimelineReloadEvent();
-}
-
-class ScrollToTopEvent extends Event {
-  const ScrollToTopEvent();
-}
-
-class ScrollToDateEvent extends Event {
-  final DateTime date;
-
-  const ScrollToDateEvent(this.date);
-}

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

@@ -75,6 +75,20 @@ class AssetService {
       isFlipped = false;
     }
 
+    if (width == null || height == null) {
+      if (asset.hasRemote) {
+        final id = asset is LocalAsset ? asset.remoteId! : (asset as RemoteAsset).id;
+        final remoteAsset = await _remoteAssetRepository.get(id);
+        width = remoteAsset?.width?.toDouble();
+        height = remoteAsset?.height?.toDouble();
+      } else {
+        final id = asset is LocalAsset ? asset.id : (asset as RemoteAsset).localId!;
+        final localAsset = await _localAssetRepository.get(id);
+        width = localAsset?.width?.toDouble();
+        height = localAsset?.height?.toDouble();
+      }
+    }
+
     final orientedWidth = isFlipped ? height : width;
     final orientedHeight = isFlipped ? width : height;
     if (orientedWidth != null && orientedHeight != null && orientedHeight > 0) {

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

@@ -40,6 +40,9 @@ 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();
 
@@ -75,6 +78,15 @@ 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,6 +8,7 @@ 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';
@@ -18,6 +19,7 @@ import 'package:logging/logging.dart';
 
 class LocalSyncService {
   final DriftLocalAlbumRepository _localAlbumRepository;
+  final DriftLocalAssetRepository _localAssetRepository;
   final NativeSyncApi _nativeSyncApi;
   final DriftTrashedLocalAssetRepository _trashedLocalAssetRepository;
   final LocalFilesManagerRepository _localFilesManager;
@@ -26,11 +28,13 @@ 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,
@@ -47,6 +51,12 @@ 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();
@@ -63,8 +73,9 @@ class LocalSyncService {
 
       final deviceAlbums = await _nativeSyncApi.getAlbums();
       await _localAlbumRepository.updateAll(deviceAlbums.toLocalAlbums());
+      final newAssets = delta.updates.toLocalAssets();
       await _localAlbumRepository.processDelta(
-        updates: delta.updates.toLocalAssets(),
+        updates: newAssets,
         deletes: delta.deletes,
         assetAlbums: delta.assetAlbums,
       );
@@ -92,6 +103,8 @@ class LocalSyncService {
           }
           await updateAlbum(dbAlbum, album);
         }
+
+        await _mapIosCloudIds(newAssets);
       }
       await _nativeSyncApi.checkpointSync();
     } catch (e, s) {
@@ -130,9 +143,12 @@ class LocalSyncService {
     try {
       _log.fine("Adding device album ${album.name}");
 
-      final assets = album.assetCount > 0 ? await _nativeSyncApi.getAssetsForAlbum(album.id) : <PlatformAsset>[];
+      final assets = album.assetCount > 0
+          ? await _nativeSyncApi.getAssetsForAlbum(album.id).then((a) => a.toLocalAssets())
+          : <LocalAsset>[];
 
-      await _localAlbumRepository.upsert(album, toUpsert: assets.toLocalAssets());
+      await _localAlbumRepository.upsert(album, toUpsert: assets);
+      await _mapIosCloudIds(assets);
       _log.fine("Successfully added device album ${album.name}");
     } catch (e, s) {
       _log.warning("Error while adding device album", e, s);
@@ -202,13 +218,16 @@ class LocalSyncService {
         return false;
       }
 
-      final newAssets = await _nativeSyncApi.getAssetsForAlbum(deviceAlbum.id, updatedTimeCond: updatedTime);
+      final newAssets = await _nativeSyncApi
+          .getAssetsForAlbum(deviceAlbum.id, updatedTimeCond: updatedTime)
+          .then((a) => a.toLocalAssets());
 
       await _localAlbumRepository.upsert(
         deviceAlbum.copyWith(backupSelection: dbAlbum.backupSelection),
-        toUpsert: newAssets.toLocalAssets(),
+        toUpsert: newAssets,
       );
 
+      await _mapIosCloudIds(newAssets);
       return true;
     } catch (e, s) {
       _log.warning("Error on fast syncing local album: ${dbAlbum.name}", e, s);
@@ -240,6 +259,7 @@ 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;
       }
 
@@ -277,6 +297,7 @@ class LocalSyncService {
       }
 
       await _localAlbumRepository.upsert(updatedDeviceAlbum, toUpsert: assetsToUpsert, toDelete: assetsToDelete);
+      await _mapIosCloudIds(assetsToUpsert);
 
       return true;
     } catch (e, s) {
@@ -285,12 +306,34 @@ 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 = await _nativeSyncApi.getCloudIdForAssetIds(assetIds);
+    await _localAlbumRepository.updateCloudMapping(cloudMapping);
+  }
+
   bool _assetsEqual(LocalAsset a, LocalAsset b) {
-    return a.updatedAt.isAtSameMomentAs(b.updatedAt) &&
+    if (CurrentPlatform.isAndroid) {
+      return a.updatedAt.isAtSameMomentAs(b.updatedAt) &&
+          a.createdAt.isAtSameMomentAs(b.createdAt) &&
+          a.width == b.width &&
+          a.height == b.height &&
+          a.durationInSeconds == b.durationInSeconds;
+    }
+
+    final firstAdjustment = a.adjustmentTime?.millisecondsSinceEpoch ?? 0;
+    final secondAdjustment = b.adjustmentTime?.millisecondsSinceEpoch ?? 0;
+    return firstAdjustment == secondAdjustment &&
         a.createdAt.isAtSameMomentAs(b.createdAt) &&
         a.width == b.width &&
         a.height == b.height &&
-        a.durationInSeconds == b.durationInSeconds;
+        a.durationInSeconds == b.durationInSeconds &&
+        a.latitude == b.latitude &&
+        a.longitude == b.longitude;
   }
 
   bool _albumsEqual(LocalAlbum a, LocalAlbum b) {
@@ -363,18 +406,21 @@ extension on Iterable<PlatformAsset> {
   }
 }
 
-extension on PlatformAsset {
+extension PlatformToLocalAsset on PlatformAsset {
   LocalAsset toLocalAsset() => LocalAsset(
     id: id,
     name: name,
     checksum: null,
     type: AssetType.values.elementAtOrNull(type) ?? AssetType.other,
     createdAt: tryFromSecondsSinceEpoch(createdAt, isUtc: true) ?? DateTime.timestamp(),
-    updatedAt: tryFromSecondsSinceEpoch(createdAt, isUtc: true) ?? DateTime.timestamp(),
+    updatedAt: tryFromSecondsSinceEpoch(updatedAt, isUtc: true) ?? DateTime.timestamp(),
     width: width,
     height: height,
     durationInSeconds: durationInSeconds,
     isFavorite: isFavorite,
     orientation: orientation,
+    adjustmentTime: tryFromSecondsSinceEpoch(adjustmentTime, isUtc: true),
+    latitude: latitude,
+    longitude: longitude,
   );
 }

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

@@ -7,6 +7,7 @@ import 'package:immich_mobile/domain/models/user.model.dart';
 import 'package:immich_mobile/infrastructure/repositories/remote_album.repository.dart';
 import 'package:immich_mobile/models/albums/album_search.model.dart';
 import 'package:immich_mobile/repositories/drift_album_api_repository.dart';
+import 'package:immich_mobile/providers/album/album_sort_by_options.provider.dart';
 
 class RemoteAlbumService {
   final DriftRemoteAlbumRepository _repository;
@@ -32,16 +33,16 @@ class RemoteAlbumService {
 
   Future<List<RemoteAlbum>> sortAlbums(
     List<RemoteAlbum> albums,
-    RemoteAlbumSortMode sortMode, {
+    AlbumSortMode sortMode, {
     bool isReverse = false,
   }) async {
     final List<RemoteAlbum> sorted = switch (sortMode) {
-      RemoteAlbumSortMode.created => albums.sortedBy((album) => album.createdAt),
-      RemoteAlbumSortMode.title => albums.sortedBy((album) => album.name),
-      RemoteAlbumSortMode.lastModified => albums.sortedBy((album) => album.updatedAt),
-      RemoteAlbumSortMode.assetCount => albums.sortedBy((album) => album.assetCount),
-      RemoteAlbumSortMode.mostRecent => await _sortByNewestAsset(albums),
-      RemoteAlbumSortMode.mostOldest => await _sortByOldestAsset(albums),
+      AlbumSortMode.created => albums.sortedBy((album) => album.createdAt),
+      AlbumSortMode.title => albums.sortedBy((album) => album.name),
+      AlbumSortMode.lastModified => albums.sortedBy((album) => album.updatedAt),
+      AlbumSortMode.assetCount => albums.sortedBy((album) => album.assetCount),
+      AlbumSortMode.mostRecent => await _sortByNewestAsset(albums),
+      AlbumSortMode.mostOldest => await _sortByOldestAsset(albums),
     };
 
     return (isReverse ? sorted.reversed : sorted).toList();
@@ -211,16 +212,3 @@ class RemoteAlbumService {
     return sorted.reversed.toList();
   }
 }
-
-enum RemoteAlbumSortMode {
-  title("library_page_sort_title"),
-  assetCount("library_page_sort_asset_count"),
-  lastModified("library_page_sort_last_modified"),
-  created("library_page_sort_created"),
-  mostRecent("sort_newest"),
-  mostOldest("sort_oldest");
-
-  final String key;
-
-  const RemoteAlbumSortMode(this.key);
-}

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

@@ -118,6 +118,10 @@ 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/services/timeline.service.dart

@@ -4,6 +4,7 @@ import 'dart:math' as math;
 import 'package:collection/collection.dart';
 import 'package:immich_mobile/constants/constants.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
+import 'package:immich_mobile/domain/models/events.model.dart';
 import 'package:immich_mobile/domain/models/setting.model.dart';
 import 'package:immich_mobile/domain/models/timeline.model.dart';
 import 'package:immich_mobile/domain/services/setting.service.dart';

mobile/lib/domain/utils/background_sync.dart

@@ -1,5 +1,6 @@
 import 'dart:async';
 
+import 'package:immich_mobile/domain/utils/migrate_cloud_ids.dart' as m;
 import 'package:immich_mobile/domain/utils/sync_linked_album.dart';
 import 'package:immich_mobile/providers/infrastructure/sync.provider.dart';
 import 'package:immich_mobile/utils/isolate.dart';
@@ -22,8 +23,13 @@ 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;
@@ -38,6 +44,9 @@ class BackgroundSyncManager {
     this.onHashingStart,
     this.onHashingComplete,
     this.onHashingError,
+    this.onCloudIdSyncStart,
+    this.onCloudIdSyncComplete,
+    this.onCloudIdSyncError,
   });
 
   Future<void> cancel() async {
@@ -55,6 +64,12 @@ class BackgroundSyncManager {
     _syncWebsocketTask?.cancel();
     _syncWebsocketTask = null;
 
+    if (_cloudIdSyncTask != null) {
+      futures.add(_cloudIdSyncTask!.future);
+    }
+    _cloudIdSyncTask?.cancel();
+    _cloudIdSyncTask = null;
+
     if (_linkedAlbumSyncTask != null) {
       futures.add(_linkedAlbumSyncTask!.future);
     }
@@ -121,7 +136,6 @@ 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;
@@ -192,6 +206,25 @@ 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

@@ -0,0 +1,99 @@
+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/drift_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/user.provider.dart';
+import 'package:logging/logging.dart';
+// ignore: import_rule_openapi
+import 'package:openapi/api.dart';
+
+Future<void> syncCloudIds(ProviderContainer ref) async {
+  final db = ref.read(driftProvider);
+  // Populate cloud IDs for local assets that don't have one yet
+  await _populateCloudIds(db);
+
+  // Wait for remote sync to complete, so we have up-to-date asset metadata entries
+  await ref.read(syncStreamServiceProvider).sync();
+
+  // Fetch the mapping for backed up assets that have a cloud ID locally but do not have a cloud ID on the server
+  final currentUser = ref.read(currentUserProvider);
+  if (currentUser == null) {
+    Logger('migrateCloudIds').warning('Current user is null. Aborting cloudId migration.');
+    return;
+  }
+
+  final mappingsToUpdate = await _fetchCloudIdMappings(db, currentUser.id);
+  final assetApi = ref.read(apiServiceProvider).assetsApi;
+  for (final mapping in mappingsToUpdate) {
+    final mobileMeta = AssetMetadataUpsertItemDto(
+      key: AssetMetadataKey.mobileApp,
+      value: RemoteAssetMobileAppMetadata(cloudId: mapping.localAsset.cloudId, eTag: mapping.localAsset.eTag),
+    );
+    try {
+      await assetApi.updateAssetMetadata(mapping.remoteAssetId, AssetMetadataUpsertDto(items: [mobileMeta]));
+    } catch (error, stack) {
+      Logger('migrateCloudIds').warning('Failed to update metadata for asset ${mapping.remoteAssetId}', error, stack);
+    }
+  }
+}
+
+Future<void> _populateCloudIds(Drift drift) async {
+  final query = drift.localAssetEntity.selectOnly()
+    ..addColumns([drift.localAssetEntity.id])
+    ..where(drift.localAssetEntity.iCloudId.isNull());
+  final ids = await query.map((row) => row.read(drift.localAssetEntity.id)!).get();
+  final cloudMapping = await NativeSyncApi().getCloudIdForAssetIds(ids);
+  await DriftLocalAlbumRepository(drift).updateCloudMapping(cloudMapping);
+}
+
+typedef _CloudIdMapping = ({String remoteAssetId, LocalAsset localAsset});
+
+Future<List<_CloudIdMapping>> _fetchCloudIdMappings(Drift drift, String userId) async {
+  final createdAt = drift.localAssetEntity.createdAt.strftime('%s');
+  final adjustmentTime = coalesce([drift.localAssetEntity.adjustmentTime.strftime('%s'), const Constant('0')]);
+  final latitude = coalesce([
+    drift.localAssetEntity.latitude,
+    const Constant(0.0),
+  ]).truncateTo(2).cast(DriftSqlType.string);
+  final longitude = coalesce([
+    drift.localAssetEntity.longitude,
+    const Constant(0.0),
+  ]).truncateTo(2).cast(DriftSqlType.string);
+
+  final delimiter = const Constant(kUploadETagDelimiter);
+  final eTag = createdAt + delimiter + adjustmentTime + delimiter + latitude + delimiter + longitude;
+
+  final query =
+      drift.remoteAssetEntity.select().join([
+        leftOuterJoin(
+          drift.localAssetEntity,
+          drift.localAssetEntity.checksum.equalsExp(drift.remoteAssetEntity.checksum),
+        ),
+        leftOuterJoin(
+          drift.remoteAssetCloudIdEntity,
+          drift.localAssetEntity.iCloudId.equalsExp(drift.remoteAssetCloudIdEntity.cloudId),
+          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) &
+            (drift.remoteAssetCloudIdEntity.cloudId.isNull() | drift.remoteAssetCloudIdEntity.eTag.isNotExp(eTag)),
+      );
+  return query.map((row) {
+    return (
+      remoteAssetId: row.read(drift.remoteAssetEntity.id)!,
+      localAsset: row.readTable(drift.localAssetEntity).toDto(),
+    );
+  }).get();
+}

mobile/lib/extensions/asset_extensions.dart

@@ -1,5 +1,5 @@
 import 'package:immich_mobile/entities/asset.entity.dart';
-import 'package:timezone/timezone.dart';
+import 'package:immich_mobile/utils/timezone.dart';
 
 extension TZExtension on Asset {
   /// Returns the created time of the asset from the exif info (if available) or from
@@ -7,24 +7,11 @@ extension TZExtension on Asset {
   /// the timezone offset in [Duration]
   (DateTime, Duration) getTZAdjustedTimeAndOffset() {
     DateTime dt = fileCreatedAt.toLocal();
+
     if (exifInfo?.dateTimeOriginal != null) {
-      dt = exifInfo!.dateTimeOriginal!;
-      if (exifInfo?.timeZone != null) {
-        dt = dt.toUtc();
-        try {
-          final location = getLocation(exifInfo!.timeZone!);
-          dt = TZDateTime.from(dt, location);
-        } on LocationNotFoundException {
-          RegExp re = RegExp(r'^utc(?:([+-]\d{1,2})(?::(\d{2}))?)?$', caseSensitive: false);
-          final m = re.firstMatch(exifInfo!.timeZone!);
-          if (m != null) {
-            final duration = Duration(hours: int.parse(m.group(1) ?? '0'), minutes: int.parse(m.group(2) ?? '0'));
-            dt = dt.add(duration);
-            return (dt, duration);
-          }
-        }
-      }
+      return applyTimezoneOffset(dateTime: exifInfo!.dateTimeOriginal!, timeZone: exifInfo?.timeZone);
     }
+
     return (dt, dt.timeZoneOffset);
   }
 }

mobile/lib/extensions/drift_extensions.dart

@@ -0,0 +1,17 @@
+import 'dart:math';
+
+import 'package:drift/drift.dart';
+// ignore: invalid_use_of_internal_member, implementation_imports
+import 'package:drift/src/runtime/query_builder/expressions/internal.dart';
+
+extension DoubleTruncateExpression<T extends num> on Expression<T> {
+  Expression<T> truncateTo(int fractionDigits) {
+    final mod = Constant(pow(10, fractionDigits).toDouble());
+    return BaseInfixOperator(
+      BaseInfixOperator(this, '*', mod, precedence: Precedence.mulDivide).cast(DriftSqlType.int),
+      '/',
+      mod,
+      precedence: Precedence.mulDivide,
+    );
+  }
+}

mobile/lib/extensions/num_extensions.dart

@@ -0,0 +1,8 @@
+import 'dart:math' as math;
+
+extension DoubleTruncate on double {
+  double truncateTo(int fractionDigits) {
+    final mod = math.pow(10.0, fractionDigits);
+    return ((this * mod).truncate() / mod);
+  }
+}

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

@@ -166,5 +166,6 @@ extension RemoteExifEntityDataDomainEx on RemoteExifEntityData {
     mm: focalLength?.toDouble(),
     lens: lens,
     isFlipped: ExifDtoConverter.isOrientationFlipped(orientation),
+    exposureSeconds: ExifDtoConverter.exposureTimeToSeconds(exposureTime),
   );
 }

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

@@ -5,6 +5,7 @@ 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();
 
@@ -16,6 +17,14 @@ 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()();
+
+  RealColumn get longitude => real().nullable()();
+
   @override
   Set<Column> get primaryKey => {id};
 }
@@ -34,5 +43,9 @@ extension LocalAssetEntityDataDomainExtension on LocalAssetEntityData {
     width: width,
     remoteId: remoteId,
     orientation: orientation,
+    adjustmentTime: adjustmentTime,
+    latitude: latitude,
+    longitude: longitude,
+    cloudId: iCloudId,
   );
 }

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

@@ -21,6 +21,10 @@ 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,
     });
 typedef $$LocalAssetEntityTableUpdateCompanionBuilder =
     i1.LocalAssetEntityCompanion Function({
@@ -35,6 +39,10 @@ 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,
     });
 
 class $$LocalAssetEntityTableFilterComposer
@@ -101,6 +109,26 @@ class $$LocalAssetEntityTableFilterComposer
     column: $table.orientation,
     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),
+  );
+
+  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),
+  );
 }
 
 class $$LocalAssetEntityTableOrderingComposer
@@ -166,6 +194,26 @@ class $$LocalAssetEntityTableOrderingComposer
     column: $table.orientation,
     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),
+  );
+
+  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),
+  );
 }
 
 class $$LocalAssetEntityTableAnnotationComposer
@@ -215,6 +263,20 @@ class $$LocalAssetEntityTableAnnotationComposer
     column: $table.orientation,
     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,
+  );
+
+  i0.GeneratedColumn<double> get latitude =>
+      $composableBuilder(column: $table.latitude, builder: (column) => column);
+
+  i0.GeneratedColumn<double> get longitude =>
+      $composableBuilder(column: $table.longitude, builder: (column) => column);
 }
 
 class $$LocalAssetEntityTableTableManager
@@ -268,6 +330,10 @@ 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(),
               }) => i1.LocalAssetEntityCompanion(
                 name: name,
                 type: type,
@@ -280,6 +346,10 @@ class $$LocalAssetEntityTableTableManager
                 checksum: checksum,
                 isFavorite: isFavorite,
                 orientation: orientation,
+                iCloudId: iCloudId,
+                adjustmentTime: adjustmentTime,
+                latitude: latitude,
+                longitude: longitude,
               ),
           createCompanionCallback:
               ({
@@ -294,6 +364,10 @@ 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(),
               }) => i1.LocalAssetEntityCompanion.insert(
                 name: name,
                 type: type,
@@ -306,6 +380,10 @@ class $$LocalAssetEntityTableTableManager
                 checksum: checksum,
                 isFavorite: isFavorite,
                 orientation: orientation,
+                iCloudId: iCloudId,
+                adjustmentTime: adjustmentTime,
+                latitude: latitude,
+                longitude: longitude,
               ),
           withReferenceMapper: (p0) => p0
               .map((e) => (e.readTable(table), i0.BaseReferences(db, table, e)))
@@ -473,6 +551,50 @@ 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
+  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 => [
     name,
@@ -486,6 +608,10 @@ class $LocalAssetEntityTable extends i3.LocalAssetEntity
     checksum,
     isFavorite,
     orientation,
+    iCloudId,
+    adjustmentTime,
+    latitude,
+    longitude,
   ];
   @override
   String get aliasedName => _alias ?? actualTableName;
@@ -566,6 +692,33 @@ 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,
+        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;
   }
 
@@ -624,6 +777,22 @@ 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'],
+      ),
+      latitude: attachedDatabase.typeMapping.read(
+        i0.DriftSqlType.double,
+        data['${effectivePrefix}latitude'],
+      ),
+      longitude: attachedDatabase.typeMapping.read(
+        i0.DriftSqlType.double,
+        data['${effectivePrefix}longitude'],
+      ),
     );
   }
 
@@ -653,6 +822,10 @@ 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;
   const LocalAssetEntityData({
     required this.name,
     required this.type,
@@ -665,6 +838,10 @@ class LocalAssetEntityData extends i0.DataClass
     this.checksum,
     required this.isFavorite,
     required this.orientation,
+    this.iCloudId,
+    this.adjustmentTime,
+    this.latitude,
+    this.longitude,
   });
   @override
   Map<String, i0.Expression> toColumns(bool nullToAbsent) {
@@ -692,6 +869,18 @@ 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);
+    }
+    if (!nullToAbsent || latitude != null) {
+      map['latitude'] = i0.Variable<double>(latitude);
+    }
+    if (!nullToAbsent || longitude != null) {
+      map['longitude'] = i0.Variable<double>(longitude);
+    }
     return map;
   }
 
@@ -714,6 +903,10 @@ 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']),
     );
   }
   @override
@@ -733,6 +926,10 @@ 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),
     };
   }
 
@@ -748,6 +945,10 @@ 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(),
   }) => i1.LocalAssetEntityData(
     name: name ?? this.name,
     type: type ?? this.type,
@@ -762,6 +963,12 @@ 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,
+    latitude: latitude.present ? latitude.value : this.latitude,
+    longitude: longitude.present ? longitude.value : this.longitude,
   );
   LocalAssetEntityData copyWithCompanion(i1.LocalAssetEntityCompanion data) {
     return LocalAssetEntityData(
@@ -782,6 +989,12 @@ 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,
+      latitude: data.latitude.present ? data.latitude.value : this.latitude,
+      longitude: data.longitude.present ? data.longitude.value : this.longitude,
     );
   }
 
@@ -798,7 +1011,11 @@ class LocalAssetEntityData extends i0.DataClass
           ..write('id: $id, ')
           ..write('checksum: $checksum, ')
           ..write('isFavorite: $isFavorite, ')
-          ..write('orientation: $orientation')
+          ..write('orientation: $orientation, ')
+          ..write('iCloudId: $iCloudId, ')
+          ..write('adjustmentTime: $adjustmentTime, ')
+          ..write('latitude: $latitude, ')
+          ..write('longitude: $longitude')
           ..write(')'))
         .toString();
   }
@@ -816,6 +1033,10 @@ class LocalAssetEntityData extends i0.DataClass
     checksum,
     isFavorite,
     orientation,
+    iCloudId,
+    adjustmentTime,
+    latitude,
+    longitude,
   );
   @override
   bool operator ==(Object other) =>
@@ -831,7 +1052,11 @@ class LocalAssetEntityData extends i0.DataClass
           other.id == this.id &&
           other.checksum == this.checksum &&
           other.isFavorite == this.isFavorite &&
-          other.orientation == this.orientation);
+          other.orientation == this.orientation &&
+          other.iCloudId == this.iCloudId &&
+          other.adjustmentTime == this.adjustmentTime &&
+          other.latitude == this.latitude &&
+          other.longitude == this.longitude);
 }
 
 class LocalAssetEntityCompanion
@@ -847,6 +1072,10 @@ 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;
   const LocalAssetEntityCompanion({
     this.name = const i0.Value.absent(),
     this.type = const i0.Value.absent(),
@@ -859,6 +1088,10 @@ 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(),
   });
   LocalAssetEntityCompanion.insert({
     required String name,
@@ -872,6 +1105,10 @@ 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(),
   }) : name = i0.Value(name),
        type = i0.Value(type),
        id = i0.Value(id);
@@ -887,6 +1124,10 @@ 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,
   }) {
     return i0.RawValuesInsertable({
       if (name != null) 'name': name,
@@ -900,6 +1141,10 @@ 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,
     });
   }
 
@@ -915,6 +1160,10 @@ 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,
   }) {
     return i1.LocalAssetEntityCompanion(
       name: name ?? this.name,
@@ -928,6 +1177,10 @@ 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,
     );
   }
 
@@ -969,6 +1222,18 @@ 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);
+    }
+    if (latitude.present) {
+      map['latitude'] = i0.Variable<double>(latitude.value);
+    }
+    if (longitude.present) {
+      map['longitude'] = i0.Variable<double>(longitude.value);
+    }
     return map;
   }
 
@@ -985,8 +1250,17 @@ class LocalAssetEntityCompanion
           ..write('id: $id, ')
           ..write('checksum: $checksum, ')
           ..write('isFavorite: $isFavorite, ')
-          ..write('orientation: $orientation')
+          ..write('orientation: $orientation, ')
+          ..write('iCloudId: $iCloudId, ')
+          ..write('adjustmentTime: $adjustmentTime, ')
+          ..write('latitude: $latitude, ')
+          ..write('longitude: $longitude')
           ..write(')'))
         .toString();
   }
 }
+
+i0.Index get idxLocalAssetCloudId => i0.Index(
+  'idx_local_asset_cloud_id',
+  'CREATE INDEX IF NOT EXISTS idx_local_asset_cloud_id ON local_asset_entity (i_cloud_id)',
+);

mobile/lib/infrastructure/entities/merged_asset.drift

@@ -21,7 +21,11 @@ SELECT
 	rae.owner_id,
 	rae.live_photo_video_id,
 	0 as orientation,
-	rae.stack_id
+	rae.stack_id,
+	NULL as i_cloud_id,
+	NULL as latitude,
+	NULL as longitude,
+	NULL as adjustmentTime
 FROM
 	remote_asset_entity rae
 LEFT JOIN
@@ -53,7 +57,11 @@ SELECT
 	NULL as owner_id,
 	NULL as live_photo_video_id,
 	lae.orientation,
-	NULL as stack_id
+	NULL as stack_id,
+	lae.i_cloud_id,
+	lae.latitude,
+	lae.longitude,
+	lae.adjustment_time
 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 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}',
+      '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}',
       variables: [
         for (var $ in userIds) i0.Variable<String>($),
         ...generatedlimit.introducedVariables,
@@ -62,6 +62,10 @@ 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'),
       ),
     );
   }
@@ -129,6 +133,10 @@ 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,
@@ -146,6 +154,10 @@ 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

@@ -0,0 +1,14 @@
+import 'package:drift/drift.dart';
+import 'package:immich_mobile/infrastructure/entities/remote_asset.entity.dart';
+import 'package:immich_mobile/infrastructure/utils/drift_default.mixin.dart';
+
+class RemoteAssetCloudIdEntity extends Table with DriftDefaultsMixin {
+  TextColumn get assetId => text().references(RemoteAssetEntity, #id, onDelete: KeyAction.cascade)();
+
+  TextColumn get cloudId => text().unique().nullable()();
+
+  TextColumn get eTag => text().nullable()();
+
+  @override
+  Set<Column> get primaryKey => {assetId};
+}

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

@@ -0,0 +1,614 @@
+// 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<String?> eTag,
+    });
+typedef $$RemoteAssetCloudIdEntityTableUpdateCompanionBuilder =
+    i1.RemoteAssetCloudIdEntityCompanion Function({
+      i0.Value<String> assetId,
+      i0.Value<String?> cloudId,
+      i0.Value<String?> eTag,
+    });
+
+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<String> get eTag => $composableBuilder(
+    column: $table.eTag,
+    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<String> get eTag => $composableBuilder(
+    column: $table.eTag,
+    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<String> get eTag =>
+      $composableBuilder(column: $table.eTag, 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<String?> eTag = const i0.Value.absent(),
+              }) => i1.RemoteAssetCloudIdEntityCompanion(
+                assetId: assetId,
+                cloudId: cloudId,
+                eTag: eTag,
+              ),
+          createCompanionCallback:
+              ({
+                required String assetId,
+                i0.Value<String?> cloudId = const i0.Value.absent(),
+                i0.Value<String?> eTag = const i0.Value.absent(),
+              }) => i1.RemoteAssetCloudIdEntityCompanion.insert(
+                assetId: assetId,
+                cloudId: cloudId,
+                eTag: eTag,
+              ),
+          withReferenceMapper: (p0) => p0
+              .map(
+                (e) => (
+                  e.readTable(table),
+                  i1.$$RemoteAssetCloudIdEntityTableReferences(db, table, e),
+                ),
+              )
+              .toList(),
+          prefetchHooksCallback: ({assetId = false}) {
+            return i0.PrefetchHooks(
+              db: db,
+              explicitlyWatchedTables: [],
+              addJoins:
+                  <
+                    T extends i0.TableManagerState<
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic
+                    >
+                  >(state) {
+                    if (assetId) {
+                      state =
+                          state.withJoin(
+                                currentTable: table,
+                                currentColumn: table.assetId,
+                                referencedTable: i1
+                                    .$$RemoteAssetCloudIdEntityTableReferences
+                                    ._assetIdTable(db),
+                                referencedColumn: i1
+                                    .$$RemoteAssetCloudIdEntityTableReferences
+                                    ._assetIdTable(db)
+                                    .id,
+                              )
+                              as T;
+                    }
+
+                    return state;
+                  },
+              getPrefetchedDataCallback: (items) async {
+                return [];
+              },
+            );
+          },
+        ),
+      );
+}
+
+typedef $$RemoteAssetCloudIdEntityTableProcessedTableManager =
+    i0.ProcessedTableManager<
+      i0.GeneratedDatabase,
+      i1.$RemoteAssetCloudIdEntityTable,
+      i1.RemoteAssetCloudIdEntityData,
+      i1.$$RemoteAssetCloudIdEntityTableFilterComposer,
+      i1.$$RemoteAssetCloudIdEntityTableOrderingComposer,
+      i1.$$RemoteAssetCloudIdEntityTableAnnotationComposer,
+      $$RemoteAssetCloudIdEntityTableCreateCompanionBuilder,
+      $$RemoteAssetCloudIdEntityTableUpdateCompanionBuilder,
+      (
+        i1.RemoteAssetCloudIdEntityData,
+        i1.$$RemoteAssetCloudIdEntityTableReferences,
+      ),
+      i1.RemoteAssetCloudIdEntityData,
+      i0.PrefetchHooks Function({bool assetId})
+    >;
+
+class $RemoteAssetCloudIdEntityTable extends i2.RemoteAssetCloudIdEntity
+    with
+        i0.TableInfo<
+          $RemoteAssetCloudIdEntityTable,
+          i1.RemoteAssetCloudIdEntityData
+        > {
+  @override
+  final i0.GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  $RemoteAssetCloudIdEntityTable(this.attachedDatabase, [this._alias]);
+  static const i0.VerificationMeta _assetIdMeta = const i0.VerificationMeta(
+    'assetId',
+  );
+  @override
+  late final i0.GeneratedColumn<String> assetId = i0.GeneratedColumn<String>(
+    'asset_id',
+    aliasedName,
+    false,
+    type: i0.DriftSqlType.string,
+    requiredDuringInsert: true,
+    defaultConstraints: i0.GeneratedColumn.constraintIsAlways(
+      'REFERENCES remote_asset_entity (id) ON DELETE CASCADE',
+    ),
+  );
+  static const i0.VerificationMeta _cloudIdMeta = const i0.VerificationMeta(
+    'cloudId',
+  );
+  @override
+  late final i0.GeneratedColumn<String> cloudId = i0.GeneratedColumn<String>(
+    'cloud_id',
+    aliasedName,
+    true,
+    type: i0.DriftSqlType.string,
+    requiredDuringInsert: false,
+    defaultConstraints: i0.GeneratedColumn.constraintIsAlways('UNIQUE'),
+  );
+  static const i0.VerificationMeta _eTagMeta = const i0.VerificationMeta(
+    'eTag',
+  );
+  @override
+  late final i0.GeneratedColumn<String> eTag = i0.GeneratedColumn<String>(
+    'e_tag',
+    aliasedName,
+    true,
+    type: i0.DriftSqlType.string,
+    requiredDuringInsert: false,
+  );
+  @override
+  List<i0.GeneratedColumn> get $columns => [assetId, cloudId, eTag];
+  @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('e_tag')) {
+      context.handle(
+        _eTagMeta,
+        eTag.isAcceptableOrUnknown(data['e_tag']!, _eTagMeta),
+      );
+    }
+    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'],
+      ),
+      eTag: attachedDatabase.typeMapping.read(
+        i0.DriftSqlType.string,
+        data['${effectivePrefix}e_tag'],
+      ),
+    );
+  }
+
+  @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 String? eTag;
+  const RemoteAssetCloudIdEntityData({
+    required this.assetId,
+    this.cloudId,
+    this.eTag,
+  });
+  @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 || eTag != null) {
+      map['e_tag'] = i0.Variable<String>(eTag);
+    }
+    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']),
+      eTag: serializer.fromJson<String?>(json['eTag']),
+    );
+  }
+  @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),
+      'eTag': serializer.toJson<String?>(eTag),
+    };
+  }
+
+  i1.RemoteAssetCloudIdEntityData copyWith({
+    String? assetId,
+    i0.Value<String?> cloudId = const i0.Value.absent(),
+    i0.Value<String?> eTag = const i0.Value.absent(),
+  }) => i1.RemoteAssetCloudIdEntityData(
+    assetId: assetId ?? this.assetId,
+    cloudId: cloudId.present ? cloudId.value : this.cloudId,
+    eTag: eTag.present ? eTag.value : this.eTag,
+  );
+  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,
+      eTag: data.eTag.present ? data.eTag.value : this.eTag,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('RemoteAssetCloudIdEntityData(')
+          ..write('assetId: $assetId, ')
+          ..write('cloudId: $cloudId, ')
+          ..write('eTag: $eTag')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode => Object.hash(assetId, cloudId, eTag);
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is i1.RemoteAssetCloudIdEntityData &&
+          other.assetId == this.assetId &&
+          other.cloudId == this.cloudId &&
+          other.eTag == this.eTag);
+}
+
+class RemoteAssetCloudIdEntityCompanion
+    extends i0.UpdateCompanion<i1.RemoteAssetCloudIdEntityData> {
+  final i0.Value<String> assetId;
+  final i0.Value<String?> cloudId;
+  final i0.Value<String?> eTag;
+  const RemoteAssetCloudIdEntityCompanion({
+    this.assetId = const i0.Value.absent(),
+    this.cloudId = const i0.Value.absent(),
+    this.eTag = const i0.Value.absent(),
+  });
+  RemoteAssetCloudIdEntityCompanion.insert({
+    required String assetId,
+    this.cloudId = const i0.Value.absent(),
+    this.eTag = const i0.Value.absent(),
+  }) : assetId = i0.Value(assetId);
+  static i0.Insertable<i1.RemoteAssetCloudIdEntityData> custom({
+    i0.Expression<String>? assetId,
+    i0.Expression<String>? cloudId,
+    i0.Expression<String>? eTag,
+  }) {
+    return i0.RawValuesInsertable({
+      if (assetId != null) 'asset_id': assetId,
+      if (cloudId != null) 'cloud_id': cloudId,
+      if (eTag != null) 'e_tag': eTag,
+    });
+  }
+
+  i1.RemoteAssetCloudIdEntityCompanion copyWith({
+    i0.Value<String>? assetId,
+    i0.Value<String?>? cloudId,
+    i0.Value<String?>? eTag,
+  }) {
+    return i1.RemoteAssetCloudIdEntityCompanion(
+      assetId: assetId ?? this.assetId,
+      cloudId: cloudId ?? this.cloudId,
+      eTag: eTag ?? this.eTag,
+    );
+  }
+
+  @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 (eTag.present) {
+      map['e_tag'] = i0.Variable<String>(eTag.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('RemoteAssetCloudIdEntityCompanion(')
+          ..write('assetId: $assetId, ')
+          ..write('cloudId: $cloudId, ')
+          ..write('eTag: $eTag')
+          ..write(')'))
+        .toString();
+  }
+}

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

@@ -10,7 +10,6 @@ import 'package:immich_mobile/infrastructure/entities/exif.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/local_album.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/local_album_asset.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/local_asset.entity.dart';
-import 'package:immich_mobile/infrastructure/entities/trashed_local_asset.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/memory.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/memory_asset.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/partner.entity.dart';
@@ -19,8 +18,10 @@ 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';
 import 'package:immich_mobile/infrastructure/entities/user.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/user_metadata.entity.dart';
 import 'package:immich_mobile/infrastructure/repositories/db.repository.steps.dart';
@@ -57,6 +58,7 @@ class IsarDatabaseRepository implements IDatabaseRepository {
     RemoteAlbumEntity,
     RemoteAlbumAssetEntity,
     RemoteAlbumUserEntity,
+    RemoteAssetCloudIdEntity,
     MemoryEntity,
     MemoryAssetEntity,
     StackEntity,
@@ -95,7 +97,7 @@ class Drift extends $Drift implements IDatabaseRepository {
   }
 
   @override
-  int get schemaVersion => 13;
+  int get schemaVersion => 15;
 
   @override
   MigrationStrategy get migration => MigrationStrategy(
@@ -185,6 +187,17 @@ class Drift extends $Drift implements IDatabaseRepository {
             await m.createIndex(v13.idxTrashedLocalAssetChecksum);
             await m.createIndex(v13.idxTrashedLocalAssetAlbum);
           },
+          from13To14: (m, v14) async {
+            await m.addColumn(v14.localAssetEntity, v14.localAssetEntity.adjustmentTime);
+            await m.addColumn(v14.localAssetEntity, v14.localAssetEntity.latitude);
+            await m.addColumn(v14.localAssetEntity, v14.localAssetEntity.longitude);
+          },
+          from14To15: (m, v15) async {
+            // Add i_cloud_id to local and remote asset tables
+            await m.addColumn(v15.localAssetEntity, v15.localAssetEntity.iCloudId);
+            await m.createIndex(v15.idxLocalAssetCloudId);
+            await m.createTable(v15.remoteAssetCloudIdEntity);
+          },
         ),
       );
 

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

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

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

@@ -1,3 +1,5 @@
+import 'dart:async';
+
 import 'package:drift/drift.dart';
 import 'package:immich_mobile/domain/models/album/local_album.model.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
@@ -244,7 +246,75 @@ class DriftLocalAlbumRepository extends DriftDatabaseRepository {
     return query.map((row) => row.readTable(_db.localAssetEntity).toDto()).get();
   }
 
-  Future<void> _upsertAssets(Iterable<LocalAsset> localAssets) {
+  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;
+
+  Future<void> _upsertAssetsDarwin(Iterable<LocalAsset> localAssets) async {
+    if (localAssets.isEmpty) {
+      return Future.value();
+    }
+
+    // Reset checksum if asset changed
+    await _db.batch((batch) async {
+      for (final asset in localAssets) {
+        final companion = LocalAssetEntityCompanion(
+          checksum: const Value(null),
+          adjustmentTime: Value(asset.adjustmentTime),
+        );
+        batch.update(
+          _db.localAssetEntity,
+          companion,
+          where: (row) => row.id.equals(asset.id) & row.adjustmentTime.isNotExp(Variable(asset.adjustmentTime)),
+        );
+      }
+    });
+
+    return _db.batch((batch) async {
+      for (final asset in localAssets) {
+        final companion = LocalAssetEntityCompanion.insert(
+          name: asset.name,
+          type: asset.type,
+          createdAt: Value(asset.createdAt),
+          updatedAt: Value(asset.updatedAt),
+          width: Value(asset.width),
+          height: Value(asset.height),
+          durationInSeconds: Value(asset.durationInSeconds),
+          id: asset.id,
+          orientation: Value(asset.orientation),
+          isFavorite: Value(asset.isFavorite),
+          latitude: Value(asset.latitude),
+          longitude: Value(asset.longitude),
+          adjustmentTime: Value(asset.adjustmentTime),
+        );
+        batch.insert<$LocalAssetEntityTable, LocalAssetEntityData>(
+          _db.localAssetEntity,
+          companion.copyWith(checksum: const Value(null)),
+          onConflict: DoUpdate((old) => companion),
+        );
+      }
+    });
+  }
+
+  Future<void> _upsertAssetsAndroid(Iterable<LocalAsset> localAssets) async {
     if (localAssets.isEmpty) {
       return Future.value();
     }
@@ -260,6 +330,7 @@ class DriftLocalAlbumRepository extends DriftDatabaseRepository {
           height: Value(asset.height),
           durationInSeconds: Value(asset.durationInSeconds),
           id: asset.id,
+          checksum: const Value(null),
           orientation: Value(asset.orientation),
           isFavorite: Value(asset.isFavorite),
         );

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

@@ -1,8 +1,11 @@
+import 'dart:async';
+
 import 'package:collection/collection.dart';
 import 'package:drift/drift.dart';
 import 'package:immich_mobile/constants/constants.dart';
 import 'package:immich_mobile/domain/models/album/local_album.model.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
+import 'package:immich_mobile/extensions/drift_extensions.dart';
 import 'package:immich_mobile/infrastructure/entities/local_album.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/local_asset.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/local_asset.entity.drift.dart';
@@ -126,4 +129,51 @@ class DriftLocalAssetRepository extends DriftDatabaseRepository {
     }
     return result;
   }
+
+  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 createdAt = _db.localAssetEntity.createdAt.strftime('%s');
+    final adjustmentTime = coalesce([_db.localAssetEntity.adjustmentTime.strftime('%s'), const Constant('0')]);
+    final latitude = coalesce([
+      _db.localAssetEntity.latitude,
+      const Constant(0.0),
+    ]).truncateTo(2).cast(DriftSqlType.string);
+    final longitude = coalesce([
+      _db.localAssetEntity.longitude,
+      const Constant(0.0),
+    ]).truncateTo(2).cast(DriftSqlType.string);
+
+    final delimiter = const Constant(kUploadETagDelimiter);
+    final eTag = createdAt + delimiter + adjustmentTime + delimiter + latitude + delimiter + longitude;
+
+    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.eTag.equalsExp(eTag),
+          );
+    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/sync_api.repository.dart

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

@@ -18,6 +18,7 @@ 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';
@@ -258,6 +259,45 @@ class SyncStreamRepository extends DriftDatabaseRepository {
     }
   }
 
+  Future<void> deleteAssetsMetadataV1(Iterable<SyncAssetMetadataDeleteV1> data) async {
+    try {
+      await _db.batch((batch) {
+        for (final metadata in data) {
+          if (metadata.key == AssetMetadataKey.mobileApp) {
+            batch.deleteWhere(_db.remoteAssetCloudIdEntity, (row) => row.assetId.equals(metadata.assetId));
+          }
+        }
+      });
+    } catch (error, stack) {
+      _logger.severe('Error: deleteAssetsMetadataV1', error, stack);
+      rethrow;
+    }
+  }
+
+  Future<void> updateAssetsMetadataV1(Iterable<SyncAssetMetadataV1> data) async {
+    try {
+      await _db.batch((batch) {
+        for (final metadata in data) {
+          if (metadata.key == AssetMetadataKey.mobileApp) {
+            final map = metadata.value as Map<String, Object?>;
+            final companion = RemoteAssetCloudIdEntityCompanion(
+              cloudId: Value(map['iCloudId']?.toString()),
+              eTag: Value(map['eTag']?.toString()),
+            );
+            batch.insert(
+              _db.remoteAssetCloudIdEntity,
+              companion.copyWith(assetId: Value(metadata.assetId)),
+              onConflict: DoUpdate((_) => companion),
+            );
+          }
+        }
+      });
+    } catch (error, stack) {
+      _logger.severe('Error: updateAssetsMetadataV1', error, stack);
+      rethrow;
+    }
+  }
+
   Future<void> deleteAlbumsV1(Iterable<SyncAlbumDeleteV1> data) async {
     try {
       await _db.batch((batch) {

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

@@ -84,6 +84,10 @@ 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/utils/exif.converter.dart

@@ -22,7 +22,7 @@ abstract final class ExifDtoConverter {
       f: dto.fNumber?.toDouble(),
       mm: dto.focalLength?.toDouble(),
       iso: dto.iso?.toInt(),
-      exposureSeconds: _exposureTimeToSeconds(dto.exposureTime),
+      exposureSeconds: exposureTimeToSeconds(dto.exposureTime),
     );
   }
 
@@ -36,15 +36,15 @@ abstract final class ExifDtoConverter {
     return isRotated90CW || isRotated270CW;
   }
 
-  static double? _exposureTimeToSeconds(String? s) {
-    if (s == null) {
+  static double? exposureTimeToSeconds(String? second) {
+    if (second == null) {
       return null;
     }
-    double? value = double.tryParse(s);
+    double? value = double.tryParse(second);
     if (value != null) {
       return value;
     }
-    final parts = s.split("/");
+    final parts = second.split("/");
     if (parts.length == 2) {
       final numerator = double.tryParse(parts.firstOrNull ?? "-");
       final denominator = double.tryParse(parts.lastOrNull ?? "-");

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

@@ -10,4 +10,8 @@ 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/pages/backup/drift_backup_asset_detail.page.dart

@@ -3,7 +3,7 @@ import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
-import 'package:immich_mobile/domain/models/timeline.model.dart';
+import 'package:immich_mobile/domain/models/events.model.dart';
 import 'package:immich_mobile/domain/utils/event_stream.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/extensions/theme_extensions.dart';

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

@@ -58,7 +58,7 @@ class SettingsPage extends StatelessWidget {
     context.locale;
     return Scaffold(
       appBar: AppBar(centerTitle: false, title: const Text('settings').tr()),
-      body: context.isMobile ? const SafeArea(child: _MobileLayout()) : const SafeArea(child: _TabletLayout()),
+      body: context.isMobile ? const _MobileLayout() : const _TabletLayout(),
     );
   }
 }
@@ -89,11 +89,7 @@ class _MobileLayout extends StatelessWidget {
                 ],
         )
         .toList();
-    return ListView(
-      physics: const ClampingScrollPhysics(),
-      padding: const EdgeInsets.only(top: 10.0, bottom: 16),
-      children: [...settings],
-    );
+    return ListView(padding: const EdgeInsets.only(top: 10.0, bottom: 16), children: [...settings]);
   }
 }
 

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

@@ -5,6 +5,7 @@ import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/store.model.dart';
 import 'package:immich_mobile/entities/store.entity.dart';
+import 'package:immich_mobile/extensions/platform_extensions.dart';
 import 'package:immich_mobile/providers/auth.provider.dart';
 import 'package:immich_mobile/providers/background_sync.provider.dart';
 import 'package:immich_mobile/providers/backup/backup.provider.dart';
@@ -60,7 +61,8 @@ class SplashScreenPageState extends ConsumerState<SplashScreenPage> {
           (_) async {
             try {
               wsProvider.connect();
-              unawaited(infoProvider.getServerInfo());
+              await infoProvider.getServerInfo();
+              final serverInfo = ref.read(serverInfoProvider);
 
               if (Store.isBetaTimelineEnabled) {
                 bool syncSuccess = false;
@@ -75,6 +77,9 @@ class SplashScreenPageState extends ConsumerState<SplashScreenPage> {
                       _resumeBackup(backupProvider);
                     }),
                     _resumeBackup(backupProvider),
+                    // Sync cloud IDs if server version is compatible
+                    if (CurrentPlatform.isIOS && serverInfo.serverVersion.isAtLeast(major: 2, minor: 4))
+                      backgroundManager.syncCloudIds(),
                   ]);
                 } else {
                   await backgroundManager.hashAssets();

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

@@ -5,7 +5,7 @@ import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/constants/constants.dart';
-import 'package:immich_mobile/domain/models/timeline.model.dart';
+import 'package:immich_mobile/domain/models/events.model.dart';
 import 'package:immich_mobile/domain/utils/event_stream.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/presentation/pages/search/paginated_search.provider.dart';
@@ -16,7 +16,6 @@ import 'package:immich_mobile/providers/infrastructure/people.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/readonly_mode.provider.dart';
 import 'package:immich_mobile/providers/search/search_input_focus.provider.dart';
 import 'package:immich_mobile/providers/tab.provider.dart';
-import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
 import 'package:immich_mobile/routing/router.dart';
 
 @RoutePage()

mobile/lib/pages/search/map/map_location_picker.page.dart

@@ -49,7 +49,7 @@ class MapLocationPickerPage extends HookConsumerWidget {
 
       var currentLatLng = LatLng(currentLocation.latitude, currentLocation.longitude);
       selectedLatLng.value = currentLatLng;
-      await controller.value?.animateCamera(CameraUpdate.newLatLng(currentLatLng));
+      await controller.value?.animateCamera(CameraUpdate.newLatLngZoom(currentLatLng, 12));
     }
 
     return MapThemeOverride(
@@ -66,7 +66,10 @@ class MapLocationPickerPage extends HookConsumerWidget {
                 borderRadius: BorderRadius.only(bottomLeft: Radius.circular(40), bottomRight: Radius.circular(40)),
               ),
               child: MapLibreMap(
-                initialCameraPosition: CameraPosition(target: initialLatLng, zoom: 12),
+                initialCameraPosition: CameraPosition(
+                  target: initialLatLng,
+                  zoom: (initialLatLng.latitude == 0 && initialLatLng.longitude == 0) ? 1 : 12,
+                ),
                 styleString: style,
                 onMapCreated: (mapController) => controller.value = mapController,
                 onStyleLoadedCallback: onStyleLoaded,

mobile/lib/platform/native_sync_api.g.dart

@@ -41,6 +41,9 @@ class PlatformAsset {
     required this.durationInSeconds,
     required this.orientation,
     required this.isFavorite,
+    this.adjustmentTime,
+    this.latitude,
+    this.longitude,
   });
 
   String id;
@@ -63,8 +66,28 @@ class PlatformAsset {
 
   bool isFavorite;
 
+  int? adjustmentTime;
+
+  double? latitude;
+
+  double? longitude;
+
   List<Object?> _toList() {
-    return <Object?>[id, name, type, createdAt, updatedAt, width, height, durationInSeconds, orientation, isFavorite];
+    return <Object?>[
+      id,
+      name,
+      type,
+      createdAt,
+      updatedAt,
+      width,
+      height,
+      durationInSeconds,
+      orientation,
+      isFavorite,
+      adjustmentTime,
+      latitude,
+      longitude,
+    ];
   }
 
   Object encode() {
@@ -84,6 +107,9 @@ class PlatformAsset {
       durationInSeconds: result[7]! as int,
       orientation: result[8]! as int,
       isFavorite: result[9]! as bool,
+      adjustmentTime: result[10] as int?,
+      latitude: result[11] as double?,
+      longitude: result[12] as double?,
     );
   }
 
@@ -590,4 +616,32 @@ class NativeSyncApi {
       return (pigeonVar_replyList[0] as Map<Object?, Object?>?)!.cast<String, List<PlatformAsset>>();
     }
   }
+
+  Future<Map<String, String?>> getCloudIdForAssetIds(List<String> assetIds) async {
+    final String pigeonVar_channelName =
+        'dev.flutter.pigeon.immich_mobile.NativeSyncApi.getCloudIdForAssetIds$pigeonVar_messageChannelSuffix';
+    final BasicMessageChannel<Object?> pigeonVar_channel = BasicMessageChannel<Object?>(
+      pigeonVar_channelName,
+      pigeonChannelCodec,
+      binaryMessenger: pigeonVar_binaryMessenger,
+    );
+    final Future<Object?> pigeonVar_sendFuture = pigeonVar_channel.send(<Object?>[assetIds]);
+    final List<Object?>? pigeonVar_replyList = await pigeonVar_sendFuture as List<Object?>?;
+    if (pigeonVar_replyList == null) {
+      throw _createConnectionError(pigeonVar_channelName);
+    } else if (pigeonVar_replyList.length > 1) {
+      throw PlatformException(
+        code: pigeonVar_replyList[0]! as String,
+        message: pigeonVar_replyList[1] as String?,
+        details: pigeonVar_replyList[2],
+      );
+    } else if (pigeonVar_replyList[0] == null) {
+      throw PlatformException(
+        code: 'null-error',
+        message: 'Host platform returned null value for non-null return value.',
+      );
+    } else {
+      return (pigeonVar_replyList[0] as Map<Object?, Object?>?)!.cast<String, String?>();
+    }
+  }
 }

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

@@ -4,6 +4,7 @@ import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/domain/models/exif.model.dart';
+import 'package:immich_mobile/extensions/platform_extensions.dart';
 import 'package:immich_mobile/providers/infrastructure/asset.provider.dart';
 
 @RoutePage()
@@ -129,6 +130,16 @@ class _AssetPropertiesSectionState extends ConsumerState<_AssetPropertiesSection
     properties.insert(4, _PropertyItem(label: 'Orientation', value: asset.orientation.toString()));
     final albums = await ref.read(assetServiceProvider).getSourceAlbums(asset.id);
     properties.add(_PropertyItem(label: 'Album', value: albums.map((a) => a.name).join(', ')));
+    if (CurrentPlatform.isIOS) {
+      properties.add(_PropertyItem(label: 'Cloud ID', value: asset.cloudId));
+      properties.add(_PropertyItem(label: 'Adjustment Time', value: asset.adjustmentTime?.toString()));
+    }
+    properties.add(
+      _PropertyItem(
+        label: 'GPS Coordinates',
+        value: asset.hasCoordinates ? '${asset.latitude}, ${asset.longitude}' : null,
+      ),
+    );
   }
 
   Future<void> _addRemoteAssetProperties(RemoteAsset asset) async {

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

@@ -2,10 +2,10 @@ import 'package:flutter/material.dart';
 import 'package:fluttertoast/fluttertoast.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/constants/enums.dart';
+import 'package:immich_mobile/domain/models/events.model.dart';
 import 'package:immich_mobile/domain/utils/event_stream.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.dart';
-import 'package:immich_mobile/presentation/widgets/asset_viewer/asset_viewer.state.dart';
 import 'package:immich_mobile/providers/infrastructure/action.provider.dart';
 import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
 import 'package:immich_mobile/widgets/common/immich_toast.dart';