merge main

2026-05-18 03:10:24 +03:00 · 2026-05-14 01:11:26 +05:30
parent 33713cf1d5 7a84266039
commit d59520d990
480 changed files with 19769 additions and 4914 deletions
@@ -61,8 +61,12 @@ class RemoteAlbum {

  @override
  bool operator ==(Object other) {
-    if (other is! RemoteAlbum) return false;
-    if (identical(this, other)) return true;
+    if (other is! RemoteAlbum) {
+      return false;
+    }
+    if (identical(this, other)) {
+      return true;
+    }
    return id == other.id &&
        name == other.name &&
        ownerId == other.ownerId &&
@@ -49,8 +49,12 @@ class LocalAlbum {

  @override
  bool operator ==(Object other) {
-    if (other is! LocalAlbum) return false;
-    if (identical(this, other)) return true;
+    if (other is! LocalAlbum) {
+      return false;
+    }
+    if (identical(this, other)) {
+      return true;
+    }

    return other.id == id &&
        other.name == name &&
@@ -51,12 +51,18 @@ sealed class BaseAsset {
  bool get isAnimatedImage => playbackStyle == AssetPlaybackStyle.imageAnimated;

  AssetPlaybackStyle get playbackStyle {
-    if (isVideo) return AssetPlaybackStyle.video;
-    if (isMotionPhoto) return AssetPlaybackStyle.livePhoto;
+    if (isVideo) {
+      return AssetPlaybackStyle.video;
+    }
+    if (isMotionPhoto) {
+      return AssetPlaybackStyle.livePhoto;
+    }
    if (isImage && durationMs != null && durationMs! > 0) {
      return AssetPlaybackStyle.imageAnimated;
    }
-    if (isImage) return AssetPlaybackStyle.image;
+    if (isImage) {
+      return AssetPlaybackStyle.image;
+    }
    return AssetPlaybackStyle.unknown;
  }

@@ -98,7 +104,9 @@ sealed class BaseAsset {

  @override
  bool operator ==(Object other) {
-    if (identical(this, other)) return true;
+    if (identical(this, other)) {
+      return true;
+    }
    if (other is BaseAsset) {
      return name == other.name &&
          type == other.type &&
@@ -74,8 +74,12 @@ class LocalAsset extends BaseAsset {
  // Not checking for remoteId here
  @override
  bool operator ==(Object other) {
-    if (other is! LocalAsset) return false;
-    if (identical(this, other)) return true;
+    if (other is! LocalAsset) {
+      return false;
+    }
+    if (identical(this, other)) {
+      return true;
+    }
    return super == other &&
        id == other.id &&
        cloudId == other.cloudId &&
@@ -10,6 +10,7 @@ class RemoteAsset extends BaseAsset {
  final AssetVisibility visibility;
  final String ownerId;
  final String? stackId;
+  final DateTime? uploadedAt;

  const RemoteAsset({
    required this.id,
@@ -20,6 +21,7 @@ class RemoteAsset extends BaseAsset {
    required super.type,
    required super.createdAt,
    required super.updatedAt,
+    this.uploadedAt,
    super.width,
    super.height,
    super.durationMs,
@@ -55,6 +57,7 @@ class RemoteAsset extends BaseAsset {
    type: $type,
    createdAt: $createdAt,
    updatedAt: $updatedAt,
+    uploadedAt: ${uploadedAt ?? "<NA>"},
    width: ${width ?? "<NA>"},
    height: ${height ?? "<NA>"},
    durationMs: ${durationMs ?? "<NA>"},
@@ -71,14 +74,19 @@ class RemoteAsset extends BaseAsset {
  // Not checking for localId here
  @override
  bool operator ==(Object other) {
-    if (other is! RemoteAsset) return false;
-    if (identical(this, other)) return true;
+    if (other is! RemoteAsset) {
+      return false;
+    }
+    if (identical(this, other)) {
+      return true;
+    }
    return super == other &&
        id == other.id &&
        ownerId == other.ownerId &&
        thumbHash == other.thumbHash &&
        visibility == other.visibility &&
-        stackId == other.stackId;
+        stackId == other.stackId &&
+        uploadedAt == other.uploadedAt;
  }

  @override
@@ -89,7 +97,8 @@ class RemoteAsset extends BaseAsset {
      localId.hashCode ^
      thumbHash.hashCode ^
      visibility.hashCode ^
-      stackId.hashCode;
+      stackId.hashCode ^
+      uploadedAt.hashCode;

  RemoteAsset copyWith({
    String? id,
@@ -100,6 +109,7 @@ class RemoteAsset extends BaseAsset {
    AssetType? type,
    DateTime? createdAt,
    DateTime? updatedAt,
+    DateTime? uploadedAt,
    int? width,
    int? height,
    int? durationMs,
@@ -119,6 +129,7 @@ class RemoteAsset extends BaseAsset {
      type: type ?? this.type,
      createdAt: createdAt ?? this.createdAt,
      updatedAt: updatedAt ?? this.updatedAt,
+      uploadedAt: uploadedAt ?? this.uploadedAt,
      width: width ?? this.width,
      height: height ?? this.height,
      durationMs: durationMs ?? this.durationMs,
@@ -144,6 +155,7 @@ class RemoteAssetExif extends RemoteAsset {
    required super.type,
    required super.createdAt,
    required super.updatedAt,
+    super.uploadedAt,
    super.width,
    super.height,
    super.durationMs,
@@ -158,8 +170,12 @@ class RemoteAssetExif extends RemoteAsset {

  @override
  bool operator ==(Object other) {
-    if (other is! RemoteAssetExif) return false;
-    if (identical(this, other)) return true;
+    if (other is! RemoteAssetExif) {
+      return false;
+    }
+    if (identical(this, other)) {
+      return true;
+    }
    return super == other && exifInfo == other.exifInfo;
  }

@@ -176,6 +192,7 @@ class RemoteAssetExif extends RemoteAsset {
    AssetType? type,
    DateTime? createdAt,
    DateTime? updatedAt,
+    DateTime? uploadedAt,
    int? width,
    int? height,
    int? durationMs,
@@ -196,6 +213,7 @@ class RemoteAssetExif extends RemoteAsset {
      type: type ?? this.type,
      createdAt: createdAt ?? this.createdAt,
      updatedAt: updatedAt ?? this.updatedAt,
+      uploadedAt: uploadedAt ?? this.uploadedAt,
      width: width ?? this.width,
      height: height ?? this.height,
      durationMs: durationMs ?? this.durationMs,
@@ -68,7 +68,9 @@ class AssetFace {

  @override
  bool operator ==(covariant AssetFace other) {
-    if (identical(this, other)) return true;
+    if (identical(this, other)) {
+      return true;
+    }

    return other.id == id &&
        other.assetId == assetId &&
@@ -69,7 +69,9 @@ class ExifInfo {

  @override
  bool operator ==(covariant ExifInfo other) {
-    if (identical(this, other)) return true;
+    if (identical(this, other)) {
+      return true;
+    }

    return other.fileSize == fileSize &&
        other.description == description &&
@@ -20,7 +20,9 @@ class LogMessage {

  @override
  bool operator ==(covariant LogMessage other) {
-    if (identical(this, other)) return true;
+    if (identical(this, other)) {
+      return true;
+    }

    return other.message == message &&
        other.level == level &&
@@ -8,7 +8,9 @@ class Marker {

  @override
  bool operator ==(covariant Marker other) {
-    if (identical(this, other)) return true;
+    if (identical(this, other)) {
+      return true;
+    }

    return other.location == location && other.assetId == assetId;
  }
@@ -2,7 +2,6 @@
 import 'dart:convert';

 import 'package:collection/collection.dart';
-
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';

 enum MemoryTypeEnum {
@@ -36,7 +35,9 @@ class MemoryData {

  @override
  bool operator ==(covariant MemoryData other) {
-    if (identical(this, other)) return true;
+    if (identical(this, other)) {
+      return true;
+    }

    return other.year == year;
  }
@@ -132,7 +133,9 @@ class DriftMemory {

  @override
  bool operator ==(covariant DriftMemory other) {
-    if (identical(this, other)) return true;
+    if (identical(this, other)) {
+      return true;
+    }
    final listEquals = const DeepCollectionEquality().equals;

    return other.id == id &&
@@ -165,15 +165,21 @@ final class _MapCodec<K extends Object, V extends Object> extends _MetadataCodec
  Map<K, V>? decode(String raw) {
    try {
      final decoded = jsonDecode(raw);
-      if (decoded is! Map) return null;
+      if (decoded is! Map) {
+        return null;
+      }
      final result = <K, V>{};
      for (final entry in decoded.entries) {
        final rawKey = entry.key;
        final rawValue = entry.value;
-        if (rawKey is! String || rawValue is! String) return null;
+        if (rawKey is! String || rawValue is! String) {
+          return null;
+        }
        final k = _keyCodec.decode(rawKey);
        final v = _valueCodec.decode(rawValue);
-        if (k == null || v == null) return null;
+        if (k == null || v == null) {
+          return null;
+        }
        result[k] = v;
      }
      return result;
@@ -195,12 +201,18 @@ final class _ListCodec<T extends Object> extends _MetadataCodec<List<T>> {
  List<T>? decode(String raw) {
    try {
      final decoded = jsonDecode(raw);
-      if (decoded is! List) return null;
+      if (decoded is! List) {
+        return null;
+      }
      final result = <T>[];
      for (final item in decoded) {
-        if (item is! String) return null;
+        if (item is! String) {
+          return null;
+        }
        final element = _elementCodec.decode(item);
-        if (element == null) return null;
+        if (element == null) {
+          return null;
+        }
        result.add(element);
      }
      return result;
@@ -69,7 +69,9 @@ class PersonDto {

  @override
  bool operator ==(covariant PersonDto other) {
-    if (identical(this, other)) return true;
+    if (identical(this, other)) {
+      return true;
+    }

    return other.id == id &&
        other.birthDate == birthDate &&
@@ -160,7 +162,9 @@ class DriftPerson {

  @override
  bool operator ==(covariant DriftPerson other) {
-    if (identical(this, other)) return true;
+    if (identical(this, other)) {
+      return true;
+    }

    return other.id == id &&
        other.createdAt == createdAt &&
@@ -12,7 +12,9 @@ class SearchResult {

  @override
  bool operator ==(covariant SearchResult other) {
-    if (identical(this, other)) return true;
+    if (identical(this, other)) {
+      return true;
+    }
    final listEquals = const DeepCollectionEquality().equals;

    return listEquals(other.assets, assets) && other.nextPage == nextPage;
@@ -37,7 +37,9 @@ class Stack {

  @override
  bool operator ==(covariant Stack other) {
-    if (identical(this, other)) return true;
+    if (identical(this, other)) {
+      return true;
+    }

    return other.id == id &&
        other.createdAt == createdAt &&
@@ -61,7 +63,9 @@ class StackResponse {

  @override
  bool operator ==(covariant StackResponse other) {
-    if (identical(this, other)) return true;
+    if (identical(this, other)) {
+      return true;
+    }

    return other.id == id && other.primaryAssetId == primaryAssetId && other.assetIds == assetIds;
  }
@@ -81,7 +81,9 @@ StoreDto: {

  @override
  bool operator ==(covariant StoreDto<T> other) {
-    if (identical(this, other)) return true;
+    if (identical(this, other)) {
+      return true;
+    }

    return other.key == key && other.value == value;
  }
@@ -13,7 +13,9 @@ class Tag {

  @override
  bool operator ==(covariant Tag other) {
-    if (identical(this, other)) return true;
+    if (identical(this, other)) {
+      return true;
+    }

    return other.id == id && other.value == value;
  }
@@ -2,6 +2,8 @@ enum GroupAssetsBy { day, month, auto, none }

 enum HeaderType { none, month, day, monthAndDay }

+enum SortAssetsBy { taken, uploaded }
+
 class Bucket {
  final int assetCount;

@@ -125,7 +125,9 @@ profileChangedAt: $profileChangedAt

  @override
  bool operator ==(covariant UserDto other) {
-    if (identical(this, other)) return true;
+    if (identical(this, other)) {
+      return true;
+    }

    return other.id == id &&
        ((updatedAt == null && other.updatedAt == null) ||
@@ -219,7 +221,9 @@ class PartnerUserDto {

  @override
  bool operator ==(covariant PartnerUserDto other) {
-    if (identical(this, other)) return true;
+    if (identical(this, other)) {
+      return true;
+    }

    return other.id == id &&
        other.email == email &&
@@ -35,7 +35,9 @@ isOnboarded: $isOnboarded,

  @override
  bool operator ==(covariant Onboarding other) {
-    if (identical(this, other)) return true;
+    if (identical(this, other)) {
+      return true;
+    }

    return isOnboarded == other.isOnboarded;
  }
@@ -132,7 +134,9 @@ showSupportBadge: $showSupportBadge,

  @override
  bool operator ==(covariant Preferences other) {
-    if (identical(this, other)) return true;
+    if (identical(this, other)) {
+      return true;
+    }

    return other.foldersEnabled == foldersEnabled &&
        other.memoriesEnabled == memoriesEnabled &&
@@ -199,7 +203,9 @@ licenseKey: $licenseKey,

  @override
  bool operator ==(covariant License other) {
-    if (identical(this, other)) return true;
+    if (identical(this, other)) {
+      return true;
+    }

    return activatedAt == other.activatedAt && activationKey == other.activationKey && licenseKey == other.licenseKey;
  }
@@ -251,7 +257,9 @@ license: ${license ?? "<NA>"},

  @override
  bool operator ==(covariant UserMetadata other) {
-    if (identical(this, other)) return true;
+    if (identical(this, other)) {
+      return true;
+    }

    return other.userId == userId &&
        other.key == key &&
@@ -105,46 +105,58 @@ class BackgroundWorkerBgService extends BackgroundWorkerFlutterApi {
  }

  @override
-  Future<void> onAndroidUpload() async {
-    _logger.info('Android background processing started');
-    final sw = Stopwatch()..start();
-    try {
-      if (!await _syncAssets(hashTimeout: Duration(minutes: _isBackupEnabled ? 3 : 6))) {
-        _logger.warning("Remote sync did not complete successfully, skipping backup");
-        return;
-      }
-      await _handleBackup();
-    } catch (error, stack) {
-      _logger.severe("Failed to complete Android background processing", error, stack);
-    } finally {
-      sw.stop();
-      _logger.info("Android background processing completed in ${sw.elapsed.inSeconds}s");
-      await _cleanup();
-    }
+  Future<void> onAndroidUpload(int? maxMinutes) async {
+    final hashTimeout = Duration(minutes: _isBackupEnabled ? 3 : 6);
+    final backupTimeout = maxMinutes != null ? Duration(minutes: maxMinutes - 1) : null;
+    return _backgroundLoop(
+      hashTimeout: hashTimeout,
+      backupTimeout: backupTimeout,
+      debugLabel: 'Android background upload',
+    );
  }

  @override
  Future<void> onIosUpload(bool isRefresh, int? maxSeconds) async {
-    _logger.info('iOS background upload started with maxSeconds: ${maxSeconds}s');
+    final hashTimeout = isRefresh ? const Duration(seconds: 5) : Duration(minutes: _isBackupEnabled ? 3 : 6);
+    final backupTimeout = maxSeconds != null ? Duration(seconds: maxSeconds - 1) : null;
+    return _backgroundLoop(hashTimeout: hashTimeout, backupTimeout: backupTimeout, debugLabel: 'iOS background upload');
+  }
+
+  Future<void> _backgroundLoop({
+    required Duration hashTimeout,
+    required Duration? backupTimeout,
+    required String debugLabel,
+  }) async {
+    _logger.info(
+      '$debugLabel started hashTimeout: ${hashTimeout.inSeconds}s, backupTimeout: ${backupTimeout?.inMinutes ?? '~'}m',
+    );
    final sw = Stopwatch()..start();
    try {
-      final timeout = isRefresh ? const Duration(seconds: 5) : Duration(minutes: _isBackupEnabled ? 3 : 6);
-      if (!await _syncAssets(hashTimeout: timeout)) {
+      if (!await _syncAssets(hashTimeout: hashTimeout)) {
        _logger.warning("Remote sync did not complete successfully, skipping backup");
        return;
      }

      final backupFuture = _handleBackup();
-      if (maxSeconds != null) {
-        await backupFuture.timeout(Duration(seconds: maxSeconds - 1), onTimeout: () {});
-      } else {
+      Timer? cancelTimer;
+      if (backupTimeout != null) {
+        cancelTimer = Timer(backupTimeout, () {
+          if (!_cancellationToken.isCompleted) {
+            _logger.warning("$debugLabel timed out after ${backupTimeout.inMinutes}m, cancelling backup");
+            _cancellationToken.complete();
+          }
+        });
+      }
+      try {
        await backupFuture;
+      } finally {
+        cancelTimer?.cancel();
      }
    } catch (error, stack) {
-      _logger.severe("Failed to complete iOS background upload", error, stack);
+      _logger.severe("Failed to complete $debugLabel", error, stack);
    } finally {
      sw.stop();
-      _logger.info("iOS background upload completed in ${sw.elapsed.inSeconds}s");
+      _logger.info("$debugLabel completed in ${sw.elapsed.inSeconds}s");
      await _cleanup();
    }
  }
@@ -176,15 +188,10 @@ class BackgroundWorkerBgService extends BackgroundWorkerFlutterApi {
      final backgroundSyncManager = _ref?.read(backgroundSyncProvider);
      final nativeSyncApi = _ref?.read(nativeSyncApiProvider);

-      await _drift.close();
-      await _driftLogger.close();
-
-      _ref?.dispose();
-      _ref = null;
-
-      _cancellationToken.complete();
      _logger.info("Cleaning up background worker");
-
+      if (!_cancellationToken.isCompleted) {
+        _cancellationToken.complete();
+      }
      final cleanupFutures = [
        nativeSyncApi?.cancelHashing(),
        workerManagerPatch.dispose().catchError((_) async {
@@ -195,10 +202,15 @@ class BackgroundWorkerBgService extends BackgroundWorkerFlutterApi {
        Store.dispose(),

        backgroundSyncManager?.cancel(),
+        _drift.optimize(allTables: true),
      ];

      await Future.wait(cleanupFutures.nonNulls);
-      _logger.info("Background worker resources cleaned up");
+      await _drift.close();
+      await _driftLogger.close();
+
+      _ref?.dispose();
+      _ref = null;
    } catch (error, stack) {
      dPrint(() => 'Failed to cleanup background worker: $error with stack: $stack');
    }
@@ -184,7 +184,9 @@ class RemoteAlbumService {
    List<RemoteAlbum> albums, {
    required AssetDateAggregation aggregation,
  }) async {
-    if (albums.isEmpty) return [];
+    if (albums.isEmpty) {
+      return [];
+    }

    final albumIds = albums.map((e) => e.id).toList();
    final sortedIds = await _repository.getSortedAlbumIds(albumIds, aggregation: aggregation);
@@ -72,7 +72,9 @@ class StoreService {

  /// Stores the [value] for the [key]. Skips write if value hasn't changed.
  Future<void> put<U extends StoreKey<T>, T>(U key, T value) async {
-    if (_cache[key.id] == value) return;
+    if (_cache[key.id] == value) {
+      return;
+    }
    await _storeRepository.upsert(key, value);
    _cache[key.id] = value;
  }
@@ -24,6 +24,7 @@ enum SyncMigrationTask {
  v20260128_ResetExifV1, // EXIF table has incorrect width and height information.
  v20260128_CopyExifWidthHeightToAsset, // Asset table has incorrect width and height for video ratio calculations.
  v20260128_ResetAssetV1, // Asset v2.5.0 has width and height information that were edited assets.
+  v20260597_ResetAssetV1AssetV2, // Assets didn't include the uploadedAt column.
 }

 class SyncStreamService {
@@ -132,6 +133,13 @@ class SyncStreamService {
        migrations.add(SyncMigrationTask.v20260128_CopyExifWidthHeightToAsset.name);
      }
    }
+
+    if (!migrations.contains(SyncMigrationTask.v20260597_ResetAssetV1AssetV2.name) &&
+        semVer > const SemVer(major: 2, minor: 7, patch: 5)) {
+      _logger.info("Running pre-sync task: v20260597_ResetAssetV1AssetV2");
+      await _syncApiRepository.deleteSyncAck([SyncEntityType.assetV1, SyncEntityType.assetV2]);
+      migrations.add(SyncMigrationTask.v20260597_ResetAssetV1AssetV2.name);
+    }
  }

  Future<void> _runPostSyncTasks(List<String> migrations) async {
@@ -318,7 +326,9 @@ class SyncStreamService {
  }

  Future<void> handleWsAssetUploadReadyV1Batch(List<dynamic> batchData) async {
-    if (batchData.isEmpty) return;
+    if (batchData.isEmpty) {
+      return;
+    }

    _logger.info('Processing batch of ${batchData.length} AssetUploadReadyV1 events');

@@ -359,7 +369,9 @@ class SyncStreamService {
  }

  Future<void> handleWsAssetUploadReadyV2Batch(List<dynamic> batchData) async {
-    if (batchData.isEmpty) return;
+    if (batchData.isEmpty) {
+      return;
+    }

    _logger.info('Processing batch of ${batchData.length} AssetUploadReadyV2 events');

@@ -34,6 +34,7 @@ enum TimelineOrigin {
  deepLink,
  albumActivities,
  folder,
+  recentlyAdded,
 }

 class TimelineFactory {
@@ -62,6 +63,8 @@ class TimelineFactory {

  TimelineService remoteAssets(String userId) => TimelineService(_timelineRepository.remote(userId, groupBy));

+  TimelineService recentlyAdded(String userId) => TimelineService(_timelineRepository.recentlyAdded(userId, groupBy));
+
  TimelineService favorite(String userId) => TimelineService(_timelineRepository.favorite(userId, groupBy));

  TimelineService trash(String userId) => TimelineService(_timelineRepository.trash(userId, groupBy));
@@ -30,7 +30,9 @@ class UserService {

  Future<UserDto?> refreshMyUser() async {
    final user = await _userApiRepository.getMyUser();
-    if (user == null) return null;
+    if (user == null) {
+      return null;
+    }
    await _storeService.put(StoreKey.currentUser, user);
    return user;
  }
@@ -11,6 +11,7 @@ extension DTOToAsset on api.AssetResponseDto {
      checksum: checksum,
      createdAt: fileCreatedAt,
      updatedAt: updatedAt,
+      uploadedAt: createdAt,
      ownerId: ownerId,
      visibility: visibility.toAssetVisibility(),
      durationMs: duration,
@@ -33,6 +34,7 @@ extension DTOToAsset on api.AssetResponseDto {
      checksum: checksum,
      createdAt: fileCreatedAt,
      updatedAt: updatedAt,
+      uploadedAt: createdAt,
      ownerId: ownerId,
      visibility: visibility.toAssetVisibility(),
      durationMs: duration,
@@ -94,8 +94,12 @@ class SnapScrollPhysics extends ScrollPhysics {
  bool get allowUserScrolling => false;

  static double target(ScrollMetrics position, double velocity, double snapOffset) {
-    if (velocity > _minFlingVelocity) return snapOffset;
-    if (velocity < -_minFlingVelocity) return position.pixels < snapOffset ? 0.0 : snapOffset;
+    if (velocity > _minFlingVelocity) {
+      return snapOffset;
+    }
+    if (velocity < -_minFlingVelocity) {
+      return position.pixels < snapOffset ? 0.0 : snapOffset;
+    }
    return position.pixels < minSnapDistance ? 0.0 : snapOffset;
  }
 }
@@ -5,6 +5,11 @@ import 'package:immich_mobile/infrastructure/utils/drift_default.mixin.dart';

@TableIndex.sql('CREATE INDEX IF NOT EXISTS idx_asset_face_person_id ON asset_face_entity (person_id)')
@TableIndex.sql('CREATE INDEX IF NOT EXISTS idx_asset_face_asset_id ON asset_face_entity (asset_id)')
+@TableIndex.sql('''
+CREATE INDEX IF NOT EXISTS idx_asset_face_visible_person
+ON asset_face_entity (person_id, asset_id)
+WHERE is_visible = 1 AND deleted_at IS NULL
+''')
 class AssetFaceEntity extends Table with DriftDefaultsMixin {
  const AssetFaceEntity();

@@ -1350,3 +1350,7 @@ i0.Index get idxAssetFaceAssetId => i0.Index(
  'idx_asset_face_asset_id',
  'CREATE INDEX IF NOT EXISTS idx_asset_face_asset_id ON asset_face_entity (asset_id)',
 );
+i0.Index get idxAssetFaceVisiblePerson => i0.Index(
+  'idx_asset_face_visible_person',
+  'CREATE INDEX IF NOT EXISTS idx_asset_face_visible_person ON asset_face_entity (person_id, asset_id) WHERE is_visible = 1 AND deleted_at IS NULL',
+);
@@ -6,6 +6,10 @@ import 'package:immich_mobile/infrastructure/utils/drift_default.mixin.dart';
 import 'package:immich_mobile/infrastructure/utils/exif.converter.dart';

@TableIndex.sql('CREATE INDEX IF NOT EXISTS idx_lat_lng ON remote_exif_entity (latitude, longitude)')
+@TableIndex.sql('''
+CREATE INDEX IF NOT EXISTS idx_remote_exif_city
+ON remote_exif_entity (city) WHERE city IS NOT NULL
+''')
 class RemoteExifEntity extends Table with DriftDefaultsMixin {
  const RemoteExifEntity();

@@ -1883,3 +1883,8 @@ class RemoteExifEntityCompanion
        .toString();
  }
 }
+
+i0.Index get idxRemoteExifCity => i0.Index(
+  'idx_remote_exif_city',
+  'CREATE INDEX IF NOT EXISTS idx_remote_exif_city ON remote_exif_entity (city) WHERE city IS NOT NULL',
+);
@@ -4,7 +4,7 @@ import 'local_asset.entity.dart';
 import 'local_album.entity.dart';
 import 'local_album_asset.entity.dart';

-mergedAsset: 
+mergedAsset:
 SELECT
 	rae.id as remote_id,
 	(SELECT lae.id FROM local_asset_entity lae WHERE lae.checksum = rae.checksum LIMIT 1) as local_id,
@@ -27,7 +27,8 @@ SELECT
 	NULL as longitude,
 	NULL as adjustmentTime,
 	rae.is_edited,
-	0 as playback_style
+	0 as playback_style,
+	rae.uploaded_at
 FROM
 	remote_asset_entity rae
 LEFT JOIN
@@ -65,7 +66,8 @@ SELECT
 	lae.longitude,
 	lae.adjustment_time,
 	0 as is_edited,
-	lae.playback_style
+	lae.playback_style,
+	NULL as uploaded_at
 FROM
 	local_asset_entity lae
 WHERE NOT EXISTS (
@@ -29,7 +29,7 @@ class MergedAssetDrift extends i1.ModularAccessor {
    );
    $arrayStartIndex += generatedlimit.amountOfVariables;
    return customSelect(
-      'SELECT rae.id AS remote_id, (SELECT lae.id FROM local_asset_entity AS lae WHERE lae.checksum = rae.checksum LIMIT 1) AS local_id, rae.name, rae.type, rae.created_at AS created_at, rae.updated_at, rae.width, rae.height, rae.duration_ms, rae.is_favorite, rae.thumb_hash, rae.checksum, rae.owner_id, rae.live_photo_video_id, 0 AS orientation, rae.stack_id, NULL AS i_cloud_id, NULL AS latitude, NULL AS longitude, NULL AS adjustmentTime, rae.is_edited, 0 AS playback_style FROM remote_asset_entity AS rae LEFT JOIN stack_entity AS se ON rae.stack_id = se.id WHERE rae.deleted_at IS NULL AND rae.visibility = 0 AND rae.owner_id IN ($expandeduserIds) AND(rae.stack_id IS NULL OR rae.id = se.primary_asset_id)UNION ALL SELECT NULL AS remote_id, lae.id AS local_id, lae.name, lae.type, lae.created_at AS created_at, lae.updated_at, lae.width, lae.height, lae.duration_ms, lae.is_favorite, NULL AS thumb_hash, lae.checksum, NULL AS owner_id, NULL AS live_photo_video_id, lae.orientation, NULL AS stack_id, lae.i_cloud_id, lae.latitude, lae.longitude, lae.adjustment_time, 0 AS is_edited, lae.playback_style FROM local_asset_entity AS lae WHERE NOT EXISTS (SELECT 1 FROM remote_asset_entity AS rae WHERE rae.checksum = lae.checksum AND rae.owner_id IN ($expandeduserIds)) AND EXISTS (SELECT 1 FROM local_album_asset_entity AS laa INNER JOIN local_album_entity AS la ON laa.album_id = la.id WHERE laa.asset_id = lae.id AND la.backup_selection = 0) AND NOT EXISTS (SELECT 1 FROM local_album_asset_entity AS laa INNER JOIN local_album_entity AS la ON laa.album_id = la.id WHERE laa.asset_id = lae.id AND la.backup_selection = 2) ORDER BY created_at DESC ${generatedlimit.sql}',
+      'SELECT rae.id AS remote_id, (SELECT lae.id FROM local_asset_entity AS lae WHERE lae.checksum = rae.checksum LIMIT 1) AS local_id, rae.name, rae.type, rae.created_at AS created_at, rae.updated_at, rae.width, rae.height, rae.duration_ms, rae.is_favorite, rae.thumb_hash, rae.checksum, rae.owner_id, rae.live_photo_video_id, 0 AS orientation, rae.stack_id, NULL AS i_cloud_id, NULL AS latitude, NULL AS longitude, NULL AS adjustmentTime, rae.is_edited, 0 AS playback_style, rae.uploaded_at FROM remote_asset_entity AS rae LEFT JOIN stack_entity AS se ON rae.stack_id = se.id WHERE rae.deleted_at IS NULL AND rae.visibility = 0 AND rae.owner_id IN ($expandeduserIds) AND(rae.stack_id IS NULL OR rae.id = se.primary_asset_id)UNION ALL SELECT NULL AS remote_id, lae.id AS local_id, lae.name, lae.type, lae.created_at AS created_at, lae.updated_at, lae.width, lae.height, lae.duration_ms, lae.is_favorite, NULL AS thumb_hash, lae.checksum, NULL AS owner_id, NULL AS live_photo_video_id, lae.orientation, NULL AS stack_id, lae.i_cloud_id, lae.latitude, lae.longitude, lae.adjustment_time, 0 AS is_edited, lae.playback_style, NULL AS uploaded_at FROM local_asset_entity AS lae WHERE NOT EXISTS (SELECT 1 FROM remote_asset_entity AS rae WHERE rae.checksum = lae.checksum AND rae.owner_id IN ($expandeduserIds)) AND EXISTS (SELECT 1 FROM local_album_asset_entity AS laa INNER JOIN local_album_entity AS la ON laa.album_id = la.id WHERE laa.asset_id = lae.id AND la.backup_selection = 0) AND NOT EXISTS (SELECT 1 FROM local_album_asset_entity AS laa INNER JOIN local_album_entity AS la ON laa.album_id = la.id WHERE laa.asset_id = lae.id AND la.backup_selection = 2) ORDER BY created_at DESC ${generatedlimit.sql}',
      variables: [
        for (var $ in userIds) i0.Variable<String>($),
        ...generatedlimit.introducedVariables,
@@ -68,6 +68,7 @@ class MergedAssetDrift extends i1.ModularAccessor {
        adjustmentTime: row.readNullable<DateTime>('adjustmentTime'),
        isEdited: row.read<bool>('is_edited'),
        playbackStyle: row.read<int>('playback_style'),
+        uploadedAt: row.readNullable<DateTime>('uploaded_at'),
      ),
    );
  }
@@ -141,6 +142,7 @@ class MergedAssetResult {
  final DateTime? adjustmentTime;
  final bool isEdited;
  final int playbackStyle;
+  final DateTime? uploadedAt;
  MergedAssetResult({
    this.remoteId,
    this.localId,
@@ -164,6 +166,7 @@ class MergedAssetResult {
    this.adjustmentTime,
    required this.isEdited,
    required this.playbackStyle,
+    this.uploadedAt,
  });
 }

@@ -5,9 +5,6 @@ import 'package:immich_mobile/infrastructure/entities/user.entity.dart';
 import 'package:immich_mobile/infrastructure/utils/asset.mixin.dart';
 import 'package:immich_mobile/infrastructure/utils/drift_default.mixin.dart';

-@TableIndex.sql(
-  'CREATE INDEX IF NOT EXISTS idx_remote_asset_owner_checksum ON remote_asset_entity (owner_id, checksum)',
-)
@TableIndex.sql('''
 CREATE UNIQUE INDEX IF NOT EXISTS UQ_remote_assets_owner_checksum
 ON remote_asset_entity (owner_id, checksum)
@@ -20,12 +17,10 @@ WHERE (library_id IS NOT NULL);
 ''')
@TableIndex.sql('CREATE INDEX IF NOT EXISTS idx_remote_asset_checksum ON remote_asset_entity (checksum)')
@TableIndex.sql('CREATE INDEX IF NOT EXISTS idx_remote_asset_stack_id ON remote_asset_entity (stack_id)')
-@TableIndex.sql(
-  "CREATE INDEX IF NOT EXISTS idx_remote_asset_local_date_time_day ON remote_asset_entity (STRFTIME('%Y-%m-%d', local_date_time))",
-)
-@TableIndex.sql(
-  "CREATE INDEX IF NOT EXISTS idx_remote_asset_local_date_time_month ON remote_asset_entity (STRFTIME('%Y-%m', local_date_time))",
-)
+@TableIndex.sql('''
+CREATE INDEX IF NOT EXISTS idx_remote_asset_owner_visibility_deleted_created
+ON remote_asset_entity (owner_id, visibility, deleted_at, created_at DESC)
+''')
 class RemoteAssetEntity extends Table with DriftDefaultsMixin, AssetEntityMixin {
  const RemoteAssetEntity();

@@ -43,6 +38,8 @@ class RemoteAssetEntity extends Table with DriftDefaultsMixin, AssetEntityMixin

  DateTimeColumn get deletedAt => dateTime().nullable()();

+  DateTimeColumn get uploadedAt => dateTime().nullable()();
+
  TextColumn get livePhotoVideoId => text().nullable()();

  IntColumn get visibility => intEnum<AssetVisibility>()();
@@ -66,6 +63,7 @@ extension RemoteAssetEntityDataDomainEx on RemoteAssetEntityData {
    type: type,
    createdAt: createdAt,
    updatedAt: updatedAt,
+    uploadedAt: uploadedAt,
    durationMs: durationMs,
    isFavorite: isFavorite,
    height: height,
@@ -27,6 +27,7 @@ typedef $$RemoteAssetEntityTableCreateCompanionBuilder =
      i0.Value<DateTime?> localDateTime,
      i0.Value<String?> thumbHash,
      i0.Value<DateTime?> deletedAt,
+      i0.Value<DateTime?> uploadedAt,
      i0.Value<String?> livePhotoVideoId,
      required i2.AssetVisibility visibility,
      i0.Value<String?> stackId,
@@ -49,6 +50,7 @@ typedef $$RemoteAssetEntityTableUpdateCompanionBuilder =
      i0.Value<DateTime?> localDateTime,
      i0.Value<String?> thumbHash,
      i0.Value<DateTime?> deletedAt,
+      i0.Value<DateTime?> uploadedAt,
      i0.Value<String?> livePhotoVideoId,
      i0.Value<i2.AssetVisibility> visibility,
      i0.Value<String?> stackId,
@@ -177,6 +179,11 @@ class $$RemoteAssetEntityTableFilterComposer
    builder: (column) => i0.ColumnFilters(column),
  );

+  i0.ColumnFilters<DateTime> get uploadedAt => $composableBuilder(
+    column: $table.uploadedAt,
+    builder: (column) => i0.ColumnFilters(column),
+  );
+
  i0.ColumnFilters<String> get livePhotoVideoId => $composableBuilder(
    column: $table.livePhotoVideoId,
    builder: (column) => i0.ColumnFilters(column),
@@ -305,6 +312,11 @@ class $$RemoteAssetEntityTableOrderingComposer
    builder: (column) => i0.ColumnOrderings(column),
  );

+  i0.ColumnOrderings<DateTime> get uploadedAt => $composableBuilder(
+    column: $table.uploadedAt,
+    builder: (column) => i0.ColumnOrderings(column),
+  );
+
  i0.ColumnOrderings<String> get livePhotoVideoId => $composableBuilder(
    column: $table.livePhotoVideoId,
    builder: (column) => i0.ColumnOrderings(column),
@@ -412,6 +424,11 @@ class $$RemoteAssetEntityTableAnnotationComposer
  i0.GeneratedColumn<DateTime> get deletedAt =>
      $composableBuilder(column: $table.deletedAt, builder: (column) => column);

+  i0.GeneratedColumn<DateTime> get uploadedAt => $composableBuilder(
+    column: $table.uploadedAt,
+    builder: (column) => column,
+  );
+
  i0.GeneratedColumn<String> get livePhotoVideoId => $composableBuilder(
    column: $table.livePhotoVideoId,
    builder: (column) => column,
@@ -507,6 +524,7 @@ class $$RemoteAssetEntityTableTableManager
                i0.Value<DateTime?> localDateTime = const i0.Value.absent(),
                i0.Value<String?> thumbHash = const i0.Value.absent(),
                i0.Value<DateTime?> deletedAt = const i0.Value.absent(),
+                i0.Value<DateTime?> uploadedAt = const i0.Value.absent(),
                i0.Value<String?> livePhotoVideoId = const i0.Value.absent(),
                i0.Value<i2.AssetVisibility> visibility =
                    const i0.Value.absent(),
@@ -528,6 +546,7 @@ class $$RemoteAssetEntityTableTableManager
                localDateTime: localDateTime,
                thumbHash: thumbHash,
                deletedAt: deletedAt,
+                uploadedAt: uploadedAt,
                livePhotoVideoId: livePhotoVideoId,
                visibility: visibility,
                stackId: stackId,
@@ -550,6 +569,7 @@ class $$RemoteAssetEntityTableTableManager
                i0.Value<DateTime?> localDateTime = const i0.Value.absent(),
                i0.Value<String?> thumbHash = const i0.Value.absent(),
                i0.Value<DateTime?> deletedAt = const i0.Value.absent(),
+                i0.Value<DateTime?> uploadedAt = const i0.Value.absent(),
                i0.Value<String?> livePhotoVideoId = const i0.Value.absent(),
                required i2.AssetVisibility visibility,
                i0.Value<String?> stackId = const i0.Value.absent(),
@@ -570,6 +590,7 @@ class $$RemoteAssetEntityTableTableManager
                localDateTime: localDateTime,
                thumbHash: thumbHash,
                deletedAt: deletedAt,
+                uploadedAt: uploadedAt,
                livePhotoVideoId: livePhotoVideoId,
                visibility: visibility,
                stackId: stackId,
@@ -645,9 +666,9 @@ typedef $$RemoteAssetEntityTableProcessedTableManager =
      i1.RemoteAssetEntityData,
      i0.PrefetchHooks Function({bool ownerId})
    >;
-i0.Index get idxRemoteAssetOwnerChecksum => i0.Index(
-  'idx_remote_asset_owner_checksum',
-  'CREATE INDEX IF NOT EXISTS idx_remote_asset_owner_checksum ON remote_asset_entity (owner_id, checksum)',
+i0.Index get uQRemoteAssetsOwnerChecksum => i0.Index(
+  'UQ_remote_assets_owner_checksum',
+  'CREATE UNIQUE INDEX IF NOT EXISTS UQ_remote_assets_owner_checksum ON remote_asset_entity (owner_id, checksum) WHERE(library_id IS NULL)',
 );

 class $RemoteAssetEntityTable extends i3.RemoteAssetEntity
@@ -818,6 +839,18 @@ class $RemoteAssetEntityTable extends i3.RemoteAssetEntity
        type: i0.DriftSqlType.dateTime,
        requiredDuringInsert: false,
      );
+  static const i0.VerificationMeta _uploadedAtMeta = const i0.VerificationMeta(
+    'uploadedAt',
+  );
+  @override
+  late final i0.GeneratedColumn<DateTime> uploadedAt =
+      i0.GeneratedColumn<DateTime>(
+        'uploaded_at',
+        aliasedName,
+        true,
+        type: i0.DriftSqlType.dateTime,
+        requiredDuringInsert: false,
+      );
  static const i0.VerificationMeta _livePhotoVideoIdMeta =
      const i0.VerificationMeta('livePhotoVideoId');
  @override
@@ -894,6 +927,7 @@ class $RemoteAssetEntityTable extends i3.RemoteAssetEntity
    localDateTime,
    thumbHash,
    deletedAt,
+    uploadedAt,
    livePhotoVideoId,
    visibility,
    stackId,
@@ -998,6 +1032,12 @@ class $RemoteAssetEntityTable extends i3.RemoteAssetEntity
        deletedAt.isAcceptableOrUnknown(data['deleted_at']!, _deletedAtMeta),
      );
    }
+    if (data.containsKey('uploaded_at')) {
+      context.handle(
+        _uploadedAtMeta,
+        uploadedAt.isAcceptableOrUnknown(data['uploaded_at']!, _uploadedAtMeta),
+      );
+    }
    if (data.containsKey('live_photo_video_id')) {
      context.handle(
        _livePhotoVideoIdMeta,
@@ -1095,6 +1135,10 @@ class $RemoteAssetEntityTable extends i3.RemoteAssetEntity
        i0.DriftSqlType.dateTime,
        data['${effectivePrefix}deleted_at'],
      ),
+      uploadedAt: attachedDatabase.typeMapping.read(
+        i0.DriftSqlType.dateTime,
+        data['${effectivePrefix}uploaded_at'],
+      ),
      livePhotoVideoId: attachedDatabase.typeMapping.read(
        i0.DriftSqlType.string,
        data['${effectivePrefix}live_photo_video_id'],
@@ -1153,6 +1197,7 @@ class RemoteAssetEntityData extends i0.DataClass
  final DateTime? localDateTime;
  final String? thumbHash;
  final DateTime? deletedAt;
+  final DateTime? uploadedAt;
  final String? livePhotoVideoId;
  final i2.AssetVisibility visibility;
  final String? stackId;
@@ -1173,6 +1218,7 @@ class RemoteAssetEntityData extends i0.DataClass
    this.localDateTime,
    this.thumbHash,
    this.deletedAt,
+    this.uploadedAt,
    this.livePhotoVideoId,
    required this.visibility,
    this.stackId,
@@ -1212,6 +1258,9 @@ class RemoteAssetEntityData extends i0.DataClass
    if (!nullToAbsent || deletedAt != null) {
      map['deleted_at'] = i0.Variable<DateTime>(deletedAt);
    }
+    if (!nullToAbsent || uploadedAt != null) {
+      map['uploaded_at'] = i0.Variable<DateTime>(uploadedAt);
+    }
    if (!nullToAbsent || livePhotoVideoId != null) {
      map['live_photo_video_id'] = i0.Variable<String>(livePhotoVideoId);
    }
@@ -1252,6 +1301,7 @@ class RemoteAssetEntityData extends i0.DataClass
      localDateTime: serializer.fromJson<DateTime?>(json['localDateTime']),
      thumbHash: serializer.fromJson<String?>(json['thumbHash']),
      deletedAt: serializer.fromJson<DateTime?>(json['deletedAt']),
+      uploadedAt: serializer.fromJson<DateTime?>(json['uploadedAt']),
      livePhotoVideoId: serializer.fromJson<String?>(json['livePhotoVideoId']),
      visibility: i1.$RemoteAssetEntityTable.$convertervisibility.fromJson(
        serializer.fromJson<int>(json['visibility']),
@@ -1281,6 +1331,7 @@ class RemoteAssetEntityData extends i0.DataClass
      'localDateTime': serializer.toJson<DateTime?>(localDateTime),
      'thumbHash': serializer.toJson<String?>(thumbHash),
      'deletedAt': serializer.toJson<DateTime?>(deletedAt),
+      'uploadedAt': serializer.toJson<DateTime?>(uploadedAt),
      'livePhotoVideoId': serializer.toJson<String?>(livePhotoVideoId),
      'visibility': serializer.toJson<int>(
        i1.$RemoteAssetEntityTable.$convertervisibility.toJson(visibility),
@@ -1306,6 +1357,7 @@ class RemoteAssetEntityData extends i0.DataClass
    i0.Value<DateTime?> localDateTime = const i0.Value.absent(),
    i0.Value<String?> thumbHash = const i0.Value.absent(),
    i0.Value<DateTime?> deletedAt = const i0.Value.absent(),
+    i0.Value<DateTime?> uploadedAt = const i0.Value.absent(),
    i0.Value<String?> livePhotoVideoId = const i0.Value.absent(),
    i2.AssetVisibility? visibility,
    i0.Value<String?> stackId = const i0.Value.absent(),
@@ -1328,6 +1380,7 @@ class RemoteAssetEntityData extends i0.DataClass
        : this.localDateTime,
    thumbHash: thumbHash.present ? thumbHash.value : this.thumbHash,
    deletedAt: deletedAt.present ? deletedAt.value : this.deletedAt,
+    uploadedAt: uploadedAt.present ? uploadedAt.value : this.uploadedAt,
    livePhotoVideoId: livePhotoVideoId.present
        ? livePhotoVideoId.value
        : this.livePhotoVideoId,
@@ -1358,6 +1411,9 @@ class RemoteAssetEntityData extends i0.DataClass
          : this.localDateTime,
      thumbHash: data.thumbHash.present ? data.thumbHash.value : this.thumbHash,
      deletedAt: data.deletedAt.present ? data.deletedAt.value : this.deletedAt,
+      uploadedAt: data.uploadedAt.present
+          ? data.uploadedAt.value
+          : this.uploadedAt,
      livePhotoVideoId: data.livePhotoVideoId.present
          ? data.livePhotoVideoId.value
          : this.livePhotoVideoId,
@@ -1387,6 +1443,7 @@ class RemoteAssetEntityData extends i0.DataClass
          ..write('localDateTime: $localDateTime, ')
          ..write('thumbHash: $thumbHash, ')
          ..write('deletedAt: $deletedAt, ')
+          ..write('uploadedAt: $uploadedAt, ')
          ..write('livePhotoVideoId: $livePhotoVideoId, ')
          ..write('visibility: $visibility, ')
          ..write('stackId: $stackId, ')
@@ -1412,6 +1469,7 @@ class RemoteAssetEntityData extends i0.DataClass
    localDateTime,
    thumbHash,
    deletedAt,
+    uploadedAt,
    livePhotoVideoId,
    visibility,
    stackId,
@@ -1436,6 +1494,7 @@ class RemoteAssetEntityData extends i0.DataClass
          other.localDateTime == this.localDateTime &&
          other.thumbHash == this.thumbHash &&
          other.deletedAt == this.deletedAt &&
+          other.uploadedAt == this.uploadedAt &&
          other.livePhotoVideoId == this.livePhotoVideoId &&
          other.visibility == this.visibility &&
          other.stackId == this.stackId &&
@@ -1459,6 +1518,7 @@ class RemoteAssetEntityCompanion
  final i0.Value<DateTime?> localDateTime;
  final i0.Value<String?> thumbHash;
  final i0.Value<DateTime?> deletedAt;
+  final i0.Value<DateTime?> uploadedAt;
  final i0.Value<String?> livePhotoVideoId;
  final i0.Value<i2.AssetVisibility> visibility;
  final i0.Value<String?> stackId;
@@ -1479,6 +1539,7 @@ class RemoteAssetEntityCompanion
    this.localDateTime = const i0.Value.absent(),
    this.thumbHash = const i0.Value.absent(),
    this.deletedAt = const i0.Value.absent(),
+    this.uploadedAt = const i0.Value.absent(),
    this.livePhotoVideoId = const i0.Value.absent(),
    this.visibility = const i0.Value.absent(),
    this.stackId = const i0.Value.absent(),
@@ -1500,6 +1561,7 @@ class RemoteAssetEntityCompanion
    this.localDateTime = const i0.Value.absent(),
    this.thumbHash = const i0.Value.absent(),
    this.deletedAt = const i0.Value.absent(),
+    this.uploadedAt = const i0.Value.absent(),
    this.livePhotoVideoId = const i0.Value.absent(),
    required i2.AssetVisibility visibility,
    this.stackId = const i0.Value.absent(),
@@ -1526,6 +1588,7 @@ class RemoteAssetEntityCompanion
    i0.Expression<DateTime>? localDateTime,
    i0.Expression<String>? thumbHash,
    i0.Expression<DateTime>? deletedAt,
+    i0.Expression<DateTime>? uploadedAt,
    i0.Expression<String>? livePhotoVideoId,
    i0.Expression<int>? visibility,
    i0.Expression<String>? stackId,
@@ -1547,6 +1610,7 @@ class RemoteAssetEntityCompanion
      if (localDateTime != null) 'local_date_time': localDateTime,
      if (thumbHash != null) 'thumb_hash': thumbHash,
      if (deletedAt != null) 'deleted_at': deletedAt,
+      if (uploadedAt != null) 'uploaded_at': uploadedAt,
      if (livePhotoVideoId != null) 'live_photo_video_id': livePhotoVideoId,
      if (visibility != null) 'visibility': visibility,
      if (stackId != null) 'stack_id': stackId,
@@ -1570,6 +1634,7 @@ class RemoteAssetEntityCompanion
    i0.Value<DateTime?>? localDateTime,
    i0.Value<String?>? thumbHash,
    i0.Value<DateTime?>? deletedAt,
+    i0.Value<DateTime?>? uploadedAt,
    i0.Value<String?>? livePhotoVideoId,
    i0.Value<i2.AssetVisibility>? visibility,
    i0.Value<String?>? stackId,
@@ -1591,6 +1656,7 @@ class RemoteAssetEntityCompanion
      localDateTime: localDateTime ?? this.localDateTime,
      thumbHash: thumbHash ?? this.thumbHash,
      deletedAt: deletedAt ?? this.deletedAt,
+      uploadedAt: uploadedAt ?? this.uploadedAt,
      livePhotoVideoId: livePhotoVideoId ?? this.livePhotoVideoId,
      visibility: visibility ?? this.visibility,
      stackId: stackId ?? this.stackId,
@@ -1646,6 +1712,9 @@ class RemoteAssetEntityCompanion
    if (deletedAt.present) {
      map['deleted_at'] = i0.Variable<DateTime>(deletedAt.value);
    }
+    if (uploadedAt.present) {
+      map['uploaded_at'] = i0.Variable<DateTime>(uploadedAt.value);
+    }
    if (livePhotoVideoId.present) {
      map['live_photo_video_id'] = i0.Variable<String>(livePhotoVideoId.value);
    }
@@ -1683,6 +1752,7 @@ class RemoteAssetEntityCompanion
          ..write('localDateTime: $localDateTime, ')
          ..write('thumbHash: $thumbHash, ')
          ..write('deletedAt: $deletedAt, ')
+          ..write('uploadedAt: $uploadedAt, ')
          ..write('livePhotoVideoId: $livePhotoVideoId, ')
          ..write('visibility: $visibility, ')
          ..write('stackId: $stackId, ')
@@ -1693,10 +1763,6 @@ class RemoteAssetEntityCompanion
  }
 }

-i0.Index get uQRemoteAssetsOwnerChecksum => i0.Index(
-  'UQ_remote_assets_owner_checksum',
-  'CREATE UNIQUE INDEX IF NOT EXISTS UQ_remote_assets_owner_checksum ON remote_asset_entity (owner_id, checksum) WHERE(library_id IS NULL)',
-);
 i0.Index get uQRemoteAssetsOwnerLibraryChecksum => i0.Index(
  'UQ_remote_assets_owner_library_checksum',
  'CREATE UNIQUE INDEX IF NOT EXISTS UQ_remote_assets_owner_library_checksum ON remote_asset_entity (owner_id, library_id, checksum) WHERE(library_id IS NOT NULL)',
@@ -1709,11 +1775,7 @@ i0.Index get idxRemoteAssetStackId => i0.Index(
  'idx_remote_asset_stack_id',
  'CREATE INDEX IF NOT EXISTS idx_remote_asset_stack_id ON remote_asset_entity (stack_id)',
 );
-i0.Index get idxRemoteAssetLocalDateTimeDay => i0.Index(
-  'idx_remote_asset_local_date_time_day',
-  'CREATE INDEX IF NOT EXISTS idx_remote_asset_local_date_time_day ON remote_asset_entity (STRFTIME(\'%Y-%m-%d\', local_date_time))',
-);
-i0.Index get idxRemoteAssetLocalDateTimeMonth => i0.Index(
-  'idx_remote_asset_local_date_time_month',
-  'CREATE INDEX IF NOT EXISTS idx_remote_asset_local_date_time_month ON remote_asset_entity (STRFTIME(\'%Y-%m\', local_date_time))',
+i0.Index get idxRemoteAssetOwnerVisibilityDeletedCreated => i0.Index(
+  'idx_remote_asset_owner_visibility_deleted_created',
+  'CREATE INDEX IF NOT EXISTS idx_remote_asset_owner_visibility_deleted_created ON remote_asset_entity (owner_id, visibility, deleted_at, created_at DESC)',
 );
@@ -2,15 +2,15 @@ import 'dart:async';
 import 'dart:ffi';
 import 'dart:ui' as ui;

+import 'package:ffi/ffi.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
-import 'package:ffi/ffi.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/providers/infrastructure/platform.provider.dart';

 part 'local_image_request.dart';
-part 'thumbhash_image_request.dart';
 part 'remote_image_request.dart';
+part 'thumbhash_image_request.dart';

 abstract class ImageRequest {
  static int _nextRequestId = 0;
@@ -74,7 +74,9 @@ abstract class ImageRequest {

  Future<ui.FrameInfo?> _fromEncodedPlatformImage(int address, int length) async {
    final result = await _codecFromEncodedPlatformImage(address, length);
-    if (result == null) return null;
+    if (result == null) {
+      return null;
+    }

    final (codec, descriptor) = result;
    if (_isCancelled) {
@@ -46,7 +46,9 @@ class LocalImageRequest extends ImageRequest {
      isVideo: assetType == AssetType.video,
      preferEncoded: true,
    );
-    if (info == null) return null;
+    if (info == null) {
+      return null;
+    }

    final (codec, _) = await _codecFromEncodedPlatformImage(info['pointer']!, info['length']!) ?? (null, null);
    return codec;
@@ -29,7 +29,9 @@ class RemoteImageRequest extends ImageRequest {
    }

    final info = await remoteImageApi.requestImage(uri, requestId: requestId, preferEncoded: true);
-    if (info == null) return null;
+    if (info == null) {
+      return null;
+    }

    final (codec, _) = await _codecFromEncodedPlatformImage(info['pointer']!, info['length']!) ?? (null, null);
    return codec;
@@ -5,7 +5,9 @@ class ApiRepository {

  Future<T> checkNull<T>(Future<T?> future) async {
    final response = await future;
-    if (response == null) throw const NoResponseDtoError();
+    if (response == null) {
+      throw const NoResponseDtoError();
+    }
    return response;
  }
 }
@@ -30,6 +30,7 @@ import 'package:immich_mobile/infrastructure/entities/user.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/user_metadata.entity.dart';
 import 'package:immich_mobile/infrastructure/repositories/db.repository.drift.dart';
 import 'package:immich_mobile/infrastructure/repositories/db.repository.steps.dart';
+import 'package:logging/logging.dart';

@DriftDatabase(
  tables: [
@@ -85,8 +86,19 @@ class Drift extends $Drift {
    });
  }

+  Future<void> optimize({bool allTables = false}) async {
+    try {
+      if (allTables) {
+        await customStatement('PRAGMA optimize=0x10002');
+      }
+      await customStatement('PRAGMA optimize');
+    } catch (error) {
+      Logger('Drift').fine('Failed to optimize database', error);
+    }
+  }
+
  @override
-  int get schemaVersion => 25;
+  int get schemaVersion => 26;

  @override
  MigrationStrategy get migration => MigrationStrategy(
@@ -254,6 +266,15 @@ class Drift extends $Drift {
          },
          from24To25: (m, v25) async {
            await m.createTable(v25.metadata);
+            await customStatement('DROP INDEX IF EXISTS idx_remote_asset_owner_checksum');
+            await customStatement('DROP INDEX IF EXISTS idx_remote_asset_local_date_time_day');
+            await customStatement('DROP INDEX IF EXISTS idx_remote_asset_local_date_time_month');
+            await m.createIndex(v25.idxRemoteAssetOwnerVisibilityDeletedCreated);
+            await m.createIndex(v25.idxRemoteExifCity);
+            await m.createIndex(v25.idxAssetFaceVisiblePerson);
+          },
+          from25To26: (m, v26) async {
+            await m.addColumn(v26.remoteAssetEntity, v26.remoteAssetEntity.uploadedAt);
          },
        ),
      );
@@ -265,6 +286,7 @@ class Drift extends $Drift {
      }

      await customStatement('PRAGMA foreign_keys = ON;');
+      await optimize();
    },
    beforeOpen: (details) async {
      await customStatement('PRAGMA foreign_keys = ON');
@@ -113,13 +113,11 @@ abstract class $Drift extends i0.GeneratedDatabase {
    i4.idxLocalAssetChecksum,
    i4.idxLocalAssetCloudId,
    i3.idxStackPrimaryAssetId,
-    i2.idxRemoteAssetOwnerChecksum,
    i2.uQRemoteAssetsOwnerChecksum,
    i2.uQRemoteAssetsOwnerLibraryChecksum,
    i2.idxRemoteAssetChecksum,
    i2.idxRemoteAssetStackId,
-    i2.idxRemoteAssetLocalDateTimeDay,
-    i2.idxRemoteAssetLocalDateTimeMonth,
+    i2.idxRemoteAssetOwnerVisibilityDeletedCreated,
    authUserEntity,
    userMetadataEntity,
    partnerEntity,
@@ -137,11 +135,13 @@ abstract class $Drift extends i0.GeneratedDatabase {
    metadataEntity,
    i10.idxPartnerSharedWithId,
    i11.idxLatLng,
+    i11.idxRemoteExifCity,
    i12.idxRemoteAlbumAssetAlbumAsset,
    i14.idxRemoteAssetCloudId,
    i17.idxPersonOwnerId,
    i18.idxAssetFacePersonId,
    i18.idxAssetFaceAssetId,
+    i18.idxAssetFaceVisiblePerson,
    i20.idxTrashedLocalAssetChecksum,
    i20.idxTrashedLocalAssetAlbum,
    i21.idxAssetEditAssetId,
@@ -12390,13 +12390,11 @@ final class Schema25 extends i0.VersionedSchema {
    idxLocalAssetChecksum,
    idxLocalAssetCloudId,
    idxStackPrimaryAssetId,
-    idxRemoteAssetOwnerChecksum,
    uQRemoteAssetsOwnerChecksum,
    uQRemoteAssetsOwnerLibraryChecksum,
    idxRemoteAssetChecksum,
    idxRemoteAssetStackId,
-    idxRemoteAssetLocalDateTimeDay,
-    idxRemoteAssetLocalDateTimeMonth,
+    idxRemoteAssetOwnerVisibilityDeletedCreated,
    authUserEntity,
    userMetadataEntity,
    partnerEntity,
@@ -12414,11 +12412,13 @@ final class Schema25 extends i0.VersionedSchema {
    metadata,
    idxPartnerSharedWithId,
    idxLatLng,
+    idxRemoteExifCity,
    idxRemoteAlbumAssetAlbumAsset,
    idxRemoteAssetCloudId,
    idxPersonOwnerId,
    idxAssetFacePersonId,
    idxAssetFaceAssetId,
+    idxAssetFaceVisiblePerson,
    idxTrashedLocalAssetChecksum,
    idxTrashedLocalAssetAlbum,
    idxAssetEditAssetId,
@@ -12583,10 +12583,6 @@ final class Schema25 extends i0.VersionedSchema {
    'idx_stack_primary_asset_id',
    'CREATE INDEX IF NOT EXISTS idx_stack_primary_asset_id ON stack_entity (primary_asset_id)',
  );
-  final i1.Index idxRemoteAssetOwnerChecksum = i1.Index(
-    'idx_remote_asset_owner_checksum',
-    'CREATE INDEX IF NOT EXISTS idx_remote_asset_owner_checksum ON remote_asset_entity (owner_id, checksum)',
-  );
  final i1.Index uQRemoteAssetsOwnerChecksum = i1.Index(
    'UQ_remote_assets_owner_checksum',
    'CREATE UNIQUE INDEX IF NOT EXISTS UQ_remote_assets_owner_checksum ON remote_asset_entity (owner_id, checksum) WHERE(library_id IS NULL)',
@@ -12603,13 +12599,9 @@ final class Schema25 extends i0.VersionedSchema {
    'idx_remote_asset_stack_id',
    'CREATE INDEX IF NOT EXISTS idx_remote_asset_stack_id ON remote_asset_entity (stack_id)',
  );
-  final i1.Index idxRemoteAssetLocalDateTimeDay = i1.Index(
-    'idx_remote_asset_local_date_time_day',
-    'CREATE INDEX IF NOT EXISTS idx_remote_asset_local_date_time_day ON remote_asset_entity (STRFTIME(\'%Y-%m-%d\', local_date_time))',
-  );
-  final i1.Index idxRemoteAssetLocalDateTimeMonth = i1.Index(
-    'idx_remote_asset_local_date_time_month',
-    'CREATE INDEX IF NOT EXISTS idx_remote_asset_local_date_time_month ON remote_asset_entity (STRFTIME(\'%Y-%m\', local_date_time))',
+  final i1.Index idxRemoteAssetOwnerVisibilityDeletedCreated = i1.Index(
+    'idx_remote_asset_owner_visibility_deleted_created',
+    'CREATE INDEX IF NOT EXISTS idx_remote_asset_owner_visibility_deleted_created ON remote_asset_entity (owner_id, visibility, deleted_at, created_at DESC)',
  );
  late final Shape40 authUserEntity = Shape40(
    source: i0.VersionedTable(
@@ -12883,6 +12875,10 @@ final class Schema25 extends i0.VersionedSchema {
    'idx_lat_lng',
    'CREATE INDEX IF NOT EXISTS idx_lat_lng ON remote_exif_entity (latitude, longitude)',
  );
+  final i1.Index idxRemoteExifCity = i1.Index(
+    'idx_remote_exif_city',
+    'CREATE INDEX IF NOT EXISTS idx_remote_exif_city ON remote_exif_entity (city) WHERE city IS NOT NULL',
+  );
  final i1.Index idxRemoteAlbumAssetAlbumAsset = i1.Index(
    'idx_remote_album_asset_album_asset',
    'CREATE INDEX IF NOT EXISTS idx_remote_album_asset_album_asset ON remote_album_asset_entity (album_id, asset_id)',
@@ -12903,6 +12899,10 @@ final class Schema25 extends i0.VersionedSchema {
    'idx_asset_face_asset_id',
    'CREATE INDEX IF NOT EXISTS idx_asset_face_asset_id ON asset_face_entity (asset_id)',
  );
+  final i1.Index idxAssetFaceVisiblePerson = i1.Index(
+    'idx_asset_face_visible_person',
+    'CREATE INDEX IF NOT EXISTS idx_asset_face_visible_person ON asset_face_entity (person_id, asset_id) WHERE is_visible = 1 AND deleted_at IS NULL',
+  );
  final i1.Index idxTrashedLocalAssetChecksum = i1.Index(
    'idx_trashed_local_asset_checksum',
    'CREATE INDEX IF NOT EXISTS idx_trashed_local_asset_checksum ON trashed_local_asset_entity (checksum)',
@@ -12943,6 +12943,602 @@ i1.GeneratedColumn<String> _column_211(String aliasedName) =>
      type: i1.DriftSqlType.string,
      $customConstraints: 'NOT NULL',
    );
+
+final class Schema26 extends i0.VersionedSchema {
+  Schema26({required super.database}) : super(version: 26);
+  @override
+  late final List<i1.DatabaseSchemaEntity> entities = [
+    userEntity,
+    remoteAssetEntity,
+    stackEntity,
+    localAssetEntity,
+    remoteAlbumEntity,
+    localAlbumEntity,
+    localAlbumAssetEntity,
+    idxLocalAlbumAssetAlbumAsset,
+    idxLocalAssetChecksum,
+    idxLocalAssetCloudId,
+    idxStackPrimaryAssetId,
+    uQRemoteAssetsOwnerChecksum,
+    uQRemoteAssetsOwnerLibraryChecksum,
+    idxRemoteAssetChecksum,
+    idxRemoteAssetStackId,
+    idxRemoteAssetOwnerVisibilityDeletedCreated,
+    authUserEntity,
+    userMetadataEntity,
+    partnerEntity,
+    remoteExifEntity,
+    remoteAlbumAssetEntity,
+    remoteAlbumUserEntity,
+    remoteAssetCloudIdEntity,
+    memoryEntity,
+    memoryAssetEntity,
+    personEntity,
+    assetFaceEntity,
+    storeEntity,
+    trashedLocalAssetEntity,
+    assetEditEntity,
+    metadata,
+    idxPartnerSharedWithId,
+    idxLatLng,
+    idxRemoteExifCity,
+    idxRemoteAlbumAssetAlbumAsset,
+    idxRemoteAssetCloudId,
+    idxPersonOwnerId,
+    idxAssetFacePersonId,
+    idxAssetFaceAssetId,
+    idxAssetFaceVisiblePerson,
+    idxTrashedLocalAssetChecksum,
+    idxTrashedLocalAssetAlbum,
+    idxAssetEditAssetId,
+  ];
+  late final Shape33 userEntity = Shape33(
+    source: i0.VersionedTable(
+      entityName: 'user_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [
+        _column_107,
+        _column_108,
+        _column_109,
+        _column_110,
+        _column_111,
+        _column_112,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape50 remoteAssetEntity = Shape50(
+    source: i0.VersionedTable(
+      entityName: 'remote_asset_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [
+        _column_108,
+        _column_113,
+        _column_114,
+        _column_115,
+        _column_116,
+        _column_117,
+        _column_118,
+        _column_107,
+        _column_119,
+        _column_120,
+        _column_121,
+        _column_122,
+        _column_123,
+        _column_124,
+        _column_212,
+        _column_125,
+        _column_126,
+        _column_127,
+        _column_128,
+        _column_129,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape35 stackEntity = Shape35(
+    source: i0.VersionedTable(
+      entityName: 'stack_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [
+        _column_107,
+        _column_114,
+        _column_115,
+        _column_121,
+        _column_130,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape36 localAssetEntity = Shape36(
+    source: i0.VersionedTable(
+      entityName: 'local_asset_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [
+        _column_108,
+        _column_113,
+        _column_114,
+        _column_115,
+        _column_116,
+        _column_117,
+        _column_118,
+        _column_107,
+        _column_131,
+        _column_120,
+        _column_132,
+        _column_133,
+        _column_134,
+        _column_135,
+        _column_136,
+        _column_137,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape48 remoteAlbumEntity = Shape48(
+    source: i0.VersionedTable(
+      entityName: 'remote_album_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [
+        _column_107,
+        _column_108,
+        _column_138,
+        _column_114,
+        _column_115,
+        _column_139,
+        _column_140,
+        _column_141,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape38 localAlbumEntity = Shape38(
+    source: i0.VersionedTable(
+      entityName: 'local_album_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [
+        _column_107,
+        _column_108,
+        _column_115,
+        _column_142,
+        _column_143,
+        _column_144,
+        _column_145,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape39 localAlbumAssetEntity = Shape39(
+    source: i0.VersionedTable(
+      entityName: 'local_album_asset_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(asset_id, album_id)'],
+      columns: [_column_146, _column_147, _column_145],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  final i1.Index idxLocalAlbumAssetAlbumAsset = i1.Index(
+    'idx_local_album_asset_album_asset',
+    'CREATE INDEX IF NOT EXISTS idx_local_album_asset_album_asset ON local_album_asset_entity (album_id, asset_id)',
+  );
+  final i1.Index idxLocalAssetChecksum = i1.Index(
+    'idx_local_asset_checksum',
+    'CREATE INDEX IF NOT EXISTS idx_local_asset_checksum ON local_asset_entity (checksum)',
+  );
+  final i1.Index idxLocalAssetCloudId = i1.Index(
+    'idx_local_asset_cloud_id',
+    'CREATE INDEX IF NOT EXISTS idx_local_asset_cloud_id ON local_asset_entity (i_cloud_id)',
+  );
+  final i1.Index idxStackPrimaryAssetId = i1.Index(
+    'idx_stack_primary_asset_id',
+    'CREATE INDEX IF NOT EXISTS idx_stack_primary_asset_id ON stack_entity (primary_asset_id)',
+  );
+  final i1.Index uQRemoteAssetsOwnerChecksum = i1.Index(
+    'UQ_remote_assets_owner_checksum',
+    'CREATE UNIQUE INDEX IF NOT EXISTS UQ_remote_assets_owner_checksum ON remote_asset_entity (owner_id, checksum) WHERE(library_id IS NULL)',
+  );
+  final i1.Index uQRemoteAssetsOwnerLibraryChecksum = i1.Index(
+    'UQ_remote_assets_owner_library_checksum',
+    'CREATE UNIQUE INDEX IF NOT EXISTS UQ_remote_assets_owner_library_checksum ON remote_asset_entity (owner_id, library_id, checksum) WHERE(library_id IS NOT NULL)',
+  );
+  final i1.Index idxRemoteAssetChecksum = i1.Index(
+    'idx_remote_asset_checksum',
+    'CREATE INDEX IF NOT EXISTS idx_remote_asset_checksum ON remote_asset_entity (checksum)',
+  );
+  final i1.Index idxRemoteAssetStackId = i1.Index(
+    'idx_remote_asset_stack_id',
+    'CREATE INDEX IF NOT EXISTS idx_remote_asset_stack_id ON remote_asset_entity (stack_id)',
+  );
+  final i1.Index idxRemoteAssetOwnerVisibilityDeletedCreated = i1.Index(
+    'idx_remote_asset_owner_visibility_deleted_created',
+    'CREATE INDEX IF NOT EXISTS idx_remote_asset_owner_visibility_deleted_created ON remote_asset_entity (owner_id, visibility, deleted_at, created_at DESC)',
+  );
+  late final Shape40 authUserEntity = Shape40(
+    source: i0.VersionedTable(
+      entityName: 'auth_user_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [
+        _column_107,
+        _column_108,
+        _column_109,
+        _column_148,
+        _column_110,
+        _column_111,
+        _column_149,
+        _column_150,
+        _column_151,
+        _column_152,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape4 userMetadataEntity = Shape4(
+    source: i0.VersionedTable(
+      entityName: 'user_metadata_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(user_id, "key")'],
+      columns: [_column_153, _column_154, _column_155],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape41 partnerEntity = Shape41(
+    source: i0.VersionedTable(
+      entityName: 'partner_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(shared_by_id, shared_with_id)'],
+      columns: [_column_156, _column_157, _column_158],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape42 remoteExifEntity = Shape42(
+    source: i0.VersionedTable(
+      entityName: 'remote_exif_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(asset_id)'],
+      columns: [
+        _column_159,
+        _column_160,
+        _column_161,
+        _column_162,
+        _column_163,
+        _column_164,
+        _column_117,
+        _column_116,
+        _column_165,
+        _column_166,
+        _column_167,
+        _column_168,
+        _column_135,
+        _column_136,
+        _column_169,
+        _column_170,
+        _column_171,
+        _column_172,
+        _column_173,
+        _column_174,
+        _column_175,
+        _column_176,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape7 remoteAlbumAssetEntity = Shape7(
+    source: i0.VersionedTable(
+      entityName: 'remote_album_asset_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(asset_id, album_id)'],
+      columns: [_column_159, _column_177],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape10 remoteAlbumUserEntity = Shape10(
+    source: i0.VersionedTable(
+      entityName: 'remote_album_user_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(album_id, user_id)'],
+      columns: [_column_177, _column_153, _column_178],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape43 remoteAssetCloudIdEntity = Shape43(
+    source: i0.VersionedTable(
+      entityName: 'remote_asset_cloud_id_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(asset_id)'],
+      columns: [
+        _column_159,
+        _column_179,
+        _column_180,
+        _column_134,
+        _column_135,
+        _column_136,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape44 memoryEntity = Shape44(
+    source: i0.VersionedTable(
+      entityName: 'memory_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [
+        _column_107,
+        _column_114,
+        _column_115,
+        _column_124,
+        _column_121,
+        _column_113,
+        _column_181,
+        _column_182,
+        _column_183,
+        _column_184,
+        _column_185,
+        _column_186,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape12 memoryAssetEntity = Shape12(
+    source: i0.VersionedTable(
+      entityName: 'memory_asset_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(asset_id, memory_id)'],
+      columns: [_column_159, _column_187],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape45 personEntity = Shape45(
+    source: i0.VersionedTable(
+      entityName: 'person_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [
+        _column_107,
+        _column_114,
+        _column_115,
+        _column_121,
+        _column_108,
+        _column_188,
+        _column_189,
+        _column_190,
+        _column_191,
+        _column_192,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape46 assetFaceEntity = Shape46(
+    source: i0.VersionedTable(
+      entityName: 'asset_face_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [
+        _column_107,
+        _column_159,
+        _column_193,
+        _column_194,
+        _column_195,
+        _column_196,
+        _column_197,
+        _column_198,
+        _column_199,
+        _column_200,
+        _column_201,
+        _column_124,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape18 storeEntity = Shape18(
+    source: i0.VersionedTable(
+      entityName: 'store_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [_column_202, _column_203, _column_204],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape47 trashedLocalAssetEntity = Shape47(
+    source: i0.VersionedTable(
+      entityName: 'trashed_local_asset_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id, album_id)'],
+      columns: [
+        _column_108,
+        _column_113,
+        _column_114,
+        _column_115,
+        _column_116,
+        _column_117,
+        _column_118,
+        _column_107,
+        _column_205,
+        _column_131,
+        _column_120,
+        _column_132,
+        _column_206,
+        _column_137,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape32 assetEditEntity = Shape32(
+    source: i0.VersionedTable(
+      entityName: 'asset_edit_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [
+        _column_107,
+        _column_159,
+        _column_207,
+        _column_208,
+        _column_209,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape49 metadata = Shape49(
+    source: i0.VersionedTable(
+      entityName: 'metadata',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY("key")'],
+      columns: [_column_210, _column_211, _column_115],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  final i1.Index idxPartnerSharedWithId = i1.Index(
+    'idx_partner_shared_with_id',
+    'CREATE INDEX IF NOT EXISTS idx_partner_shared_with_id ON partner_entity (shared_with_id)',
+  );
+  final i1.Index idxLatLng = i1.Index(
+    'idx_lat_lng',
+    'CREATE INDEX IF NOT EXISTS idx_lat_lng ON remote_exif_entity (latitude, longitude)',
+  );
+  final i1.Index idxRemoteExifCity = i1.Index(
+    'idx_remote_exif_city',
+    'CREATE INDEX IF NOT EXISTS idx_remote_exif_city ON remote_exif_entity (city) WHERE city IS NOT NULL',
+  );
+  final i1.Index idxRemoteAlbumAssetAlbumAsset = i1.Index(
+    'idx_remote_album_asset_album_asset',
+    'CREATE INDEX IF NOT EXISTS idx_remote_album_asset_album_asset ON remote_album_asset_entity (album_id, asset_id)',
+  );
+  final i1.Index idxRemoteAssetCloudId = i1.Index(
+    'idx_remote_asset_cloud_id',
+    'CREATE INDEX IF NOT EXISTS idx_remote_asset_cloud_id ON remote_asset_cloud_id_entity (cloud_id)',
+  );
+  final i1.Index idxPersonOwnerId = i1.Index(
+    'idx_person_owner_id',
+    'CREATE INDEX IF NOT EXISTS idx_person_owner_id ON person_entity (owner_id)',
+  );
+  final i1.Index idxAssetFacePersonId = i1.Index(
+    'idx_asset_face_person_id',
+    'CREATE INDEX IF NOT EXISTS idx_asset_face_person_id ON asset_face_entity (person_id)',
+  );
+  final i1.Index idxAssetFaceAssetId = i1.Index(
+    'idx_asset_face_asset_id',
+    'CREATE INDEX IF NOT EXISTS idx_asset_face_asset_id ON asset_face_entity (asset_id)',
+  );
+  final i1.Index idxAssetFaceVisiblePerson = i1.Index(
+    'idx_asset_face_visible_person',
+    'CREATE INDEX IF NOT EXISTS idx_asset_face_visible_person ON asset_face_entity (person_id, asset_id) WHERE is_visible = 1 AND deleted_at IS NULL',
+  );
+  final i1.Index idxTrashedLocalAssetChecksum = i1.Index(
+    'idx_trashed_local_asset_checksum',
+    'CREATE INDEX IF NOT EXISTS idx_trashed_local_asset_checksum ON trashed_local_asset_entity (checksum)',
+  );
+  final i1.Index idxTrashedLocalAssetAlbum = i1.Index(
+    'idx_trashed_local_asset_album',
+    'CREATE INDEX IF NOT EXISTS idx_trashed_local_asset_album ON trashed_local_asset_entity (album_id)',
+  );
+  final i1.Index idxAssetEditAssetId = i1.Index(
+    'idx_asset_edit_asset_id',
+    'CREATE INDEX IF NOT EXISTS idx_asset_edit_asset_id ON asset_edit_entity (asset_id)',
+  );
+}
+
+class Shape50 extends i0.VersionedTable {
+  Shape50({required super.source, required super.alias}) : super.aliased();
+  i1.GeneratedColumn<String> get name =>
+      columnsByName['name']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<int> get type =>
+      columnsByName['type']! as i1.GeneratedColumn<int>;
+  i1.GeneratedColumn<String> get createdAt =>
+      columnsByName['created_at']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<String> get updatedAt =>
+      columnsByName['updated_at']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<int> get width =>
+      columnsByName['width']! as i1.GeneratedColumn<int>;
+  i1.GeneratedColumn<int> get height =>
+      columnsByName['height']! as i1.GeneratedColumn<int>;
+  i1.GeneratedColumn<int> get durationMs =>
+      columnsByName['duration_ms']! as i1.GeneratedColumn<int>;
+  i1.GeneratedColumn<String> get id =>
+      columnsByName['id']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<String> get checksum =>
+      columnsByName['checksum']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<int> get isFavorite =>
+      columnsByName['is_favorite']! as i1.GeneratedColumn<int>;
+  i1.GeneratedColumn<String> get ownerId =>
+      columnsByName['owner_id']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<String> get localDateTime =>
+      columnsByName['local_date_time']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<String> get thumbHash =>
+      columnsByName['thumb_hash']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<String> get deletedAt =>
+      columnsByName['deleted_at']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<String> get uploadedAt =>
+      columnsByName['uploaded_at']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<String> get livePhotoVideoId =>
+      columnsByName['live_photo_video_id']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<int> get visibility =>
+      columnsByName['visibility']! as i1.GeneratedColumn<int>;
+  i1.GeneratedColumn<String> get stackId =>
+      columnsByName['stack_id']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<String> get libraryId =>
+      columnsByName['library_id']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<int> get isEdited =>
+      columnsByName['is_edited']! as i1.GeneratedColumn<int>;
+}
+
+i1.GeneratedColumn<String> _column_212(String aliasedName) =>
+    i1.GeneratedColumn<String>(
+      'uploaded_at',
+      aliasedName,
+      true,
+      type: i1.DriftSqlType.string,
+      $customConstraints: 'NULL',
+    );
 i0.MigrationStepWithVersion migrationSteps({
  required Future<void> Function(i1.Migrator m, Schema2 schema) from1To2,
  required Future<void> Function(i1.Migrator m, Schema3 schema) from2To3,
@@ -12968,6 +13564,7 @@ i0.MigrationStepWithVersion migrationSteps({
  required Future<void> Function(i1.Migrator m, Schema23 schema) from22To23,
  required Future<void> Function(i1.Migrator m, Schema24 schema) from23To24,
  required Future<void> Function(i1.Migrator m, Schema25 schema) from24To25,
+  required Future<void> Function(i1.Migrator m, Schema26 schema) from25To26,
 }) {
  return (currentVersion, database) async {
    switch (currentVersion) {
@@ -13091,6 +13688,11 @@ i0.MigrationStepWithVersion migrationSteps({
        final migrator = i1.Migrator(database, schema);
        await from24To25(migrator, schema);
        return 25;
+      case 25:
+        final schema = Schema26(database: database);
+        final migrator = i1.Migrator(database, schema);
+        await from25To26(migrator, schema);
+        return 26;
      default:
        throw ArgumentError.value('Unknown migration from $currentVersion');
    }
@@ -13122,6 +13724,7 @@ i1.OnUpgrade stepByStep({
  required Future<void> Function(i1.Migrator m, Schema23 schema) from22To23,
  required Future<void> Function(i1.Migrator m, Schema24 schema) from23To24,
  required Future<void> Function(i1.Migrator m, Schema25 schema) from24To25,
+  required Future<void> Function(i1.Migrator m, Schema26 schema) from25To26,
 }) => i0.VersionedSchema.stepByStepHelper(
  step: migrationSteps(
    from1To2: from1To2,
@@ -13148,5 +13751,6 @@ i1.OnUpgrade stepByStep({
    from22To23: from22To23,
    from23To24: from23To24,
    from24To25: from24To25,
+    from25To26: from25To26,
  ),
 );
@@ -49,7 +49,9 @@ class MetadataRepository extends DriftDatabaseRepository {
  T _read<T extends Object>(MetadataKey<T> key) => (_cache[key] as T?) ?? key.defaultValue;

  Future<void> write<T extends Object, U extends T>(MetadataKey<T> key, U value) async {
-    if (_read(key) == value) return;
+    if (_read(key) == value) {
+      return;
+    }

    await _db
        .into(_db.metadataEntity)
@@ -64,9 +66,9 @@ class MetadataRepository extends DriftDatabaseRepository {
    _updateCache(key, key.defaultValue);
  }

-  Stream<AppConfig> watchAppConfig() => _watchDomain(MetadataDomain.appConfig).distinct();
+  Stream<AppConfig> watchAppConfig() => _watchDomain(.appConfig).distinct();

-  Stream<SystemConfig> watchSystemConfig() => _watchDomain(MetadataDomain.systemConfig).distinct();
+  Stream<SystemConfig> watchSystemConfig() => _watchDomain(.systemConfig).distinct();

  Stream<T> _watchDomain<T extends Object>(MetadataDomain<T> domain) {
    final query = _db.select(_db.metadataEntity)..where((t) => t.key.like('${domain.prefix}.%'));
@@ -80,13 +82,17 @@ class MetadataRepository extends DriftDatabaseRepository {
    final keyMap = MetadataKey.asKeyMap();
    for (final row in rows) {
      final key = keyMap[row.key];
-      if (key == null) continue;
+      if (key == null) {
+        continue;
+      }
      _updateCache(key, key.decode(row.value));
    }
  }

  void _updateCache<T extends Object>(MetadataKey<T> key, T value) {
-    if (_cache[key] == value) return;
+    if (_cache[key] == value) {
+      return;
+    }
    _cache[key] = value;
    key.domain.rebuild(this);
  }
@@ -360,7 +360,9 @@ class DriftRemoteAlbumRepository extends DriftDatabaseRepository {
  }

  Future<List<String>> getSortedAlbumIds(List<String> albumIds, {required AssetDateAggregation aggregation}) async {
-    if (albumIds.isEmpty) return [];
+    if (albumIds.isEmpty) {
+      return [];
+    }

    final jsonIds = jsonEncode(albumIds);
    final sqlAgg = aggregation == AssetDateAggregation.start ? 'MIN' : 'MAX';
@@ -164,6 +164,16 @@ class RemoteAssetRepository extends DriftDatabaseRepository {
    });
  }

+  Future<void> emptyTrash(String ownerId) async {
+    await _db.remoteAssetEntity.deleteWhere((t) => t.deletedAt.isNotNull() & t.ownerId.equals(ownerId));
+  }
+
+  Future<void> restoreAllTrash(String ownerId) async {
+    await (_db.remoteAssetEntity.update()..where((t) => t.deletedAt.isNotNull() & t.ownerId.equals(ownerId))).write(
+      const RemoteAssetEntityCompanion(deletedAt: Value(null)),
+    );
+  }
+
  Future<void> delete(List<String> ids) {
    return _db.batch((batch) {
      for (final id in ids) {
@@ -14,6 +14,7 @@ import 'package:immich_mobile/infrastructure/entities/asset_edit.entity.drift.da
 import 'package:immich_mobile/infrastructure/entities/asset_face.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/auth_user.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/exif.entity.drift.dart';
+import 'package:immich_mobile/infrastructure/entities/local_album.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/memory.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/memory_asset.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/partner.entity.drift.dart';
@@ -45,25 +46,35 @@ class SyncStreamRepository extends DriftDatabaseRepository {
        // foreign_keys PRAGMA is no-op within transactions
        // https://www.sqlite.org/pragma.html#pragma_foreign_keys
        await _db.customStatement('PRAGMA foreign_keys = OFF');
-        await transaction(() async {
-          await _db.assetFaceEntity.deleteAll();
-          await _db.memoryAssetEntity.deleteAll();
-          await _db.memoryEntity.deleteAll();
-          await _db.partnerEntity.deleteAll();
-          await _db.personEntity.deleteAll();
-          await _db.remoteAlbumAssetEntity.deleteAll();
-          await _db.remoteAlbumEntity.deleteAll();
-          await _db.remoteAlbumUserEntity.deleteAll();
-          await _db.remoteAssetEntity.deleteAll();
-          await _db.remoteExifEntity.deleteAll();
-          await _db.stackEntity.deleteAll();
-          await _db.authUserEntity.deleteAll();
-          await _db.userEntity.deleteAll();
-          await _db.userMetadataEntity.deleteAll();
-          await _db.remoteAssetCloudIdEntity.deleteAll();
-          await _db.assetEditEntity.deleteAll();
-        });
-        await _db.customStatement('PRAGMA foreign_keys = ON');
+        try {
+          await transaction(() async {
+            // FK cascade (ON DELETE SET NULL) does not fire while foreign_keys = OFF,
+            // so null linkedRemoteAlbumId manually to avoid dangling pointers in local_album_entity.
+            await _db.localAlbumEntity.update().write(
+              const LocalAlbumEntityCompanion(linkedRemoteAlbumId: Value(null)),
+            );
+            await _db.assetFaceEntity.deleteAll();
+            await _db.memoryAssetEntity.deleteAll();
+            await _db.memoryEntity.deleteAll();
+            await _db.partnerEntity.deleteAll();
+            await _db.personEntity.deleteAll();
+            await _db.remoteAlbumAssetEntity.deleteAll();
+            await _db.remoteAlbumEntity.deleteAll();
+            await _db.remoteAlbumUserEntity.deleteAll();
+            await _db.remoteAssetEntity.deleteAll();
+            await _db.remoteExifEntity.deleteAll();
+            await _db.stackEntity.deleteAll();
+            await _db.authUserEntity.deleteAll();
+            await _db.userEntity.deleteAll();
+            await _db.userMetadataEntity.deleteAll();
+            await _db.remoteAssetCloudIdEntity.deleteAll();
+            await _db.assetEditEntity.deleteAll();
+          });
+        } finally {
+          // re-enable FK even if the transaction throws, otherwise the connection
+          // would be left with foreign_keys = OFF, silently disabling cascades.
+          await _db.customStatement('PRAGMA foreign_keys = ON');
+        }
      });
    } catch (error, stack) {
      _logger.severe('Error: SyncResetV1', error, stack);
@@ -191,6 +202,7 @@ class SyncStreamRepository extends DriftDatabaseRepository {
            type: Value(asset.type.toAssetType()),
            createdAt: Value.absentIfNull(asset.fileCreatedAt),
            updatedAt: Value.absentIfNull(asset.fileModifiedAt),
+            uploadedAt: Value(asset.createdAt),
            durationMs: Value(asset.duration?.toDuration()?.inMilliseconds ?? 0),
            checksum: Value(asset.checksum),
            isFavorite: Value(asset.isFavorite),
@@ -229,6 +241,7 @@ class SyncStreamRepository extends DriftDatabaseRepository {
            type: Value(asset.type.toAssetType()),
            createdAt: Value.absentIfNull(asset.fileCreatedAt),
            updatedAt: Value.absentIfNull(asset.fileModifiedAt),
+            uploadedAt: Value(asset.createdAt),
            durationMs: Value(asset.duration),
            checksum: Value(asset.checksum),
            isFavorite: Value(asset.isFavorite),
@@ -79,6 +79,7 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
                  type: row.type,
                  createdAt: row.createdAt,
                  updatedAt: row.updatedAt,
+                  uploadedAt: row.uploadedAt,
                  thumbHash: row.thumbHash,
                  width: row.width,
                  height: row.height,
@@ -244,17 +245,21 @@ class DriftTimelineRepository extends DriftDatabaseRepository {

    final isAscending = albumData.order == AlbumAssetOrder.asc;

-    final query = _db.remoteAssetEntity.select().addColumns([_db.localAssetEntity.id]).join([
+    // Correlated subquery picks the first matching local asset by checksum,
+    // avoiding fan-out when the same photo exists in multiple device albums (#23273).
+    final localId = subqueryExpression<String>(
+      _db.localAssetEntity.selectOnly()
+        ..addColumns([_db.localAssetEntity.id])
+        ..where(_db.localAssetEntity.checksum.equalsExp(_db.remoteAssetEntity.checksum))
+        ..limit(1),
+    );
+
+    final query = _db.remoteAssetEntity.select().addColumns([localId]).join([
      innerJoin(
        _db.remoteAlbumAssetEntity,
        _db.remoteAlbumAssetEntity.assetId.equalsExp(_db.remoteAssetEntity.id),
        useColumns: false,
      ),
-      leftOuterJoin(
-        _db.localAssetEntity,
-        _db.remoteAssetEntity.checksum.equalsExp(_db.localAssetEntity.checksum),
-        useColumns: false,
-      ),
    ])..where(_db.remoteAssetEntity.deletedAt.isNull() & _db.remoteAlbumAssetEntity.albumId.equals(albumId));

    if (isAscending) {
@@ -265,9 +270,7 @@ class DriftTimelineRepository extends DriftDatabaseRepository {

    query.limit(count, offset: offset);

-    return query
-        .map((row) => row.readTable(_db.remoteAssetEntity).toDto(localId: row.read(_db.localAssetEntity.id)))
-        .get();
+    return query.map((row) => row.readTable(_db.remoteAssetEntity).toDto(localId: row.read(localId))).get();
  }

  TimelineQuery fromAssets(List<BaseAsset> assets, TimelineOrigin origin) => (
@@ -315,6 +318,17 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
    origin: TimelineOrigin.remoteAssets,
  );

+  TimelineQuery recentlyAdded(String userId, GroupAssetsBy groupBy) => _remoteQueryBuilder(
+    filter: (row) =>
+        row.uploadedAt.isNotNull() &
+        row.deletedAt.isNull() &
+        row.ownerId.equals(userId) &
+        (row.visibility.equalsValue(AssetVisibility.timeline) | row.visibility.equalsValue(AssetVisibility.archive)),
+    origin: TimelineOrigin.recentlyAdded,
+    groupBy: groupBy,
+    sortBy: SortAssetsBy.uploaded,
+  );
+
  TimelineQuery favorite(String userId, GroupAssetsBy groupBy) => _remoteQueryBuilder(
    filter: (row) =>
        row.deletedAt.isNull() &
@@ -422,23 +436,22 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
  }

  Stream<List<Bucket>> _watchPersonBucket(String userId, String personId, {GroupAssetsBy groupBy = GroupAssetsBy.day}) {
+    final idQuery = _db.assetFaceEntity.selectOnly()
+      ..addColumns([_db.assetFaceEntity.assetId])
+      ..where(
+        _db.assetFaceEntity.personId.equals(personId) &
+            _db.assetFaceEntity.isVisible.equals(true) &
+            _db.assetFaceEntity.deletedAt.isNull(),
+      );
+
    if (groupBy == GroupAssetsBy.none) {
      final query = _db.remoteAssetEntity.selectOnly()
        ..addColumns([_db.remoteAssetEntity.id.count()])
-        ..join([
-          innerJoin(
-            _db.assetFaceEntity,
-            _db.assetFaceEntity.assetId.equalsExp(_db.remoteAssetEntity.id),
-            useColumns: false,
-          ),
-        ])
        ..where(
-          _db.remoteAssetEntity.deletedAt.isNull() &
+          _db.remoteAssetEntity.id.isInQuery(idQuery) &
+              _db.remoteAssetEntity.deletedAt.isNull() &
              _db.remoteAssetEntity.ownerId.equals(userId) &
-              _db.remoteAssetEntity.visibility.equalsValue(AssetVisibility.timeline) &
-              _db.assetFaceEntity.personId.equals(personId) &
-              _db.assetFaceEntity.isVisible.equals(true) &
-              _db.assetFaceEntity.deletedAt.isNull(),
+              _db.remoteAssetEntity.visibility.equalsValue(AssetVisibility.timeline),
        );

      return query.map((row) {
@@ -452,20 +465,11 @@ class DriftTimelineRepository extends DriftDatabaseRepository {

    final query = _db.remoteAssetEntity.selectOnly()
      ..addColumns([assetCountExp, dateExp])
-      ..join([
-        innerJoin(
-          _db.assetFaceEntity,
-          _db.assetFaceEntity.assetId.equalsExp(_db.remoteAssetEntity.id),
-          useColumns: false,
-        ),
-      ])
      ..where(
-        _db.remoteAssetEntity.deletedAt.isNull() &
+        _db.remoteAssetEntity.id.isInQuery(idQuery) &
            _db.remoteAssetEntity.ownerId.equals(userId) &
            _db.remoteAssetEntity.visibility.equalsValue(AssetVisibility.timeline) &
-            _db.assetFaceEntity.personId.equals(personId) &
-            _db.assetFaceEntity.isVisible.equals(true) &
-            _db.assetFaceEntity.deletedAt.isNull(),
+            _db.remoteAssetEntity.deletedAt.isNull(),
      )
      ..groupBy([dateExp])
      ..orderBy([OrderingTerm.desc(dateExp)]);
@@ -483,26 +487,26 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
    required int offset,
    required int count,
  }) {
-    final query =
-        _db.remoteAssetEntity.select().join([
-            innerJoin(
-              _db.assetFaceEntity,
-              _db.assetFaceEntity.assetId.equalsExp(_db.remoteAssetEntity.id),
-              useColumns: false,
-            ),
-          ])
-          ..where(
-            _db.remoteAssetEntity.deletedAt.isNull() &
-                _db.remoteAssetEntity.ownerId.equals(userId) &
-                _db.remoteAssetEntity.visibility.equalsValue(AssetVisibility.timeline) &
-                _db.assetFaceEntity.personId.equals(personId) &
-                _db.assetFaceEntity.isVisible.equals(true) &
-                _db.assetFaceEntity.deletedAt.isNull(),
-          )
-          ..orderBy([OrderingTerm.desc(_db.remoteAssetEntity.createdAt)])
-          ..limit(count, offset: offset);
+    final idQuery = _db.assetFaceEntity.selectOnly()
+      ..addColumns([_db.assetFaceEntity.assetId])
+      ..where(
+        _db.assetFaceEntity.personId.equals(personId) &
+            _db.assetFaceEntity.isVisible.equals(true) &
+            _db.assetFaceEntity.deletedAt.isNull(),
+      );

-    return query.map((row) => row.readTable(_db.remoteAssetEntity).toDto()).get();
+    final query = _db.remoteAssetEntity.select()
+      ..where(
+        (row) =>
+            row.id.isInQuery(idQuery) &
+            row.deletedAt.isNull() &
+            row.ownerId.equals(userId) &
+            row.visibility.equalsValue(AssetVisibility.timeline),
+      )
+      ..orderBy([(row) => OrderingTerm.desc(row.createdAt)])
+      ..limit(count, offset: offset);
+
+    return query.map((row) => row.toDto()).get();
  }

  TimelineQuery map(List<String> userIds, TimelineMapOptions options, GroupAssetsBy groupBy) => (
@@ -605,9 +609,10 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
    required TimelineOrigin origin,
    GroupAssetsBy groupBy = GroupAssetsBy.day,
    bool joinLocal = false,
+    SortAssetsBy sortBy = SortAssetsBy.taken,
  }) {
    return (
-      bucketSource: () => _watchRemoteBucket(filter: filter, groupBy: groupBy),
+      bucketSource: () => _watchRemoteBucket(filter: filter, groupBy: groupBy, sortBy: sortBy),
      assetSource: (offset, count) =>
          _getRemoteAssets(filter: filter, offset: offset, count: count, joinLocal: joinLocal),
      origin: origin,
@@ -617,6 +622,7 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
  Stream<List<Bucket>> _watchRemoteBucket({
    required Expression<bool> Function($RemoteAssetEntityTable row) filter,
    GroupAssetsBy groupBy = GroupAssetsBy.day,
+    SortAssetsBy sortBy = SortAssetsBy.taken,
  }) {
    if (groupBy == GroupAssetsBy.none) {
      final query = _db.remoteAssetEntity.count(where: filter);
@@ -624,7 +630,7 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
    }

    final assetCountExp = _db.remoteAssetEntity.id.count();
-    final dateExp = _db.remoteAssetEntity.effectiveCreatedAt(groupBy);
+    final dateExp = _db.remoteAssetEntity.effectiveCreatedAt(groupBy, sortBy: sortBy);

    final query = _db.remoteAssetEntity.selectOnly()
      ..addColumns([assetCountExp, dateExp])
@@ -700,8 +706,13 @@ extension on Expression<DateTime> {
 }

 extension on $RemoteAssetEntityTable {
-  Expression<String> effectiveCreatedAt(GroupAssetsBy groupBy) =>
-      coalesce([localDateTime.dateFmt(groupBy), createdAt.dateFmt(groupBy, toLocal: true)]);
+  Expression<String> effectiveCreatedAt(GroupAssetsBy groupBy, {SortAssetsBy sortBy = SortAssetsBy.taken}) {
+    if (sortBy == SortAssetsBy.uploaded) {
+      return uploadedAt.dateFmt(groupBy, toLocal: true);
+    }
+
+    return coalesce([localDateTime.dateFmt(groupBy), createdAt.dateFmt(groupBy, toLocal: true)]);
+  }
 }

 extension on String {
@@ -12,7 +12,9 @@ class DriftAuthUserRepository extends DriftDatabaseRepository {
  Future<UserDto?> get(String id) async {
    final user = await _db.managers.authUserEntity.filter((user) => user.id.equals(id)).getSingleOrNull();

-    if (user == null) return null;
+    if (user == null) {
+      return null;
+    }

    final query = _db.userMetadataEntity.select()..where((e) => e.userId.equals(id));
    final metadata = await query.map((row) => row.toDto()).get();
@@ -12,7 +12,9 @@ class UserApiRepository extends ApiRepository {

  Future<UserDto?> getMyUser() async {
    final (adminDto, preferenceDto) = await (_api.getMyUser(), _api.getMyPreferences()).wait;
-    if (adminDto == null) return null;
+    if (adminDto == null) {
+      return null;
+    }

    return UserConverter.fromAdminDto(adminDto, preferenceDto);
  }
@@ -10,6 +10,7 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_displaymode/flutter_displaymode.dart';
+import 'package:flutter_local_notifications/flutter_local_notifications.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/constants/constants.dart';
 import 'package:immich_mobile/constants/locales.dart';
@@ -163,6 +164,13 @@ class ImmichAppState extends ConsumerState<ImmichApp> with WidgetsBindingObserve
      }
    }
    SystemChrome.setSystemUIOverlayStyle(overlayStyle);
+
+    await FlutterLocalNotificationsPlugin().initialize(
+      const InitializationSettings(
+        android: AndroidInitializationSettings('@drawable/notification_icon'),
+        iOS: DarwinInitializationSettings(),
+      ),
+    );
  }

  Future<DeepLink> _deepLinkBuilder(PlatformDeepLink deepLink) async {
@@ -171,19 +179,32 @@ class ImmichAppState extends ConsumerState<ImmichApp> with WidgetsBindingObserve

    final isColdStart = currentRouteName == null || currentRouteName == SplashScreenRoute.name;

+    PageRouteInfo? route;
    if (deepLink.uri.scheme == "immich") {
-      final proposedRoute = await deepLinkHandler.handleScheme(deepLink, ref, isColdStart);
-
-      return proposedRoute;
+      route = await deepLinkHandler.handleScheme(deepLink, ref);
+    } else if (deepLink.uri.host == "my.immich.app") {
+      route = await deepLinkHandler.handleMyImmichApp(deepLink, ref);
+    } else {
+      return DeepLink.path(deepLink.path);
    }

-    if (deepLink.uri.host == "my.immich.app") {
-      final proposedRoute = await deepLinkHandler.handleMyImmichApp(deepLink, ref, isColdStart);
-
-      return proposedRoute;
+    if (route == null) {
+      return isColdStart ? DeepLink.defaultPath : DeepLink.none;
    }

-    return DeepLink.path(deepLink.path);
+    // We need to replace the route if the destination is the current route
+    if (!isColdStart) {
+      unawaited(
+        ref.read(appRouterProvider).pushAndPopUntil(route, predicate: (r) => r.settings.name != route!.routeName),
+      );
+      return DeepLink.none;
+    }
+
+    return DeepLink([
+      // we need something to segue back to if the app was cold started
+      if (isColdStart) const TabShellRoute(children: [MainTimelineRoute()]),
+      route,
+    ]);
  }

  @override
@@ -44,7 +44,9 @@ class Activity {

  @override
  bool operator ==(covariant Activity other) {
-    if (identical(this, other)) return true;
+    if (identical(this, other)) {
+      return true;
+    }

    return other.id == id &&
        other.assetId == assetId &&
@@ -44,7 +44,9 @@ class AuthState {

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

    return other is AuthState &&
        other.deviceId == deviceId &&
@@ -16,7 +16,9 @@ class AuxilaryEndpoint {

  @override
  bool operator ==(covariant AuxilaryEndpoint other) {
-    if (identical(this, other)) return true;
+    if (identical(this, other)) {
+      return true;
+    }

    return other.url == url && other.status == status;
  }
@@ -53,7 +55,9 @@ class AuxCheckStatus {

  @override
  bool operator ==(covariant AuxCheckStatus other) {
-    if (identical(this, other)) return true;
+    if (identical(this, other)) {
+      return true;
+    }

    return other.name == name;
  }
@@ -19,7 +19,9 @@ class BiometricStatus {

  @override
  bool operator ==(covariant BiometricStatus other) {
-    if (identical(this, other)) return true;
+    if (identical(this, other)) {
+      return true;
+    }
    final listEquals = const DeepCollectionEquality().equals;

    return listEquals(other.availableBiometrics, availableBiometrics) && other.canAuthenticate == canAuthenticate;
@@ -67,7 +67,9 @@ class CastManagerState {

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

    return other is CastManagerState &&
        other.isCasting == isCasting &&
@@ -41,7 +41,9 @@ class DownloadInfo {

  @override
  bool operator ==(covariant DownloadInfo other) {
-    if (identical(this, other)) return true;
+    if (identical(this, other)) {
+      return true;
+    }

    return other.fileName == fileName && other.progress == progress && other.status == status;
  }
@@ -71,7 +73,9 @@ class DownloadState {

  @override
  bool operator ==(covariant DownloadState other) {
-    if (identical(this, other)) return true;
+    if (identical(this, other)) {
+      return true;
+    }
    final mapEquals = const DeepCollectionEquality().equals;

    return other.downloadStatus == downloadStatus &&
@@ -32,7 +32,9 @@ class LivePhotosMetadata {

  @override
  bool operator ==(covariant LivePhotosMetadata other) {
-    if (identical(this, other)) return true;
+    if (identical(this, other)) {
+      return true;
+    }

    return other.part == part && other.id == id;
  }
@@ -17,7 +17,9 @@ class MapMarker {

  @override
  bool operator ==(covariant MapMarker other) {
-    if (identical(this, other)) return true;
+    if (identical(this, other)) {
+      return true;
+    }

    return other.latLng == latLng && other.assetRemoteId == assetRemoteId;
  }
@@ -51,7 +51,9 @@ class MapState {

  @override
  bool operator ==(covariant MapState other) {
-    if (identical(this, other)) return true;
+    if (identical(this, other)) {
+      return true;
+    }

    return other.themeMode == themeMode &&
        other.showFavoriteOnly == showFavoriteOnly &&
@@ -42,7 +42,9 @@ class SearchCuratedContent {

  @override
  bool operator ==(covariant SearchCuratedContent other) {
-    if (identical(this, other)) return true;
+    if (identical(this, other)) {
+      return true;
+    }

    return other.label == label && other.subtitle == subtitle && other.id == id;
  }
@@ -36,7 +36,9 @@ class SearchLocationFilter {

  @override
  bool operator ==(covariant SearchLocationFilter other) {
-    if (identical(this, other)) return true;
+    if (identical(this, other)) {
+      return true;
+    }

    return other.country == country && other.state == state && other.city == city;
  }
@@ -75,7 +77,9 @@ class SearchCameraFilter {

  @override
  bool operator ==(covariant SearchCameraFilter other) {
-    if (identical(this, other)) return true;
+    if (identical(this, other)) {
+      return true;
+    }

    return other.make == make && other.model == model;
  }
@@ -117,7 +121,9 @@ class SearchDateFilter {

  @override
  bool operator ==(covariant SearchDateFilter other) {
-    if (identical(this, other)) return true;
+    if (identical(this, other)) {
+      return true;
+    }

    return other.takenBefore == takenBefore && other.takenAfter == takenAfter;
  }
@@ -152,7 +158,9 @@ class SearchRatingFilter {

  @override
  bool operator ==(covariant SearchRatingFilter other) {
-    if (identical(this, other)) return true;
+    if (identical(this, other)) {
+      return true;
+    }

    return other.rating == rating;
  }
@@ -198,7 +206,9 @@ class SearchDisplayFilters {

  @override
  bool operator ==(covariant SearchDisplayFilters other) {
-    if (identical(this, other)) return true;
+    if (identical(this, other)) {
+      return true;
+    }

    return other.isNotInAlbum == isNotInAlbum && other.isArchive == isArchive && other.isFavorite == isFavorite;
  }
@@ -305,7 +315,9 @@ class SearchFilter {

  @override
  bool operator ==(covariant SearchFilter other) {
-    if (identical(this, other)) return true;
+    if (identical(this, other)) {
+      return true;
+    }

    return other.context == context &&
        other.filename == filename &&
@@ -38,7 +38,9 @@ class ServerConfig {

  @override
  bool operator ==(covariant ServerConfig other) {
-    if (identical(this, other)) return true;
+    if (identical(this, other)) {
+      return true;
+    }

    return other.trashDays == trashDays &&
        other.oauthButtonText == oauthButtonText &&
@@ -35,7 +35,9 @@ class ServerDiskInfo {

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

    return other is ServerDiskInfo &&
        other.diskAvailable == diskAvailable &&
@@ -50,7 +50,9 @@ class ServerFeatures {

  @override
  bool operator ==(covariant ServerFeatures other) {
-    if (identical(this, other)) return true;
+    if (identical(this, other)) {
+      return true;
+    }

    return other.trash == trash &&
        other.map == map &&
@@ -60,7 +60,9 @@ class ServerInfo {

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

    return other is ServerInfo &&
        other.serverVersion == serverVersion &&
@@ -88,7 +88,9 @@ class ShareIntentAttachment {

  @override
  bool operator ==(covariant ShareIntentAttachment other) {
-    if (identical(this, other)) return true;
+    if (identical(this, other)) {
+      return true;
+    }

    return other.path == path && other.type == type;
  }
@@ -418,7 +418,9 @@ class _PreparingStatusState extends ConsumerState {
  }

  void _startPollingIfNeeded() {
-    if (_pollingTimer != null) return;
+    if (_pollingTimer != null) {
+      return;
+    }

    _pollingTimer = Timer.periodic(const Duration(seconds: 3), (timer) async {
      final currentUser = ref.read(currentUserProvider);
@@ -83,7 +83,9 @@ class _DriftBackupAlbumSelectionPageState extends ConsumerState<DriftBackupAlbum
    final albumCount = albums.length;
    // Filter albums based on search query
    final filteredAlbums = albums.where((album) {
-      if (_searchQuery.isEmpty) return true;
+      if (_searchQuery.isEmpty) {
+        return true;
+      }
      return album.name.toLowerCase().contains(_searchQuery.toLowerCase());
    }).toList();

@@ -40,7 +40,9 @@ class _DriftUploadDetailPageState extends ConsumerState<DriftUploadDetailPage> {
    }

    for (final item in uploadingItems) {
-      if (_taskSlotAssignments.containsKey(item.taskId)) continue;
+      if (_taskSlotAssignments.containsKey(item.taskId)) {
+        continue;
+      }

      for (int i = 0; i < _maxSlots; i++) {
        if (slots[i] == null) {
@@ -87,7 +87,10 @@ class HeaderSettingsPage extends HookConsumerWidget {
    for (final header in headers) {
      final key = header.key.trim();
      final value = header.value.trim();
-      if (key.isEmpty || value.isEmpty) continue;
+
+      if (key.isEmpty || value.isEmpty) {
+        continue;
+      }
      headersMap[key] = value;
    }

@@ -31,7 +31,9 @@ RecursiveFolder? _findFolderInStructure(RootFolder rootFolder, RecursiveFolder t

    if (folder.subfolders.isNotEmpty) {
      final found = _findFolderInStructure(folder, targetFolder);
-      if (found != null) return found;
+      if (found != null) {
+        return found;
+      }
    }
  }
  return null;
@@ -113,7 +115,9 @@ class FolderContent extends HookConsumerWidget {

    // Initial asset fetch
    useEffect(() {
-      if (folder == null) return;
+      if (folder == null) {
+        return;
+      }
      ref.read(folderRenderListProvider(folder!).notifier).fetchAssets(sortOrder);
      return null;
    }, [folder]);
@@ -20,7 +20,9 @@ class SharedLinkPage extends HookConsumerWidget {
    useEffect(() {
      ref.read(sharedLinksStateProvider.notifier).fetchLinks();
      return () {
-        if (!context.mounted) return;
+        if (!context.mounted) {
+          return;
+        }
        ref.invalidate(sharedLinksStateProvider);
      };
    }, []);
@@ -277,7 +277,7 @@ abstract class BackgroundWorkerFlutterApi {

  Future<void> onIosUpload(bool isRefresh, int? maxSeconds);

-  Future<void> onAndroidUpload();
+  Future<void> onAndroidUpload(int? maxMinutes);

  Future<void> cancel();

@@ -323,8 +323,10 @@ abstract class BackgroundWorkerFlutterApi {
        pigeonVar_channel.setMessageHandler(null);
      } else {
        pigeonVar_channel.setMessageHandler((Object? message) async {
+          final List<Object?> args = message! as List<Object?>;
+          final int? arg_maxMinutes = args[0] as int?;
          try {
-            await api.onAndroidUpload();
+            await api.onAndroidUpload(arg_maxMinutes);
            return wrapResponse(empty: true);
          } on PlatformException catch (e) {
            return wrapResponse(error: e);
@@ -191,8 +191,12 @@ class _AssetPropertiesSectionState extends ConsumerState<_AssetPropertiesSection
  }

  String _getAssetTypeTitle(BaseAsset asset) {
-    if (asset is LocalAsset) return 'Local Asset';
-    if (asset is RemoteAsset) return 'Remote Asset';
+    if (asset is LocalAsset) {
+      return 'Local Asset';
+    }
+    if (asset is RemoteAsset) {
+      return 'Remote Asset';
+    }
    return 'Base Asset';
  }
 }
@@ -160,12 +160,25 @@ class DriftMemoryPage extends HookConsumerWidget {
      currentAssetPage.value = otherIndex;
      updateProgressText();

+      final activeMemory = currentMemory.value;
+
      // Wait for page change animation to finish
      await Future.delayed(const Duration(milliseconds: 400));
+
+      // check if memory is still the same and if context is still mounted
+      if (currentMemory.value != activeMemory || !context.mounted) {
+        return;
+      }
+
      // And then precache the next asset
      await precacheAsset(otherIndex + 1);

-      final asset = currentMemory.value.assets[otherIndex];
+      // check again as precache involves async operations
+      if (currentMemory.value != activeMemory || !context.mounted) {
+        return;
+      }
+
+      final asset = activeMemory.assets[otherIndex];
      currentAsset.value = asset;
      ref.read(assetViewerProvider.notifier).setAsset(asset);
    }
@@ -0,0 +1,32 @@
+import 'package:auto_route/auto_route.dart';
+import 'package:flutter/widgets.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/extensions/translate_extensions.dart';
+import 'package:immich_mobile/presentation/widgets/timeline/timeline.widget.dart';
+import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
+import 'package:immich_mobile/providers/user.provider.dart';
+import 'package:immich_mobile/widgets/common/mesmerizing_sliver_app_bar.dart';
+
+@RoutePage()
+class DriftRecentlyAddedPage extends StatelessWidget {
+  const DriftRecentlyAddedPage({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return ProviderScope(
+      overrides: [
+        timelineServiceProvider.overrideWith((ref) {
+          final user = ref.watch(currentUserProvider);
+          if (user == null) {
+            throw Exception('User must be logged in to access recently taken');
+          }
+
+          final timelineService = ref.watch(timelineFactoryProvider).recentlyAdded(user.id);
+          ref.onDispose(timelineService.dispose);
+          return timelineService;
+        }),
+      ],
+      child: Timeline(appBar: MesmerizingSliverAppBar(title: 'recently_added'.t())),
+    );
+  }
+}
@@ -245,7 +245,9 @@ class _EditAlbumDialogState extends ConsumerState<_EditAlbumDialog> {
  }

  Future<void> _handleSave() async {
-    if (formKey.currentState?.validate() != true) return;
+    if (formKey.currentState?.validate() != true) {
+      return;
+    }

    try {
      final newTitle = titleController.text.trim();
@@ -1,13 +1,18 @@
 import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/generated/translations.g.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/bottom_sheet/trash_bottom_sheet.widget.dart';
+import 'package:immich_mobile/providers/infrastructure/action.provider.dart';
 import 'package:immich_mobile/presentation/widgets/timeline/timeline.widget.dart';
 import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
 import 'package:immich_mobile/providers/server_info.provider.dart';
 import 'package:immich_mobile/providers/user.provider.dart';
+import 'package:immich_mobile/widgets/common/confirm_dialog.dart';
+import 'package:immich_mobile/widgets/common/immich_toast.dart';

@RoutePage()
 class DriftTrashPage extends StatelessWidget {
@@ -36,6 +41,7 @@ class DriftTrashPage extends StatelessWidget {
          pinned: true,
          centerTitle: true,
          elevation: 0,
+          actions: [const _TrashKebabMenu()],
        ),
        topSliverWidgetHeight: 24,
        topSliverWidget: Consumer(
@@ -53,3 +59,89 @@ class DriftTrashPage extends StatelessWidget {
    );
  }
 }
+
+class _TrashKebabMenu extends ConsumerWidget {
+  const _TrashKebabMenu();
+
+  Future<void> _confirmAndRun(
+    BuildContext context,
+    WidgetRef ref, {
+    required String title,
+    required String content,
+    required Future<ActionResult> Function(String userId) action,
+    required String Function(int count) successMsg,
+  }) async {
+    await showDialog<bool>(
+      context: context,
+      builder: (_) => ConfirmDialog(
+        title: title,
+        content: content,
+        onOk: () async {
+          final user = ref.read(currentUserProvider);
+          if (user == null) {
+            return;
+          }
+          final result = await action(user.id);
+          if (!context.mounted) {
+            return;
+          }
+          ImmichToast.show(
+            context: context,
+            msg: result.success ? successMsg(result.count) : context.t.scaffold_body_error_occurred,
+            toastType: result.success ? ToastType.success : ToastType.error,
+          );
+        },
+      ),
+    );
+  }
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    return MenuAnchor(
+      consumeOutsideTap: true,
+      style: MenuStyle(
+        backgroundColor: WidgetStatePropertyAll(context.themeData.scaffoldBackgroundColor),
+        surfaceTintColor: const WidgetStatePropertyAll(Colors.grey),
+        elevation: const WidgetStatePropertyAll(4),
+        shape: const WidgetStatePropertyAll(
+          RoundedRectangleBorder(borderRadius: BorderRadius.all(Radius.circular(12))),
+        ),
+        padding: const WidgetStatePropertyAll(EdgeInsets.symmetric(vertical: 6)),
+      ),
+      menuChildren: [
+        BaseActionButton(
+          label: context.t.empty_trash,
+          iconData: Icons.delete_forever_outlined,
+          onPressed: () => _confirmAndRun(
+            context,
+            ref,
+            title: context.t.empty_trash,
+            content: context.t.empty_trash_confirmation,
+            action: ref.read(actionProvider.notifier).emptyTrash,
+            successMsg: (count) => context.t.assets_permanently_deleted_count(count: count),
+          ),
+          menuItem: true,
+        ),
+        BaseActionButton(
+          label: context.t.restore_all,
+          iconData: Icons.restore_outlined,
+          onPressed: () => _confirmAndRun(
+            context,
+            ref,
+            title: context.t.restore_all,
+            content: context.t.assets_restore_confirmation,
+            action: ref.read(actionProvider.notifier).restoreAllTrash,
+            successMsg: (count) => context.t.assets_restored_count(count: count),
+          ),
+          menuItem: true,
+        ),
+      ],
+      builder: (context, controller, child) {
+        return IconButton(
+          icon: const Icon(Icons.more_vert_rounded),
+          onPressed: () => controller.isOpen ? controller.close() : controller.open(),
+        );
+      },
+    );
+  }
+}
@@ -95,7 +95,9 @@ class _DriftEditImagePageState extends ConsumerState<DriftEditImagePage> with Ti
    return PopScope(
      canPop: !hasUnsavedEdits,
      onPopInvokedWithResult: (didPop, result) async {
-        if (didPop) return;
+        if (didPop) {
+          return;
+        }
        final shouldDiscard = await _showDiscardChangesDialog() ?? false;
        if (shouldDiscard && mounted) {
          Navigator.of(context).pop();
@@ -179,7 +179,9 @@ class EditorState {

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

    return other is EditorState &&
        other.isApplyingEdits == isApplyingEdits &&
@@ -58,7 +58,9 @@ class _ProfilePictureCropPageState extends ConsumerState<ProfilePictureCropPage>
  }

  Future<void> _handleDone() async {
-    if (_isLoading) return;
+    if (_isLoading) {
+      return;
+    }

    setState(() {
      _isLoading = true;
@@ -72,7 +74,9 @@ class _ProfilePictureCropPageState extends ConsumerState<ProfilePictureCropPage>
          .read(uploadProfileImageProvider.notifier)
          .upload(xFile, fileName: 'profile-picture.png');

-      if (!context.mounted) return;
+      if (!context.mounted) {
+        return;
+      }

      if (success) {
        final profileImagePath = ref.read(uploadProfileImageProvider).profileImagePath;
@@ -102,7 +106,9 @@ class _ProfilePictureCropPageState extends ConsumerState<ProfilePictureCropPage>
        );
      }
    } catch (e) {
-      if (!context.mounted) return;
+      if (!context.mounted) {
+        return;
+      }

      ImmichToast.show(
        context: context,
@@ -13,6 +13,7 @@ import 'package:immich_mobile/domain/models/timeline.model.dart';
 import 'package:immich_mobile/domain/services/timeline.service.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
+import 'package:immich_mobile/generated/translations.g.dart';
 import 'package:immich_mobile/models/search/search_filter.model.dart';
 import 'package:immich_mobile/presentation/pages/search/paginated_search.provider.dart';
 import 'package:immich_mobile/presentation/widgets/bottom_sheet/general_bottom_sheet.widget.dart';
@@ -106,10 +107,17 @@ class DriftSearchPage extends HookConsumerWidget {

      Future.microtask(() {
        textSearchController.clear();
+        peopleCurrentFilterWidget.value = null;
+        dateRangeCurrentFilterWidget.value = null;
+        cameraCurrentFilterWidget.value = null;
+        tagCurrentFilterWidget.value = null;
+        mediaTypeCurrentFilterWidget.value = null;
+        ratingCurrentFilterWidget.value = null;
+        displayOptionCurrentFilterWidget.value = null;
+        locationCurrentFilterWidget.value = preFilter.location.city != null
+            ? Text(preFilter.location.city!, style: context.textTheme.labelLarge)
+            : null;
        search(preFilter);
-        if (preFilter.location.city != null) {
-          locationCurrentFilterWidget.value = Text(preFilter.location.city!, style: context.textTheme.labelLarge);
-        }
      });

      return null;
@@ -701,7 +709,9 @@ class _SearchResultGrid extends ConsumerWidget {
  bool _onScrollUpdateNotification(ScrollNotification notification) {
    final metrics = notification.metrics;

-    if (metrics.axis != Axis.vertical) return false;
+    if (metrics.axis != Axis.vertical) {
+      return false;
+    }

    final isBottomSheet = notification.context?.findAncestorWidgetOfExactType<DraggableScrollableSheet>() != null;
    final remaining = metrics.maxScrollExtent - metrics.pixels;
@@ -728,7 +738,9 @@ class _SearchResultGrid extends ConsumerWidget {

    final hasMore = ref.watch(paginatedSearchProvider.select((s) => s.nextPage != null));

-    if (hasMore) return null;
+    if (hasMore) {
+      return null;
+    }

    return SliverToBoxAdapter(
      child: Padding(
@@ -868,6 +880,12 @@ class _QuickLinkList extends StatelessWidget {
            isTop: true,
            onTap: () => context.pushRoute(const DriftRecentlyTakenRoute()),
          ),
+          _QuickLink(
+            title: context.t.recently_added,
+            icon: Icons.upload_outlined,
+            isTop: true,
+            onTap: () => context.pushRoute(const DriftRecentlyAddedRoute()),
+          ),
          _QuickLink(
            title: 'videos'.t(context: context),
            icon: Icons.play_circle_outline_rounded,
@@ -44,7 +44,9 @@ class PaginatedSearchNotifier extends StateNotifier<SearchState> {
  Stream<int> get assetCount => _assetCountController.stream;

  Future<void> search(SearchFilter filter) async {
-    if (state.nextPage == null || state.isLoading) return;
+    if (state.nextPage == null || state.isLoading) {
+      return;
+    }

    state = SearchState(assets: state.assets, nextPage: state.nextPage, isLoading: true);

@@ -50,7 +50,9 @@ class _AddActionButtonState extends ConsumerState<AddActionButton> {

  List<Widget> _buildMenuChildren() {
    final asset = ref.read(assetViewerProvider).currentAsset;
-    if (asset == null) return [];
+    if (asset == null) {
+      return [];
+    }

    final user = ref.read(currentUserProvider);
    final isOwner = asset is RemoteAsset && asset.ownerId == user?.id;
@@ -12,7 +12,9 @@ import 'package:immich_mobile/widgets/common/immich_toast.dart';

 // used to allow performing archive action from different sources  (without duplicating code)
 Future<void> performArchiveAction(BuildContext context, WidgetRef ref, {required ActionSource source}) async {
-  if (!context.mounted) return;
+  if (!context.mounted) {
+    return;
+  }

  if (source == ActionSource.viewer) {
    EventStream.shared.emit(const ViewerReloadAssetEvent());
@@ -54,7 +54,9 @@ class DeleteActionButton extends ConsumerWidget {
          ],
        ),
      );
-      if (confirm != true) return;
+      if (confirm != true) {
+        return;
+      }
    }

    if (source == ActionSource.viewer) {
@@ -33,7 +33,9 @@ class DeletePermanentActionButton extends ConsumerWidget {
          builder: (context) => PermanentDeleteDialog(count: count),
        ) ??
        false;
-    if (!confirm) return;
+    if (!confirm) {
+      return;
+    }

    if (source == ActionSource.viewer) {
      EventStream.shared.emit(const ViewerReloadAssetEvent());
@@ -12,7 +12,9 @@ import 'package:immich_mobile/widgets/common/immich_toast.dart';

 // Reusable helper: move to locked folder from any source (e.g called from menu)
 Future<void> performMoveToLockFolderAction(BuildContext context, WidgetRef ref, {required ActionSource source}) async {
-  if (!context.mounted) return;
+  if (!context.mounted) {
+    return;
+  }

  if (source == ActionSource.viewer) {
    EventStream.shared.emit(const ViewerReloadAssetEvent());
@@ -12,7 +12,6 @@ class OpenInBrowserActionButton extends ConsumerWidget {
  final TimelineOrigin origin;
  final bool iconOnly;
  final bool menuItem;
-  final Color? iconColor;

  const OpenInBrowserActionButton({
    super.key,
@@ -20,7 +19,6 @@ class OpenInBrowserActionButton extends ConsumerWidget {
    required this.origin,
    this.iconOnly = false,
    this.menuItem = false,
-    this.iconColor,
  });

  void _onTap() async {
@@ -52,7 +50,6 @@ class OpenInBrowserActionButton extends ConsumerWidget {
    return BaseActionButton(
      label: 'open_in_browser'.t(context: context),
      iconData: Icons.open_in_browser,
-      iconColor: iconColor,
      iconOnly: iconOnly,
      menuItem: menuItem,
      onPressed: _onTap,
@@ -37,7 +37,7 @@ class SimilarPhotosActionButton extends ConsumerWidget {
          date: SearchDateFilter(),
          display: SearchDisplayFilters(isNotInAlbum: false, isArchive: false, isFavorite: false),
          rating: SearchRatingFilter(),
-          mediaType: AssetType.image,
+          mediaType: AssetType.other,
        ),
      );

@@ -14,7 +14,9 @@ import 'package:immich_mobile/domain/utils/event_stream.dart';

 // used to allow performing unarchive action from different sources (without duplicating code)
 Future<void> performUnArchiveAction(BuildContext context, WidgetRef ref, {required ActionSource source}) async {
-  if (!context.mounted) return;
+  if (!context.mounted) {
+    return;
+  }

  if (source == ActionSource.viewer) {
    EventStream.shared.emit(const ViewerReloadAssetEvent());
@@ -26,6 +26,14 @@ class AssetDetails extends ConsumerWidget {
      decoration: BoxDecoration(
        color: context.colorScheme.surface,
        borderRadius: const BorderRadius.vertical(top: Radius.circular(20)),
+        boxShadow: [
+          BoxShadow(
+            color: Colors.black.withValues(alpha: 0.2),
+            offset: const Offset(0, -3),
+            blurRadius: 10,
+            spreadRadius: 2,
+          ),
+        ],
      ),
      child: SafeArea(
        top: false,
@@ -21,21 +21,27 @@ class AppearsInDetails extends ConsumerWidget {

  @override
  Widget build(BuildContext context, WidgetRef ref) {
-    if (!asset.hasRemote) return const SizedBox.shrink();
+    if (!asset.hasRemote) {
+      return const SizedBox.shrink();
+    }

    final remoteAssetId = switch (asset) {
      RemoteAsset(:final id) => id,
      LocalAsset(:final remoteAssetId) => remoteAssetId,
    };

-    if (remoteAssetId == null) return const SizedBox.shrink();
+    if (remoteAssetId == null) {
+      return const SizedBox.shrink();
+    }

    final userId = ref.watch(currentUserProvider)?.id;
    final assetAlbums = ref.watch(albumsContainingAssetProvider(remoteAssetId));

    return assetAlbums.when(
      data: (albums) {
-        if (albums.isEmpty) return const SizedBox.shrink();
+        if (albums.isEmpty) {
+          return const SizedBox.shrink();
+        }

        albums.sortBy((a) => a.name);

@@ -20,7 +20,9 @@ class RatingDetails extends ConsumerWidget {
        .watch(userMetadataPreferencesProvider)
        .maybeWhen(data: (prefs) => prefs?.ratingsEnabled ?? false, orElse: () => false);

-    if (!isRatingEnabled) return const SizedBox.shrink();
+    if (!isRatingEnabled) {
+      return const SizedBox.shrink();
+    }

    return Padding(
      padding: const EdgeInsets.only(left: 16.0, top: 16.0),
@@ -22,6 +22,7 @@ class TechnicalDetails extends ConsumerWidget {
    final exifInfo = this.exifInfo;
    final cameraTitle = _getCameraInfoTitle(exifInfo);
    final lensTitle = exifInfo?.lens != null && exifInfo!.lens!.isNotEmpty ? exifInfo.lens : null;
+    final lensSubtitle = _getLensInfoSubtitle(exifInfo);

    return Column(
      children: [
@@ -46,9 +47,16 @@ class TechnicalDetails extends ConsumerWidget {
            title: lensTitle,
            titleStyle: context.textTheme.labelLarge,
            leading: Icon(Icons.camera_outlined, size: 24, color: context.textTheme.labelLarge?.color),
-            subtitle: _getLensInfoSubtitle(exifInfo),
+            subtitle: lensSubtitle,
            subtitleStyle: context.textTheme.bodyMedium?.copyWith(color: context.colorScheme.onSurfaceSecondary),
          ),
+        ] else if (lensSubtitle != null) ...[
+          const SizedBox(height: 16),
+          SheetTile(
+            title: lensSubtitle,
+            titleStyle: context.textTheme.bodyMedium?.copyWith(color: context.colorScheme.onSurfaceSecondary),
+            leading: Icon(Icons.camera_outlined, size: 24, color: context.textTheme.labelLarge?.color),
+          ),
        ],
      ],
    );
@@ -103,7 +111,9 @@ class TechnicalDetails extends ConsumerWidget {
  }

  static String? _getCameraInfoTitle(ExifInfo? exifInfo) {
-    if (exifInfo == null) return null;
+    if (exifInfo == null) {
+      return null;
+    }
    return switch ((exifInfo.make, exifInfo.model)) {
      (null, null) => null,
      (String make, null) => make,
@@ -113,16 +123,23 @@ class TechnicalDetails extends ConsumerWidget {
  }

  static String? _getCameraInfoSubtitle(ExifInfo? exifInfo) {
-    if (exifInfo == null) return null;
+    if (exifInfo == null) {
+      return null;
+    }
    final exposureTime = exifInfo.exposureTime.isNotEmpty ? exifInfo.exposureTime : null;
    final iso = exifInfo.iso != null ? 'ISO ${exifInfo.iso}' : null;
    return [exposureTime, iso].where((spec) => spec != null && spec.isNotEmpty).join(_kSeparator);
  }

  static String? _getLensInfoSubtitle(ExifInfo? exifInfo) {
-    if (exifInfo == null) return null;
+    if (exifInfo == null) {
+      return null;
+    }
    final fNumber = exifInfo.fNumber.isNotEmpty ? 'ƒ/${exifInfo.fNumber}' : null;
    final focalLength = exifInfo.focalLength.isNotEmpty ? '${exifInfo.focalLength} mm' : null;
+    if (fNumber == null && focalLength == null) {
+      return null;
+    }
    return [fNumber, focalLength].where((spec) => spec != null && spec.isNotEmpty).join(_kSeparator);
  }
 }
@@ -14,10 +14,10 @@ import 'package:immich_mobile/extensions/scroll_extensions.dart';
 import 'package:immich_mobile/presentation/widgets/asset_viewer/asset_details.widget.dart';
 import 'package:immich_mobile/presentation/widgets/asset_viewer/asset_stack.provider.dart';
 import 'package:immich_mobile/presentation/widgets/asset_viewer/asset_stack.widget.dart';
-import 'package:immich_mobile/providers/asset_viewer/asset_viewer.provider.dart';
 import 'package:immich_mobile/presentation/widgets/asset_viewer/video_viewer.widget.dart';
 import 'package:immich_mobile/presentation/widgets/images/image_provider.dart';
 import 'package:immich_mobile/presentation/widgets/images/thumbnail.widget.dart';
+import 'package:immich_mobile/providers/asset_viewer/asset_viewer.provider.dart';
 import 'package:immich_mobile/providers/asset_viewer/is_motion_video_playing.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/metadata.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
@@ -61,7 +61,9 @@ class _AssetPageState extends ConsumerState<AssetPage> {
    super.initState();
    _eventSubscription = EventStream.shared.listen(_onEvent);
    WidgetsBinding.instance.addPostFrameCallback((_) {
-      if (!mounted || !_scrollController.hasClients) return;
+      if (!mounted || !_scrollController.hasClients) {
+        return;
+      }
      _scrollController.snapPosition.snapOffset = _snapOffset;
      if (_showingDetails && _snapOffset > 0) {
        _scrollController.jumpTo(_snapOffset);
@@ -86,7 +88,9 @@ class _AssetPageState extends ConsumerState<AssetPage> {
  }

  void _showDetails() {
-    if (!_scrollController.hasClients || _snapOffset <= 0) return;
+    if (!_scrollController.hasClients || _snapOffset <= 0) {
+      return;
+    }
    _viewer.setShowingDetails(true);
    _scrollController.animateTo(_snapOffset, duration: Durations.medium2, curve: Curves.easeOutCubic);
  }
@@ -127,7 +131,9 @@ class _AssetPageState extends ConsumerState<AssetPage> {
  }

  void _updateDrag(DragUpdateDetails details) {
-    if (_dragStart == null) return;
+    if (_dragStart == null) {
+      return;
+    }

    if (_dragIntent == _DragIntent.none) {
      _dragIntent = switch ((details.globalPosition - _dragStart!.globalPosition).dy) {
@@ -140,7 +146,9 @@ class _AssetPageState extends ConsumerState<AssetPage> {
    switch (_dragIntent) {
      case _DragIntent.none:
      case _DragIntent.scroll:
-        if (_drag == null) _startProxyDrag();
+        if (_drag == null) {
+          _startProxyDrag();
+        }
        _drag?.update(details);

        _syncShowingDetails();
@@ -150,7 +158,9 @@ class _AssetPageState extends ConsumerState<AssetPage> {
  }

  void _endDrag(DragEndDetails details) {
-    if (_dragStart == null) return;
+    if (_dragStart == null) {
+      return;
+    }

    final start = _dragStart;
    _dragStart = null;
@@ -187,7 +197,9 @@ class _AssetPageState extends ConsumerState<AssetPage> {
    PhotoViewControllerBase controller,
    PhotoViewScaleStateController scaleStateController,
  ) {
-    if (!_showingDetails && _isZoomed) return;
+    if (!_showingDetails && _isZoomed) {
+      return;
+    }
    _beginDrag(details);
  }

@@ -214,7 +226,9 @@ class _AssetPageState extends ConsumerState<AssetPage> {
  }

  void _onTapUp(BuildContext context, TapUpDetails details, PhotoViewControllerValue controllerValue) {
-    if (_showingDetails || _dragStart != null) return;
+    if (_showingDetails || _dragStart != null) {
+      return;
+    }

    final tapToNavigate = ref.read(metadataProvider).appConfig.viewer.tapToNavigate;
    if (!tapToNavigate) {
@@ -246,31 +260,43 @@ class _AssetPageState extends ConsumerState<AssetPage> {
    _viewer.setZoomed(_isZoomed);

    if (scaleState != PhotoViewScaleState.initial) {
-      if (_dragStart == null) _viewer.setControls(false);
+      if (_dragStart == null) {
+        _viewer.setControls(false);
+      }
      return;
    }

-    if (!_showingDetails) _viewer.setControls(true);
+    if (!_showingDetails) {
+      _viewer.setControls(true);
+    }
  }

  void _listenForScaleBoundaries(PhotoViewControllerBase? controller) {
    _scaleBoundarySub?.cancel();
    _scaleBoundarySub = null;
-    if (controller == null || controller.scaleBoundaries != null) return;
+    if (controller == null || controller.scaleBoundaries != null) {
+      return;
+    }
    _scaleBoundarySub = controller.outputStateStream.listen((_) {
      if (controller.scaleBoundaries != null) {
        _scaleBoundarySub?.cancel();
        _scaleBoundarySub = null;
-        if (mounted) setState(() {});
+        if (mounted) {
+          setState(() {});
+        }
      }
    });
  }

  double _getImageHeight(double maxWidth, double maxHeight, BaseAsset? asset) {
    final sb = _viewController?.scaleBoundaries;
-    if (sb != null) return sb.childSize.height * sb.initialScale;
+    if (sb != null) {
+      return sb.childSize.height * sb.initialScale;
+    }

-    if (asset == null || asset.width == null || asset.height == null) return maxHeight;
+    if (asset == null || asset.width == null || asset.height == null) {
+      return maxHeight;
+    }

    final r = asset.width! / asset.height!;
    return math.min(maxWidth / r, maxHeight);
@@ -21,12 +21,16 @@ class AssetPreloader {
    unawaited(timelineService.preloadAssets(index));
    _timer?.cancel();
    _timer = Timer(Durations.medium4, () async {
-      if (!mounted()) return;
+      if (!mounted()) {
+        return;
+      }
      final (prev, next) = await (
        timelineService.getAssetAsync(index - 1),
        timelineService.getAssetAsync(index + 1),
      ).wait;
-      if (!mounted()) return;
+      if (!mounted()) {
+        return;
+      }
      _prevStream?.removeListener(_dummyListener);
      _nextStream?.removeListener(_dummyListener);
      _prevStream = prev != null ? _resolveImage(prev, size) : null;
@@ -17,9 +17,9 @@ import 'package:immich_mobile/presentation/widgets/action_buttons/download_statu
 import 'package:immich_mobile/presentation/widgets/asset_viewer/asset_page.widget.dart';
 import 'package:immich_mobile/presentation/widgets/asset_viewer/asset_preloader.dart';
 import 'package:immich_mobile/presentation/widgets/asset_viewer/asset_stack.provider.dart';
-import 'package:immich_mobile/providers/asset_viewer/asset_viewer.provider.dart';
-import 'package:immich_mobile/presentation/widgets/asset_viewer/viewer_top_app_bar.widget.dart';
 import 'package:immich_mobile/presentation/widgets/asset_viewer/viewer_bottom_app_bar.widget.dart';
+import 'package:immich_mobile/presentation/widgets/asset_viewer/viewer_top_app_bar.widget.dart';
+import 'package:immich_mobile/providers/asset_viewer/asset_viewer.provider.dart';
 import 'package:immich_mobile/providers/cast.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/current_album.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
@@ -67,7 +67,9 @@ class AssetViewer extends ConsumerStatefulWidget {
    ref.read(assetViewerProvider.notifier).reset();

    // Hide controls by default for videos
-    if (asset.isVideo) ref.read(assetViewerProvider.notifier).setControls(false);
+    if (asset.isVideo) {
+      ref.read(assetViewerProvider.notifier).setControls(false);
+    }

    _setAsset(ref, asset);
  }
@@ -90,7 +92,9 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {

  void _onTapNavigate(int direction) {
    final page = _pageController.page?.toInt();
-    if (page == null) return;
+    if (page == null) {
+      return;
+    }
    final target = page + direction;
    final maxPage = _totalAssets - 1;
    if (target >= 0 && target <= maxPage) {
@@ -105,7 +109,9 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {

    final asset = ref.read(assetViewerProvider).currentAsset;
    assert(asset != null, "Current asset should not be null when opening the AssetViewer");
-    if (asset != null) _stackChildrenKeepAlive = ref.read(stackChildrenNotifier(asset).notifier).ref.keepAlive();
+    if (asset != null) {
+      _stackChildrenKeepAlive = ref.read(stackChildrenNotifier(asset).notifier).ref.keepAlive();
+    }

    _reloadSubscription = EventStream.shared.listen(_onEvent);

@@ -137,7 +143,9 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
  // playing, and preventing the video on the next page from becoming ready
  // unnecessarily.
  bool _onScrollEnd(ScrollEndNotification notification) {
-    if (notification.depth != 0) return false;
+    if (notification.depth != 0) {
+      return false;
+    }

    final page = _pageController.page?.round();
    if (page != null && page != _currentPage) {
@@ -155,7 +163,9 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
    _currentPage = index;

    final asset = await ref.read(timelineServiceProvider).getAssetAsync(index);
-    if (asset == null) return;
+    if (asset == null) {
+      return;
+    }

    AssetViewer._setAsset(ref, asset);
    _preloader.preload(index, context.sizeData);
@@ -165,9 +175,13 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
  }

  void _handleCasting() {
-    if (!ref.read(castProvider).isCasting) return;
+    if (!ref.read(castProvider).isCasting) {
+      return;
+    }
    final asset = ref.read(assetViewerProvider).currentAsset;
-    if (asset == null) return;
+    if (asset == null) {
+      return;
+    }

    if (asset is RemoteAsset) {
      context.scaffoldMessenger.hideCurrentSnackBar();
@@ -199,7 +213,9 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
  }

  void _onViewerReloadEvent() {
-    if (_totalAssets <= 1) return;
+    if (_totalAssets <= 1) {
+      return;
+    }

    final index = _pageController.page?.round() ?? 0;
    final target = index >= _totalAssets - 1 ? index - 1 : index + 1;
@@ -252,7 +268,9 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {

    // Listen for casting changes and send initial asset to the cast provider
    ref.listen(castProvider.select((value) => value.isCasting), (_, isCasting) {
-      if (!isCasting) return;
+      if (!isCasting) {
+        return;
+      }
      WidgetsBinding.instance.addPostFrameCallback((_) {
        _handleCasting();
      });
@@ -65,26 +65,37 @@ class ViewerBottomBar extends ConsumerWidget {
                  labelLarge: context.themeData.textTheme.labelLarge?.copyWith(color: Colors.white),
                ),
              ),
-              child: Container(
-                decoration: const BoxDecoration(
-                  gradient: LinearGradient(
-                    begin: Alignment.bottomCenter,
-                    end: Alignment.topCenter,
-                    colors: [Colors.black45, Colors.black12, Colors.transparent],
-                    stops: [0.0, 0.7, 1.0],
+              child: Stack(
+                children: [
+                  const Positioned.fill(
+                    child: IgnorePointer(
+                      child: DecoratedBox(
+                        decoration: BoxDecoration(
+                          gradient: LinearGradient(
+                            begin: Alignment.bottomCenter,
+                            end: Alignment.topCenter,
+                            colors: [Colors.black45, Colors.black12, Colors.transparent],
+                            stops: [0.0, 0.7, 1.0],
+                          ),
+                        ),
+                      ),
+                    ),
                  ),
-                ),
-                child: SafeArea(
-                  top: false,
-                  child: Column(
-                    mainAxisSize: MainAxisSize.min,
-                    children: [
-                      if (asset.isVideo) VideoControls(videoPlayerName: asset.heroTag),
-                      if (!isReadonlyModeEnabled)
-                        Row(mainAxisAlignment: MainAxisAlignment.spaceEvenly, children: actions),
-                    ],
+                  SafeArea(
+                    top: false,
+                    child: Padding(
+                      padding: const EdgeInsets.only(top: 16),
+                      child: Column(
+                        mainAxisSize: MainAxisSize.min,
+                        children: [
+                          if (asset.isVideo) VideoControls(videoPlayerName: asset.heroTag),
+                          if (!isReadonlyModeEnabled)
+                            Row(mainAxisAlignment: MainAxisAlignment.spaceEvenly, children: actions),
+                        ],
+                      ),
+                    ),
                  ),
-                ),
+                ],
              ),
            ),
    );
@@ -0,0 +1,78 @@
+import 'package:flutter/material.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/extensions/platform_extensions.dart';
+import 'package:immich_mobile/extensions/translate_extensions.dart';
+import 'package:immich_mobile/providers/asset_viewer/asset_viewer.provider.dart';
+import 'package:immich_mobile/providers/asset_viewer/is_motion_video_playing.provider.dart';
+
+class MotionPhotoPlayButton extends ConsumerWidget {
+  const MotionPhotoPlayButton({super.key});
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final asset = ref.watch(assetViewerProvider.select((state) => state.currentAsset));
+    final isPlaying = ref.watch(isPlayingMotionVideoProvider);
+    final showControls = ref.watch(assetViewerProvider.select((state) => state.showingControls));
+    final isShowingDetails = ref.watch(assetViewerProvider.select((state) => state.showingDetails));
+
+    if (asset == null || !asset.isMotionPhoto || isShowingDetails) {
+      return const SizedBox.shrink();
+    }
+
+    return IgnorePointer(
+      ignoring: !showControls,
+      child: AnimatedOpacity(
+        opacity: showControls ? 1.0 : 0.0,
+        duration: Durations.short2,
+        child: SafeArea(
+          child: Padding(
+            padding: const EdgeInsets.only(top: 60),
+            child: Center(
+              child: _MotionButton(
+                isPlaying: isPlaying,
+                onPressed: ref.read(isPlayingMotionVideoProvider.notifier).toggle,
+              ),
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+}
+
+class _MotionButton extends StatelessWidget {
+  final bool isPlaying;
+  final VoidCallback onPressed;
+
+  const _MotionButton({required this.isPlaying, required this.onPressed});
+
+  @override
+  Widget build(BuildContext context) {
+    return Material(
+      color: Colors.grey[900]!.withValues(alpha: 0.4),
+      borderRadius: const BorderRadius.all(Radius.circular(24)),
+      child: InkWell(
+        onTap: onPressed,
+        borderRadius: const BorderRadius.all(Radius.circular(24)),
+        child: Padding(
+          padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 6),
+          child: Row(
+            mainAxisSize: MainAxisSize.min,
+            children: [
+              Icon(
+                isPlaying ? Icons.motion_photos_pause_outlined : Icons.play_circle_outline_rounded,
+                color: Colors.white,
+                size: 16,
+              ),
+              const SizedBox(width: 8),
+              Text(
+                CurrentPlatform.isAndroid ? 'motion'.t(context: context) : 'live'.t(context: context),
+                style: const TextStyle(color: Colors.white, fontSize: 14, fontWeight: FontWeight.w500),
+              ),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+}
--- a/Show More
+++ b/Show More