Added error handling for layout.server.ts to avoid unaccessible to previous deploy instance due to changes in SvelteKit project

* Added test button

* styling notification box

* Added auto dismission and animation to each notificaiont list

* Remove test button

.github/workflows/github-repo-stats.yml

@@ -0,0 +1,19 @@
+name: github-repo-stats
+
+on:
+  schedule:
+    # Run this once per day, towards the end of the day for keeping the most
+    # recent data point most meaningful (hours are interpreted in UTC).
+    - cron: "0 23 * * *"
+  workflow_dispatch: # Allow for running this manually.
+
+jobs:
+  j1:
+    name: github-repo-stats
+    runs-on: ubuntu-latest
+    steps:
+      - name: run-ghrs
+        # Use latest release.
+        uses: jgehrcke/github-repo-stats@RELEASE
+        with:
+          ghtoken: ${{ secrets.GHRS_GITHUB_API_TOKEN }}

CODE_OF_CONDUCT.md

@@ -0,0 +1,134 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+We as members, contributors, and leaders pledge to make participation
+in our community a harassment-free experience for everyone, regardless
+of age, body size, visible or invisible disability, ethnicity, sex
+characteristics, gender identity and expression, level of experience,
+education, socio-economic status, nationality, personal appearance,
+race, religion, or sexual identity and orientation.
+
+We pledge to act and interact in ways that contribute to an open,
+welcoming, diverse, inclusive, and healthy community.
+
+## Our Standards
+
+Examples of behavior that contributes to a positive environment for
+our community include:
+
+- Demonstrating empathy and kindness toward other people
+- Being respectful of differing opinions, viewpoints, and experiences
+- Giving and gracefully accepting constructive feedback
+- Accepting responsibility and apologizing to those affected by our
+  mistakes, and learning from the experience
+- Focusing on what is best not just for us as individuals, but for the
+  overall community
+
+Examples of unacceptable behavior include:
+
+- The use of sexualized language or imagery, and sexual attention or
+  advances of any kind
+- Trolling, insulting or derogatory comments, and personal or
+  political attacks
+- Public or private harassment
+- Publishing others' private information, such as a physical or email
+  address, without their explicit permission
+- Other conduct which could reasonably be considered inappropriate in
+  a professional setting
+
+## Enforcement Responsibilities
+
+Community leaders are responsible for clarifying and enforcing our
+standards of acceptable behavior and will take appropriate and fair
+corrective action in response to any behavior that they deem
+inappropriate, threatening, offensive, or harmful.
+
+Community leaders have the right and responsibility to remove, edit,
+or reject comments, commits, code, wiki edits, issues, and other
+contributions that are not aligned to this Code of Conduct, and will
+communicate reasons for moderation decisions when appropriate.
+
+## Scope
+
+This Code of Conduct applies within all community spaces, and also
+applies when an individual is officially representing the community in
+public spaces. Examples of representing our community include using an
+official e-mail address, posting via an official social media account,
+or acting as an appointed representative at an online or offline
+event.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior
+may be reported to the community leaders responsible for enforcement
+at our Discord channel. All complaints
+will be reviewed and investigated promptly and fairly.
+
+All community leaders are obligated to respect the privacy and
+security of the reporter of any incident.
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in
+determining the consequences for any action they deem in violation of
+this Code of Conduct:
+
+### 1. Correction
+
+**Community Impact**: Use of inappropriate language or other behavior
+deemed unprofessional or unwelcome in the community.
+
+**Consequence**: A private, written warning from community leaders,
+providing clarity around the nature of the violation and an
+explanation of why the behavior was inappropriate. A public apology
+may be requested.
+
+### 2. Warning
+
+**Community Impact**: A violation through a single incident or series
+of actions.
+
+**Consequence**: A warning with consequences for continued
+behavior. No interaction with the people involved, including
+unsolicited interaction with those enforcing the Code of Conduct, for
+a specified period of time. This includes avoiding interactions in
+community spaces as well as external channels like social
+media. Violating these terms may lead to a temporary or permanent ban.
+
+### 3. Temporary Ban
+
+**Community Impact**: A serious violation of community standards,
+including sustained inappropriate behavior.
+
+**Consequence**: A temporary ban from any sort of interaction or
+public communication with the community for a specified period of
+time. No public or private interaction with the people involved,
+including unsolicited interaction with those enforcing the Code of
+Conduct, is allowed during this period. Violating these terms may lead
+to a permanent ban.
+
+### 4. Permanent Ban
+
+**Community Impact**: Demonstrating a pattern of violation of
+community standards, including sustained inappropriate behavior,
+harassment of an individual, or aggression toward or disparagement of
+classes of individuals.
+
+**Consequence**: A permanent ban from any sort of public interaction
+within the community.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor
+Covenant][homepage], version 2.0, available at
+https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
+
+Community Impact Guidelines were inspired by [Mozilla's code of
+conduct enforcement ladder](https://github.com/mozilla/diversity).
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see the
+FAQ at https://www.contributor-covenant.org/faq. Translations are
+available at https://www.contributor-covenant.org/translations.

README.md

@@ -1,3 +1,9 @@
+<h1 align="center"> Immich </h1>
+ <p align="center"> <b>High performance self-hosted photo and video backup solution.</b> </p>
+<p align="center">
+  <img src="design/feature-panel.png"  title="Immich Logo">
+</p>
+
 <p align="center">
   <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://github.com/alextran1502/immich"><img src="https://img.shields.io/github/stars/alextran1502/immich.svg?style=for-the-badge&logo=github&color=3F51B5&label=Stars&logoColor=000000&labelColor=ececec" alt="Star on Github"></a>
@@ -14,75 +20,66 @@
     <img src="https://img.shields.io/discord/979116623879368755.svg?label=Immich%20Discord&logo=Discord&style=for-the-badge&logoColor=000000&labelColor=ececec" atl="Immich Discord"/>
   </a>
   <br/>  
-  <br/>  
-  <br/>  
-  <br/>  
-
-  <p align="center">
-    <img src="design/feature-panel.png"  title="Immich Logo">
-  </p>
+  <br/>   
 </p>
 
-# Immich
-
-**High performance self-hosted photo and video backup solution.**
-
-![](https://media.giphy.com/media/y8ZeaAigGmNvlSoKhU/giphy.gif)
-
-Loading ~4000 images/videos
-
-## Screenshots
-
-### Mobile
-<p align="left">
-  <img src="design/login-screen.png" width="150" title="Login With Custom URL">
-  <img src="design/backup-screen.png" width="150" title="Backup Setting Info">
-  <img src="design/selective-backup-screen.png" width="150" title="Backup Setting Info">
-  <img src="design/home-screen.jpeg" width="150" title="Home Screen">
-  <img src="design/search-screen.jpeg" width="150" title="Curated Search Info">
-  <img src="design/shared-albums.png" width="150" title="Shared Albums">
-  <img src="design/nsc6.png" width="150" title="EXIF Info">
-</p>
-
-### Web
-<p align="left">
-  <img src="design/web-home.jpeg"  width="49%" title="Home Dashboard">
-  <img src="design/web-detail.jpeg" width="49%" title="Detail">
-</p>
-
-# Note
-
-**!! NOT READY FOR PRODUCTION! DO NOT USE TO STORE YOUR ASSETS !!**
-
-This project is under heavy development, there will be continuous functions, features and api changes.
+## Content
+- [Features](#features)
+- [Screenshots](#screenshots)
+- [Installation](#installation)
+- [Mobile App](#-mobile-app)
+- [Development](#development)
+- [Support](#support)
+- [Known Issues](#known-issues)
 
 # Features 
 
+> ⚠️ WARNING: **NOT READY FOR PRODUCTION! DO NOT USE TO STORE YOUR ASSETS**. This project is under heavy development, there will be continuous functions, features and api changes.
+
 |  | Mobile | Web |
-| - | - | - |
-| Upload and view videos and photos | Yes | Yes
-| Auto backup when the app is opened | Yes | N/A
-| Selective album(s) for backup | Yes | N/A
-| Download photos and videos to local device | Yes | Yes
-| Multi-user support | Yes | Yes
-| Album | Yes | Yes
-| Shared Albums | Yes | Yes
-| Quick navigation with draggable scrollbar | Yes | Yes
-| Support RAW (HEIC, HEIF, DNG, Apple ProRaw) | Yes | Yes
-| Metadata view (EXIF, map) | Yes | Yes
-| Search by metadata, objects and image tags | Yes | No
-| Administrative functions (user management) | N/A | Yes
+| - | - | - | 
+| ☁️ Upload and view videos and photos | Yes | Yes 
+| 🔄 Auto backup when the app is opened | Yes | N/A
+| ☑️ Selective album(s) for backup | Yes | N/A
+| ⬇️ Download photos and videos to local device | Yes | Yes
+| 👪 Multi-user support | Yes | Yes
+| 🖼️ Album | Yes | Yes
+| 🤝 Shared Albums | Yes | Yes
+| 🚀 Quick navigation with draggable scrollbar | Yes | Yes
+| 🗃️ Support RAW (HEIC, HEIF, DNG, Apple ProRaw) | Yes | Yes
+| 🧭 Metadata view (EXIF, map) | Yes | Yes
+| 🔎 Search by metadata, objects and image tags | Yes | No
+| ⚙️ Administrative functions (user management) | N/A | Yes
 
 
-# System Requirement
+  <br/>  
 
-**OS**: Preferred unix-based operating system (Ubuntu, Debian, MacOS...etc). 
+# Screenshots
 
-**RAM**: At least 2GB, preffered 4GB.
+### Mobile
+| | | | | |
+| - | - | - | - | - |
+| <img src="design/login-screen.png" width="150" title="Login With Custom URL"> <p align="center"> Login with custom URL </p> | <img src="design/backup-screen.png" width="150" title="Backup Setting Info"> <p align="center"> Backup Settings </p> | <img src="design/selective-backup-screen.png" width="150" title="Backup Setting Info"> <p align="center"> Backup selection </p> | <img src="design/home-screen.jpeg" width="150" title="Home Screen"> <p align="center"> Home Screen </p> | <img src="design/search-screen.jpeg" width="150" title="Curated Search Info"> <p align="center"> Curated search </p> |
+| <img src="design/shared-albums.png" width="150" title="Shared Albums"> <p align="center"> Shared albums </p>  |  <img src="design/nsc6.png" width="150" title="EXIF Info"> <p align="center"> EXIF info </p>  | <img src="https://media.giphy.com/media/y8ZeaAigGmNvlSoKhU/giphy.gif" width="150" title="Loading ~4000 images/videos"> <p align="center"> Loading ~4000 images/videos </p>  |
 
-**Core**: At least 2 cores, preffered 4 cores.
+### Web
+| Home Dashboard | Image view |
+| - | - |
+|<img src="design/web-home.jpeg"  width="100%" title="Home Dashboard"> | <img src="design/web-detail.jpeg" width="100%" title="Detail">|
 
-# Technology Stack
+
+  <br/>  
+
+# Project Details
+## 💾 System Requirements
+
+- **OS**: Preferred unix-based operating system (Ubuntu, Debian, MacOS...etc). 
+
+- **RAM**: At least 2GB, preferred 4GB.
+
+- **Core**: At least 2 cores, preferred 4 cores.
+
+## 🔩 Technology Stack
 
 There are several services that compose Immich:
 
@@ -93,15 +90,18 @@ There are several services that compose Immich:
 5. **Nginx** - Load balancing and optimized file uploading.
 6. **TensorFlow** - Object Detection (COCO SSD) and Image Classification (ImageNet).
 
-# Installing
 
-## One-step installation - for evaluating only
+  <br/>  
+
+# Installation
+
+## Testing One-step installation (not recommended for production)
+
+> ⚠️ *This installation method is for evaluating Immich before futher customization to meet the users' needs.*
 
 *Applicable system: Ubuntu, Debian, MacOS*
 
-*This installation method is for evaluating Immich before futher customization to meet the users' needs.*
-
-In the shell, from the directory of your choice, run the following command:
+- In the shell, from the directory of your choice, run the following command:
 
 ```bash
 curl -o- https://raw.githubusercontent.com/immich-app/immich/main/install.sh | bash
@@ -114,116 +114,70 @@ The web application will be available at `http://<machine-ip-address>:2283`, and
 The directory which is used to store the backup file is `./immich-app/immich-data`.
 
 
-## Customize installation - for production usage
+  <br/>  
+
+## Custom installation (Recommended)
 
 ### Step 1 - Download necessary files
 
-Create a directory called `immich-app` and cd into it. Then
+- Create a directory called `immich-app` and cd into it.
 
-Get `docker-compose.yml`
+- Get `docker-compose.yml`
 
 ```bash
 wget https://raw.githubusercontent.com/immich-app/immich/main/docker/docker-compose.yml
 ```
 
-Get `.env`
+- Get `.env`
 
 ```bash
 wget -O .env https://raw.githubusercontent.com/immich-app/immich/main/docker/.env.example
 ```
 
-### Step 2 - Populate .env file with customed information
+### Step 2 - Populate .env file with custom information
 
-* Populate customised database information if necessary.
+<a href="https://github.com/immich-app/immich/blob/main/docker/.env.example" target="_blank"><b>See the example <code>.env</code> file</b></a>
+
+* Populate custom database information if necessary.
 * Populate `UPLOAD_LOCATION` as prefered location for storing backup assets.
-* Populate a secret value for `JWT_SECRET`
-* [Optional] Populate Mapbox value.
-
-**Example**
-
-```bash
-###################################################################################
-# Database
-###################################################################################
-DB_USERNAME=postgres
-DB_PASSWORD=postgres
-DB_DATABASE_NAME=immich
-
-###################################################################################
-# Upload File Config
-###################################################################################
-UPLOAD_LOCATION=<put-the-path-of-the-upload-folder-here>
-
-###################################################################################
-# JWT SECRET
-###################################################################################
-JWT_SECRET=randomstringthatissolongandpowerfulthatnoonecanguess
-
-###################################################################################
-# MAPBOX
-####################################################################################
-# ENABLE_MAPBOX is either true of false -> if true, you have to provide MAPBOX_KEY
-ENABLE_MAPBOX=false
-MAPBOX_KEY=
-```
+* Populate a secret value for `JWT_SECRET`, you can use this command: `openssl rand -base64 128`
+* [Optional] Populate Mapbox value to use reverse geocoding.
 
 ### Step 3 - Start the containers
 
-Run `docker-compose up` or `docker compose up` (based on your docker's version)
+- Run `docker-compose up` or `docker compose up` (based on your docker's version)
 
 ### Step 4 - Register admin user
 
-Navigate to the web at `http://<machine-ip-address>:2283` and follow the prompts to register admin user.
-
-<p align="left">
+- Navigate to the web at `http://<machine-ip-address>:2283` and follow the prompts to register admin user. 
+<p align="center">
   <img src="design/admin-registration-form.png" width="300" title="Admin Registration">
-<p/>
+</p>
 
-Additional accounts on the server can be created by the admin account.
-
-<p align="left">
-  <img src="design/admin-interface.png" width="500" title="Admin User Management">
-<p/>
+- You can add and manage users from the administration page. 
+<p align="center">
+ <img src="design/admin-interface.png" width="500" title="Admin User Management">
+</p>
 
 ### Step 5 - Access the mobile app
 
-Login the mobile app with the server endpoint URL at `http://<machine-ip-address>:2283/api`
-
-<p align="left">
+- Login the mobile app with the server endpoint URL at `http://<machine-ip-address>:2283/api`
+<p align="center">
   <img src="design/login-screen.jpeg" width="250" title="Example login screen">
-<p/>
+</p> 
 
-## Mobile app
+  <br/>  
 
-## F-Droid
-You can get the app on F-droid by clicking the image below.
+# Mobile app
 
-[<img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png"
-    alt="Get it on F-Droid"
-    height="80">](https://f-droid.org/packages/app.alextran.immich)
+| F-Droid | Google Play | iOS |
+| - | - | - |
+| <a href="https://f-droid.org/packages/app.alextran.immich"><img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png" alt="Get it on F-Droid" height="80"></a> | <p align="left"> <img src="design/google-play-qr-code.png" width="200" title="Google Play Store"> <p/> | <p align="left"> <img src="design/ios-qr-code.png" width="200" title="Apple App Store"> <p/> |
+
+> *The App version might be lagging behind the latest release due to the review process.*
 
 
-## Android
-
-#### Get the app on Google Play Store [here](https://play.google.com/store/apps/details?id=app.alextran.immich) 
-
-*The App version might be lagging behind the latest release due to the review process.*
-
-<p align="left">
-  <img src="design/google-play-qr-code.png" width="200" title="Google Play Store">
-<p/>
-
-## iOS
-
-#### Get the app on Apple AppStore [here](https://apps.apple.com/us/app/immich/id1613945652):
-
-*The App version might be lagging behind the latest release due to the review process.*
-
-
-<p align="left">
-  <img src="design/ios-qr-code.png" width="200" title="Apple App Store">
-<p/>
-
+  <br/>  
 
 # Development
 
@@ -244,31 +198,28 @@ npm run api:generate # Run from server directory
 ```
 You can find the generated client SDK in the [`web/src/api`](web/src/api) for Typescript SDK and [`mobile/openapi`](mobile/openapi) for Dart SDK.
 
+
+  <br/>  
+
 # Support
 
-If you like the app, find it helpful, and want to support me to offset the cost of publishing to AppStores, you can sponsor the project with [**one time**](https://github.com/sponsors/alextran1502?frequency=one-time&sponsor=alextran1502) or monthly donation from [**Github Sponsor**](https://github.com/sponsors/alextran1502)
+If you like the app, find it helpful, and want to support me to offset the cost of publishing to AppStores, you can sponsor the project with [**one time**](https://github.com/sponsors/alextran1502?frequency=one-time&sponsor=alextran1502) or monthly donation from [**Github Sponsor**](https://github.com/sponsors/alextran1502).
 
 You can also donate using crypto currency with the following addresses:
 
-<p align="left" style="display: flex; place-items: center; gap: 20px" title="Bitcoin(BTC)">
-<img src="design/bitcoin.png" width="25" title="Bitcoin">
-<code>1FvEp6P6NM8EZEkpGUFAN2LqJ1gxusNxZX</code>
-</p>
+<p align="" style="display: flex; place-items: center; gap: 15px" title="Bitcoin(BTC)"><img src="design/bitcoin.png" width="25" title="Bitcoin"> <b>Bitcoin</b>: <code>1FvEp6P6NM8EZEkpGUFAN2LqJ1gxusNxZX</code></p>
 
-  
-<p align="left" style="display: flex; place-items: center; gap: 15px" title="Cardano(ADA)">
-<img src="design/cardano.png" width="30" title="Cardano">
-<code>
-addr1qyy567vqhqrr3p7vpszr5p264gw89sqcwts2z8wqy4yek87cdmy79zazyjp7tmwhkluhk3krvslkzfvg0h43tytp3f5q49nycc
-</code>
-</p>
+<p align="" style="display: flex; place-items: center; gap: 15px" title="Cardano(ADA)"> <img src="design/cardano.png" width="30" title="Cardano"> <b>Cardano</b>: <code>addr1qyy567vqhqrr3p7vpszr5p264gw89sqcwts2z8wqy4yek87cdmy79zazyjp7tmwhkluhk3krvslkzfvg0h43tytp3f5q49nycc</code> </p>
 
 
 This is also a meaningful way to give me motivation and encouragement to continue working on the app.
 
 Cheers! 🎉
 
-# Known Issue
+
+  <br/>  
+
+# Known Issues
 
 ## TensorFlow Build Issue
 

docker/docker-compose.dev.yml

@@ -6,6 +6,7 @@ services:
     build:
       context: ../server
       dockerfile: Dockerfile
+      target: builder
     command: npm run start:dev immich
     volumes:
       - ../server:/usr/src/app
@@ -24,6 +25,7 @@ services:
     build:
       context: ../machine-learning
       dockerfile: Dockerfile
+      target: builder
     command: npm run start:dev
     volumes:
       - ../machine-learning:/usr/src/app
@@ -41,6 +43,7 @@ services:
     build:
       context: ../server
       dockerfile: Dockerfile
+      target: builder
     command: npm run start:dev microservices
     volumes:
       - ../server:/usr/src/app

docker/docker-compose.test.yml

@@ -6,6 +6,7 @@ services:
     build:
       context: ../server
       dockerfile: Dockerfile
+      target: builder
     command: npm run test:e2e
     expose:
       - "3000"

localizely.yml

@@ -9,6 +9,8 @@ upload:
       locale_code: de-DE
     - file: mobile/assets/i18n/fr-FR.json
       locale_code: fr-FR
+    - file: mobile/assets/i18n/nl-NL.json
+      locale_code: nl-NL
 download:
   files:
     - file: mobile/assets/i18n/en-US.json
@@ -17,3 +19,5 @@ download:
       locale_code: de-DE
     - file: mobile/assets/i18n/fr-FR.json
       locale_code: fr-FR
+    - file: mobile/assets/i18n/nl-NL.json
+      locale_code: nl-NL

machine-learning/Dockerfile

@@ -1,4 +1,5 @@
-FROM node:16-bullseye-slim
+# Build stage
+FROM node:16-bullseye-slim as builder
 
 ARG DEBIAN_FRONTEND=noninteractive
 
@@ -15,3 +16,27 @@ RUN npm rebuild @tensorflow/tfjs-node --build-from-source
 COPY . .
 
 RUN npm run build
+
+
+# Prod stage
+FROM node:16-bullseye-slim
+
+ARG DEBIAN_FRONTEND=noninteractive
+
+WORKDIR /usr/src/app
+
+COPY package.json package-lock.json ./
+COPY entrypoint.sh ./
+
+RUN mkdir -p /usr/src/app/dist \
+  && mkdir -p /usr/src/app/node_modules \
+  && apt-get update \
+  && apt-get install -y ffmpeg \
+  && rm -rf /var/cache/apt/lists
+
+COPY --from=builder /usr/src/app/node_modules ./node_modules
+COPY --from=builder /usr/src/app/dist ./dist
+
+RUN npm prune --production
+
+# CMD [ "node", "dist/main" ]

machine-learning/entrypoint.sh

@@ -1,2 +1,3 @@
 # npm run typeorm migration:run
-npm run build && npm run start:prod
+# npm run start:prod
+node dist/main.js

mobile/android/.gitignore

@@ -11,3 +11,6 @@ GeneratedPluginRegistrant.java
 key.properties
 **/*.keystore
 **/*.jks
+
+# Fastlane
+/fastlane/report.xml

mobile/android/app/build.gradle

@@ -80,5 +80,8 @@ flutter {
 }
 
 dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_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/immich_mobile/MainActivity.kt

@@ -1,6 +0,0 @@
-package com.example.immich_mobile
-
-import io.flutter.embedding.android.FlutterActivity
-
-class MainActivity: FlutterActivity() {
-}

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

@@ -0,0 +1,98 @@
+package app.alextran.immich
+
+import android.content.Context
+import android.net.Uri
+import android.content.Intent
+import android.provider.Settings
+import android.util.Log
+import android.widget.Toast
+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
+
+/**
+ * Android plugin for Dart `BackgroundService`
+ *
+ * Receives messages/method calls from the foreground Dart side to manage
+ * the background service, e.g. start (enqueue), stop (cancel) 
+ */
+class BackgroundServicePlugin : FlutterPlugin, MethodChannel.MethodCallHandler {
+
+    private var methodChannel: MethodChannel? = null
+    private var context: Context? = null
+
+    override fun onAttachedToEngine(binding: FlutterPlugin.FlutterPluginBinding) {
+        onAttachedToEngine(binding.applicationContext, binding.binaryMessenger)
+    }
+
+    private fun onAttachedToEngine(ctx: Context, messenger: BinaryMessenger) {
+        context = ctx
+        methodChannel = MethodChannel(messenger, "immich/foregroundChannel")
+        methodChannel?.setMethodCallHandler(this)
+    }
+
+    override fun onDetachedFromEngine(binding: FlutterPlugin.FlutterPluginBinding) {
+        onDetachedFromEngine()
+    }
+
+    private fun onDetachedFromEngine() {
+        methodChannel?.setMethodCallHandler(null)
+        methodChannel = null
+    }
+
+    override fun onMethodCall(call: MethodCall, result: MethodChannel.Result) {
+        val ctx = context!!
+        when(call.method) {
+            "initialize" -> { // needs to be called prior to any other method
+                val args = call.arguments<ArrayList<*>>()!!
+                ctx.getSharedPreferences(BackupWorker.SHARED_PREF_NAME, Context.MODE_PRIVATE)
+                    .edit().putLong(BackupWorker.SHARED_PREF_CALLBACK_KEY, args.get(0) as Long).apply()
+                result.success(true)
+            }
+            "start" -> {
+                val args = call.arguments<ArrayList<*>>()!!
+                val immediate = args.get(0) as Boolean
+                val keepExisting = args.get(1) as Boolean
+                val requireUnmeteredNetwork = args.get(2) as Boolean
+                val requireCharging = args.get(3) as Boolean
+                val notificationTitle = args.get(4) as String
+                ctx.getSharedPreferences(BackupWorker.SHARED_PREF_NAME, Context.MODE_PRIVATE)
+                    .edit().putString(BackupWorker.SHARED_PREF_NOTIFICATION_TITLE, notificationTitle).apply()
+                BackupWorker.startWork(ctx, immediate, keepExisting, requireUnmeteredNetwork, requireCharging)
+                result.success(true)
+            }
+            "stop" -> {
+                BackupWorker.stopWork(ctx)
+                result.success(true)
+            }
+            "isEnabled" -> {
+                result.success(BackupWorker.isEnabled(ctx))
+            }
+            "disableBatteryOptimizations" -> {
+                if(!BackupWorker.isIgnoringBatteryOptimizations(ctx)) {
+                    val args = call.arguments<ArrayList<*>>()!!
+                    val text = args.get(0) as String
+                    Toast.makeText(ctx, text, Toast.LENGTH_LONG).show()
+                    val intent = Intent(Settings.ACTION_IGNORE_BATTERY_OPTIMIZATION_SETTINGS)
+                    intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                    intent.setData(Uri.parse("package:" + ctx.getPackageName()))
+                    try {
+                        ctx.startActivity(intent)
+                    } catch(e: Exception) {
+                        intent.setAction(Settings.ACTION_APPLICATION_DETAILS_SETTINGS)
+                        try {
+                            ctx.startActivity(intent)
+                        } catch (e2: Exception) {
+                            return result.success(false)
+                        }
+                    }
+                }
+                result.success(true)
+            }
+            else -> result.notImplemented()
+        }
+    }
+}
+
+private const val TAG = "BackgroundServicePlugin"

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

@@ -0,0 +1,345 @@
+package app.alextran.immich
+
+import android.app.NotificationChannel
+import android.app.NotificationManager
+import android.content.Context
+import android.os.Build
+import android.os.Handler
+import android.os.Looper
+import android.os.PowerManager
+import android.os.SystemClock
+import android.provider.MediaStore
+import android.provider.BaseColumns
+import android.provider.MediaStore.MediaColumns
+import android.provider.MediaStore.Images.Media
+import android.util.Log
+import androidx.annotation.RequiresApi
+import androidx.core.app.NotificationCompat
+import androidx.concurrent.futures.ResolvableFuture
+import androidx.work.BackoffPolicy
+import androidx.work.Constraints
+import androidx.work.Data
+import androidx.work.ForegroundInfo
+import androidx.work.ListenableWorker
+import androidx.work.NetworkType
+import androidx.work.WorkerParameters
+import androidx.work.ExistingWorkPolicy
+import androidx.work.OneTimeWorkRequest
+import androidx.work.WorkManager
+import com.google.common.util.concurrent.ListenableFuture
+import io.flutter.embedding.engine.FlutterEngine
+import io.flutter.embedding.engine.dart.DartExecutor
+import io.flutter.embedding.engine.loader.FlutterLoader
+import io.flutter.plugin.common.MethodCall
+import io.flutter.plugin.common.MethodChannel
+import io.flutter.view.FlutterCallbackInformation
+import java.util.concurrent.TimeUnit
+
+/**
+ * Worker executed by Android WorkManager to perform backup in background
+ *
+ * Starts the Dart runtime/engine and calls `_nativeEntry` function in
+ * `background.service.dart` to run the actual backup logic.
+ * Called by Android WorkManager when all constraints for the work are met,
+ * i.e. a new photo/video is created on the device AND battery is not low.
+ * Optionally, unmetered network (wifi) and charging can be required.
+ * As this work is not triggered periodically, but on content change, the
+ * worker enqueues itself again with the same settings.
+ * In case the worker is stopped by the system (e.g. constraints like wifi
+ * are no longer met, or the system needs memory resources for more other
+ * more important work), the worker is replaced without the constraint on
+ * changed contents to run again as soon as deemed possible by the system.
+ */
+class BackupWorker(ctx: Context, params: WorkerParameters) : ListenableWorker(ctx, params), MethodChannel.MethodCallHandler {
+
+    private val resolvableFuture = ResolvableFuture.create<Result>()
+    private var engine: FlutterEngine? = null
+    private lateinit var backgroundChannel: MethodChannel
+    private val notificationManager = ctx.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+    private val isIgnoringBatteryOptimizations = isIgnoringBatteryOptimizations(applicationContext)
+
+    override fun startWork(): ListenableFuture<ListenableWorker.Result> {
+
+        val ctx = applicationContext
+        // enqueue itself once again to continue to listen on added photos/videos
+        enqueueMoreWork(ctx,
+                        requireUnmeteredNetwork = inputData.getBoolean(DATA_KEY_UNMETERED, true),
+                        requireCharging = inputData.getBoolean(DATA_KEY_CHARGING, false))
+
+        if (!flutterLoader.initialized()) {
+            flutterLoader.startInitialization(ctx)
+        }
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            // Create a Notification channel if necessary
+            createChannel()
+        }
+        if (isIgnoringBatteryOptimizations) {
+            // normal background services can only up to 10 minutes
+            // foreground services are allowed to run indefinitely
+            // requires battery optimizations to be disabled (either manually by the user
+            // or by the system learning that immich is important to the user)
+            val title = ctx.getSharedPreferences(SHARED_PREF_NAME, Context.MODE_PRIVATE)
+                .getString(SHARED_PREF_NOTIFICATION_TITLE, NOTIFICATION_DEFAULT_TITLE)!!
+            setForegroundAsync(createForegroundInfo(title))
+        }
+        engine = FlutterEngine(ctx)
+
+        flutterLoader.ensureInitializationCompleteAsync(ctx, null, Handler(Looper.getMainLooper())) {
+            runDart()
+        }
+
+        return resolvableFuture
+    }
+
+    /**
+     * Starts the Dart runtime/engine and calls `_nativeEntry` function in
+     * `background.service.dart` to run the actual backup logic.
+     */
+    private fun runDart() {
+        val callbackDispatcherHandle = applicationContext.getSharedPreferences(
+            SHARED_PREF_NAME, Context.MODE_PRIVATE).getLong(SHARED_PREF_CALLBACK_KEY, 0L)
+        val callbackInformation = FlutterCallbackInformation.lookupCallbackInformation(callbackDispatcherHandle)
+        val appBundlePath = flutterLoader.findAppBundlePath()
+
+        engine?.let { engine ->
+            backgroundChannel = MethodChannel(engine.dartExecutor, "immich/backgroundChannel")
+            backgroundChannel.setMethodCallHandler(this@BackupWorker)
+            engine.dartExecutor.executeDartCallback(
+                DartExecutor.DartCallback(
+                    applicationContext.assets,
+                    appBundlePath,
+                    callbackInformation
+                )
+            )
+        }
+    }
+
+    override fun onStopped() {
+        // called when the system has to stop this worker because constraints are
+        // no longer met or the system needs resources for more important tasks
+        Handler(Looper.getMainLooper()).postAtFrontOfQueue {
+            backgroundChannel.invokeMethod("systemStop", null)
+        }
+        // cannot await/get(block) on resolvableFuture as its already cancelled (would throw CancellationException)
+        // instead, wait for 5 seconds until forcefully stopping backup work
+        Handler(Looper.getMainLooper()).postDelayed({
+            stopEngine(null)
+        }, 5000)
+    }
+
+
+    private fun stopEngine(result: Result?) {
+        if (result != null) {
+            resolvableFuture.set(result)
+        } else if (engine != null && inputData.getInt(DATA_KEY_RETRIES, 0) == 0) {
+            // stopped by system and this is the first time (content change constraints active)
+            // replace the task without the content constraints to finish the backup as soon as possible
+            enqueueMoreWork(applicationContext,
+                immediate = true,
+                requireUnmeteredNetwork = inputData.getBoolean(DATA_KEY_UNMETERED, true),
+                requireCharging = inputData.getBoolean(DATA_KEY_CHARGING, false),
+                initialDelayInMs = ONE_MINUTE,
+                retries = inputData.getInt(DATA_KEY_RETRIES, 0) + 1)
+        }
+        engine?.destroy()
+        engine = null
+    }
+
+    override fun onMethodCall(call: MethodCall, r: MethodChannel.Result) {
+        when (call.method) {
+            "initialized" ->
+                backgroundChannel.invokeMethod(
+                    "onAssetsChanged",
+                    null,
+                    object : MethodChannel.Result {
+                        override fun notImplemented() {
+                            stopEngine(Result.failure())
+                        }
+
+                        override fun error(errorCode: String, errorMessage: String?, errorDetails: Any?) {
+                            stopEngine(Result.failure())
+                        }
+
+                        override fun success(receivedResult: Any?) {
+                            val success = receivedResult as Boolean
+                            stopEngine(if(success) Result.success() else Result.retry())
+                            if (!success && inputData.getInt(DATA_KEY_RETRIES, 0) == 0) {
+                                // there was an error (e.g. server not available)
+                                // replace the task without the content constraints to finish the backup as soon as possible
+                                enqueueMoreWork(applicationContext,
+                                    immediate = true,
+                                    requireUnmeteredNetwork = inputData.getBoolean(DATA_KEY_UNMETERED, true),
+                                    requireCharging = inputData.getBoolean(DATA_KEY_CHARGING, false),
+                                    initialDelayInMs = ONE_MINUTE,
+                                    retries = inputData.getInt(DATA_KEY_RETRIES, 0) + 1)
+                            }
+                        }
+                    }
+                )
+            "updateNotification" -> {
+                val args = call.arguments<ArrayList<*>>()!!
+                val title = args.get(0) as String
+                val content = args.get(1) as String
+                if (isIgnoringBatteryOptimizations) {
+                    setForegroundAsync(createForegroundInfo(title, content))
+                }
+            }
+            "showError" -> {
+                val args = call.arguments<ArrayList<*>>()!!
+                val title = args.get(0) as String
+                val content = args.get(1) as String
+                val individualTag = args.get(2) as String?
+                showError(title, content, individualTag)
+            }
+            "clearErrorNotifications" -> clearErrorNotifications()
+            else -> r.notImplemented()
+        }
+    }
+
+    private fun showError(title: String, content: String, individualTag: String?) {
+        val notification = NotificationCompat.Builder(applicationContext, NOTIFICATION_CHANNEL_ERROR_ID)
+           .setContentTitle(title)
+           .setTicker(title)
+           .setContentText(content)
+           .setSmallIcon(R.mipmap.ic_launcher)
+           .setOnlyAlertOnce(true)
+           .build()
+        notificationManager.notify(individualTag, NOTIFICATION_ERROR_ID, notification)
+    }
+
+    private fun clearErrorNotifications() {
+        notificationManager.cancel(NOTIFICATION_ERROR_ID)
+    }
+
+    private fun createForegroundInfo(title: String = NOTIFICATION_DEFAULT_TITLE, content: String? = null): ForegroundInfo {
+       val notification = NotificationCompat.Builder(applicationContext, NOTIFICATION_CHANNEL_ID)
+           .setContentTitle(title)
+           .setTicker(title)
+           .setContentText(content)
+           .setSmallIcon(R.mipmap.ic_launcher)
+           .setOngoing(true)
+           .build()
+       return ForegroundInfo(NOTIFICATION_ID, notification)
+   }
+
+    @RequiresApi(Build.VERSION_CODES.O)
+    private fun createChannel() {
+        val foreground = NotificationChannel(NOTIFICATION_CHANNEL_ID, NOTIFICATION_CHANNEL_ID, NotificationManager.IMPORTANCE_LOW)
+        notificationManager.createNotificationChannel(foreground)
+        val error = NotificationChannel(NOTIFICATION_CHANNEL_ERROR_ID, NOTIFICATION_CHANNEL_ERROR_ID, NotificationManager.IMPORTANCE_DEFAULT)
+        notificationManager.createNotificationChannel(error)
+    }
+
+    companion object {
+        const val SHARED_PREF_NAME = "immichBackgroundService"
+        const val SHARED_PREF_CALLBACK_KEY = "callbackDispatcherHandle"
+        const val SHARED_PREF_SERVICE_ENABLED = "serviceEnabled"
+        const val SHARED_PREF_NOTIFICATION_TITLE = "notificationTitle"
+
+        private const val TASK_NAME = "immich/photoListener"
+        private const val DATA_KEY_UNMETERED = "unmetered"
+        private const val DATA_KEY_CHARGING = "charging"
+        private const val DATA_KEY_RETRIES = "retries"
+        private const val NOTIFICATION_CHANNEL_ID = "immich/backgroundService"
+        private const val NOTIFICATION_CHANNEL_ERROR_ID = "immich/backgroundServiceError"
+        private const val NOTIFICATION_DEFAULT_TITLE = "Immich"
+        private const val NOTIFICATION_ID = 1
+        private const val NOTIFICATION_ERROR_ID = 2 
+        private const val ONE_MINUTE: Long = 60000
+
+        /**
+         * Enqueues the `BackupWorker` to run when all constraints are met.
+         * 
+         * @param context Android Context
+         * @param immediate whether to enqueue(replace) the worker without the content change constraint
+         * @param keepExisting if true, use `ExistingWorkPolicy.KEEP`, else `ExistingWorkPolicy.APPEND_OR_REPLACE`
+         * @param requireUnmeteredNetwork if true, task only runs if connected to wifi
+         * @param requireCharging if true, task only runs if device is charging
+         * @param retries retry count (should be 0 unless an error occured and this is a retry)
+         */
+        fun startWork(context: Context,
+                        immediate: Boolean = false,
+                        keepExisting: Boolean = false,
+                        requireUnmeteredNetwork: Boolean = false,
+                        requireCharging: Boolean = false) {
+            context.getSharedPreferences(SHARED_PREF_NAME, Context.MODE_PRIVATE)
+                    .edit().putBoolean(SHARED_PREF_SERVICE_ENABLED, true).apply()
+            enqueueMoreWork(context, immediate, keepExisting, requireUnmeteredNetwork, requireCharging)
+        }
+
+        private fun enqueueMoreWork(context: Context,
+                                    immediate: Boolean = false,
+                                    keepExisting: Boolean = false,
+                                    requireUnmeteredNetwork: Boolean = false,
+                                    requireCharging: Boolean = false,
+                                    initialDelayInMs: Long = 0,
+                                    retries: Int = 0) {
+            if (!isEnabled(context)) {
+                return
+            }
+            val constraints = Constraints.Builder()
+                .setRequiredNetworkType(if (requireUnmeteredNetwork) NetworkType.UNMETERED else NetworkType.CONNECTED)
+                .setRequiresBatteryNotLow(true)
+                .setRequiresCharging(requireCharging);
+            if (!immediate) {
+                constraints
+                .addContentUriTrigger(MediaStore.Images.Media.INTERNAL_CONTENT_URI, true)
+                .addContentUriTrigger(MediaStore.Images.Media.EXTERNAL_CONTENT_URI, true)
+                .addContentUriTrigger(MediaStore.Video.Media.INTERNAL_CONTENT_URI, true)
+                .addContentUriTrigger(MediaStore.Video.Media.EXTERNAL_CONTENT_URI, true)
+            }
+
+            val inputData = Data.Builder()
+                .putBoolean(DATA_KEY_CHARGING, requireCharging)
+                .putBoolean(DATA_KEY_UNMETERED, requireUnmeteredNetwork)
+                .putInt(DATA_KEY_RETRIES, retries)
+                .build()
+                
+            val photoCheck = OneTimeWorkRequest.Builder(BackupWorker::class.java)
+                .setConstraints(constraints.build())
+                .setInputData(inputData)
+                .setInitialDelay(initialDelayInMs, TimeUnit.MILLISECONDS)
+                .setBackoffCriteria(
+                    BackoffPolicy.EXPONENTIAL,
+                    ONE_MINUTE,
+                    TimeUnit.MILLISECONDS)
+                .build()
+            val policy = if (immediate) ExistingWorkPolicy.REPLACE else (if (keepExisting) ExistingWorkPolicy.KEEP else ExistingWorkPolicy.APPEND_OR_REPLACE)
+            val op = WorkManager.getInstance(context).enqueueUniqueWork(TASK_NAME, policy, photoCheck)
+            val result = op.getResult().get()
+        }
+
+        /**
+         * Stops the currently running worker (if any) and removes it from the work queue
+         */
+        fun stopWork(context: Context) {
+            context.getSharedPreferences(SHARED_PREF_NAME, Context.MODE_PRIVATE)
+                    .edit().putBoolean(SHARED_PREF_SERVICE_ENABLED, false).apply()
+            WorkManager.getInstance(context).cancelUniqueWork(TASK_NAME)
+        }
+
+        /**
+         * Returns `true` if the app is ignoring battery optimizations
+         */
+        fun isIgnoringBatteryOptimizations(ctx: Context): Boolean {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                val pwrm = ctx.getSystemService(Context.POWER_SERVICE) as PowerManager
+                val name = ctx.packageName
+                return pwrm.isIgnoringBatteryOptimizations(name)
+            }
+            return true
+        }
+
+        /**
+         * Return true if the user has enabled the background backup service
+         */
+        fun isEnabled(ctx: Context): Boolean {
+            return ctx.getSharedPreferences(SHARED_PREF_NAME, Context.MODE_PRIVATE)
+                    .getBoolean(SHARED_PREF_SERVICE_ENABLED, false)
+        }
+
+        private val flutterLoader = FlutterLoader()
+    }
+}
+
+private const val TAG = "BackupWorker"

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

@@ -1,6 +1,13 @@
 package app.alextran.immich
 
 import io.flutter.embedding.android.FlutterActivity
+import io.flutter.embedding.engine.FlutterEngine
 
 class MainActivity: FlutterActivity() {
+
+    override fun configureFlutterEngine(flutterEngine: FlutterEngine) {
+        super.configureFlutterEngine(flutterEngine)
+        flutterEngine.getPlugins().add(BackgroundServicePlugin())
+    }
+
 }

mobile/android/build.gradle

@@ -1,5 +1,8 @@
 buildscript {
     ext.kotlin_version = '1.6.10'
+    ext.work_version = '2.7.1'
+    ext.concurrent_version = '1.1.0'
+    ext.guava_version = '31.0.1-android'
     repositories {
         google()
         mavenCentral()

mobile/android/fastlane/Fastfile

@@ -30,8 +30,8 @@ platform :android do
       task: 'bundle', 
       build_type: 'Release',
       properties: {
-        "android.injected.version.code" => 33,
-        "android.injected.version.name" => "1.23.0",
+        "android.injected.version.code" => 36,
+        "android.injected.version.name" => "1.26.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/android/fastlane/metadata/android/en-US/changelogs/34.txt

@@ -0,0 +1,3 @@
+* Feature - [Android] Background backup.
+* Fixed - [iOS] Dark mode not auto switch.
+* Fixed - WebSocket not getting correct data on mobile.

mobile/android/fastlane/metadata/android/en-US/changelogs/35.txt

@@ -0,0 +1,4 @@
+* Feature - Customization options for asset grid 
+* Added pt-BR Translation: Translation into Portuguese Brazil
+* Feature - Show notifications on background backup errors 
+* Optimization - Use CachedNetworkImage and separate cache for thumbnails on library page

mobile/android/fastlane/report.xml

@@ -5,17 +5,17 @@
     
     
       
-      <testcase classname="fastlane.lanes" name="0: default_platform" time="0.000221">
+      <testcase classname="fastlane.lanes" name="0: default_platform" time="0.000224">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="1: bundleRelease" time="55.750133">
+      <testcase classname="fastlane.lanes" name="1: bundleRelease" time="65.786484">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="2: upload_to_play_store" time="35.558064">
+      <testcase classname="fastlane.lanes" name="2: upload_to_play_store" time="36.344276">
         
       </testcase>
     

mobile/assets/i18n/de-DE.json

@@ -48,7 +48,7 @@
   "control_bottom_app_bar_delete": "Löschen",
   "create_shared_album_page_share": "Teilen",
   "create_shared_album_page_create": "Erstellen",
-  "create_shared_album_page_share_add_assets": "ELEMENTE HINZUFÜGEN",
+  "create_shared_album_page_share_add_assets": "FOTOS HINZUFÜGEN",
   "create_shared_album_page_share_select_photos": "Fotos auswählen",
   "daily_title_text_date": "E, dd MMM",
   "daily_title_text_date_year": "E, dd MMM, yyyy",
@@ -76,6 +76,7 @@
   "monthly_title_text_date_format": "MMMM y",
   "profile_drawer_client_server_up_to_date": "App und Server sind aktuell",
   "profile_drawer_sign_out": "Abmelden",
+  "profile_drawer_settings": "Einstellungen",
   "search_bar_hint": "Durchsuche deine Fotos",
   "search_page_no_objects": "Keine Objektinformationen verfügbar",
   "search_page_no_places": "Keine Informationen über Orte verfügbar",
@@ -112,5 +113,14 @@
   "library_page_new_album": "Neues Album",
   "create_album_page_untitled": "Unbenannt",
   "share_dialog_preparing": "Vorbereiten...",
-  "control_bottom_app_bar_share": "Teilen"
+  "control_bottom_app_bar_share": "Teilen",
+  "setting_pages_app_bar_settings": "Einstellungen",
+  "theme_setting_theme_title": "Theme",
+  "theme_setting_theme_subtitle": "Wählen Sie die Themeneinstellung der App",
+  "theme_setting_system_theme_switch": "Automatisch (Systemeinstellung folgen)",
+  "theme_setting_dark_mode_switch": "Dunkler Modus",
+  "theme_setting_image_viewer_quality_title": "Qualität des Bildbetrachters",
+  "theme_setting_image_viewer_quality_subtitle": "Einstellen der Qualität des Detailbildbetrachters",
+  "theme_setting_three_stage_loading_title": "Dreistufiges Laden aktivieren",
+  "theme_setting_three_stage_loading_subtitle": "Das dreistufige Ladeverfahren kann die Performance beim Laden verbessern, erhöht allerdings den Datenverbrauch deutlich"
 }

mobile/assets/i18n/en-US.json

@@ -16,10 +16,26 @@
   "backup_album_selection_page_selection_info": "Selection Info",
   "backup_album_selection_page_total_assets": "Total unique assets",
   "backup_all": "All",
+  "backup_background_service_default_notification": "Checking for new assets…",
+  "backup_background_service_disable_battery_optimizations": "Please disable battery optimization for Immich to enable background backup",
+  "backup_background_service_upload_failure_notification": "Failed to upload {}",
+  "backup_background_service_in_progress_notification": "Backing up your assets…",
+  "backup_background_service_current_upload_notification": "Uploading {}",
+  "backup_background_service_error_title": "Backup error",
+  "backup_background_service_connection_failed_message": "Failed to connect to the server. Retrying…",
+  "backup_background_service_backup_failed_message": "Failed to backup assets. Retrying…",
   "backup_controller_page_albums": "Backup Albums",
   "backup_controller_page_backup": "Backup",
   "backup_controller_page_backup_selected": "Selected: ",
   "backup_controller_page_backup_sub": "Backed up photos and videos",
+  "backup_controller_page_background_description": "Turn on the background service to automatically backup any new assets without needing to open the app",
+  "backup_controller_page_background_wifi": "Only on WiFi",
+  "backup_controller_page_background_charging": "Only while charging",
+  "backup_controller_page_background_is_on": "Automatic background backup is on",
+  "backup_controller_page_background_is_off": "Automatic background backup is off",
+  "backup_controller_page_background_turn_on": "Turn on background service",
+  "backup_controller_page_background_turn_off": "Turn off background service",
+  "backup_controller_page_background_configure_error": "Failed to configure the background service",
   "backup_controller_page_cancel": "Cancel",
   "backup_controller_page_created": "Created on: {}",
   "backup_controller_page_desc_backup": "Turn on backup to automatically upload new assets to the server.",
@@ -122,5 +138,16 @@
   "theme_setting_image_viewer_quality_title": "Image viewer quality",
   "theme_setting_image_viewer_quality_subtitle": "Adjust the quality of the detail image viewer",
   "theme_setting_three_stage_loading_title": "Enable three-stage loading",
-  "theme_setting_three_stage_loading_subtitle": "The three-stage loading delivers the best quality image in exchange for a slower loading speed"
+  "theme_setting_three_stage_loading_subtitle": "Three-stage loading might increase the loading performance but causes significantly higher network load",
+  "asset_list_settings_title": "Photo Grid",
+  "asset_list_settings_subtitle": "Photo grid layout settings",
+  "theme_setting_asset_list_storage_indicator_title": "Show storage indicator on asset tiles",
+  "theme_setting_asset_list_tiles_per_row_title": "Number of assets per row ({})",
+  "setting_notifications_title": "Notifications",
+  "setting_notifications_subtitle": "Adjust your notification preferences",
+  "setting_notifications_notify_failures_grace_period": "Notify background backup failures: {}",
+  "setting_notifications_notify_immediately": "immediately",
+  "setting_notifications_notify_minutes": "{} minutes",
+  "setting_notifications_notify_hours": "{} hours",
+  "setting_notifications_notify_never": "never"
 }

mobile/assets/i18n/nl-NL.json

@@ -0,0 +1,153 @@
+{
+  "album_info_card_backup_album_excluded": "UITGESLOTEN",
+  "album_info_card_backup_album_included": "INGESLOTEN",
+  "album_viewer_appbar_share_delete": "Verwijder album",
+  "album_viewer_appbar_share_err_delete": "Fout bij verwijderen album",
+  "album_viewer_appbar_share_err_leave": "Fout bij verlaten album",
+  "album_viewer_appbar_share_err_remove": "Er gaat iets mis bij het verwijderen van items uit het album",
+  "album_viewer_appbar_share_err_title": "Fout bij wijzigen album titel",
+  "album_viewer_appbar_share_leave": "Verlaat album",
+  "album_viewer_appbar_share_remove": "Verwijder uit album",
+  "album_viewer_page_share_add_users": "Voeg gebruiker toe",
+  "backup_album_selection_page_albums_device": "Albums op apparaat ({})",
+  "backup_album_selection_page_albums_tap": "Tik om in te voegen, dubbel tik om uit te sluiten",
+  "backup_album_selection_page_assets_scatter": "Items kunnen over verschillende albums verdeeld zijn, dus albums kunnen ingesloten of uitgesloten zijn van het backup proces.",
+  "backup_album_selection_page_select_albums": "Selecteer albums",
+  "backup_album_selection_page_selection_info": "Selectie info",
+  "backup_album_selection_page_total_assets": "Totaal unieke items",
+  "backup_all": "Alle",
+  "backup_background_service_default_notification": "Controleren op nieuw items…",
+  "backup_background_service_disable_battery_optimizations": "Schakel batterij optimalisatie uit voor Immich om achtergrond backup in te schakelen",
+  "backup_background_service_upload_failure_notification": "Fout bij upload {}",
+  "backup_background_service_in_progress_notification": "Backuppen van items…",
+  "backup_background_service_current_upload_notification": "Uploaden {}",
+  "backup_background_service_error_title": "Backup fout",
+  "backup_background_service_connection_failed_message": "Fout bij verbinden server. Opnieuw proberen…",
+  "backup_background_service_backup_failed_message": "Fout bij backuppen items. Opnieuw proberen…",
+  "backup_controller_page_albums": "Backup Albums",
+  "backup_controller_page_backup": "Backup",
+  "backup_controller_page_backup_selected": "Geselecteerd: ",
+  "backup_controller_page_backup_sub": "Foto's en video's gebackupped",
+  "backup_controller_page_background_description": "Gebruik achtergrondservice om automatisch nieuwe items te uploaden naar server zonder de app te openen",
+  "backup_controller_page_background_wifi": "Alleen op WiFi",
+  "backup_controller_page_background_charging": "Alleen tijdens opladen",
+  "backup_controller_page_background_is_on": "Automatische achtergrond backup staat aan",
+  "backup_controller_page_background_is_off": "Automatische achtergrond backup staat uit",
+  "backup_controller_page_background_turn_on": "Zet achtergrondservice aan",
+  "backup_controller_page_background_turn_off": "Zet achtergrondservice uit",
+  "backup_controller_page_background_configure_error": "Achtergrondservice configuratie mislukt",
+  "backup_controller_page_cancel": "Annuleren",
+  "backup_controller_page_created": "Gemaakt op: {}",
+  "backup_controller_page_desc_backup": "Configureer backup om automatisch nieuwe items te uploaden naar server.",
+  "backup_controller_page_excluded": "Uitgezonderd: ",
+  "backup_controller_page_failed": "Mislukt ({})",
+  "backup_controller_page_filename": "Bestandsnaam: {} [{}]",
+  "backup_controller_page_id": "ID: {}",
+  "backup_controller_page_info": "Backup informatie",
+  "backup_controller_page_none_selected": "Geen geselecteerd",
+  "backup_controller_page_remainder": "Rest",
+  "backup_controller_page_remainder_sub": "Overgebleven foto's en video's om te backuppen uit selectie",
+  "backup_controller_page_select": "Selecteer",
+  "backup_controller_page_server_storage": "Server Opslag",
+  "backup_controller_page_start_backup": "Start Backup",
+  "backup_controller_page_status_off": "Backup staat uit",
+  "backup_controller_page_status_on": "Backup staat aan",
+  "backup_controller_page_storage_format": "{} van {} gebruikt",
+  "backup_controller_page_to_backup": "Albums om te backuppen",
+  "backup_controller_page_total": "Totaal",
+  "backup_controller_page_total_sub": "Alle unieke foto's en video's uit geselecteerde albums",
+  "backup_controller_page_turn_off": "Backup uitzetten",
+  "backup_controller_page_turn_on": "Backup aanzetten",
+  "backup_controller_page_uploading_file_info": "Bestandsgegevens uploaden",
+  "backup_err_only_album": "Kan niet alleen het album verwijderen",
+  "backup_info_card_assets": "items",
+  "control_bottom_app_bar_delete": "Verwijderen",
+  "create_shared_album_page_share": "Delen",
+  "create_shared_album_page_create": "Aanmaken",
+  "create_shared_album_page_share_add_assets": "VOEG FOTO'S TOE",
+  "create_shared_album_page_share_select_photos": "Selecteer Foto's",
+  "daily_title_text_date": "E, MMM dd",
+  "daily_title_text_date_year": "E, MMM dd, yyyy",
+  "date_format": "E, LLL d, y • h:mm a",
+  "delete_dialog_alert": "Deze items zullen permanent verwijderd worden van Immich en je apparaat",
+  "delete_dialog_cancel": "Annuleren",
+  "delete_dialog_ok": "Verwijderen",
+  "delete_dialog_title": "Verwijder permanent",
+  "exif_bottom_sheet_description": "Voeg beschrijving toe...",
+  "exif_bottom_sheet_details": "DETAILS",
+  "exif_bottom_sheet_location": "LOCATIE",
+  "login_form_button_text": "Login",
+  "login_form_email_hint": "jouwemail@email.com",
+  "login_form_endpoint_hint": "http://jouw-server-ip:port/api",
+  "login_form_endpoint_url": "Server URL",
+  "login_form_err_http": "Voer http:// of https:// in",
+  "login_form_err_invalid_email": "Ongeldige Email",
+  "login_form_err_leading_whitespace": "Spatie aan het begin",
+  "login_form_err_trailing_whitespace": "Spatie aan het eind",
+  "login_form_failed_login": "Fout bij inloggen, controleer server url, email en wachtwoord",
+  "login_form_label_email": "Email",
+  "login_form_label_password": "Wachtwoord",
+  "login_form_password_hint": "wachtwoord",
+  "login_form_save_login": "Ingelogd blijven",
+  "monthly_title_text_date_format": "MMMM y",
+  "profile_drawer_client_server_up_to_date": "Client en Server zijn up-to-date",
+  "profile_drawer_sign_out": "Uitloggen",
+  "profile_drawer_settings": "Instellingen",
+  "search_bar_hint": "Zoek je foto's",
+  "search_page_no_objects": "Geen object gegevens beschikbaar",
+  "search_page_no_places": "Geen locatie gegevens beschikbaar",
+  "search_page_places": "Plaatsen",
+  "search_page_things": "Dingen",
+  "search_result_page_new_search_hint": "Nieuw resultaat",
+  "select_additional_user_for_sharing_page_suggestions": "Suggesties",
+  "select_user_for_sharing_page_err_album": "Album aanmaken mislukt",
+  "select_user_for_sharing_page_share_suggestions": "Suggesties",
+  "share_add": "Toevoegen",
+  "share_add_photos": "Foto's toevoegen",
+  "share_add_title": "Titel toevoegen",
+  "share_create_album": "Album aanmaken",
+  "share_invite": "Uitnodigen voor album",
+  "sharing_page_album": "Gedeelde albums",
+  "sharing_page_description": "Maak gedeelde albums om foto's en video's te delen met mensen in je netwerk.",
+  "sharing_page_empty_list": "LEGE LIJST",
+  "sharing_silver_appbar_create_shared_album": "Maak gedeeld album",
+  "sharing_silver_appbar_share_partner": "Delen met partner",
+  "tab_controller_nav_photos": "Foto's",
+  "tab_controller_nav_search": "Zoeken",
+  "tab_controller_nav_sharing": "Delen",
+  "tab_controller_nav_library": "Bibliotheek",
+  "version_announcement_overlay_ack": "Bevestig",
+  "version_announcement_overlay_release_notes": "release opmerkingen",
+  "version_announcement_overlay_text_1": "Er is een nieuwe versie beschikbaar van",
+  "version_announcement_overlay_text_2": "neem je tijd en bezoek de ",
+  "version_announcement_overlay_text_3": " controleer of je docker-compose en .env up-to-date zijn om te voorkomen dat er misconfiguraties zijn, in het bijzonder als je gebruik maakt van WatchTower of een ander mechanisme dat je server automatisch configureert.",
+  "version_announcement_overlay_title": "Nieuwe server versie beschikbaar \uD83C\uDF89",
+  "album_thumbnail_card_item": "1 item",
+  "album_thumbnail_card_items": "{} items",
+  "album_thumbnail_card_shared": " · Gedeeld",
+  "library_page_albums": "Albums",
+  "library_page_new_album": "Nieuw album",
+  "create_album_page_untitled": "Naamloos",
+  "share_dialog_preparing": "Voorbereiden...",
+  "control_bottom_app_bar_share": "Delen",
+  "setting_pages_app_bar_settings": "Instellingen",
+  "theme_setting_theme_title": "Thema",
+  "theme_setting_theme_subtitle": "Kies de thema instelling van de app",
+  "theme_setting_system_theme_switch": "Automatisch (volg systeeminstelling)",
+  "theme_setting_dark_mode_switch": "Donkere modus",
+  "theme_setting_image_viewer_quality_title": "Foto weergave kwaliteit",
+  "theme_setting_image_viewer_quality_subtitle": "Pas de kwaliteit aan van de gedetailleerde foto weergave",
+  "theme_setting_three_stage_loading_title": "Drie-laags laden inschakelen",
+  "theme_setting_three_stage_loading_subtitle": "Three-stage loading might increase the loading performance but causes significantly higher network load",
+  "asset_list_settings_title": "Foto Grid",
+  "asset_list_settings_subtitle": "Foto grid layout instellingen",
+  "theme_setting_asset_list_storage_indicator_title": "Laat ruimte indicator zien bij item tegels",
+  "theme_setting_asset_list_tiles_per_row_title": "Aantal items per rij ({})",
+  "setting_notifications_title": "Notificaties",
+  "setting_notifications_subtitle": "Werk je notificatievoorkeuren bij",
+  "setting_notifications_notify_failures_grace_period": "Melding achtergrond backup fouten: {}",
+  "setting_notifications_notify_immediately": "meteen",
+  "setting_notifications_notify_minutes": "{} minuten",
+  "setting_notifications_notify_hours": "{} uur",
+  "setting_notifications_notify_never": "nooit"
+}

mobile/assets/i18n/pt-BR.json

@@ -0,0 +1,140 @@
+{
+    "album_info_card_backup_album_excluded": "EXCLUÍDO",
+    "album_info_card_backup_album_included": "INCLUÍDO",
+    "album_viewer_appbar_share_delete": "Excluir álbum",
+    "album_viewer_appbar_share_err_delete": "Falha ao excluir álbum",
+    "album_viewer_appbar_share_err_leave": "Falha ao sair do álbum",
+    "album_viewer_appbar_share_err_remove": "Há problemas ao remover recursos do álbum",
+    "album_viewer_appbar_share_err_title": "Falha ao alterar o título do álbum",
+    "album_viewer_appbar_share_leave": "Sair do álbum",
+    "album_viewer_appbar_share_remove": "Remover do álbum",
+    "album_viewer_page_share_add_users": "Adicionar usuários",
+    "backup_album_selection_page_albums_device": "Álbuns no dispositivo ({})",
+    "backup_album_selection_page_albums_tap": "Toque para incluir, toque duas vezes para excluir",
+    "backup_album_selection_page_assets_scatter": "Os recursos podem se espalhar por vários álbuns. Assim, os álbuns podem ser incluídos ou excluídos durante o processo de backup.",
+    "backup_album_selection_page_select_albums": "Selecionar álbuns",
+    "backup_album_selection_page_selection_info": "Informações da Seleção",
+    "backup_album_selection_page_total_assets": "Total de recursos exclusivos",
+    "backup_all": "Todos",
+    "backup_background_service_default_notification": "Checking for new assets…",
+    "backup_background_service_disable_battery_optimizations": "Por favor, desabilite a otimização da bateria para Immich para habilitar o backup em segundo plano",
+    "backup_background_service_upload_failure_notification": "Falha ao carregar {}",
+    "backup_background_service_in_progress_notification": "Fazendo backup de seus ativos…",
+    "backup_background_service_current_upload_notification": "Enviando {}",
+    "backup_controller_page_albums": "Álbuns de backup",
+    "backup_controller_page_backup": "Backup",
+    "backup_controller_page_backup_selected": "Selecionado: ",
+    "backup_controller_page_backup_sub": "Backup de fotos e vídeos",
+    "backup_controller_page_background_description": "Ative o serviço em segundo plano para fazer backup automático de novos ativos sem precisar abrir o aplicativo",
+    "backup_controller_page_background_wifi": "Apenas em Wi-Fi",
+    "backup_controller_page_background_charging": "Apenas durante o carregamento",
+    "backup_controller_page_background_is_on": "O backup automático em segundo plano está ativado",
+    "backup_controller_page_background_is_off": "O backup automático em segundo plano está desativado",
+    "backup_controller_page_background_turn_on": "Ativar o serviço em segundo plano",
+    "backup_controller_page_background_turn_off": "Desativar o serviço em segundo plano",
+    "backup_controller_page_background_configure_error": "Falha ao configurar o serviço em segundo plano",
+    "backup_controller_page_cancel": "Cancelar",
+    "backup_controller_page_created": "Criado em: {}",
+    "backup_controller_page_desc_backup": "Ative o backup para carregar automaticamente novos ativos no servidor.",
+    "backup_controller_page_excluded": "Excluído: ",
+    "backup_controller_page_failed": "Falhou ({})",
+    "backup_controller_page_filename": "Nome do arquivo: {} [{}]",
+    "backup_controller_page_id": "ID: {}",
+    "backup_controller_page_info": "Informações de backup",
+    "backup_controller_page_none_selected": "Nenhum selecionado",
+    "backup_controller_page_remainder": "Restante",
+    "backup_controller_page_remainder_sub": "Fotos e vídeos restantes para fazer backup da seleção",
+    "backup_controller_page_select": "Selecionar",
+    "backup_controller_page_server_storage": "Armazenamento do servidor",
+    "backup_controller_page_start_backup": "Iniciar backup",
+    "backup_controller_page_status_off": "O backup está desativado",
+    "backup_controller_page_status_on": "O backup está ativado",
+    "backup_controller_page_storage_format": "{} de {} usado",
+    "backup_controller_page_to_backup": "Álbuns para backup",
+    "backup_controller_page_total": "Total",
+    "backup_controller_page_total_sub": "Todas as fotos e vídeos únicos dos álbuns selecionados",
+    "backup_controller_page_turn_off": "Desativar o backup",
+    "backup_controller_page_turn_on": "Ativar Backup",
+    "backup_controller_page_uploading_file_info": "Carregando informações do arquivo",
+    "backup_err_only_album": "Não é possível remover o único álbum",
+    "backup_info_card_assets": "ativos",
+    "control_bottom_app_bar_delete": "Excluir",
+    "create_shared_album_page_share": "Compartilhar",
+    "create_shared_album_page_create": "Criar",
+    "create_shared_album_page_share_add_assets": "ADICIONAR FOTOS",
+    "create_shared_album_page_share_select_photos": "Selecionar fotos",
+    "daily_title_text_date": "E, MMM dd",
+    "daily_title_text_date_year": "E, MMM dd, yyyy",
+    "date_format": "E, LLL d, y • h:mm a",
+    "delete_dialog_alert": "Esses itens serão excluídos permanentemente do Immich e do seu dispositivo",
+    "delete_dialog_cancel": "Cancelar",
+    "delete_dialog_ok": "Excluir",
+    "delete_dialog_title": "Excluir permanentemente",
+    "exif_bottom_sheet_description": "Adicionar descrição...",
+    "exif_bottom_sheet_details": "DETALHES",
+    "exif_bottom_sheet_location": "LOCALIZAÇÃO",
+    "login_form_button_text": "Login",
+    "login_form_email_hint": "youremail@email.com",
+    "login_form_endpoint_hint": "http://your-server-ip:port/api",
+    "login_form_endpoint_url": "Server Endpoint URL",
+    "login_form_err_http": "Please specify http:// or https://",
+    "login_form_err_invalid_email": "E-mail inválido",
+    "login_form_err_leading_whitespace": "Leading whitespace",
+    "login_form_err_trailing_whitespace": "Trailing whitespace",
+    "login_form_failed_login": "Erro ao fazer login, verifique a url do servidor, e-mail e senha",
+    "login_form_label_email": "Email",
+    "login_form_label_password": "Password",
+    "login_form_password_hint": "password",
+    "login_form_save_login": "Permaneçer conectado",
+    "monthly_title_text_date_format": "MMMM y",
+    "profile_drawer_client_server_up_to_date": "Cliente e Servidor estão atualizados",
+    "profile_drawer_sign_out": "Sair",
+    "profile_drawer_settings": "Configurações",
+    "search_bar_hint": "Procurar fotos",
+    "search_page_no_objects": "Nenhuma informação de objeto disponível",
+    "search_page_no_places": "Nenhuma informação de lugares disponível",
+    "search_page_places": "Lugares",
+    "search_page_things": "Coisas",
+    "search_result_page_new_search_hint": "Nova pesquisa",
+    "select_additional_user_for_sharing_page_suggestions": "Sugestões",
+    "select_user_for_sharing_page_err_album": "Falha ao criar álbum",
+    "select_user_for_sharing_page_share_suggestions": "Sugestões",
+    "share_add": "Adicionar",
+    "share_add_photos": "Adicionar fotos",
+    "share_add_title": "Adicione um título",
+    "share_create_album": "Criar álbum",
+    "share_invite": "Convidar para o álbum",
+    "sharing_page_album": "Álbuns compartilhados",
+    "sharing_page_description": "Crie álbuns compartilhados para compartilhar fotos e vídeos com pessoas em sua rede.",
+    "sharing_page_empty_list": "LISTA VAZIA",
+    "sharing_silver_appbar_create_shared_album": "Criar álbum compartilhado",
+    "sharing_silver_appbar_share_partner": "Compartilhe com o parceiro",
+    "tab_controller_nav_photos": "Fotos",
+    "tab_controller_nav_search": "Procurar",
+    "tab_controller_nav_sharing": "Compartilhamento",
+    "tab_controller_nav_library": "Biblioteca",
+    "version_announcement_overlay_ack": "Confirmar",
+    "version_announcement_overlay_release_notes": "notas de lançamento",
+    "version_announcement_overlay_text_1": "Oi amigo, há um novo lançamento de",
+    "version_announcement_overlay_text_2": "reserve um tempo para visitar o ",
+    "version_announcement_overlay_text_3": " e verifique se a configuração do docker-compose e do .env está atualizada para evitar configurações incorretas, especialmente se você usar o WatchTower ou qualquer mecanismo que lide com a atualização automática do aplicativo do servidor.",
+    "version_announcement_overlay_title": "Nova versão do servidor disponível \uD83C\uDF89",
+    "album_thumbnail_card_item": "1 item",
+    "album_thumbnail_card_items": "{} items",
+    "album_thumbnail_card_shared": " · Compartilhado",
+    "library_page_albums": "Albums",
+    "library_page_new_album": "Novo album",
+    "create_album_page_untitled": "Sem título",
+    "share_dialog_preparing": "Preparando...",
+    "control_bottom_app_bar_share": "Compartilhar",
+    "setting_pages_app_bar_settings": "Configurações",
+    "theme_setting_theme_title": "Tema",
+    "theme_setting_theme_subtitle": "Escolha a configuração de tema do app",
+    "theme_setting_system_theme_switch": "Automático (seguir a configuração do sistema)",
+    "theme_setting_dark_mode_switch": "Dark mode",
+    "theme_setting_image_viewer_quality_title": "Qualidade das imagens do visualizador",
+    "theme_setting_image_viewer_quality_subtitle": "Ajuste a qualidade de imagens detalhadas do visualizador",
+    "theme_setting_three_stage_loading_title": "Ative o carregamento em três estágios",
+    "theme_setting_three_stage_loading_subtitle": "O carregamento em três estágios oferece a imagem de melhor qualidade em troca de uma velocidade de carregamento mais lenta"
+  }
+  

mobile/ios/Runner.xcodeproj/project.pbxproj

@@ -360,7 +360,7 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/RunnerProfile.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 40;
+				CURRENT_PROJECT_VERSION = 51;
 				DEVELOPMENT_TEAM = 2F67MQ8R79;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
@@ -495,7 +495,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 40;
+				CURRENT_PROJECT_VERSION = 51;
 				DEVELOPMENT_TEAM = 2F67MQ8R79;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
@@ -522,7 +522,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 40;
+				CURRENT_PROJECT_VERSION = 51;
 				DEVELOPMENT_TEAM = 2F67MQ8R79;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;

mobile/ios/Runner/Info.plist

@@ -17,11 +17,11 @@
     <key>CFBundlePackageType</key>
     <string>APPL</string>
     <key>CFBundleShortVersionString</key>
-    <string>1.21.0</string>
+    <string>1.26.0</string>
     <key>CFBundleSignature</key>
     <string>????</string>
     <key>CFBundleVersion</key>
-    <string>40</string>
+    <string>51</string>
     <key>LSRequiresIPhoneOS</key>
     <true />
     <key>MGLMapboxMetricsEnabledSettingShownInApp</key>
@@ -66,8 +66,7 @@
       <string>UIInterfaceOrientationLandscapeLeft</string>
       <string>UIInterfaceOrientationLandscapeRight</string>
     </array>
-    <key>UIUserInterfaceStyle</key>
-    <string>Light</string>
+ 
     <key>UIViewControllerBasedStatusBarAppearance</key>
     <true />
     <key>io.flutter.embedded_views_preview</key>
@@ -93,7 +92,9 @@
       <string>it</string>
       <string>fi</string>
       <string>ja</string>
+      <string>nl</string>
       <string>pl</string>
+      <string>pt</string>
     </array>
   </dict>
 </plist>

mobile/ios/fastlane/Fastfile

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

mobile/ios/fastlane/report.xml

@@ -5,32 +5,32 @@
     
     
       
-      <testcase classname="fastlane.lanes" name="0: default_platform" time="0.000205">
+      <testcase classname="fastlane.lanes" name="0: default_platform" time="0.000349">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="1: increment_version_number" time="0.360401">
+      <testcase classname="fastlane.lanes" name="1: increment_version_number" time="0.650297">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="2: latest_testflight_build_number" time="4.012696">
+      <testcase classname="fastlane.lanes" name="2: latest_testflight_build_number" time="7.757602">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="3: increment_build_number" time="0.378836">
+      <testcase classname="fastlane.lanes" name="3: increment_build_number" time="0.421008">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="4: build_app" time="80.023705">
+      <testcase classname="fastlane.lanes" name="4: build_app" time="126.240949">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="5: upload_to_testflight" time="98.18403">
+      <testcase classname="fastlane.lanes" name="5: upload_to_testflight" time="68.206021">
         
       </testcase>
     

mobile/lib/constants/hive_box.dart

@@ -19,3 +19,7 @@ const String githubReleaseInfoKey = "immichGithubReleaseInfoKey"; // Key 1
 
 // User Setting Info
 const String userSettingInfoBox = "immichUserSettingInfoBox";
+
+// Background backup Info
+const String backgroundBackupInfoBox = "immichBackgroundBackupInfoBox"; // Box
+const String backupFailedSince = "immichBackupFailedSince"; // Key 1

mobile/lib/constants/locales.dart

@@ -0,0 +1,19 @@
+import 'dart:ui';
+
+const List<Locale> locales = [
+  // Default locale
+  Locale('en', 'US'),
+  // Additional locales
+  Locale('da', 'DK'),
+  Locale('de', 'DE'),
+  Locale('es', 'ES'),
+  Locale('fi', 'FI'),
+  Locale('fr', 'FR'),
+  Locale('it', 'IT'),
+  Locale('ja', 'JP'),
+  Locale('nl', 'NL'),
+  Locale('pl', 'PL'),
+  Locale('pt', 'PR')
+];
+
+const String translationsPath = 'assets/i18n';

mobile/lib/main.dart

@@ -7,6 +7,9 @@ import 'package:flutter/services.dart';
 import 'package:flutter_displaymode/flutter_displaymode.dart';
 import 'package:hive_flutter/hive_flutter.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/constants/immich_colors.dart';
+import 'package:immich_mobile/constants/locales.dart';
+import 'package:immich_mobile/modules/backup/background_service/background.service.dart';
 import 'package:immich_mobile/modules/backup/models/hive_backup_albums.model.dart';
 import 'package:immich_mobile/modules/backup/providers/backup.provider.dart';
 import 'package:immich_mobile/modules/login/models/hive_saved_login_info.model.dart';
@@ -18,7 +21,6 @@ import 'package:immich_mobile/shared/providers/asset.provider.dart';
 import 'package:immich_mobile/shared/providers/release_info.provider.dart';
 import 'package:immich_mobile/shared/providers/server_info.provider.dart';
 import 'package:immich_mobile/shared/providers/websocket.provider.dart';
-import 'package:immich_mobile/modules/settings/services/app_settings.service.dart';
 import 'package:immich_mobile/shared/views/immich_loading_overlay.dart';
 import 'package:immich_mobile/shared/views/version_announcement_overlay.dart';
 import 'package:immich_mobile/utils/immich_app_theme.dart';
@@ -44,20 +46,6 @@ void main() async {
 
   await EasyLocalization.ensureInitialized();
 
-  var locales = const [
-    // Default locale
-    Locale('en', 'US'),
-    // Additional locales
-    Locale('da', 'DK'),
-    Locale('de', 'DE'),
-    Locale('es', 'ES'),
-    Locale('fi', 'FI'),
-    Locale('fr', 'FR'),
-    Locale('it', 'IT'),
-    Locale('ja', 'JP'),
-    Locale('pl', 'PL')
-  ];
-
   if (kReleaseMode && Platform.isAndroid) {
     try {
       await FlutterDisplayMode.setHighRefreshRate();
@@ -69,7 +57,7 @@ void main() async {
   runApp(
     EasyLocalization(
       supportedLocales: locales,
-      path: 'assets/i18n',
+      path: translationsPath,
       useFallbackTranslations: true,
       fallbackLocale: locales.first,
       child: const ProviderScope(child: ImmichApp()),
@@ -96,6 +84,7 @@ class ImmichAppState extends ConsumerState<ImmichApp>
         var isAuthenticated = ref.watch(authenticationProvider).isAuthenticated;
 
         if (isAuthenticated) {
+          ref.read(backgroundServiceProvider).resumeServiceIfEnabled();
           ref.watch(backupProvider.notifier).resumeBackup();
           ref.watch(assetProvider.notifier).getAllAsset();
           ref.watch(serverInfoProvider.notifier).getServerVersion();
@@ -135,6 +124,10 @@ class ImmichAppState extends ConsumerState<ImmichApp>
   initState() {
     super.initState();
     initApp().then((_) => debugPrint("App Init Completed"));
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      // needs to be delayed so that EasyLocalization is working
+      ref.read(backgroundServiceProvider).resumeServiceIfEnabled();
+    });
   }
 
   @override

mobile/lib/modules/album/ui/album_thumbnail_card.dart

@@ -1,16 +1,25 @@
+import 'dart:math';
+
 import 'package:auto_route/auto_route.dart';
+import 'package:cached_network_image/cached_network_image.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:hive/hive.dart';
 import 'package:immich_mobile/constants/hive_box.dart';
 import 'package:immich_mobile/routing/router.dart';
+import 'package:immich_mobile/shared/services/cache.service.dart';
+import 'package:immich_mobile/utils/image_url_builder.dart';
 import 'package:openapi/api.dart';
-import 'package:transparent_image/transparent_image.dart';
 
 class AlbumThumbnailCard extends StatelessWidget {
-  const AlbumThumbnailCard({Key? key, required this.album}) : super(key: key);
+  const AlbumThumbnailCard({
+    Key? key,
+    required this.album,
+    required this.cacheService,
+  }) : super(key: key);
 
   final AlbumResponseDto album;
+  final CacheService cacheService;
 
   @override
   Widget build(BuildContext context) {
@@ -29,19 +38,19 @@ class AlbumThumbnailCard extends StatelessWidget {
           children: [
             ClipRRect(
               borderRadius: BorderRadius.circular(8),
-              child: FadeInImage(
+              child: CachedNetworkImage(
+                cacheManager: cacheService.getCache(CacheType.albumThumbnail),
+                memCacheHeight: max(400, cardSize.toInt() * 3),
                 width: cardSize,
                 height: cardSize,
                 fit: BoxFit.cover,
-                placeholder: MemoryImage(kTransparentImage),
-                image: NetworkImage(
-                  '${box.get(serverEndpointKey)}/asset/thumbnail/${album.albumThumbnailAssetId}?format=JPEG',
-                  headers: {
-                    "Authorization": "Bearer ${box.get(accessTokenKey)}"
-                  },
-                ),
                 fadeInDuration: const Duration(milliseconds: 200),
-                fadeOutDuration: const Duration(milliseconds: 200),
+                imageUrl:
+                    getAlbumThumbnailUrl(album, type: ThumbnailFormat.JPEG),
+                httpHeaders: {
+                  "Authorization": "Bearer ${box.get(accessTokenKey)}"
+                },
+                cacheKey: "${album.albumThumbnailAssetId}",
               ),
             ),
             Padding(

mobile/lib/modules/album/ui/album_viewer_thumbnail.dart

@@ -14,11 +14,13 @@ import 'package:openapi/api.dart';
 class AlbumViewerThumbnail extends HookConsumerWidget {
   final AssetResponseDto asset;
   final List<AssetResponseDto> assetList;
+  final bool showStorageIndicator;
 
   const AlbumViewerThumbnail({
     Key? key,
     required this.asset,
     required this.assetList,
+    this.showStorageIndicator = true,
   }) : super(key: key);
 
   @override
@@ -166,7 +168,7 @@ class AlbumViewerThumbnail extends HookConsumerWidget {
       child: Stack(
         children: [
           _buildThumbnailImage(),
-          _buildAssetStoreLocationIcon(),
+          if (showStorageIndicator) _buildAssetStoreLocationIcon(),
           if (asset.type != AssetTypeEnum.IMAGE) _buildVideoLabel(),
           if (isMultiSelectionEnable) _buildAssetSelectionIcon(),
         ],

mobile/lib/modules/album/views/album_viewer_page.dart

@@ -13,6 +13,8 @@ import 'package:immich_mobile/modules/album/ui/album_action_outlined_button.dart
 import 'package:immich_mobile/modules/album/ui/album_viewer_appbar.dart';
 import 'package:immich_mobile/modules/album/ui/album_viewer_editable_title.dart';
 import 'package:immich_mobile/modules/album/ui/album_viewer_thumbnail.dart';
+import 'package:immich_mobile/modules/settings/providers/app_settings.provider.dart';
+import 'package:immich_mobile/modules/settings/services/app_settings.service.dart';
 import 'package:immich_mobile/routing/router.dart';
 import 'package:immich_mobile/shared/ui/immich_loading_indicator.dart';
 import 'package:immich_mobile/shared/ui/immich_sliver_persistent_app_bar_delegate.dart';
@@ -186,12 +188,17 @@ class AlbumViewerPage extends HookConsumerWidget {
     }
 
     Widget _buildImageGrid(AlbumResponseDto albumInfo) {
+      final appSettingService = ref.watch(appSettingsServiceProvider);
+      final bool showStorageIndicator =
+          appSettingService.getSetting(AppSettingsEnum.storageIndicator);
+
       if (albumInfo.assets.isNotEmpty) {
         return SliverPadding(
           padding: const EdgeInsets.only(top: 10.0),
           sliver: SliverGrid(
-            gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(
-              crossAxisCount: 3,
+            gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
+              crossAxisCount:
+                  appSettingService.getSetting(AppSettingsEnum.tilesPerRow),
               crossAxisSpacing: 5.0,
               mainAxisSpacing: 5,
             ),
@@ -200,6 +207,7 @@ class AlbumViewerPage extends HookConsumerWidget {
                 return AlbumViewerThumbnail(
                   asset: albumInfo.assets[index],
                   assetList: albumInfo.assets,
+                  showStorageIndicator: showStorageIndicator,
                 );
               },
               childCount: albumInfo.assetCount,

mobile/lib/modules/album/views/library_page.dart

@@ -6,6 +6,7 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/modules/album/providers/album.provider.dart';
 import 'package:immich_mobile/modules/album/ui/album_thumbnail_card.dart';
 import 'package:immich_mobile/routing/router.dart';
+import 'package:immich_mobile/shared/services/cache.service.dart';
 
 class LibraryPage extends HookConsumerWidget {
   const LibraryPage({Key? key}) : super(key: key);
@@ -13,6 +14,7 @@ class LibraryPage extends HookConsumerWidget {
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     final albums = ref.watch(albumProvider);
+    final cacheService = ref.watch(cacheServiceProvider);
 
     useEffect(
       () {
@@ -102,6 +104,7 @@ class LibraryPage extends HookConsumerWidget {
                   _buildCreateAlbumButton(),
                   for (var album in albums)
                     AlbumThumbnailCard(
+                      cacheService: cacheService,
                       album: album,
                     ),
                 ],

mobile/lib/modules/album/views/sharing_page.dart

@@ -1,4 +1,5 @@
 import 'package:auto_route/auto_route.dart';
+import 'package:cached_network_image/cached_network_image.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
@@ -8,8 +9,9 @@ import 'package:immich_mobile/constants/hive_box.dart';
 import 'package:immich_mobile/modules/album/providers/shared_album.provider.dart';
 import 'package:immich_mobile/modules/album/ui/sharing_sliver_appbar.dart';
 import 'package:immich_mobile/routing/router.dart';
+import 'package:immich_mobile/shared/services/cache.service.dart';
+import 'package:immich_mobile/utils/image_url_builder.dart';
 import 'package:openapi/api.dart';
-import 'package:transparent_image/transparent_image.dart';
 
 class SharingPage extends HookConsumerWidget {
   const SharingPage({Key? key}) : super(key: key);
@@ -19,6 +21,7 @@ class SharingPage extends HookConsumerWidget {
     var box = Hive.box(userInfoBox);
     var thumbnailRequestUrl = '${box.get(serverEndpointKey)}/asset/thumbnail';
     final List<AlbumResponseDto> sharedAlbums = ref.watch(sharedAlbumProvider);
+    final CacheService cacheService = ref.watch(cacheServiceProvider);
 
     useEffect(
       () {
@@ -32,29 +35,26 @@ class SharingPage extends HookConsumerWidget {
       return SliverList(
         delegate: SliverChildBuilderDelegate(
           (BuildContext context, int index) {
-            String thumbnailUrl = sharedAlbums[index].albumThumbnailAssetId !=
-                    null
-                ? "$thumbnailRequestUrl/${sharedAlbums[index].albumThumbnailAssetId}"
-                : "https://images.unsplash.com/photo-1612178537253-bccd437b730e?ixlib=rb-1.2.1&ixid=MnwxMjA3fDB8MHxzZWFyY2h8NXx8Ymxhbmt8ZW58MHx8MHx8&auto=format&fit=crop&w=700&q=60";
+            final album = sharedAlbums[index];
 
             return ListTile(
               contentPadding:
                   const EdgeInsets.symmetric(vertical: 12, horizontal: 12),
               leading: ClipRRect(
                 borderRadius: BorderRadius.circular(8),
-                child: FadeInImage(
+                child: CachedNetworkImage(
                   width: 60,
                   height: 60,
+                  memCacheHeight: 200,
                   fit: BoxFit.cover,
-                  placeholder: MemoryImage(kTransparentImage),
-                  image: NetworkImage(
-                    thumbnailUrl,
-                    headers: {
-                      "Authorization": "Bearer ${box.get(accessTokenKey)}"
-                    },
-                  ),
+                  cacheManager:
+                      cacheService.getCache(CacheType.sharedAlbumThumbnail),
+                  imageUrl: getAlbumThumbnailUrl(album),
+                  cacheKey: album.albumThumbnailAssetId,
+                  httpHeaders: {
+                    "Authorization": "Bearer ${box.get(accessTokenKey)}"
+                  },
                   fadeInDuration: const Duration(milliseconds: 200),
-                  fadeOutDuration: const Duration(milliseconds: 200),
                 ),
               ),
               title: Text(

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

@@ -0,0 +1,458 @@
+import 'dart:async';
+import 'dart:developer';
+import 'dart:io';
+import 'dart:isolate';
+import 'dart:ui' show IsolateNameServer, PluginUtilities;
+import 'package:cancellation_token_http/http.dart';
+import 'package:collection/collection.dart';
+import 'package:easy_localization/easy_localization.dart';
+import 'package:flutter/services.dart';
+import 'package:flutter/widgets.dart';
+import 'package:hive_flutter/hive_flutter.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/constants/hive_box.dart';
+import 'package:immich_mobile/modules/backup/background_service/localization.dart';
+import 'package:immich_mobile/modules/backup/models/current_upload_asset.model.dart';
+import 'package:immich_mobile/modules/backup/models/error_upload_asset.model.dart';
+import 'package:immich_mobile/modules/backup/models/hive_backup_albums.model.dart';
+import 'package:immich_mobile/modules/backup/services/backup.service.dart';
+import 'package:immich_mobile/modules/login/models/hive_saved_login_info.model.dart';
+import 'package:immich_mobile/modules/settings/services/app_settings.service.dart';
+import 'package:immich_mobile/shared/services/api.service.dart';
+import 'package:photo_manager/photo_manager.dart';
+
+final backgroundServiceProvider = Provider(
+  (ref) => BackgroundService(),
+);
+
+/// Background backup service
+class BackgroundService {
+  static const String _portNameLock = "immichLock";
+  BackgroundService();
+  static const MethodChannel _foregroundChannel =
+      MethodChannel('immich/foregroundChannel');
+  static const MethodChannel _backgroundChannel =
+      MethodChannel('immich/backgroundChannel');
+  bool _isForegroundInitialized = false;
+  bool _isBackgroundInitialized = false;
+  CancellationToken? _cancellationToken;
+  bool _canceledBySystem = false;
+  int _wantsLockTime = 0;
+  bool _hasLock = false;
+  SendPort? _waitingIsolate;
+  ReceivePort? _rp;
+  bool _errorGracePeriodExceeded = true;
+
+  bool get isForegroundInitialized {
+    return _isForegroundInitialized;
+  }
+
+  bool get isBackgroundInitialized {
+    return _isBackgroundInitialized;
+  }
+
+  Future<bool> _initialize() async {
+    final callback = PluginUtilities.getCallbackHandle(_nativeEntry)!;
+    var result = await _foregroundChannel
+        .invokeMethod('initialize', [callback.toRawHandle()]);
+    _isForegroundInitialized = true;
+    return result;
+  }
+
+  /// Ensures that the background service is enqueued if enabled in settings
+  Future<bool> resumeServiceIfEnabled() async {
+    return await isBackgroundBackupEnabled() &&
+        await startService(keepExisting: true);
+  }
+
+  /// Enqueues the background service
+  Future<bool> startService({
+    bool immediate = false,
+    bool keepExisting = false,
+    bool requireUnmetered = true,
+    bool requireCharging = false,
+  }) async {
+    if (!Platform.isAndroid) {
+      return true;
+    }
+    try {
+      if (!_isForegroundInitialized) {
+        await _initialize();
+      }
+      final String title =
+          "backup_background_service_default_notification".tr();
+      final bool ok = await _foregroundChannel.invokeMethod(
+        'start',
+        [immediate, keepExisting, requireUnmetered, requireCharging, title],
+      );
+      return ok;
+    } catch (error) {
+      return false;
+    }
+  }
+
+  /// Cancels the background service (if currently running) and removes it from work queue
+  Future<bool> stopService() async {
+    if (!Platform.isAndroid) {
+      return true;
+    }
+    try {
+      if (!_isForegroundInitialized) {
+        await _initialize();
+      }
+      final ok = await _foregroundChannel.invokeMethod('stop');
+      return ok;
+    } catch (error) {
+      return false;
+    }
+  }
+
+  /// Returns `true` if the background service is enabled
+  Future<bool> isBackgroundBackupEnabled() async {
+    if (!Platform.isAndroid) {
+      return false;
+    }
+    try {
+      if (!_isForegroundInitialized) {
+        await _initialize();
+      }
+      return await _foregroundChannel.invokeMethod("isEnabled");
+    } catch (error) {
+      return false;
+    }
+  }
+
+  /// Opens an activity to let the user disable battery optimizations for Immich
+  Future<bool> disableBatteryOptimizations() async {
+    if (!Platform.isAndroid) {
+      return true;
+    }
+    try {
+      if (!_isForegroundInitialized) {
+        await _initialize();
+      }
+      final String message =
+          "backup_background_service_disable_battery_optimizations".tr();
+      return await _foregroundChannel.invokeMethod(
+        'disableBatteryOptimizations',
+        message,
+      );
+    } catch (error) {
+      return false;
+    }
+  }
+
+  /// Updates the notification shown by the background service
+  Future<bool> _updateNotification({
+    required String title,
+    String? content,
+  }) async {
+    if (!Platform.isAndroid) {
+      return true;
+    }
+    try {
+      if (_isBackgroundInitialized) {
+        return await _backgroundChannel
+            .invokeMethod('updateNotification', [title, content]);
+      }
+    } catch (error) {
+      debugPrint("[_updateNotification] failed to communicate with plugin");
+    }
+    return Future.value(false);
+  }
+
+  /// Shows a new priority notification
+  Future<bool> _showErrorNotification({
+    required String title,
+    String? content,
+    String? individualTag,
+  }) async {
+    if (!Platform.isAndroid) {
+      return true;
+    }
+    try {
+      if (_isBackgroundInitialized && _errorGracePeriodExceeded) {
+        return await _backgroundChannel
+            .invokeMethod('showError', [title, content, individualTag]);
+      }
+    } catch (error) {
+      debugPrint("[_showErrorNotification] failed to communicate with plugin");
+    }
+    return false;
+  }
+
+  Future<bool> _clearErrorNotifications() async {
+    if (!Platform.isAndroid) {
+      return true;
+    }
+    try {
+      if (_isBackgroundInitialized) {
+        return await _backgroundChannel.invokeMethod('clearErrorNotifications');
+      }
+    } catch (error) {
+      debugPrint(
+          "[_clearErrorNotifications] failed to communicate with plugin");
+    }
+    return false;
+  }
+
+  /// await to ensure this thread (foreground or background) has exclusive access
+  Future<bool> acquireLock() async {
+    if (!Platform.isAndroid) {
+      return true;
+    }
+    final int lockTime = Timeline.now;
+    _wantsLockTime = lockTime;
+    final ReceivePort rp = ReceivePort(_portNameLock);
+    _rp = rp;
+    final SendPort sp = rp.sendPort;
+
+    while (!IsolateNameServer.registerPortWithName(sp, _portNameLock)) {
+      try {
+        await _checkLockReleasedWithHeartbeat(lockTime);
+      } catch (error) {
+        return false;
+      }
+      if (_wantsLockTime != lockTime) {
+        return false;
+      }
+    }
+    _hasLock = true;
+    rp.listen(_heartbeatListener);
+    return true;
+  }
+
+  Future<void> _checkLockReleasedWithHeartbeat(final int lockTime) async {
+    SendPort? other = IsolateNameServer.lookupPortByName(_portNameLock);
+    if (other != null) {
+      final ReceivePort tempRp = ReceivePort();
+      final SendPort tempSp = tempRp.sendPort;
+      final bs = tempRp.asBroadcastStream();
+      while (_wantsLockTime == lockTime) {
+        other.send(tempSp);
+        final dynamic answer = await bs.first
+            .timeout(const Duration(seconds: 5), onTimeout: () => null);
+        if (_wantsLockTime != lockTime) {
+          break;
+        }
+        if (answer == null) {
+          // other isolate failed to answer, assuming it exited without releasing the lock
+          if (other == IsolateNameServer.lookupPortByName(_portNameLock)) {
+            IsolateNameServer.removePortNameMapping(_portNameLock);
+          }
+          break;
+        } else if (answer == true) {
+          // other isolate released the lock
+          break;
+        } else if (answer == false) {
+          // other isolate is still active
+        }
+        final dynamic isFinished = await bs.first
+            .timeout(const Duration(seconds: 5), onTimeout: () => false);
+        if (isFinished == true) {
+          break;
+        }
+      }
+      tempRp.close();
+    }
+  }
+
+  void _heartbeatListener(dynamic msg) {
+    if (msg is SendPort) {
+      _waitingIsolate = msg;
+      msg.send(false);
+    }
+  }
+
+  /// releases the exclusive access lock
+  void releaseLock() {
+    if (!Platform.isAndroid) {
+      return;
+    }
+    _wantsLockTime = 0;
+    if (_hasLock) {
+      IsolateNameServer.removePortNameMapping(_portNameLock);
+      _waitingIsolate?.send(true);
+      _waitingIsolate = null;
+      _hasLock = false;
+    }
+    _rp?.close();
+    _rp = null;
+  }
+
+  void _setupBackgroundCallHandler() {
+    _backgroundChannel.setMethodCallHandler(_callHandler);
+    _isBackgroundInitialized = true;
+    _backgroundChannel.invokeMethod('initialized');
+  }
+
+  Future<bool> _callHandler(MethodCall call) async {
+    switch (call.method) {
+      case "onAssetsChanged":
+        final Future<bool> translationsLoaded = loadTranslations();
+        try {
+          final bool hasAccess = await acquireLock();
+          if (!hasAccess) {
+            debugPrint("[_callHandler] could acquire lock, exiting");
+            return false;
+          }
+          await translationsLoaded;
+          final bool ok = await _onAssetsChanged();
+          if (ok) {
+            Hive.box(backgroundBackupInfoBox).delete(backupFailedSince);
+          } else if (Hive.box(backgroundBackupInfoBox).get(backupFailedSince) ==
+              null) {
+            Hive.box(backgroundBackupInfoBox)
+                .put(backupFailedSince, DateTime.now());
+          }
+          return ok;
+        } catch (error) {
+          debugPrint(error.toString());
+          return false;
+        } finally {
+          await Hive.close();
+          releaseLock();
+        }
+      case "systemStop":
+        _canceledBySystem = true;
+        _cancellationToken?.cancel();
+        return true;
+      default:
+        debugPrint("Unknown method ${call.method}");
+        return false;
+    }
+  }
+
+  Future<bool> _onAssetsChanged() async {
+    await Hive.initFlutter();
+
+    Hive.registerAdapter(HiveSavedLoginInfoAdapter());
+    Hive.registerAdapter(HiveBackupAlbumsAdapter());
+    await Hive.openBox(userInfoBox);
+    await Hive.openBox<HiveSavedLoginInfo>(hiveLoginInfoBox);
+    await Hive.openBox(userSettingInfoBox);
+    await Hive.openBox(backgroundBackupInfoBox);
+
+    ApiService apiService = ApiService();
+    apiService.setEndpoint(Hive.box(userInfoBox).get(serverEndpointKey));
+    apiService.setAccessToken(Hive.box(userInfoBox).get(accessTokenKey));
+    BackupService backupService = BackupService(apiService);
+
+    final Box<HiveBackupAlbums> box =
+        await Hive.openBox<HiveBackupAlbums>(hiveBackupInfoBox);
+    final HiveBackupAlbums? backupAlbumInfo = box.get(backupInfoKey);
+    if (backupAlbumInfo == null) {
+      _clearErrorNotifications();
+      return true;
+    }
+
+    await PhotoManager.setIgnorePermissionCheck(true);
+    _errorGracePeriodExceeded = _isErrorGracePeriodExceeded();
+
+    if (_canceledBySystem) {
+      return false;
+    }
+
+    List<AssetEntity> toUpload =
+        await backupService.buildUploadCandidates(backupAlbumInfo);
+
+    try {
+      toUpload = await backupService.removeAlreadyUploadedAssets(toUpload);
+    } catch (e) {
+      _showErrorNotification(
+        title: "backup_background_service_error_title".tr(),
+        content: "backup_background_service_connection_failed_message".tr(),
+      );
+      return false;
+    }
+
+    if (_canceledBySystem) {
+      return false;
+    }
+
+    if (toUpload.isEmpty) {
+      _clearErrorNotifications();
+      return true;
+    }
+
+    _cancellationToken = CancellationToken();
+    final bool ok = await backupService.backupAsset(
+      toUpload,
+      _cancellationToken!,
+      _onAssetUploaded,
+      _onProgress,
+      _onSetCurrentBackupAsset,
+      _onBackupError,
+    );
+    if (ok) {
+      _clearErrorNotifications();
+      await box.put(
+        backupInfoKey,
+        backupAlbumInfo,
+      );
+    } else {
+      _showErrorNotification(
+        title: "backup_background_service_error_title".tr(),
+        content: "backup_background_service_backup_failed_message".tr(),
+      );
+    }
+    return ok;
+  }
+
+  void _onAssetUploaded(String deviceAssetId, String deviceId) {
+    debugPrint("Uploaded $deviceAssetId from $deviceId");
+  }
+
+  void _onProgress(int sent, int total) {}
+
+  void _onBackupError(ErrorUploadAsset errorAssetInfo) {
+    _showErrorNotification(
+      title: "Upload failed",
+      content: "backup_background_service_upload_failure_notification"
+          .tr(args: [errorAssetInfo.fileName]),
+      individualTag: errorAssetInfo.id,
+    );
+  }
+
+  void _onSetCurrentBackupAsset(CurrentUploadAsset currentUploadAsset) {
+    _updateNotification(
+      title: "backup_background_service_in_progress_notification".tr(),
+      content: "backup_background_service_current_upload_notification"
+          .tr(args: [currentUploadAsset.fileName]),
+    );
+  }
+
+  bool _isErrorGracePeriodExceeded() {
+    final int value = AppSettingsService()
+        .getSetting(AppSettingsEnum.uploadErrorNotificationGracePeriod);
+    if (value == 0) {
+      return true;
+    } else if (value == 5) {
+      return false;
+    }
+    final DateTime? failedSince =
+        Hive.box(backgroundBackupInfoBox).get(backupFailedSince);
+    if (failedSince == null) {
+      return false;
+    }
+    final Duration duration = DateTime.now().difference(failedSince);
+    if (value == 1) {
+      return duration > const Duration(minutes: 30);
+    } else if (value == 2) {
+      return duration > const Duration(hours: 2);
+    } else if (value == 3) {
+      return duration > const Duration(hours: 8);
+    } else if (value == 4) {
+      return duration > const Duration(hours: 24);
+    }
+    assert(false, "Invalid value");
+    return true;
+  }
+}
+
+/// entry point called by Kotlin/Java code; needs to be a top-level function
+void _nativeEntry() {
+  WidgetsFlutterBinding.ensureInitialized();
+  BackgroundService backgroundService = BackgroundService();
+  backgroundService._setupBackgroundCallHandler();
+}

mobile/lib/modules/backup/background_service/localization.dart

@@ -0,0 +1,27 @@
+import 'package:flutter/foundation.dart';
+import 'package:easy_localization/src/asset_loader.dart';
+import 'package:easy_localization/src/easy_localization_controller.dart';
+import 'package:easy_localization/src/localization.dart';
+import 'package:immich_mobile/constants/locales.dart';
+
+/// Workaround to manually load translations in another Isolate
+Future<bool> loadTranslations() async {
+  await EasyLocalizationController.initEasyLocation();
+
+  final controller = EasyLocalizationController(
+    supportedLocales: locales,
+    useFallbackTranslations: true,
+    saveLocale: true,
+    assetLoader: const RootBundleAssetLoader(),
+    path: translationsPath,
+    useOnlyLangCode: false,
+    onLoadError: (e) => debugPrint(e.toString()),
+    fallbackLocale: locales.first,
+  );
+
+  await controller.loadTranslations();
+
+  return Localization.load(controller.locale,
+      translations: controller.translations,
+      fallbackTranslations: controller.fallbackTranslations);
+}

mobile/lib/modules/backup/models/available_album.model.dart

@@ -4,35 +4,45 @@ import 'package:photo_manager/photo_manager.dart';
 
 class AvailableAlbum {
   final AssetPathEntity albumEntity;
+  final DateTime? lastBackup;
   final Uint8List? thumbnailData;
   AvailableAlbum({
     required this.albumEntity,
+    this.lastBackup,
     this.thumbnailData,
   });
 
   AvailableAlbum copyWith({
     AssetPathEntity? albumEntity,
+    DateTime? lastBackup,
     Uint8List? thumbnailData,
   }) {
     return AvailableAlbum(
       albumEntity: albumEntity ?? this.albumEntity,
+      lastBackup: lastBackup ?? this.lastBackup,
       thumbnailData: thumbnailData ?? this.thumbnailData,
     );
   }
 
+  String get name => albumEntity.name;
+
+  int get assetCount => albumEntity.assetCount;
+
+  String get id => albumEntity.id;
+
+  bool get isAll => albumEntity.isAll;
+
   @override
   String toString() =>
-      'AvailableAlbum(albumEntity: $albumEntity, thumbnailData: $thumbnailData)';
+      'AvailableAlbum(albumEntity: $albumEntity, lastBackup: $lastBackup, thumbnailData: $thumbnailData)';
 
   @override
   bool operator ==(Object other) {
     if (identical(this, other)) return true;
 
-    return other is AvailableAlbum &&
-        other.albumEntity == albumEntity &&
-        other.thumbnailData == thumbnailData;
+    return other is AvailableAlbum && other.albumEntity == albumEntity;
   }
 
   @override
-  int get hashCode => albumEntity.hashCode ^ thumbnailData.hashCode;
+  int get hashCode => albumEntity.hashCode;
 }

mobile/lib/modules/backup/models/backup_state.model.dart

@@ -6,7 +6,7 @@ import 'package:photo_manager/photo_manager.dart';
 import 'package:immich_mobile/modules/backup/models/available_album.model.dart';
 import 'package:immich_mobile/modules/backup/models/current_upload_asset.model.dart';
 
-enum BackUpProgressEnum { idle, inProgress, done }
+enum BackUpProgressEnum { idle, inProgress, inBackground, done }
 
 class BackUpState {
   // enum
@@ -15,11 +15,14 @@ class BackUpState {
   final double progressInPercentage;
   final CancellationToken cancelToken;
   final ServerInfoResponseDto serverInfo;
+  final bool backgroundBackup;
+  final bool backupRequireWifi;
+  final bool backupRequireCharging;
 
   /// All available albums on the device
   final List<AvailableAlbum> availableAlbums;
-  final Set<AssetPathEntity> selectedBackupAlbums;
-  final Set<AssetPathEntity> excludedBackupAlbums;
+  final Set<AvailableAlbum> selectedBackupAlbums;
+  final Set<AvailableAlbum> excludedBackupAlbums;
 
   /// Assets that are not overlapping in selected backup albums and excluded backup albums
   final Set<AssetEntity> allUniqueAssets;
@@ -36,6 +39,9 @@ class BackUpState {
     required this.progressInPercentage,
     required this.cancelToken,
     required this.serverInfo,
+    required this.backgroundBackup,
+    required this.backupRequireWifi,
+    required this.backupRequireCharging,
     required this.availableAlbums,
     required this.selectedBackupAlbums,
     required this.excludedBackupAlbums,
@@ -50,9 +56,12 @@ class BackUpState {
     double? progressInPercentage,
     CancellationToken? cancelToken,
     ServerInfoResponseDto? serverInfo,
+    bool? backgroundBackup,
+    bool? backupRequireWifi,
+    bool? backupRequireCharging,
     List<AvailableAlbum>? availableAlbums,
-    Set<AssetPathEntity>? selectedBackupAlbums,
-    Set<AssetPathEntity>? excludedBackupAlbums,
+    Set<AvailableAlbum>? selectedBackupAlbums,
+    Set<AvailableAlbum>? excludedBackupAlbums,
     Set<AssetEntity>? allUniqueAssets,
     Set<String>? selectedAlbumsBackupAssetsIds,
     CurrentUploadAsset? currentUploadAsset,
@@ -63,6 +72,10 @@ class BackUpState {
       progressInPercentage: progressInPercentage ?? this.progressInPercentage,
       cancelToken: cancelToken ?? this.cancelToken,
       serverInfo: serverInfo ?? this.serverInfo,
+      backgroundBackup: backgroundBackup ?? this.backgroundBackup,
+      backupRequireWifi: backupRequireWifi ?? this.backupRequireWifi,
+      backupRequireCharging:
+          backupRequireCharging ?? this.backupRequireCharging,
       availableAlbums: availableAlbums ?? this.availableAlbums,
       selectedBackupAlbums: selectedBackupAlbums ?? this.selectedBackupAlbums,
       excludedBackupAlbums: excludedBackupAlbums ?? this.excludedBackupAlbums,
@@ -75,7 +88,7 @@ class BackUpState {
 
   @override
   String toString() {
-    return 'BackUpState(backupProgress: $backupProgress, allAssetsInDatabase: $allAssetsInDatabase, progressInPercentage: $progressInPercentage, cancelToken: $cancelToken, serverInfo: $serverInfo, availableAlbums: $availableAlbums, selectedBackupAlbums: $selectedBackupAlbums, excludedBackupAlbums: $excludedBackupAlbums, allUniqueAssets: $allUniqueAssets, selectedAlbumsBackupAssetsIds: $selectedAlbumsBackupAssetsIds, currentUploadAsset: $currentUploadAsset)';
+    return 'BackUpState(backupProgress: $backupProgress, allAssetsInDatabase: $allAssetsInDatabase, progressInPercentage: $progressInPercentage, cancelToken: $cancelToken, serverInfo: $serverInfo, backgroundBackup: $backgroundBackup, backupRequireWifi: $backupRequireWifi, backupRequireCharging: $backupRequireCharging, availableAlbums: $availableAlbums, selectedBackupAlbums: $selectedBackupAlbums, excludedBackupAlbums: $excludedBackupAlbums, allUniqueAssets: $allUniqueAssets, selectedAlbumsBackupAssetsIds: $selectedAlbumsBackupAssetsIds, currentUploadAsset: $currentUploadAsset)';
   }
 
   @override
@@ -89,6 +102,9 @@ class BackUpState {
         other.progressInPercentage == progressInPercentage &&
         other.cancelToken == cancelToken &&
         other.serverInfo == serverInfo &&
+        other.backgroundBackup == backgroundBackup &&
+        other.backupRequireWifi == backupRequireWifi &&
+        other.backupRequireCharging == backupRequireCharging &&
         collectionEquals(other.availableAlbums, availableAlbums) &&
         collectionEquals(other.selectedBackupAlbums, selectedBackupAlbums) &&
         collectionEquals(other.excludedBackupAlbums, excludedBackupAlbums) &&
@@ -107,6 +123,9 @@ class BackUpState {
         progressInPercentage.hashCode ^
         cancelToken.hashCode ^
         serverInfo.hashCode ^
+        backgroundBackup.hashCode ^
+        backupRequireWifi.hashCode ^
+        backupRequireCharging.hashCode ^
         availableAlbums.hashCode ^
         selectedBackupAlbums.hashCode ^
         excludedBackupAlbums.hashCode ^

mobile/lib/modules/backup/models/hive_backup_albums.model.dart

@@ -13,9 +13,17 @@ class HiveBackupAlbums {
   @HiveField(1)
   List<String> excludedAlbumsIds;
 
+  @HiveField(2, defaultValue: [])
+  List<DateTime> lastSelectedBackupTime;
+
+  @HiveField(3, defaultValue: [])
+  List<DateTime> lastExcludedBackupTime;
+
   HiveBackupAlbums({
     required this.selectedAlbumIds,
     required this.excludedAlbumsIds,
+    required this.lastSelectedBackupTime,
+    required this.lastExcludedBackupTime,
   });
 
   @override
@@ -25,10 +33,16 @@ class HiveBackupAlbums {
   HiveBackupAlbums copyWith({
     List<String>? selectedAlbumIds,
     List<String>? excludedAlbumsIds,
+    List<DateTime>? lastSelectedBackupTime,
+    List<DateTime>? lastExcludedBackupTime,
   }) {
     return HiveBackupAlbums(
       selectedAlbumIds: selectedAlbumIds ?? this.selectedAlbumIds,
       excludedAlbumsIds: excludedAlbumsIds ?? this.excludedAlbumsIds,
+      lastSelectedBackupTime:
+          lastSelectedBackupTime ?? this.lastSelectedBackupTime,
+      lastExcludedBackupTime:
+          lastExcludedBackupTime ?? this.lastExcludedBackupTime,
     );
   }
 
@@ -37,6 +51,8 @@ class HiveBackupAlbums {
 
     result.addAll({'selectedAlbumIds': selectedAlbumIds});
     result.addAll({'excludedAlbumsIds': excludedAlbumsIds});
+    result.addAll({'lastSelectedBackupTime': lastSelectedBackupTime});
+    result.addAll({'lastExcludedBackupTime': lastExcludedBackupTime});
 
     return result;
   }
@@ -45,6 +61,10 @@ class HiveBackupAlbums {
     return HiveBackupAlbums(
       selectedAlbumIds: List<String>.from(map['selectedAlbumIds']),
       excludedAlbumsIds: List<String>.from(map['excludedAlbumsIds']),
+      lastSelectedBackupTime:
+          List<DateTime>.from(map['lastSelectedBackupTime']),
+      lastExcludedBackupTime:
+          List<DateTime>.from(map['lastExcludedBackupTime']),
     );
   }
 
@@ -60,9 +80,15 @@ class HiveBackupAlbums {
 
     return other is HiveBackupAlbums &&
         listEquals(other.selectedAlbumIds, selectedAlbumIds) &&
-        listEquals(other.excludedAlbumsIds, excludedAlbumsIds);
+        listEquals(other.excludedAlbumsIds, excludedAlbumsIds) &&
+        listEquals(other.lastSelectedBackupTime, lastSelectedBackupTime) &&
+        listEquals(other.lastExcludedBackupTime, lastExcludedBackupTime);
   }
 
   @override
-  int get hashCode => selectedAlbumIds.hashCode ^ excludedAlbumsIds.hashCode;
+  int get hashCode =>
+      selectedAlbumIds.hashCode ^
+      excludedAlbumsIds.hashCode ^
+      lastSelectedBackupTime.hashCode ^
+      lastExcludedBackupTime.hashCode;
 }

mobile/lib/modules/backup/models/hive_backup_albums.model.g.dart

@@ -19,17 +19,25 @@ class HiveBackupAlbumsAdapter extends TypeAdapter<HiveBackupAlbums> {
     return HiveBackupAlbums(
       selectedAlbumIds: (fields[0] as List).cast<String>(),
       excludedAlbumsIds: (fields[1] as List).cast<String>(),
+      lastSelectedBackupTime:
+          fields[2] == null ? [] : (fields[2] as List).cast<DateTime>(),
+      lastExcludedBackupTime:
+          fields[3] == null ? [] : (fields[3] as List).cast<DateTime>(),
     );
   }
 
   @override
   void write(BinaryWriter writer, HiveBackupAlbums obj) {
     writer
-      ..writeByte(2)
+      ..writeByte(4)
       ..writeByte(0)
       ..write(obj.selectedAlbumIds)
       ..writeByte(1)
-      ..write(obj.excludedAlbumsIds);
+      ..write(obj.excludedAlbumsIds)
+      ..writeByte(2)
+      ..write(obj.lastSelectedBackupTime)
+      ..writeByte(3)
+      ..write(obj.lastExcludedBackupTime);
   }
 
   @override

mobile/lib/modules/backup/providers/backup.provider.dart

@@ -1,3 +1,5 @@
+import 'dart:io';
+
 import 'package:cancellation_token_http/http.dart';
 import 'package:flutter/foundation.dart';
 import 'package:hive_flutter/hive_flutter.dart';
@@ -9,9 +11,11 @@ import 'package:immich_mobile/modules/backup/models/current_upload_asset.model.d
 import 'package:immich_mobile/modules/backup/models/error_upload_asset.model.dart';
 import 'package:immich_mobile/modules/backup/models/hive_backup_albums.model.dart';
 import 'package:immich_mobile/modules/backup/providers/error_backup_list.provider.dart';
+import 'package:immich_mobile/modules/backup/background_service/background.service.dart';
 import 'package:immich_mobile/modules/backup/services/backup.service.dart';
 import 'package:immich_mobile/modules/login/models/authentication_state.model.dart';
 import 'package:immich_mobile/modules/login/providers/authentication.provider.dart';
+import 'package:immich_mobile/shared/providers/app_state.provider.dart';
 import 'package:immich_mobile/shared/services/server_info.service.dart';
 import 'package:openapi/api.dart';
 import 'package:photo_manager/photo_manager.dart';
@@ -21,6 +25,7 @@ class BackupNotifier extends StateNotifier<BackUpState> {
     this._backupService,
     this._serverInfoService,
     this._authState,
+    this._backgroundService,
     this.ref,
   ) : super(
           BackUpState(
@@ -28,6 +33,9 @@ class BackupNotifier extends StateNotifier<BackUpState> {
             allAssetsInDatabase: const [],
             progressInPercentage: 0,
             cancelToken: CancellationToken(),
+            backgroundBackup: false,
+            backupRequireWifi: true,
+            backupRequireCharging: false,
             serverInfo: ServerInfoResponseDto(
               diskAvailable: "0",
               diskAvailableRaw: 0,
@@ -56,6 +64,7 @@ class BackupNotifier extends StateNotifier<BackUpState> {
   final BackupService _backupService;
   final ServerInfoService _serverInfoService;
   final AuthenticationState _authState;
+  final BackgroundService _backgroundService;
   final Ref ref;
 
   ///
@@ -66,7 +75,7 @@ class BackupNotifier extends StateNotifier<BackUpState> {
   /// We have method to include and exclude albums
   /// The total unique assets will be used for backing mechanism
   ///
-  void addAlbumForBackup(AssetPathEntity album) {
+  void addAlbumForBackup(AvailableAlbum album) {
     if (state.excludedBackupAlbums.contains(album)) {
       removeExcludedAlbumForBackup(album);
     }
@@ -76,7 +85,7 @@ class BackupNotifier extends StateNotifier<BackUpState> {
     _updateBackupAssetCount();
   }
 
-  void addExcludedAlbumForBackup(AssetPathEntity album) {
+  void addExcludedAlbumForBackup(AvailableAlbum album) {
     if (state.selectedBackupAlbums.contains(album)) {
       removeAlbumForBackup(album);
     }
@@ -85,8 +94,8 @@ class BackupNotifier extends StateNotifier<BackUpState> {
     _updateBackupAssetCount();
   }
 
-  void removeAlbumForBackup(AssetPathEntity album) {
-    Set<AssetPathEntity> currentSelectedAlbums = state.selectedBackupAlbums;
+  void removeAlbumForBackup(AvailableAlbum album) {
+    Set<AvailableAlbum> currentSelectedAlbums = state.selectedBackupAlbums;
 
     currentSelectedAlbums.removeWhere((a) => a == album);
 
@@ -94,8 +103,8 @@ class BackupNotifier extends StateNotifier<BackUpState> {
     _updateBackupAssetCount();
   }
 
-  void removeExcludedAlbumForBackup(AssetPathEntity album) {
-    Set<AssetPathEntity> currentExcludedAlbums = state.excludedBackupAlbums;
+  void removeExcludedAlbumForBackup(AvailableAlbum album) {
+    Set<AvailableAlbum> currentExcludedAlbums = state.excludedBackupAlbums;
 
     currentExcludedAlbums.removeWhere((a) => a == album);
 
@@ -103,6 +112,50 @@ class BackupNotifier extends StateNotifier<BackUpState> {
     _updateBackupAssetCount();
   }
 
+  void configureBackgroundBackup({
+    bool? enabled,
+    bool? requireWifi,
+    bool? requireCharging,
+    required void Function(String msg) onError,
+  }) async {
+    assert(enabled != null || requireWifi != null || requireCharging != null);
+    if (Platform.isAndroid) {
+      final bool wasEnabled = state.backgroundBackup;
+      final bool wasWifi = state.backupRequireWifi;
+      final bool wasCharing = state.backupRequireCharging;
+      state = state.copyWith(
+        backgroundBackup: enabled,
+        backupRequireWifi: requireWifi,
+        backupRequireCharging: requireCharging,
+      );
+
+      if (state.backgroundBackup) {
+        if (!wasEnabled) {
+          await _backgroundService.disableBatteryOptimizations();
+        }
+        final bool success = await _backgroundService.stopService() &&
+            await _backgroundService.startService(
+              requireUnmetered: state.backupRequireWifi,
+              requireCharging: state.backupRequireCharging,
+            );
+        if (!success) {
+          state = state.copyWith(
+            backgroundBackup: wasEnabled,
+            backupRequireWifi: wasWifi,
+            backupRequireCharging: wasCharing,
+          );
+          onError("backup_controller_page_background_configure_error");
+        }
+      } else {
+        final bool success = await _backgroundService.stopService();
+        if (!success) {
+          state = state.copyWith(backgroundBackup: wasEnabled);
+          onError("backup_controller_page_background_configure_error");
+        }
+      }
+    }
+  }
+
   ///
   /// Get all album on the device
   /// Get all selected and excluded album from the user's persistent storage
@@ -144,6 +197,8 @@ class BackupNotifier extends StateNotifier<BackUpState> {
       defaultValue: HiveBackupAlbums(
         selectedAlbumIds: [],
         excludedAlbumsIds: [],
+        lastSelectedBackupTime: [],
+        lastExcludedBackupTime: [],
       ),
     );
 
@@ -173,6 +228,10 @@ class BackupNotifier extends StateNotifier<BackUpState> {
         HiveBackupAlbums(
           selectedAlbumIds: [albumHasAllAssets.id],
           excludedAlbumsIds: [],
+          lastSelectedBackupTime: [
+            DateTime.fromMillisecondsSinceEpoch(0, isUtc: true)
+          ],
+          lastExcludedBackupTime: [],
         ),
       );
 
@@ -181,19 +240,37 @@ class BackupNotifier extends StateNotifier<BackUpState> {
 
     // Generate AssetPathEntity from id to add to local state
     try {
-      for (var selectedAlbumId in backupAlbumInfo!.selectedAlbumIds) {
-        var albumAsset = await AssetPathEntity.fromId(selectedAlbumId);
-        state = state.copyWith(
-          selectedBackupAlbums: {...state.selectedBackupAlbums, albumAsset},
+      Set<AvailableAlbum> selectedAlbums = {};
+      for (var i = 0; i < backupAlbumInfo!.selectedAlbumIds.length; i++) {
+        var albumAsset =
+            await AssetPathEntity.fromId(backupAlbumInfo.selectedAlbumIds[i]);
+        selectedAlbums.add(
+          AvailableAlbum(
+            albumEntity: albumAsset,
+            lastBackup: backupAlbumInfo.lastSelectedBackupTime.length > i
+                ? backupAlbumInfo.lastSelectedBackupTime[i]
+                : DateTime.fromMillisecondsSinceEpoch(0, isUtc: true),
+          ),
         );
       }
 
-      for (var excludedAlbumId in backupAlbumInfo.excludedAlbumsIds) {
-        var albumAsset = await AssetPathEntity.fromId(excludedAlbumId);
-        state = state.copyWith(
-          excludedBackupAlbums: {...state.excludedBackupAlbums, albumAsset},
+      Set<AvailableAlbum> excludedAlbums = {};
+      for (var i = 0; i < backupAlbumInfo.excludedAlbumsIds.length; i++) {
+        var albumAsset =
+            await AssetPathEntity.fromId(backupAlbumInfo.excludedAlbumsIds[i]);
+        excludedAlbums.add(
+          AvailableAlbum(
+            albumEntity: albumAsset,
+            lastBackup: backupAlbumInfo.lastExcludedBackupTime.length > i
+                ? backupAlbumInfo.lastExcludedBackupTime[i]
+                : DateTime.fromMillisecondsSinceEpoch(0, isUtc: true),
+          ),
         );
       }
+      state = state.copyWith(
+        selectedBackupAlbums: selectedAlbums,
+        excludedBackupAlbums: excludedAlbums,
+      );
     } catch (e) {
       debugPrint("[ERROR] Failed to generate album from id $e");
     }
@@ -209,14 +286,14 @@ class BackupNotifier extends StateNotifier<BackUpState> {
     Set<AssetEntity> assetsFromExcludedAlbums = {};
 
     for (var album in state.selectedBackupAlbums) {
-      var assets =
-          await album.getAssetListRange(start: 0, end: album.assetCount);
+      var assets = await album.albumEntity
+          .getAssetListRange(start: 0, end: album.assetCount);
       assetsFromSelectedAlbums.addAll(assets);
     }
 
     for (var album in state.excludedBackupAlbums) {
-      var assets =
-          await album.getAssetListRange(start: 0, end: album.assetCount);
+      var assets = await album.albumEntity
+          .getAssetListRange(start: 0, end: album.assetCount);
       assetsFromExcludedAlbums.addAll(assets);
     }
 
@@ -263,12 +340,16 @@ class BackupNotifier extends StateNotifier<BackUpState> {
   /// and then update the UI according to those information
   ///
   Future<void> getBackupInfo() async {
-    await Future.wait([
-      _getBackupAlbumsInfo(),
-      _updateServerInfo(),
-    ]);
+    final bool isEnabled = await _backgroundService.isBackgroundBackupEnabled();
+    state = state.copyWith(backgroundBackup: isEnabled);
+    if (state.backupProgress != BackUpProgressEnum.inBackground) {
+      await Future.wait([
+        _getBackupAlbumsInfo(),
+        _updateServerInfo(),
+      ]);
 
-    await _updateBackupAssetCount();
+      await _updateBackupAssetCount();
+    }
   }
 
   ///
@@ -276,6 +357,7 @@ class BackupNotifier extends StateNotifier<BackUpState> {
   /// Hive database
   ///
   void _updatePersistentAlbumsSelection() {
+    final epoch = DateTime.fromMillisecondsSinceEpoch(0, isUtc: true);
     Box<HiveBackupAlbums> backupAlbumInfoBox =
         Hive.box<HiveBackupAlbums>(hiveBackupInfoBox);
     backupAlbumInfoBox.put(
@@ -283,6 +365,12 @@ class BackupNotifier extends StateNotifier<BackUpState> {
       HiveBackupAlbums(
         selectedAlbumIds: state.selectedBackupAlbums.map((e) => e.id).toList(),
         excludedAlbumsIds: state.excludedBackupAlbums.map((e) => e.id).toList(),
+        lastSelectedBackupTime: state.selectedBackupAlbums
+            .map((e) => e.lastBackup ?? epoch)
+            .toList(),
+        lastExcludedBackupTime: state.excludedBackupAlbums
+            .map((e) => e.lastBackup ?? epoch)
+            .toList(),
       ),
     );
   }
@@ -290,7 +378,8 @@ class BackupNotifier extends StateNotifier<BackUpState> {
   ///
   /// Invoke backup process
   ///
-  void startBackupProcess() async {
+  Future<void> startBackupProcess() async {
+    assert(state.backupProgress == BackUpProgressEnum.idle);
     state = state.copyWith(backupProgress: BackUpProgressEnum.inProgress);
 
     await getBackupInfo();
@@ -318,7 +407,7 @@ class BackupNotifier extends StateNotifier<BackUpState> {
 
       // Perform Backup
       state = state.copyWith(cancelToken: CancellationToken());
-      _backupService.backupAsset(
+      await _backupService.backupAsset(
         assetsWillBeBackup,
         state.cancelToken,
         _onAssetUploaded,
@@ -326,6 +415,7 @@ class BackupNotifier extends StateNotifier<BackUpState> {
         _onSetCurrentBackupAsset,
         _onBackupError,
       );
+      await _notifyBackgroundServiceCanRun();
     } else {
       PhotoManager.openSetting();
     }
@@ -340,6 +430,9 @@ class BackupNotifier extends StateNotifier<BackUpState> {
   }
 
   void cancelBackup() {
+    if (state.backupProgress != BackUpProgressEnum.inProgress) {
+      _notifyBackgroundServiceCanRun();
+    }
     state.cancelToken.cancel();
     state = state.copyWith(
       backupProgress: BackUpProgressEnum.idle,
@@ -359,10 +452,21 @@ class BackupNotifier extends StateNotifier<BackUpState> {
     if (state.allUniqueAssets.length -
             state.selectedAlbumsBackupAssetsIds.length ==
         0) {
+      final latestAssetBackup =
+          state.allUniqueAssets.map((e) => e.modifiedDateTime).reduce(
+                (v, e) => e.isAfter(v) ? e : v,
+              );
       state = state.copyWith(
+        selectedBackupAlbums: state.selectedBackupAlbums
+            .map((e) => e.copyWith(lastBackup: latestAssetBackup))
+            .toSet(),
+        excludedBackupAlbums: state.excludedBackupAlbums
+            .map((e) => e.copyWith(lastBackup: latestAssetBackup))
+            .toSet(),
         backupProgress: BackUpProgressEnum.done,
         progressInPercentage: 0.0,
       );
+      _updatePersistentAlbumsSelection();
     }
 
     _updateServerInfo();
@@ -385,7 +489,7 @@ class BackupNotifier extends StateNotifier<BackUpState> {
     }
   }
 
-  void resumeBackup() {
+  Future<void> _resumeBackup() async {
     // Check if user is login
     var accessKey = Hive.box(userInfoBox).get(accessTokenKey);
 
@@ -404,13 +508,91 @@ class BackupNotifier extends StateNotifier<BackUpState> {
         return;
       }
 
+      if (state.backupProgress == BackUpProgressEnum.inBackground) {
+        debugPrint("[resumeBackup] Background backup is running - abort");
+        return;
+      }
+
       // Run backup
       debugPrint("[resumeBackup] Start back up");
-      startBackupProcess();
+      await startBackupProcess();
     }
 
     return;
   }
+
+  Future<void> resumeBackup() async {
+    if (Platform.isAndroid) {
+      // assumes the background service is currently running
+      // if true, waits until it has stopped to update the app state from HiveDB
+      // before actually resuming backup by calling the internal `_resumeBackup`
+      final BackUpProgressEnum previous = state.backupProgress;
+      state = state.copyWith(backupProgress: BackUpProgressEnum.inBackground);
+      final bool hasLock = await _backgroundService.acquireLock();
+      if (!hasLock) {
+        return;
+      }
+      Box<HiveBackupAlbums> box =
+          await Hive.openBox<HiveBackupAlbums>(hiveBackupInfoBox);
+      HiveBackupAlbums? albums = box.get(backupInfoKey);
+      Set<AvailableAlbum> selectedAlbums = state.selectedBackupAlbums;
+      Set<AvailableAlbum> excludedAlbums = state.excludedBackupAlbums;
+      if (albums != null) {
+        selectedAlbums = _updateAlbumsBackupTime(
+          selectedAlbums,
+          albums.selectedAlbumIds,
+          albums.lastSelectedBackupTime,
+        );
+        excludedAlbums = _updateAlbumsBackupTime(
+          excludedAlbums,
+          albums.excludedAlbumsIds,
+          albums.lastExcludedBackupTime,
+        );
+      }
+      state = state.copyWith(
+        backupProgress: previous,
+        selectedBackupAlbums: selectedAlbums,
+        excludedBackupAlbums: excludedAlbums,
+      );
+    }
+    return _resumeBackup();
+  }
+
+  Set<AvailableAlbum> _updateAlbumsBackupTime(
+    Set<AvailableAlbum> albums,
+    List<String> ids,
+    List<DateTime> times,
+  ) {
+    Set<AvailableAlbum> result = {};
+    for (int i = 0; i < ids.length; i++) {
+      try {
+        AvailableAlbum a = albums.firstWhere((e) => e.id == ids[i]);
+        result.add(a.copyWith(lastBackup: times[i]));
+      } on StateError {
+        debugPrint("[_updateAlbumBackupTime] failed to find album in state");
+      }
+    }
+    return result;
+  }
+
+  Future<void> _notifyBackgroundServiceCanRun() async {
+    const allowedStates = [
+      AppStateEnum.inactive,
+      AppStateEnum.paused,
+      AppStateEnum.detached,
+    ];
+    if (Platform.isAndroid &&
+        allowedStates.contains(ref.read(appStateProvider.notifier).state)) {
+      try {
+        if (Hive.isBoxOpen(hiveBackupInfoBox)) {
+          await Hive.box<HiveBackupAlbums>(hiveBackupInfoBox).close();
+        }
+      } catch (error) {
+        debugPrint("[_notifyBackgroundServiceCanRun] failed to close box");
+      }
+      _backgroundService.releaseLock();
+    }
+  }
 }
 
 final backupProvider =
@@ -419,6 +601,7 @@ final backupProvider =
     ref.watch(backupServiceProvider),
     ref.watch(serverInfoServiceProvider),
     ref.watch(authenticationProvider),
+    ref.watch(backgroundServiceProvider),
     ref,
   );
 });

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

@@ -2,6 +2,7 @@ import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
 
+import 'package:collection/collection.dart';
 import 'package:flutter/material.dart';
 import 'package:hive/hive.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
@@ -9,6 +10,7 @@ import 'package:immich_mobile/constants/hive_box.dart';
 import 'package:immich_mobile/modules/backup/models/current_upload_asset.model.dart';
 import 'package:immich_mobile/modules/backup/models/error_upload_asset.model.dart';
 import 'package:immich_mobile/shared/providers/api.provider.dart';
+import 'package:immich_mobile/modules/backup/models/hive_backup_albums.model.dart';
 import 'package:immich_mobile/shared/services/api.service.dart';
 import 'package:immich_mobile/utils/files_helper.dart';
 import 'package:openapi/api.dart';
@@ -39,8 +41,129 @@ class BackupService {
     }
   }
 
-  backupAsset(
-    Set<AssetEntity> assetList,
+  /// Returns all assets newer than the last successful backup per album
+  Future<List<AssetEntity>> buildUploadCandidates(
+    HiveBackupAlbums backupAlbums,
+  ) async {
+    final filter = FilterOptionGroup(
+      containsPathModified: true,
+      orders: [const OrderOption(type: OrderOptionType.updateDate)],
+    );
+    final now = DateTime.now();
+    final List<AssetPathEntity?> selectedAlbums =
+        await _loadAlbumsWithTimeFilter(
+      backupAlbums.selectedAlbumIds,
+      backupAlbums.lastSelectedBackupTime,
+      filter,
+      now,
+    );
+    if (selectedAlbums.every((e) => e == null)) {
+      return [];
+    }
+    final int allIdx = selectedAlbums.indexWhere((e) => e != null && e.isAll);
+    if (allIdx != -1) {
+      final List<AssetPathEntity?> excludedAlbums =
+          await _loadAlbumsWithTimeFilter(
+        backupAlbums.excludedAlbumsIds,
+        backupAlbums.lastExcludedBackupTime,
+        filter,
+        now,
+      );
+      final List<AssetEntity> toAdd = await _fetchAssetsAndUpdateLastBackup(
+        selectedAlbums.slice(allIdx, allIdx + 1),
+        backupAlbums.lastSelectedBackupTime.slice(allIdx, allIdx + 1),
+        now,
+      );
+      final List<AssetEntity> toRemove = await _fetchAssetsAndUpdateLastBackup(
+        excludedAlbums,
+        backupAlbums.lastExcludedBackupTime,
+        now,
+      );
+      return toAdd.toSet().difference(toRemove.toSet()).toList();
+    } else {
+      return await _fetchAssetsAndUpdateLastBackup(
+        selectedAlbums,
+        backupAlbums.lastSelectedBackupTime,
+        now,
+      );
+    }
+  }
+
+  Future<List<AssetPathEntity?>> _loadAlbumsWithTimeFilter(
+    List<String> albumIds,
+    List<DateTime> lastBackups,
+    FilterOptionGroup filter,
+    DateTime now,
+  ) async {
+    List<AssetPathEntity?> result = List.filled(albumIds.length, null);
+    for (int i = 0; i < albumIds.length; i++) {
+      try {
+        final AssetPathEntity album =
+            await AssetPathEntity.obtainPathFromProperties(
+          id: albumIds[i],
+          optionGroup: filter.copyWith(
+            updateTimeCond: DateTimeCond(
+              // subtract 2 seconds to prevent missing assets due to rounding issues
+              min: lastBackups[i].subtract(const Duration(seconds: 2)),
+              max: now,
+            ),
+          ),
+          maxDateTimeToNow: false,
+        );
+        result[i] = album;
+      } on StateError {
+        // either there are no assets matching the filter criteria OR the album no longer exists
+      }
+    }
+    return result;
+  }
+
+  Future<List<AssetEntity>> _fetchAssetsAndUpdateLastBackup(
+    List<AssetPathEntity?> albums,
+    List<DateTime> lastBackup,
+    DateTime now,
+  ) async {
+    List<AssetEntity> result = [];
+    for (int i = 0; i < albums.length; i++) {
+      final AssetPathEntity? a = albums[i];
+      if (a != null && a.lastModified?.isBefore(lastBackup[i]) != true) {
+        result.addAll(await a.getAssetListRange(start: 0, end: a.assetCount));
+        lastBackup[i] = now;
+      }
+    }
+    return result;
+  }
+
+  /// Returns a new list of assets not yet uploaded
+  Future<List<AssetEntity>> removeAlreadyUploadedAssets(
+    List<AssetEntity> candidates,
+  ) async {
+    final String deviceId = Hive.box(userInfoBox).get(deviceIdKey);
+    if (candidates.length < 10) {
+      final List<CheckDuplicateAssetResponseDto?> duplicateResponse =
+          await Future.wait(
+        candidates.map(
+          (e) => _apiService.assetApi.checkDuplicateAsset(
+            CheckDuplicateAssetDto(deviceAssetId: e.id, deviceId: deviceId),
+          ),
+        ),
+      );
+      return candidates
+          .whereIndexed((i, e) => duplicateResponse[i]?.isExist == false)
+          .toList();
+    } else {
+      final List<String>? allAssetsInDatabase = await getDeviceBackupAsset();
+
+      if (allAssetsInDatabase == null) {
+        return candidates;
+      }
+      final Set<String> inDb = allAssetsInDatabase.toSet();
+      return candidates.whereNot((e) => inDb.contains(e.id)).toList();
+    }
+  }
+
+  Future<bool> backupAsset(
+    Iterable<AssetEntity> assetList,
     http.CancellationToken cancelToken,
     Function(String, String) singleAssetDoneCb,
     Function(int, int) uploadProgressCb,
@@ -50,6 +173,7 @@ class BackupService {
     String deviceId = Hive.box(userInfoBox).get(deviceIdKey);
     String savedEndpoint = Hive.box(userInfoBox).get(serverEndpointKey);
     File? file;
+    bool anyErrors = false;
 
     for (var entity in assetList) {
       try {
@@ -134,9 +258,10 @@ class BackupService {
         }
       } on http.CancelledException {
         debugPrint("Backup was cancelled by the user");
-        return;
+        return false;
       } catch (e) {
         debugPrint("ERROR backupAsset: ${e.toString()}");
+        anyErrors = true;
         continue;
       } finally {
         if (Platform.isIOS) {
@@ -144,6 +269,7 @@ class BackupService {
         }
       }
     }
+    return !anyErrors;
   }
 
   String _getAssetType(AssetType assetType) {

mobile/lib/modules/backup/ui/album_info_card.dart

@@ -6,14 +6,14 @@ import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:fluttertoast/fluttertoast.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/modules/backup/models/available_album.model.dart';
 import 'package:immich_mobile/modules/backup/providers/backup.provider.dart';
 import 'package:immich_mobile/routing/router.dart';
 import 'package:immich_mobile/shared/ui/immich_toast.dart';
-import 'package:photo_manager/photo_manager.dart';
 
 class AlbumInfoCard extends HookConsumerWidget {
   final Uint8List? imageData;
-  final AssetPathEntity albumInfo;
+  final AvailableAlbum albumInfo;
 
   const AlbumInfoCard({Key? key, this.imageData, required this.albumInfo})
       : super(key: key);
@@ -123,7 +123,7 @@ class AlbumInfoCard extends HookConsumerWidget {
             return;
           }
 
-          if (albumInfo.id == 'isAll') {
+          if (albumInfo.id == 'isAll' || albumInfo.name == 'Recents') {
             ImmichToast.show(
               context: context,
               msg: 'Cannot exclude album contains all assets',
@@ -223,7 +223,7 @@ class AlbumInfoCard extends HookConsumerWidget {
                   IconButton(
                     onPressed: () {
                       AutoRouter.of(context).push(
-                        AlbumPreviewRoute(album: albumInfo),
+                        AlbumPreviewRoute(album: albumInfo.albumEntity),
                       );
                     },
                     icon: Icon(

mobile/lib/modules/backup/views/backup_album_selection_page.dart

@@ -48,7 +48,7 @@ class BackupAlbumSelectionPage extends HookConsumerWidget {
                   : const EdgeInsets.all(0),
               child: AlbumInfoCard(
                 imageData: thumbnailData,
-                albumInfo: availableAlbums[index].albumEntity,
+                albumInfo: availableAlbums[index],
               ),
             );
           }),

mobile/lib/modules/backup/views/backup_controller_page.dart

@@ -1,3 +1,5 @@
+import 'dart:io';
+
 import 'package:auto_route/auto_route.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
@@ -20,9 +22,12 @@ class BackupControllerPage extends HookConsumerWidget {
   Widget build(BuildContext context, WidgetRef ref) {
     BackUpState backupState = ref.watch(backupProvider);
     AuthenticationState authenticationState = ref.watch(authenticationProvider);
+    bool hasExclusiveAccess =
+        backupState.backupProgress != BackUpProgressEnum.inBackground;
     bool shouldBackup = backupState.allUniqueAssets.length -
-                backupState.selectedAlbumsBackupAssetsIds.length ==
-            0
+                    backupState.selectedAlbumsBackupAssetsIds.length ==
+                0 ||
+            !hasExclusiveAccess
         ? false
         : true;
 
@@ -141,6 +146,99 @@ class BackupControllerPage extends HookConsumerWidget {
       );
     }
 
+    void _showErrorToUser(String msg) {
+      final snackBar = SnackBar(
+        content: Text(
+          msg.tr(),
+        ),
+        backgroundColor: Colors.red,
+      );
+      ScaffoldMessenger.of(context).showSnackBar(snackBar);
+    }
+
+    ListTile _buildBackgroundBackupController() {
+      final bool isBackgroundEnabled = backupState.backgroundBackup;
+      final bool isWifiRequired = backupState.backupRequireWifi;
+      final bool isChargingRequired = backupState.backupRequireCharging;
+      final Color activeColor = Theme.of(context).primaryColor;
+      return ListTile(
+        isThreeLine: true,
+        leading: isBackgroundEnabled
+            ? Icon(
+                Icons.cloud_sync_rounded,
+                color: activeColor,
+              )
+            : const Icon(Icons.cloud_sync_rounded),
+        title: Text(
+          isBackgroundEnabled
+              ? "backup_controller_page_background_is_on"
+              : "backup_controller_page_background_is_off",
+          style: const TextStyle(fontWeight: FontWeight.bold, fontSize: 14),
+        ).tr(),
+        subtitle: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            if (!isBackgroundEnabled)
+              const Text("backup_controller_page_background_description").tr(),
+            if (isBackgroundEnabled)
+              SwitchListTile(
+                title:
+                    const Text("backup_controller_page_background_wifi").tr(),
+                secondary: Icon(
+                  Icons.wifi,
+                  color: isWifiRequired ? activeColor : null,
+                ),
+                dense: true,
+                activeColor: activeColor,
+                value: isWifiRequired,
+                onChanged: hasExclusiveAccess
+                    ? (isChecked) => ref
+                        .read(backupProvider.notifier)
+                        .configureBackgroundBackup(
+                          requireWifi: isChecked,
+                          onError: _showErrorToUser,
+                        )
+                    : null,
+              ),
+            if (isBackgroundEnabled)
+              SwitchListTile(
+                title: const Text("backup_controller_page_background_charging")
+                    .tr(),
+                secondary: Icon(
+                  Icons.charging_station,
+                  color: isChargingRequired ? activeColor : null,
+                ),
+                dense: true,
+                activeColor: activeColor,
+                value: isChargingRequired,
+                onChanged: hasExclusiveAccess
+                    ? (isChecked) => ref
+                        .read(backupProvider.notifier)
+                        .configureBackgroundBackup(
+                          requireCharging: isChecked,
+                          onError: _showErrorToUser,
+                        )
+                    : null,
+              ),
+            ElevatedButton(
+              onPressed: () =>
+                  ref.read(backupProvider.notifier).configureBackgroundBackup(
+                        enabled: !isBackgroundEnabled,
+                        onError: _showErrorToUser,
+                      ),
+              child: Text(
+                isBackgroundEnabled
+                    ? "backup_controller_page_background_turn_off"
+                    : "backup_controller_page_background_turn_on",
+                style:
+                    const TextStyle(fontWeight: FontWeight.bold, fontSize: 12),
+              ).tr(),
+            ),
+          ],
+        ),
+      );
+    }
+
     Widget _buildSelectedAlbumName() {
       var text = "backup_controller_page_backup_selected".tr();
       var albums = ref.watch(backupProvider).selectedBackupAlbums;
@@ -237,9 +335,12 @@ class BackupControllerPage extends HookConsumerWidget {
             ),
           ),
           trailing: ElevatedButton(
-            onPressed: () {
-              AutoRouter.of(context).push(const BackupAlbumSelectionRoute());
-            },
+            onPressed: hasExclusiveAccess
+                ? () {
+                    AutoRouter.of(context)
+                        .push(const BackupAlbumSelectionRoute());
+                  }
+                : null,
             child: const Text(
               "backup_controller_page_select",
               style: TextStyle(
@@ -400,7 +501,10 @@ class BackupControllerPage extends HookConsumerWidget {
 
     void startBackup() {
       ref.watch(errorBackupListProvider.notifier).empty();
-      ref.watch(backupProvider.notifier).startBackupProcess();
+      if (ref.watch(backupProvider).backupProgress !=
+          BackUpProgressEnum.inBackground) {
+        ref.watch(backupProvider.notifier).startBackupProcess();
+      }
     }
 
     return Scaffold(
@@ -433,6 +537,27 @@ class BackupControllerPage extends HookConsumerWidget {
                 style: TextStyle(fontWeight: FontWeight.bold, fontSize: 16),
               ).tr(),
             ),
+            hasExclusiveAccess
+                ? const SizedBox.shrink()
+                : Card(
+                    shape: RoundedRectangleBorder(
+                      borderRadius:
+                          BorderRadius.circular(5), // if you need this
+                      side: const BorderSide(
+                        color: Colors.black12,
+                        width: 1,
+                      ),
+                    ),
+                    elevation: 0,
+                    borderOnForeground: false,
+                    child: const Padding(
+                      padding: EdgeInsets.all(16.0),
+                      child: Text(
+                        "Background backup is currently running, some actions are disabled",
+                        style: TextStyle(fontWeight: FontWeight.bold),
+                      ),
+                    ),
+                  ),
             _buildFolderSelectionTile(),
             BackupInfoCard(
               title: "backup_controller_page_total".tr(),
@@ -452,6 +577,8 @@ class BackupControllerPage extends HookConsumerWidget {
             ),
             const Divider(),
             _buildAutoBackupController(),
+            if (Platform.isAndroid) const Divider(),
+            if (Platform.isAndroid) _buildBackgroundBackupController(),
             const Divider(),
             _buildStorageInformation(),
             const Divider(),

mobile/lib/modules/home/ui/image_grid.dart

@@ -7,11 +7,15 @@ import 'package:openapi/api.dart';
 class ImageGrid extends ConsumerWidget {
   final List<AssetResponseDto> assetGroup;
   final List<AssetResponseDto> sortedAssetGroup;
+  final int tilesPerRow;
+  final bool showStorageIndicator;
 
   ImageGrid({
     Key? key,
     required this.assetGroup,
     required this.sortedAssetGroup,
+    this.tilesPerRow = 4,
+    this.showStorageIndicator = true,
   }) : super(key: key);
 
   List<AssetResponseDto> imageSortedList = [];
@@ -19,8 +23,8 @@ class ImageGrid extends ConsumerWidget {
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     return SliverGrid(
-      gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(
-        crossAxisCount: 4,
+      gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
+        crossAxisCount: tilesPerRow,
         crossAxisSpacing: 5.0,
         mainAxisSpacing: 5,
       ),
@@ -34,6 +38,7 @@ class ImageGrid extends ConsumerWidget {
                 ThumbnailImage(
                   asset: assetGroup[index],
                   assetList: sortedAssetGroup,
+                  showStorageIndicator: showStorageIndicator,
                 ),
                 if (assetType != AssetTypeEnum.IMAGE)
                   Positioned(

mobile/lib/modules/home/ui/thumbnail_image.dart

@@ -15,8 +15,13 @@ import 'package:openapi/api.dart';
 class ThumbnailImage extends HookConsumerWidget {
   final AssetResponseDto asset;
   final List<AssetResponseDto> assetList;
+  final bool showStorageIndicator;
 
-  const ThumbnailImage({Key? key, required this.asset, required this.assetList})
+  const ThumbnailImage(
+      {Key? key,
+      required this.asset,
+      required this.assetList,
+      this.showStorageIndicator = true})
       : super(key: key);
 
   @override
@@ -123,7 +128,7 @@ class ThumbnailImage extends HookConsumerWidget {
                   child: _buildSelectionIcon(asset),
                 ),
               ),
-            Positioned(
+            if (showStorageIndicator) Positioned(
               right: 10,
               bottom: 5,
               child: Icon(

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

@@ -10,6 +10,8 @@ import 'package:immich_mobile/modules/home/ui/image_grid.dart';
 import 'package:immich_mobile/modules/home/ui/immich_sliver_appbar.dart';
 import 'package:immich_mobile/modules/home/ui/monthly_title_text.dart';
 import 'package:immich_mobile/modules/home/ui/profile_drawer/profile_drawer.dart';
+import 'package:immich_mobile/modules/settings/providers/app_settings.provider.dart';
+import 'package:immich_mobile/modules/settings/services/app_settings.service.dart';
 
 import 'package:immich_mobile/shared/providers/asset.provider.dart';
 import 'package:immich_mobile/shared/providers/server_info.provider.dart';
@@ -21,6 +23,8 @@ class HomePage extends HookConsumerWidget {
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
+    final appSettingService = ref.watch(appSettingsServiceProvider);
+
     ScrollController scrollController = useScrollController();
     var assetGroupByDateTime = ref.watch(assetGroupByDateTimeProvider);
     List<Widget> imageGridGroup = [];
@@ -61,35 +65,45 @@ class HomePage extends HookConsumerWidget {
         int? lastMonth;
 
         assetGroupByDateTime.forEach((dateGroup, immichAssetList) {
-          DateTime parseDateGroup = DateTime.parse(dateGroup);
-          int currentMonth = parseDateGroup.month;
+          try {
+            DateTime parseDateGroup = DateTime.parse(dateGroup);
+            int currentMonth = parseDateGroup.month;
 
-          if (lastMonth != null) {
-            if (currentMonth - lastMonth! != 0) {
-              imageGridGroup.add(
-                MonthlyTitleText(
-                  isoDate: dateGroup,
-                ),
-              );
+            if (lastMonth != null) {
+              if (currentMonth - lastMonth! != 0) {
+                imageGridGroup.add(
+                  MonthlyTitleText(
+                    isoDate: dateGroup,
+                  ),
+                );
+              }
             }
+
+            imageGridGroup.add(
+              DailyTitleText(
+                key: Key('${dateGroup.toString()}title'),
+                isoDate: dateGroup,
+                assetGroup: immichAssetList,
+              ),
+            );
+
+            imageGridGroup.add(
+              ImageGrid(
+                assetGroup: immichAssetList,
+                sortedAssetGroup: sortedAssetList,
+                tilesPerRow:
+                    appSettingService.getSetting(AppSettingsEnum.tilesPerRow),
+                showStorageIndicator: appSettingService
+                    .getSetting(AppSettingsEnum.storageIndicator),
+              ),
+            );
+
+            lastMonth = currentMonth;
+          } catch (e) {
+            debugPrint(
+              "[ERROR] Cannot parse $dateGroup - Wrong create date format : ${immichAssetList.map((asset) => asset.createdAt).toList()}",
+            );
           }
-
-          imageGridGroup.add(
-            DailyTitleText(
-              key: Key('${dateGroup.toString()}title'),
-              isoDate: dateGroup,
-              assetGroup: immichAssetList,
-            ),
-          );
-
-          imageGridGroup.add(
-            ImageGrid(
-              assetGroup: immichAssetList,
-              sortedAssetGroup: sortedAssetList,
-            ),
-          );
-
-          lastMonth = currentMonth;
         });
       }
 
@@ -117,7 +131,7 @@ class HomePage extends HookConsumerWidget {
               ],
             ),
             Padding(
-              padding: const EdgeInsets.only(top: 60.0, bottom: 30.0),
+              padding: const EdgeInsets.only(top: 60.0, bottom: 0.0),
               child: DraggableScrollbar.semicircle(
                 backgroundColor: Theme.of(context).hintColor,
                 controller: scrollController,

mobile/lib/modules/settings/services/app_settings.service.dart

@@ -1,11 +1,18 @@
-import 'package:flutter/material.dart';
 import 'package:hive_flutter/hive_flutter.dart';
-import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/constants/hive_box.dart';
 
-enum AppSettingsEnum {
-  threeStageLoading, // true, false,
-  themeMode, // "light","dark","system"
+enum AppSettingsEnum<T> {
+  threeStageLoading<bool>("threeStageLoading", false),
+  themeMode<String>("themeMode", "system"), // "light","dark","system"
+  tilesPerRow<int>("tilesPerRow", 4),
+  uploadErrorNotificationGracePeriod<int>(
+      "uploadErrorNotificationGracePeriod", 2),
+  storageIndicator<bool>("storageIndicator", true);
+
+  const AppSettingsEnum(this.hiveKey, this.defaultValue);
+
+  final String hiveKey;
+  final T defaultValue;
 }
 
 class AppSettingsService {
@@ -15,63 +22,26 @@ class AppSettingsService {
     hiveBox = Hive.box(userSettingInfoBox);
   }
 
-  T getSetting<T>(AppSettingsEnum settingType) {
-    var settingKey = _settingHiveBoxKeyLookup(settingType);
-
-    if (!hiveBox.containsKey(settingKey)) {
-      T defaultSetting = _setDefaultSetting(settingType);
-      return defaultSetting;
+  T getSetting<T>(AppSettingsEnum<T> settingType) {
+    if (!hiveBox.containsKey(settingType.hiveKey)) {
+      return _setDefault(settingType);
     }
 
-    var result = hiveBox.get(settingKey);
+    var result = hiveBox.get(settingType.hiveKey);
 
-    if (result is T) {
-      return result;
-    } else {
-      debugPrint("Incorrect setting type");
-      throw TypeError();
+    if (result is! T) {
+      return _setDefault(settingType);
     }
+
+    return result;
   }
 
-  setSetting<T>(AppSettingsEnum settingType, T value) {
-    var settingKey = _settingHiveBoxKeyLookup(settingType);
-
-    if (hiveBox.containsKey(settingKey)) {
-      var result = hiveBox.get(settingKey);
-
-      if (result is! T) {
-        debugPrint("Incorrect setting type");
-        throw TypeError();
-      }
-
-      hiveBox.put(settingKey, value);
-    } else {
-      hiveBox.put(settingKey, value);
-    }
+  setSetting<T>(AppSettingsEnum<T> settingType, T value) {
+    hiveBox.put(settingType.hiveKey, value);
   }
 
-  _setDefaultSetting(AppSettingsEnum settingType) {
-    var settingKey = _settingHiveBoxKeyLookup(settingType);
-
-    // Default value of threeStageLoading is false
-    if (settingType == AppSettingsEnum.threeStageLoading) {
-      hiveBox.put(settingKey, false);
-      return false;
-    }
-
-    // Default value of themeMode is "light"
-    if (settingType == AppSettingsEnum.themeMode) {
-      hiveBox.put(settingKey, "system");
-      return "system";
-    }
-  }
-
-  String _settingHiveBoxKeyLookup(AppSettingsEnum settingType) {
-    switch (settingType) {
-      case AppSettingsEnum.threeStageLoading:
-        return 'threeStageLoading';
-      case AppSettingsEnum.themeMode:
-        return 'themeMode';
-    }
+  T _setDefault<T>(AppSettingsEnum<T> settingType) {
+    hiveBox.put(settingType.hiveKey, settingType.defaultValue);
+    return settingType.defaultValue;
   }
 }

mobile/lib/modules/settings/ui/asset_list_settings/asset_list_settings.dart

@@ -0,0 +1,33 @@
+import 'package:easy_localization/easy_localization.dart';
+import 'package:flutter/material.dart';
+import 'package:immich_mobile/modules/settings/ui/asset_list_settings/asset_list_storage_indicator.dart';
+import 'asset_list_tiles_per_row.dart';
+
+class AssetListSettings extends StatelessWidget {
+  const AssetListSettings({
+    Key? key,
+  }) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return ExpansionTile(
+      textColor: Theme.of(context).primaryColor,
+      title: const Text(
+        'asset_list_settings_title',
+        style: TextStyle(
+          fontWeight: FontWeight.bold,
+        ),
+      ).tr(),
+      subtitle: const Text(
+        'asset_list_settings_subtitle',
+        style: TextStyle(
+          fontSize: 13,
+        ),
+      ).tr(),
+      children: const [
+        TilesPerRow(),
+        StorageIndicator(),
+      ],
+    );
+  }
+}

mobile/lib/modules/settings/ui/asset_list_settings/asset_list_storage_indicator.dart

@@ -0,0 +1,48 @@
+import 'package:easy_localization/easy_localization.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/settings/providers/app_settings.provider.dart';
+import 'package:immich_mobile/modules/settings/services/app_settings.service.dart';
+import 'package:immich_mobile/shared/providers/asset.provider.dart';
+
+class StorageIndicator extends HookConsumerWidget {
+  const StorageIndicator({
+    Key? key,
+  }) : super(key: key);
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final appSettingService = ref.watch(appSettingsServiceProvider);
+
+    final showStorageIndicator = useState(true);
+
+    void switchChanged(bool value) {
+      appSettingService.setSetting(AppSettingsEnum.storageIndicator, value);
+      showStorageIndicator.value = value;
+
+      ref.invalidate(assetGroupByDateTimeProvider);
+    }
+
+    useEffect(
+      () {
+        showStorageIndicator.value = appSettingService.getSetting<bool>(AppSettingsEnum.storageIndicator);
+
+        return null;
+      },
+      [],
+    );
+
+    return SwitchListTile.adaptive(
+      activeColor: Theme.of(context).primaryColor,
+      title: const Text(
+        "theme_setting_asset_list_storage_indicator_title",
+        style: TextStyle(
+          fontSize: 12,
+        ),
+      ).tr(),
+      onChanged: switchChanged,
+      value: showStorageIndicator.value,
+    );
+  }
+}

mobile/lib/modules/settings/ui/asset_list_settings/asset_list_tiles_per_row.dart

@@ -0,0 +1,64 @@
+import 'package:easy_localization/easy_localization.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/settings/providers/app_settings.provider.dart';
+import 'package:immich_mobile/modules/settings/services/app_settings.service.dart';
+import 'package:immich_mobile/shared/providers/asset.provider.dart';
+
+class TilesPerRow extends HookConsumerWidget {
+  const TilesPerRow({
+    Key? key,
+  }) : super(key: key);
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final appSettingService = ref.watch(appSettingsServiceProvider);
+
+    final itemsValue = useState(4.0);
+
+    void sliderChanged(double value) {
+      appSettingService.setSetting(AppSettingsEnum.tilesPerRow, value.toInt());
+      itemsValue.value = value;
+    }
+
+    void sliderChangedEnd(double _) {
+      ref.invalidate(assetGroupByDateTimeProvider);
+    }
+
+    useEffect(
+      () {
+        int tilesPerRow =
+            appSettingService.getSetting(AppSettingsEnum.tilesPerRow);
+        itemsValue.value = tilesPerRow.toDouble();
+        return null;
+      },
+      [],
+    );
+
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        ListTile(
+          title: const Text(
+            "theme_setting_asset_list_tiles_per_row_title",
+            style: TextStyle(
+              fontSize: 12,
+              fontWeight: FontWeight.bold,
+            ),
+          ).tr(args: ["${itemsValue.value.toInt()}"]),
+        ),
+        Slider(
+          onChangeEnd: sliderChangedEnd,
+          onChanged: sliderChanged,
+          value: itemsValue.value,
+          min: 2,
+          max: 6,
+          divisions: 4,
+          label: "${itemsValue.value.toInt()}",
+          activeColor: Theme.of(context).primaryColor,
+        ),
+      ],
+    );
+  }
+}

mobile/lib/modules/settings/ui/image_viewer_quality_setting/three_stage_loading.dart

@@ -36,6 +36,7 @@ class ThreeStageLoading extends HookConsumerWidget {
     }
 
     return SwitchListTile.adaptive(
+      activeColor: Theme.of(context).primaryColor,
       title: const Text(
         "theme_setting_three_stage_loading_title",
         style: TextStyle(

mobile/lib/modules/settings/ui/notification_setting/notification_setting.dart

@@ -0,0 +1,82 @@
+import 'package:easy_localization/easy_localization.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/settings/providers/app_settings.provider.dart';
+import 'package:immich_mobile/modules/settings/services/app_settings.service.dart';
+
+class NotificationSetting extends HookConsumerWidget {
+  const NotificationSetting({
+    Key? key,
+  }) : super(key: key);
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final appSettingService = ref.watch(appSettingsServiceProvider);
+
+    final sliderValue = useState(0.0);
+
+    useEffect(
+      () {
+        sliderValue.value = appSettingService
+            .getSetting<int>(AppSettingsEnum.uploadErrorNotificationGracePeriod)
+            .toDouble();
+        return null;
+      },
+      [],
+    );
+
+    final String formattedValue = _formatSliderValue(sliderValue.value);
+    return ExpansionTile(
+      textColor: Theme.of(context).primaryColor,
+      title: const Text(
+        'setting_notifications_title',
+        style: TextStyle(
+          fontWeight: FontWeight.bold,
+        ),
+      ).tr(),
+      subtitle: const Text(
+        'setting_notifications_subtitle',
+        style: TextStyle(
+          fontSize: 13,
+        ),
+      ).tr(),
+      children: [
+        ListTile(
+          isThreeLine: false,
+          dense: true,
+          title: const Text(
+            'setting_notifications_notify_failures_grace_period',
+            style: TextStyle(fontWeight: FontWeight.bold),
+          ).tr(args: [formattedValue]),
+          subtitle: Slider(
+            value: sliderValue.value,
+            onChanged: (double v) => sliderValue.value = v,
+            onChangeEnd: (double v) => appSettingService.setSetting(
+                AppSettingsEnum.uploadErrorNotificationGracePeriod, v.toInt()),
+            max: 5.0,
+            divisions: 5,
+            label: formattedValue,
+            activeColor: Theme.of(context).primaryColor,
+          ),
+        ),
+      ],
+    );
+  }
+}
+
+String _formatSliderValue(double v) {
+  if (v == 0.0) {
+    return 'setting_notifications_notify_immediately'.tr();
+  } else if (v == 1.0) {
+    return 'setting_notifications_notify_minutes'.tr(args: const ['30']);
+  } else if (v == 2.0) {
+    return 'setting_notifications_notify_hours'.tr(args: const ['2']);
+  } else if (v == 3.0) {
+    return 'setting_notifications_notify_hours'.tr(args: const ['8']);
+  } else if (v == 4.0) {
+    return 'setting_notifications_notify_hours'.tr(args: const ['24']);
+  } else {
+    return 'setting_notifications_notify_never'.tr();
+  }
+}

mobile/lib/modules/settings/ui/theme_setting/theme_setting.dart

@@ -3,7 +3,6 @@ import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/modules/settings/providers/app_settings.provider.dart';
-import 'package:immich_mobile/modules/settings/ui/image_viewer_quality_setting/three_stage_loading.dart';
 import 'package:immich_mobile/modules/settings/services/app_settings.service.dart';
 import 'package:immich_mobile/utils/immich_app_theme.dart';
 

mobile/lib/modules/settings/views/settings_page.dart

@@ -1,7 +1,11 @@
+import 'dart:io';
+
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/modules/settings/ui/asset_list_settings/asset_list_settings.dart';
 import 'package:immich_mobile/modules/settings/ui/image_viewer_quality_setting/image_viewer_quality_setting.dart';
+import 'package:immich_mobile/modules/settings/ui/notification_setting/notification_setting.dart';
 import 'package:immich_mobile/modules/settings/ui/theme_setting/theme_setting.dart';
 
 class SettingsPage extends HookConsumerWidget {
@@ -36,6 +40,8 @@ class SettingsPage extends HookConsumerWidget {
             tiles: [
               const ImageViewerQualitySetting(),
               const ThemeSetting(),
+              const AssetListSettings(),
+              if (Platform.isAndroid) const NotificationSetting(),
             ],
           ).toList(),
         ],

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

@@ -0,0 +1,21 @@
+import 'package:flutter_cache_manager/flutter_cache_manager.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+
+enum CacheType {
+  albumThumbnail,
+  sharedAlbumThumbnail;
+}
+
+final cacheServiceProvider = Provider((_) => CacheService());
+
+class CacheService {
+
+  BaseCacheManager getCache(CacheType type) {
+    return _getDefaultCache(type.name);
+  }
+
+  BaseCacheManager _getDefaultCache(String cacheName) {
+    return CacheManager(Config(cacheName));
+  }
+
+}

mobile/lib/utils/image_url_builder.dart

@@ -3,14 +3,31 @@ import 'package:openapi/api.dart';
 
 import '../constants/hive_box.dart';
 
-String getThumbnailUrl(final AssetResponseDto asset,
-    {ThumbnailFormat type = ThumbnailFormat.WEBP}) {
-  final box = Hive.box(userInfoBox);
+String getThumbnailUrl(
+  final AssetResponseDto asset, {
+  ThumbnailFormat type = ThumbnailFormat.WEBP,
+}) {
+  return _getThumbnailUrl(asset.id, type: type);
+}
 
-  return '${box.get(serverEndpointKey)}/asset/thumbnail/${asset.id}?format=${type.value}';
+String getAlbumThumbnailUrl(
+  final AlbumResponseDto album, {
+  ThumbnailFormat type = ThumbnailFormat.WEBP,
+}) {
+  if (album.albumThumbnailAssetId == null) {
+    return '';
+  }
+  return _getThumbnailUrl(album.albumThumbnailAssetId!, type: type);
 }
 
 String getImageUrl(final AssetResponseDto asset) {
   final box = Hive.box(userInfoBox);
   return '${box.get(serverEndpointKey)}/asset/file?aid=${asset.deviceAssetId}&did=${asset.deviceId}&isThumb=false';
 }
+
+String _getThumbnailUrl(final String id,
+    {ThumbnailFormat type = ThumbnailFormat.WEBP}) {
+  final box = Hive.box(userInfoBox);
+
+  return '${box.get(serverEndpointKey)}/asset/thumbnail/${id}?format=${type.value}';
+}

mobile/pubspec.lock

@@ -322,7 +322,7 @@ packages:
     source: hosted
     version: "0.6.8"
   flutter_cache_manager:
-    dependency: transitive
+    dependency: "direct main"
     description:
       name: flutter_cache_manager
       url: "https://pub.dartlang.org"

mobile/pubspec.yaml

@@ -2,7 +2,7 @@ name: immich_mobile
 description: Immich - selfhosted backup media file on mobile phone
 
 publish_to: "none"
-version: 1.23.0+33
+version: 1.26.0+35
 
 environment:
   sdk: ">=2.17.0 <3.0.0"
@@ -43,6 +43,7 @@ dependencies:
   easy_localization: ^3.0.1
   share_plus: ^4.0.10
   flutter_displaymode: ^0.4.0
+  flutter_cache_manager: 3.3.0
 
   path: ^1.8.1
   path_provider: ^2.0.11

server/Dockerfile

@@ -1,15 +1,32 @@
-FROM node:16-alpine3.14 as core
-
-ARG DEBIAN_FRONTEND=noninteractive
+# Build stage
+FROM node:16-alpine3.14 as builder
 
 WORKDIR /usr/src/app
 
 COPY package.json package-lock.json ./
 
-RUN apk add --update-cache build-base python3 libheif vips-dev vips ffmpeg
-
+RUN apk add --update-cache build-base python3 libheif vips-dev ffmpeg
 RUN npm ci
 
 COPY . .
 
 RUN npm run build
+
+
+# Prod stage
+FROM node:16-alpine3.14
+
+WORKDIR /usr/src/app
+
+COPY package.json package-lock.json ./
+COPY start-server.sh start-microservices.sh ./
+
+RUN mkdir -p /usr/src/app/dist \
+  && apk add --no-cache libheif vips ffmpeg
+
+COPY --from=builder /usr/src/app/node_modules ./node_modules
+COPY --from=builder /usr/src/app/dist ./dist
+
+RUN npm prune --production
+
+EXPOSE 3001

server/apps/immich/src/api-v1/album/album-repository.ts

@@ -202,7 +202,14 @@ export class AlbumRepository implements IAlbumRepository {
 
     // TODO: No need to return boolean if using a singe delete query
     if (deleteAssetCount == removeAssetsDto.assetIds.length) {
-      return this.get(album.id) as Promise<AlbumEntity>;
+      const retAlbum = await this.get(album.id) as AlbumEntity;
+
+      if (retAlbum?.assets?.length === 0) { // is empty album
+        await this.albumRepository.update(album.id, { albumThumbnailAssetId: null });
+        retAlbum.albumThumbnailAssetId = null;
+      }
+
+      return retAlbum;
     } else {
       throw new BadRequestException('Some assets were not found in the album');
     }

server/apps/immich/src/api-v1/server-info/server-info.service.ts

@@ -1,7 +1,7 @@
+import { APP_UPLOAD_LOCATION } from '@app/common/constants';
 import { Injectable } from '@nestjs/common';
 import { ServerInfoResponseDto } from './response-dto/server-info-response.dto';
 import diskusage from 'diskusage';
-import { APP_UPLOAD_LOCATION } from '../../constants/upload_location.constant';
 
 @Injectable()
 export class ServerInfoService {

server/apps/immich/src/app.module.ts

@@ -1,3 +1,4 @@
+import { immichAppConfig } from '@app/common/config';
 import { MiddlewareConsumer, Module, NestModule } from '@nestjs/common';
 import { UserModule } from './api-v1/user/user.module';
 import { AssetModule } from './api-v1/asset/asset.module';
@@ -5,7 +6,6 @@ import { AuthModule } from './api-v1/auth/auth.module';
 import { ImmichJwtModule } from './modules/immich-jwt/immich-jwt.module';
 import { DeviceInfoModule } from './api-v1/device-info/device-info.module';
 import { ConfigModule } from '@nestjs/config';
-import { immichAppConfig } from './config/app.config';
 import { BullModule } from '@nestjs/bull';
 import { ServerInfoModule } from './api-v1/server-info/server-info.module';
 import { BackgroundTaskModule } from './modules/background-task/background-task.module';
@@ -34,6 +34,7 @@ import { AppLoggerMiddleware } from './middlewares/app-logger.middleware';
 
     BullModule.forRootAsync({
       useFactory: async () => ({
+        prefix: 'immich_bull',
         redis: {
           host: process.env.REDIS_HOSTNAME || 'immich_redis',
           port: parseInt(process.env.REDIS_PORT || '6379'),

server/apps/immich/src/config/asset-upload.config.ts

@@ -1,15 +1,15 @@
+import { APP_UPLOAD_LOCATION } from '@app/common/constants';
 import { HttpException, HttpStatus } from '@nestjs/common';
 import { MulterOptions } from '@nestjs/platform-express/multer/interfaces/multer-options.interface';
 import { existsSync, mkdirSync } from 'fs';
 import { diskStorage } from 'multer';
 import { extname } from 'path';
 import { Request } from 'express';
-import { APP_UPLOAD_LOCATION } from '../constants/upload_location.constant';
 import { randomUUID } from 'crypto';
 
 export const assetUploadOption: MulterOptions = {
   fileFilter: (req: Request, file: any, cb: any) => {
-    if (file.mimetype.match(/\/(jpg|jpeg|png|gif|mp4|x-msvideo|quicktime|heic|heif|dng|webp)$/)) {
+    if (file.mimetype.match(/\/(jpg|jpeg|png|gif|mp4|x-msvideo|quicktime|heic|heif|dng|x-adobe-dng|webp|tiff)$/)) {
       cb(null, true);
     } else {
       cb(new HttpException(`Unsupported file type ${extname(file.originalname)}`, HttpStatus.BAD_REQUEST), false);

server/apps/immich/src/config/profile-image-upload.config.ts

@@ -1,10 +1,10 @@
+import { APP_UPLOAD_LOCATION } from '@app/common/constants';
 import { HttpException, HttpStatus } from '@nestjs/common';
 import { MulterOptions } from '@nestjs/platform-express/multer/interfaces/multer-options.interface';
 import { existsSync, mkdirSync } from 'fs';
 import { diskStorage } from 'multer';
 import { extname } from 'path';
 import { Request } from 'express';
-import { APP_UPLOAD_LOCATION } from '../constants/upload_location.constant';
 
 export const profileImageUploadOption: MulterOptions = {
   fileFilter: (req: Request, file: any, cb: any) => {

server/apps/immich/src/constants/server_version.constant.ts

@@ -10,7 +10,7 @@ export interface IServerVersion {
 
 export const serverVersion: IServerVersion = {
   major: 1,
-  minor: 23,
+  minor: 26,
   patch: 0,
   build: 0,
 };

server/apps/immich/src/modules/background-task/background-task.processor.ts

@@ -30,10 +30,19 @@ export class BackgroundTaskProcessor {
       });
 
       // TODO: what if there is no asset.resizePath. Should fail the Job?
+      // => panoti report: Job not fail
       if (asset.resizePath) {
         fs.unlink(asset.resizePath, (err) => {
           if (err) {
-            console.log('error deleting ', asset.originalPath);
+            console.log('error deleting ', asset.resizePath);
+          }
+        });
+      }
+
+      if (asset.webpPath) {
+        fs.unlink(asset.webpPath, (err) => {
+          if (err) {
+            console.log('error deleting ', asset.webpPath);
           }
         });
       }

server/apps/immich/test/jest-e2e.json

@@ -7,6 +7,7 @@
     "^.+\\.(t|j)s$": "ts-jest"
   },
   "moduleNameMapper": {
+    "@app/common/(.*)": "<rootDir>../../../libs/common/src/$1",
     "@app/database/config/(.*)": "<rootDir>../../../libs/database/src/config/$1",
     "@app/database/entities/(.*)": "<rootDir>../../../libs/database/src/entities/$1"
   }

server/apps/microservices/src/microservices.module.ts

@@ -1,30 +1,34 @@
-import { BullModule } from '@nestjs/bull';
-import { Module } from '@nestjs/common';
-import { TypeOrmModule } from '@nestjs/typeorm';
+import { immichAppConfig } from '@app/common/config';
 import { DatabaseModule } from '@app/database';
 import { AssetEntity } from '@app/database/entities/asset.entity';
 import { ExifEntity } from '@app/database/entities/exif.entity';
 import { SmartInfoEntity } from '@app/database/entities/smart-info.entity';
 import { UserEntity } from '@app/database/entities/user.entity';
-import { MicroservicesService } from './microservices.service';
-import { AssetUploadedProcessor } from './processors/asset-uploaded.processor';
-import { ThumbnailGeneratorProcessor } from './processors/thumbnail.processor';
-import { MetadataExtractionProcessor } from './processors/metadata-extraction.processor';
-import { VideoTranscodeProcessor } from './processors/video-transcode.processor';
-import { CommunicationModule } from '../../immich/src/api-v1/communication/communication.module';
 import {
   assetUploadedQueueName,
   metadataExtractionQueueName,
   thumbnailGeneratorQueueName,
   videoConversionQueueName,
 } from '@app/job/constants/queue-name.constant';
+import { BullModule } from '@nestjs/bull';
+import { Module } from '@nestjs/common';
+import { ConfigModule } from '@nestjs/config';
+import { TypeOrmModule } from '@nestjs/typeorm';
+import { CommunicationModule } from '../../immich/src/api-v1/communication/communication.module';
+import { MicroservicesService } from './microservices.service';
+import { AssetUploadedProcessor } from './processors/asset-uploaded.processor';
+import { MetadataExtractionProcessor } from './processors/metadata-extraction.processor';
+import { ThumbnailGeneratorProcessor } from './processors/thumbnail.processor';
+import { VideoTranscodeProcessor } from './processors/video-transcode.processor';
 
 @Module({
   imports: [
+    ConfigModule.forRoot(immichAppConfig),
     DatabaseModule,
     TypeOrmModule.forFeature([UserEntity, ExifEntity, AssetEntity, SmartInfoEntity]),
     BullModule.forRootAsync({
       useFactory: async () => ({
+        prefix: 'immich_bull',
         redis: {
           host: process.env.REDIS_HOSTNAME || 'immich_redis',
           port: parseInt(process.env.REDIS_PORT || '6379'),

server/apps/microservices/src/processors/asset-uploaded.processor.ts

@@ -1,7 +1,4 @@
-import { InjectQueue, Process, Processor } from '@nestjs/bull';
-import { Job, Queue } from 'bull';
 import { AssetType } from '@app/database/entities/asset.entity';
-import { randomUUID } from 'crypto';
 import {
   IAssetUploadedJob,
   IMetadataExtractionJob,
@@ -17,6 +14,9 @@ import {
   mp4ConversionProcessorName,
   videoMetadataExtractionProcessorName,
 } from '@app/job';
+import { InjectQueue, Process, Processor } from '@nestjs/bull';
+import { Job, Queue } from 'bull';
+import { randomUUID } from 'crypto';
 
 @Processor(assetUploadedQueueName)
 export class AssetUploadedProcessor {
@@ -64,7 +64,11 @@ export class AssetUploadedProcessor {
 
     // Extract video duration if uploaded from the web & CLI
     if (asset.type == AssetType.VIDEO) {
-      await this.metadataExtractionQueue.add(videoMetadataExtractionProcessorName, { asset }, { jobId: randomUUID() });
+      await this.metadataExtractionQueue.add(
+        videoMetadataExtractionProcessorName,
+        { asset, fileName, fileSize },
+        { jobId: randomUUID() }
+      );
     }
   }
 }

server/apps/microservices/src/processors/metadata-extraction.processor.ts

@@ -1,18 +1,6 @@
-import { Process, Processor } from '@nestjs/bull';
-import { Job } from 'bull';
 import { AssetEntity } from '@app/database/entities/asset.entity';
-import { Repository } from 'typeorm/repository/Repository';
-import { InjectRepository } from '@nestjs/typeorm';
 import { ExifEntity } from '@app/database/entities/exif.entity';
-import exifr from 'exifr';
-import mapboxGeocoding, { GeocodeService } from '@mapbox/mapbox-sdk/services/geocoding';
-import { MapiResponse } from '@mapbox/mapbox-sdk/lib/classes/mapi-response';
-import { readFile } from 'fs/promises';
-import { Logger } from '@nestjs/common';
-import axios from 'axios';
 import { SmartInfoEntity } from '@app/database/entities/smart-info.entity';
-import ffmpeg from 'fluent-ffmpeg';
-import path from 'path';
 import {
   IExifExtractionProcessor,
   IVideoLengthExtractionProcessor,
@@ -24,6 +12,18 @@ import {
   reverseGeocodingProcessorName,
   IReverseGeocodingProcessor,
 } from '@app/job';
+import { MapiResponse } from '@mapbox/mapbox-sdk/lib/classes/mapi-response';
+import mapboxGeocoding, { GeocodeService } from '@mapbox/mapbox-sdk/services/geocoding';
+import { Process, Processor } from '@nestjs/bull';
+import { Logger } from '@nestjs/common';
+import { InjectRepository } from '@nestjs/typeorm';
+import axios from 'axios';
+import { Job } from 'bull';
+import exifr from 'exifr';
+import ffmpeg from 'fluent-ffmpeg';
+import { readFile } from 'fs/promises';
+import path from 'path';
+import { Repository } from 'typeorm/repository/Repository';
 
 @Processor(metadataExtractionQueueName)
 export class MetadataExtractionProcessor {
@@ -60,8 +60,8 @@ export class MetadataExtractionProcessor {
       newExif.make = exifData['Make'] || null;
       newExif.model = exifData['Model'] || null;
       newExif.imageName = path.parse(fileName).name || null;
-      newExif.exifImageHeight = exifData['ExifImageHeight'] || null;
-      newExif.exifImageWidth = exifData['ExifImageWidth'] || null;
+      newExif.exifImageHeight = exifData['ExifImageHeight'] || exifData['ImageHeight'] || null;
+      newExif.exifImageWidth = exifData['ExifImageWidth'] || exifData['ImageWidth'] || null;
       newExif.fileSizeInByte = fileSize || null;
       newExif.orientation = exifData['Orientation'] || null;
       newExif.dateTimeOriginal = exifData['DateTimeOriginal'] || null;
@@ -85,9 +85,21 @@ export class MetadataExtractionProcessor {
 
         const res: [] = geoCodeInfo.body['features'];
 
-        const city = res.filter((geoInfo) => geoInfo['place_type'][0] == 'place')[0]['text'];
-        const state = res.filter((geoInfo) => geoInfo['place_type'][0] == 'region')[0]['text'];
-        const country = res.filter((geoInfo) => geoInfo['place_type'][0] == 'country')[0]['text'];
+        let city = '';
+        let state = '';
+        let country = '';
+
+        if (res.filter((geoInfo) => geoInfo['place_type'][0] == 'place')[0]) {
+          city = res.filter((geoInfo) => geoInfo['place_type'][0] == 'place')[0]['text'];
+        }
+
+        if (res.filter((geoInfo) => geoInfo['place_type'][0] == 'region')[0]) {
+          state = res.filter((geoInfo) => geoInfo['place_type'][0] == 'region')[0]['text'];
+        }
+
+        if (res.filter((geoInfo) => geoInfo['place_type'][0] == 'country')[0]) {
+          country = res.filter((geoInfo) => geoInfo['place_type'][0] == 'country')[0]['text'];
+        }
 
         newExif.city = city || null;
         newExif.state = state || null;
@@ -114,9 +126,21 @@ export class MetadataExtractionProcessor {
 
       const res: [] = geoCodeInfo.body['features'];
 
-      const city = res.filter((geoInfo) => geoInfo['place_type'][0] == 'place')[0]['text'];
-      const state = res.filter((geoInfo) => geoInfo['place_type'][0] == 'region')[0]['text'];
-      const country = res.filter((geoInfo) => geoInfo['place_type'][0] == 'country')[0]['text'];
+      let city = '';
+      let state = '';
+      let country = '';
+
+      if (res.filter((geoInfo) => geoInfo['place_type'][0] == 'place')[0]) {
+        city = res.filter((geoInfo) => geoInfo['place_type'][0] == 'place')[0]['text'];
+      }
+
+      if (res.filter((geoInfo) => geoInfo['place_type'][0] == 'region')[0]) {
+        state = res.filter((geoInfo) => geoInfo['place_type'][0] == 'region')[0]['text'];
+      }
+
+      if (res.filter((geoInfo) => geoInfo['place_type'][0] == 'country')[0]) {
+        country = res.filter((geoInfo) => geoInfo['place_type'][0] == 'country')[0]['text'];
+      }
 
       await this.exifRepository.update({ id: exif.id }, { city, state, country });
     }
@@ -166,33 +190,130 @@ export class MetadataExtractionProcessor {
 
   @Process({ name: videoMetadataExtractionProcessorName, concurrency: 2 })
   async extractVideoMetadata(job: Job<IVideoLengthExtractionProcessor>) {
-    const { asset } = job.data;
+    const { asset, fileName } = job.data;
 
-    ffmpeg.ffprobe(asset.originalPath, async (err, data) => {
-      if (!err) {
-        let durationString = asset.duration;
-        let createdAt = asset.createdAt;
+    try {
+      const data = await new Promise<ffmpeg.FfprobeData>((resolve, reject) =>
+        ffmpeg.ffprobe(asset.originalPath, (err, data) => {
+          if (err) return reject(err);
+          return resolve(data);
+        }),
+      );
+      let durationString = asset.duration;
+      let createdAt = asset.createdAt;
 
-        if (data.format.duration) {
-          durationString = this.extractDuration(data.format.duration);
-        }
+      if (data.format.duration) {
+        durationString = this.extractDuration(data.format.duration);
+      }
 
-        const videoTags = data.format.tags;
-        if (videoTags) {
-          if (videoTags['com.apple.quicktime.creationdate']) {
-            createdAt = String(videoTags['com.apple.quicktime.creationdate']);
-          } else if (videoTags['creation_time']) {
-            createdAt = String(videoTags['creation_time']);
-          } else {
-            createdAt = asset.createdAt;
-          }
+      const videoTags = data.format.tags;
+      if (videoTags) {
+        if (videoTags['com.apple.quicktime.creationdate']) {
+          createdAt = String(videoTags['com.apple.quicktime.creationdate']);
+        } else if (videoTags['creation_time']) {
+          createdAt = String(videoTags['creation_time']);
         } else {
           createdAt = asset.createdAt;
         }
-
-        await this.assetRepository.update({ id: asset.id }, { duration: durationString, createdAt: createdAt });
+      } else {
+        createdAt = asset.createdAt;
       }
-    });
+
+      const newExif = new ExifEntity();
+      newExif.assetId = asset.id;
+      newExif.description = '';
+      newExif.imageName = path.parse(fileName).name || null;
+      newExif.fileSizeInByte = data.format.size || null;
+      newExif.dateTimeOriginal = createdAt ? new Date(createdAt) : null;
+      newExif.modifyDate = null;
+      newExif.latitude = null;
+      newExif.longitude = null;
+      newExif.city = null;
+      newExif.state = null;
+      newExif.country = null;
+      newExif.fps = null;
+
+      if (videoTags && videoTags['location']) {
+        const location = videoTags['location'] as string;
+        const locationRegex = /([+-][0-9]+\.[0-9]+)([+-][0-9]+\.[0-9]+)\/$/;
+        const match = location.match(locationRegex);
+
+        if (match?.length === 3) {
+          newExif.latitude = parseFloat(match[1]);
+          newExif.longitude = parseFloat(match[2]);
+        }
+      } else if (videoTags && videoTags['com.apple.quicktime.location.ISO6709']) {
+        const location = videoTags['com.apple.quicktime.location.ISO6709'] as string;
+        const locationRegex = /([+-][0-9]+\.[0-9]+)([+-][0-9]+\.[0-9]+)([+-][0-9]+\.[0-9]+)\/$/;
+        const match = location.match(locationRegex);
+
+        if (match?.length === 4) {
+          newExif.latitude = parseFloat(match[1]);
+          newExif.longitude = parseFloat(match[2]);
+        }
+      }
+
+      // Reverse GeoCoding
+      if (this.geocodingClient && newExif.longitude && newExif.latitude) {
+        const geoCodeInfo: MapiResponse = await this.geocodingClient
+          .reverseGeocode({
+            query: [newExif.longitude, newExif.latitude],
+            types: ['country', 'region', 'place'],
+          })
+          .send();
+
+        const res: [] = geoCodeInfo.body['features'];
+
+        let city = '';
+        let state = '';
+        let country = '';
+
+        if (res.filter((geoInfo) => geoInfo['place_type'][0] == 'place')[0]) {
+          city = res.filter((geoInfo) => geoInfo['place_type'][0] == 'place')[0]['text'];
+        }
+
+        if (res.filter((geoInfo) => geoInfo['place_type'][0] == 'region')[0]) {
+          state = res.filter((geoInfo) => geoInfo['place_type'][0] == 'region')[0]['text'];
+        }
+
+        if (res.filter((geoInfo) => geoInfo['place_type'][0] == 'country')[0]) {
+          country = res.filter((geoInfo) => geoInfo['place_type'][0] == 'country')[0]['text'];
+        }
+
+        newExif.city = city || null;
+        newExif.state = state || null;
+        newExif.country = country || null;
+      }
+
+      for (const stream of data.streams) {
+        if (stream.codec_type === 'video') {
+          newExif.exifImageWidth = stream.width || null;
+          newExif.exifImageHeight = stream.height || null;
+
+          if (typeof stream.rotation === 'string') {
+            newExif.orientation = stream.rotation;
+          } else if (typeof stream.rotation === 'number') {
+            newExif.orientation = `${stream.rotation}`;
+          } else {
+            newExif.orientation = null;
+          }
+
+          if (stream.r_frame_rate) {
+            let fpsParts = stream.r_frame_rate.split('/');
+
+            if (fpsParts.length === 2) {
+              newExif.fps = Math.round(parseInt(fpsParts[0]) / parseInt(fpsParts[1]));
+            }
+          }
+        }
+      }
+
+      await this.exifRepository.save(newExif);
+      await this.assetRepository.update({ id: asset.id }, { duration: durationString, createdAt: createdAt });
+    } catch (err) {
+      // do nothing
+      console.log('Error in video metadata extraction', err);
+    }
   }
 
   private extractDuration(duration: number) {
@@ -202,8 +323,6 @@ export class MetadataExtractionProcessor {
     const minutes = Math.floor((videoDurationInSecond - hours * 3600) / 60);
     const seconds = videoDurationInSecond - hours * 3600 - minutes * 60;
 
-    return `${hours}:${minutes < 10 ? '0' + minutes.toString() : minutes}:${
-      seconds < 10 ? '0' + seconds.toString() : seconds
-    }.000000`;
+    return `${hours}:${minutes.toString().padStart(2, '0')}:${seconds.toString().padStart(2, '0')}.000000`;
   }
 }

server/apps/microservices/src/processors/thumbnail.processor.ts

@@ -1,14 +1,4 @@
-import { InjectQueue, Process, Processor } from '@nestjs/bull';
-import { Job, Queue } from 'bull';
 import { AssetEntity, AssetType } from '@app/database/entities/asset.entity';
-import { Repository } from 'typeorm/repository/Repository';
-import { InjectRepository } from '@nestjs/typeorm';
-import sharp from 'sharp';
-import { existsSync, mkdirSync } from 'node:fs';
-import { randomUUID } from 'node:crypto';
-import { CommunicationGateway } from '../../../immich/src/api-v1/communication/communication.gateway';
-import ffmpeg from 'fluent-ffmpeg';
-import { Logger } from '@nestjs/common';
 import {
   WebpGeneratorProcessor,
   generateJPEGThumbnailProcessorName,
@@ -19,6 +9,17 @@ import {
   thumbnailGeneratorQueueName,
   JpegGeneratorProcessor,
 } from '@app/job';
+import { InjectQueue, Process, Processor } from '@nestjs/bull';
+import { Logger } from '@nestjs/common';
+import { InjectRepository } from '@nestjs/typeorm';
+import { mapAsset } from 'apps/immich/src/api-v1/asset/response-dto/asset-response.dto';
+import { Job, Queue } from 'bull';
+import ffmpeg from 'fluent-ffmpeg';
+import { randomUUID } from 'node:crypto';
+import { existsSync, mkdirSync } from 'node:fs';
+import sharp from 'sharp';
+import { Repository } from 'typeorm/repository/Repository';
+import { CommunicationGateway } from '../../../immich/src/api-v1/communication/communication.gateway';
 
 @Processor(thumbnailGeneratorQueueName)
 export class ThumbnailGeneratorProcessor {
@@ -29,7 +30,7 @@ export class ThumbnailGeneratorProcessor {
     @InjectQueue(thumbnailGeneratorQueueName)
     private thumbnailGeneratorQueue: Queue,
 
-    private wsCommunicateionGateway: CommunicationGateway,
+    private wsCommunicationGateway: CommunicationGateway,
 
     @InjectQueue(metadataExtractionQueueName)
     private metadataExtractionQueue: Queue,
@@ -50,58 +51,47 @@ export class ThumbnailGeneratorProcessor {
     const jpegThumbnailPath = resizePath + originalFilename + '.jpeg';
 
     if (asset.type == AssetType.IMAGE) {
-      sharp(asset.originalPath)
-        .resize(1440, 2560, { fit: 'inside' })
-        .jpeg()
-        .rotate()
-        .toFile(jpegThumbnailPath, async (err) => {
-          if (!err) {
-            await this.assetRepository.update({ id: asset.id }, { resizePath: jpegThumbnailPath });
+      await sharp(asset.originalPath).resize(1440, 2560, { fit: 'inside' }).jpeg().rotate().toFile(jpegThumbnailPath);
+      await this.assetRepository.update({ id: asset.id }, { resizePath: jpegThumbnailPath });
 
-            // Update resize path to send to generate webp queue
-            asset.resizePath = jpegThumbnailPath;
+      // Update resize path to send to generate webp queue
+      asset.resizePath = jpegThumbnailPath;
 
-            await this.thumbnailGeneratorQueue.add(
-              generateWEBPThumbnailProcessorName,
-              { asset },
-              { jobId: randomUUID() },
-            );
-            await this.metadataExtractionQueue.add(imageTaggingProcessorName, { asset }, { jobId: randomUUID() });
-            await this.metadataExtractionQueue.add(objectDetectionProcessorName, { asset }, { jobId: randomUUID() });
-            this.wsCommunicateionGateway.server.to(asset.userId).emit('on_upload_success', JSON.stringify(asset));
-          }
-        });
+      await this.thumbnailGeneratorQueue.add(generateWEBPThumbnailProcessorName, { asset }, { jobId: randomUUID() });
+      await this.metadataExtractionQueue.add(imageTaggingProcessorName, { asset }, { jobId: randomUUID() });
+      await this.metadataExtractionQueue.add(objectDetectionProcessorName, { asset }, { jobId: randomUUID() });
+      this.wsCommunicationGateway.server.to(asset.userId).emit('on_upload_success', JSON.stringify(mapAsset(asset)));
     }
 
     if (asset.type == AssetType.VIDEO) {
-      ffmpeg(asset.originalPath)
-        .outputOptions(['-ss 00:00:00.000', '-frames:v 1'])
-        .output(jpegThumbnailPath)
-        .on('start', () => {
-          Logger.log('Start Generating Video Thumbnail', 'generateJPEGThumbnail');
-        })
-        .on('error', (error) => {
-          Logger.error(`Cannot Generate Video Thumbnail ${error}`, 'generateJPEGThumbnail');
-          // reject();
-        })
-        .on('end', async () => {
-          Logger.log(`Generating Video Thumbnail Success ${asset.id}`, 'generateJPEGThumbnail');
-          await this.assetRepository.update({ id: asset.id }, { resizePath: jpegThumbnailPath });
+      await new Promise((resolve, reject) => {
+        ffmpeg(asset.originalPath)
+          .outputOptions(['-ss 00:00:00.000', '-frames:v 1'])
+          .output(jpegThumbnailPath)
+          .on('start', () => {
+            Logger.log('Start Generating Video Thumbnail', 'generateJPEGThumbnail');
+          })
+          .on('error', (error) => {
+            Logger.error(`Cannot Generate Video Thumbnail ${error}`, 'generateJPEGThumbnail');
+            reject(error);
+          })
+          .on('end', async () => {
+            Logger.log(`Generating Video Thumbnail Success ${asset.id}`, 'generateJPEGThumbnail');
+            resolve(asset);
+          })
+          .run();
+      });
 
-          // Update resize path to send to generate webp queue
-          asset.resizePath = jpegThumbnailPath;
+      await this.assetRepository.update({ id: asset.id }, { resizePath: jpegThumbnailPath });
 
-          await this.thumbnailGeneratorQueue.add(
-            generateWEBPThumbnailProcessorName,
-            { asset },
-            { jobId: randomUUID() },
-          );
-          await this.metadataExtractionQueue.add(imageTaggingProcessorName, { asset }, { jobId: randomUUID() });
-          await this.metadataExtractionQueue.add(objectDetectionProcessorName, { asset }, { jobId: randomUUID() });
+      // Update resize path to send to generate webp queue
+      asset.resizePath = jpegThumbnailPath;
 
-          this.wsCommunicateionGateway.server.to(asset.userId).emit('on_upload_success', JSON.stringify(asset));
-        })
-        .run();
+      await this.thumbnailGeneratorQueue.add(generateWEBPThumbnailProcessorName, { asset }, { jobId: randomUUID() });
+      await this.metadataExtractionQueue.add(imageTaggingProcessorName, { asset }, { jobId: randomUUID() });
+      await this.metadataExtractionQueue.add(objectDetectionProcessorName, { asset }, { jobId: randomUUID() });
+
+      this.wsCommunicationGateway.server.to(asset.userId).emit('on_upload_success', JSON.stringify(mapAsset(asset)));
     }
   }
 
@@ -112,16 +102,10 @@ export class ThumbnailGeneratorProcessor {
     if (!asset.resizePath) {
       return;
     }
+
     const webpPath = asset.resizePath.replace('jpeg', 'webp');
 
-    sharp(asset.resizePath)
-      .resize(250)
-      .webp()
-      .rotate()
-      .toFile(webpPath, (err) => {
-        if (!err) {
-          this.assetRepository.update({ id: asset.id }, { webpPath: webpPath });
-        }
-      });
+    await sharp(asset.resizePath).resize(250).webp().rotate().toFile(webpPath);
+    await this.assetRepository.update({ id: asset.id }, { webpPath: webpPath });
   }
 }

server/apps/microservices/src/processors/video-transcode.processor.ts

@@ -1,3 +1,5 @@
+import { APP_UPLOAD_LOCATION } from '@app/common/constants';
+import { AssetEntity } from '@app/database/entities/asset.entity';
 import { mp4ConversionProcessorName } from '@app/job/constants/job-name.constant';
 import { videoConversionQueueName } from '@app/job/constants/queue-name.constant';
 import { IMp4ConversionProcessor } from '@app/job/interfaces/video-transcode.interface';
@@ -8,8 +10,6 @@ import { Job } from 'bull';
 import ffmpeg from 'fluent-ffmpeg';
 import { existsSync, mkdirSync } from 'fs';
 import { Repository } from 'typeorm';
-import { AssetEntity } from '../../../../libs/database/src/entities/asset.entity';
-import { APP_UPLOAD_LOCATION } from '../../../immich/src/constants/upload_location.constant';
 
 @Processor(videoConversionQueueName)
 export class VideoTranscodeProcessor {

server/libs/common/src/config/index.ts

@@ -0,0 +1 @@
+export * from './app.config';

server/libs/common/src/constants/index.ts

@@ -0,0 +1 @@
+export * from './upload_location.constant';

server/libs/common/src/index.ts

@@ -0,0 +1,2 @@
+export * from './config';
+export * from './constants';

server/libs/common/tsconfig.lib.json

@@ -0,0 +1,9 @@
+{
+  "extends": "../../tsconfig.json",
+  "compilerOptions": {
+    "declaration": true,
+    "outDir": "../../dist/libs/common"
+  },
+  "include": ["src/**/*"],
+  "exclude": ["node_modules", "dist", "test", "**/*spec.ts"]
+}

server/libs/database/src/entities/exif.entity.ts

@@ -13,14 +13,9 @@ export class ExifEntity {
   @Column({ type: 'uuid' })
   assetId!: string;
 
-  @Column({ type: 'varchar', nullable: true })
-  make!: string | null;
-
-  @Column({ type: 'varchar', nullable: true })
-  model!: string | null;
-
-  @Column({ type: 'varchar', nullable: true })
-  imageName!: string | null;
+  /* General info */
+  @Column({ type: 'text', nullable: true, default: '' })
+  description!: string; // or caption
 
   @Column({ type: 'integer', nullable: true })
   exifImageWidth!: number | null;
@@ -28,7 +23,7 @@ export class ExifEntity {
   @Column({ type: 'integer', nullable: true })
   exifImageHeight!: number | null;
 
-  @Column({ type: 'integer', nullable: true })
+  @Column({ type: 'bigint', nullable: true })
   fileSizeInByte!: number | null;
 
   @Column({ type: 'varchar', nullable: true })
@@ -40,21 +35,6 @@ export class ExifEntity {
   @Column({ type: 'timestamptz', nullable: true })
   modifyDate!: Date | null;
 
-  @Column({ type: 'varchar', nullable: true })
-  lensModel!: string | null;
-
-  @Column({ type: 'float8', nullable: true })
-  fNumber!: number | null;
-
-  @Column({ type: 'float8', nullable: true })
-  focalLength!: number | null;
-
-  @Column({ type: 'integer', nullable: true })
-  iso!: number | null;
-
-  @Column({ type: 'float', nullable: true })
-  exposureTime!: number | null;
-
   @Column({ type: 'float', nullable: true })
   latitude!: number | null;
 
@@ -70,9 +50,38 @@ export class ExifEntity {
   @Column({ type: 'varchar', nullable: true })
   country!: string | null;
 
+  /* Image info */
+  @Column({ type: 'varchar', nullable: true })
+  make!: string | null;
+
+  @Column({ type: 'varchar', nullable: true })
+  model!: string | null;
+
+  @Column({ type: 'varchar', nullable: true })
+  imageName!: string | null;
+
+  @Column({ type: 'varchar', nullable: true })
+  lensModel!: string | null;
+
+  @Column({ type: 'float8', nullable: true })
+  fNumber!: number | null;
+
+  @Column({ type: 'float8', nullable: true })
+  focalLength!: number | null;
+
+  @Column({ type: 'integer', nullable: true })
+  iso!: number | null;
+
+  @Column({ type: 'float', nullable: true })
+  exposureTime!: number | null;
+
+  /* Video info */
+  @Column({ type: 'float8', nullable: true })
+  fps?: number | null;
+
   @OneToOne(() => AssetEntity, { onDelete: 'CASCADE', nullable: true })
   @JoinColumn({ name: 'assetId', referencedColumnName: 'id' })
-  asset?: ExifEntity;
+  asset?: AssetEntity;
 
   @Index('exif_text_searchable', { synchronize: false })
   @Column({

server/libs/database/src/entities/smart-info.entity.ts

@@ -18,5 +18,5 @@ export class SmartInfoEntity {
 
   @OneToOne(() => AssetEntity, { onDelete: 'CASCADE', nullable: true })
   @JoinColumn({ name: 'assetId', referencedColumnName: 'id' })
-  asset?: SmartInfoEntity;
+  asset?: AssetEntity;
 }

server/libs/database/src/migrations/1661011331242-AddCaption.ts

@@ -0,0 +1,15 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class AddCaption1661011331242 implements MigrationInterface {
+  name = 'AddCaption1661011331242';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`ALTER TABLE "exif" ADD "description" text DEFAULT ''`);
+    await queryRunner.query(`ALTER TABLE "exif" ADD "fps" double precision`);
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`ALTER TABLE "exif" DROP COLUMN "fps"`);
+    await queryRunner.query(`ALTER TABLE "exif" DROP COLUMN "description"`);
+  }
+}

server/libs/database/src/migrations/1661528919411-ChangeExifFileSizeInByteToBigInt.ts

@@ -0,0 +1,19 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class ChangeExifFileSizeInByteToBigInt1661528919411 implements MigrationInterface {
+  name = 'ChangeExifFileSizeInByteToBigInt1661528919411';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
+      ALTER TABLE exif
+      ALTER COLUMN "fileSizeInByte" type bigint using "fileSizeInByte"::bigint;
+    `);
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
+    ALTER TABLE exif
+    ALTER COLUMN "fileSizeInByte" type integer using "fileSizeInByte"::integer;
+  `);
+  }
+}

server/libs/job/src/interfaces/metadata-extraction.interface.ts

@@ -23,6 +23,16 @@ export interface IVideoLengthExtractionProcessor {
    * The Asset entity that was saved in the database
    */
   asset: AssetEntity;
+
+  /**
+   * Original file name
+   */
+  fileName: string;
+
+  /**
+   * File size in byte
+   */
+  fileSize: number;
 }
 
 export interface IReverseGeocodingProcessor {

server/nest-cli.json

@@ -33,6 +33,15 @@
         "tsConfigPath": "apps/microservices/tsconfig.app.json"
       }
     },
+    "common": {
+      "type": "library",
+      "root": "libs/common",
+      "entryFile": "index",
+      "sourceRoot": "libs/common/src",
+      "compilerOptions": {
+        "tsConfigPath": "libs/common/tsconfig.lib.json"
+      }
+    },
     "database": {
       "type": "library",
       "root": "libs/database",

server/tsconfig.json

@@ -16,6 +16,12 @@
     "esModuleInterop": true,
     "baseUrl": "./",
     "paths": {
+      "@app/common": [
+        "libs/common/src"
+      ],
+      "@app/common/*": [
+        "libs/common/src/*"
+      ],
       "@app/database": [
         "libs/database/src"
       ],

web/package.json

@@ -6,7 +6,6 @@
 		"build": "vite build",
 		"package": "svelte-kit package",
 		"preview": "vite preview",
-		"prepare": "svelte-kit sync",
 		"check": "svelte-check --tsconfig ./tsconfig.json",
 		"check:watch": "svelte-check --tsconfig ./tsconfig.json --watch",
 		"lint": "prettier --check --plugin-search-dir=. . && eslint .",

web/src/api/index.ts

@@ -1,2 +1,3 @@
 export * from './open-api';
 export * from './api';
+export * from './utils';

web/src/api/utils.ts

@@ -0,0 +1,12 @@
+let _basePath = '/api';
+
+export function getFileUrl(aid: string, did: string, isThumb?: boolean, isWeb?: boolean) {
+  const urlObj = new URL(`${window.location.origin}${_basePath}/asset/file`);
+  
+  urlObj.searchParams.append('aid', aid);
+  urlObj.searchParams.append('did', did);
+  if (isThumb !== undefined && isThumb !== null) urlObj.searchParams.append('isThumb', `${isThumb}`);
+  if (isWeb !== undefined && isWeb !== null) urlObj.searchParams.append('isWeb', `${isWeb}`);
+
+  return urlObj.href;
+}

web/src/app.d.ts

@@ -8,10 +8,4 @@ declare namespace App {
 	}
 
 	// interface Platform {}
-
-	interface Session {
-		user?: import('@api').UserResponseDto;
-	}
-
-	// interface Stuff {}
 }

web/src/hooks.ts

@@ -1,31 +1,5 @@
-import type { ExternalFetch, GetSession, Handle } from '@sveltejs/kit';
-import * as cookie from 'cookie';
-import { serverApi } from '@api';
+import type { Handle } from '@sveltejs/kit';
 
 export const handle: Handle = async ({ event, resolve }) => {
-	const cookies = cookie.parse(event.request.headers.get('cookie') || '');
-
-	if (!cookies['immich_is_authenticated']) {
-		return await resolve(event);
-	}
-	const accessToken = cookies['immich_access_token'];
-
-	try {
-		serverApi.setAccessToken(accessToken);
-		const { data } = await serverApi.userApi.getMyUserInfo();
-		event.locals.user = data;
-
-		return await resolve(event);
-	} catch (error) {
-		event.locals.user = undefined;
-		return await resolve(event);
-	}
-};
-
-export const getSession: GetSession = async ({ locals }) => {
-	if (!locals.user) return {};
-
-	return {
-		user: locals.user
-	};
+	return await resolve(event);
 };

web/src/lib/components/album-page/album-card.svelte

@@ -2,7 +2,7 @@
 	import { AlbumResponseDto, api, ThumbnailFormat } from '@api';
 	import { createEventDispatcher, onMount } from 'svelte';
 	import DotsVertical from 'svelte-material-icons/DotsVertical.svelte';
-	import { fade } from 'svelte/transition';
+	import { fly } from 'svelte/transition';
 	import CircleIconButton from '../shared-components/circle-icon-button.svelte';
 
 	export let album: AlbumResponseDto;

web/src/lib/components/album-page/album-viewer.svelte

@@ -22,6 +22,10 @@
 	import MenuOption from '../shared-components/context-menu/menu-option.svelte';
 	import ThumbnailSelection from './thumbnail-selection.svelte';
 	import ControlAppBar from '../shared-components/control-app-bar.svelte';
+	import {
+		notificationController,
+		NotificationType
+	} from '../shared-components/notification/notification';
 
 	export let album: AlbumResponseDto;
 
@@ -129,7 +133,11 @@
 				album = data;
 				multiSelectAsset = new Set();
 			} catch (e) {
-				console.log('Error [album-viewer] [removeAssetFromAlbum]', e);
+				console.error('Error [album-viewer] [removeAssetFromAlbum]', e);
+				notificationController.show({
+					type: NotificationType.Error,
+					message: 'Error removing assets from album, check console for more details'
+				});
 			}
 		}
 	};
@@ -179,7 +187,11 @@
 					currentAlbumName = album.albumName;
 				})
 				.catch((e) => {
-					console.log('Error [updateAlbumInfo] ', e);
+					console.error('Error [updateAlbumInfo] ', e);
+					notificationController.show({
+						type: NotificationType.Error,
+						message: "Error updating album's name, check console for more details"
+					});
 				});
 		}
 	}
@@ -193,7 +205,11 @@
 
 			isShowAssetSelection = false;
 		} catch (e) {
-			console.log('Error [createAlbumHandler] ', e);
+			console.error('Error [createAlbumHandler] ', e);
+			notificationController.show({
+				type: NotificationType.Error,
+				message: 'Error creating album, check console for more details'
+			});
 		}
 	};
 
@@ -209,7 +225,11 @@
 
 			isShowShareUserSelection = false;
 		} catch (e) {
-			console.log('Error [createAlbumHandler] ', e);
+			console.error('Error [addUserHandler] ', e);
+			notificationController.show({
+				type: NotificationType.Error,
+				message: 'Error adding users to album, check console for more details'
+			});
 		}
 	};
 
@@ -227,7 +247,11 @@
 			album = data;
 			isShowShareInfoModal = false;
 		} catch (e) {
-			console.log('Error [sharedUserDeletedHandler] ', e);
+			console.error('Error [sharedUserDeletedHandler] ', e);
+			notificationController.show({
+				type: NotificationType.Error,
+				message: 'Error deleting share users, check console for more details'
+			});
 		}
 	};
 
@@ -241,7 +265,11 @@
 				await api.albumApi.deleteAlbum(album.id);
 				goto(backUrl);
 			} catch (e) {
-				console.log('Error [userDeleteMenu] ', e);
+				console.error('Error [userDeleteMenu] ', e);
+				notificationController.show({
+					type: NotificationType.Error,
+					message: 'Error deleting album, check console for more details'
+				});
 			}
 		}
 	};
@@ -262,7 +290,11 @@
 				albumThumbnailAssetId: asset.id
 			});
 		} catch (e) {
-			console.log('Error [setAlbumThumbnailHandler] ', e);
+			console.error('Error [setAlbumThumbnailHandler] ', e);
+			notificationController.show({
+				type: NotificationType.Error,
+				message: 'Error setting album thumbnail, check console for more details'
+			});
 		}
 
 		isShowThumbnailSelection = false;

web/src/lib/components/album-page/share-info-modal.svelte

@@ -7,6 +7,10 @@
 	import CircleIconButton from '../shared-components/circle-icon-button.svelte';
 	import ContextMenu from '../shared-components/context-menu/context-menu.svelte';
 	import MenuOption from '../shared-components/context-menu/menu-option.svelte';
+	import {
+		notificationController,
+		NotificationType
+	} from '../shared-components/notification/notification';
 
 	export let album: AlbumResponseDto;
 
@@ -24,6 +28,10 @@
 			currentUser = data;
 		} catch (e) {
 			console.error('Error [share-info-modal] [getAllUsers]', e);
+			notificationController.show({
+				message: 'Error getting user info, check console for more details',
+				type: NotificationType.Error
+			});
 		}
 	});
 
@@ -48,6 +56,10 @@
 				dispatch('user-deleted', { userId });
 			} catch (e) {
 				console.error('Error [share-info-modal] [removeUser]', e);
+				notificationController.show({
+					message: 'Error removing user, check console for more details',
+					type: NotificationType.Error
+				});
 			}
 		}
 	};

web/src/lib/components/asset-viewer/asset-viewer.svelte

@@ -1,207 +1,215 @@
 <script lang="ts">
-  import { createEventDispatcher, onMount } from 'svelte';
-  import { fly } from 'svelte/transition';
-  import AsserViewerNavBar from './asser-viewer-nav-bar.svelte';
-  import ChevronRight from 'svelte-material-icons/ChevronRight.svelte';
-  import ChevronLeft from 'svelte-material-icons/ChevronLeft.svelte';
-  import PhotoViewer from './photo-viewer.svelte';
-  import DetailPanel from './detail-panel.svelte';
-  import { downloadAssets } from '$lib/stores/download';
-  import VideoViewer from './video-viewer.svelte';
-  import { api, AssetResponseDto, AssetTypeEnum } from '@api';
-  import { browser } from '$app/env';
+	import { createEventDispatcher, onMount, onDestroy } from 'svelte';
+	import { fly } from 'svelte/transition';
+	import AsserViewerNavBar from './asser-viewer-nav-bar.svelte';
+	import ChevronRight from 'svelte-material-icons/ChevronRight.svelte';
+	import ChevronLeft from 'svelte-material-icons/ChevronLeft.svelte';
+	import PhotoViewer from './photo-viewer.svelte';
+	import DetailPanel from './detail-panel.svelte';
+	import { downloadAssets } from '$lib/stores/download';
+	import VideoViewer from './video-viewer.svelte';
+	import { api, AssetResponseDto, AssetTypeEnum } from '@api';
+	import {
+		notificationController,
+		NotificationType
+	} from '../shared-components/notification/notification';
 
-  const dispatch = createEventDispatcher();
+	export let asset: AssetResponseDto;
 
-  export let asset: AssetResponseDto;
+	const dispatch = createEventDispatcher();
+	let halfLeftHover = false;
+	let halfRightHover = false;
+	let isShowDetail = false;
 
-  let halfLeftHover = false;
-  let halfRightHover = false;
-  let isShowDetail = false;
+	onMount(() => {
+		document.addEventListener('keydown', (keyInfo) => handleKeyboardPress(keyInfo.key));
+	});
 
-  onMount(() => {
-    if (browser) {
-      document.addEventListener('keydown', (keyInfo) => handleKeyboardPress(keyInfo.key));
-    }
-  });
+	onDestroy(() => {
+		document.removeEventListener('keydown', (e) => {});
+	});
 
-  const handleKeyboardPress = (key: string) => {
-    switch (key) {
-      case 'Escape':
-        closeViewer();
-        return;
-      case 'i':
-        isShowDetail = !isShowDetail;
-        return;
-      case 'ArrowLeft':
-        navigateAssetBackward();
-        return;
-      case 'ArrowRight':
-        navigateAssetForward();
-        return;
-    }
-  };
+	const handleKeyboardPress = (key: string) => {
+		switch (key) {
+			case 'Escape':
+				closeViewer();
+				return;
+			case 'i':
+				isShowDetail = !isShowDetail;
+				return;
+			case 'ArrowLeft':
+				navigateAssetBackward();
+				return;
+			case 'ArrowRight':
+				navigateAssetForward();
+				return;
+		}
+	};
 
-  const closeViewer = () => {
-    dispatch('close');
-  };
+	const closeViewer = () => {
+		dispatch('close');
+	};
 
-  const navigateAssetForward = (e?: Event) => {
-    e?.stopPropagation();
-    dispatch('navigate-forward');
-  };
+	const navigateAssetForward = (e?: Event) => {
+		e?.stopPropagation();
+		dispatch('navigate-forward');
+	};
 
-  const navigateAssetBackward = (e?: Event) => {
-    e?.stopPropagation();
-    dispatch('navigate-backward');
-  };
+	const navigateAssetBackward = (e?: Event) => {
+		e?.stopPropagation();
+		dispatch('navigate-backward');
+	};
 
-  const showDetailInfoHandler = () => {
-    isShowDetail = !isShowDetail;
-  };
+	const showDetailInfoHandler = () => {
+		isShowDetail = !isShowDetail;
+	};
 
-  const downloadFile = async () => {
-    try {
-      console.log(asset.exifInfo);
-      const imageName = asset.exifInfo?.imageName ? asset.exifInfo?.imageName : asset.id;
-      const imageExtension = asset.originalPath.split('.')[1];
-      const imageFileName = imageName + '.' + imageExtension;
+	const downloadFile = async () => {
+		try {
+			console.log(asset.exifInfo);
+			const imageName = asset.exifInfo?.imageName ? asset.exifInfo?.imageName : asset.id;
+			const imageExtension = asset.originalPath.split('.')[1];
+			const imageFileName = imageName + '.' + imageExtension;
 
-      // If assets is already download -> return;
-      if ($downloadAssets[imageFileName]) {
-        return;
-      }
+			// If assets is already download -> return;
+			if ($downloadAssets[imageFileName]) {
+				return;
+			}
 
-      $downloadAssets[imageFileName] = 0;
+			$downloadAssets[imageFileName] = 0;
 
-      const {data, status} = await api.assetApi.downloadFile(
-        asset.deviceAssetId,
-        asset.deviceId,
-        false,
-        false,
-        {
-          responseType: 'blob',
-          onDownloadProgress: (progressEvent) => {
-            if (progressEvent.lengthComputable) {
-              const total = progressEvent.total;
-              const current = progressEvent.loaded;
-              $downloadAssets[imageFileName] = Math.floor((current / total) * 100);
-            }
-          }
-        }
-      );
+			const { data, status } = await api.assetApi.downloadFile(
+				asset.deviceAssetId,
+				asset.deviceId,
+				false,
+				false,
+				{
+					responseType: 'blob',
+					onDownloadProgress: (progressEvent) => {
+						if (progressEvent.lengthComputable) {
+							const total = progressEvent.total;
+							const current = progressEvent.loaded;
+							$downloadAssets[imageFileName] = Math.floor((current / total) * 100);
+						}
+					}
+				}
+			);
 
-      if (!(data instanceof Blob)) {
-        return;
-      }
+			if (!(data instanceof Blob)) {
+				return;
+			}
 
-      if (status === 200) {
-        const fileUrl = URL.createObjectURL(data);
-        const anchor = document.createElement('a');
-        anchor.href = fileUrl;
-        anchor.download = imageFileName;
+			if (status === 200) {
+				const fileUrl = URL.createObjectURL(data);
+				const anchor = document.createElement('a');
+				anchor.href = fileUrl;
+				anchor.download = imageFileName;
 
-        document.body.appendChild(anchor);
-        anchor.click();
-        document.body.removeChild(anchor);
+				document.body.appendChild(anchor);
+				anchor.click();
+				document.body.removeChild(anchor);
 
-        URL.revokeObjectURL(fileUrl);
+				URL.revokeObjectURL(fileUrl);
 
-        // Remove item from download list
-        setTimeout(() => {
-          const copy = $downloadAssets;
-          delete copy[imageFileName];
-          $downloadAssets = copy;
-        }, 2000);
-      }
-    } catch (e) {
-      console.log('Error downloading file ', e);
-    }
-  };
+				// Remove item from download list
+				setTimeout(() => {
+					const copy = $downloadAssets;
+					delete copy[imageFileName];
+					$downloadAssets = copy;
+				}, 2000);
+			}
+		} catch (e) {
+			console.error('Error downloading file ', e);
+			notificationController.show({
+				type: NotificationType.Error,
+				message: 'Error downloading file, check console for more details.'
+			});
+		}
+	};
 </script>
 
 <section
-        id="immich-asset-viewer"
-        class="fixed h-screen w-screen top-0 overflow-y-hidden bg-black z-[999] grid grid-rows-[64px_1fr] grid-cols-4  "
+	id="immich-asset-viewer"
+	class="fixed h-screen w-screen top-0 overflow-y-hidden bg-black z-[999] grid grid-rows-[64px_1fr] grid-cols-4  "
 >
-    <div class="col-start-1 col-span-4 row-start-1 row-span-1 z-[1000] transition-transform">
-        <AsserViewerNavBar
-                on:goBack={closeViewer}
-                on:showDetail={showDetailInfoHandler}
-                on:download={downloadFile}
-        />
-    </div>
+	<div class="col-start-1 col-span-4 row-start-1 row-span-1 z-[1000] transition-transform">
+		<AsserViewerNavBar
+			on:goBack={closeViewer}
+			on:showDetail={showDetailInfoHandler}
+			on:download={downloadFile}
+		/>
+	</div>
 
-    <div
-            class={`row-start-2 row-span-end col-start-1 col-span-2 flex place-items-center hover:cursor-pointer w-3/4 ${
+	<div
+		class={`row-start-2 row-span-end col-start-1 col-span-2 flex place-items-center hover:cursor-pointer w-3/4 ${
 			asset.type === AssetTypeEnum.Video ? '' : 'z-[999]'
 		}`}
-            on:mouseenter={() => {
+		on:mouseenter={() => {
 			halfLeftHover = true;
 			halfRightHover = false;
 		}}
-            on:mouseleave={() => {
+		on:mouseleave={() => {
 			halfLeftHover = false;
 		}}
-            on:click={navigateAssetBackward}
-    >
-        <button
-                class="rounded-full p-3 hover:bg-gray-500 hover:text-gray-700 z-[1000]  text-gray-500 mx-4"
-                class:navigation-button-hover={halfLeftHover}
-                on:click={navigateAssetBackward}
-        >
-            <ChevronLeft size="36"/>
-        </button>
-    </div>
+		on:click={navigateAssetBackward}
+	>
+		<button
+			class="rounded-full p-3 hover:bg-gray-500 hover:text-gray-700 z-[1000]  text-gray-500 mx-4"
+			class:navigation-button-hover={halfLeftHover}
+			on:click={navigateAssetBackward}
+		>
+			<ChevronLeft size="36" />
+		</button>
+	</div>
 
-    <div class="row-start-1 row-span-full col-start-1 col-span-4">
-        {#key asset.id}
-            {#if asset.type === AssetTypeEnum.Image}
-                <PhotoViewer assetId={asset.id} deviceId={asset.deviceId} on:close={closeViewer}/>
-            {:else}
-                <VideoViewer assetId={asset.id} on:close={closeViewer}/>
-            {/if}
-        {/key}
-    </div>
+	<div class="row-start-1 row-span-full col-start-1 col-span-4">
+		{#key asset.id}
+			{#if asset.type === AssetTypeEnum.Image}
+				<PhotoViewer assetId={asset.id} deviceId={asset.deviceId} on:close={closeViewer} />
+			{:else}
+				<VideoViewer assetId={asset.id} on:close={closeViewer} />
+			{/if}
+		{/key}
+	</div>
 
-    <div
-            class={`row-start-2 row-span-full col-start-3 col-span-2 flex justify-end place-items-center hover:cursor-pointer w-3/4 justify-self-end ${
+	<div
+		class={`row-start-2 row-span-full col-start-3 col-span-2 flex justify-end place-items-center hover:cursor-pointer w-3/4 justify-self-end ${
 			asset.type === AssetTypeEnum.Video ? '' : 'z-[500]'
 		}`}
-            on:click={navigateAssetForward}
-            on:mouseenter={() => {
+		on:click={navigateAssetForward}
+		on:mouseenter={() => {
 			halfLeftHover = false;
 			halfRightHover = true;
 		}}
-            on:mouseleave={() => {
+		on:mouseleave={() => {
 			halfRightHover = false;
 		}}
-    >
-        <button
-                class="rounded-full p-3 hover:bg-gray-500 hover:text-gray-700 text-gray-500 mx-4 z-[1000]"
-                class:navigation-button-hover={halfRightHover}
-                on:click={navigateAssetForward}
-        >
-            <ChevronRight size="36"/>
-        </button>
-    </div>
+	>
+		<button
+			class="rounded-full p-3 hover:bg-gray-500 hover:text-gray-700 text-gray-500 mx-4 z-[1000]"
+			class:navigation-button-hover={halfRightHover}
+			on:click={navigateAssetForward}
+		>
+			<ChevronRight size="36" />
+		</button>
+	</div>
 
-    {#if isShowDetail}
-        <div
-                transition:fly={{ duration: 150 }}
-                id="detail-panel"
-                class="bg-immich-bg w-[360px] row-span-full transition-all "
-                translate="yes"
-        >
-            <DetailPanel {asset} on:close={() => (isShowDetail = false)}/>
-        </div>
-    {/if}
+	{#if isShowDetail}
+		<div
+			transition:fly={{ duration: 150 }}
+			id="detail-panel"
+			class="bg-immich-bg w-[360px] row-span-full transition-all "
+			translate="yes"
+		>
+			<DetailPanel {asset} on:close={() => (isShowDetail = false)} />
+		</div>
+	{/if}
 </section>
 
 <style>
-    .navigation-button-hover {
-        background-color: rgb(107 114 128 / var(--tw-bg-opacity));
-        color: rgb(55 65 81 / var(--tw-text-opacity));
-        transition: all 150ms;
-    }
+	.navigation-button-hover {
+		background-color: rgb(107 114 128 / var(--tw-bg-opacity));
+		color: rgb(55 65 81 / var(--tw-text-opacity));
+		transition: all 150ms;
+	}
 </style>

web/src/lib/components/asset-viewer/photo-viewer.svelte

@@ -1,7 +1,7 @@
 <script lang="ts">
 	import { fade } from 'svelte/transition';
 
-	import { createEventDispatcher, onMount } from 'svelte';
+	import { onMount } from 'svelte';
 	import LoadingSpinner from '../shared-components/loading-spinner.svelte';
 	import { api, AssetResponseDto } from '@api';
 
@@ -10,8 +10,6 @@
 
 	let assetInfo: AssetResponseDto;
 
-	const dispatch = createEventDispatcher();
-
 	onMount(async () => {
 		const { data } = await api.assetApi.getAssetById(assetId);
 		assetInfo = data;

web/src/lib/components/asset-viewer/video-viewer.svelte

@@ -3,7 +3,7 @@
 
 	import { createEventDispatcher, onMount } from 'svelte';
 	import LoadingSpinner from '../shared-components/loading-spinner.svelte';
-	import { api, AssetResponseDto } from '@api';
+	import { api, AssetResponseDto, getFileUrl } from '@api';
 
 	export let assetId: string;
 
@@ -13,48 +13,32 @@
 
 	let videoPlayerNode: HTMLVideoElement;
 	let isVideoLoading = true;
+	let videoUrl: string;
 
 	onMount(async () => {
 		const { data: assetInfo } = await api.assetApi.getAssetById(assetId);
 
-		asset = assetInfo;
+		await loadVideoData(assetInfo);
 
-		await loadVideoData();
+		asset = assetInfo;
 	});
 
-	const loadVideoData = async () => {
+	const loadVideoData = async (assetInfo: AssetResponseDto) => {
 		isVideoLoading = true;
 
-		try {
-			const { data } = await api.assetApi.serveFile(
-				asset.deviceAssetId,
-				asset.deviceId,
-				false,
-				true,
-				{
-					responseType: 'blob'
-				}
-			);
+		videoUrl = getFileUrl(assetInfo.deviceAssetId, assetInfo.deviceId, false, true);
 
-			if (!(data instanceof Blob)) {
-				return;
-			}
+		return assetInfo;
+	};
 
-			const videoData = URL.createObjectURL(data);
-			videoPlayerNode.src = videoData;
+	const handleCanPlay = (ev: Event) => {
+		const playerNode = ev.target as HTMLVideoElement;
 
-			videoPlayerNode.load();
+		playerNode.muted = true;
+		playerNode.play();
+		playerNode.muted = false;
 
-			videoPlayerNode.oncanplay = () => {
-				videoPlayerNode.muted = true;
-				videoPlayerNode.play();
-				videoPlayerNode.muted = false;
-
-				isVideoLoading = false;
-			};
-
-			return videoData;
-		} catch (e) {}
+		isVideoLoading = false;
 	};
 </script>
 
@@ -63,7 +47,13 @@
 	class="flex place-items-center place-content-center h-full select-none"
 >
 	{#if asset}
-		<video controls class="h-full object-contain" bind:this={videoPlayerNode}>
+		<video
+			controls
+			class="h-full object-contain"
+			on:canplay={handleCanPlay}
+			bind:this={videoPlayerNode}
+		>
+			<source src={videoUrl} type="video/mp4" />
 			<track kind="captions" />
 		</video>