fix: hide stack slideshow when editor open (#25520)

* docs: beginning of the year tune up and updates

* darker dark

* backup information

* promote to table of content

* Apply suggestions from code review

Co-authored-by: Mert <101130780+mertalev@users.noreply.github.com>
Co-authored-by: Mees Frensel <33722705+meesfrensel@users.noreply.github.com>

* restore and backup

* edit

* Apply suggestions from code review

Co-authored-by: bo0tzz <git@bo0tzz.me>

* feedback

* more information on mobile

Co-authored-by: https://github.com/aviv926

* more information on free up space
>
> Co-authored-by: jtagcat <git-12dbd862@jtag.cat>

* Update docs/docs/features/mobile-app.mdx

Co-authored-by: jtagcat <git-12dbd862@jtag.cat>

* screenshot and minor tweaks

---------

Co-authored-by: Mert <101130780+mertalev@users.noreply.github.com>
Co-authored-by: Mees Frensel <33722705+meesfrensel@users.noreply.github.com>
Co-authored-by: bo0tzz <git@bo0tzz.me>
Co-authored-by: jtagcat <git-12dbd862@jtag.cat>

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

@@ -2,6 +2,8 @@
 
 import Tabs from '@theme/Tabs';
 import TabItem from '@theme/TabItem';
+import { mdiAlertCircle, mdiCheckCircle } from '@mdi/js';
+import Icon from '@mdi/react';
 
 A [3-2-1 backup strategy](https://www.backblaze.com/blog/the-3-2-1-backup-strategy/) is recommended to protect your data. You should keep copies of your uploaded photos/videos as well as the Immich database for a comprehensive backup solution. This page provides an overview on how to backup the database and the location of user-uploaded pictures and videos. A template bash script that can be run as a cron job is provided [here](/guides/template-backup-script.md)
 
@@ -11,47 +13,127 @@ The instructions on this page show you how to prepare your Immich instance to be
 
 ## Database
 
+Immich stores [file paths](https://github.com/immich-app/immich/discussions/3299) and user metadata in the database. It does not scan the library folder, so database backups are essential.
+
+### Automatic Database Backups
+
+Immich automatically creates database backups for disaster-recovery purposes. These backups are stored in `UPLOAD_LOCATION/backups` and can be managed through the web interface.
+
+You can adjust the backup schedule and retention settings in **Administration > Settings > Backup** (default: keep last 14 backups, create daily at 2:00 AM).
+
 :::caution
-Immich saves [file paths in the database](https://github.com/immich-app/immich/discussions/3299), it does not scan the library folder to update the database so backups are crucial.
+Database backups do **not** contain photos or videos — only metadata. They must be used together with a copy of the files in `UPLOAD_LOCATION` as outlined below.
 :::
 
+#### Creating a Backup
+
+You can trigger a database backup manually:
+
+1. Go to **Administration > Job Queues**
+2. Click **Create job** in the top right
+3. Select **Create Database Backup** and click **Confirm**
+
+The backup will appear in `UPLOAD_LOCATION/backups` and counts toward your retention limit.
+
+### Restoring a Database Backup
+
+Immich provides two ways to restore a database backup: through the web interface or via the command line. The web interface is the recommended method for most users.
+
+#### Restore from Settings {#restore-from-settings}
+
+If you have an existing Immich installation:
+
+<img
+src={require('./img/restore-from-settings.webp').default}
+title="Restore from settings"
+/>
+
+1. Go to **Administration > Maintenance**
+2. Expand the **Restore database backup** section
+3. You'll see a list of available backups with their version and creation date
+4. Click **Restore** next to the backup you want to restore
+5. Confirm the restore operation
+
 :::info
-Refer to the official [postgres documentation](https://www.postgresql.org/docs/current/backup.html) for details about backing up and restoring a postgres database.
+Restoring a backup will wipe the current database and replace it with the backup. A restore point is automatically created before the operation begins, allowing rollback if the restore fails.
 :::
 
-:::caution
-It is not recommended to directly backup the `DB_DATA_LOCATION` folder. Doing so while the database is running can lead to a corrupted backup that cannot be restored.
+#### Restore from Onboarding {#restore-from-onboarding}
+
+If you're setting up Immich on a fresh installation and want to restore from an existing backup:
+
+1. Download and populate `.env` and `docker-compose.yml` as per the [installation instructions](/install/docker-compose).
+2. Move the previous's instance data directories containing `backups`, `encoded-video`, `library`, `profile`, `thumbs` and `upload` into the new `UPLOAD_LOCATION`
+3. **(For external libraries)** If you used external library feature in your previous instance, make sure that the mount settings in your new `docker-compose.yml` reflect the same structure. You may need to move files accordingly.
+
+:::info Example
+
+Assuming your previous `UPLOAD_LOCATION` was `UPLOAD_LOCATION=/my-broken-instance/media` and your new one is `UPLOAD_LOCATION=/a-brand-new-instance/data`, you will need to perform the following file moves:
+
+```
+/my-broken-instance/media/backups          ->    /a-brand-new-instance/data/backups
+/my-broken-instance/media/encoded-video    ->    /a-brand-new-instance/data/encoded-video
+/my-broken-instance/media/library          ->    /a-brand-new-instance/data/library
+/my-broken-instance/media/profile          ->    /a-brand-new-instance/data/profile
+/my-broken-instance/media/thumbs           ->    /a-brand-new-instance/data/thumbs
+/my-broken-instance/media/upload           ->    /a-brand-new-instance/data/upload
+```
+
 :::
 
-### Automatic Database Dumps
+4. Start the Immich services with `docker compose up -d`
+
+<img
+src={require('./img/restore-from-onboarding.webp').default}
+title="Restore from onboarding"
+/>
+
+5. On the welcome screen, click **Restore from backup**
+6. Immich will enter maintenance mode and display integrity checks for your storage folders
+7. Review the folder status to ensure your library files are accessible
+8. Click **Next** to proceed to backup selection
+9. Select a backup from the list or upload a backup file (`.sql.gz`)
+10. Click **Restore** to begin the restoration process
+
+:::tip
+Before restoring, ensure your `UPLOAD_LOCATION` folders contain the same files that existed when the backup was created. The integrity check will show you which folders are readable/writable and how many files they contain.
+:::
+
+### Uploading a Backup File {#uploading-backup}
+
+You can upload a database backup file directly:
+
+1. In the **Restore database backup** section, click **Select from computer**
+2. Choose a `.sql.gz` file
+3. The uploaded backup will appear in the list with an `uploaded-` prefix
+4. Click **Restore** to restore from the uploaded file
+
+### Backup Version Compatibility {#backup-compatibility}
+
+When viewing backups, Immich displays compatibility indicators based on the current version and the information from the filename:
+
+- <Icon path={mdiCheckCircle} size={1} color="green"/> Backup version matches current Immich version
+- <Icon path={mdiAlertCircle} size={1} color="#feb001"/> Backup was created with a different Immich version
+- <Icon path={mdiAlertCircle} size={1} color="red"/> Could not determine backup version
 
 :::warning
-The automatic database dumps can be used to restore the database in the event of damage to the Postgres database files.
-There is no monitoring for these dumps and you will not be notified if they are unsuccessful.
+Restoring a backup from a different Immich version may require database migrations. The restore process will attempt to run migrations automatically, but you should ensure you're restoring to a compatible version when possible.
 :::
 
-:::caution
-The database dumps do **NOT** contain any pictures or videos, only metadata. They are only usable with a copy of the other files in `UPLOAD_LOCATION` as outlined below.
-:::
+### Restore Process {#restore-process}
 
-For disaster-recovery purposes, Immich will automatically create database dumps. The dumps are stored in `UPLOAD_LOCATION/backups`.
-Please be sure to make your own, independent backup of the database together with the asset folders as noted below.
-You can adjust the schedule and amount of kept database dumps in the [admin settings](http://my.immich.app/admin/system-settings?isOpen=backup).
-By default, Immich will keep the last 14 database dumps and create a new dump every day at 2:00 AM.
+During restoration, Immich will:
 
-#### Trigger Dump
+1. Create a backup of the current database (restore point)
+2. Restore the selected backup
+3. Run database migrations if needed
+4. Perform a health check to verify the restore succeeded
 
-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.
+If the restore fails (e.g., corrupted backup or missing admin user), Immich will automatically roll back to the restore point.
 
-#### Restoring
+### Restore via Command Line {#restore-cli}
 
-We hope to make restoring simpler in future versions, for now you can find the database dumps in the `UPLOAD_LOCATION/backups` folder on your host.
-Then please follow the steps in the following section for restoring the database.
-
-### Manual Backup and Restore
+For advanced users or automated recovery scenarios, you can restore a database backup using the command line.
 
 <Tabs>
   <TabItem value="Linux system" label="Linux system" default>
@@ -106,10 +188,12 @@ docker compose up -d                              # Start remainder of Immich ap
   </TabItem>
 </Tabs>
 
-Note that for the database restore to proceed properly, it requires a completely fresh install (i.e. the Immich server has never run since creating the Docker containers). If the Immich app has run, Postgres conflicts may be encountered upon database restoration (relation already exists, violated foreign key constraints, multiple primary keys, etc.), in which case you need to delete the `DB_DATA_LOCATION` folder to reset the database.
+:::note
+For the database restore to proceed properly, it requires a completely fresh install (i.e., the Immich server has never run since creating the Docker containers). If the Immich app has run, you may encounter Postgres conflicts (relation already exists, violated foreign key constraints, etc.). In this case, delete the `DB_DATA_LOCATION` folder to reset the database.
+:::
 
 :::tip
-Some deployment methods make it difficult to start the database without also starting the server. In these cases, you may set the environment variable `DB_SKIP_MIGRATIONS=true` before starting the services. This will prevent the server from running migrations that interfere with the restore process. Be sure to remove this variable and restart the services after the database is restored.
+Some deployment methods make it difficult to start the database without also starting the server. In these cases, set the environment variable `DB_SKIP_MIGRATIONS=true` before starting the services. This prevents the server from running migrations that interfere with the restore process. Remove this variable and restart services after the database is restored.
 :::
 
 ## Filesystem
@@ -157,17 +241,14 @@ for more info read the [release notes](https://github.com/immich-app/immich/rele
 - **Encoded Assets:**
   - Videos that have been re-encoded from the original for wider compatibility. The original is not removed.
   - Stored in `UPLOAD_LOCATION/encoded-video/<userID>`.
-
+- **Database Dump Backups:**
+  - Automatic database backups created by Immich for disaster recovery.
+  - Stored in `UPLOAD_LOCATION/backups/`.
 - **Postgres**
   - The Immich database containing all the information to allow the system to function properly.  
     **Note:** This folder will only appear to users who have made the changes mentioned in [v1.102.0](https://github.com/immich-app/immich/discussions/8930) (an optional, non-mandatory change) or who started with this version.
   - Stored in `DB_DATA_LOCATION`.
 
-  :::danger
-  A backup of this folder does not constitute a backup of your database!
-  Follow the instructions listed [here](/administration/backup-and-restore#database) to learn how to perform a proper backup.
-  :::
-
 </TabItem>
   <TabItem value="Storage Template On" label="Storage Template On">
 
@@ -203,16 +284,14 @@ When you turn off the storage template engine, it will leave the assets in `UPLO
   - Files uploaded through mobile apps.
   - Temporarily located in `UPLOAD_LOCATION/upload/<userID>`.
   - Transferred to `UPLOAD_LOCATION/library/<userID>` upon successful upload.
+- **Database Dump Backups:**
+  - Automatic database backups created by Immich for disaster recovery.
+  - Stored in `UPLOAD_LOCATION/backups/`.
 - **Postgres**
   - The Immich database containing all the information to allow the system to function properly.  
     **Note:** This folder will only appear to users who have made the changes mentioned in [v1.102.0](https://github.com/immich-app/immich/discussions/8930) (an optional, non-mandatory change) or who started with this version.
   - Stored in `DB_DATA_LOCATION`.
 
-  :::danger
-  A backup of this folder does not constitute a backup of your database!
-  Follow the instructions listed [here](/administration/backup-and-restore#database) to learn how to perform a proper backup.
-  :::
-
 </TabItem>
 
 </Tabs>

docs/docs/administration/jobs-workers.md

@@ -50,7 +50,7 @@ When a new asset is uploaded it kicks off a series of jobs, which include metada
 
 Additionally, some jobs (such as memories generation) run on a schedule, which is every night at midnight by default. To change when they run or enable/disable a job navigate to System Settings -> [Nightly Tasks Settings](https://my.immich.app/admin/system-settings?isOpen=nightly-tasks).
 
-<img src={require('./img/admin-nightly-tasks.webp').default} width="60%" title="Admin nightly tasks" />
+<img src={require('./img/admin-nightly-tasks.webp').default} width="80%" title="Admin nightly tasks" />
 
 :::note
 Some jobs ([External Libraries](/features/libraries) scanning, Database Dump) are configured in their own sections in System Settings.

docs/docs/administration/maintenance-mode.md

@@ -4,7 +4,7 @@ Maintenance mode is used to perform administrative tasks such as restoring backu
 
 You can enter maintenance mode by either:
 
-- Selecting "enable maintenance mode" in system settings in administration.
+- Selecting "Switch to maintenance mode" in `Maintenance` tab in administration.
 - Running the enable maintenance mode [administration command](./server-commands.md).
 
 ## Logging in during maintenance

docs/docs/administration/user-management.mdx

@@ -31,7 +31,7 @@ Admin can send a welcome email if the Email option is set, you can learn here ho
 
 Admin can specify the storage quota for the user as the instance's admin; once the limit is reached, the user won't be able to upload to the instance anymore.
 
-In order to select a storage quota, click on the pencil icon and enter the storage quota in GiB. You can choose an unlimited quota by leaving it empty (default).
+In order to select a storage quota, click on the edit user icon and enter the storage quota in GiB. You can choose an unlimited quota by leaving it empty (default).
 
 :::tip
 The system administrator can see the usage quota percentage of all users in Server Stats page.
@@ -41,12 +41,12 @@ The system administrator can see the usage quota percentage of all users in Serv
 External libraries don't take up space from the storage quota.
 :::
 
-<img src={require('./img/user-quota-size.webp').default} width="40%" title="Set Quota Size" />
+<img src={require('./img/user-quota-size.webp').default} width="80%" title="Set Quota Size" />
 
 ## Set Storage Label For User
 
 The admin can add a custom label for each user, so instead of `upload/{userId}/your-template` it will be `upload/{custom_user_label}/your-template`.  
-To apply a storage template, go to the Administration page -> click on the pencil button next to the user.
+To apply a storage template, go to the `Administration > Users`, then click on the context menu button next to the user.
 :::note
 To apply the Storage Label to previously uploaded assets, run the Storage Migration Job.
 :::
@@ -55,25 +55,21 @@ To apply the Storage Label to previously uploaded assets, run the Storage Migrat
 
 ## Password Reset
 
-To reset a user's password, click the pencil icon to edit a user, then click "Reset Password". The user's password will be reset to random password and they have to change it next time the sign in.
+<img src={require('./img/user-edit-menu.webp').default} width="80%" title="Customize Delete User" />
 
-<img src={require('./img/user-management-update.webp').default} width="40%" title="Reset Password" />
+To reset a user's password, go to `Administration > Users`, then click on the context menu button next to the user, then click "Reset Password". The user's password will be reset to a random password and they have to change it next time they sign in.
 
 ## Delete a User
 
-If you need to remove a user from Immich, head to "Administration", where users can be scheduled for deletion. The user account will immediately become disabled and their library and all associated data will be removed after 7 days by default.
-
-<img src={require('./img/delete-user.webp').default} width="40%" title="Delete User" />
+If you need to remove a user from Immich, go to `Administration > Users`, then click on the context menu button next to the user. The user account will immediately become disabled and their library and all associated data will be removed after 7 days by default.
 
 ### Delete Delay
 
-You can customize the time of the deletion of the users from the Administration -> Settings -> User Settings.
+You can customize the time of the deletion of the users from `Administration -> Settings -> User Settings`.
 :::info user deletion job
 The user deletion job runs at midnight to check for users that are ready for deletion. Changes to this setting will be evaluated at the next execution.
 :::
 
-<img src={require('./img/customize-delete-user.webp').default} width="80%" title="Customize Delete User" />
-
 ### Immediately Remove User
 
 You can choose to delete a user immediately by checking the box

docs/docs/developer/setup.md

@@ -37,7 +37,8 @@ All the services are packaged to run as with single Docker Compose command.
 1. Clone the project repo.
 2. Run `cp docker/example.env docker/.env`.
 3. Edit `docker/.env` to provide values for the required variable `UPLOAD_LOCATION`.
-4. From the root directory, run:
+4. Install dependencies - `pnpm i`
+5. From the root directory, run:
 
 ```bash title="Start development server"
 make dev # required Makefile installed on the system.

docs/docs/features/automatic-backup.md

@@ -1,42 +0,0 @@
-# Automatic Backup
-
-Immich supports uploading photos and videos from your mobile device to the server automatically.
-
----
-
-You can enable the settings by accessing the upload options from the upload page
-
-<img src={require('./img/backup-settings-access.webp').default} width="50%" title="Backup option selection" />
-
-<img src={require('./img/background-foreground-backup.webp').default} width="50%" title="Foreground&Background Backup" />
-
-## Foreground backup
-
-If foreground backup is enabled: whenever the app is opened or resumed, it will check if any photos or videos in the selected album(s) have yet to be uploaded to the cloud (the remainder count). If there are any, they will be uploaded.
-
-## Background backup
-
-This feature is intended for everyday use. For initial bulk uploading, please use the foreground upload feature. For more information on why background upload is not working as expected, please refer to the [FAQ](/FAQ#why-does-foreground-backup-stop-when-i-navigate-away-from-the-app-shouldnt-it-transfer-the-job-to-background-backup).
-
-If background backup is enabled. The app will periodically check if there are any new photos or videos in the selected album(s) to be uploaded to the server. If there are, it will upload them to the cloud in the background.
-
-:::info Note
-
-#### General
-
-- The app must be in the background for the backup worker to start running.
-- If you reopen the app and the first page you see is the backup page, the counts will not reflect the background uploaded result. You have to navigate out of the page and come back to see the updated counts.
-
-#### Android
-
-- It is a well-known problem that some Android models are very strict with battery optimization settings, which can cause a problem with the background worker. Please visit [Don't kill my app](https://dontkillmyapp.com/) for a guide on disabling this setting on your phone.
-
-#### iOS
-
-- You must enable **Background App Refresh** for the app to work in the background. You can enable it in the Settings app under General > Background App Refresh.
-
-<div style={{textAlign: 'center'}}>
-<img src={require('./img/background-app-refresh.webp').default} width="30%" title="background-app-refresh" />
-</div>
-
-:::

docs/docs/features/command-line-interface.md

@@ -188,6 +188,8 @@ immich upload --dry-run . | tail -n +6 | jq .newFiles[]
 
 ### Obtain the API Key
 
-The API key can be obtained in the user setting panel on the web interface.
+The API key can be obtained in the user setting panel on the web interface. You can also specify permissions for the key to limit its access.
 
 ![Obtain Api Key](./img/obtain-api-key.webp)
+
+![Specify permissions for the key](./img/obtain-api-key-2.webp)

docs/docs/features/editing.mdx

@@ -0,0 +1,19 @@
+# Editing
+
+Immich supports non-destructive editing of photos. This means that any edits you make to an asset do not modify the original file, but instead create a new version of the asset with the edits applied. You can always revert back to the original asset if needed.
+
+## Supported Edits
+
+Currently, Immich supports the following types of edits:
+
+- Cropping
+- Rotation
+- Mirroring
+
+<img src={require('./img/web-edit-interface.webp').default} title="Web edit interface" />
+
+## Download
+
+When you download an edited asset, Immich provides the edited version of the asset by default. However, you can choose to download the original version if needed.
+
+<img src={require('./img/web-edit-download.webp').default} title="Web edit download" />

docs/docs/features/facial-recognition.md

@@ -21,14 +21,14 @@ The asset detail view will also show the faces that are recognized in the asset.
 Additional actions you can do include:
 
 - Changing the feature photo of the person
-- Setting a person's date of birth
-- Merging two or more detected faces into one person
 - Hiding the faces of a person from the Explore page and detail view
-- Assigning an unrecognized face to a person
+- Setting a person's date of birth, so that the age of the person can be shown at the time the photo was taken
+- Merging two or more detected people into one person
+- Favoriting a person to pin them to the top of the list
 
 It can be found from the app bar when you access the detail view of a person.
 
-<img src={require('./img/facial-recognition-4.webp').default} title='Facial Recognition 4' width="70%"/>
+<img src={require('./img/facial-recognition-4.webp').default} title='Facial Recognition 4' />
 
 ## How Face Detection Works
 

docs/docs/features/libraries.md

@@ -118,46 +118,35 @@ _Remember to run `docker compose up -d` to register the changes. Make sure you c
 
 These actions must be performed by the Immich administrator.
 
-- Click on your avatar in the upper right corner
-- Click on Administration -> External Libraries
-- Click on Create an external library…
-- Select which user owns the library, this can not be changed later
-- Enter `/mnt/media/christmas-trip` then click Add
-- Click on Save
-- Click the drop-down menu on the newly created library
-- Click on Scan
-- Click the drop-down menu on the newly created library
-- Click on Rename Library and rename it to "Christmas Trip"
+- Click on your avatar in the upper right corner.
+- Click on `Administration -> External Libraries`.
+- Click on `Create Library`.
+- Select which user owns the library, this **can not** be changed later
+- You are now entering the library management page.
+- Click on `Add` in the `Folders` section.
+- Enter `/mnt/media/christmas-trip` then click Add.
+- Click on `Edit` Library and rename it to "Christmas Trip".
 
 NOTE: We have to use the `/mnt/media/christmas-trip` path and not the `/mnt/nas/christmas-trip` path since all paths have to be what the Docker containers see.
 
 Next, we'll add an exclusion pattern to filter out raw files.
 
-- Click the drop-down menu on the newly-created Christmas library
-- Click on Manage
-- Click on Scan Settings
-- Click on Add Exclusion Pattern
-- Enter `**/Raw/**` and click save.
-- Click save
-- Click the drop-down menu on the newly created library
-- Click on Scan
+- Click on `Add` in the `Exclusion Patterns` section.
+- Enter `**/Raw/**` and click Add.
+- Click on `Scan`
 
 The christmas trip library will now be scanned in the background. In the meantime, let's add the videos and old photos to another library.
 
-- Click on Create External Library.
-
-:::note
-If you get an error here, please rename the other external library to something else. This is a bug that will be fixed in a future release.
-:::
-
-- Click the drop-down menu on the newly created library
-- Click Edit Import Paths
-- Click on Add Path
+- Go back to `Administration -> External Libraries`.
+- Click on `Create Library`.
+- Select which user owns the library,
+- You are now entering the library management page.
+- Click on `Add` in the `Folders` section.
 - Enter `/mnt/media/old-pics` then click Add
-- Click on Add Path
+- Click on `Add` in the `Folders` section.
 - Enter `/mnt/media/videos` then click Add
-- Click Save
-- Click on Scan
+- Click on `Scan`
+- Click on `Edit` Library and rename it to "Old videos and photos".
 
 Within seconds, the assets from the old-pics and videos folders should show up in the main timeline.
 

docs/docs/features/mobile-app.mdx

@@ -20,14 +20,6 @@ Below are the SHA-256 fingerprints for the certificates signing the android appl
 
 :::
 
-:::info Beta Program
-The beta release channel allows users to test upcoming changes before they are officially released. To join the channel use the links below.
-
-- Android: Invitation link from [web](https://play.google.com/store/apps/details?id=app.alextran.immich) or from [mobile](https://play.google.com/store/apps/details?id=app.alextran.immich)
-- iOS: [TestFlight invitation link](https://testflight.apple.com/join/1vYsAa8P)
-
-:::
-
 ## Login
 
 <MobileAppLogin />
@@ -36,15 +28,11 @@ The beta release channel allows users to test upcoming changes before they are o
 
 <MobileAppBackup />
 
-:::info
-You can enable automatic backup on supported devices. For more information see [Automatic Backup](/features/automatic-backup.md).
-:::
-
 ## Sync only selected photos
 
 If you have a large number of photos on the device, and you would prefer not to backup all the photos, then it might be prudent to only backup selected photos from device to the Immich server.
 
-First, you need to enable the Storage Indicator in your app's settings. Navigate to **<ins>Settings -> Photo Grid</ins>** and enable **"Show Storage indicator on asset tiles"**; this makes it easy to distinguish local-only assets and synced assets.
+First, you need to enable the Storage Indicator in your app's settings. Navigate to **<ins>Settings -> Photo Grid</ins>** and enable **`Show Storage indicator on asset tiles`**; this makes it easy to distinguish local-only assets and synced assets.
 
 :::note
 
@@ -55,13 +43,8 @@ This will enable a small cloud icon on the bottom right corner of the asset tile
 
 :::
 
-Now make sure that the local album is selected in the backup screen (steps 1-2 above). You can find these albums listed in **<ins>Library -> On this device</ins>**. To selectively upload photos from these albums, simply select the local-only photos and tap on "Upload" button in the dynamic bottom menu.
+Now make sure that the local album is selected in the backup screen (steps 1-2 above). You can find these albums listed in **<ins>Library -> On this device</ins>**. To selectively upload photos from these albums, simply select the local-only photos and tap on the `Upload` button in the dynamic bottom menu.
 
-<img
-  src={require('./img/mobile-upload-open-photo.webp').default}
-  width="50%"
-  title="Upload button on local asset preview"
-/>
 <img
   src={require('./img/mobile-upload-selected-photos.webp').default}
   width="40%"
@@ -70,53 +53,46 @@ Now make sure that the local album is selected in the backup screen (steps 1-2 a
 
 ## Free Up Space
 
-The **Free Up Space** tool allows you to remove local media files from your device that have already been successfully backed up to your Immich server (and are not in the Immich trash). This helps reclaim storage on your mobile device without losing your memories.
+**Free Up Space** allows you to remove local media files from your device that have already been successfully backed up to your Immich server (and are not in Immich trash). This helps reclaim storage on your mobile device without losing your memories.
 
 ### How it works
 
+<img src={require('./img/free-up-space.webp').default} title="Free up space" />
+
 1.  **Configuration:**
-    - **Cutoff Date:** You can select a cutoff date. The tool will only look for photos and videos **on or before** this date.
-    - **Filter Options:** You can choose to remove **All** assets, or restrict removal to **Photos only** or **Videos only**.
-    - **Keep Favorites:** By default, local assets marked as favorites are preserved on your device, even if they match the cutoff date.
-2.  **Scan & Review:** Before any files are removed, you are presented with a review screen to verify which items will be deleted.
-3.  **Deletion:** Confirmed items are moved to your device's native Trash/Recycle Bin. They will be permanently removed by the OS based on your system settings (usually after 30 days).
+    - **Cutoff date:** Free Up Space will only look for photos and videos **on or before** this date. Photos removed from the device don't show up in other (messaging) apps and have to be shared from Immich in order to send them.
+    - **Keep favorites:** This works the same way `Keep albums` does. By default, favorited assets are preserved on your device.
+    - **Keep albums:** Hold all photos and videos in the selected albums on your device, regardless of other settings. By default, `WhatsApp` [related albums](#external-app-dependencies) are selected to be kept on the device. Assets not already on the device will not be re-downloaded.
+    - **Keep on device:** You can choose to restrict removal to `Always keep` **All photos** or **All videos**, regardless of other settings. This setting can hamper freeing up space significantly — with 80 GB of videos and 40 GB photos, selecting `Always keep photos` retains thousands of photos on your device.
 
-:::info Android Permissions
-For the smoothest experience on Android, you should grant Immich special delete privileges. Without this, you may be prompted to confirm deletion for every single image.
+2.  **Scan & Review:** Before any files are removed, you are presented with a review screen to verify which items will be deleted and how much storage is reclamable.
+3.  **Deletion:** Confirmed items are moved to your device's native Trash/Recycle Bin.
 
-Go to **Immich Settings > Advanced** and enable **"Media Management Access"**.
+:::info reclaim storage
+To use the reclaimed space right away, you must empty the system/gallery trash manually outside of Immich.
 :::
 
-### iCloud Photos (iOS Users)
+Provided the server is healthy and [backed up](/administration/backup-and-restore.md), assets removed by Free Up Space can always be accessed in the Immich app.
 
-If you use **iCloud Photos** alongside Immich, it is vital to understand how deletion affects your data. iCloud utilizes a two-way sync; this means deleting a photo from your iPhone to free up space will **also delete it from iCloud**.
+### iCloud Photos
+
+If you use **iCloud Photos** alongside Immich, it is vital to understand how deletion affects your data. After using **Free Up Space**, the photo will be stored **only** on your Immich server (and your phone's "Recently Deleted" folder for 30 days).
+
+Assets that are part of an **iCloud Shared Album** are automatically excluded from the cleanup scan because iCloud does not allow removing the items in Shared Album from the device.
 
 :::warning iCloud & Backups
-If you rely on iCloud as a secondary backup (part of a 3-2-1 backup strategy), using the Free Up Space feature in Immich will remove the file from both your phone and iCloud.
+If, in addition to Immich, you rely on iCloud as a secondary backup (as part of your [3-2-1](https://www.backblaze.com/blog/the-3-2-1-backup-strategy/) backup strategy), you should instead use `Optimize iPhone Storage` in [iCloud Photos](https://support.apple.com/en-us/105061).
 
-Once deleted, the photo will exist **only** on your Immich server (and your phone's "Recently Deleted" folder for 30 days).
-
-When you use iCloud Photos and delete a photo or video on one device, it's also deleted on all other devices where you're signed in with the same Apple Account.
-
-More information on the [Apple Support](https://support.apple.com/en-us/108922#iCloud_photo_library) website
-
-**Shared Albums**
-Assets that are part of an **iCloud Shared Album** are automatically excluded from the cleanup scan to ensure they remain viewable to others in the shared album.
+iCloud utilizes a two-way sync; this means deleting a photo, or using Free Up Space from your iPhone will **also delete it from iCloud** and all other devices (Mac, iPad) where you're signed in with the same Apple Account. See [Apple Support](https://support.apple.com/en-us/108922#iCloud_photo_library) for more info.
 :::
 
-### External App Dependencies (WhatsApp, etc.)
+### External App Dependencies (WhatsApp, etc.) \{#external-app-dependencies\}
 
-:::danger WhatsApp & Local Files
 Android applications like **WhatsApp** rely on local files to display media in chat history.
 
 If Immich backs up your WhatsApp folder and you run **Free Up Space**, the local copies of these images will be deleted. Consequently, **media in your WhatsApp chats will appear blurry or missing.** You will only be able to view these photos inside the Immich app; they will no longer be visible within the WhatsApp interface.
 
-**Recommendation:** If keeping chat history intact is important, please ensure you review the deletion list carefully or consider excluding WhatsApp folders from the backup if you intend to use this feature frequently.
-:::
-
-:::info reclaim storage
-You must empty the system/gallery trash manually to reclaim storage.
-:::
+**Recommendation:** If keeping chat history intact is important, exclude WhatsApp with `Keep albums` in Free Up Space and review the deletion list carefully. You have to enable [Album Sync](#album-sync) for WhatsApp to show up in the list. Alternatively, don't [back up](#backup) WhatsApp with Immich.
 
 ## Album Sync
 
@@ -138,10 +114,19 @@ You can sync or mirror an album from your phone to the Immich server on your acc
 
 ### Synchronizing albums from the past
 
-Albums can be synchronized to the server even if they did not exist on the server before. In order to apply this setting you have to:  
-Enter the cloud on the top right -> cog wheel on the top right -> select the sync option under Sync albums.
+<img src={require('./img/backup-album-sync.webp').default} width="400px" title="Backup album synchronization option" />
+
+Albums can be synchronized to the server even if they did not exist on the server before. You can enable this feature at any time and use the **Reorganize into album** button to backfill existing uploads into their corresponding albums.
 
 :::info Sync albums delete/move photos
 If you delete/move photos in the local album on your device, it will not be reflected in the album on the server **even if** you click Sync albums
 It will only reflect files you add.
 :::
+
+## Read-only/kid Mode
+
+You can set the app to read-only mode to prevent accidental deletion of photos from your device, and only allow viewing photos on the timeline.
+
+To toggle this feature, long-press the profile icon or go to `Settings > Advanced > Read-only Mode`.
+
+<img src={require('./img/read-only-mode.webp').default} width="800px" title="Read-only mode" />

docs/docs/features/mobile-backup.md

@@ -0,0 +1,85 @@
+---
+sidebar_position: 1
+---
+
+# Mobile Backup
+
+## Overview
+
+Immich supports uploading photos and videos from your mobile device to the server automatically.
+
+When backup is enabled, Immich will upload new photos and videos from selected albums when you open or resume the app, as well as periodically in the background.
+
+<img
+src={require('./img/enable-backup-button.webp').default}
+width="400px"
+title="Upload button"
+/>
+
+## General Features
+
+### Backup albums selection
+
+<img
+src={require('./img/backup-album-selection.webp').default}
+width="400px"
+title="Backup album selection"
+/>
+
+You can select which albums on your mobile device to back up to the server. You can also exclude specific albums (by double-tapping on them) from being backed up. This is useful for iOS users since assets can belong to multiple albums. For example, you may want to back up all assets except those in the "Videos" album.
+
+### Deduplication
+
+When you first select albums for backup, Immich calculates a checksum for each file's content. This checksum identifies assets already on the server—whether uploaded via CLI, web interface, or another device. Files matching existing assets are skipped, preventing duplicate uploads and saving bandwidth.
+
+### Networking requirements
+
+By default, Immich will only upload photos and videos when connected to Wi-Fi. You can change this behavior in the backup settings page.
+
+<img
+src={require('./img/backup-options.webp').default}
+width="400px"
+title="Upload button"
+/>
+
+### Backup album synchronization
+
+<img
+src={require('./img/backup-album-sync.webp').default}
+width="400px"
+title="Backup album synchronization option"
+/>
+
+When enabled, Immich automatically creates albums on the server that mirror the albums on your mobile device. Photos and videos are organized into these server-side albums to match your device's album structure, making it easy to find and browse your content the same way you do on your phone.
+
+This is a one-way sync from your device to the server. You can enable this feature at any time and use the **Reorganize into album** button to backfill existing uploads into their corresponding albums.
+
+## Platform Specific Features
+
+### Android
+
+<img
+src={require('./img/android-backup-options.webp').default}
+width="400px"
+title="Android backup options"
+/>
+
+- It is a well-known problem that some Android models are very strict with battery optimization settings, which can cause a problem with the background worker. Please visit [Don't kill my app](https://dontkillmyapp.com/) for a guide on disabling this setting on your phone.
+- You can allow the background task to run only when the device is charging.
+- You can set the minimum delay from the time a photo is taken to when the background upload task will run.
+
+### iOS
+
+- You must enable **Background App Refresh** for the app to work in the background. You can enable it in the Settings app under General > Background App Refresh.
+
+<div style={{textAlign: 'center'}}>
+<img src={require('./img/background-app-refresh.webp').default} width="30%" title="background-app-refresh" />
+</div>
+
+- iOS automatically manages background tasks; the app cannot control when the background upload task will run. The more frequently you open the app, the more often background tasks will run.
+
+#### iCloud Backup
+
+Local albums containing assets from iCloud and marked for backup in Immich will be pulled from iCloud and temporarily stored in the app's cache folder. Once the hashing and uploading process is completed, the temporary files will be emptied.
+
+This process may consume additional data and storage space on your device, especially if you have a large number of iCloud photos and videos. Please ensure you have sufficient storage space and monitor your data usage if you are not connected to Wi-Fi.

docs/docs/features/searching.md

@@ -11,45 +11,25 @@ Contextual CLIP search is powered by the [VectorChord](https://github.com/tensor
 
 In addition, Immich offers advanced search functionality, allowing you to find specific content using customizable search filters. These filters include location, one or more faces, specific albums, and more. You can try out the search filters on the [Demo site](https://demo.immich.app).
 
-The filters smart search allows you to search by include:
+You can search the following types of content:
 
-- People
-- Location
-  - Country
-  - State
-  - City
-- Camera
-  - Make
-  - Model
-- Date range
-- File name or extension
-- Media type
-  - Image (including live/motion photos)
-  - Video
-  - All
-- Condition
-  - Not in any album
-  - Archived
-  - Favorited
-  - Rating
-
-<Tabs>
-  <TabItem value="Computer" label="Computer" default>
-
-Some search examples:
+| Type                                | Description                                           |
+| ----------------------------------- | ----------------------------------------------------- |
+| People                              | Faces that are recognized in your photos/videos.      |
+| Contextual                          | Content of the photos and videos.                     |
+| File name or extension              | Full or partial file's name, or file's extension      |
+| Description                         | Description added to assets.                          |
+| Optical Character Recognition (OCR) | Text in images                                        |
+| Locations                           | Cities, states, and countries from reverse geocoding. |
+| Tags                                | Tags assigned or extracted from assets.               |
+| Camera                              | make, model and lens model                            |
+| Time frame                          | Start and end date of a specific time bucket          |
+| Media type                          | Image or video or both                                |
+| Display options                     | In Archive, in Favorites or Not in any album          |
+| Start rating                        | User-assigned start rating                            |
 
 <img src={require('./img/advanced-search-filters.webp').default} width="70%" title='Advanced search filters' />
 
-<img src={require('./img/search-ex-1.webp').default} width="70%" title='Search Example 1' />
-
-</TabItem>
-  <TabItem value="Mobile" label="Mobile">
-
-<img src={require('./img/mobile-smart-search.webp').default} width="30%" title='Smart search on mobile' />
-
-</TabItem>
-</Tabs>
-
 ## Configuration
 
 Navigating to `Administration > Settings > Machine Learning Settings > Smart Search` will show the options available.

docs/docs/guides/external-library.md

@@ -30,26 +30,17 @@ In the Immich web UI:
 - click the **Administration** link in the upper right corner.
   <img src={require('./img/administration-link.webp').default} width="50%" title="Administration link" />
 
-- Select the **External Libraries** tab
-  <img src={require('./img/external-libraries.webp').default} width="50%" title="External Libraries tab" />
-
-- Click the **Create Library** button
-  <img src={require('./img/create-external-library.webp').default} width="50%" title="Create Library button" />
+- Select the **External Libraries** tab and click the **Create Library** button
+  <img src={require('./img/create-external-library.webp').default} width="80%" title="Create Library button" />
 
 - In the dialog, select which user should own the new library
   <img src={require('./img/library-owner.webp').default} width="50%" title="Library owner dialog" />
 
-- Click the three-dots menu and select **Edit Import Paths**
-  <img src={require('./img/edit-import-paths.webp').default} width="50%" title="Edit Import Paths menu option" />
+- You are now entering the library management page.
+  <img src={require('./img/library-management-page.webp').default} width="80%" title="Library management page" />
 
-- Click Add path
-  <img src={require('./img/add-path-button.webp').default} width="50%" title="Add Path button" />
-
-- Enter **/home/user/photos1** as the path and click Add
-  <img src={require('./img/add-path-field.webp').default} width="50%" title="Add Path field" />
-
-- Save the new path
-  <img src={require('./img/path-save.webp').default} width="50%" title="Path Save button" />
+- Click `Add` in the Folder section to specify a path for scanning and enter **/home/user/photos1** as the path and click Add
+  <img src={require('./img/edit-import-path.webp').default} width="50%" title="Add an import path" />
 
 - Click the three-dots menu and select **Scan New Library Files**
   <img src={require('./img/scan-new-library-files.webp').default} width="50%" title="Scan New Library Files menu option" />
@@ -64,4 +55,3 @@ In the Immich web UI:
 
 - You should see non-zero Active jobs for
   Library, Generate Thumbnails, and Extract Metadata.
-  <img src={require('./img/job-status.webp').default} width="50%" title="Job Status display" />

docs/docs/install/environment-variables.md

@@ -17,11 +17,11 @@ If this does not work, try running `docker compose up -d --force-recreate`.
 
 ## Docker Compose
 
-| Variable           | Description                     |  Default  | Containers               |
-| :----------------- | :------------------------------ | :-------: | :----------------------- |
-| `IMMICH_VERSION`   | Image tags                      | `release` | server, machine learning |
-| `UPLOAD_LOCATION`  | Host path for uploads           |           | server                   |
-| `DB_DATA_LOCATION` | Host path for Postgres database |           | database                 |
+| Variable           | Description                     | Default | Containers               |
+| :----------------- | :------------------------------ | :-----: | :----------------------- |
+| `IMMICH_VERSION`   | Image tags                      |  `v2`   | server, machine learning |
+| `UPLOAD_LOCATION`  | Host path for uploads           |         | server                   |
+| `DB_DATA_LOCATION` | Host path for Postgres database |         | database                 |
 
 :::tip
 These environment variables are used by the `docker-compose.yml` file and do **NOT** affect the containers directly.

docs/docs/overview/quick-start.mdx

@@ -10,7 +10,7 @@ to install and use it.
 
 ## Requirements
 
-- A system with at least 4GB of RAM and 2 CPU cores.
+- A system with at least 6GB of RAM and 2 CPU cores.
 - [Docker](https://docs.docker.com/engine/install/)
 
 > For a more detailed list of requirements, see the [requirements page](/install/requirements).
@@ -63,9 +63,9 @@ The backup time differs depending on how many photos are on your mobile device.
 take quite a while.
 To quickly get going, you can selectively upload few photos first, by following this [guide](/features/mobile-app#sync-only-selected-photos).
 
-You can select the **Jobs** tab to see Immich processing your photos.
+You can select the **Job Queues** tab to see Immich processing your photos.
 
-<img src={require('/docs/guides/img/jobs-tab.webp').default} title="Jobs tab" width={300} />
+<img src={require('/docs/guides/img/jobs-tab.webp').default} title="Job Queues tab" width={300} />
 
 ---
 
@@ -90,4 +90,4 @@ You may want to [upload photos from your own archive](/features/command-line-int
 
 You may want to incorporate a pre-existing archive of photos from an [External Library](/features/libraries); there's a [guide](/guides/external-library) for that.
 
-You may want your mobile device to [back photos up to your server automatically](/features/automatic-backup).
+You may want your mobile device to [back photos up to your server automatically](/features/mobile-backup).

docs/docs/partials/_mobile-app-backup.md

@@ -6,4 +6,8 @@
 
 <img src={require('./img/album-selection.webp').default} width='50%' title='Backup button' />
 
-3. Scroll down to the bottom and press "**Start Backup**" to start the backup process. This will upload all the assets in the selected albums.
+3. Scroll down to the bottom and press "**Enable Backup**" to start the backup process. This will upload all the assets in the selected albums.
+
+:::info
+You can read more about backup options [here](/features/mobile-backup.md).
+:::

docs/docs/partials/_user-create.md

@@ -2,6 +2,6 @@ If you have friends or family members who want to use the application as well, y
 
 <img src={require('./img/create-new-user.webp').default} width="90%" title='New User Registration' />
 
-In the Administration panel, you can click on the **Create user** button, and you'll be presented with the following dialog:
+On the **Administration > Users** page, you can click on the **Create user** button, and you'll be presented with the following dialog:
 
-<img src={require('./img/create-new-user-dialog.webp').default} width="90%" title='New User Registration Dialog' />
+<img src={require('./img/create-new-user-dialog.webp').default} width="40%" title='New User Registration Dialog' />

docs/docusaurus.config.js

@@ -76,6 +76,10 @@ const config = {
           autoCollapseCategories: false,
         },
       },
+      tableOfContents: {
+        minHeadingLevel: 2,
+        maxHeadingLevel: 4,
+      },
       navbar: {
         logo: {
           alt: 'Immich Logo',

docs/src/css/custom.css

@@ -69,7 +69,13 @@ h6 {
   --ifm-color-primary-lighter: #e9f1fe;
   --ifm-color-primary-lightest: #ffffff;
   --docusaurus-highlighted-code-line-bg: rgba(0, 0, 0, 0.3);
-  --ifm-background-color: #000000;
+  --ifm-navbar-background-color: #0c0c0c;
+  --ifm-footer-background-color: #0c0c0c;
+}
+
+[data-theme='dark'] body,
+[data-theme='dark'] .main-wrapper {
+  background-color: #070707;
 }
 
 div[class^='announcementBar_'] {

docs/static/_redirects

@@ -34,3 +34,4 @@
 /overview/introduction /overview/quick-start 307
 /overview/welcome /overview/quick-start 307
 /docs/* /:splat 307
+/features/automatic-backup /features/mobile-backup 307

docs/tailwind.config.js

@@ -17,9 +17,9 @@ module.exports = {
 
         // Dark Theme
         'immich-dark-primary': '#adcbfa',
-        'immich-dark-bg': '#070a14',
+        'immich-dark-bg': '#000000',
         'immich-dark-fg': '#e5e7eb',
-        'immich-dark-gray': '#212121',
+        'immich-dark-gray': '#111111',
       },
     },
   },

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

@@ -41,7 +41,7 @@ class HashService {
     final Stopwatch stopwatch = Stopwatch()..start();
     try {
       // Migrate hashes from cloud ID to local ID so we don't have to re-hash them
-      await _localAssetRepository.reconcileHashesFromCloudId();
+      await _migrateHashes();
 
       // Sorted by backupSelection followed by isCloud
       final localAlbums = await _localAlbumRepository.getBackupAlbums();
@@ -78,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/utils/migrate_cloud_ids.dart

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

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

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

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

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

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

@@ -97,7 +97,7 @@ class Drift extends $Drift implements IDatabaseRepository {
   }
 
   @override
-  int get schemaVersion => 18;
+  int get schemaVersion => 17;
 
   @override
   MigrationStrategy get migration => MigrationStrategy(
@@ -204,9 +204,6 @@ class Drift extends $Drift implements IDatabaseRepository {
           from16To17: (m, v17) async {
             await m.addColumn(v17.remoteAssetEntity, v17.remoteAssetEntity.isEdited);
           },
-          from17To18: (m, v18) async {
-            await m.createIndex(v18.idxRemoteAssetCloudId);
-          },
         ),
       );
 

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

@@ -120,7 +120,6 @@ abstract class $Drift extends i0.GeneratedDatabase {
     storeEntity,
     trashedLocalAssetEntity,
     i11.idxLatLng,
-    i14.idxRemoteAssetCloudId,
     i20.idxTrashedLocalAssetChecksum,
     i20.idxTrashedLocalAssetAlbum,
   ];

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

@@ -7408,455 +7408,6 @@ i1.GeneratedColumn<bool> _column_101(String aliasedName) =>
       ),
       defaultValue: const CustomExpression('0'),
     );
-
-final class Schema18 extends i0.VersionedSchema {
-  Schema18({required super.database}) : super(version: 18);
-  @override
-  late final List<i1.DatabaseSchemaEntity> entities = [
-    userEntity,
-    remoteAssetEntity,
-    stackEntity,
-    localAssetEntity,
-    remoteAlbumEntity,
-    localAlbumEntity,
-    localAlbumAssetEntity,
-    idxLocalAssetChecksum,
-    idxLocalAssetCloudId,
-    idxRemoteAssetOwnerChecksum,
-    uQRemoteAssetsOwnerChecksum,
-    uQRemoteAssetsOwnerLibraryChecksum,
-    idxRemoteAssetChecksum,
-    authUserEntity,
-    userMetadataEntity,
-    partnerEntity,
-    remoteExifEntity,
-    remoteAlbumAssetEntity,
-    remoteAlbumUserEntity,
-    remoteAssetCloudIdEntity,
-    memoryEntity,
-    memoryAssetEntity,
-    personEntity,
-    assetFaceEntity,
-    storeEntity,
-    trashedLocalAssetEntity,
-    idxLatLng,
-    idxRemoteAssetCloudId,
-    idxTrashedLocalAssetChecksum,
-    idxTrashedLocalAssetAlbum,
-  ];
-  late final Shape20 userEntity = Shape20(
-    source: i0.VersionedTable(
-      entityName: 'user_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_0,
-        _column_1,
-        _column_3,
-        _column_84,
-        _column_85,
-        _column_91,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape28 remoteAssetEntity = Shape28(
-    source: i0.VersionedTable(
-      entityName: 'remote_asset_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_1,
-        _column_8,
-        _column_9,
-        _column_5,
-        _column_10,
-        _column_11,
-        _column_12,
-        _column_0,
-        _column_13,
-        _column_14,
-        _column_15,
-        _column_16,
-        _column_17,
-        _column_18,
-        _column_19,
-        _column_20,
-        _column_21,
-        _column_86,
-        _column_101,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape3 stackEntity = Shape3(
-    source: i0.VersionedTable(
-      entityName: 'stack_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [_column_0, _column_9, _column_5, _column_15, _column_75],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape26 localAssetEntity = Shape26(
-    source: i0.VersionedTable(
-      entityName: 'local_asset_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_1,
-        _column_8,
-        _column_9,
-        _column_5,
-        _column_10,
-        _column_11,
-        _column_12,
-        _column_0,
-        _column_22,
-        _column_14,
-        _column_23,
-        _column_98,
-        _column_96,
-        _column_46,
-        _column_47,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape9 remoteAlbumEntity = Shape9(
-    source: i0.VersionedTable(
-      entityName: 'remote_album_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_0,
-        _column_1,
-        _column_56,
-        _column_9,
-        _column_5,
-        _column_15,
-        _column_57,
-        _column_58,
-        _column_59,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape19 localAlbumEntity = Shape19(
-    source: i0.VersionedTable(
-      entityName: 'local_album_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_0,
-        _column_1,
-        _column_5,
-        _column_31,
-        _column_32,
-        _column_90,
-        _column_33,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape22 localAlbumAssetEntity = Shape22(
-    source: i0.VersionedTable(
-      entityName: 'local_album_asset_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(asset_id, album_id)'],
-      columns: [_column_34, _column_35, _column_33],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  final i1.Index idxLocalAssetChecksum = i1.Index(
-    'idx_local_asset_checksum',
-    'CREATE INDEX IF NOT EXISTS idx_local_asset_checksum ON local_asset_entity (checksum)',
-  );
-  final i1.Index idxLocalAssetCloudId = i1.Index(
-    'idx_local_asset_cloud_id',
-    'CREATE INDEX IF NOT EXISTS idx_local_asset_cloud_id ON local_asset_entity (i_cloud_id)',
-  );
-  final i1.Index idxRemoteAssetOwnerChecksum = i1.Index(
-    'idx_remote_asset_owner_checksum',
-    'CREATE INDEX IF NOT EXISTS idx_remote_asset_owner_checksum ON remote_asset_entity (owner_id, checksum)',
-  );
-  final i1.Index uQRemoteAssetsOwnerChecksum = i1.Index(
-    'UQ_remote_assets_owner_checksum',
-    'CREATE UNIQUE INDEX IF NOT EXISTS UQ_remote_assets_owner_checksum ON remote_asset_entity (owner_id, checksum) WHERE(library_id IS NULL)',
-  );
-  final i1.Index uQRemoteAssetsOwnerLibraryChecksum = i1.Index(
-    'UQ_remote_assets_owner_library_checksum',
-    'CREATE UNIQUE INDEX IF NOT EXISTS UQ_remote_assets_owner_library_checksum ON remote_asset_entity (owner_id, library_id, checksum) WHERE(library_id IS NOT NULL)',
-  );
-  final i1.Index idxRemoteAssetChecksum = i1.Index(
-    'idx_remote_asset_checksum',
-    'CREATE INDEX IF NOT EXISTS idx_remote_asset_checksum ON remote_asset_entity (checksum)',
-  );
-  late final Shape21 authUserEntity = Shape21(
-    source: i0.VersionedTable(
-      entityName: 'auth_user_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_0,
-        _column_1,
-        _column_3,
-        _column_2,
-        _column_84,
-        _column_85,
-        _column_92,
-        _column_93,
-        _column_7,
-        _column_94,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape4 userMetadataEntity = Shape4(
-    source: i0.VersionedTable(
-      entityName: 'user_metadata_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(user_id, "key")'],
-      columns: [_column_25, _column_26, _column_27],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape5 partnerEntity = Shape5(
-    source: i0.VersionedTable(
-      entityName: 'partner_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(shared_by_id, shared_with_id)'],
-      columns: [_column_28, _column_29, _column_30],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape8 remoteExifEntity = Shape8(
-    source: i0.VersionedTable(
-      entityName: 'remote_exif_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(asset_id)'],
-      columns: [
-        _column_36,
-        _column_37,
-        _column_38,
-        _column_39,
-        _column_40,
-        _column_41,
-        _column_11,
-        _column_10,
-        _column_42,
-        _column_43,
-        _column_44,
-        _column_45,
-        _column_46,
-        _column_47,
-        _column_48,
-        _column_49,
-        _column_50,
-        _column_51,
-        _column_52,
-        _column_53,
-        _column_54,
-        _column_55,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape7 remoteAlbumAssetEntity = Shape7(
-    source: i0.VersionedTable(
-      entityName: 'remote_album_asset_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(asset_id, album_id)'],
-      columns: [_column_36, _column_60],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape10 remoteAlbumUserEntity = Shape10(
-    source: i0.VersionedTable(
-      entityName: 'remote_album_user_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(album_id, user_id)'],
-      columns: [_column_60, _column_25, _column_61],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape27 remoteAssetCloudIdEntity = Shape27(
-    source: i0.VersionedTable(
-      entityName: 'remote_asset_cloud_id_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(asset_id)'],
-      columns: [
-        _column_36,
-        _column_99,
-        _column_100,
-        _column_96,
-        _column_46,
-        _column_47,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape11 memoryEntity = Shape11(
-    source: i0.VersionedTable(
-      entityName: 'memory_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_0,
-        _column_9,
-        _column_5,
-        _column_18,
-        _column_15,
-        _column_8,
-        _column_62,
-        _column_63,
-        _column_64,
-        _column_65,
-        _column_66,
-        _column_67,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape12 memoryAssetEntity = Shape12(
-    source: i0.VersionedTable(
-      entityName: 'memory_asset_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(asset_id, memory_id)'],
-      columns: [_column_36, _column_68],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape14 personEntity = Shape14(
-    source: i0.VersionedTable(
-      entityName: 'person_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_0,
-        _column_9,
-        _column_5,
-        _column_15,
-        _column_1,
-        _column_69,
-        _column_71,
-        _column_72,
-        _column_73,
-        _column_74,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape15 assetFaceEntity = Shape15(
-    source: i0.VersionedTable(
-      entityName: 'asset_face_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_0,
-        _column_36,
-        _column_76,
-        _column_77,
-        _column_78,
-        _column_79,
-        _column_80,
-        _column_81,
-        _column_82,
-        _column_83,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape18 storeEntity = Shape18(
-    source: i0.VersionedTable(
-      entityName: 'store_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [_column_87, _column_88, _column_89],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape25 trashedLocalAssetEntity = Shape25(
-    source: i0.VersionedTable(
-      entityName: 'trashed_local_asset_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id, album_id)'],
-      columns: [
-        _column_1,
-        _column_8,
-        _column_9,
-        _column_5,
-        _column_10,
-        _column_11,
-        _column_12,
-        _column_0,
-        _column_95,
-        _column_22,
-        _column_14,
-        _column_23,
-        _column_97,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  final i1.Index idxLatLng = i1.Index(
-    'idx_lat_lng',
-    'CREATE INDEX IF NOT EXISTS idx_lat_lng ON remote_exif_entity (latitude, longitude)',
-  );
-  final i1.Index idxRemoteAssetCloudId = i1.Index(
-    'idx_remote_asset_cloud_id',
-    'CREATE INDEX IF NOT EXISTS idx_remote_asset_cloud_id ON remote_asset_cloud_id_entity (cloud_id)',
-  );
-  final i1.Index idxTrashedLocalAssetChecksum = i1.Index(
-    'idx_trashed_local_asset_checksum',
-    'CREATE INDEX IF NOT EXISTS idx_trashed_local_asset_checksum ON trashed_local_asset_entity (checksum)',
-  );
-  final i1.Index idxTrashedLocalAssetAlbum = i1.Index(
-    'idx_trashed_local_asset_album',
-    'CREATE INDEX IF NOT EXISTS idx_trashed_local_asset_album ON trashed_local_asset_entity (album_id)',
-  );
-}
-
 i0.MigrationStepWithVersion migrationSteps({
   required Future<void> Function(i1.Migrator m, Schema2 schema) from1To2,
   required Future<void> Function(i1.Migrator m, Schema3 schema) from2To3,
@@ -7874,7 +7425,6 @@ i0.MigrationStepWithVersion migrationSteps({
   required Future<void> Function(i1.Migrator m, Schema15 schema) from14To15,
   required Future<void> Function(i1.Migrator m, Schema16 schema) from15To16,
   required Future<void> Function(i1.Migrator m, Schema17 schema) from16To17,
-  required Future<void> Function(i1.Migrator m, Schema18 schema) from17To18,
 }) {
   return (currentVersion, database) async {
     switch (currentVersion) {
@@ -7958,11 +7508,6 @@ i0.MigrationStepWithVersion migrationSteps({
         final migrator = i1.Migrator(database, schema);
         await from16To17(migrator, schema);
         return 17;
-      case 17:
-        final schema = Schema18(database: database);
-        final migrator = i1.Migrator(database, schema);
-        await from17To18(migrator, schema);
-        return 18;
       default:
         throw ArgumentError.value('Unknown migration from $currentVersion');
     }
@@ -7986,7 +7531,6 @@ i1.OnUpgrade stepByStep({
   required Future<void> Function(i1.Migrator m, Schema15 schema) from14To15,
   required Future<void> Function(i1.Migrator m, Schema16 schema) from15To16,
   required Future<void> Function(i1.Migrator m, Schema17 schema) from16To17,
-  required Future<void> Function(i1.Migrator m, Schema18 schema) from17To18,
 }) => i0.VersionedSchema.stepByStepHelper(
   step: migrationSteps(
     from1To2: from1To2,
@@ -8005,6 +7549,5 @@ i1.OnUpgrade stepByStep({
     from14To15: from14To15,
     from15To16: from15To16,
     from16To17: from16To17,
-    from17To18: from17To18,
   ),
 );

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

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

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

@@ -75,8 +75,7 @@ class SplashScreenPageState extends ConsumerState<SplashScreenPage> {
                       _resumeBackup(backupProvider);
                     }),
                     _resumeBackup(backupProvider),
-                    // TODO: Bring back when the soft freeze issue is addressed
-                    // backgroundManager.syncCloudIds(),
+                    backgroundManager.syncCloudIds(),
                   ]);
                 } else {
                   await backgroundManager.hashAssets();