Up version for release

chore(mobile) Improve mobile UI (#1038 )
feat(server,web): activate ETags for all API endpoints and asset serving (#1031 )
2022-11-30 11:18:06 -06:00 · 2022-11-30 10:58:07 -06:00 · 2022-11-29 15:45:47 -06:00 · 2022-11-28 14:14:22 -06:00 · 2022-11-28 10:17:27 -06:00 · 2022-11-28 10:01:09 -06:00
105 changed files with 1564 additions and 730 deletions
--- a/docs/blog/2019-05-28-first-blog-post.md
+++ b/docs/blog/2019-05-28-first-blog-post.md
@@ -1,12 +0,0 @@
---
-slug: first-blog-post
-title: First Blog Post
-authors:
-  name: Gao Wei
-  title: Docusaurus Core Team
-  url: https://github.com/wgao19
-  image_url: https://github.com/wgao19.png
-tags: [hola, docusaurus]
---
-
-Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque elementum dignissim ultricies. Fusce rhoncus ipsum tempor eros aliquam consequat. Lorem ipsum dolor sit amet
--- a/docs/blog/2019-05-29-long-blog-post.md
+++ b/docs/blog/2019-05-29-long-blog-post.md
@@ -1,44 +0,0 @@
---
-slug: long-blog-post
-title: Long Blog Post
-authors: endi
-tags: [hello, docusaurus]
---
-
-This is the summary of a very long blog post,
-
-Use a `<!--` `truncate` `-->` comment to limit blog post size in the list view.
-
-<!--truncate-->
-
-Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque elementum dignissim ultricies. Fusce rhoncus ipsum tempor eros aliquam consequat. Lorem ipsum dolor sit amet
-
-Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque elementum dignissim ultricies. Fusce rhoncus ipsum tempor eros aliquam consequat. Lorem ipsum dolor sit amet
-
-Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque elementum dignissim ultricies. Fusce rhoncus ipsum tempor eros aliquam consequat. Lorem ipsum dolor sit amet
-
-Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque elementum dignissim ultricies. Fusce rhoncus ipsum tempor eros aliquam consequat. Lorem ipsum dolor sit amet
-
-Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque elementum dignissim ultricies. Fusce rhoncus ipsum tempor eros aliquam consequat. Lorem ipsum dolor sit amet
-
-Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque elementum dignissim ultricies. Fusce rhoncus ipsum tempor eros aliquam consequat. Lorem ipsum dolor sit amet
-
-Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque elementum dignissim ultricies. Fusce rhoncus ipsum tempor eros aliquam consequat. Lorem ipsum dolor sit amet
-
-Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque elementum dignissim ultricies. Fusce rhoncus ipsum tempor eros aliquam consequat. Lorem ipsum dolor sit amet
-
-Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque elementum dignissim ultricies. Fusce rhoncus ipsum tempor eros aliquam consequat. Lorem ipsum dolor sit amet
-
-Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque elementum dignissim ultricies. Fusce rhoncus ipsum tempor eros aliquam consequat. Lorem ipsum dolor sit amet
-
-Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque elementum dignissim ultricies. Fusce rhoncus ipsum tempor eros aliquam consequat. Lorem ipsum dolor sit amet
-
-Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque elementum dignissim ultricies. Fusce rhoncus ipsum tempor eros aliquam consequat. Lorem ipsum dolor sit amet
-
-Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque elementum dignissim ultricies. Fusce rhoncus ipsum tempor eros aliquam consequat. Lorem ipsum dolor sit amet
-
-Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque elementum dignissim ultricies. Fusce rhoncus ipsum tempor eros aliquam consequat. Lorem ipsum dolor sit amet
-
-Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque elementum dignissim ultricies. Fusce rhoncus ipsum tempor eros aliquam consequat. Lorem ipsum dolor sit amet
-
-Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque elementum dignissim ultricies. Fusce rhoncus ipsum tempor eros aliquam consequat. Lorem ipsum dolor sit amet
--- a/docs/blog/2021-08-01-mdx-blog-post.mdx
+++ b/docs/blog/2021-08-01-mdx-blog-post.mdx
@@ -1,20 +0,0 @@
---
-slug: mdx-blog-post
-title: MDX Blog Post
-authors: [slorber]
-tags: [docusaurus]
---
-
-Blog posts support [Docusaurus Markdown features](https://docusaurus.io/docs/markdown-features), such as [MDX](https://mdxjs.com/).
-
-:::tip
-
-Use the power of React to create interactive blog posts.
-
-```js
-<button onClick={() => alert('button clicked!')}>Click me!</button>
-```
-
-<button onClick={() => alert('button clicked!')}>Click me!</button>
-
-:::
--- a/docs/blog/2021-08-26-welcome/docusaurus-plushie-banner.jpeg
+++ b/docs/blog/2021-08-26-welcome/docusaurus-plushie-banner.jpeg
--- a/docs/blog/2021-08-26-welcome/index.md
+++ b/docs/blog/2021-08-26-welcome/index.md
@@ -1,25 +0,0 @@
---
-slug: welcome
-title: Welcome
-authors: [slorber, yangshun]
-tags: [facebook, hello, docusaurus]
---
-
-[Docusaurus blogging features](https://docusaurus.io/docs/blog) are powered by the [blog plugin](https://docusaurus.io/docs/api/plugins/@docusaurus/plugin-content-blog).
-
-Simply add Markdown files (or folders) to the `blog` directory.
-
-Regular blog authors can be added to `authors.yml`.
-
-The blog post date can be extracted from filenames, such as:
-
- `2019-05-30-welcome.md`
- `2019-05-30-welcome/index.md`
-
-A blog post folder can be convenient to co-locate blog post images:
-
-![Docusaurus Plushie](./docusaurus-plushie-banner.jpeg)
-
-The blog supports tags as well!
-
-**And if you don't want a blog**: just delete this directory, and use `blog: false` in your Docusaurus config.
--- a/docs/blog/authors.yml
+++ b/docs/blog/authors.yml
@@ -1,17 +1,5 @@
-endi:
-  name: Endilie Yacop Sucipto
-  title: Maintainer of Docusaurus
-  url: https://github.com/endiliey
-  image_url: https://github.com/endiliey.png
-
-yangshun:
-  name: Yangshun Tay
-  title: Front End Engineer @ Facebook
-  url: https://github.com/yangshun
-  image_url: https://github.com/yangshun.png
-
-slorber:
-  name: Sébastien Lorber
-  title: Docusaurus maintainer
-  url: https://sebastienlorber.com
-  image_url: https://github.com/slorber.png
+alextran:
+  name: Alex Tran
+  title: Maintainer of Immich
+  url: https://github.com/alextran1502
+  image_url: https://github.com/alextran1502.png
--- a/docs/blog/release-1.36/index.mdx
+++ b/docs/blog/release-1.36/index.mdx
@@ -0,0 +1,114 @@
+---
+slug: release-1-36
+title: Release v1.36.0
+authors: [alextran]
+tags: [release]
+date: 2022-11-10
+---
+
+Hello everyone, it is my pleasure to deliver the new release of Immich to you. The team has been working hard to bring you the new features and improvements. This release includes some big features that the community has been asking since the beginning of Immich. We hope you will enjoy it.
+
+Some notable features are:
+
+- [OAuth integration](#livephoto-ios-support-)
+- [LivePhoto support on iOS](#oauth-integration-)
+- User config system
+
+<!--truncate-->
+
+## LivePhoto iOS Support 🎉
+
+LivePhoto on iOS is now supported in Immich.
+
+The motion part will now be uploaded and can be played on the mobile app and the web.
+
+:::caution
+
+- The server and the app has to be on version **1.36.x** for the application to work correctly.
+- Previous uploaded photos will not be updated automatically, you will have to remove and reupload them if you want to keep the LivePhoto functionality.
+
+:::
+
+<img
+  src="https://media.giphy.com/media/fTrGceZd7t1ewi8ESc/giphy.gif"
+  width="100%"
+  style={{
+    borderRadius: "10px",
+    boxShadow:
+      "rgba(9, 30, 66, 0.25) 0px 1px 1px, rgba(9, 30, 66, 0.13) 0px 0px 1px 1px",
+  }}
+  title="LivePhoto playback on the web"
+/>
+
+## OAuth Integration 🎉
+
+I want to borrow this chance to express my gratitude to [@EnricoBilla](https://github.com/EnricoBilla), who has been the trailblazer for this feature since the beginning days of Immich. His PR has sparked ideas, suggestions, and discussion among the team member on how to integrate this feature successfully into the app. Thank you so much for your work and your time.
+
+OAuth is now integrated into the system. Please follow the guide [here](https://immich.app/docs/usage/oauth) to set up your OAuth integration
+
+After setting up the correct environment variables in the `.env` file, as shown below
+
+| Key                 | Type    | Default              | Description                                                               |
+| ------------------- | ------- | -------------------- | ------------------------------------------------------------------------- |
+| OAUTH_ENABLED       | boolean | false                | Enable/disable OAuth2                                                     |
+| OAUTH_ISSUER_URL    | URL     | (required)           | Required. Self-discovery URL for client                                   |
+| OAUTH_CLIENT_ID     | string  | (required)           | Required. Client ID                                                       |
+| OAUTH_CLIENT_SECRET | string  | (required)           | Required. Client Secret                                                   |
+| OAUTH_SCOPE         | string  | openid email profile | Full list of scopes to send with the request (space delimited)            |
+| OAUTH_AUTO_REGISTER | boolean | true                 | When true, will automatically register a user the first time they sign in |
+| OAUTH_BUTTON_TEXT   | string  | Login with OAuth     | Text for the OAuth button on the web                                      |
+
+```bash title="Authentik Example"
+OAUTH_ENABLED=true
+OAUTH_ISSUER_URL=http://10.1.15.216:9000/application/o/immich-test/
+OAUTH_CLIENT_ID=30596v8f78a4b6a97d5985c3076b6b4c4d12ddc33
+OAUTH_CLIENT_SECRET=50f1eafdec353b95b1c638db390db4ab67ef035a51212dbec2f56175e2eb272b5d572c099176e6fe116ecf47ffdd544bgdb9e2edc588307ee0339d25eeccd88
+OAUTH_BUTTON_TEXT=Login with Authentik
+```
+
+The web will have the option to sign in with OAuth.
+
+<img
+  src="https://user-images.githubusercontent.com/27055614/202923726-f43fa148-47f5-4182-8f29-b0b87e4586fa.png"
+  width="50%"
+  title="Web Sign in with OAuth"
+  style={{
+    borderRadius: "10px",
+    boxShadow:
+      "rgba(9, 30, 66, 0.25) 0px 1px 1px, rgba(9, 30, 66, 0.13) 0px 0px 1px 1px",
+  }}
+/>
+
+The mobile app will check if the server has OAuth enabled before displaying the OAuth
+sign-in button.
+
+<img
+  src="https://media.giphy.com/media/3iy3SaNkVYtlkEiw06/giphy.gif"
+  title="Mobile sign in with OAuth"
+  style={{
+    borderRadius: "10px",
+    boxShadow:
+      "rgba(9, 30, 66, 0.25) 0px 1px 1px, rgba(9, 30, 66, 0.13) 0px 0px 1px 1px",
+  }}
+/>
+
+## Support
+
+<img
+  src="https://media.giphy.com/media/LStqgGESXW8XnuCv5y/giphy.gif"
+  width="300"
+  style={{
+    borderRadius: "10px",
+    boxShadow:
+      "rgba(9, 30, 66, 0.25) 0px 1px 1px, rgba(9, 30, 66, 0.13) 0px 0px 1px 1px",
+  }}
+  title="Support the project"
+/>
+
+If you find the project helpful and it helps you in some ways, you can support the project [one time](https://github.com/sponsors/alextran1502?frequency=one-time&sponsor=alextran1502) or [monthly](https://github.com/sponsors/alextran1502) from GitHub Sponsor
+
+It is a great way to let me know that you want me to continue developing and working on this project for years to come.
+
+## Details
+
+For more details, please check out the [release note](https://github.com/immich-app/immich/releases/tag/v1.36.0_55-dev)
--- a/docs/docs/usage/oauth.md
+++ b/docs/docs/usage/oauth.md
@@ -49,7 +49,7 @@ Once you have a new OAuth client application configured, Immich can be configure
 | OAUTH_ENABLED       | boolean | false                | Enable/disable OAuth2                                                     |
 | OAUTH_ISSUER_URL    | URL     | (required)           | Required. Self-discovery URL for client (from previous step)              |
 | OAUTH_CLIENT_ID     | string  | (required)           | Required. Client ID (from previous step)                                  |
-| OAUTH_CLIENT_SECRET | string  | (required)           | Required. Client Secret (previous step                                    |
+| OAUTH_CLIENT_SECRET | string  | (required)           | Required. Client Secret (previous step)                                    |
 | OAUTH_SCOPE         | string  | openid email profile | Full list of scopes to send with the request (space delimited)            |
 | OAUTH_AUTO_REGISTER | boolean | true                 | When true, will automatically register a user the first time they sign in |
 | OAUTH_BUTTON_TEXT   | string  | Login with OAuth     | Text for the OAuth button on the web                                      |
--- a/docs/docusaurus.config.js
+++ b/docs/docusaurus.config.js
@@ -80,7 +80,7 @@ const config = {
            position: "right",
            label: "Documentation",
          },
-          // { to: "/blog", label: "Blog", position: "right" },
+          { to: "/blog", label: "Blog", position: "right" },
          {
            href: "https://github.com/immich-app/immich",
            label: "GitHub",
--- a/mobile/android/app/build.gradle
+++ b/mobile/android/app/build.gradle
@@ -52,7 +52,7 @@ android {
        // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
        applicationId "app.alextran.immich"
        minSdkVersion 23
-        targetSdkVersion flutter.targetSdkVersion
+        targetSdkVersion 33
        versionCode flutterVersionCode.toInteger()
        versionName flutterVersionName
    }
--- a/mobile/android/app/src/main/AndroidManifest.xml
+++ b/mobile/android/app/src/main/AndroidManifest.xml
@@ -38,6 +38,9 @@
  <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
  <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
  <uses-permission android:name="android.permission.ACCESS_MEDIA_LOCATION" />
+  <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" /> <!-- If you want to read images-->
+  <uses-permission android:name="android.permission.READ_MEDIA_VIDEO" /> <!-- If you want to read videos-->
+  <uses-permission android:name="android.permission.READ_MEDIA_AUDIO" /> <!-- If you want to read audio-->

  <queries>
    <intent>
--- a/mobile/android/fastlane/Fastfile
+++ b/mobile/android/fastlane/Fastfile
@@ -35,8 +35,8 @@ platform :android do
      task: 'bundle', 
      build_type: 'Release',
      properties: {
-        "android.injected.version.code" => 55,
-        "android.injected.version.name" => "1.36.0",
+        "android.injected.version.code" => 58,
+        "android.injected.version.name" => "1.37.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')
--- a/mobile/android/fastlane/metadata/android/en-US/changelogs/56.txt
+++ b/mobile/android/fastlane/metadata/android/en-US/changelogs/56.txt
@@ -0,0 +1,2 @@
+* Fixed freezed splash screen
+* Fixed OIDC redirect but not logging in
--- a/mobile/android/fastlane/metadata/android/en-US/changelogs/57.txt
+++ b/mobile/android/fastlane/metadata/android/en-US/changelogs/57.txt
@@ -0,0 +1,2 @@
+* Show human readable file size in detail view
+* Fix permission issue on Android 33
--- a/mobile/android/fastlane/metadata/android/en-US/changelogs/58.txt
+++ b/mobile/android/fastlane/metadata/android/en-US/changelogs/58.txt
@@ -0,0 +1,6 @@
+* Use binary prefixes for data sizes
+* Fix not able to show device asset on Android 13
+* Use cached asset info if unchanged instead of downloading all assets
+* Add in-app logging
+* Add search mechanism to album selection page
+* Improve UI
--- a/mobile/android/fastlane/report.xml
+++ b/mobile/android/fastlane/report.xml
@@ -5,17 +5,17 @@
    
    
      
-      <testcase classname="fastlane.lanes" name="0: default_platform" time="0.000315">
+      <testcase classname="fastlane.lanes" name="0: default_platform" time="0.000345">
        
      </testcase>
    
      
-      <testcase classname="fastlane.lanes" name="1: bundleRelease" time="185.624188">
+      <testcase classname="fastlane.lanes" name="1: bundleRelease" time="123.14891">
        
      </testcase>
    
      
-      <testcase classname="fastlane.lanes" name="2: upload_to_play_store" time="39.180655">
+      <testcase classname="fastlane.lanes" name="2: upload_to_play_store" time="39.270764">
        
      </testcase>
    
--- a/mobile/assets/i18n/en-US.json
+++ b/mobile/assets/i18n/en-US.json
@@ -17,7 +17,7 @@
  "backup_album_selection_page_albums_device": "Albums on device ({})",
  "backup_album_selection_page_albums_tap": "Tap to include, double tap to exclude",
  "backup_album_selection_page_assets_scatter": "Assets can scatter across multiple albums. Thus, albums can be included or excluded during the backup process.",
-  "backup_album_selection_page_select_albums": "Select Albums",
+  "backup_album_selection_page_select_albums": "Select albums",
  "backup_album_selection_page_selection_info": "Selection Info",
  "backup_album_selection_page_total_assets": "Total unique assets",
  "backup_all": "All",
@@ -120,6 +120,7 @@
  "profile_drawer_client_server_up_to_date": "Client and Server are up-to-date",
  "profile_drawer_settings": "Settings",
  "profile_drawer_sign_out": "Sign Out",
+  "profile_drawer_app_logs": "Logs",
  "search_bar_hint": "Search your photos",
  "search_page_no_objects": "No Objects Info Available",
  "search_page_no_places": "No Places Info Available",
--- a/mobile/fonts/Inconsolata-Regular.ttf
+++ b/mobile/fonts/Inconsolata-Regular.ttf
--- a/mobile/ios/Runner.xcodeproj/project.pbxproj
+++ b/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 = 71;
+				CURRENT_PROJECT_VERSION = 72;
 				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 = 71;
+				CURRENT_PROJECT_VERSION = 72;
 				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 = 71;
+				CURRENT_PROJECT_VERSION = 72;
 				DEVELOPMENT_TEAM = 2F67MQ8R79;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
--- a/mobile/ios/Runner/Info.plist
+++ b/mobile/ios/Runner/Info.plist
@@ -17,11 +17,11 @@
    <key>CFBundlePackageType</key>
    <string>APPL</string>
    <key>CFBundleShortVersionString</key>
-    <string>1.36.0</string>
+    <string>1.36.1</string>
    <key>CFBundleSignature</key>
    <string>????</string>
    <key>CFBundleVersion</key>
-    <string>71</string>
+    <string>72</string>
    <key>LSRequiresIPhoneOS</key>
    <true />
    <key>MGLMapboxMetricsEnabledSettingShownInApp</key>
--- a/mobile/ios/ci_scripts/ci_post_clone.sh
+++ b/mobile/ios/ci_scripts/ci_post_clone.sh
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+# The default execution directory of this script is the ci_scripts directory.
+cd $CI_WORKSPACE/mobile
+
+# Install Flutter using git.
+git clone https://github.com/flutter/flutter.git --depth 1 -b stable $HOME/flutter
+export PATH="$PATH:$HOME/flutter/bin"
+
+# Install Flutter artifacts for iOS (--ios), or macOS (--macos) platforms.
+flutter precache --ios
+
+# Install Flutter dependencies.
+flutter pub get
+
+# Install CocoaPods using Homebrew.
+HOMEBREW_NO_AUTO_UPDATE=1 # disable homebrew's automatic updates.
+brew install cocoapods
+
+# Install CocoaPods dependencies.
+cd ios && pod install # run `pod install` in the `ios` directory.
+
+exit 0
--- a/mobile/ios/fastlane/Fastfile
+++ b/mobile/ios/fastlane/Fastfile
@@ -19,7 +19,7 @@ platform :ios do
  desc "iOS Beta"
  lane :beta do
    increment_version_number(
-      version_number: "1.36.0"
+      version_number: "1.37.0"
    )
    increment_build_number(
      build_number: latest_testflight_build_number + 1,
--- a/mobile/ios/fastlane/report.xml
+++ b/mobile/ios/fastlane/report.xml
@@ -5,32 +5,32 @@
    
    
      
-      <testcase classname="fastlane.lanes" name="0: default_platform" time="0.000333">
+      <testcase classname="fastlane.lanes" name="0: default_platform" time="0.000358">
        
      </testcase>
    
      
-      <testcase classname="fastlane.lanes" name="1: increment_version_number" time="0.777934">
+      <testcase classname="fastlane.lanes" name="1: increment_version_number" time="0.721922">
        
      </testcase>
    
      
-      <testcase classname="fastlane.lanes" name="2: latest_testflight_build_number" time="6.375897">
+      <testcase classname="fastlane.lanes" name="2: latest_testflight_build_number" time="6.015111">
        
      </testcase>
    
      
-      <testcase classname="fastlane.lanes" name="3: increment_build_number" time="0.664307">
+      <testcase classname="fastlane.lanes" name="3: increment_build_number" time="0.656945">
        
      </testcase>
    
      
-      <testcase classname="fastlane.lanes" name="4: build_app" time="88.90147">
+      <testcase classname="fastlane.lanes" name="4: build_app" time="75.686541">
        
      </testcase>
    
      
-      <testcase classname="fastlane.lanes" name="5: upload_to_testflight" time="79.807067">
+      <testcase classname="fastlane.lanes" name="5: upload_to_testflight" time="68.644406">
        
      </testcase>
    
--- a/mobile/lib/constants/hive_box.dart
+++ b/mobile/lib/constants/hive_box.dart
@@ -4,6 +4,7 @@ const String accessTokenKey = "immichBoxAccessTokenKey"; // Key 1
 const String deviceIdKey = 'immichBoxDeviceIdKey'; // Key 2
 const String isLoggedInKey = 'immichIsLoggedInKey'; // Key 3
 const String serverEndpointKey = 'immichBoxServerEndpoint'; // Key 4
+const String assetEtagKey = 'immichAssetEtagKey'; // Key 5

 // Login Info
 const String hiveLoginInfoBox = "immichLoginInfoBox"; // Box
@@ -29,3 +30,6 @@ const String backupRequireCharging = "immichBackupRequireCharging"; // Key 3
 // Duplicate asset
 const String duplicatedAssetsBox = "immichDuplicatedAssetsBox"; // Box
 const String duplicatedAssetsKey = "immichDuplicatedAssetsKey"; // Key 1
+
+// In app logger
+const String immichLoggerBox = "immichInAppLogger"; // Box
--- a/mobile/lib/main.dart
+++ b/mobile/lib/main.dart
@@ -16,11 +16,13 @@ import 'package:immich_mobile/modules/login/models/hive_saved_login_info.model.d
 import 'package:immich_mobile/modules/login/providers/authentication.provider.dart';
 import 'package:immich_mobile/routing/router.dart';
 import 'package:immich_mobile/routing/tab_navigation_observer.dart';
+import 'package:immich_mobile/shared/models/immich_logger_message.model.dart';
 import 'package:immich_mobile/shared/providers/app_state.provider.dart';
 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/shared/services/immich_logger.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';
@@ -31,8 +33,10 @@ void main() async {
  Hive.registerAdapter(HiveSavedLoginInfoAdapter());
  Hive.registerAdapter(HiveBackupAlbumsAdapter());
  Hive.registerAdapter(HiveDuplicatedAssetsAdapter());
+  Hive.registerAdapter(ImmichLoggerMessageAdapter());

  await Future.wait([
+    Hive.openBox<ImmichLoggerMessage>(immichLoggerBox),
    Hive.openBox(userInfoBox),
    Hive.openBox<HiveSavedLoginInfo>(hiveLoginInfoBox),
    Hive.openBox(hiveGithubReleaseInfoBox),
@@ -58,6 +62,9 @@ void main() async {
    }
  }

+  // Initialize Immich Logger Service
+  ImmichLogger().init();
+
  runApp(
    EasyLocalization(
      supportedLocales: locales,
--- a/mobile/lib/modules/album/services/album.service.dart
+++ b/mobile/lib/modules/album/services/album.service.dart
@@ -69,7 +69,10 @@ class AlbumService {
    Iterable<Asset> assets,
  ) async {
    return createAlbum(
-        _getNextAlbumName(await getAlbums(isShared: false)), assets, []);
+      _getNextAlbumName(await getAlbums(isShared: false)),
+      assets,
+      [],
+    );
  }

  Future<AlbumResponseDto?> getAlbumDetail(String albumId) async {
--- a/mobile/lib/modules/album/ui/album_thumbnail_card.dart
+++ b/mobile/lib/modules/album/ui/album_thumbnail_card.dart
@@ -21,8 +21,39 @@ class AlbumThumbnailCard extends StatelessWidget {
  @override
  Widget build(BuildContext context) {
    var box = Hive.box(userInfoBox);
+    var cardSize = MediaQuery.of(context).size.width / 2 - 18;
+    var isDarkMode = Theme.of(context).brightness == Brightness.dark;

-    final cardSize = MediaQuery.of(context).size.width / 2 - 18;
+    buildEmptyThumbnail() {
+      return Container(
+        decoration: BoxDecoration(
+          color: isDarkMode ? Colors.grey[800] : Colors.grey[200],
+        ),
+        child: SizedBox(
+          height: cardSize,
+          width: cardSize,
+          child: const Center(
+            child: Icon(Icons.no_photography),
+          ),
+        ),
+      );
+    }
+
+    buildAlbumThumbnail() {
+      return CachedNetworkImage(
+        memCacheHeight: max(400, cardSize.toInt() * 3),
+        width: cardSize,
+        height: cardSize,
+        fit: BoxFit.cover,
+        fadeInDuration: const Duration(milliseconds: 200),
+        imageUrl: getAlbumThumbnailUrl(
+          album,
+          type: ThumbnailFormat.JPEG,
+        ),
+        httpHeaders: {"Authorization": "Bearer ${box.get(accessTokenKey)}"},
+        cacheKey: "${album.albumThumbnailAssetId}",
+      );
+    }

    return GestureDetector(
      onTap: () {
@@ -35,19 +66,9 @@ class AlbumThumbnailCard extends StatelessWidget {
          children: [
            ClipRRect(
              borderRadius: BorderRadius.circular(8),
-              child: CachedNetworkImage(
-                memCacheHeight: max(400, cardSize.toInt() * 3),
-                width: cardSize,
-                height: cardSize,
-                fit: BoxFit.cover,
-                fadeInDuration: const Duration(milliseconds: 200),
-                imageUrl:
-                    getAlbumThumbnailUrl(album, type: ThumbnailFormat.JPEG),
-                httpHeaders: {
-                  "Authorization": "Bearer ${box.get(accessTokenKey)}"
-                },
-                cacheKey: "${album.albumThumbnailAssetId}",
-              ),
+              child: album.albumThumbnailAssetId == null
+                  ? buildEmptyThumbnail()
+                  : buildAlbumThumbnail(),
            ),
            Padding(
              padding: const EdgeInsets.only(top: 8.0),
--- a/mobile/lib/modules/album/ui/album_viewer_appbar.dart
+++ b/mobile/lib/modules/album/ui/album_viewer_appbar.dart
@@ -34,7 +34,7 @@ class AlbumViewerAppbar extends HookConsumerWidget with PreferredSizeWidget {
    final newAlbumTitle = ref.watch(albumViewerProvider).editTitleText;
    final isEditAlbum = ref.watch(albumViewerProvider).isEditAlbum;

-    void _onDeleteAlbumPressed(String albumId) async {
+    void onDeleteAlbumPressed(String albumId) async {
      ImmichLoadingOverlayController.appLoader.show();

      bool isSuccess =
@@ -62,7 +62,7 @@ class AlbumViewerAppbar extends HookConsumerWidget with PreferredSizeWidget {
      ImmichLoadingOverlayController.appLoader.hide();
    }

-    void _onLeaveAlbumPressed(String albumId) async {
+    void onLeaveAlbumPressed(String albumId) async {
      ImmichLoadingOverlayController.appLoader.show();

      bool isSuccess =
@@ -84,7 +84,7 @@ class AlbumViewerAppbar extends HookConsumerWidget with PreferredSizeWidget {
      ImmichLoadingOverlayController.appLoader.hide();
    }

-    void _onRemoveFromAlbumPressed(String albumId) async {
+    void onRemoveFromAlbumPressed(String albumId) async {
      ImmichLoadingOverlayController.appLoader.show();

      bool isSuccess =
@@ -110,7 +110,7 @@ class AlbumViewerAppbar extends HookConsumerWidget with PreferredSizeWidget {
      ImmichLoadingOverlayController.appLoader.hide();
    }

-    _buildBottomSheetActionButton() {
+    buildBottomSheetActionButton() {
      if (isMultiSelectionEnable) {
        if (albumInfo.ownerId == userId) {
          return ListTile(
@@ -119,7 +119,7 @@ class AlbumViewerAppbar extends HookConsumerWidget with PreferredSizeWidget {
              'album_viewer_appbar_share_remove',
              style: TextStyle(fontWeight: FontWeight.bold),
            ).tr(),
-            onTap: () => _onRemoveFromAlbumPressed(albumId),
+            onTap: () => onRemoveFromAlbumPressed(albumId),
          );
        } else {
          return const SizedBox();
@@ -132,7 +132,7 @@ class AlbumViewerAppbar extends HookConsumerWidget with PreferredSizeWidget {
              'album_viewer_appbar_share_delete',
              style: TextStyle(fontWeight: FontWeight.bold),
            ).tr(),
-            onTap: () => _onDeleteAlbumPressed(albumId),
+            onTap: () => onDeleteAlbumPressed(albumId),
          );
        } else {
          return ListTile(
@@ -141,13 +141,13 @@ class AlbumViewerAppbar extends HookConsumerWidget with PreferredSizeWidget {
              'album_viewer_appbar_share_leave',
              style: TextStyle(fontWeight: FontWeight.bold),
            ).tr(),
-            onTap: () => _onLeaveAlbumPressed(albumId),
+            onTap: () => onLeaveAlbumPressed(albumId),
          );
        }
      }
    }

-    void _buildBottomSheet() {
+    void buildBottomSheet() {
      showModalBottomSheet(
        backgroundColor: Theme.of(context).scaffoldBackgroundColor,
        isScrollControlled: false,
@@ -157,7 +157,7 @@ class AlbumViewerAppbar extends HookConsumerWidget with PreferredSizeWidget {
            child: Column(
              mainAxisSize: MainAxisSize.min,
              children: [
-                _buildBottomSheetActionButton(),
+                buildBottomSheetActionButton(),
              ],
            ),
          );
@@ -165,7 +165,7 @@ class AlbumViewerAppbar extends HookConsumerWidget with PreferredSizeWidget {
      );
    }

-    _buildLeadingButton() {
+    buildLeadingButton() {
      if (isMultiSelectionEnable) {
        return IconButton(
          onPressed: () => ref
@@ -204,7 +204,7 @@ class AlbumViewerAppbar extends HookConsumerWidget with PreferredSizeWidget {

    return AppBar(
      elevation: 0,
-      leading: _buildLeadingButton(),
+      leading: buildLeadingButton(),
      title: isMultiSelectionEnable
          ? Text('${selectedAssetsInAlbum.length}')
          : null,
@@ -212,7 +212,7 @@ class AlbumViewerAppbar extends HookConsumerWidget with PreferredSizeWidget {
      actions: [
        IconButton(
          splashRadius: 25,
-          onPressed: _buildBottomSheet,
+          onPressed: buildBottomSheet,
          icon: const Icon(Icons.more_horiz_rounded),
        ),
      ],
--- a/mobile/lib/modules/album/ui/album_viewer_thumbnail.dart
+++ b/mobile/lib/modules/album/ui/album_viewer_thumbnail.dart
@@ -27,7 +27,7 @@ class AlbumViewerThumbnail extends HookConsumerWidget {
    final isMultiSelectionEnable =
        ref.watch(assetSelectionProvider).isMultiselectEnable;

-    _viewAsset() {
+    viewAsset() {
      AutoRouter.of(context).push(
        GalleryViewerRoute(
          asset: asset,
@@ -47,18 +47,18 @@ class AlbumViewerThumbnail extends HookConsumerWidget {
      }
    }

-    _enableMultiSelection() {
+    enableMultiSelection() {
      ref.watch(assetSelectionProvider.notifier).enableMultiselection();
      ref
          .watch(assetSelectionProvider.notifier)
          .addAssetsInAlbumViewer([asset]);
    }

-    _disableMultiSelection() {
+    disableMultiSelection() {
      ref.watch(assetSelectionProvider.notifier).disableMultiselection();
    }

-    _buildVideoLabel() {
+    buildVideoLabel() {
      return Positioned(
        top: 5,
        right: 5,
@@ -80,7 +80,7 @@ class AlbumViewerThumbnail extends HookConsumerWidget {
      );
    }

-    _buildAssetStoreLocationIcon() {
+    buildAssetStoreLocationIcon() {
      return Positioned(
        right: 10,
        bottom: 5,
@@ -94,7 +94,7 @@ class AlbumViewerThumbnail extends HookConsumerWidget {
      );
    }

-    _buildAssetSelectionIcon() {
+    buildAssetSelectionIcon() {
      bool isSelected = selectedAssetsInAlbumViewer.contains(asset);

      return Positioned(
@@ -112,21 +112,21 @@ class AlbumViewerThumbnail extends HookConsumerWidget {
      );
    }

-    _buildThumbnailImage() {
+    buildThumbnailImage() {
      return Container(
        decoration: BoxDecoration(border: drawBorderColor()),
        child: ImmichImage(asset, width: 300, height: 300),
      );
    }

-    _handleSelectionGesture() {
+    handleSelectionGesture() {
      if (selectedAssetsInAlbumViewer.contains(asset)) {
        ref
            .watch(assetSelectionProvider.notifier)
            .removeAssetsInAlbumViewer([asset]);

        if (selectedAssetsInAlbumViewer.isEmpty) {
-          _disableMultiSelection();
+          disableMultiSelection();
        }
      } else {
        ref
@@ -136,14 +136,14 @@ class AlbumViewerThumbnail extends HookConsumerWidget {
    }

    return GestureDetector(
-      onTap: isMultiSelectionEnable ? _handleSelectionGesture : _viewAsset,
-      onLongPress: _enableMultiSelection,
+      onTap: isMultiSelectionEnable ? handleSelectionGesture : viewAsset,
+      onLongPress: enableMultiSelection,
      child: Stack(
        children: [
-          _buildThumbnailImage(),
-          if (showStorageIndicator) _buildAssetStoreLocationIcon(),
-          if (!asset.isImage) _buildVideoLabel(),
-          if (isMultiSelectionEnable) _buildAssetSelectionIcon(),
+          buildThumbnailImage(),
+          if (showStorageIndicator) buildAssetStoreLocationIcon(),
+          if (!asset.isImage) buildVideoLabel(),
+          if (isMultiSelectionEnable) buildAssetSelectionIcon(),
        ],
      ),
    );
--- a/mobile/lib/modules/album/ui/month_group_title.dart
+++ b/mobile/lib/modules/album/ui/month_group_title.dart
@@ -21,7 +21,7 @@ class MonthGroupTitle extends HookConsumerWidget {
        ref.watch(assetSelectionProvider).selectedNewAssetsForAlbum;
    final isAlbumExist = ref.watch(assetSelectionProvider).isAlbumExist;

-    _handleTitleIconClick() {
+    handleTitleIconClick() {
      HapticFeedback.heavyImpact();

      if (isAlbumExist) {
@@ -61,7 +61,7 @@ class MonthGroupTitle extends HookConsumerWidget {
      }
    }

-    _getSimplifiedMonth() {
+    getSimplifiedMonth() {
      var monthAndYear = month.split(',');
      var yearText = monthAndYear[1].trim();
      var monthText = monthAndYear[0].trim();
@@ -85,7 +85,7 @@ class MonthGroupTitle extends HookConsumerWidget {
        child: Row(
          children: [
            GestureDetector(
-              onTap: _handleTitleIconClick,
+              onTap: handleTitleIconClick,
              child: selectedDateGroup.contains(month)
                  ? Icon(
                      Icons.check_circle_rounded,
@@ -97,11 +97,11 @@ class MonthGroupTitle extends HookConsumerWidget {
                    ),
            ),
            GestureDetector(
-              onTap: _handleTitleIconClick,
+              onTap: handleTitleIconClick,
              child: Padding(
                padding: const EdgeInsets.only(left: 8.0),
                child: Text(
-                  _getSimplifiedMonth(),
+                  getSimplifiedMonth(),
                  style: TextStyle(
                    fontSize: 24,
                    color: Theme.of(context).primaryColor,
--- a/mobile/lib/modules/album/ui/selection_thumbnail_image.dart
+++ b/mobile/lib/modules/album/ui/selection_thumbnail_image.dart
@@ -18,7 +18,7 @@ class SelectionThumbnailImage extends HookConsumerWidget {
        ref.watch(assetSelectionProvider).selectedAdditionalAssetsForAlbum;
    var isAlbumExist = ref.watch(assetSelectionProvider).isAlbumExist;

-    Widget _buildSelectionIcon(Asset asset) {
+    Widget buildSelectionIcon(Asset asset) {
      var isSelected = selectedAsset.map((item) => item.id).contains(asset.id);
      var isNewlySelected =
          newAssetsForAlbum.map((item) => item.id).contains(asset.id);
@@ -111,7 +111,7 @@ class SelectionThumbnailImage extends HookConsumerWidget {
            padding: const EdgeInsets.all(3.0),
            child: Align(
              alignment: Alignment.topLeft,
-              child: _buildSelectionIcon(asset),
+              child: buildSelectionIcon(asset),
            ),
          ),
          if (!asset.isImage)
--- a/mobile/lib/modules/album/views/album_viewer_page.dart
+++ b/mobile/lib/modules/album/views/album_viewer_page.dart
@@ -37,7 +37,7 @@ class AlbumViewerPage extends HookConsumerWidget {

    /// Find out if the assets in album exist on the device
    /// If they exist, add to selected asset state to show they are already selected.
-    void _onAddPhotosPressed(AlbumResponseDto albumInfo) async {
+    void onAddPhotosPressed(AlbumResponseDto albumInfo) async {
      if (albumInfo.assets.isNotEmpty == true) {
        ref.watch(assetSelectionProvider.notifier).addNewAssets(
              albumInfo.assets.map((e) => Asset.remote(e)).toList(),
@@ -60,7 +60,8 @@ class AlbumViewerPage extends HookConsumerWidget {
                    albumId,
                  );

-          if (addAssetsResult != null && addAssetsResult.successfullyAdded > 0) {
+          if (addAssetsResult != null &&
+              addAssetsResult.successfullyAdded > 0) {
            ref.refresh(sharedAlbumDetailProvider(albumId));
          }

@@ -73,7 +74,7 @@ class AlbumViewerPage extends HookConsumerWidget {
      }
    }

-    void _onAddUsersPressed(AlbumResponseDto albumInfo) async {
+    void onAddUsersPressed(AlbumResponseDto albumInfo) async {
      List<String>? sharedUserIds =
          await AutoRouter.of(context).push<List<String>?>(
        SelectAdditionalUserForSharingRoute(albumInfo: albumInfo),
@@ -94,7 +95,7 @@ class AlbumViewerPage extends HookConsumerWidget {
      }
    }

-    Widget _buildTitle(AlbumResponseDto albumInfo) {
+    Widget buildTitle(AlbumResponseDto albumInfo) {
      return Padding(
        padding: const EdgeInsets.only(left: 8, right: 8, top: 16),
        child: userId == albumInfo.ownerId
@@ -115,7 +116,7 @@ class AlbumViewerPage extends HookConsumerWidget {
      );
    }

-    Widget _buildAlbumDateRange(AlbumResponseDto albumInfo) {
+    Widget buildAlbumDateRange(AlbumResponseDto albumInfo) {
      String startDate = "";
      DateTime parsedStartDate =
          DateTime.parse(albumInfo.assets.first.createdAt);
@@ -148,14 +149,14 @@ class AlbumViewerPage extends HookConsumerWidget {
      );
    }

-    Widget _buildHeader(AlbumResponseDto albumInfo) {
+    Widget buildHeader(AlbumResponseDto albumInfo) {
      return SliverToBoxAdapter(
        child: Column(
          crossAxisAlignment: CrossAxisAlignment.start,
          children: [
-            _buildTitle(albumInfo),
+            buildTitle(albumInfo),
            if (albumInfo.assets.isNotEmpty == true)
-              _buildAlbumDateRange(albumInfo),
+              buildAlbumDateRange(albumInfo),
            if (albumInfo.shared)
              SizedBox(
                height: 60,
@@ -188,7 +189,7 @@ class AlbumViewerPage extends HookConsumerWidget {
      );
    }

-    Widget _buildImageGrid(AlbumResponseDto albumInfo) {
+    Widget buildImageGrid(AlbumResponseDto albumInfo) {
      final appSettingService = ref.watch(appSettingsServiceProvider);
      final bool showStorageIndicator =
          appSettingService.getSetting(AppSettingsEnum.storageIndicator);
@@ -220,7 +221,7 @@ class AlbumViewerPage extends HookConsumerWidget {
      return const SliverToBoxAdapter();
    }

-    Widget _buildControlButton(AlbumResponseDto albumInfo) {
+    Widget buildControlButton(AlbumResponseDto albumInfo) {
      return Padding(
        padding: const EdgeInsets.only(left: 16.0, top: 8, bottom: 8),
        child: SizedBox(
@@ -230,13 +231,13 @@ class AlbumViewerPage extends HookConsumerWidget {
            children: [
              AlbumActionOutlinedButton(
                iconData: Icons.add_photo_alternate_outlined,
-                onPressed: () => _onAddPhotosPressed(albumInfo),
+                onPressed: () => onAddPhotosPressed(albumInfo),
                labelText: "share_add_photos".tr(),
              ),
              if (userId == albumInfo.ownerId)
                AlbumActionOutlinedButton(
                  iconData: Icons.person_add_alt_rounded,
-                  onPressed: () => _onAddUsersPressed(albumInfo),
+                  onPressed: () => onAddUsersPressed(albumInfo),
                  labelText: "album_viewer_page_share_add_users".tr(),
                ),
            ],
@@ -245,7 +246,7 @@ class AlbumViewerPage extends HookConsumerWidget {
      );
    }

-    Widget _buildBody(AlbumResponseDto albumInfo) {
+    Widget buildBody(AlbumResponseDto albumInfo) {
      return GestureDetector(
        onTap: () {
          titleFocusNode.unfocus();
@@ -257,7 +258,7 @@ class AlbumViewerPage extends HookConsumerWidget {
          child: CustomScrollView(
            controller: scrollController,
            slivers: [
-              _buildHeader(albumInfo),
+              buildHeader(albumInfo),
              SliverPersistentHeader(
                pinned: true,
                delegate: ImmichSliverPersistentAppBarDelegate(
@@ -265,11 +266,11 @@ class AlbumViewerPage extends HookConsumerWidget {
                  maxHeight: 50,
                  child: Container(
                    color: Theme.of(context).scaffoldBackgroundColor,
-                    child: _buildControlButton(albumInfo),
+                    child: buildControlButton(albumInfo),
                  ),
                ),
              ),
-              _buildImageGrid(albumInfo)
+              buildImageGrid(albumInfo)
            ],
          ),
        ),
@@ -293,7 +294,7 @@ class AlbumViewerPage extends HookConsumerWidget {
      ),
      body: albumInfo.when(
        data: (albumInfo) => albumInfo != null
-            ? _buildBody(albumInfo)
+            ? buildBody(albumInfo)
            : const Center(
                child: CircularProgressIndicator(),
              ),
--- a/mobile/lib/modules/album/views/asset_selection_page.dart
+++ b/mobile/lib/modules/album/views/asset_selection_page.dart
@@ -25,7 +25,7 @@ class AssetSelectionPage extends HookConsumerWidget {

    List<Widget> imageGridGroup = [];

-    String _buildAssetCountText() {
+    String buildAssetCountText() {
      if (isAlbumExist) {
        return (selectedAssets.length + newAssetsForAlbum.length).toString();
      } else {
@@ -33,7 +33,7 @@ class AssetSelectionPage extends HookConsumerWidget {
      }
    }

-    Widget _buildBody() {
+    Widget buildBody() {
      assetGroupMonthYear.forEach((monthYear, assetGroup) {
        imageGridGroup
            .add(MonthGroupTitle(month: monthYear, assetGroup: assetGroup));
@@ -71,7 +71,7 @@ class AssetSelectionPage extends HookConsumerWidget {
                style: TextStyle(fontSize: 18),
              ).tr()
            : Text(
-                _buildAssetCountText(),
+                buildAssetCountText(),
                style: const TextStyle(fontSize: 18),
              ),
        centerTitle: false,
@@ -94,7 +94,7 @@ class AssetSelectionPage extends HookConsumerWidget {
            ),
        ],
      ),
-      body: _buildBody(),
+      body: buildBody(),
    );
  }
 }
--- a/mobile/lib/modules/album/views/create_album_page.dart
+++ b/mobile/lib/modules/album/views/create_album_page.dart
@@ -29,11 +29,11 @@ class CreateAlbumPage extends HookConsumerWidget {
        ref.watch(assetSelectionProvider).selectedNewAssetsForAlbum;
    final isDarkTheme = Theme.of(context).brightness == Brightness.dark;

-    _showSelectUserPage() {
+    showSelectUserPage() {
      AutoRouter.of(context).push(const SelectUserForSharingRoute());
    }

-    void _onBackgroundTapped() {
+    void onBackgroundTapped() {
      albumTitleTextFieldFocusNode.unfocus();
      isAlbumTitleTextFieldFocus.value = false;

@@ -45,7 +45,7 @@ class CreateAlbumPage extends HookConsumerWidget {
      }
    }

-    _onSelectPhotosButtonPressed() async {
+    onSelectPhotosButtonPressed() async {
      ref.watch(assetSelectionProvider.notifier).setIsAlbumExist(false);

      AssetSelectionPageResult? selectedAsset = await AutoRouter.of(context)
@@ -56,7 +56,7 @@ class CreateAlbumPage extends HookConsumerWidget {
      }
    }

-    _buildTitleInputField() {
+    buildTitleInputField() {
      return Padding(
        padding: const EdgeInsets.only(
          right: 10,
@@ -71,7 +71,7 @@ class CreateAlbumPage extends HookConsumerWidget {
      );
    }

-    _buildTitle() {
+    buildTitle() {
      if (selectedAssets.isEmpty) {
        return SliverToBoxAdapter(
          child: Padding(
@@ -90,7 +90,7 @@ class CreateAlbumPage extends HookConsumerWidget {
      return const SliverToBoxAdapter();
    }

-    _buildSelectPhotosButton() {
+    buildSelectPhotosButton() {
      if (selectedAssets.isEmpty) {
        return SliverToBoxAdapter(
          child: Padding(
@@ -109,7 +109,7 @@ class CreateAlbumPage extends HookConsumerWidget {
                  borderRadius: BorderRadius.circular(5),
                ),
              ),
-              onPressed: _onSelectPhotosButtonPressed,
+              onPressed: onSelectPhotosButtonPressed,
              icon: Icon(
                Icons.add_rounded,
                color: Theme.of(context).primaryColor,
@@ -132,7 +132,7 @@ class CreateAlbumPage extends HookConsumerWidget {
      return const SliverToBoxAdapter();
    }

-    _buildControlButton() {
+    buildControlButton() {
      return Padding(
        padding: const EdgeInsets.only(left: 12.0, top: 16, bottom: 16),
        child: SizedBox(
@@ -142,7 +142,7 @@ class CreateAlbumPage extends HookConsumerWidget {
            children: [
              AlbumActionOutlinedButton(
                iconData: Icons.add_photo_alternate_outlined,
-                onPressed: _onSelectPhotosButtonPressed,
+                onPressed: onSelectPhotosButtonPressed,
                labelText: "share_add_photos".tr(),
              ),
            ],
@@ -151,7 +151,7 @@ class CreateAlbumPage extends HookConsumerWidget {
      );
    }

-    _buildSelectedImageGrid() {
+    buildSelectedImageGrid() {
      if (selectedAssets.isNotEmpty) {
        return SliverPadding(
          padding: const EdgeInsets.only(top: 16),
@@ -164,7 +164,7 @@ class CreateAlbumPage extends HookConsumerWidget {
            delegate: SliverChildBuilderDelegate(
              (BuildContext context, int index) {
                return GestureDetector(
-                  onTap: _onBackgroundTapped,
+                  onTap: onBackgroundTapped,
                  child: SharedAlbumThumbnailImage(
                    asset: selectedAssets.elementAt(index),
                  ),
@@ -179,7 +179,7 @@ class CreateAlbumPage extends HookConsumerWidget {
      return const SliverToBoxAdapter();
    }

-    _createNonSharedAlbum() async {
+    createNonSharedAlbum() async {
      var newAlbum = await ref.watch(albumProvider.notifier).createAlbum(
            ref.watch(albumTitleProvider),
            ref.watch(assetSelectionProvider).selectedNewAssetsForAlbum,
@@ -216,7 +216,7 @@ class CreateAlbumPage extends HookConsumerWidget {
          if (isSharedAlbum)
            TextButton(
              onPressed: albumTitleController.text.isNotEmpty
-                  ? _showSelectUserPage
+                  ? showSelectUserPage
                  : null,
              child: Text(
                'create_shared_album_page_share'.tr(),
@@ -230,7 +230,7 @@ class CreateAlbumPage extends HookConsumerWidget {
            TextButton(
              onPressed: albumTitleController.text.isNotEmpty &&
                      selectedAssets.isNotEmpty
-                  ? _createNonSharedAlbum
+                  ? createNonSharedAlbum
                  : null,
              child: Text(
                'create_shared_album_page_create'.tr(),
@@ -242,7 +242,7 @@ class CreateAlbumPage extends HookConsumerWidget {
        ],
      ),
      body: GestureDetector(
-        onTap: _onBackgroundTapped,
+        onTap: onBackgroundTapped,
        child: CustomScrollView(
          slivers: [
            SliverAppBar(
@@ -255,15 +255,15 @@ class CreateAlbumPage extends HookConsumerWidget {
                preferredSize: const Size.fromHeight(66.0),
                child: Column(
                  children: [
-                    _buildTitleInputField(),
-                    if (selectedAssets.isNotEmpty) _buildControlButton(),
+                    buildTitleInputField(),
+                    if (selectedAssets.isNotEmpty) buildControlButton(),
                  ],
                ),
              ),
            ),
-            _buildTitle(),
-            _buildSelectPhotosButton(),
-            _buildSelectedImageGrid(),
+            buildTitle(),
+            buildSelectPhotosButton(),
+            buildSelectedImageGrid(),
          ],
        ),
      ),
--- a/mobile/lib/modules/album/views/select_additional_user_for_sharing_page.dart
+++ b/mobile/lib/modules/album/views/select_additional_user_for_sharing_page.dart
@@ -19,12 +19,12 @@ class SelectAdditionalUserForSharingPage extends HookConsumerWidget {
        ref.watch(suggestedSharedUsersProvider);
    final sharedUsersList = useState<Set<UserResponseDto>>({});

-    _addNewUsersHandler() {
+    addNewUsersHandler() {
      AutoRouter.of(context)
          .pop(sharedUsersList.value.map((e) => e.id).toList());
    }

-    _buildTileIcon(UserResponseDto user) {
+    buildTileIcon(UserResponseDto user) {
      if (sharedUsersList.value.contains(user)) {
        return CircleAvatar(
          backgroundColor: Theme.of(context).primaryColor,
@@ -42,7 +42,7 @@ class SelectAdditionalUserForSharingPage extends HookConsumerWidget {
      }
    }

-    _buildUserList(List<UserResponseDto> users) {
+    buildUserList(List<UserResponseDto> users) {
      List<Widget> usersChip = [];

      for (var user in sharedUsersList.value) {
@@ -84,7 +84,7 @@ class SelectAdditionalUserForSharingPage extends HookConsumerWidget {
            shrinkWrap: true,
            itemBuilder: ((context, index) {
              return ListTile(
-                leading: _buildTileIcon(users[index]),
+                leading: buildTileIcon(users[index]),
                title: Text(
                  users[index].email,
                  style: const TextStyle(
@@ -131,7 +131,7 @@ class SelectAdditionalUserForSharingPage extends HookConsumerWidget {
        actions: [
          TextButton(
            onPressed:
-                sharedUsersList.value.isEmpty ? null : _addNewUsersHandler,
+                sharedUsersList.value.isEmpty ? null : addNewUsersHandler,
            child: const Text(
              "share_add",
              style: TextStyle(fontSize: 14, fontWeight: FontWeight.bold),
@@ -147,7 +147,7 @@ class SelectAdditionalUserForSharingPage extends HookConsumerWidget {
            );
          }

-          return _buildUserList(users);
+          return buildUserList(users);
        },
        error: (e, _) => Text("Error loading suggested users $e"),
        loading: () => const Center(
--- a/mobile/lib/modules/album/views/select_user_for_sharing_page.dart
+++ b/mobile/lib/modules/album/views/select_user_for_sharing_page.dart
@@ -20,7 +20,7 @@ class SelectUserForSharingPage extends HookConsumerWidget {
    AsyncValue<List<UserResponseDto>> suggestedShareUsers =
        ref.watch(suggestedSharedUsersProvider);

-    _createSharedAlbum() async {
+    createSharedAlbum() async {
      var newAlbum =
          await ref.watch(sharedAlbumProvider.notifier).createSharedAlbum(
                ref.watch(albumTitleProvider),
@@ -44,7 +44,7 @@ class SelectUserForSharingPage extends HookConsumerWidget {
      );
    }

-    _buildTileIcon(UserResponseDto user) {
+    buildTileIcon(UserResponseDto user) {
      if (sharedUsersList.value.contains(user)) {
        return CircleAvatar(
          backgroundColor: Theme.of(context).primaryColor,
@@ -62,7 +62,7 @@ class SelectUserForSharingPage extends HookConsumerWidget {
      }
    }

-    _buildUserList(List<UserResponseDto> users) {
+    buildUserList(List<UserResponseDto> users) {
      List<Widget> usersChip = [];

      for (var user in sharedUsersList.value) {
@@ -104,7 +104,7 @@ class SelectUserForSharingPage extends HookConsumerWidget {
            shrinkWrap: true,
            itemBuilder: ((context, index) {
              return ListTile(
-                leading: _buildTileIcon(users[index]),
+                leading: buildTileIcon(users[index]),
                title: Text(
                  users[index].email,
                  style: const TextStyle(
@@ -153,8 +153,7 @@ class SelectUserForSharingPage extends HookConsumerWidget {
            style: TextButton.styleFrom(
              foregroundColor: Theme.of(context).primaryColor,
            ),
-            onPressed:
-                sharedUsersList.value.isEmpty ? null : _createSharedAlbum,
+            onPressed: sharedUsersList.value.isEmpty ? null : createSharedAlbum,
            child: const Text(
              "share_create_album",
              style: TextStyle(
@@ -168,7 +167,7 @@ class SelectUserForSharingPage extends HookConsumerWidget {
      ),
      body: suggestedShareUsers.when(
        data: (users) {
-          return _buildUserList(users);
+          return buildUserList(users);
        },
        error: (e, _) => Text("Error loading suggested users $e"),
        loading: () => const Center(
--- a/mobile/lib/modules/album/views/sharing_page.dart
+++ b/mobile/lib/modules/album/views/sharing_page.dart
@@ -28,7 +28,7 @@ class SharingPage extends HookConsumerWidget {
      [],
    );

-    _buildAlbumList() {
+    buildAlbumList() {
      return SliverList(
        delegate: SliverChildBuilderDelegate(
          (BuildContext context, int index) {
@@ -71,7 +71,7 @@ class SharingPage extends HookConsumerWidget {
      );
    }

-    _buildEmptyListIndication() {
+    buildEmptyListIndication() {
      return SliverToBoxAdapter(
        child: Padding(
          padding: const EdgeInsets.all(8.0),
@@ -136,8 +136,8 @@ class SharingPage extends HookConsumerWidget {
            ),
          ),
          sharedAlbums.isNotEmpty
-              ? _buildAlbumList()
-              : _buildEmptyListIndication()
+              ? buildAlbumList()
+              : buildEmptyListIndication()
        ],
      ),
    );
--- a/mobile/lib/modules/asset_viewer/providers/image_viewer_page_state.provider.dart
+++ b/mobile/lib/modules/asset_viewer/providers/image_viewer_page_state.provider.dart
@@ -64,5 +64,7 @@ class ImageViewerStateNotifier extends StateNotifier<ImageViewerPageState> {
 final imageViewerStateProvider =
    StateNotifierProvider<ImageViewerStateNotifier, ImageViewerPageState>(
  ((ref) => ImageViewerStateNotifier(
-      ref.watch(imageViewerServiceProvider), ref.watch(shareServiceProvider))),
+        ref.watch(imageViewerServiceProvider),
+        ref.watch(shareServiceProvider),
+      )),
 );
--- a/mobile/lib/modules/asset_viewer/ui/exif_bottom_sheet.dart
+++ b/mobile/lib/modules/asset_viewer/ui/exif_bottom_sheet.dart
@@ -6,6 +6,7 @@ import 'package:immich_mobile/shared/models/asset.dart';
 import 'package:openapi/api.dart';
 import 'package:path/path.dart' as p;
 import 'package:latlong2/latlong.dart';
+import 'package:immich_mobile/utils/bytes_units.dart';

 class ExifBottomSheet extends ConsumerWidget {
  final Asset assetDetail;
@@ -15,7 +16,7 @@ class ExifBottomSheet extends ConsumerWidget {

  @override
  Widget build(BuildContext context, WidgetRef ref) {
-    _buildMap() {
+    buildMap() {
      return Padding(
        padding: const EdgeInsets.symmetric(vertical: 16.0),
        child: Container(
@@ -66,7 +67,7 @@ class ExifBottomSheet extends ConsumerWidget {

    ExifResponseDto? exifInfo = assetDetail.remote?.exifInfo;

-    _buildLocationText() {
+    buildLocationText() {
      return Text(
        "${exifInfo?.city}, ${exifInfo?.state}",
        style: TextStyle(
@@ -120,11 +121,11 @@ class ExifBottomSheet extends ConsumerWidget {
                  ).tr(),
                  if (assetDetail.latitude != null &&
                      assetDetail.longitude != null)
-                    _buildMap(),
+                    buildMap(),
                  if (exifInfo != null &&
                      exifInfo.city != null &&
                      exifInfo.state != null)
-                    _buildLocationText(),
+                    buildLocationText(),
                  Text(
                    "${assetDetail.latitude?.toStringAsFixed(4)}, ${assetDetail.longitude?.toStringAsFixed(4)}",
                    style: TextStyle(fontSize: 12, color: Colors.grey[400]),
@@ -162,7 +163,7 @@ class ExifBottomSheet extends ConsumerWidget {
                    ),
                    subtitle: exifInfo.exifImageHeight != null
                        ? Text(
-                            "${exifInfo.exifImageHeight} x ${exifInfo.exifImageWidth}  ${exifInfo.fileSizeInByte!}B ",
+                            "${exifInfo.exifImageHeight} x ${exifInfo.exifImageWidth}  ${formatBytes(exifInfo.fileSizeInByte!)} ",
                          )
                        : null,
                  ),
@@ -178,7 +179,7 @@ class ExifBottomSheet extends ConsumerWidget {
                        style: const TextStyle(fontWeight: FontWeight.bold),
                      ),
                      subtitle: Text(
-                        "ƒ/${exifInfo.fNumber}   1/${(1 / (exifInfo.exposureTime ?? 1)).toStringAsFixed(0)}   ${exifInfo.focalLength}mm   ISO${exifInfo.iso} ",
+                        "ƒ/${exifInfo.fNumber}   1/${(1 / (exifInfo.exposureTime ?? 1)).toStringAsFixed(0)}   ${exifInfo.focalLength} mm   ISO${exifInfo.iso} ",
                      ),
                    ),
                ],
--- a/mobile/lib/modules/backup/background_service/background.service.dart
+++ b/mobile/lib/modules/backup/background_service/background.service.dart
@@ -349,7 +349,6 @@ class BackgroundService {
      Hive.openBox<HiveDuplicatedAssets>(duplicatedAssetsBox),
      Hive.openBox<HiveBackupAlbums>(hiveBackupInfoBox),
    ]);
-
    ApiService apiService = ApiService();
    apiService.setEndpoint(Hive.box(userInfoBox).get(serverEndpointKey));
    apiService.setAccessToken(Hive.box(userInfoBox).get(accessTokenKey));
--- a/mobile/lib/modules/backup/background_service/localization.dart
+++ b/mobile/lib/modules/backup/background_service/localization.dart
@@ -1,3 +1,5 @@
+// ignore_for_file: implementation_imports
+
 import 'package:flutter/foundation.dart';
 import 'package:easy_localization/src/asset_loader.dart';
 import 'package:easy_localization/src/easy_localization_controller.dart';
--- a/mobile/lib/modules/backup/providers/backup.provider.dart
+++ b/mobile/lib/modules/backup/providers/backup.provider.dart
@@ -1,7 +1,7 @@
 import 'dart:io';

 import 'package:cancellation_token_http/http.dart';
-import 'package:flutter/foundation.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';
@@ -18,6 +18,7 @@ import 'package:immich_mobile/modules/login/models/authentication_state.model.da
 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:logging/logging.dart';
 import 'package:openapi/api.dart';
 import 'package:photo_manager/photo_manager.dart';

@@ -62,11 +63,13 @@ class BackupNotifier extends StateNotifier<BackUpState> {
    getBackupInfo();
  }

+  final log = Logger('BackupNotifier');
  final BackupService _backupService;
  final ServerInfoService _serverInfoService;
  final AuthenticationState _authState;
  final BackgroundService _backgroundService;
  final Ref ref;
+  var isGettingBackupInfo = false;

  ///
  /// UI INTERACTION
@@ -171,9 +174,10 @@ class BackupNotifier extends StateNotifier<BackUpState> {
  /// Get all album on the device
  /// Get all selected and excluded album from the user's persistent storage
  /// If this is the first time performing backup - set the default selected album to be
-  /// the one that has all assets (Recent on Android, Recents on iOS)
+  /// the one that has all assets (`Recent` on Android, `Recents` on iOS)
  ///
  Future<void> _getBackupAlbumsInfo() async {
+    Stopwatch stopwatch = Stopwatch()..start();
    // Get all albums on the device
    List<AvailableAlbum> availableAlbums = [];
    List<AssetPathEntity> albums = await PhotoManager.getAssetPathList(
@@ -181,6 +185,8 @@ class BackupNotifier extends StateNotifier<BackUpState> {
      type: RequestType.common,
    );

+    log.info('Found ${albums.length} local albums');
+
    for (AssetPathEntity album in albums) {
      AvailableAlbum availableAlbum = AvailableAlbum(albumEntity: album);

@@ -218,13 +224,16 @@ class BackupNotifier extends StateNotifier<BackUpState> {
    );

    if (backupAlbumInfo == null) {
-      debugPrint("[ERROR] getting Hive backup album infomation");
+      log.severe(
+        "backupAlbumInfo == null",
+        "Failed to get Hive backup album information",
+      );
      return;
    }

    // First time backup - set isAll album is the default one for backup.
    if (backupAlbumInfo.selectedAlbumIds.isEmpty) {
-      debugPrint("First time backup setup recent album as default");
+      log.info("First time backup; setup 'Recent(s)' album as default");

      // Get album that contains all assets
      var list = await PhotoManager.getAssetPathList(
@@ -286,9 +295,11 @@ class BackupNotifier extends StateNotifier<BackUpState> {
        selectedBackupAlbums: selectedAlbums,
        excludedBackupAlbums: excludedAlbums,
      );
-    } catch (e) {
-      debugPrint("[ERROR] Failed to generate album from id $e");
+    } catch (e, stackTrace) {
+      log.severe("Failed to generate album from id", e, stackTrace);
    }
+
+    debugPrint("_getBackupAlbumsInfo takes ${stopwatch.elapsedMilliseconds}ms");
  }

  ///
@@ -338,7 +349,7 @@ class BackupNotifier extends StateNotifier<BackUpState> {
    );

    if (allUniqueAssets.isEmpty) {
-      debugPrint("No Asset On Device");
+      log.info("Not found albums or assets on the device to backup");
      state = state.copyWith(
        backupProgress: BackUpProgressEnum.idle,
        allAssetsInDatabase: allAssetsInDatabase,
@@ -360,25 +371,29 @@ class BackupNotifier extends StateNotifier<BackUpState> {
    return;
  }

-  ///
  /// Get all necessary information for calculating the available albums,
  /// which albums are selected or excluded
  /// and then update the UI according to those information
-  ///
  Future<void> getBackupInfo() async {
-    final bool isEnabled = await _backgroundService.isBackgroundBackupEnabled();
-    state = state.copyWith(backgroundBackup: isEnabled);
-    if (state.backupProgress != BackUpProgressEnum.inBackground) {
-      await _getBackupAlbumsInfo();
-      await _updateServerInfo();
-      await _updateBackupAssetCount();
+    if (!isGettingBackupInfo) {
+      isGettingBackupInfo = true;
+
+      var isEnabled = await _backgroundService.isBackgroundBackupEnabled();
+
+      state = state.copyWith(backgroundBackup: isEnabled);
+
+      if (state.backupProgress != BackUpProgressEnum.inBackground) {
+        await _getBackupAlbumsInfo();
+        await _updateServerInfo();
+        await _updateBackupAssetCount();
+      }
+
+      isGettingBackupInfo = false;
    }
  }

-  ///
  /// Save user selection of selected albums and excluded albums to
  /// Hive database
-  ///
  void _updatePersistentAlbumsSelection() {
    final epoch = DateTime.fromMillisecondsSinceEpoch(0, isUtc: true);
    Box<HiveBackupAlbums> backupAlbumInfoBox =
@@ -398,9 +413,7 @@ class BackupNotifier extends StateNotifier<BackUpState> {
    );
  }

-  ///
  /// Invoke backup process
-  ///
  Future<void> startBackupProcess() async {
    assert(state.backupProgress == BackUpProgressEnum.idle);
    state = state.copyWith(backupProgress: BackUpProgressEnum.inProgress);
@@ -412,7 +425,7 @@ class BackupNotifier extends StateNotifier<BackUpState> {
      await PhotoManager.clearFileCache();

      if (state.allUniqueAssets.isEmpty) {
-        debugPrint("No Asset On Device - Abort Backup Process");
+        log.info("No Asset On Device - Abort Backup Process");
        state = state.copyWith(backupProgress: BackUpProgressEnum.idle);
        return;
      }
@@ -530,7 +543,7 @@ class BackupNotifier extends StateNotifier<BackUpState> {

    // User has been logged out return
    if (accessKey == null || !_authState.isAuthenticated) {
-      debugPrint("[resumeBackup] not authenticated - abort");
+      log.info("[_resumeBackup] not authenticated - abort");
      return;
    }

@@ -539,17 +552,17 @@ class BackupNotifier extends StateNotifier<BackUpState> {
        _authState.deviceInfo.isAutoBackup) {
      // check if backup is alreayd in process - then return
      if (state.backupProgress == BackUpProgressEnum.inProgress) {
-        debugPrint("[resumeBackup] Backup is already in progress - abort");
+        log.info("[_resumeBackup] Backup is already in progress - abort");
        return;
      }

      if (state.backupProgress == BackUpProgressEnum.inBackground) {
-        debugPrint("[resumeBackup] Background backup is running - abort");
+        log.info("[_resumeBackup] Background backup is running - abort");
        return;
      }

      // Run backup
-      debugPrint("[resumeBackup] Start back up");
+      log.info("[_resumeBackup] Start back up");
      await startBackupProcess();
    }

@@ -565,7 +578,7 @@ class BackupNotifier extends StateNotifier<BackUpState> {
      state = state.copyWith(backupProgress: BackUpProgressEnum.inBackground);
      final bool hasLock = await _backgroundService.acquireLock();
      if (!hasLock) {
-        debugPrint("WARNING [resumeBackup] failed to acquireLock");
+        log.warning("WARNING [resumeBackup] failed to acquireLock");
        return;
      }
      await Future.wait([
@@ -612,7 +625,11 @@ class BackupNotifier extends StateNotifier<BackUpState> {
        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");
+        log.severe(
+          "[_updateAlbumBackupTime] failed to find album in state",
+          "State Error",
+          StackTrace.current,
+        );
      }
    }
    return result;
@@ -631,21 +648,29 @@ class BackupNotifier extends StateNotifier<BackUpState> {
          await Hive.box<HiveBackupAlbums>(hiveBackupInfoBox).close();
        }
      } catch (error) {
-        debugPrint("[_notifyBackgroundServiceCanRun] failed to close box");
+        log.info("[_notifyBackgroundServiceCanRun] failed to close box");
      }
      try {
        if (Hive.isBoxOpen(duplicatedAssetsBox)) {
          await Hive.box<HiveDuplicatedAssets>(duplicatedAssetsBox).close();
        }
-      } catch (error) {
-        debugPrint("[_notifyBackgroundServiceCanRun] failed to close box");
+      } catch (error, stackTrace) {
+        log.severe(
+          "[_notifyBackgroundServiceCanRun] failed to close box",
+          error,
+          stackTrace,
+        );
      }
      try {
        if (Hive.isBoxOpen(backgroundBackupInfoBox)) {
          await Hive.box(backgroundBackupInfoBox).close();
        }
-      } catch (error) {
-        debugPrint("[_notifyBackgroundServiceCanRun] failed to close box");
+      } catch (error, stackTrace) {
+        log.severe(
+          "[_notifyBackgroundServiceCanRun] failed to close box",
+          error,
+          stackTrace,
+        );
      }
      _backgroundService.releaseLock();
    }
--- a/mobile/lib/modules/backup/ui/album_info_card.dart
+++ b/mobile/lib/modules/backup/ui/album_info_card.dart
@@ -33,7 +33,7 @@ class AlbumInfoCard extends HookConsumerWidget {
    ColorFilter unselectedFilter =
        const ColorFilter.mode(Colors.black, BlendMode.color);

-    _buildSelectedTextBox() {
+    buildSelectedTextBox() {
      if (isSelected) {
        return Chip(
          visualDensity: VisualDensity.compact,
@@ -67,7 +67,7 @@ class AlbumInfoCard extends HookConsumerWidget {
      return const SizedBox();
    }

-    _buildImageFilter() {
+    buildImageFilter() {
      if (isSelected) {
        return selectedFilter;
      } else if (isExcluded) {
@@ -163,7 +163,7 @@ class AlbumInfoCard extends HookConsumerWidget {
                      topRight: Radius.circular(12),
                    ),
                    image: DecorationImage(
-                      colorFilter: _buildImageFilter(),
+                      colorFilter: buildImageFilter(),
                      image: imageData != null
                          ? MemoryImage(imageData!)
                          : const AssetImage(
@@ -177,7 +177,7 @@ class AlbumInfoCard extends HookConsumerWidget {
                Positioned(
                  bottom: 10,
                  left: 25,
-                  child: _buildSelectedTextBox(),
+                  child: buildSelectedTextBox(),
                )
              ],
            ),
--- a/mobile/lib/modules/backup/views/album_preview_page.dart
+++ b/mobile/lib/modules/backup/views/album_preview_page.dart
@@ -15,14 +15,16 @@ class AlbumPreviewPage extends HookConsumerWidget {
  Widget build(BuildContext context, WidgetRef ref) {
    final assets = useState<List<AssetEntity>>([]);

-    _getAssetsInAlbum() async {
+    getAssetsInAlbum() async {
      assets.value = await album.getAssetListRange(
-          start: 0, end: await album.assetCountAsync);
+        start: 0,
+        end: await album.assetCountAsync,
+      );
    }

    useEffect(
      () {
-        _getAssetsInAlbum();
+        getAssetsInAlbum();
        return null;
      },
      [],
@@ -34,7 +36,7 @@ class AlbumPreviewPage extends HookConsumerWidget {
        title: Column(
          children: [
            Text(
-              "${album.name} (${album.assetCountAsync})",
+              album.name,
              style: const TextStyle(fontSize: 14, fontWeight: FontWeight.bold),
            ),
            Padding(
--- a/mobile/lib/modules/backup/views/backup_album_selection_page.dart
+++ b/mobile/lib/modules/backup/views/backup_album_selection_page.dart
@@ -5,6 +5,7 @@ import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:fluttertoast/fluttertoast.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/constants/immich_colors.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/modules/backup/ui/album_info_card.dart';
 import 'package:immich_mobile/shared/ui/immich_loading_indicator.dart';
@@ -14,10 +15,13 @@ class BackupAlbumSelectionPage extends HookConsumerWidget {
  const BackupAlbumSelectionPage({Key? key}) : super(key: key);
  @override
  Widget build(BuildContext context, WidgetRef ref) {
-    final availableAlbums = ref.watch(backupProvider).availableAlbums;
+    // final availableAlbums = ref.watch(backupProvider).availableAlbums;
    final selectedBackupAlbums = ref.watch(backupProvider).selectedBackupAlbums;
    final excludedBackupAlbums = ref.watch(backupProvider).excludedBackupAlbums;
    final isDarkTheme = Theme.of(context).brightness == Brightness.dark;
+    final albums = useState<List<AvailableAlbum>>(
+      ref.watch(backupProvider).availableAlbums,
+    );

    useEffect(
      () {
@@ -27,8 +31,8 @@ class BackupAlbumSelectionPage extends HookConsumerWidget {
      [],
    );

-    _buildAlbumSelectionList() {
-      if (availableAlbums.isEmpty) {
+    buildAlbumSelectionList() {
+      if (albums.value.isEmpty) {
        return const Center(
          child: ImmichLoadingIndicator(),
        );
@@ -38,17 +42,17 @@ class BackupAlbumSelectionPage extends HookConsumerWidget {
        height: 265,
        child: ListView.builder(
          scrollDirection: Axis.horizontal,
-          itemCount: availableAlbums.length,
+          itemCount: albums.value.length,
          physics: const BouncingScrollPhysics(),
          itemBuilder: ((context, index) {
-            var thumbnailData = availableAlbums[index].thumbnailData;
+            var thumbnailData = albums.value[index].thumbnailData;
            return Padding(
              padding: index == 0
                  ? const EdgeInsets.only(left: 16.00)
                  : const EdgeInsets.all(0),
              child: AlbumInfoCard(
                imageData: thumbnailData,
-                albumInfo: availableAlbums[index],
+                albumInfo: albums.value[index],
              ),
            );
          }),
@@ -56,7 +60,7 @@ class BackupAlbumSelectionPage extends HookConsumerWidget {
      );
    }

-    _buildSelectedAlbumNameChip() {
+    buildSelectedAlbumNameChip() {
      return selectedBackupAlbums.map((album) {
        void removeSelection() {
          if (ref.watch(backupProvider).selectedBackupAlbums.length == 1) {
@@ -79,15 +83,13 @@ class BackupAlbumSelectionPage extends HookConsumerWidget {
            child: Chip(
              visualDensity: VisualDensity.compact,
              shape: RoundedRectangleBorder(
-                borderRadius: BorderRadius.circular(5),
+                borderRadius: BorderRadius.circular(10),
              ),
              label: Text(
                album.name,
                style: TextStyle(
                  fontSize: 10,
-                  color: Theme.of(context).brightness == Brightness.dark
-                      ? Colors.black
-                      : Colors.white,
+                  color: isDarkTheme ? Colors.black : Colors.white,
                  fontWeight: FontWeight.bold,
                ),
              ),
@@ -104,7 +106,7 @@ class BackupAlbumSelectionPage extends HookConsumerWidget {
      }).toSet();
    }

-    _buildExcludedAlbumNameChip() {
+    buildExcludedAlbumNameChip() {
      return excludedBackupAlbums.map((album) {
        void removeSelection() {
          ref
@@ -119,7 +121,7 @@ class BackupAlbumSelectionPage extends HookConsumerWidget {
            child: Chip(
              visualDensity: VisualDensity.compact,
              shape: RoundedRectangleBorder(
-                borderRadius: BorderRadius.circular(5),
+                borderRadius: BorderRadius.circular(10),
              ),
              label: Text(
                album.name,
@@ -143,6 +145,46 @@ class BackupAlbumSelectionPage extends HookConsumerWidget {
      }).toSet();
    }

+    buildSearchBar() {
+      return Padding(
+        padding: const EdgeInsets.only(left: 16.0, right: 16, bottom: 8.0),
+        child: TextFormField(
+          onChanged: (searchValue) {
+            albums.value = ref
+                .watch(backupProvider)
+                .availableAlbums
+                .where(
+                  (album) => album.name
+                      .toLowerCase()
+                      .contains(searchValue.toLowerCase()),
+                )
+                .toList();
+          },
+          decoration: InputDecoration(
+            contentPadding: const EdgeInsets.symmetric(
+              horizontal: 8.0,
+              vertical: 8.0,
+            ),
+            hintText: "Search",
+            hintStyle: TextStyle(
+              color: isDarkTheme ? Colors.white : Colors.grey,
+              fontSize: 14.0,
+            ),
+            prefixIcon: const Icon(
+              Icons.search,
+              color: Colors.grey,
+            ),
+            border: OutlineInputBorder(
+              borderRadius: BorderRadius.circular(10),
+              borderSide: BorderSide.none,
+            ),
+            filled: true,
+            fillColor: isDarkTheme ? Colors.white30 : Colors.grey[200],
+          ),
+        ),
+      );
+    }
+
    return Scaffold(
      appBar: AppBar(
        leading: IconButton(
@@ -177,8 +219,8 @@ class BackupAlbumSelectionPage extends HookConsumerWidget {
            padding: const EdgeInsets.symmetric(horizontal: 16.0),
            child: Wrap(
              children: [
-                ..._buildSelectedAlbumNameChip(),
-                ..._buildExcludedAlbumNameChip()
+                ...buildSelectedAlbumNameChip(),
+                ...buildExcludedAlbumNameChip()
              ],
            ),
          ),
@@ -188,7 +230,7 @@ class BackupAlbumSelectionPage extends HookConsumerWidget {
            child: Card(
              margin: const EdgeInsets.all(0),
              shape: RoundedRectangleBorder(
-                borderRadius: BorderRadius.circular(5),
+                borderRadius: BorderRadius.circular(10),
                side: BorderSide(
                  color: isDarkTheme
                      ? const Color.fromARGB(255, 0, 0, 0)
@@ -225,8 +267,11 @@ class BackupAlbumSelectionPage extends HookConsumerWidget {

          ListTile(
            title: Text(
-              "backup_album_selection_page_albums_device"
-                  .tr(args: [availableAlbums.length.toString()]),
+              "backup_album_selection_page_albums_device".tr(
+                args: [
+                  ref.watch(backupProvider).availableAlbums.length.toString()
+                ],
+              ),
              style: const TextStyle(fontWeight: FontWeight.bold, fontSize: 14),
            ),
            subtitle: Padding(
@@ -254,7 +299,7 @@ class BackupAlbumSelectionPage extends HookConsumerWidget {
                  builder: (BuildContext context) {
                    return AlertDialog(
                      shape: RoundedRectangleBorder(
-                        borderRadius: BorderRadius.circular(12),
+                        borderRadius: BorderRadius.circular(10),
                      ),
                      elevation: 5,
                      title: Text(
@@ -284,9 +329,11 @@ class BackupAlbumSelectionPage extends HookConsumerWidget {
            ),
          ),

+          buildSearchBar(),
+
          Padding(
            padding: const EdgeInsets.only(bottom: 16.0),
-            child: _buildAlbumSelectionList(),
+            child: buildAlbumSelectionList(),
          ),
        ],
      ),
--- a/mobile/lib/modules/backup/views/backup_controller_page.dart
+++ b/mobile/lib/modules/backup/views/backup_controller_page.dart
@@ -45,7 +45,7 @@ class BackupControllerPage extends HookConsumerWidget {
      [],
    );

-    Widget _buildStorageInformation() {
+    Widget buildStorageInformation() {
      return ListTile(
        leading: Icon(
          Icons.storage_rounded,
@@ -84,7 +84,7 @@ class BackupControllerPage extends HookConsumerWidget {
      );
    }

-    ListTile _buildAutoBackupController() {
+    ListTile buildAutoBackupController() {
      var backUpOption = authenticationState.deviceInfo.isAutoBackup
          ? "backup_controller_page_status_on".tr()
          : "backup_controller_page_status_off".tr();
@@ -143,7 +143,7 @@ class BackupControllerPage extends HookConsumerWidget {
      );
    }

-    void _showErrorToUser(String msg) {
+    void showErrorToUser(String msg) {
      final snackBar = SnackBar(
        content: Text(
          msg.tr(),
@@ -153,7 +153,7 @@ class BackupControllerPage extends HookConsumerWidget {
      ScaffoldMessenger.of(context).showSnackBar(snackBar);
    }

-    void _showBatteryOptimizationInfoToUser() {
+    void showBatteryOptimizationInfoToUser() {
      showDialog<void>(
        context: context,
        barrierDismissible: false,
@@ -193,7 +193,7 @@ class BackupControllerPage extends HookConsumerWidget {
      );
    }

-    ListTile _buildBackgroundBackupController() {
+    ListTile buildBackgroundBackupController() {
      final bool isBackgroundEnabled = backupState.backgroundBackup;
      final bool isWifiRequired = backupState.backupRequireWifi;
      final bool isChargingRequired = backupState.backupRequireCharging;
@@ -238,8 +238,8 @@ class BackupControllerPage extends HookConsumerWidget {
                        .read(backupProvider.notifier)
                        .configureBackgroundBackup(
                          requireWifi: isChecked,
-                          onError: _showErrorToUser,
-                          onBatteryInfo: _showBatteryOptimizationInfoToUser,
+                          onError: showErrorToUser,
+                          onBatteryInfo: showBatteryOptimizationInfoToUser,
                        )
                    : null,
              ),
@@ -259,8 +259,8 @@ class BackupControllerPage extends HookConsumerWidget {
                        .read(backupProvider.notifier)
                        .configureBackgroundBackup(
                          requireCharging: isChecked,
-                          onError: _showErrorToUser,
-                          onBatteryInfo: _showBatteryOptimizationInfoToUser,
+                          onError: showErrorToUser,
+                          onBatteryInfo: showBatteryOptimizationInfoToUser,
                        )
                    : null,
              ),
@@ -268,8 +268,8 @@ class BackupControllerPage extends HookConsumerWidget {
              onPressed: () =>
                  ref.read(backupProvider.notifier).configureBackgroundBackup(
                        enabled: !isBackgroundEnabled,
-                        onError: _showErrorToUser,
-                        onBatteryInfo: _showBatteryOptimizationInfoToUser,
+                        onError: showErrorToUser,
+                        onBatteryInfo: showBatteryOptimizationInfoToUser,
                      ),
              child: Text(
                isBackgroundEnabled
@@ -284,7 +284,7 @@ class BackupControllerPage extends HookConsumerWidget {
      );
    }

-    Widget _buildSelectedAlbumName() {
+    Widget buildSelectedAlbumName() {
      var text = "backup_controller_page_backup_selected".tr();
      var albums = ref.watch(backupProvider).selectedBackupAlbums;

@@ -323,7 +323,7 @@ class BackupControllerPage extends HookConsumerWidget {
      }
    }

-    Widget _buildExcludedAlbumName() {
+    Widget buildExcludedAlbumName() {
      var text = "backup_controller_page_excluded".tr();
      var albums = ref.watch(backupProvider).excludedBackupAlbums;

@@ -348,7 +348,7 @@ class BackupControllerPage extends HookConsumerWidget {
      }
    }

-    _buildFolderSelectionTile() {
+    buildFolderSelectionTile() {
      return Card(
        shape: RoundedRectangleBorder(
          borderRadius: BorderRadius.circular(5), // if you need this
@@ -374,8 +374,8 @@ class BackupControllerPage extends HookConsumerWidget {
                  "backup_controller_page_to_backup",
                  style: TextStyle(fontSize: 12),
                ).tr(),
-                _buildSelectedAlbumName(),
-                _buildExcludedAlbumName()
+                buildSelectedAlbumName(),
+                buildExcludedAlbumName()
              ],
            ),
          ),
@@ -398,7 +398,7 @@ class BackupControllerPage extends HookConsumerWidget {
      );
    }

-    _buildCurrentBackupAssetInfoCard() {
+    buildCurrentBackupAssetInfoCard() {
      return ListTile(
        leading: Icon(
          Icons.info_outline_rounded,
@@ -606,7 +606,7 @@ class BackupControllerPage extends HookConsumerWidget {
                      ),
                    ),
                  ),
-            _buildFolderSelectionTile(),
+            buildFolderSelectionTile(),
            BackupInfoCard(
              title: "backup_controller_page_total".tr(),
              subtitle: "backup_controller_page_total_sub".tr(),
@@ -624,13 +624,13 @@ class BackupControllerPage extends HookConsumerWidget {
                  "${backupState.allUniqueAssets.length - backupState.selectedAlbumsBackupAssetsIds.length}",
            ),
            const Divider(),
-            _buildAutoBackupController(),
+            buildAutoBackupController(),
            if (Platform.isAndroid) const Divider(),
-            if (Platform.isAndroid) _buildBackgroundBackupController(),
+            if (Platform.isAndroid) buildBackgroundBackupController(),
            const Divider(),
-            _buildStorageInformation(),
+            buildStorageInformation(),
            const Divider(),
-            _buildCurrentBackupAssetInfoCard(),
+            buildCurrentBackupAssetInfoCard(),
            Padding(
              padding: const EdgeInsets.only(
                top: 24,
--- a/mobile/lib/modules/home/services/asset.service.dart
+++ b/mobile/lib/modules/home/services/asset.service.dart
@@ -10,8 +10,10 @@ import 'package:immich_mobile/modules/backup/services/backup.service.dart';
 import 'package:immich_mobile/shared/models/asset.dart';
 import 'package:immich_mobile/shared/providers/api.provider.dart';
 import 'package:immich_mobile/shared/services/api.service.dart';
+import 'package:immich_mobile/utils/openapi_extensions.dart';
+import 'package:immich_mobile/utils/tuple.dart';
+import 'package:logging/logging.dart';
 import 'package:openapi/api.dart';
-import 'package:photo_manager/src/types/entity.dart';

 final assetServiceProvider = Provider(
  (ref) => AssetService(
@@ -25,42 +27,31 @@ class AssetService {
  final ApiService _apiService;
  final BackupService _backupService;
  final BackgroundService _backgroundService;
+  final log = Logger('AssetService');

  AssetService(this._apiService, this._backupService, this._backgroundService);

-  /// Returns all local, remote assets in that order
-  Future<List<Asset>> getAllAsset({bool urgent = false}) async {
-    final List<Asset> assets = [];
+  /// Returns `null` if the server state did not change, else list of assets
+  Future<List<Asset>?> getRemoteAssets({required bool hasCache}) async {
    try {
-      // not using `await` here to fetch local & remote assets concurrently
-      final Future<List<AssetResponseDto>?> remoteTask =
-          _apiService.assetApi.getAllAssets();
-      final Iterable<AssetEntity> newLocalAssets;
-      final List<AssetEntity> localAssets = await _getLocalAssets(urgent);
-      final List<AssetResponseDto> remoteAssets = await remoteTask ?? [];
-      if (remoteAssets.isNotEmpty && localAssets.isNotEmpty) {
-        final String deviceId = Hive.box(userInfoBox).get(deviceIdKey);
-        final Set<String> existingIds = remoteAssets
-            .where((e) => e.deviceId == deviceId)
-            .map((e) => e.deviceAssetId)
-            .toSet();
-        newLocalAssets = localAssets.where((e) => !existingIds.contains(e.id));
-      } else {
-        newLocalAssets = localAssets;
+      final Box box = Hive.box(userInfoBox);
+      final Pair<List<AssetResponseDto>, String?>? remote = await _apiService
+          .assetApi
+          .getAllAssetsWithETag(eTag: hasCache ? box.get(assetEtagKey) : null);
+      if (remote == null) {
+        return null;
      }
-
-      assets.addAll(newLocalAssets.map((e) => Asset.local(e)));
-      // the order (first all local, then remote assets) is important!
-      assets.addAll(remoteAssets.map((e) => Asset.remote(e)));
-    } catch (e) {
-      debugPrint("Error [getAllAsset]  ${e.toString()}");
+      box.put(assetEtagKey, remote.second);
+      return remote.first.map(Asset.remote).toList(growable: false);
+    } catch (e, stack) {
+      log.severe('Error while getting remote assets', e, stack);
+      return null;
    }
-    return assets;
  }

  /// if [urgent] is `true`, do not block by waiting on the background service
-  /// to finish running. Returns an empty list instead after a timeout.
-  Future<List<AssetEntity>> _getLocalAssets(bool urgent) async {
+  /// to finish running. Returns `null` instead after a timeout.
+  Future<List<Asset>?> getLocalAssets({bool urgent = false}) async {
    try {
      final Future<bool> hasAccess = urgent
          ? _backgroundService.hasAccess
@@ -71,15 +62,16 @@ class AssetService {
      }
      final box = await Hive.openBox<HiveBackupAlbums>(hiveBackupInfoBox);
      final HiveBackupAlbums? backupAlbumInfo = box.get(backupInfoKey);
-
-      return backupAlbumInfo != null
-          ? await _backupService
-              .buildUploadCandidates(backupAlbumInfo.deepCopy())
-          : [];
+      if (backupAlbumInfo != null) {
+        return (await _backupService
+                .buildUploadCandidates(backupAlbumInfo.deepCopy()))
+            .map(Asset.local)
+            .toList(growable: false);
+      }
    } catch (e) {
      debugPrint("Error [_getLocalAssets] ${e.toString()}");
-      return [];
    }
+    return null;
  }

  Future<Asset?> getAssetById(String assetId) async {
--- a/mobile/lib/modules/home/ui/immich_sliver_appbar.dart
+++ b/mobile/lib/modules/home/ui/immich_sliver_appbar.dart
@@ -32,7 +32,9 @@ class ImmichSliverAppBar extends ConsumerWidget {
      snap: false,
      backgroundColor: Theme.of(context).appBarTheme.backgroundColor,
      shape: const RoundedRectangleBorder(
-        borderRadius: BorderRadius.all(Radius.circular(5)),
+        borderRadius: BorderRadius.all(
+          Radius.circular(5),
+        ),
      ),
      leading: Builder(
        builder: (BuildContext context) {
--- a/mobile/lib/modules/home/ui/profile_drawer/profile_drawer.dart
+++ b/mobile/lib/modules/home/ui/profile_drawer/profile_drawer.dart
@@ -2,12 +2,12 @@ import 'package:auto_route/auto_route.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/modules/backup/providers/backup.provider.dart';
 import 'package:immich_mobile/modules/home/ui/profile_drawer/profile_drawer_header.dart';
 import 'package:immich_mobile/modules/home/ui/profile_drawer/server_info_box.dart';
+import 'package:immich_mobile/modules/login/providers/authentication.provider.dart';
 import 'package:immich_mobile/routing/router.dart';
 import 'package:immich_mobile/shared/providers/asset.provider.dart';
-import 'package:immich_mobile/modules/login/providers/authentication.provider.dart';
-import 'package:immich_mobile/modules/backup/providers/backup.provider.dart';
 import 'package:immich_mobile/shared/providers/websocket.provider.dart';

 class ProfileDrawer extends HookConsumerWidget {
@@ -15,7 +15,7 @@ class ProfileDrawer extends HookConsumerWidget {

  @override
  Widget build(BuildContext context, WidgetRef ref) {
-    _buildSignoutButton() {
+    buildSignoutButton() {
      return ListTile(
        horizontalTitleGap: 0,
        leading: SizedBox(
@@ -46,7 +46,7 @@ class ProfileDrawer extends HookConsumerWidget {
      );
    }

-    _buildSettingButton() {
+    buildSettingButton() {
      return ListTile(
        horizontalTitleGap: 0,
        leading: SizedBox(
@@ -70,6 +70,30 @@ class ProfileDrawer extends HookConsumerWidget {
      );
    }

+    buildAppLogButton() {
+      return ListTile(
+        horizontalTitleGap: 0,
+        leading: SizedBox(
+          height: double.infinity,
+          child: Icon(
+            Icons.assignment_outlined,
+            color: Theme.of(context).textTheme.labelMedium?.color,
+            size: 20,
+          ),
+        ),
+        title: Text(
+          "profile_drawer_app_logs",
+          style: Theme.of(context)
+              .textTheme
+              .labelLarge
+              ?.copyWith(fontWeight: FontWeight.bold),
+        ).tr(),
+        onTap: () {
+          AutoRouter.of(context).push(const AppLogRoute());
+        },
+      );
+    }
+
    return Drawer(
      child: Column(
        mainAxisAlignment: MainAxisAlignment.spaceBetween,
@@ -79,8 +103,9 @@ class ProfileDrawer extends HookConsumerWidget {
            padding: EdgeInsets.zero,
            children: [
              const ProfileDrawerHeader(),
-              _buildSettingButton(),
-              _buildSignoutButton(),
+              buildSettingButton(),
+              buildAppLogButton(),
+              buildSignoutButton(),
            ],
          ),
          const ServerInfoBox()
--- a/mobile/lib/modules/home/ui/profile_drawer/profile_drawer_header.dart
+++ b/mobile/lib/modules/home/ui/profile_drawer/profile_drawer_header.dart
@@ -25,7 +25,7 @@ class ProfileDrawerHeader extends HookConsumerWidget {
    var dummmy = Random().nextInt(1024);
    final isDarkMode = Theme.of(context).brightness == Brightness.dark;

-    _buildUserProfileImage() {
+    buildUserProfileImage() {
      if (authState.profileImagePath.isEmpty) {
        return const CircleAvatar(
          radius: 35,
@@ -77,7 +77,7 @@ class ProfileDrawerHeader extends HookConsumerWidget {
      return const SizedBox();
    }

-    _pickUserProfileImage() async {
+    pickUserProfileImage() async {
      final XFile? image = await ImagePicker().pickImage(
        source: ImageSource.gallery,
        maxHeight: 1024,
@@ -98,7 +98,7 @@ class ProfileDrawerHeader extends HookConsumerWidget {

    useEffect(
      () {
-        _buildUserProfileImage();
+        buildUserProfileImage();
        return null;
      },
      [],
@@ -129,12 +129,12 @@ class ProfileDrawerHeader extends HookConsumerWidget {
          Stack(
            clipBehavior: Clip.none,
            children: [
-              _buildUserProfileImage(),
+              buildUserProfileImage(),
              Positioned(
                bottom: 0,
                right: -5,
                child: GestureDetector(
-                  onTap: _pickUserProfileImage,
+                  onTap: pickUserProfileImage,
                  child: Material(
                    color: Colors.grey[100],
                    elevation: 3,
--- a/mobile/lib/modules/home/ui/profile_drawer/server_info_box.dart
+++ b/mobile/lib/modules/home/ui/profile_drawer/server_info_box.dart
@@ -17,7 +17,7 @@ class ServerInfoBox extends HookConsumerWidget {

    final appInfo = useState({});

-    _getPackageInfo() async {
+    getPackageInfo() async {
      PackageInfo packageInfo = await PackageInfo.fromPlatform();

      appInfo.value = {
@@ -28,7 +28,7 @@ class ServerInfoBox extends HookConsumerWidget {

    useEffect(
      () {
-        _getPackageInfo();
+        getPackageInfo();
        return null;
      },
      [],
--- a/mobile/lib/modules/home/views/home_page.dart
+++ b/mobile/lib/modules/home/views/home_page.dart
@@ -1,3 +1,5 @@
+import 'dart:async';
+
 import 'package:auto_route/auto_route.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
@@ -20,6 +22,7 @@ import 'package:immich_mobile/shared/providers/asset.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/shared/services/share.service.dart';
+import 'package:immich_mobile/shared/ui/immich_loading_indicator.dart';
 import 'package:immich_mobile/shared/ui/immich_toast.dart';
 import 'package:openapi/api.dart';

@@ -37,6 +40,8 @@ class HomePage extends HookConsumerWidget {
    final albums = ref.watch(albumProvider);
    final albumService = ref.watch(albumServiceProvider);

+    final tipOneOpacity = useState(0.0);
+
    useEffect(
      () {
        ref.read(websocketProvider.notifier).connect();
@@ -146,6 +151,49 @@ class HomePage extends HookConsumerWidget {
        }
      }

+      buildLoadingIndicator() {
+        Timer(const Duration(seconds: 2), () {
+          tipOneOpacity.value = 1;
+        });
+
+        return Center(
+          child: Column(
+            mainAxisAlignment: MainAxisAlignment.center,
+            children: [
+              const ImmichLoadingIndicator(),
+              Padding(
+                padding: const EdgeInsets.only(top: 16.0),
+                child: Text(
+                  'Building the timeline',
+                  style: TextStyle(
+                    fontWeight: FontWeight.w600,
+                    fontSize: 16,
+                    color: Theme.of(context).primaryColor,
+                  ),
+                ),
+              ),
+              AnimatedOpacity(
+                duration: const Duration(milliseconds: 500),
+                opacity: tipOneOpacity.value,
+                child: const SizedBox(
+                  width: 250,
+                  child: Padding(
+                    padding: EdgeInsets.only(top: 8.0),
+                    child: Text(
+                      'If this is your first time using the app, please make sure to choose a backup album(s) so that the timeline can populate photos and videos in the album(s).',
+                      textAlign: TextAlign.justify,
+                      style: TextStyle(
+                        fontSize: 12,
+                      ),
+                    ),
+                  ),
+                ),
+              )
+            ],
+          ),
+        );
+      }
+
      return SafeArea(
        bottom: !multiselectEnabled.state,
        top: true,
@@ -164,15 +212,17 @@ class HomePage extends HookConsumerWidget {
                top: selectionEnabledHook.value ? 0 : 60,
                bottom: 0.0,
              ),
-              child: ImmichAssetGrid(
-                renderList: renderList,
-                assetsPerRow:
-                    appSettingService.getSetting(AppSettingsEnum.tilesPerRow),
-                showStorageIndicator: appSettingService
-                    .getSetting(AppSettingsEnum.storageIndicator),
-                listener: selectionListener,
-                selectionActive: selectionEnabledHook.value,
-              ),
+              child: ref.watch(assetProvider).isEmpty
+                  ? buildLoadingIndicator()
+                  : ImmichAssetGrid(
+                      renderList: renderList,
+                      assetsPerRow: appSettingService
+                          .getSetting(AppSettingsEnum.tilesPerRow),
+                      showStorageIndicator: appSettingService
+                          .getSetting(AppSettingsEnum.storageIndicator),
+                      listener: selectionListener,
+                      selectionActive: selectionEnabledHook.value,
+                    ),
            ),
            if (selectionEnabledHook.value)
              ControlBottomAppBar(
--- a/mobile/lib/modules/login/providers/authentication.provider.dart
+++ b/mobile/lib/modules/login/providers/authentication.provider.dart
@@ -90,6 +90,7 @@ class AuthenticationNotifier extends StateNotifier<AuthenticationState> {

      return setSuccessLoginInfo(
        accessToken: loginResponse.accessToken,
+        serverUrl: serverEndpoint,
        isSavedLoginInfo: isSavedLoginInfo,
      );
    } catch (e) {
@@ -100,11 +101,14 @@ class AuthenticationNotifier extends StateNotifier<AuthenticationState> {
  }

  Future<bool> logout() async {
-    Hive.box(userInfoBox).delete(accessTokenKey);
    state = state.copyWith(isAuthenticated: false);
-    _assetCacheService.invalidate();
-    _albumCacheService.invalidate();
-    _sharedAlbumCacheService.invalidate();
+    await Future.wait([
+      Hive.box(userInfoBox).delete(accessTokenKey),
+      Hive.box(userInfoBox).delete(assetEtagKey),
+      _assetCacheService.invalidate(),
+      _albumCacheService.invalidate(),
+      _sharedAlbumCacheService.invalidate(),
+    ]);

    // Remove login info from local storage
    var loginInfo =
@@ -114,7 +118,7 @@ class AuthenticationNotifier extends StateNotifier<AuthenticationState> {
      loginInfo.password = "";
      loginInfo.isSaveLogin = false;

-      Hive.box<HiveSavedLoginInfo>(hiveLoginInfoBox).put(
+      await Hive.box<HiveSavedLoginInfo>(hiveLoginInfoBox).put(
        savedLoginInfoKey,
        loginInfo,
      );
@@ -159,16 +163,18 @@ class AuthenticationNotifier extends StateNotifier<AuthenticationState> {

  Future<bool> setSuccessLoginInfo({
    required String accessToken,
+    required String serverUrl,
    required bool isSavedLoginInfo,
  }) async {
-    Hive.box(userInfoBox).put(accessTokenKey, accessToken);
-
    _apiService.setAccessToken(accessToken);
    var userResponseDto = await _apiService.userApi.getMyUserInfo();

    if (userResponseDto != null) {
+      var userInfoHiveBox = await Hive.openBox(userInfoBox);
      var deviceInfo = await _deviceInfoService.getDeviceInfo();
-      Hive.box(userInfoBox).put(deviceIdKey, deviceInfo["deviceId"]);
+      userInfoHiveBox.put(deviceIdKey, deviceInfo["deviceId"]);
+      userInfoHiveBox.put(accessTokenKey, accessToken);
+      userInfoHiveBox.put(serverEndpointKey, serverUrl);

      state = state.copyWith(
        isAuthenticated: true,
@@ -191,7 +197,7 @@ class AuthenticationNotifier extends StateNotifier<AuthenticationState> {
            email: "",
            password: "",
            isSaveLogin: true,
-            serverUrl: Hive.box(userInfoBox).get(serverEndpointKey),
+            serverUrl: serverUrl,
            accessToken: accessToken,
          ),
        );
--- a/mobile/lib/modules/login/providers/oauth.provider.dart
+++ b/mobile/lib/modules/login/providers/oauth.provider.dart
@@ -2,5 +2,5 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/modules/login/services/oauth.service.dart';
 import 'package:immich_mobile/shared/providers/api.provider.dart';

-final OAuthServiceProvider =
+final oAuthServiceProvider =
    Provider((ref) => OAuthService(ref.watch(apiServiceProvider)));
--- a/mobile/lib/modules/login/ui/login_form.dart
+++ b/mobile/lib/modules/login/ui/login_form.dart
@@ -83,6 +83,13 @@ class LoginForm extends HookConsumerWidget {
      [],
    );

+    populateTestLoginInfo() {
+      usernameController.text = 'testuser@email.com';
+      passwordController.text = 'password';
+      serverEndpointController.text = 'http://10.1.15.216:2283/api';
+      isSaveLoginInfo.value = true;
+    }
+
    return Center(
      child: ConstrainedBox(
        constraints: const BoxConstraints(maxWidth: 300),
@@ -92,10 +99,13 @@ class LoginForm extends HookConsumerWidget {
            runSpacing: 16,
            alignment: WrapAlignment.center,
            children: [
-              const Image(
-                image: AssetImage('assets/immich-logo-no-outline.png'),
-                width: 100,
-                filterQuality: FilterQuality.high,
+              GestureDetector(
+                onDoubleTap: () => populateTestLoginInfo(),
+                child: const Image(
+                  image: AssetImage('assets/immich-logo-no-outline.png'),
+                  width: 100,
+                  filterQuality: FilterQuality.high,
+                ),
              ),
              Text(
                'IMMICH',
@@ -349,7 +359,7 @@ class OAuthLoginButton extends ConsumerWidget {

  @override
  Widget build(BuildContext context, WidgetRef ref) {
-    var oAuthService = ref.watch(OAuthServiceProvider);
+    var oAuthService = ref.watch(oAuthServiceProvider);

    void performOAuthLogin() async {
      ref.watch(assetProvider.notifier).clearAllAsset();
@@ -380,6 +390,7 @@ class OAuthLoginButton extends ConsumerWidget {
              .setSuccessLoginInfo(
                accessToken: loginResponseDto.accessToken,
                isSavedLoginInfo: isSavedLoginInfo,
+                serverUrl: serverEndpointController.text,
              );

          if (isSuccess) {
--- a/mobile/lib/modules/login/views/login_page.dart
+++ b/mobile/lib/modules/login/views/login_page.dart
@@ -1,14 +1,65 @@
+import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/modules/login/ui/login_form.dart';
+import 'package:immich_mobile/routing/router.dart';
+import 'package:package_info_plus/package_info_plus.dart';

 class LoginPage extends HookConsumerWidget {
  const LoginPage({Key? key}) : super(key: key);

  @override
  Widget build(BuildContext context, WidgetRef ref) {
-    return const Scaffold(
-      body: LoginForm(),
+    final appVersion = useState('0.0.0');
+
+    getAppInfo() async {
+      PackageInfo packageInfo = await PackageInfo.fromPlatform();
+      appVersion.value = packageInfo.version;
+    }
+
+    useEffect(
+      () {
+        getAppInfo();
+        return null;
+      },
+    );
+
+    return Scaffold(
+      body: const LoginForm(),
+      bottomNavigationBar: Padding(
+        padding: const EdgeInsets.only(bottom: 16.0),
+        child: SizedBox(
+          height: 50,
+          child: Row(
+            mainAxisAlignment: MainAxisAlignment.center,
+            children: [
+              Text(
+                'v${appVersion.value}',
+                style: const TextStyle(
+                  color: Colors.grey,
+                  fontWeight: FontWeight.bold,
+                  fontFamily: "Inconsolata",
+                ),
+              ),
+              const Text(' '),
+              GestureDetector(
+                child: Text(
+                  'Logs',
+                  style: TextStyle(
+                    color: Theme.of(context).primaryColor,
+                    fontWeight: FontWeight.bold,
+                    fontFamily: "Inconsolata",
+                  ),
+                ),
+                onTap: () {
+                  AutoRouter.of(context).push(const AppLogRoute());
+                },
+              ),
+            ],
+          ),
+        ),
+      ),
    );
  }
 }
--- a/mobile/lib/modules/search/views/search_page.dart
+++ b/mobile/lib/modules/search/views/search_page.dart
@@ -39,14 +39,14 @@ class SearchPage extends HookConsumerWidget {
      [],
    );

-    _onSearchSubmitted(String searchTerm) async {
+    onSearchSubmitted(String searchTerm) async {
      searchFocusNode.unfocus();
      ref.watch(searchPageStateProvider.notifier).disableSearch();

      AutoRouter.of(context).push(SearchResultRoute(searchTerm: searchTerm));
    }

-    _buildPlaces() {
+    buildPlaces() {
      return curatedLocation.when(
        loading: () => SizedBox(
          height: imageSize,
@@ -97,7 +97,7 @@ class SearchPage extends HookConsumerWidget {
      );
    }

-    _buildThings() {
+    buildThings() {
      return curatedObjects.when(
        loading: () => SizedBox(
          height: imageSize,
@@ -155,7 +155,7 @@ class SearchPage extends HookConsumerWidget {
    return Scaffold(
      appBar: SearchBar(
        searchFocusNode: searchFocusNode,
-        onSubmitted: _onSearchSubmitted,
+        onSubmitted: onSearchSubmitted,
      ),
      body: GestureDetector(
        onTap: () {
@@ -174,7 +174,7 @@ class SearchPage extends HookConsumerWidget {
                    style: TextStyle(fontWeight: FontWeight.bold, fontSize: 14),
                  ).tr(),
                ),
-                _buildPlaces(),
+                buildPlaces(),
                Padding(
                  padding: const EdgeInsets.all(16.0),
                  child: const Text(
@@ -182,11 +182,11 @@ class SearchPage extends HookConsumerWidget {
                    style: TextStyle(fontWeight: FontWeight.bold, fontSize: 14),
                  ).tr(),
                ),
-                _buildThings()
+                buildThings()
              ],
            ),
            if (isSearchEnabled)
-              SearchSuggestionList(onSubmitted: _onSearchSubmitted),
+              SearchSuggestionList(onSubmitted: onSearchSubmitted),
          ],
        ),
      ),
--- a/mobile/lib/modules/search/views/search_result_page.dart
+++ b/mobile/lib/modules/search/views/search_result_page.dart
@@ -38,7 +38,7 @@ class SearchResultPage extends HookConsumerWidget {
      [],
    );

-    _onSearchSubmitted(String newSearchTerm) {
+    onSearchSubmitted(String newSearchTerm) {
      debugPrint("Re-Search with $newSearchTerm");
      searchFocusNode?.unfocus();
      isNewSearch.value = false;
@@ -46,7 +46,7 @@ class SearchResultPage extends HookConsumerWidget {
      ref.watch(searchResultPageProvider.notifier).search(newSearchTerm);
    }

-    _buildTextField() {
+    buildTextField() {
      return TextField(
        controller: searchTermController,
        focusNode: searchFocusNode,
@@ -60,7 +60,7 @@ class SearchResultPage extends HookConsumerWidget {
        onSubmitted: (searchTerm) {
          if (searchTerm.isNotEmpty) {
            searchTermController.clear();
-            _onSearchSubmitted(searchTerm);
+            onSearchSubmitted(searchTerm);
          } else {
            isNewSearch.value = false;
          }
@@ -80,7 +80,7 @@ class SearchResultPage extends HookConsumerWidget {
      );
    }

-    _buildChip() {
+    buildChip() {
      return Chip(
        label: Wrap(
          spacing: 5,
@@ -108,7 +108,7 @@ class SearchResultPage extends HookConsumerWidget {
      );
    }

-    _buildSearchResult() {
+    buildSearchResult() {
      var searchResultPageState = ref.watch(searchResultPageProvider);
      var searchResultRenderList = ref.watch(searchRenderListProvider);

@@ -154,7 +154,7 @@ class SearchResultPage extends HookConsumerWidget {
            isNewSearch.value = true;
            searchFocusNode?.requestFocus();
          },
-          child: isNewSearch.value ? _buildTextField() : _buildChip(),
+          child: isNewSearch.value ? buildTextField() : buildChip(),
        ),
        centerTitle: false,
      ),
@@ -168,9 +168,9 @@ class SearchResultPage extends HookConsumerWidget {
        },
        child: Stack(
          children: [
-            _buildSearchResult(),
+            buildSearchResult(),
            if (isNewSearch.value)
-              SearchSuggestionList(onSubmitted: _onSearchSubmitted),
+              SearchSuggestionList(onSubmitted: onSearchSubmitted),
          ],
        ),
      ),
--- a/mobile/lib/modules/settings/views/settings_page.dart
+++ b/mobile/lib/modules/settings/views/settings_page.dart
@@ -4,7 +4,6 @@ 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/experimental_settings/experimental_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';
--- a/mobile/lib/routing/router.dart
+++ b/mobile/lib/routing/router.dart
@@ -1,33 +1,34 @@
 import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/modules/album/views/library_page.dart';
-import 'package:immich_mobile/modules/asset_viewer/views/gallery_viewer.dart';
-import 'package:immich_mobile/modules/backup/views/album_preview_page.dart';
-import 'package:immich_mobile/modules/backup/views/backup_album_selection_page.dart';
-import 'package:immich_mobile/modules/backup/views/failed_backup_status_page.dart';
-import 'package:immich_mobile/modules/login/views/change_password_page.dart';
-import 'package:immich_mobile/modules/login/views/login_page.dart';
-import 'package:immich_mobile/modules/home/views/home_page.dart';
-import 'package:immich_mobile/modules/search/views/search_page.dart';
-import 'package:immich_mobile/modules/search/views/search_result_page.dart';
 import 'package:immich_mobile/modules/album/models/asset_selection_page_result.model.dart';
 import 'package:immich_mobile/modules/album/views/album_viewer_page.dart';
 import 'package:immich_mobile/modules/album/views/asset_selection_page.dart';
 import 'package:immich_mobile/modules/album/views/create_album_page.dart';
+import 'package:immich_mobile/modules/album/views/library_page.dart';
 import 'package:immich_mobile/modules/album/views/select_additional_user_for_sharing_page.dart';
 import 'package:immich_mobile/modules/album/views/select_user_for_sharing_page.dart';
 import 'package:immich_mobile/modules/album/views/sharing_page.dart';
+import 'package:immich_mobile/modules/asset_viewer/views/gallery_viewer.dart';
+import 'package:immich_mobile/modules/asset_viewer/views/image_viewer_page.dart';
+import 'package:immich_mobile/modules/asset_viewer/views/video_viewer_page.dart';
+import 'package:immich_mobile/modules/backup/views/album_preview_page.dart';
+import 'package:immich_mobile/modules/backup/views/backup_album_selection_page.dart';
+import 'package:immich_mobile/modules/backup/views/backup_controller_page.dart';
+import 'package:immich_mobile/modules/backup/views/failed_backup_status_page.dart';
+import 'package:immich_mobile/modules/home/views/home_page.dart';
+import 'package:immich_mobile/modules/login/views/change_password_page.dart';
+import 'package:immich_mobile/modules/login/views/login_page.dart';
+import 'package:immich_mobile/modules/search/views/search_page.dart';
+import 'package:immich_mobile/modules/search/views/search_result_page.dart';
 import 'package:immich_mobile/modules/settings/views/settings_page.dart';
 import 'package:immich_mobile/routing/auth_guard.dart';
-import 'package:immich_mobile/modules/backup/views/backup_controller_page.dart';
-import 'package:immich_mobile/modules/asset_viewer/views/image_viewer_page.dart';
 import 'package:immich_mobile/shared/models/asset.dart';
 import 'package:immich_mobile/shared/providers/api.provider.dart';
 import 'package:immich_mobile/shared/services/api.service.dart';
+import 'package:immich_mobile/shared/views/app_log_page.dart';
 import 'package:immich_mobile/shared/views/splash_screen.dart';
 import 'package:immich_mobile/shared/views/tab_controller_page.dart';
-import 'package:immich_mobile/modules/asset_viewer/views/video_viewer_page.dart';
 import 'package:openapi/api.dart';
 import 'package:photo_manager/photo_manager.dart';

@@ -80,6 +81,10 @@ part 'router.gr.dart';
      transitionsBuilder: TransitionsBuilders.slideBottom,
    ),
    AutoRoute(page: SettingsPage, guards: [AuthGuard]),
+    CustomRoute(
+      page: AppLogPage,
+      transitionsBuilder: TransitionsBuilders.slideBottom,
+    ),
  ],
 )
 class AppRouter extends _$AppRouter {
--- a/mobile/lib/routing/router.gr.dart
+++ b/mobile/lib/routing/router.gr.dart
@@ -142,6 +142,14 @@ class _$AppRouter extends RootStackRouter {
      return MaterialPageX<dynamic>(
          routeData: routeData, child: const SettingsPage());
    },
+    AppLogRoute.name: (routeData) {
+      return CustomPage<dynamic>(
+          routeData: routeData,
+          child: const AppLogPage(),
+          transitionsBuilder: TransitionsBuilders.slideBottom,
+          opaque: true,
+          barrierDismissible: false);
+    },
    HomeRoute.name: (routeData) {
      return MaterialPageX<dynamic>(
          routeData: routeData, child: const HomePage());
@@ -218,7 +226,8 @@ class _$AppRouter extends RootStackRouter {
        RouteConfig(FailedBackupStatusRoute.name,
            path: '/failed-backup-status-page', guards: [authGuard]),
        RouteConfig(SettingsRoute.name,
-            path: '/settings-page', guards: [authGuard])
+            path: '/settings-page', guards: [authGuard]),
+        RouteConfig(AppLogRoute.name, path: '/app-log-page')
      ];
 }

@@ -560,6 +569,14 @@ class SettingsRoute extends PageRouteInfo<void> {
  static const String name = 'SettingsRoute';
 }

+/// generated route for
+/// [AppLogPage]
+class AppLogRoute extends PageRouteInfo<void> {
+  const AppLogRoute() : super(AppLogRoute.name, path: '/app-log-page');
+
+  static const String name = 'AppLogRoute';
+}
+
 /// generated route for
 /// [HomePage]
 class HomeRoute extends PageRouteInfo<void> {
--- a/mobile/lib/shared/models/immich_logger_message.model.dart
+++ b/mobile/lib/shared/models/immich_logger_message.model.dart
@@ -0,0 +1,34 @@
+import 'package:hive/hive.dart';
+
+part 'immich_logger_message.model.g.dart';
+
+@HiveType(typeId: 3)
+class ImmichLoggerMessage {
+  @HiveField(0)
+  String message;
+
+  @HiveField(1, defaultValue: "INFO")
+  String level;
+
+  @HiveField(2)
+  DateTime createdAt;
+
+  @HiveField(3)
+  String? context1;
+
+  @HiveField(4)
+  String? context2;
+
+  ImmichLoggerMessage({
+    required this.message,
+    required this.level,
+    required this.createdAt,
+    required this.context1,
+    required this.context2,
+  });
+
+  @override
+  String toString() {
+    return 'InAppLoggerMessage(message: $message, level: $level, createdAt: $createdAt)';
+  }
+}
--- a/mobile/lib/shared/models/immich_logger_message.model.g.dart
+++ b/mobile/lib/shared/models/immich_logger_message.model.g.dart
@@ -0,0 +1,53 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'immich_logger_message.model.dart';
+
+// **************************************************************************
+// TypeAdapterGenerator
+// **************************************************************************
+
+class ImmichLoggerMessageAdapter extends TypeAdapter<ImmichLoggerMessage> {
+  @override
+  final int typeId = 3;
+
+  @override
+  ImmichLoggerMessage read(BinaryReader reader) {
+    final numOfFields = reader.readByte();
+    final fields = <int, dynamic>{
+      for (int i = 0; i < numOfFields; i++) reader.readByte(): reader.read(),
+    };
+    return ImmichLoggerMessage(
+      message: fields[0] as String,
+      level: fields[1] == null ? 'INFO' : fields[1] as String,
+      createdAt: fields[2] as DateTime,
+      context1: fields[3] as String?,
+      context2: fields[4] as String?,
+    );
+  }
+
+  @override
+  void write(BinaryWriter writer, ImmichLoggerMessage obj) {
+    writer
+      ..writeByte(5)
+      ..writeByte(0)
+      ..write(obj.message)
+      ..writeByte(1)
+      ..write(obj.level)
+      ..writeByte(2)
+      ..write(obj.createdAt)
+      ..writeByte(3)
+      ..write(obj.context1)
+      ..writeByte(4)
+      ..write(obj.context2);
+  }
+
+  @override
+  int get hashCode => typeId.hashCode;
+
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      other is ImmichLoggerMessageAdapter &&
+          runtimeType == other.runtimeType &&
+          typeId == other.typeId;
+}
--- a/mobile/lib/shared/providers/asset.provider.dart
+++ b/mobile/lib/shared/providers/asset.provider.dart
@@ -1,20 +1,22 @@
 import 'dart:collection';

-import 'package:flutter/foundation.dart';
+import 'package:hive/hive.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/constants/hive_box.dart';
 import 'package:immich_mobile/modules/home/services/asset.service.dart';
 import 'package:immich_mobile/modules/home/services/asset_cache.service.dart';
 import 'package:immich_mobile/shared/models/asset.dart';
 import 'package:immich_mobile/shared/services/device_info.service.dart';
 import 'package:collection/collection.dart';
 import 'package:intl/intl.dart';
+import 'package:logging/logging.dart';
 import 'package:openapi/api.dart';
 import 'package:photo_manager/photo_manager.dart';

 class AssetNotifier extends StateNotifier<List<Asset>> {
  final AssetService _assetService;
  final AssetCacheService _assetCacheService;
-
+  final log = Logger('AssetNotifier');
  final DeviceInfoService _deviceInfoService = DeviceInfoService();
  bool _getAllAssetInProgress = false;
  bool _deleteInProgress = false;
@@ -33,31 +35,61 @@ class AssetNotifier extends StateNotifier<List<Asset>> {
    final stopwatch = Stopwatch();
    try {
      _getAllAssetInProgress = true;
-
      final bool isCacheValid = await _assetCacheService.isValid();
+      stopwatch.start();
+      final localTask = _assetService.getLocalAssets(urgent: !isCacheValid);
+      final remoteTask = _assetService.getRemoteAssets(hasCache: isCacheValid);
      if (isCacheValid && state.isEmpty) {
-        stopwatch.start();
        state = await _assetCacheService.get();
-        debugPrint(
-            "Reading assets from cache: ${stopwatch.elapsedMilliseconds}ms");
+        log.info(
+          "Reading assets from cache: ${stopwatch.elapsedMilliseconds}ms",
+        );
        stopwatch.reset();
      }

-      stopwatch.start();
-      var allAssets = await _assetService.getAllAsset(urgent: !isCacheValid);
-      debugPrint("Query assets from API: ${stopwatch.elapsedMilliseconds}ms");
+      int remoteBegin = state.indexWhere((a) => a.isRemote);
+      remoteBegin = remoteBegin == -1 ? state.length : remoteBegin;
+      final List<Asset> currentLocal = state.slice(0, remoteBegin);
+      List<Asset>? newRemote = await remoteTask;
+      List<Asset>? newLocal = await localTask;
+      log.info("Load assets: ${stopwatch.elapsedMilliseconds}ms");
      stopwatch.reset();
-
-      state = allAssets;
+      if (newRemote == null &&
+          (newLocal == null || currentLocal.equals(newLocal))) {
+        log.info("state is already up-to-date");
+        return;
+      }
+      newRemote ??= state.slice(remoteBegin);
+      newLocal ??= [];
+      state = _combineLocalAndRemoteAssets(local: newLocal, remote: newRemote);
+      log.info("Combining assets: ${stopwatch.elapsedMilliseconds}ms");
    } finally {
      _getAllAssetInProgress = false;
    }
-    debugPrint("[getAllAsset] setting new asset state");
+    log.info("setting new asset state");

-    stopwatch.start();
-    _cacheState();
-    debugPrint("Store assets in cache: ${stopwatch.elapsedMilliseconds}ms");
    stopwatch.reset();
+    _cacheState();
+    log.info("Store assets in cache: ${stopwatch.elapsedMilliseconds}ms");
+  }
+
+  List<Asset> _combineLocalAndRemoteAssets({
+    required Iterable<Asset> local,
+    required List<Asset> remote,
+  }) {
+    final List<Asset> assets = [];
+    if (remote.isNotEmpty && local.isNotEmpty) {
+      final String deviceId = Hive.box(userInfoBox).get(deviceIdKey);
+      final Set<String> existingIds = remote
+          .where((e) => e.deviceId == deviceId)
+          .map((e) => e.deviceAssetId)
+          .toSet();
+      local = local.where((e) => !existingIds.contains(e.id));
+    }
+    assets.addAll(local);
+    // the order (first all local, then remote assets) is important!
+    assets.addAll(remote);
+    return assets;
  }

  clearAllAsset() {
@@ -123,8 +155,8 @@ class AssetNotifier extends StateNotifier<List<Asset>> {
    if (local.isNotEmpty) {
      try {
        return await PhotoManager.editor.deleteWithIds(local);
-      } catch (e) {
-        debugPrint("Delete asset from device failed: $e");
+      } catch (e, stack) {
+        log.severe("Failed to delete asset from device", e, stack);
      }
    }
    return [];
@@ -145,7 +177,9 @@ class AssetNotifier extends StateNotifier<List<Asset>> {

 final assetProvider = StateNotifierProvider<AssetNotifier, List<Asset>>((ref) {
  return AssetNotifier(
-      ref.watch(assetServiceProvider), ref.watch(assetCacheServiceProvider));
+    ref.watch(assetServiceProvider),
+    ref.watch(assetCacheServiceProvider),
+  );
 });

 final assetGroupByDateTimeProvider = StateProvider((ref) {
--- a/mobile/lib/shared/providers/release_info.provider.dart
+++ b/mobile/lib/shared/providers/release_info.provider.dart
@@ -6,10 +6,11 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:http/http.dart';
 import 'package:immich_mobile/constants/hive_box.dart';
 import 'package:immich_mobile/shared/views/version_announcement_overlay.dart';
+import 'package:logging/logging.dart';

 class ReleaseInfoNotifier extends StateNotifier<String> {
  ReleaseInfoNotifier() : super("");
-
+  final log = Logger('ReleaseInfoNotifier');
  void checkGithubReleaseInfo() async {
    final Client client = Client();
    var box = Hive.box(hiveGithubReleaseInfoBox);
@@ -17,19 +18,17 @@ class ReleaseInfoNotifier extends StateNotifier<String> {
    try {
      String? localReleaseVersion = box.get(githubReleaseInfoKey);
      final res = await client.get(
-          Uri.parse(
-            "https://api.github.com/repos/immich-app/immich/releases/latest",
-          ),
-          headers: {"Accept": "application/vnd.github.v3+json"});
+        Uri.parse(
+          "https://api.github.com/repos/immich-app/immich/releases/latest",
+        ),
+        headers: {"Accept": "application/vnd.github.v3+json"},
+      );

      if (res.statusCode == 200) {
        final data = jsonDecode(res.body);
        String latestTagVersion = data["tag_name"];
        state = latestTagVersion;

-        debugPrint("Local release version $localReleaseVersion");
-        debugPrint("Remote release veresion $latestTagVersion");
-
        if (localReleaseVersion == null && latestTagVersion.isNotEmpty) {
          VersionAnnouncementOverlayController.appLoader.show();
          return;
--- a/mobile/lib/shared/providers/websocket.provider.dart
+++ b/mobile/lib/shared/providers/websocket.provider.dart
@@ -6,23 +6,24 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/constants/hive_box.dart';
 import 'package:immich_mobile/modules/login/providers/authentication.provider.dart';
 import 'package:immich_mobile/shared/providers/asset.provider.dart';
+import 'package:logging/logging.dart';
 import 'package:openapi/api.dart';
 import 'package:socket_io_client/socket_io_client.dart';

-class WebscoketState {
+class WebsocketState {
  final Socket? socket;
  final bool isConnected;

-  WebscoketState({
+  WebsocketState({
    this.socket,
    required this.isConnected,
  });

-  WebscoketState copyWith({
+  WebsocketState copyWith({
    Socket? socket,
    bool? isConnected,
  }) {
-    return WebscoketState(
+    return WebsocketState(
      socket: socket ?? this.socket,
      isConnected: isConnected ?? this.isConnected,
    );
@@ -30,13 +31,13 @@ class WebscoketState {

  @override
  String toString() =>
-      'WebscoketState(socket: $socket, isConnected: $isConnected)';
+      'WebsocketState(socket: $socket, isConnected: $isConnected)';

  @override
  bool operator ==(Object other) {
    if (identical(this, other)) return true;

-    return other is WebscoketState &&
+    return other is WebsocketState &&
        other.socket == socket &&
        other.isConnected == isConnected;
  }
@@ -45,12 +46,11 @@ class WebscoketState {
  int get hashCode => socket.hashCode ^ isConnected.hashCode;
 }

-class WebsocketNotifier extends StateNotifier<WebscoketState> {
+class WebsocketNotifier extends StateNotifier<WebsocketState> {
  WebsocketNotifier(this.ref)
-      : super(WebscoketState(socket: null, isConnected: false)) {
-    debugPrint("Init websocket instance");
-  }
+      : super(WebsocketState(socket: null, isConnected: false));

+  final log = Logger('WebsocketNotifier');
  final Ref ref;

  connect() {
@@ -60,8 +60,8 @@ class WebsocketNotifier extends StateNotifier<WebscoketState> {
      var accessToken = Hive.box(userInfoBox).get(accessTokenKey);
      var endpoint = Hive.box(userInfoBox).get(serverEndpointKey);
      try {
-        debugPrint("[WEBSOCKET] Attempting to connect to ws");
-        // Configure socket transports must be sepecified
+        debugPrint("Attempting to connect to websocket");
+        // Configure socket transports must be specified
        Socket socket = io(
          endpoint.toString().replaceAll('/api', ''),
          OptionBuilder()
@@ -76,18 +76,18 @@ class WebsocketNotifier extends StateNotifier<WebscoketState> {
        );

        socket.onConnect((_) {
-          debugPrint("[WEBSOCKET] Established Websocket Connection");
-          state = WebscoketState(isConnected: true, socket: socket);
+          debugPrint("Established Websocket Connection");
+          state = WebsocketState(isConnected: true, socket: socket);
        });

        socket.onDisconnect((_) {
-          debugPrint("[WEBSOCKET] Disconnect to Websocket Connection");
-          state = WebscoketState(isConnected: false, socket: null);
+          debugPrint("Disconnect to Websocket Connection");
+          state = WebsocketState(isConnected: false, socket: null);
        });

        socket.on('error', (errorMessage) {
-          debugPrint("Webcoket Error - $errorMessage");
-          state = WebscoketState(isConnected: false, socket: null);
+          log.severe("Websocket Error - $errorMessage");
+          state = WebsocketState(isConnected: false, socket: null);
        });

        socket.on('on_upload_success', (data) {
@@ -105,21 +105,22 @@ class WebsocketNotifier extends StateNotifier<WebscoketState> {
  }

  disconnect() {
-    debugPrint("[WEBSOCKET] Attempting to disconnect");
+    debugPrint("Attempting to disconnect from websocket");
+
    var socket = state.socket?.disconnect();

    if (socket?.disconnected == true) {
-      state = WebscoketState(isConnected: false, socket: null);
+      state = WebsocketState(isConnected: false, socket: null);
    }
  }

  stopListenToEvent(String eventName) {
-    debugPrint("[Websocket] Stop listening to event $eventName");
+    debugPrint("Stop listening to event $eventName");
    state.socket?.off(eventName);
  }

  listenUploadEvent() {
-    debugPrint("[Websocket] Start listening to event on_upload_success");
+    debugPrint("Start listening to event on_upload_success");
    state.socket?.on('on_upload_success', (data) {
      var jsonString = jsonDecode(data.toString());
      AssetResponseDto? newAsset = AssetResponseDto.fromJson(jsonString);
@@ -132,6 +133,6 @@ class WebsocketNotifier extends StateNotifier<WebscoketState> {
 }

 final websocketProvider =
-    StateNotifierProvider<WebsocketNotifier, WebscoketState>((ref) {
+    StateNotifierProvider<WebsocketNotifier, WebsocketState>((ref) {
  return WebsocketNotifier(ref);
 });
--- a/mobile/lib/shared/services/cache.service.dart
+++ b/mobile/lib/shared/services/cache.service.dart
@@ -1,3 +1,4 @@
+// ignore: depend_on_referenced_packages
 import 'package:flutter_cache_manager/flutter_cache_manager.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/modules/settings/providers/app_settings.provider.dart';
--- a/mobile/lib/shared/services/immich_logger.service.dart
+++ b/mobile/lib/shared/services/immich_logger.service.dart
@@ -0,0 +1,95 @@
+import 'dart:io';
+
+import 'package:flutter/widgets.dart';
+import 'package:hive/hive.dart';
+import 'package:immich_mobile/constants/hive_box.dart';
+import 'package:immich_mobile/shared/models/immich_logger_message.model.dart';
+import 'package:logging/logging.dart';
+import 'package:path_provider/path_provider.dart';
+import 'package:share_plus/share_plus.dart';
+
+/// [ImmichLogger] is a custom logger that is built on top of the [logging] package.
+/// The logs are written to a Hive box and onto console, using `debugPrint` method.
+///
+/// The logs are deleted when exceeding the `maxLogEntries` (default 200) property
+/// in the class.
+///
+/// Logs can be shared by calling the `shareLogs` method, which will open a share dialog
+/// and generate a csv file.
+class ImmichLogger {
+  final maxLogEntries = 200;
+  final Box<ImmichLoggerMessage> _box = Hive.box(immichLoggerBox);
+
+  List<ImmichLoggerMessage> get messages =>
+      _box.values.toList().reversed.toList();
+
+  ImmichLogger() {
+    _removeOverflowMessages();
+  }
+
+  init() {
+    Logger.root.level = Level.INFO;
+    Logger.root.onRecord.listen(_writeLogToHiveBox);
+  }
+
+  _removeOverflowMessages() {
+    if (_box.length > maxLogEntries) {
+      var numberOfEntryToBeDeleted = _box.length - maxLogEntries;
+      for (var i = 0; i < numberOfEntryToBeDeleted; i++) {
+        _box.deleteAt(0);
+      }
+    }
+  }
+
+  _writeLogToHiveBox(LogRecord record) {
+    final Box<ImmichLoggerMessage> box = Hive.box(immichLoggerBox);
+    var formattedMessage = record.message;
+
+    debugPrint('[${record.level.name}] [${record.time}] ${record.message}');
+    box.add(
+      ImmichLoggerMessage(
+        message: formattedMessage,
+        level: record.level.name,
+        createdAt: record.time,
+        context1: record.loggerName,
+        context2: record.stackTrace?.toString(),
+      ),
+    );
+  }
+
+  void clearLogs() {
+    _box.clear();
+  }
+
+  Future<void> shareLogs() async {
+    final tempDir = await getTemporaryDirectory();
+    final dateTime = DateTime.now().toIso8601String();
+    final filePath = '${tempDir.path}/Immich_log_$dateTime.csv';
+    final logFile = await File(filePath).create();
+    final io = logFile.openWrite();
+    try {
+      // Write header
+      io.write("created_at,level,context,message,stacktrace\n");
+
+      // Write messages
+      for (final m in messages) {
+        io.write(
+          '${m.createdAt},${m.level},"${m.context1 ?? ""}","${m.message}","${m.context2 ?? ""}"\n',
+        );
+      }
+    } finally {
+      await io.flush();
+      await io.close();
+    }
+
+    // Share file
+    await Share.shareFiles(
+      [filePath],
+      subject: "Immich logs $dateTime",
+      sharePositionOrigin: Rect.zero,
+    );
+
+    // Clean up temp file
+    await logFile.delete();
+  }
+}
--- a/mobile/lib/shared/services/json_cache.dart
+++ b/mobile/lib/shared/services/json_cache.dart
@@ -23,8 +23,12 @@ abstract class JsonCache<T> {
  }

  Future<void> invalidate() async {
-    final file = await _getCacheFile();
-    await file.delete();
+    try {
+      final file = await _getCacheFile();
+      await file.delete();
+    } on FileSystemException {
+      // file is already deleted
+    }
  }

  Future<void> putRawData(dynamic data) async {
@@ -46,4 +50,4 @@ abstract class JsonCache<T> {

  void put(T data);
  Future<T> get();
-}
+}
--- a/mobile/lib/shared/ui/immich_loading_indicator.dart
+++ b/mobile/lib/shared/ui/immich_loading_indicator.dart
@@ -15,7 +15,10 @@ class ImmichLoadingIndicator extends StatelessWidget {
        borderRadius: BorderRadius.circular(10),
      ),
      padding: const EdgeInsets.all(15),
-      child: const CircularProgressIndicator(color: Colors.white),
+      child: const CircularProgressIndicator(
+        color: Colors.white,
+        strokeWidth: 2,
+      ),
    );
  }
 }
--- a/mobile/lib/shared/ui/immich_toast.dart
+++ b/mobile/lib/shared/ui/immich_toast.dart
@@ -15,7 +15,7 @@ class ImmichToast {
    final fToast = FToast();
    fToast.init(context);

-    Color _getColor(ToastType type, BuildContext context) {
+    Color getColor(ToastType type, BuildContext context) {
      switch (type) {
        case ToastType.info:
          return Theme.of(context).primaryColor;
@@ -26,7 +26,7 @@ class ImmichToast {
      }
    }

-    Icon _getIcon(ToastType type) {
+    Icon getIcon(ToastType type) {
      switch (type) {
        case ToastType.info:
          return Icon(
@@ -60,7 +60,7 @@ class ImmichToast {
        child: Row(
          mainAxisSize: MainAxisSize.min,
          children: [
-            _getIcon(toastType),
+            getIcon(toastType),
            const SizedBox(
              width: 12.0,
            ),
@@ -68,7 +68,7 @@ class ImmichToast {
              child: Text(
                msg,
                style: TextStyle(
-                  color: _getColor(toastType, context),
+                  color: getColor(toastType, context),
                  fontWeight: FontWeight.bold,
                  fontSize: 15,
                ),
--- a/mobile/lib/shared/views/app_log_page.dart
+++ b/mobile/lib/shared/views/app_log_page.dart
@@ -0,0 +1,165 @@
+import 'package:auto_route/auto_route.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_hooks/flutter_hooks.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/shared/services/immich_logger.service.dart';
+import 'package:intl/intl.dart';
+
+class AppLogPage extends HookConsumerWidget {
+  const AppLogPage({
+    Key? key,
+  }) : super(key: key);
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final immichLogger = ImmichLogger();
+    final logMessages = useState(immichLogger.messages);
+
+    Widget colorStatusIndicator(Color color) {
+      return Column(
+        mainAxisAlignment: MainAxisAlignment.center,
+        children: [
+          Container(
+            width: 10,
+            height: 10,
+            decoration: BoxDecoration(
+              color: color,
+              shape: BoxShape.circle,
+            ),
+          ),
+        ],
+      );
+    }
+
+    Widget buildLeadingIcon(String level) {
+      switch (level) {
+        case "INFO":
+          return colorStatusIndicator(Theme.of(context).primaryColor);
+        case "SEVERE":
+          return colorStatusIndicator(Colors.redAccent);
+
+        case "WARNING":
+          return colorStatusIndicator(Colors.orangeAccent);
+        default:
+          return colorStatusIndicator(Colors.grey);
+      }
+    }
+
+    getTileColor(String level) {
+      switch (level) {
+        case "INFO":
+          return Colors.transparent;
+        case "SEVERE":
+          return Theme.of(context).brightness == Brightness.dark
+              ? Colors.redAccent.withOpacity(0.25)
+              : Colors.redAccent.withOpacity(0.075);
+        case "WARNING":
+          return Theme.of(context).brightness == Brightness.dark
+              ? Colors.orangeAccent.withOpacity(0.25)
+              : Colors.orangeAccent.withOpacity(0.075);
+        default:
+          return Theme.of(context).primaryColor.withOpacity(0.1);
+      }
+    }
+
+    return Scaffold(
+      appBar: AppBar(
+        title: Text(
+          "Logs - ${logMessages.value.length}",
+          style: const TextStyle(
+            fontWeight: FontWeight.bold,
+            fontSize: 16.0,
+          ),
+        ),
+        scrolledUnderElevation: 1,
+        elevation: 2,
+        actions: [
+          IconButton(
+            icon: Icon(
+              Icons.delete_outline_rounded,
+              color: Theme.of(context).primaryColor,
+              semanticLabel: "Clear logs",
+              size: 20.0,
+            ),
+            onPressed: () {
+              immichLogger.clearLogs();
+              logMessages.value = [];
+            },
+          ),
+          IconButton(
+            icon: Icon(
+              Icons.share_rounded,
+              color: Theme.of(context).primaryColor,
+              semanticLabel: "Share logs",
+              size: 20.0,
+            ),
+            onPressed: () {
+              immichLogger.shareLogs();
+            },
+          ),
+        ],
+        leading: IconButton(
+          onPressed: () {
+            AutoRouter.of(context).pop();
+          },
+          icon: const Icon(
+            Icons.arrow_back_ios_new_rounded,
+            size: 20.0,
+          ),
+        ),
+        centerTitle: true,
+      ),
+      body: ListView.separated(
+        separatorBuilder: (context, index) {
+          return Divider(
+            height: 0,
+            color: Theme.of(context).brightness == Brightness.dark
+                ? Colors.white70
+                : Colors.grey[600],
+          );
+        },
+        itemCount: logMessages.value.length,
+        itemBuilder: (context, index) {
+          var logMessage = logMessages.value[index];
+          return ListTile(
+            visualDensity: VisualDensity.compact,
+            dense: true,
+            tileColor: getTileColor(logMessage.level),
+            minLeadingWidth: 10,
+            title: Text.rich(
+              TextSpan(
+                children: [
+                  TextSpan(
+                    text: "#$index ",
+                    style: TextStyle(
+                      color: Theme.of(context).brightness == Brightness.dark
+                          ? Colors.white70
+                          : Colors.grey[600],
+                      fontSize: 14.0,
+                      fontWeight: FontWeight.bold,
+                    ),
+                  ),
+                  TextSpan(
+                    text: logMessage.message,
+                    style: const TextStyle(
+                      fontSize: 14.0,
+                    ),
+                  ),
+                ],
+              ),
+              style: const TextStyle(fontSize: 14.0, fontFamily: "Inconsolata"),
+            ),
+            subtitle: Text(
+              "[${logMessage.context1}] Logged on ${DateFormat("HH:mm:ss.SSS").format(logMessage.createdAt)}",
+              style: TextStyle(
+                fontSize: 12.0,
+                color: Colors.grey[600],
+              ),
+            ),
+            leading: buildLeadingIcon(logMessage.level),
+          );
+        },
+      ),
+    );
+  }
+}
--- a/mobile/lib/shared/views/splash_screen.dart
+++ b/mobile/lib/shared/views/splash_screen.dart
@@ -20,22 +20,28 @@ class SplashScreenPage extends HookConsumerWidget {
        Hive.box<HiveSavedLoginInfo>(hiveLoginInfoBox).get(savedLoginInfoKey);

    void performLoggingIn() async {
-      if (loginInfo != null) {
-        // Make sure API service is initialized
-        apiService.setEndpoint(loginInfo.serverUrl);
+      try {
+        if (loginInfo != null) {
+          // Make sure API service is initialized
+          apiService.setEndpoint(loginInfo.serverUrl);

-        var isSuccess =
-            await ref.read(authenticationProvider.notifier).setSuccessLoginInfo(
-                  accessToken: loginInfo.accessToken,
-                  isSavedLoginInfo: true,
-                );
-        if (isSuccess) {
-          // Resume backup (if enable) then navigate
-          ref.watch(backupProvider.notifier).resumeBackup();
-          AutoRouter.of(context).replace(const TabControllerRoute());
-        } else {
-          AutoRouter.of(context).replace(const LoginRoute());
+          var isSuccess = await ref
+              .read(authenticationProvider.notifier)
+              .setSuccessLoginInfo(
+                accessToken: loginInfo.accessToken,
+                isSavedLoginInfo: true,
+                serverUrl: loginInfo.serverUrl,
+              );
+          if (isSuccess) {
+            // Resume backup (if enable) then navigate
+            ref.watch(backupProvider.notifier).resumeBackup();
+            AutoRouter.of(context).replace(const TabControllerRoute());
+          } else {
+            AutoRouter.of(context).replace(const LoginRoute());
+          }
        }
+      } catch (_) {
+        AutoRouter.of(context).replace(const LoginRoute());
      }
    }

--- a/mobile/lib/utils/bytes_units.dart
+++ b/mobile/lib/utils/bytes_units.dart
@@ -1,15 +1,17 @@
-
 String formatBytes(int bytes) {
-  if (bytes < 1000) {
-    return "$bytes B";
-  } else if (bytes < 1000000) {
-    final kb = (bytes / 1000).toStringAsFixed(1);
-    return "$kb kB";
-  } else if (bytes < 1000000000) {
-    final mb = (bytes / 1000000).toStringAsFixed(1);
-    return "$mb MB";
-  } else {
-    final gb = (bytes / 1000000000).toStringAsFixed(1);
-    return "$gb GB";
+  const units = ['B', 'KiB', 'MiB', 'GiB', 'TiB', 'PiB', 'EiB'];
+
+  int magnitude = 0;
+  double remainder = bytes.toDouble();
+  while (remainder >= 1024) {
+    if (magnitude + 1 < units.length) {
+      magnitude++;
+      remainder /= 1024;
+    }
+    else {
+      break;
+    }
  }
-}
+
+  return "${remainder.toStringAsFixed(magnitude == 0 ? 0 : 1)} ${units[magnitude]}";
+}
--- a/mobile/lib/utils/immich_cache_info_repository.dart
+++ b/mobile/lib/utils/immich_cache_info_repository.dart
@@ -1,3 +1,5 @@
+// ignore_for_file: depend_on_referenced_packages, implementation_imports
+
 import 'dart:io';
 import 'dart:math';

--- a/mobile/lib/utils/openapi_extensions.dart
+++ b/mobile/lib/utils/openapi_extensions.dart
@@ -0,0 +1,53 @@
+import 'dart:convert';
+import 'dart:io';
+
+import 'package:http/http.dart';
+import 'package:openapi/api.dart';
+
+import 'tuple.dart';
+
+/// Extension methods to retrieve ETag together with the API call
+extension WithETag on AssetApi {
+  /// Get all AssetEntity belong to the user
+  ///
+  /// Parameters:
+  ///
+  /// * [String] eTag:
+  ///   ETag of data already cached on the client
+  Future<Pair<List<AssetResponseDto>, String?>?> getAllAssetsWithETag({
+    String? eTag,
+  }) async {
+    final response = await getAllAssetsWithHttpInfo(
+      ifNoneMatch: eTag,
+    );
+    if (response.statusCode >= HttpStatus.badRequest) {
+      throw ApiException(response.statusCode, await _decodeBodyBytes(response));
+    }
+    // When a remote server returns no body with a status of 204, we shall not decode it.
+    // At the time of writing this, `dart:convert` will throw an "Unexpected end of input"
+    // FormatException when trying to decode an empty string.
+    if (response.body.isNotEmpty &&
+        response.statusCode != HttpStatus.noContent) {
+      final responseBody = await _decodeBodyBytes(response);
+      final etag = response.headers[HttpHeaders.etagHeader];
+      final data = (await apiClient.deserializeAsync(
+              responseBody, 'List<AssetResponseDto>') as List)
+          .cast<AssetResponseDto>()
+          .toList();
+      return Pair(data, etag);
+    }
+    return null;
+  }
+}
+
+/// Returns the decoded body as UTF-8 if the given headers indicate an 'application/json'
+/// content type. Otherwise, returns the decoded body as decoded by dart:http package.
+Future<String> _decodeBodyBytes(Response response) async {
+  final contentType = response.headers['content-type'];
+  return contentType != null &&
+          contentType.toLowerCase().startsWith('application/json')
+      ? response.bodyBytes.isEmpty
+          ? ''
+          : utf8.decode(response.bodyBytes)
+      : response.body;
+}
--- a/mobile/lib/utils/tuple.dart
+++ b/mobile/lib/utils/tuple.dart
@@ -0,0 +1,8 @@
+/// An immutable pair or 2-tuple
+/// TODO replace with Record once Dart 2.19 is available
+class Pair<T1, T2> {
+  final T1 first;
+  final T2 second;
+
+  const Pair(this.first, this.second);
+}
--- a/mobile/openapi/doc/AssetApi.md
+++ b/mobile/openapi/doc/AssetApi.md
@@ -274,7 +274,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)

 # **getAllAssets**
-> List<AssetResponseDto> getAllAssets()
+> List<AssetResponseDto> getAllAssets(ifNoneMatch)



@@ -291,9 +291,10 @@ import 'package:openapi/api.dart';
 //defaultApiClient.getAuthentication<HttpBearerAuth>('bearer').setAccessToken(yourTokenGeneratorFunction);

 final api_instance = AssetApi();
+final ifNoneMatch = ifNoneMatch_example; // String | ETag of data already cached on the client

 try {
-    final result = api_instance.getAllAssets();
+    final result = api_instance.getAllAssets(ifNoneMatch);
    print(result);
 } catch (e) {
    print('Exception when calling AssetApi->getAllAssets: $e\n');
@@ -301,7 +302,10 @@ try {
 ```

 ### Parameters
-This endpoint does not need any parameter.
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **ifNoneMatch** | **String**| ETag of data already cached on the client | [optional] 

 ### Return type

--- a/mobile/openapi/doc/AssetResponseDto.md
+++ b/mobile/openapi/doc/AssetResponseDto.md
@@ -21,10 +21,10 @@ Name | Type | Description | Notes
 **mimeType** | **String** |  | 
 **duration** | **String** |  | 
 **webpPath** | **String** |  | 
-**encodedVideoPath** | **String** |  | 
+**encodedVideoPath** | **String** |  | [optional] 
 **exifInfo** | [**ExifResponseDto**](ExifResponseDto.md) |  | [optional] 
 **smartInfo** | [**SmartInfoResponseDto**](SmartInfoResponseDto.md) |  | [optional] 
-**livePhotoVideoId** | **String** |  | 
+**livePhotoVideoId** | **String** |  | [optional] 

 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)

--- a/mobile/openapi/doc/UserResponseDto.md
+++ b/mobile/openapi/doc/UserResponseDto.md
@@ -16,7 +16,7 @@ Name | Type | Description | Notes
 **profileImagePath** | **String** |  | 
 **shouldChangePassword** | **bool** |  | 
 **isAdmin** | **bool** |  | 
-**deletedAt** | [**DateTime**](DateTime.md) |  | 
+**deletedAt** | [**DateTime**](DateTime.md) |  | [optional] 

 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)

--- a/mobile/openapi/lib/api/asset_api.dart
+++ b/mobile/openapi/lib/api/asset_api.dart
@@ -297,7 +297,12 @@ class AssetApi {
  /// Get all AssetEntity belong to the user
  ///
  /// Note: This method returns the HTTP [Response].
-  Future<Response> getAllAssetsWithHttpInfo() async {
+  ///
+  /// Parameters:
+  ///
+  /// * [String] ifNoneMatch:
+  ///   ETag of data already cached on the client
+  Future<Response> getAllAssetsWithHttpInfo({ String? ifNoneMatch, }) async {
    // ignore: prefer_const_declarations
    final path = r'/asset';

@@ -308,6 +313,10 @@ class AssetApi {
    final headerParams = <String, String>{};
    final formParams = <String, String>{};

+    if (ifNoneMatch != null) {
+      headerParams[r'if-none-match'] = parameterToString(ifNoneMatch);
+    }
+
    const contentTypes = <String>[];


@@ -325,8 +334,13 @@ class AssetApi {
  /// 
  ///
  /// Get all AssetEntity belong to the user
-  Future<List<AssetResponseDto>?> getAllAssets() async {
-    final response = await getAllAssetsWithHttpInfo();
+  ///
+  /// Parameters:
+  ///
+  /// * [String] ifNoneMatch:
+  ///   ETag of data already cached on the client
+  Future<List<AssetResponseDto>?> getAllAssets({ String? ifNoneMatch, }) async {
+    final response = await getAllAssetsWithHttpInfo( ifNoneMatch: ifNoneMatch, );
    if (response.statusCode >= HttpStatus.badRequest) {
      throw ApiException(response.statusCode, await _decodeBodyBytes(response));
    }
--- a/mobile/openapi/lib/model/album_response_dto.dart
+++ b/mobile/openapi/lib/model/album_response_dto.dart
@@ -43,48 +43,51 @@ class AlbumResponseDto {
  List<AssetResponseDto> assets;

  @override
-  bool operator ==(Object other) => identical(this, other) || other is AlbumResponseDto &&
-     other.assetCount == assetCount &&
-     other.id == id &&
-     other.ownerId == ownerId &&
-     other.albumName == albumName &&
-     other.createdAt == createdAt &&
-     other.albumThumbnailAssetId == albumThumbnailAssetId &&
-     other.shared == shared &&
-     other.sharedUsers == sharedUsers &&
-     other.assets == assets;
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      other is AlbumResponseDto &&
+          other.assetCount == assetCount &&
+          other.id == id &&
+          other.ownerId == ownerId &&
+          other.albumName == albumName &&
+          other.createdAt == createdAt &&
+          other.albumThumbnailAssetId == albumThumbnailAssetId &&
+          other.shared == shared &&
+          other.sharedUsers == sharedUsers &&
+          other.assets == assets;

  @override
  int get hashCode =>
-    // ignore: unnecessary_parenthesis
-    (assetCount.hashCode) +
-    (id.hashCode) +
-    (ownerId.hashCode) +
-    (albumName.hashCode) +
-    (createdAt.hashCode) +
-    (albumThumbnailAssetId == null ? 0 : albumThumbnailAssetId!.hashCode) +
-    (shared.hashCode) +
-    (sharedUsers.hashCode) +
-    (assets.hashCode);
+      // ignore: unnecessary_parenthesis
+      (assetCount.hashCode) +
+      (id.hashCode) +
+      (ownerId.hashCode) +
+      (albumName.hashCode) +
+      (createdAt.hashCode) +
+      (albumThumbnailAssetId == null ? 0 : albumThumbnailAssetId!.hashCode) +
+      (shared.hashCode) +
+      (sharedUsers.hashCode) +
+      (assets.hashCode);

  @override
-  String toString() => 'AlbumResponseDto[assetCount=$assetCount, id=$id, ownerId=$ownerId, albumName=$albumName, createdAt=$createdAt, albumThumbnailAssetId=$albumThumbnailAssetId, shared=$shared, sharedUsers=$sharedUsers, assets=$assets]';
+  String toString() =>
+      'AlbumResponseDto[assetCount=$assetCount, id=$id, ownerId=$ownerId, albumName=$albumName, createdAt=$createdAt, albumThumbnailAssetId=$albumThumbnailAssetId, shared=$shared, sharedUsers=$sharedUsers, assets=$assets]';

  Map<String, dynamic> toJson() {
    final _json = <String, dynamic>{};
-      _json[r'assetCount'] = assetCount;
-      _json[r'id'] = id;
-      _json[r'ownerId'] = ownerId;
-      _json[r'albumName'] = albumName;
-      _json[r'createdAt'] = createdAt;
+    _json[r'assetCount'] = assetCount;
+    _json[r'id'] = id;
+    _json[r'ownerId'] = ownerId;
+    _json[r'albumName'] = albumName;
+    _json[r'createdAt'] = createdAt;
    if (albumThumbnailAssetId != null) {
      _json[r'albumThumbnailAssetId'] = albumThumbnailAssetId;
    } else {
      _json[r'albumThumbnailAssetId'] = null;
    }
-      _json[r'shared'] = shared;
-      _json[r'sharedUsers'] = sharedUsers;
-      _json[r'assets'] = assets;
+    _json[r'shared'] = shared;
+    _json[r'sharedUsers'] = sharedUsers;
+    _json[r'assets'] = assets;
    return _json;
  }

@@ -98,13 +101,13 @@ class AlbumResponseDto {
      // Ensure that the map contains the required keys.
      // Note 1: the values aren't checked for validity beyond being non-null.
      // Note 2: this code is stripped in release mode!
-      assert(() {
-        requiredKeys.forEach((key) {
-          assert(json.containsKey(key), 'Required key "AlbumResponseDto[$key]" is missing from JSON.');
-          assert(json[key] != null, 'Required key "AlbumResponseDto[$key]" has a null value in JSON.');
-        });
-        return true;
-      }());
+      // assert(() {
+      //   requiredKeys.forEach((key) {
+      //     assert(json.containsKey(key), 'Required key "AlbumResponseDto[$key]" is missing from JSON.');
+      //     assert(json[key] != null, 'Required key "AlbumResponseDto[$key]" has a null value in JSON.');
+      //   });
+      //   return true;
+      // }());

      return AlbumResponseDto(
        assetCount: mapValueOfType<int>(json, r'assetCount')!,
@@ -112,7 +115,8 @@ class AlbumResponseDto {
        ownerId: mapValueOfType<String>(json, r'ownerId')!,
        albumName: mapValueOfType<String>(json, r'albumName')!,
        createdAt: mapValueOfType<String>(json, r'createdAt')!,
-        albumThumbnailAssetId: mapValueOfType<String>(json, r'albumThumbnailAssetId'),
+        albumThumbnailAssetId:
+            mapValueOfType<String>(json, r'albumThumbnailAssetId'),
        shared: mapValueOfType<bool>(json, r'shared')!,
        sharedUsers: UserResponseDto.listFromJson(json[r'sharedUsers'])!,
        assets: AssetResponseDto.listFromJson(json[r'assets'])!,
@@ -121,7 +125,10 @@ class AlbumResponseDto {
    return null;
  }

-  static List<AlbumResponseDto>? listFromJson(dynamic json, {bool growable = false,}) {
+  static List<AlbumResponseDto>? listFromJson(
+    dynamic json, {
+    bool growable = false,
+  }) {
    final result = <AlbumResponseDto>[];
    if (json is List && json.isNotEmpty) {
      for (final row in json) {
@@ -149,12 +156,18 @@ class AlbumResponseDto {
  }

  // maps a json object with a list of AlbumResponseDto-objects as value to a dart map
-  static Map<String, List<AlbumResponseDto>> mapListFromJson(dynamic json, {bool growable = false,}) {
+  static Map<String, List<AlbumResponseDto>> mapListFromJson(
+    dynamic json, {
+    bool growable = false,
+  }) {
    final map = <String, List<AlbumResponseDto>>{};
    if (json is Map && json.isNotEmpty) {
      json = json.cast<String, dynamic>(); // ignore: parameter_assignments
      for (final entry in json.entries) {
-        final value = AlbumResponseDto.listFromJson(entry.value, growable: growable,);
+        final value = AlbumResponseDto.listFromJson(
+          entry.value,
+          growable: growable,
+        );
        if (value != null) {
          map[entry.key] = value;
        }
@@ -176,4 +189,3 @@ class AlbumResponseDto {
    'assets',
  };
 }
-
--- a/mobile/openapi/lib/model/asset_response_dto.dart
+++ b/mobile/openapi/lib/model/asset_response_dto.dart
@@ -26,10 +26,10 @@ class AssetResponseDto {
    required this.mimeType,
    required this.duration,
    required this.webpPath,
-    required this.encodedVideoPath,
+    this.encodedVideoPath,
    this.exifInfo,
    this.smartInfo,
-    required this.livePhotoVideoId,
+    this.livePhotoVideoId,
  });

  AssetTypeEnum type;
@@ -270,8 +270,6 @@ class AssetResponseDto {
    'mimeType',
    'duration',
    'webpPath',
-    'encodedVideoPath',
-    'livePhotoVideoId',
  };
 }

--- a/mobile/openapi/lib/model/user_response_dto.dart
+++ b/mobile/openapi/lib/model/user_response_dto.dart
@@ -21,7 +21,7 @@ class UserResponseDto {
    required this.profileImagePath,
    required this.shouldChangePassword,
    required this.isAdmin,
-    required this.deletedAt,
+    this.deletedAt,
  });

  String id;
@@ -40,6 +40,12 @@ class UserResponseDto {

  bool isAdmin;

+  ///
+  /// Please note: This property should have been non-nullable! Since the specification file
+  /// does not include a default value (using the "default:" property), however, the generated
+  /// source code must fall back to having a nullable type.
+  /// Consider adding a "default:" property in the specification file to hide this note.
+  ///
  DateTime? deletedAt;

  @override
@@ -173,7 +179,6 @@ class UserResponseDto {
    'profileImagePath',
    'shouldChangePassword',
    'isAdmin',
-    'deletedAt',
  };
 }

--- a/mobile/pubspec.lock
+++ b/mobile/pubspec.lock
@@ -266,7 +266,7 @@ packages:
      name: ffi
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "1.2.1"
+    version: "2.0.1"
  file:
    dependency: transitive
    description:
@@ -554,12 +554,12 @@ packages:
    source: hosted
    version: "1.0.1"
  logging:
-    dependency: transitive
+    dependency: "direct main"
    description:
      name: logging
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "1.0.2"
+    version: "1.1.0"
  matcher:
    dependency: transitive
    description:
@@ -629,7 +629,7 @@ packages:
      name: package_info_plus
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "1.4.2"
+    version: "1.4.3+1"
  package_info_plus_linux:
    dependency: transitive
    description:
@@ -664,7 +664,7 @@ packages:
      name: package_info_plus_windows
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "1.0.5"
+    version: "2.1.0"
  path:
    dependency: "direct main"
    description:
@@ -699,7 +699,7 @@ packages:
      name: path_provider_linux
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "2.1.6"
+    version: "2.1.7"
  path_provider_macos:
    dependency: transitive
    description:
@@ -720,7 +720,7 @@ packages:
      name: path_provider_windows
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "2.0.6"
+    version: "2.1.3"
  pedantic:
    dependency: transitive
    description:
@@ -998,14 +998,14 @@ packages:
      name: sqflite
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "2.0.2+1"
+    version: "2.2.0+3"
  sqflite_common:
    dependency: transitive
    description:
      name: sqflite_common
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "2.2.1+1"
+    version: "2.4.0+2"
  stack_trace:
    dependency: transitive
    description:
@@ -1257,7 +1257,7 @@ packages:
      name: win32
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "2.5.2"
+    version: "2.7.0"
  wkt_parser:
    dependency: transitive
    description:
--- a/mobile/pubspec.yaml
+++ b/mobile/pubspec.yaml
@@ -2,7 +2,7 @@ name: immich_mobile
 description: Immich - selfhosted backup media file on mobile phone

 publish_to: "none"
-version: 1.36.0+55
+version: 1.37.0+58

 environment:
  sdk: ">=2.17.0 <3.0.0"
@@ -47,6 +47,7 @@ dependencies:

  # easy to remove packages:
  image_picker: ^0.8.5+3 # only used to select user profile image from system gallery -> we can simply select an image from within immich?
+  logging: ^1.1.0

 dev_dependencies:
  flutter_test:
@@ -71,7 +72,9 @@ flutter:
    - family: SnowburstOne
      fonts:
        - asset: fonts/SnowburstOne.ttf
-
+    - family: Inconsolata
+      fonts:
+        - asset: fonts/Inconsolata-Regular.ttf
 flutter_icons:
  image_path_android: "assets/immich-logo-no-outline.png"
  image_path_ios: "assets/immich-logo-no-outline.png"
--- a/server/apps/immich/src/api-v1/album/response-dto/album-response.dto.ts
+++ b/server/apps/immich/src/api-v1/album/response-dto/album-response.dto.ts
@@ -18,7 +18,14 @@ export class AlbumResponseDto {
 }

 export function mapAlbum(entity: AlbumEntity): AlbumResponseDto {
-  const sharedUsers = entity.sharedUsers?.map((userAlbum) => mapUser(userAlbum.userInfo)) || [];
+  const sharedUsers: UserResponseDto[] = [];
+
+  entity.sharedUsers?.forEach((userAlbum) => {
+    if (userAlbum.userInfo) {
+      const user = mapUser(userAlbum.userInfo);
+      sharedUsers.push(user);
+    }
+  });
  return {
    albumName: entity.albumName,
    albumThumbnailAssetId: entity.albumThumbnailAssetId,
@@ -33,7 +40,14 @@ export function mapAlbum(entity: AlbumEntity): AlbumResponseDto {
 }

 export function mapAlbumExcludeAssetInfo(entity: AlbumEntity): AlbumResponseDto {
-  const sharedUsers = entity.sharedUsers?.map((userAlbum) => mapUser(userAlbum.userInfo)) || [];
+  const sharedUsers: UserResponseDto[] = [];
+
+  entity.sharedUsers?.forEach((userAlbum) => {
+    if (userAlbum.userInfo) {
+      const user = mapUser(userAlbum.userInfo);
+      sharedUsers.push(user);
+    }
+  });
  return {
    albumName: entity.albumName,
    albumThumbnailAssetId: entity.albumThumbnailAssetId,
--- a/server/apps/immich/src/api-v1/asset/asset.controller.ts
+++ b/server/apps/immich/src/api-v1/asset/asset.controller.ts
@@ -21,12 +21,12 @@ import { FileFieldsInterceptor } from '@nestjs/platform-express';
 import { assetUploadOption } from '../../config/asset-upload.config';
 import { AuthUserDto, GetAuthUser } from '../../decorators/auth-user.decorator';
 import { ServeFileDto } from './dto/serve-file.dto';
-import { Response as Res } from 'express';
+import { Response as Res} from 'express';
 import { BackgroundTaskService } from '../../modules/background-task/background-task.service';
 import { DeleteAssetDto } from './dto/delete-asset.dto';
 import { SearchAssetDto } from './dto/search-asset.dto';
 import { CheckDuplicateAssetDto } from './dto/check-duplicate-asset.dto';
-import { ApiBearerAuth, ApiBody, ApiConsumes, ApiTags } from '@nestjs/swagger';
+import { ApiBearerAuth, ApiBody, ApiConsumes, ApiHeader, ApiTags } from '@nestjs/swagger';
 import { CuratedObjectsResponseDto } from './response-dto/curated-objects-response.dto';
 import { CuratedLocationsResponseDto } from './response-dto/curated-locations-response.dto';
 import { AssetResponseDto } from './response-dto/asset-response.dto';
@@ -108,7 +108,7 @@ export class AssetController {
  }

  @Get('/file/:assetId')
-  @Header('Cache-Control', 'max-age=300')
+  @Header('Cache-Control', 'max-age=3600')
  async serveFile(
    @Headers() headers: Record<string, string>,
    @Response({ passthrough: true }) res: Res,
@@ -119,13 +119,14 @@ export class AssetController {
  }

  @Get('/thumbnail/:assetId')
-  @Header('Cache-Control', 'max-age=300')
+  @Header('Cache-Control', 'max-age=3600')
  async getAssetThumbnail(
+    @Headers() headers: Record<string, string>,
    @Response({ passthrough: true }) res: Res,
    @Param('assetId') assetId: string,
    @Query(new ValidationPipe({ transform: true })) query: GetAssetThumbnailDto,
  ): Promise<any> {
-    return this.assetService.getAssetThumbnail(assetId, query, res);
+    return this.assetService.getAssetThumbnail(assetId, query, res, headers);
  }

  @Get('/curated-objects')
@@ -168,8 +169,15 @@ export class AssetController {
   * Get all AssetEntity belong to the user
   */
  @Get('/')
+  @ApiHeader({
+    name: 'if-none-match',
+    description: 'ETag of data already cached on the client',
+    required: false,
+    schema: { type: 'string' },
+  })
  async getAllAssets(@GetAuthUser() authUser: AuthUserDto): Promise<AssetResponseDto[]> {
-    return await this.assetService.getAllAssets(authUser);
+    const assets = await this.assetService.getAllAssets(authUser);
+    return assets;
  }

  @Post('/time-bucket')
--- a/server/apps/immich/src/api-v1/asset/asset.service.ts
+++ b/server/apps/immich/src/api-v1/asset/asset.service.ts
@@ -306,7 +306,12 @@ export class AssetService {
    }
  }

-  public async getAssetThumbnail(assetId: string, query: GetAssetThumbnailDto, res: Res) {
+  public async getAssetThumbnail(
+    assetId: string,
+    query: GetAssetThumbnailDto,
+    res: Res,
+    headers: Record<string, string>,
+  ) {
    let fileReadStream: ReadStream;

    const asset = await this.assetRepository.findOne({ where: { id: assetId } });
@@ -316,28 +321,22 @@ export class AssetService {
    }

    try {
-      if (query.format == GetAssetThumbnailFormatEnum.JPEG) {
+      if (query.format == GetAssetThumbnailFormatEnum.WEBP && asset.webpPath && asset.webpPath.length > 0) {
+        if (await processETag(asset.webpPath, res, headers)) {
+          return;
+        }
+        await fs.access(asset.webpPath, constants.R_OK);
+        fileReadStream = createReadStream(asset.webpPath);
+      } else {
        if (!asset.resizePath) {
          throw new NotFoundException('resizePath not set');
        }
-
-        await fs.access(asset.resizePath, constants.R_OK | constants.W_OK);
-        fileReadStream = createReadStream(asset.resizePath);
-      } else {
-        if (asset.webpPath && asset.webpPath.length > 0) {
-          await fs.access(asset.webpPath, constants.R_OK | constants.W_OK);
-          fileReadStream = createReadStream(asset.webpPath);
-        } else {
-          if (!asset.resizePath) {
-            throw new NotFoundException('resizePath not set');
-          }
-
-          await fs.access(asset.resizePath, constants.R_OK | constants.W_OK);
-          fileReadStream = createReadStream(asset.resizePath);
+        if (await processETag(asset.resizePath, res, headers)) {
+          return;
        }
+        await fs.access(asset.resizePath, constants.R_OK);
+        fileReadStream = createReadStream(asset.resizePath);
      }
-
-      res.header('Cache-Control', 'max-age=300');
      return new StreamableFile(fileReadStream);
    } catch (e) {
      res.header('Cache-Control', 'none');
@@ -349,7 +348,7 @@ export class AssetService {
    }
  }

-  public async serveFile(assetId: string, query: ServeFileDto, res: Res, headers: any) {
+  public async serveFile(assetId: string, query: ServeFileDto, res: Res, headers: Record<string, string>) {
    let fileReadStream: ReadStream;
    const asset = await this._assetRepository.getById(assetId);

@@ -371,6 +370,9 @@ export class AssetService {
            Logger.error('Error serving IMAGE asset for web', 'ServeFile');
            throw new InternalServerErrorException(`Failed to serve image asset for web`, 'ServeFile');
          }
+          if (await processETag(asset.resizePath, res, headers)) {
+            return;
+          }
          await fs.access(asset.resizePath, constants.R_OK | constants.W_OK);
          fileReadStream = createReadStream(asset.resizePath);

@@ -384,7 +386,9 @@ export class AssetService {
          res.set({
            'Content-Type': asset.mimeType,
          });
-
+          if (await processETag(asset.originalPath, res, headers)) {
+            return;
+          }
          await fs.access(asset.originalPath, constants.R_OK | constants.W_OK);
          fileReadStream = createReadStream(asset.originalPath);
        } else {
@@ -392,7 +396,9 @@ export class AssetService {
            res.set({
              'Content-Type': 'image/webp',
            });
-
+            if (await processETag(asset.webpPath, res, headers)) {
+              return;
+            }
            await fs.access(asset.webpPath, constants.R_OK | constants.W_OK);
            fileReadStream = createReadStream(asset.webpPath);
          } else {
@@ -403,6 +409,9 @@ export class AssetService {
            if (!asset.resizePath) {
              throw new Error('resizePath not set');
            }
+            if (await processETag(asset.resizePath, res, headers)) {
+              return;
+            }

            await fs.access(asset.resizePath, constants.R_OK | constants.W_OK);
            fileReadStream = createReadStream(asset.resizePath);
@@ -436,9 +445,9 @@ export class AssetService {

        if (range) {
          /** Extracting Start and End value from Range Header */
-          let [start, end] = range.replace(/bytes=/, '').split('-');
-          start = parseInt(start, 10);
-          end = end ? parseInt(end, 10) : size - 1;
+          const [startStr, endStr] = range.replace(/bytes=/, '').split('-');
+          let start = parseInt(startStr, 10);
+          let end = endStr ? parseInt(endStr, 10) : size - 1;

          if (!isNaN(start) && isNaN(end)) {
            start = start;
@@ -475,7 +484,9 @@ export class AssetService {
          res.set({
            'Content-Type': mimeType,
          });
-
+          if (await processETag(asset.originalPath, res, headers)) {
+            return;
+          }
          return new StreamableFile(createReadStream(videoPath));
        }
      } catch (e) {
@@ -632,3 +643,14 @@ export class AssetService {
    return this._assetRepository.getAssetCountByUserId(authUser.id);
  }
 }
+
+async function processETag(path: string, res: Res, headers: Record<string, string>): Promise<boolean> {
+  const { size, mtimeNs } = await fs.stat(path, { bigint: true });
+  const etag = `W/"${size}-${mtimeNs}"`;
+  res.setHeader('ETag', etag);
+  if (etag === headers['if-none-match']) {
+    res.status(304);
+    return true;
+  }
+  return false;
+}
--- a/server/apps/immich/src/api-v1/asset/response-dto/asset-response.dto.ts
+++ b/server/apps/immich/src/api-v1/asset/response-dto/asset-response.dto.ts
@@ -19,10 +19,10 @@ export class AssetResponseDto {
  mimeType!: string | null;
  duration!: string;
  webpPath!: string | null;
-  encodedVideoPath!: string | null;
+  encodedVideoPath?: string | null;
  exifInfo?: ExifResponseDto;
  smartInfo?: SmartInfoResponseDto;
-  livePhotoVideoId!: string | null;
+  livePhotoVideoId?: string | null;
 }

 export function mapAsset(entity: AssetEntity): AssetResponseDto {
--- a/server/apps/immich/src/api-v1/user/response-dto/user-response.dto.ts
+++ b/server/apps/immich/src/api-v1/user/response-dto/user-response.dto.ts
@@ -9,7 +9,7 @@ export class UserResponseDto {
  profileImagePath!: string;
  shouldChangePassword!: boolean;
  isAdmin!: boolean;
-  deletedAt!: Date | null;
+  deletedAt?: Date;
 }

 export function mapUser(entity: UserEntity): UserResponseDto {
@@ -22,6 +22,6 @@ export function mapUser(entity: UserEntity): UserResponseDto {
    profileImagePath: entity.profileImagePath,
    shouldChangePassword: entity.shouldChangePassword,
    isAdmin: entity.isAdmin,
-    deletedAt: entity.deletedAt || null,
+    deletedAt: entity.deletedAt,
  };
 }
--- a/server/apps/immich/src/api-v1/user/user.service.spec.ts
+++ b/server/apps/immich/src/api-v1/user/user.service.spec.ts
@@ -127,5 +127,16 @@ describe('UserService', () => {
      });
      expect(result).rejects.toBeInstanceOf(NotFoundException);
    });
+
+    it('cannot delete admin user', () => {
+      const requestor = adminAuthUser;
+
+      userRepositoryMock.get.mockImplementationOnce(() => Promise.resolve(adminUser));
+      userRepositoryMock.get.mockImplementationOnce(() => Promise.resolve(adminUser));
+
+      const result = sui.deleteUser(requestor, adminAuthUser.id);
+
+      expect(result).rejects.toBeInstanceOf(BadRequestException);
+    });
  });
 });
--- a/server/apps/immich/src/api-v1/user/user.service.ts
+++ b/server/apps/immich/src/api-v1/user/user.service.ts
@@ -119,6 +119,11 @@ export class UserService {
    if (!user) {
      throw new BadRequestException('User not found');
    }
+
+    if (user.isAdmin) {
+      throw new BadRequestException('Cannot delete admin user');
+    }
+
    try {
      const deletedUser = await this.userRepository.delete(user);
      return mapUser(deletedUser);
--- a/server/apps/immich/src/constants/server_version.constant.ts
+++ b/server/apps/immich/src/constants/server_version.constant.ts
@@ -10,7 +10,7 @@ export interface IServerVersion {

 export const serverVersion: IServerVersion = {
  major: 1,
-  minor: 36,
+  minor: 37,
  patch: 0,
-  build: 55,
+  build: 58,
 };
--- a/server/apps/immich/src/main.ts
+++ b/server/apps/immich/src/main.ts
@@ -14,6 +14,7 @@ async function bootstrap() {
  const app = await NestFactory.create<NestExpressApplication>(AppModule);

  app.set('trust proxy');
+  app.set('etag', 'strong');
  app.use(cookieParser());
  app.use(json({ limit: '10mb' }));
  if (process.env.NODE_ENV === 'development') {
--- a/server/apps/immich/src/modules/download/download.service.ts
+++ b/server/apps/immich/src/modules/download/download.service.ts
@@ -35,7 +35,7 @@ export class DownloadService {
        fileCount++;

        // for easier testing, can be changed before merging.
-        if (totalSize > HumanReadableSize.GB * 20) {
+        if (totalSize > HumanReadableSize.GiB * 20) {
          complete = false;
          this.logger.log(
            `Archive size exceeded after ${fileCount} files, capping at ${totalSize} bytes (${asHumanReadable(
--- a/server/apps/immich/src/utils/human-readable.util.ts
+++ b/server/apps/immich/src/utils/human-readable.util.ts
@@ -1,31 +1,25 @@
-const KB = 1000;
-const MB = KB * 1000;
-const GB = MB * 1000;
-const TB = GB * 1000;
-const PB = TB * 1000;
+const KiB = Math.pow(1024, 1);
+const MiB = Math.pow(1024, 2);
+const GiB = Math.pow(1024, 3);
+const TiB = Math.pow(1024, 4);
+const PiB = Math.pow(1024, 5);

-export const HumanReadableSize = { KB, MB, GB, TB, PB };
+export const HumanReadableSize = { KiB, MiB, GiB, TiB, PiB };

-export function asHumanReadable(bytes: number, precision = 1) {
-  if (bytes >= PB) {
-    return `${(bytes / PB).toFixed(precision)}PB`;
-  }
+export function asHumanReadable(bytes: number, precision = 1): string {
+  const units = ['B', 'KiB', 'MiB', 'GiB', 'TiB', 'PiB', 'EiB'];

-  if (bytes >= TB) {
-    return `${(bytes / TB).toFixed(precision)}TB`;
-  }
+	let magnitude = 0;
+	let remainder = bytes;
+	while (remainder >= 1024) {
+		if (magnitude + 1 < units.length) {
+			magnitude++;
+			remainder /= 1024;
+		}
+		else {
+			break;
+		}
+	}

-  if (bytes >= GB) {
-    return `${(bytes / GB).toFixed(precision)}GB`;
-  }
-
-  if (bytes >= MB) {
-    return `${(bytes / MB).toFixed(precision)}MB`;
-  }
-
-  if (bytes >= KB) {
-    return `${(bytes / KB).toFixed(precision)}KB`;
-  }
-
-  return `${bytes}B`;
+	return `${remainder.toFixed( magnitude == 0 ? 0 : precision )} ${units[magnitude]}`;
 }
--- a/server/immich-openapi-specs.json
+++ b/server/immich-openapi-specs.json
--- a/web/src/api/open-api/api.ts
+++ b/web/src/api/open-api/api.ts
@@ -427,7 +427,7 @@ export interface AssetResponseDto {
     * @type {string}
     * @memberof AssetResponseDto
     */
-    'encodedVideoPath': string | null;
+    'encodedVideoPath'?: string | null;
    /**
     * 
     * @type {ExifResponseDto}
@@ -445,7 +445,7 @@ export interface AssetResponseDto {
     * @type {string}
     * @memberof AssetResponseDto
     */
-    'livePhotoVideoId': string | null;
+    'livePhotoVideoId'?: string | null;
 }
 /**
 * 
@@ -1729,7 +1729,7 @@ export interface UserResponseDto {
     * @type {string}
     * @memberof UserResponseDto
     */
-    'deletedAt': string | null;
+    'deletedAt'?: string;
 }
 /**
 * 
@@ -2788,10 +2788,11 @@ export const AssetApiAxiosParamCreator = function (configuration?: Configuration
        /**
         * Get all AssetEntity belong to the user
         * @summary 
+         * @param {string} [ifNoneMatch] ETag of data already cached on the client
         * @param {*} [options] Override http request option.
         * @throws {RequiredError}
         */
-        getAllAssets: async (options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        getAllAssets: async (ifNoneMatch?: string, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
            const localVarPath = `/asset`;
            // use dummy base URL string because the URL constructor only accepts absolute URLs.
            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
@@ -2808,6 +2809,10 @@ export const AssetApiAxiosParamCreator = function (configuration?: Configuration
            // http bearer authentication required
            await setBearerAuthToObject(localVarHeaderParameter, configuration)

+            if (ifNoneMatch !== undefined && ifNoneMatch !== null) {
+                localVarHeaderParameter['if-none-match'] = String(ifNoneMatch);
+            }
+

    
            setSearchParams(localVarUrlObj, localVarQueryParameter);
@@ -3388,11 +3393,12 @@ export const AssetApiFp = function(configuration?: Configuration) {
        /**
         * Get all AssetEntity belong to the user
         * @summary 
+         * @param {string} [ifNoneMatch] ETag of data already cached on the client
         * @param {*} [options] Override http request option.
         * @throws {RequiredError}
         */
-        async getAllAssets(options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<Array<AssetResponseDto>>> {
-            const localVarAxiosArgs = await localVarAxiosParamCreator.getAllAssets(options);
+        async getAllAssets(ifNoneMatch?: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<Array<AssetResponseDto>>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.getAllAssets(ifNoneMatch, options);
            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
        },
        /**
@@ -3590,11 +3596,12 @@ export const AssetApiFactory = function (configuration?: Configuration, basePath
        /**
         * Get all AssetEntity belong to the user
         * @summary 
+         * @param {string} [ifNoneMatch] ETag of data already cached on the client
         * @param {*} [options] Override http request option.
         * @throws {RequiredError}
         */
-        getAllAssets(options?: any): AxiosPromise<Array<AssetResponseDto>> {
-            return localVarFp.getAllAssets(options).then((request) => request(axios, basePath));
+        getAllAssets(ifNoneMatch?: string, options?: any): AxiosPromise<Array<AssetResponseDto>> {
+            return localVarFp.getAllAssets(ifNoneMatch, options).then((request) => request(axios, basePath));
        },
        /**
         * Get a single asset\'s information
@@ -3788,12 +3795,13 @@ export class AssetApi extends BaseAPI {
    /**
     * Get all AssetEntity belong to the user
     * @summary 
+     * @param {string} [ifNoneMatch] ETag of data already cached on the client
     * @param {*} [options] Override http request option.
     * @throws {RequiredError}
     * @memberof AssetApi
     */
-    public getAllAssets(options?: AxiosRequestConfig) {
-        return AssetApiFp(this.configuration).getAllAssets(options).then((request) => request(this.axios, this.basePath));
+    public getAllAssets(ifNoneMatch?: string, options?: AxiosRequestConfig) {
+        return AssetApiFp(this.configuration).getAllAssets(ifNoneMatch, options).then((request) => request(this.axios, this.basePath));
    }

    /**
--- a/web/src/lib/components/admin-page/server-stats/server-stats-panel.svelte
+++ b/web/src/lib/components/admin-page/server-stats/server-stats-panel.svelte
@@ -15,8 +15,8 @@
 		return name;
 	};

-	$: spaceUnit = stats.usage.slice(stats.usage.length - 2, stats.usage.length);
-	$: spaceUsage = stats.usage.slice(0, stats.usage.length - 2);
+	$: spaceUnit = stats.usage.split(' ')[1];
+	$: spaceUsage = stats.usage.split(' ')[0];
 </script>

 <div class="flex flex-col gap-5">
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Alex	a384798779	Up version for release	2022-11-30 11:18:06 -06:00
Alex	d31eddf32f	chore(mobile) Improve mobile UI (#1038 )	2022-11-30 10:58:07 -06:00
Fynn Petersen-Frey	1068c4ad23	feat(server,web): activate ETags for all API endpoints and asset serving (#1031 ) This greatly reduces the network traffic by app/web.	2022-11-29 15:45:47 -06:00
Alex	cbc979263e	chore(mobile): Improve readability of logs page (#1033 )	2022-11-28 14:14:22 -06:00
Fynn Petersen-Frey	765181bbc0	chore(mobile): improve CSV log export (#1032 )	2022-11-28 10:17:27 -06:00
Fynn Petersen-Frey	d82dec9773	fix(mobile): fix cache invalidation on logout (#1030 ) await all the cache-invalidation operations during logout and catch errors to actually perform all operations.	2022-11-28 10:01:09 -06:00
Alex	024177515d	feat(mobile) Add in app logging to show app's log information (#1014 )	2022-11-27 14:34:19 -06:00
Alex Tran	fb3b36a569	Added test for user.service	2022-11-26 15:09:06 -06:00
Alex	614743c8f4	fix(server): Prevent delete admin user (#1023 )	2022-11-26 15:02:23 -06:00
Fynn Petersen-Frey	47f5e4134e	feat(mobile): use cached asset info if unchanged instead of downloading all assets (#1017 ) * feat(mobile): use cached asset info if unchanged instead of downloading all assets This adds an HTTP ETag to the getAllAssets endpoint and client-side support in the app. If locally cache content is identical to the content on the server, the potentially large list of all assets does not need to be downloaded. * use ts import instead of require	2022-11-26 10:16:02 -06:00
denck007	efa7b3ba54	Fix(web): navbar color overlap and scroll bar incorrect z index (#1018 ) * fix(web): Navbar color overlaps tall images * fix(web): Scroll bar date behind navbar when scrubbing (fixes issue #757)	2022-11-25 20:52:01 -06:00
Alex	1e9d67ec39	Up mobile version for hotfix release	2022-11-24 15:50:18 -06:00
Alex	80d0ddca9a	fix(mobile): Fix not able to show device asset on Android 13 (#1016 )	2022-11-24 15:47:55 -06:00
Kiel Hurley	976d347623	feat(server,web,mobile): Use binary prefixes for data sizes (#1009 )	2022-11-24 11:39:27 -06:00
Alex Tran	df0a059a02	Up patch version	2022-11-21 20:26:03 -06:00
Alex	cc697486fc	fix(server): Deleted shared users cause problem with album retrival and creation (#1002 ) * fix(server): Deleted shared users cause problem with album retrival and creation * Remove dead code	2022-11-21 20:24:56 -06:00
Alex	2227a6f5f3	Added custom buildscript for XCodeCloud	2022-11-21 13:54:30 -06:00
Alex	a9320f06e8	Added v1.36 release note to website	2022-11-21 12:53:25 -06:00
Alex	39b7ab66d4	chore(mobile): clean up linter problems (#1000 )	2022-11-21 06:13:14 -06:00
Alex Tran	bc9ee1d611	Added hotfix release note	2022-11-21 05:41:44 -06:00
Alex	56ce747ffc	fix(mobile): freeze on splash screen due to accessing bad state (#998 )	2022-11-21 05:29:43 -06:00