chore: version v1.137.3

fix: migration if media location is set (#20532 )
fix: guard IS_FAVORITE column with SDK check (#20511 )
2025-08-01 14:52:24 +00:00 · 2025-08-01 14:49:51 +00:00 · 2025-08-01 05:39:59 -05:00 · 2025-08-01 05:38:52 -05:00 · 2025-08-01 02:45:16 +00:00 · 2025-07-31 21:29:01 -05:00
53 changed files with 839 additions and 238 deletions
--- a/cli/package-lock.json
+++ b/cli/package-lock.json
@@ -1,12 +1,12 @@
 {
  "name": "@immich/cli",
-  "version": "2.2.73",
+  "version": "2.2.77",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "@immich/cli",
-      "version": "2.2.73",
+      "version": "2.2.77",
      "license": "GNU Affero General Public License version 3",
      "dependencies": {
        "chokidar": "^4.0.3",
@@ -54,7 +54,7 @@
    },
    "../open-api/typescript-sdk": {
      "name": "@immich/sdk",
-      "version": "1.136.0",
+      "version": "1.137.3",
      "dev": true,
      "license": "GNU Affero General Public License version 3",
      "dependencies": {
--- a/cli/package.json
+++ b/cli/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@immich/cli",
-  "version": "2.2.73",
+  "version": "2.2.77",
  "description": "Command Line Interface (CLI) for Immich",
  "type": "module",
  "exports": "./dist/index.js",
--- a/docs/docs/administration/oauth.md
+++ b/docs/docs/administration/oauth.md
@@ -64,7 +64,7 @@ Once you have a new OAuth client application configured, Immich can be configure
 | Storage Label Claim                                  | string  | preferred_username   | Claim mapping for the user's storage label**¹**                                     |
 | Role Claim                                           | string  | immich_role          | Claim mapping for the user's role. (should return "user" or "admin")**¹**           |
 | Storage Quota Claim                                  | string  | immich_quota         | Claim mapping for the user's storage**¹**                                           |
-| Default Storage Quota (GiB)                          | number  | 0                    | Default quota for user without storage quota claim (Enter 0 for unlimited quota)    |
+| Default Storage Quota (GiB)                          | number  | 0                    | Default quota for user without storage quota claim (empty for unlimited quota)      |
 | Button Text                                          | string  | Login with OAuth     | Text for the OAuth button on the web                                                |
 | Auto Register                                        | boolean | true                 | When true, will automatically register a user the first time they sign in           |
 | [Auto Launch](#auto-launch)                          | boolean | false                | When true, will skip the login page and automatically start the OAuth login process |
@@ -106,6 +106,89 @@ Immich has a route (`/api/oauth/mobile-redirect`) that is already configured to

 ## Example Configuration

+<details>
+<summary>Authelia Example</summary>
+
+### Authelia Example
+
+Here's an example of OAuth configured for Authelia:
+
+This assumes there exist an attribute `immichquota` in the user schema, which is used to set the user's storage quota in Immich.
+The configuration concerning the quota is optional.
+
+```yaml
+authentication_backend:
+  ldap:
+    # The LDAP server configuration goes here.
+    # See: https://www.authelia.com/c/ldap
+    attributes:
+      extra:
+        immichquota: # The attribute name from LDAP
+          name: 'immich_quota'
+          multi_valued: false
+          value_type: 'integer'
+identity_providers:
+  oidc:
+    ## The other portions of the mandatory OpenID Connect 1.0 configuration go here.
+    ## See: https://www.authelia.com/c/oidc
+    claims_policies:
+      immich_policy:
+        custom_claims:
+          immich_quota:
+            attribute: 'immich_quota'
+    scopes:
+      immich_scope:
+        claims:
+          - 'immich_quota'
+
+    clients:
+      - client_id: 'immich'
+        client_name: 'Immich'
+        # https://www.authelia.com/integration/openid-connect/frequently-asked-questions/#how-do-i-generate-a-client-identifier-or-client-secret
+        client_secret: $pbkdf2-sha512$310000$c8p78n7pUMln0jzvd4aK4Q$JNRBzwAo0ek5qKn50cFzzvE9RXV88h1wJn5KGiHrD0YKtZaR/nCb2CJPOsKaPK0hjf.9yHxzQGZziziccp6Yng'
+        public: false
+        require_pkce: false
+        redirect_uris:
+          - 'https://example.immich.app/auth/login'
+          - 'https://example.immich.app/user-settings'
+          - 'app.immich:///oauth-callback'
+        scopes:
+          - 'openid'
+          - 'profile'
+          - 'email'
+          - 'immich_scope'
+        claims_policy: 'immich_policy'
+        response_types:
+          - 'code'
+        grant_types:
+          - 'authorization_code'
+        id_token_signed_response_alg: 'RS256'
+        userinfo_signed_response_alg: 'RS256'
+        token_endpoint_auth_method: 'client_secret_post'
+```
+
+Configuration of OAuth in Immich System Settings
+
+| Setting                            | Value                                                               |
+| ---------------------------------- | ------------------------------------------------------------------- |
+| Issuer URL                         | `https://example.immich.app/.well-known/openid-configuration`       |
+| Client ID                          | immich                                                              |
+| Client Secret                      | 0v89FXkQOWO\***\*\*\*\*\***\*\*\***\*\*\*\*\***mprbvXD549HH6s1iw... |
+| Token Endpoint Auth Method         | client_secret_post                                                  |
+| Scope                              | openid email profile immich_scope                                   |
+| ID Token Signed Response Algorithm | RS256                                                               |
+| Userinfo Signed Response Algorithm | RS256                                                               |
+| Storage Label Claim                | uid                                                                 |
+| Storage Quota Claim                | immich_quota                                                        |
+| Default Storage Quota (GiB)        | 0 (empty for unlimited quota)                                       |
+| Button Text                        | Sign in with Authelia (optional)                                    |
+| Auto Register                      | Enabled (optional)                                                  |
+| Auto Launch                        | Enabled (optional)                                                  |
+| Mobile Redirect URI Override       | Disable                                                             |
+| Mobile Redirect URI                |                                                                     |
+
+</details>
+
 <details>
 <summary>Authentik Example</summary>

@@ -128,7 +211,7 @@ Configuration of OAuth in Immich System Settings
 | Signing Algorithm            | RS256                                                                              |
 | Storage Label Claim          | preferred_username                                                                 |
 | Storage Quota Claim          | immich_quota                                                                       |
-| Default Storage Quota (GiB)  | 0 (0 for unlimited quota)                                                          |
+| Default Storage Quota (GiB)  | 0 (empty for unlimited quota)                                                      |
 | Button Text                  | Sign in with Authentik (optional)                                                  |
 | Auto Register                | Enabled (optional)                                                                 |
 | Auto Launch                  | Enabled (optional)                                                                 |
@@ -159,7 +242,7 @@ Configuration of OAuth in Immich System Settings
 | Signing Algorithm            | RS256                                                                        |
 | Storage Label Claim          | preferred_username                                                           |
 | Storage Quota Claim          | immich_quota                                                                 |
-| Default Storage Quota (GiB)  | 0 (0 for unlimited quota)                                                    |
+| Default Storage Quota (GiB)  | 0 (empty for unlimited quota)                                                |
 | Button Text                  | Sign in with Google (optional)                                               |
 | Auto Register                | Enabled (optional)                                                           |
 | Auto Launch                  | Enabled                                                                      |
--- a/docs/static/archived-versions.json
+++ b/docs/static/archived-versions.json
@@ -1,4 +1,20 @@
 [
+  {
+    "label": "v1.137.3",
+    "url": "https://v1.137.3.archive.immich.app"
+  },
+  {
+    "label": "v1.137.2",
+    "url": "https://v1.137.2.archive.immich.app"
+  },
+  {
+    "label": "v1.137.1",
+    "url": "https://v1.137.1.archive.immich.app"
+  },
+  {
+    "label": "v1.137.0",
+    "url": "https://v1.137.0.archive.immich.app"
+  },
  {
    "label": "v1.136.0",
    "url": "https://v1.136.0.archive.immich.app"
--- a/e2e/package-lock.json
+++ b/e2e/package-lock.json
@@ -1,12 +1,12 @@
 {
  "name": "immich-e2e",
-  "version": "1.136.0",
+  "version": "1.137.3",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "immich-e2e",
-      "version": "1.136.0",
+      "version": "1.137.3",
      "license": "GNU Affero General Public License version 3",
      "devDependencies": {
        "@eslint/eslintrc": "^3.1.0",
@@ -46,7 +46,7 @@
    },
    "../cli": {
      "name": "@immich/cli",
-      "version": "2.2.73",
+      "version": "2.2.77",
      "dev": true,
      "license": "GNU Affero General Public License version 3",
      "dependencies": {
@@ -95,7 +95,7 @@
    },
    "../open-api/typescript-sdk": {
      "name": "@immich/sdk",
-      "version": "1.136.0",
+      "version": "1.137.3",
      "dev": true,
      "license": "GNU Affero General Public License version 3",
      "dependencies": {
--- a/e2e/package.json
+++ b/e2e/package.json
@@ -1,6 +1,6 @@
 {
  "name": "immich-e2e",
-  "version": "1.136.0",
+  "version": "1.137.3",
  "description": "",
  "main": "index.js",
  "type": "module",
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -653,6 +653,7 @@
  "clear": "Clear",
  "clear_all": "Clear all",
  "clear_all_recent_searches": "Clear all recent searches",
+  "clear_file_cache": "Clear File Cache",
  "clear_message": "Clear message",
  "clear_value": "Clear value",
  "client_cert_dialog_msg_confirm": "OK",
@@ -834,6 +835,7 @@
  "edit_birthday": "Edit Birthday",
  "edit_date": "Edit date",
  "edit_date_and_time": "Edit date and time",
+  "edit_date_and_time_action_prompt": "{count} date and time edited",
  "edit_description": "Edit description",
  "edit_description_prompt": "Please select a new description:",
  "edit_exclusion_pattern": "Edit exclusion pattern",
--- a/mobile/android/app/src/main/kotlin/app/alextran/immich/sync/MessagesImplBase.kt
+++ b/mobile/android/app/src/main/kotlin/app/alextran/immich/sync/MessagesImplBase.kt
@@ -29,21 +29,24 @@ open class NativeSyncApiImplBase(context: Context) {
      MediaStore.Files.FileColumns.MEDIA_TYPE_VIDEO.toString()
    )
    const val BUCKET_SELECTION = "(${MediaStore.Files.FileColumns.BUCKET_ID} = ?)"
-    val ASSET_PROJECTION = arrayOf(
-      MediaStore.MediaColumns._ID,
-      MediaStore.MediaColumns.DATA,
-      MediaStore.MediaColumns.DISPLAY_NAME,
-      MediaStore.MediaColumns.DATE_TAKEN,
-      MediaStore.MediaColumns.DATE_ADDED,
-      MediaStore.MediaColumns.DATE_MODIFIED,
-      MediaStore.Files.FileColumns.MEDIA_TYPE,
-      MediaStore.MediaColumns.BUCKET_ID,
-      MediaStore.MediaColumns.WIDTH,
-      MediaStore.MediaColumns.HEIGHT,
-      MediaStore.MediaColumns.DURATION,
-      MediaStore.MediaColumns.ORIENTATION,
-      MediaStore.MediaColumns.IS_FAVORITE,
-    )
+    val ASSET_PROJECTION = buildList {
+      add(MediaStore.MediaColumns._ID)
+      add(MediaStore.MediaColumns.DATA)
+      add(MediaStore.MediaColumns.DISPLAY_NAME)
+      add(MediaStore.MediaColumns.DATE_TAKEN)
+      add(MediaStore.MediaColumns.DATE_ADDED)
+      add(MediaStore.MediaColumns.DATE_MODIFIED)
+      add(MediaStore.Files.FileColumns.MEDIA_TYPE)
+      add(MediaStore.MediaColumns.BUCKET_ID)
+      add(MediaStore.MediaColumns.WIDTH)
+      add(MediaStore.MediaColumns.HEIGHT)
+      add(MediaStore.MediaColumns.DURATION)
+      add(MediaStore.MediaColumns.ORIENTATION)
+      // IS_FAVORITE is only available on Android 11 and above
+      if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.R) {
+        add(MediaStore.MediaColumns.IS_FAVORITE)
+      }
+    }.toTypedArray()

    const val HASH_BUFFER_SIZE = 2 * 1024 * 1024
  }
@@ -78,7 +81,7 @@ open class NativeSyncApiImplBase(context: Context) {
        val durationColumn = c.getColumnIndexOrThrow(MediaStore.MediaColumns.DURATION)
        val orientationColumn =
          c.getColumnIndexOrThrow(MediaStore.MediaColumns.ORIENTATION)
-        val favoriteColumn = c.getColumnIndexOrThrow(MediaStore.MediaColumns.IS_FAVORITE)
+        val favoriteColumn = c.getColumnIndex(MediaStore.MediaColumns.IS_FAVORITE)

        while (c.moveToNext()) {
          val id = c.getLong(idColumn).toString()
@@ -107,7 +110,7 @@ open class NativeSyncApiImplBase(context: Context) {
          else c.getLong(durationColumn) / 1000
          val bucketId = c.getString(bucketIdColumn)
          val orientation = c.getInt(orientationColumn)
-          val isFavorite = c.getInt(favoriteColumn) != 0;
+          val isFavorite = if (favoriteColumn == -1) false else c.getInt(favoriteColumn) != 0

          val asset = PlatformAsset(
            id,
--- a/mobile/android/fastlane/Fastfile
+++ b/mobile/android/fastlane/Fastfile
@@ -35,8 +35,8 @@ platform :android do
      task: 'bundle', 
      build_type: 'Release',
      properties: {
-        "android.injected.version.code" => 205,
-        "android.injected.version.name" => "1.136.0",
+        "android.injected.version.code" => 3002,
+        "android.injected.version.name" => "1.137.3",
      }
    )
    upload_to_play_store(skip_upload_apk: true, skip_upload_images: true, skip_upload_screenshots: true, aab: '../build/app/outputs/bundle/release/app-release.aab')
--- a/mobile/ios/Runner.xcodeproj/project.pbxproj
+++ b/mobile/ios/Runner.xcodeproj/project.pbxproj
@@ -649,7 +649,7 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/RunnerProfile.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 210;
+				CURRENT_PROJECT_VERSION = 213;
 				CUSTOM_GROUP_ID = group.app.immich.share;
 				DEVELOPMENT_TEAM = 2F67MQ8R79;
 				ENABLE_BITCODE = NO;
@@ -793,7 +793,7 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 210;
+				CURRENT_PROJECT_VERSION = 213;
 				CUSTOM_GROUP_ID = group.app.immich.share;
 				DEVELOPMENT_TEAM = 2F67MQ8R79;
 				ENABLE_BITCODE = NO;
@@ -823,7 +823,7 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 210;
+				CURRENT_PROJECT_VERSION = 213;
 				CUSTOM_GROUP_ID = group.app.immich.share;
 				DEVELOPMENT_TEAM = 2F67MQ8R79;
 				ENABLE_BITCODE = NO;
@@ -857,7 +857,7 @@
 				CODE_SIGN_ENTITLEMENTS = WidgetExtension/WidgetExtension.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 210;
+				CURRENT_PROJECT_VERSION = 213;
 				DEVELOPMENT_TEAM = 2F67MQ8R79;
 				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu17;
@@ -900,7 +900,7 @@
 				CODE_SIGN_ENTITLEMENTS = WidgetExtension/WidgetExtension.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 210;
+				CURRENT_PROJECT_VERSION = 213;
 				DEVELOPMENT_TEAM = 2F67MQ8R79;
 				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu17;
@@ -940,7 +940,7 @@
 				CODE_SIGN_ENTITLEMENTS = WidgetExtension/WidgetExtension.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 210;
+				CURRENT_PROJECT_VERSION = 213;
 				DEVELOPMENT_TEAM = 2F67MQ8R79;
 				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu17;
@@ -979,7 +979,7 @@
 				CODE_SIGN_ENTITLEMENTS = ShareExtension/ShareExtension.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 210;
+				CURRENT_PROJECT_VERSION = 213;
 				CUSTOM_GROUP_ID = group.app.immich.share;
 				DEVELOPMENT_TEAM = 2F67MQ8R79;
 				ENABLE_USER_SCRIPT_SANDBOXING = YES;
@@ -1023,7 +1023,7 @@
 				CODE_SIGN_ENTITLEMENTS = ShareExtension/ShareExtension.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 210;
+				CURRENT_PROJECT_VERSION = 213;
 				CUSTOM_GROUP_ID = group.app.immich.share;
 				DEVELOPMENT_TEAM = 2F67MQ8R79;
 				ENABLE_USER_SCRIPT_SANDBOXING = YES;
@@ -1064,7 +1064,7 @@
 				CODE_SIGN_ENTITLEMENTS = ShareExtension/ShareExtension.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 210;
+				CURRENT_PROJECT_VERSION = 213;
 				CUSTOM_GROUP_ID = group.app.immich.share;
 				DEVELOPMENT_TEAM = 2F67MQ8R79;
 				ENABLE_USER_SCRIPT_SANDBOXING = YES;
--- a/mobile/ios/Runner/Info.plist
+++ b/mobile/ios/Runner/Info.plist
@@ -78,7 +78,7 @@
    <key>CFBundlePackageType</key>
    <string>APPL</string>
    <key>CFBundleShortVersionString</key>
-    <string>1.135.1</string>
+    <string>1.137.2</string>
    <key>CFBundleSignature</key>
    <string>????</string>
    <key>CFBundleURLTypes</key>
@@ -105,7 +105,7 @@
      </dict>
    </array>
    <key>CFBundleVersion</key>
-    <string>210</string>
+    <string>213</string>
    <key>FLTEnableImpeller</key>
    <true />
    <key>ITSAppUsesNonExemptEncryption</key>
--- a/mobile/ios/fastlane/Fastfile
+++ b/mobile/ios/fastlane/Fastfile
@@ -22,7 +22,7 @@ platform :ios do
      path: "./Runner.xcodeproj",
    )
    increment_version_number(
-      version_number: "1.136.0"
+      version_number: "1.137.3"
    )
    increment_build_number(
      build_number: latest_testflight_build_number + 1,
--- a/mobile/lib/domain/services/hash.service.dart
+++ b/mobile/lib/domain/services/hash.service.dart
@@ -104,6 +104,7 @@ class HashService {
    DLog.log("Hashed ${hashed.length}/${toHash.length} assets");

    await _localAssetRepository.updateHashes(hashed);
+    await _storageRepository.clearCache();
  }
 }

--- a/mobile/lib/infrastructure/repositories/remote_asset.repository.dart
+++ b/mobile/lib/infrastructure/repositories/remote_asset.repository.dart
@@ -186,6 +186,23 @@ class RemoteAssetRepository extends DriftDatabaseRepository {
    });
  }

+  Future<void> updateDateTime(List<String> ids, DateTime dateTime) {
+    return _db.batch((batch) async {
+      for (final id in ids) {
+        batch.update(
+          _db.remoteExifEntity,
+          RemoteExifEntityCompanion(dateTimeOriginal: Value(dateTime)),
+          where: (e) => e.assetId.equals(id),
+        );
+        batch.update(
+          _db.remoteAssetEntity,
+          RemoteAssetEntityCompanion(createdAt: Value(dateTime)),
+          where: (e) => e.id.equals(id),
+        );
+      }
+    });
+  }
+
  Future<void> stack(String userId, StackResponse stack) {
    return _db.transaction(() async {
      final stackIds = await _db.managers.stackEntity
--- a/mobile/lib/infrastructure/repositories/storage.repository.dart
+++ b/mobile/lib/infrastructure/repositories/storage.repository.dart
@@ -66,4 +66,14 @@ class StorageRepository {
    }
    return entity;
  }
+
+  Future<void> clearCache() async {
+    final log = Logger('StorageRepository');
+
+    try {
+      await PhotoManager.clearFileCache();
+    } catch (error, stackTrace) {
+      log.warning("Error clearing cache", error, stackTrace);
+    }
+  }
 }
--- a/mobile/lib/pages/backup/drift_backup_album_selection.page.dart
+++ b/mobile/lib/pages/backup/drift_backup_album_selection.page.dart
@@ -6,7 +6,6 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/album/local_album.model.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
-import 'package:immich_mobile/providers/album/album.provider.dart';
 import 'package:immich_mobile/providers/app_settings.provider.dart';
 import 'package:immich_mobile/providers/backup/backup_album.provider.dart';
 import 'package:immich_mobile/providers/backup/drift_backup.provider.dart';
@@ -14,7 +13,6 @@ import 'package:immich_mobile/providers/user.provider.dart';
 import 'package:immich_mobile/services/app_settings.service.dart';
 import 'package:immich_mobile/widgets/backup/drift_album_info_list_tile.dart';
 import 'package:immich_mobile/widgets/common/search_field.dart';
-import 'package:immich_mobile/widgets/settings/settings_switch_list_tile.dart';

@RoutePage()
 class DriftBackupAlbumSelectionPage extends ConsumerStatefulWidget {
@@ -67,14 +65,14 @@ class _DriftBackupAlbumSelectionPageState extends ConsumerState<DriftBackupAlbum
    final selectedBackupAlbums = albums.where((album) => album.backupSelection == BackupSelection.selected).toList();
    final excludedBackupAlbums = albums.where((album) => album.backupSelection == BackupSelection.excluded).toList();

-    handleSyncAlbumToggle(bool isEnable) async {
-      if (isEnable) {
-        await ref.read(albumProvider.notifier).refreshRemoteAlbums();
-        for (final album in selectedBackupAlbums) {
-          await ref.read(albumProvider.notifier).createSyncAlbum(album.name);
-        }
-      }
-    }
+    // handleSyncAlbumToggle(bool isEnable) async {
+    //   if (isEnable) {
+    //     await ref.read(albumProvider.notifier).refreshRemoteAlbums();
+    //     for (final album in selectedBackupAlbums) {
+    //       await ref.read(albumProvider.notifier).createSyncAlbum(album.name);
+    //     }
+    //   }
+    // }

    return PopScope(
      onPopInvokedWithResult: (didPop, result) async {
@@ -167,16 +165,15 @@ class _DriftBackupAlbumSelectionPageState extends ConsumerState<DriftBackupAlbum
                    ),
                  ),

-                  SettingsSwitchListTile(
-                    valueNotifier: _enableSyncUploadAlbum,
-                    title: "sync_albums".t(context: context),
-                    subtitle: "sync_upload_album_setting_subtitle".t(context: context),
-                    contentPadding: const EdgeInsets.symmetric(horizontal: 16),
-                    titleStyle: context.textTheme.bodyLarge?.copyWith(fontWeight: FontWeight.bold),
-                    subtitleStyle: context.textTheme.labelLarge?.copyWith(color: context.colorScheme.primary),
-                    onChanged: handleSyncAlbumToggle,
-                  ),
-
+                  // SettingsSwitchListTile(
+                  //   valueNotifier: _enableSyncUploadAlbum,
+                  //   title: "sync_albums".t(context: context),
+                  //   subtitle: "sync_upload_album_setting_subtitle".t(context: context),
+                  //   contentPadding: const EdgeInsets.symmetric(horizontal: 16),
+                  //   titleStyle: context.textTheme.bodyLarge?.copyWith(fontWeight: FontWeight.bold),
+                  //   subtitleStyle: context.textTheme.labelLarge?.copyWith(color: context.colorScheme.primary),
+                  //   onChanged: handleSyncAlbumToggle,
+                  // ),
                  ListTile(
                    title: Text(
                      "albums_on_device_count".t(context: context, args: {'count': albumCount.toString()}),
--- a/mobile/lib/presentation/pages/drift_remote_album.page.dart
+++ b/mobile/lib/presentation/pages/drift_remote_album.page.dart
@@ -28,13 +28,15 @@ class RemoteAlbumPage extends ConsumerStatefulWidget {
 }

 class _RemoteAlbumPageState extends ConsumerState<RemoteAlbumPage> {
+  late RemoteAlbum _album;
  @override
  void initState() {
    super.initState();
+    _album = widget.album;
  }

  Future<void> addAssets(BuildContext context) async {
-    final albumAssets = await ref.read(remoteAlbumProvider.notifier).getAssets(widget.album.id);
+    final albumAssets = await ref.read(remoteAlbumProvider.notifier).getAssets(_album.id);

    final newAssets = await context.pushRoute<Set<BaseAsset>>(
      DriftAssetSelectionTimelineRoute(lockedSelectionAssets: albumAssets.toSet()),
@@ -47,7 +49,7 @@ class _RemoteAlbumPageState extends ConsumerState<RemoteAlbumPage> {
    final added = await ref
        .read(remoteAlbumProvider.notifier)
        .addAssets(
-          widget.album.id,
+          _album.id,
          newAssets.map((asset) {
            final remoteAsset = asset as RemoteAsset;
            return remoteAsset.id;
@@ -64,14 +66,14 @@ class _RemoteAlbumPageState extends ConsumerState<RemoteAlbumPage> {
  }

  Future<void> addUsers(BuildContext context) async {
-    final newUsers = await context.pushRoute<List<String>>(DriftUserSelectionRoute(album: widget.album));
+    final newUsers = await context.pushRoute<List<String>>(DriftUserSelectionRoute(album: _album));

    if (newUsers == null || newUsers.isEmpty) {
      return;
    }

    try {
-      await ref.read(remoteAlbumProvider.notifier).addUsers(widget.album.id, newUsers);
+      await ref.read(remoteAlbumProvider.notifier).addUsers(_album.id, newUsers);

      if (newUsers.isNotEmpty) {
        ImmichToast.show(
@@ -81,7 +83,7 @@ class _RemoteAlbumPageState extends ConsumerState<RemoteAlbumPage> {
        );
      }

-      ref.invalidate(remoteAlbumSharedUsersProvider(widget.album.id));
+      ref.invalidate(remoteAlbumSharedUsersProvider(_album.id));
    } catch (e) {
      ImmichToast.show(
        context: context,
@@ -92,7 +94,7 @@ class _RemoteAlbumPageState extends ConsumerState<RemoteAlbumPage> {
  }

  Future<void> toggleAlbumOrder() async {
-    await ref.read(remoteAlbumProvider.notifier).toggleAlbumOrder(widget.album.id);
+    await ref.read(remoteAlbumProvider.notifier).toggleAlbumOrder(_album.id);

    ref.invalidate(timelineServiceProvider);
  }
@@ -106,7 +108,7 @@ class _RemoteAlbumPageState extends ConsumerState<RemoteAlbumPage> {
          content: Column(
            mainAxisSize: MainAxisSize.min,
            children: [
-              Text('album_delete_confirmation'.t(context: context, args: {'album': widget.album.name})),
+              Text('album_delete_confirmation'.t(context: context, args: {'album': _album.name})),
              const SizedBox(height: 8),
              Text('album_delete_confirmation_description'.t(context: context)),
            ],
@@ -128,7 +130,7 @@ class _RemoteAlbumPageState extends ConsumerState<RemoteAlbumPage> {

    if (confirmed == true) {
      try {
-        await ref.read(remoteAlbumProvider.notifier).deleteAlbum(widget.album.id);
+        await ref.read(remoteAlbumProvider.notifier).deleteAlbum(_album.id);

        ImmichToast.show(
          context: context,
@@ -151,17 +153,20 @@ class _RemoteAlbumPageState extends ConsumerState<RemoteAlbumPage> {
    final result = await showDialog<_EditAlbumData?>(
      context: context,
      barrierDismissible: true,
-      builder: (context) => _EditAlbumDialog(album: widget.album),
+      builder: (context) => _EditAlbumDialog(album: _album),
    );

    if (result != null && context.mounted) {
+      setState(() {
+        _album = _album.copyWith(name: result.name, description: result.description ?? '');
+      });
      HapticFeedback.mediumImpact();
    }
  }

  void showOptionSheet(BuildContext context) {
    final user = ref.watch(currentUserProvider);
-    final isOwner = user != null ? user.id == widget.album.ownerId : false;
+    final isOwner = user != null ? user.id == _album.ownerId : false;

    showModalBottomSheet(
      context: context,
@@ -205,7 +210,7 @@ class _RemoteAlbumPageState extends ConsumerState<RemoteAlbumPage> {
    return ProviderScope(
      overrides: [
        timelineServiceProvider.overrideWith((ref) {
-          final timelineService = ref.watch(timelineFactoryProvider).remoteAlbum(albumId: widget.album.id);
+          final timelineService = ref.watch(timelineFactoryProvider).remoteAlbum(albumId: _album.id);
          ref.onDispose(timelineService.dispose);
          return timelineService;
        }),
@@ -217,7 +222,7 @@ class _RemoteAlbumPageState extends ConsumerState<RemoteAlbumPage> {
          onToggleAlbumOrder: () => toggleAlbumOrder(),
          onEditTitle: () => showEditTitleAndDescription(context),
        ),
-        bottomSheet: RemoteAlbumBottomSheet(album: widget.album),
+        bottomSheet: RemoteAlbumBottomSheet(album: _album),
      ),
    );
  }
--- a/mobile/lib/presentation/widgets/action_buttons/edit_date_time_action_button.widget.dart
+++ b/mobile/lib/presentation/widgets/action_buttons/edit_date_time_action_button.widget.dart
@@ -1,10 +1,44 @@
 import 'package:flutter/material.dart';
+import 'package:fluttertoast/fluttertoast.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.dart';
+import 'package:immich_mobile/providers/infrastructure/action.provider.dart';
+import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
+import 'package:immich_mobile/widgets/common/immich_toast.dart';

 class EditDateTimeActionButton extends ConsumerWidget {
-  const EditDateTimeActionButton({super.key});
+  final ActionSource source;
+
+  const EditDateTimeActionButton({super.key, required this.source});
+
+  _onTap(BuildContext context, WidgetRef ref) async {
+    if (!context.mounted) {
+      return;
+    }
+
+    final result = await ref.read(actionProvider.notifier).editDateTime(source, context);
+    if (result == null) {
+      return;
+    }
+
+    ref.read(multiSelectProvider.notifier).reset();
+
+    final successMessage = 'edit_date_and_time_action_prompt'.t(
+      context: context,
+      args: {'count': result.count.toString()},
+    );
+
+    if (context.mounted) {
+      ImmichToast.show(
+        context: context,
+        msg: result.success ? successMessage : 'scaffold_body_error_occurred'.t(context: context),
+        gravity: ToastGravity.BOTTOM,
+        toastType: result.success ? ToastType.success : ToastType.error,
+      );
+    }
+  }

  @override
  Widget build(BuildContext context, WidgetRef ref) {
@@ -12,6 +46,7 @@ class EditDateTimeActionButton extends ConsumerWidget {
      maxWidth: 95.0,
      iconData: Icons.edit_calendar_outlined,
      label: "control_bottom_app_bar_edit_time".t(context: context),
+      onPressed: () => _onTap(context, ref),
    );
  }
 }
--- a/mobile/lib/presentation/widgets/album/album_selector.widget.dart
+++ b/mobile/lib/presentation/widgets/album/album_selector.widget.dart
@@ -14,6 +14,7 @@ import 'package:immich_mobile/models/albums/album_search.model.dart';
 import 'package:immich_mobile/pages/common/large_leading_tile.dart';
 import 'package:immich_mobile/presentation/widgets/images/thumbnail.widget.dart';
 import 'package:immich_mobile/providers/infrastructure/album.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/current_album.provider.dart';
 import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
 import 'package:immich_mobile/providers/user.provider.dart';
 import 'package:immich_mobile/routing/router.dart';
@@ -578,6 +579,7 @@ class AddToAlbumHeader extends ConsumerWidget {
        return;
      }

+      ref.read(currentRemoteAlbumProvider.notifier).setAlbum(newAlbum);
      context.pushRoute(RemoteAlbumRoute(album: newAlbum));
    }

--- a/mobile/lib/presentation/widgets/asset_viewer/bottom_sheet.widget.dart
+++ b/mobile/lib/presentation/widgets/asset_viewer/bottom_sheet.widget.dart
@@ -143,12 +143,18 @@ class _AssetDetailBottomSheet extends ConsumerWidget {
    final exifInfo = ref.watch(currentAssetExifProvider).valueOrNull;
    final cameraTitle = _getCameraInfoTitle(exifInfo);

+    Future<void> editDateTime() async {
+      await ref.read(actionProvider.notifier).editDateTime(ActionSource.viewer, context);
+    }
+
    return SliverList.list(
      children: [
        // Asset Date and Time
        _SheetTile(
          title: _getDateTime(context, asset),
          titleStyle: context.textTheme.bodyMedium?.copyWith(fontWeight: FontWeight.w600),
+          trailing: asset.hasRemote ? const Icon(Icons.edit, size: 18) : null,
+          onTap: asset.hasRemote ? () async => await editDateTime() : null,
        ),
        if (exifInfo != null) _SheetAssetDescription(exif: exifInfo),
        const SheetPeopleDetails(),
@@ -194,11 +200,21 @@ class _AssetDetailBottomSheet extends ConsumerWidget {
 class _SheetTile extends StatelessWidget {
  final String title;
  final Widget? leading;
+  final Widget? trailing;
  final String? subtitle;
  final TextStyle? titleStyle;
  final TextStyle? subtitleStyle;
+  final VoidCallback? onTap;

-  const _SheetTile({required this.title, this.titleStyle, this.leading, this.subtitle, this.subtitleStyle});
+  const _SheetTile({
+    required this.title,
+    this.titleStyle,
+    this.leading,
+    this.subtitle,
+    this.subtitleStyle,
+    this.trailing,
+    this.onTap,
+  });

  @override
  Widget build(BuildContext context) {
@@ -234,8 +250,10 @@ class _SheetTile extends StatelessWidget {
      title: titleWidget,
      titleAlignment: ListTileTitleAlignment.center,
      leading: leading,
+      trailing: trailing,
      contentPadding: leading == null ? null : const EdgeInsets.only(left: 25),
      subtitle: subtitleWidget,
+      onTap: onTap,
    );
  }
 }
--- a/mobile/lib/presentation/widgets/asset_viewer/bottom_sheet/sheet_people_details.widget.dart
+++ b/mobile/lib/presentation/widgets/asset_viewer/bottom_sheet/sheet_people_details.widget.dart
@@ -79,7 +79,7 @@ class _SheetPeopleDetailsState extends ConsumerState<SheetPeopleDetails> {
                            context.back();
                            return;
                          }
-                          context.back();
+                          context.pop();
                          context.pushRoute(DriftPersonRoute(person: person));
                        },
                        onNameTap: () => showNameEditModal(person),
--- a/mobile/lib/presentation/widgets/bottom_sheet/archive_bottom_sheet.widget.dart
+++ b/mobile/lib/presentation/widgets/bottom_sheet/archive_bottom_sheet.widget.dart
@@ -40,7 +40,7 @@ class ArchiveBottomSheet extends ConsumerWidget {
          isTrashEnable
              ? const TrashActionButton(source: ActionSource.timeline)
              : const DeletePermanentActionButton(source: ActionSource.timeline),
-          const EditDateTimeActionButton(),
+          const EditDateTimeActionButton(source: ActionSource.timeline),
          const EditLocationActionButton(source: ActionSource.timeline),
          const MoveToLockFolderActionButton(source: ActionSource.timeline),
          const StackActionButton(source: ActionSource.timeline),
--- a/mobile/lib/presentation/widgets/bottom_sheet/favorite_bottom_sheet.widget.dart
+++ b/mobile/lib/presentation/widgets/bottom_sheet/favorite_bottom_sheet.widget.dart
@@ -40,7 +40,7 @@ class FavoriteBottomSheet extends ConsumerWidget {
          isTrashEnable
              ? const TrashActionButton(source: ActionSource.timeline)
              : const DeletePermanentActionButton(source: ActionSource.timeline),
-          const EditDateTimeActionButton(),
+          const EditDateTimeActionButton(source: ActionSource.timeline),
          const EditLocationActionButton(source: ActionSource.timeline),
          const MoveToLockFolderActionButton(source: ActionSource.timeline),
          const StackActionButton(source: ActionSource.timeline),
--- a/mobile/lib/presentation/widgets/bottom_sheet/general_bottom_sheet.widget.dart
+++ b/mobile/lib/presentation/widgets/bottom_sheet/general_bottom_sheet.widget.dart
@@ -76,7 +76,7 @@ class GeneralBottomSheet extends ConsumerWidget {
          if (multiselect.hasLocal || multiselect.hasMerged) ...[
            const DeleteLocalActionButton(source: ActionSource.timeline),
          ],
-          const EditDateTimeActionButton(),
+          const EditDateTimeActionButton(source: ActionSource.timeline),
          const EditLocationActionButton(source: ActionSource.timeline),
          const MoveToLockFolderActionButton(source: ActionSource.timeline),
          const StackActionButton(source: ActionSource.timeline),
--- a/mobile/lib/presentation/widgets/bottom_sheet/remote_album_bottom_sheet.widget.dart
+++ b/mobile/lib/presentation/widgets/bottom_sheet/remote_album_bottom_sheet.widget.dart
@@ -43,7 +43,7 @@ class RemoteAlbumBottomSheet extends ConsumerWidget {
          isTrashEnable
              ? const TrashActionButton(source: ActionSource.timeline)
              : const DeletePermanentActionButton(source: ActionSource.timeline),
-          const EditDateTimeActionButton(),
+          const EditDateTimeActionButton(source: ActionSource.timeline),
          const EditLocationActionButton(source: ActionSource.timeline),
          const MoveToLockFolderActionButton(source: ActionSource.timeline),
          const StackActionButton(source: ActionSource.timeline),
--- a/mobile/lib/presentation/widgets/timeline/fixed/segment.model.dart
+++ b/mobile/lib/presentation/widgets/timeline/fixed/segment.model.dart
@@ -1,7 +1,7 @@
 import 'dart:math' as math;

 import 'package:auto_route/auto_route.dart';
-import 'package:flutter/widgets.dart';
+import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/domain/services/timeline.service.dart';
@@ -11,6 +11,7 @@ import 'package:immich_mobile/presentation/widgets/timeline/header.widget.dart';
 import 'package:immich_mobile/presentation/widgets/timeline/segment.model.dart';
 import 'package:immich_mobile/presentation/widgets/timeline/segment_builder.dart';
 import 'package:immich_mobile/presentation/widgets/timeline/timeline.state.dart';
+import 'package:immich_mobile/presentation/widgets/timeline/timeline_drag_region.dart';
 import 'package:immich_mobile/providers/asset_viewer/is_motion_video_playing.provider.dart';
 import 'package:immich_mobile/providers/haptic_feedback.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
@@ -125,10 +126,14 @@ class _FixedSegmentRow extends ConsumerWidget {
      textDirection: Directionality.of(context),
      children: [
        for (int i = 0; i < assets.length; i++)
-          _AssetTileWidget(
-            key: ValueKey(Object.hash(assets[i].heroTag, assetIndex + i, timelineService.hashCode)),
-            asset: assets[i],
+          TimelineAssetIndexWrapper(
            assetIndex: assetIndex + i,
+            segmentIndex: 0, // For simplicity, using 0 for now
+            child: _AssetTileWidget(
+              key: ValueKey(Object.hash(assets[i].heroTag, assetIndex + i, timelineService.hashCode)),
+              asset: assets[i],
+              assetIndex: assetIndex + i,
+            ),
          ),
      ],
    );
--- a/mobile/lib/presentation/widgets/timeline/timeline.widget.dart
+++ b/mobile/lib/presentation/widgets/timeline/timeline.widget.dart
@@ -1,11 +1,14 @@
 import 'dart:async';
+import 'dart:collection';
 import 'dart:math' as math;

 import 'package:collection/collection.dart';
 import 'package:flutter/foundation.dart';
+import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/rendering.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/domain/models/setting.model.dart';
 import 'package:immich_mobile/domain/models/timeline.model.dart';
 import 'package:immich_mobile/domain/utils/event_stream.dart';
@@ -15,6 +18,7 @@ import 'package:immich_mobile/presentation/widgets/bottom_sheet/general_bottom_s
 import 'package:immich_mobile/presentation/widgets/timeline/scrubber.widget.dart';
 import 'package:immich_mobile/presentation/widgets/timeline/segment.model.dart';
 import 'package:immich_mobile/presentation/widgets/timeline/timeline.state.dart';
+import 'package:immich_mobile/presentation/widgets/timeline/timeline_drag_region.dart';
 import 'package:immich_mobile/providers/infrastructure/setting.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
 import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
@@ -88,10 +92,29 @@ class _SliverTimelineState extends ConsumerState<_SliverTimeline> {
  final _scrollController = ScrollController();
  StreamSubscription? _eventSubscription;

+  // Drag selection state
+  bool _dragging = false;
+  TimelineAssetIndex? _dragAnchorIndex;
+  final Set<BaseAsset> _draggedAssets = HashSet();
+  ScrollPhysics? _scrollPhysics;
+
+  int _perRow = 4;
+  double _scaleFactor = 3.0;
+  double _baseScaleFactor = 3.0;
+
  @override
  void initState() {
    super.initState();
    _eventSubscription = EventStream.shared.listen(_onEvent);
+
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      final currentTilesPerRow = ref.read(settingsProvider).get(Setting.tilesPerRow);
+      setState(() {
+        _perRow = currentTilesPerRow;
+        _scaleFactor = 7.0 - _perRow;
+        _baseScaleFactor = _scaleFactor;
+      });
+    });
  }

  void _onEvent(Event event) {
@@ -150,6 +173,71 @@ class _SliverTimelineState extends ConsumerState<_SliverTimeline> {
    });
  }

+  // Drag selection methods
+  void _setDragStartIndex(TimelineAssetIndex index) {
+    setState(() {
+      _scrollPhysics = const ClampingScrollPhysics();
+      _dragAnchorIndex = index;
+      _dragging = true;
+    });
+  }
+
+  void _stopDrag() {
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      // Update the physics post frame to prevent sudden change in physics on iOS.
+      setState(() {
+        _scrollPhysics = null;
+      });
+    });
+    setState(() {
+      _dragging = false;
+      _draggedAssets.clear();
+    });
+    // Reset the scrolling state after a small delay to allow bottom sheet to expand again
+    Future.delayed(const Duration(milliseconds: 300), () {
+      if (mounted) {
+        ref.read(timelineStateProvider.notifier).setScrolling(false);
+      }
+    });
+  }
+
+  void _dragScroll(ScrollDirection direction) {
+    _scrollController.animateTo(
+      _scrollController.offset + (direction == ScrollDirection.forward ? 175 : -175),
+      duration: const Duration(milliseconds: 125),
+      curve: Curves.easeOut,
+    );
+  }
+
+  void _handleDragAssetEnter(TimelineAssetIndex index) {
+    if (_dragAnchorIndex == null || !_dragging) return;
+
+    final timelineService = ref.read(timelineServiceProvider);
+    final dragAnchorIndex = _dragAnchorIndex!;
+
+    // Calculate the range of assets to select
+    final startIndex = math.min(dragAnchorIndex.assetIndex, index.assetIndex);
+    final endIndex = math.max(dragAnchorIndex.assetIndex, index.assetIndex);
+    final count = endIndex - startIndex + 1;
+
+    // Load the assets in the range
+    if (timelineService.hasRange(startIndex, count)) {
+      final selectedAssets = timelineService.getAssets(startIndex, count);
+
+      // Clear previous drag selection and add new range
+      final multiSelectNotifier = ref.read(multiSelectProvider.notifier);
+      for (final asset in _draggedAssets) {
+        multiSelectNotifier.deselectAsset(asset);
+      }
+      _draggedAssets.clear();
+
+      for (final asset in selectedAssets) {
+        multiSelectNotifier.selectAsset(asset);
+        _draggedAssets.add(asset);
+      }
+    }
+  }
+
  @override
  Widget build(BuildContext _) {
    final asyncSegments = ref.watch(timelineSegmentProvider);
@@ -177,43 +265,83 @@ class _SliverTimelineState extends ConsumerState<_SliverTimeline> {

          return PrimaryScrollController(
            controller: _scrollController,
-            child: Stack(
-              children: [
-                Scrubber(
-                  layoutSegments: segments,
-                  timelineHeight: maxHeight,
-                  topPadding: topPadding,
-                  bottomPadding: bottomPadding,
-                  monthSegmentSnappingOffset: widget.topSliverWidgetHeight ?? 0 + appBarExpandedHeight,
-                  child: CustomScrollView(
-                    primary: true,
-                    cacheExtent: maxHeight * 2,
-                    slivers: [
-                      if (isSelectionMode) const SelectionSliverAppBar() else if (widget.appBar != null) widget.appBar!,
-                      if (widget.topSliverWidget != null) widget.topSliverWidget!,
-                      _SliverSegmentedList(
-                        segments: segments,
-                        delegate: SliverChildBuilderDelegate(
-                          (ctx, index) {
-                            if (index >= childCount) return null;
-                            final segment = segments.findByIndex(index);
-                            return segment?.builder(ctx, index) ?? const SizedBox.shrink();
-                          },
-                          childCount: childCount,
-                          addAutomaticKeepAlives: false,
-                          // We add repaint boundary around tiles, so skip the auto boundaries
-                          addRepaintBoundaries: false,
-                        ),
-                      ),
-                      const SliverPadding(padding: EdgeInsets.only(bottom: scrubberBottomPadding)),
-                    ],
-                  ),
+            child: RawGestureDetector(
+              gestures: {
+                CustomScaleGestureRecognizer: GestureRecognizerFactoryWithHandlers<CustomScaleGestureRecognizer>(
+                  () => CustomScaleGestureRecognizer(),
+                  (CustomScaleGestureRecognizer scale) {
+                    scale.onStart = (details) {
+                      _baseScaleFactor = _scaleFactor;
+                    };
+
+                    scale.onUpdate = (details) {
+                      final newScaleFactor = math.max(math.min(5.0, _baseScaleFactor * details.scale), 1.0);
+                      final newPerRow = 7 - newScaleFactor.toInt();
+
+                      if (newPerRow != _perRow) {
+                        setState(() {
+                          _scaleFactor = newScaleFactor;
+                          _perRow = newPerRow;
+                        });
+
+                        ref.read(settingsProvider.notifier).set(Setting.tilesPerRow, _perRow);
+                      }
+                    };
+                  },
                ),
-                if (!isSelectionMode && isMultiSelectEnabled) ...[
-                  const Positioned(top: 60, left: 25, child: _MultiSelectStatusButton()),
-                  if (widget.bottomSheet != null) widget.bottomSheet!,
-                ],
-              ],
+              },
+              child: TimelineDragRegion(
+                onStart: _setDragStartIndex,
+                onAssetEnter: _handleDragAssetEnter,
+                onEnd: _stopDrag,
+                onScroll: _dragScroll,
+                onScrollStart: () {
+                  // Minimize the bottom sheet when drag selection starts
+                  ref.read(timelineStateProvider.notifier).setScrolling(true);
+                },
+                child: Stack(
+                  children: [
+                    Scrubber(
+                      layoutSegments: segments,
+                      timelineHeight: maxHeight,
+                      topPadding: topPadding,
+                      bottomPadding: bottomPadding,
+                      monthSegmentSnappingOffset: widget.topSliverWidgetHeight ?? 0 + appBarExpandedHeight,
+                      child: CustomScrollView(
+                        primary: true,
+                        physics: _scrollPhysics,
+                        cacheExtent: maxHeight * 2,
+                        slivers: [
+                          if (isSelectionMode)
+                            const SelectionSliverAppBar()
+                          else if (widget.appBar != null)
+                            widget.appBar!,
+                          if (widget.topSliverWidget != null) widget.topSliverWidget!,
+                          _SliverSegmentedList(
+                            segments: segments,
+                            delegate: SliverChildBuilderDelegate(
+                              (ctx, index) {
+                                if (index >= childCount) return null;
+                                final segment = segments.findByIndex(index);
+                                return segment?.builder(ctx, index) ?? const SizedBox.shrink();
+                              },
+                              childCount: childCount,
+                              addAutomaticKeepAlives: false,
+                              // We add repaint boundary around tiles, so skip the auto boundaries
+                              addRepaintBoundaries: false,
+                            ),
+                          ),
+                          const SliverPadding(padding: EdgeInsets.only(bottom: scrubberBottomPadding)),
+                        ],
+                      ),
+                    ),
+                    if (!isSelectionMode && isMultiSelectEnabled) ...[
+                      const Positioned(top: 60, left: 25, child: _MultiSelectStatusButton()),
+                      if (widget.bottomSheet != null) widget.bottomSheet!,
+                    ],
+                  ],
+                ),
+              ),
            ),
          );
        },
@@ -443,3 +571,11 @@ class _MultiSelectStatusButton extends ConsumerWidget {
    );
  }
 }
+
+/// accepts a gesture even though it should reject it (because child won)
+class CustomScaleGestureRecognizer extends ScaleGestureRecognizer {
+  @override
+  void rejectGesture(int pointer) {
+    acceptGesture(pointer);
+  }
+}
--- a/mobile/lib/presentation/widgets/timeline/timeline_drag_region.dart
+++ b/mobile/lib/presentation/widgets/timeline/timeline_drag_region.dart
@@ -0,0 +1,212 @@
+import 'dart:async';
+
+import 'package:collection/collection.dart';
+import 'package:flutter/gestures.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter/rendering.dart';
+
+class TimelineDragRegion extends StatefulWidget {
+  final Widget child;
+
+  final void Function(TimelineAssetIndex valueKey)? onStart;
+  final void Function(TimelineAssetIndex valueKey)? onAssetEnter;
+  final void Function()? onEnd;
+  final void Function()? onScrollStart;
+  final void Function(ScrollDirection direction)? onScroll;
+
+  const TimelineDragRegion({
+    super.key,
+    required this.child,
+    this.onStart,
+    this.onAssetEnter,
+    this.onEnd,
+    this.onScrollStart,
+    this.onScroll,
+  });
+
+  @override
+  State createState() => _TimelineDragRegionState();
+}
+
+class _TimelineDragRegionState extends State<TimelineDragRegion> {
+  late TimelineAssetIndex? assetUnderPointer;
+  late TimelineAssetIndex? anchorAsset;
+
+  // Scroll related state
+  static const double scrollOffset = 0.10;
+  double? topScrollOffset;
+  double? bottomScrollOffset;
+  Timer? scrollTimer;
+  late bool scrollNotified;
+
+  @override
+  void initState() {
+    super.initState();
+    assetUnderPointer = null;
+    anchorAsset = null;
+    scrollNotified = false;
+  }
+
+  @override
+  void didChangeDependencies() {
+    super.didChangeDependencies();
+    topScrollOffset = null;
+    bottomScrollOffset = null;
+  }
+
+  @override
+  void dispose() {
+    scrollTimer?.cancel();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return RawGestureDetector(
+      gestures: {
+        _CustomLongPressGestureRecognizer: GestureRecognizerFactoryWithHandlers<_CustomLongPressGestureRecognizer>(
+          () => _CustomLongPressGestureRecognizer(),
+          _registerCallbacks,
+        ),
+      },
+      child: widget.child,
+    );
+  }
+
+  void _registerCallbacks(_CustomLongPressGestureRecognizer recognizer) {
+    recognizer.onLongPressMoveUpdate = (details) => _onLongPressMove(details);
+    recognizer.onLongPressStart = (details) => _onLongPressStart(details);
+    recognizer.onLongPressUp = _onLongPressEnd;
+  }
+
+  TimelineAssetIndex? _getValueKeyAtPosition(Offset position) {
+    final box = context.findAncestorRenderObjectOfType<RenderBox>();
+    if (box == null) return null;
+
+    final hitTestResult = BoxHitTestResult();
+    final local = box.globalToLocal(position);
+    if (!box.hitTest(hitTestResult, position: local)) return null;
+
+    return (hitTestResult.path.firstWhereOrNull((hit) => hit.target is _TimelineAssetIndexProxy)?.target
+            as _TimelineAssetIndexProxy?)
+        ?.index;
+  }
+
+  void _onLongPressStart(LongPressStartDetails event) {
+    /// Calculate widget height and scroll offset when long press starting instead of in [initState]
+    /// or [didChangeDependencies] as the grid might still be rendering into view to get the actual size
+    final height = context.size?.height;
+    if (height != null && (topScrollOffset == null || bottomScrollOffset == null)) {
+      topScrollOffset = height * scrollOffset;
+      bottomScrollOffset = height - topScrollOffset!;
+    }
+
+    final initialHit = _getValueKeyAtPosition(event.globalPosition);
+    anchorAsset = initialHit;
+    if (initialHit == null) return;
+
+    if (anchorAsset != null) {
+      widget.onStart?.call(anchorAsset!);
+    }
+  }
+
+  void _onLongPressEnd() {
+    scrollNotified = false;
+    scrollTimer?.cancel();
+    widget.onEnd?.call();
+  }
+
+  void _onLongPressMove(LongPressMoveUpdateDetails event) {
+    if (anchorAsset == null) return;
+    if (topScrollOffset == null || bottomScrollOffset == null) return;
+
+    final currentDy = event.localPosition.dy;
+
+    if (currentDy > bottomScrollOffset!) {
+      scrollTimer ??= Timer.periodic(
+        const Duration(milliseconds: 50),
+        (_) => widget.onScroll?.call(ScrollDirection.forward),
+      );
+    } else if (currentDy < topScrollOffset!) {
+      scrollTimer ??= Timer.periodic(
+        const Duration(milliseconds: 50),
+        (_) => widget.onScroll?.call(ScrollDirection.reverse),
+      );
+    } else {
+      scrollTimer?.cancel();
+      scrollTimer = null;
+    }
+
+    final currentlyTouchingAsset = _getValueKeyAtPosition(event.globalPosition);
+    if (currentlyTouchingAsset == null) return;
+
+    if (assetUnderPointer != currentlyTouchingAsset) {
+      if (!scrollNotified) {
+        scrollNotified = true;
+        widget.onScrollStart?.call();
+      }
+
+      widget.onAssetEnter?.call(currentlyTouchingAsset);
+      assetUnderPointer = currentlyTouchingAsset;
+    }
+  }
+}
+
+class _CustomLongPressGestureRecognizer extends LongPressGestureRecognizer {
+  @override
+  void rejectGesture(int pointer) {
+    acceptGesture(pointer);
+  }
+}
+
+class TimelineAssetIndexWrapper extends SingleChildRenderObjectWidget {
+  final int assetIndex;
+  final int segmentIndex;
+
+  const TimelineAssetIndexWrapper({
+    required Widget super.child,
+    required this.assetIndex,
+    required this.segmentIndex,
+    super.key,
+  });
+
+  @override
+  // ignore: library_private_types_in_public_api
+  _TimelineAssetIndexProxy createRenderObject(BuildContext context) {
+    return _TimelineAssetIndexProxy(
+      index: TimelineAssetIndex(assetIndex: assetIndex, segmentIndex: segmentIndex),
+    );
+  }
+
+  @override
+  void updateRenderObject(
+    BuildContext context,
+    // ignore: library_private_types_in_public_api
+    _TimelineAssetIndexProxy renderObject,
+  ) {
+    renderObject.index = TimelineAssetIndex(assetIndex: assetIndex, segmentIndex: segmentIndex);
+  }
+}
+
+class _TimelineAssetIndexProxy extends RenderProxyBox {
+  TimelineAssetIndex index;
+
+  _TimelineAssetIndexProxy({required this.index});
+}
+
+class TimelineAssetIndex {
+  final int assetIndex;
+  final int segmentIndex;
+
+  const TimelineAssetIndex({required this.assetIndex, required this.segmentIndex});
+
+  @override
+  bool operator ==(covariant TimelineAssetIndex other) {
+    if (identical(this, other)) return true;
+
+    return other.assetIndex == assetIndex && other.segmentIndex == segmentIndex;
+  }
+
+  @override
+  int get hashCode => assetIndex.hashCode ^ segmentIndex.hashCode;
+}
--- a/mobile/lib/providers/infrastructure/action.provider.dart
+++ b/mobile/lib/providers/infrastructure/action.provider.dart
@@ -1,10 +1,13 @@
+import 'package:background_downloader/background_downloader.dart';
 import 'package:flutter/material.dart';
 import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
+import 'package:immich_mobile/models/download/livephotos_medatada.model.dart';
 import 'package:immich_mobile/providers/infrastructure/asset_viewer/current_asset.provider.dart';
 import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
 import 'package:immich_mobile/providers/user.provider.dart';
 import 'package:immich_mobile/services/action.service.dart';
+import 'package:immich_mobile/services/download.service.dart';
 import 'package:immich_mobile/services/timeline.service.dart';
 import 'package:immich_mobile/services/upload.service.dart';
 import 'package:logging/logging.dart';
@@ -30,6 +33,7 @@ class ActionNotifier extends Notifier<void> {
  final Logger _logger = Logger('ActionNotifier');
  late ActionService _service;
  late UploadService _uploadService;
+  late DownloadService _downloadService;

  ActionNotifier() : super();

@@ -37,6 +41,29 @@ class ActionNotifier extends Notifier<void> {
  void build() {
    _uploadService = ref.watch(uploadServiceProvider);
    _service = ref.watch(actionServiceProvider);
+    _downloadService = ref.watch(downloadServiceProvider);
+    _downloadService.onImageDownloadStatus = _downloadImageCallback;
+    _downloadService.onVideoDownloadStatus = _downloadVideoCallback;
+    _downloadService.onLivePhotoDownloadStatus = _downloadLivePhotoCallback;
+  }
+
+  void _downloadImageCallback(TaskStatusUpdate update) {
+    if (update.status == TaskStatus.complete) {
+      _downloadService.saveImageWithPath(update.task);
+    }
+  }
+
+  void _downloadVideoCallback(TaskStatusUpdate update) {
+    if (update.status == TaskStatus.complete) {
+      _downloadService.saveVideo(update.task);
+    }
+  }
+
+  void _downloadLivePhotoCallback(TaskStatusUpdate update) async {
+    if (update.status == TaskStatus.complete) {
+      final livePhotosId = LivePhotosMetadata.fromJson(update.task.metaData).id;
+      _downloadService.saveLivePhotos(update.task, livePhotosId);
+    }
  }

  List<String> _getRemoteIdsForSource(ActionSource source) {
@@ -239,6 +266,21 @@ class ActionNotifier extends Notifier<void> {
    }
  }

+  Future<ActionResult?> editDateTime(ActionSource source, BuildContext context) async {
+    final ids = _getOwnedRemoteIdsForSource(source);
+    try {
+      final isEdited = await _service.editDateTime(ids, context);
+      if (!isEdited) {
+        return null;
+      }
+
+      return ActionResult(count: ids.length, success: true);
+    } catch (error, stack) {
+      _logger.severe('Failed to edit date and time for assets', error, stack);
+      return ActionResult(count: ids.length, success: false, error: error.toString());
+    }
+  }
+
  Future<ActionResult> removeFromAlbum(ActionSource source, String albumId) async {
    final ids = _getRemoteIdsForSource(source);
    try {
--- a/mobile/lib/repositories/asset_api.repository.dart
+++ b/mobile/lib/repositories/asset_api.repository.dart
@@ -66,6 +66,10 @@ class AssetApiRepository extends ApiRepository {
    return _api.updateAssets(AssetBulkUpdateDto(ids: ids, latitude: location.latitude, longitude: location.longitude));
  }

+  Future<void> updateDateTime(List<String> ids, DateTime dateTime) async {
+    return _api.updateAssets(AssetBulkUpdateDto(ids: ids, dateTimeOriginal: dateTime.toIso8601String()));
+  }
+
  Future<StackResponse> stack(List<String> ids) async {
    final responseDto = await checkNull(_stacksApi.createStack(StackCreateDto(assetIds: ids)));

--- a/mobile/lib/services/action.service.dart
+++ b/mobile/lib/services/action.service.dart
@@ -13,6 +13,7 @@ import 'package:immich_mobile/repositories/asset_api.repository.dart';
 import 'package:immich_mobile/repositories/asset_media.repository.dart';
 import 'package:immich_mobile/repositories/drift_album_api_repository.dart';
 import 'package:immich_mobile/routing/router.dart';
+import 'package:immich_mobile/widgets/common/date_time_picker.dart';
 import 'package:immich_mobile/widgets/common/location_picker.dart';
 import 'package:maplibre_gl/maplibre_gl.dart' as maplibre;
 import 'package:riverpod_annotation/riverpod_annotation.dart';
@@ -159,6 +160,44 @@ class ActionService {
    return true;
  }

+  Future<bool> editDateTime(List<String> remoteIds, BuildContext context) async {
+    DateTime? initialDate;
+    String? timeZone;
+    Duration? offset;
+
+    if (remoteIds.length == 1) {
+      final assetId = remoteIds.first;
+      final asset = await _remoteAssetRepository.get(assetId);
+      if (asset == null) {
+        return false;
+      }
+
+      final exifData = await _remoteAssetRepository.getExif(assetId);
+      initialDate = asset.createdAt.toLocal();
+      offset = initialDate.timeZoneOffset;
+      timeZone = exifData?.timeZone;
+    }
+
+    final dateTime = await showDateTimePicker(
+      context: context,
+      initialDateTime: initialDate,
+      initialTZ: timeZone,
+      initialTZOffset: offset,
+    );
+
+    if (dateTime == null) {
+      return false;
+    }
+
+    // convert dateTime to DateTime object
+    final parsedDateTime = DateTime.parse(dateTime);
+
+    await _assetApiRepository.updateDateTime(remoteIds, parsedDateTime);
+    await _remoteAssetRepository.updateDateTime(remoteIds, parsedDateTime);
+
+    return true;
+  }
+
  Future<int> removeFromAlbum(List<String> remoteIds, String albumId) async {
    int removedCount = 0;
    final result = await _albumApiRepository.removeAssets(albumId, remoteIds);
--- a/mobile/lib/services/upload.service.dart
+++ b/mobile/lib/services/upload.service.dart
@@ -99,6 +99,7 @@ class UploadService {
  }

  Future<void> manualBackup(List<LocalAsset> localAssets) async {
+    await _storageRepository.clearCache();
    List<UploadTask> tasks = [];
    for (final asset in localAssets) {
      final task = await _getUploadTask(
@@ -120,6 +121,8 @@ class UploadService {
  /// Build the upload tasks
  /// Enqueue the tasks
  Future<void> startBackup(String userId, void Function(EnqueueStatus status) onEnqueueTasks) async {
+    await _storageRepository.clearCache();
+
    shouldAbortQueuingTasks = false;

    final candidates = await _backupRepository.getCandidates(userId);
@@ -159,6 +162,7 @@ class UploadService {
  Future<int> cancelBackup() async {
    shouldAbortQueuingTasks = true;

+    await _storageRepository.clearCache();
    await _uploadRepository.reset(kBackupGroup);
    await _uploadRepository.deleteDatabaseRecords(kBackupGroup);

--- a/mobile/lib/widgets/common/date_time_picker.dart
+++ b/mobile/lib/widgets/common/date_time_picker.dart
@@ -145,7 +145,7 @@ class _DateTimePicker extends HookWidget {
              1,
            ),
            trailing: Icon(Icons.edit_outlined, size: 18, color: context.primaryColor),
-            title: Text(DateFormat("dd-MM-yyyy hh:mm a").format(date.value), style: context.textTheme.bodyMedium).tr(),
+            title: Text(DateFormat("dd-MM-yyyy hh:mm a").format(date.value), style: context.textTheme.bodyMedium),
            onTap: pickDate,
          ),
          const SizedBox(height: 24),
--- a/mobile/lib/widgets/settings/beta_sync_settings/beta_sync_settings.dart
+++ b/mobile/lib/widgets/settings/beta_sync_settings/beta_sync_settings.dart
@@ -10,6 +10,7 @@ import 'package:immich_mobile/providers/infrastructure/asset.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/album.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/db.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/memory.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/storage.provider.dart';
 import 'package:immich_mobile/providers/sync_status.provider.dart';
 import 'package:immich_mobile/widgets/settings/beta_sync_settings/entity_count_tile.dart';
 import 'package:path/path.dart' as path;
@@ -104,6 +105,10 @@ class BetaSyncSettings extends HookConsumerWidget {
      }
    }

+    Future<void> clearFileCache() async {
+      await ref.read(storageRepositoryProvider).clearCache();
+    }
+
    return FutureBuilder<List<dynamic>>(
      future: loadCounts(),
      builder: (context, snapshot) {
@@ -241,6 +246,14 @@ class BetaSyncSettings extends HookConsumerWidget {
              const Divider(height: 1, indent: 16, endIndent: 16),
              const SizedBox(height: 24),
              _SectionHeaderText(text: "actions".t(context: context)),
+              ListTile(
+                title: Text(
+                  "clear_file_cache".t(context: context),
+                  style: const TextStyle(fontWeight: FontWeight.w500),
+                ),
+                leading: const Icon(Icons.playlist_remove_rounded),
+                onTap: clearFileCache,
+              ),
              ListTile(
                title: Text(
                  "export_database".t(context: context),
--- a/mobile/openapi/README.md
+++ b/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.136.0
+- API version: 1.137.3
 - Generator version: 7.8.0
 - Build package: org.openapitools.codegen.languages.DartClientCodegen

--- a/mobile/pubspec.yaml
+++ b/mobile/pubspec.yaml
@@ -2,7 +2,7 @@ name: immich_mobile
 description: Immich - selfhosted backup media file on mobile phone

 publish_to: 'none'
-version: 1.136.0+3000
+version: 1.137.3+3002

 environment:
  sdk: '>=3.8.0 <4.0.0'
--- a/mobile/test/domain/services/hash_service_test.dart
+++ b/mobile/test/domain/services/hash_service_test.dart
@@ -40,6 +40,7 @@ void main() {
    registerFallbackValue(LocalAssetStub.image1);

    when(() => mockAssetRepo.updateHashes(any())).thenAnswer((_) async => {});
+    when(() => mockStorageRepo.clearCache()).thenAnswer((_) async => {});
  });

  group('HashService hashAssets', () {
--- a/open-api/immich-openapi-specs.json
+++ b/open-api/immich-openapi-specs.json
@@ -9469,7 +9469,7 @@
  "info": {
    "title": "Immich",
    "description": "Immich API",
-    "version": "1.136.0",
+    "version": "1.137.3",
    "contact": {}
  },
  "tags": [],
--- a/open-api/typescript-sdk/package-lock.json
+++ b/open-api/typescript-sdk/package-lock.json
@@ -1,12 +1,12 @@
 {
  "name": "@immich/sdk",
-  "version": "1.136.0",
+  "version": "1.137.3",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "@immich/sdk",
-      "version": "1.136.0",
+      "version": "1.137.3",
      "license": "GNU Affero General Public License version 3",
      "dependencies": {
        "@oazapfts/runtime": "^1.0.2"
--- a/open-api/typescript-sdk/package.json
+++ b/open-api/typescript-sdk/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@immich/sdk",
-  "version": "1.136.0",
+  "version": "1.137.3",
  "description": "Auto-generated TypeScript SDK for the Immich API",
  "type": "module",
  "main": "./build/index.js",
--- a/open-api/typescript-sdk/src/fetch-client.ts
+++ b/open-api/typescript-sdk/src/fetch-client.ts
@@ -1,6 +1,6 @@
 /**
 * Immich
- * 1.136.0
+ * 1.137.3
 * DO NOT MODIFY - This file has been generated using oazapfts.
 * See https://www.npmjs.com/package/oazapfts
 */
--- a/server/package-lock.json
+++ b/server/package-lock.json
@@ -1,12 +1,12 @@
 {
  "name": "immich",
-  "version": "1.136.0",
+  "version": "1.137.3",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "immich",
-      "version": "1.136.0",
+      "version": "1.137.3",
      "license": "GNU Affero General Public License version 3",
      "dependencies": {
        "@nestjs/bullmq": "^11.0.1",
--- a/server/package.json
+++ b/server/package.json
@@ -1,6 +1,6 @@
 {
  "name": "immich",
-  "version": "1.136.0",
+  "version": "1.137.3",
  "description": "",
  "author": "",
  "private": true,
--- a/server/src/queries/asset.repository.sql
+++ b/server/src/queries/asset.repository.sql
@@ -170,27 +170,10 @@ where

 -- AssetRepository.getFileSamples
 select
-  "asset"."id",
-  "asset"."originalPath",
-  "asset"."sidecarPath",
-  "asset"."encodedVideoPath",
-  (
-    select
-      coalesce(json_agg(agg), '[]')
-    from
-      (
-        select
-          "path"
-        from
-          "asset_file"
-        where
-          "asset"."id" = "asset_file"."assetId"
-      ) as agg
-  ) as "files"
+  "assetId",
+  "path"
 from
-  "asset"
-where
-  "asset"."libraryId" is null
+  "asset_file"
 limit
  3

--- a/server/src/repositories/asset.repository.ts
+++ b/server/src/repositories/asset.repository.ts
@@ -1,6 +1,5 @@
 import { Injectable } from '@nestjs/common';
 import { Insertable, Kysely, NotNull, Selectable, UpdateResult, Updateable, sql } from 'kysely';
-import { jsonArrayFrom } from 'kysely/helpers/postgres';
 import { isEmpty, isUndefined, omitBy } from 'lodash';
 import { InjectKysely } from 'nestjs-kysely';
 import { Stack } from 'src/database';
@@ -338,20 +337,7 @@ export class AssetRepository {

  @GenerateSql()
  getFileSamples() {
-    return this.db
-      .selectFrom('asset')
-      .select((eb) => [
-        'asset.id',
-        'asset.originalPath',
-        'asset.sidecarPath',
-        'asset.encodedVideoPath',
-        jsonArrayFrom(eb.selectFrom('asset_file').select('path').whereRef('asset.id', '=', 'asset_file.assetId')).as(
-          'files',
-        ),
-      ])
-      .where('asset.libraryId', 'is', null)
-      .limit(sql.lit(3))
-      .execute();
+    return this.db.selectFrom('asset_file').select(['assetId', 'path']).limit(sql.lit(3)).execute();
  }

  @GenerateSql({ params: [DummyValue.UUID] })
--- a/server/src/services/cli.service.ts
+++ b/server/src/services/cli.service.ts
@@ -86,12 +86,7 @@ export class CliService extends BaseService {
    }

    for (const asset of assets) {
-      paths.push(
-        asset.originalPath,
-        asset.sidecarPath,
-        asset.encodedVideoPath,
-        ...asset.files.map((file) => file.path),
-      );
+      paths.push(asset.path);
    }

    return paths.filter(Boolean) as string[];
--- a/server/src/services/storage.service.ts
+++ b/server/src/services/storage.service.ts
@@ -97,18 +97,22 @@ export class StorageService extends BaseService {
      const current = StorageCore.getMediaLocation();
      const samples = await this.assetRepository.getFileSamples();
      if (samples.length > 0) {
-        const originalPath = samples[0].originalPath;
+        const path = samples[0].path;
        const savedValue = await this.systemMetadataRepository.get(SystemMetadataKey.MediaLocation);
        let previous = savedValue?.location || '';

+        if (!previous && this.configRepository.getEnv().storage.mediaLocation) {
+          previous = current;
+        }
+
        if (!previous) {
-          previous = originalPath.startsWith('upload/') ? 'upload' : '/usr/src/app/upload';
+          previous = path.startsWith('upload/') ? 'upload' : '/usr/src/app/upload';
        }

        if (previous !== current) {
          this.logger.log(`Media location changed (from=${previous}, to=${current})`);

-          if (!originalPath.startsWith(previous)) {
+          if (!path.startsWith(previous)) {
            throw new Error(
              'Detected an inconsistent media location. For more information, see https://immich.app/errors#inconsistent-media-location',
            );
--- a/web/package-lock.json
+++ b/web/package-lock.json
@@ -1,17 +1,17 @@
 {
  "name": "immich-web",
-  "version": "1.136.0",
+  "version": "1.137.3",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "immich-web",
-      "version": "1.136.0",
+      "version": "1.137.3",
      "license": "GNU Affero General Public License version 3",
      "dependencies": {
        "@formatjs/icu-messageformat-parser": "^2.9.8",
        "@immich/sdk": "file:../open-api/typescript-sdk",
-        "@immich/ui": "^0.23.5",
+        "@immich/ui": "^0.23.6",
        "@mapbox/mapbox-gl-rtl-text": "0.2.3",
        "@mdi/js": "^7.4.47",
        "@photo-sphere-viewer/core": "^5.11.5",
@@ -94,7 +94,7 @@
    },
    "../open-api/typescript-sdk": {
      "name": "@immich/sdk",
-      "version": "1.136.0",
+      "version": "1.137.3",
      "license": "GNU Affero General Public License version 3",
      "dependencies": {
        "@oazapfts/runtime": "^1.0.2"
@@ -1357,9 +1357,9 @@
      "link": true
    },
    "node_modules/@immich/ui": {
-      "version": "0.23.5",
-      "resolved": "https://registry.npmjs.org/@immich/ui/-/ui-0.23.5.tgz",
-      "integrity": "sha512-1wlFMmfDmtGC+Kcc8cYTT00mQaSumR41KEOOOmVn5Rw/8z9pUhpNY8mGl1AxY4qhtnaz+G3dH6vowYzL23D+YQ==",
+      "version": "0.23.6",
+      "resolved": "https://registry.npmjs.org/@immich/ui/-/ui-0.23.6.tgz",
+      "integrity": "sha512-HYIguDx/nCXcvqLKhY1R/+Aks6mn8B9jIiNVQH6WODDPbvGFrvQT5uINhXHrjsdyuzKBVS6dps+lx9+9Z6z4rA==",
      "license": "GNU Affero General Public License version 3",
      "dependencies": {
        "@mdi/js": "^7.4.47",
--- a/web/package.json
+++ b/web/package.json
@@ -1,6 +1,6 @@
 {
  "name": "immich-web",
-  "version": "1.136.0",
+  "version": "1.137.3",
  "license": "GNU Affero General Public License version 3",
  "type": "module",
  "scripts": {
@@ -28,7 +28,7 @@
  "dependencies": {
    "@formatjs/icu-messageformat-parser": "^2.9.8",
    "@immich/sdk": "file:../open-api/typescript-sdk",
-    "@immich/ui": "^0.23.5",
+    "@immich/ui": "^0.23.6",
    "@mapbox/mapbox-gl-rtl-text": "0.2.3",
    "@mdi/js": "^7.4.47",
    "@photo-sphere-viewer/core": "^5.11.5",
--- a/web/src/lib/components/shared-components/gallery-viewer/gallery-viewer.svelte
+++ b/web/src/lib/components/shared-components/gallery-viewer/gallery-viewer.svelte
@@ -27,6 +27,7 @@
  import Portal from '../portal/portal.svelte';

  interface Props {
+    initialAssetId?: string;
    assets: (TimelineAsset | AssetResponseDto)[];
    assetInteraction: AssetInteraction;
    disableAssetSelect?: boolean;
@@ -44,6 +45,7 @@
  }

  let {
+    initialAssetId = undefined,
    assets = $bindable(),
    assetInteraction,
    disableAssetSelect = false,
@@ -117,7 +119,14 @@
    };
  });

-  let currentViewAssetIndex = 0;
+  let currentIndex = 0;
+  if (initialAssetId && assets.length > 0) {
+    const index = assets.findIndex(({ id }) => id === initialAssetId);
+    if (index !== -1) {
+      currentIndex = index;
+    }
+  }
+
  let shiftKeyIsDown = $state(false);
  let lastAssetMouseEvent: TimelineAsset | null = $state(null);
  let slidingWindow = $state({ top: 0, bottom: 0 });
@@ -150,8 +159,8 @@
    }
  });
  const viewAssetHandler = async (asset: TimelineAsset) => {
-    currentViewAssetIndex = assets.findIndex((a) => a.id == asset.id);
-    await setAssetId(assets[currentViewAssetIndex].id);
+    currentIndex = assets.findIndex((a) => a.id == asset.id);
+    await setAssetId(assets[currentIndex].id);
    await navigate({ targetRoute: 'current', assetId: $viewingAsset.id });
  };

@@ -324,12 +333,12 @@
      if (onNext) {
        asset = await onNext();
      } else {
-        if (currentViewAssetIndex >= assets.length - 1) {
+        if (currentIndex >= assets.length - 1) {
          return false;
        }

-        currentViewAssetIndex = currentViewAssetIndex + 1;
-        asset = currentViewAssetIndex < assets.length ? assets[currentViewAssetIndex] : undefined;
+        currentIndex = currentIndex + 1;
+        asset = currentIndex < assets.length ? assets[currentIndex] : undefined;
      }

      if (!asset) {
@@ -374,12 +383,12 @@
      if (onPrevious) {
        asset = await onPrevious();
      } else {
-        if (currentViewAssetIndex <= 0) {
+        if (currentIndex <= 0) {
          return false;
        }

-        currentViewAssetIndex = currentViewAssetIndex - 1;
-        asset = currentViewAssetIndex >= 0 ? assets[currentViewAssetIndex] : undefined;
+        currentIndex = currentIndex - 1;
+        asset = currentIndex >= 0 ? assets[currentIndex] : undefined;
      }

      if (!asset) {
@@ -412,10 +421,10 @@
        );
        if (assets.length === 0) {
          await goto(AppRoute.PHOTOS);
-        } else if (currentViewAssetIndex === assets.length) {
+        } else if (currentIndex === assets.length) {
          await handlePrevious();
        } else {
-          await setAssetId(assets[currentViewAssetIndex].id);
+          await setAssetId(assets[currentIndex].id);
        }
        break;
      }
--- a/web/src/lib/components/utilities-page/large-assets/large-asset-data.svelte
+++ b/web/src/lib/components/utilities-page/large-assets/large-asset-data.svelte
@@ -1,12 +1,8 @@
 <script lang="ts">
-  import Icon from '$lib/components/elements/icon.svelte';
-  import { getAssetThumbnailUrl } from '$lib/utils';
-  import { getAssetResolution, getFileSize } from '$lib/utils/asset-utils';
-  import { getAltText } from '$lib/utils/thumbnail-util';
+  import Thumbnail from '$lib/components/assets/thumbnail/thumbnail.svelte';
+  import { getFileSize } from '$lib/utils/asset-utils';
  import { toTimelineAsset } from '$lib/utils/timeline-util';
  import { type AssetResponseDto } from '@immich/sdk';
-  import { mdiHeart } from '@mdi/js';
-  import { t } from 'svelte-i18n';

  interface Props {
    asset: AssetResponseDto;
@@ -16,43 +12,26 @@
  let { asset, onViewAsset }: Props = $props();

  let assetData = $derived(JSON.stringify(asset, null, 2));
+
+  let boxWidth = $state(300);
 </script>

 <div
-  class="max-w-60 rounded-xl border-4 transition-colors font-semibold text-xs bg-gray-200 dark:bg-gray-800 border-gray-200 dark:border-gray-800"
+  class="w-full aspect-square rounded-xl border-4 transition-colors font-semibold text-xs bg-gray-200 dark:bg-gray-800 border-gray-200 dark:border-gray-800"
+  bind:clientWidth={boxWidth}
+  title={assetData}
 >
-  <div class="relative w-full">
-    <button type="button" onclick={() => onViewAsset(asset)} class="block relative w-full" aria-label={$t('keep')}>
-      <!-- THUMBNAIL-->
-      <img
-        src={getAssetThumbnailUrl(asset.id)}
-        alt={$getAltText(toTimelineAsset(asset))}
-        title={assetData}
-        class="h-60 object-cover rounded-t-xl w-full"
-        draggable="false"
-      />
+  <div class="relative w-full h-full overflow-hidden rounded-lg">
+    <Thumbnail asset={toTimelineAsset(asset)} readonly onClick={() => onViewAsset(asset)} thumbnailSize={boxWidth} />

-      <!-- OVERLAY CHIP -->
-      {#if !!asset.libraryId}
-        <div class="absolute bottom-1 end-3 px-4 py-1 rounded-xl text-xs transition-colors bg-red-300/90">External</div>
-      {/if}
-
-      <!-- FAVORITE ICON -->
-      {#if asset.isFavorite}
-        <div class="absolute bottom-2 start-2">
-          <Icon path={mdiHeart} size="24" class="text-white" />
-        </div>
-      {/if}
-    </button>
+    {#if !!asset.libraryId}
+      <div class="absolute bottom-1 end-3 px-4 py-1 rounded-xl text-xs transition-colors bg-red-500">External</div>
+    {/if}
  </div>
-
-  <div class="flex justify-between items-center pl-2 pr-4 gap-2">
-    <div class="grid gap-y-2 py-2 text-xs transition-colors dark:text-white">
-      <div class="text-left text-ellipsis truncate">{asset.originalFileName}</div>
-      <span>{getAssetResolution(asset)}</span>
-    </div>
-    <div class="dark:text-white text-lg font-bold whitespace-nowrap w-max">
-      {getFileSize(asset, 1)}
-    </div>
+  <div class="text-center mt-4 px-4 text-sm font-normal truncate" title={asset.originalFileName}>
+    {asset.originalFileName}
+  </div>
+  <div class="text-center">
+    <p class="text-primary text-xl font-semibold py-3">{getFileSize(asset, 1)}</p>
  </div>
 </div>
--- a/web/src/routes/(user)/folders/[[photos=photos]]/[[assetId=id]]/+page.svelte
+++ b/web/src/routes/(user)/folders/[[photos=photos]]/[[assetId=id]]/+page.svelte
@@ -21,8 +21,8 @@
  import TreeItems from '$lib/components/shared-components/tree/tree-items.svelte';
  import Sidebar from '$lib/components/sidebar/sidebar.svelte';
  import { AppRoute, QueryParameter } from '$lib/constants';
-  import { AssetInteraction } from '$lib/stores/asset-interaction.svelte';
  import type { Viewport } from '$lib/managers/timeline-manager/types';
+  import { AssetInteraction } from '$lib/stores/asset-interaction.svelte';
  import { foldersStore } from '$lib/stores/folders.svelte';
  import { preferences } from '$lib/stores/user.store';
  import { cancelMultiselect } from '$lib/utils/asset-utils';
@@ -40,7 +40,6 @@
  let { data }: Props = $props();

  const viewport: Viewport = $state({ width: 0, height: 0 });
-
  const assetInteraction = new AssetInteraction();

  const handleNavigateToFolder = (folderName: string) => navigateToView(joinPaths(data.tree.path, folderName));
@@ -104,6 +103,7 @@
    {#if data.pathAssets && data.pathAssets.length > 0}
      <div bind:clientHeight={viewport.height} bind:clientWidth={viewport.width} class="mt-2">
        <GalleryViewer
+          initialAssetId={data.asset?.id}
          assets={data.pathAssets}
          {assetInteraction}
          {viewport}
--- a/web/src/routes/(user)/utilities/large-files/[[photos=photos]]/[[assetId=id]]/+page.svelte
+++ b/web/src/routes/(user)/utilities/large-files/[[photos=photos]]/[[assetId=id]]/+page.svelte
@@ -56,7 +56,7 @@
 </script>

 <UserPageLayout title={data.meta.title} scrollbar={true}>
-  <div class="flex gap-2 flex-wrap">
+  <div class="grid gap-2 grid-cols-2 sm:grid-cols-3 lg:grid-cols-4 xl:grid-cols-6">
    {#if assets && data.assets.length > 0}
      {#each assets as asset (asset.id)}
        <LargeAssetData {asset} onViewAsset={(asset) => setAsset(asset)} />
Author	SHA1	Message	Date
github-actions	007ba1d9ef	chore: version v1.137.3	2025-08-01 14:52:24 +00:00
Daniel Dietzler	4d5cd1a6b5	fix: migration if media location is set (#20532 )	2025-08-01 14:49:51 +00:00
shenlong	8108f50c4e	fix: guard IS_FAVORITE column with SDK check (#20511 ) Co-authored-by: shenlong-tanwen <139912620+shalong-tanwen@users.noreply.github.com>	2025-08-01 05:39:59 -05:00
Alex	1b8354ed36	chore: post release tasks (#20497 )	2025-08-01 05:38:52 -05:00
github-actions	9242afb4b0	chore: version v1.137.2	2025-08-01 02:45:16 +00:00
Alex	c5f14adff0	feat: drag to select beta timeline (#20456 )	2025-07-31 21:29:01 -05:00
Alex	1378f22368	fix: add to album render empty app bar (#20480 ) * fix: add to album render empty app bar * set current album	2025-07-31 21:28:33 -05:00
Alex	4bd465e752	feat: change grid size with gesture (#20455 )	2025-07-31 21:02:28 -05:00
github-actions	a07531be3b	chore: version v1.137.1	2025-07-31 23:05:34 +00:00
Daniel Dietzler	3cdc6844a1	fix: automatic media location migration without internal assets (#20489 )	2025-07-31 22:58:35 +00:00
github-actions	c3263e50fc	chore: version v1.137.0	2025-07-31 20:19:26 +00:00
Alex	7391ea6ff9	chore: large file size grid view styling (#20472 ) * chore: large file grid styles * chore: large file grid styles	2025-07-31 12:52:19 -04:00
Daniel Dietzler	f972b8d514	fix: modal race conditions (#20460 )	2025-07-31 07:28:45 -05:00
Jason Rasmussen	6b50d958f4	fix: incorrect next/previous action after folder view refresh (#20447 )	2025-07-30 14:50:52 -05:00
Alex	27c456eb75	fix: people navigation (#20450 )	2025-07-30 14:47:47 -05:00
Brandon Wees	e7d051db3c	feat: drift edit time and date action (#20377 ) * feat: drift edit time and date action * feat: add edit button on asset viewer bottom sheet * update localDateTime column in addition to createdAt to keep consistency * fix: dont update local dateTime Server calcs this anyway and it will be synced when the change is applied. We don't use localDateTime on mobile so there is no reason to update this value * fix: padding around edit icon in ListTile Co-authored-by: shenlong <139912620+shenlong-tanwen@users.noreply.github.com> * chore: format * fix: hide date edit control when asset does not have a remote * fix: pull timezones correctly from image --------- Co-authored-by: shenlong <139912620+shenlong-tanwen@users.noreply.github.com>	2025-07-30 14:40:13 -05:00
Peter Ombodi	86d31d7d29	fix(download): handle completed downloads and refresh albums (#20241 ) * fix(download): handle completed downloads and refresh albums * fix(download): remove use of outdated AlbumService --------- Co-authored-by: Peter Ombodi <peter.ombodi@gmail.com>	2025-07-30 14:33:55 -05:00
shenlong	f416342eff	fix: clear local file cache before upload (#20448 ) * clear local file cache before upload * clear cache during hashing * fix test * add button to clear cache manually * add button to clear cache manually --------- Co-authored-by: shenlong-tanwen <139912620+shalong-tanwen@users.noreply.github.com> Co-authored-by: Alex <alex.tran1502@gmail.com>	2025-07-30 14:32:38 -05:00
Cédric	d73335ecbc	docs: add config example for Authelia (#20223 )	2025-07-30 19:13:19 +00:00