reduce widget rebuild

.github/workflows/docker-cleanup.yml

@@ -38,7 +38,7 @@ jobs:
       -
         name: Clean temporary images
         if: "${{ env.TOKEN != '' }}"
-        uses: stumpylog/image-cleaner-action/ephemeral@v0.4.0
+        uses: stumpylog/image-cleaner-action/ephemeral@v0.3.0
         with:
           token: "${{ env.TOKEN }}"
           owner: "immich-app"
@@ -70,7 +70,7 @@ jobs:
       -
         name: Clean untagged images
         if: "${{ env.TOKEN != '' }}"
-        uses: stumpylog/image-cleaner-action/untagged@v0.4.0
+        uses: stumpylog/image-cleaner-action/untagged@v0.3.0
         with:
           token: "${{ env.TOKEN }}"
           owner: "immich-app"

README.md

@@ -2,7 +2,7 @@
   <br/>  
   <a href="https://opensource.org/licenses/MIT"><img src="https://img.shields.io/badge/license-MIT-green.svg?color=3F51B5&style=for-the-badge&label=License&logoColor=000000&labelColor=ececec" alt="License: MIT"></a>
   <a href="https://discord.gg/D8JsnBEuKb">
-    <img src="https://img.shields.io/discord/979116623879368755.svg?label=Discord&logo=Discord&style=for-the-badge&logoColor=000000&labelColor=ececec" alt="Discord"/>
+    <img src="https://img.shields.io/discord/979116623879368755.svg?label=Discord&logo=Discord&style=for-the-badge&logoColor=000000&labelColor=ececec" atl="Discord"/>
   </a>
   <br/>  
   <br/>   

cli/src/api/open-api/base.ts

@@ -4,7 +4,7 @@
  * Immich
  * Immich API
  *
- * The version of the OpenAPI document: 1.85.0
+ * The version of the OpenAPI document: 1.84.0
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

cli/src/api/open-api/common.ts

@@ -4,7 +4,7 @@
  * Immich
  * Immich API
  *
- * The version of the OpenAPI document: 1.85.0
+ * The version of the OpenAPI document: 1.84.0
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

cli/src/api/open-api/configuration.ts

@@ -4,7 +4,7 @@
  * Immich
  * Immich API
  *
- * The version of the OpenAPI document: 1.85.0
+ * The version of the OpenAPI document: 1.84.0
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

cli/src/api/open-api/index.ts

@@ -4,7 +4,7 @@
  * Immich
  * Immich API
  *
- * The version of the OpenAPI document: 1.85.0
+ * The version of the OpenAPI document: 1.84.0
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

docker/docker-compose.dev.yml

@@ -1,7 +1,3 @@
-# See:
-# - https://immich.app/docs/developer/setup
-# - https://immich.app/docs/developer/troubleshooting
-
 version: "3.8"
 
 services:
@@ -75,6 +71,10 @@ services:
     command: npm run dev --host
     env_file:
       - .env
+    environment:
+      # Rename these values for svelte public interface
+      - PUBLIC_IMMICH_SERVER_URL=${IMMICH_SERVER_URL}
+      - PUBLIC_IMMICH_API_URL_EXTERNAL=${IMMICH_API_URL_EXTERNAL}
     ports:
       - 3000:3000
       - 24678:24678

docker/docker-compose.prod.yml

@@ -7,9 +7,9 @@ services:
     build:
       context: ../server
       dockerfile: Dockerfile
-    command: [ "./start-server.sh" ]
+    command: ["./start-server.sh"]
     volumes:
-      - ${UPLOAD_LOCATION}/photos:/usr/src/app/upload
+      - ${UPLOAD_LOCATION}:/usr/src/app/upload
       - /etc/localtime:/etc/localtime:ro
     env_file:
       - .env
@@ -18,6 +18,19 @@ services:
       - database
       - typesense
 
+  immich-machine-learning:
+    container_name: immich_machine_learning
+    image: immich-machine-learning:latest
+    build:
+      context: ../machine-learning
+      dockerfile: Dockerfile
+    volumes:
+      - ${UPLOAD_LOCATION}:/usr/src/app/upload
+      - model-cache:/cache
+    env_file:
+      - .env
+    restart: always
+
   immich-microservices:
     container_name: immich_microservices
     image: immich-microservices:latest
@@ -27,9 +40,9 @@ services:
     build:
       context: ../server
       dockerfile: Dockerfile
-    command: [ "./start-microservices.sh" ]
+    command: ["./start-microservices.sh"]
     volumes:
-      - ${UPLOAD_LOCATION}/photos:/usr/src/app/upload
+      - ${UPLOAD_LOCATION}:/usr/src/app/upload
       - /etc/localtime:/etc/localtime:ro
     env_file:
       - .env
@@ -51,18 +64,6 @@ services:
     depends_on:
       - immich-server
 
-  immich-machine-learning:
-    container_name: immich_machine_learning
-    image: immich-machine-learning:latest
-    build:
-      context: ../machine-learning
-      dockerfile: Dockerfile
-    volumes:
-      - model-cache:/cache
-    env_file:
-      - .env
-    restart: always
-
   typesense:
     container_name: immich_typesense
     image: typesense/typesense:0.24.1@sha256:9bcff2b829f12074426ca044b56160ca9d777a0c488303469143dd9f8259d4dd
@@ -72,7 +73,7 @@ services:
       # remove this to get debug messages
       - GLOG_minloglevel=1
     volumes:
-      - ${UPLOAD_LOCATION}/typesense:/data
+      - tsdata:/data
     restart: always
 
   redis:
@@ -90,7 +91,7 @@ services:
       POSTGRES_USER: ${DB_USERNAME}
       POSTGRES_DB: ${DB_DATABASE_NAME}
     volumes:
-      - ${UPLOAD_LOCATION}/postgres:/var/lib/postgresql/data
+      - pgdata:/var/lib/postgresql/data
     restart: always
 
   immich-proxy:
@@ -112,4 +113,6 @@ services:
     restart: always
 
 volumes:
+  pgdata:
   model-cache:
+  tsdata:

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

@@ -17,13 +17,13 @@ docker exec -t immich_postgres pg_dumpall -c -U postgres | gzip > "/path/to/back
 ```
 
 ```bash title='Restore'
-docker compose down -v  # CAUTION! Deletes all Immich data to start from scratch.
+docker-compose down -v  # CAUTION! Deletes all Immich data to start from scratch.
-docker compose pull     # Update to latest version of Immich (if desired)
+docker-compose pull     # Update to latest version of Immich (if desired)
-docker compose create   # Create Docker containers for Immich apps without running them.
+docker-compose create   # Create Docker containers for Immich apps without running them.
 docker start immich_postgres    # Start Postgres server
 sleep 10    # Wait for Postgres server to start up
 gunzip < "/path/to/backup/dump.sql.gz" | docker exec -i immich_postgres psql -U postgres -d immich    # Restore Backup
-docker compose up -d    # Start remainder of Immich apps
+docker-compose up -d    # Start remainder of Immich apps
 ```
 
 Note that for the database restore to proceed properly, it requires a completely fresh install (i.e. the Immich server has never run since creating the Docker containers). If the Immich app has run, Postgres conflicts may be encountered upon database restoration (relation already exists, violated foreign key constraints, multiple primary keys, etc.).

docs/docs/developer/troubleshooting.md

@@ -1,19 +0,0 @@
-# Troubleshooting
-
-:::tip
-A great option to get assistance with troubleshooting is to join our [Discord](https://discord.gg/D8JsnBEuKb) server, where we have a dedicated channel for `#contributing`.
-:::
-
-## Known Issues
-
-### Running on Windows
-
-Running Immich on Windows can be frustrating and there are lots of ways it can go wrong. Where possible we recommend using Docker on Linux. However, several people have had success running Immich on Windows using Docker via WSL2.
-
-### NTFS Mounted Volumes
-
-The docker-compose.dev.yml and docker-compose.prod.yml use volume mounts for the postgres database. On start-up, postgres will try to `chown` the data directory, but fail. See [this post](https://forums.docker.com/t/data-directory-var-lib-postgresql-data-pgdata-has-wrong-ownership/17963/24) for more information about this issue and possible solutions.
-
-### `Cannot read properties of null (reading 'split')`
-
-This error occurs when trying to access the app via port `3000` instead of `2283`. During development `immich-proxy` runs on port 2283, while `immich-web` runs on `3000`.

docs/docs/features/bulk-upload.md

@@ -4,10 +4,6 @@ You can use the CLI to upload an existing gallery to the Immich server
 
 [Immich CLI Repository](https://github.com/immich-app/CLI)
 
-:::tip Google Photos Takeout
-If you are looking to import your Google Photos takeout, we recommed this community maintained tool [immich-go](https://github.com/simulot/immich-go)
-:::
-
 ## Requirements
 
 - Node.js 16 or above

docs/docs/features/facial-recognition.md

@@ -1,7 +1,5 @@
 # Facial Recognition
 
-## Overview
-
 Immich recognizes faces in your photos and videos and groups them together. You can then assign names to the faces and search for them.
 
 The list of people is shown in the Explore page.
@@ -15,16 +13,3 @@ Upon clicking on a person, a list of assets that contain their face will be show
 The asset detail view will also show the faces that are recognized in the asset.
 
 <img src={require('./img/facial-recognition-3.png').default} title='Facial Recognition 3' />
-
-## Actions
-
-Additional actions you can do with a detected person are:
-
-- Change the feature face photo of the person
-- Set date of birth
-- Merge two or more detected faces into one person
-- Hide face
-
-It can be found from the app bar when you access the detial view of a person
-
-<img src={require('./img/facial-recognition-4.png').default} title='Facial Recognition 4' width="70%"/>

docs/docs/features/mobile-app.mdx

@@ -1,6 +1,6 @@
 import MobileAppDownload from '../partials/_mobile-app-download.md';
 import MobileAppLogin from '../partials/_mobile-app-login.md';
-import MobileAppBackup from '../partials/_mobile-app-backup.md';
+import MobileAppBackup from '../partials/_mobile-app-login.md';
 
 # Mobile App
 

docs/docs/guides/python-file-upload.md

@@ -1,42 +0,0 @@
-# Python File Upload
-
-```python
-#!/usr/bin/python3
-
-import requests
-import os
-from datetime import datetime
-
-API_KEY = 'YOUR_API_KEY'                # replace with a valid api key
-BASE_URL = 'http://127.0.0.1:2283/api'  # replace as needed
-
-
-def upload(file):
-    stats = os.stat(file)
-
-    headers = {
-        'Accept': 'application/json',
-        'x-api-key': API_KEY
-    }
-
-    data = {
-        'deviceAssetId': f'{file}-{stats.st_mtime}',
-        'deviceId': 'python',
-        'fileCreatedAt': datetime.fromtimestamp(stats.st_mtime),
-        'fileModifiedAt': datetime.fromtimestamp(stats.st_mtime),
-        'isFavorite': 'false',
-    }
-
-    files = {
-        'assetData': open(file, 'rb')
-    }
-
-    response = requests.post(
-        f'{BASE_URL}/asset/upload', headers=headers, data=data, files=files)
-
-    print(response.json())
-    # {'id': 'ef96f635-61c7-4639-9e60-61a11c4bbfba', 'duplicate': False}
-
-
-upload('./test.jpg')
-```

docs/docs/install/config-file.md

@@ -17,12 +17,6 @@ The default configuration looks like this:
     "targetAudioCodec": "aac",
     "targetResolution": "720",
     "maxBitrate": "0",
-    "bframes": -1,
-    "refs": 0,
-    "gopSize": 0,
-    "npl": 0,
-    "temporalAQ": false,
-    "cqMode": "auto",
     "twoPass": false,
     "transcode": "required",
     "tonemap": "hable",
@@ -50,15 +44,9 @@ The default configuration looks like this:
     "sidecar": {
       "concurrency": 5
     },
-    "library": {
-      "concurrency": 5
-    },
     "storageTemplateMigration": {
       "concurrency": 5
     },
-    "migration": {
-      "concurrency": 5
-    },
     "thumbnailGeneration": {
       "concurrency": 5
     },
@@ -67,16 +55,16 @@ The default configuration looks like this:
     }
   },
   "machineLearning": {
+    "classification": {
+      "minScore": 0.7,
+      "enabled": true,
+      "modelName": "microsoft/resnet-50"
+    },
     "enabled": true,
     "url": "http://immich-machine-learning:3003",
-    "classification": {
-      "enabled": true,
-      "modelName": "microsoft/resnet-50",
-      "minScore": 0.9
-    },
     "clip": {
       "enabled": true,
-      "modelName": "ViT-B-32__openai"
+      "modelName": "ViT-B-32::openai"
     },
     "facialRecognition": {
       "enabled": true,
@@ -86,14 +74,6 @@ The default configuration looks like this:
       "minFaces": 1
     }
   },
-  "map": {
-    "enabled": true,
-    "tileUrl": "https://tile.openstreetmap.org/{z}/{x}/{y}.png"
-  },
-  "reverseGeocoding": {
-    "enabled": true,
-    "citiesFileOverride": "cities500"
-  },
   "oauth": {
     "enabled": false,
     "issuerUrl": "",
@@ -116,27 +96,8 @@ The default configuration looks like this:
   "thumbnail": {
     "webpSize": 250,
     "jpegSize": 1440,
-    "quality": 80,
+    "quality": 90,
     "colorspace": "p3"
-  },
-  "newVersionCheck": {
-    "enabled": true
-  },
-  "trash": {
-    "enabled": true,
-    "days": 30
-  },
-  "theme": {
-    "customCss": ""
-  },
-  "library": {
-    "scan": {
-      "enabled": true,
-      "cronExpression": "0 0 * * *"
-    }
-  },
-  "stylesheets": {
-    "css": ""
   }
 }
 ```

docs/src/pages/index.tsx

@@ -34,7 +34,7 @@ function HomepageHeader() {
           </Link>
         </div>
 
-        <img src="/img/immich-screenshots.png" alt="screenshots" width={'85%'} />
+        <img src="/img/immich-screenshots.png" alt="logo" />
 
         <div className="flex flex-col sm:flex-row place-items-center place-content-center mt-4 gap-1">
           <div className="h-24">

machine-learning/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "machine-learning"
-version = "1.85.0"
+version = "1.84.0"
 description = ""
 authors = ["Hau Tran <alex.tran1502@gmail.com>"]
 readme = "README.md"

mobile/android/fastlane/Fastfile

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

mobile/assets/i18n/en-US.json

@@ -23,7 +23,6 @@
   "album_viewer_appbar_share_err_title": "Failed to change album title",
   "album_viewer_appbar_share_leave": "Leave album",
   "album_viewer_appbar_share_remove": "Remove from album",
-  "album_viewer_appbar_share_to": "Share To",
   "album_viewer_page_share_add_users": "Add users",
   "all_people_page_title": "People",
   "all_videos_page_title": "Videos",
@@ -373,11 +372,5 @@
   "viewer_stack_use_as_main_asset": "Use as Main Asset",
   "app_bar_signout_dialog_title": "Sign out",
   "app_bar_signout_dialog_content": "Are you sure you wanna sign out?",
-  "app_bar_signout_dialog_ok": "Yes",
+  "app_bar_signout_dialog_ok": "Yes"
-  "shared_album_activities_input_hint": "Say something",
-  "shared_album_activity_remove_title": "Delete Activity",
-  "shared_album_activity_remove_content": "Do you want to delete this activity?",
-  "shared_album_activity_setting_title": "Comments & likes",
-  "shared_album_activity_setting_subtitle": "Let others respond",
-  "shared_album_activities_input_disable": "Comment is disabled"
 }

mobile/ios/Podfile.lock

@@ -28,6 +28,12 @@ PODS:
     - Flutter
   - isar_flutter_libs (1.0.0):
     - Flutter
+  - media_kit_libs_ios_video (1.0.4):
+    - Flutter
+  - media_kit_native_event_loop (1.0.0):
+    - Flutter
+  - media_kit_video (0.0.1):
+    - Flutter
   - package_info_plus (0.4.5):
     - Flutter
   - path_provider_foundation (0.0.1):
@@ -42,6 +48,8 @@ PODS:
     - FlutterMacOS
   - ReachabilitySwift (5.0.0)
   - SAMKeychain (1.5.3)
+  - screen_brightness_ios (0.1.0):
+    - Flutter
   - share_plus (0.0.1):
     - Flutter
   - shared_preferences_foundation (0.0.1):
@@ -55,6 +63,8 @@ PODS:
     - Flutter
   - video_player_avfoundation (0.0.1):
     - Flutter
+  - volume_controller (0.0.1):
+    - Flutter
   - wakelock_plus (0.0.1):
     - Flutter
 
@@ -71,16 +81,21 @@ DEPENDENCIES:
   - image_picker_ios (from `.symlinks/plugins/image_picker_ios/ios`)
   - integration_test (from `.symlinks/plugins/integration_test/ios`)
   - isar_flutter_libs (from `.symlinks/plugins/isar_flutter_libs/ios`)
+  - media_kit_libs_ios_video (from `.symlinks/plugins/media_kit_libs_ios_video/ios`)
+  - media_kit_native_event_loop (from `.symlinks/plugins/media_kit_native_event_loop/ios`)
+  - media_kit_video (from `.symlinks/plugins/media_kit_video/ios`)
   - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`)
   - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`)
   - path_provider_ios (from `.symlinks/plugins/path_provider_ios/ios`)
   - permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`)
   - photo_manager (from `.symlinks/plugins/photo_manager/ios`)
+  - screen_brightness_ios (from `.symlinks/plugins/screen_brightness_ios/ios`)
   - share_plus (from `.symlinks/plugins/share_plus/ios`)
   - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
   - sqflite (from `.symlinks/plugins/sqflite/ios`)
   - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
   - video_player_avfoundation (from `.symlinks/plugins/video_player_avfoundation/ios`)
+  - volume_controller (from `.symlinks/plugins/volume_controller/ios`)
   - wakelock_plus (from `.symlinks/plugins/wakelock_plus/ios`)
 
 SPEC REPOS:
@@ -115,6 +130,12 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/integration_test/ios"
   isar_flutter_libs:
     :path: ".symlinks/plugins/isar_flutter_libs/ios"
+  media_kit_libs_ios_video:
+    :path: ".symlinks/plugins/media_kit_libs_ios_video/ios"
+  media_kit_native_event_loop:
+    :path: ".symlinks/plugins/media_kit_native_event_loop/ios"
+  media_kit_video:
+    :path: ".symlinks/plugins/media_kit_video/ios"
   package_info_plus:
     :path: ".symlinks/plugins/package_info_plus/ios"
   path_provider_foundation:
@@ -125,6 +146,8 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/permission_handler_apple/ios"
   photo_manager:
     :path: ".symlinks/plugins/photo_manager/ios"
+  screen_brightness_ios:
+    :path: ".symlinks/plugins/screen_brightness_ios/ios"
   share_plus:
     :path: ".symlinks/plugins/share_plus/ios"
   shared_preferences_foundation:
@@ -135,6 +158,8 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/url_launcher_ios/ios"
   video_player_avfoundation:
     :path: ".symlinks/plugins/video_player_avfoundation/ios"
+  volume_controller:
+    :path: ".symlinks/plugins/volume_controller/ios"
   wakelock_plus:
     :path: ".symlinks/plugins/wakelock_plus/ios"
 
@@ -152,6 +177,9 @@ SPEC CHECKSUMS:
   image_picker_ios: 4a8aadfbb6dc30ad5141a2ce3832af9214a705b5
   integration_test: 13825b8a9334a850581300559b8839134b124670
   isar_flutter_libs: b69f437aeab9c521821c3f376198c4371fa21073
+  media_kit_libs_ios_video: a5fe24bc7875ccd6378a0978c13185e1344651c1
+  media_kit_native_event_loop: e6b2ab20cf0746eb1c33be961fcf79667304fa2a
+  media_kit_video: 5da63f157170e5bf303bf85453b7ef6971218a2e
   package_info_plus: fd030dabf36271f146f1f3beacd48f564b0f17f7
   path_provider_foundation: 29f094ae23ebbca9d3d0cec13889cd9060c0e943
   path_provider_ios: 14f3d2fd28c4fdb42f44e0f751d12861c43cee02
@@ -159,12 +187,14 @@ SPEC CHECKSUMS:
   photo_manager: 4f6810b7dfc4feb03b461ac1a70dacf91fba7604
   ReachabilitySwift: 985039c6f7b23a1da463388634119492ff86c825
   SAMKeychain: 483e1c9f32984d50ca961e26818a534283b4cd5c
+  screen_brightness_ios: 715ca807df953bf676d339f11464e438143ee625
   share_plus: 599aa54e4ea31d4b4c0e9c911bcc26c55e791028
   shared_preferences_foundation: 5b919d13b803cadd15ed2dc053125c68730e5126
   sqflite: 31f7eba61e3074736dff8807a9b41581e4f7f15a
   Toast: 91b396c56ee72a5790816f40d3a94dd357abc196
   url_launcher_ios: 08a3dfac5fb39e8759aeb0abbd5d9480f30fc8b4
   video_player_avfoundation: 81e49bb3d9fb63dccf9fa0f6d877dc3ddbeac126
+  volume_controller: 531ddf792994285c9b17f9d8a7e4dcdd29b3eae9
   wakelock_plus: 8b09852c8876491e4b6d179e17dfe2a0b5f60d47
 
 PODFILE CHECKSUM: 599d8aeb73728400c15364e734525722250a5382

mobile/ios/fastlane/Fastfile

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

mobile/lib/main.dart

@@ -7,7 +7,6 @@ import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_displaymode/flutter_displaymode.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:timezone/data/latest.dart';
 import 'package:immich_mobile/constants/locales.dart';
 import 'package:immich_mobile/modules/backup/background_service/background.service.dart';
 import 'package:immich_mobile/modules/backup/models/backup_album.model.dart';
@@ -36,6 +35,7 @@ import 'package:immich_mobile/utils/immich_app_theme.dart';
 import 'package:immich_mobile/utils/migration.dart';
 import 'package:isar/isar.dart';
 import 'package:logging/logging.dart';
+import 'package:media_kit/media_kit.dart';
 import 'package:path_provider/path_provider.dart';
 
 void main() async {
@@ -50,6 +50,7 @@ void main() async {
 
 Future<void> initApp() async {
   await EasyLocalization.ensureInitialized();
+  MediaKit.ensureInitialized();
 
   if (kReleaseMode && Platform.isAndroid) {
     try {
@@ -78,8 +79,6 @@ Future<void> initApp() async {
     log.severe('Catch all error: ${error.toString()} - $error', error, stack);
     return true;
   };
-
-  initializeTimeZones();
 }
 
 Future<Isar> loadDb() async {

mobile/lib/modules/activities/models/activity.model.dart

@@ -1,90 +0,0 @@
-import 'package:immich_mobile/shared/models/user.dart';
-import 'package:openapi/api.dart';
-
-enum ActivityType { comment, like }
-
-class Activity {
-  final String id;
-  final String? assetId;
-  final String? comment;
-  final DateTime createdAt;
-  final ActivityType type;
-  final User user;
-
-  const Activity({
-    required this.id,
-    this.assetId,
-    this.comment,
-    required this.createdAt,
-    required this.type,
-    required this.user,
-  });
-
-  Activity copyWith({
-    String? id,
-    String? assetId,
-    String? comment,
-    DateTime? createdAt,
-    ActivityType? type,
-    User? user,
-  }) {
-    return Activity(
-      id: id ?? this.id,
-      assetId: assetId ?? this.assetId,
-      comment: comment ?? this.comment,
-      createdAt: createdAt ?? this.createdAt,
-      type: type ?? this.type,
-      user: user ?? this.user,
-    );
-  }
-
-  Activity.fromDto(ActivityResponseDto dto)
-      : id = dto.id,
-        assetId = dto.assetId,
-        comment = dto.comment,
-        createdAt = dto.createdAt,
-        type = dto.type == ActivityResponseDtoTypeEnum.comment
-            ? ActivityType.comment
-            : ActivityType.like,
-        user = User(
-          email: dto.user.email,
-          firstName: dto.user.firstName,
-          lastName: dto.user.lastName,
-          profileImagePath: dto.user.profileImagePath,
-          id: dto.user.id,
-          // Placeholder values
-          isAdmin: false,
-          updatedAt: DateTime.now(),
-          isPartnerSharedBy: false,
-          isPartnerSharedWith: false,
-          memoryEnabled: false,
-        );
-
-  @override
-  String toString() {
-    return 'Activity(id: $id, assetId: $assetId, comment: $comment, createdAt: $createdAt, type: $type, user: $user)';
-  }
-
-  @override
-  bool operator ==(Object other) {
-    if (identical(this, other)) return true;
-
-    return other is Activity &&
-        other.id == id &&
-        other.assetId == assetId &&
-        other.comment == comment &&
-        other.createdAt == createdAt &&
-        other.type == type &&
-        other.user == user;
-  }
-
-  @override
-  int get hashCode {
-    return id.hashCode ^
-        assetId.hashCode ^
-        comment.hashCode ^
-        createdAt.hashCode ^
-        type.hashCode ^
-        user.hashCode;
-  }
-}

mobile/lib/modules/activities/providers/activity.provider.dart

@@ -1,130 +0,0 @@
-import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/modules/activities/models/activity.model.dart';
-import 'package:immich_mobile/modules/activities/services/activity.service.dart';
-
-class ActivityNotifier extends StateNotifier<AsyncValue<List<Activity>>> {
-  final Ref _ref;
-  final ActivityService _activityService;
-  final String albumId;
-  final String? assetId;
-
-  ActivityNotifier(
-    this._ref,
-    this._activityService,
-    this.albumId,
-    this.assetId,
-  ) : super(
-          const AsyncData([]),
-        ) {
-    fetchActivity();
-  }
-
-  Future<void> fetchActivity() async {
-    state = const AsyncLoading();
-    state = await AsyncValue.guard(
-      () => _activityService.getAllActivities(albumId, assetId),
-    );
-  }
-
-  Future<void> removeActivity(String id) async {
-    final activities = state.asData?.value ?? [];
-    if (await _activityService.removeActivity(id)) {
-      final removedActivity = activities.firstWhere((a) => a.id == id);
-      activities.remove(removedActivity);
-      state = AsyncData(activities);
-      if (removedActivity.type == ActivityType.comment) {
-        _ref
-            .read(
-              activityStatisticsStateProvider(
-                (albumId: albumId, assetId: assetId),
-              ).notifier,
-            )
-            .removeActivity();
-      }
-    }
-  }
-
-  Future<void> addComment(String comment) async {
-    final activity = await _activityService.addActivity(
-      albumId,
-      ActivityType.comment,
-      assetId: assetId,
-      comment: comment,
-    );
-
-    if (activity != null) {
-      final activities = state.asData?.value ?? [];
-      state = AsyncData([...activities, activity]);
-      _ref
-          .read(
-            activityStatisticsStateProvider(
-              (albumId: albumId, assetId: assetId),
-            ).notifier,
-          )
-          .addActivity();
-      if (assetId != null) {
-        // Add a count to the current album's provider as well
-        _ref
-            .read(
-              activityStatisticsStateProvider(
-                (albumId: albumId, assetId: null),
-              ).notifier,
-            )
-            .addActivity();
-      }
-    }
-  }
-
-  Future<void> addLike() async {
-    final activity = await _activityService
-        .addActivity(albumId, ActivityType.like, assetId: assetId);
-    if (activity != null) {
-      final activities = state.asData?.value ?? [];
-      state = AsyncData([...activities, activity]);
-    }
-  }
-}
-
-class ActivityStatisticsNotifier extends StateNotifier<int> {
-  final String albumId;
-  final String? assetId;
-  final ActivityService _activityService;
-  ActivityStatisticsNotifier(this._activityService, this.albumId, this.assetId)
-      : super(0) {
-    fetchStatistics();
-  }
-
-  Future<void> fetchStatistics() async {
-    state = await _activityService.getStatistics(albumId, assetId: assetId);
-  }
-
-  Future<void> addActivity() async {
-    state = state + 1;
-  }
-
-  Future<void> removeActivity() async {
-    state = state - 1;
-  }
-}
-
-typedef ActivityParams = ({String albumId, String? assetId});
-
-final activityStateProvider = StateNotifierProvider.autoDispose
-    .family<ActivityNotifier, AsyncValue<List<Activity>>, ActivityParams>(
-        (ref, args) {
-  return ActivityNotifier(
-    ref,
-    ref.watch(activityServiceProvider),
-    args.albumId,
-    args.assetId,
-  );
-});
-
-final activityStatisticsStateProvider = StateNotifierProvider.autoDispose
-    .family<ActivityStatisticsNotifier, int, ActivityParams>((ref, args) {
-  return ActivityStatisticsNotifier(
-    ref.watch(activityServiceProvider),
-    args.albumId,
-    args.assetId,
-  );
-});

mobile/lib/modules/activities/services/activity.service.dart

@@ -1,85 +0,0 @@
-import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/modules/activities/models/activity.model.dart';
-import 'package:immich_mobile/shared/providers/api.provider.dart';
-import 'package:immich_mobile/shared/services/api.service.dart';
-import 'package:logging/logging.dart';
-import 'package:openapi/api.dart';
-
-final activityServiceProvider =
-    Provider((ref) => ActivityService(ref.watch(apiServiceProvider)));
-
-class ActivityService {
-  final ApiService _apiService;
-  final Logger _log = Logger("ActivityService");
-
-  ActivityService(this._apiService);
-
-  Future<List<Activity>> getAllActivities(
-    String albumId,
-    String? assetId,
-  ) async {
-    try {
-      final list = await _apiService.activityApi
-          .getActivities(albumId, assetId: assetId);
-      return list != null ? list.map(Activity.fromDto).toList() : [];
-    } catch (e) {
-      _log.severe(
-        "failed to fetch activities for albumId - $albumId; assetId - $assetId -> $e",
-      );
-      rethrow;
-    }
-  }
-
-  Future<int> getStatistics(String albumId, {String? assetId}) async {
-    try {
-      final dto = await _apiService.activityApi
-          .getActivityStatistics(albumId, assetId: assetId);
-      return dto?.comments ?? 0;
-    } catch (e) {
-      _log.severe(
-        "failed to fetch activity statistics for albumId - $albumId; assetId - $assetId -> $e",
-      );
-    }
-    return 0;
-  }
-
-  Future<bool> removeActivity(String id) async {
-    try {
-      await _apiService.activityApi.deleteActivity(id);
-      return true;
-    } catch (e) {
-      _log.severe(
-        "failed to remove activity id - $id -> $e",
-      );
-    }
-    return false;
-  }
-
-  Future<Activity?> addActivity(
-    String albumId,
-    ActivityType type, {
-    String? assetId,
-    String? comment,
-  }) async {
-    try {
-      final dto = await _apiService.activityApi.createActivity(
-        ActivityCreateDto(
-          albumId: albumId,
-          type: type == ActivityType.comment
-              ? ReactionType.comment
-              : ReactionType.like,
-          assetId: assetId,
-          comment: comment,
-        ),
-      );
-      if (dto != null) {
-        return Activity.fromDto(dto);
-      }
-    } catch (e) {
-      _log.severe(
-        "failed to add activity for albumId - $albumId; assetId - $assetId -> $e",
-      );
-    }
-    return null;
-  }
-}

mobile/lib/modules/activities/views/activities_page.dart

@@ -1,320 +0,0 @@
-import 'package:cached_network_image/cached_network_image.dart';
-import 'package:collection/collection.dart';
-import 'package:easy_localization/easy_localization.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_hooks/flutter_hooks.dart' hide Store;
-import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/modules/activities/models/activity.model.dart';
-import 'package:immich_mobile/modules/activities/providers/activity.provider.dart';
-import 'package:immich_mobile/shared/models/store.dart';
-import 'package:immich_mobile/shared/ui/confirm_dialog.dart';
-import 'package:immich_mobile/shared/ui/immich_loading_indicator.dart';
-import 'package:immich_mobile/shared/ui/user_circle_avatar.dart';
-import 'package:immich_mobile/utils/datetime_extensions.dart';
-import 'package:immich_mobile/utils/image_url_builder.dart';
-
-class ActivitiesPage extends HookConsumerWidget {
-  final String albumId;
-  final String? assetId;
-  final bool withAssetThumbs;
-  final String appBarTitle;
-  final bool isOwner;
-  final bool isReadOnly;
-  const ActivitiesPage(
-    this.albumId, {
-    this.appBarTitle = "",
-    this.assetId,
-    this.withAssetThumbs = true,
-    this.isOwner = false,
-    this.isReadOnly = false,
-    super.key,
-  });
-
-  @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    final provider =
-        activityStateProvider((albumId: albumId, assetId: assetId));
-    final activities = ref.watch(provider);
-    final inputController = useTextEditingController();
-    final inputFocusNode = useFocusNode();
-    final listViewScrollController = useScrollController();
-    final currentUser = Store.tryGet(StoreKey.currentUser);
-
-    useEffect(
-      () {
-        inputFocusNode.requestFocus();
-        return null;
-      },
-      [],
-    );
-
-    buildTitleWithTimestamp(Activity activity, {bool leftAlign = true}) {
-      final textColor = Theme.of(context).brightness == Brightness.dark
-          ? Colors.white
-          : Colors.black;
-      final textStyle = Theme.of(context)
-          .textTheme
-          .bodyMedium
-          ?.copyWith(color: textColor.withOpacity(0.6));
-
-      return Row(
-        mainAxisAlignment: leftAlign
-            ? MainAxisAlignment.start
-            : MainAxisAlignment.spaceBetween,
-        mainAxisSize: leftAlign ? MainAxisSize.min : MainAxisSize.max,
-        children: [
-          Text(
-            "${activity.user.firstName} ${activity.user.lastName}",
-            style: textStyle,
-            overflow: TextOverflow.ellipsis,
-          ),
-          if (leftAlign)
-            Text(
-              " • ",
-              style: textStyle,
-            ),
-          Expanded(
-            child: Text(
-              activity.createdAt.copyWith().timeAgo(),
-              style: textStyle,
-              overflow: TextOverflow.ellipsis,
-              textAlign: leftAlign ? TextAlign.left : TextAlign.right,
-            ),
-          ),
-        ],
-      );
-    }
-
-    buildAssetThumbnail(Activity activity) {
-      return withAssetThumbs && activity.assetId != null
-          ? Container(
-              width: 40,
-              height: 30,
-              decoration: BoxDecoration(
-                borderRadius: BorderRadius.circular(4),
-                image: DecorationImage(
-                  image: CachedNetworkImageProvider(
-                    getThumbnailUrlForRemoteId(
-                      activity.assetId!,
-                    ),
-                    cacheKey: getThumbnailCacheKeyForRemoteId(
-                      activity.assetId!,
-                    ),
-                    headers: {
-                      "Authorization":
-                          'Bearer ${Store.get(StoreKey.accessToken)}',
-                    },
-                  ),
-                  fit: BoxFit.cover,
-                ),
-              ),
-              child: const SizedBox.shrink(),
-            )
-          : null;
-    }
-
-    buildTextField(String? likedId) {
-      final liked = likedId != null;
-      return Padding(
-        padding: const EdgeInsets.only(bottom: 10),
-        child: TextField(
-          controller: inputController,
-          enabled: !isReadOnly,
-          focusNode: inputFocusNode,
-          textInputAction: TextInputAction.send,
-          autofocus: false,
-          decoration: InputDecoration(
-            border: InputBorder.none,
-            focusedBorder: InputBorder.none,
-            prefixIcon: currentUser != null
-                ? Padding(
-                    padding: const EdgeInsets.symmetric(horizontal: 15),
-                    child: UserCircleAvatar(
-                      user: currentUser,
-                      size: 30,
-                      radius: 15,
-                    ),
-                  )
-                : null,
-            suffixIcon: Padding(
-              padding: const EdgeInsets.only(right: 10),
-              child: IconButton(
-                icon: Icon(
-                  liked
-                      ? Icons.favorite_rounded
-                      : Icons.favorite_border_rounded,
-                ),
-                onPressed: () async {
-                  liked
-                      ? await ref
-                          .read(provider.notifier)
-                          .removeActivity(likedId)
-                      : await ref.read(provider.notifier).addLike();
-                },
-              ),
-            ),
-            suffixIconColor: liked ? Colors.red[700] : null,
-            hintText: isReadOnly
-                ? 'shared_album_activities_input_disable'.tr()
-                : 'shared_album_activities_input_hint'.tr(),
-            hintStyle: TextStyle(
-              fontWeight: FontWeight.normal,
-              fontSize: 14,
-              color: Colors.grey[600],
-            ),
-          ),
-          onEditingComplete: () async {
-            await ref.read(provider.notifier).addComment(inputController.text);
-            inputController.clear();
-            inputFocusNode.unfocus();
-            listViewScrollController.animateTo(
-              listViewScrollController.position.maxScrollExtent,
-              duration: const Duration(milliseconds: 800),
-              curve: Curves.fastOutSlowIn,
-            );
-          },
-          onTapOutside: (_) => inputFocusNode.unfocus(),
-        ),
-      );
-    }
-
-    getDismissibleWidget(
-      Widget widget,
-      Activity activity,
-      bool canDelete,
-    ) {
-      return Dismissible(
-        key: Key(activity.id),
-        dismissThresholds: const {
-          DismissDirection.horizontal: 0.7,
-        },
-        direction: DismissDirection.horizontal,
-        confirmDismiss: (direction) => canDelete
-            ? showDialog(
-                context: context,
-                builder: (context) => ConfirmDialog(
-                  onOk: () {},
-                  title: "shared_album_activity_remove_title",
-                  content: "shared_album_activity_remove_content",
-                  ok: "delete_dialog_ok",
-                ),
-              )
-            : Future.value(false),
-        onDismissed: (direction) async =>
-            await ref.read(provider.notifier).removeActivity(activity.id),
-        background: Container(
-          color: canDelete ? Colors.red[400] : Colors.grey[600],
-          alignment: AlignmentDirectional.centerStart,
-          child: canDelete
-              ? const Padding(
-                  padding: EdgeInsets.all(15),
-                  child: Icon(
-                    Icons.delete_sweep_rounded,
-                    color: Colors.black,
-                  ),
-                )
-              : null,
-        ),
-        secondaryBackground: Container(
-          color: canDelete ? Colors.red[400] : Colors.grey[600],
-          alignment: AlignmentDirectional.centerEnd,
-          child: canDelete
-              ? const Padding(
-                  padding: EdgeInsets.all(15),
-                  child: Icon(
-                    Icons.delete_sweep_rounded,
-                    color: Colors.black,
-                  ),
-                )
-              : null,
-        ),
-        child: widget,
-      );
-    }
-
-    return Scaffold(
-      appBar: AppBar(title: Text(appBarTitle)),
-      body: activities.maybeWhen(
-        orElse: () {
-          return const Center(child: ImmichLoadingIndicator());
-        },
-        data: (data) {
-          final liked = data.firstWhereOrNull(
-            (a) =>
-                a.type == ActivityType.like &&
-                a.user.id == currentUser?.id &&
-                a.assetId == assetId,
-          );
-
-          return SafeArea(
-            child: Stack(
-              children: [
-                ListView.builder(
-                  controller: listViewScrollController,
-                  itemCount: data.length + 1,
-                  itemBuilder: (context, index) {
-                    // Vertical gap after the last element
-                    if (index == data.length) {
-                      return const SizedBox(
-                        height: 80,
-                      );
-                    }
-
-                    final activity = data[index];
-                    final canDelete =
-                        activity.user.id == currentUser?.id || isOwner;
-
-                    return Padding(
-                      padding: const EdgeInsets.all(5),
-                      child: activity.type == ActivityType.comment
-                          ? getDismissibleWidget(
-                              ListTile(
-                                minVerticalPadding: 15,
-                                leading: UserCircleAvatar(user: activity.user),
-                                title: buildTitleWithTimestamp(
-                                  activity,
-                                  leftAlign: withAssetThumbs &&
-                                      activity.assetId != null,
-                                ),
-                                titleAlignment: ListTileTitleAlignment.top,
-                                trailing: buildAssetThumbnail(activity),
-                                subtitle: Text(activity.comment!),
-                              ),
-                              activity,
-                              canDelete,
-                            )
-                          : getDismissibleWidget(
-                              ListTile(
-                                minVerticalPadding: 15,
-                                leading: Container(
-                                  width: 44,
-                                  alignment: Alignment.center,
-                                  child: Icon(
-                                    Icons.favorite_rounded,
-                                    color: Colors.red[700],
-                                  ),
-                                ),
-                                title: buildTitleWithTimestamp(activity),
-                                trailing: buildAssetThumbnail(activity),
-                              ),
-                              activity,
-                              canDelete,
-                            ),
-                    );
-                  },
-                ),
-                Align(
-                  alignment: Alignment.bottomCenter,
-                  child: Container(
-                    color: Theme.of(context).scaffoldBackgroundColor,
-                    child: buildTextField(liked?.id),
-                  ),
-                ),
-              ],
-            ),
-          );
-        },
-      ),
-    );
-  }
-}

mobile/lib/modules/album/providers/shared_album.provider.dart

@@ -2,7 +2,6 @@ import 'dart:async';
 
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/modules/album/providers/album_detail.provider.dart';
 import 'package:immich_mobile/modules/album/services/album.service.dart';
 import 'package:immich_mobile/shared/models/album.dart';
 import 'package:immich_mobile/shared/models/asset.dart';
@@ -11,7 +10,7 @@ import 'package:immich_mobile/shared/providers/db.provider.dart';
 import 'package:isar/isar.dart';
 
 class SharedAlbumNotifier extends StateNotifier<List<Album>> {
-  SharedAlbumNotifier(this._albumService, Isar db, this._ref) : super([]) {
+  SharedAlbumNotifier(this._albumService, Isar db) : super([]) {
     final query = db.albums.filter().sharedEqualTo(true).sortByCreatedAtDesc();
     query.findAll().then((value) => state = value);
     _streamSub = query.watch().listen((data) => state = data);
@@ -19,7 +18,6 @@ class SharedAlbumNotifier extends StateNotifier<List<Album>> {
 
   final AlbumService _albumService;
   late final StreamSubscription<List<Album>> _streamSub;
-  final Ref _ref;
 
   Future<Album?> createSharedAlbum(
     String albumName,
@@ -68,17 +66,6 @@ class SharedAlbumNotifier extends StateNotifier<List<Album>> {
     return result;
   }
 
-  Future<bool> setActivityEnabled(Album album, bool activityEnabled) async {
-    final result =
-        await _albumService.setActivityEnabled(album, activityEnabled);
-
-    if (result) {
-      _ref.invalidate(albumDetailProvider(album.id));
-    }
-
-    return result;
-  }
-
   @override
   void dispose() {
     _streamSub.cancel();
@@ -91,6 +78,5 @@ final sharedAlbumProvider =
   return SharedAlbumNotifier(
     ref.watch(albumServiceProvider),
     ref.watch(dbProvider),
-    ref,
   );
 });

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

@@ -284,23 +284,6 @@ class AlbumService {
     return false;
   }
 
-  Future<bool> setActivityEnabled(Album album, bool enabled) async {
-    try {
-      final result = await _apiService.albumApi.updateAlbumInfo(
-        album.remoteId!,
-        UpdateAlbumDto(isActivityEnabled: enabled),
-      );
-      if (result != null) {
-        album.activityEnabled = enabled;
-        await _db.writeTxn(() => _db.albums.put(album));
-        return true;
-      }
-    } catch (e) {
-      debugPrint("Error setActivityEnabled  ${e.toString()}");
-    }
-    return false;
-  }
-
   Future<bool> deleteAlbum(Album album) async {
     try {
       final userId = Store.get(StoreKey.currentUser).isarId;

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

@@ -3,13 +3,10 @@ import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:fluttertoast/fluttertoast.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/modules/activities/providers/activity.provider.dart';
 import 'package:immich_mobile/modules/album/providers/album.provider.dart';
 import 'package:immich_mobile/modules/album/providers/album_detail.provider.dart';
 import 'package:immich_mobile/modules/album/providers/album_viewer.provider.dart';
 import 'package:immich_mobile/modules/album/providers/shared_album.provider.dart';
-import 'package:immich_mobile/shared/ui/share_dialog.dart';
-import 'package:immich_mobile/shared/services/share.service.dart';
 import 'package:immich_mobile/routing/router.dart';
 import 'package:immich_mobile/shared/models/album.dart';
 import 'package:immich_mobile/shared/models/asset.dart';
@@ -27,7 +24,6 @@ class AlbumViewerAppbar extends HookConsumerWidget
     required this.titleFocusNode,
     this.onAddPhotos,
     this.onAddUsers,
-    required this.onActivities,
   }) : super(key: key);
 
   final Album album;
@@ -37,19 +33,11 @@ class AlbumViewerAppbar extends HookConsumerWidget
   final FocusNode titleFocusNode;
   final Function(Album album)? onAddPhotos;
   final Function(Album album)? onAddUsers;
-  final Function(Album album) onActivities;
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     final newAlbumTitle = ref.watch(albumViewerProvider).editTitleText;
     final isEditAlbum = ref.watch(albumViewerProvider).isEditAlbum;
-    final comments = album.shared
-        ? ref.watch(
-            activityStatisticsStateProvider(
-              (albumId: album.remoteId!, assetId: null),
-            ),
-          )
-        : 0;
 
     deleteAlbum() async {
       ImmichLoadingOverlayController.appLoader.show();
@@ -172,81 +160,40 @@ class AlbumViewerAppbar extends HookConsumerWidget
       ImmichLoadingOverlayController.appLoader.hide();
     }
 
-    void handleShareAssets(
+    buildBottomSheetActionButton() {
-      WidgetRef ref,
-      BuildContext context,
-      Set<Asset> selection,
-    ) {
-      showDialog(
-        context: context,
-        builder: (BuildContext buildContext) {
-          ref.watch(shareServiceProvider).shareAssets(selection.toList()).then(
-            (bool status) {
-              if (!status) {
-                ImmichToast.show(
-                  context: context,
-                  msg: 'image_viewer_page_state_provider_share_error'.tr(),
-                  toastType: ToastType.error,
-                  gravity: ToastGravity.BOTTOM,
-                );
-              }
-              Navigator.of(buildContext).pop();
-            },
-          );
-          return const ShareDialog();
-        },
-        barrierDismissible: false,
-      );
-    }
-
-    void onShareAssetsTo() async {
-      ImmichLoadingOverlayController.appLoader.show();
-      handleShareAssets(ref, context, selected);
-      ImmichLoadingOverlayController.appLoader.hide();
-    }
-
-    buildBottomSheetActions() {
       if (selected.isNotEmpty) {
-        return [
+        if (album.ownerId == userId) {
-          ListTile(
+          return ListTile(
-            leading: const Icon(Icons.ios_share_rounded),
+            leading: const Icon(Icons.delete_sweep_rounded),
             title: const Text(
-              'album_viewer_appbar_share_to',
+              'album_viewer_appbar_share_remove',
               style: TextStyle(fontWeight: FontWeight.bold),
             ).tr(),
-            onTap: () => onShareAssetsTo(),
+            onTap: () => onRemoveFromAlbumPressed(),
-          ),
+          );
-          album.ownerId == userId
+        } else {
-              ? ListTile(
+          return const SizedBox();
-                  leading: const Icon(Icons.delete_sweep_rounded),
+        }
-                  title: const Text(
-                    'album_viewer_appbar_share_remove',
-                    style: TextStyle(fontWeight: FontWeight.bold),
-                  ).tr(),
-                  onTap: () => onRemoveFromAlbumPressed(),
-                )
-              : const SizedBox(),
-        ];
       } else {
-        return [
+        if (album.ownerId == userId) {
-          album.ownerId == userId
+          return ListTile(
-              ? ListTile(
+            leading: const Icon(Icons.delete_forever_rounded),
-                  leading: const Icon(Icons.delete_forever_rounded),
+            title: const Text(
-                  title: const Text(
+              'album_viewer_appbar_share_delete',
-                    'album_viewer_appbar_share_delete',
+              style: TextStyle(fontWeight: FontWeight.bold),
-                    style: TextStyle(fontWeight: FontWeight.bold),
+            ).tr(),
-                  ).tr(),
+            onTap: () => onDeleteAlbumPressed(),
-                  onTap: () => onDeleteAlbumPressed(),
+          );
-                )
+        } else {
-              : ListTile(
+          return ListTile(
-                  leading: const Icon(Icons.person_remove_rounded),
+            leading: const Icon(Icons.person_remove_rounded),
-                  title: const Text(
+            title: const Text(
-                    'album_viewer_appbar_share_leave',
+              'album_viewer_appbar_share_leave',
-                    style: TextStyle(fontWeight: FontWeight.bold),
+              style: TextStyle(fontWeight: FontWeight.bold),
-                  ).tr(),
+            ).tr(),
-                  onTap: () => onLeaveAlbumPressed(),
+            onTap: () => onLeaveAlbumPressed(),
-                ),
+          );
-        ];
+        }
       }
     }
 
@@ -310,7 +257,7 @@ class AlbumViewerAppbar extends HookConsumerWidget
               child: Column(
                 mainAxisSize: MainAxisSize.min,
                 children: [
-                  ...buildBottomSheetActions(),
+                  buildBottomSheetActionButton(),
                   if (selected.isEmpty && onAddPhotos != null) ...commonActions,
                   if (selected.isEmpty &&
                       onAddPhotos != null &&
@@ -324,33 +271,6 @@ class AlbumViewerAppbar extends HookConsumerWidget
       );
     }
 
-    Widget buildActivitiesButton() {
-      return IconButton(
-        onPressed: () {
-          onActivities(album);
-        },
-        icon: Row(
-          crossAxisAlignment: CrossAxisAlignment.center,
-          children: [
-            const Icon(
-              Icons.mode_comment_outlined,
-            ),
-            if (comments != 0)
-              Padding(
-                padding: const EdgeInsets.only(left: 5),
-                child: Text(
-                  comments.toString(),
-                  style: TextStyle(
-                    fontWeight: FontWeight.bold,
-                    color: Theme.of(context).primaryColor,
-                  ),
-                ),
-              ),
-          ],
-        ),
-      );
-    }
-
     buildLeadingButton() {
       if (selected.isNotEmpty) {
         return IconButton(
@@ -394,8 +314,6 @@ class AlbumViewerAppbar extends HookConsumerWidget
       title: selected.isNotEmpty ? Text('${selected.length}') : null,
       centerTitle: false,
       actions: [
-        if (album.shared && (album.activityEnabled || comments != 0))
-          buildActivitiesButton(),
         if (album.isRemote)
           IconButton(
             splashRadius: 25,

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

@@ -23,7 +23,6 @@ class AlbumOptionsPage extends HookConsumerWidget {
     final sharedUsers = useState(album.sharedUsers.toList());
     final owner = album.owner.value;
     final userId = ref.watch(authenticationProvider).userId;
-    final activityEnabled = useState(album.activityEnabled);
     final isOwner = owner?.id == userId;
 
     void showErrorMessage() {
@@ -196,31 +195,6 @@ class AlbumOptionsPage extends HookConsumerWidget {
         mainAxisAlignment: MainAxisAlignment.start,
         crossAxisAlignment: CrossAxisAlignment.start,
         children: [
-          if (isOwner && album.shared)
-            SwitchListTile.adaptive(
-              value: activityEnabled.value,
-              onChanged: (bool value) async {
-                activityEnabled.value = value;
-                if (await ref
-                    .read(sharedAlbumProvider.notifier)
-                    .setActivityEnabled(album, value)) {
-                  album.activityEnabled = value;
-                }
-              },
-              activeColor: activityEnabled.value
-                  ? Theme.of(context).primaryColor
-                  : Theme.of(context).disabledColor,
-              dense: true,
-              title: Text(
-                "shared_album_activity_setting_title",
-                style: Theme.of(context)
-                    .textTheme
-                    .labelLarge
-                    ?.copyWith(fontWeight: FontWeight.bold),
-              ).tr(),
-              subtitle:
-                  const Text("shared_album_activity_setting_subtitle").tr(),
-            ),
           buildSectionTitle("PEOPLE"),
           buildOwnerInfo(),
           buildSharedUsersList(),

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

@@ -232,19 +232,6 @@ class AlbumViewerPage extends HookConsumerWidget {
       );
     }
 
-    onActivitiesPressed(Album album) {
-      if (album.remoteId != null) {
-        AutoRouter.of(context).push(
-          ActivitiesRoute(
-            albumId: album.remoteId!,
-            appBarTitle: album.name,
-            isOwner: userId == album.ownerId,
-            isReadOnly: !album.activityEnabled,
-          ),
-        );
-      }
-    }
-
     return Scaffold(
       appBar: album.when(
         data: (data) => AlbumViewerAppbar(
@@ -255,7 +242,6 @@ class AlbumViewerPage extends HookConsumerWidget {
           selectionDisabled: disableSelection,
           onAddPhotos: onAddPhotosPressed,
           onAddUsers: onAddUsersPressed,
-          onActivities: onActivitiesPressed,
         ),
         error: (error, stackTrace) => AppBar(title: const Text("Error")),
         loading: () => AppBar(),
@@ -280,8 +266,6 @@ class AlbumViewerPage extends HookConsumerWidget {
                 ],
               ),
               isOwner: userId == data.ownerId,
-              sharedAlbumId:
-                  data.shared && data.activityEnabled ? data.remoteId : null,
             ),
           ),
         ),

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

@@ -4,7 +4,6 @@ import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_map/flutter_map.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:timezone/timezone.dart';
 import 'package:immich_mobile/modules/asset_viewer/ui/description_input.dart';
 import 'package:immich_mobile/modules/map/ui/map_thumbnail.dart';
 import 'package:immich_mobile/shared/models/asset.dart';
@@ -27,36 +26,12 @@ class ExifBottomSheet extends HookConsumerWidget {
       exifInfo.latitude != 0 &&
       exifInfo.longitude != 0;
 
-  String formatTimeZone(Duration d) =>
-      "GMT${d.isNegative ? '-': '+'}${d.inHours.abs().toString().padLeft(2, '0')}:${d.inMinutes.abs().remainder(60).toString().padLeft(2, '0')}";
-
   String get formattedDateTime {
-    DateTime dt = asset.fileCreatedAt.toLocal();
+    final fileCreatedAt = asset.fileCreatedAt.toLocal();
-    String? timeZone;
+    final date = DateFormat.yMMMEd().format(fileCreatedAt);
-    if (asset.exifInfo?.dateTimeOriginal != null) {
+    final time = DateFormat.jm().format(fileCreatedAt);
-      dt = asset.exifInfo!.dateTimeOriginal!;
-      if (asset.exifInfo?.timeZone != null) {
-        dt = dt.toUtc();
-        try {
-          final location = getLocation(asset.exifInfo!.timeZone!);
-          dt = TZDateTime.from(dt, location);
-        } on LocationNotFoundException {
-          RegExp re = RegExp(r'^utc(?:([+-]\d{1,2})(?::(\d{2}))?)?$', caseSensitive: false);
-          final m = re.firstMatch(asset.exifInfo!.timeZone!);
-          if (m != null) {
-            final duration = Duration(hours: int.parse(m.group(1) ?? '0'), minutes: int.parse(m.group(2) ?? '0'));
-            dt = dt.add(duration);
-            timeZone = formatTimeZone(duration);
-          }
-        }
-      }
-    }
 
-    final date = DateFormat.yMMMEd().format(dt);
+    return '$date • $time';
-    final time = DateFormat.jm().format(dt);
-    timeZone ??= formatTimeZone(dt.timeZoneOffset);
-
-    return '$date • $time $timeZone';
   }
 
   Future<Uri?> _createCoordinatesUri(ExifInfo? exifInfo) async {

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

@@ -1,7 +1,6 @@
 import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/modules/activities/providers/activity.provider.dart';
 import 'package:immich_mobile/shared/models/asset.dart';
 import 'package:immich_mobile/shared/providers/asset.provider.dart';
 
@@ -17,8 +16,6 @@ class TopControlAppBar extends HookConsumerWidget {
     required this.onFavorite,
     required this.onUploadPressed,
     required this.isOwner,
-    required this.shareAlbumId,
-    required this.onActivitiesPressed,
   }) : super(key: key);
 
   final Asset asset;
@@ -27,23 +24,14 @@ class TopControlAppBar extends HookConsumerWidget {
   final VoidCallback? onDownloadPressed;
   final VoidCallback onToggleMotionVideo;
   final VoidCallback onAddToAlbumPressed;
-  final VoidCallback onActivitiesPressed;
   final Function(Asset) onFavorite;
   final bool isPlayingMotionVideo;
   final bool isOwner;
-  final String? shareAlbumId;
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     const double iconSize = 22.0;
     final a = ref.watch(assetWatcher(asset)).value ?? asset;
-    final comments = shareAlbumId != null
-        ? ref.watch(
-            activityStatisticsStateProvider(
-              (albumId: shareAlbumId!, assetId: asset.remoteId),
-            ),
-          )
-        : 0;
 
     Widget buildFavoriteButton(a) {
       return IconButton(
@@ -106,34 +94,6 @@ class TopControlAppBar extends HookConsumerWidget {
       );
     }
 
-    Widget buildActivitiesButton() {
-      return IconButton(
-        onPressed: () {
-          onActivitiesPressed();
-        },
-        icon: Row(
-          crossAxisAlignment: CrossAxisAlignment.center,
-          children: [
-            Icon(
-              Icons.mode_comment_outlined,
-              color: Colors.grey[200],
-            ),
-            if (comments != 0)
-              Padding(
-                padding: const EdgeInsets.only(left: 5),
-                child: Text(
-                  comments.toString(),
-                  style: TextStyle(
-                    fontWeight: FontWeight.bold,
-                    color: Colors.grey[200],
-                  ),
-                ),
-              ),
-          ],
-        ),
-      );
-    }
-
     Widget buildUploadButton() {
       return IconButton(
         onPressed: onUploadPressed,
@@ -170,7 +130,6 @@ class TopControlAppBar extends HookConsumerWidget {
         if (asset.isLocal && !asset.isRemote) buildUploadButton(),
         if (asset.isRemote && !asset.isLocal && isOwner) buildDownloadButton(),
         if (asset.isRemote && isOwner) buildAddToAlbumButtom(),
-        if (shareAlbumId != null) buildActivitiesButton(),
         buildMoreInfoButton(),
       ],
     );

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

@@ -49,7 +49,6 @@ class GalleryViewerPage extends HookConsumerWidget {
   final int heroOffset;
   final bool showStack;
   final bool isOwner;
-  final String? sharedAlbumId;
 
   GalleryViewerPage({
     super.key,
@@ -59,7 +58,6 @@ class GalleryViewerPage extends HookConsumerWidget {
     this.heroOffset = 0,
     this.showStack = false,
     this.isOwner = true,
-    this.sharedAlbumId,
   }) : controller = PageController(initialPage: initialIndex);
 
   final PageController controller;
@@ -329,19 +327,6 @@ class GalleryViewerPage extends HookConsumerWidget {
       );
     }
 
-    handleActivities() {
-      if (sharedAlbumId != null) {
-        AutoRouter.of(context).push(
-          ActivitiesRoute(
-            albumId: sharedAlbumId!,
-            assetId: asset().remoteId,
-            withAssetThumbs: false,
-            isOwner: isOwner,
-          ),
-        );
-      }
-    }
-
     buildAppBar() {
       return IgnorePointer(
         ignoring: !ref.watch(showControlsProvider),
@@ -370,8 +355,6 @@ class GalleryViewerPage extends HookConsumerWidget {
                 isPlayingMotionVideo.value = !isPlayingMotionVideo.value;
               }),
               onAddToAlbumPressed: () => addToAlbum(asset()),
-              shareAlbumId: sharedAlbumId,
-              onActivitiesPressed: handleActivities,
             ),
           ),
         ),
@@ -460,8 +443,7 @@ class GalleryViewerPage extends HookConsumerWidget {
                 decoration: BoxDecoration(
                   color: Colors.white,
                   borderRadius: BorderRadius.circular(6),
-                  border: (stackIndex.value == -1 && index == 0) ||
+                  border: index == stackIndex.value
-                          index == stackIndex.value
                       ? Border.all(
                           color: Colors.white,
                           width: 2,
@@ -809,11 +791,6 @@ class GalleryViewerPage extends HookConsumerWidget {
                         localPosition = details.localPosition,
                     onDragUpdate: (_, details, __) =>
                         handleSwipeUpDown(details),
-                    heroAttributes: PhotoViewHeroAttributes(
-                      tag: isFromDto
-                          ? '${a.remoteId}-$heroOffset'
-                          : a.id + heroOffset,
-                    ),
                     filterQuality: FilterQuality.high,
                     maxScale: 1.0,
                     minScale: 1.0,

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

@@ -9,6 +9,8 @@ import 'package:immich_mobile/modules/asset_viewer/ui/video_player_controls.dart
 import 'package:immich_mobile/shared/models/asset.dart';
 import 'package:immich_mobile/shared/models/store.dart';
 import 'package:immich_mobile/shared/ui/immich_loading_indicator.dart';
+import 'package:media_kit/media_kit.dart';
+import 'package:media_kit_video/media_kit_video.dart';
 import 'package:photo_manager/photo_manager.dart';
 import 'package:video_player/video_player.dart';
 import 'package:wakelock_plus/wakelock_plus.dart';
@@ -125,99 +127,128 @@ class VideoPlayer extends StatefulWidget {
 }
 
 class _VideoPlayerState extends State<VideoPlayer> {
-  late VideoPlayerController videoPlayerController;
+  // late VideoPlayerController videoPlayerController;
-  ChewieController? chewieController;
+  // ChewieController? chewieController;
+
+  // Create a [Player] to control playback.
+  late final player = Player();
+  // Create a [VideoController] to handle video output from [Player].
+  late final controller = VideoController(player);
 
   @override
   void initState() {
     super.initState();
-    initializePlayer();
+    // initializePlayer();
 
-    videoPlayerController.addListener(() {
+    // videoPlayerController.addListener(() {
-      if (videoPlayerController.value.isInitialized) {
+    //   if (videoPlayerController.value.isInitialized) {
-        if (videoPlayerController.value.isPlaying) {
+    //     if (videoPlayerController.value.isPlaying) {
-          WakelockPlus.enable();
+    //       WakelockPlus.enable();
-          widget.onPlaying?.call();
+    //       widget.onPlaying?.call();
-        } else if (!videoPlayerController.value.isPlaying) {
+    //     } else if (!videoPlayerController.value.isPlaying) {
-          WakelockPlus.disable();
+    //       WakelockPlus.disable();
-          widget.onPaused?.call();
+    //       widget.onPaused?.call();
-        }
+    //     }
 
-        if (videoPlayerController.value.position ==
+    //     if (videoPlayerController.value.position ==
-            videoPlayerController.value.duration) {
+    //         videoPlayerController.value.duration) {
-          WakelockPlus.disable();
+    //       WakelockPlus.disable();
-          widget.onVideoEnded();
+    //       widget.onVideoEnded();
-        }
+    //     }
-      }
+    //   }
-    });
+    // });
-  }
 
-  Future<void> initializePlayer() async {
+    if (widget.file == null) {
-    try {
+      player.open(
-      videoPlayerController = widget.file == null
+        Media(
-          ? VideoPlayerController.networkUrl(
+          Uri.parse(widget.url!).toString(),
-              Uri.parse(widget.url!),
+          httpHeaders: {
-              httpHeaders: {"Authorization": "Bearer ${widget.jwtToken}"},
+            "Authorization": "Bearer ${widget.jwtToken}",
-            )
+          },
-          : VideoPlayerController.file(widget.file!);
+        ),
-
+      );
-      await videoPlayerController.initialize();
+    } else {
-      _createChewieController();
+      player.open(
-      setState(() {});
+        Media(
-    } catch (e) {
+          widget.file!.path,
-      debugPrint("ERROR initialize video player $e");
+        ),
+      );
     }
   }
 
-  _createChewieController() {
+  // Future<void> initializePlayer() async {
-    chewieController = ChewieController(
+  //   try {
-      controlsSafeAreaMinimum: const EdgeInsets.only(
+  //     videoPlayerController = widget.file == null
-        bottom: 100,
+  //         ? VideoPlayerController.networkUrl(
-      ),
+  //             Uri.parse(widget.url!),
-      showOptions: true,
+  //             httpHeaders: {"Authorization": "Bearer ${widget.jwtToken}"},
-      showControlsOnInitialize: false,
+  //           )
-      videoPlayerController: videoPlayerController,
+  //         : VideoPlayerController.file(widget.file!);
-      autoPlay: true,
+
-      autoInitialize: true,
+  //     await videoPlayerController.initialize();
-      allowFullScreen: false,
+  //     _createChewieController();
-      allowedScreenSleep: false,
+  //     setState(() {});
-      showControls: !widget.isMotionVideo,
+  //   } catch (e) {
-      customControls: const VideoPlayerControls(),
+  //     debugPrint("ERROR initialize video player $e");
-      hideControlsTimer: const Duration(seconds: 5),
+  //   }
-    );
+  // }
-  }
+
+  // _createChewieController() {
+  //   chewieController = ChewieController(
+  //     controlsSafeAreaMinimum: const EdgeInsets.only(
+  //       bottom: 100,
+  //     ),
+  //     showOptions: true,
+  //     showControlsOnInitialize: false,
+  //     videoPlayerController: videoPlayerController,
+  //     autoPlay: true,
+  //     autoInitialize: true,
+  //     allowFullScreen: false,
+  //     allowedScreenSleep: false,
+  //     showControls: !widget.isMotionVideo,
+  //     customControls: const VideoPlayerControls(),
+  //     hideControlsTimer: const Duration(seconds: 5),
+  //   );
+  // }
 
   @override
   void dispose() {
     super.dispose();
-    videoPlayerController.pause();
+    player.dispose();
-    videoPlayerController.dispose();
+    // videoPlayerController.pause();
-    chewieController?.dispose();
+    // videoPlayerController.dispose();
+    // chewieController?.dispose();
   }
 
   @override
   Widget build(BuildContext context) {
-    if (chewieController?.videoPlayerController.value.isInitialized == true) {
+    return SizedBox(
-      return SizedBox(
+      width: MediaQuery.of(context).size.width,
-        child: Chewie(
+      height: MediaQuery.of(context).size.height,
-          controller: chewieController!,
+      child: Video(controller: controller),
-        ),
+    );
-      );
+
-    } else {
+    // if (chewieController?.videoPlayerController.value.isInitialized == true) {
-      return SizedBox(
+    //   return SizedBox(
-        height: MediaQuery.of(context).size.height,
+    //     child: Chewie(
-        width: MediaQuery.of(context).size.width,
+    //       controller: chewieController!,
-        child: Center(
+    //     ),
-          child: Stack(
+    //   );
-            children: [
+    // } else {
-              if (widget.placeholder != null) widget.placeholder!,
+    //   return SizedBox(
-              const Center(
+    //     height: MediaQuery.of(context).size.height,
-                child: ImmichLoadingIndicator(),
+    //     width: MediaQuery.of(context).size.width,
-              ),
+    //     child: Center(
-            ],
+    //       child: Stack(
-          ),
+    //         children: [
-        ),
+    //           if (widget.placeholder != null) widget.placeholder!,
-      );
+    //           const Center(
-    }
+    //             child: ImmichLoadingIndicator(),
+    //           ),
+    //         ],
+    //       ),
+    //     ),
+    //   );
+    // }
   }
 }

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

@@ -40,7 +40,7 @@ class BackupNotifier extends StateNotifier<BackUpState> {
             progressInPercentage: 0,
             cancelToken: CancellationToken(),
             autoBackup: Store.get(StoreKey.autoBackup, false),
-            backgroundBackup: Store.get(StoreKey.backgroundBackup, false),
+            backgroundBackup: false,
             backupRequireWifi: Store.get(StoreKey.backupRequireWifi, true),
             backupRequireCharging:
                 Store.get(StoreKey.backupRequireCharging, false),
@@ -171,7 +171,6 @@ class BackupNotifier extends StateNotifier<BackUpState> {
           state.backupRequireCharging,
         );
         await Store.put(StoreKey.backupTriggerDelay, state.backupTriggerDelay);
-        await Store.put(StoreKey.backgroundBackup, state.backgroundBackup);
       } else {
         state = state.copyWith(
           backgroundBackup: wasEnabled,
@@ -384,9 +383,6 @@ class BackupNotifier extends StateNotifier<BackUpState> {
     final isEnabled = await _backgroundService.isBackgroundBackupEnabled();
 
     state = state.copyWith(backgroundBackup: isEnabled);
-    if (isEnabled != Store.get(StoreKey.backgroundBackup, !isEnabled)) {
-      Store.put(StoreKey.backgroundBackup, isEnabled);
-    }
 
     if (state.backupProgress != BackUpProgressEnum.inBackground) {
       await _getBackupAlbumsInfo();

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

@@ -34,7 +34,6 @@ class ImmichAssetGrid extends HookConsumerWidget {
   final bool showDragScroll;
   final bool showStack;
   final bool isOwner;
-  final String? sharedAlbumId;
 
   const ImmichAssetGrid({
     super.key,
@@ -56,7 +55,6 @@ class ImmichAssetGrid extends HookConsumerWidget {
     this.showDragScroll = true,
     this.showStack = false,
     this.isOwner = true,
-    this.sharedAlbumId,
   });
 
   @override
@@ -122,7 +120,6 @@ class ImmichAssetGrid extends HookConsumerWidget {
           showDragScroll: showDragScroll,
           showStack: showStack,
           isOwner: isOwner,
-          sharedAlbumId: sharedAlbumId,
         ),
       );
     }

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

@@ -39,7 +39,6 @@ class ImmichAssetGridView extends StatefulWidget {
   final bool showDragScroll;
   final bool showStack;
   final bool isOwner;
-  final String? sharedAlbumId;
 
   const ImmichAssetGridView({
     super.key,
@@ -61,7 +60,6 @@ class ImmichAssetGridView extends StatefulWidget {
     this.showDragScroll = true,
     this.showStack = false,
     this.isOwner = true,
-    this.sharedAlbumId,
   });
 
   @override
@@ -143,7 +141,6 @@ class ImmichAssetGridViewState extends State<ImmichAssetGridView> {
       heroOffset: widget.heroOffset,
       showStack: widget.showStack,
       isOwner: widget.isOwner,
-      sharedAlbumId: widget.sharedAlbumId,
     );
   }
 

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

@@ -21,7 +21,6 @@ class ThumbnailImage extends StatelessWidget {
   final Function? onSelect;
   final Function? onDeselect;
   final int heroOffset;
-  final String? sharedAlbumId;
 
   const ThumbnailImage({
     Key? key,
@@ -32,7 +31,6 @@ class ThumbnailImage extends StatelessWidget {
     this.showStorageIndicator = true,
     this.showStack = false,
     this.isOwner = true,
-    this.sharedAlbumId,
     this.useGrayBoxPlaceholder = false,
     this.isSelected = false,
     this.multiselectEnabled = false,
@@ -186,7 +184,6 @@ class ThumbnailImage extends StatelessWidget {
               heroOffset: heroOffset,
               showStack: showStack,
               isOwner: isOwner,
-              sharedAlbumId: sharedAlbumId,
             ),
           );
         }

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

@@ -100,7 +100,7 @@ class ControlBottomAppBar extends ConsumerWidget {
             label: "control_bottom_app_bar_stack".tr(),
             onPressed: enabled ? onStack : null,
           ),
-        if (hasLocal)
+        if (!hasRemote)
           ControlBoxButton(
             iconData: Icons.backup_outlined,
             label: "Upload",

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

@@ -169,10 +169,9 @@ class HomePage extends HookConsumerWidget {
         processing.value = true;
         selectionEnabledHook.value = false;
         try {
-          ref.read(manualUploadProvider.notifier).uploadAssets(
+          ref
-                context,
+              .read(manualUploadProvider.notifier)
-                selection.value.where((a) => a.storage == AssetState.local),
+              .uploadAssets(context, selection.value);
-              );
         } finally {
           processing.value = false;
         }

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

@@ -17,7 +17,7 @@ class OAuthService {
     // Resolve API server endpoint from user provided serverUrl
     await _apiService.resolveAndSetEndpoint(serverUrl);
 
-    return await _apiService.oAuthApi.generateOAuthConfig(
+    return await _apiService.oAuthApi.generateConfig(
       OAuthConfigDto(redirectUri: '$callbackUrlScheme:/'),
     );
   }
@@ -29,7 +29,7 @@ class OAuthService {
         callbackUrlScheme: callbackUrlScheme,
       );
 
-      return await _apiService.oAuthApi.finishOAuth(
+      return await _apiService.oAuthApi.callback(
         OAuthCallbackDto(
           url: result,
         ),

mobile/lib/modules/login/ui/login_form.dart

@@ -65,7 +65,7 @@ class LoginForm extends HookConsumerWidget {
         isLoadingServer.value = true;
         final endpoint = await apiService.resolveAndSetEndpoint(serverUrl);
 
-        final loginConfig = await apiService.oAuthApi.generateOAuthConfig(
+        final loginConfig = await apiService.oAuthApi.generateConfig(
           OAuthConfigDto(redirectUri: serverUrl),
         );
 

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

@@ -172,7 +172,7 @@ class SearchPage extends HookConsumerWidget {
                 ),
                 ListTile(
                   leading: Icon(
-                    Icons.favorite_border_rounded,
+                    Icons.star_outline,
                     color: categoryIconColor,
                   ),
                   title:

mobile/lib/modules/trash/providers/trashed_asset.provider.dart

@@ -37,7 +37,6 @@ class TrashNotifier extends StateNotifier<bool> {
           .remoteIdProperty()
           .findAll();
 
-      // TODO: handle local asset removal on emptyTrash
       _ref
           .read(syncServiceProvider)
           .handleRemoteAssetRemoval(idsToRemove.cast<String>().toList());

mobile/lib/routing/router.dart

@@ -1,7 +1,6 @@
 import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/modules/activities/views/activities_page.dart';
 import 'package:immich_mobile/modules/album/models/asset_selection_page_result.model.dart';
 import 'package:immich_mobile/modules/album/views/album_options_part.dart';
 import 'package:immich_mobile/modules/album/views/album_viewer_page.dart';
@@ -161,12 +160,6 @@ part 'router.gr.dart';
     AutoRoute(page: TrashPage, guards: [AuthGuard, DuplicateGuard]),
     AutoRoute(page: SharedLinkPage, guards: [AuthGuard, DuplicateGuard]),
     AutoRoute(page: SharedLinkEditPage, guards: [AuthGuard, DuplicateGuard]),
-    CustomRoute(
-      page: ActivitiesPage,
-      guards: [AuthGuard, DuplicateGuard],
-      transitionsBuilder: TransitionsBuilders.slideLeft,
-      durationInMilliseconds: 200,
-    ),
   ],
 )
 class AppRouter extends _$AppRouter {

mobile/lib/routing/router.gr.dart

@@ -73,7 +73,6 @@ class _$AppRouter extends RootStackRouter {
           heroOffset: args.heroOffset,
           showStack: args.showStack,
           isOwner: args.isOwner,
-          sharedAlbumId: args.sharedAlbumId,
         ),
       );
     },
@@ -338,25 +337,6 @@ class _$AppRouter extends RootStackRouter {
         ),
       );
     },
-    ActivitiesRoute.name: (routeData) {
-      final args = routeData.argsAs<ActivitiesRouteArgs>();
-      return CustomPage<dynamic>(
-        routeData: routeData,
-        child: ActivitiesPage(
-          args.albumId,
-          appBarTitle: args.appBarTitle,
-          assetId: args.assetId,
-          withAssetThumbs: args.withAssetThumbs,
-          isOwner: args.isOwner,
-          isReadOnly: args.isReadOnly,
-          key: args.key,
-        ),
-        transitionsBuilder: TransitionsBuilders.slideLeft,
-        durationInMilliseconds: 200,
-        opaque: true,
-        barrierDismissible: false,
-      );
-    },
     HomeRoute.name: (routeData) {
       return MaterialPageX<dynamic>(
         routeData: routeData,
@@ -694,14 +674,6 @@ class _$AppRouter extends RootStackRouter {
             duplicateGuard,
           ],
         ),
-        RouteConfig(
-          ActivitiesRoute.name,
-          path: '/activities-page',
-          guards: [
-            authGuard,
-            duplicateGuard,
-          ],
-        ),
       ];
 }
 
@@ -777,7 +749,6 @@ class GalleryViewerRoute extends PageRouteInfo<GalleryViewerRouteArgs> {
     int heroOffset = 0,
     bool showStack = false,
     bool isOwner = true,
-    String? sharedAlbumId,
   }) : super(
           GalleryViewerRoute.name,
           path: '/gallery-viewer-page',
@@ -789,7 +760,6 @@ class GalleryViewerRoute extends PageRouteInfo<GalleryViewerRouteArgs> {
             heroOffset: heroOffset,
             showStack: showStack,
             isOwner: isOwner,
-            sharedAlbumId: sharedAlbumId,
           ),
         );
 
@@ -805,7 +775,6 @@ class GalleryViewerRouteArgs {
     this.heroOffset = 0,
     this.showStack = false,
     this.isOwner = true,
-    this.sharedAlbumId,
   });
 
   final Key? key;
@@ -822,11 +791,9 @@ class GalleryViewerRouteArgs {
 
   final bool isOwner;
 
-  final String? sharedAlbumId;
-
   @override
   String toString() {
-    return 'GalleryViewerRouteArgs{key: $key, initialIndex: $initialIndex, loadAsset: $loadAsset, totalAssets: $totalAssets, heroOffset: $heroOffset, showStack: $showStack, isOwner: $isOwner, sharedAlbumId: $sharedAlbumId}';
+    return 'GalleryViewerRouteArgs{key: $key, initialIndex: $initialIndex, loadAsset: $loadAsset, totalAssets: $totalAssets, heroOffset: $heroOffset, showStack: $showStack, isOwner: $isOwner}';
   }
 }
 
@@ -1560,65 +1527,6 @@ class SharedLinkEditRouteArgs {
   }
 }
 
-/// generated route for
-/// [ActivitiesPage]
-class ActivitiesRoute extends PageRouteInfo<ActivitiesRouteArgs> {
-  ActivitiesRoute({
-    required String albumId,
-    String appBarTitle = "",
-    String? assetId,
-    bool withAssetThumbs = true,
-    bool isOwner = false,
-    bool isReadOnly = false,
-    Key? key,
-  }) : super(
-          ActivitiesRoute.name,
-          path: '/activities-page',
-          args: ActivitiesRouteArgs(
-            albumId: albumId,
-            appBarTitle: appBarTitle,
-            assetId: assetId,
-            withAssetThumbs: withAssetThumbs,
-            isOwner: isOwner,
-            isReadOnly: isReadOnly,
-            key: key,
-          ),
-        );
-
-  static const String name = 'ActivitiesRoute';
-}
-
-class ActivitiesRouteArgs {
-  const ActivitiesRouteArgs({
-    required this.albumId,
-    this.appBarTitle = "",
-    this.assetId,
-    this.withAssetThumbs = true,
-    this.isOwner = false,
-    this.isReadOnly = false,
-    this.key,
-  });
-
-  final String albumId;
-
-  final String appBarTitle;
-
-  final String? assetId;
-
-  final bool withAssetThumbs;
-
-  final bool isOwner;
-
-  final bool isReadOnly;
-
-  final Key? key;
-
-  @override
-  String toString() {
-    return 'ActivitiesRouteArgs{albumId: $albumId, appBarTitle: $appBarTitle, assetId: $assetId, withAssetThumbs: $withAssetThumbs, isOwner: $isOwner, isReadOnly: $isReadOnly, key: $key}';
-  }
-}
-
 /// generated route for
 /// [HomePage]
 class HomeRoute extends PageRouteInfo<void> {

mobile/lib/shared/models/album.dart

@@ -22,7 +22,6 @@ class Album {
     this.endDate,
     this.lastModifiedAssetTimestamp,
     required this.shared,
-    required this.activityEnabled,
   });
 
   Id id = Isar.autoIncrement;
@@ -37,7 +36,6 @@ class Album {
   DateTime? endDate;
   DateTime? lastModifiedAssetTimestamp;
   bool shared;
-  bool activityEnabled;
   final IsarLink<User> owner = IsarLink<User>();
   final IsarLink<Asset> thumbnail = IsarLink<Asset>();
   final IsarLinks<User> sharedUsers = IsarLinks<User>();
@@ -79,8 +77,7 @@ class Album {
   }
 
   Stream<void> watchRenderList(GroupAssetsBy groupAssetsBy) async* {
-    final query =
+    final query = assets.filter().sortByFileCreatedAtDesc();
-        assets.filter().isTrashedEqualTo(false).sortByFileCreatedAtDesc();
     _renderList = await RenderList.fromQuery(query, groupAssetsBy);
     yield _renderList;
     await for (final _ in query.watchLazy()) {
@@ -108,7 +105,6 @@ class Album {
         modifiedAt.isAtSameMomentAs(other.modifiedAt) &&
         lastModifiedAssetTimestampIsSetAndEqual &&
         shared == other.shared &&
-        activityEnabled == other.activityEnabled &&
         owner.value == other.owner.value &&
         thumbnail.value == other.thumbnail.value &&
         sharedUsers.length == other.sharedUsers.length &&
@@ -126,7 +122,6 @@ class Album {
       modifiedAt.hashCode ^
       lastModifiedAssetTimestamp.hashCode ^
       shared.hashCode ^
-      activityEnabled.hashCode ^
       owner.value.hashCode ^
       thumbnail.value.hashCode ^
       sharedUsers.length.hashCode ^
@@ -138,7 +133,6 @@ class Album {
       createdAt: ape.lastModified?.toUtc() ?? DateTime.now().toUtc(),
       modifiedAt: ape.lastModified?.toUtc() ?? DateTime.now().toUtc(),
       shared: false,
-      activityEnabled: false,
     );
     a.owner.value = Store.get(StoreKey.currentUser);
     a.localId = ape.id;
@@ -156,7 +150,6 @@ class Album {
       shared: dto.shared,
       startDate: dto.startDate,
       endDate: dto.endDate,
-      activityEnabled: dto.isActivityEnabled,
     );
     a.owner.value = await db.users.getById(dto.ownerId);
     if (dto.albumThumbnailAssetId != null) {

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

@@ -17,53 +17,48 @@ const AlbumSchema = CollectionSchema(
   name: r'Album',
   id: -1355968412107120937,
   properties: {
-    r'activityEnabled': PropertySchema(
-      id: 0,
-      name: r'activityEnabled',
-      type: IsarType.bool,
-    ),
     r'createdAt': PropertySchema(
-      id: 1,
+      id: 0,
       name: r'createdAt',
       type: IsarType.dateTime,
     ),
     r'endDate': PropertySchema(
-      id: 2,
+      id: 1,
       name: r'endDate',
       type: IsarType.dateTime,
     ),
     r'lastModifiedAssetTimestamp': PropertySchema(
-      id: 3,
+      id: 2,
       name: r'lastModifiedAssetTimestamp',
       type: IsarType.dateTime,
     ),
     r'localId': PropertySchema(
-      id: 4,
+      id: 3,
       name: r'localId',
       type: IsarType.string,
     ),
     r'modifiedAt': PropertySchema(
-      id: 5,
+      id: 4,
       name: r'modifiedAt',
       type: IsarType.dateTime,
     ),
     r'name': PropertySchema(
-      id: 6,
+      id: 5,
       name: r'name',
       type: IsarType.string,
     ),
     r'remoteId': PropertySchema(
-      id: 7,
+      id: 6,
       name: r'remoteId',
       type: IsarType.string,
     ),
     r'shared': PropertySchema(
-      id: 8,
+      id: 7,
       name: r'shared',
       type: IsarType.bool,
     ),
     r'startDate': PropertySchema(
-      id: 9,
+      id: 8,
       name: r'startDate',
       type: IsarType.dateTime,
     )
@@ -162,16 +157,15 @@ void _albumSerialize(
   List<int> offsets,
   Map<Type, List<int>> allOffsets,
 ) {
-  writer.writeBool(offsets[0], object.activityEnabled);
+  writer.writeDateTime(offsets[0], object.createdAt);
-  writer.writeDateTime(offsets[1], object.createdAt);
+  writer.writeDateTime(offsets[1], object.endDate);
-  writer.writeDateTime(offsets[2], object.endDate);
+  writer.writeDateTime(offsets[2], object.lastModifiedAssetTimestamp);
-  writer.writeDateTime(offsets[3], object.lastModifiedAssetTimestamp);
+  writer.writeString(offsets[3], object.localId);
-  writer.writeString(offsets[4], object.localId);
+  writer.writeDateTime(offsets[4], object.modifiedAt);
-  writer.writeDateTime(offsets[5], object.modifiedAt);
+  writer.writeString(offsets[5], object.name);
-  writer.writeString(offsets[6], object.name);
+  writer.writeString(offsets[6], object.remoteId);
-  writer.writeString(offsets[7], object.remoteId);
+  writer.writeBool(offsets[7], object.shared);
-  writer.writeBool(offsets[8], object.shared);
+  writer.writeDateTime(offsets[8], object.startDate);
-  writer.writeDateTime(offsets[9], object.startDate);
 }
 
 Album _albumDeserialize(
@@ -181,16 +175,15 @@ Album _albumDeserialize(
   Map<Type, List<int>> allOffsets,
 ) {
   final object = Album(
-    activityEnabled: reader.readBool(offsets[0]),
+    createdAt: reader.readDateTime(offsets[0]),
-    createdAt: reader.readDateTime(offsets[1]),
+    endDate: reader.readDateTimeOrNull(offsets[1]),
-    endDate: reader.readDateTimeOrNull(offsets[2]),
+    lastModifiedAssetTimestamp: reader.readDateTimeOrNull(offsets[2]),
-    lastModifiedAssetTimestamp: reader.readDateTimeOrNull(offsets[3]),
+    localId: reader.readStringOrNull(offsets[3]),
-    localId: reader.readStringOrNull(offsets[4]),
+    modifiedAt: reader.readDateTime(offsets[4]),
-    modifiedAt: reader.readDateTime(offsets[5]),
+    name: reader.readString(offsets[5]),
-    name: reader.readString(offsets[6]),
+    remoteId: reader.readStringOrNull(offsets[6]),
-    remoteId: reader.readStringOrNull(offsets[7]),
+    shared: reader.readBool(offsets[7]),
-    shared: reader.readBool(offsets[8]),
+    startDate: reader.readDateTimeOrNull(offsets[8]),
-    startDate: reader.readDateTimeOrNull(offsets[9]),
   );
   object.id = id;
   return object;
@@ -204,24 +197,22 @@ P _albumDeserializeProp<P>(
 ) {
   switch (propertyId) {
     case 0:
-      return (reader.readBool(offset)) as P;
-    case 1:
       return (reader.readDateTime(offset)) as P;
+    case 1:
+      return (reader.readDateTimeOrNull(offset)) as P;
     case 2:
       return (reader.readDateTimeOrNull(offset)) as P;
     case 3:
-      return (reader.readDateTimeOrNull(offset)) as P;
+      return (reader.readStringOrNull(offset)) as P;
     case 4:
-      return (reader.readStringOrNull(offset)) as P;
-    case 5:
       return (reader.readDateTime(offset)) as P;
-    case 6:
+    case 5:
       return (reader.readString(offset)) as P;
-    case 7:
+    case 6:
       return (reader.readStringOrNull(offset)) as P;
-    case 8:
+    case 7:
       return (reader.readBool(offset)) as P;
-    case 9:
+    case 8:
       return (reader.readDateTimeOrNull(offset)) as P;
     default:
       throw IsarError('Unknown property with id $propertyId');
@@ -451,16 +442,6 @@ extension AlbumQueryWhere on QueryBuilder<Album, Album, QWhereClause> {
 }
 
 extension AlbumQueryFilter on QueryBuilder<Album, Album, QFilterCondition> {
-  QueryBuilder<Album, Album, QAfterFilterCondition> activityEnabledEqualTo(
-      bool value) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(FilterCondition.equalTo(
-        property: r'activityEnabled',
-        value: value,
-      ));
-    });
-  }
-
   QueryBuilder<Album, Album, QAfterFilterCondition> createdAtEqualTo(
       DateTime value) {
     return QueryBuilder.apply(this, (query) {
@@ -1404,18 +1385,6 @@ extension AlbumQueryLinks on QueryBuilder<Album, Album, QFilterCondition> {
 }
 
 extension AlbumQuerySortBy on QueryBuilder<Album, Album, QSortBy> {
-  QueryBuilder<Album, Album, QAfterSortBy> sortByActivityEnabled() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addSortBy(r'activityEnabled', Sort.asc);
-    });
-  }
-
-  QueryBuilder<Album, Album, QAfterSortBy> sortByActivityEnabledDesc() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addSortBy(r'activityEnabled', Sort.desc);
-    });
-  }
-
   QueryBuilder<Album, Album, QAfterSortBy> sortByCreatedAt() {
     return QueryBuilder.apply(this, (query) {
       return query.addSortBy(r'createdAt', Sort.asc);
@@ -1527,18 +1496,6 @@ extension AlbumQuerySortBy on QueryBuilder<Album, Album, QSortBy> {
 }
 
 extension AlbumQuerySortThenBy on QueryBuilder<Album, Album, QSortThenBy> {
-  QueryBuilder<Album, Album, QAfterSortBy> thenByActivityEnabled() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addSortBy(r'activityEnabled', Sort.asc);
-    });
-  }
-
-  QueryBuilder<Album, Album, QAfterSortBy> thenByActivityEnabledDesc() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addSortBy(r'activityEnabled', Sort.desc);
-    });
-  }
-
   QueryBuilder<Album, Album, QAfterSortBy> thenByCreatedAt() {
     return QueryBuilder.apply(this, (query) {
       return query.addSortBy(r'createdAt', Sort.asc);
@@ -1662,12 +1619,6 @@ extension AlbumQuerySortThenBy on QueryBuilder<Album, Album, QSortThenBy> {
 }
 
 extension AlbumQueryWhereDistinct on QueryBuilder<Album, Album, QDistinct> {
-  QueryBuilder<Album, Album, QDistinct> distinctByActivityEnabled() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addDistinctBy(r'activityEnabled');
-    });
-  }
-
   QueryBuilder<Album, Album, QDistinct> distinctByCreatedAt() {
     return QueryBuilder.apply(this, (query) {
       return query.addDistinctBy(r'createdAt');
@@ -1733,12 +1684,6 @@ extension AlbumQueryProperty on QueryBuilder<Album, Album, QQueryProperty> {
     });
   }
 
-  QueryBuilder<Album, bool, QQueryOperations> activityEnabledProperty() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addPropertyName(r'activityEnabled');
-    });
-  }
-
   QueryBuilder<Album, DateTime, QQueryOperations> createdAtProperty() {
     return QueryBuilder.apply(this, (query) {
       return query.addPropertyName(r'createdAt');

mobile/lib/shared/models/exif_info.dart

@@ -8,8 +8,6 @@ part 'exif_info.g.dart';
 class ExifInfo {
   Id? id;
   int? fileSize;
-  DateTime? dateTimeOriginal;
-  String? timeZone;
   String? make;
   String? model;
   String? lens;
@@ -49,8 +47,6 @@ class ExifInfo {
 
   ExifInfo.fromDto(ExifResponseDto dto)
       : fileSize = dto.fileSizeInByte,
-        dateTimeOriginal = dto.dateTimeOriginal,
-        timeZone = dto.timeZone,
         make = dto.make,
         model = dto.model,
         lens = dto.lensModel,
@@ -68,8 +64,6 @@ class ExifInfo {
   ExifInfo({
     this.id,
     this.fileSize,
-    this.dateTimeOriginal,
-    this.timeZone,
     this.make,
     this.model,
     this.lens,
@@ -88,8 +82,6 @@ class ExifInfo {
   ExifInfo copyWith({
     Id? id,
     int? fileSize,
-    DateTime? dateTimeOriginal,
-    String? timeZone,
     String? make,
     String? model,
     String? lens,
@@ -107,8 +99,6 @@ class ExifInfo {
       ExifInfo(
         id: id ?? this.id,
         fileSize: fileSize ?? this.fileSize,
-        dateTimeOriginal: dateTimeOriginal ?? this.dateTimeOriginal,
-        timeZone: timeZone ?? this.timeZone,
         make: make ?? this.make,
         model: model ?? this.model,
         lens: lens ?? this.lens,
@@ -129,8 +119,6 @@ class ExifInfo {
     if (other is! ExifInfo) return false;
     return id == other.id &&
         fileSize == other.fileSize &&
-        dateTimeOriginal == other.dateTimeOriginal &&
-        timeZone == other.timeZone &&
         make == other.make &&
         model == other.model &&
         lens == other.lens &&
@@ -151,8 +139,6 @@ class ExifInfo {
   int get hashCode =>
       id.hashCode ^
       fileSize.hashCode ^
-      dateTimeOriginal.hashCode ^
-      timeZone.hashCode ^
       make.hashCode ^
       model.hashCode ^
       lens.hashCode ^

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

@@ -27,75 +27,65 @@ const ExifInfoSchema = CollectionSchema(
       name: r'country',
       type: IsarType.string,
     ),
-    r'dateTimeOriginal': PropertySchema(
-      id: 2,
-      name: r'dateTimeOriginal',
-      type: IsarType.dateTime,
-    ),
     r'description': PropertySchema(
-      id: 3,
+      id: 2,
       name: r'description',
       type: IsarType.string,
     ),
     r'exposureSeconds': PropertySchema(
-      id: 4,
+      id: 3,
       name: r'exposureSeconds',
       type: IsarType.float,
     ),
     r'f': PropertySchema(
-      id: 5,
+      id: 4,
       name: r'f',
       type: IsarType.float,
     ),
     r'fileSize': PropertySchema(
-      id: 6,
+      id: 5,
       name: r'fileSize',
       type: IsarType.long,
     ),
     r'iso': PropertySchema(
-      id: 7,
+      id: 6,
       name: r'iso',
       type: IsarType.int,
     ),
     r'lat': PropertySchema(
-      id: 8,
+      id: 7,
       name: r'lat',
       type: IsarType.float,
     ),
     r'lens': PropertySchema(
-      id: 9,
+      id: 8,
       name: r'lens',
       type: IsarType.string,
     ),
     r'long': PropertySchema(
-      id: 10,
+      id: 9,
       name: r'long',
       type: IsarType.float,
     ),
     r'make': PropertySchema(
-      id: 11,
+      id: 10,
       name: r'make',
       type: IsarType.string,
     ),
     r'mm': PropertySchema(
-      id: 12,
+      id: 11,
       name: r'mm',
       type: IsarType.float,
     ),
     r'model': PropertySchema(
-      id: 13,
+      id: 12,
       name: r'model',
       type: IsarType.string,
     ),
     r'state': PropertySchema(
-      id: 14,
+      id: 13,
       name: r'state',
       type: IsarType.string,
-    ),
-    r'timeZone': PropertySchema(
-      id: 15,
-      name: r'timeZone',
-      type: IsarType.string,
     )
   },
   estimateSize: _exifInfoEstimateSize,
@@ -160,12 +150,6 @@ int _exifInfoEstimateSize(
       bytesCount += 3 + value.length * 3;
     }
   }
-  {
-    final value = object.timeZone;
-    if (value != null) {
-      bytesCount += 3 + value.length * 3;
-    }
-  }
   return bytesCount;
 }
 
@@ -177,20 +161,18 @@ void _exifInfoSerialize(
 ) {
   writer.writeString(offsets[0], object.city);
   writer.writeString(offsets[1], object.country);
-  writer.writeDateTime(offsets[2], object.dateTimeOriginal);
+  writer.writeString(offsets[2], object.description);
-  writer.writeString(offsets[3], object.description);
+  writer.writeFloat(offsets[3], object.exposureSeconds);
-  writer.writeFloat(offsets[4], object.exposureSeconds);
+  writer.writeFloat(offsets[4], object.f);
-  writer.writeFloat(offsets[5], object.f);
+  writer.writeLong(offsets[5], object.fileSize);
-  writer.writeLong(offsets[6], object.fileSize);
+  writer.writeInt(offsets[6], object.iso);
-  writer.writeInt(offsets[7], object.iso);
+  writer.writeFloat(offsets[7], object.lat);
-  writer.writeFloat(offsets[8], object.lat);
+  writer.writeString(offsets[8], object.lens);
-  writer.writeString(offsets[9], object.lens);
+  writer.writeFloat(offsets[9], object.long);
-  writer.writeFloat(offsets[10], object.long);
+  writer.writeString(offsets[10], object.make);
-  writer.writeString(offsets[11], object.make);
+  writer.writeFloat(offsets[11], object.mm);
-  writer.writeFloat(offsets[12], object.mm);
+  writer.writeString(offsets[12], object.model);
-  writer.writeString(offsets[13], object.model);
+  writer.writeString(offsets[13], object.state);
-  writer.writeString(offsets[14], object.state);
-  writer.writeString(offsets[15], object.timeZone);
 }
 
 ExifInfo _exifInfoDeserialize(
@@ -202,21 +184,19 @@ ExifInfo _exifInfoDeserialize(
   final object = ExifInfo(
     city: reader.readStringOrNull(offsets[0]),
     country: reader.readStringOrNull(offsets[1]),
-    dateTimeOriginal: reader.readDateTimeOrNull(offsets[2]),
+    description: reader.readStringOrNull(offsets[2]),
-    description: reader.readStringOrNull(offsets[3]),
+    exposureSeconds: reader.readFloatOrNull(offsets[3]),
-    exposureSeconds: reader.readFloatOrNull(offsets[4]),
+    f: reader.readFloatOrNull(offsets[4]),
-    f: reader.readFloatOrNull(offsets[5]),
+    fileSize: reader.readLongOrNull(offsets[5]),
-    fileSize: reader.readLongOrNull(offsets[6]),
     id: id,
-    iso: reader.readIntOrNull(offsets[7]),
+    iso: reader.readIntOrNull(offsets[6]),
-    lat: reader.readFloatOrNull(offsets[8]),
+    lat: reader.readFloatOrNull(offsets[7]),
-    lens: reader.readStringOrNull(offsets[9]),
+    lens: reader.readStringOrNull(offsets[8]),
-    long: reader.readFloatOrNull(offsets[10]),
+    long: reader.readFloatOrNull(offsets[9]),
-    make: reader.readStringOrNull(offsets[11]),
+    make: reader.readStringOrNull(offsets[10]),
-    mm: reader.readFloatOrNull(offsets[12]),
+    mm: reader.readFloatOrNull(offsets[11]),
-    model: reader.readStringOrNull(offsets[13]),
+    model: reader.readStringOrNull(offsets[12]),
-    state: reader.readStringOrNull(offsets[14]),
+    state: reader.readStringOrNull(offsets[13]),
-    timeZone: reader.readStringOrNull(offsets[15]),
   );
   return object;
 }
@@ -233,33 +213,29 @@ P _exifInfoDeserializeProp<P>(
     case 1:
       return (reader.readStringOrNull(offset)) as P;
     case 2:
-      return (reader.readDateTimeOrNull(offset)) as P;
-    case 3:
       return (reader.readStringOrNull(offset)) as P;
+    case 3:
+      return (reader.readFloatOrNull(offset)) as P;
     case 4:
       return (reader.readFloatOrNull(offset)) as P;
     case 5:
-      return (reader.readFloatOrNull(offset)) as P;
-    case 6:
       return (reader.readLongOrNull(offset)) as P;
-    case 7:
+    case 6:
       return (reader.readIntOrNull(offset)) as P;
+    case 7:
+      return (reader.readFloatOrNull(offset)) as P;
     case 8:
-      return (reader.readFloatOrNull(offset)) as P;
+      return (reader.readStringOrNull(offset)) as P;
     case 9:
-      return (reader.readStringOrNull(offset)) as P;
+      return (reader.readFloatOrNull(offset)) as P;
     case 10:
-      return (reader.readFloatOrNull(offset)) as P;
+      return (reader.readStringOrNull(offset)) as P;
     case 11:
-      return (reader.readStringOrNull(offset)) as P;
-    case 12:
       return (reader.readFloatOrNull(offset)) as P;
+    case 12:
+      return (reader.readStringOrNull(offset)) as P;
     case 13:
       return (reader.readStringOrNull(offset)) as P;
-    case 14:
-      return (reader.readStringOrNull(offset)) as P;
-    case 15:
-      return (reader.readStringOrNull(offset)) as P;
     default:
       throw IsarError('Unknown property with id $propertyId');
   }
@@ -646,80 +622,6 @@ extension ExifInfoQueryFilter
     });
   }
 
-  QueryBuilder<ExifInfo, ExifInfo, QAfterFilterCondition>
-      dateTimeOriginalIsNull() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(const FilterCondition.isNull(
-        property: r'dateTimeOriginal',
-      ));
-    });
-  }
-
-  QueryBuilder<ExifInfo, ExifInfo, QAfterFilterCondition>
-      dateTimeOriginalIsNotNull() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(const FilterCondition.isNotNull(
-        property: r'dateTimeOriginal',
-      ));
-    });
-  }
-
-  QueryBuilder<ExifInfo, ExifInfo, QAfterFilterCondition>
-      dateTimeOriginalEqualTo(DateTime? value) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(FilterCondition.equalTo(
-        property: r'dateTimeOriginal',
-        value: value,
-      ));
-    });
-  }
-
-  QueryBuilder<ExifInfo, ExifInfo, QAfterFilterCondition>
-      dateTimeOriginalGreaterThan(
-    DateTime? value, {
-    bool include = false,
-  }) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(FilterCondition.greaterThan(
-        include: include,
-        property: r'dateTimeOriginal',
-        value: value,
-      ));
-    });
-  }
-
-  QueryBuilder<ExifInfo, ExifInfo, QAfterFilterCondition>
-      dateTimeOriginalLessThan(
-    DateTime? value, {
-    bool include = false,
-  }) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(FilterCondition.lessThan(
-        include: include,
-        property: r'dateTimeOriginal',
-        value: value,
-      ));
-    });
-  }
-
-  QueryBuilder<ExifInfo, ExifInfo, QAfterFilterCondition>
-      dateTimeOriginalBetween(
-    DateTime? lower,
-    DateTime? upper, {
-    bool includeLower = true,
-    bool includeUpper = true,
-  }) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(FilterCondition.between(
-        property: r'dateTimeOriginal',
-        lower: lower,
-        includeLower: includeLower,
-        upper: upper,
-        includeUpper: includeUpper,
-      ));
-    });
-  }
-
   QueryBuilder<ExifInfo, ExifInfo, QAfterFilterCondition> descriptionIsNull() {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(const FilterCondition.isNull(
@@ -2054,152 +1956,6 @@ extension ExifInfoQueryFilter
       ));
     });
   }
-
-  QueryBuilder<ExifInfo, ExifInfo, QAfterFilterCondition> timeZoneIsNull() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(const FilterCondition.isNull(
-        property: r'timeZone',
-      ));
-    });
-  }
-
-  QueryBuilder<ExifInfo, ExifInfo, QAfterFilterCondition> timeZoneIsNotNull() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(const FilterCondition.isNotNull(
-        property: r'timeZone',
-      ));
-    });
-  }
-
-  QueryBuilder<ExifInfo, ExifInfo, QAfterFilterCondition> timeZoneEqualTo(
-    String? value, {
-    bool caseSensitive = true,
-  }) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(FilterCondition.equalTo(
-        property: r'timeZone',
-        value: value,
-        caseSensitive: caseSensitive,
-      ));
-    });
-  }
-
-  QueryBuilder<ExifInfo, ExifInfo, QAfterFilterCondition> timeZoneGreaterThan(
-    String? value, {
-    bool include = false,
-    bool caseSensitive = true,
-  }) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(FilterCondition.greaterThan(
-        include: include,
-        property: r'timeZone',
-        value: value,
-        caseSensitive: caseSensitive,
-      ));
-    });
-  }
-
-  QueryBuilder<ExifInfo, ExifInfo, QAfterFilterCondition> timeZoneLessThan(
-    String? value, {
-    bool include = false,
-    bool caseSensitive = true,
-  }) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(FilterCondition.lessThan(
-        include: include,
-        property: r'timeZone',
-        value: value,
-        caseSensitive: caseSensitive,
-      ));
-    });
-  }
-
-  QueryBuilder<ExifInfo, ExifInfo, QAfterFilterCondition> timeZoneBetween(
-    String? lower,
-    String? upper, {
-    bool includeLower = true,
-    bool includeUpper = true,
-    bool caseSensitive = true,
-  }) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(FilterCondition.between(
-        property: r'timeZone',
-        lower: lower,
-        includeLower: includeLower,
-        upper: upper,
-        includeUpper: includeUpper,
-        caseSensitive: caseSensitive,
-      ));
-    });
-  }
-
-  QueryBuilder<ExifInfo, ExifInfo, QAfterFilterCondition> timeZoneStartsWith(
-    String value, {
-    bool caseSensitive = true,
-  }) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(FilterCondition.startsWith(
-        property: r'timeZone',
-        value: value,
-        caseSensitive: caseSensitive,
-      ));
-    });
-  }
-
-  QueryBuilder<ExifInfo, ExifInfo, QAfterFilterCondition> timeZoneEndsWith(
-    String value, {
-    bool caseSensitive = true,
-  }) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(FilterCondition.endsWith(
-        property: r'timeZone',
-        value: value,
-        caseSensitive: caseSensitive,
-      ));
-    });
-  }
-
-  QueryBuilder<ExifInfo, ExifInfo, QAfterFilterCondition> timeZoneContains(
-      String value,
-      {bool caseSensitive = true}) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(FilterCondition.contains(
-        property: r'timeZone',
-        value: value,
-        caseSensitive: caseSensitive,
-      ));
-    });
-  }
-
-  QueryBuilder<ExifInfo, ExifInfo, QAfterFilterCondition> timeZoneMatches(
-      String pattern,
-      {bool caseSensitive = true}) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(FilterCondition.matches(
-        property: r'timeZone',
-        wildcard: pattern,
-        caseSensitive: caseSensitive,
-      ));
-    });
-  }
-
-  QueryBuilder<ExifInfo, ExifInfo, QAfterFilterCondition> timeZoneIsEmpty() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(FilterCondition.equalTo(
-        property: r'timeZone',
-        value: '',
-      ));
-    });
-  }
-
-  QueryBuilder<ExifInfo, ExifInfo, QAfterFilterCondition> timeZoneIsNotEmpty() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(FilterCondition.greaterThan(
-        property: r'timeZone',
-        value: '',
-      ));
-    });
-  }
 }
 
 extension ExifInfoQueryObject
@@ -2233,18 +1989,6 @@ extension ExifInfoQuerySortBy on QueryBuilder<ExifInfo, ExifInfo, QSortBy> {
     });
   }
 
-  QueryBuilder<ExifInfo, ExifInfo, QAfterSortBy> sortByDateTimeOriginal() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addSortBy(r'dateTimeOriginal', Sort.asc);
-    });
-  }
-
-  QueryBuilder<ExifInfo, ExifInfo, QAfterSortBy> sortByDateTimeOriginalDesc() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addSortBy(r'dateTimeOriginal', Sort.desc);
-    });
-  }
-
   QueryBuilder<ExifInfo, ExifInfo, QAfterSortBy> sortByDescription() {
     return QueryBuilder.apply(this, (query) {
       return query.addSortBy(r'description', Sort.asc);
@@ -2388,18 +2132,6 @@ extension ExifInfoQuerySortBy on QueryBuilder<ExifInfo, ExifInfo, QSortBy> {
       return query.addSortBy(r'state', Sort.desc);
     });
   }
-
-  QueryBuilder<ExifInfo, ExifInfo, QAfterSortBy> sortByTimeZone() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addSortBy(r'timeZone', Sort.asc);
-    });
-  }
-
-  QueryBuilder<ExifInfo, ExifInfo, QAfterSortBy> sortByTimeZoneDesc() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addSortBy(r'timeZone', Sort.desc);
-    });
-  }
 }
 
 extension ExifInfoQuerySortThenBy
@@ -2428,18 +2160,6 @@ extension ExifInfoQuerySortThenBy
     });
   }
 
-  QueryBuilder<ExifInfo, ExifInfo, QAfterSortBy> thenByDateTimeOriginal() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addSortBy(r'dateTimeOriginal', Sort.asc);
-    });
-  }
-
-  QueryBuilder<ExifInfo, ExifInfo, QAfterSortBy> thenByDateTimeOriginalDesc() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addSortBy(r'dateTimeOriginal', Sort.desc);
-    });
-  }
-
   QueryBuilder<ExifInfo, ExifInfo, QAfterSortBy> thenByDescription() {
     return QueryBuilder.apply(this, (query) {
       return query.addSortBy(r'description', Sort.asc);
@@ -2595,18 +2315,6 @@ extension ExifInfoQuerySortThenBy
       return query.addSortBy(r'state', Sort.desc);
     });
   }
-
-  QueryBuilder<ExifInfo, ExifInfo, QAfterSortBy> thenByTimeZone() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addSortBy(r'timeZone', Sort.asc);
-    });
-  }
-
-  QueryBuilder<ExifInfo, ExifInfo, QAfterSortBy> thenByTimeZoneDesc() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addSortBy(r'timeZone', Sort.desc);
-    });
-  }
 }
 
 extension ExifInfoQueryWhereDistinct
@@ -2625,12 +2333,6 @@ extension ExifInfoQueryWhereDistinct
     });
   }
 
-  QueryBuilder<ExifInfo, ExifInfo, QDistinct> distinctByDateTimeOriginal() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addDistinctBy(r'dateTimeOriginal');
-    });
-  }
-
   QueryBuilder<ExifInfo, ExifInfo, QDistinct> distinctByDescription(
       {bool caseSensitive = true}) {
     return QueryBuilder.apply(this, (query) {
@@ -2707,13 +2409,6 @@ extension ExifInfoQueryWhereDistinct
       return query.addDistinctBy(r'state', caseSensitive: caseSensitive);
     });
   }
-
-  QueryBuilder<ExifInfo, ExifInfo, QDistinct> distinctByTimeZone(
-      {bool caseSensitive = true}) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addDistinctBy(r'timeZone', caseSensitive: caseSensitive);
-    });
-  }
 }
 
 extension ExifInfoQueryProperty
@@ -2736,13 +2431,6 @@ extension ExifInfoQueryProperty
     });
   }
 
-  QueryBuilder<ExifInfo, DateTime?, QQueryOperations>
-      dateTimeOriginalProperty() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addPropertyName(r'dateTimeOriginal');
-    });
-  }
-
   QueryBuilder<ExifInfo, String?, QQueryOperations> descriptionProperty() {
     return QueryBuilder.apply(this, (query) {
       return query.addPropertyName(r'description');
@@ -2814,10 +2502,4 @@ extension ExifInfoQueryProperty
       return query.addPropertyName(r'state');
     });
   }
-
-  QueryBuilder<ExifInfo, String?, QQueryOperations> timeZoneProperty() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addPropertyName(r'timeZone');
-    });
-  }
 }

mobile/lib/shared/models/store.dart

@@ -156,7 +156,6 @@ enum StoreKey<T> {
   accessToken<String>(11, type: String),
   serverEndpoint<String>(12, type: String),
   autoBackup<bool>(13, type: bool),
-  backgroundBackup<bool>(14, type: bool),
   // user settings from [AppSettingsEnum] below:
   loadPreview<bool>(100, type: bool),
   loadOriginal<bool>(101, type: bool),

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

@@ -66,7 +66,7 @@ class ServerInfoNotifier extends StateNotifier<ServerInfo> {
       state = state.copyWith(
         isVersionMismatch: true,
         versionMismatchErrorMessage:
-            "Server is out of date. Please update to the latest major version.",
+            "Server is out of date in major version. Some functionalities might not work correctly. Download and rebuild server",
       );
 
       return;
@@ -76,7 +76,7 @@ class ServerInfoNotifier extends StateNotifier<ServerInfo> {
       state = state.copyWith(
         isVersionMismatch: true,
         versionMismatchErrorMessage:
-            "Server is out of date. Consider updating to the latest minor version.",
+            "Server is out of date in minor version. Some functionalities might not work correctly. Consider download and rebuild server",
       );
 
       return;

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

@@ -22,7 +22,6 @@ class ApiService {
   late PersonApi personApi;
   late AuditApi auditApi;
   late SharedLinkApi sharedLinkApi;
-  late ActivityApi activityApi;
 
   ApiService() {
     final endpoint = Store.tryGet(StoreKey.serverEndpoint);
@@ -48,7 +47,6 @@ class ApiService {
     personApi = PersonApi(_apiClient);
     auditApi = AuditApi(_apiClient);
     sharedLinkApi = SharedLinkApi(_apiClient);
-    activityApi = ActivityApi(_apiClient);
   }
 
   Future<String> resolveAndSetEndpoint(String serverUrl) async {

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

@@ -62,31 +62,20 @@ class AssetService {
 
   /// Returns `null` if the server state did not change, else list of assets
   Future<List<Asset>?> _getRemoteAssets(User user) async {
-    const int chunkSize = 5000;
     try {
-      final DateTime now = DateTime.now().toUtc();
+      final List<AssetResponseDto>? assets =
-      final List<Asset> allAssets = [];
+          await _apiService.assetApi.getAllAssets(
-      for (int i = 0;; i += chunkSize) {
+        userId: user.id,
-        final List<AssetResponseDto>? assets =
+      );
-            await _apiService.assetApi.getAllAssets(
+      if (assets == null) {
-          userId: user.id,
+        return null;
-          // updatedBefore is important! without it we could
+      } else if (assets.isNotEmpty && assets.first.ownerId != user.id) {
-          // a) get the same Asset multiple times in different versions (when
+        log.warning("Make sure that server and app versions match!"
-          // the asset is modified while the chunks are loaded from the server)
+            " The server returned assets for user ${assets.first.ownerId}"
-          // b) miss assets when new assets are inserted in between the calls
+            " while requesting assets of user ${user.id}");
-          updatedBefore: now,
+        return null;
-          skip: i,
-          take: chunkSize,
-        );
-        if (assets == null) {
-          return null;
-        }
-        allAssets.addAll(assets.map(Asset.remote));
-        if (assets.length < chunkSize) {
-          break;
-        }
       }
-      return allAssets;
+      return assets.map(Asset.remote).toList();
     } catch (error, stack) {
       log.severe(
         'Error while getting remote assets: ${error.toString()}',

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

@@ -197,7 +197,7 @@ class SyncService {
     User user,
     FutureOr<List<Asset>?> Function(User user) loadAssets,
   ) async {
-    final DateTime now = DateTime.now().toUtc();
+    final DateTime now = DateTime.now();
     final List<Asset>? remote = await loadAssets(user);
     if (remote == null) {
       return false;
@@ -210,10 +210,6 @@ class SyncService {
     assert(inDb.isSorted(Asset.compareByChecksum), "inDb not sorted!");
 
     remote.sort(Asset.compareByChecksum);
-
-    // filter our duplicates that might be introduced by the chunked retrieval
-    remote.uniqueConsecutive(compare: Asset.compareByChecksum);
-
     final (toAdd, toUpdate, toRemove) = _diffAssets(remote, inDb, remote: true);
     if (toAdd.isEmpty && toUpdate.isEmpty && toRemove.isEmpty) {
       await _updateUserAssetsETag(user, now);
@@ -763,12 +759,6 @@ class SyncService {
   final List<Asset> toAdd = [];
   final List<Asset> toUpdate = [];
   final List<Asset> toRemove = [];
-  if (assets.isEmpty || inDb.isEmpty) {
-    // fast path for trivial cases: halfes memory usage during initial sync
-    return assets.isEmpty
-        ? (toAdd, toUpdate, inDb) // remove all from DB
-        : (assets, toUpdate, toRemove); // add all assets
-  }
   diffSortedListsSync(
     inDb,
     assets,

mobile/lib/shared/ui/app_bar_dialog/app_bar_dialog.dart

@@ -194,7 +194,6 @@ class ImmichAppBarDialog extends HookConsumerWidget {
                 Navigator.of(context).pop();
                 launchUrl(
                   Uri.parse('https://immich.app'),
-                  mode: LaunchMode.externalApplication,
                 );
               },
               child: Text(
@@ -214,7 +213,6 @@ class ImmichAppBarDialog extends HookConsumerWidget {
                 Navigator.of(context).pop();
                 launchUrl(
                   Uri.parse('https://github.com/immich-app/immich'),
-                  mode: LaunchMode.externalApplication,
                 );
               },
               child: Text(

mobile/lib/shared/ui/app_bar_dialog/app_bar_server_info.dart

@@ -182,36 +182,19 @@ class AppBarServerInfo extends HookConsumerWidget {
                     child: Container(
                       width: 200,
                       padding: const EdgeInsets.only(right: 10.0),
-                      child: Tooltip(
+                      child: Text(
-                        verticalOffset: 0,
+                        getServerUrl() ?? '--',
-                        decoration: BoxDecoration(
+                        style: TextStyle(
-                          color:
+                          fontSize: 11,
-                              Theme.of(context).primaryColor.withOpacity(0.9),
+                          color: Theme.of(context)
-                          borderRadius: BorderRadius.circular(10),
+                              .textTheme
-                        ),
+                              .labelSmall
-                        textStyle: TextStyle(
+                              ?.color
-                          color: Theme.of(context).brightness == Brightness.dark
+                              ?.withOpacity(0.5),
-                              ? Colors.black
-                              : Colors.white,
                           fontWeight: FontWeight.bold,
+                          overflow: TextOverflow.ellipsis,
                         ),
-                        message: getServerUrl() ?? '--',
+                        textAlign: TextAlign.end,
-                        preferBelow: false,
-                        triggerMode: TooltipTriggerMode.tap,
-                        child: Text(
-                          getServerUrl() ?? '--',
-                          style: TextStyle(
-                            fontSize: 11,
-                            color: Theme.of(context)
-                                .textTheme
-                                .labelSmall
-                                ?.color
-                                ?.withOpacity(0.5),
-                            fontWeight: FontWeight.bold,
-                            overflow: TextOverflow.ellipsis,
-                          ),
-                          textAlign: TextAlign.end,
-                        ),
                       ),
                     ),
                   ),

mobile/lib/shared/ui/immich_app_bar.dart

@@ -31,7 +31,7 @@ class ImmichAppBar extends ConsumerWidget implements PreferredSizeWidget {
     final isDarkMode = Theme.of(context).brightness == Brightness.dark;
     const widgetSize = 30.0;
 
-    buildProfileIndicator() {
+    buildProfilePhoto() {
       return InkWell(
         onTap: () => showDialog(
           context: context,
@@ -39,33 +39,37 @@ class ImmichAppBar extends ConsumerWidget implements PreferredSizeWidget {
           builder: (ctx) => const ImmichAppBarDialog(),
         ),
         borderRadius: BorderRadius.circular(12),
-        child: Badge(
+        child: authState.profileImagePath.isEmpty || user == null
-          label: Container(
+            ? const Icon(
-            decoration: BoxDecoration(
+                Icons.face_outlined,
-              color: Colors.black,
+                size: widgetSize,
-              borderRadius: BorderRadius.circular(widgetSize / 2),
+              )
-            ),
+            : UserCircleAvatar(
-            child: const Icon(
+                radius: 15,
-              Icons.info,
+                size: 27,
-              color: Color.fromARGB(255, 243, 188, 106),
+                user: user,
-              size: widgetSize / 2,
+              ),
-            ),
+      );
+    }
+
+    buildProfileIndicator() {
+      return Badge(
+        label: Container(
+          decoration: BoxDecoration(
+            color: Colors.black,
+            borderRadius: BorderRadius.circular(widgetSize / 2),
+          ),
+          child: const Icon(
+            Icons.info,
+            color: Color.fromARGB(255, 243, 188, 106),
+            size: widgetSize / 2,
           ),
-          backgroundColor: Colors.transparent,
-          alignment: Alignment.bottomRight,
-          isLabelVisible: serverInfoState.isVersionMismatch,
-          offset: const Offset(2, 2),
-          child: authState.profileImagePath.isEmpty || user == null
-              ? const Icon(
-                  Icons.face_outlined,
-                  size: widgetSize,
-                )
-              : UserCircleAvatar(
-                  radius: 15,
-                  size: 27,
-                  user: user,
-                ),
         ),
+        backgroundColor: Colors.transparent,
+        alignment: Alignment.bottomRight,
+        isLabelVisible: serverInfoState.isVersionMismatch,
+        offset: const Offset(2, 2),
+        child: buildProfilePhoto(),
       );
     }
 

mobile/lib/shared/ui/user_circle_avatar.dart

@@ -40,23 +40,19 @@ class UserCircleAvatar extends ConsumerWidget {
 
     final profileImageUrl =
         '${Store.get(StoreKey.serverEndpoint)}/user/profile-image/${user.id}?d=${Random().nextInt(1024)}';
-
-    final textIcon = Text(
-      user.firstName[0].toUpperCase(),
-      style: TextStyle(
-        fontWeight: FontWeight.bold,
-        color: Theme.of(context).brightness == Brightness.dark
-            ? Colors.black
-            : Colors.white,
-      ),
-    );
     return CircleAvatar(
       backgroundColor: useRandomBackgroundColor
           ? randomColors[Random().nextInt(randomColors.length)]
           : Theme.of(context).primaryColor,
       radius: radius,
       child: user.profileImagePath == ""
-          ? textIcon
+          ? Text(
+              user.firstName[0].toUpperCase(),
+              style: const TextStyle(
+                fontWeight: FontWeight.bold,
+                color: Colors.black,
+              ),
+            )
           : ClipRRect(
               borderRadius: BorderRadius.circular(50),
               child: CachedNetworkImage(
@@ -70,7 +66,8 @@ class UserCircleAvatar extends ConsumerWidget {
                   "Authorization": "Bearer ${Store.get(StoreKey.accessToken)}",
                 },
                 fadeInDuration: const Duration(milliseconds: 300),
-                errorWidget: (context, error, stackTrace) => textIcon,
+                errorWidget: (context, error, stackTrace) =>
+                    Image.memory(kTransparentImage),
               ),
             ),
     );

mobile/lib/utils/datetime_extensions.dart

@@ -1,36 +0,0 @@
-extension TimeAgoExtension on DateTime {
-  String timeAgo({bool numericDates = true}) {
-    DateTime date = toLocal();
-    final date2 = DateTime.now().toLocal();
-    final difference = date2.difference(date);
-
-    if (difference.inSeconds < 5) {
-      return 'Just now';
-    } else if (difference.inSeconds < 60) {
-      return '${difference.inSeconds} seconds ago';
-    } else if (difference.inMinutes <= 1) {
-      return (numericDates) ? '1 minute ago' : 'A minute ago';
-    } else if (difference.inMinutes < 60) {
-      return '${difference.inMinutes} minutes ago';
-    } else if (difference.inHours <= 1) {
-      return (numericDates) ? '1 hour ago' : 'An hour ago';
-    } else if (difference.inHours < 60) {
-      return '${difference.inHours} hours ago';
-    } else if (difference.inDays <= 1) {
-      return (numericDates) ? '1 day ago' : 'Yesterday';
-    } else if (difference.inDays < 6) {
-      return '${difference.inDays} days ago';
-    } else if ((difference.inDays / 7).ceil() <= 1) {
-      return (numericDates) ? '1 week ago' : 'Last week';
-    } else if ((difference.inDays / 7).ceil() < 4) {
-      return '${(difference.inDays / 7).ceil()} weeks ago';
-    } else if ((difference.inDays / 30).ceil() <= 1) {
-      return (numericDates) ? '1 month ago' : 'Last month';
-    } else if ((difference.inDays / 30).ceil() < 30) {
-      return '${(difference.inDays / 30).ceil()} months ago';
-    } else if ((difference.inDays / 365).ceil() <= 1) {
-      return (numericDates) ? '1 year ago' : 'Last year';
-    }
-    return '${(difference.inDays / 365).floor()} years ago';
-  }
-}

mobile/openapi/README.md

@@ -3,7 +3,7 @@ Immich API
 
 This Dart package is automatically generated by the [OpenAPI Generator](https://openapi-generator.tech) project:
 
-- API version: 1.85.0
+- API version: 1.84.0
 - Build package: org.openapitools.codegen.languages.DartClientCodegen
 
 ## Requirements
@@ -58,10 +58,10 @@ final api_instance = APIKeyApi();
 final aPIKeyCreateDto = APIKeyCreateDto(); // APIKeyCreateDto | 
 
 try {
-    final result = api_instance.createApiKey(aPIKeyCreateDto);
+    final result = api_instance.createKey(aPIKeyCreateDto);
     print(result);
 } catch (e) {
-    print('Exception when calling APIKeyApi->createApiKey: $e\n');
+    print('Exception when calling APIKeyApi->createKey: $e\n');
 }
 
 ```
@@ -72,11 +72,11 @@ All URIs are relative to */api*
 
 Class | Method | HTTP request | Description
 ------------ | ------------- | ------------- | -------------
-*APIKeyApi* | [**createApiKey**](doc//APIKeyApi.md#createapikey) | **POST** /api-key | 
+*APIKeyApi* | [**createKey**](doc//APIKeyApi.md#createkey) | **POST** /api-key | 
-*APIKeyApi* | [**deleteApiKey**](doc//APIKeyApi.md#deleteapikey) | **DELETE** /api-key/{id} | 
+*APIKeyApi* | [**deleteKey**](doc//APIKeyApi.md#deletekey) | **DELETE** /api-key/{id} | 
-*APIKeyApi* | [**getApiKey**](doc//APIKeyApi.md#getapikey) | **GET** /api-key/{id} | 
+*APIKeyApi* | [**getKey**](doc//APIKeyApi.md#getkey) | **GET** /api-key/{id} | 
-*APIKeyApi* | [**getApiKeys**](doc//APIKeyApi.md#getapikeys) | **GET** /api-key | 
+*APIKeyApi* | [**getKeys**](doc//APIKeyApi.md#getkeys) | **GET** /api-key | 
-*APIKeyApi* | [**updateApiKey**](doc//APIKeyApi.md#updateapikey) | **PUT** /api-key/{id} | 
+*APIKeyApi* | [**updateKey**](doc//APIKeyApi.md#updatekey) | **PUT** /api-key/{id} | 
 *ActivityApi* | [**createActivity**](doc//ActivityApi.md#createactivity) | **POST** /activity | 
 *ActivityApi* | [**deleteActivity**](doc//ActivityApi.md#deleteactivity) | **DELETE** /activity/{id} | 
 *ActivityApi* | [**getActivities**](doc//ActivityApi.md#getactivities) | **GET** /activity | 
@@ -91,7 +91,7 @@ Class | Method | HTTP request | Description
 *AlbumApi* | [**removeAssetFromAlbum**](doc//AlbumApi.md#removeassetfromalbum) | **DELETE** /album/{id}/assets | 
 *AlbumApi* | [**removeUserFromAlbum**](doc//AlbumApi.md#removeuserfromalbum) | **DELETE** /album/{id}/user/{userId} | 
 *AlbumApi* | [**updateAlbumInfo**](doc//AlbumApi.md#updatealbuminfo) | **PATCH** /album/{id} | 
-*AssetApi* | [**checkBulkUpload**](doc//AssetApi.md#checkbulkupload) | **POST** /asset/bulk-upload-check | 
+*AssetApi* | [**bulkUploadCheck**](doc//AssetApi.md#bulkuploadcheck) | **POST** /asset/bulk-upload-check | 
 *AssetApi* | [**checkExistingAssets**](doc//AssetApi.md#checkexistingassets) | **POST** /asset/exist | 
 *AssetApi* | [**deleteAssets**](doc//AssetApi.md#deleteassets) | **DELETE** /asset | 
 *AssetApi* | [**downloadArchive**](doc//AssetApi.md#downloadarchive) | **POST** /asset/download/archive | 
@@ -100,15 +100,15 @@ Class | Method | HTTP request | Description
 *AssetApi* | [**getAllAssets**](doc//AssetApi.md#getallassets) | **GET** /asset | 
 *AssetApi* | [**getAssetById**](doc//AssetApi.md#getassetbyid) | **GET** /asset/assetById/{id} | 
 *AssetApi* | [**getAssetSearchTerms**](doc//AssetApi.md#getassetsearchterms) | **GET** /asset/search-terms | 
-*AssetApi* | [**getAssetStatistics**](doc//AssetApi.md#getassetstatistics) | **GET** /asset/statistics | 
+*AssetApi* | [**getAssetStats**](doc//AssetApi.md#getassetstats) | **GET** /asset/statistics | 
 *AssetApi* | [**getAssetThumbnail**](doc//AssetApi.md#getassetthumbnail) | **GET** /asset/thumbnail/{id} | 
+*AssetApi* | [**getByTimeBucket**](doc//AssetApi.md#getbytimebucket) | **GET** /asset/time-bucket | 
 *AssetApi* | [**getCuratedLocations**](doc//AssetApi.md#getcuratedlocations) | **GET** /asset/curated-locations | 
 *AssetApi* | [**getCuratedObjects**](doc//AssetApi.md#getcuratedobjects) | **GET** /asset/curated-objects | 
 *AssetApi* | [**getDownloadInfo**](doc//AssetApi.md#getdownloadinfo) | **POST** /asset/download/info | 
 *AssetApi* | [**getMapMarkers**](doc//AssetApi.md#getmapmarkers) | **GET** /asset/map-marker | 
 *AssetApi* | [**getMemoryLane**](doc//AssetApi.md#getmemorylane) | **GET** /asset/memory-lane | 
 *AssetApi* | [**getRandom**](doc//AssetApi.md#getrandom) | **GET** /asset/random | 
-*AssetApi* | [**getTimeBucket**](doc//AssetApi.md#gettimebucket) | **GET** /asset/time-bucket | 
 *AssetApi* | [**getTimeBuckets**](doc//AssetApi.md#gettimebuckets) | **GET** /asset/time-buckets | 
 *AssetApi* | [**getUserAssetsByDeviceId**](doc//AssetApi.md#getuserassetsbydeviceid) | **GET** /asset/{deviceId} | 
 *AssetApi* | [**importFile**](doc//AssetApi.md#importfile) | **POST** /asset/import | 
@@ -125,30 +125,30 @@ Class | Method | HTTP request | Description
 *AuditApi* | [**getAuditDeletes**](doc//AuditApi.md#getauditdeletes) | **GET** /audit/deletes | 
 *AuditApi* | [**getAuditFiles**](doc//AuditApi.md#getauditfiles) | **GET** /audit/file-report | 
 *AuditApi* | [**getFileChecksums**](doc//AuditApi.md#getfilechecksums) | **POST** /audit/file-report/checksum | 
+*AuthenticationApi* | [**adminSignUp**](doc//AuthenticationApi.md#adminsignup) | **POST** /auth/admin-sign-up | 
 *AuthenticationApi* | [**changePassword**](doc//AuthenticationApi.md#changepassword) | **POST** /auth/change-password | 
 *AuthenticationApi* | [**getAuthDevices**](doc//AuthenticationApi.md#getauthdevices) | **GET** /auth/devices | 
 *AuthenticationApi* | [**login**](doc//AuthenticationApi.md#login) | **POST** /auth/login | 
 *AuthenticationApi* | [**logout**](doc//AuthenticationApi.md#logout) | **POST** /auth/logout | 
 *AuthenticationApi* | [**logoutAuthDevice**](doc//AuthenticationApi.md#logoutauthdevice) | **DELETE** /auth/devices/{id} | 
 *AuthenticationApi* | [**logoutAuthDevices**](doc//AuthenticationApi.md#logoutauthdevices) | **DELETE** /auth/devices | 
-*AuthenticationApi* | [**signUpAdmin**](doc//AuthenticationApi.md#signupadmin) | **POST** /auth/admin-sign-up | 
 *AuthenticationApi* | [**validateAccessToken**](doc//AuthenticationApi.md#validateaccesstoken) | **POST** /auth/validateToken | 
 *JobApi* | [**getAllJobsStatus**](doc//JobApi.md#getalljobsstatus) | **GET** /jobs | 
 *JobApi* | [**sendJobCommand**](doc//JobApi.md#sendjobcommand) | **PUT** /jobs/{id} | 
 *LibraryApi* | [**createLibrary**](doc//LibraryApi.md#createlibrary) | **POST** /library | 
 *LibraryApi* | [**deleteLibrary**](doc//LibraryApi.md#deletelibrary) | **DELETE** /library/{id} | 
-*LibraryApi* | [**getLibraries**](doc//LibraryApi.md#getlibraries) | **GET** /library | 
+*LibraryApi* | [**getAllForUser**](doc//LibraryApi.md#getallforuser) | **GET** /library | 
 *LibraryApi* | [**getLibraryInfo**](doc//LibraryApi.md#getlibraryinfo) | **GET** /library/{id} | 
 *LibraryApi* | [**getLibraryStatistics**](doc//LibraryApi.md#getlibrarystatistics) | **GET** /library/{id}/statistics | 
 *LibraryApi* | [**removeOfflineFiles**](doc//LibraryApi.md#removeofflinefiles) | **POST** /library/{id}/removeOffline | 
 *LibraryApi* | [**scanLibrary**](doc//LibraryApi.md#scanlibrary) | **POST** /library/{id}/scan | 
 *LibraryApi* | [**updateLibrary**](doc//LibraryApi.md#updatelibrary) | **PUT** /library/{id} | 
-*OAuthApi* | [**finishOAuth**](doc//OAuthApi.md#finishoauth) | **POST** /oauth/callback | 
+*OAuthApi* | [**authorizeOAuth**](doc//OAuthApi.md#authorizeoauth) | **POST** /oauth/authorize | 
-*OAuthApi* | [**generateOAuthConfig**](doc//OAuthApi.md#generateoauthconfig) | **POST** /oauth/config | 
+*OAuthApi* | [**callback**](doc//OAuthApi.md#callback) | **POST** /oauth/callback | 
-*OAuthApi* | [**linkOAuthAccount**](doc//OAuthApi.md#linkoauthaccount) | **POST** /oauth/link | 
+*OAuthApi* | [**generateConfig**](doc//OAuthApi.md#generateconfig) | **POST** /oauth/config | 
-*OAuthApi* | [**redirectOAuthToMobile**](doc//OAuthApi.md#redirectoauthtomobile) | **GET** /oauth/mobile-redirect | 
+*OAuthApi* | [**link**](doc//OAuthApi.md#link) | **POST** /oauth/link | 
-*OAuthApi* | [**startOAuth**](doc//OAuthApi.md#startoauth) | **POST** /oauth/authorize | 
+*OAuthApi* | [**mobileRedirect**](doc//OAuthApi.md#mobileredirect) | **GET** /oauth/mobile-redirect | 
-*OAuthApi* | [**unlinkOAuthAccount**](doc//OAuthApi.md#unlinkoauthaccount) | **POST** /oauth/unlink | 
+*OAuthApi* | [**unlink**](doc//OAuthApi.md#unlink) | **POST** /oauth/unlink | 
 *PartnerApi* | [**createPartner**](doc//PartnerApi.md#createpartner) | **POST** /partner/{id} | 
 *PartnerApi* | [**getPartners**](doc//PartnerApi.md#getpartners) | **GET** /partner | 
 *PartnerApi* | [**removePartner**](doc//PartnerApi.md#removepartner) | **DELETE** /partner/{id} | 
@@ -166,8 +166,8 @@ Class | Method | HTTP request | Description
 *ServerInfoApi* | [**getServerConfig**](doc//ServerInfoApi.md#getserverconfig) | **GET** /server-info/config | 
 *ServerInfoApi* | [**getServerFeatures**](doc//ServerInfoApi.md#getserverfeatures) | **GET** /server-info/features | 
 *ServerInfoApi* | [**getServerInfo**](doc//ServerInfoApi.md#getserverinfo) | **GET** /server-info | 
-*ServerInfoApi* | [**getServerStatistics**](doc//ServerInfoApi.md#getserverstatistics) | **GET** /server-info/statistics | 
 *ServerInfoApi* | [**getServerVersion**](doc//ServerInfoApi.md#getserverversion) | **GET** /server-info/version | 
+*ServerInfoApi* | [**getStats**](doc//ServerInfoApi.md#getstats) | **GET** /server-info/stats | 
 *ServerInfoApi* | [**getSupportedMediaTypes**](doc//ServerInfoApi.md#getsupportedmediatypes) | **GET** /server-info/media-types | 
 *ServerInfoApi* | [**getTheme**](doc//ServerInfoApi.md#gettheme) | **GET** /server-info/theme | 
 *ServerInfoApi* | [**pingServer**](doc//ServerInfoApi.md#pingserver) | **GET** /server-info/ping | 
@@ -180,7 +180,7 @@ Class | Method | HTTP request | Description
 *SharedLinkApi* | [**removeSharedLinkAssets**](doc//SharedLinkApi.md#removesharedlinkassets) | **DELETE** /shared-link/{id}/assets | 
 *SharedLinkApi* | [**updateSharedLink**](doc//SharedLinkApi.md#updatesharedlink) | **PATCH** /shared-link/{id} | 
 *SystemConfigApi* | [**getConfig**](doc//SystemConfigApi.md#getconfig) | **GET** /system-config | 
-*SystemConfigApi* | [**getConfigDefaults**](doc//SystemConfigApi.md#getconfigdefaults) | **GET** /system-config/defaults | 
+*SystemConfigApi* | [**getDefaults**](doc//SystemConfigApi.md#getdefaults) | **GET** /system-config/defaults | 
 *SystemConfigApi* | [**getStorageTemplateOptions**](doc//SystemConfigApi.md#getstoragetemplateoptions) | **GET** /system-config/storage-template-options | 
 *SystemConfigApi* | [**updateConfig**](doc//SystemConfigApi.md#updateconfig) | **PUT** /system-config | 
 *TagApi* | [**createTag**](doc//TagApi.md#createtag) | **POST** /tag | 

mobile/openapi/doc/APIKeyApi.md

@@ -9,15 +9,15 @@ All URIs are relative to */api*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
-[**createApiKey**](APIKeyApi.md#createapikey) | **POST** /api-key | 
+[**createKey**](APIKeyApi.md#createkey) | **POST** /api-key | 
-[**deleteApiKey**](APIKeyApi.md#deleteapikey) | **DELETE** /api-key/{id} | 
+[**deleteKey**](APIKeyApi.md#deletekey) | **DELETE** /api-key/{id} | 
-[**getApiKey**](APIKeyApi.md#getapikey) | **GET** /api-key/{id} | 
+[**getKey**](APIKeyApi.md#getkey) | **GET** /api-key/{id} | 
-[**getApiKeys**](APIKeyApi.md#getapikeys) | **GET** /api-key | 
+[**getKeys**](APIKeyApi.md#getkeys) | **GET** /api-key | 
-[**updateApiKey**](APIKeyApi.md#updateapikey) | **PUT** /api-key/{id} | 
+[**updateKey**](APIKeyApi.md#updatekey) | **PUT** /api-key/{id} | 
 
 
-# **createApiKey**
+# **createKey**
-> APIKeyCreateResponseDto createApiKey(aPIKeyCreateDto)
+> APIKeyCreateResponseDto createKey(aPIKeyCreateDto)
 
 
 
@@ -43,10 +43,10 @@ final api_instance = APIKeyApi();
 final aPIKeyCreateDto = APIKeyCreateDto(); // APIKeyCreateDto | 
 
 try {
-    final result = api_instance.createApiKey(aPIKeyCreateDto);
+    final result = api_instance.createKey(aPIKeyCreateDto);
     print(result);
 } catch (e) {
-    print('Exception when calling APIKeyApi->createApiKey: $e\n');
+    print('Exception when calling APIKeyApi->createKey: $e\n');
 }
 ```
 
@@ -71,8 +71,8 @@ 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)
 
-# **deleteApiKey**
+# **deleteKey**
-> deleteApiKey(id)
+> deleteKey(id)
 
 
 
@@ -98,9 +98,9 @@ final api_instance = APIKeyApi();
 final id = 38400000-8cf0-11bd-b23e-10b96e4ef00d; // String | 
 
 try {
-    api_instance.deleteApiKey(id);
+    api_instance.deleteKey(id);
 } catch (e) {
-    print('Exception when calling APIKeyApi->deleteApiKey: $e\n');
+    print('Exception when calling APIKeyApi->deleteKey: $e\n');
 }
 ```
 
@@ -125,8 +125,8 @@ void (empty response body)
 
 [[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)
 
-# **getApiKey**
+# **getKey**
-> APIKeyResponseDto getApiKey(id)
+> APIKeyResponseDto getKey(id)
 
 
 
@@ -152,10 +152,10 @@ final api_instance = APIKeyApi();
 final id = 38400000-8cf0-11bd-b23e-10b96e4ef00d; // String | 
 
 try {
-    final result = api_instance.getApiKey(id);
+    final result = api_instance.getKey(id);
     print(result);
 } catch (e) {
-    print('Exception when calling APIKeyApi->getApiKey: $e\n');
+    print('Exception when calling APIKeyApi->getKey: $e\n');
 }
 ```
 
@@ -180,8 +180,8 @@ 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)
 
-# **getApiKeys**
+# **getKeys**
-> List<APIKeyResponseDto> getApiKeys()
+> List<APIKeyResponseDto> getKeys()
 
 
 
@@ -206,10 +206,10 @@ import 'package:openapi/api.dart';
 final api_instance = APIKeyApi();
 
 try {
-    final result = api_instance.getApiKeys();
+    final result = api_instance.getKeys();
     print(result);
 } catch (e) {
-    print('Exception when calling APIKeyApi->getApiKeys: $e\n');
+    print('Exception when calling APIKeyApi->getKeys: $e\n');
 }
 ```
 
@@ -231,8 +231,8 @@ This endpoint does not need any parameter.
 
 [[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)
 
-# **updateApiKey**
+# **updateKey**
-> APIKeyResponseDto updateApiKey(id, aPIKeyUpdateDto)
+> APIKeyResponseDto updateKey(id, aPIKeyUpdateDto)
 
 
 
@@ -259,10 +259,10 @@ final id = 38400000-8cf0-11bd-b23e-10b96e4ef00d; // String |
 final aPIKeyUpdateDto = APIKeyUpdateDto(); // APIKeyUpdateDto | 
 
 try {
-    final result = api_instance.updateApiKey(id, aPIKeyUpdateDto);
+    final result = api_instance.updateKey(id, aPIKeyUpdateDto);
     print(result);
 } catch (e) {
-    print('Exception when calling APIKeyApi->updateApiKey: $e\n');
+    print('Exception when calling APIKeyApi->updateKey: $e\n');
 }
 ```
 

mobile/openapi/doc/AlbumResponseDto.md

@@ -17,7 +17,6 @@ Name | Type | Description | Notes
 **endDate** | [**DateTime**](DateTime.md) |  | [optional] 
 **hasSharedLink** | **bool** |  | 
 **id** | **String** |  | 
-**isActivityEnabled** | **bool** |  | 
 **lastModifiedAssetTimestamp** | [**DateTime**](DateTime.md) |  | [optional] 
 **owner** | [**UserResponseDto**](UserResponseDto.md) |  | 
 **ownerId** | **String** |  | 

mobile/openapi/doc/AssetApi.md

@@ -9,7 +9,7 @@ All URIs are relative to */api*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
-[**checkBulkUpload**](AssetApi.md#checkbulkupload) | **POST** /asset/bulk-upload-check | 
+[**bulkUploadCheck**](AssetApi.md#bulkuploadcheck) | **POST** /asset/bulk-upload-check | 
 [**checkExistingAssets**](AssetApi.md#checkexistingassets) | **POST** /asset/exist | 
 [**deleteAssets**](AssetApi.md#deleteassets) | **DELETE** /asset | 
 [**downloadArchive**](AssetApi.md#downloadarchive) | **POST** /asset/download/archive | 
@@ -18,15 +18,15 @@ Method | HTTP request | Description
 [**getAllAssets**](AssetApi.md#getallassets) | **GET** /asset | 
 [**getAssetById**](AssetApi.md#getassetbyid) | **GET** /asset/assetById/{id} | 
 [**getAssetSearchTerms**](AssetApi.md#getassetsearchterms) | **GET** /asset/search-terms | 
-[**getAssetStatistics**](AssetApi.md#getassetstatistics) | **GET** /asset/statistics | 
+[**getAssetStats**](AssetApi.md#getassetstats) | **GET** /asset/statistics | 
 [**getAssetThumbnail**](AssetApi.md#getassetthumbnail) | **GET** /asset/thumbnail/{id} | 
+[**getByTimeBucket**](AssetApi.md#getbytimebucket) | **GET** /asset/time-bucket | 
 [**getCuratedLocations**](AssetApi.md#getcuratedlocations) | **GET** /asset/curated-locations | 
 [**getCuratedObjects**](AssetApi.md#getcuratedobjects) | **GET** /asset/curated-objects | 
 [**getDownloadInfo**](AssetApi.md#getdownloadinfo) | **POST** /asset/download/info | 
 [**getMapMarkers**](AssetApi.md#getmapmarkers) | **GET** /asset/map-marker | 
 [**getMemoryLane**](AssetApi.md#getmemorylane) | **GET** /asset/memory-lane | 
 [**getRandom**](AssetApi.md#getrandom) | **GET** /asset/random | 
-[**getTimeBucket**](AssetApi.md#gettimebucket) | **GET** /asset/time-bucket | 
 [**getTimeBuckets**](AssetApi.md#gettimebuckets) | **GET** /asset/time-buckets | 
 [**getUserAssetsByDeviceId**](AssetApi.md#getuserassetsbydeviceid) | **GET** /asset/{deviceId} | 
 [**importFile**](AssetApi.md#importfile) | **POST** /asset/import | 
@@ -41,8 +41,8 @@ Method | HTTP request | Description
 [**uploadFile**](AssetApi.md#uploadfile) | **POST** /asset/upload | 
 
 
-# **checkBulkUpload**
+# **bulkUploadCheck**
-> AssetBulkUploadCheckResponseDto checkBulkUpload(assetBulkUploadCheckDto)
+> AssetBulkUploadCheckResponseDto bulkUploadCheck(assetBulkUploadCheckDto)
 
 
 
@@ -70,10 +70,10 @@ final api_instance = AssetApi();
 final assetBulkUploadCheckDto = AssetBulkUploadCheckDto(); // AssetBulkUploadCheckDto | 
 
 try {
-    final result = api_instance.checkBulkUpload(assetBulkUploadCheckDto);
+    final result = api_instance.bulkUploadCheck(assetBulkUploadCheckDto);
     print(result);
 } catch (e) {
-    print('Exception when calling AssetApi->checkBulkUpload: $e\n');
+    print('Exception when calling AssetApi->bulkUploadCheck: $e\n');
 }
 ```
 
@@ -374,7 +374,7 @@ void (empty response body)
 [[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(skip, take, userId, isFavorite, isArchived, updatedAfter, updatedBefore, ifNoneMatch)
+> List<AssetResponseDto> getAllAssets(userId, isFavorite, isArchived, skip, updatedAfter, ifNoneMatch)
 
 
 
@@ -399,17 +399,15 @@ import 'package:openapi/api.dart';
 //defaultApiClient.getAuthentication<HttpBearerAuth>('bearer').setAccessToken(yourTokenGeneratorFunction);
 
 final api_instance = AssetApi();
-final skip = 56; // int | 
-final take = 56; // int | 
 final userId = 38400000-8cf0-11bd-b23e-10b96e4ef00d; // String | 
 final isFavorite = true; // bool | 
 final isArchived = true; // bool | 
+final skip = 8.14; // num | 
 final updatedAfter = 2013-10-20T19:20:30+01:00; // DateTime | 
-final updatedBefore = 2013-10-20T19:20:30+01:00; // DateTime | 
 final ifNoneMatch = ifNoneMatch_example; // String | ETag of data already cached on the client
 
 try {
-    final result = api_instance.getAllAssets(skip, take, userId, isFavorite, isArchived, updatedAfter, updatedBefore, ifNoneMatch);
+    final result = api_instance.getAllAssets(userId, isFavorite, isArchived, skip, updatedAfter, ifNoneMatch);
     print(result);
 } catch (e) {
     print('Exception when calling AssetApi->getAllAssets: $e\n');
@@ -420,13 +418,11 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **skip** | **int**|  | [optional] 
- **take** | **int**|  | [optional] 
  **userId** | **String**|  | [optional] 
  **isFavorite** | **bool**|  | [optional] 
  **isArchived** | **bool**|  | [optional] 
+ **skip** | **num**|  | [optional] 
  **updatedAfter** | **DateTime**|  | [optional] 
- **updatedBefore** | **DateTime**|  | [optional] 
  **ifNoneMatch** | **String**| ETag of data already cached on the client | [optional] 
 
 ### Return type
@@ -554,8 +550,8 @@ This endpoint does not need any parameter.
 
 [[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)
 
-# **getAssetStatistics**
+# **getAssetStats**
-> AssetStatsResponseDto getAssetStatistics(isArchived, isFavorite, isTrashed)
+> AssetStatsResponseDto getAssetStats(isArchived, isFavorite, isTrashed)
 
 
 
@@ -583,10 +579,10 @@ final isFavorite = true; // bool |
 final isTrashed = true; // bool | 
 
 try {
-    final result = api_instance.getAssetStatistics(isArchived, isFavorite, isTrashed);
+    final result = api_instance.getAssetStats(isArchived, isFavorite, isTrashed);
     print(result);
 } catch (e) {
-    print('Exception when calling AssetApi->getAssetStatistics: $e\n');
+    print('Exception when calling AssetApi->getAssetStats: $e\n');
 }
 ```
 
@@ -672,6 +668,79 @@ 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)
 
+# **getByTimeBucket**
+> List<AssetResponseDto> getByTimeBucket(size, timeBucket, userId, albumId, personId, isArchived, isFavorite, isTrashed, withStacked, key)
+
+
+
+### Example
+```dart
+import 'package:openapi/api.dart';
+// TODO Configure API key authorization: cookie
+//defaultApiClient.getAuthentication<ApiKeyAuth>('cookie').apiKey = 'YOUR_API_KEY';
+// uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+//defaultApiClient.getAuthentication<ApiKeyAuth>('cookie').apiKeyPrefix = 'Bearer';
+// TODO Configure API key authorization: api_key
+//defaultApiClient.getAuthentication<ApiKeyAuth>('api_key').apiKey = 'YOUR_API_KEY';
+// uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+//defaultApiClient.getAuthentication<ApiKeyAuth>('api_key').apiKeyPrefix = 'Bearer';
+// TODO Configure HTTP Bearer authorization: bearer
+// Case 1. Use String Token
+//defaultApiClient.getAuthentication<HttpBearerAuth>('bearer').setAccessToken('YOUR_ACCESS_TOKEN');
+// Case 2. Use Function which generate token.
+// String yourTokenGeneratorFunction() { ... }
+//defaultApiClient.getAuthentication<HttpBearerAuth>('bearer').setAccessToken(yourTokenGeneratorFunction);
+
+final api_instance = AssetApi();
+final size = ; // TimeBucketSize | 
+final timeBucket = timeBucket_example; // String | 
+final userId = 38400000-8cf0-11bd-b23e-10b96e4ef00d; // String | 
+final albumId = 38400000-8cf0-11bd-b23e-10b96e4ef00d; // String | 
+final personId = 38400000-8cf0-11bd-b23e-10b96e4ef00d; // String | 
+final isArchived = true; // bool | 
+final isFavorite = true; // bool | 
+final isTrashed = true; // bool | 
+final withStacked = true; // bool | 
+final key = key_example; // String | 
+
+try {
+    final result = api_instance.getByTimeBucket(size, timeBucket, userId, albumId, personId, isArchived, isFavorite, isTrashed, withStacked, key);
+    print(result);
+} catch (e) {
+    print('Exception when calling AssetApi->getByTimeBucket: $e\n');
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **size** | [**TimeBucketSize**](.md)|  | 
+ **timeBucket** | **String**|  | 
+ **userId** | **String**|  | [optional] 
+ **albumId** | **String**|  | [optional] 
+ **personId** | **String**|  | [optional] 
+ **isArchived** | **bool**|  | [optional] 
+ **isFavorite** | **bool**|  | [optional] 
+ **isTrashed** | **bool**|  | [optional] 
+ **withStacked** | **bool**|  | [optional] 
+ **key** | **String**|  | [optional] 
+
+### Return type
+
+[**List<AssetResponseDto>**](AssetResponseDto.md)
+
+### Authorization
+
+[cookie](../README.md#cookie), [api_key](../README.md#api_key), [bearer](../README.md#bearer)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+[[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)
+
 # **getCuratedLocations**
 > List<CuratedLocationsResponseDto> getCuratedLocations()
 
@@ -1004,79 +1073,6 @@ 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)
 
-# **getTimeBucket**
-> List<AssetResponseDto> getTimeBucket(size, timeBucket, userId, albumId, personId, isArchived, isFavorite, isTrashed, withStacked, key)
-
-
-
-### Example
-```dart
-import 'package:openapi/api.dart';
-// TODO Configure API key authorization: cookie
-//defaultApiClient.getAuthentication<ApiKeyAuth>('cookie').apiKey = 'YOUR_API_KEY';
-// uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-//defaultApiClient.getAuthentication<ApiKeyAuth>('cookie').apiKeyPrefix = 'Bearer';
-// TODO Configure API key authorization: api_key
-//defaultApiClient.getAuthentication<ApiKeyAuth>('api_key').apiKey = 'YOUR_API_KEY';
-// uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-//defaultApiClient.getAuthentication<ApiKeyAuth>('api_key').apiKeyPrefix = 'Bearer';
-// TODO Configure HTTP Bearer authorization: bearer
-// Case 1. Use String Token
-//defaultApiClient.getAuthentication<HttpBearerAuth>('bearer').setAccessToken('YOUR_ACCESS_TOKEN');
-// Case 2. Use Function which generate token.
-// String yourTokenGeneratorFunction() { ... }
-//defaultApiClient.getAuthentication<HttpBearerAuth>('bearer').setAccessToken(yourTokenGeneratorFunction);
-
-final api_instance = AssetApi();
-final size = ; // TimeBucketSize | 
-final timeBucket = timeBucket_example; // String | 
-final userId = 38400000-8cf0-11bd-b23e-10b96e4ef00d; // String | 
-final albumId = 38400000-8cf0-11bd-b23e-10b96e4ef00d; // String | 
-final personId = 38400000-8cf0-11bd-b23e-10b96e4ef00d; // String | 
-final isArchived = true; // bool | 
-final isFavorite = true; // bool | 
-final isTrashed = true; // bool | 
-final withStacked = true; // bool | 
-final key = key_example; // String | 
-
-try {
-    final result = api_instance.getTimeBucket(size, timeBucket, userId, albumId, personId, isArchived, isFavorite, isTrashed, withStacked, key);
-    print(result);
-} catch (e) {
-    print('Exception when calling AssetApi->getTimeBucket: $e\n');
-}
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **size** | [**TimeBucketSize**](.md)|  | 
- **timeBucket** | **String**|  | 
- **userId** | **String**|  | [optional] 
- **albumId** | **String**|  | [optional] 
- **personId** | **String**|  | [optional] 
- **isArchived** | **bool**|  | [optional] 
- **isFavorite** | **bool**|  | [optional] 
- **isTrashed** | **bool**|  | [optional] 
- **withStacked** | **bool**|  | [optional] 
- **key** | **String**|  | [optional] 
-
-### Return type
-
-[**List<AssetResponseDto>**](AssetResponseDto.md)
-
-### Authorization
-
-[cookie](../README.md#cookie), [api_key](../README.md#api_key), [bearer](../README.md#bearer)
-
-### HTTP request headers
-
- - **Content-Type**: Not defined
- - **Accept**: application/json
-
-[[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)
-
 # **getTimeBuckets**
 > List<TimeBucketResponseDto> getTimeBuckets(size, userId, albumId, personId, isArchived, isFavorite, isTrashed, withStacked, key)
 
@@ -1700,7 +1696,7 @@ void (empty response body)
 [[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)
 
 # **uploadFile**
-> AssetFileUploadResponseDto uploadFile(assetData, deviceAssetId, deviceId, fileCreatedAt, fileModifiedAt, key, duration, isArchived, isExternal, isFavorite, isOffline, isReadOnly, isVisible, libraryId, livePhotoData, sidecarData)
+> AssetFileUploadResponseDto uploadFile(assetData, deviceAssetId, deviceId, fileCreatedAt, fileModifiedAt, isFavorite, key, duration, isArchived, isExternal, isOffline, isReadOnly, isVisible, libraryId, livePhotoData, sidecarData)
 
 
 
@@ -1728,11 +1724,11 @@ final deviceAssetId = deviceAssetId_example; // String |
 final deviceId = deviceId_example; // String | 
 final fileCreatedAt = 2013-10-20T19:20:30+01:00; // DateTime | 
 final fileModifiedAt = 2013-10-20T19:20:30+01:00; // DateTime | 
+final isFavorite = true; // bool | 
 final key = key_example; // String | 
 final duration = duration_example; // String | 
 final isArchived = true; // bool | 
 final isExternal = true; // bool | 
-final isFavorite = true; // bool | 
 final isOffline = true; // bool | 
 final isReadOnly = true; // bool | 
 final isVisible = true; // bool | 
@@ -1741,7 +1737,7 @@ final livePhotoData = BINARY_DATA_HERE; // MultipartFile |
 final sidecarData = BINARY_DATA_HERE; // MultipartFile | 
 
 try {
-    final result = api_instance.uploadFile(assetData, deviceAssetId, deviceId, fileCreatedAt, fileModifiedAt, key, duration, isArchived, isExternal, isFavorite, isOffline, isReadOnly, isVisible, libraryId, livePhotoData, sidecarData);
+    final result = api_instance.uploadFile(assetData, deviceAssetId, deviceId, fileCreatedAt, fileModifiedAt, isFavorite, key, duration, isArchived, isExternal, isOffline, isReadOnly, isVisible, libraryId, livePhotoData, sidecarData);
     print(result);
 } catch (e) {
     print('Exception when calling AssetApi->uploadFile: $e\n');
@@ -1757,11 +1753,11 @@ Name | Type | Description  | Notes
  **deviceId** | **String**|  | 
  **fileCreatedAt** | **DateTime**|  | 
  **fileModifiedAt** | **DateTime**|  | 
+ **isFavorite** | **bool**|  | 
  **key** | **String**|  | [optional] 
  **duration** | **String**|  | [optional] 
  **isArchived** | **bool**|  | [optional] 
  **isExternal** | **bool**|  | [optional] 
- **isFavorite** | **bool**|  | [optional] 
  **isOffline** | **bool**|  | [optional] 
  **isReadOnly** | **bool**|  | [optional] 
  **isVisible** | **bool**|  | [optional] 

mobile/openapi/doc/AuthenticationApi.md

@@ -9,16 +9,57 @@ All URIs are relative to */api*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
+[**adminSignUp**](AuthenticationApi.md#adminsignup) | **POST** /auth/admin-sign-up | 
 [**changePassword**](AuthenticationApi.md#changepassword) | **POST** /auth/change-password | 
 [**getAuthDevices**](AuthenticationApi.md#getauthdevices) | **GET** /auth/devices | 
 [**login**](AuthenticationApi.md#login) | **POST** /auth/login | 
 [**logout**](AuthenticationApi.md#logout) | **POST** /auth/logout | 
 [**logoutAuthDevice**](AuthenticationApi.md#logoutauthdevice) | **DELETE** /auth/devices/{id} | 
 [**logoutAuthDevices**](AuthenticationApi.md#logoutauthdevices) | **DELETE** /auth/devices | 
-[**signUpAdmin**](AuthenticationApi.md#signupadmin) | **POST** /auth/admin-sign-up | 
 [**validateAccessToken**](AuthenticationApi.md#validateaccesstoken) | **POST** /auth/validateToken | 
 
 
+# **adminSignUp**
+> AdminSignupResponseDto adminSignUp(signUpDto)
+
+
+
+### Example
+```dart
+import 'package:openapi/api.dart';
+
+final api_instance = AuthenticationApi();
+final signUpDto = SignUpDto(); // SignUpDto | 
+
+try {
+    final result = api_instance.adminSignUp(signUpDto);
+    print(result);
+} catch (e) {
+    print('Exception when calling AuthenticationApi->adminSignUp: $e\n');
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **signUpDto** | [**SignUpDto**](SignUpDto.md)|  | 
+
+### Return type
+
+[**AdminSignupResponseDto**](AdminSignupResponseDto.md)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[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)
+
 # **changePassword**
 > UserResponseDto changePassword(changePasswordDto)
 
@@ -321,47 +362,6 @@ void (empty response body)
 
 [[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)
 
-# **signUpAdmin**
-> AdminSignupResponseDto signUpAdmin(signUpDto)
-
-
-
-### Example
-```dart
-import 'package:openapi/api.dart';
-
-final api_instance = AuthenticationApi();
-final signUpDto = SignUpDto(); // SignUpDto | 
-
-try {
-    final result = api_instance.signUpAdmin(signUpDto);
-    print(result);
-} catch (e) {
-    print('Exception when calling AuthenticationApi->signUpAdmin: $e\n');
-}
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **signUpDto** | [**SignUpDto**](SignUpDto.md)|  | 
-
-### Return type
-
-[**AdminSignupResponseDto**](AdminSignupResponseDto.md)
-
-### Authorization
-
-No authorization required
-
-### HTTP request headers
-
- - **Content-Type**: application/json
- - **Accept**: application/json
-
-[[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)
-
 # **validateAccessToken**
 > ValidateAccessTokenResponseDto validateAccessToken()
 

mobile/openapi/doc/ImportAssetDto.md

@@ -16,7 +16,7 @@ Name | Type | Description | Notes
 **fileModifiedAt** | [**DateTime**](DateTime.md) |  | 
 **isArchived** | **bool** |  | [optional] 
 **isExternal** | **bool** |  | [optional] 
-**isFavorite** | **bool** |  | [optional] 
+**isFavorite** | **bool** |  | 
 **isOffline** | **bool** |  | [optional] 
 **isReadOnly** | **bool** |  | [optional] [default to true]
 **isVisible** | **bool** |  | [optional] 

mobile/openapi/doc/LibraryApi.md

@@ -11,7 +11,7 @@ Method | HTTP request | Description
 ------------- | ------------- | -------------
 [**createLibrary**](LibraryApi.md#createlibrary) | **POST** /library | 
 [**deleteLibrary**](LibraryApi.md#deletelibrary) | **DELETE** /library/{id} | 
-[**getLibraries**](LibraryApi.md#getlibraries) | **GET** /library | 
+[**getAllForUser**](LibraryApi.md#getallforuser) | **GET** /library | 
 [**getLibraryInfo**](LibraryApi.md#getlibraryinfo) | **GET** /library/{id} | 
 [**getLibraryStatistics**](LibraryApi.md#getlibrarystatistics) | **GET** /library/{id}/statistics | 
 [**removeOfflineFiles**](LibraryApi.md#removeofflinefiles) | **POST** /library/{id}/removeOffline | 
@@ -128,8 +128,8 @@ void (empty response body)
 
 [[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)
 
-# **getLibraries**
+# **getAllForUser**
-> List<LibraryResponseDto> getLibraries()
+> List<LibraryResponseDto> getAllForUser()
 
 
 
@@ -154,10 +154,10 @@ import 'package:openapi/api.dart';
 final api_instance = LibraryApi();
 
 try {
-    final result = api_instance.getLibraries();
+    final result = api_instance.getAllForUser();
     print(result);
 } catch (e) {
-    print('Exception when calling LibraryApi->getLibraries: $e\n');
+    print('Exception when calling LibraryApi->getAllForUser: $e\n');
 }
 ```
 

mobile/openapi/doc/OAuthApi.md

@@ -9,191 +9,16 @@ All URIs are relative to */api*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
-[**finishOAuth**](OAuthApi.md#finishoauth) | **POST** /oauth/callback | 
+[**authorizeOAuth**](OAuthApi.md#authorizeoauth) | **POST** /oauth/authorize | 
-[**generateOAuthConfig**](OAuthApi.md#generateoauthconfig) | **POST** /oauth/config | 
+[**callback**](OAuthApi.md#callback) | **POST** /oauth/callback | 
-[**linkOAuthAccount**](OAuthApi.md#linkoauthaccount) | **POST** /oauth/link | 
+[**generateConfig**](OAuthApi.md#generateconfig) | **POST** /oauth/config | 
-[**redirectOAuthToMobile**](OAuthApi.md#redirectoauthtomobile) | **GET** /oauth/mobile-redirect | 
+[**link**](OAuthApi.md#link) | **POST** /oauth/link | 
-[**startOAuth**](OAuthApi.md#startoauth) | **POST** /oauth/authorize | 
+[**mobileRedirect**](OAuthApi.md#mobileredirect) | **GET** /oauth/mobile-redirect | 
-[**unlinkOAuthAccount**](OAuthApi.md#unlinkoauthaccount) | **POST** /oauth/unlink | 
+[**unlink**](OAuthApi.md#unlink) | **POST** /oauth/unlink | 
 
 
-# **finishOAuth**
+# **authorizeOAuth**
-> LoginResponseDto finishOAuth(oAuthCallbackDto)
+> OAuthAuthorizeResponseDto authorizeOAuth(oAuthConfigDto)
-
-
-
-### Example
-```dart
-import 'package:openapi/api.dart';
-
-final api_instance = OAuthApi();
-final oAuthCallbackDto = OAuthCallbackDto(); // OAuthCallbackDto | 
-
-try {
-    final result = api_instance.finishOAuth(oAuthCallbackDto);
-    print(result);
-} catch (e) {
-    print('Exception when calling OAuthApi->finishOAuth: $e\n');
-}
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **oAuthCallbackDto** | [**OAuthCallbackDto**](OAuthCallbackDto.md)|  | 
-
-### Return type
-
-[**LoginResponseDto**](LoginResponseDto.md)
-
-### Authorization
-
-No authorization required
-
-### HTTP request headers
-
- - **Content-Type**: application/json
- - **Accept**: application/json
-
-[[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)
-
-# **generateOAuthConfig**
-> OAuthConfigResponseDto generateOAuthConfig(oAuthConfigDto)
-
-
-
-@deprecated use feature flags and /oauth/authorize
-
-### Example
-```dart
-import 'package:openapi/api.dart';
-
-final api_instance = OAuthApi();
-final oAuthConfigDto = OAuthConfigDto(); // OAuthConfigDto | 
-
-try {
-    final result = api_instance.generateOAuthConfig(oAuthConfigDto);
-    print(result);
-} catch (e) {
-    print('Exception when calling OAuthApi->generateOAuthConfig: $e\n');
-}
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **oAuthConfigDto** | [**OAuthConfigDto**](OAuthConfigDto.md)|  | 
-
-### Return type
-
-[**OAuthConfigResponseDto**](OAuthConfigResponseDto.md)
-
-### Authorization
-
-No authorization required
-
-### HTTP request headers
-
- - **Content-Type**: application/json
- - **Accept**: application/json
-
-[[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)
-
-# **linkOAuthAccount**
-> UserResponseDto linkOAuthAccount(oAuthCallbackDto)
-
-
-
-### Example
-```dart
-import 'package:openapi/api.dart';
-// TODO Configure API key authorization: cookie
-//defaultApiClient.getAuthentication<ApiKeyAuth>('cookie').apiKey = 'YOUR_API_KEY';
-// uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-//defaultApiClient.getAuthentication<ApiKeyAuth>('cookie').apiKeyPrefix = 'Bearer';
-// TODO Configure API key authorization: api_key
-//defaultApiClient.getAuthentication<ApiKeyAuth>('api_key').apiKey = 'YOUR_API_KEY';
-// uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-//defaultApiClient.getAuthentication<ApiKeyAuth>('api_key').apiKeyPrefix = 'Bearer';
-// TODO Configure HTTP Bearer authorization: bearer
-// Case 1. Use String Token
-//defaultApiClient.getAuthentication<HttpBearerAuth>('bearer').setAccessToken('YOUR_ACCESS_TOKEN');
-// Case 2. Use Function which generate token.
-// String yourTokenGeneratorFunction() { ... }
-//defaultApiClient.getAuthentication<HttpBearerAuth>('bearer').setAccessToken(yourTokenGeneratorFunction);
-
-final api_instance = OAuthApi();
-final oAuthCallbackDto = OAuthCallbackDto(); // OAuthCallbackDto | 
-
-try {
-    final result = api_instance.linkOAuthAccount(oAuthCallbackDto);
-    print(result);
-} catch (e) {
-    print('Exception when calling OAuthApi->linkOAuthAccount: $e\n');
-}
-```
-
-### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **oAuthCallbackDto** | [**OAuthCallbackDto**](OAuthCallbackDto.md)|  | 
-
-### Return type
-
-[**UserResponseDto**](UserResponseDto.md)
-
-### Authorization
-
-[cookie](../README.md#cookie), [api_key](../README.md#api_key), [bearer](../README.md#bearer)
-
-### HTTP request headers
-
- - **Content-Type**: application/json
- - **Accept**: application/json
-
-[[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)
-
-# **redirectOAuthToMobile**
-> redirectOAuthToMobile()
-
-
-
-### Example
-```dart
-import 'package:openapi/api.dart';
-
-final api_instance = OAuthApi();
-
-try {
-    api_instance.redirectOAuthToMobile();
-} catch (e) {
-    print('Exception when calling OAuthApi->redirectOAuthToMobile: $e\n');
-}
-```
-
-### Parameters
-This endpoint does not need any parameter.
-
-### Return type
-
-void (empty response body)
-
-### Authorization
-
-No authorization required
-
-### HTTP request headers
-
- - **Content-Type**: Not defined
- - **Accept**: Not defined
-
-[[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)
-
-# **startOAuth**
-> OAuthAuthorizeResponseDto startOAuth(oAuthConfigDto)
 
 
 
@@ -205,10 +30,10 @@ final api_instance = OAuthApi();
 final oAuthConfigDto = OAuthConfigDto(); // OAuthConfigDto | 
 
 try {
-    final result = api_instance.startOAuth(oAuthConfigDto);
+    final result = api_instance.authorizeOAuth(oAuthConfigDto);
     print(result);
 } catch (e) {
-    print('Exception when calling OAuthApi->startOAuth: $e\n');
+    print('Exception when calling OAuthApi->authorizeOAuth: $e\n');
 }
 ```
 
@@ -233,8 +58,183 @@ No authorization required
 
 [[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)
 
-# **unlinkOAuthAccount**
+# **callback**
-> UserResponseDto unlinkOAuthAccount()
+> LoginResponseDto callback(oAuthCallbackDto)
+
+
+
+### Example
+```dart
+import 'package:openapi/api.dart';
+
+final api_instance = OAuthApi();
+final oAuthCallbackDto = OAuthCallbackDto(); // OAuthCallbackDto | 
+
+try {
+    final result = api_instance.callback(oAuthCallbackDto);
+    print(result);
+} catch (e) {
+    print('Exception when calling OAuthApi->callback: $e\n');
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **oAuthCallbackDto** | [**OAuthCallbackDto**](OAuthCallbackDto.md)|  | 
+
+### Return type
+
+[**LoginResponseDto**](LoginResponseDto.md)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[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)
+
+# **generateConfig**
+> OAuthConfigResponseDto generateConfig(oAuthConfigDto)
+
+
+
+@deprecated use feature flags and /oauth/authorize
+
+### Example
+```dart
+import 'package:openapi/api.dart';
+
+final api_instance = OAuthApi();
+final oAuthConfigDto = OAuthConfigDto(); // OAuthConfigDto | 
+
+try {
+    final result = api_instance.generateConfig(oAuthConfigDto);
+    print(result);
+} catch (e) {
+    print('Exception when calling OAuthApi->generateConfig: $e\n');
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **oAuthConfigDto** | [**OAuthConfigDto**](OAuthConfigDto.md)|  | 
+
+### Return type
+
+[**OAuthConfigResponseDto**](OAuthConfigResponseDto.md)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[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)
+
+# **link**
+> UserResponseDto link(oAuthCallbackDto)
+
+
+
+### Example
+```dart
+import 'package:openapi/api.dart';
+// TODO Configure API key authorization: cookie
+//defaultApiClient.getAuthentication<ApiKeyAuth>('cookie').apiKey = 'YOUR_API_KEY';
+// uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+//defaultApiClient.getAuthentication<ApiKeyAuth>('cookie').apiKeyPrefix = 'Bearer';
+// TODO Configure API key authorization: api_key
+//defaultApiClient.getAuthentication<ApiKeyAuth>('api_key').apiKey = 'YOUR_API_KEY';
+// uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+//defaultApiClient.getAuthentication<ApiKeyAuth>('api_key').apiKeyPrefix = 'Bearer';
+// TODO Configure HTTP Bearer authorization: bearer
+// Case 1. Use String Token
+//defaultApiClient.getAuthentication<HttpBearerAuth>('bearer').setAccessToken('YOUR_ACCESS_TOKEN');
+// Case 2. Use Function which generate token.
+// String yourTokenGeneratorFunction() { ... }
+//defaultApiClient.getAuthentication<HttpBearerAuth>('bearer').setAccessToken(yourTokenGeneratorFunction);
+
+final api_instance = OAuthApi();
+final oAuthCallbackDto = OAuthCallbackDto(); // OAuthCallbackDto | 
+
+try {
+    final result = api_instance.link(oAuthCallbackDto);
+    print(result);
+} catch (e) {
+    print('Exception when calling OAuthApi->link: $e\n');
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **oAuthCallbackDto** | [**OAuthCallbackDto**](OAuthCallbackDto.md)|  | 
+
+### Return type
+
+[**UserResponseDto**](UserResponseDto.md)
+
+### Authorization
+
+[cookie](../README.md#cookie), [api_key](../README.md#api_key), [bearer](../README.md#bearer)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
+[[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)
+
+# **mobileRedirect**
+> mobileRedirect()
+
+
+
+### Example
+```dart
+import 'package:openapi/api.dart';
+
+final api_instance = OAuthApi();
+
+try {
+    api_instance.mobileRedirect();
+} catch (e) {
+    print('Exception when calling OAuthApi->mobileRedirect: $e\n');
+}
+```
+
+### Parameters
+This endpoint does not need any parameter.
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: Not defined
+
+[[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)
+
+# **unlink**
+> UserResponseDto unlink()
 
 
 
@@ -259,10 +259,10 @@ import 'package:openapi/api.dart';
 final api_instance = OAuthApi();
 
 try {
-    final result = api_instance.unlinkOAuthAccount();
+    final result = api_instance.unlink();
     print(result);
 } catch (e) {
-    print('Exception when calling OAuthApi->unlinkOAuthAccount: $e\n');
+    print('Exception when calling OAuthApi->unlink: $e\n');
 }
 ```
 

mobile/openapi/doc/ServerInfoApi.md

@@ -12,8 +12,8 @@ Method | HTTP request | Description
 [**getServerConfig**](ServerInfoApi.md#getserverconfig) | **GET** /server-info/config | 
 [**getServerFeatures**](ServerInfoApi.md#getserverfeatures) | **GET** /server-info/features | 
 [**getServerInfo**](ServerInfoApi.md#getserverinfo) | **GET** /server-info | 
-[**getServerStatistics**](ServerInfoApi.md#getserverstatistics) | **GET** /server-info/statistics | 
 [**getServerVersion**](ServerInfoApi.md#getserverversion) | **GET** /server-info/version | 
+[**getStats**](ServerInfoApi.md#getstats) | **GET** /server-info/stats | 
 [**getSupportedMediaTypes**](ServerInfoApi.md#getsupportedmediatypes) | **GET** /server-info/media-types | 
 [**getTheme**](ServerInfoApi.md#gettheme) | **GET** /server-info/theme | 
 [**pingServer**](ServerInfoApi.md#pingserver) | **GET** /server-info/ping | 
@@ -144,57 +144,6 @@ This endpoint does not need any parameter.
 
 [[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)
 
-# **getServerStatistics**
-> ServerStatsResponseDto getServerStatistics()
-
-
-
-### Example
-```dart
-import 'package:openapi/api.dart';
-// TODO Configure API key authorization: cookie
-//defaultApiClient.getAuthentication<ApiKeyAuth>('cookie').apiKey = 'YOUR_API_KEY';
-// uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-//defaultApiClient.getAuthentication<ApiKeyAuth>('cookie').apiKeyPrefix = 'Bearer';
-// TODO Configure API key authorization: api_key
-//defaultApiClient.getAuthentication<ApiKeyAuth>('api_key').apiKey = 'YOUR_API_KEY';
-// uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-//defaultApiClient.getAuthentication<ApiKeyAuth>('api_key').apiKeyPrefix = 'Bearer';
-// TODO Configure HTTP Bearer authorization: bearer
-// Case 1. Use String Token
-//defaultApiClient.getAuthentication<HttpBearerAuth>('bearer').setAccessToken('YOUR_ACCESS_TOKEN');
-// Case 2. Use Function which generate token.
-// String yourTokenGeneratorFunction() { ... }
-//defaultApiClient.getAuthentication<HttpBearerAuth>('bearer').setAccessToken(yourTokenGeneratorFunction);
-
-final api_instance = ServerInfoApi();
-
-try {
-    final result = api_instance.getServerStatistics();
-    print(result);
-} catch (e) {
-    print('Exception when calling ServerInfoApi->getServerStatistics: $e\n');
-}
-```
-
-### Parameters
-This endpoint does not need any parameter.
-
-### Return type
-
-[**ServerStatsResponseDto**](ServerStatsResponseDto.md)
-
-### Authorization
-
-[cookie](../README.md#cookie), [api_key](../README.md#api_key), [bearer](../README.md#bearer)
-
-### HTTP request headers
-
- - **Content-Type**: Not defined
- - **Accept**: application/json
-
-[[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)
-
 # **getServerVersion**
 > ServerVersionResponseDto getServerVersion()
 
@@ -232,6 +181,57 @@ No authorization required
 
 [[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)
 
+# **getStats**
+> ServerStatsResponseDto getStats()
+
+
+
+### Example
+```dart
+import 'package:openapi/api.dart';
+// TODO Configure API key authorization: cookie
+//defaultApiClient.getAuthentication<ApiKeyAuth>('cookie').apiKey = 'YOUR_API_KEY';
+// uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+//defaultApiClient.getAuthentication<ApiKeyAuth>('cookie').apiKeyPrefix = 'Bearer';
+// TODO Configure API key authorization: api_key
+//defaultApiClient.getAuthentication<ApiKeyAuth>('api_key').apiKey = 'YOUR_API_KEY';
+// uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+//defaultApiClient.getAuthentication<ApiKeyAuth>('api_key').apiKeyPrefix = 'Bearer';
+// TODO Configure HTTP Bearer authorization: bearer
+// Case 1. Use String Token
+//defaultApiClient.getAuthentication<HttpBearerAuth>('bearer').setAccessToken('YOUR_ACCESS_TOKEN');
+// Case 2. Use Function which generate token.
+// String yourTokenGeneratorFunction() { ... }
+//defaultApiClient.getAuthentication<HttpBearerAuth>('bearer').setAccessToken(yourTokenGeneratorFunction);
+
+final api_instance = ServerInfoApi();
+
+try {
+    final result = api_instance.getStats();
+    print(result);
+} catch (e) {
+    print('Exception when calling ServerInfoApi->getStats: $e\n');
+}
+```
+
+### Parameters
+This endpoint does not need any parameter.
+
+### Return type
+
+[**ServerStatsResponseDto**](ServerStatsResponseDto.md)
+
+### Authorization
+
+[cookie](../README.md#cookie), [api_key](../README.md#api_key), [bearer](../README.md#bearer)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+[[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)
+
 # **getSupportedMediaTypes**
 > ServerMediaTypesResponseDto getSupportedMediaTypes()
 

mobile/openapi/doc/SystemConfigApi.md

@@ -10,7 +10,7 @@ All URIs are relative to */api*
 Method | HTTP request | Description
 ------------- | ------------- | -------------
 [**getConfig**](SystemConfigApi.md#getconfig) | **GET** /system-config | 
-[**getConfigDefaults**](SystemConfigApi.md#getconfigdefaults) | **GET** /system-config/defaults | 
+[**getDefaults**](SystemConfigApi.md#getdefaults) | **GET** /system-config/defaults | 
 [**getStorageTemplateOptions**](SystemConfigApi.md#getstoragetemplateoptions) | **GET** /system-config/storage-template-options | 
 [**updateConfig**](SystemConfigApi.md#updateconfig) | **PUT** /system-config | 
 
@@ -66,8 +66,8 @@ This endpoint does not need any parameter.
 
 [[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)
 
-# **getConfigDefaults**
+# **getDefaults**
-> SystemConfigDto getConfigDefaults()
+> SystemConfigDto getDefaults()
 
 
 
@@ -92,10 +92,10 @@ import 'package:openapi/api.dart';
 final api_instance = SystemConfigApi();
 
 try {
-    final result = api_instance.getConfigDefaults();
+    final result = api_instance.getDefaults();
     print(result);
 } catch (e) {
-    print('Exception when calling SystemConfigApi->getConfigDefaults: $e\n');
+    print('Exception when calling SystemConfigApi->getDefaults: $e\n');
 }
 ```
 

mobile/openapi/doc/UpdateAlbumDto.md

@@ -11,7 +11,6 @@ Name | Type | Description | Notes
 **albumName** | **String** |  | [optional] 
 **albumThumbnailAssetId** | **String** |  | [optional] 
 **description** | **String** |  | [optional] 
-**isActivityEnabled** | **bool** |  | [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)
 

mobile/openapi/lib/api/api_key_api.dart

@@ -20,7 +20,7 @@ class APIKeyApi {
   /// Parameters:
   ///
   /// * [APIKeyCreateDto] aPIKeyCreateDto (required):
-  Future<Response> createApiKeyWithHttpInfo(APIKeyCreateDto aPIKeyCreateDto,) async {
+  Future<Response> createKeyWithHttpInfo(APIKeyCreateDto aPIKeyCreateDto,) async {
     // ignore: prefer_const_declarations
     final path = r'/api-key';
 
@@ -48,8 +48,8 @@ class APIKeyApi {
   /// Parameters:
   ///
   /// * [APIKeyCreateDto] aPIKeyCreateDto (required):
-  Future<APIKeyCreateResponseDto?> createApiKey(APIKeyCreateDto aPIKeyCreateDto,) async {
+  Future<APIKeyCreateResponseDto?> createKey(APIKeyCreateDto aPIKeyCreateDto,) async {
-    final response = await createApiKeyWithHttpInfo(aPIKeyCreateDto,);
+    final response = await createKeyWithHttpInfo(aPIKeyCreateDto,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -67,7 +67,7 @@ class APIKeyApi {
   /// Parameters:
   ///
   /// * [String] id (required):
-  Future<Response> deleteApiKeyWithHttpInfo(String id,) async {
+  Future<Response> deleteKeyWithHttpInfo(String id,) async {
     // ignore: prefer_const_declarations
     final path = r'/api-key/{id}'
       .replaceAll('{id}', id);
@@ -96,8 +96,8 @@ class APIKeyApi {
   /// Parameters:
   ///
   /// * [String] id (required):
-  Future<void> deleteApiKey(String id,) async {
+  Future<void> deleteKey(String id,) async {
-    final response = await deleteApiKeyWithHttpInfo(id,);
+    final response = await deleteKeyWithHttpInfo(id,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -107,7 +107,7 @@ class APIKeyApi {
   /// Parameters:
   ///
   /// * [String] id (required):
-  Future<Response> getApiKeyWithHttpInfo(String id,) async {
+  Future<Response> getKeyWithHttpInfo(String id,) async {
     // ignore: prefer_const_declarations
     final path = r'/api-key/{id}'
       .replaceAll('{id}', id);
@@ -136,8 +136,8 @@ class APIKeyApi {
   /// Parameters:
   ///
   /// * [String] id (required):
-  Future<APIKeyResponseDto?> getApiKey(String id,) async {
+  Future<APIKeyResponseDto?> getKey(String id,) async {
-    final response = await getApiKeyWithHttpInfo(id,);
+    final response = await getKeyWithHttpInfo(id,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -152,7 +152,7 @@ class APIKeyApi {
   }
 
   /// Performs an HTTP 'GET /api-key' operation and returns the [Response].
-  Future<Response> getApiKeysWithHttpInfo() async {
+  Future<Response> getKeysWithHttpInfo() async {
     // ignore: prefer_const_declarations
     final path = r'/api-key';
 
@@ -177,8 +177,8 @@ class APIKeyApi {
     );
   }
 
-  Future<List<APIKeyResponseDto>?> getApiKeys() async {
+  Future<List<APIKeyResponseDto>?> getKeys() async {
-    final response = await getApiKeysWithHttpInfo();
+    final response = await getKeysWithHttpInfo();
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -201,7 +201,7 @@ class APIKeyApi {
   /// * [String] id (required):
   ///
   /// * [APIKeyUpdateDto] aPIKeyUpdateDto (required):
-  Future<Response> updateApiKeyWithHttpInfo(String id, APIKeyUpdateDto aPIKeyUpdateDto,) async {
+  Future<Response> updateKeyWithHttpInfo(String id, APIKeyUpdateDto aPIKeyUpdateDto,) async {
     // ignore: prefer_const_declarations
     final path = r'/api-key/{id}'
       .replaceAll('{id}', id);
@@ -232,8 +232,8 @@ class APIKeyApi {
   /// * [String] id (required):
   ///
   /// * [APIKeyUpdateDto] aPIKeyUpdateDto (required):
-  Future<APIKeyResponseDto?> updateApiKey(String id, APIKeyUpdateDto aPIKeyUpdateDto,) async {
+  Future<APIKeyResponseDto?> updateKey(String id, APIKeyUpdateDto aPIKeyUpdateDto,) async {
-    final response = await updateApiKeyWithHttpInfo(id, aPIKeyUpdateDto,);
+    final response = await updateKeyWithHttpInfo(id, aPIKeyUpdateDto,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }

mobile/openapi/lib/api/asset_api.dart

@@ -23,7 +23,7 @@ class AssetApi {
   /// Parameters:
   ///
   /// * [AssetBulkUploadCheckDto] assetBulkUploadCheckDto (required):
-  Future<Response> checkBulkUploadWithHttpInfo(AssetBulkUploadCheckDto assetBulkUploadCheckDto,) async {
+  Future<Response> bulkUploadCheckWithHttpInfo(AssetBulkUploadCheckDto assetBulkUploadCheckDto,) async {
     // ignore: prefer_const_declarations
     final path = r'/asset/bulk-upload-check';
 
@@ -53,8 +53,8 @@ class AssetApi {
   /// Parameters:
   ///
   /// * [AssetBulkUploadCheckDto] assetBulkUploadCheckDto (required):
-  Future<AssetBulkUploadCheckResponseDto?> checkBulkUpload(AssetBulkUploadCheckDto assetBulkUploadCheckDto,) async {
+  Future<AssetBulkUploadCheckResponseDto?> bulkUploadCheck(AssetBulkUploadCheckDto assetBulkUploadCheckDto,) async {
-    final response = await checkBulkUploadWithHttpInfo(assetBulkUploadCheckDto,);
+    final response = await bulkUploadCheckWithHttpInfo(assetBulkUploadCheckDto,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -309,23 +309,19 @@ class AssetApi {
   ///
   /// Parameters:
   ///
-  /// * [int] skip:
-  ///
-  /// * [int] take:
-  ///
   /// * [String] userId:
   ///
   /// * [bool] isFavorite:
   ///
   /// * [bool] isArchived:
   ///
-  /// * [DateTime] updatedAfter:
+  /// * [num] skip:
   ///
-  /// * [DateTime] updatedBefore:
+  /// * [DateTime] updatedAfter:
   ///
   /// * [String] ifNoneMatch:
   ///   ETag of data already cached on the client
-  Future<Response> getAllAssetsWithHttpInfo({ int? skip, int? take, String? userId, bool? isFavorite, bool? isArchived, DateTime? updatedAfter, DateTime? updatedBefore, String? ifNoneMatch, }) async {
+  Future<Response> getAllAssetsWithHttpInfo({ String? userId, bool? isFavorite, bool? isArchived, num? skip, DateTime? updatedAfter, String? ifNoneMatch, }) async {
     // ignore: prefer_const_declarations
     final path = r'/asset';
 
@@ -336,12 +332,6 @@ class AssetApi {
     final headerParams = <String, String>{};
     final formParams = <String, String>{};
 
-    if (skip != null) {
-      queryParams.addAll(_queryParams('', 'skip', skip));
-    }
-    if (take != null) {
-      queryParams.addAll(_queryParams('', 'take', take));
-    }
     if (userId != null) {
       queryParams.addAll(_queryParams('', 'userId', userId));
     }
@@ -351,12 +341,12 @@ class AssetApi {
     if (isArchived != null) {
       queryParams.addAll(_queryParams('', 'isArchived', isArchived));
     }
+    if (skip != null) {
+      queryParams.addAll(_queryParams('', 'skip', skip));
+    }
     if (updatedAfter != null) {
       queryParams.addAll(_queryParams('', 'updatedAfter', updatedAfter));
     }
-    if (updatedBefore != null) {
-      queryParams.addAll(_queryParams('', 'updatedBefore', updatedBefore));
-    }
 
     if (ifNoneMatch != null) {
       headerParams[r'if-none-match'] = parameterToString(ifNoneMatch);
@@ -380,24 +370,20 @@ class AssetApi {
   ///
   /// Parameters:
   ///
-  /// * [int] skip:
-  ///
-  /// * [int] take:
-  ///
   /// * [String] userId:
   ///
   /// * [bool] isFavorite:
   ///
   /// * [bool] isArchived:
   ///
-  /// * [DateTime] updatedAfter:
+  /// * [num] skip:
   ///
-  /// * [DateTime] updatedBefore:
+  /// * [DateTime] updatedAfter:
   ///
   /// * [String] ifNoneMatch:
   ///   ETag of data already cached on the client
-  Future<List<AssetResponseDto>?> getAllAssets({ int? skip, int? take, String? userId, bool? isFavorite, bool? isArchived, DateTime? updatedAfter, DateTime? updatedBefore, String? ifNoneMatch, }) async {
+  Future<List<AssetResponseDto>?> getAllAssets({ String? userId, bool? isFavorite, bool? isArchived, num? skip, DateTime? updatedAfter, String? ifNoneMatch, }) async {
-    final response = await getAllAssetsWithHttpInfo( skip: skip, take: take, userId: userId, isFavorite: isFavorite, isArchived: isArchived, updatedAfter: updatedAfter, updatedBefore: updatedBefore, ifNoneMatch: ifNoneMatch, );
+    final response = await getAllAssetsWithHttpInfo( userId: userId, isFavorite: isFavorite, isArchived: isArchived, skip: skip, updatedAfter: updatedAfter, ifNoneMatch: ifNoneMatch, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -527,7 +513,7 @@ class AssetApi {
   /// * [bool] isFavorite:
   ///
   /// * [bool] isTrashed:
-  Future<Response> getAssetStatisticsWithHttpInfo({ bool? isArchived, bool? isFavorite, bool? isTrashed, }) async {
+  Future<Response> getAssetStatsWithHttpInfo({ bool? isArchived, bool? isFavorite, bool? isTrashed, }) async {
     // ignore: prefer_const_declarations
     final path = r'/asset/statistics';
 
@@ -569,8 +555,8 @@ class AssetApi {
   /// * [bool] isFavorite:
   ///
   /// * [bool] isTrashed:
-  Future<AssetStatsResponseDto?> getAssetStatistics({ bool? isArchived, bool? isFavorite, bool? isTrashed, }) async {
+  Future<AssetStatsResponseDto?> getAssetStats({ bool? isArchived, bool? isFavorite, bool? isTrashed, }) async {
-    final response = await getAssetStatisticsWithHttpInfo( isArchived: isArchived, isFavorite: isFavorite, isTrashed: isTrashed, );
+    final response = await getAssetStatsWithHttpInfo( isArchived: isArchived, isFavorite: isFavorite, isTrashed: isTrashed, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -647,6 +633,119 @@ class AssetApi {
     return null;
   }
 
+  /// Performs an HTTP 'GET /asset/time-bucket' operation and returns the [Response].
+  /// Parameters:
+  ///
+  /// * [TimeBucketSize] size (required):
+  ///
+  /// * [String] timeBucket (required):
+  ///
+  /// * [String] userId:
+  ///
+  /// * [String] albumId:
+  ///
+  /// * [String] personId:
+  ///
+  /// * [bool] isArchived:
+  ///
+  /// * [bool] isFavorite:
+  ///
+  /// * [bool] isTrashed:
+  ///
+  /// * [bool] withStacked:
+  ///
+  /// * [String] key:
+  Future<Response> getByTimeBucketWithHttpInfo(TimeBucketSize size, String timeBucket, { String? userId, String? albumId, String? personId, bool? isArchived, bool? isFavorite, bool? isTrashed, bool? withStacked, String? key, }) async {
+    // ignore: prefer_const_declarations
+    final path = r'/asset/time-bucket';
+
+    // ignore: prefer_final_locals
+    Object? postBody;
+
+    final queryParams = <QueryParam>[];
+    final headerParams = <String, String>{};
+    final formParams = <String, String>{};
+
+      queryParams.addAll(_queryParams('', 'size', size));
+    if (userId != null) {
+      queryParams.addAll(_queryParams('', 'userId', userId));
+    }
+    if (albumId != null) {
+      queryParams.addAll(_queryParams('', 'albumId', albumId));
+    }
+    if (personId != null) {
+      queryParams.addAll(_queryParams('', 'personId', personId));
+    }
+    if (isArchived != null) {
+      queryParams.addAll(_queryParams('', 'isArchived', isArchived));
+    }
+    if (isFavorite != null) {
+      queryParams.addAll(_queryParams('', 'isFavorite', isFavorite));
+    }
+    if (isTrashed != null) {
+      queryParams.addAll(_queryParams('', 'isTrashed', isTrashed));
+    }
+    if (withStacked != null) {
+      queryParams.addAll(_queryParams('', 'withStacked', withStacked));
+    }
+      queryParams.addAll(_queryParams('', 'timeBucket', timeBucket));
+    if (key != null) {
+      queryParams.addAll(_queryParams('', 'key', key));
+    }
+
+    const contentTypes = <String>[];
+
+
+    return apiClient.invokeAPI(
+      path,
+      'GET',
+      queryParams,
+      postBody,
+      headerParams,
+      formParams,
+      contentTypes.isEmpty ? null : contentTypes.first,
+    );
+  }
+
+  /// Parameters:
+  ///
+  /// * [TimeBucketSize] size (required):
+  ///
+  /// * [String] timeBucket (required):
+  ///
+  /// * [String] userId:
+  ///
+  /// * [String] albumId:
+  ///
+  /// * [String] personId:
+  ///
+  /// * [bool] isArchived:
+  ///
+  /// * [bool] isFavorite:
+  ///
+  /// * [bool] isTrashed:
+  ///
+  /// * [bool] withStacked:
+  ///
+  /// * [String] key:
+  Future<List<AssetResponseDto>?> getByTimeBucket(TimeBucketSize size, String timeBucket, { String? userId, String? albumId, String? personId, bool? isArchived, bool? isFavorite, bool? isTrashed, bool? withStacked, String? key, }) async {
+    final response = await getByTimeBucketWithHttpInfo(size, timeBucket,  userId: userId, albumId: albumId, personId: personId, isArchived: isArchived, isFavorite: isFavorite, isTrashed: isTrashed, withStacked: withStacked, key: key, );
+    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);
+      return (await apiClient.deserializeAsync(responseBody, 'List<AssetResponseDto>') as List)
+        .cast<AssetResponseDto>()
+        .toList();
+
+    }
+    return null;
+  }
+
   /// Performs an HTTP 'GET /asset/curated-locations' operation and returns the [Response].
   Future<Response> getCuratedLocationsWithHttpInfo() async {
     // ignore: prefer_const_declarations
@@ -976,119 +1075,6 @@ class AssetApi {
     return null;
   }
 
-  /// Performs an HTTP 'GET /asset/time-bucket' operation and returns the [Response].
-  /// Parameters:
-  ///
-  /// * [TimeBucketSize] size (required):
-  ///
-  /// * [String] timeBucket (required):
-  ///
-  /// * [String] userId:
-  ///
-  /// * [String] albumId:
-  ///
-  /// * [String] personId:
-  ///
-  /// * [bool] isArchived:
-  ///
-  /// * [bool] isFavorite:
-  ///
-  /// * [bool] isTrashed:
-  ///
-  /// * [bool] withStacked:
-  ///
-  /// * [String] key:
-  Future<Response> getTimeBucketWithHttpInfo(TimeBucketSize size, String timeBucket, { String? userId, String? albumId, String? personId, bool? isArchived, bool? isFavorite, bool? isTrashed, bool? withStacked, String? key, }) async {
-    // ignore: prefer_const_declarations
-    final path = r'/asset/time-bucket';
-
-    // ignore: prefer_final_locals
-    Object? postBody;
-
-    final queryParams = <QueryParam>[];
-    final headerParams = <String, String>{};
-    final formParams = <String, String>{};
-
-      queryParams.addAll(_queryParams('', 'size', size));
-    if (userId != null) {
-      queryParams.addAll(_queryParams('', 'userId', userId));
-    }
-    if (albumId != null) {
-      queryParams.addAll(_queryParams('', 'albumId', albumId));
-    }
-    if (personId != null) {
-      queryParams.addAll(_queryParams('', 'personId', personId));
-    }
-    if (isArchived != null) {
-      queryParams.addAll(_queryParams('', 'isArchived', isArchived));
-    }
-    if (isFavorite != null) {
-      queryParams.addAll(_queryParams('', 'isFavorite', isFavorite));
-    }
-    if (isTrashed != null) {
-      queryParams.addAll(_queryParams('', 'isTrashed', isTrashed));
-    }
-    if (withStacked != null) {
-      queryParams.addAll(_queryParams('', 'withStacked', withStacked));
-    }
-      queryParams.addAll(_queryParams('', 'timeBucket', timeBucket));
-    if (key != null) {
-      queryParams.addAll(_queryParams('', 'key', key));
-    }
-
-    const contentTypes = <String>[];
-
-
-    return apiClient.invokeAPI(
-      path,
-      'GET',
-      queryParams,
-      postBody,
-      headerParams,
-      formParams,
-      contentTypes.isEmpty ? null : contentTypes.first,
-    );
-  }
-
-  /// Parameters:
-  ///
-  /// * [TimeBucketSize] size (required):
-  ///
-  /// * [String] timeBucket (required):
-  ///
-  /// * [String] userId:
-  ///
-  /// * [String] albumId:
-  ///
-  /// * [String] personId:
-  ///
-  /// * [bool] isArchived:
-  ///
-  /// * [bool] isFavorite:
-  ///
-  /// * [bool] isTrashed:
-  ///
-  /// * [bool] withStacked:
-  ///
-  /// * [String] key:
-  Future<List<AssetResponseDto>?> getTimeBucket(TimeBucketSize size, String timeBucket, { String? userId, String? albumId, String? personId, bool? isArchived, bool? isFavorite, bool? isTrashed, bool? withStacked, String? key, }) async {
-    final response = await getTimeBucketWithHttpInfo(size, timeBucket,  userId: userId, albumId: albumId, personId: personId, isArchived: isArchived, isFavorite: isFavorite, isTrashed: isTrashed, withStacked: withStacked, key: key, );
-    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);
-      return (await apiClient.deserializeAsync(responseBody, 'List<AssetResponseDto>') as List)
-        .cast<AssetResponseDto>()
-        .toList();
-
-    }
-    return null;
-  }
-
   /// Performs an HTTP 'GET /asset/time-buckets' operation and returns the [Response].
   /// Parameters:
   ///
@@ -1674,6 +1660,8 @@ class AssetApi {
   ///
   /// * [DateTime] fileModifiedAt (required):
   ///
+  /// * [bool] isFavorite (required):
+  ///
   /// * [String] key:
   ///
   /// * [String] duration:
@@ -1682,8 +1670,6 @@ class AssetApi {
   ///
   /// * [bool] isExternal:
   ///
-  /// * [bool] isFavorite:
-  ///
   /// * [bool] isOffline:
   ///
   /// * [bool] isReadOnly:
@@ -1695,7 +1681,7 @@ class AssetApi {
   /// * [MultipartFile] livePhotoData:
   ///
   /// * [MultipartFile] sidecarData:
-  Future<Response> uploadFileWithHttpInfo(MultipartFile assetData, String deviceAssetId, String deviceId, DateTime fileCreatedAt, DateTime fileModifiedAt, { String? key, String? duration, bool? isArchived, bool? isExternal, bool? isFavorite, bool? isOffline, bool? isReadOnly, bool? isVisible, String? libraryId, MultipartFile? livePhotoData, MultipartFile? sidecarData, }) async {
+  Future<Response> uploadFileWithHttpInfo(MultipartFile assetData, String deviceAssetId, String deviceId, DateTime fileCreatedAt, DateTime fileModifiedAt, bool isFavorite, { String? key, String? duration, bool? isArchived, bool? isExternal, bool? isOffline, bool? isReadOnly, bool? isVisible, String? libraryId, MultipartFile? livePhotoData, MultipartFile? sidecarData, }) async {
     // ignore: prefer_const_declarations
     final path = r'/asset/upload';
 
@@ -1804,6 +1790,8 @@ class AssetApi {
   ///
   /// * [DateTime] fileModifiedAt (required):
   ///
+  /// * [bool] isFavorite (required):
+  ///
   /// * [String] key:
   ///
   /// * [String] duration:
@@ -1812,8 +1800,6 @@ class AssetApi {
   ///
   /// * [bool] isExternal:
   ///
-  /// * [bool] isFavorite:
-  ///
   /// * [bool] isOffline:
   ///
   /// * [bool] isReadOnly:
@@ -1825,8 +1811,8 @@ class AssetApi {
   /// * [MultipartFile] livePhotoData:
   ///
   /// * [MultipartFile] sidecarData:
-  Future<AssetFileUploadResponseDto?> uploadFile(MultipartFile assetData, String deviceAssetId, String deviceId, DateTime fileCreatedAt, DateTime fileModifiedAt, { String? key, String? duration, bool? isArchived, bool? isExternal, bool? isFavorite, bool? isOffline, bool? isReadOnly, bool? isVisible, String? libraryId, MultipartFile? livePhotoData, MultipartFile? sidecarData, }) async {
+  Future<AssetFileUploadResponseDto?> uploadFile(MultipartFile assetData, String deviceAssetId, String deviceId, DateTime fileCreatedAt, DateTime fileModifiedAt, bool isFavorite, { String? key, String? duration, bool? isArchived, bool? isExternal, bool? isOffline, bool? isReadOnly, bool? isVisible, String? libraryId, MultipartFile? livePhotoData, MultipartFile? sidecarData, }) async {
-    final response = await uploadFileWithHttpInfo(assetData, deviceAssetId, deviceId, fileCreatedAt, fileModifiedAt,  key: key, duration: duration, isArchived: isArchived, isExternal: isExternal, isFavorite: isFavorite, isOffline: isOffline, isReadOnly: isReadOnly, isVisible: isVisible, libraryId: libraryId, livePhotoData: livePhotoData, sidecarData: sidecarData, );
+    final response = await uploadFileWithHttpInfo(assetData, deviceAssetId, deviceId, fileCreatedAt, fileModifiedAt, isFavorite,  key: key, duration: duration, isArchived: isArchived, isExternal: isExternal, isOffline: isOffline, isReadOnly: isReadOnly, isVisible: isVisible, libraryId: libraryId, livePhotoData: livePhotoData, sidecarData: sidecarData, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }

mobile/openapi/lib/api/authentication_api.dart

@@ -16,6 +16,53 @@ class AuthenticationApi {
 
   final ApiClient apiClient;
 
+  /// Performs an HTTP 'POST /auth/admin-sign-up' operation and returns the [Response].
+  /// Parameters:
+  ///
+  /// * [SignUpDto] signUpDto (required):
+  Future<Response> adminSignUpWithHttpInfo(SignUpDto signUpDto,) async {
+    // ignore: prefer_const_declarations
+    final path = r'/auth/admin-sign-up';
+
+    // ignore: prefer_final_locals
+    Object? postBody = signUpDto;
+
+    final queryParams = <QueryParam>[];
+    final headerParams = <String, String>{};
+    final formParams = <String, String>{};
+
+    const contentTypes = <String>['application/json'];
+
+
+    return apiClient.invokeAPI(
+      path,
+      'POST',
+      queryParams,
+      postBody,
+      headerParams,
+      formParams,
+      contentTypes.isEmpty ? null : contentTypes.first,
+    );
+  }
+
+  /// Parameters:
+  ///
+  /// * [SignUpDto] signUpDto (required):
+  Future<AdminSignupResponseDto?> adminSignUp(SignUpDto signUpDto,) async {
+    final response = await adminSignUpWithHttpInfo(signUpDto,);
+    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) {
+      return await apiClient.deserializeAsync(await _decodeBodyBytes(response), 'AdminSignupResponseDto',) as AdminSignupResponseDto;
+    
+    }
+    return null;
+  }
+
   /// Performs an HTTP 'POST /auth/change-password' operation and returns the [Response].
   /// Parameters:
   ///
@@ -268,53 +315,6 @@ class AuthenticationApi {
     }
   }
 
-  /// Performs an HTTP 'POST /auth/admin-sign-up' operation and returns the [Response].
-  /// Parameters:
-  ///
-  /// * [SignUpDto] signUpDto (required):
-  Future<Response> signUpAdminWithHttpInfo(SignUpDto signUpDto,) async {
-    // ignore: prefer_const_declarations
-    final path = r'/auth/admin-sign-up';
-
-    // ignore: prefer_final_locals
-    Object? postBody = signUpDto;
-
-    final queryParams = <QueryParam>[];
-    final headerParams = <String, String>{};
-    final formParams = <String, String>{};
-
-    const contentTypes = <String>['application/json'];
-
-
-    return apiClient.invokeAPI(
-      path,
-      'POST',
-      queryParams,
-      postBody,
-      headerParams,
-      formParams,
-      contentTypes.isEmpty ? null : contentTypes.first,
-    );
-  }
-
-  /// Parameters:
-  ///
-  /// * [SignUpDto] signUpDto (required):
-  Future<AdminSignupResponseDto?> signUpAdmin(SignUpDto signUpDto,) async {
-    final response = await signUpAdminWithHttpInfo(signUpDto,);
-    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) {
-      return await apiClient.deserializeAsync(await _decodeBodyBytes(response), 'AdminSignupResponseDto',) as AdminSignupResponseDto;
-    
-    }
-    return null;
-  }
-
   /// Performs an HTTP 'POST /auth/validateToken' operation and returns the [Response].
   Future<Response> validateAccessTokenWithHttpInfo() async {
     // ignore: prefer_const_declarations

mobile/openapi/lib/api/library_api.dart

@@ -104,7 +104,7 @@ class LibraryApi {
   }
 
   /// Performs an HTTP 'GET /library' operation and returns the [Response].
-  Future<Response> getLibrariesWithHttpInfo() async {
+  Future<Response> getAllForUserWithHttpInfo() async {
     // ignore: prefer_const_declarations
     final path = r'/library';
 
@@ -129,8 +129,8 @@ class LibraryApi {
     );
   }
 
-  Future<List<LibraryResponseDto>?> getLibraries() async {
+  Future<List<LibraryResponseDto>?> getAllForUser() async {
-    final response = await getLibrariesWithHttpInfo();
+    final response = await getAllForUserWithHttpInfo();
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }

mobile/openapi/lib/api/o_auth_api.dart

@@ -16,11 +16,58 @@ class OAuthApi {
 
   final ApiClient apiClient;
 
+  /// Performs an HTTP 'POST /oauth/authorize' operation and returns the [Response].
+  /// Parameters:
+  ///
+  /// * [OAuthConfigDto] oAuthConfigDto (required):
+  Future<Response> authorizeOAuthWithHttpInfo(OAuthConfigDto oAuthConfigDto,) async {
+    // ignore: prefer_const_declarations
+    final path = r'/oauth/authorize';
+
+    // ignore: prefer_final_locals
+    Object? postBody = oAuthConfigDto;
+
+    final queryParams = <QueryParam>[];
+    final headerParams = <String, String>{};
+    final formParams = <String, String>{};
+
+    const contentTypes = <String>['application/json'];
+
+
+    return apiClient.invokeAPI(
+      path,
+      'POST',
+      queryParams,
+      postBody,
+      headerParams,
+      formParams,
+      contentTypes.isEmpty ? null : contentTypes.first,
+    );
+  }
+
+  /// Parameters:
+  ///
+  /// * [OAuthConfigDto] oAuthConfigDto (required):
+  Future<OAuthAuthorizeResponseDto?> authorizeOAuth(OAuthConfigDto oAuthConfigDto,) async {
+    final response = await authorizeOAuthWithHttpInfo(oAuthConfigDto,);
+    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) {
+      return await apiClient.deserializeAsync(await _decodeBodyBytes(response), 'OAuthAuthorizeResponseDto',) as OAuthAuthorizeResponseDto;
+    
+    }
+    return null;
+  }
+
   /// Performs an HTTP 'POST /oauth/callback' operation and returns the [Response].
   /// Parameters:
   ///
   /// * [OAuthCallbackDto] oAuthCallbackDto (required):
-  Future<Response> finishOAuthWithHttpInfo(OAuthCallbackDto oAuthCallbackDto,) async {
+  Future<Response> callbackWithHttpInfo(OAuthCallbackDto oAuthCallbackDto,) async {
     // ignore: prefer_const_declarations
     final path = r'/oauth/callback';
 
@@ -48,8 +95,8 @@ class OAuthApi {
   /// Parameters:
   ///
   /// * [OAuthCallbackDto] oAuthCallbackDto (required):
-  Future<LoginResponseDto?> finishOAuth(OAuthCallbackDto oAuthCallbackDto,) async {
+  Future<LoginResponseDto?> callback(OAuthCallbackDto oAuthCallbackDto,) async {
-    final response = await finishOAuthWithHttpInfo(oAuthCallbackDto,);
+    final response = await callbackWithHttpInfo(oAuthCallbackDto,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -70,7 +117,7 @@ class OAuthApi {
   /// Parameters:
   ///
   /// * [OAuthConfigDto] oAuthConfigDto (required):
-  Future<Response> generateOAuthConfigWithHttpInfo(OAuthConfigDto oAuthConfigDto,) async {
+  Future<Response> generateConfigWithHttpInfo(OAuthConfigDto oAuthConfigDto,) async {
     // ignore: prefer_const_declarations
     final path = r'/oauth/config';
 
@@ -100,8 +147,8 @@ class OAuthApi {
   /// Parameters:
   ///
   /// * [OAuthConfigDto] oAuthConfigDto (required):
-  Future<OAuthConfigResponseDto?> generateOAuthConfig(OAuthConfigDto oAuthConfigDto,) async {
+  Future<OAuthConfigResponseDto?> generateConfig(OAuthConfigDto oAuthConfigDto,) async {
-    final response = await generateOAuthConfigWithHttpInfo(oAuthConfigDto,);
+    final response = await generateConfigWithHttpInfo(oAuthConfigDto,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -119,7 +166,7 @@ class OAuthApi {
   /// Parameters:
   ///
   /// * [OAuthCallbackDto] oAuthCallbackDto (required):
-  Future<Response> linkOAuthAccountWithHttpInfo(OAuthCallbackDto oAuthCallbackDto,) async {
+  Future<Response> linkWithHttpInfo(OAuthCallbackDto oAuthCallbackDto,) async {
     // ignore: prefer_const_declarations
     final path = r'/oauth/link';
 
@@ -147,8 +194,8 @@ class OAuthApi {
   /// Parameters:
   ///
   /// * [OAuthCallbackDto] oAuthCallbackDto (required):
-  Future<UserResponseDto?> linkOAuthAccount(OAuthCallbackDto oAuthCallbackDto,) async {
+  Future<UserResponseDto?> link(OAuthCallbackDto oAuthCallbackDto,) async {
-    final response = await linkOAuthAccountWithHttpInfo(oAuthCallbackDto,);
+    final response = await linkWithHttpInfo(oAuthCallbackDto,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -163,7 +210,7 @@ class OAuthApi {
   }
 
   /// Performs an HTTP 'GET /oauth/mobile-redirect' operation and returns the [Response].
-  Future<Response> redirectOAuthToMobileWithHttpInfo() async {
+  Future<Response> mobileRedirectWithHttpInfo() async {
     // ignore: prefer_const_declarations
     final path = r'/oauth/mobile-redirect';
 
@@ -188,62 +235,15 @@ class OAuthApi {
     );
   }
 
-  Future<void> redirectOAuthToMobile() async {
+  Future<void> mobileRedirect() async {
-    final response = await redirectOAuthToMobileWithHttpInfo();
+    final response = await mobileRedirectWithHttpInfo();
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
   }
 
-  /// Performs an HTTP 'POST /oauth/authorize' operation and returns the [Response].
-  /// Parameters:
-  ///
-  /// * [OAuthConfigDto] oAuthConfigDto (required):
-  Future<Response> startOAuthWithHttpInfo(OAuthConfigDto oAuthConfigDto,) async {
-    // ignore: prefer_const_declarations
-    final path = r'/oauth/authorize';
-
-    // ignore: prefer_final_locals
-    Object? postBody = oAuthConfigDto;
-
-    final queryParams = <QueryParam>[];
-    final headerParams = <String, String>{};
-    final formParams = <String, String>{};
-
-    const contentTypes = <String>['application/json'];
-
-
-    return apiClient.invokeAPI(
-      path,
-      'POST',
-      queryParams,
-      postBody,
-      headerParams,
-      formParams,
-      contentTypes.isEmpty ? null : contentTypes.first,
-    );
-  }
-
-  /// Parameters:
-  ///
-  /// * [OAuthConfigDto] oAuthConfigDto (required):
-  Future<OAuthAuthorizeResponseDto?> startOAuth(OAuthConfigDto oAuthConfigDto,) async {
-    final response = await startOAuthWithHttpInfo(oAuthConfigDto,);
-    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) {
-      return await apiClient.deserializeAsync(await _decodeBodyBytes(response), 'OAuthAuthorizeResponseDto',) as OAuthAuthorizeResponseDto;
-    
-    }
-    return null;
-  }
-
   /// Performs an HTTP 'POST /oauth/unlink' operation and returns the [Response].
-  Future<Response> unlinkOAuthAccountWithHttpInfo() async {
+  Future<Response> unlinkWithHttpInfo() async {
     // ignore: prefer_const_declarations
     final path = r'/oauth/unlink';
 
@@ -268,8 +268,8 @@ class OAuthApi {
     );
   }
 
-  Future<UserResponseDto?> unlinkOAuthAccount() async {
+  Future<UserResponseDto?> unlink() async {
-    final response = await unlinkOAuthAccountWithHttpInfo();
+    final response = await unlinkWithHttpInfo();
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }

mobile/openapi/lib/api/server_info_api.dart

@@ -139,47 +139,6 @@ class ServerInfoApi {
     return null;
   }
 
-  /// Performs an HTTP 'GET /server-info/statistics' operation and returns the [Response].
-  Future<Response> getServerStatisticsWithHttpInfo() async {
-    // ignore: prefer_const_declarations
-    final path = r'/server-info/statistics';
-
-    // ignore: prefer_final_locals
-    Object? postBody;
-
-    final queryParams = <QueryParam>[];
-    final headerParams = <String, String>{};
-    final formParams = <String, String>{};
-
-    const contentTypes = <String>[];
-
-
-    return apiClient.invokeAPI(
-      path,
-      'GET',
-      queryParams,
-      postBody,
-      headerParams,
-      formParams,
-      contentTypes.isEmpty ? null : contentTypes.first,
-    );
-  }
-
-  Future<ServerStatsResponseDto?> getServerStatistics() async {
-    final response = await getServerStatisticsWithHttpInfo();
-    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) {
-      return await apiClient.deserializeAsync(await _decodeBodyBytes(response), 'ServerStatsResponseDto',) as ServerStatsResponseDto;
-    
-    }
-    return null;
-  }
-
   /// Performs an HTTP 'GET /server-info/version' operation and returns the [Response].
   Future<Response> getServerVersionWithHttpInfo() async {
     // ignore: prefer_const_declarations
@@ -221,6 +180,47 @@ class ServerInfoApi {
     return null;
   }
 
+  /// Performs an HTTP 'GET /server-info/stats' operation and returns the [Response].
+  Future<Response> getStatsWithHttpInfo() async {
+    // ignore: prefer_const_declarations
+    final path = r'/server-info/stats';
+
+    // ignore: prefer_final_locals
+    Object? postBody;
+
+    final queryParams = <QueryParam>[];
+    final headerParams = <String, String>{};
+    final formParams = <String, String>{};
+
+    const contentTypes = <String>[];
+
+
+    return apiClient.invokeAPI(
+      path,
+      'GET',
+      queryParams,
+      postBody,
+      headerParams,
+      formParams,
+      contentTypes.isEmpty ? null : contentTypes.first,
+    );
+  }
+
+  Future<ServerStatsResponseDto?> getStats() async {
+    final response = await getStatsWithHttpInfo();
+    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) {
+      return await apiClient.deserializeAsync(await _decodeBodyBytes(response), 'ServerStatsResponseDto',) as ServerStatsResponseDto;
+    
+    }
+    return null;
+  }
+
   /// Performs an HTTP 'GET /server-info/media-types' operation and returns the [Response].
   Future<Response> getSupportedMediaTypesWithHttpInfo() async {
     // ignore: prefer_const_declarations

mobile/openapi/lib/api/system_config_api.dart

@@ -58,7 +58,7 @@ class SystemConfigApi {
   }
 
   /// Performs an HTTP 'GET /system-config/defaults' operation and returns the [Response].
-  Future<Response> getConfigDefaultsWithHttpInfo() async {
+  Future<Response> getDefaultsWithHttpInfo() async {
     // ignore: prefer_const_declarations
     final path = r'/system-config/defaults';
 
@@ -83,8 +83,8 @@ class SystemConfigApi {
     );
   }
 
-  Future<SystemConfigDto?> getConfigDefaults() async {
+  Future<SystemConfigDto?> getDefaults() async {
-    final response = await getConfigDefaultsWithHttpInfo();
+    final response = await getDefaultsWithHttpInfo();
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }

mobile/openapi/lib/model/album_response_dto.dart

@@ -22,7 +22,6 @@ class AlbumResponseDto {
     this.endDate,
     required this.hasSharedLink,
     required this.id,
-    required this.isActivityEnabled,
     this.lastModifiedAssetTimestamp,
     required this.owner,
     required this.ownerId,
@@ -56,8 +55,6 @@ class AlbumResponseDto {
 
   String id;
 
-  bool isActivityEnabled;
-
   ///
   /// 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
@@ -95,7 +92,6 @@ class AlbumResponseDto {
      other.endDate == endDate &&
      other.hasSharedLink == hasSharedLink &&
      other.id == id &&
-     other.isActivityEnabled == isActivityEnabled &&
      other.lastModifiedAssetTimestamp == lastModifiedAssetTimestamp &&
      other.owner == owner &&
      other.ownerId == ownerId &&
@@ -116,7 +112,6 @@ class AlbumResponseDto {
     (endDate == null ? 0 : endDate!.hashCode) +
     (hasSharedLink.hashCode) +
     (id.hashCode) +
-    (isActivityEnabled.hashCode) +
     (lastModifiedAssetTimestamp == null ? 0 : lastModifiedAssetTimestamp!.hashCode) +
     (owner.hashCode) +
     (ownerId.hashCode) +
@@ -126,7 +121,7 @@ class AlbumResponseDto {
     (updatedAt.hashCode);
 
   @override
-  String toString() => 'AlbumResponseDto[albumName=$albumName, albumThumbnailAssetId=$albumThumbnailAssetId, assetCount=$assetCount, assets=$assets, createdAt=$createdAt, description=$description, endDate=$endDate, hasSharedLink=$hasSharedLink, id=$id, isActivityEnabled=$isActivityEnabled, lastModifiedAssetTimestamp=$lastModifiedAssetTimestamp, owner=$owner, ownerId=$ownerId, shared=$shared, sharedUsers=$sharedUsers, startDate=$startDate, updatedAt=$updatedAt]';
+  String toString() => 'AlbumResponseDto[albumName=$albumName, albumThumbnailAssetId=$albumThumbnailAssetId, assetCount=$assetCount, assets=$assets, createdAt=$createdAt, description=$description, endDate=$endDate, hasSharedLink=$hasSharedLink, id=$id, lastModifiedAssetTimestamp=$lastModifiedAssetTimestamp, owner=$owner, ownerId=$ownerId, shared=$shared, sharedUsers=$sharedUsers, startDate=$startDate, updatedAt=$updatedAt]';
 
   Map<String, dynamic> toJson() {
     final json = <String, dynamic>{};
@@ -147,7 +142,6 @@ class AlbumResponseDto {
     }
       json[r'hasSharedLink'] = this.hasSharedLink;
       json[r'id'] = this.id;
-      json[r'isActivityEnabled'] = this.isActivityEnabled;
     if (this.lastModifiedAssetTimestamp != null) {
       json[r'lastModifiedAssetTimestamp'] = this.lastModifiedAssetTimestamp!.toUtc().toIso8601String();
     } else {
@@ -183,7 +177,6 @@ class AlbumResponseDto {
         endDate: mapDateTime(json, r'endDate', ''),
         hasSharedLink: mapValueOfType<bool>(json, r'hasSharedLink')!,
         id: mapValueOfType<String>(json, r'id')!,
-        isActivityEnabled: mapValueOfType<bool>(json, r'isActivityEnabled')!,
         lastModifiedAssetTimestamp: mapDateTime(json, r'lastModifiedAssetTimestamp', ''),
         owner: UserResponseDto.fromJson(json[r'owner'])!,
         ownerId: mapValueOfType<String>(json, r'ownerId')!,
@@ -246,7 +239,6 @@ class AlbumResponseDto {
     'description',
     'hasSharedLink',
     'id',
-    'isActivityEnabled',
     'owner',
     'ownerId',
     'shared',

mobile/openapi/lib/model/import_asset_dto.dart

@@ -21,7 +21,7 @@ class ImportAssetDto {
     required this.fileModifiedAt,
     this.isArchived,
     this.isExternal,
-    this.isFavorite,
+    required this.isFavorite,
     this.isOffline,
     this.isReadOnly = true,
     this.isVisible,
@@ -63,13 +63,7 @@ class ImportAssetDto {
   ///
   bool? isExternal;
 
-  ///
+  bool isFavorite;
-  /// 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.
-  ///
-  bool? isFavorite;
 
   ///
   /// Please note: This property should have been non-nullable! Since the specification file
@@ -133,7 +127,7 @@ class ImportAssetDto {
     (fileModifiedAt.hashCode) +
     (isArchived == null ? 0 : isArchived!.hashCode) +
     (isExternal == null ? 0 : isExternal!.hashCode) +
-    (isFavorite == null ? 0 : isFavorite!.hashCode) +
+    (isFavorite.hashCode) +
     (isOffline == null ? 0 : isOffline!.hashCode) +
     (isReadOnly.hashCode) +
     (isVisible == null ? 0 : isVisible!.hashCode) +
@@ -165,11 +159,7 @@ class ImportAssetDto {
     } else {
     //  json[r'isExternal'] = null;
     }
-    if (this.isFavorite != null) {
       json[r'isFavorite'] = this.isFavorite;
-    } else {
-    //  json[r'isFavorite'] = null;
-    }
     if (this.isOffline != null) {
       json[r'isOffline'] = this.isOffline;
     } else {
@@ -210,7 +200,7 @@ class ImportAssetDto {
         fileModifiedAt: mapDateTime(json, r'fileModifiedAt', '')!,
         isArchived: mapValueOfType<bool>(json, r'isArchived'),
         isExternal: mapValueOfType<bool>(json, r'isExternal'),
-        isFavorite: mapValueOfType<bool>(json, r'isFavorite'),
+        isFavorite: mapValueOfType<bool>(json, r'isFavorite')!,
         isOffline: mapValueOfType<bool>(json, r'isOffline'),
         isReadOnly: mapValueOfType<bool>(json, r'isReadOnly') ?? true,
         isVisible: mapValueOfType<bool>(json, r'isVisible'),
@@ -268,6 +258,7 @@ class ImportAssetDto {
     'deviceId',
     'fileCreatedAt',
     'fileModifiedAt',
+    'isFavorite',
   };
 }
 

mobile/openapi/lib/model/update_album_dto.dart

@@ -16,7 +16,6 @@ class UpdateAlbumDto {
     this.albumName,
     this.albumThumbnailAssetId,
     this.description,
-    this.isActivityEnabled,
   });
 
   ///
@@ -43,31 +42,21 @@ class UpdateAlbumDto {
   ///
   String? description;
 
-  ///
-  /// 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.
-  ///
-  bool? isActivityEnabled;
-
   @override
   bool operator ==(Object other) => identical(this, other) || other is UpdateAlbumDto &&
      other.albumName == albumName &&
      other.albumThumbnailAssetId == albumThumbnailAssetId &&
-     other.description == description &&
+     other.description == description;
-     other.isActivityEnabled == isActivityEnabled;
 
   @override
   int get hashCode =>
     // ignore: unnecessary_parenthesis
     (albumName == null ? 0 : albumName!.hashCode) +
     (albumThumbnailAssetId == null ? 0 : albumThumbnailAssetId!.hashCode) +
-    (description == null ? 0 : description!.hashCode) +
+    (description == null ? 0 : description!.hashCode);
-    (isActivityEnabled == null ? 0 : isActivityEnabled!.hashCode);
 
   @override
-  String toString() => 'UpdateAlbumDto[albumName=$albumName, albumThumbnailAssetId=$albumThumbnailAssetId, description=$description, isActivityEnabled=$isActivityEnabled]';
+  String toString() => 'UpdateAlbumDto[albumName=$albumName, albumThumbnailAssetId=$albumThumbnailAssetId, description=$description]';
 
   Map<String, dynamic> toJson() {
     final json = <String, dynamic>{};
@@ -86,11 +75,6 @@ class UpdateAlbumDto {
     } else {
     //  json[r'description'] = null;
     }
-    if (this.isActivityEnabled != null) {
-      json[r'isActivityEnabled'] = this.isActivityEnabled;
-    } else {
-    //  json[r'isActivityEnabled'] = null;
-    }
     return json;
   }
 
@@ -105,7 +89,6 @@ class UpdateAlbumDto {
         albumName: mapValueOfType<String>(json, r'albumName'),
         albumThumbnailAssetId: mapValueOfType<String>(json, r'albumThumbnailAssetId'),
         description: mapValueOfType<String>(json, r'description'),
-        isActivityEnabled: mapValueOfType<bool>(json, r'isActivityEnabled'),
       );
     }
     return null;

mobile/openapi/test/album_response_dto_test.dart

@@ -61,11 +61,6 @@ void main() {
       // TODO
     });
 
-    // bool isActivityEnabled
-    test('to test the property `isActivityEnabled`', () async {
-      // TODO
-    });
-
     // DateTime lastModifiedAssetTimestamp
     test('to test the property `lastModifiedAssetTimestamp`', () async {
       // TODO

mobile/openapi/test/api_key_api_test.dart

@@ -17,28 +17,28 @@ void main() {
   // final instance = APIKeyApi();
 
   group('tests for APIKeyApi', () {
-    //Future<APIKeyCreateResponseDto> createApiKey(APIKeyCreateDto aPIKeyCreateDto) async
+    //Future<APIKeyCreateResponseDto> createKey(APIKeyCreateDto aPIKeyCreateDto) async
-    test('test createApiKey', () async {
+    test('test createKey', () async {
       // TODO
     });
 
-    //Future deleteApiKey(String id) async
+    //Future deleteKey(String id) async
-    test('test deleteApiKey', () async {
+    test('test deleteKey', () async {
       // TODO
     });
 
-    //Future<APIKeyResponseDto> getApiKey(String id) async
+    //Future<APIKeyResponseDto> getKey(String id) async
-    test('test getApiKey', () async {
+    test('test getKey', () async {
       // TODO
     });
 
-    //Future<List<APIKeyResponseDto>> getApiKeys() async
+    //Future<List<APIKeyResponseDto>> getKeys() async
-    test('test getApiKeys', () async {
+    test('test getKeys', () async {
       // TODO
     });
 
-    //Future<APIKeyResponseDto> updateApiKey(String id, APIKeyUpdateDto aPIKeyUpdateDto) async
+    //Future<APIKeyResponseDto> updateKey(String id, APIKeyUpdateDto aPIKeyUpdateDto) async
-    test('test updateApiKey', () async {
+    test('test updateKey', () async {
       // TODO
     });
 

mobile/openapi/test/asset_api_test.dart

@@ -19,8 +19,8 @@ void main() {
   group('tests for AssetApi', () {
     // Checks if assets exist by checksums
     //
-    //Future<AssetBulkUploadCheckResponseDto> checkBulkUpload(AssetBulkUploadCheckDto assetBulkUploadCheckDto) async
+    //Future<AssetBulkUploadCheckResponseDto> bulkUploadCheck(AssetBulkUploadCheckDto assetBulkUploadCheckDto) async
-    test('test checkBulkUpload', () async {
+    test('test bulkUploadCheck', () async {
       // TODO
     });
 
@@ -53,7 +53,7 @@ void main() {
 
     // Get all AssetEntity belong to the user
     //
-    //Future<List<AssetResponseDto>> getAllAssets({ int skip, int take, String userId, bool isFavorite, bool isArchived, DateTime updatedAfter, DateTime updatedBefore, String ifNoneMatch }) async
+    //Future<List<AssetResponseDto>> getAllAssets({ String userId, bool isFavorite, bool isArchived, num skip, DateTime updatedAfter, String ifNoneMatch }) async
     test('test getAllAssets', () async {
       // TODO
     });
@@ -70,8 +70,8 @@ void main() {
       // TODO
     });
 
-    //Future<AssetStatsResponseDto> getAssetStatistics({ bool isArchived, bool isFavorite, bool isTrashed }) async
+    //Future<AssetStatsResponseDto> getAssetStats({ bool isArchived, bool isFavorite, bool isTrashed }) async
-    test('test getAssetStatistics', () async {
+    test('test getAssetStats', () async {
       // TODO
     });
 
@@ -80,6 +80,11 @@ void main() {
       // TODO
     });
 
+    //Future<List<AssetResponseDto>> getByTimeBucket(TimeBucketSize size, String timeBucket, { String userId, String albumId, String personId, bool isArchived, bool isFavorite, bool isTrashed, bool withStacked, String key }) async
+    test('test getByTimeBucket', () async {
+      // TODO
+    });
+
     //Future<List<CuratedLocationsResponseDto>> getCuratedLocations() async
     test('test getCuratedLocations', () async {
       // TODO
@@ -110,11 +115,6 @@ void main() {
       // TODO
     });
 
-    //Future<List<AssetResponseDto>> getTimeBucket(TimeBucketSize size, String timeBucket, { String userId, String albumId, String personId, bool isArchived, bool isFavorite, bool isTrashed, bool withStacked, String key }) async
-    test('test getTimeBucket', () async {
-      // TODO
-    });
-
     //Future<List<TimeBucketResponseDto>> getTimeBuckets(TimeBucketSize size, { String userId, String albumId, String personId, bool isArchived, bool isFavorite, bool isTrashed, bool withStacked, String key }) async
     test('test getTimeBuckets', () async {
       // TODO
@@ -172,7 +172,7 @@ void main() {
       // TODO
     });
 
-    //Future<AssetFileUploadResponseDto> uploadFile(MultipartFile assetData, String deviceAssetId, String deviceId, DateTime fileCreatedAt, DateTime fileModifiedAt, { String key, String duration, bool isArchived, bool isExternal, bool isFavorite, bool isOffline, bool isReadOnly, bool isVisible, String libraryId, MultipartFile livePhotoData, MultipartFile sidecarData }) async
+    //Future<AssetFileUploadResponseDto> uploadFile(MultipartFile assetData, String deviceAssetId, String deviceId, DateTime fileCreatedAt, DateTime fileModifiedAt, bool isFavorite, { String key, String duration, bool isArchived, bool isExternal, bool isOffline, bool isReadOnly, bool isVisible, String libraryId, MultipartFile livePhotoData, MultipartFile sidecarData }) async
     test('test uploadFile', () async {
       // TODO
     });

mobile/openapi/test/authentication_api_test.dart

@@ -17,6 +17,11 @@ void main() {
   // final instance = AuthenticationApi();
 
   group('tests for AuthenticationApi', () {
+    //Future<AdminSignupResponseDto> adminSignUp(SignUpDto signUpDto) async
+    test('test adminSignUp', () async {
+      // TODO
+    });
+
     //Future<UserResponseDto> changePassword(ChangePasswordDto changePasswordDto) async
     test('test changePassword', () async {
       // TODO
@@ -47,11 +52,6 @@ void main() {
       // TODO
     });
 
-    //Future<AdminSignupResponseDto> signUpAdmin(SignUpDto signUpDto) async
-    test('test signUpAdmin', () async {
-      // TODO
-    });
-
     //Future<ValidateAccessTokenResponseDto> validateAccessToken() async
     test('test validateAccessToken', () async {
       // TODO

mobile/openapi/test/library_api_test.dart

@@ -27,8 +27,8 @@ void main() {
       // TODO
     });
 
-    //Future<List<LibraryResponseDto>> getLibraries() async
+    //Future<List<LibraryResponseDto>> getAllForUser() async
-    test('test getLibraries', () async {
+    test('test getAllForUser', () async {
       // TODO
     });
 

mobile/openapi/test/o_auth_api_test.dart

@@ -17,35 +17,35 @@ void main() {
   // final instance = OAuthApi();
 
   group('tests for OAuthApi', () {
-    //Future<LoginResponseDto> finishOAuth(OAuthCallbackDto oAuthCallbackDto) async
+    //Future<OAuthAuthorizeResponseDto> authorizeOAuth(OAuthConfigDto oAuthConfigDto) async
-    test('test finishOAuth', () async {
+    test('test authorizeOAuth', () async {
+      // TODO
+    });
+
+    //Future<LoginResponseDto> callback(OAuthCallbackDto oAuthCallbackDto) async
+    test('test callback', () async {
       // TODO
     });
 
     // @deprecated use feature flags and /oauth/authorize
     //
-    //Future<OAuthConfigResponseDto> generateOAuthConfig(OAuthConfigDto oAuthConfigDto) async
+    //Future<OAuthConfigResponseDto> generateConfig(OAuthConfigDto oAuthConfigDto) async
-    test('test generateOAuthConfig', () async {
+    test('test generateConfig', () async {
       // TODO
     });
 
-    //Future<UserResponseDto> linkOAuthAccount(OAuthCallbackDto oAuthCallbackDto) async
+    //Future<UserResponseDto> link(OAuthCallbackDto oAuthCallbackDto) async
-    test('test linkOAuthAccount', () async {
+    test('test link', () async {
       // TODO
     });
 
-    //Future redirectOAuthToMobile() async
+    //Future mobileRedirect() async
-    test('test redirectOAuthToMobile', () async {
+    test('test mobileRedirect', () async {
       // TODO
     });
 
-    //Future<OAuthAuthorizeResponseDto> startOAuth(OAuthConfigDto oAuthConfigDto) async
+    //Future<UserResponseDto> unlink() async
-    test('test startOAuth', () async {
+    test('test unlink', () async {
-      // TODO
-    });
-
-    //Future<UserResponseDto> unlinkOAuthAccount() async
-    test('test unlinkOAuthAccount', () async {
       // TODO
     });
 

mobile/openapi/test/server_info_api_test.dart

@@ -32,13 +32,13 @@ void main() {
       // TODO
     });
 
-    //Future<ServerStatsResponseDto> getServerStatistics() async
+    //Future<ServerVersionResponseDto> getServerVersion() async
-    test('test getServerStatistics', () async {
+    test('test getServerVersion', () async {
       // TODO
     });
 
-    //Future<ServerVersionResponseDto> getServerVersion() async
+    //Future<ServerStatsResponseDto> getStats() async
-    test('test getServerVersion', () async {
+    test('test getStats', () async {
       // TODO
     });
 

mobile/openapi/test/system_config_api_test.dart

@@ -22,8 +22,8 @@ void main() {
       // TODO
     });
 
-    //Future<SystemConfigDto> getConfigDefaults() async
+    //Future<SystemConfigDto> getDefaults() async
-    test('test getConfigDefaults', () async {
+    test('test getDefaults', () async {
       // TODO
     });
 

mobile/openapi/test/update_album_dto_test.dart

@@ -31,11 +31,6 @@ void main() {
       // TODO
     });
 
-    // bool isActivityEnabled
-    test('to test the property `isActivityEnabled`', () async {
-      // TODO
-    });
-
 
   });
 

mobile/pubspec.lock

@@ -21,10 +21,10 @@ packages:
     dependency: transitive
     description:
       name: archive
-      sha256: "0c8368c9b3f0abbc193b9d6133649a614204b528982bebc7026372d61677ce3a"
+      sha256: "7e0d52067d05f2e0324268097ba723b71cb41ac8a6a2b24d1edf9c536b987b03"
       url: "https://pub.dev"
     source: hosted
-    version: "3.3.7"
+    version: "3.4.6"
   args:
     dependency: transitive
     description:
@@ -201,6 +201,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.7.0"
+  cli_util:
+    dependency: transitive
+    description:
+      name: cli_util
+      sha256: b8db3080e59b2503ca9e7922c3df2072cf13992354d5e944074ffa836fba43b7
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.4.0"
   clock:
     dependency: transitive
     description:
@@ -455,10 +463,10 @@ packages:
     dependency: "direct dev"
     description:
       name: flutter_launcher_icons
-      sha256: "559c600f056e7c704bd843723c21e01b5fba47e8824bd02422165bcc02a5de1d"
+      sha256: "526faf84284b86a4cb36d20a5e45147747b7563d921373d4ee0559c54fcdbcea"
       url: "https://pub.dev"
     source: hosted
-    version: "0.9.3"
+    version: "0.13.1"
   flutter_lints:
     dependency: "direct dev"
     description:
@@ -516,10 +524,10 @@ packages:
     dependency: "direct dev"
     description:
       name: flutter_native_splash
-      sha256: "6777a3abb974021a39b5fdd2d46a03ca390e03903b6351f21d10e7ecc969f12d"
+      sha256: d93394f22f73e810bda59e11ebe83329c5511d6460b6b7509c4e1f3c92d6d625
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.16"
+    version: "2.3.5"
   flutter_plugin_android_lifecycle:
     dependency: transitive
     description:
@@ -691,10 +699,10 @@ packages:
     dependency: transitive
     description:
       name: image
-      sha256: "8e9d133755c3e84c73288363e6343157c383a0c6c56fc51afcc5d4d7180306d6"
+      sha256: "028f61960d56f26414eb616b48b04eb37d700cbe477b7fb09bf1d7ce57fd9271"
       url: "https://pub.dev"
     source: hosted
-    version: "3.3.0"
+    version: "4.1.3"
   image_picker:
     dependency: "direct main"
     description:
@@ -868,6 +876,78 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.5.0"
+  media_kit:
+    dependency: "direct main"
+    description:
+      name: media_kit
+      sha256: "3289062540e3b8b9746e5c50d95bd78a9289826b7227e253dff806d002b9e67a"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.10+1"
+  media_kit_libs_android_video:
+    dependency: transitive
+    description:
+      name: media_kit_libs_android_video
+      sha256: "9dd8012572e4aff47516e55f2597998f0a378e3d588d0fad0ca1f11a53ae090c"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.3.6"
+  media_kit_libs_ios_video:
+    dependency: transitive
+    description:
+      name: media_kit_libs_ios_video
+      sha256: b5382994eb37a4564c368386c154ad70ba0cc78dacdd3fb0cd9f30db6d837991
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.4"
+  media_kit_libs_linux:
+    dependency: transitive
+    description:
+      name: media_kit_libs_linux
+      sha256: e186891c31daa6bedab4d74dcdb4e8adfccc7d786bfed6ad81fe24a3b3010310
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.3"
+  media_kit_libs_macos_video:
+    dependency: transitive
+    description:
+      name: media_kit_libs_macos_video
+      sha256: f26aa1452b665df288e360393758f84b911f70ffb3878032e1aabba23aa1032d
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.4"
+  media_kit_libs_video:
+    dependency: "direct main"
+    description:
+      name: media_kit_libs_video
+      sha256: "3688e0c31482074578652bf038ce6301a5d21e1eda6b54fc3117ffeb4bdba067"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.4"
+  media_kit_libs_windows_video:
+    dependency: transitive
+    description:
+      name: media_kit_libs_windows_video
+      sha256: "7bace5f35d9afcc7f9b5cdadb7541d2191a66bb3fc71bfa11c1395b3360f6122"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.9"
+  media_kit_native_event_loop:
+    dependency: transitive
+    description:
+      name: media_kit_native_event_loop
+      sha256: a605cf185499d14d58935b8784955a92a4bf0ff4e19a23de3d17a9106303930e
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.8"
+  media_kit_video:
+    dependency: "direct main"
+    description:
+      name: media_kit_video
+      sha256: c048d11a19e379aebbe810647636e3fc6d18374637e2ae12def4ff8a4b99a882
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.2.4"
   meta:
     dependency: transitive
     description:
@@ -1171,6 +1251,62 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.27.7"
+  safe_local_storage:
+    dependency: transitive
+    description:
+      name: safe_local_storage
+      sha256: ede4eb6cb7d88a116b3d3bf1df70790b9e2038bc37cb19112e381217c74d9440
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.2"
+  screen_brightness:
+    dependency: transitive
+    description:
+      name: screen_brightness
+      sha256: ed8da4a4511e79422fc1aa88138e920e4008cd312b72cdaa15ccb426c0faaedd
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.2.2+1"
+  screen_brightness_android:
+    dependency: transitive
+    description:
+      name: screen_brightness_android
+      sha256: "3df10961e3a9e968a5e076fe27e7f4741fa8a1d3950bdeb48cf121ed529d0caf"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.1.0+2"
+  screen_brightness_ios:
+    dependency: transitive
+    description:
+      name: screen_brightness_ios
+      sha256: "99adc3ca5490b8294284aad5fcc87f061ad685050e03cf45d3d018fe398fd9a2"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.1.0"
+  screen_brightness_macos:
+    dependency: transitive
+    description:
+      name: screen_brightness_macos
+      sha256: "64b34e7e3f4900d7687c8e8fb514246845a73ecec05ab53483ed025bd4a899fd"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.1.0+1"
+  screen_brightness_platform_interface:
+    dependency: transitive
+    description:
+      name: screen_brightness_platform_interface
+      sha256: b211d07f0c96637a15fb06f6168617e18030d5d74ad03795dd8547a52717c171
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.1.0"
+  screen_brightness_windows:
+    dependency: transitive
+    description:
+      name: screen_brightness_windows
+      sha256: "9261bf33d0fc2707d8cf16339ce25768100a65e70af0fcabaf032fc12408ba86"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.1.3"
   scrollable_positioned_list:
     dependency: "direct main"
     description:
@@ -1401,7 +1537,7 @@ packages:
     source: hosted
     version: "2.1.3"
   timezone:
-    dependency: "direct main"
+    dependency: transitive
     description:
       name: timezone
       sha256: "1cfd8ddc2d1cfd836bc93e67b9be88c3adaeca6f40a00ca999104c30693cdca0"
@@ -1448,6 +1584,22 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.2.2"
+  universal_platform:
+    dependency: transitive
+    description:
+      name: universal_platform
+      sha256: d315be0f6641898b280ffa34e2ddb14f3d12b1a37882557869646e0cc363d0cc
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.0+1"
+  uri_parser:
+    dependency: transitive
+    description:
+      name: uri_parser
+      sha256: "6543c9fd86d2862fac55d800a43e67c0dcd1a41677cb69c2f8edfe73bbcf1835"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.2"
   url_launcher:
     dependency: "direct main"
     description:
@@ -1576,6 +1728,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "11.7.1"
+  volume_controller:
+    dependency: transitive
+    description:
+      name: volume_controller
+      sha256: "189bdc7a554f476b412e4c8b2f474562b09d74bc458c23667356bce3ca1d48c9"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.7"
   wakelock_plus:
     dependency: "direct main"
     description:

mobile/pubspec.yaml

@@ -2,7 +2,7 @@ name: immich_mobile
 description: Immich - selfhosted backup media file on mobile phone
 
 publish_to: "none"
-version: 1.85.0+109
+version: 1.84.0+108
 isar_version: &isar_version 3.1.0+1
 
 environment:
@@ -52,7 +52,10 @@ dependencies:
   crypto: ^3.0.3 # TODO remove once native crypto is used on iOS
   wakelock_plus: ^1.1.1
   flutter_local_notifications: ^15.1.0+1
-  timezone: ^0.9.2
+
+  media_kit: ^1.1.10 # Primary package.
+  media_kit_video: ^1.2.4 # For video rendering.
+  media_kit_libs_video: ^1.0.4 # Native video dependencies.
 
   openapi:
     path: openapi
@@ -76,7 +79,7 @@ dev_dependencies:
   flutter_lints: ^2.0.1
   build_runner: ^2.2.1
   auto_route_generator: ^5.0.2
-  flutter_launcher_icons: "^0.9.2"
+  flutter_launcher_icons: "^0.13.1"
   flutter_native_splash: ^2.2.16
   isar_generator: *isar_version
   mockito: ^5.3.2

server/immich-openapi-specs.json

@@ -678,7 +678,7 @@
     },
     "/api-key": {
       "get": {
-        "operationId": "getApiKeys",
+        "operationId": "getKeys",
         "parameters": [],
         "responses": {
           "200": {
@@ -711,7 +711,7 @@
         ]
       },
       "post": {
-        "operationId": "createApiKey",
+        "operationId": "createKey",
         "parameters": [],
         "requestBody": {
           "content": {
@@ -753,7 +753,7 @@
     },
     "/api-key/{id}": {
       "delete": {
-        "operationId": "deleteApiKey",
+        "operationId": "deleteKey",
         "parameters": [
           {
             "name": "id",
@@ -786,7 +786,7 @@
         ]
       },
       "get": {
-        "operationId": "getApiKey",
+        "operationId": "getKey",
         "parameters": [
           {
             "name": "id",
@@ -826,7 +826,7 @@
         ]
       },
       "put": {
-        "operationId": "updateApiKey",
+        "operationId": "updateKey",
         "parameters": [
           {
             "name": "id",
@@ -914,22 +914,6 @@
         "description": "Get all AssetEntity belong to the user",
         "operationId": "getAllAssets",
         "parameters": [
-          {
-            "name": "skip",
-            "required": false,
-            "in": "query",
-            "schema": {
-              "type": "integer"
-            }
-          },
-          {
-            "name": "take",
-            "required": false,
-            "in": "query",
-            "schema": {
-              "type": "integer"
-            }
-          },
           {
             "name": "userId",
             "required": false,
@@ -956,16 +940,15 @@
             }
           },
           {
-            "name": "updatedAfter",
+            "name": "skip",
             "required": false,
             "in": "query",
             "schema": {
-              "format": "date-time",
+              "type": "number"
-              "type": "string"
             }
           },
           {
-            "name": "updatedBefore",
+            "name": "updatedAfter",
             "required": false,
             "in": "query",
             "schema": {
@@ -1101,7 +1084,7 @@
     "/asset/bulk-upload-check": {
       "post": {
         "description": "Checks if assets exist by checksums",
-        "operationId": "checkBulkUpload",
+        "operationId": "bulkUploadCheck",
         "parameters": [],
         "requestBody": {
           "content": {
@@ -1872,7 +1855,7 @@
     },
     "/asset/statistics": {
       "get": {
-        "operationId": "getAssetStatistics",
+        "operationId": "getAssetStats",
         "parameters": [
           {
             "name": "isArchived",
@@ -1994,7 +1977,7 @@
     },
     "/asset/time-bucket": {
       "get": {
-        "operationId": "getTimeBucket",
+        "operationId": "getByTimeBucket",
         "parameters": [
           {
             "name": "size",
@@ -2613,7 +2596,7 @@
     },
     "/auth/admin-sign-up": {
       "post": {
-        "operationId": "signUpAdmin",
+        "operationId": "adminSignUp",
         "parameters": [],
         "requestBody": {
           "content": {
@@ -2960,7 +2943,7 @@
     },
     "/library": {
       "get": {
-        "operationId": "getLibraries",
+        "operationId": "getAllForUser",
         "parameters": [],
         "responses": {
           "200": {
@@ -3282,7 +3265,7 @@
     },
     "/oauth/authorize": {
       "post": {
-        "operationId": "startOAuth",
+        "operationId": "authorizeOAuth",
         "parameters": [],
         "requestBody": {
           "content": {
@@ -3313,7 +3296,7 @@
     },
     "/oauth/callback": {
       "post": {
-        "operationId": "finishOAuth",
+        "operationId": "callback",
         "parameters": [],
         "requestBody": {
           "content": {
@@ -3346,7 +3329,7 @@
       "post": {
         "deprecated": true,
         "description": "@deprecated use feature flags and /oauth/authorize",
-        "operationId": "generateOAuthConfig",
+        "operationId": "generateConfig",
         "parameters": [],
         "requestBody": {
           "content": {
@@ -3377,7 +3360,7 @@
     },
     "/oauth/link": {
       "post": {
-        "operationId": "linkOAuthAccount",
+        "operationId": "link",
         "parameters": [],
         "requestBody": {
           "content": {
@@ -3419,7 +3402,7 @@
     },
     "/oauth/mobile-redirect": {
       "get": {
-        "operationId": "redirectOAuthToMobile",
+        "operationId": "mobileRedirect",
         "parameters": [],
         "responses": {
           "200": {
@@ -3433,7 +3416,7 @@
     },
     "/oauth/unlink": {
       "post": {
-        "operationId": "unlinkOAuthAccount",
+        "operationId": "unlink",
         "parameters": [],
         "responses": {
           "201": {
@@ -4324,9 +4307,9 @@
         ]
       }
     },
-    "/server-info/statistics": {
+    "/server-info/stats": {
       "get": {
-        "operationId": "getServerStatistics",
+        "operationId": "getStats",
         "parameters": [],
         "responses": {
           "200": {
@@ -4854,7 +4837,7 @@
     },
     "/system-config/defaults": {
       "get": {
-        "operationId": "getConfigDefaults",
+        "operationId": "getDefaults",
         "parameters": [],
         "responses": {
           "200": {
@@ -5638,7 +5621,7 @@
   "info": {
     "title": "Immich",
     "description": "Immich API",
-    "version": "1.85.0",
+    "version": "1.84.0",
     "contact": {}
   },
   "tags": [],
@@ -5894,9 +5877,6 @@
           "id": {
             "type": "string"
           },
-          "isActivityEnabled": {
-            "type": "boolean"
-          },
           "lastModifiedAssetTimestamp": {
             "format": "date-time",
             "type": "string"
@@ -5938,8 +5918,7 @@
           "sharedUsers",
           "hasSharedLink",
           "assets",
-          "owner",
+          "owner"
-          "isActivityEnabled"
         ],
         "type": "object"
       },
@@ -6676,7 +6655,8 @@
           "deviceAssetId",
           "deviceId",
           "fileCreatedAt",
-          "fileModifiedAt"
+          "fileModifiedAt",
+          "isFavorite"
         ],
         "type": "object"
       },
@@ -7163,7 +7143,8 @@
           "deviceAssetId",
           "deviceId",
           "fileCreatedAt",
-          "fileModifiedAt"
+          "fileModifiedAt",
+          "isFavorite"
         ],
         "type": "object"
       },
@@ -8914,9 +8895,6 @@
           },
           "description": {
             "type": "string"
-          },
-          "isActivityEnabled": {
-            "type": "boolean"
           }
         },
         "type": "object"