Version v1.64.0

* Remove toggle fullscreen button

* Implement custom video player controls

* Move Padding into Container

.github/workflows/docker.yml

@@ -42,10 +42,10 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2.1.0
+        uses: docker/setup-qemu-action@v2.2.0
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2.5.0
+        uses: docker/setup-buildx-action@v2.7.0
         # Workaround to fix error:
         # failed to push: failed to copy: io: read/write on closed pipe
         # See https://github.com/docker/build-push-action/issues/761
@@ -100,7 +100,7 @@ jobs:
           fi
 
       - name: Build and push image
-        uses: docker/build-push-action@v4.0.0
+        uses: docker/build-push-action@v4.1.1
         with:
           context: ${{ matrix.context }}
           platforms: ${{ matrix.platforms }}

.github/workflows/prepare-release.yml

@@ -34,6 +34,9 @@ jobs:
         with:
           token: ${{ secrets.ORG_RELEASE_TOKEN }}
 
+      - name: Install Poetry
+        run: pipx install poetry
+
       - name: Bump version
         run: misc/release/pump-version.sh -s "${{ inputs.serverBump }}" -m "${{ inputs.mobileBump }}"
 

.github/workflows/test.yml

@@ -167,13 +167,13 @@ jobs:
         run: npm --prefix server run typeorm:migrations:run
       - name: Generate new migrations
         continue-on-error: true
-        run: npm --prefix server run typeorm:migrations:generate ./libs/infra/src/migrations/TestMigration
+        run: npm --prefix server run typeorm:migrations:generate ./src/infra/migrations/TestMigration
       - name: Find file changes
         uses: tj-actions/verify-changed-files@v13.1
         id: verify-changed-files
         with:
           files: |
-            server/libs/infra/src/migrations/
+            server/src/infra/migrations/
       - name: Verify files have not changed
         if: steps.verify-changed-files.outputs.files_changed == 'true'
         run: |

README.md

@@ -19,6 +19,7 @@
 <br/>
 <p align="center">
   <a href="README_zh_CN.md">中文</a>
+  <a href="README_tr_TR.md">Türkçe</a>
 </p>
 
 ## Disclaimer
@@ -82,8 +83,9 @@ Spec: Free-tier Oracle VM - Amsterdam - 2.4Ghz quad-core ARM64 CPU, 24GB RAM
 | Public Sharing                               | No     | Yes |
 | Archive and Favorites                        | Yes    | Yes |
 | Global Map                                   | No     | Yes |
-| Partner Sharing                              | No     | Yes |
+| Partner Sharing                              | Yes    | Yes |
 | Facial recognition and clustering            | No     | Yes |
+| Offline support                              | Yes    | No  |
 
 # Support the project
 

README_tr_TR.md

@@ -0,0 +1,104 @@
+<p align="center"> 
+  <br/>  
+  <a href="https://opensource.org/licenses/MIT"><img src="https://img.shields.io/badge/license-MIT-green.svg?color=3F51B5&style=for-the-badge&label=License&logoColor=000000&labelColor=ececec" alt="License: MIT"></a>
+  <a href="https://discord.gg/D8JsnBEuKb">
+    <img src="https://img.shields.io/discord/979116623879368755.svg?label=Discord&logo=Discord&style=for-the-badge&logoColor=000000&labelColor=ececec" atl="Discord"/>
+  </a>
+  <br/>  
+  <br/>   
+</p>
+
+<p align="center">
+<img src="design/immich-logo.svg" width="150" title="Login With Custom URL">
+</p>
+<h3 align="center">Immich - Yüksek performanslı, kendine ait barındırılan fotoğraf ve video yedekleme çözümü</h3>
+<br/>
+<a href="https://immich.app">
+<img src="design/immich-screenshots.png" title="Main Screenshot">
+</a>
+<br/>
+<p align="center">
+  <a href="README.md">English</a>
+  <a href="README_zh_CN.md">中文</a>
+</p>
+
+## Feragatname
+
+- ⚠️ Proje **çok aktif** bir şekilde geliştirilmektedir.
+- ⚠️ Hatalar ve uygulama yapısını bozan değişiklikler olabilir.
+- ⚠️ **Uygulamayı, fotoğraflarınızı ve videolarınızı saklamanın tek yöntemi olarak kullanmayın!**
+
+## Content
+
+- [Resmi Belgeler](https://immich.app/docs)
+- [Yol Haritası](https://github.com/orgs/immich-app/projects/1)
+- [Demo](#demo)
+- [Özellikler](#özellikler)
+- [Giriş](https://immich.app/docs/overview/introduction)
+- [Kurulum](https://immich.app/docs/install/requirements)
+- [Katkı Sağlama Rehberi](https://immich.app/docs/overview/support-the-project)
+- [Projeyi Destekle](#projeyi-destekle)
+
+## Belgeler
+
+Kurulum dahil olmak üzere resmi belgeleri https://immich.app/ adresinde bulabilirsiniz.
+
+## Demo
+
+Web demo adresi: https://demo.immich.app
+
+Mobil uygulama için `Server Endpoint URL` olarak `https://demo.immich.app/api` adresini kullanabilirsiniz.
+
+```bash title="Demo Bilgileri"
+Giriş bilgileri:
+email: demo@immich.app
+password: demo
+```
+
+```
+Server Özellikleri: Free-tier Oracle VM - Amsterdam - 2.4Ghz quad-core ARM64 CPU, 24GB RAM
+```
+
+# Özellikler
+
+| Özellikler                                          | Mobile | Web  |
+| ----------------------------------------------------| ------ | ---  |
+| Videoları ve fotoğrafları yükleme ve görüntüleme    | Evet   | Evet |
+| Uygulama açıldığında otomatik yedekleme             | Evet   | N/A  |
+| Yedekleme için seçilebilir albüm(ler)               | Evet   | N/A  |
+| Fotoğrafları ve videoları yerel cihaza yükleme      | Evet   | Evet |
+| Çoklu kullanıcı desteği                             | Evet   | Evet |
+| Albüm ve paylaşılan albümler                        | Evet   | Evet |
+| Silinebilir/sürüklenebilir kaydırma çubuğu          | Evet   | Evet |
+| RAW (HEIC, HEIF, DNG, Apple ProRaw) format desteği  | Evet   | Evet |
+| Metadata'ya uygun görüntüleme (EXIF, map)           | Evet   | Evet |
+| Metadata, objects, faces ve CLIP'e göre arama       | Evet   | Evet |
+| Yönetimsel işlevler (kullanıcı yönetimi)            | Hayır  | Evet |
+| Arka planda yedekleme                               | Evet   | N/A  |
+| Sanal kaydırma                                      | Evet   | Evet |
+| OAuth desteği                                       | Evet   | Evet |
+| API anahtarları                                     | N/A    | Evet |
+| LivePhoto yedekleme ve oynatma                      | iOS    | Evet |
+| Kullanıcı tanımlı depolama yapısı                   | Evet   | Evet |
+| Herkese açık paylaşım                               | Hayır  | Evet |
+| Arşiv ve Favoriler                                  | Evet   | Evet |
+| Dünya haritası                                      | Hayır  | Evet |
+| Partner paylaşımı                                   | Evet   | Evet |
+| Yüz tanıma ve kümeleme                              | Hayır  | Evet |
+| Çevrimdışı destek                                   | Evet   | Hayır|
+
+# Projeyi Destekle
+
+Bu projeye bağlı kaldım ve durmayacağım. Belgeleri güncellemeye, yeni özellikler eklemeye ve hataları düzeltmeye devam edeceğim. Ancak bunu tek başıma yapamam. Bu yüzden devam etme konusunda bana motivasyon sağlamanız için yardımınıza ihtiyacım var.
+
+[selfhosted.show - In the episode 'The-organization-must-not-be-name is a Hostile Actor'](https://selfhosted.show/79?t=1418) bölümünde söylendiği üzere,bu projede takımımın ve benim projeye harcadağımız büyük bir çaba var. Bir gün bunu tam zamanlı olarak yapabilmeyi çok isterim. Bunu gerçekleştirebilmek için gerçekten sizlerin desteğine ihtiyacım var.
+
+Eğer bu size doğru bir amaç gibi geliyorsa ve uygulamanın uzun bir süre boyunca kullanacağınız bir şey olduğunu düşünüyorsanız, aşağıdaki bağlantılardan birini kullanarak bana destek olabilirsiniz.
+
+## Bağış
+
+- [Aylık bağış](https://github.com/sponsors/alextran1502) via GitHub Sponsors
+- [Bir seferlik bağış](https://github.com/sponsors/alextran1502?frequency=one-time&sponsor=alextran1502) via GitHub Sponsors
+- [Librepay](https://liberapay.com/alex.tran1502/)
+- [buymeacoffee](https://www.buymeacoffee.com/altran1502)
+- Bitcoin: 1FvEp6P6NM8EZEkpGUFAN2LqJ1gxusNxZX

README_zh_CN.md

@@ -23,6 +23,7 @@
 
 <p align="center">
   <a href="README.md">English</a>
+  <a href="README_tr_TR.md">Türkçe</a>
 </p>
 
 

docker/.env.test

@@ -10,12 +10,7 @@ REDIS_HOSTNAME=immich-redis-test
 # Upload File Config
 UPLOAD_LOCATION=./upload
 
-# MAPBOX
-## ENABLE_MAPBOX is either true of false -> if true, you have to provide MAPBOX_KEY
-ENABLE_MAPBOX=false
-
 # WEB
-MAPBOX_KEY=
 VITE_SERVER_ENDPOINT=http://localhost:2283/api
 
 TYPESENSE_ENABLED=false

docker/docker-compose.dev.yml

@@ -35,8 +35,7 @@ services:
     ports:
       - 3003:3003
     volumes:
-      - ../machine-learning/src:/usr/src/app
-      - ${UPLOAD_LOCATION}:/usr/src/app/upload
+      - ../machine-learning/app:/usr/src/app
       - model-cache:/cache
     env_file:
       - .env
@@ -95,7 +94,7 @@ services:
 
   typesense:
     container_name: immich_typesense
-    image: typesense/typesense:0.24.0
+    image: typesense/typesense:0.24.1@sha256:9bcff2b829f12074426ca044b56160ca9d777a0c488303469143dd9f8259d4dd
     environment:
       - TYPESENSE_API_KEY=${TYPESENSE_API_KEY}
       - TYPESENSE_DATA_DIR=/data
@@ -106,11 +105,11 @@ services:
 
   redis:
     container_name: immich_redis
-    image: redis:6.2
+    image: redis:6.2-alpine@sha256:70a7a5b641117670beae0d80658430853896b5ef269ccf00d1827427e3263fa3
 
   database:
     container_name: immich_postgres
-    image: postgres:14
+    image: postgres:14-alpine@sha256:28407a9961e76f2d285dc6991e8e48893503cc3836a4755bbc2d40bcc272a441
     env_file:
       - .env
     environment:
@@ -137,6 +136,7 @@ services:
       - 2283:8080
     depends_on:
       - immich-server
+      - immich-web
     restart: always
 
 volumes:

docker/docker-compose.test.yml

@@ -25,12 +25,12 @@ services:
       - immich-test-network
   immich-redis-test:
     container_name: immich-redis-test
-    image: redis:6.2
+    image: redis:6.2-alpine@sha256:70a7a5b641117670beae0d80658430853896b5ef269ccf00d1827427e3263fa3
     networks:
       - immich-test-network
   immich-database-test:
     container_name: immich-database-test
-    image: postgres:14
+    image: postgres:14-alpine@sha256:28407a9961e76f2d285dc6991e8e48893503cc3836a4755bbc2d40bcc272a441
     env_file:
       - .env.test
     environment:

docker/docker-compose.yml

@@ -4,7 +4,7 @@ services:
   immich-server:
     container_name: immich_server
     image: ghcr.io/immich-app/immich-server:${IMMICH_VERSION:-release}
-    command: ["start-server.sh"]
+    command: [ "start.sh", "immich" ]
     volumes:
       - ${UPLOAD_LOCATION}:/usr/src/app/upload
     env_file:
@@ -18,7 +18,7 @@ services:
   immich-microservices:
     container_name: immich_microservices
     image: ghcr.io/immich-app/immich-server:${IMMICH_VERSION:-release}
-    command: ["start-microservices.sh"]
+    command: [ "start.sh", "microservices" ]
     volumes:
       - ${UPLOAD_LOCATION}:/usr/src/app/upload
     env_file:
@@ -33,7 +33,6 @@ services:
     container_name: immich_machine_learning
     image: ghcr.io/immich-app/immich-machine-learning:${IMMICH_VERSION:-release}
     volumes:
-      - ${UPLOAD_LOCATION}:/usr/src/app/upload
       - model-cache:/cache
     env_file:
       - .env
@@ -48,7 +47,7 @@ services:
 
   typesense:
     container_name: immich_typesense
-    image: typesense/typesense:0.24.0
+    image: typesense/typesense:0.24.1@sha256:9bcff2b829f12074426ca044b56160ca9d777a0c488303469143dd9f8259d4dd
     environment:
       - TYPESENSE_API_KEY=${TYPESENSE_API_KEY}
       - TYPESENSE_DATA_DIR=/data
@@ -60,12 +59,12 @@ services:
 
   redis:
     container_name: immich_redis
-    image: redis:6.2
+    image: redis:6.2-alpine@sha256:70a7a5b641117670beae0d80658430853896b5ef269ccf00d1827427e3263fa3
     restart: always
 
   database:
     container_name: immich_postgres
-    image: postgres:14
+    image: postgres:14-alpine@sha256:28407a9961e76f2d285dc6991e8e48893503cc3836a4755bbc2d40bcc272a441
     env_file:
       - .env
     environment:
@@ -88,6 +87,7 @@ services:
       - 2283:8080
     depends_on:
       - immich-server
+      - immich-web
     restart: always
 
 volumes:

docker/example.env

@@ -52,11 +52,11 @@ TYPESENSE_API_KEY=some-random-text
 # TYPESENSE_URL uses base64 encoding for the nodes json.
 # Example JSON that was used:
 # [
-#      { 'host': 'typesense-1.example.net', 'port': '443', 'protocol': 'https' },
-#      { 'host': 'typesense-2.example.net', 'port': '443', 'protocol': 'https' },
-#      { 'host': 'typesense-3.example.net', 'port': '443', 'protocol': 'https' },
-#  ]
-# TYPESENSE_URL=ha://WwogICAgeyAnaG9zdCc6ICd0eXBlc2Vuc2UtMS5leGFtcGxlLm5ldCcsICdwb3J0JzogJzQ0MycsICdwcm90b2NvbCc6ICdodHRwcycgfSwKICAgIHsgJ2hvc3QnOiAndHlwZXNlbnNlLTIuZXhhbXBsZS5uZXQnLCAncG9ydCc6ICc0NDMnLCAncHJvdG9jb2wnOiAnaHR0cHMnIH0sCiAgICB7ICdob3N0JzogJ3R5cGVzZW5zZS0zLmV4YW1wbGUubmV0JywgJ3BvcnQnOiAnNDQzJywgJ3Byb3RvY29sJzogJ2h0dHBzJyB9LApd
+#      { "host": "typesense-1.example.net", "port": "443", "protocol": "https" },
+#      { "host": "typesense-2.example.net", "port": "443", "protocol": "https" },
+#      { "host": "typesense-3.example.net", "port": "443", "protocol": "https" },
+# ]
+# TYPESENSE_URL=ha://WwogIHsgImhvc3QiOiAidHlwZXNlbnNlLTEuZXhhbXBsZS5uZXQiLCAicG9ydCI6ICI0NDMiLCAicHJvdG9jb2wiOiAiaHR0cHMiIH0sCiAgeyAiaG9zdCI6ICJ0eXBlc2Vuc2UtMi5leGFtcGxlLm5ldCIsICJwb3J0IjogIjQ0MyIsICJwcm90b2NvbCI6ICJodHRwcyIgfSwKICB7ICJob3N0IjogInR5cGVzZW5zZS0zLmV4YW1wbGUubmV0IiwgInBvcnQiOiAiNDQzIiwgInByb3RvY29sIjogImh0dHBzIiB9Cl0=
 
 ###################################################################################
 # Reverse Geocoding
@@ -109,7 +109,7 @@ IMMICH_MACHINE_LEARNING_URL=http://immich-machine-learning:3003
 ###################################################################################
 # Immich Version - Optional
 #
-# This allows all immich docker images to be pinned to a specific version. By default, 
+# This allows all immich docker images to be pinned to a specific version. By default,
 # the version is "release" but could be a specific version, like "v1.59.0".
 ###################################################################################
 

docs/blog/2023/06-24/update.mdx

@@ -0,0 +1,105 @@
+---
+title: June 2023 update
+authors: [alextran]
+tags: [update]
+---
+
+Hello everybody, Alex here!
+
+I am back with another update on Immich. It has been only a month since my last update (May 18th, 2023), but it seems forever. I think the rapid releases of Immich and the amount of work make the perspective of time change in Immich’s world. We have some exciting updates that I think you will like.
+
+Before going into detail, on behalf of the core team, I would like to thank all of you for loving Immich and contributing to the project. Thank you for helping me make Immich an enjoyable alternative solution to Google Photos so that you have complete control of your data and privacy. I know we are still young and have a lot of work to do, but I am confident we will get there with help from the community. I appreciate all of you from the bottom of my heart!
+
+<!--truncate-->
+
+And now, to the exciting part, what is new in Immich’s world?
+
+- Initial support for existing gallery.
+- Memory feature.
+- Support XMP sidecar.
+- Support more raw formats.
+- Justified layout for web timeline and blurred thumbnail hash.
+- Mechanism to host machine learning on a completely different machine.
+
+## Support for existing gallery
+
+I know this is the most controversial feature when it comes to Immich’s way of ingesting photos and videos. For many users, having to upload photos and videos to Immich is simply not working. We listen, discuss, and digest this feature internally more than you imagine because it is not a simple feature to tackle while keeping the performance and the user experience at the top level, which is Immich’s primary goal.
+
+Thankfully, we have many great contributors and developers that want to make this come true. So we came up with an initial implementation of this feature in the form of a supporting read-only gallery.
+
+To be concise, Immich can now read in the gallery files, register the path into the database, and then generate necessary files and put them through Immich’s machine learning pipeline so you can use all the goodness of Immich without the need to upload them. Since this is the initial implementation, some actions/behavior are not yet supported, and we aim to build toward them in future releases, namely:
+
+- Assets are not automatically synced and must instead be manually synced with the CLI tool.
+- Only new files that are added to the gallery will be detected.
+- Deleted and moved files will not be detected.
+
+You can find more information on how to use the feature by reading the documentation [here](/docs/features/read-only-gallery).
+
+## Memory feature
+
+This is considered a fun feature that the team and I wanted to build for so long, but we had to put it off because of the refactoring of the code base. The code base is now in a good enough form to circle back and add more exciting features.
+
+This memory feature is very much similar to GPhotos' implementation of “x years since…”. We are aiming to add more categories of memories in the future, such as “Spotlight of the day” or “Day of the Week highlights”
+
+<iframe
+  width="560"
+  height="315"
+  src="https://www.youtube.com/embed/j5XZKvViPew"
+  title="YouTube video player"
+  frameborder="0"
+  allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share"
+  allowfullscreen
+></iframe>
+
+This feature is now available on the web and will be ported to the mobile app in the near future.
+
+## Support XMP Sidecar
+
+Immich can now import/upload XMP sidecars from the CLI and use the information as the metadata of assets.
+
+## Support more raw formats.
+
+With the recent updates on the dependencies of Immich, we are now extending and hardening support for multiple raw formats. So users with DSLR or mirrorless cameras can now upload their original files to Immich and have them displayed in high-quality thumbnails on the web and mobile view.
+
+## Justified layout for web timeline and blurred thumbnail hash
+
+This is an aesthetic improvement in user experience when browsing the timeline. Photos and videos are now displayed correctly with perspective orientation, making the browsing experience more pleasurable.
+
+To further improve the browsing experience, we now added a blur hash to the thumbnail, so the transition is more natural with a dreamy fade in effect, similar to how our brain goes from faded to vivid memory
+
+<iframe
+  width="560"
+  height="315"
+  src="https://www.youtube.com/embed/b95FLmGHRFc"
+  title="YouTube video player"
+  frameborder="0"
+  allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share"
+  allowfullscreen
+></iframe>
+
+## Hosting machine learning container on a different machine
+
+With more capabilities Immich is building toward, machine learning will get more powerful and therefore require more resources to run effectively. However, we understand that users might not have the best server resources where they host the Immich instance. Therefore, we changed how machine learning interacts and receives the photos and videos to run through its inference pipeline.
+
+The machine learning container is now a headless system that can run on any machine. As long as your Immich instance can communicate with the system running the machine learning container, it can send the files and receive the required information to make Immich powerful in terms of searching and intelligence. This helps you to utilize a more powerful machine in your home/infrastructure to perform the CPU-intensive tasks while letting Immich only handle the I/O operations for a pleasant and smooth experience.
+
+---
+
+So, those are the highlights for the team and the community after a busy month. There are a lot more changes and improvements. I encourage you to read some release notes, starting from version [v1.57.0](https://github.com/immich-app/immich/releases/tag/v1.57.0) to now.
+
+Thank you, and I am asking for your support for the project. I hope to be a full-time maintainer of Immich one day to dedicate myself to the project as my life works for the community and my family. You can find the support channels below:
+
+- Monthly donation via [GitHub Sponsors](https://github.com/sponsors/alextran1502)
+- One-time donation via [GitHub Sponsors](https://github.com/sponsors/alextran1502?frequency=one-time&sponsor=alextran1502)
+- [Liberapay](https://liberapay.com/alex.tran1502/)
+- [buymeacoffee](https://www.buymeacoffee.com/altran1502)
+- Bitcoin: 1FvEp6P6NM8EZEkpGUFAN2LqJ1gxusNxZX
+- Give a project a star - the contributors love gazing at the stars and seeing their creations shining in the sky.
+
+Join our friendly [Discord](https://discord.gg/D8JsnBEuKb) to talk and discuss Immich, tech, or anything
+
+Cheer!
+
+Until next time!
+
+Alex

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

@@ -13,9 +13,17 @@ docker exec -t immich_postgres pg_dumpall -c -U postgres | gzip > "/path/to/back
 ```
 
 ```bash title='Restore'
-gunzip < /path/to/backup/dump.sql.gz | docker exec -i immich_postgres psql -U postgres -d immich
+docker-compose down -v  # CAUTION! Deletes all Immich data to start from scratch.
+docker-compose pull     # Update to latest version of Immich (if desired)
+docker-compose create   # Create Docker containers for Immich apps without running them.
+docker start immich_postgres    # Start Postgres server
+sleep 10    # Wait for Postgres server to start up
+gunzip < "/path/to/backup/dump.sql.gz" | docker exec -i immich_postgres psql -U postgres -d immich    # Restore Backup
+docker-compose up -d    # Start remainder of Immich apps
 ```
 
+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.).
+
 The database dumps can also be automated (using [this image](https://github.com/prodrigestivill/docker-postgres-backup-local)) by editing the docker compose file to match the following:
 
 ```yaml

docs/docs/developer/database-migrations.md

@@ -1,14 +1,14 @@
 # Database Migrations
 
-After making any changes in the `server/libs/database/src/entities`, a database migration need to run in order to register the changes in the database. Follow the steps below to create a new migration.
+After making any changes in the `server/src/infra/database/entities`, a database migration need to run in order to register the changes in the database. Follow the steps below to create a new migration.
 
 1. Run the command
 
 ```bash
-npm run typeorm:migrations:generate ./libs/infra/src/<migration-name>
+npm run typeorm:migrations:generate ./src/infra/<migration-name>
 ```
 
 2. Check if the migration file makes sense.
-3. Move the migration file to folder `server/libs/database/src/migrations` in your code editor.
+3. Move the migration file to folder `./src/infra/database/migrations` in your code editor.
 
 The server will automatically detect `*.ts` file changes and restart. Part of the server start-up process includes running any new migrations, so it will be applied immediately.

docs/docs/developer/pr-checklist.md

@@ -30,4 +30,4 @@ The Open API client libraries need to be regenerated whenever there are changes
 
 ## Database Migrations
 
-A database migration needs to be generated whenever there are changes to `server/libs/infra/src/entities`. See [Database Migration](/docs/developer/database-migrations.md) for more details.
+A database migration needs to be generated whenever there are changes to `server/src/infra/src/entities`. See [Database Migration](/docs/developer/database-migrations.md) for more details.

docs/docs/developer/setup.md

@@ -10,9 +10,9 @@ sidebar_position: 2
 
 This environment includes the following services:
 
-- Core server - `/server/apps/immich`
+- Core server - `/server/src/immich`
 - Machine learning - `/machine-learning`
-- Microservices - `/server/apps/microservicess`
+- Microservices - `/server/src/microservicess`
 - Web app - `/web`
 - Redis
 - PostgreSQL development database with exposed port `5432` so you can use any database client to acess it

docs/docs/features/bulk-upload.md

@@ -42,6 +42,7 @@ immich upload --key HFEJ38DNSDUEG --server http://192.168.1.216:2283/api --recur
 | --server / -s    | Immich's server address                                             |
 | --threads / -t   | Number of threads to use (Default 5)                                |
 | --album/ -al     | Create albums for assets based on the parent folder or a given name |
+| --import/ -i     | Import gallery                                                      |
 
 ### Obtain the API Key
 
@@ -76,10 +77,10 @@ If you are running the CLI container on the same machine as your Immich server,
 
 1. Find the internal Docker network used by Immich via `docker network ls`.
 2. Adapt the above command to pass the `--network <immich_network>` argument to `docker run`, substituting `<immich_network>` with the result from step 1.
-3. Use `--server http://immich-server:3001/` for the upload command instead of the external address.
+3. Use `--server http://immich-server:3001` for the upload command instead of the external address.
 
 ```bash title="Upload to internal address"
-docker run --network immich_default -it --rm -v "$(pwd):/import" ghcr.io/immich-app/immich-cli:latest upload --key HFEJ38DNSDUEG --server http://immich-server:3001/
+docker run --network immich_default -it --rm -v "$(pwd):/import" ghcr.io/immich-app/immich-cli:latest upload --key HFEJ38DNSDUEG --server http://immich-server:3001
 ```
 
 :::

docs/docs/features/read-only-gallery.md

@@ -0,0 +1,103 @@
+# Read-only Gallery [Experimental]
+
+## Overview
+
+This feature enables users to use an existing gallery without uploading the assets to Immich.
+
+Upon syncing the file information, it will be read by Immich to generate supported files.
+
+:::caution
+
+This feature is still in an experimental stage. And this is an initial implementation and will receive improvements in the future.
+
+The current limitations of this feature are:
+
+- Assets are not automatically synced and must instead be manually synced with the CLI tool.
+- Only new files that are added to the gallery will be detected.
+- Deleted and moved files will not be detected.
+
+:::
+
+## Usage
+
+:::tip Example scenario
+
+On the VM/system that Immich is running, I have 2 galleries that I want to use with Immich.
+
+- My gallery is stored at `/mnt/media/precious-memory`
+- My wife's gallery is stored at `/mnt/media/childhood-memory`
+
+We will use those values in the steps below.
+
+:::
+
+### Mount the gallery to the containers.
+
+`immich-server` and `immich-microservices` containers will need access to the gallery. Mount the directory path as in the example below
+
+```diff title="docker-compose.yml"
+  immich-server:
+    container_name: immich_server
+    image: ghcr.io/immich-app/immich-server:${IMMICH_VERSION:-release}
+    command: [ "start.sh", "immich" ]
+    volumes:
+      - ${UPLOAD_LOCATION}:/usr/src/app/upload
++     - /mnt/media/precious-memory:/mnt/media/precious-memory
++     - /mnt/media/childhood-memory:/mnt/media/childhood-memory
+    env_file:
+      - .env
+    depends_on:
+      - redis
+      - database
+      - typesense
+    restart: always
+
+  immich-microservices:
+    container_name: immich_microservices
+    image: ghcr.io/immich-app/immich-server:${IMMICH_VERSION:-release}
+    command: [ "start.sh", "microservices" ]
+    volumes:
+      - ${UPLOAD_LOCATION}:/usr/src/app/upload
++     - /mnt/media/precious-memory:/mnt/media/precious-memory
++     - /mnt/media/childhood-memory:/mnt/media/childhood-memory
+    env_file:
+      - .env
+    depends_on:
+      - redis
+      - database
+      - typesense
+    restart: always
+```
+
+:::tip
+Internal and external path have to be identical.
+:::
+
+_Remember to bring the container down/up to register the changes. Make sure you can see the mounted path in the container._
+
+### Register the path for the user.
+
+This action is done by the admin of the instance.
+
+- Navigate to `Administration > Users` page on the web.
+- Click on the user edit button.
+- Add the gallery path to the `External Path` field for the corresponding user and confirm the changes.
+
+<img src={require('./img/me.png').default} width='33%' title='My Account Storage Path' />
+
+<img src={require('./img/my-wife.png').default} width='33%' title='My Wifes Account Storage Path' />
+
+### Sync with the CLI tool.
+
+- Install or update the [CLI Tool](/docs/features/bulk-upload.md). The import feature is supported from version `v0.39.0` of the CLI
+- Run the command below to sync the gallery with Immich.
+
+```bash title="Import my gallery"
+immich upload --key <my-api-key> --server http://my-server-ip:2283/api /mnt/media/precious-memory --recursive --import
+```
+
+```bash title="Import my wife gallery"
+immich upload --key <my-wife-api-key> --server http://my-server-ip:2283/api /mnt/media/childhood-memory --recursive --import
+```
+
+The `--import` flag will tell Immich to import the files by path instead of uploading them.

docs/docs/features/xmp-sidecars.md

@@ -4,7 +4,7 @@ Immich can ingest XMP sidecars on file upload (via the CLI) as well as detect ne
 
 <img src={require('./img/xmp-sidecars.png').default} title='XMP sidecars' />
 
-XMP sidecars are external XML files that contain metadata related to media files. Many applications read and write these files either exclusively or in addition to the metadata written to image files. They can be a powerful tool for editing and storing metadata of a media file without modifying the mdia file itself. When Immich receives or detects an XMP sidecar for a media file, it will attempt to extract the metadata from both the sidecar as well as the media file. It will prioritize the metadata for fields in the sidecar but will fall back and use the metadata in the media file if necessary.
+XMP sidecars are external XML files that contain metadata related to media files. Many applications read and write these files either exclusively or in addition to the metadata written to image files. They can be a powerful tool for editing and storing metadata of a media file without modifying the media file itself. When Immich receives or detects an XMP sidecar for a media file, it will attempt to extract the metadata from both the sidecar as well as the media file. It will prioritize the metadata for fields in the sidecar but will fall back and use the metadata in the media file if necessary.
 
 When importing files via the CLI bulk uploader, Immich will automatically detect XMP sidecar files as files that exist next to the original media file and have the exact same name with an additional `.xmp` file extension (i.e., `PXL_20230401_203352928.MP.jpg` and `PXL_20230401_203352928.MP.jpg.xmp`).
 

docs/docs/install/environment-variables.md

@@ -0,0 +1,186 @@
+# Environment Variables
+
+## Docker Compose
+
+| Variable          | Description           |  Default  | Services                                                       |
+| :---------------- | :-------------------- | :-------: | :------------------------------------------------------------- |
+| `IMMICH_VERSION`  | Image tags            | `release` | server, microservices, machine learning, web, proxy, typesense |
+| `UPLOAD_LOCATION` | Host Path for uploads |           | server, microservices                                          |
+
+:::tip
+
+These environment variables are used by the `docker-compose.yml` file and do **NOT** affect the containers directly.
+
+:::
+
+## General
+
+| Variable                    | Description                                  |   Default    | Services                                     |
+| :-------------------------- | :------------------------------------------- | :----------: | :------------------------------------------- |
+| `TZ`                        | Timezone                                     |              | microservices                                |
+| `NODE_ENV`                  | Environment (production, development)        | `production` | server, microservices, machine learning, web |
+| `LOG_LEVEL`                 | Log Level (verbose, debug, log, warn, error) |    `log`     | server, microservices                        |
+| `IMMICH_MEDIA_LOCATION`     | Media Location                               |  `./upload`  | server, microservices                        |
+| `PUBLIC_LOGIN_PAGE_MESSAGE` | Public Login Page Message                    |              | web                                          |
+
+:::tip
+
+`TZ` is only used by the `exiftool` as a fallback in case the timezone cannot be determined from the image metadata.
+
+`exiftool` is only present in the microservices container.
+
+:::
+
+## Geocoding
+
+| Variable                           | Description                         |           Default            | Services      |
+| :--------------------------------- | :---------------------------------- | :--------------------------: | :------------ |
+| `DISABLE_REVERSE_GEOCODING`        | Disable Reverse Geocoding Precision |           `false`            | microservices |
+| `REVERSE_GEOCODING_PRECISION`      | Reverse Geocoding Precision         |             `3`              | microservices |
+| `REVERSE_GEOCODING_DUMP_DIRECTORY` | Reverse Geocoding Dump Directory    | `./.reverse-geocoding-dump/` | microservices |
+
+## Ports
+
+| Variable                | Description           | Default | Services         |
+| :---------------------- | :-------------------- | :-----: | :--------------- |
+| `PORT`                  | Web Port              | `3000`  | web              |
+| `SERVER_PORT`           | Server Port           | `3001`  | server           |
+| `MICROSERVICES_PORT`    | Microservices Port    | `3002`  | microservices    |
+| `MACHINE_LEARNING_PORT` | Machine Learning Port | `3003`  | machine learning |
+
+## URLs
+
+| Variable                      | Description                                              |                Default                | Services              |
+| :---------------------------- | :------------------------------------------------------- | :-----------------------------------: | :-------------------- |
+| `IMMICH_WEB_URL`              | Immich Web URL                                           |       `http://immich-web:3000`        | proxy                 |
+| `IMMICH_SERVER_URL`           | Immich Server URL                                        |      `http://immich-server:3001`      | web, proxy            |
+| `IMMICH_MACHINE_LEARNING_URL` | Immich Machine Learning URL, set `"false"` to disable ML | `http://immich-machine-learning:3003` | server, microservices |
+| `PUBLIC_IMMICH_SERVER_URL`    | Public Immich URL                                        |      `http://immich-server:3001`      | web                   |
+| `IMMICH_API_URL_EXTERNAL`     | Immich API URL External                                  |                `/api`                 | web                   |
+
+:::info
+
+The above paths are modifying the internal paths of the containers.
+
+:::
+
+## Database
+
+| Variable      | Description       |   Default   | Services              |
+| :------------ | :---------------- | :---------: | :-------------------- |
+| `DB_URL`      | Database URL      |             | server, microservices |
+| `DB_HOSTNAME` | Database Host     | `localhost` | server, microservices |
+| `DB_PORT`     | Database Port     |   `5432`    | server, microservices |
+| `DB_USERNAME` | Database User     | `postgres`  | server, microservices |
+| `DB_PASSWORD` | Database Password | `postgres`  | server, microservices |
+| `DB_DATABASE` | Database Name     |  `immich`   | server, microservices |
+
+:::info
+
+When `DB_URL` is defined, the other database (`DB_*`) variables are ignored.
+
+:::
+
+## Redis
+
+| Variable         | Description    |    Default     | Services              |
+| :--------------- | :------------- | :------------: | :-------------------- |
+| `REDIS_URL`      | Redis URL      |                | server, microservices |
+| `REDIS_HOSTNAME` | Redis Host     | `immich_redis` | server, microservices |
+| `REDIS_PORT`     | Redis Port     |     `6379`     | server, microservices |
+| `REDIS_DBINDEX`  | Redis DB Index |      `0`       | server, microservices |
+| `REDIS_USERNAME` | Redis Username |                | server, microservices |
+| `REDIS_PASSWORD` | Redis Password |                | server, microservices |
+| `REDIS_SOCKET`   | Redis Socket   |                | server, microservices |
+
+:::info
+
+`REDIS_URL` must start with `ioredis://` and then include a `base64` encoded JSON string for the configuration.
+More info can be found in the upstream [ioredis](https://ioredis.readthedocs.io/en/latest/API/) documentation.
+
+- When `REDIS_URL` is defined, the other redis (`REDIS_*`) variables are ignored.
+- When `REDIS_SOCKET` is defined, the other redis (`REDIS_*`) variables are ignored.
+
+:::
+
+Redis (Sentinel) URL example JSON before encoding:
+
+```json
+{
+  "sentinels": [
+    {
+      "host": "redis-sentinel-node-0",
+      "port": 26379
+    },
+    {
+      "host": "redis-sentinel-node-1",
+      "port": 26379
+    },
+    {
+      "host": "redis-sentinel-node-2",
+      "port": 26379
+    }
+  ],
+  "name": "redis-sentinel"
+}
+```
+
+## Typesense
+
+| Variable             | Description              |   Default   | Services                         |
+| :------------------- | :----------------------- | :---------: | :------------------------------- |
+| `TYPESENSE_ENABLED`  | Enable Typesense         |             | server, microservices            |
+| `TYPESENSE_URL`      | Typesense URL            |             | server, microservices            |
+| `TYPESENSE_HOST`     | Typesense Host           | `typesense` | server, microservices            |
+| `TYPESENSE_PORT`     | Typesense Port           |   `8108`    | server, microservices            |
+| `TYPESENSE_PROTOCOL` | Typesense Protocol       |   `http`    | server, microservices            |
+| `TYPESENSE_API_KEY`  | Typesense API Key        |             | server, microservices, typesense |
+| `TYPESENSE_DATA_DIR` | Typesense Data Directory |   `/data`   | typesense                        |
+
+:::info
+
+`TYPESENSE_URL` must start with `ha://` and then include a `base64` encoded JSON string for the configuration.
+
+`TYPESENSE_ENABLED`: Anything other than `false`, behaves as `true`.
+Even undefined is treated as `true`.
+
+- When `TYPESENSE_URL` is defined, the other typesense (`TYPESENSE_*`) variables are ignored.
+
+:::
+
+Typesense URL example JSON before encoding:
+
+```json
+[
+  {
+    "host": "typesense-1.example.net",
+    "port": "443",
+    "protocol": "https"
+  },
+  {
+    "host": "typesense-2.example.net",
+    "port": "443",
+    "protocol": "https"
+  },
+  {
+    "host": "typesense-3.example.net",
+    "port": "443",
+    "protocol": "https"
+  }
+]
+```
+
+## Machine Learning
+
+| Variable                                    | Description                    |        Default        | Services         |
+| :------------------------------------------ | :----------------------------- | :-------------------: | :--------------- |
+| `MACHINE_LEARNING_MIN_FACE_SCORE`           | Minimum Face Score             |         `0.7`         | machine learning |
+| `MACHINE_LEARNING_MODEL_TTL`                | Model TTL                      |         `300`         | machine learning |
+| `MACHINE_LEARNING_EAGER_STARTUP`            | Eager Startup                  |        `true`         | machine learning |
+| `MACHINE_LEARNING_MIN_TAG_SCORE`            | Minimum Tag Score              |         `0.9`         | machine learning |
+| `MACHINE_LEARNING_FACIAL_RECOGNITION_MODEL` | Facial Recognition Model       |      `buffalo_l`      | machine learning |
+| `MACHINE_LEARNING_CLIP_TEXT_MODEL`          | Clip Text Model                |    `clip-ViT-B-32`    | machine learning |
+| `MACHINE_LEARNING_CLIP_IMAGE_MODEL`         | Clip Image Model               |    `clip-ViT-B-32`    | machine learning |
+| `MACHINE_LEARNING_CLASSIFICATION_MODEL`     | Classification Model           | `microsoft/resnet-50` | machine learning |
+| `MACHINE_LEARNING_CACHE_FOLDER`             | ML Cache Location              |       `/cache`        | machine learning |
+| `TRANSFORMERS_CACHE`                        | ML Transformers Cache Location |       `/cache`        | machine learning |

docs/docusaurus.config.js

@@ -105,6 +105,11 @@ const config = {
             position: 'right',
             label: 'API',
           },
+          {
+            to: '/blog',
+            position: 'right',
+            label: 'Blog',
+          },
           {
             href: 'https://github.com/immich-app/immich',
             label: 'GitHub',

docs/package.json

@@ -35,7 +35,7 @@
     "@docusaurus/module-type-aliases": "2.1.0",
     "@tsconfig/docusaurus": "^1.0.5",
     "prettier": "^2.8.8",
-    "typescript": "^4.7.4"
+    "typescript": "^5.0.0"
   },
   "browserslist": {
     "production": [

machine-learning/Dockerfile

@@ -1,29 +1,28 @@
-FROM python:3.10 as builder
+FROM python:3.11.4-bullseye@sha256:5b401676aff858495a5c9c726c60b8b73fe52833e9e16eccdb59e93d52741727 as builder
 
 ENV PYTHONDONTWRITEBYTECODE=1 \
   PYTHONUNBUFFERED=1 \
   PIP_NO_CACHE_DIR=true
 
+RUN pip install --upgrade pip && pip install poetry
+RUN poetry config installer.max-workers 10 && \
+  poetry config virtualenvs.create false
 RUN python -m venv /opt/venv
-RUN /opt/venv/bin/pip install torch --index-url https://download.pytorch.org/whl/cpu
-RUN /opt/venv/bin/pip install transformers tqdm numpy scikit-learn scipy nltk sentencepiece fastapi Pillow uvicorn[standard]
-RUN /opt/venv/bin/pip install --no-deps sentence-transformers
-# Facial Recognition Stuff
-RUN /opt/venv/bin/pip install insightface onnxruntime
+ENV VIRTUAL_ENV="/opt/venv" PATH="/opt/venv/bin:${PATH}"
 
-FROM python:3.10-slim
+COPY poetry.lock pyproject.toml ./
+RUN poetry install --sync --no-interaction --no-ansi --no-root --only main
 
-ENV NODE_ENV=production
-
-COPY --from=builder /opt/venv /opt/venv
-
-ENV TRANSFORMERS_CACHE=/cache \
-  PYTHONDONTWRITEBYTECODE=1 \
-  PYTHONUNBUFFERED=1 \
-  PATH="/opt/venv/bin:$PATH"
+FROM python:3.11.4-slim-bullseye@sha256:91d194f58f50594cda71dcd2e8fdefd90e7ecc57d07823813b67c8521e565dcd
 
 WORKDIR /usr/src/app
+ENV NODE_ENV=production \
+  TRANSFORMERS_CACHE=/cache \
+  PYTHONDONTWRITEBYTECODE=1 \
+  PYTHONUNBUFFERED=1 \
+  PATH="/opt/venv/bin:$PATH" \
+  PYTHONPATH=/usr/src
 
-COPY . .
-ENV PYTHONPATH=`pwd`
-CMD ["python", "src/main.py"]
+COPY --from=builder /opt/venv /opt/venv
+COPY app .
+ENTRYPOINT ["python", "-m", "app.main"]

machine-learning/README.md

@@ -1,5 +1,22 @@
-
 # Immich Machine Learning
 
-- Object Detection
-- Image Classification
+- Image classification
+- CLIP embeddings
+- Facial recognition
+
+# Setup
+
+This project uses [Poetry](https://python-poetry.org/docs/#installation), so be sure to install it first.
+Running `poetry install --no-root --with dev` will install everything you need in an isolated virtual environment.
+
+To add or remove dependencies, you can use the commands `poetry add $PACKAGE_NAME` and `poetry remove $PACKAGE_NAME`, respectively.
+Be sure to commit the `poetry.lock` and `pyproject.toml` files to reflect any changes in dependencies.
+
+
+# Load Testing
+
+To measure inference throughput and latency, you can use [Locust](https://locust.io/) using the provided `locustfile.py`.
+Locust works by querying the model endpoints and aggregating their statistics, meaning the app must be deployed.
+You can run `load_test.sh` to automatically deploy the app locally and start Locust, optionally adjusting its env variables as needed.
+
+Alternatively, for more custom testing, you may also run `locust` directly: see the [documentation](https://docs.locust.io/en/stable/index.html). Note that in Locust's jargon, concurrency is measured in `users`, and each user runs one task at a time. To achieve a particular per-endpoint concurrency, multiply that number by the number of endpoints to be queried. For example, if there are 3 endpoints and you want each of them to receive 8 requests at a time, you should set the number of users to 24.

machine-learning/app/config.py

@@ -0,0 +1,31 @@
+from pathlib import Path
+
+from pydantic import BaseSettings
+
+from .schemas import ModelType
+
+
+class Settings(BaseSettings):
+    cache_folder: str = "/cache"
+    classification_model: str = "microsoft/resnet-50"
+    clip_image_model: str = "clip-ViT-B-32"
+    clip_text_model: str = "clip-ViT-B-32"
+    facial_recognition_model: str = "buffalo_l"
+    min_tag_score: float = 0.9
+    eager_startup: bool = True
+    model_ttl: int = 300
+    host: str = "0.0.0.0"
+    port: int = 3003
+    workers: int = 1
+    min_face_score: float = 0.7
+
+    class Config(BaseSettings.Config):
+        env_prefix = "MACHINE_LEARNING_"
+        case_sensitive = False
+
+
+def get_cache_dir(model_name: str, model_type: ModelType) -> Path:
+    return Path(settings.cache_folder, model_type.value, model_name)
+
+
+settings = Settings()

machine-learning/app/main.py

@@ -0,0 +1,133 @@
+import os
+from io import BytesIO
+from typing import Any
+
+import cv2
+import numpy as np
+import uvicorn
+from fastapi import Body, Depends, FastAPI
+from PIL import Image
+
+from .config import settings
+from .models.base import InferenceModel
+from .models.cache import ModelCache
+from .schemas import (
+    EmbeddingResponse,
+    FaceResponse,
+    MessageResponse,
+    ModelType,
+    TagResponse,
+    TextModelRequest,
+    TextResponse,
+)
+
+app = FastAPI()
+
+
+@app.on_event("startup")
+async def startup_event() -> None:
+    app.state.model_cache = ModelCache(ttl=settings.model_ttl, revalidate=True)
+    same_clip = settings.clip_image_model == settings.clip_text_model
+    app.state.clip_vision_type = ModelType.CLIP if same_clip else ModelType.CLIP_VISION
+    app.state.clip_text_type = ModelType.CLIP if same_clip else ModelType.CLIP_TEXT
+    models = [
+        (settings.classification_model, ModelType.IMAGE_CLASSIFICATION),
+        (settings.clip_image_model, app.state.clip_vision_type),
+        (settings.clip_text_model, app.state.clip_text_type),
+        (settings.facial_recognition_model, ModelType.FACIAL_RECOGNITION),
+    ]
+
+    # Get all models
+    for model_name, model_type in models:
+        if settings.eager_startup:
+            await app.state.model_cache.get(model_name, model_type)
+        else:
+            InferenceModel.from_model_type(model_type, model_name)
+
+
+def dep_pil_image(byte_image: bytes = Body(...)) -> Image.Image:
+    return Image.open(BytesIO(byte_image))
+
+
+def dep_cv_image(byte_image: bytes = Body(...)) -> cv2.Mat:
+    byte_image_np = np.frombuffer(byte_image, np.uint8)
+    return cv2.imdecode(byte_image_np, cv2.IMREAD_COLOR)
+
+
+@app.get("/", response_model=MessageResponse)
+async def root() -> dict[str, str]:
+    return {"message": "Immich ML"}
+
+
+@app.get("/ping", response_model=TextResponse)
+def ping() -> str:
+    return "pong"
+
+
+@app.post(
+    "/image-classifier/tag-image",
+    response_model=TagResponse,
+    status_code=200,
+)
+async def image_classification(
+    image: Image.Image = Depends(dep_pil_image),
+) -> list[str]:
+    model = await app.state.model_cache.get(
+        settings.classification_model, ModelType.IMAGE_CLASSIFICATION
+    )
+    labels = model.predict(image)
+    return labels
+
+
+@app.post(
+    "/sentence-transformer/encode-image",
+    response_model=EmbeddingResponse,
+    status_code=200,
+)
+async def clip_encode_image(
+    image: Image.Image = Depends(dep_pil_image),
+) -> list[float]:
+    model = await app.state.model_cache.get(
+        settings.clip_image_model, app.state.clip_vision_type
+    )
+    embedding = model.predict(image)
+    return embedding
+
+
+@app.post(
+    "/sentence-transformer/encode-text",
+    response_model=EmbeddingResponse,
+    status_code=200,
+)
+async def clip_encode_text(payload: TextModelRequest) -> list[float]:
+    model = await app.state.model_cache.get(
+        settings.clip_text_model, app.state.clip_text_type
+    )
+    embedding = model.predict(payload.text)
+    return embedding
+
+
+@app.post(
+    "/facial-recognition/detect-faces",
+    response_model=FaceResponse,
+    status_code=200,
+)
+async def facial_recognition(
+    image: cv2.Mat = Depends(dep_cv_image),
+) -> list[dict[str, Any]]:
+    model = await app.state.model_cache.get(
+        settings.facial_recognition_model, ModelType.FACIAL_RECOGNITION
+    )
+    faces = model.predict(image)
+    return faces
+
+
+if __name__ == "__main__":
+    is_dev = os.getenv("NODE_ENV") == "development"
+    uvicorn.run(
+        "app.main:app",
+        host=settings.host,
+        port=settings.port,
+        reload=is_dev,
+        workers=settings.workers,
+    )

machine-learning/app/models/__init__.py

@@ -0,0 +1,3 @@
+from .clip import CLIPSTTextEncoder, CLIPSTVisionEncoder
+from .facial_recognition import FaceRecognizer
+from .image_classification import ImageClassifier

machine-learning/app/models/base.py

@@ -0,0 +1,52 @@
+from __future__ import annotations
+
+from abc import abstractmethod, ABC
+from pathlib import Path
+from typing import Any
+
+from ..config import get_cache_dir
+from ..schemas import ModelType
+
+
+class InferenceModel(ABC):
+    _model_type: ModelType
+
+    def __init__(
+        self,
+        model_name: str,
+        cache_dir: Path | None = None,
+    ):
+        self.model_name = model_name
+        self._cache_dir = (
+            cache_dir
+            if cache_dir is not None
+            else get_cache_dir(model_name, self.model_type)
+        )
+
+    @abstractmethod
+    def predict(self, inputs: Any) -> Any:
+        ...
+
+    @property
+    def model_type(self) -> ModelType:
+        return self._model_type
+
+    @property
+    def cache_dir(self) -> Path:
+        return self._cache_dir
+
+    @cache_dir.setter
+    def cache_dir(self, cache_dir: Path):
+        self._cache_dir = cache_dir
+
+    @classmethod
+    def from_model_type(
+        cls, model_type: ModelType, model_name, **model_kwargs
+    ) -> InferenceModel:
+        subclasses = {
+            subclass._model_type: subclass for subclass in cls.__subclasses__()
+        }
+        if model_type not in subclasses:
+            raise ValueError(f"Unsupported model type: {model_type}")
+
+        return subclasses[model_type](model_name, **model_kwargs)

machine-learning/app/models/cache.py

@@ -0,0 +1,92 @@
+import asyncio
+
+from aiocache.backends.memory import SimpleMemoryCache
+from aiocache.lock import OptimisticLock
+from aiocache.plugins import BasePlugin, TimingPlugin
+
+from ..schemas import ModelType
+from .base import InferenceModel
+
+
+class ModelCache:
+    """Fetches a model from an in-memory cache, instantiating it if it's missing."""
+
+    def __init__(
+        self,
+        ttl: float | None = None,
+        revalidate: bool = False,
+        timeout: int | None = None,
+        profiling: bool = False,
+    ):
+        """
+        Args:
+            ttl: Unloads model after this duration. Disabled if None. Defaults to None.
+            revalidate: Resets TTL on cache hit. Useful to keep models in memory while active. Defaults to False.
+            timeout: Maximum allowed time for model to load. Disabled if None. Defaults to None.
+            profiling: Collects metrics for cache operations, adding slight overhead. Defaults to False.
+        """
+
+        self.ttl = ttl
+        plugins = []
+
+        if revalidate:
+            plugins.append(RevalidationPlugin())
+        if profiling:
+            plugins.append(TimingPlugin())
+
+        self.cache = SimpleMemoryCache(
+            ttl=ttl, timeout=timeout, plugins=plugins, namespace=None
+        )
+
+    async def get(
+        self, model_name: str, model_type: ModelType, **model_kwargs
+    ) -> InferenceModel:
+        """
+        Args:
+            model_name: Name of model in the model hub used for the task.
+            model_type: Model type or task, which determines which model zoo is used.
+
+        Returns:
+            model: The requested model.
+        """
+
+        key = self.cache.build_key(model_name, model_type.value)
+        model = await self.cache.get(key)
+        if model is None:
+            async with OptimisticLock(self.cache, key) as lock:
+                model = await asyncio.get_running_loop().run_in_executor(
+                    None,
+                    lambda: InferenceModel.from_model_type(
+                        model_type, model_name, **model_kwargs
+                    ),
+                )
+                await lock.cas(model, ttl=self.ttl)
+        return model
+
+    async def get_profiling(self) -> dict[str, float] | None:
+        if not hasattr(self.cache, "profiling"):
+            return None
+
+        return self.cache.profiling  # type: ignore
+
+
+class RevalidationPlugin(BasePlugin):
+    """Revalidates cache item's TTL after cache hit."""
+
+    async def post_get(self, client, key, ret=None, namespace=None, **kwargs):
+        if ret is None:
+            return
+        if namespace is not None:
+            key = client.build_key(key, namespace)
+        if key in client._handlers:
+            await client.expire(key, client.ttl)
+
+    async def post_multi_get(self, client, keys, ret=None, namespace=None, **kwargs):
+        if ret is None:
+            return
+
+        for key, val in zip(keys, ret):
+            if namespace is not None:
+                key = client.build_key(key, namespace)
+            if val is not None and key in client._handlers:
+                await client.expire(key, client.ttl)

machine-learning/app/models/clip.py

@@ -0,0 +1,37 @@
+from pathlib import Path
+
+from PIL.Image import Image
+from sentence_transformers import SentenceTransformer
+
+from ..schemas import ModelType
+from .base import InferenceModel
+
+
+class CLIPSTEncoder(InferenceModel):
+    _model_type = ModelType.CLIP
+
+    def __init__(
+        self,
+        model_name: str,
+        cache_dir: Path | None = None,
+        **model_kwargs,
+    ):
+        super().__init__(model_name, cache_dir)
+        self.model = SentenceTransformer(
+            self.model_name,
+            cache_folder=self.cache_dir.as_posix(),
+            **model_kwargs,
+        )
+
+    def predict(self, image_or_text: Image | str) -> list[float]:
+        return self.model.encode(image_or_text).tolist()
+
+
+# stubs to allow different behavior between the two in the future
+# and handle loading different image and text clip models
+class CLIPSTVisionEncoder(CLIPSTEncoder):
+    _model_type = ModelType.CLIP_VISION
+
+
+class CLIPSTTextEncoder(CLIPSTEncoder):
+    _model_type = ModelType.CLIP_TEXT

machine-learning/app/models/facial_recognition.py

@@ -0,0 +1,59 @@
+from pathlib import Path
+from typing import Any
+
+import cv2
+from insightface.app import FaceAnalysis
+
+from ..config import settings
+from ..schemas import ModelType
+from .base import InferenceModel
+
+
+class FaceRecognizer(InferenceModel):
+    _model_type = ModelType.FACIAL_RECOGNITION
+
+    def __init__(
+        self,
+        model_name: str,
+        min_score: float = settings.min_face_score,
+        cache_dir: Path | None = None,
+        **model_kwargs,
+    ):
+        super().__init__(model_name, cache_dir)
+        self.min_score = min_score
+        model = FaceAnalysis(
+            name=self.model_name,
+            root=self.cache_dir.as_posix(),
+            allowed_modules=["detection", "recognition"],
+            **model_kwargs,
+        )
+        model.prepare(
+            ctx_id=0,
+            det_thresh=self.min_score,
+            det_size=(640, 640),
+        )
+        self.model = model
+
+    def predict(self, image: cv2.Mat) -> list[dict[str, Any]]:
+        height, width, _ = image.shape
+        results = []
+        faces = self.model.get(image)
+
+        for face in faces:
+            x1, y1, x2, y2 = face.bbox
+
+            results.append(
+                {
+                    "imageWidth": width,
+                    "imageHeight": height,
+                    "boundingBox": {
+                        "x1": round(x1),
+                        "y1": round(y1),
+                        "x2": round(x2),
+                        "y2": round(y2),
+                    },
+                    "score": face.det_score.item(),
+                    "embedding": face.normed_embedding.tolist(),
+                }
+            )
+        return results

machine-learning/app/models/image_classification.py

@@ -0,0 +1,40 @@
+from pathlib import Path
+
+from PIL.Image import Image
+from transformers.pipelines import pipeline
+
+from ..config import settings
+from ..schemas import ModelType
+from .base import InferenceModel
+
+
+class ImageClassifier(InferenceModel):
+    _model_type = ModelType.IMAGE_CLASSIFICATION
+
+    def __init__(
+        self,
+        model_name: str,
+        min_score: float = settings.min_tag_score,
+        cache_dir: Path | None = None,
+        **model_kwargs,
+    ):
+        super().__init__(model_name, cache_dir)
+        self.min_score = min_score
+
+        self.model = pipeline(
+            self.model_type.value,
+            self.model_name,
+            model_kwargs={"cache_dir": self.cache_dir, **model_kwargs},
+        )
+
+    def predict(self, image: Image) -> list[str]:
+        predictions = self.model(image)
+        tags = list(
+            {
+                tag
+                for pred in predictions
+                for tag in pred["label"].split(", ")
+                if pred["score"] >= self.min_score
+            }
+        )
+        return tags

machine-learning/app/schemas.py

@@ -0,0 +1,66 @@
+from enum import Enum
+
+from pydantic import BaseModel
+
+
+def to_lower_camel(string: str) -> str:
+    tokens = [
+        token.capitalize() if i > 0 else token
+        for i, token in enumerate(string.split("_"))
+    ]
+    return "".join(tokens)
+
+
+class TextModelRequest(BaseModel):
+    text: str
+
+
+class TextResponse(BaseModel):
+    __root__: str
+
+
+class MessageResponse(BaseModel):
+    message: str
+
+
+class TagResponse(BaseModel):
+    __root__: list[str]
+
+
+class Embedding(BaseModel):
+    __root__: list[float]
+
+
+class EmbeddingResponse(BaseModel):
+    __root__: Embedding
+
+
+class BoundingBox(BaseModel):
+    x1: int
+    y1: int
+    x2: int
+    y2: int
+
+
+class Face(BaseModel):
+    image_width: int
+    image_height: int
+    bounding_box: BoundingBox
+    score: float
+    embedding: Embedding
+
+    class Config:
+        alias_generator = to_lower_camel
+        allow_population_by_field_name = True
+
+
+class FaceResponse(BaseModel):
+    __root__: list[Face]
+
+
+class ModelType(Enum):
+    IMAGE_CLASSIFICATION = "image-classification"
+    CLIP = "clip"
+    CLIP_VISION = "clip-vision"
+    CLIP_TEXT = "clip-text"
+    FACIAL_RECOGNITION = "facial-recognition"

machine-learning/load_test.sh

@@ -0,0 +1,24 @@
+export MACHINE_LEARNING_CACHE_FOLDER=/tmp/model_cache
+export MACHINE_LEARNING_MIN_FACE_SCORE=0.034 # returns 1 face per request; setting this to 0 blows up the number of faces to the thousands
+export MACHINE_LEARNING_MIN_TAG_SCORE=0.0
+export PID_FILE=/tmp/locust_pid
+export LOG_FILE=/tmp/gunicorn.log
+export HEADLESS=false
+export HOST=127.0.0.1:3003
+export CONCURRENCY=4
+export NUM_ENDPOINTS=3
+export PYTHONPATH=app
+
+gunicorn app.main:app --worker-class uvicorn.workers.UvicornWorker \
+    --bind $HOST --daemon --error-logfile $LOG_FILE --pid $PID_FILE
+while true ; do
+    echo "Loading models..."
+    sleep 5
+    if cat $LOG_FILE | grep -q -E "startup complete"; then break; fi
+done
+
+# "users" are assigned only one task, so multiply concurrency by the number of tasks
+locust --host http://$HOST --web-host 127.0.0.1 \
+    --run-time 120s --users $(($CONCURRENCY * $NUM_ENDPOINTS)) $(if $HEADLESS; then echo "--headless"; fi)
+
+if [[ -e $PID_FILE ]]; then kill $(cat $PID_FILE); fi

machine-learning/locustfile.py

@@ -0,0 +1,52 @@
+from io import BytesIO
+
+from locust import HttpUser, events, task
+from PIL import Image
+
+
+@events.test_start.add_listener
+def on_test_start(environment, **kwargs):
+    global byte_image
+    image = Image.new("RGB", (1000, 1000))
+    byte_image = BytesIO()
+    image.save(byte_image, format="jpeg")
+
+
+class InferenceLoadTest(HttpUser):
+    abstract: bool = True
+    host = "http://127.0.0.1:3003"
+    data: bytes
+    headers: dict[str, str] = {"Content-Type": "image/jpg"}
+
+    # re-use the image across all instances in a process
+    def on_start(self):
+        global byte_image
+        self.data = byte_image.getvalue()
+
+
+class ClassificationLoadTest(InferenceLoadTest):
+    @task
+    def classify(self):
+        self.client.post(
+            "/image-classifier/tag-image", data=self.data, headers=self.headers
+        )
+
+
+class CLIPLoadTest(InferenceLoadTest):
+    @task
+    def encode_image(self):
+        self.client.post(
+            "/sentence-transformer/encode-image",
+            data=self.data,
+            headers=self.headers,
+        )
+
+
+class RecognitionLoadTest(InferenceLoadTest):
+    @task
+    def recognize(self):
+        self.client.post(
+            "/facial-recognition/detect-faces",
+            data=self.data,
+            headers=self.headers,
+        )

machine-learning/pyproject.toml

@@ -0,0 +1,59 @@
+[tool.poetry]
+name = "machine-learning"
+version = "1.64.0"
+description = ""
+authors = ["Hau Tran <alex.tran1502@gmail.com>"]
+readme = "README.md"
+packages = [{include = "app"}]
+
+[tool.poetry.dependencies]
+python = "^3.11"
+torch = [
+    {markers = "platform_machine == 'arm64' or platform_machine == 'aarch64'", version = "=2.0.1", source = "pypi"},
+    {markers = "platform_machine == 'amd64' or platform_machine == 'x86_64'", version = "=2.0.1", source = "pytorch-cpu"}
+]
+transformers = "^4.29.2"
+sentence-transformers = "^2.2.2"
+onnxruntime = "^1.15.0"
+insightface = "^0.7.3"
+opencv-python-headless = "^4.7.0.72"
+pillow = "^9.5.0"
+fastapi = "^0.95.2"
+uvicorn = {extras = ["standard"], version = "^0.22.0"}
+pydantic = "^1.10.8"
+aiocache = "^0.12.1"
+
+[tool.poetry.group.dev.dependencies]
+mypy = "^1.3.0"
+black = "^23.3.0"
+pytest = "^7.3.1"
+locust = "^2.15.1"
+gunicorn = "^20.1.0"
+
+[[tool.poetry.source]]
+name = "pytorch-cpu"
+url = "https://download.pytorch.org/whl/cpu"
+priority = "explicit"
+
+[build-system]
+requires = ["poetry-core"]
+build-backend = "poetry.core.masonry.api"
+
+[tool.flake8]
+max-line-length = 120
+
+[tool.mypy]
+python_version = "3.11"
+plugins = "pydantic.mypy"
+follow_imports = "silent"
+warn_redundant_casts = true
+disallow_any_generics = true
+check_untyped_defs = true
+no_implicit_reexport = true
+disallow_untyped_defs = true
+
+[tool.pydantic-mypy]
+init_forbid_extra = true
+init_typed = true
+warn_required_dynamic_aliases = true
+warn_untyped_fields = true

machine-learning/src/main.py

@@ -1,169 +0,0 @@
-import os
-import numpy as np
-import cv2 as cv
-import uvicorn
-
-from insightface.app import FaceAnalysis
-from transformers import pipeline
-from sentence_transformers import SentenceTransformer
-from PIL import Image
-from fastapi import FastAPI
-from pydantic import BaseModel
-
-
-class MlRequestBody(BaseModel):
-    thumbnailPath: str
-
-
-class ClipRequestBody(BaseModel):
-    text: str
-
-
-classification_model = os.getenv(
-    "MACHINE_LEARNING_CLASSIFICATION_MODEL", "microsoft/resnet-50"
-)
-clip_image_model = os.getenv("MACHINE_LEARNING_CLIP_IMAGE_MODEL", "clip-ViT-B-32")
-clip_text_model = os.getenv("MACHINE_LEARNING_CLIP_TEXT_MODEL", "clip-ViT-B-32")
-facial_recognition_model = os.getenv(
-    "MACHINE_LEARNING_FACIAL_RECOGNITION_MODEL", "buffalo_l"
-)
-
-min_face_score = float(os.getenv("MACHINE_LEARNING_MIN_FACE_SCORE", 0.7))
-min_tag_score = float(os.getenv("MACHINE_LEARNING_MIN_TAG_SCORE", 0.9))
-eager_startup = (
-    os.getenv("MACHINE_LEARNING_EAGER_STARTUP", "true") == "true"
-)  # loads all models at startup
-
-cache_folder = os.getenv("MACHINE_LEARNING_CACHE_FOLDER", "/cache")
-
-_model_cache = {}
-
-app = FastAPI()
-
-
-@app.on_event("startup")
-async def startup_event():
-    models = [
-        (classification_model, "image-classification"),
-        (clip_image_model, "clip"),
-        (clip_text_model, "clip"),
-        (facial_recognition_model, "facial-recognition"),
-    ]
-
-    # Get all models
-    for model_name, model_type in models:
-        if eager_startup:
-            get_cached_model(model_name, model_type)
-        else:
-            _get_model(model_name, model_type)
-
-
-@app.get("/")
-async def root():
-    return {"message": "Immich ML"}
-
-
-@app.get("/ping")
-def ping():
-    return "pong"
-
-
-@app.post("/image-classifier/tag-image", status_code=200)
-def image_classification(payload: MlRequestBody):
-    model = get_cached_model(classification_model, "image-classification")
-    assetPath = payload.thumbnailPath
-    return run_engine(model, assetPath)
-
-
-@app.post("/sentence-transformer/encode-image", status_code=200)
-def clip_encode_image(payload: MlRequestBody):
-    model = get_cached_model(clip_image_model, "clip")
-    assetPath = payload.thumbnailPath
-    return model.encode(Image.open(assetPath)).tolist()
-
-
-@app.post("/sentence-transformer/encode-text", status_code=200)
-def clip_encode_text(payload: ClipRequestBody):
-    model = get_cached_model(clip_text_model, "clip")
-    text = payload.text
-    return model.encode(text).tolist()
-
-
-@app.post("/facial-recognition/detect-faces", status_code=200)
-def facial_recognition(payload: MlRequestBody):
-    model = get_cached_model(facial_recognition_model, "facial-recognition")
-    assetPath = payload.thumbnailPath
-    img = cv.imread(assetPath)
-    height, width, _ = img.shape
-    results = []
-    faces = model.get(img)
-
-    for face in faces:
-        if face.det_score < min_face_score:
-            continue
-        x1, y1, x2, y2 = face.bbox
-
-        results.append(
-            {
-                "imageWidth": width,
-                "imageHeight": height,
-                "boundingBox": {
-                    "x1": round(x1),
-                    "y1": round(y1),
-                    "x2": round(x2),
-                    "y2": round(y2),
-                },
-                "score": face.det_score.item(),
-                "embedding": face.normed_embedding.tolist(),
-            }
-        )
-    return results
-
-
-def run_engine(engine, path):
-    result = []
-    predictions = engine(path)
-
-    for index, pred in enumerate(predictions):
-        tags = pred["label"].split(", ")
-        if pred["score"] > min_tag_score:
-            result = [*result, *tags]
-
-    if len(result) > 1:
-        result = list(set(result))
-
-    return result
-
-
-def get_cached_model(model, task):
-    global _model_cache
-    key = "|".join([model, str(task)])
-    if key not in _model_cache:
-        model = _get_model(model, task)
-        _model_cache[key] = model
-
-    return _model_cache[key]
-
-
-def _get_model(model, task):
-    match task:
-        case "facial-recognition":
-            model = FaceAnalysis(
-                name=model,
-                root=cache_folder,
-                allowed_modules=["detection", "recognition"],
-            )
-            model.prepare(ctx_id=0, det_size=(640, 640))
-        case "clip":
-            model = SentenceTransformer(model, cache_folder=cache_folder)
-        case _:
-            model = pipeline(model=model, task=task)
-    return model
-
-
-if __name__ == "__main__":
-    host = os.getenv("MACHINE_LEARNING_HOST", "0.0.0.0")
-    port = int(os.getenv("MACHINE_LEARNING_PORT", 3003))
-    is_dev = os.getenv("NODE_ENV") == "development"
-
-    uvicorn.run("main:app", host=host, port=port, reload=is_dev, workers=1)

misc/release/pump-version.sh

@@ -63,6 +63,7 @@ if [ "$CURRENT_SERVER" != "$NEXT_SERVER" ]; then
   echo "Pumping Server: $CURRENT_SERVER => $NEXT_SERVER"
   npm --prefix server version $SERVER_PUMP
   npm --prefix server run api:generate
+  poetry --directory machine-learning version $SERVER_PUMP
 fi
 
 if [ "$CURRENT_MOBILE" != "$NEXT_MOBILE" ]; then

mobile/android/app/build.gradle

@@ -72,6 +72,11 @@ android {
    }
 
     buildTypes {
+        debug {
+            applicationIdSuffix '.debug'
+            versionNameSuffix '-DEBUG'
+        }
+
         release {
             signingConfig signingConfigs.release
         }
@@ -84,6 +89,7 @@ flutter {
 
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlin_coroutines_version"
     implementation "androidx.work:work-runtime-ktx:$work_version"
     implementation "androidx.concurrent:concurrent-futures:$concurrent_version"
     implementation "com.google.guava:guava:$guava_version"

mobile/android/app/src/main/kotlin/com/example/mobile/BackgroundServicePlugin.kt

@@ -1,10 +1,15 @@
 package app.alextran.immich
 
 import android.content.Context
+import android.util.Log
 import io.flutter.embedding.engine.plugins.FlutterPlugin
 import io.flutter.plugin.common.BinaryMessenger
 import io.flutter.plugin.common.MethodCall
 import io.flutter.plugin.common.MethodChannel
+import java.security.MessageDigest
+import java.io.File
+import java.io.FileInputStream
+import kotlinx.coroutines.*
 
 /**
  * Android plugin for Dart `BackgroundService`
@@ -16,6 +21,7 @@ class BackgroundServicePlugin : FlutterPlugin, MethodChannel.MethodCallHandler {
 
     private var methodChannel: MethodChannel? = null
     private var context: Context? = null
+    private val sha1: MessageDigest = MessageDigest.getInstance("SHA-1")
 
     override fun onAttachedToEngine(binding: FlutterPlugin.FlutterPluginBinding) {
         onAttachedToEngine(binding.applicationContext, binding.binaryMessenger)
@@ -70,9 +76,40 @@ class BackgroundServicePlugin : FlutterPlugin, MethodChannel.MethodCallHandler {
             "isIgnoringBatteryOptimizations" -> {
                 result.success(BackupWorker.isIgnoringBatteryOptimizations(ctx))
             }
+            "digestFiles" -> {
+                val args = call.arguments<ArrayList<String>>()!!
+                GlobalScope.launch(Dispatchers.IO) {
+                    val buf = ByteArray(BUFSIZE)
+                    val digest: MessageDigest = MessageDigest.getInstance("SHA-1")
+                    val hashes = arrayOfNulls<ByteArray>(args.size)
+                    for (i in args.indices) {
+                        val path = args[i]
+                        var len = 0
+                        try {
+                            val file = FileInputStream(path)
+                            try {
+                                while (true) {
+                                    len = file.read(buf)
+                                    if (len != BUFSIZE) break
+                                    digest.update(buf)
+                                }
+                            } finally {
+                                file.close()
+                            }
+                            digest.update(buf, 0, len)
+                            hashes[i] = digest.digest()
+                        } catch (e: Exception) {
+                            // skip this file
+                            Log.w(TAG, "Failed to hash file ${args[i]}: $e")
+                        }
+                    }
+                    result.success(hashes.asList())
+                }
+            }
             else -> result.notImplemented()
         }
     }
 }
 
-private const val TAG = "BackgroundServicePlugin"
+private const val TAG = "BackgroundServicePlugin"
+private const val BUFSIZE = 2*1024*1024;

mobile/android/build.gradle

@@ -1,5 +1,6 @@
 buildscript {
     ext.kotlin_version = '1.8.20'
+    ext.kotlin_coroutines_version = '1.7.1'
     ext.work_version = '2.7.1'
     ext.concurrent_version = '1.1.0'
     ext.guava_version = '31.0.1-android'

mobile/android/fastlane/Fastfile

@@ -35,8 +35,8 @@ platform :android do
       task: 'bundle', 
       build_type: 'Release',
       properties: {
-        "android.injected.version.code" => 83,
-        "android.injected.version.name" => "1.60.0",
+        "android.injected.version.code" => 87,
+        "android.injected.version.name" => "1.64.0",
       }
     )
     upload_to_play_store(skip_upload_apk: true, skip_upload_images: true, skip_upload_screenshots: true, aab: '../build/app/outputs/bundle/release/app-release.aab')

mobile/assets/i18n/en-US.json

@@ -217,6 +217,7 @@
   "search_page_selfies": "Selfies",
   "search_page_things": "Things",
   "search_page_videos": "Videos",
+  "search_page_people": "People",
   "search_page_view_all_button": "View all",
   "search_page_your_activity": "Your activity",
   "search_result_page_new_search_hint": "New Search",
@@ -285,5 +286,6 @@
   "version_announcement_overlay_text_1": "Hi friend, there is a new release of",
   "version_announcement_overlay_text_2": "please take your time to visit the ",
   "version_announcement_overlay_text_3": " and ensure your docker-compose and .env setup is up-to-date to prevent any misconfigurations, especially if you use WatchTower or any mechanism that handles updating your server application automatically.",
-  "version_announcement_overlay_title": "New Server Version Available \uD83C\uDF89"
-}
+  "version_announcement_overlay_title": "New Server Version Available \uD83C\uDF89",
+  "all_people_page_title": "People"
+}

mobile/ios/Podfile.lock

@@ -39,7 +39,7 @@ PODS:
   - shared_preferences_foundation (0.0.1):
     - Flutter
     - FlutterMacOS
-  - sqflite (0.0.2):
+  - sqflite (0.0.3):
     - Flutter
     - FMDB (>= 2.7.5)
   - Toast (4.0.0)
@@ -128,21 +128,21 @@ SPEC CHECKSUMS:
   flutter_web_auth: c25208760459cec375a3c39f6a8759165ca0fa4d
   fluttertoast: eb263d302cc92e04176c053d2385237e9f43fad0
   FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
-  image_picker_ios: 58b9c4269cb176f89acea5e5d043c9358f2d25f8
+  image_picker_ios: 4a8aadfbb6dc30ad5141a2ce3832af9214a705b5
   integration_test: 13825b8a9334a850581300559b8839134b124670
   isar_flutter_libs: b69f437aeab9c521821c3f376198c4371fa21073
   package_info_plus: 6c92f08e1f853dc01228d6f553146438dafcd14e
-  path_provider_foundation: c68054786f1b4f3343858c1e1d0caaded73f0be9
+  path_provider_foundation: eaf5b3e458fc0e5fbb9940fb09980e853fe058b8
   path_provider_ios: 14f3d2fd28c4fdb42f44e0f751d12861c43cee02
   permission_handler_apple: 44366e37eaf29454a1e7b1b7d736c2cceaeb17ce
   photo_manager: 4f6810b7dfc4feb03b461ac1a70dacf91fba7604
   SAMKeychain: 483e1c9f32984d50ca961e26818a534283b4cd5c
   share_plus: 056a1e8ac890df3e33cb503afffaf1e9b4fbae68
-  shared_preferences_foundation: 986fc17f3d3251412d18b0265f9c64113a8c2472
-  sqflite: 6d358c025f5b867b29ed92fc697fd34924e11904
+  shared_preferences_foundation: e2dae3258e06f44cc55f49d42024fd8dd03c590c
+  sqflite: 31f7eba61e3074736dff8807a9b41581e4f7f15a
   Toast: 91b396c56ee72a5790816f40d3a94dd357abc196
   url_launcher_ios: 08a3dfac5fb39e8759aeb0abbd5d9480f30fc8b4
-  video_player_avfoundation: 6d971a232d72e6ee25368378d48a079dea01f1cf
+  video_player_avfoundation: 81e49bb3d9fb63dccf9fa0f6d877dc3ddbeac126
   wakelock: d0fc7c864128eac40eba1617cb5264d9c940b46f
 
 PODFILE CHECKSUM: 599d8aeb73728400c15364e734525722250a5382

mobile/ios/fastlane/Fastfile

@@ -19,7 +19,7 @@ platform :ios do
   desc "iOS Beta"
   lane :beta do
     increment_version_number(
-      version_number: "1.60.0"
+      version_number: "1.64.0"
     )
     increment_build_number(
       build_number: latest_testflight_build_number + 1,

mobile/lib/main.dart

@@ -19,9 +19,11 @@ import 'package:immich_mobile/modules/settings/providers/notification_permission
 import 'package:immich_mobile/routing/router.dart';
 import 'package:immich_mobile/routing/tab_navigation_observer.dart';
 import 'package:immich_mobile/shared/models/album.dart';
+import 'package:immich_mobile/shared/models/android_device_asset.dart';
 import 'package:immich_mobile/shared/models/asset.dart';
 import 'package:immich_mobile/shared/models/etag.dart';
 import 'package:immich_mobile/shared/models/exif_info.dart';
+import 'package:immich_mobile/shared/models/ios_device_asset.dart';
 import 'package:immich_mobile/shared/models/logger_message.model.dart';
 import 'package:immich_mobile/shared/models/store.dart';
 import 'package:immich_mobile/shared/models/user.dart';
@@ -91,6 +93,7 @@ Future<Isar> loadDb() async {
       DuplicatedAssetSchema,
       LoggerMessageSchema,
       ETagSchema,
+      Platform.isAndroid ? AndroidDeviceAssetSchema : IOSDeviceAssetSchema,
     ],
     directory: dir.path,
     maxSizeMiB: 256,

mobile/lib/modules/asset_viewer/providers/image_viewer_page_state.provider.dart

@@ -2,6 +2,7 @@ import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:fluttertoast/fluttertoast.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/modules/album/services/album.service.dart';
 import 'package:immich_mobile/modules/asset_viewer/models/image_viewer_page_state.model.dart';
 import 'package:immich_mobile/modules/asset_viewer/services/image_viewer.service.dart';
 import 'package:immich_mobile/shared/models/asset.dart';
@@ -12,9 +13,13 @@ import 'package:immich_mobile/shared/ui/share_dialog.dart';
 class ImageViewerStateNotifier extends StateNotifier<ImageViewerPageState> {
   final ImageViewerService _imageViewerService;
   final ShareService _shareService;
+  final AlbumService _albumService;
 
-  ImageViewerStateNotifier(this._imageViewerService, this._shareService)
-      : super(
+  ImageViewerStateNotifier(
+    this._imageViewerService,
+    this._shareService,
+    this._albumService,
+  ) : super(
           ImageViewerPageState(
             downloadAssetStatus: DownloadAssetStatus.idle,
           ),
@@ -34,6 +39,7 @@ class ImageViewerStateNotifier extends StateNotifier<ImageViewerPageState> {
         toastType: ToastType.success,
         gravity: ToastGravity.BOTTOM,
       );
+      _albumService.refreshDeviceAlbums();
     } else {
       state = state.copyWith(downloadAssetStatus: DownloadAssetStatus.error);
       ImmichToast.show(
@@ -66,5 +72,6 @@ final imageViewerStateProvider =
   ((ref) => ImageViewerStateNotifier(
         ref.watch(imageViewerServiceProvider),
         ref.watch(shareServiceProvider),
+        ref.watch(albumServiceProvider),
       )),
 );

mobile/lib/modules/asset_viewer/providers/show_controls.provider.dart

@@ -0,0 +1,21 @@
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+
+final showControlsProvider = StateNotifierProvider<ShowControls, bool>((ref) {
+  return ShowControls(ref);
+});
+
+class ShowControls extends StateNotifier<bool> {
+  ShowControls(this.ref) : super(true);
+
+  final Ref ref;
+
+  bool get show => state;
+
+  set show(bool value) {
+    state = value;
+  }
+
+  void toggle() {
+    state = !state;
+  }
+}

mobile/lib/modules/asset_viewer/providers/video_player_controls_provider.dart

@@ -0,0 +1,46 @@
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+
+class VideoPlaybackControls {
+  VideoPlaybackControls({required this.position, required this.mute});
+
+  final double position;
+  final bool mute;
+}
+
+final videoPlayerControlsProvider =
+    StateNotifierProvider<VideoPlayerControls, VideoPlaybackControls>((ref) {
+  return VideoPlayerControls(ref);
+});
+
+class VideoPlayerControls extends StateNotifier<VideoPlaybackControls> {
+  VideoPlayerControls(this.ref)
+      : super(
+          VideoPlaybackControls(
+            position: 0,
+            mute: false,
+          ),
+        );
+
+  final Ref ref;
+
+  VideoPlaybackControls get value => state;
+
+  set value(VideoPlaybackControls value) {
+    state = value;
+  }
+
+  double get position => state.position;
+  bool get mute => state.mute;
+
+  set position(double value) {
+    state = VideoPlaybackControls(position: value, mute: state.mute);
+  }
+
+  set mute(bool value) {
+    state = VideoPlaybackControls(position: state.position, mute: value);
+  }
+
+  void toggleMute() {
+    state = VideoPlaybackControls(position: state.position, mute: !state.mute);
+  }
+}

mobile/lib/modules/asset_viewer/providers/video_player_value_provider.dart

@@ -0,0 +1,35 @@
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+
+class VideoPlaybackValue {
+  VideoPlaybackValue({required this.position, required this.duration});
+
+  final Duration position;
+  final Duration duration;
+}
+
+final videoPlaybackValueProvider =
+    StateNotifierProvider<VideoPlaybackValueState, VideoPlaybackValue>((ref) {
+  return VideoPlaybackValueState(ref);
+});
+
+class VideoPlaybackValueState extends StateNotifier<VideoPlaybackValue> {
+  VideoPlaybackValueState(this.ref)
+      : super(
+          VideoPlaybackValue(
+            position: Duration.zero,
+            duration: Duration.zero,
+          ),
+        );
+
+  final Ref ref;
+
+  VideoPlaybackValue get value => state;
+
+  set value(VideoPlaybackValue value) {
+    state = value;
+  }
+
+  set position(Duration value) {
+    state = VideoPlaybackValue(position: value, duration: state.duration);
+  }
+}

mobile/lib/modules/asset_viewer/ui/animated_play_pause.dart

@@ -0,0 +1,57 @@
+import 'package:flutter/material.dart';
+
+/// A widget that animates implicitly between a play and a pause icon.
+class AnimatedPlayPause extends StatefulWidget {
+  const AnimatedPlayPause({
+    Key? key,
+    required this.playing,
+    this.size,
+    this.color,
+  }) : super(key: key);
+
+  final double? size;
+  final bool playing;
+  final Color? color;
+
+  @override
+  State<StatefulWidget> createState() => AnimatedPlayPauseState();
+}
+
+class AnimatedPlayPauseState extends State<AnimatedPlayPause>
+    with SingleTickerProviderStateMixin {
+  late final animationController = AnimationController(
+    vsync: this,
+    value: widget.playing ? 1 : 0,
+    duration: const Duration(milliseconds: 300),
+  );
+
+  @override
+  void didUpdateWidget(AnimatedPlayPause oldWidget) {
+    super.didUpdateWidget(oldWidget);
+    if (widget.playing != oldWidget.playing) {
+      if (widget.playing) {
+        animationController.forward();
+      } else {
+        animationController.reverse();
+      }
+    }
+  }
+
+  @override
+  void dispose() {
+    animationController.dispose();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Center(
+      child: AnimatedIcon(
+        color: widget.color,
+        size: widget.size,
+        icon: AnimatedIcons.play_pause,
+        progress: animationController,
+      ),
+    );
+  }
+}

mobile/lib/modules/asset_viewer/ui/center_play_button.dart

@@ -0,0 +1,53 @@
+import 'package:flutter/material.dart';
+import 'package:immich_mobile/modules/asset_viewer/ui/animated_play_pause.dart';
+
+class CenterPlayButton extends StatelessWidget {
+  const CenterPlayButton({
+    Key? key,
+    required this.backgroundColor,
+    this.iconColor,
+    required this.show,
+    required this.isPlaying,
+    required this.isFinished,
+    this.onPressed,
+  }) : super(key: key);
+
+  final Color backgroundColor;
+  final Color? iconColor;
+  final bool show;
+  final bool isPlaying;
+  final bool isFinished;
+  final VoidCallback? onPressed;
+
+  @override
+  Widget build(BuildContext context) {
+    return ColoredBox(
+      color: Colors.transparent,
+      child: Center(
+        child: UnconstrainedBox(
+          child: AnimatedOpacity(
+            opacity: show ? 1.0 : 0.0,
+            duration: const Duration(milliseconds: 100),
+            child: DecoratedBox(
+              decoration: BoxDecoration(
+                color: backgroundColor,
+                shape: BoxShape.circle,
+              ),
+              child: IconButton(
+                iconSize: 32,
+                padding: const EdgeInsets.all(12.0),
+                icon: isFinished
+                    ? Icon(Icons.replay, color: iconColor)
+                    : AnimatedPlayPause(
+                        color: iconColor,
+                        playing: isPlaying,
+                      ),
+                onPressed: onPressed,
+              ),
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+}

mobile/lib/modules/asset_viewer/ui/top_control_app_bar.dart

@@ -72,15 +72,7 @@ class TopControlAppBar extends HookConsumerWidget {
                     color: Colors.grey[200],
                   ),
           ),
-        if (!asset.isLocal)
-          IconButton(
-            onPressed: onDownloadPressed,
-            icon: Icon(
-              Icons.cloud_download_outlined,
-              color: Colors.grey[200],
-            ),
-          ),
-        if (asset.storage == AssetState.merged)
+        if (asset.storage == AssetState.remote)
           IconButton(
             onPressed: onDownloadPressed,
             icon: Icon(

mobile/lib/modules/asset_viewer/ui/video_player_controls.dart

@@ -0,0 +1,207 @@
+import 'dart:async';
+
+import 'package:chewie/chewie.dart';
+import 'package:flutter/material.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/modules/asset_viewer/providers/show_controls.provider.dart';
+import 'package:immich_mobile/modules/asset_viewer/providers/video_player_controls_provider.dart';
+import 'package:immich_mobile/modules/asset_viewer/providers/video_player_value_provider.dart';
+import 'package:immich_mobile/modules/asset_viewer/ui/center_play_button.dart';
+import 'package:immich_mobile/shared/ui/immich_loading_indicator.dart';
+import 'package:video_player/video_player.dart';
+
+class VideoPlayerControls extends ConsumerStatefulWidget {
+  const VideoPlayerControls({
+    Key? key,
+  }) : super(key: key);
+
+  @override
+  VideoPlayerControlsState createState() => VideoPlayerControlsState();
+}
+
+class VideoPlayerControlsState extends ConsumerState<VideoPlayerControls>
+    with SingleTickerProviderStateMixin {
+  late VideoPlayerController controller;
+  late VideoPlayerValue _latestValue;
+  bool _displayBufferingIndicator = false;
+  double? _latestVolume;
+  Timer? _hideTimer;
+
+  ChewieController? _chewieController;
+  ChewieController get chewieController => _chewieController!;
+
+  @override
+  Widget build(BuildContext context) {
+    ref.listen(videoPlayerControlsProvider.select((value) => value.mute),
+        (_, value) {
+      _mute(value);
+      _cancelAndRestartTimer();
+    });
+
+    ref.listen(videoPlayerControlsProvider.select((value) => value.position),
+        (_, position) {
+      _seekTo(position);
+      _cancelAndRestartTimer();
+    });
+
+    if (_latestValue.hasError) {
+      return chewieController.errorBuilder?.call(
+            context,
+            chewieController.videoPlayerController.value.errorDescription!,
+          ) ??
+          const Center(
+            child: Icon(
+              Icons.error,
+              color: Colors.white,
+              size: 42,
+            ),
+          );
+    }
+
+    return GestureDetector(
+      onTap: () => _cancelAndRestartTimer(),
+      child: AbsorbPointer(
+        absorbing: !ref.watch(showControlsProvider),
+        child: Stack(
+          children: [
+            if (_displayBufferingIndicator)
+              const Center(
+                child: ImmichLoadingIndicator(),
+              )
+            else
+              _buildHitArea(),
+          ],
+        ),
+      ),
+    );
+  }
+
+  @override
+  void dispose() {
+    _dispose();
+    super.dispose();
+  }
+
+  void _dispose() {
+    controller.removeListener(_updateState);
+    _hideTimer?.cancel();
+  }
+
+  @override
+  void didChangeDependencies() {
+    final oldController = _chewieController;
+    _chewieController = ChewieController.of(context);
+    controller = chewieController.videoPlayerController;
+
+    if (oldController != chewieController) {
+      _dispose();
+      _initialize();
+    }
+
+    super.didChangeDependencies();
+  }
+
+  Widget _buildHitArea() {
+    final bool isFinished = _latestValue.position >= _latestValue.duration;
+
+    return GestureDetector(
+      onTap: () {
+        if (_latestValue.isPlaying) {
+          ref.read(showControlsProvider.notifier).show = false;
+        } else {
+          _playPause();
+          ref.read(showControlsProvider.notifier).show = false;
+        }
+      },
+      child: CenterPlayButton(
+        backgroundColor: Colors.black54,
+        iconColor: Colors.white,
+        isFinished: isFinished,
+        isPlaying: controller.value.isPlaying,
+        show: ref.watch(showControlsProvider),
+        onPressed: _playPause,
+      ),
+    );
+  }
+
+  void _cancelAndRestartTimer() {
+    _hideTimer?.cancel();
+    _startHideTimer();
+    ref.read(showControlsProvider.notifier).show = true;
+  }
+
+  Future<void> _initialize() async {
+    _mute(ref.read(videoPlayerControlsProvider.select((value) => value.mute)));
+
+    controller.addListener(_updateState);
+    _latestValue = controller.value;
+
+    if (controller.value.isPlaying || chewieController.autoPlay) {
+      _startHideTimer();
+    }
+  }
+
+  void _playPause() {
+    final isFinished = _latestValue.position >= _latestValue.duration;
+
+    setState(() {
+      if (controller.value.isPlaying) {
+        ref.read(showControlsProvider.notifier).show = true;
+        _hideTimer?.cancel();
+        controller.pause();
+      } else {
+        _cancelAndRestartTimer();
+
+        if (!controller.value.isInitialized) {
+          controller.initialize().then((_) {
+            controller.play();
+          });
+        } else {
+          if (isFinished) {
+            controller.seekTo(Duration.zero);
+          }
+          controller.play();
+        }
+      }
+    });
+  }
+
+  void _startHideTimer() {
+    final hideControlsTimer = chewieController.hideControlsTimer.isNegative
+        ? ChewieController.defaultHideControlsTimer
+        : chewieController.hideControlsTimer;
+    _hideTimer = Timer(hideControlsTimer, () {
+      ref.read(showControlsProvider.notifier).show = false;
+    });
+  }
+
+  void _updateState() {
+    if (!mounted) return;
+
+    _displayBufferingIndicator = controller.value.isBuffering;
+
+    setState(() {
+      _latestValue = controller.value;
+      ref.read(videoPlaybackValueProvider.notifier).value = VideoPlaybackValue(
+        position: _latestValue.position,
+        duration: _latestValue.duration,
+      );
+    });
+  }
+
+  void _mute(bool mute) {
+    if (mute) {
+      _latestVolume = controller.value.volume;
+      controller.setVolume(0);
+    } else {
+      controller.setVolume(_latestVolume ?? 0.5);
+    }
+  }
+
+  void _seekTo(double position) {
+    final Duration pos = controller.value.duration * (position / 100.0);
+    if (pos != controller.value.position) {
+      controller.seekTo(pos);
+    }
+  }
+}

mobile/lib/modules/asset_viewer/views/gallery_viewer.dart

@@ -1,4 +1,5 @@
 import 'dart:io';
+import 'dart:math';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:auto_route/auto_route.dart';
 import 'package:cached_network_image/cached_network_image.dart';
@@ -6,8 +7,11 @@ import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_hooks/flutter_hooks.dart' hide Store;
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/modules/asset_viewer/providers/show_controls.provider.dart';
+import 'package:immich_mobile/modules/asset_viewer/providers/video_player_controls_provider.dart';
 import 'package:immich_mobile/modules/album/ui/add_to_album_bottom_sheet.dart';
 import 'package:immich_mobile/modules/asset_viewer/providers/image_viewer_page_state.provider.dart';
+import 'package:immich_mobile/modules/asset_viewer/providers/video_player_value_provider.dart';
 import 'package:immich_mobile/modules/asset_viewer/ui/advanced_bottom_sheet.dart';
 import 'package:immich_mobile/modules/asset_viewer/ui/exif_bottom_sheet.dart';
 import 'package:immich_mobile/modules/asset_viewer/ui/top_control_app_bar.dart';
@@ -49,10 +53,10 @@ class GalleryViewerPage extends HookConsumerWidget {
     final isLoadPreview = useState(AppSettingsEnum.loadPreview.defaultValue);
     final isLoadOriginal = useState(AppSettingsEnum.loadOriginal.defaultValue);
     final isZoomed = useState<bool>(false);
-    final showAppBar = useState<bool>(true);
     final isPlayingMotionVideo = useState(false);
     final isPlayingVideo = useState(false);
-    late Offset localPosition;
+    final progressValue = useState(0.0);
+    Offset? localPosition;
     final authToken = 'Bearer ${Store.get(StoreKey.accessToken)}';
     final currentIndex = useState(initialIndex);
     final currentAsset = loadAsset(currentIndex.value);
@@ -60,15 +64,6 @@ class GalleryViewerPage extends HookConsumerWidget {
 
     Asset asset() => watchedAsset.value ?? currentAsset;
 
-    showAppBar.addListener(() {
-      // Change to and from immersive mode, hiding navigation and app bar
-      if (showAppBar.value) {
-        SystemChrome.setEnabledSystemUIMode(SystemUiMode.edgeToEdge);
-      } else {
-        SystemChrome.setEnabledSystemUIMode(SystemUiMode.immersive);
-      }
-    });
-
     useEffect(
       () {
         isLoadPreview.value =
@@ -246,8 +241,13 @@ class GalleryViewerPage extends HookConsumerWidget {
         return;
       }
 
+      // Guard [localPosition] null
+      if (localPosition == null) {
+        return;
+      }
+
       // Check for delta from initial down point
-      final d = details.localPosition - localPosition;
+      final d = details.localPosition - localPosition!;
       // If the magnitude of the dx swipe is large, we probably didn't mean to go down
       if (d.dx.abs() > dxThreshold) {
         return;
@@ -272,92 +272,212 @@ class GalleryViewerPage extends HookConsumerWidget {
     }
 
     buildAppBar() {
-      final show = (showAppBar.value || // onTap has the final say
-              (showAppBar.value && !isZoomed.value)) &&
-          !isPlayingVideo.value;
-
-      return AnimatedOpacity(
-        duration: const Duration(milliseconds: 100),
-        opacity: show ? 1.0 : 0.0,
-        child: Container(
-          color: Colors.black.withOpacity(0.4),
-          child: TopControlAppBar(
-            isPlayingMotionVideo: isPlayingMotionVideo.value,
-            asset: asset(),
-            isFavorite: asset().isFavorite,
-            onMoreInfoPressed: showInfo,
-            onFavorite: asset().isRemote ? () => toggleFavorite(asset()) : null,
-            onDownloadPressed: asset().storage == AssetState.local
-                ? null
-                : () =>
-                    ref.watch(imageViewerStateProvider.notifier).downloadAsset(
-                          asset(),
-                          context,
-                        ),
-            onToggleMotionVideo: (() {
-              isPlayingMotionVideo.value = !isPlayingMotionVideo.value;
-            }),
-            onAddToAlbumPressed: () => addToAlbum(asset()),
+      return IgnorePointer(
+        ignoring: !ref.watch(showControlsProvider),
+        child: AnimatedOpacity(
+          duration: const Duration(milliseconds: 100),
+          opacity: ref.watch(showControlsProvider) ? 1.0 : 0.0,
+          child: Container(
+            color: Colors.black.withOpacity(0.4),
+            child: TopControlAppBar(
+              isPlayingMotionVideo: isPlayingMotionVideo.value,
+              asset: asset(),
+              isFavorite: asset().isFavorite,
+              onMoreInfoPressed: showInfo,
+              onFavorite:
+                  asset().isRemote ? () => toggleFavorite(asset()) : null,
+              onDownloadPressed: asset().isLocal
+                  ? null
+                  : () => ref
+                      .watch(imageViewerStateProvider.notifier)
+                      .downloadAsset(
+                        asset(),
+                        context,
+                      ),
+              onToggleMotionVideo: (() {
+                isPlayingMotionVideo.value = !isPlayingMotionVideo.value;
+              }),
+              onAddToAlbumPressed: () => addToAlbum(asset()),
+            ),
           ),
         ),
       );
     }
 
-    buildBottomBar() {
-      final show = (showAppBar.value || // onTap has the final say
-              (showAppBar.value && !isZoomed.value)) &&
-          !isPlayingVideo.value;
-      return AnimatedOpacity(
-        duration: const Duration(milliseconds: 100),
-        opacity: show ? 1.0 : 0.0,
-        child: BottomNavigationBar(
-          backgroundColor: Colors.black.withOpacity(0.4),
-          unselectedIconTheme: const IconThemeData(color: Colors.white),
-          selectedIconTheme: const IconThemeData(color: Colors.white),
-          unselectedLabelStyle: const TextStyle(color: Colors.black),
-          selectedLabelStyle: const TextStyle(color: Colors.black),
-          showSelectedLabels: false,
-          showUnselectedLabels: false,
-          items: [
-            BottomNavigationBarItem(
-              icon: const Icon(Icons.ios_share_rounded),
-              label: 'control_bottom_app_bar_share'.tr(),
-              tooltip: 'control_bottom_app_bar_share'.tr(),
-            ),
-            asset().isArchived
-                ? BottomNavigationBarItem(
-                    icon: const Icon(Icons.unarchive_rounded),
-                    label: 'control_bottom_app_bar_unarchive'.tr(),
-                    tooltip: 'control_bottom_app_bar_unarchive'.tr(),
-                  )
-                : BottomNavigationBarItem(
-                    icon: const Icon(Icons.archive_outlined),
-                    label: 'control_bottom_app_bar_archive'.tr(),
-                    tooltip: 'control_bottom_app_bar_archive'.tr(),
-                  ),
-            BottomNavigationBarItem(
-              icon: const Icon(Icons.delete_outline),
-              label: 'control_bottom_app_bar_delete'.tr(),
-              tooltip: 'control_bottom_app_bar_delete'.tr(),
-            ),
-          ],
-          onTap: (index) {
-            switch (index) {
-              case 0:
-                shareAsset();
-                break;
-              case 1:
-                handleArchive(asset());
-                break;
-              case 2:
-                handleDelete(asset());
-                break;
-            }
+    Widget buildProgressBar() {
+      final playerValue = ref.watch(videoPlaybackValueProvider);
+
+      return Expanded(
+        child: Slider(
+          value: playerValue.duration == Duration.zero
+              ? 0.0
+              : min(
+                  playerValue.position.inMicroseconds /
+                      playerValue.duration.inMicroseconds *
+                      100,
+                  100,
+                ),
+          min: 0,
+          max: 100,
+          thumbColor: Colors.white,
+          activeColor: Colors.white,
+          inactiveColor: Colors.white.withOpacity(0.75),
+          onChanged: (position) {
+            progressValue.value = position;
+            ref.read(videoPlayerControlsProvider.notifier).position = position;
           },
         ),
       );
     }
 
+    Text buildPosition() {
+      final position = ref
+          .watch(videoPlaybackValueProvider.select((value) => value.position));
+
+      return Text(
+        _formatDuration(position),
+        style: TextStyle(
+          fontSize: 14.0,
+          color: Colors.white.withOpacity(.75),
+          fontWeight: FontWeight.normal,
+        ),
+      );
+    }
+
+    Text buildDuration() {
+      final duration = ref
+          .watch(videoPlaybackValueProvider.select((value) => value.duration));
+
+      return Text(
+        _formatDuration(duration),
+        style: TextStyle(
+          fontSize: 14.0,
+          color: Colors.white.withOpacity(.75),
+          fontWeight: FontWeight.normal,
+        ),
+      );
+    }
+
+    Widget buildMuteButton() {
+      return IconButton(
+        icon: Icon(
+          ref.watch(videoPlayerControlsProvider.select((value) => value.mute))
+              ? Icons.volume_off
+              : Icons.volume_up,
+        ),
+        onPressed: () =>
+            ref.read(videoPlayerControlsProvider.notifier).toggleMute(),
+        color: Colors.white,
+      );
+    }
+
+    buildBottomBar() {
+      return IgnorePointer(
+        ignoring: !ref.watch(showControlsProvider),
+        child: AnimatedOpacity(
+          duration: const Duration(milliseconds: 100),
+          opacity: ref.watch(showControlsProvider) ? 1.0 : 0.0,
+          child: Column(
+            children: [
+              Visibility(
+                visible: !asset().isImage && !isPlayingMotionVideo.value,
+                child: Container(
+                  color: Colors.black.withOpacity(0.4),
+                  child: Padding(
+                    padding: MediaQuery.of(context).orientation ==
+                            Orientation.portrait
+                        ? const EdgeInsets.symmetric(horizontal: 12.0)
+                        : const EdgeInsets.symmetric(horizontal: 64.0),
+                    child: Row(
+                      children: [
+                        buildPosition(),
+                        buildProgressBar(),
+                        buildDuration(),
+                        buildMuteButton(),
+                      ],
+                    ),
+                  ),
+                ),
+              ),
+              BottomNavigationBar(
+                backgroundColor: Colors.black.withOpacity(0.4),
+                unselectedIconTheme: const IconThemeData(color: Colors.white),
+                selectedIconTheme: const IconThemeData(color: Colors.white),
+                unselectedLabelStyle: const TextStyle(color: Colors.black),
+                selectedLabelStyle: const TextStyle(color: Colors.black),
+                showSelectedLabels: false,
+                showUnselectedLabels: false,
+                items: [
+                  BottomNavigationBarItem(
+                    icon: const Icon(Icons.ios_share_rounded),
+                    label: 'control_bottom_app_bar_share'.tr(),
+                    tooltip: 'control_bottom_app_bar_share'.tr(),
+                  ),
+                  asset().isArchived
+                      ? BottomNavigationBarItem(
+                          icon: const Icon(Icons.unarchive_rounded),
+                          label: 'control_bottom_app_bar_unarchive'.tr(),
+                          tooltip: 'control_bottom_app_bar_unarchive'.tr(),
+                        )
+                      : BottomNavigationBarItem(
+                          icon: const Icon(Icons.archive_outlined),
+                          label: 'control_bottom_app_bar_archive'.tr(),
+                          tooltip: 'control_bottom_app_bar_archive'.tr(),
+                        ),
+                  BottomNavigationBarItem(
+                    icon: const Icon(Icons.delete_outline),
+                    label: 'control_bottom_app_bar_delete'.tr(),
+                    tooltip: 'control_bottom_app_bar_delete'.tr(),
+                  ),
+                ],
+                onTap: (index) {
+                  switch (index) {
+                    case 0:
+                      shareAsset();
+                      break;
+                    case 1:
+                      handleArchive(asset());
+                      break;
+                    case 2:
+                      handleDelete(asset());
+                      break;
+                  }
+                },
+              ),
+            ],
+          ),
+        ),
+      );
+    }
+
+    ref.listen(showControlsProvider, (_, show) {
+      if (show) {
+        SystemChrome.setEnabledSystemUIMode(SystemUiMode.edgeToEdge);
+      } else {
+        SystemChrome.setEnabledSystemUIMode(SystemUiMode.immersive);
+      }
+    });
+
+    ImageProvider imageProvider(Asset asset) {
+      if (asset.isLocal) {
+        return localImageProvider(asset);
+      } else {
+        if (isLoadOriginal.value) {
+          return originalImageProvider(asset);
+        } else if (isLoadPreview.value) {
+          return remoteThumbnailImageProvider(
+            asset,
+            api.ThumbnailFormat.JPEG,
+          );
+        } else {
+          return remoteThumbnailImageProvider(
+            asset,
+            api.ThumbnailFormat.WEBP,
+          );
+        }
+      }
+    }
+
     return Scaffold(
       backgroundColor: Colors.black,
       body: WillPopScope(
@@ -371,7 +491,6 @@ class GalleryViewerPage extends HookConsumerWidget {
             PhotoViewGallery.builder(
               scaleStateChangedCallback: (state) {
                 isZoomed.value = state != PhotoViewScaleState.initial;
-                showAppBar.value = !isZoomed.value;
               },
               pageController: controller,
               scrollPhysics: isZoomed.value
@@ -392,6 +511,8 @@ class GalleryViewerPage extends HookConsumerWidget {
                   precacheNextImage(value - 1);
                 }
                 currentIndex.value = value;
+                progressValue.value = 0.0;
+
                 HapticFeedback.selectionClick();
               },
               loadingBuilder: isLoadPreview.value
@@ -451,33 +572,17 @@ class GalleryViewerPage extends HookConsumerWidget {
                   : null,
               builder: (context, index) {
                 final asset = loadAsset(index);
+                final ImageProvider provider = imageProvider(asset);
+
                 if (asset.isImage && !isPlayingMotionVideo.value) {
-                  // Show photo
-                  final ImageProvider provider;
-                  if (asset.isLocal) {
-                    provider = localImageProvider(asset);
-                  } else {
-                    if (isLoadOriginal.value) {
-                      provider = originalImageProvider(asset);
-                    } else if (isLoadPreview.value) {
-                      provider = remoteThumbnailImageProvider(
-                        asset,
-                        api.ThumbnailFormat.JPEG,
-                      );
-                    } else {
-                      provider = remoteThumbnailImageProvider(
-                        asset,
-                        api.ThumbnailFormat.WEBP,
-                      );
-                    }
-                  }
                   return PhotoViewGalleryPageOptions(
                     onDragStart: (_, details, __) =>
                         localPosition = details.localPosition,
                     onDragUpdate: (_, details, __) =>
                         handleSwipeUpDown(details),
-                    onTapDown: (_, __, ___) =>
-                        showAppBar.value = !showAppBar.value,
+                    onTapDown: (_, __, ___) {
+                      ref.read(showControlsProvider.notifier).toggle();
+                    },
                     imageProvider: provider,
                     heroAttributes: PhotoViewHeroAttributes(
                       tag: asset.id,
@@ -502,19 +607,24 @@ class GalleryViewerPage extends HookConsumerWidget {
                     filterQuality: FilterQuality.high,
                     maxScale: 1.0,
                     minScale: 1.0,
-                    basePosition: Alignment.bottomCenter,
-                    child: SafeArea(
-                      child: VideoViewerPage(
-                        onPlaying: () => isPlayingVideo.value = true,
-                        onPaused: () => isPlayingVideo.value = false,
-                        asset: asset,
-                        isMotionVideo: isPlayingMotionVideo.value,
-                        onVideoEnded: () {
-                          if (isPlayingMotionVideo.value) {
-                            isPlayingMotionVideo.value = false;
-                          }
-                        },
+                    basePosition: Alignment.center,
+                    child: VideoViewerPage(
+                      onPlaying: () => isPlayingVideo.value = true,
+                      onPaused: () => isPlayingVideo.value = false,
+                      asset: asset,
+                      isMotionVideo: isPlayingMotionVideo.value,
+                      placeholder: Image(
+                        image: provider,
+                        fit: BoxFit.fitWidth,
+                        height: MediaQuery.of(context).size.height,
+                        width: MediaQuery.of(context).size.width,
+                        alignment: Alignment.center,
                       ),
+                      onVideoEnded: () {
+                        if (isPlayingMotionVideo.value) {
+                          isPlayingMotionVideo.value = false;
+                        }
+                      },
                     ),
                   );
                 }
@@ -537,4 +647,37 @@ class GalleryViewerPage extends HookConsumerWidget {
       ),
     );
   }
+
+  String _formatDuration(Duration position) {
+    final ms = position.inMilliseconds;
+
+    int seconds = ms ~/ 1000;
+    final int hours = seconds ~/ 3600;
+    seconds = seconds % 3600;
+    final minutes = seconds ~/ 60;
+    seconds = seconds % 60;
+
+    final hoursString = hours >= 10
+        ? '$hours'
+        : hours == 0
+            ? '00'
+            : '0$hours';
+
+    final minutesString = minutes >= 10
+        ? '$minutes'
+        : minutes == 0
+            ? '00'
+            : '0$minutes';
+
+    final secondsString = seconds >= 10
+        ? '$seconds'
+        : seconds == 0
+            ? '00'
+            : '0$seconds';
+
+    final formattedTime =
+        '${hoursString == '00' ? '' : '$hoursString:'}$minutesString:$secondsString';
+
+    return formattedTime;
+  }
 }

mobile/lib/modules/asset_viewer/views/video_viewer_page.dart

@@ -5,16 +5,19 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:chewie/chewie.dart';
 import 'package:immich_mobile/modules/asset_viewer/models/image_viewer_page_state.model.dart';
 import 'package:immich_mobile/modules/asset_viewer/providers/image_viewer_page_state.provider.dart';
+import 'package:immich_mobile/modules/asset_viewer/ui/video_player_controls.dart';
 import 'package:immich_mobile/shared/models/asset.dart';
 import 'package:immich_mobile/shared/models/store.dart';
 import 'package:immich_mobile/shared/ui/immich_loading_indicator.dart';
 import 'package:photo_manager/photo_manager.dart';
 import 'package:video_player/video_player.dart';
+import 'package:wakelock/wakelock.dart';
 
 // ignore: must_be_immutable
 class VideoViewerPage extends HookConsumerWidget {
   final Asset asset;
   final bool isMotionVideo;
+  final Widget? placeholder;
   final VoidCallback onVideoEnded;
   final VoidCallback? onPlaying;
   final VoidCallback? onPaused;
@@ -26,6 +29,7 @@ class VideoViewerPage extends HookConsumerWidget {
     required this.onVideoEnded,
     this.onPlaying,
     this.onPaused,
+    this.placeholder,
   }) : super(key: key);
 
   @override
@@ -66,6 +70,7 @@ class VideoViewerPage extends HookConsumerWidget {
           onVideoEnded: onVideoEnded,
           onPaused: onPaused,
           onPlaying: onPlaying,
+          placeholder: placeholder,
         ),
         if (downloadAssetStatus == DownloadAssetStatus.loading)
           const Center(
@@ -95,6 +100,10 @@ class VideoPlayer extends StatefulWidget {
   final Function()? onPlaying;
   final Function()? onPaused;
 
+  /// The placeholder to show while the video is loading
+  /// usually, a thumbnail of the video
+  final Widget? placeholder;
+
   const VideoPlayer({
     Key? key,
     this.url,
@@ -104,6 +113,7 @@ class VideoPlayer extends StatefulWidget {
     required this.isMotionVideo,
     this.onPlaying,
     this.onPaused,
+    this.placeholder,
   }) : super(key: key);
 
   @override
@@ -122,13 +132,16 @@ class _VideoPlayerState extends State<VideoPlayer> {
     videoPlayerController.addListener(() {
       if (videoPlayerController.value.isInitialized) {
         if (videoPlayerController.value.isPlaying) {
+          Wakelock.enable();
           widget.onPlaying?.call();
         } else if (!videoPlayerController.value.isPlaying) {
+          Wakelock.disable();
           widget.onPaused?.call();
         }
 
         if (videoPlayerController.value.position ==
             videoPlayerController.value.duration) {
+          Wakelock.disable();
           widget.onVideoEnded();
         }
       }
@@ -162,9 +175,10 @@ class _VideoPlayerState extends State<VideoPlayer> {
       videoPlayerController: videoPlayerController,
       autoPlay: true,
       autoInitialize: true,
-      allowFullScreen: true,
+      allowFullScreen: false,
       allowedScreenSleep: false,
       showControls: !widget.isMotionVideo,
+      customControls: const VideoPlayerControls(),
       hideControlsTimer: const Duration(seconds: 5),
     );
   }
@@ -186,12 +200,18 @@ class _VideoPlayerState extends State<VideoPlayer> {
         ),
       );
     } else {
-      return const Center(
-        child: SizedBox(
-          width: 75,
-          height: 75,
-          child: CircularProgressIndicator.adaptive(
-            strokeWidth: 2,
+      return SizedBox(
+        height: MediaQuery.of(context).size.height,
+        width: MediaQuery.of(context).size.width,
+        child: Center(
+          child: Stack(
+            children: [
+              if (widget.placeholder != null)
+                widget.placeholder!,
+              const Center(
+                child: ImmichLoadingIndicator(),
+              ),
+            ],
           ),
         ),
       );

mobile/lib/modules/backup/background_service/background.service.dart

@@ -132,6 +132,17 @@ class BackgroundService {
     }
   }
 
+  Future<Uint8List?> digestFile(String path) {
+    return _foregroundChannel.invokeMethod<Uint8List>("digestFile", [path]);
+  }
+
+  Future<List<Uint8List?>?> digestFiles(List<String> paths) {
+    return _foregroundChannel.invokeListMethod<Uint8List?>(
+      "digestFiles",
+      paths,
+    );
+  }
+
   /// Updates the notification shown by the background service
   Future<bool?> _updateNotification({
     String? title,

mobile/lib/modules/backup/services/backup.service.dart

@@ -16,7 +16,9 @@ import 'package:immich_mobile/shared/providers/db.provider.dart';
 import 'package:immich_mobile/shared/services/api.service.dart';
 import 'package:immich_mobile/utils/files_helper.dart';
 import 'package:isar/isar.dart';
+import 'package:logging/logging.dart';
 import 'package:openapi/api.dart';
+import 'package:permission_handler/permission_handler.dart';
 import 'package:photo_manager/photo_manager.dart';
 import 'package:http_parser/http_parser.dart';
 import 'package:path/path.dart' as p;
@@ -33,6 +35,7 @@ class BackupService {
   final httpClient = http.Client();
   final ApiService _apiService;
   final Isar _db;
+  final Logger _log = Logger("BackupService");
 
   BackupService(this._apiService, this._db);
 
@@ -203,6 +206,14 @@ class BackupService {
     Function(CurrentUploadAsset) setCurrentUploadAssetCb,
     Function(ErrorUploadAsset) errorCb,
   ) async {
+    if (Platform.isAndroid &&
+        !(await Permission.accessMediaLocation.status).isGranted) {
+      // double check that permission is granted here, to guard against
+      // uploading corrupt assets without EXIF information
+      _log.warning("Media location permission is not granted. "
+          "Cannot access original assets for backup.");
+      return false;
+    }
     final String deviceId = Store.get(StoreKey.deviceId);
     final String savedEndpoint = Store.get(StoreKey.serverEndpoint);
     File? file;

mobile/lib/modules/home/ui/asset_grid/group_divider_title.dart

@@ -29,8 +29,8 @@ class GroupDividerTitle extends ConsumerWidget {
 
     return Padding(
       padding: const EdgeInsets.only(
-        top: 29.0,
-        bottom: 10.0,
+        top: 12.0,
+        bottom: 4.0,
         left: 12.0,
         right: 12.0,
       ),

mobile/lib/modules/home/ui/asset_grid/immich_asset_grid.dart

@@ -1,3 +1,6 @@
+import 'dart:math';
+
+import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
@@ -25,6 +28,7 @@ class ImmichAssetGrid extends HookConsumerWidget {
   final bool showMultiSelectIndicator;
   final void Function(ItemPosition start, ItemPosition end)?
       visibleItemsListener;
+  final Widget? topWidget;
 
   const ImmichAssetGrid({
     super.key,
@@ -41,6 +45,7 @@ class ImmichAssetGrid extends HookConsumerWidget {
     this.dynamicLayout,
     this.showMultiSelectIndicator = true,
     this.visibleItemsListener,
+    this.topWidget,
   });
 
   @override
@@ -51,6 +56,12 @@ class ImmichAssetGrid extends HookConsumerWidget {
     final enableHeroAnimations = useState(false);
     final transitionDuration = ModalRoute.of(context)?.transitionDuration;
 
+    final perRow = useState(
+      assetsPerRow ?? settings.getSetting(AppSettingsEnum.tilesPerRow)!,
+    );
+    final scaleFactor = useState(7.0 - perRow.value);
+    final baseScaleFactor = useState(7.0 - perRow.value);
+
     useEffect(
       () {
         // Wait for transition to complete, then re-enable
@@ -80,22 +91,44 @@ class ImmichAssetGrid extends HookConsumerWidget {
         onWillPop: onWillPop,
         child: HeroMode(
           enabled: enableHeroAnimations.value,
-          child: ImmichAssetGridView(
-            onRefresh: onRefresh,
-            assetsPerRow: assetsPerRow ??
-                settings.getSetting(AppSettingsEnum.tilesPerRow),
-            listener: listener,
-            showStorageIndicator: showStorageIndicator ??
-                settings.getSetting(AppSettingsEnum.storageIndicator),
-            renderList: renderList,
-            margin: margin,
-            selectionActive: selectionActive,
-            preselectedAssets: preselectedAssets,
-            canDeselect: canDeselect,
-            dynamicLayout: dynamicLayout ??
-                settings.getSetting(AppSettingsEnum.dynamicLayout),
-            showMultiSelectIndicator: showMultiSelectIndicator,
-            visibleItemsListener: visibleItemsListener,
+          child: RawGestureDetector(
+            gestures: {
+              CustomScaleGestureRecognizer:
+                  GestureRecognizerFactoryWithHandlers<
+                          CustomScaleGestureRecognizer>(
+                      () => CustomScaleGestureRecognizer(),
+                      (CustomScaleGestureRecognizer scale) {
+                scale.onStart = (details) {
+                  baseScaleFactor.value = scaleFactor.value;
+                };
+
+                scale.onUpdate = (details) {
+                  scaleFactor.value =
+                      max(min(5.0, baseScaleFactor.value * details.scale), 1.0);
+                  if (7 - scaleFactor.value.toInt() != perRow.value) {
+                    perRow.value = 7 - scaleFactor.value.toInt();
+                  }
+                };
+                scale.onEnd = (details) {};
+              })
+            },
+            child: ImmichAssetGridView(
+              onRefresh: onRefresh,
+              assetsPerRow: perRow.value,
+              listener: listener,
+              showStorageIndicator: showStorageIndicator ??
+                  settings.getSetting(AppSettingsEnum.storageIndicator),
+              renderList: renderList,
+              margin: margin,
+              selectionActive: selectionActive,
+              preselectedAssets: preselectedAssets,
+              canDeselect: canDeselect,
+              dynamicLayout: dynamicLayout ??
+                  settings.getSetting(AppSettingsEnum.dynamicLayout),
+              showMultiSelectIndicator: showMultiSelectIndicator,
+              visibleItemsListener: visibleItemsListener,
+              topWidget: topWidget,
+            ),
           ),
         ),
       );
@@ -113,3 +146,11 @@ class ImmichAssetGrid extends HookConsumerWidget {
     );
   }
 }
+
+/// accepts a gesture even though it should reject it (because child won)
+class CustomScaleGestureRecognizer extends ScaleGestureRecognizer {
+  @override
+  void rejectGesture(int pointer) {
+    acceptGesture(pointer);
+  }
+}

mobile/lib/modules/home/ui/asset_grid/immich_asset_grid_view.dart

@@ -127,7 +127,7 @@ class ImmichAssetGridViewState extends State<ImmichAssetGridView> {
           width: width * widthDistribution[index],
           height: width,
           margin: EdgeInsets.only(
-            top: widget.margin,
+            bottom: widget.margin,
             right: last ? 0.0 : widget.margin,
           ),
           child: _buildThumbnailOrPlaceholder(asset, absoluteOffset + index),
@@ -157,7 +157,7 @@ class ImmichAssetGridViewState extends State<ImmichAssetGridView> {
     final String title = monthFormat.format(date);
     return Padding(
       key: Key("month-$title"),
-      padding: const EdgeInsets.only(left: 12.0, top: 30),
+      padding: const EdgeInsets.only(left: 12.0, top: 24.0),
       child: Text(
         title,
         style: TextStyle(
@@ -179,7 +179,7 @@ class ImmichAssetGridViewState extends State<ImmichAssetGridView> {
             width: width,
             height: height,
             margin: EdgeInsets.only(
-              top: widget.margin,
+              bottom: widget.margin,
               right: i + 1 == num ? 0.0 : widget.margin,
             ),
             color: Colors.grey,
@@ -206,6 +206,8 @@ class ImmichAssetGridViewState extends State<ImmichAssetGridView> {
           key: ValueKey(section.offset),
           crossAxisAlignment: CrossAxisAlignment.start,
           children: [
+            if (section.offset == 0 && widget.topWidget != null)
+              widget.topWidget!,
             if (section.type == RenderAssetGridElementType.monthTitle)
               _buildMonthTitle(context, section.date),
             if (section.type == RenderAssetGridElementType.groupDividerTitle ||
@@ -401,6 +403,7 @@ class ImmichAssetGridView extends StatefulWidget {
   final bool showMultiSelectIndicator;
   final void Function(ItemPosition start, ItemPosition end)?
       visibleItemsListener;
+  final Widget? topWidget;
 
   const ImmichAssetGridView({
     super.key,
@@ -416,6 +419,7 @@ class ImmichAssetGridView extends StatefulWidget {
     this.dynamicLayout = true,
     this.showMultiSelectIndicator = true,
     this.visibleItemsListener,
+    this.topWidget,
   });
 
   @override

mobile/lib/modules/home/views/home_page.dart

@@ -47,11 +47,11 @@ class HomePage extends HookConsumerWidget {
 
     useEffect(
       () {
-        ref.watch(websocketProvider.notifier).connect();
-        ref.watch(assetProvider.notifier).getAllAsset();
-        ref.watch(albumProvider.notifier).getAllAlbums();
-        ref.watch(sharedAlbumProvider.notifier).getAllSharedAlbums();
-        ref.watch(serverInfoProvider.notifier).getServerVersion();
+        ref.read(websocketProvider.notifier).connect();
+        Future(() => ref.read(assetProvider.notifier).getAllAsset());
+        ref.read(albumProvider.notifier).getAllAlbums();
+        ref.read(sharedAlbumProvider.notifier).getAllSharedAlbums();
+        ref.read(serverInfoProvider.notifier).getServerVersion();
 
         selectionEnabledHook.addListener(() {
           multiselectEnabled.state = selectionEnabledHook.value;
@@ -144,7 +144,7 @@ class HomePage extends HookConsumerWidget {
           );
           if (remoteAssets.isNotEmpty) {
             await ref
-                .watch(assetProvider.notifier)
+                .read(assetProvider.notifier)
                 .toggleArchive(remoteAssets, true);
 
             final assetOrAssets = remoteAssets.length > 1 ? 'assets' : 'asset';
@@ -163,7 +163,7 @@ class HomePage extends HookConsumerWidget {
       void onDelete() async {
         processing.value = true;
         try {
-          await ref.watch(assetProvider.notifier).deleteAssets(selection.value);
+          await ref.read(assetProvider.notifier).deleteAssets(selection.value);
           selectionEnabledHook.value = false;
         } finally {
           processing.value = false;

mobile/lib/modules/login/services/oauth.service.dart

@@ -1,4 +1,5 @@
 import 'package:immich_mobile/shared/services/api.service.dart';
+import 'package:logging/logging.dart';
 import 'package:openapi/api.dart';
 import 'package:flutter_web_auth/flutter_web_auth.dart';
 
@@ -7,7 +8,7 @@ import 'package:flutter_web_auth/flutter_web_auth.dart';
 class OAuthService {
   final ApiService _apiService;
   final callbackUrlScheme = 'app.immich';
-
+  final log = Logger('OAuthService');
   OAuthService(this._apiService);
 
   Future<OAuthConfigResponseDto?> getOAuthServerConfig(
@@ -33,7 +34,8 @@ class OAuthService {
           url: result,
         ),
       );
-    } catch (e) {
+    } catch (e, stack) {
+      log.severe("Error performing oAuthLogin: ${e.toString()}", e, stack);
       return null;
     }
   }

mobile/lib/modules/onboarding/providers/gallery_permission.provider.dart

@@ -6,7 +6,7 @@ import 'package:permission_handler/permission_handler.dart';
 
 class GalleryPermissionNotifier extends StateNotifier<PermissionStatus> {
   GalleryPermissionNotifier()
-    : super(PermissionStatus.denied)  // Denied is the intitial state
+      : super(PermissionStatus.denied) // Denied is the intitial state
   {
     // Sets the initial state
     getGalleryPermissionStatus();
@@ -16,19 +16,20 @@ class GalleryPermissionNotifier extends StateNotifier<PermissionStatus> {
 
   /// Requests the gallery permission
   Future<PermissionStatus> requestGalleryPermission() async {
+    PermissionStatus result;
     // Android 32 and below uses Permission.storage
     if (Platform.isAndroid) {
       final androidInfo = await DeviceInfoPlugin().androidInfo;
       if (androidInfo.version.sdkInt <= 32) {
         // Android 32 and below need storage
         final permission = await Permission.storage.request();
-        state = permission;
-        return permission;
+        result = permission;
       } else {
         // Android 33 need photo & video
         final photos = await Permission.photos.request();
         if (!photos.isGranted) {
           // Don't ask twice for the same permission
+          state = photos;
           return photos;
         }
         final videos = await Permission.videos.request();
@@ -45,28 +46,32 @@ class GalleryPermissionNotifier extends StateNotifier<PermissionStatus> {
           status = PermissionStatus.denied;
         }
 
-        state = status;
-        return status;
+        result = status;
+      }
+      if (result == PermissionStatus.granted &&
+          androidInfo.version.sdkInt >= 29) {
+        result = await Permission.accessMediaLocation.request();
       }
     } else {
       // iOS can use photos
       final photos = await Permission.photos.request();
-      state = photos;
-      return photos;
+      result = photos;
     }
+    state = result;
+    return result;
   }
 
   /// Checks the current state of the gallery permissions without
   /// requesting them again
   Future<PermissionStatus> getGalleryPermissionStatus() async {
+    PermissionStatus result;
     // Android 32 and below uses Permission.storage
     if (Platform.isAndroid) {
       final androidInfo = await DeviceInfoPlugin().androidInfo;
       if (androidInfo.version.sdkInt <= 32) {
         // Android 32 and below need storage
         final permission = await Permission.storage.status;
-        state = permission;
-        return permission;
+        result = permission;
       } else {
         // Android 33 needs photo & video
         final photos = await Permission.photos.status;
@@ -84,18 +89,23 @@ class GalleryPermissionNotifier extends StateNotifier<PermissionStatus> {
           status = PermissionStatus.denied;
         }
 
-        state = status;
-        return status;
+        result = status;
+      }
+      if (state == PermissionStatus.granted &&
+          androidInfo.version.sdkInt >= 29) {
+        result = await Permission.accessMediaLocation.status;
       }
     } else {
       // iOS can use photos
       final photos = await Permission.photos.status;
-      state = photos;
-      return photos;
+      result = photos;
     }
+    state = result;
+    return result;
   }
 }
 
-final galleryPermissionNotifier
-  = StateNotifierProvider<GalleryPermissionNotifier, PermissionStatus>
-    ((ref) => GalleryPermissionNotifier());
+final galleryPermissionNotifier =
+    StateNotifierProvider<GalleryPermissionNotifier, PermissionStatus>(
+  (ref) => GalleryPermissionNotifier(),
+);

mobile/lib/modules/search/providers/people.provider.dart

@@ -0,0 +1,44 @@
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/modules/home/ui/asset_grid/asset_grid_data_structure.dart';
+import 'package:immich_mobile/modules/search/services/person.service.dart';
+import 'package:openapi/api.dart';
+
+final personAssetsProvider = FutureProvider.family
+    .autoDispose<RenderList, String>((ref, personId) async {
+  final PersonService personService = ref.watch(personServiceProvider);
+
+  final assets = await personService.getPersonAssets(personId);
+
+  if (assets == null) {
+    return RenderList.empty();
+  }
+
+  return RenderList.fromAssets(assets, GroupAssetsBy.auto);
+});
+
+final getCuratedPeopleProvider =
+    FutureProvider.autoDispose<List<PersonResponseDto>>((ref) async {
+  final PersonService personService = ref.watch(personServiceProvider);
+
+  final curatedPeople = await personService.getCuratedPeople();
+
+  return curatedPeople ?? [];
+});
+
+class UpdatePersonName {
+  final String id;
+  final String name;
+
+  UpdatePersonName(this.id, this.name);
+}
+
+final updatePersonNameProvider =
+    StateProvider.family<void, UpdatePersonName>((ref, dto) async {
+  final PersonService personService = ref.watch(personServiceProvider);
+
+  final person = await personService.updateName(dto.id, dto.name);
+
+  if (person != null && person.name == dto.name) {
+    ref.invalidate(getCuratedPeopleProvider);
+  }
+});

mobile/lib/modules/search/services/person.service.dart

@@ -0,0 +1,56 @@
+import 'package:flutter/material.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/shared/models/asset.dart';
+import 'package:immich_mobile/shared/providers/api.provider.dart';
+import 'package:immich_mobile/shared/services/api.service.dart';
+import 'package:openapi/api.dart';
+
+final personServiceProvider = Provider(
+  (ref) => PersonService(
+    ref.watch(apiServiceProvider),
+  ),
+);
+
+class PersonService {
+  final ApiService _apiService;
+
+  PersonService(this._apiService);
+
+  Future<List<PersonResponseDto>?> getCuratedPeople() async {
+    try {
+      return await _apiService.personApi.getAllPeople();
+    } catch (e) {
+      debugPrint("Error [getCuratedPeople] ${e.toString()}");
+      return null;
+    }
+  }
+
+  Future<List<Asset>?> getPersonAssets(String id) async {
+    try {
+      final assets = await _apiService.personApi.getPersonAssets(id);
+
+      if (assets == null) {
+        return null;
+      }
+
+      return assets.map((e) => Asset.remote(e)).toList();
+    } catch (e) {
+      debugPrint("Error [getPersonAssets] ${e.toString()}");
+      return null;
+    }
+  }
+
+  Future<PersonResponseDto?> updateName(String id, String name) async {
+    try {
+      return await _apiService.personApi.updatePerson(
+        id,
+        PersonUpdateDto(
+          name: name,
+        ),
+      );
+    } catch (e) {
+      debugPrint("Error [updateName] ${e.toString()}");
+      return null;
+    }
+  }
+}

mobile/lib/modules/search/ui/curated_people_row.dart

@@ -0,0 +1,114 @@
+import 'package:flutter/material.dart';
+import 'package:immich_mobile/modules/search/models/curated_content.dart';
+import 'package:immich_mobile/modules/search/ui/thumbnail_with_info.dart';
+import 'package:immich_mobile/shared/models/store.dart';
+import 'package:immich_mobile/utils/image_url_builder.dart';
+
+class CuratedPeopleRow extends StatelessWidget {
+  final List<CuratedContent> content;
+
+  /// Callback with the content and the index when tapped
+  final Function(CuratedContent, int)? onTap;
+  final Function(CuratedContent, int)? onNameTap;
+
+  const CuratedPeopleRow({
+    super.key,
+    required this.content,
+    this.onTap,
+    required this.onNameTap,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    const imageSize = 85.0;
+
+    // Guard empty [content]
+    if (content.isEmpty) {
+      // Return empty thumbnail
+      return Align(
+        alignment: Alignment.centerLeft,
+        child: Padding(
+          padding: const EdgeInsets.symmetric(horizontal: 16.0),
+          child: SizedBox(
+            width: imageSize,
+            height: imageSize,
+            child: ThumbnailWithInfo(
+              textInfo: '',
+              onTap: () {},
+            ),
+          ),
+        ),
+      );
+    }
+
+    return ListView.builder(
+      scrollDirection: Axis.horizontal,
+      padding: const EdgeInsets.only(
+        left: 16,
+        top: 8,
+      ),
+      itemBuilder: (context, index) {
+        final person = content[index];
+        final headers = {
+          "Authorization": "Bearer ${Store.get(StoreKey.accessToken)}"
+        };
+        return Padding(
+          padding: const EdgeInsets.only(right: 18.0),
+          child: SizedBox(
+            width: imageSize,
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.center,
+              children: [
+                GestureDetector(
+                  onTap: () => onTap?.call(person, index),
+                  child: SizedBox(
+                    height: imageSize,
+                    child: Material(
+                      shape: const CircleBorder(side: BorderSide.none),
+                      elevation: 3,
+                      child: CircleAvatar(
+                        maxRadius: imageSize / 2,
+                        backgroundImage: NetworkImage(
+                          getFaceThumbnailUrl(person.id),
+                          headers: headers,
+                        ),
+                      ),
+                    ),
+                  ),
+                ),
+                if (person.label == "")
+                  GestureDetector(
+                    onTap: () => onNameTap?.call(person, index),
+                    child: Padding(
+                      padding: const EdgeInsets.only(top: 8.0),
+                      child: Text(
+                        "Add name",
+                        style: TextStyle(
+                          fontWeight: FontWeight.bold,
+                          color: Theme.of(context).primaryColor,
+                        ),
+                      ),
+                    ),
+                  )
+                else
+                  Padding(
+                    padding: const EdgeInsets.only(top: 8.0),
+                    child: Text(
+                      person.label,
+                      textAlign: TextAlign.center,
+                      overflow: TextOverflow.ellipsis,
+                      style: const TextStyle(
+                        fontWeight: FontWeight.bold,
+                        fontSize: 13.0,
+                      ),
+                    ),
+                  )
+              ],
+            ),
+          ),
+        );
+      },
+      itemCount: content.length,
+    );
+  }
+}

mobile/lib/modules/search/ui/explore_grid.dart

@@ -4,12 +4,16 @@ import 'package:immich_mobile/modules/search/models/curated_content.dart';
 import 'package:immich_mobile/modules/search/ui/thumbnail_with_info.dart';
 import 'package:immich_mobile/routing/router.dart';
 import 'package:immich_mobile/shared/models/store.dart';
+import 'package:immich_mobile/utils/image_url_builder.dart';
 
 class ExploreGrid extends StatelessWidget {
   final List<CuratedContent> curatedContent;
+  final bool isPeople;
+
   const ExploreGrid({
     super.key,
     required this.curatedContent,
+    this.isPeople = false,
   });
 
   @override
@@ -36,16 +40,25 @@ class ExploreGrid extends StatelessWidget {
       ),
       itemBuilder: (context, index) {
         final content = curatedContent[index];
-        final thumbnailRequestUrl =
-            '${Store.get(StoreKey.serverEndpoint)}/asset/thumbnail/${content.id}';
+        final thumbnailRequestUrl = isPeople
+            ? getFaceThumbnailUrl(content.id)
+            : '${Store.get(StoreKey.serverEndpoint)}/asset/thumbnail/${content.id}';
+
         return ThumbnailWithInfo(
           imageUrl: thumbnailRequestUrl,
           textInfo: content.label,
           borderRadius: 0,
           onTap: () {
-            AutoRouter.of(context).push(
-              SearchResultRoute(searchTerm: 'm:${content.label}'),
-            );
+            isPeople
+                ? AutoRouter.of(context).push(
+                    PersonResultRoute(
+                      personId: content.id,
+                      personName: content.label,
+                    ),
+                  )
+                : AutoRouter.of(context).push(
+                    SearchResultRoute(searchTerm: 'm:${content.label}'),
+                  );
           },
         );
       },

mobile/lib/modules/search/ui/person_name_edit_form.dart

@@ -0,0 +1,82 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_hooks/flutter_hooks.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/modules/search/providers/people.provider.dart';
+
+class PersonNameEditFormResult {
+  final bool success;
+  final String updatedName;
+
+  PersonNameEditFormResult(this.success, this.updatedName);
+}
+
+class PersonNameEditForm extends HookConsumerWidget {
+  final String personId;
+  final String personName;
+
+  const PersonNameEditForm({
+    super.key,
+    required this.personId,
+    required this.personName,
+  });
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final controller = useTextEditingController(text: personName);
+
+    return AlertDialog(
+      title: const Text(
+        "Add a name",
+        style: TextStyle(fontWeight: FontWeight.bold),
+      ),
+      content: SingleChildScrollView(
+        child: TextFormField(
+          controller: controller,
+          autofocus: true,
+          decoration: const InputDecoration(
+            hintText: 'Name',
+          ),
+        ),
+      ),
+      actions: [
+        TextButton(
+          style: TextButton.styleFrom(),
+          onPressed: () {
+            Navigator.of(context, rootNavigator: true)
+                .pop<PersonNameEditFormResult>(
+              PersonNameEditFormResult(false, ''),
+            );
+          },
+          child: Text(
+            "Cancel",
+            style: TextStyle(
+              color: Colors.red[300],
+              fontWeight: FontWeight.bold,
+            ),
+          ),
+        ),
+        TextButton(
+          onPressed: () {
+            ref.read(
+              updatePersonNameProvider(
+                UpdatePersonName(personId, controller.text),
+              ),
+            );
+
+            Navigator.of(context, rootNavigator: true)
+                .pop<PersonNameEditFormResult>(
+              PersonNameEditFormResult(true, controller.text),
+            );
+          },
+          child: Text(
+            "Save",
+            style: TextStyle(
+              color: Theme.of(context).primaryColor,
+              fontWeight: FontWeight.bold,
+            ),
+          ),
+        ),
+      ],
+    );
+  }
+}

mobile/lib/modules/search/ui/search_row_title.dart

@@ -0,0 +1,46 @@
+import 'package:easy_localization/easy_localization.dart';
+import 'package:flutter/material.dart';
+
+class SearchRowTitle extends StatelessWidget {
+  final Function() onViewAllPressed;
+  final String title;
+  final double top;
+
+  const SearchRowTitle({
+    super.key,
+    required this.onViewAllPressed,
+    required this.title,
+    this.top = 12,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return Padding(
+      padding: EdgeInsets.only(
+        left: 16.0,
+        right: 16.0,
+        top: top,
+      ),
+      child: Row(
+        mainAxisAlignment: MainAxisAlignment.spaceBetween,
+        children: [
+          Text(
+            title,
+            style: Theme.of(context).textTheme.titleSmall,
+          ),
+          TextButton(
+            onPressed: onViewAllPressed,
+            child: Text(
+              'search_page_view_all_button',
+              style: TextStyle(
+                color: Theme.of(context).primaryColor,
+                fontWeight: FontWeight.bold,
+                fontSize: 14.0,
+              ),
+            ).tr(),
+          ),
+        ],
+      ),
+    );
+  }
+}

mobile/lib/modules/search/views/all_people_page.dart

@@ -0,0 +1,51 @@
+import 'package:auto_route/auto_route.dart';
+import 'package:easy_localization/easy_localization.dart';
+import 'package:flutter/material.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/modules/search/models/curated_content.dart';
+import 'package:immich_mobile/modules/search/providers/people.provider.dart';
+import 'package:immich_mobile/modules/search/ui/explore_grid.dart';
+import 'package:immich_mobile/shared/ui/immich_loading_indicator.dart';
+
+class AllPeoplePage extends HookConsumerWidget {
+  const AllPeoplePage({super.key});
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final curatedPeople = ref.watch(getCuratedPeopleProvider);
+
+    return Scaffold(
+      appBar: AppBar(
+        title: Text(
+          'all_people_page_title',
+          style: TextStyle(
+            color: Theme.of(context).primaryColor,
+            fontWeight: FontWeight.bold,
+            fontSize: 16.0,
+          ),
+        ).tr(),
+        leading: IconButton(
+          onPressed: () => AutoRouter.of(context).pop(),
+          icon: const Icon(Icons.arrow_back_ios_rounded),
+        ),
+      ),
+      body: curatedPeople.when(
+        loading: () => const Center(child: ImmichLoadingIndicator()),
+        error: (err, stack) => Center(
+          child: Text('Error: $err'),
+        ),
+        data: (people) => ExploreGrid(
+          isPeople: true,
+          curatedContent: people
+              .map(
+                (person) => CuratedContent(
+                  label: person.name,
+                  id: person.id,
+                ),
+              )
+              .toList(),
+        ),
+      ),
+    );
+  }
+}

mobile/lib/modules/search/views/person_result_page.dart

@@ -0,0 +1,152 @@
+import 'package:auto_route/auto_route.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_hooks/flutter_hooks.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/modules/home/ui/asset_grid/immich_asset_grid.dart';
+import 'package:immich_mobile/modules/search/providers/people.provider.dart';
+import 'package:immich_mobile/modules/search/ui/person_name_edit_form.dart';
+import 'package:immich_mobile/shared/models/store.dart' as isar_store;
+import 'package:immich_mobile/utils/image_url_builder.dart';
+
+class PersonResultPage extends HookConsumerWidget {
+  final String personId;
+  final String personName;
+
+  const PersonResultPage({
+    super.key,
+    required this.personId,
+    required this.personName,
+  });
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final name = useState(personName);
+
+    showEditNameDialog() {
+      showDialog<PersonNameEditFormResult>(
+        context: context,
+        builder: (BuildContext context) {
+          return PersonNameEditForm(
+            personId: personId,
+            personName: personName,
+          );
+        },
+      ).then((result) {
+        if (result != null && result.success) {
+          name.value = result.updatedName;
+        }
+      });
+    }
+
+    void buildBottomSheet() {
+      showModalBottomSheet(
+        backgroundColor: Theme.of(context).scaffoldBackgroundColor,
+        isScrollControlled: false,
+        context: context,
+        useSafeArea: true,
+        builder: (context) {
+          return SafeArea(
+            child: Column(
+              mainAxisSize: MainAxisSize.min,
+              children: [
+                ListTile(
+                  leading: const Icon(Icons.edit_outlined),
+                  title: const Text(
+                    'Edit name',
+                    style: TextStyle(fontWeight: FontWeight.bold),
+                  ),
+                  onTap: showEditNameDialog,
+                )
+              ],
+            ),
+          );
+        },
+      );
+    }
+
+    buildTitleBlock() {
+      if (name.value == "") {
+        return GestureDetector(
+          onTap: showEditNameDialog,
+          child: Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              Text(
+                'Add a name',
+                style: Theme.of(context).textTheme.titleSmall?.copyWith(
+                      color: Theme.of(context).colorScheme.secondary,
+                    ),
+              ),
+              Text(
+                'Find them fast by name with search',
+                style: Theme.of(context).textTheme.labelSmall,
+              ),
+            ],
+          ),
+        );
+      }
+
+      return Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Text(
+            name.value,
+            style: Theme.of(context).textTheme.titleLarge,
+          ),
+        ],
+      );
+    }
+
+    return Scaffold(
+      appBar: AppBar(
+        title: Text(name.value),
+        leading: IconButton(
+          onPressed: () => AutoRouter.of(context).pop(),
+          icon: const Icon(Icons.arrow_back_ios_rounded),
+        ),
+        actions: [
+          IconButton(
+            onPressed: buildBottomSheet,
+            icon: const Icon(Icons.more_vert_rounded),
+          ),
+        ],
+      ),
+      body: ref.watch(personAssetsProvider(personId)).when(
+            loading: () => const Center(child: CircularProgressIndicator()),
+            error: (error, stackTrace) => Center(
+              child: Text(
+                error.toString(),
+              ),
+            ),
+            data: (data) => data.isEmpty
+                ? const Center(
+                    child: Text('Opps'),
+                  )
+                : ImmichAssetGrid(
+                    renderList: data,
+                    topWidget: Padding(
+                      padding: const EdgeInsets.only(left: 8.0, top: 24),
+                      child: Row(
+                        children: [
+                          CircleAvatar(
+                            radius: 36,
+                            backgroundImage: NetworkImage(
+                              getFaceThumbnailUrl(personId),
+                              headers: {
+                                "Authorization":
+                                    "Bearer ${isar_store.Store.get(isar_store.StoreKey.accessToken)}"
+                              },
+                            ),
+                          ),
+                          Padding(
+                            padding: const EdgeInsets.only(left: 16.0),
+                            child: buildTitleBlock(),
+                          ),
+                        ],
+                      ),
+                    ),
+                  ),
+          ),
+    );
+  }
+}

mobile/lib/modules/search/views/search_page.dart

@@ -4,13 +4,16 @@ import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart' hide Store;
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/modules/search/models/curated_content.dart';
+import 'package:immich_mobile/modules/search/providers/people.provider.dart';
 import 'package:immich_mobile/modules/search/providers/search_page_state.provider.dart';
+import 'package:immich_mobile/modules/search/ui/curated_people_row.dart';
 import 'package:immich_mobile/modules/search/ui/curated_row.dart';
 import 'package:immich_mobile/modules/search/ui/immich_search_bar.dart';
+import 'package:immich_mobile/modules/search/ui/person_name_edit_form.dart';
+import 'package:immich_mobile/modules/search/ui/search_row_title.dart';
 import 'package:immich_mobile/modules/search/ui/search_suggestion_list.dart';
 import 'package:immich_mobile/routing/router.dart';
 import 'package:immich_mobile/shared/ui/immich_loading_indicator.dart';
-import 'package:openapi/api.dart';
 
 // ignore: must_be_immutable
 class SearchPage extends HookConsumerWidget {
@@ -21,10 +24,9 @@ class SearchPage extends HookConsumerWidget {
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     final isSearchEnabled = ref.watch(searchPageStateProvider).isSearchEnabled;
-    AsyncValue<List<CuratedLocationsResponseDto>> curatedLocation =
-        ref.watch(getCuratedLocationProvider);
-    AsyncValue<List<CuratedObjectsResponseDto>> curatedObjects =
-        ref.watch(getCuratedObjectProvider);
+    final curatedLocation = ref.watch(getCuratedLocationProvider);
+    final curatedObjects = ref.watch(getCuratedObjectProvider);
+    final curatedPeople = ref.watch(getCuratedPeopleProvider);
     var isDarkTheme = Theme.of(context).brightness == Brightness.dark;
     double imageSize = MediaQuery.of(context).size.width / 3;
 
@@ -54,6 +56,50 @@ class SearchPage extends HookConsumerWidget {
       );
     }
 
+    showNameEditModel(
+      String personId,
+      String personName,
+    ) {
+      return showDialog(
+        context: context,
+        builder: (BuildContext context) {
+          return PersonNameEditForm(personId: personId, personName: personName);
+        },
+      );
+    }
+
+    buildPeople() {
+      return SizedBox(
+        height: MediaQuery.of(context).size.width / 3,
+        child: curatedPeople.when(
+          loading: () => const Center(child: ImmichLoadingIndicator()),
+          error: (err, stack) => Center(child: Text('Error: $err')),
+          data: (people) => CuratedPeopleRow(
+            content: people
+                .map(
+                  (person) => CuratedContent(
+                    id: person.id,
+                    label: person.name,
+                  ),
+                )
+                .take(12)
+                .toList(),
+            onTap: (content, index) {
+              AutoRouter.of(context).push(
+                PersonResultRoute(
+                  personId: content.id,
+                  personName: content.label,
+                ),
+              );
+            },
+            onNameTap: (person, index) => {
+              showNameEditModel(person.id, person.label),
+            },
+          ),
+        ),
+      );
+    }
+
     buildPlaces() {
       return SizedBox(
         height: imageSize,
@@ -130,63 +176,25 @@ class SearchPage extends HookConsumerWidget {
           children: [
             ListView(
               children: [
-                Padding(
-                  padding: const EdgeInsets.symmetric(
-                    horizontal: 16.0,
-                    vertical: 4.0,
-                  ),
-                  child: Row(
-                    mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                    children: [
-                      Text(
-                        "search_page_places",
-                        style: Theme.of(context).textTheme.titleSmall,
-                      ).tr(),
-                      TextButton(
-                        child: Text(
-                          'search_page_view_all_button',
-                          style: TextStyle(
-                            color: Theme.of(context).primaryColor,
-                            fontWeight: FontWeight.bold,
-                            fontSize: 14.0,
-                          ),
-                        ).tr(),
-                        onPressed: () => AutoRouter.of(context).push(
-                          const CuratedLocationRoute(),
-                        ),
-                      ),
-                    ],
+                SearchRowTitle(
+                  title: "search_page_people".tr(),
+                  onViewAllPressed: () => AutoRouter.of(context).push(
+                    const AllPeopleRoute(),
                   ),
                 ),
-                buildPlaces(),
-                Padding(
-                  padding: const EdgeInsets.only(
-                    top: 24.0,
-                    bottom: 4.0,
-                    left: 16.0,
-                    right: 16.0,
+                buildPeople(),
+                SearchRowTitle(
+                  title: "search_page_places".tr(),
+                  onViewAllPressed: () => AutoRouter.of(context).push(
+                    const CuratedLocationRoute(),
                   ),
-                  child: Row(
-                    mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                    children: [
-                      Text(
-                        "search_page_things",
-                        style: Theme.of(context).textTheme.titleSmall,
-                      ).tr(),
-                      TextButton(
-                        child: Text(
-                          'search_page_view_all_button',
-                          style: TextStyle(
-                            color: Theme.of(context).primaryColor,
-                            fontWeight: FontWeight.bold,
-                            fontSize: 14.0,
-                          ),
-                        ).tr(),
-                        onPressed: () => AutoRouter.of(context).push(
-                          const CuratedObjectRoute(),
-                        ),
-                      ),
-                    ],
+                  top: 0,
+                ),
+                buildPlaces(),
+                SearchRowTitle(
+                  title: "search_page_things".tr(),
+                  onViewAllPressed: () => AutoRouter.of(context).push(
+                    const CuratedObjectRoute(),
                   ),
                 ),
                 buildThings(),
@@ -200,7 +208,7 @@ class SearchPage extends HookConsumerWidget {
                 ),
                 ListTile(
                   leading: Icon(
-                    Icons.favorite_border,
+                    Icons.star_outline,
                     color: categoryIconColor,
                   ),
                   title:

mobile/lib/routing/router.dart

@@ -25,9 +25,11 @@ import 'package:immich_mobile/modules/login/views/login_page.dart';
 import 'package:immich_mobile/modules/onboarding/providers/gallery_permission.provider.dart';
 import 'package:immich_mobile/modules/onboarding/views/permission_onboarding_page.dart';
 import 'package:immich_mobile/modules/search/views/all_motion_videos_page.dart';
+import 'package:immich_mobile/modules/search/views/all_people_page.dart';
 import 'package:immich_mobile/modules/search/views/all_videos_page.dart';
 import 'package:immich_mobile/modules/search/views/curated_location_page.dart';
 import 'package:immich_mobile/modules/search/views/curated_object_page.dart';
+import 'package:immich_mobile/modules/search/views/person_result_page.dart';
 import 'package:immich_mobile/modules/search/views/recently_added_page.dart';
 import 'package:immich_mobile/modules/search/views/search_page.dart';
 import 'package:immich_mobile/modules/search/views/search_result_page.dart';
@@ -37,8 +39,8 @@ import 'package:immich_mobile/routing/duplicate_guard.dart';
 import 'package:immich_mobile/routing/gallery_permission_guard.dart';
 import 'package:immich_mobile/shared/models/asset.dart';
 import 'package:immich_mobile/shared/models/album.dart';
-import 'package:immich_mobile/shared/models/user.dart';
 import 'package:immich_mobile/shared/models/logger_message.model.dart';
+import 'package:immich_mobile/shared/models/user.dart';
 import 'package:immich_mobile/shared/providers/api.provider.dart';
 import 'package:immich_mobile/shared/services/api.service.dart';
 import 'package:immich_mobile/shared/views/app_log_detail_page.dart';
@@ -140,7 +142,15 @@ part 'router.gr.dart';
       ],
     ),
     AutoRoute(page: PartnerPage, guards: [AuthGuard, DuplicateGuard]),
-    AutoRoute(page: PartnerDetailPage, guards: [AuthGuard, DuplicateGuard])
+    AutoRoute(page: PartnerDetailPage, guards: [AuthGuard, DuplicateGuard]),
+    AutoRoute(
+      page: PersonResultPage,
+      guards: [
+        AuthGuard,
+        DuplicateGuard,
+      ],
+    ),
+    AutoRoute(page: AllPeoplePage, guards: [AuthGuard, DuplicateGuard]),
   ],
 )
 class AppRouter extends _$AppRouter {

mobile/lib/routing/router.gr.dart

@@ -84,6 +84,7 @@ class _$AppRouter extends RootStackRouter {
           onVideoEnded: args.onVideoEnded,
           onPlaying: args.onPlaying,
           onPaused: args.onPaused,
+          placeholder: args.placeholder,
         ),
       );
     },
@@ -272,6 +273,23 @@ class _$AppRouter extends RootStackRouter {
         ),
       );
     },
+    PersonResultRoute.name: (routeData) {
+      final args = routeData.argsAs<PersonResultRouteArgs>();
+      return MaterialPageX<dynamic>(
+        routeData: routeData,
+        child: PersonResultPage(
+          key: args.key,
+          personId: args.personId,
+          personName: args.personName,
+        ),
+      );
+    },
+    AllPeopleRoute.name: (routeData) {
+      return MaterialPageX<dynamic>(
+        routeData: routeData,
+        child: const AllPeoplePage(),
+      );
+    },
     HomeRoute.name: (routeData) {
       return MaterialPageX<dynamic>(
         routeData: routeData,
@@ -555,6 +573,22 @@ class _$AppRouter extends RootStackRouter {
             duplicateGuard,
           ],
         ),
+        RouteConfig(
+          PersonResultRoute.name,
+          path: '/person-result-page',
+          guards: [
+            authGuard,
+            duplicateGuard,
+          ],
+        ),
+        RouteConfig(
+          AllPeopleRoute.name,
+          path: '/all-people-page',
+          guards: [
+            authGuard,
+            duplicateGuard,
+          ],
+        ),
       ];
 }
 
@@ -670,9 +704,10 @@ class VideoViewerRoute extends PageRouteInfo<VideoViewerRouteArgs> {
     Key? key,
     required Asset asset,
     required bool isMotionVideo,
-    required dynamic onVideoEnded,
-    dynamic onPlaying,
-    dynamic onPaused,
+    required void Function() onVideoEnded,
+    void Function()? onPlaying,
+    void Function()? onPaused,
+    Widget? placeholder,
   }) : super(
           VideoViewerRoute.name,
           path: '/video-viewer-page',
@@ -683,6 +718,7 @@ class VideoViewerRoute extends PageRouteInfo<VideoViewerRouteArgs> {
             onVideoEnded: onVideoEnded,
             onPlaying: onPlaying,
             onPaused: onPaused,
+            placeholder: placeholder,
           ),
         );
 
@@ -697,6 +733,7 @@ class VideoViewerRouteArgs {
     required this.onVideoEnded,
     this.onPlaying,
     this.onPaused,
+    this.placeholder,
   });
 
   final Key? key;
@@ -705,15 +742,17 @@ class VideoViewerRouteArgs {
 
   final bool isMotionVideo;
 
-  final dynamic onVideoEnded;
+  final void Function() onVideoEnded;
 
-  final dynamic onPlaying;
+  final void Function()? onPlaying;
 
-  final dynamic onPaused;
+  final void Function()? onPaused;
+
+  final Widget? placeholder;
 
   @override
   String toString() {
-    return 'VideoViewerRouteArgs{key: $key, asset: $asset, isMotionVideo: $isMotionVideo, onVideoEnded: $onVideoEnded, onPlaying: $onPlaying, onPaused: $onPaused}';
+    return 'VideoViewerRouteArgs{key: $key, asset: $asset, isMotionVideo: $isMotionVideo, onVideoEnded: $onVideoEnded, onPlaying: $onPlaying, onPaused: $onPaused, placeholder: $placeholder}';
   }
 }
 
@@ -1191,6 +1230,57 @@ class PartnerDetailRouteArgs {
   }
 }
 
+/// generated route for
+/// [PersonResultPage]
+class PersonResultRoute extends PageRouteInfo<PersonResultRouteArgs> {
+  PersonResultRoute({
+    Key? key,
+    required String personId,
+    required String personName,
+  }) : super(
+          PersonResultRoute.name,
+          path: '/person-result-page',
+          args: PersonResultRouteArgs(
+            key: key,
+            personId: personId,
+            personName: personName,
+          ),
+        );
+
+  static const String name = 'PersonResultRoute';
+}
+
+class PersonResultRouteArgs {
+  const PersonResultRouteArgs({
+    this.key,
+    required this.personId,
+    required this.personName,
+  });
+
+  final Key? key;
+
+  final String personId;
+
+  final String personName;
+
+  @override
+  String toString() {
+    return 'PersonResultRouteArgs{key: $key, personId: $personId, personName: $personName}';
+  }
+}
+
+/// generated route for
+/// [AllPeoplePage]
+class AllPeopleRoute extends PageRouteInfo<void> {
+  const AllPeopleRoute()
+      : super(
+          AllPeopleRoute.name,
+          path: '/all-people-page',
+        );
+
+  static const String name = 'AllPeopleRoute';
+}
+
 /// generated route for
 /// [HomePage]
 class HomeRoute extends PageRouteInfo<void> {

mobile/lib/routing/tab_navigation_observer.dart

@@ -1,6 +1,7 @@
 import 'package:auto_route/auto_route.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/modules/album/providers/album.provider.dart';
+import 'package:immich_mobile/modules/search/providers/people.provider.dart';
 
 import 'package:immich_mobile/modules/search/providers/search_page_state.provider.dart';
 import 'package:immich_mobile/modules/album/providers/shared_album.provider.dart';
@@ -32,6 +33,7 @@ class TabNavigationObserver extends AutoRouterObserver {
       // Refresh Location State
       ref.invalidate(getCuratedLocationProvider);
       ref.invalidate(getCuratedObjectProvider);
+      ref.invalidate(getCuratedPeopleProvider);
     }
 
     if (route.name == 'SharingRoute') {

mobile/lib/shared/models/album.dart

@@ -166,23 +166,10 @@ extension AssetsHelper on IsarCollection<Album> {
   }
 }
 
-extension AssetPathEntityHelper on AssetPathEntity {
-  Future<List<Asset>> getAssets({
-    int start = 0,
-    int end = 0x7fffffffffffffff,
-    Set<String>? excludedAssets,
-  }) async {
-    final assetEntities = await getAssetListRange(start: start, end: end);
-    if (excludedAssets != null) {
-      return assetEntities
-          .where((e) => !excludedAssets.contains(e.id))
-          .map(Asset.local)
-          .toList();
-    }
-    return assetEntities.map(Asset.local).toList();
-  }
-}
-
 extension AlbumResponseDtoHelper on AlbumResponseDto {
   List<Asset> getAssets() => assets.map(Asset.remote).toList();
 }
+
+extension AssetPathEntityHelper on AssetPathEntity {
+  String get eTagKeyAssetCount => "device-album-$id-asset-count";
+}

mobile/lib/shared/models/android_device_asset.dart

@@ -0,0 +1,10 @@
+import 'package:immich_mobile/shared/models/device_asset.dart';
+import 'package:isar/isar.dart';
+
+part 'android_device_asset.g.dart';
+
+@Collection()
+class AndroidDeviceAsset extends DeviceAsset {
+  AndroidDeviceAsset({required this.id, required super.hash});
+  Id id;
+}

mobile/lib/shared/models/android_device_asset.g.dart

@@ -0,0 +1,493 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'android_device_asset.dart';
+
+// **************************************************************************
+// IsarCollectionGenerator
+// **************************************************************************
+
+// coverage:ignore-file
+// ignore_for_file: duplicate_ignore, non_constant_identifier_names, constant_identifier_names, invalid_use_of_protected_member, unnecessary_cast, prefer_const_constructors, lines_longer_than_80_chars, require_trailing_commas, inference_failure_on_function_invocation, unnecessary_parenthesis, unnecessary_raw_strings, unnecessary_null_checks, join_return_with_assignment, prefer_final_locals, avoid_js_rounded_ints, avoid_positional_boolean_parameters, always_specify_types
+
+extension GetAndroidDeviceAssetCollection on Isar {
+  IsarCollection<AndroidDeviceAsset> get androidDeviceAssets =>
+      this.collection();
+}
+
+const AndroidDeviceAssetSchema = CollectionSchema(
+  name: r'AndroidDeviceAsset',
+  id: -6758387181232899335,
+  properties: {
+    r'hash': PropertySchema(
+      id: 0,
+      name: r'hash',
+      type: IsarType.byteList,
+    )
+  },
+  estimateSize: _androidDeviceAssetEstimateSize,
+  serialize: _androidDeviceAssetSerialize,
+  deserialize: _androidDeviceAssetDeserialize,
+  deserializeProp: _androidDeviceAssetDeserializeProp,
+  idName: r'id',
+  indexes: {
+    r'hash': IndexSchema(
+      id: -7973251393006690288,
+      name: r'hash',
+      unique: false,
+      replace: false,
+      properties: [
+        IndexPropertySchema(
+          name: r'hash',
+          type: IndexType.hash,
+          caseSensitive: false,
+        )
+      ],
+    )
+  },
+  links: {},
+  embeddedSchemas: {},
+  getId: _androidDeviceAssetGetId,
+  getLinks: _androidDeviceAssetGetLinks,
+  attach: _androidDeviceAssetAttach,
+  version: '3.1.0+1',
+);
+
+int _androidDeviceAssetEstimateSize(
+  AndroidDeviceAsset object,
+  List<int> offsets,
+  Map<Type, List<int>> allOffsets,
+) {
+  var bytesCount = offsets.last;
+  bytesCount += 3 + object.hash.length;
+  return bytesCount;
+}
+
+void _androidDeviceAssetSerialize(
+  AndroidDeviceAsset object,
+  IsarWriter writer,
+  List<int> offsets,
+  Map<Type, List<int>> allOffsets,
+) {
+  writer.writeByteList(offsets[0], object.hash);
+}
+
+AndroidDeviceAsset _androidDeviceAssetDeserialize(
+  Id id,
+  IsarReader reader,
+  List<int> offsets,
+  Map<Type, List<int>> allOffsets,
+) {
+  final object = AndroidDeviceAsset(
+    hash: reader.readByteList(offsets[0]) ?? [],
+    id: id,
+  );
+  return object;
+}
+
+P _androidDeviceAssetDeserializeProp<P>(
+  IsarReader reader,
+  int propertyId,
+  int offset,
+  Map<Type, List<int>> allOffsets,
+) {
+  switch (propertyId) {
+    case 0:
+      return (reader.readByteList(offset) ?? []) as P;
+    default:
+      throw IsarError('Unknown property with id $propertyId');
+  }
+}
+
+Id _androidDeviceAssetGetId(AndroidDeviceAsset object) {
+  return object.id;
+}
+
+List<IsarLinkBase<dynamic>> _androidDeviceAssetGetLinks(
+    AndroidDeviceAsset object) {
+  return [];
+}
+
+void _androidDeviceAssetAttach(
+    IsarCollection<dynamic> col, Id id, AndroidDeviceAsset object) {
+  object.id = id;
+}
+
+extension AndroidDeviceAssetQueryWhereSort
+    on QueryBuilder<AndroidDeviceAsset, AndroidDeviceAsset, QWhere> {
+  QueryBuilder<AndroidDeviceAsset, AndroidDeviceAsset, QAfterWhere> anyId() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addWhereClause(const IdWhereClause.any());
+    });
+  }
+}
+
+extension AndroidDeviceAssetQueryWhere
+    on QueryBuilder<AndroidDeviceAsset, AndroidDeviceAsset, QWhereClause> {
+  QueryBuilder<AndroidDeviceAsset, AndroidDeviceAsset, QAfterWhereClause>
+      idEqualTo(Id id) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addWhereClause(IdWhereClause.between(
+        lower: id,
+        upper: id,
+      ));
+    });
+  }
+
+  QueryBuilder<AndroidDeviceAsset, AndroidDeviceAsset, QAfterWhereClause>
+      idNotEqualTo(Id id) {
+    return QueryBuilder.apply(this, (query) {
+      if (query.whereSort == Sort.asc) {
+        return query
+            .addWhereClause(
+              IdWhereClause.lessThan(upper: id, includeUpper: false),
+            )
+            .addWhereClause(
+              IdWhereClause.greaterThan(lower: id, includeLower: false),
+            );
+      } else {
+        return query
+            .addWhereClause(
+              IdWhereClause.greaterThan(lower: id, includeLower: false),
+            )
+            .addWhereClause(
+              IdWhereClause.lessThan(upper: id, includeUpper: false),
+            );
+      }
+    });
+  }
+
+  QueryBuilder<AndroidDeviceAsset, AndroidDeviceAsset, QAfterWhereClause>
+      idGreaterThan(Id id, {bool include = false}) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addWhereClause(
+        IdWhereClause.greaterThan(lower: id, includeLower: include),
+      );
+    });
+  }
+
+  QueryBuilder<AndroidDeviceAsset, AndroidDeviceAsset, QAfterWhereClause>
+      idLessThan(Id id, {bool include = false}) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addWhereClause(
+        IdWhereClause.lessThan(upper: id, includeUpper: include),
+      );
+    });
+  }
+
+  QueryBuilder<AndroidDeviceAsset, AndroidDeviceAsset, QAfterWhereClause>
+      idBetween(
+    Id lowerId,
+    Id upperId, {
+    bool includeLower = true,
+    bool includeUpper = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addWhereClause(IdWhereClause.between(
+        lower: lowerId,
+        includeLower: includeLower,
+        upper: upperId,
+        includeUpper: includeUpper,
+      ));
+    });
+  }
+
+  QueryBuilder<AndroidDeviceAsset, AndroidDeviceAsset, QAfterWhereClause>
+      hashEqualTo(List<int> hash) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addWhereClause(IndexWhereClause.equalTo(
+        indexName: r'hash',
+        value: [hash],
+      ));
+    });
+  }
+
+  QueryBuilder<AndroidDeviceAsset, AndroidDeviceAsset, QAfterWhereClause>
+      hashNotEqualTo(List<int> hash) {
+    return QueryBuilder.apply(this, (query) {
+      if (query.whereSort == Sort.asc) {
+        return query
+            .addWhereClause(IndexWhereClause.between(
+              indexName: r'hash',
+              lower: [],
+              upper: [hash],
+              includeUpper: false,
+            ))
+            .addWhereClause(IndexWhereClause.between(
+              indexName: r'hash',
+              lower: [hash],
+              includeLower: false,
+              upper: [],
+            ));
+      } else {
+        return query
+            .addWhereClause(IndexWhereClause.between(
+              indexName: r'hash',
+              lower: [hash],
+              includeLower: false,
+              upper: [],
+            ))
+            .addWhereClause(IndexWhereClause.between(
+              indexName: r'hash',
+              lower: [],
+              upper: [hash],
+              includeUpper: false,
+            ));
+      }
+    });
+  }
+}
+
+extension AndroidDeviceAssetQueryFilter
+    on QueryBuilder<AndroidDeviceAsset, AndroidDeviceAsset, QFilterCondition> {
+  QueryBuilder<AndroidDeviceAsset, AndroidDeviceAsset, QAfterFilterCondition>
+      hashElementEqualTo(int value) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.equalTo(
+        property: r'hash',
+        value: value,
+      ));
+    });
+  }
+
+  QueryBuilder<AndroidDeviceAsset, AndroidDeviceAsset, QAfterFilterCondition>
+      hashElementGreaterThan(
+    int value, {
+    bool include = false,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.greaterThan(
+        include: include,
+        property: r'hash',
+        value: value,
+      ));
+    });
+  }
+
+  QueryBuilder<AndroidDeviceAsset, AndroidDeviceAsset, QAfterFilterCondition>
+      hashElementLessThan(
+    int value, {
+    bool include = false,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.lessThan(
+        include: include,
+        property: r'hash',
+        value: value,
+      ));
+    });
+  }
+
+  QueryBuilder<AndroidDeviceAsset, AndroidDeviceAsset, QAfterFilterCondition>
+      hashElementBetween(
+    int lower,
+    int upper, {
+    bool includeLower = true,
+    bool includeUpper = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.between(
+        property: r'hash',
+        lower: lower,
+        includeLower: includeLower,
+        upper: upper,
+        includeUpper: includeUpper,
+      ));
+    });
+  }
+
+  QueryBuilder<AndroidDeviceAsset, AndroidDeviceAsset, QAfterFilterCondition>
+      hashLengthEqualTo(int length) {
+    return QueryBuilder.apply(this, (query) {
+      return query.listLength(
+        r'hash',
+        length,
+        true,
+        length,
+        true,
+      );
+    });
+  }
+
+  QueryBuilder<AndroidDeviceAsset, AndroidDeviceAsset, QAfterFilterCondition>
+      hashIsEmpty() {
+    return QueryBuilder.apply(this, (query) {
+      return query.listLength(
+        r'hash',
+        0,
+        true,
+        0,
+        true,
+      );
+    });
+  }
+
+  QueryBuilder<AndroidDeviceAsset, AndroidDeviceAsset, QAfterFilterCondition>
+      hashIsNotEmpty() {
+    return QueryBuilder.apply(this, (query) {
+      return query.listLength(
+        r'hash',
+        0,
+        false,
+        999999,
+        true,
+      );
+    });
+  }
+
+  QueryBuilder<AndroidDeviceAsset, AndroidDeviceAsset, QAfterFilterCondition>
+      hashLengthLessThan(
+    int length, {
+    bool include = false,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.listLength(
+        r'hash',
+        0,
+        true,
+        length,
+        include,
+      );
+    });
+  }
+
+  QueryBuilder<AndroidDeviceAsset, AndroidDeviceAsset, QAfterFilterCondition>
+      hashLengthGreaterThan(
+    int length, {
+    bool include = false,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.listLength(
+        r'hash',
+        length,
+        include,
+        999999,
+        true,
+      );
+    });
+  }
+
+  QueryBuilder<AndroidDeviceAsset, AndroidDeviceAsset, QAfterFilterCondition>
+      hashLengthBetween(
+    int lower,
+    int upper, {
+    bool includeLower = true,
+    bool includeUpper = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.listLength(
+        r'hash',
+        lower,
+        includeLower,
+        upper,
+        includeUpper,
+      );
+    });
+  }
+
+  QueryBuilder<AndroidDeviceAsset, AndroidDeviceAsset, QAfterFilterCondition>
+      idEqualTo(Id value) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.equalTo(
+        property: r'id',
+        value: value,
+      ));
+    });
+  }
+
+  QueryBuilder<AndroidDeviceAsset, AndroidDeviceAsset, QAfterFilterCondition>
+      idGreaterThan(
+    Id value, {
+    bool include = false,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.greaterThan(
+        include: include,
+        property: r'id',
+        value: value,
+      ));
+    });
+  }
+
+  QueryBuilder<AndroidDeviceAsset, AndroidDeviceAsset, QAfterFilterCondition>
+      idLessThan(
+    Id value, {
+    bool include = false,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.lessThan(
+        include: include,
+        property: r'id',
+        value: value,
+      ));
+    });
+  }
+
+  QueryBuilder<AndroidDeviceAsset, AndroidDeviceAsset, QAfterFilterCondition>
+      idBetween(
+    Id lower,
+    Id upper, {
+    bool includeLower = true,
+    bool includeUpper = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.between(
+        property: r'id',
+        lower: lower,
+        includeLower: includeLower,
+        upper: upper,
+        includeUpper: includeUpper,
+      ));
+    });
+  }
+}
+
+extension AndroidDeviceAssetQueryObject
+    on QueryBuilder<AndroidDeviceAsset, AndroidDeviceAsset, QFilterCondition> {}
+
+extension AndroidDeviceAssetQueryLinks
+    on QueryBuilder<AndroidDeviceAsset, AndroidDeviceAsset, QFilterCondition> {}
+
+extension AndroidDeviceAssetQuerySortBy
+    on QueryBuilder<AndroidDeviceAsset, AndroidDeviceAsset, QSortBy> {}
+
+extension AndroidDeviceAssetQuerySortThenBy
+    on QueryBuilder<AndroidDeviceAsset, AndroidDeviceAsset, QSortThenBy> {
+  QueryBuilder<AndroidDeviceAsset, AndroidDeviceAsset, QAfterSortBy>
+      thenById() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addSortBy(r'id', Sort.asc);
+    });
+  }
+
+  QueryBuilder<AndroidDeviceAsset, AndroidDeviceAsset, QAfterSortBy>
+      thenByIdDesc() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addSortBy(r'id', Sort.desc);
+    });
+  }
+}
+
+extension AndroidDeviceAssetQueryWhereDistinct
+    on QueryBuilder<AndroidDeviceAsset, AndroidDeviceAsset, QDistinct> {
+  QueryBuilder<AndroidDeviceAsset, AndroidDeviceAsset, QDistinct>
+      distinctByHash() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addDistinctBy(r'hash');
+    });
+  }
+}
+
+extension AndroidDeviceAssetQueryProperty
+    on QueryBuilder<AndroidDeviceAsset, AndroidDeviceAsset, QQueryProperty> {
+  QueryBuilder<AndroidDeviceAsset, int, QQueryOperations> idProperty() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addPropertyName(r'id');
+    });
+  }
+
+  QueryBuilder<AndroidDeviceAsset, List<int>, QQueryOperations> hashProperty() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addPropertyName(r'hash');
+    });
+  }
+}

mobile/lib/shared/models/asset.dart

@@ -1,3 +1,5 @@
+import 'dart:convert';
+
 import 'package:immich_mobile/shared/models/exif_info.dart';
 import 'package:immich_mobile/shared/models/store.dart';
 import 'package:immich_mobile/utils/hash.dart';
@@ -14,7 +16,7 @@ part 'asset.g.dart';
 class Asset {
   Asset.remote(AssetResponseDto remote)
       : remoteId = remote.id,
-        isLocal = false,
+        checksum = remote.checksum,
         fileCreatedAt = remote.fileCreatedAt,
         fileModifiedAt = remote.fileModifiedAt,
         updatedAt = remote.updatedAt,
@@ -24,23 +26,20 @@ class Asset {
         height = remote.exifInfo?.exifImageHeight?.toInt(),
         width = remote.exifInfo?.exifImageWidth?.toInt(),
         livePhotoVideoId = remote.livePhotoVideoId,
-        localId = remote.deviceAssetId,
-        deviceId = fastHash(remote.deviceId),
         ownerId = fastHash(remote.ownerId),
         exifInfo =
             remote.exifInfo != null ? ExifInfo.fromDto(remote.exifInfo!) : null,
         isFavorite = remote.isFavorite,
         isArchived = remote.isArchived;
 
-  Asset.local(AssetEntity local)
+  Asset.local(AssetEntity local, List<int> hash)
       : localId = local.id,
-        isLocal = true,
+        checksum = base64.encode(hash),
         durationInSeconds = local.duration,
         type = AssetType.values[local.typeInt],
         height = local.height,
         width = local.width,
         fileName = local.title!,
-        deviceId = Store.get(StoreKey.deviceIdHash),
         ownerId = Store.get(StoreKey.currentUser).isarId,
         fileModifiedAt = local.modifiedDateTime,
         updatedAt = local.modifiedDateTime,
@@ -53,13 +52,15 @@ class Asset {
     if (local.latitude != null) {
       exifInfo = ExifInfo(lat: local.latitude, long: local.longitude);
     }
+    _local = local;
+    assert(hash.length == 20, "invalid SHA1 hash");
   }
 
   Asset({
     this.id = Isar.autoIncrement,
+    required this.checksum,
     this.remoteId,
     required this.localId,
-    required this.deviceId,
     required this.ownerId,
     required this.fileCreatedAt,
     required this.fileModifiedAt,
@@ -72,7 +73,6 @@ class Asset {
     this.livePhotoVideoId,
     this.exifInfo,
     required this.isFavorite,
-    required this.isLocal,
     required this.isArchived,
   });
 
@@ -83,7 +83,7 @@ class Asset {
   AssetEntity? get local {
     if (isLocal && _local == null) {
       _local = AssetEntity(
-        id: localId,
+        id: localId!,
         typeInt: isImage ? 1 : 2,
         width: width ?? 0,
         height: height ?? 0,
@@ -98,18 +98,21 @@ class Asset {
 
   Id id = Isar.autoIncrement;
 
+  /// stores the raw SHA1 bytes as a base64 String
+  /// because Isar cannot sort lists of byte arrays
+  @Index(
+    unique: true,
+    replace: false,
+    type: IndexType.hash,
+    composite: [CompositeIndex("ownerId")],
+  )
+  String checksum;
+
   @Index(unique: false, replace: false, type: IndexType.hash)
   String? remoteId;
 
-  @Index(
-    unique: false,
-    replace: false,
-    type: IndexType.hash,
-    composite: [CompositeIndex('deviceId')],
-  )
-  String localId;
-
-  int deviceId;
+  @Index(unique: false, replace: false, type: IndexType.hash)
+  String? localId;
 
   int ownerId;
 
@@ -134,14 +137,15 @@ class Asset {
 
   bool isFavorite;
 
-  /// `true` if this [Asset] is present on the device
-  bool isLocal;
-
   bool isArchived;
 
   @ignore
   ExifInfo? exifInfo;
 
+  /// `true` if this [Asset] is present on the device
+  @ignore
+  bool get isLocal => localId != null;
+
   @ignore
   bool get isInDb => id != Isar.autoIncrement;
 
@@ -175,9 +179,9 @@ class Asset {
   bool operator ==(other) {
     if (other is! Asset) return false;
     return id == other.id &&
+        checksum == other.checksum &&
         remoteId == other.remoteId &&
         localId == other.localId &&
-        deviceId == other.deviceId &&
         ownerId == other.ownerId &&
         fileCreatedAt.isAtSameMomentAs(other.fileCreatedAt) &&
         fileModifiedAt.isAtSameMomentAs(other.fileModifiedAt) &&
@@ -197,9 +201,9 @@ class Asset {
   @ignore
   int get hashCode =>
       id.hashCode ^
+      checksum.hashCode ^
       remoteId.hashCode ^
       localId.hashCode ^
-      deviceId.hashCode ^
       ownerId.hashCode ^
       fileCreatedAt.hashCode ^
       fileModifiedAt.hashCode ^
@@ -217,8 +221,7 @@ class Asset {
   /// Returns `true` if this [Asset] can updated with values from parameter [a]
   bool canUpdate(Asset a) {
     assert(isInDb);
-    assert(localId == a.localId);
-    assert(deviceId == a.deviceId);
+    assert(checksum == a.checksum);
     assert(a.storage != AssetState.merged);
     return a.updatedAt.isAfter(updatedAt) ||
         a.isRemote && !isRemote ||
@@ -239,11 +242,18 @@ class Asset {
       if (a.isRemote) {
         return a._copyWith(
           id: id,
-          isLocal: isLocal,
+          localId: localId,
           width: a.width ?? width,
           height: a.height ?? height,
           exifInfo: a.exifInfo?.copyWith(id: id) ?? exifInfo,
         );
+      } else if (isRemote) {
+        return _copyWith(
+          localId: localId ?? a.localId,
+          width: width ?? a.width,
+          height: height ?? a.height,
+          exifInfo: exifInfo ?? a.exifInfo?.copyWith(id: id),
+        );
       } else {
         return a._copyWith(
           id: id,
@@ -270,7 +280,7 @@ class Asset {
       } else {
         // add only missing values (and set isLocal to true)
         return _copyWith(
-          isLocal: true,
+          localId: localId ?? a.localId,
           width: width ?? a.width,
           height: height ?? a.height,
           exifInfo: exifInfo ?? a.exifInfo?.copyWith(id: id),
@@ -281,9 +291,9 @@ class Asset {
 
   Asset _copyWith({
     Id? id,
+    String? checksum,
     String? remoteId,
     String? localId,
-    int? deviceId,
     int? ownerId,
     DateTime? fileCreatedAt,
     DateTime? fileModifiedAt,
@@ -295,15 +305,14 @@ class Asset {
     String? fileName,
     String? livePhotoVideoId,
     bool? isFavorite,
-    bool? isLocal,
     bool? isArchived,
     ExifInfo? exifInfo,
   }) =>
       Asset(
         id: id ?? this.id,
+        checksum: checksum ?? this.checksum,
         remoteId: remoteId ?? this.remoteId,
         localId: localId ?? this.localId,
-        deviceId: deviceId ?? this.deviceId,
         ownerId: ownerId ?? this.ownerId,
         fileCreatedAt: fileCreatedAt ?? this.fileCreatedAt,
         fileModifiedAt: fileModifiedAt ?? this.fileModifiedAt,
@@ -315,7 +324,6 @@ class Asset {
         fileName: fileName ?? this.fileName,
         livePhotoVideoId: livePhotoVideoId ?? this.livePhotoVideoId,
         isFavorite: isFavorite ?? this.isFavorite,
-        isLocal: isLocal ?? this.isLocal,
         isArchived: isArchived ?? this.isArchived,
         exifInfo: exifInfo ?? this.exifInfo,
       );
@@ -328,39 +336,36 @@ class Asset {
     }
   }
 
-  /// compares assets by [ownerId], [deviceId], [localId]
-  static int compareByOwnerDeviceLocalId(Asset a, Asset b) {
-    final int ownerIdOrder = a.ownerId.compareTo(b.ownerId);
-    if (ownerIdOrder != 0) {
-      return ownerIdOrder;
-    }
-    final int deviceIdOrder = a.deviceId.compareTo(b.deviceId);
-    if (deviceIdOrder != 0) {
-      return deviceIdOrder;
-    }
-    final int localIdOrder = a.localId.compareTo(b.localId);
-    return localIdOrder;
-  }
-
-  /// compares assets by [ownerId], [deviceId], [localId], [fileModifiedAt]
-  static int compareByOwnerDeviceLocalIdModified(Asset a, Asset b) {
-    final int order = compareByOwnerDeviceLocalId(a, b);
-    return order != 0 ? order : a.fileModifiedAt.compareTo(b.fileModifiedAt);
-  }
-
   static int compareById(Asset a, Asset b) => a.id.compareTo(b.id);
 
-  static int compareByLocalId(Asset a, Asset b) =>
-      a.localId.compareTo(b.localId);
+  static int compareByChecksum(Asset a, Asset b) =>
+      a.checksum.compareTo(b.checksum);
+
+  static int compareByOwnerChecksum(Asset a, Asset b) {
+    final int ownerIdOrder = a.ownerId.compareTo(b.ownerId);
+    if (ownerIdOrder != 0) return ownerIdOrder;
+    return compareByChecksum(a, b);
+  }
+
+  static int compareByOwnerChecksumCreatedModified(Asset a, Asset b) {
+    final int ownerIdOrder = a.ownerId.compareTo(b.ownerId);
+    if (ownerIdOrder != 0) return ownerIdOrder;
+    final int checksumOrder = compareByChecksum(a, b);
+    if (checksumOrder != 0) return checksumOrder;
+    final int createdOrder = a.fileCreatedAt.compareTo(b.fileCreatedAt);
+    if (createdOrder != 0) return createdOrder;
+    return a.fileModifiedAt.compareTo(b.fileModifiedAt);
+  }
 
   @override
   String toString() {
     return """
 {
+  "id": ${id == Isar.autoIncrement ? '"N/A"' : id},
   "remoteId": "${remoteId ?? "N/A"}",
-  "localId": "$localId", 
-  "deviceId": "$deviceId", 
-  "ownerId": "$ownerId", 
+  "localId": "${localId ?? "N/A"}",
+  "checksum": "$checksum",
+  "ownerId": $ownerId, 
   "livePhotoVideoId": "${livePhotoVideoId ?? "N/A"}",
   "fileCreatedAt": "$fileCreatedAt",
   "fileModifiedAt": "$fileModifiedAt", 
@@ -369,9 +374,8 @@ class Asset {
   "type": "$type",
   "fileName": "$fileName", 
   "isFavorite": $isFavorite, 
-  "isLocal": $isLocal,
   "isRemote: $isRemote,
-  "storage": $storage,
+  "storage": "$storage",
   "width": ${width ?? "N/A"},
   "height": ${height ?? "N/A"},
   "isArchived": $isArchived
@@ -424,10 +428,6 @@ extension AssetsHelper on IsarCollection<Asset> {
   QueryBuilder<Asset, Asset, QAfterWhereClause> _remote(Iterable<String> ids) =>
       where().anyOf(ids, (q, String e) => q.remoteIdEqualTo(e));
   QueryBuilder<Asset, Asset, QAfterWhereClause> _local(Iterable<String> ids) {
-    return where().anyOf(
-      ids,
-      (q, String e) =>
-          q.localIdDeviceIdEqualTo(e, Store.get(StoreKey.deviceIdHash)),
-    );
+    return where().anyOf(ids, (q, String e) => q.localIdEqualTo(e));
   }
 }

mobile/lib/shared/models/asset.g.dart

@@ -17,10 +17,10 @@ const AssetSchema = CollectionSchema(
   name: r'Asset',
   id: -2933289051367723566,
   properties: {
-    r'deviceId': PropertySchema(
+    r'checksum': PropertySchema(
       id: 0,
-      name: r'deviceId',
-      type: IsarType.long,
+      name: r'checksum',
+      type: IsarType.string,
     ),
     r'durationInSeconds': PropertySchema(
       id: 1,
@@ -57,44 +57,39 @@ const AssetSchema = CollectionSchema(
       name: r'isFavorite',
       type: IsarType.bool,
     ),
-    r'isLocal': PropertySchema(
-      id: 8,
-      name: r'isLocal',
-      type: IsarType.bool,
-    ),
     r'livePhotoVideoId': PropertySchema(
-      id: 9,
+      id: 8,
       name: r'livePhotoVideoId',
       type: IsarType.string,
     ),
     r'localId': PropertySchema(
-      id: 10,
+      id: 9,
       name: r'localId',
       type: IsarType.string,
     ),
     r'ownerId': PropertySchema(
-      id: 11,
+      id: 10,
       name: r'ownerId',
       type: IsarType.long,
     ),
     r'remoteId': PropertySchema(
-      id: 12,
+      id: 11,
       name: r'remoteId',
       type: IsarType.string,
     ),
     r'type': PropertySchema(
-      id: 13,
+      id: 12,
       name: r'type',
       type: IsarType.byte,
       enumMap: _AssettypeEnumValueMap,
     ),
     r'updatedAt': PropertySchema(
-      id: 14,
+      id: 13,
       name: r'updatedAt',
       type: IsarType.dateTime,
     ),
     r'width': PropertySchema(
-      id: 15,
+      id: 14,
       name: r'width',
       type: IsarType.int,
     )
@@ -105,6 +100,24 @@ const AssetSchema = CollectionSchema(
   deserializeProp: _assetDeserializeProp,
   idName: r'id',
   indexes: {
+    r'checksum_ownerId': IndexSchema(
+      id: 5611361749756160119,
+      name: r'checksum_ownerId',
+      unique: true,
+      replace: false,
+      properties: [
+        IndexPropertySchema(
+          name: r'checksum',
+          type: IndexType.hash,
+          caseSensitive: true,
+        ),
+        IndexPropertySchema(
+          name: r'ownerId',
+          type: IndexType.value,
+          caseSensitive: false,
+        )
+      ],
+    ),
     r'remoteId': IndexSchema(
       id: 6301175856541681032,
       name: r'remoteId',
@@ -118,9 +131,9 @@ const AssetSchema = CollectionSchema(
         )
       ],
     ),
-    r'localId_deviceId': IndexSchema(
-      id: 7649417350086526165,
-      name: r'localId_deviceId',
+    r'localId': IndexSchema(
+      id: 1199848425898359622,
+      name: r'localId',
       unique: false,
       replace: false,
       properties: [
@@ -128,11 +141,6 @@ const AssetSchema = CollectionSchema(
           name: r'localId',
           type: IndexType.hash,
           caseSensitive: true,
-        ),
-        IndexPropertySchema(
-          name: r'deviceId',
-          type: IndexType.value,
-          caseSensitive: false,
         )
       ],
     )
@@ -151,6 +159,7 @@ int _assetEstimateSize(
   Map<Type, List<int>> allOffsets,
 ) {
   var bytesCount = offsets.last;
+  bytesCount += 3 + object.checksum.length * 3;
   bytesCount += 3 + object.fileName.length * 3;
   {
     final value = object.livePhotoVideoId;
@@ -158,7 +167,12 @@ int _assetEstimateSize(
       bytesCount += 3 + value.length * 3;
     }
   }
-  bytesCount += 3 + object.localId.length * 3;
+  {
+    final value = object.localId;
+    if (value != null) {
+      bytesCount += 3 + value.length * 3;
+    }
+  }
   {
     final value = object.remoteId;
     if (value != null) {
@@ -174,7 +188,7 @@ void _assetSerialize(
   List<int> offsets,
   Map<Type, List<int>> allOffsets,
 ) {
-  writer.writeLong(offsets[0], object.deviceId);
+  writer.writeString(offsets[0], object.checksum);
   writer.writeLong(offsets[1], object.durationInSeconds);
   writer.writeDateTime(offsets[2], object.fileCreatedAt);
   writer.writeDateTime(offsets[3], object.fileModifiedAt);
@@ -182,14 +196,13 @@ void _assetSerialize(
   writer.writeInt(offsets[5], object.height);
   writer.writeBool(offsets[6], object.isArchived);
   writer.writeBool(offsets[7], object.isFavorite);
-  writer.writeBool(offsets[8], object.isLocal);
-  writer.writeString(offsets[9], object.livePhotoVideoId);
-  writer.writeString(offsets[10], object.localId);
-  writer.writeLong(offsets[11], object.ownerId);
-  writer.writeString(offsets[12], object.remoteId);
-  writer.writeByte(offsets[13], object.type.index);
-  writer.writeDateTime(offsets[14], object.updatedAt);
-  writer.writeInt(offsets[15], object.width);
+  writer.writeString(offsets[8], object.livePhotoVideoId);
+  writer.writeString(offsets[9], object.localId);
+  writer.writeLong(offsets[10], object.ownerId);
+  writer.writeString(offsets[11], object.remoteId);
+  writer.writeByte(offsets[12], object.type.index);
+  writer.writeDateTime(offsets[13], object.updatedAt);
+  writer.writeInt(offsets[14], object.width);
 }
 
 Asset _assetDeserialize(
@@ -199,7 +212,7 @@ Asset _assetDeserialize(
   Map<Type, List<int>> allOffsets,
 ) {
   final object = Asset(
-    deviceId: reader.readLong(offsets[0]),
+    checksum: reader.readString(offsets[0]),
     durationInSeconds: reader.readLong(offsets[1]),
     fileCreatedAt: reader.readDateTime(offsets[2]),
     fileModifiedAt: reader.readDateTime(offsets[3]),
@@ -208,15 +221,14 @@ Asset _assetDeserialize(
     id: id,
     isArchived: reader.readBool(offsets[6]),
     isFavorite: reader.readBool(offsets[7]),
-    isLocal: reader.readBool(offsets[8]),
-    livePhotoVideoId: reader.readStringOrNull(offsets[9]),
-    localId: reader.readString(offsets[10]),
-    ownerId: reader.readLong(offsets[11]),
-    remoteId: reader.readStringOrNull(offsets[12]),
-    type: _AssettypeValueEnumMap[reader.readByteOrNull(offsets[13])] ??
+    livePhotoVideoId: reader.readStringOrNull(offsets[8]),
+    localId: reader.readStringOrNull(offsets[9]),
+    ownerId: reader.readLong(offsets[10]),
+    remoteId: reader.readStringOrNull(offsets[11]),
+    type: _AssettypeValueEnumMap[reader.readByteOrNull(offsets[12])] ??
         AssetType.other,
-    updatedAt: reader.readDateTime(offsets[14]),
-    width: reader.readIntOrNull(offsets[15]),
+    updatedAt: reader.readDateTime(offsets[13]),
+    width: reader.readIntOrNull(offsets[14]),
   );
   return object;
 }
@@ -229,7 +241,7 @@ P _assetDeserializeProp<P>(
 ) {
   switch (propertyId) {
     case 0:
-      return (reader.readLong(offset)) as P;
+      return (reader.readString(offset)) as P;
     case 1:
       return (reader.readLong(offset)) as P;
     case 2:
@@ -245,21 +257,19 @@ P _assetDeserializeProp<P>(
     case 7:
       return (reader.readBool(offset)) as P;
     case 8:
-      return (reader.readBool(offset)) as P;
+      return (reader.readStringOrNull(offset)) as P;
     case 9:
       return (reader.readStringOrNull(offset)) as P;
     case 10:
-      return (reader.readString(offset)) as P;
-    case 11:
       return (reader.readLong(offset)) as P;
-    case 12:
+    case 11:
       return (reader.readStringOrNull(offset)) as P;
-    case 13:
+    case 12:
       return (_AssettypeValueEnumMap[reader.readByteOrNull(offset)] ??
           AssetType.other) as P;
-    case 14:
+    case 13:
       return (reader.readDateTime(offset)) as P;
-    case 15:
+    case 14:
       return (reader.readIntOrNull(offset)) as P;
     default:
       throw IsarError('Unknown property with id $propertyId');
@@ -291,6 +301,94 @@ void _assetAttach(IsarCollection<dynamic> col, Id id, Asset object) {
   object.id = id;
 }
 
+extension AssetByIndex on IsarCollection<Asset> {
+  Future<Asset?> getByChecksumOwnerId(String checksum, int ownerId) {
+    return getByIndex(r'checksum_ownerId', [checksum, ownerId]);
+  }
+
+  Asset? getByChecksumOwnerIdSync(String checksum, int ownerId) {
+    return getByIndexSync(r'checksum_ownerId', [checksum, ownerId]);
+  }
+
+  Future<bool> deleteByChecksumOwnerId(String checksum, int ownerId) {
+    return deleteByIndex(r'checksum_ownerId', [checksum, ownerId]);
+  }
+
+  bool deleteByChecksumOwnerIdSync(String checksum, int ownerId) {
+    return deleteByIndexSync(r'checksum_ownerId', [checksum, ownerId]);
+  }
+
+  Future<List<Asset?>> getAllByChecksumOwnerId(
+      List<String> checksumValues, List<int> ownerIdValues) {
+    final len = checksumValues.length;
+    assert(ownerIdValues.length == len,
+        'All index values must have the same length');
+    final values = <List<dynamic>>[];
+    for (var i = 0; i < len; i++) {
+      values.add([checksumValues[i], ownerIdValues[i]]);
+    }
+
+    return getAllByIndex(r'checksum_ownerId', values);
+  }
+
+  List<Asset?> getAllByChecksumOwnerIdSync(
+      List<String> checksumValues, List<int> ownerIdValues) {
+    final len = checksumValues.length;
+    assert(ownerIdValues.length == len,
+        'All index values must have the same length');
+    final values = <List<dynamic>>[];
+    for (var i = 0; i < len; i++) {
+      values.add([checksumValues[i], ownerIdValues[i]]);
+    }
+
+    return getAllByIndexSync(r'checksum_ownerId', values);
+  }
+
+  Future<int> deleteAllByChecksumOwnerId(
+      List<String> checksumValues, List<int> ownerIdValues) {
+    final len = checksumValues.length;
+    assert(ownerIdValues.length == len,
+        'All index values must have the same length');
+    final values = <List<dynamic>>[];
+    for (var i = 0; i < len; i++) {
+      values.add([checksumValues[i], ownerIdValues[i]]);
+    }
+
+    return deleteAllByIndex(r'checksum_ownerId', values);
+  }
+
+  int deleteAllByChecksumOwnerIdSync(
+      List<String> checksumValues, List<int> ownerIdValues) {
+    final len = checksumValues.length;
+    assert(ownerIdValues.length == len,
+        'All index values must have the same length');
+    final values = <List<dynamic>>[];
+    for (var i = 0; i < len; i++) {
+      values.add([checksumValues[i], ownerIdValues[i]]);
+    }
+
+    return deleteAllByIndexSync(r'checksum_ownerId', values);
+  }
+
+  Future<Id> putByChecksumOwnerId(Asset object) {
+    return putByIndex(r'checksum_ownerId', object);
+  }
+
+  Id putByChecksumOwnerIdSync(Asset object, {bool saveLinks = true}) {
+    return putByIndexSync(r'checksum_ownerId', object, saveLinks: saveLinks);
+  }
+
+  Future<List<Id>> putAllByChecksumOwnerId(List<Asset> objects) {
+    return putAllByIndex(r'checksum_ownerId', objects);
+  }
+
+  List<Id> putAllByChecksumOwnerIdSync(List<Asset> objects,
+      {bool saveLinks = true}) {
+    return putAllByIndexSync(r'checksum_ownerId', objects,
+        saveLinks: saveLinks);
+  }
+}
+
 extension AssetQueryWhereSort on QueryBuilder<Asset, Asset, QWhere> {
   QueryBuilder<Asset, Asset, QAfterWhere> anyId() {
     return QueryBuilder.apply(this, (query) {
@@ -365,6 +463,145 @@ extension AssetQueryWhere on QueryBuilder<Asset, Asset, QWhereClause> {
     });
   }
 
+  QueryBuilder<Asset, Asset, QAfterWhereClause> checksumEqualToAnyOwnerId(
+      String checksum) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addWhereClause(IndexWhereClause.equalTo(
+        indexName: r'checksum_ownerId',
+        value: [checksum],
+      ));
+    });
+  }
+
+  QueryBuilder<Asset, Asset, QAfterWhereClause> checksumNotEqualToAnyOwnerId(
+      String checksum) {
+    return QueryBuilder.apply(this, (query) {
+      if (query.whereSort == Sort.asc) {
+        return query
+            .addWhereClause(IndexWhereClause.between(
+              indexName: r'checksum_ownerId',
+              lower: [],
+              upper: [checksum],
+              includeUpper: false,
+            ))
+            .addWhereClause(IndexWhereClause.between(
+              indexName: r'checksum_ownerId',
+              lower: [checksum],
+              includeLower: false,
+              upper: [],
+            ));
+      } else {
+        return query
+            .addWhereClause(IndexWhereClause.between(
+              indexName: r'checksum_ownerId',
+              lower: [checksum],
+              includeLower: false,
+              upper: [],
+            ))
+            .addWhereClause(IndexWhereClause.between(
+              indexName: r'checksum_ownerId',
+              lower: [],
+              upper: [checksum],
+              includeUpper: false,
+            ));
+      }
+    });
+  }
+
+  QueryBuilder<Asset, Asset, QAfterWhereClause> checksumOwnerIdEqualTo(
+      String checksum, int ownerId) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addWhereClause(IndexWhereClause.equalTo(
+        indexName: r'checksum_ownerId',
+        value: [checksum, ownerId],
+      ));
+    });
+  }
+
+  QueryBuilder<Asset, Asset, QAfterWhereClause>
+      checksumEqualToOwnerIdNotEqualTo(String checksum, int ownerId) {
+    return QueryBuilder.apply(this, (query) {
+      if (query.whereSort == Sort.asc) {
+        return query
+            .addWhereClause(IndexWhereClause.between(
+              indexName: r'checksum_ownerId',
+              lower: [checksum],
+              upper: [checksum, ownerId],
+              includeUpper: false,
+            ))
+            .addWhereClause(IndexWhereClause.between(
+              indexName: r'checksum_ownerId',
+              lower: [checksum, ownerId],
+              includeLower: false,
+              upper: [checksum],
+            ));
+      } else {
+        return query
+            .addWhereClause(IndexWhereClause.between(
+              indexName: r'checksum_ownerId',
+              lower: [checksum, ownerId],
+              includeLower: false,
+              upper: [checksum],
+            ))
+            .addWhereClause(IndexWhereClause.between(
+              indexName: r'checksum_ownerId',
+              lower: [checksum],
+              upper: [checksum, ownerId],
+              includeUpper: false,
+            ));
+      }
+    });
+  }
+
+  QueryBuilder<Asset, Asset, QAfterWhereClause>
+      checksumEqualToOwnerIdGreaterThan(
+    String checksum,
+    int ownerId, {
+    bool include = false,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addWhereClause(IndexWhereClause.between(
+        indexName: r'checksum_ownerId',
+        lower: [checksum, ownerId],
+        includeLower: include,
+        upper: [checksum],
+      ));
+    });
+  }
+
+  QueryBuilder<Asset, Asset, QAfterWhereClause> checksumEqualToOwnerIdLessThan(
+    String checksum,
+    int ownerId, {
+    bool include = false,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addWhereClause(IndexWhereClause.between(
+        indexName: r'checksum_ownerId',
+        lower: [checksum],
+        upper: [checksum, ownerId],
+        includeUpper: include,
+      ));
+    });
+  }
+
+  QueryBuilder<Asset, Asset, QAfterWhereClause> checksumEqualToOwnerIdBetween(
+    String checksum,
+    int lowerOwnerId,
+    int upperOwnerId, {
+    bool includeLower = true,
+    bool includeUpper = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addWhereClause(IndexWhereClause.between(
+        indexName: r'checksum_ownerId',
+        lower: [checksum, lowerOwnerId],
+        includeLower: includeLower,
+        upper: [checksum, upperOwnerId],
+        includeUpper: includeUpper,
+      ));
+    });
+  }
+
   QueryBuilder<Asset, Asset, QAfterWhereClause> remoteIdIsNull() {
     return QueryBuilder.apply(this, (query) {
       return query.addWhereClause(IndexWhereClause.equalTo(
@@ -430,29 +667,49 @@ extension AssetQueryWhere on QueryBuilder<Asset, Asset, QWhereClause> {
     });
   }
 
-  QueryBuilder<Asset, Asset, QAfterWhereClause> localIdEqualToAnyDeviceId(
-      String localId) {
+  QueryBuilder<Asset, Asset, QAfterWhereClause> localIdIsNull() {
     return QueryBuilder.apply(this, (query) {
       return query.addWhereClause(IndexWhereClause.equalTo(
-        indexName: r'localId_deviceId',
+        indexName: r'localId',
+        value: [null],
+      ));
+    });
+  }
+
+  QueryBuilder<Asset, Asset, QAfterWhereClause> localIdIsNotNull() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addWhereClause(IndexWhereClause.between(
+        indexName: r'localId',
+        lower: [null],
+        includeLower: false,
+        upper: [],
+      ));
+    });
+  }
+
+  QueryBuilder<Asset, Asset, QAfterWhereClause> localIdEqualTo(
+      String? localId) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addWhereClause(IndexWhereClause.equalTo(
+        indexName: r'localId',
         value: [localId],
       ));
     });
   }
 
-  QueryBuilder<Asset, Asset, QAfterWhereClause> localIdNotEqualToAnyDeviceId(
-      String localId) {
+  QueryBuilder<Asset, Asset, QAfterWhereClause> localIdNotEqualTo(
+      String? localId) {
     return QueryBuilder.apply(this, (query) {
       if (query.whereSort == Sort.asc) {
         return query
             .addWhereClause(IndexWhereClause.between(
-              indexName: r'localId_deviceId',
+              indexName: r'localId',
               lower: [],
               upper: [localId],
               includeUpper: false,
             ))
             .addWhereClause(IndexWhereClause.between(
-              indexName: r'localId_deviceId',
+              indexName: r'localId',
               lower: [localId],
               includeLower: false,
               upper: [],
@@ -460,13 +717,13 @@ extension AssetQueryWhere on QueryBuilder<Asset, Asset, QWhereClause> {
       } else {
         return query
             .addWhereClause(IndexWhereClause.between(
-              indexName: r'localId_deviceId',
+              indexName: r'localId',
               lower: [localId],
               includeLower: false,
               upper: [],
             ))
             .addWhereClause(IndexWhereClause.between(
-              indexName: r'localId_deviceId',
+              indexName: r'localId',
               lower: [],
               upper: [localId],
               includeUpper: false,
@@ -474,151 +731,135 @@ extension AssetQueryWhere on QueryBuilder<Asset, Asset, QWhereClause> {
       }
     });
   }
-
-  QueryBuilder<Asset, Asset, QAfterWhereClause> localIdDeviceIdEqualTo(
-      String localId, int deviceId) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addWhereClause(IndexWhereClause.equalTo(
-        indexName: r'localId_deviceId',
-        value: [localId, deviceId],
-      ));
-    });
-  }
-
-  QueryBuilder<Asset, Asset, QAfterWhereClause>
-      localIdEqualToDeviceIdNotEqualTo(String localId, int deviceId) {
-    return QueryBuilder.apply(this, (query) {
-      if (query.whereSort == Sort.asc) {
-        return query
-            .addWhereClause(IndexWhereClause.between(
-              indexName: r'localId_deviceId',
-              lower: [localId],
-              upper: [localId, deviceId],
-              includeUpper: false,
-            ))
-            .addWhereClause(IndexWhereClause.between(
-              indexName: r'localId_deviceId',
-              lower: [localId, deviceId],
-              includeLower: false,
-              upper: [localId],
-            ));
-      } else {
-        return query
-            .addWhereClause(IndexWhereClause.between(
-              indexName: r'localId_deviceId',
-              lower: [localId, deviceId],
-              includeLower: false,
-              upper: [localId],
-            ))
-            .addWhereClause(IndexWhereClause.between(
-              indexName: r'localId_deviceId',
-              lower: [localId],
-              upper: [localId, deviceId],
-              includeUpper: false,
-            ));
-      }
-    });
-  }
-
-  QueryBuilder<Asset, Asset, QAfterWhereClause>
-      localIdEqualToDeviceIdGreaterThan(
-    String localId,
-    int deviceId, {
-    bool include = false,
-  }) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addWhereClause(IndexWhereClause.between(
-        indexName: r'localId_deviceId',
-        lower: [localId, deviceId],
-        includeLower: include,
-        upper: [localId],
-      ));
-    });
-  }
-
-  QueryBuilder<Asset, Asset, QAfterWhereClause> localIdEqualToDeviceIdLessThan(
-    String localId,
-    int deviceId, {
-    bool include = false,
-  }) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addWhereClause(IndexWhereClause.between(
-        indexName: r'localId_deviceId',
-        lower: [localId],
-        upper: [localId, deviceId],
-        includeUpper: include,
-      ));
-    });
-  }
-
-  QueryBuilder<Asset, Asset, QAfterWhereClause> localIdEqualToDeviceIdBetween(
-    String localId,
-    int lowerDeviceId,
-    int upperDeviceId, {
-    bool includeLower = true,
-    bool includeUpper = true,
-  }) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addWhereClause(IndexWhereClause.between(
-        indexName: r'localId_deviceId',
-        lower: [localId, lowerDeviceId],
-        includeLower: includeLower,
-        upper: [localId, upperDeviceId],
-        includeUpper: includeUpper,
-      ));
-    });
-  }
 }
 
 extension AssetQueryFilter on QueryBuilder<Asset, Asset, QFilterCondition> {
-  QueryBuilder<Asset, Asset, QAfterFilterCondition> deviceIdEqualTo(int value) {
+  QueryBuilder<Asset, Asset, QAfterFilterCondition> checksumEqualTo(
+    String value, {
+    bool caseSensitive = true,
+  }) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.equalTo(
-        property: r'deviceId',
+        property: r'checksum',
         value: value,
+        caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<Asset, Asset, QAfterFilterCondition> deviceIdGreaterThan(
-    int value, {
+  QueryBuilder<Asset, Asset, QAfterFilterCondition> checksumGreaterThan(
+    String value, {
     bool include = false,
+    bool caseSensitive = true,
   }) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.greaterThan(
         include: include,
-        property: r'deviceId',
+        property: r'checksum',
         value: value,
+        caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<Asset, Asset, QAfterFilterCondition> deviceIdLessThan(
-    int value, {
+  QueryBuilder<Asset, Asset, QAfterFilterCondition> checksumLessThan(
+    String value, {
     bool include = false,
+    bool caseSensitive = true,
   }) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.lessThan(
         include: include,
-        property: r'deviceId',
+        property: r'checksum',
         value: value,
+        caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<Asset, Asset, QAfterFilterCondition> deviceIdBetween(
-    int lower,
-    int upper, {
+  QueryBuilder<Asset, Asset, QAfterFilterCondition> checksumBetween(
+    String lower,
+    String upper, {
     bool includeLower = true,
     bool includeUpper = true,
+    bool caseSensitive = true,
   }) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.between(
-        property: r'deviceId',
+        property: r'checksum',
         lower: lower,
         includeLower: includeLower,
         upper: upper,
         includeUpper: includeUpper,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<Asset, Asset, QAfterFilterCondition> checksumStartsWith(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.startsWith(
+        property: r'checksum',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<Asset, Asset, QAfterFilterCondition> checksumEndsWith(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.endsWith(
+        property: r'checksum',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<Asset, Asset, QAfterFilterCondition> checksumContains(
+      String value,
+      {bool caseSensitive = true}) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.contains(
+        property: r'checksum',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<Asset, Asset, QAfterFilterCondition> checksumMatches(
+      String pattern,
+      {bool caseSensitive = true}) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.matches(
+        property: r'checksum',
+        wildcard: pattern,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<Asset, Asset, QAfterFilterCondition> checksumIsEmpty() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.equalTo(
+        property: r'checksum',
+        value: '',
+      ));
+    });
+  }
+
+  QueryBuilder<Asset, Asset, QAfterFilterCondition> checksumIsNotEmpty() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.greaterThan(
+        property: r'checksum',
+        value: '',
       ));
     });
   }
@@ -1053,15 +1294,6 @@ extension AssetQueryFilter on QueryBuilder<Asset, Asset, QFilterCondition> {
     });
   }
 
-  QueryBuilder<Asset, Asset, QAfterFilterCondition> isLocalEqualTo(bool value) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(FilterCondition.equalTo(
-        property: r'isLocal',
-        value: value,
-      ));
-    });
-  }
-
   QueryBuilder<Asset, Asset, QAfterFilterCondition> livePhotoVideoIdIsNull() {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(const FilterCondition.isNull(
@@ -1210,8 +1442,24 @@ extension AssetQueryFilter on QueryBuilder<Asset, Asset, QFilterCondition> {
     });
   }
 
+  QueryBuilder<Asset, Asset, QAfterFilterCondition> localIdIsNull() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(const FilterCondition.isNull(
+        property: r'localId',
+      ));
+    });
+  }
+
+  QueryBuilder<Asset, Asset, QAfterFilterCondition> localIdIsNotNull() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(const FilterCondition.isNotNull(
+        property: r'localId',
+      ));
+    });
+  }
+
   QueryBuilder<Asset, Asset, QAfterFilterCondition> localIdEqualTo(
-    String value, {
+    String? value, {
     bool caseSensitive = true,
   }) {
     return QueryBuilder.apply(this, (query) {
@@ -1224,7 +1472,7 @@ extension AssetQueryFilter on QueryBuilder<Asset, Asset, QFilterCondition> {
   }
 
   QueryBuilder<Asset, Asset, QAfterFilterCondition> localIdGreaterThan(
-    String value, {
+    String? value, {
     bool include = false,
     bool caseSensitive = true,
   }) {
@@ -1239,7 +1487,7 @@ extension AssetQueryFilter on QueryBuilder<Asset, Asset, QFilterCondition> {
   }
 
   QueryBuilder<Asset, Asset, QAfterFilterCondition> localIdLessThan(
-    String value, {
+    String? value, {
     bool include = false,
     bool caseSensitive = true,
   }) {
@@ -1254,8 +1502,8 @@ extension AssetQueryFilter on QueryBuilder<Asset, Asset, QFilterCondition> {
   }
 
   QueryBuilder<Asset, Asset, QAfterFilterCondition> localIdBetween(
-    String lower,
-    String upper, {
+    String? lower,
+    String? upper, {
     bool includeLower = true,
     bool includeUpper = true,
     bool caseSensitive = true,
@@ -1718,15 +1966,15 @@ extension AssetQueryObject on QueryBuilder<Asset, Asset, QFilterCondition> {}
 extension AssetQueryLinks on QueryBuilder<Asset, Asset, QFilterCondition> {}
 
 extension AssetQuerySortBy on QueryBuilder<Asset, Asset, QSortBy> {
-  QueryBuilder<Asset, Asset, QAfterSortBy> sortByDeviceId() {
+  QueryBuilder<Asset, Asset, QAfterSortBy> sortByChecksum() {
     return QueryBuilder.apply(this, (query) {
-      return query.addSortBy(r'deviceId', Sort.asc);
+      return query.addSortBy(r'checksum', Sort.asc);
     });
   }
 
-  QueryBuilder<Asset, Asset, QAfterSortBy> sortByDeviceIdDesc() {
+  QueryBuilder<Asset, Asset, QAfterSortBy> sortByChecksumDesc() {
     return QueryBuilder.apply(this, (query) {
-      return query.addSortBy(r'deviceId', Sort.desc);
+      return query.addSortBy(r'checksum', Sort.desc);
     });
   }
 
@@ -1814,18 +2062,6 @@ extension AssetQuerySortBy on QueryBuilder<Asset, Asset, QSortBy> {
     });
   }
 
-  QueryBuilder<Asset, Asset, QAfterSortBy> sortByIsLocal() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addSortBy(r'isLocal', Sort.asc);
-    });
-  }
-
-  QueryBuilder<Asset, Asset, QAfterSortBy> sortByIsLocalDesc() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addSortBy(r'isLocal', Sort.desc);
-    });
-  }
-
   QueryBuilder<Asset, Asset, QAfterSortBy> sortByLivePhotoVideoId() {
     return QueryBuilder.apply(this, (query) {
       return query.addSortBy(r'livePhotoVideoId', Sort.asc);
@@ -1912,15 +2148,15 @@ extension AssetQuerySortBy on QueryBuilder<Asset, Asset, QSortBy> {
 }
 
 extension AssetQuerySortThenBy on QueryBuilder<Asset, Asset, QSortThenBy> {
-  QueryBuilder<Asset, Asset, QAfterSortBy> thenByDeviceId() {
+  QueryBuilder<Asset, Asset, QAfterSortBy> thenByChecksum() {
     return QueryBuilder.apply(this, (query) {
-      return query.addSortBy(r'deviceId', Sort.asc);
+      return query.addSortBy(r'checksum', Sort.asc);
     });
   }
 
-  QueryBuilder<Asset, Asset, QAfterSortBy> thenByDeviceIdDesc() {
+  QueryBuilder<Asset, Asset, QAfterSortBy> thenByChecksumDesc() {
     return QueryBuilder.apply(this, (query) {
-      return query.addSortBy(r'deviceId', Sort.desc);
+      return query.addSortBy(r'checksum', Sort.desc);
     });
   }
 
@@ -2020,18 +2256,6 @@ extension AssetQuerySortThenBy on QueryBuilder<Asset, Asset, QSortThenBy> {
     });
   }
 
-  QueryBuilder<Asset, Asset, QAfterSortBy> thenByIsLocal() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addSortBy(r'isLocal', Sort.asc);
-    });
-  }
-
-  QueryBuilder<Asset, Asset, QAfterSortBy> thenByIsLocalDesc() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addSortBy(r'isLocal', Sort.desc);
-    });
-  }
-
   QueryBuilder<Asset, Asset, QAfterSortBy> thenByLivePhotoVideoId() {
     return QueryBuilder.apply(this, (query) {
       return query.addSortBy(r'livePhotoVideoId', Sort.asc);
@@ -2118,9 +2342,10 @@ extension AssetQuerySortThenBy on QueryBuilder<Asset, Asset, QSortThenBy> {
 }
 
 extension AssetQueryWhereDistinct on QueryBuilder<Asset, Asset, QDistinct> {
-  QueryBuilder<Asset, Asset, QDistinct> distinctByDeviceId() {
+  QueryBuilder<Asset, Asset, QDistinct> distinctByChecksum(
+      {bool caseSensitive = true}) {
     return QueryBuilder.apply(this, (query) {
-      return query.addDistinctBy(r'deviceId');
+      return query.addDistinctBy(r'checksum', caseSensitive: caseSensitive);
     });
   }
 
@@ -2167,12 +2392,6 @@ extension AssetQueryWhereDistinct on QueryBuilder<Asset, Asset, QDistinct> {
     });
   }
 
-  QueryBuilder<Asset, Asset, QDistinct> distinctByIsLocal() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addDistinctBy(r'isLocal');
-    });
-  }
-
   QueryBuilder<Asset, Asset, QDistinct> distinctByLivePhotoVideoId(
       {bool caseSensitive = true}) {
     return QueryBuilder.apply(this, (query) {
@@ -2227,9 +2446,9 @@ extension AssetQueryProperty on QueryBuilder<Asset, Asset, QQueryProperty> {
     });
   }
 
-  QueryBuilder<Asset, int, QQueryOperations> deviceIdProperty() {
+  QueryBuilder<Asset, String, QQueryOperations> checksumProperty() {
     return QueryBuilder.apply(this, (query) {
-      return query.addPropertyName(r'deviceId');
+      return query.addPropertyName(r'checksum');
     });
   }
 
@@ -2275,19 +2494,13 @@ extension AssetQueryProperty on QueryBuilder<Asset, Asset, QQueryProperty> {
     });
   }
 
-  QueryBuilder<Asset, bool, QQueryOperations> isLocalProperty() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addPropertyName(r'isLocal');
-    });
-  }
-
   QueryBuilder<Asset, String?, QQueryOperations> livePhotoVideoIdProperty() {
     return QueryBuilder.apply(this, (query) {
       return query.addPropertyName(r'livePhotoVideoId');
     });
   }
 
-  QueryBuilder<Asset, String, QQueryOperations> localIdProperty() {
+  QueryBuilder<Asset, String?, QQueryOperations> localIdProperty() {
     return QueryBuilder.apply(this, (query) {
       return query.addPropertyName(r'localId');
     });

mobile/lib/shared/models/device_asset.dart

@@ -0,0 +1,8 @@
+import 'package:isar/isar.dart';
+
+class DeviceAsset {
+  DeviceAsset({required this.hash});
+
+  @Index(unique: false, type: IndexType.hash)
+  List<byte> hash;
+}

mobile/lib/shared/models/ios_device_asset.dart

@@ -0,0 +1,14 @@
+import 'package:immich_mobile/shared/models/device_asset.dart';
+import 'package:immich_mobile/utils/hash.dart';
+import 'package:isar/isar.dart';
+
+part 'ios_device_asset.g.dart';
+
+@Collection()
+class IOSDeviceAsset extends DeviceAsset {
+  IOSDeviceAsset({required this.id, required super.hash});
+
+  @Index(replace: true, unique: true, type: IndexType.hash)
+  String id;
+  Id get isarId => fastHash(id);
+}

mobile/lib/shared/models/ios_device_asset.g.dart

@@ -0,0 +1,780 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'ios_device_asset.dart';
+
+// **************************************************************************
+// IsarCollectionGenerator
+// **************************************************************************
+
+// coverage:ignore-file
+// ignore_for_file: duplicate_ignore, non_constant_identifier_names, constant_identifier_names, invalid_use_of_protected_member, unnecessary_cast, prefer_const_constructors, lines_longer_than_80_chars, require_trailing_commas, inference_failure_on_function_invocation, unnecessary_parenthesis, unnecessary_raw_strings, unnecessary_null_checks, join_return_with_assignment, prefer_final_locals, avoid_js_rounded_ints, avoid_positional_boolean_parameters, always_specify_types
+
+extension GetIOSDeviceAssetCollection on Isar {
+  IsarCollection<IOSDeviceAsset> get iOSDeviceAssets => this.collection();
+}
+
+const IOSDeviceAssetSchema = CollectionSchema(
+  name: r'IOSDeviceAsset',
+  id: -1671546753821948030,
+  properties: {
+    r'hash': PropertySchema(
+      id: 0,
+      name: r'hash',
+      type: IsarType.byteList,
+    ),
+    r'id': PropertySchema(
+      id: 1,
+      name: r'id',
+      type: IsarType.string,
+    )
+  },
+  estimateSize: _iOSDeviceAssetEstimateSize,
+  serialize: _iOSDeviceAssetSerialize,
+  deserialize: _iOSDeviceAssetDeserialize,
+  deserializeProp: _iOSDeviceAssetDeserializeProp,
+  idName: r'isarId',
+  indexes: {
+    r'id': IndexSchema(
+      id: -3268401673993471357,
+      name: r'id',
+      unique: true,
+      replace: true,
+      properties: [
+        IndexPropertySchema(
+          name: r'id',
+          type: IndexType.hash,
+          caseSensitive: true,
+        )
+      ],
+    ),
+    r'hash': IndexSchema(
+      id: -7973251393006690288,
+      name: r'hash',
+      unique: false,
+      replace: false,
+      properties: [
+        IndexPropertySchema(
+          name: r'hash',
+          type: IndexType.hash,
+          caseSensitive: false,
+        )
+      ],
+    )
+  },
+  links: {},
+  embeddedSchemas: {},
+  getId: _iOSDeviceAssetGetId,
+  getLinks: _iOSDeviceAssetGetLinks,
+  attach: _iOSDeviceAssetAttach,
+  version: '3.1.0+1',
+);
+
+int _iOSDeviceAssetEstimateSize(
+  IOSDeviceAsset object,
+  List<int> offsets,
+  Map<Type, List<int>> allOffsets,
+) {
+  var bytesCount = offsets.last;
+  bytesCount += 3 + object.hash.length;
+  bytesCount += 3 + object.id.length * 3;
+  return bytesCount;
+}
+
+void _iOSDeviceAssetSerialize(
+  IOSDeviceAsset object,
+  IsarWriter writer,
+  List<int> offsets,
+  Map<Type, List<int>> allOffsets,
+) {
+  writer.writeByteList(offsets[0], object.hash);
+  writer.writeString(offsets[1], object.id);
+}
+
+IOSDeviceAsset _iOSDeviceAssetDeserialize(
+  Id id,
+  IsarReader reader,
+  List<int> offsets,
+  Map<Type, List<int>> allOffsets,
+) {
+  final object = IOSDeviceAsset(
+    hash: reader.readByteList(offsets[0]) ?? [],
+    id: reader.readString(offsets[1]),
+  );
+  return object;
+}
+
+P _iOSDeviceAssetDeserializeProp<P>(
+  IsarReader reader,
+  int propertyId,
+  int offset,
+  Map<Type, List<int>> allOffsets,
+) {
+  switch (propertyId) {
+    case 0:
+      return (reader.readByteList(offset) ?? []) as P;
+    case 1:
+      return (reader.readString(offset)) as P;
+    default:
+      throw IsarError('Unknown property with id $propertyId');
+  }
+}
+
+Id _iOSDeviceAssetGetId(IOSDeviceAsset object) {
+  return object.isarId;
+}
+
+List<IsarLinkBase<dynamic>> _iOSDeviceAssetGetLinks(IOSDeviceAsset object) {
+  return [];
+}
+
+void _iOSDeviceAssetAttach(
+    IsarCollection<dynamic> col, Id id, IOSDeviceAsset object) {}
+
+extension IOSDeviceAssetByIndex on IsarCollection<IOSDeviceAsset> {
+  Future<IOSDeviceAsset?> getById(String id) {
+    return getByIndex(r'id', [id]);
+  }
+
+  IOSDeviceAsset? getByIdSync(String id) {
+    return getByIndexSync(r'id', [id]);
+  }
+
+  Future<bool> deleteById(String id) {
+    return deleteByIndex(r'id', [id]);
+  }
+
+  bool deleteByIdSync(String id) {
+    return deleteByIndexSync(r'id', [id]);
+  }
+
+  Future<List<IOSDeviceAsset?>> getAllById(List<String> idValues) {
+    final values = idValues.map((e) => [e]).toList();
+    return getAllByIndex(r'id', values);
+  }
+
+  List<IOSDeviceAsset?> getAllByIdSync(List<String> idValues) {
+    final values = idValues.map((e) => [e]).toList();
+    return getAllByIndexSync(r'id', values);
+  }
+
+  Future<int> deleteAllById(List<String> idValues) {
+    final values = idValues.map((e) => [e]).toList();
+    return deleteAllByIndex(r'id', values);
+  }
+
+  int deleteAllByIdSync(List<String> idValues) {
+    final values = idValues.map((e) => [e]).toList();
+    return deleteAllByIndexSync(r'id', values);
+  }
+
+  Future<Id> putById(IOSDeviceAsset object) {
+    return putByIndex(r'id', object);
+  }
+
+  Id putByIdSync(IOSDeviceAsset object, {bool saveLinks = true}) {
+    return putByIndexSync(r'id', object, saveLinks: saveLinks);
+  }
+
+  Future<List<Id>> putAllById(List<IOSDeviceAsset> objects) {
+    return putAllByIndex(r'id', objects);
+  }
+
+  List<Id> putAllByIdSync(List<IOSDeviceAsset> objects,
+      {bool saveLinks = true}) {
+    return putAllByIndexSync(r'id', objects, saveLinks: saveLinks);
+  }
+}
+
+extension IOSDeviceAssetQueryWhereSort
+    on QueryBuilder<IOSDeviceAsset, IOSDeviceAsset, QWhere> {
+  QueryBuilder<IOSDeviceAsset, IOSDeviceAsset, QAfterWhere> anyIsarId() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addWhereClause(const IdWhereClause.any());
+    });
+  }
+}
+
+extension IOSDeviceAssetQueryWhere
+    on QueryBuilder<IOSDeviceAsset, IOSDeviceAsset, QWhereClause> {
+  QueryBuilder<IOSDeviceAsset, IOSDeviceAsset, QAfterWhereClause> isarIdEqualTo(
+      Id isarId) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addWhereClause(IdWhereClause.between(
+        lower: isarId,
+        upper: isarId,
+      ));
+    });
+  }
+
+  QueryBuilder<IOSDeviceAsset, IOSDeviceAsset, QAfterWhereClause>
+      isarIdNotEqualTo(Id isarId) {
+    return QueryBuilder.apply(this, (query) {
+      if (query.whereSort == Sort.asc) {
+        return query
+            .addWhereClause(
+              IdWhereClause.lessThan(upper: isarId, includeUpper: false),
+            )
+            .addWhereClause(
+              IdWhereClause.greaterThan(lower: isarId, includeLower: false),
+            );
+      } else {
+        return query
+            .addWhereClause(
+              IdWhereClause.greaterThan(lower: isarId, includeLower: false),
+            )
+            .addWhereClause(
+              IdWhereClause.lessThan(upper: isarId, includeUpper: false),
+            );
+      }
+    });
+  }
+
+  QueryBuilder<IOSDeviceAsset, IOSDeviceAsset, QAfterWhereClause>
+      isarIdGreaterThan(Id isarId, {bool include = false}) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addWhereClause(
+        IdWhereClause.greaterThan(lower: isarId, includeLower: include),
+      );
+    });
+  }
+
+  QueryBuilder<IOSDeviceAsset, IOSDeviceAsset, QAfterWhereClause>
+      isarIdLessThan(Id isarId, {bool include = false}) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addWhereClause(
+        IdWhereClause.lessThan(upper: isarId, includeUpper: include),
+      );
+    });
+  }
+
+  QueryBuilder<IOSDeviceAsset, IOSDeviceAsset, QAfterWhereClause> isarIdBetween(
+    Id lowerIsarId,
+    Id upperIsarId, {
+    bool includeLower = true,
+    bool includeUpper = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addWhereClause(IdWhereClause.between(
+        lower: lowerIsarId,
+        includeLower: includeLower,
+        upper: upperIsarId,
+        includeUpper: includeUpper,
+      ));
+    });
+  }
+
+  QueryBuilder<IOSDeviceAsset, IOSDeviceAsset, QAfterWhereClause> idEqualTo(
+      String id) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addWhereClause(IndexWhereClause.equalTo(
+        indexName: r'id',
+        value: [id],
+      ));
+    });
+  }
+
+  QueryBuilder<IOSDeviceAsset, IOSDeviceAsset, QAfterWhereClause> idNotEqualTo(
+      String id) {
+    return QueryBuilder.apply(this, (query) {
+      if (query.whereSort == Sort.asc) {
+        return query
+            .addWhereClause(IndexWhereClause.between(
+              indexName: r'id',
+              lower: [],
+              upper: [id],
+              includeUpper: false,
+            ))
+            .addWhereClause(IndexWhereClause.between(
+              indexName: r'id',
+              lower: [id],
+              includeLower: false,
+              upper: [],
+            ));
+      } else {
+        return query
+            .addWhereClause(IndexWhereClause.between(
+              indexName: r'id',
+              lower: [id],
+              includeLower: false,
+              upper: [],
+            ))
+            .addWhereClause(IndexWhereClause.between(
+              indexName: r'id',
+              lower: [],
+              upper: [id],
+              includeUpper: false,
+            ));
+      }
+    });
+  }
+
+  QueryBuilder<IOSDeviceAsset, IOSDeviceAsset, QAfterWhereClause> hashEqualTo(
+      List<int> hash) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addWhereClause(IndexWhereClause.equalTo(
+        indexName: r'hash',
+        value: [hash],
+      ));
+    });
+  }
+
+  QueryBuilder<IOSDeviceAsset, IOSDeviceAsset, QAfterWhereClause>
+      hashNotEqualTo(List<int> hash) {
+    return QueryBuilder.apply(this, (query) {
+      if (query.whereSort == Sort.asc) {
+        return query
+            .addWhereClause(IndexWhereClause.between(
+              indexName: r'hash',
+              lower: [],
+              upper: [hash],
+              includeUpper: false,
+            ))
+            .addWhereClause(IndexWhereClause.between(
+              indexName: r'hash',
+              lower: [hash],
+              includeLower: false,
+              upper: [],
+            ));
+      } else {
+        return query
+            .addWhereClause(IndexWhereClause.between(
+              indexName: r'hash',
+              lower: [hash],
+              includeLower: false,
+              upper: [],
+            ))
+            .addWhereClause(IndexWhereClause.between(
+              indexName: r'hash',
+              lower: [],
+              upper: [hash],
+              includeUpper: false,
+            ));
+      }
+    });
+  }
+}
+
+extension IOSDeviceAssetQueryFilter
+    on QueryBuilder<IOSDeviceAsset, IOSDeviceAsset, QFilterCondition> {
+  QueryBuilder<IOSDeviceAsset, IOSDeviceAsset, QAfterFilterCondition>
+      hashElementEqualTo(int value) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.equalTo(
+        property: r'hash',
+        value: value,
+      ));
+    });
+  }
+
+  QueryBuilder<IOSDeviceAsset, IOSDeviceAsset, QAfterFilterCondition>
+      hashElementGreaterThan(
+    int value, {
+    bool include = false,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.greaterThan(
+        include: include,
+        property: r'hash',
+        value: value,
+      ));
+    });
+  }
+
+  QueryBuilder<IOSDeviceAsset, IOSDeviceAsset, QAfterFilterCondition>
+      hashElementLessThan(
+    int value, {
+    bool include = false,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.lessThan(
+        include: include,
+        property: r'hash',
+        value: value,
+      ));
+    });
+  }
+
+  QueryBuilder<IOSDeviceAsset, IOSDeviceAsset, QAfterFilterCondition>
+      hashElementBetween(
+    int lower,
+    int upper, {
+    bool includeLower = true,
+    bool includeUpper = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.between(
+        property: r'hash',
+        lower: lower,
+        includeLower: includeLower,
+        upper: upper,
+        includeUpper: includeUpper,
+      ));
+    });
+  }
+
+  QueryBuilder<IOSDeviceAsset, IOSDeviceAsset, QAfterFilterCondition>
+      hashLengthEqualTo(int length) {
+    return QueryBuilder.apply(this, (query) {
+      return query.listLength(
+        r'hash',
+        length,
+        true,
+        length,
+        true,
+      );
+    });
+  }
+
+  QueryBuilder<IOSDeviceAsset, IOSDeviceAsset, QAfterFilterCondition>
+      hashIsEmpty() {
+    return QueryBuilder.apply(this, (query) {
+      return query.listLength(
+        r'hash',
+        0,
+        true,
+        0,
+        true,
+      );
+    });
+  }
+
+  QueryBuilder<IOSDeviceAsset, IOSDeviceAsset, QAfterFilterCondition>
+      hashIsNotEmpty() {
+    return QueryBuilder.apply(this, (query) {
+      return query.listLength(
+        r'hash',
+        0,
+        false,
+        999999,
+        true,
+      );
+    });
+  }
+
+  QueryBuilder<IOSDeviceAsset, IOSDeviceAsset, QAfterFilterCondition>
+      hashLengthLessThan(
+    int length, {
+    bool include = false,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.listLength(
+        r'hash',
+        0,
+        true,
+        length,
+        include,
+      );
+    });
+  }
+
+  QueryBuilder<IOSDeviceAsset, IOSDeviceAsset, QAfterFilterCondition>
+      hashLengthGreaterThan(
+    int length, {
+    bool include = false,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.listLength(
+        r'hash',
+        length,
+        include,
+        999999,
+        true,
+      );
+    });
+  }
+
+  QueryBuilder<IOSDeviceAsset, IOSDeviceAsset, QAfterFilterCondition>
+      hashLengthBetween(
+    int lower,
+    int upper, {
+    bool includeLower = true,
+    bool includeUpper = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.listLength(
+        r'hash',
+        lower,
+        includeLower,
+        upper,
+        includeUpper,
+      );
+    });
+  }
+
+  QueryBuilder<IOSDeviceAsset, IOSDeviceAsset, QAfterFilterCondition> idEqualTo(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.equalTo(
+        property: r'id',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<IOSDeviceAsset, IOSDeviceAsset, QAfterFilterCondition>
+      idGreaterThan(
+    String value, {
+    bool include = false,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.greaterThan(
+        include: include,
+        property: r'id',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<IOSDeviceAsset, IOSDeviceAsset, QAfterFilterCondition>
+      idLessThan(
+    String value, {
+    bool include = false,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.lessThan(
+        include: include,
+        property: r'id',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<IOSDeviceAsset, IOSDeviceAsset, QAfterFilterCondition> idBetween(
+    String lower,
+    String upper, {
+    bool includeLower = true,
+    bool includeUpper = true,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.between(
+        property: r'id',
+        lower: lower,
+        includeLower: includeLower,
+        upper: upper,
+        includeUpper: includeUpper,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<IOSDeviceAsset, IOSDeviceAsset, QAfterFilterCondition>
+      idStartsWith(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.startsWith(
+        property: r'id',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<IOSDeviceAsset, IOSDeviceAsset, QAfterFilterCondition>
+      idEndsWith(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.endsWith(
+        property: r'id',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<IOSDeviceAsset, IOSDeviceAsset, QAfterFilterCondition>
+      idContains(String value, {bool caseSensitive = true}) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.contains(
+        property: r'id',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<IOSDeviceAsset, IOSDeviceAsset, QAfterFilterCondition> idMatches(
+      String pattern,
+      {bool caseSensitive = true}) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.matches(
+        property: r'id',
+        wildcard: pattern,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<IOSDeviceAsset, IOSDeviceAsset, QAfterFilterCondition>
+      idIsEmpty() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.equalTo(
+        property: r'id',
+        value: '',
+      ));
+    });
+  }
+
+  QueryBuilder<IOSDeviceAsset, IOSDeviceAsset, QAfterFilterCondition>
+      idIsNotEmpty() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.greaterThan(
+        property: r'id',
+        value: '',
+      ));
+    });
+  }
+
+  QueryBuilder<IOSDeviceAsset, IOSDeviceAsset, QAfterFilterCondition>
+      isarIdEqualTo(Id value) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.equalTo(
+        property: r'isarId',
+        value: value,
+      ));
+    });
+  }
+
+  QueryBuilder<IOSDeviceAsset, IOSDeviceAsset, QAfterFilterCondition>
+      isarIdGreaterThan(
+    Id value, {
+    bool include = false,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.greaterThan(
+        include: include,
+        property: r'isarId',
+        value: value,
+      ));
+    });
+  }
+
+  QueryBuilder<IOSDeviceAsset, IOSDeviceAsset, QAfterFilterCondition>
+      isarIdLessThan(
+    Id value, {
+    bool include = false,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.lessThan(
+        include: include,
+        property: r'isarId',
+        value: value,
+      ));
+    });
+  }
+
+  QueryBuilder<IOSDeviceAsset, IOSDeviceAsset, QAfterFilterCondition>
+      isarIdBetween(
+    Id lower,
+    Id upper, {
+    bool includeLower = true,
+    bool includeUpper = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.between(
+        property: r'isarId',
+        lower: lower,
+        includeLower: includeLower,
+        upper: upper,
+        includeUpper: includeUpper,
+      ));
+    });
+  }
+}
+
+extension IOSDeviceAssetQueryObject
+    on QueryBuilder<IOSDeviceAsset, IOSDeviceAsset, QFilterCondition> {}
+
+extension IOSDeviceAssetQueryLinks
+    on QueryBuilder<IOSDeviceAsset, IOSDeviceAsset, QFilterCondition> {}
+
+extension IOSDeviceAssetQuerySortBy
+    on QueryBuilder<IOSDeviceAsset, IOSDeviceAsset, QSortBy> {
+  QueryBuilder<IOSDeviceAsset, IOSDeviceAsset, QAfterSortBy> sortById() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addSortBy(r'id', Sort.asc);
+    });
+  }
+
+  QueryBuilder<IOSDeviceAsset, IOSDeviceAsset, QAfterSortBy> sortByIdDesc() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addSortBy(r'id', Sort.desc);
+    });
+  }
+}
+
+extension IOSDeviceAssetQuerySortThenBy
+    on QueryBuilder<IOSDeviceAsset, IOSDeviceAsset, QSortThenBy> {
+  QueryBuilder<IOSDeviceAsset, IOSDeviceAsset, QAfterSortBy> thenById() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addSortBy(r'id', Sort.asc);
+    });
+  }
+
+  QueryBuilder<IOSDeviceAsset, IOSDeviceAsset, QAfterSortBy> thenByIdDesc() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addSortBy(r'id', Sort.desc);
+    });
+  }
+
+  QueryBuilder<IOSDeviceAsset, IOSDeviceAsset, QAfterSortBy> thenByIsarId() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addSortBy(r'isarId', Sort.asc);
+    });
+  }
+
+  QueryBuilder<IOSDeviceAsset, IOSDeviceAsset, QAfterSortBy>
+      thenByIsarIdDesc() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addSortBy(r'isarId', Sort.desc);
+    });
+  }
+}
+
+extension IOSDeviceAssetQueryWhereDistinct
+    on QueryBuilder<IOSDeviceAsset, IOSDeviceAsset, QDistinct> {
+  QueryBuilder<IOSDeviceAsset, IOSDeviceAsset, QDistinct> distinctByHash() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addDistinctBy(r'hash');
+    });
+  }
+
+  QueryBuilder<IOSDeviceAsset, IOSDeviceAsset, QDistinct> distinctById(
+      {bool caseSensitive = true}) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addDistinctBy(r'id', caseSensitive: caseSensitive);
+    });
+  }
+}
+
+extension IOSDeviceAssetQueryProperty
+    on QueryBuilder<IOSDeviceAsset, IOSDeviceAsset, QQueryProperty> {
+  QueryBuilder<IOSDeviceAsset, int, QQueryOperations> isarIdProperty() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addPropertyName(r'isarId');
+    });
+  }
+
+  QueryBuilder<IOSDeviceAsset, List<int>, QQueryOperations> hashProperty() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addPropertyName(r'hash');
+    });
+  }
+
+  QueryBuilder<IOSDeviceAsset, String, QQueryOperations> idProperty() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addPropertyName(r'id');
+    });
+  }
+}

mobile/lib/shared/providers/asset.provider.dart

@@ -18,11 +18,7 @@ import 'package:logging/logging.dart';
 import 'package:openapi/api.dart';
 import 'package:photo_manager/photo_manager.dart';
 
-/// State does not contain archived assets.
-/// Use database provider if you want to access the isArchived assets
-class AssetsState {}
-
-class AssetNotifier extends StateNotifier<AssetsState> {
+class AssetNotifier extends StateNotifier<bool> {
   final AssetService _assetService;
   final AlbumService _albumService;
   final UserService _userService;
@@ -38,7 +34,7 @@ class AssetNotifier extends StateNotifier<AssetsState> {
     this._userService,
     this._syncService,
     this._db,
-  ) : super(AssetsState());
+  ) : super(false);
 
   Future<void> getAllAsset({bool clear = false}) async {
     if (_getAllAssetInProgress || _deleteInProgress) {
@@ -48,14 +44,15 @@ class AssetNotifier extends StateNotifier<AssetsState> {
     final stopwatch = Stopwatch()..start();
     try {
       _getAllAssetInProgress = true;
+      state = true;
       if (clear) {
         await clearAssetsAndAlbums(_db);
         log.info("Manual refresh requested, cleared assets and albums from db");
       }
+      await _userService.refreshUsers();
       final bool newRemote = await _assetService.refreshRemoteAssets();
       final bool newLocal = await _albumService.refreshDeviceAlbums();
       debugPrint("newRemote: $newRemote, newLocal: $newLocal");
-      await _userService.refreshUsers();
       final List<User> partners =
           await _db.users.filter().isPartnerSharedWithEqualTo(true).findAll();
       for (User u in partners) {
@@ -64,6 +61,7 @@ class AssetNotifier extends StateNotifier<AssetsState> {
       log.info("Load assets: ${stopwatch.elapsedMilliseconds}ms");
     } finally {
       _getAllAssetInProgress = false;
+      state = false;
     }
   }
 
@@ -79,6 +77,7 @@ class AssetNotifier extends StateNotifier<AssetsState> {
 
   Future<void> deleteAssets(Set<Asset> deleteAssets) async {
     _deleteInProgress = true;
+    state = true;
     try {
       final localDeleted = await _deleteLocalAssets(deleteAssets);
       final remoteDeleted = await _deleteRemoteAssets(deleteAssets);
@@ -91,24 +90,14 @@ class AssetNotifier extends StateNotifier<AssetsState> {
       }
     } finally {
       _deleteInProgress = false;
+      state = false;
     }
   }
 
   Future<List<String>> _deleteLocalAssets(Set<Asset> assetsToDelete) async {
-    final int deviceId = Store.get(StoreKey.deviceIdHash);
-    final List<String> local = [];
+    final List<String> local =
+        assetsToDelete.where((a) => a.isLocal).map((a) => a.localId!).toList();
     // Delete asset from device
-    for (final Asset asset in assetsToDelete) {
-      if (asset.isLocal) {
-        local.add(asset.localId);
-      } else if (asset.deviceId == deviceId) {
-        // Delete asset on device if it is still present
-        var localAsset = await AssetEntity.fromId(asset.localId);
-        if (localAsset != null) {
-          local.add(localAsset.id);
-        }
-      }
-    }
     if (local.isNotEmpty) {
       try {
         return await PhotoManager.editor.deleteWithIds(local);
@@ -153,7 +142,7 @@ class AssetNotifier extends StateNotifier<AssetsState> {
   }
 }
 
-final assetProvider = StateNotifierProvider<AssetNotifier, AssetsState>((ref) {
+final assetProvider = StateNotifierProvider<AssetNotifier, bool>((ref) {
   return AssetNotifier(
     ref.watch(assetServiceProvider),
     ref.watch(albumServiceProvider),
@@ -201,7 +190,7 @@ final remoteAssetsProvider =
       .remoteIdIsNotNull()
       .filter()
       .ownerIdEqualTo(userId)
-      .sortByFileCreatedAt();
+      .sortByFileCreatedAtDesc();
   final settings = ref.watch(appSettingsServiceProvider);
   final groupBy =
       GroupAssetsBy.values[settings.getSetting(AppSettingsEnum.groupAssetsBy)];

mobile/lib/shared/providers/server_info.provider.dart

@@ -76,7 +76,7 @@ class ServerInfoNotifier extends StateNotifier<ServerInfoState> {
     return {
       "major": int.parse(major),
       "minor": int.parse(minor),
-      "patch": int.parse(patch),
+      "patch": int.parse(patch.replaceAll("-DEBUG", "")),
     };
   }
 }

mobile/lib/shared/services/api.service.dart

@@ -17,6 +17,7 @@ class ApiService {
   late SearchApi searchApi;
   late ServerInfoApi serverInfoApi;
   late PartnerApi partnerApi;
+  late PersonApi personApi;
 
   ApiService() {
     final endpoint = Store.tryGet(StoreKey.serverEndpoint);
@@ -39,6 +40,7 @@ class ApiService {
     serverInfoApi = ServerInfoApi(_apiClient);
     searchApi = SearchApi(_apiClient);
     partnerApi = PartnerApi(_apiClient);
+    personApi = PersonApi(_apiClient);
   }
 
   Future<String> resolveAndSetEndpoint(String serverUrl) async {

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

@@ -66,8 +66,11 @@ class AssetService {
     try {
       final etag = hasCache ? _db.eTags.getByIdSync(user.id)?.value : null;
       final (List<AssetResponseDto>? assets, String? newETag) =
-          await _apiService.assetApi
-              .getAllAssetsWithETag(eTag: etag, userId: user.id);
+          await _apiService.assetApi.getAllAssetsWithETag(
+        eTag: etag,
+        userId: user.id,
+        withoutThumbs: true,
+      );
       if (assets == null) {
         return null;
       } else if (assets.isNotEmpty && assets.first.ownerId != user.id) {
@@ -79,8 +82,12 @@ class AssetService {
         _db.writeTxn(() => _db.eTags.put(ETag(id: user.id, value: newETag)));
       }
       return assets.map(Asset.remote).toList();
-    } catch (e, stack) {
-      log.severe('Error while getting remote assets', e, stack);
+    } catch (error, stack) {
+      log.severe(
+        'Error while getting remote assets: ${error.toString()}',
+        error,
+        stack,
+      );
       return null;
     }
   }
@@ -97,8 +104,8 @@ class AssetService {
 
       return await _apiService.assetApi
           .deleteAsset(DeleteAssetDto(ids: payload));
-    } catch (e) {
-      debugPrint("Error getAllAsset  ${e.toString()}");
+    } catch (error, stack) {
+      log.severe("Error deleteAssets  ${error.toString()}", error, stack);
       return null;
     }
   }

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

@@ -0,0 +1,175 @@
+import 'dart:convert';
+import 'dart:io';
+
+import 'package:crypto/crypto.dart';
+import 'package:flutter/foundation.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/modules/backup/background_service/background.service.dart';
+import 'package:immich_mobile/shared/models/android_device_asset.dart';
+import 'package:immich_mobile/shared/models/asset.dart';
+import 'package:immich_mobile/shared/models/device_asset.dart';
+import 'package:immich_mobile/shared/models/ios_device_asset.dart';
+import 'package:immich_mobile/shared/providers/db.provider.dart';
+import 'package:immich_mobile/utils/builtin_extensions.dart';
+import 'package:isar/isar.dart';
+import 'package:logging/logging.dart';
+import 'package:photo_manager/photo_manager.dart';
+
+class HashService {
+  HashService(this._db, this._backgroundService);
+  final Isar _db;
+  final BackgroundService _backgroundService;
+  final _log = Logger('HashService');
+
+  /// Returns all assets that were successfully hashed
+  Future<List<Asset>> getHashedAssets(
+    AssetPathEntity album, {
+    int start = 0,
+    int end = 0x7fffffffffffffff,
+    Set<String>? excludedAssets,
+  }) async {
+    final entities = await album.getAssetListRange(start: start, end: end);
+    final filtered = excludedAssets == null
+        ? entities
+        : entities.where((e) => !excludedAssets.contains(e.id)).toList();
+    return _hashAssets(filtered);
+  }
+
+  /// Converts a list of [AssetEntity]s to [Asset]s including only those
+  /// that were successfully hashed. Hashes are looked up in a DB table
+  /// [AndroidDeviceAsset] / [IOSDeviceAsset] by local id. Only missing
+  /// entries are newly hashed and added to the DB table.
+  Future<List<Asset>> _hashAssets(List<AssetEntity> assetEntities) async {
+    const int batchFileCount = 128;
+    const int batchDataSize = 1024 * 1024 * 1024; // 1GB
+
+    final ids = assetEntities
+        .map(Platform.isAndroid ? (a) => a.id.toInt() : (a) => a.id)
+        .toList();
+    final List<DeviceAsset?> hashes = await _lookupHashes(ids);
+    final List<DeviceAsset> toAdd = [];
+    final List<String> toHash = [];
+
+    int bytes = 0;
+
+    for (int i = 0; i < assetEntities.length; i++) {
+      if (hashes[i] != null) {
+        continue;
+      }
+      final file = await assetEntities[i].originFile;
+      if (file == null) {
+        _log.warning(
+          "Failed to get file for asset ${assetEntities[i].id}, skipping",
+        );
+        continue;
+      }
+      bytes += await file.length();
+      toHash.add(file.path);
+      final deviceAsset = Platform.isAndroid
+          ? AndroidDeviceAsset(id: ids[i] as int, hash: const [])
+          : IOSDeviceAsset(id: ids[i] as String, hash: const []);
+      toAdd.add(deviceAsset);
+      hashes[i] = deviceAsset;
+      if (toHash.length == batchFileCount || bytes >= batchDataSize) {
+        await _processBatch(toHash, toAdd);
+        toAdd.clear();
+        toHash.clear();
+        bytes = 0;
+      }
+    }
+    if (toHash.isNotEmpty) {
+      await _processBatch(toHash, toAdd);
+    }
+    return _mapAllHashedAssets(assetEntities, hashes);
+  }
+
+  /// Lookup hashes of assets by their local ID
+  Future<List<DeviceAsset?>> _lookupHashes(List<Object> ids) =>
+      Platform.isAndroid
+          ? _db.androidDeviceAssets.getAll(ids.cast())
+          : _db.iOSDeviceAssets.getAllById(ids.cast());
+
+  /// Processes a batch of files and saves any successfully hashed
+  /// values to the DB table.
+  Future<void> _processBatch(
+    final List<String> toHash,
+    final List<DeviceAsset> toAdd,
+  ) async {
+    final hashes = await _hashFiles(toHash);
+    bool anyNull = false;
+    for (int j = 0; j < hashes.length; j++) {
+      if (hashes[j]?.length == 20) {
+        toAdd[j].hash = hashes[j]!;
+      } else {
+        _log.warning("Failed to hash file ${toHash[j]}, skipping");
+        anyNull = true;
+      }
+    }
+    final validHashes = anyNull
+        ? toAdd.where((e) => e.hash.length == 20).toList(growable: false)
+        : toAdd;
+    await _db.writeTxn(
+      () => Platform.isAndroid
+          ? _db.androidDeviceAssets.putAll(validHashes.cast())
+          : _db.iOSDeviceAssets.putAll(validHashes.cast()),
+    );
+    _log.fine("Hashed ${validHashes.length}/${toHash.length} assets");
+  }
+
+  /// Hashes the given files and returns a list of the same length
+  /// files that could not be hashed have a `null` value
+  Future<List<Uint8List?>> _hashFiles(List<String> paths) async {
+    if (Platform.isAndroid) {
+      final List<Uint8List?>? hashes =
+          await _backgroundService.digestFiles(paths);
+      if (hashes == null) {
+        throw Exception("Hashing ${paths.length} files failed");
+      }
+      return hashes;
+    } else if (Platform.isIOS) {
+      final List<Uint8List?> result = List.filled(paths.length, null);
+      for (int i = 0; i < paths.length; i++) {
+        result[i] = await _hashAssetDart(File(paths[i]));
+      }
+      return result;
+    } else {
+      throw Exception("_hashFiles implementation missing");
+    }
+  }
+
+  /// Hashes a single file using Dart's crypto package
+  Future<Uint8List?> _hashAssetDart(File f) async {
+    late Digest output;
+    final sink = sha1.startChunkedConversion(
+      ChunkedConversionSink<Digest>.withCallback((accumulated) {
+        output = accumulated.first;
+      }),
+    );
+    await for (final chunk in f.openRead()) {
+      sink.add(chunk);
+    }
+    sink.close();
+    return Uint8List.fromList(output.bytes);
+  }
+
+  /// Converts [AssetEntity]s that were successfully hashed to [Asset]s
+  List<Asset> _mapAllHashedAssets(
+    List<AssetEntity> assets,
+    List<DeviceAsset?> hashes,
+  ) {
+    final List<Asset> result = [];
+    for (int i = 0; i < assets.length; i++) {
+      if (hashes[i] != null && hashes[i]!.hash.isNotEmpty) {
+        result.add(Asset.local(assets[i], hashes[i]!.hash));
+      }
+    }
+    return result;
+  }
+}
+
+final hashServiceProvider = Provider(
+  (ref) => HashService(
+    ref.watch(dbProvider),
+    ref.watch(backgroundServiceProvider),
+  ),
+);

mobile/lib/shared/services/sync.service.dart

@@ -4,10 +4,12 @@ import 'package:collection/collection.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/shared/models/album.dart';
 import 'package:immich_mobile/shared/models/asset.dart';
+import 'package:immich_mobile/shared/models/etag.dart';
 import 'package:immich_mobile/shared/models/exif_info.dart';
 import 'package:immich_mobile/shared/models/store.dart';
 import 'package:immich_mobile/shared/models/user.dart';
 import 'package:immich_mobile/shared/providers/db.provider.dart';
+import 'package:immich_mobile/shared/services/hash.service.dart';
 import 'package:immich_mobile/utils/async_mutex.dart';
 import 'package:immich_mobile/utils/builtin_extensions.dart';
 import 'package:immich_mobile/utils/diff.dart';
@@ -16,15 +18,17 @@ import 'package:logging/logging.dart';
 import 'package:openapi/api.dart';
 import 'package:photo_manager/photo_manager.dart';
 
-final syncServiceProvider =
-    Provider((ref) => SyncService(ref.watch(dbProvider)));
+final syncServiceProvider = Provider(
+  (ref) => SyncService(ref.watch(dbProvider), ref.watch(hashServiceProvider)),
+);
 
 class SyncService {
   final Isar _db;
+  final HashService _hashService;
   final AsyncMutex _lock = AsyncMutex();
   final Logger _log = Logger('SyncService');
 
-  SyncService(this._db);
+  SyncService(this._db, this._hashService);
 
   // public methods:
 
@@ -33,6 +37,7 @@ class SyncService {
   Future<bool> syncUsersFromServer(List<User> users) async {
     users.sortBy((u) => u.id);
     final dbUsers = await _db.users.where().sortById().findAll();
+    assert(dbUsers.isSortedBy((u) => u.id), "dbUsers not sorted!");
     final List<int> toDelete = [];
     final List<User> toUpsert = [];
     final changes = diffSortedListsSync(
@@ -108,40 +113,16 @@ class SyncService {
   // private methods:
 
   /// Syncs a new asset to the db. Returns `true` if successful
-  Future<bool> _syncNewAssetToDb(Asset newAsset) async {
-    final List<Asset> inDb = await _db.assets
-        .where()
-        .localIdDeviceIdEqualTo(newAsset.localId, newAsset.deviceId)
-        .findAll();
-    Asset? match;
-    if (inDb.length == 1) {
-      // exactly one match: trivial case
-      match = inDb.first;
-    } else if (inDb.length > 1) {
-      // TODO instead of this heuristics: match by checksum once available
-      for (Asset a in inDb) {
-        if (a.ownerId == newAsset.ownerId &&
-            a.fileModifiedAt.isAtSameMomentAs(newAsset.fileModifiedAt)) {
-          assert(match == null);
-          match = a;
-        }
-      }
-      if (match == null) {
-        for (Asset a in inDb) {
-          if (a.ownerId == newAsset.ownerId) {
-            assert(match == null);
-            match = a;
-          }
-        }
-      }
-    }
-    if (match != null) {
+  Future<bool> _syncNewAssetToDb(Asset a) async {
+    final Asset? inDb =
+        await _db.assets.getByChecksumOwnerId(a.checksum, a.ownerId);
+    if (inDb != null) {
       // unify local/remote assets by replacing the
       // local-only asset in the DB with a local&remote asset
-      newAsset = match.updatedCopy(newAsset);
+      a = inDb.updatedCopy(a);
     }
     try {
-      await _db.writeTxn(() => newAsset.put(_db));
+      await _db.writeTxn(() => a.put(_db));
     } on IsarError catch (e) {
       _log.severe("Failed to put new asset into db: $e");
       return false;
@@ -162,11 +143,11 @@ class SyncService {
     final List<Asset> inDb = await _db.assets
         .filter()
         .ownerIdEqualTo(user.isarId)
-        .sortByDeviceId()
-        .thenByLocalId()
-        .thenByFileModifiedAt()
+        .sortByChecksum()
         .findAll();
-    remote.sort(Asset.compareByOwnerDeviceLocalIdModified);
+    assert(inDb.isSorted(Asset.compareByChecksum), "inDb not sorted!");
+
+    remote.sort(Asset.compareByChecksum);
     final (toAdd, toUpdate, toRemove) = _diffAssets(remote, inDb, remote: true);
     if (toAdd.isEmpty && toUpdate.isEmpty && toRemove.isEmpty) {
       return false;
@@ -199,6 +180,7 @@ class SyncService {
       query = baseQuery.owner((q) => q.isarIdEqualTo(me.isarId));
     }
     final List<Album> dbAlbums = await query.sortByRemoteId().findAll();
+    assert(dbAlbums.isSortedBy((e) => e.remoteId!), "dbAlbums not sorted!");
 
     final List<Asset> toDelete = [];
     final List<Asset> existing = [];
@@ -245,16 +227,16 @@ class SyncService {
     if (dto.assetCount != dto.assets.length) {
       return false;
     }
-    final assetsInDb = await album.assets
-        .filter()
-        .sortByOwnerId()
-        .thenByDeviceId()
-        .thenByLocalId()
-        .thenByFileModifiedAt()
-        .findAll();
+    final assetsInDb =
+        await album.assets.filter().sortByOwnerId().thenByChecksum().findAll();
+    assert(assetsInDb.isSorted(Asset.compareByOwnerChecksum), "inDb unsorted!");
     final List<Asset> assetsOnRemote = dto.getAssets();
-    assetsOnRemote.sort(Asset.compareByOwnerDeviceLocalIdModified);
-    final (toAdd, toUpdate, toUnlink) = _diffAssets(assetsOnRemote, assetsInDb);
+    assetsOnRemote.sort(Asset.compareByOwnerChecksum);
+    final (toAdd, toUpdate, toUnlink) = _diffAssets(
+      assetsOnRemote,
+      assetsInDb,
+      compare: Asset.compareByOwnerChecksum,
+    );
 
     // update shared users
     final List<User> sharedUsers = album.sharedUsers.toList(growable: false);
@@ -297,6 +279,7 @@ class SyncService {
         await album.assets.update(link: assetsToLink, unlink: toUnlink.cast());
         await _db.albums.put(album);
       });
+      _log.info("Synced changes of remote album ${album.name} to DB");
     } on IsarError catch (e) {
       _log.severe("Failed to sync remote album to database $e");
     }
@@ -382,10 +365,11 @@ class SyncService {
     Set<String>? excludedAssets,
   ]) async {
     onDevice.sort((a, b) => a.id.compareTo(b.id));
-    final List<Album> inDb =
+    final inDb =
         await _db.albums.where().localIdIsNotNull().sortByLocalId().findAll();
     final List<Asset> deleteCandidates = [];
     final List<Asset> existing = [];
+    assert(inDb.isSorted((a, b) => a.localId!.compareTo(b.localId!)), "sort!");
     final bool anyChanges = await diffSortedLists(
       onDevice,
       inDb,
@@ -447,14 +431,15 @@ class SyncService {
     final inDb = await album.assets
         .filter()
         .ownerIdEqualTo(Store.get(StoreKey.currentUser).isarId)
-        .deviceIdEqualTo(Store.get(StoreKey.deviceIdHash))
-        .sortByLocalId()
+        .sortByChecksum()
         .findAll();
+    assert(inDb.isSorted(Asset.compareByChecksum), "inDb not sorted!");
+    final int assetCountOnDevice = await ape.assetCountAsync;
     final List<Asset> onDevice =
-        await ape.getAssets(excludedAssets: excludedAssets);
-    onDevice.sort(Asset.compareByLocalId);
-    final (toAdd, toUpdate, toDelete) =
-        _diffAssets(onDevice, inDb, compare: Asset.compareByLocalId);
+        await _hashService.getHashedAssets(ape, excludedAssets: excludedAssets);
+    _removeDuplicates(onDevice);
+    // _removeDuplicates sorts `onDevice` by checksum
+    final (toAdd, toUpdate, toDelete) = _diffAssets(onDevice, inDb);
     if (toAdd.isEmpty &&
         toUpdate.isEmpty &&
         toDelete.isEmpty &&
@@ -491,6 +476,9 @@ class SyncService {
         await _db.albums.put(album);
         album.thumbnail.value ??= await album.assets.filter().findFirst();
         await album.thumbnail.save();
+        await _db.eTags.put(
+          ETag(id: ape.eTagKeyAssetCount, value: assetCountOnDevice.toString()),
+        );
       });
       _log.info("Synced changes of local album ${ape.name} to DB");
     } on IsarError catch (e) {
@@ -503,8 +491,13 @@ class SyncService {
   /// fast path for common case: only new assets were added to device album
   /// returns `true` if successfull, else `false`
   Future<bool> _syncDeviceAlbumFast(AssetPathEntity ape, Album album) async {
+    if (!(ape.lastModified ?? DateTime.now()).isAfter(album.modifiedAt)) {
+      return false;
+    }
     final int totalOnDevice = await ape.assetCountAsync;
-    final AssetPathEntity? modified = totalOnDevice > album.assetCount
+    final int lastKnownTotal =
+        (await _db.eTags.getById(ape.eTagKeyAssetCount))?.value?.toInt() ?? 0;
+    final AssetPathEntity? modified = totalOnDevice > lastKnownTotal
         ? await ape.fetchPathProperties(
             filterOptionGroup: FilterOptionGroup(
               updateTimeCond: DateTimeCond(
@@ -517,17 +510,22 @@ class SyncService {
     if (modified == null) {
       return false;
     }
-    final List<Asset> newAssets = await modified.getAssets();
-    if (totalOnDevice != album.assets.length + newAssets.length) {
+    final List<Asset> newAssets = await _hashService.getHashedAssets(modified);
+
+    if (totalOnDevice != lastKnownTotal + newAssets.length) {
       return false;
     }
     album.modifiedAt = ape.lastModified ?? DateTime.now();
+    _removeDuplicates(newAssets);
     final (existingInDb, updated) = await _linkWithExistingFromDb(newAssets);
     try {
       await _db.writeTxn(() async {
         await _db.assets.putAll(updated);
         await album.assets.update(link: existingInDb + updated);
         await _db.albums.put(album);
+        await _db.eTags.put(
+          ETag(id: ape.eTagKeyAssetCount, value: totalOnDevice.toString()),
+        );
       });
       _log.info("Fast synced local album ${ape.name} to DB");
     } on IsarError catch (e) {
@@ -547,7 +545,9 @@ class SyncService {
   ]) async {
     _log.info("Syncing a new local album to DB: ${ape.name}");
     final Album a = Album.local(ape);
-    final assets = await ape.getAssets(excludedAssets: excludedAssets);
+    final assets =
+        await _hashService.getHashedAssets(ape, excludedAssets: excludedAssets);
+    _removeDuplicates(assets);
     final (existingInDb, updated) = await _linkWithExistingFromDb(assets);
     _log.info(
       "${existingInDb.length} assets already existed in DB, to upsert ${updated.length}",
@@ -570,44 +570,29 @@ class SyncService {
   Future<(List<Asset> existing, List<Asset> updated)> _linkWithExistingFromDb(
     List<Asset> assets,
   ) async {
-    if (assets.isEmpty) {
-      return ([].cast<Asset>(), [].cast<Asset>());
-    }
-    final List<Asset> inDb = await _db.assets
-        .where()
-        .anyOf(
-          assets,
-          (q, Asset e) => q.localIdDeviceIdEqualTo(e.localId, e.deviceId),
-        )
-        .sortByOwnerId()
-        .thenByDeviceId()
-        .thenByLocalId()
-        .thenByFileModifiedAt()
-        .findAll();
-    assets.sort(Asset.compareByOwnerDeviceLocalIdModified);
-    final List<Asset> existing = [], toUpsert = [];
-    diffSortedListsSync(
-      inDb,
-      assets,
-      // do not compare by modified date because for some assets dates differ on
-      // client and server, thus never reaching "both" case below
-      compare: Asset.compareByOwnerDeviceLocalId,
-      both: (Asset a, Asset b) {
-        if (a.canUpdate(b)) {
-          toUpsert.add(a.updatedCopy(b));
-          return true;
-        } else {
-          existing.add(a);
-          return false;
-        }
-      },
-      onlyFirst: (Asset a) => _log.finer(
-        "_linkWithExistingFromDb encountered asset only in DB: $a",
-        null,
-        StackTrace.current,
-      ),
-      onlySecond: (Asset b) => toUpsert.add(b),
+    if (assets.isEmpty) return ([].cast<Asset>(), [].cast<Asset>());
+
+    final List<Asset?> inDb = await _db.assets.getAllByChecksumOwnerId(
+      assets.map((a) => a.checksum).toList(growable: false),
+      assets.map((a) => a.ownerId).toInt64List(),
     );
+    assert(inDb.length == assets.length);
+    final List<Asset> existing = [], toUpsert = [];
+    for (int i = 0; i < assets.length; i++) {
+      final Asset? b = inDb[i];
+      if (b == null) {
+        toUpsert.add(assets[i]);
+        continue;
+      }
+      if (b.canUpdate(assets[i])) {
+        final updated = b.updatedCopy(assets[i]);
+        assert(updated.id != Isar.autoIncrement);
+        toUpsert.add(updated);
+      } else {
+        existing.add(b);
+      }
+    }
+    assert(existing.length + toUpsert.length == assets.length);
     return (existing, toUpsert);
   }
 
@@ -627,11 +612,63 @@ class SyncService {
       });
       _log.info("Upserted ${assets.length} assets into the DB");
     } on IsarError catch (e) {
-      _log.warning(
+      _log.severe(
         "Failed to upsert ${assets.length} assets into the DB: ${e.toString()}",
       );
+      // give details on the errors
+      assets.sort(Asset.compareByOwnerChecksum);
+      final inDb = await _db.assets.getAllByChecksumOwnerId(
+        assets.map((e) => e.checksum).toList(growable: false),
+        assets.map((e) => e.ownerId).toInt64List(),
+      );
+      for (int i = 0; i < assets.length; i++) {
+        final Asset a = assets[i];
+        final Asset? b = inDb[i];
+        if (b == null) {
+          if (a.id != Isar.autoIncrement) {
+            _log.warning(
+              "Trying to update an asset that does not exist in DB:\n$a",
+            );
+          }
+        } else if (a.id != b.id) {
+          _log.warning(
+            "Trying to insert another asset with the same checksum+owner. In DB:\n$b\nTo insert:\n$a",
+          );
+        }
+      }
+      for (int i = 1; i < assets.length; i++) {
+        if (Asset.compareByOwnerChecksum(assets[i - 1], assets[i]) == 0) {
+          _log.warning(
+            "Trying to insert duplicate assets:\n${assets[i - 1]}\n${assets[i]}",
+          );
+        }
+      }
     }
   }
+
+  List<Asset> _removeDuplicates(List<Asset> assets) {
+    final int before = assets.length;
+    assets.sort(Asset.compareByOwnerChecksumCreatedModified);
+    assets.uniqueConsecutive(
+      compare: Asset.compareByOwnerChecksum,
+      onDuplicate: (a, b) =>
+          _log.info("Ignoring duplicate assets on device:\n$a\n$b"),
+    );
+    final int duplicates = before - assets.length;
+    if (duplicates > 0) {
+      _log.warning("Ignored $duplicates duplicate assets on device");
+    }
+    return assets;
+  }
+
+  /// returns `true` if the albums differ on the surface
+  Future<bool> _hasAssetPathEntityChanged(AssetPathEntity a, Album b) async {
+    return a.name != b.name ||
+        a.lastModified == null ||
+        !a.lastModified!.isAtSameMomentAs(b.modifiedAt) ||
+        await a.assetCountAsync !=
+            (await _db.eTags.getById(a.eTagKeyAssetCount))?.value?.toInt();
+  }
 }
 
 /// Returns a triple(toAdd, toUpdate, toRemove)
@@ -639,7 +676,7 @@ class SyncService {
   List<Asset> assets,
   List<Asset> inDb, {
   bool? remote,
-  int Function(Asset, Asset) compare = Asset.compareByOwnerDeviceLocalId,
+  int Function(Asset, Asset) compare = Asset.compareByChecksum,
 }) {
   final List<Asset> toAdd = [];
   final List<Asset> toUpdate = [];
@@ -663,7 +700,7 @@ class SyncService {
         }
       } else if (remote == false && a.isRemote) {
         if (a.isLocal) {
-          a.isLocal = false;
+          a.localId = null;
           toUpdate.add(a);
         }
       } else {
@@ -685,9 +722,9 @@ class SyncService {
     return const ([], []);
   }
   deleteCandidates.sort(Asset.compareById);
-  deleteCandidates.uniqueConsecutive((a) => a.id);
+  deleteCandidates.uniqueConsecutive(compare: Asset.compareById);
   existing.sort(Asset.compareById);
-  existing.uniqueConsecutive((a) => a.id);
+  existing.uniqueConsecutive(compare: Asset.compareById);
   final (tooAdd, toUpdate, toRemove) = _diffAssets(
     existing,
     deleteCandidates,
@@ -698,14 +735,6 @@ class SyncService {
   return (toRemove.map((e) => e.id).toList(), toUpdate);
 }
 
-/// returns `true` if the albums differ on the surface
-Future<bool> _hasAssetPathEntityChanged(AssetPathEntity a, Album b) async {
-  return a.name != b.name ||
-      a.lastModified == null ||
-      !a.lastModified!.isAtSameMomentAs(b.modifiedAt) ||
-      await a.assetCountAsync != b.assetCount;
-}
-
 /// returns `true` if the albums differ on the surface
 bool _hasAlbumResponseDtoChanged(AlbumResponseDto dto, Album a) {
   return dto.assetCount != a.assetCount ||

mobile/lib/shared/ui/immich_image.dart

@@ -1,6 +1,7 @@
 import 'package:cached_network_image/cached_network_image.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
+import 'package:flutter_cache_manager/flutter_cache_manager.dart';
 import 'package:immich_mobile/shared/models/asset.dart';
 import 'package:immich_mobile/shared/models/store.dart';
 import 'package:immich_mobile/utils/image_url_builder.dart';
@@ -110,8 +111,12 @@ class ImmichImage extends StatelessWidget {
         );
       },
       errorWidget: (context, url, error) {
-        debugPrint("Error getting thumbnail $url = $error");
-        CachedNetworkImage.evictFromCache(thumbnailRequestUrl);
+        if (error is HttpExceptionWithStatus &&
+            error.statusCode >= 400 &&
+            error.statusCode < 500) {
+          debugPrint("Evicting thumbnail '$url' from cache: $error");
+          CachedNetworkImage.evictFromCache(url);
+        }
         return Icon(
           Icons.image_not_supported_outlined,
           color: Theme.of(context).primaryColor,

mobile/lib/shared/views/tab_controller_page.dart

@@ -6,12 +6,39 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/modules/asset_viewer/providers/scroll_notifier.provider.dart';
 import 'package:immich_mobile/modules/home/providers/multiselect.provider.dart';
 import 'package:immich_mobile/routing/router.dart';
+import 'package:immich_mobile/shared/providers/asset.provider.dart';
 
-class TabControllerPage extends ConsumerWidget {
+class TabControllerPage extends HookConsumerWidget {
   const TabControllerPage({Key? key}) : super(key: key);
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
+    final refreshing = ref.watch(assetProvider);
+
+    Widget buildIcon(Widget icon) {
+      if (!refreshing) return icon;
+      return Stack(
+        alignment: Alignment.center,
+        clipBehavior: Clip.none,
+        children: [
+          icon,
+          Positioned(
+            right: -14,
+            child: SizedBox(
+              height: 12,
+              width: 12,
+              child: CircularProgressIndicator(
+                strokeWidth: 2,
+                valueColor: AlwaysStoppedAnimation<Color>(
+                  Theme.of(context).primaryColor,
+                ),
+              ),
+            ),
+          ),
+        ],
+      );
+    }
+
     navigationRail(TabsRouter tabsRouter) {
       return NavigationRail(
         labelType: NavigationRailLabelType.all,
@@ -83,9 +110,11 @@ class TabControllerPage extends ConsumerWidget {
             icon: const Icon(
               Icons.photo_library_outlined,
             ),
-            selectedIcon: Icon(
-              Icons.photo_library,
-              color: Theme.of(context).primaryColor,
+            selectedIcon: buildIcon(
+              Icon(
+                Icons.photo_library,
+                color: Theme.of(context).primaryColor,
+              ),
             ),
           ),
           NavigationDestination(
@@ -113,9 +142,11 @@ class TabControllerPage extends ConsumerWidget {
             icon: const Icon(
               Icons.photo_album_outlined,
             ),
-            selectedIcon: Icon(
-              Icons.photo_album_rounded,
-              color: Theme.of(context).primaryColor,
+            selectedIcon: buildIcon(
+              Icon(
+                Icons.photo_album_rounded,
+                color: Theme.of(context).primaryColor,
+              ),
             ),
           )
         ],

mobile/lib/utils/builtin_extensions.dart

@@ -1,3 +1,5 @@
+import 'dart:typed_data';
+
 import 'package:collection/collection.dart';
 
 extension DurationExtension on String {
@@ -22,15 +24,20 @@ extension DurationExtension on String {
 }
 
 extension ListExtension<E> on List<E> {
-  List<E> uniqueConsecutive<T>([T Function(E element)? key]) {
-    key ??= (E e) => e as T;
+  List<E> uniqueConsecutive({
+    int Function(E a, E b)? compare,
+    void Function(E a, E b)? onDuplicate,
+  }) {
+    compare ??= (E a, E b) => a == b ? 0 : 1;
     int i = 1, j = 1;
     for (; i < length; i++) {
-      if (key(this[i]) != key(this[i - 1])) {
+      if (compare(this[i - 1], this[i]) != 0) {
         if (i != j) {
           this[j] = this[i];
         }
         j++;
+      } else if (onDuplicate != null) {
+        onDuplicate(this[i - 1], this[i]);
       }
     }
     length = length == 0 ? 0 : j;
@@ -45,3 +52,11 @@ extension ListExtension<E> on List<E> {
     return ListSlice<E>(this, start, end);
   }
 }
+
+extension IntListExtension on Iterable<int> {
+  Int64List toInt64List() {
+    final list = Int64List(length);
+    list.setAll(0, this);
+    return list;
+  }
+}

mobile/lib/utils/files_helper.dart

@@ -47,6 +47,102 @@ class FileHelper {
       case 'webm':
         return {"type": "video", "subType": "webm"};
 
+      case 'avif':
+        return {"type": "image", "subType": "avif"};
+
+      case 'insp':
+        return {"type": "image", "subType": "jpeg"};
+
+      case 'insv':
+        return {"type": "video", "subType": "mp4"};
+
+      case 'arw':
+        return {"type": "image", "subType": "x-sony-arw"};
+
+      case 'raf':
+        return {"type": "image", "subType": "x-fuji-raf"};
+
+      case 'nef':
+        return {"type": "image", "subType": "x-nikon-nef"};
+
+      case 'srw':
+        return {"type": "image", "subType": "x-samsung-srw"};
+
+      case 'crw':
+        return {"type": "image", "subType": "x-canon-crw"};
+
+      case 'cr2':
+        return {"type": "image", "subType": "x-canon-cr2"};
+
+      case 'cr3':
+        return {"type": "image", "subType": "x-canon-cr3"};
+
+      case 'erf':
+        return {"type": "image", "subType": "x-epson-erf"};
+
+      case 'dcr':
+        return {"type": "image", "subType": "x-kodak-dcr"};
+
+      case 'k25':
+        return {"type": "image", "subType": "x-kodak-k25"};
+
+      case 'kdc':
+        return {"type": "image", "subType": "x-kodak-kdc"};
+
+      case 'mrw':
+        return {"type": "image", "subType": "x-minolta-mrw"};
+
+      case 'orf':
+        return {"type": "image", "subType": "x-olympus-orf"};
+
+      case 'raw':
+        return {"type": "image", "subType": "x-panasonic-raw"};
+
+      case 'pef':
+        return {"type": "image", "subType": "x-panasonic-pef"};
+
+      case 'x3f':
+        return {"type": "image", "subType": "x-sigma-x3f"};
+
+      case 'srf':
+        return {"type": "image", "subType": "x-sony-srf"};
+
+      case 'sr2':
+        return {"type": "image", "subType": "x-sony-sr2"};
+
+      case '3fr':
+        return {"type": "image", "subType": "x-hasselblad-3fr"};
+
+      case 'fff':
+        return {"type": "image", "subType": "x-hasselblad-fff"};
+
+      case 'rwl':
+        return {"type": "image", "subType": "x-leica-rwl"};
+
+      case 'ori':
+        return {"type": "image", "subType": "x-olympus-ori"};
+
+      case 'iiq':
+        return {"type": "image", "subType": "x-phaseone-iiq"};
+
+      case 'ari':
+        return {"type": "image", "subType": "x-arriflex-ari"};
+
+      case 'cap':
+        return {"type": "image", "subType": "x-phaseone-cap"};
+
+      case 'cin':
+        return {"type": "image", "subType": "x-phantom-cin"};
+
+      case 'jxl':
+        return {"type": "image", "subType": "jxl"};
+
+      case 'mts':
+        return {"type": "video", "subType": "mp2t"};
+
+      case 'm2ts':
+        return {"type": "video", "subType": "mp2t"};
+
       default:
         return {"type": "unsupport", "subType": "unsupport"};
     }