Merge remote-tracking branch 'origin/main' into feature/new-activity-timeline

mobile/.fvmrc

@@ -1,3 +1,3 @@
 {
-  "flutter": "3.35.6"
+  "flutter": "3.35.7"
 }

mobile/.vscode/settings.json

@@ -1,5 +1,5 @@
 {
-  "dart.flutterSdkPath": ".fvm/versions/3.35.6",
+  "dart.flutterSdkPath": ".fvm/versions/3.35.7",
   "dart.lineLength": 120,
   "[dart]": {
     "editor.rulers": [120]

mobile/analysis_options.yaml

@@ -17,7 +17,7 @@ linter:
   # section below to disable rules from the `package:flutter_lints/flutter.yaml`
   # included above or to enable additional rules. A list of all available lints
   # and their documentation is published at
-  # https://dart-lang.github.io/linter/lints/index.html.
+  # https://dart.dev/tools/linter-rules
   #
   # Instead of disabling a lint rule for the entire project in the
   # section below, it can also be suppressed for a single line of code
@@ -28,6 +28,7 @@ linter:
   rules:
     # avoid_print: false  # Uncomment to disable the `avoid_print` rule
     # prefer_single_quotes: true # Uncomment to enable the `prefer_single_quotes` rule
+    unawaited_futures: true
     use_build_context_synchronously: false
     require_trailing_commas: true
     unrelated_type_equality_checks: true
@@ -46,6 +47,8 @@ analyzer:
   # TODO: Re-enable after upgrading custom_lint
   # plugins:
   #   - custom_lint
+  errors:
+    unawaited_futures: warning
 
 custom_lint:
   debug: true
@@ -152,160 +155,6 @@ dart_code_metrics:
   #  - avoid-passing-async-when-sync-expected
   #  - avoid-throw-in-catch-block
     - avoid-unused-parameters
-  #  - avoid-unnecessary-type-assertions
-  #  - avoid-unnecessary-type-casts
-  #  - avoid-unrelated-type-assertions
-  #  - avoid-unrelated-type-casts
-  #  - no-empty-block
-  #  - no-equal-then-else
-  #  - prefer-correct-test-file-name
     - prefer-const-border-radius
-  #  - prefer-match-file-name
-  #  - prefer-return-await
-  #  - avoid-self-assignment
-  #  - avoid-self-compare
-  #  - avoid-shadowing
-  #  - prefer-iterable-of
-  #  - no-equal-switch-case
-  #  - no-equal-conditions
-  #  - avoid-equal-expressions
-  #  - avoid-missed-calls
-  #  - avoid-unnecessary-negations
-  #  - avoid-unused-generics
-  #  - function-always-returns-null
-  #  - avoid-throw-objects-without-tostring
-  #  - avoid-unsafe-collection-methods
-  #  - prefer-wildcard-pattern
-  #  - no-equal-switch-expression-cases
-  #  - avoid-future-tostring
-  #  - avoid-unassigned-late-fields
-  #  - avoid-nested-futures
-  #  - avoid-generics-shadowing
-  #  - prefer-parentheses-with-if-null
-  #  - no-equal-nested-conditions
-  #  - avoid-shadowed-extension-methods
-  #  - avoid-unnecessary-conditionals
-  #  - avoid-double-slash-imports
-  #  - avoid-map-keys-contains
-  #  - prefer-correct-json-casts
-  #  - avoid-duplicate-mixins
-  #  - avoid-nullable-interpolation
-  #  - avoid-unused-instances
-  #  - prefer-correct-for-loop-increment
-  #  - prefer-public-exception-classes
-  #  - avoid-uncaught-future-errors
-  #  - always-remove-listener
-  #  - avoid-unnecessary-setstate
-  #  - check-for-equals-in-render-object-setters
-  #  - consistent-update-render-object
-  #  - use-setstate-synchronously
-  #  - avoid-incomplete-copy-with
-  #  - proper-super-calls
-  #  - dispose-fields
-  #  - avoid-empty-setstate
-  #  - avoid-state-constructors
-  #  - avoid-recursive-widget-calls
-  #  - avoid-missing-image-alt
-  #  - avoid-passing-self-as-argument
-  #  - avoid-unnecessary-if
-  #  - avoid-unconditional-break
-  #  - avoid-referencing-discarded-variables
-  #  - avoid-unnecessary-local-late
-  #  - avoid-wildcard-cases-with-enums
-  #  - match-getter-setter-field-names
-  #  - avoid-accessing-collections-by-constant-index
-  #  - prefer-unique-test-names
-  #  - avoid-duplicate-cascades
-  #  - prefer-specific-cases-first
-  #  - avoid-duplicate-switch-case-conditions
-  #  - prefer-explicit-function-type
-  #  - avoid-misused-test-matchers
-  #  - avoid-duplicate-test-assertions
-  #  - prefer-switch-with-enums
-  #  - prefer-any-or-every
-  #  - avoid-duplicate-map-keys
-  #  - avoid-nullable-tostring
-  #  - avoid-undisposed-instances
-  #  - avoid-duplicate-initializers
-  #  - avoid-unassigned-stream-subscriptions
-  #  - avoid-empty-test-groups
-  #  - avoid-not-encodable-in-to-json
-  #  - avoid-contradictory-expressions
-  #  - avoid-excessive-expressions
-  #  - prefer-private-extension-type-field
-  #  - avoid-renaming-representation-getters
-  #  - avoid-empty-spread
-  #  - avoid-unnecessary-gesture-detector
-  #  - avoid-missing-completer-stack-trace
-  #  - avoid-casting-to-extension-type
-  #  - prefer-overriding-parent-equality
-  #  - avoid-missing-controller
-  #  - avoid-unknown-pragma
-  #  - avoid-conditions-with-boolean-literals
-  #  - avoid-multi-assignment
-  #  - avoid-collection-equality-checks
-  #  - avoid-only-rethrow
-  #  - avoid-incorrect-image-opacity
-  #  - avoid-misused-set-literals
-  #  - dispose-class-fields
-  #  - avoid-suspicious-super-overrides
-  #  - avoid-assignments-as-conditions
-  #  - avoid-unused-assignment
-  #  - avoid-unnecessary-overrides
-  #  - avoid-implicitly-nullable-extension-types
-    # Enable with the next release
-    # - avoid-late-final-reassignment
-    # - avoid-duplicate-constant-values
-    # - function-always-returns-same-value
-    # - avoid-flexible-outside-flex
-    # - avoid-unnecessary-patterns
-    # - use-closest-build-context
-    # - avoid-commented-out-code
-    # - avoid-recursive-tostring
-    # - avoid-enum-values-by-index
-    # - avoid-constant-assert-conditions
-    # - avoid-inconsistent-digit-separators
-    # - pass-existing-future-to-future-builder
-    # - pass-existing-stream-to-stream-builder
-
-    # Code simplification
-  #  - avoid-redundant-async
-  #  - avoid-redundant-else
-  #  - avoid-unnecessary-nullable-return-type
-  #  - avoid-redundant-pragma-inline
-  #  - avoid-nested-records
-  #  - avoid-redundant-positional-field-name
-  #  - avoid-explicit-pattern-field-name
-  #  - prefer-simpler-patterns-null-check
-  #  - avoid-unnecessary-return
-  #  - avoid-duplicate-patterns
-  #  - avoid-keywords-in-wildcard-pattern
-  #  - avoid-unnecessary-futures
-  #  - avoid-unnecessary-reassignment
-  #  - avoid-unnecessary-call
-  #  - avoid-unnecessary-stateful-widgets
-  #  - prefer-dedicated-media-query-methods
-  #  - avoid-unnecessary-overrides-in-state
-  #  - move-variable-closer-to-its-usage
-  #  - avoid-nullable-parameters-with-default-values
-  #  - prefer-null-aware-spread
-  #  - avoid-inferrable-type-arguments
-  #  - avoid-unnecessary-super
-  #  - avoid-unnecessary-collections
-  #  - avoid-unnecessary-extends
-  #  - avoid-unnecessary-enum-arguments
-  #  - prefer-contains
-    # Enable with the next release
-    # - prefer-simpler-boolean-expressions
-    # - prefer-spacing
-    # - avoid-unnecessary-continue
-    # - avoid-unnecessary-compare-to
-
-    # Style
-  #  - prefer-trailing-comma
-  #  - unnecessary-trailing-comma
     - prefer-declaring-const-constructor
-  #  - prefer-single-widget-per-file
     - prefer-switch-expression
-  #  - prefer-prefixed-global-constants
-  #  - prefer-correct-callback-field-name

mobile/android/app/src/main/kotlin/app/alextran/immich/sync/MessagesImplBase.kt

@@ -101,9 +101,15 @@ open class NativeSyncApiImplBase(context: Context) : ImmichPlugin() {
 
         while (c.moveToNext()) {
           val id = c.getLong(idColumn).toString()
+          val name = c.getStringOrNull(nameColumn)
+          val bucketId = c.getStringOrNull(bucketIdColumn)
+          val path = c.getStringOrNull(dataColumn)
 
-          val path = c.getString(dataColumn)
-          if (path.isNullOrBlank() || !File(path).exists()) {
+          // Skip assets with invalid metadata
+          if (
+            name.isNullOrBlank() || bucketId.isNullOrBlank() ||
+            path.isNullOrBlank() || !File(path).exists()
+          ) {
             yield(AssetResult.InvalidAsset(id))
             continue
           }
@@ -113,7 +119,6 @@ open class NativeSyncApiImplBase(context: Context) : ImmichPlugin() {
             MediaStore.Files.FileColumns.MEDIA_TYPE_VIDEO -> 2
             else -> 0
           }
-          val name = c.getString(nameColumn)
           // Date taken is milliseconds since epoch, Date added is seconds since epoch
           val createdAt = (c.getLong(dateTakenColumn).takeIf { it > 0 }?.div(1000))
             ?: c.getLong(dateAddedColumn)
@@ -124,7 +129,6 @@ open class NativeSyncApiImplBase(context: Context) : ImmichPlugin() {
           // Duration is milliseconds
           val duration = if (mediaType == MediaStore.Files.FileColumns.MEDIA_TYPE_IMAGE) 0
           else c.getLong(durationColumn) / 1000
-          val bucketId = c.getString(bucketIdColumn)
           val orientation = c.getInt(orientationColumn)
           val isFavorite = if (favoriteColumn == -1) false else c.getInt(favoriteColumn) != 0
 

mobile/lib/constants/enums.dart

@@ -1,6 +1,6 @@
 enum SortOrder { asc, desc }
 
-enum TextSearchType { context, filename, description }
+enum TextSearchType { context, filename, description, ocr }
 
 enum AssetVisibilityEnum { timeline, hidden, archive, locked }
 

mobile/lib/domain/services/background_worker.service.dart

@@ -114,10 +114,10 @@ class BackgroundWorkerBgService extends BackgroundWorkerFlutterApi {
       configureFileDownloaderNotifications();
 
       // Notify the host that the background worker service has been initialized and is ready to use
-      _backgroundHostApi.onInitialized();
+      unawaited(_backgroundHostApi.onInitialized());
     } catch (error, stack) {
       _logger.severe("Failed to initialize background worker", error, stack);
-      _backgroundHostApi.close();
+      unawaited(_backgroundHostApi.close());
     }
   }
 

mobile/lib/domain/services/local_sync.service.dart

@@ -249,7 +249,7 @@ class LocalSyncService {
 
       if (assetsToUpsert.isEmpty && assetsToDelete.isEmpty) {
         _log.fine("No asset changes detected in album ${deviceAlbum.name}. Updating metadata.");
-        _localAlbumRepository.upsert(updatedDeviceAlbum);
+        await _localAlbumRepository.upsert(updatedDeviceAlbum);
         return true;
       }
 

mobile/lib/domain/services/remote_album.service.dart

@@ -164,6 +164,10 @@ class RemoteAlbumService {
     return _repository.getCount();
   }
 
+  Future<List<RemoteAlbum>> getAlbumsContainingAsset(String assetId) {
+    return _repository.getAlbumsContainingAsset(assetId);
+  }
+
   Future<List<RemoteAlbum>> _sortByNewestAsset(List<RemoteAlbum> albums) async {
     // map album IDs to their newest asset dates
     final Map<String, Future<DateTime?>> assetTimestampFutures = {};

mobile/lib/infrastructure/loaders/remote_image_request.dart

@@ -68,7 +68,7 @@ class RemoteImageRequest extends ImageRequest {
     final cacheManager = this.cacheManager;
     final streamController = StreamController<List<int>>(sync: true);
     final Stream<List<int>> stream;
-    cacheManager?.putStreamedFile(url, streamController.stream);
+    unawaited(cacheManager?.putStreamedFile(url, streamController.stream));
     stream = response.map((chunk) {
       if (_isCancelled) {
         throw StateError('Cancelled request');
@@ -81,11 +81,11 @@ class RemoteImageRequest extends ImageRequest {
 
     try {
       final Uint8List bytes = await _downloadBytes(stream, response.contentLength);
-      streamController.close();
+      unawaited(streamController.close());
       return await ImmutableBuffer.fromUint8List(bytes);
     } catch (e) {
       streamController.addError(e);
-      streamController.close();
+      unawaited(streamController.close());
       if (_isCancelled) {
         return null;
       }
@@ -143,7 +143,7 @@ class RemoteImageRequest extends ImageRequest {
       return await _decodeBuffer(buffer, decode, scale);
     } catch (e) {
       log.severe('Failed to decode cached image', e);
-      _evictFile(url);
+      unawaited(_evictFile(url));
       return null;
     }
   }

mobile/lib/infrastructure/repositories/local_album.repository.dart

@@ -361,15 +361,13 @@ class DriftLocalAlbumRepository extends DriftDatabaseRepository {
     return _db.managers.localAlbumEntity.count();
   }
 
-  Future unlinkRemoteAlbum(String id) async {
-    return _db.localAlbumEntity.update()
-      ..where((row) => row.id.equals(id))
-      ..write(const LocalAlbumEntityCompanion(linkedRemoteAlbumId: Value(null)));
+  Future<void> unlinkRemoteAlbum(String id) async {
+    final query = _db.localAlbumEntity.update()..where((row) => row.id.equals(id));
+    await query.write(const LocalAlbumEntityCompanion(linkedRemoteAlbumId: Value(null)));
   }
 
-  Future linkRemoteAlbum(String localAlbumId, String remoteAlbumId) async {
-    return _db.localAlbumEntity.update()
-      ..where((row) => row.id.equals(localAlbumId))
-      ..write(LocalAlbumEntityCompanion(linkedRemoteAlbumId: Value(remoteAlbumId)));
+  Future<void> linkRemoteAlbum(String localAlbumId, String remoteAlbumId) async {
+    final query = _db.localAlbumEntity.update()..where((row) => row.id.equals(localAlbumId));
+    await query.write(LocalAlbumEntityCompanion(linkedRemoteAlbumId: Value(remoteAlbumId)));
   }
 }

mobile/lib/infrastructure/repositories/remote_album.repository.dart

@@ -382,6 +382,61 @@ class DriftRemoteAlbumRepository extends DriftDatabaseRepository {
 
     return query.map((row) => row.read(_db.remoteAssetEntity.id)!).get();
   }
+
+  Future<List<RemoteAlbum>> getAlbumsContainingAsset(String assetId) async {
+    // Note: this needs to be 2 queries as the where clause filtering causes the assetCount to always be 1
+    final albumIdsQuery = _db.remoteAlbumAssetEntity.selectOnly()
+      ..addColumns([_db.remoteAlbumAssetEntity.albumId])
+      ..where(_db.remoteAlbumAssetEntity.assetId.equals(assetId));
+
+    final albumIds = await albumIdsQuery.map((row) => row.read(_db.remoteAlbumAssetEntity.albumId)!).get();
+
+    if (albumIds.isEmpty) {
+      return [];
+    }
+
+    final assetCount = _db.remoteAlbumAssetEntity.assetId.count(distinct: true);
+    final query =
+        _db.remoteAlbumEntity.select().join([
+            leftOuterJoin(
+              _db.remoteAlbumAssetEntity,
+              _db.remoteAlbumAssetEntity.albumId.equalsExp(_db.remoteAlbumEntity.id),
+              useColumns: false,
+            ),
+            leftOuterJoin(
+              _db.remoteAssetEntity,
+              _db.remoteAssetEntity.id.equalsExp(_db.remoteAlbumAssetEntity.assetId),
+              useColumns: false,
+            ),
+            leftOuterJoin(
+              _db.userEntity,
+              _db.userEntity.id.equalsExp(_db.remoteAlbumEntity.ownerId),
+              useColumns: false,
+            ),
+            leftOuterJoin(
+              _db.remoteAlbumUserEntity,
+              _db.remoteAlbumUserEntity.albumId.equalsExp(_db.remoteAlbumEntity.id),
+              useColumns: false,
+            ),
+          ])
+          ..where(_db.remoteAlbumEntity.id.isIn(albumIds) & _db.remoteAssetEntity.deletedAt.isNull())
+          ..addColumns([assetCount])
+          ..addColumns([_db.remoteAlbumUserEntity.userId.count(distinct: true)])
+          ..addColumns([_db.userEntity.name])
+          ..groupBy([_db.remoteAlbumEntity.id]);
+
+    return query
+        .map(
+          (row) => row
+              .readTable(_db.remoteAlbumEntity)
+              .toDto(
+                ownerName: row.read(_db.userEntity.name) ?? '',
+                isShared: row.read(_db.remoteAlbumUserEntity.userId.count(distinct: true))! > 0,
+                assetCount: row.read(assetCount) ?? 0,
+              ),
+        )
+        .get();
+  }
 }
 
 extension on RemoteAlbumEntityData {

mobile/lib/infrastructure/repositories/search_api.repository.dart

@@ -5,6 +5,7 @@ import 'package:openapi/api.dart';
 
 class SearchApiRepository extends ApiRepository {
   final SearchApi _api;
+
   const SearchApiRepository(this._api);
 
   Future<SearchResponseDto?> search(SearchFilter filter, int page) {
@@ -15,10 +16,12 @@ class SearchApiRepository extends ApiRepository {
       type = AssetTypeEnum.VIDEO;
     }
 
-    if (filter.context != null && filter.context!.isNotEmpty) {
+    if ((filter.context != null && filter.context!.isNotEmpty) ||
+        (filter.assetId != null && filter.assetId!.isNotEmpty)) {
       return _api.searchSmart(
         SmartSearchDto(
-          query: filter.context!,
+          query: filter.context,
+          queryAssetId: filter.assetId,
           language: filter.language,
           country: filter.location.country,
           state: filter.location.state,
@@ -43,6 +46,7 @@ class SearchApiRepository extends ApiRepository {
         originalFileName: filter.filename != null && filter.filename!.isNotEmpty ? filter.filename : null,
         country: filter.location.country,
         description: filter.description != null && filter.description!.isNotEmpty ? filter.description : null,
+        ocr: filter.ocr != null && filter.ocr!.isNotEmpty ? filter.ocr : null,
         state: filter.location.state,
         city: filter.location.city,
         make: filter.camera.make,

mobile/lib/infrastructure/repositories/storage.repository.dart

@@ -1,6 +1,7 @@
 import 'dart:io';
 
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
+import 'package:immich_mobile/extensions/platform_extensions.dart';
 import 'package:logging/logging.dart';
 import 'package:photo_manager/photo_manager.dart';
 
@@ -89,5 +90,17 @@ class StorageRepository {
     } catch (error, stackTrace) {
       log.warning("Error clearing cache", error, stackTrace);
     }
+
+    if (!CurrentPlatform.isIOS) {
+      return;
+    }
+
+    try {
+      if (await Directory.systemTemp.exists()) {
+        await Directory.systemTemp.delete(recursive: true);
+      }
+    } catch (error, stackTrace) {
+      log.warning("Error deleting temporary directory", error, stackTrace);
+    }
   }
 }

mobile/lib/main.dart

@@ -159,7 +159,7 @@ class ImmichAppState extends ConsumerState<ImmichApp> with WidgetsBindingObserve
     WidgetsBinding.instance.addObserver(this);
 
     // Draw the app from edge to edge
-    SystemChrome.setEnabledSystemUIMode(SystemUiMode.edgeToEdge);
+    unawaited(SystemChrome.setEnabledSystemUIMode(SystemUiMode.edgeToEdge));
 
     // Sets the navigation bar color
     SystemUiOverlayStyle overlayStyle = const SystemUiOverlayStyle(systemNavigationBarColor: Colors.transparent);

mobile/lib/models/search/search_filter.model.dart

@@ -176,7 +176,9 @@ class SearchFilter {
   String? context;
   String? filename;
   String? description;
+  String? ocr;
   String? language;
+  String? assetId;
   Set<PersonDto> people;
   SearchLocationFilter location;
   SearchCameraFilter camera;
@@ -190,7 +192,9 @@ class SearchFilter {
     this.context,
     this.filename,
     this.description,
+    this.ocr,
     this.language,
+    this.assetId,
     required this.people,
     required this.location,
     required this.camera,
@@ -203,6 +207,8 @@ class SearchFilter {
     return (context == null || (context != null && context!.isEmpty)) &&
         (filename == null || (filename!.isEmpty)) &&
         (description == null || (description!.isEmpty)) &&
+        (assetId == null || (assetId!.isEmpty)) &&
+        (ocr == null || (ocr!.isEmpty)) &&
         people.isEmpty &&
         location.country == null &&
         location.state == null &&
@@ -222,6 +228,8 @@ class SearchFilter {
     String? filename,
     String? description,
     String? language,
+    String? ocr,
+    String? assetId,
     Set<PersonDto>? people,
     SearchLocationFilter? location,
     SearchCameraFilter? camera,
@@ -234,6 +242,8 @@ class SearchFilter {
       filename: filename ?? this.filename,
       description: description ?? this.description,
       language: language ?? this.language,
+      ocr: ocr ?? this.ocr,
+      assetId: assetId ?? this.assetId,
       people: people ?? this.people,
       location: location ?? this.location,
       camera: camera ?? this.camera,
@@ -245,7 +255,7 @@ class SearchFilter {
 
   @override
   String toString() {
-    return 'SearchFilter(context: $context, filename: $filename, description: $description, language: $language, people: $people, location: $location, camera: $camera, date: $date, display: $display, mediaType: $mediaType)';
+    return 'SearchFilter(context: $context, filename: $filename, description: $description, language: $language, ocr: $ocr, people: $people, location: $location, camera: $camera, date: $date, display: $display, mediaType: $mediaType, assetId: $assetId)';
   }
 
   @override
@@ -256,6 +266,8 @@ class SearchFilter {
         other.filename == filename &&
         other.description == description &&
         other.language == language &&
+        other.ocr == ocr &&
+        other.assetId == assetId &&
         other.people == people &&
         other.location == location &&
         other.camera == camera &&
@@ -270,6 +282,8 @@ class SearchFilter {
         filename.hashCode ^
         description.hashCode ^
         language.hashCode ^
+        ocr.hashCode ^
+        assetId.hashCode ^
         people.hashCode ^
         location.hashCode ^
         camera.hashCode ^

mobile/lib/models/server_info/server_features.model.dart

@@ -5,33 +5,37 @@ class ServerFeatures {
   final bool map;
   final bool oauthEnabled;
   final bool passwordLogin;
+  final bool ocr;
 
   const ServerFeatures({
     required this.trash,
     required this.map,
     required this.oauthEnabled,
     required this.passwordLogin,
+    this.ocr = false,
   });
 
-  ServerFeatures copyWith({bool? trash, bool? map, bool? oauthEnabled, bool? passwordLogin}) {
+  ServerFeatures copyWith({bool? trash, bool? map, bool? oauthEnabled, bool? passwordLogin, bool? ocr}) {
     return ServerFeatures(
       trash: trash ?? this.trash,
       map: map ?? this.map,
       oauthEnabled: oauthEnabled ?? this.oauthEnabled,
       passwordLogin: passwordLogin ?? this.passwordLogin,
+      ocr: ocr ?? this.ocr,
     );
   }
 
   @override
   String toString() {
-    return 'ServerFeatures(trash: $trash, map: $map, oauthEnabled: $oauthEnabled, passwordLogin: $passwordLogin)';
+    return 'ServerFeatures(trash: $trash, map: $map, oauthEnabled: $oauthEnabled, passwordLogin: $passwordLogin, ocr: $ocr)';
   }
 
   ServerFeatures.fromDto(ServerFeaturesDto dto)
     : trash = dto.trash,
       map = dto.map,
       oauthEnabled = dto.oauth,
-      passwordLogin = dto.passwordLogin;
+      passwordLogin = dto.passwordLogin,
+      ocr = dto.ocr;
 
   @override
   bool operator ==(covariant ServerFeatures other) {
@@ -40,11 +44,12 @@ class ServerFeatures {
     return other.trash == trash &&
         other.map == map &&
         other.oauthEnabled == oauthEnabled &&
-        other.passwordLogin == passwordLogin;
+        other.passwordLogin == passwordLogin &&
+        other.ocr == ocr;
   }
 
   @override
   int get hashCode {
-    return trash.hashCode ^ map.hashCode ^ oauthEnabled.hashCode ^ passwordLogin.hashCode;
+    return trash.hashCode ^ map.hashCode ^ oauthEnabled.hashCode ^ passwordLogin.hashCode ^ ocr.hashCode;
   }
 }

mobile/lib/pages/album/album_options.page.dart

@@ -1,3 +1,5 @@
+import 'dart:async';
+
 import 'package:auto_route/auto_route.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
@@ -51,7 +53,7 @@ class AlbumOptionsPage extends HookConsumerWidget {
         final isSuccess = await ref.read(albumProvider.notifier).leaveAlbum(album);
 
         if (isSuccess) {
-          context.navigateTo(const TabControllerRoute(children: [AlbumsRoute()]));
+          unawaited(context.navigateTo(const TabControllerRoute(children: [AlbumsRoute()])));
         } else {
           showErrorMessage();
         }

mobile/lib/pages/album/album_shared_user_selection.page.dart

@@ -1,3 +1,5 @@
+import 'dart:async';
+
 import 'package:auto_route/auto_route.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
@@ -29,8 +31,8 @@ class AlbumSharedUserSelectionPage extends HookConsumerWidget {
 
       if (newAlbum != null) {
         ref.watch(albumTitleProvider.notifier).clearAlbumTitle();
-        context.maybePop(true);
-        context.navigateTo(const TabControllerRoute(children: [AlbumsRoute()]));
+        unawaited(context.maybePop(true));
+        unawaited(context.navigateTo(const TabControllerRoute(children: [AlbumsRoute()])));
       }
 
       ScaffoldMessenger(
@@ -109,8 +111,8 @@ class AlbumSharedUserSelectionPage extends HookConsumerWidget {
         centerTitle: false,
         leading: IconButton(
           icon: const Icon(Icons.close_rounded),
-          onPressed: () async {
-            context.maybePop();
+          onPressed: () {
+            unawaited(context.maybePop());
           },
         ),
         actions: [

mobile/lib/pages/backup/backup_controller.page.dart

@@ -155,7 +155,7 @@ class BackupControllerPage extends HookConsumerWidget {
                 // waited until returning from selection
                 await ref.read(backupProvider.notifier).backupAlbumSelectionDone();
                 // waited until backup albums are stored in DB
-                ref.read(albumProvider.notifier).refreshDeviceAlbums();
+                await ref.read(albumProvider.notifier).refreshDeviceAlbums();
               },
               child: const Text("select", style: TextStyle(fontWeight: FontWeight.bold)).tr(),
             ),

mobile/lib/pages/backup/drift_backup.page.dart

@@ -270,7 +270,7 @@ class _BackupAlbumSelectionCard extends ConsumerWidget {
             if (currentUser == null) {
               return;
             }
-            ref.read(driftBackupProvider.notifier).getBackupStatus(currentUser.id);
+            unawaited(ref.read(driftBackupProvider.notifier).getBackupStatus(currentUser.id));
           },
           child: const Text("select", style: TextStyle(fontWeight: FontWeight.bold)).tr(),
         ),

mobile/lib/pages/backup/drift_backup_asset_detail.page.dart

@@ -11,6 +11,7 @@ import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/pages/common/large_leading_tile.dart';
 import 'package:immich_mobile/presentation/widgets/images/thumbnail.widget.dart';
 import 'package:immich_mobile/providers/backup/drift_backup.provider.dart';
+import 'package:immich_mobile/repositories/asset_media.repository.dart';
 import 'package:immich_mobile/routing/router.dart';
 
 @RoutePage()
@@ -31,55 +32,66 @@ class DriftBackupAssetDetailPage extends ConsumerWidget {
             itemBuilder: (context, index) {
               final asset = candidates[index];
               final albumsAsyncValue = ref.watch(driftCandidateBackupAlbumInfoProvider(asset.id));
-              return LargeLeadingTile(
-                title: Text(
-                  asset.name,
-                  style: context.textTheme.labelLarge?.copyWith(fontWeight: FontWeight.w500, fontSize: 16),
-                ),
-                subtitle: Column(
-                  crossAxisAlignment: CrossAxisAlignment.start,
-                  children: [
-                    Text(
-                      asset.createdAt.toString(),
-                      style: TextStyle(fontSize: 13.0, color: context.colorScheme.onSurfaceSecondary),
+              final assetMediaRepository = ref.watch(assetMediaRepositoryProvider);
+              return FutureBuilder<String?>(
+                future: assetMediaRepository.getOriginalFilename(asset.id),
+                builder: (context, snapshot) {
+                  final displayName = snapshot.data ?? asset.name;
+                  return LargeLeadingTile(
+                    title: Text(
+                      displayName,
+                      style: context.textTheme.labelLarge?.copyWith(fontWeight: FontWeight.w500, fontSize: 16),
                     ),
-                    Text(
-                      asset.checksum ?? "N/A",
-                      style: TextStyle(fontSize: 13.0, color: context.colorScheme.onSurfaceSecondary),
-                      overflow: TextOverflow.ellipsis,
-                    ),
-                    albumsAsyncValue.when(
-                      data: (albums) {
-                        if (albums.isEmpty) {
-                          return const SizedBox.shrink();
-                        }
-                        return Text(
-                          albums.map((a) => a.name).join(', '),
-                          style: context.textTheme.labelLarge?.copyWith(color: context.primaryColor),
+                    subtitle: Column(
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      children: [
+                        Text(
+                          asset.createdAt.toString(),
+                          style: TextStyle(fontSize: 13.0, color: context.colorScheme.onSurfaceSecondary),
+                        ),
+                        Text(
+                          asset.checksum ?? "N/A",
+                          style: TextStyle(fontSize: 13.0, color: context.colorScheme.onSurfaceSecondary),
                           overflow: TextOverflow.ellipsis,
-                        );
-                      },
-                      error: (error, stackTrace) => Text(
-                        'error_saving_image'.tr(args: [error.toString()]),
-                        style: TextStyle(color: context.colorScheme.error),
-                      ),
-                      loading: () => const SizedBox(height: 16, width: 16, child: CircularProgressIndicator.adaptive()),
+                        ),
+                        albumsAsyncValue.when(
+                          data: (albums) {
+                            if (albums.isEmpty) {
+                              return const SizedBox.shrink();
+                            }
+                            return Text(
+                              albums.map((a) => a.name).join(', '),
+                              style: context.textTheme.labelLarge?.copyWith(color: context.primaryColor),
+                              overflow: TextOverflow.ellipsis,
+                            );
+                          },
+                          error: (error, stackTrace) => Text(
+                            'error_saving_image'.tr(args: [error.toString()]),
+                            style: TextStyle(color: context.colorScheme.error),
+                          ),
+                          loading: () =>
+                              const SizedBox(height: 16, width: 16, child: CircularProgressIndicator.adaptive()),
+                        ),
+                      ],
                     ),
-                  ],
-                ),
-                leading: ClipRRect(
-                  borderRadius: const BorderRadius.all(Radius.circular(12)),
-                  child: SizedBox(
-                    width: 64,
-                    height: 64,
-                    child: Thumbnail.fromAsset(asset: asset, size: const Size(64, 64), fit: BoxFit.cover),
-                  ),
-                ),
-                trailing: const Padding(padding: EdgeInsets.only(right: 24, left: 8), child: Icon(Icons.image_search)),
-                onTap: () async {
-                  await context.maybePop();
-                  await context.navigateTo(const TabShellRoute(children: [MainTimelineRoute()]));
-                  EventStream.shared.emit(ScrollToDateEvent(asset.createdAt));
+                    leading: ClipRRect(
+                      borderRadius: const BorderRadius.all(Radius.circular(12)),
+                      child: SizedBox(
+                        width: 64,
+                        height: 64,
+                        child: Thumbnail.fromAsset(asset: asset, size: const Size(64, 64), fit: BoxFit.cover),
+                      ),
+                    ),
+                    trailing: const Padding(
+                      padding: EdgeInsets.only(right: 24, left: 8),
+                      child: Icon(Icons.image_search),
+                    ),
+                    onTap: () async {
+                      await context.maybePop();
+                      await context.navigateTo(const TabShellRoute(children: [MainTimelineRoute()]));
+                      EventStream.shared.emit(ScrollToDateEvent(asset.createdAt));
+                    },
+                  );
                 },
               );
             },

mobile/lib/pages/backup/drift_upload_detail.page.dart

@@ -170,8 +170,8 @@ class DriftUploadDetailPage extends ConsumerWidget {
     );
   }
 
-  Future<void> _showFileDetailDialog(BuildContext context, DriftUploadStatus item) async {
-    showDialog(
+  Future<void> _showFileDetailDialog(BuildContext context, DriftUploadStatus item) {
+    return showDialog(
       context: context,
       builder: (context) => FileDetailDialog(uploadStatus: item),
     );

mobile/lib/pages/common/activities.page.dart

@@ -33,7 +33,7 @@ class ActivitiesPage extends HookConsumerWidget {
     Future<void> onAddComment(String comment) async {
       await activityNotifier.addComment(comment);
       // Scroll to the end of the list to show the newly added activity
-      listViewScrollController.animateTo(
+      await listViewScrollController.animateTo(
         listViewScrollController.position.maxScrollExtent + 200,
         duration: const Duration(milliseconds: 600),
         curve: Curves.fastOutSlowIn,

mobile/lib/pages/common/create_album.page.dart

@@ -1,3 +1,5 @@
+import 'dart:async';
+
 import 'package:auto_route/auto_route.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
@@ -170,11 +172,11 @@ class CreateAlbumPage extends HookConsumerWidget {
           .createAlbum(ref.read(albumTitleProvider), selectedAssets.value);
 
       if (newAlbum != null) {
-        ref.read(albumProvider.notifier).refreshRemoteAlbums();
+        await ref.read(albumProvider.notifier).refreshRemoteAlbums();
         selectedAssets.value = {};
         ref.read(albumTitleProvider.notifier).clearAlbumTitle();
         ref.read(albumViewerProvider.notifier).disableEditAlbum();
-        context.replaceRoute(AlbumViewerRoute(albumId: newAlbum.id));
+        unawaited(context.replaceRoute(AlbumViewerRoute(albumId: newAlbum.id)));
       }
     }
 

mobile/lib/pages/common/gallery_viewer.page.dart

@@ -95,7 +95,7 @@ class GalleryViewerPage extends HookConsumerWidget {
       } catch (e) {
         // swallow error silently
         log.severe('Error precaching next image: $e');
-        context.maybePop();
+        await context.maybePop();
       }
     }
 

mobile/lib/pages/common/native_video_viewer.page.dart

@@ -26,6 +26,7 @@ import 'package:wakelock_plus/wakelock_plus.dart';
 
 @RoutePage()
 class NativeVideoViewerPage extends HookConsumerWidget {
+  static final log = Logger('NativeVideoViewer');
   final Asset asset;
   final bool showControls;
   final int playbackDelayFactor;
@@ -59,8 +60,6 @@ class NativeVideoViewerPage extends HookConsumerWidget {
     // Used to show the placeholder during hero animations for remote videos to avoid a stutter
     final isVisible = useState(Platform.isIOS && asset.isLocal);
 
-    final log = Logger('NativeVideoViewerPage');
-
     final isCasting = ref.watch(castProvider.select((c) => c.isCasting));
 
     final isVideoReady = useState(false);
@@ -142,7 +141,7 @@ class NativeVideoViewerPage extends HookConsumerWidget {
       interval: const Duration(milliseconds: 100),
       maxWaitTime: const Duration(milliseconds: 200),
     );
-    ref.listen(videoPlayerControlsProvider, (oldControls, newControls) async {
+    ref.listen(videoPlayerControlsProvider, (oldControls, newControls) {
       final playerController = controller.value;
       if (playerController == null) {
         return;
@@ -153,28 +152,14 @@ class NativeVideoViewerPage extends HookConsumerWidget {
         return;
       }
 
-      final oldSeek = (oldControls?.position ?? 0) ~/ 1;
-      final newSeek = newControls.position ~/ 1;
+      final oldSeek = oldControls?.position.inMilliseconds;
+      final newSeek = newControls.position.inMilliseconds;
       if (oldSeek != newSeek || newControls.restarted) {
         seekDebouncer.run(() => playerController.seekTo(newSeek));
       }
 
       if (oldControls?.pause != newControls.pause || newControls.restarted) {
-        // Make sure the last seek is complete before pausing or playing
-        // Otherwise, `onPlaybackPositionChanged` can receive outdated events
-        if (seekDebouncer.isActive) {
-          await seekDebouncer.drain();
-        }
-
-        try {
-          if (newControls.pause) {
-            await playerController.pause();
-          } else {
-            await playerController.play();
-          }
-        } catch (error) {
-          log.severe('Error pausing or playing video: $error');
-        }
+        unawaited(_onPauseChange(context, playerController, seekDebouncer, newControls.pause));
       }
     });
 
@@ -234,7 +219,7 @@ class NativeVideoViewerPage extends HookConsumerWidget {
         return;
       }
 
-      ref.read(videoPlaybackValueProvider.notifier).position = Duration(seconds: playbackInfo.position);
+      ref.read(videoPlaybackValueProvider.notifier).position = Duration(milliseconds: playbackInfo.position);
 
       // Check if the video is buffering
       if (playbackInfo.status == PlaybackStatus.playing) {
@@ -282,11 +267,13 @@ class NativeVideoViewerPage extends HookConsumerWidget {
       nc.onPlaybackReady.addListener(onPlaybackReady);
       nc.onPlaybackEnded.addListener(onPlaybackEnded);
 
-      nc.loadVideoSource(source).catchError((error) {
-        log.severe('Error loading video source: $error');
-      });
+      unawaited(
+        nc.loadVideoSource(source).catchError((error) {
+          log.severe('Error loading video source: $error');
+        }),
+      );
       final loopVideo = ref.read(appSettingsServiceProvider).getSetting<bool>(AppSettingsEnum.loopVideo);
-      nc.setLoop(loopVideo);
+      unawaited(nc.setLoop(loopVideo));
 
       controller.value = nc;
       Timer(const Duration(milliseconds: 200), checkIfBuffering);
@@ -357,12 +344,12 @@ class NativeVideoViewerPage extends HookConsumerWidget {
 
     useOnAppLifecycleStateChange((_, state) async {
       if (state == AppLifecycleState.resumed && shouldPlayOnForeground.value) {
-        controller.value?.play();
+        await controller.value?.play();
       } else if (state == AppLifecycleState.paused) {
         final videoPlaying = await controller.value?.isPlaying();
         if (videoPlaying ?? true) {
           shouldPlayOnForeground.value = true;
-          controller.value?.pause();
+          await controller.value?.pause();
         } else {
           shouldPlayOnForeground.value = false;
         }
@@ -391,4 +378,35 @@ class NativeVideoViewerPage extends HookConsumerWidget {
       ],
     );
   }
+
+  Future<void> _onPauseChange(
+    BuildContext context,
+    NativeVideoPlayerController controller,
+    Debouncer seekDebouncer,
+    bool isPaused,
+  ) async {
+    if (!context.mounted) {
+      return;
+    }
+
+    // Make sure the last seek is complete before pausing or playing
+    // Otherwise, `onPlaybackPositionChanged` can receive outdated events
+    if (seekDebouncer.isActive) {
+      await seekDebouncer.drain();
+    }
+
+    if (!context.mounted) {
+      return;
+    }
+
+    try {
+      if (isPaused) {
+        await controller.pause();
+      } else {
+        await controller.play();
+      }
+    } catch (error) {
+      log.severe('Error pausing or playing video: $error');
+    }
+  }
 }

mobile/lib/pages/common/splash_screen.page.dart

@@ -55,48 +55,50 @@ class SplashScreenPageState extends ConsumerState<SplashScreenPage> {
       final backgroundManager = ref.read(backgroundSyncProvider);
       final backupProvider = ref.read(driftBackupProvider.notifier);
 
-      ref.read(authProvider.notifier).saveAuthInfo(accessToken: accessToken).then(
-        (_) async {
-          try {
-            wsProvider.connect();
-            infoProvider.getServerInfo();
+      unawaited(
+        ref.read(authProvider.notifier).saveAuthInfo(accessToken: accessToken).then(
+          (_) async {
+            try {
+              wsProvider.connect();
+              unawaited(infoProvider.getServerInfo());
 
-            if (Store.isBetaTimelineEnabled) {
-              bool syncSuccess = false;
-              await Future.wait([
-                backgroundManager.syncLocal(),
-                backgroundManager.syncRemote().then((success) => syncSuccess = success),
-              ]);
-
-              if (syncSuccess) {
+              if (Store.isBetaTimelineEnabled) {
+                bool syncSuccess = false;
                 await Future.wait([
-                  backgroundManager.hashAssets().then((_) {
-                    _resumeBackup(backupProvider);
-                  }),
-                  _resumeBackup(backupProvider),
+                  backgroundManager.syncLocal(),
+                  backgroundManager.syncRemote().then((success) => syncSuccess = success),
                 ]);
-              } else {
-                await backgroundManager.hashAssets();
-              }
 
-              if (Store.get(StoreKey.syncAlbums, false)) {
-                await backgroundManager.syncLinkedAlbum();
+                if (syncSuccess) {
+                  await Future.wait([
+                    backgroundManager.hashAssets().then((_) {
+                      _resumeBackup(backupProvider);
+                    }),
+                    _resumeBackup(backupProvider),
+                  ]);
+                } else {
+                  await backgroundManager.hashAssets();
+                }
+
+                if (Store.get(StoreKey.syncAlbums, false)) {
+                  await backgroundManager.syncLinkedAlbum();
+                }
               }
+            } catch (e) {
+              log.severe('Failed establishing connection to the server: $e');
             }
-          } catch (e) {
-            log.severe('Failed establishing connection to the server: $e');
-          }
-        },
-        onError: (exception) => {
-          log.severe('Failed to update auth info with access token: $accessToken'),
-          ref.read(authProvider.notifier).logout(),
-          context.replaceRoute(const LoginRoute()),
-        },
+          },
+          onError: (exception) => {
+            log.severe('Failed to update auth info with access token: $accessToken'),
+            ref.read(authProvider.notifier).logout(),
+            context.replaceRoute(const LoginRoute()),
+          },
+        ),
       );
     } else {
       log.severe('Missing crucial offline login info - Logging out completely');
-      ref.read(authProvider.notifier).logout();
-      context.replaceRoute(const LoginRoute());
+      unawaited(ref.read(authProvider.notifier).logout());
+      unawaited(context.replaceRoute(const LoginRoute()));
       return;
     }
 
@@ -106,11 +108,11 @@ class SplashScreenPageState extends ConsumerState<SplashScreenPage> {
       final needBetaMigration = Store.get(StoreKey.needBetaMigration, false);
       if (needBetaMigration) {
         await Store.put(StoreKey.needBetaMigration, false);
-        context.router.replaceAll([ChangeExperienceRoute(switchingToBeta: true)]);
+        unawaited(context.router.replaceAll([ChangeExperienceRoute(switchingToBeta: true)]));
         return;
       }
 
-      context.replaceRoute(Store.isBetaTimelineEnabled ? const TabShellRoute() : const TabControllerRoute());
+      unawaited(context.replaceRoute(Store.isBetaTimelineEnabled ? const TabShellRoute() : const TabControllerRoute()));
     }
 
     if (Store.isBetaTimelineEnabled) {
@@ -120,7 +122,7 @@ class SplashScreenPageState extends ConsumerState<SplashScreenPage> {
     final hasPermission = await ref.read(galleryPermissionNotifier.notifier).hasPermission;
     if (hasPermission) {
       // Resume backup (if enable) then navigate
-      ref.watch(backupProvider.notifier).resumeBackup();
+      await ref.watch(backupProvider.notifier).resumeBackup();
     }
   }
 
@@ -130,7 +132,7 @@ class SplashScreenPageState extends ConsumerState<SplashScreenPage> {
     if (isEnableBackup) {
       final currentUser = Store.tryGet(StoreKey.currentUser);
       if (currentUser != null) {
-        notifier.handleBackupResume(currentUser.id);
+        unawaited(notifier.handleBackupResume(currentUser.id));
       }
     }
   }

mobile/lib/pages/common/tab_shell.page.dart

@@ -7,6 +7,7 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/timeline.model.dart';
 import 'package:immich_mobile/domain/utils/event_stream.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
+import 'package:immich_mobile/presentation/pages/search/paginated_search.provider.dart';
 import 'package:immich_mobile/providers/haptic_feedback.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/album.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/memory.provider.dart';
@@ -77,7 +78,7 @@ class _TabShellPageState extends ConsumerState<TabShellPage> {
     }
 
     return AutoTabsRouter(
-      routes: [const MainTimelineRoute(), DriftSearchRoute(), const DriftAlbumsRoute(), const DriftLibraryRoute()],
+      routes: const [MainTimelineRoute(), DriftSearchRoute(), DriftAlbumsRoute(), DriftLibraryRoute()],
       duration: const Duration(milliseconds: 600),
       transitionBuilder: (context, child, animation) => FadeTransition(opacity: animation, child: child),
       builder: (context, child) {
@@ -114,6 +115,10 @@ void _onNavigationSelected(TabsRouter router, int index, WidgetRef ref) {
     ref.invalidate(driftMemoryFutureProvider);
   }
 
+  if (router.activeIndex != 1 && index == 1) {
+    ref.read(searchPreFilterProvider.notifier).clear();
+  }
+
   // On Search page tapped
   if (router.activeIndex == 1 && index == 1) {
     ref.read(searchInputFocusProvider).requestFocus();

mobile/lib/pages/editing/crop.page.dart

@@ -1,13 +1,16 @@
-import 'package:flutter/material.dart';
+import 'dart:async';
+
+import 'package:auto_route/auto_route.dart';
 import 'package:crop_image/crop_image.dart';
+import 'package:easy_localization/easy_localization.dart';
+import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
+import 'package:immich_mobile/entities/asset.entity.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/routing/router.dart';
 import 'package:immich_mobile/utils/hooks/crop_controller_hook.dart';
-import 'package:immich_mobile/entities/asset.entity.dart';
+
 import 'edit.page.dart';
-import 'package:easy_localization/easy_localization.dart';
-import 'package:auto_route/auto_route.dart';
 
 /// A widget for cropping an image.
 /// This widget uses [HookWidget] to manage its lifecycle and state. It allows
@@ -35,7 +38,7 @@ class CropImagePage extends HookWidget {
             icon: Icon(Icons.done_rounded, color: context.primaryColor, size: 24),
             onPressed: () async {
               final croppedImage = await cropController.croppedImage();
-              context.pushRoute(EditImageRoute(asset: asset, image: croppedImage, isEdited: true));
+              unawaited(context.pushRoute(EditImageRoute(asset: asset, image: croppedImage, isEdited: true)));
             },
           ),
         ],

mobile/lib/pages/editing/filter.page.dart

@@ -1,12 +1,13 @@
 import 'dart:async';
 import 'dart:ui' as ui;
+
+import 'package:auto_route/auto_route.dart';
+import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
-import 'package:immich_mobile/extensions/build_context_extensions.dart';
-import 'package:immich_mobile/entities/asset.entity.dart';
 import 'package:immich_mobile/constants/filters.dart';
-import 'package:easy_localization/easy_localization.dart';
-import 'package:auto_route/auto_route.dart';
+import 'package:immich_mobile/entities/asset.entity.dart';
+import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/routing/router.dart';
 
 /// A widget for filtering an image.
@@ -74,7 +75,7 @@ class FilterImagePage extends HookWidget {
             icon: Icon(Icons.done_rounded, color: context.primaryColor, size: 24),
             onPressed: () async {
               final filteredImage = await applyFilterAndConvert(colorFilter.value);
-              context.pushRoute(EditImageRoute(asset: asset, image: filteredImage, isEdited: true));
+              unawaited(context.pushRoute(EditImageRoute(asset: asset, image: filteredImage, isEdited: true)));
             },
           ),
         ],

mobile/lib/pages/library/locked/pin_auth.page.dart

@@ -1,14 +1,16 @@
+import 'dart:async';
+
 import 'package:auto_route/auto_route.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart' show useState;
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/providers/local_auth.provider.dart';
 import 'package:immich_mobile/routing/router.dart';
 import 'package:immich_mobile/widgets/forms/pin_registration_form.dart';
 import 'package:immich_mobile/widgets/forms/pin_verification_form.dart';
-import 'package:immich_mobile/entities/store.entity.dart';
 
 @RoutePage()
 class PinAuthPage extends HookConsumerWidget {
@@ -35,9 +37,9 @@ class PinAuthPage extends HookConsumerWidget {
         );
 
         if (isBetaTimeline) {
-          context.replaceRoute(const DriftLockedFolderRoute());
+          unawaited(context.replaceRoute(const DriftLockedFolderRoute()));
         } else {
-          context.replaceRoute(const LockedRoute());
+          unawaited(context.replaceRoute(const LockedRoute()));
         }
       }
     }

mobile/lib/pages/library/shared_link/shared_link_edit.page.dart

@@ -333,7 +333,7 @@ class SharedLinkEditPage extends HookConsumerWidget {
             changeExpiry: changeExpiry,
           );
       ref.invalidate(sharedLinksStateProvider);
-      context.maybePop();
+      await context.maybePop();
     }
 
     return Scaffold(

mobile/lib/pages/photos/photos.page.dart

@@ -82,10 +82,12 @@ class PhotosPage extends HookConsumerWidget {
       final fullRefresh = refreshCount.value > 0;
 
       if (fullRefresh) {
-        Future.wait([
-          ref.read(assetProvider.notifier).getAllAsset(clear: true),
-          ref.read(albumProvider.notifier).refreshRemoteAlbums(),
-        ]);
+        unawaited(
+          Future.wait([
+            ref.read(assetProvider.notifier).getAllAsset(clear: true),
+            ref.read(albumProvider.notifier).refreshRemoteAlbums(),
+          ]),
+        );
 
         // refresh was forced: user requested another refresh within 2 seconds
         refreshCount.value = 0;

mobile/lib/pages/search/map/map.page.dart

@@ -1,3 +1,4 @@
+import 'dart:async';
 import 'dart:math';
 
 import 'package:auto_route/auto_route.dart';
@@ -83,7 +84,7 @@ class MapPage extends HookConsumerWidget {
         isLoading.value = true;
         markers.value = await ref.read(mapMarkersProvider.future);
         assetsDebouncer.run(updateAssetsInBounds);
-        reloadLayers();
+        await reloadLayers();
       } finally {
         isLoading.value = false;
       }
@@ -128,7 +129,7 @@ class MapPage extends HookConsumerWidget {
       );
 
       if (marker != null) {
-        updateAssetMarkerPosition(marker);
+        await updateAssetMarkerPosition(marker);
       } else {
         // If no asset was previously selected and no new asset is available, close the bottom sheet
         if (selectedMarker.value == null) {
@@ -165,7 +166,7 @@ class MapPage extends HookConsumerWidget {
       if (asset.isVideo) {
         ref.read(showControlsProvider.notifier).show = false;
       }
-      context.pushRoute(GalleryViewerRoute(initialIndex: 0, heroOffset: 0, renderList: renderList));
+      unawaited(context.pushRoute(GalleryViewerRoute(initialIndex: 0, heroOffset: 0, renderList: renderList)));
     }
 
     /// BOTTOM SHEET CALLBACKS
@@ -209,7 +210,7 @@ class MapPage extends HookConsumerWidget {
       }
 
       if (mapController.value != null && location != null) {
-        mapController.value!.animateCamera(
+        await mapController.value!.animateCamera(
           CameraUpdate.newLatLngZoom(LatLng(location.latitude, location.longitude), mapZoomToAssetLevel),
           duration: const Duration(milliseconds: 800),
         );

mobile/lib/pages/search/map/map_location_picker.page.dart

@@ -8,9 +8,9 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/extensions/asyncvalue_extensions.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/extensions/maplibrecontroller_extensions.dart';
+import 'package:immich_mobile/utils/map_utils.dart';
 import 'package:immich_mobile/widgets/map/map_theme_override.dart';
 import 'package:maplibre_gl/maplibre_gl.dart';
-import 'package:immich_mobile/utils/map_utils.dart';
 
 @RoutePage()
 class MapLocationPickerPage extends HookConsumerWidget {
@@ -30,7 +30,7 @@ class MapLocationPickerPage extends HookConsumerWidget {
 
     Future<void> onMapClick(Point<num> point, LatLng centre) async {
       selectedLatLng.value = centre;
-      controller.value?.animateCamera(CameraUpdate.newLatLng(centre));
+      await controller.value?.animateCamera(CameraUpdate.newLatLng(centre));
       if (marker.value != null) {
         await controller.value?.updateSymbol(marker.value!, SymbolOptions(geometry: centre));
       }
@@ -49,7 +49,7 @@ class MapLocationPickerPage extends HookConsumerWidget {
 
       var currentLatLng = LatLng(currentLocation.latitude, currentLocation.longitude);
       selectedLatLng.value = currentLatLng;
-      controller.value?.animateCamera(CameraUpdate.newLatLng(currentLatLng));
+      await controller.value?.animateCamera(CameraUpdate.newLatLng(currentLatLng));
     }
 
     return MapThemeOverride(

mobile/lib/pages/search/search.page.dart

@@ -266,7 +266,7 @@ class SearchPage extends HookConsumerWidget {
         filter.value = filter.value.copyWith(date: SearchDateFilter());
 
         dateRangeCurrentFilterWidget.value = null;
-        search();
+        unawaited(search());
         return;
       }
 
@@ -295,7 +295,7 @@ class SearchPage extends HookConsumerWidget {
         );
       }
 
-      search();
+      unawaited(search());
     }
 
     // MEDIA PICKER
@@ -389,15 +389,18 @@ class SearchPage extends HookConsumerWidget {
     handleTextSubmitted(String value) {
       switch (textSearchType.value) {
         case TextSearchType.context:
-          filter.value = filter.value.copyWith(filename: '', context: value, description: '');
+          filter.value = filter.value.copyWith(filename: '', context: value, description: '', ocr: '');
 
           break;
         case TextSearchType.filename:
-          filter.value = filter.value.copyWith(filename: value, context: '', description: '');
+          filter.value = filter.value.copyWith(filename: value, context: '', description: '', ocr: '');
 
           break;
         case TextSearchType.description:
-          filter.value = filter.value.copyWith(filename: '', context: '', description: value);
+          filter.value = filter.value.copyWith(filename: '', context: '', description: value, ocr: '');
+          break;
+        case TextSearchType.ocr:
+          filter.value = filter.value.copyWith(filename: '', context: '', description: '', ocr: value);
           break;
       }
 
@@ -408,6 +411,7 @@ class SearchPage extends HookConsumerWidget {
       TextSearchType.context => Icons.image_search_rounded,
       TextSearchType.filename => Icons.abc_rounded,
       TextSearchType.description => Icons.text_snippet_outlined,
+      TextSearchType.ocr => Icons.document_scanner_outlined,
     };
 
     return Scaffold(
@@ -493,6 +497,24 @@ class SearchPage extends HookConsumerWidget {
                     searchHintText.value = 'search_by_description_example'.tr();
                   },
                 ),
+                MenuItemButton(
+                  child: ListTile(
+                    leading: const Icon(Icons.document_scanner_outlined),
+                    title: Text(
+                      'search_filter_ocr'.tr(),
+                      style: context.textTheme.bodyLarge?.copyWith(
+                        fontWeight: FontWeight.w500,
+                        color: textSearchType.value == TextSearchType.ocr ? context.colorScheme.primary : null,
+                      ),
+                    ),
+                    selectedColor: context.colorScheme.primary,
+                    selected: textSearchType.value == TextSearchType.ocr,
+                  ),
+                  onPressed: () {
+                    textSearchType.value = TextSearchType.ocr;
+                    searchHintText.value = 'search_by_ocr_example'.tr();
+                  },
+                ),
               ],
             ),
           ),

mobile/lib/presentation/pages/drift_activities.page.dart

@@ -2,6 +2,7 @@ import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart' hide Store;
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/domain/models/album/album.model.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/extensions/asyncvalue_extensions.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
@@ -20,11 +21,12 @@ import 'package:immich_mobile/widgets/common/user_circle_avatar.dart';
 
 @RoutePage()
 class DriftActivitiesPage extends HookConsumerWidget {
-  const DriftActivitiesPage({super.key});
+  final RemoteAlbum album;
+
+  const DriftActivitiesPage({super.key, required this.album});
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
-    final album = ref.watch(currentRemoteAlbumProvider)!;
     final asset = ref.read(currentAssetNotifier) as RemoteAsset?;
 
     final activityNotifier = ref.read(albumActivityProvider(album.id, asset?.id).notifier);
@@ -40,49 +42,52 @@ class DriftActivitiesPage extends HookConsumerWidget {
       scrollToBottom();
     }
 
-    return Scaffold(
-      appBar: AppBar(
-        title: asset == null ? Text(album.name) : null,
-        actions: [const LikeActivityActionButton(menuItem: true)],
-        actionsPadding: const EdgeInsets.only(right: 8),
-      ),
-      body: activities.widgetWhen(
-        onData: (data) {
-          final List<Widget> activityWidgets = [];
-          for (final activity in data.reversed) {
-            activityWidgets.add(
-              Padding(
-                padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 6),
-                child: _CommentBubble(activity: activity),
+    return ProviderScope(
+      overrides: [currentRemoteAlbumScopedProvider.overrideWithValue(album)],
+      child: Scaffold(
+        appBar: AppBar(
+          title: asset == null ? Text(album.name) : null,
+          actions: [const LikeActivityActionButton(menuItem: true)],
+          actionsPadding: const EdgeInsets.only(right: 8),
+        ),
+        body: activities.widgetWhen(
+          onData: (data) {
+            final List<Widget> activityWidgets = [];
+            for (final activity in data.reversed) {
+              activityWidgets.add(
+                Padding(
+                  padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 6),
+                  child: _CommentBubble(activity: activity),
+                ),
+              );
+            }
+
+            return SafeArea(
+              child: Stack(
+                children: [
+                  ListView(
+                    controller: listViewScrollController,
+                    padding: const EdgeInsets.only(top: 8, bottom: 80),
+                    reverse: true,
+                    children: activityWidgets,
+                  ),
+                  Align(
+                    alignment: Alignment.bottomCenter,
+                    child: Container(
+                      decoration: BoxDecoration(
+                        color: context.scaffoldBackgroundColor,
+                        border: Border(top: BorderSide(color: context.colorScheme.secondaryContainer, width: 1)),
+                      ),
+                      child: DriftActivityTextField(isEnabled: album.isActivityEnabled, onSubmit: onAddComment),
+                    ),
+                  ),
+                ],
               ),
             );
-          }
-
-          return SafeArea(
-            child: Stack(
-              children: [
-                ListView(
-                  controller: listViewScrollController,
-                  padding: const EdgeInsets.only(top: 8, bottom: 80),
-                  reverse: true,
-                  children: activityWidgets,
-                ),
-                Align(
-                  alignment: Alignment.bottomCenter,
-                  child: Container(
-                    decoration: BoxDecoration(
-                      color: context.scaffoldBackgroundColor,
-                      border: Border(top: BorderSide(color: context.colorScheme.secondaryContainer, width: 1)),
-                    ),
-                    child: DriftActivityTextField(isEnabled: album.isActivityEnabled, onSubmit: onAddComment),
-                  ),
-                ),
-              ],
-            ),
-          );
-        },
+          },
+        ),
+        resizeToAvoidBottomInset: true,
       ),
-      resizeToAvoidBottomInset: true,
     );
   }
 }

mobile/lib/presentation/pages/drift_album.page.dart

@@ -5,7 +5,6 @@ import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/presentation/widgets/album/album_selector.widget.dart';
 import 'package:immich_mobile/providers/infrastructure/album.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/current_album.provider.dart';
 import 'package:immich_mobile/routing/router.dart';
 import 'package:immich_mobile/widgets/common/immich_sliver_app_bar.dart';
 
@@ -43,7 +42,6 @@ class _DriftAlbumsPageState extends ConsumerState<DriftAlbumsPage> {
           ),
           AlbumSelector(
             onAlbumSelected: (album) {
-              ref.read(currentRemoteAlbumProvider.notifier).setAlbum(album);
               context.router.push(RemoteAlbumRoute(album: album));
             },
           ),

mobile/lib/presentation/pages/drift_album_options.page.dart

@@ -1,9 +1,12 @@
+import 'dart:async';
+
 import 'package:auto_route/auto_route.dart';
 import 'package:collection/collection.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:fluttertoast/fluttertoast.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/domain/models/album/album.model.dart';
 import 'package:immich_mobile/domain/models/user.model.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/extensions/theme_extensions.dart';
@@ -20,15 +23,11 @@ import 'package:immich_mobile/widgets/common/user_circle_avatar.dart';
 
 @RoutePage()
 class DriftAlbumOptionsPage extends HookConsumerWidget {
-  const DriftAlbumOptionsPage({super.key});
+  final RemoteAlbum album;
+  const DriftAlbumOptionsPage({super.key, required this.album});
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
-    final album = ref.watch(currentRemoteAlbumProvider);
-    if (album == null) {
-      return const SizedBox();
-    }
-
     final sharedUsersAsync = ref.watch(remoteAlbumSharedUsersProvider(album.id));
     final userId = ref.watch(authProvider).userId;
     final activityEnabled = useState(album.isActivityEnabled);
@@ -47,7 +46,7 @@ class DriftAlbumOptionsPage extends HookConsumerWidget {
     void leaveAlbum() async {
       try {
         await ref.read(remoteAlbumProvider.notifier).leaveAlbum(album.id, userId: userId);
-        context.navigateTo(const DriftAlbumsRoute());
+        unawaited(context.navigateTo(const DriftAlbumsRoute()));
       } catch (_) {
         showErrorMessage();
       }
@@ -189,48 +188,51 @@ class DriftAlbumOptionsPage extends HookConsumerWidget {
       );
     }
 
-    return Scaffold(
-      appBar: AppBar(
-        leading: IconButton(
-          icon: const Icon(Icons.arrow_back_ios_new_rounded),
-          onPressed: () => context.maybePop(null),
+    return ProviderScope(
+      overrides: [currentRemoteAlbumScopedProvider.overrideWithValue(album)],
+      child: Scaffold(
+        appBar: AppBar(
+          leading: IconButton(
+            icon: const Icon(Icons.arrow_back_ios_new_rounded),
+            onPressed: () => context.maybePop(null),
+          ),
+          centerTitle: true,
+          title: Text("options".t(context: context)),
         ),
-        centerTitle: true,
-        title: Text("options".t(context: context)),
-      ),
-      body: ListView(
-        children: [
-          const SizedBox(height: 8),
-          if (isOwner)
-            SwitchListTile.adaptive(
-              value: activityEnabled.value,
-              onChanged: (bool value) async {
-                activityEnabled.value = value;
-                await ref.read(remoteAlbumProvider.notifier).setActivityStatus(album.id, value);
-              },
-              activeThumbColor: activityEnabled.value ? context.primaryColor : context.themeData.disabledColor,
-              dense: true,
-              title: Text(
-                "comments_and_likes",
-                style: context.textTheme.titleMedium?.copyWith(fontWeight: FontWeight.w500),
-              ).t(context: context),
-              subtitle: Text(
-                "let_others_respond",
-                style: context.textTheme.labelLarge?.copyWith(color: context.colorScheme.onSurfaceSecondary),
-              ).t(context: context),
-            ),
-          buildSectionTitle("shared_album_section_people_title".t(context: context)),
-          if (isOwner) ...[
-            ListTile(
-              leading: const Icon(Icons.person_add_rounded),
-              title: Text("invite_people".t(context: context)),
-              onTap: () async => addUsers(),
-            ),
-            const Divider(indent: 16),
+        body: ListView(
+          children: [
+            const SizedBox(height: 8),
+            if (isOwner)
+              SwitchListTile.adaptive(
+                value: activityEnabled.value,
+                onChanged: (bool value) async {
+                  activityEnabled.value = value;
+                  await ref.read(remoteAlbumProvider.notifier).setActivityStatus(album.id, value);
+                },
+                activeThumbColor: activityEnabled.value ? context.primaryColor : context.themeData.disabledColor,
+                dense: true,
+                title: Text(
+                  "comments_and_likes",
+                  style: context.textTheme.titleMedium?.copyWith(fontWeight: FontWeight.w500),
+                ).t(context: context),
+                subtitle: Text(
+                  "let_others_respond",
+                  style: context.textTheme.labelLarge?.copyWith(color: context.colorScheme.onSurfaceSecondary),
+                ).t(context: context),
+              ),
+            buildSectionTitle("shared_album_section_people_title".t(context: context)),
+            if (isOwner) ...[
+              ListTile(
+                leading: const Icon(Icons.person_add_rounded),
+                title: Text("invite_people".t(context: context)),
+                onTap: () async => addUsers(),
+              ),
+              const Divider(indent: 16),
+            ],
+            buildOwnerInfo(),
+            buildSharedUsersList(),
           ],
-          buildOwnerInfo(),
-          buildSharedUsersList(),
-        ],
+        ),
       ),
     );
   }

mobile/lib/presentation/pages/drift_create_album.page.dart

@@ -1,3 +1,5 @@
+import 'dart:async';
+
 import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
@@ -6,7 +8,6 @@ import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/presentation/widgets/images/thumbnail.widget.dart';
 import 'package:immich_mobile/providers/infrastructure/album.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/current_album.provider.dart';
 import 'package:immich_mobile/routing/router.dart';
 import 'package:immich_mobile/widgets/album/album_action_filled_button.dart';
 
@@ -178,8 +179,7 @@ class _DriftCreateAlbumPageState extends ConsumerState<DriftCreateAlbumPage> {
         );
 
     if (album != null) {
-      ref.read(currentRemoteAlbumProvider.notifier).setAlbum(album);
-      context.replaceRoute(RemoteAlbumRoute(album: album));
+      unawaited(context.replaceRoute(RemoteAlbumRoute(album: album)));
     }
   }
 

mobile/lib/presentation/pages/drift_remote_album.page.dart

@@ -1,3 +1,5 @@
+import 'dart:async';
+
 import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
@@ -139,7 +141,7 @@ class _RemoteAlbumPageState extends ConsumerState<RemoteAlbumPage> {
           toastType: ToastType.success,
         );
 
-        context.pushRoute(const DriftAlbumsRoute());
+        unawaited(context.pushRoute(const DriftAlbumsRoute()));
       } catch (e) {
         ImmichToast.show(
           context: context,
@@ -161,12 +163,12 @@ class _RemoteAlbumPageState extends ConsumerState<RemoteAlbumPage> {
       setState(() {
         _album = _album.copyWith(name: result.name, description: result.description ?? '');
       });
-      HapticFeedback.mediumImpact();
+      unawaited(HapticFeedback.mediumImpact());
     }
   }
 
   Future<void> showActivity(BuildContext context) async {
-    context.pushRoute(const DriftActivitiesRoute());
+    unawaited(context.pushRoute(DriftActivitiesRoute(album: _album)));
   }
 
   Future<void> showOptionSheet(BuildContext context) async {
@@ -175,56 +177,58 @@ class _RemoteAlbumPageState extends ConsumerState<RemoteAlbumPage> {
     final canAddPhotos =
         await ref.read(remoteAlbumServiceProvider).getUserRole(_album.id, user?.id ?? '') == AlbumUserRole.editor;
 
-    showModalBottomSheet(
-      context: context,
-      backgroundColor: context.colorScheme.surface,
-      isScrollControlled: false,
-      builder: (context) {
-        return DriftRemoteAlbumOption(
-          onDeleteAlbum: isOwner
-              ? () async {
-                  await deleteAlbum(context);
-                  if (context.mounted) {
+    unawaited(
+      showModalBottomSheet(
+        context: context,
+        backgroundColor: context.colorScheme.surface,
+        isScrollControlled: false,
+        builder: (context) {
+          return DriftRemoteAlbumOption(
+            onDeleteAlbum: isOwner
+                ? () async {
+                    await deleteAlbum(context);
+                    if (context.mounted) {
+                      context.pop();
+                    }
+                  }
+                : null,
+            onAddUsers: isOwner
+                ? () async {
+                    await addUsers(context);
                     context.pop();
                   }
-                }
-              : null,
-          onAddUsers: isOwner
-              ? () async {
-                  await addUsers(context);
-                  context.pop();
-                }
-              : null,
-          onAddPhotos: isOwner || canAddPhotos
-              ? () async {
-                  await addAssets(context);
-                  context.pop();
-                }
-              : null,
-          onToggleAlbumOrder: isOwner
-              ? () async {
-                  await toggleAlbumOrder();
-                  context.pop();
-                }
-              : null,
-          onEditAlbum: isOwner
-              ? () async {
-                  context.pop();
-                  await showEditTitleAndDescription(context);
-                }
-              : null,
-          onCreateSharedLink: isOwner
-              ? () async {
-                  context.pop();
-                  context.pushRoute(SharedLinkEditRoute(albumId: _album.id));
-                }
-              : null,
-          onShowOptions: () {
-            context.pop();
-            context.pushRoute(const DriftAlbumOptionsRoute());
-          },
-        );
-      },
+                : null,
+            onAddPhotos: isOwner || canAddPhotos
+                ? () async {
+                    await addAssets(context);
+                    context.pop();
+                  }
+                : null,
+            onToggleAlbumOrder: isOwner
+                ? () async {
+                    await toggleAlbumOrder();
+                    context.pop();
+                  }
+                : null,
+            onEditAlbum: isOwner
+                ? () async {
+                    context.pop();
+                    await showEditTitleAndDescription(context);
+                  }
+                : null,
+            onCreateSharedLink: isOwner
+                ? () async {
+                    context.pop();
+                    unawaited(context.pushRoute(SharedLinkEditRoute(albumId: _album.id)));
+                  }
+                : null,
+            onShowOptions: () {
+              context.pop();
+              context.pushRoute(DriftAlbumOptionsRoute(album: _album));
+            },
+          );
+        },
+      ),
     );
   }
 
@@ -233,35 +237,24 @@ class _RemoteAlbumPageState extends ConsumerState<RemoteAlbumPage> {
     final user = ref.watch(currentUserProvider);
     final isOwner = user != null ? user.id == _album.ownerId : false;
 
-    return PopScope(
-      onPopInvokedWithResult: (didPop, _) {
-        if (didPop) {
-          Future.microtask(() {
-            if (mounted) {
-              ref.read(currentRemoteAlbumProvider.notifier).dispose();
-              ref.read(remoteAlbumProvider.notifier).refresh();
-            }
-          });
-        }
-      },
-      child: ProviderScope(
-        overrides: [
-          timelineServiceProvider.overrideWith((ref) {
-            final timelineService = ref.watch(timelineFactoryProvider).remoteAlbum(albumId: _album.id);
-            ref.onDispose(timelineService.dispose);
-            return timelineService;
-          }),
-        ],
-        child: Timeline(
-          appBar: RemoteAlbumSliverAppBar(
-            icon: Icons.photo_album_outlined,
-            onShowOptions: () => showOptionSheet(context),
-            onToggleAlbumOrder: isOwner ? () => toggleAlbumOrder() : null,
-            onEditTitle: isOwner ? () => showEditTitleAndDescription(context) : null,
-            onActivity: () => showActivity(context),
-          ),
-          bottomSheet: RemoteAlbumBottomSheet(album: _album),
+    return ProviderScope(
+      overrides: [
+        timelineServiceProvider.overrideWith((ref) {
+          final timelineService = ref.watch(timelineFactoryProvider).remoteAlbum(albumId: _album.id);
+          ref.onDispose(timelineService.dispose);
+          return timelineService;
+        }),
+        currentRemoteAlbumScopedProvider.overrideWithValue(_album),
+      ],
+      child: Timeline(
+        appBar: RemoteAlbumSliverAppBar(
+          icon: Icons.photo_album_outlined,
+          onShowOptions: () => showOptionSheet(context),
+          onToggleAlbumOrder: isOwner ? () => toggleAlbumOrder() : null,
+          onEditTitle: isOwner ? () => showEditTitleAndDescription(context) : null,
+          onActivity: () => showActivity(context),
         ),
+        bottomSheet: RemoteAlbumBottomSheet(album: _album),
       ),
     );
   }

mobile/lib/presentation/pages/editing/drift_crop.page.dart

@@ -1,3 +1,5 @@
+import 'dart:async';
+
 import 'package:auto_route/auto_route.dart';
 import 'package:crop_image/crop_image.dart';
 import 'package:easy_localization/easy_localization.dart';
@@ -34,7 +36,7 @@ class DriftCropImagePage extends HookWidget {
             icon: Icon(Icons.done_rounded, color: context.primaryColor, size: 24),
             onPressed: () async {
               final croppedImage = await cropController.croppedImage();
-              context.pushRoute(DriftEditImageRoute(asset: asset, image: croppedImage, isEdited: true));
+              unawaited(context.pushRoute(DriftEditImageRoute(asset: asset, image: croppedImage, isEdited: true)));
             },
           ),
         ],

mobile/lib/presentation/pages/editing/drift_edit.page.dart

@@ -70,7 +70,7 @@ class DriftEditImagePage extends ConsumerWidget {
         Logger("SaveEditedImage").warning("Failed to retrieve the saved image back from OS", e);
       }
 
-      ref.read(backgroundSyncProvider).syncLocal(full: true);
+      unawaited(ref.read(backgroundSyncProvider).syncLocal(full: true));
       _exitEditing(context);
       ImmichToast.show(durationInSecond: 3, context: context, msg: 'Image Saved!');
 

mobile/lib/presentation/pages/editing/drift_filter.page.dart

@@ -75,7 +75,7 @@ class DriftFilterImagePage extends HookWidget {
             icon: Icon(Icons.done_rounded, color: context.primaryColor, size: 24),
             onPressed: () async {
               final filteredImage = await applyFilterAndConvert(colorFilter.value);
-              context.pushRoute(DriftEditImageRoute(asset: asset, image: filteredImage, isEdited: true));
+              unawaited(context.pushRoute(DriftEditImageRoute(asset: asset, image: filteredImage, isEdited: true)));
             },
           ),
         ],

mobile/lib/presentation/pages/search/drift_search.page.dart

@@ -19,6 +19,7 @@ import 'package:immich_mobile/presentation/widgets/timeline/timeline.widget.dart
 import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
 import 'package:immich_mobile/providers/search/search_input_focus.provider.dart';
 import 'package:immich_mobile/routing/router.dart';
+import 'package:immich_mobile/widgets/common/feature_check.dart';
 import 'package:immich_mobile/widgets/common/search_field.dart';
 import 'package:immich_mobile/widgets/search/search_filter/camera_picker.dart';
 import 'package:immich_mobile/widgets/search/search_filter/display_option_picker.dart';
@@ -31,15 +32,14 @@ import 'package:immich_mobile/widgets/search/search_filter/search_filter_utils.d
 
 @RoutePage()
 class DriftSearchPage extends HookConsumerWidget {
-  const DriftSearchPage({super.key, this.preFilter});
-
-  final SearchFilter? preFilter;
+  const DriftSearchPage({super.key});
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     final textSearchType = useState<TextSearchType>(TextSearchType.context);
     final searchHintText = useState<String>('sunrise_on_the_beach'.t(context: context));
     final textSearchController = useTextEditingController();
+    final preFilter = ref.watch(searchPreFilterProvider);
     final filter = useState<SearchFilter>(
       SearchFilter(
         people: preFilter?.people ?? {},
@@ -49,6 +49,7 @@ class DriftSearchPage extends HookConsumerWidget {
         display: preFilter?.display ?? SearchDisplayFilters(isNotInAlbum: false, isArchive: false, isFavorite: false),
         mediaType: preFilter?.mediaType ?? AssetType.other,
         language: "${context.locale.languageCode}-${context.locale.countryCode}",
+        assetId: preFilter?.assetId,
       ),
     );
 
@@ -109,8 +110,8 @@ class DriftSearchPage extends HookConsumerWidget {
         Future.delayed(Duration.zero, () {
           search();
 
-          if (preFilter!.location.city != null) {
-            locationCurrentFilterWidget.value = Text(preFilter!.location.city!, style: context.textTheme.labelLarge);
+          if (preFilter.location.city != null) {
+            locationCurrentFilterWidget.value = Text(preFilter.location.city!, style: context.textTheme.labelLarge);
           }
         });
       }
@@ -271,7 +272,7 @@ class DriftSearchPage extends HookConsumerWidget {
         filter.value = filter.value.copyWith(date: SearchDateFilter());
 
         dateRangeCurrentFilterWidget.value = null;
-        search();
+        unawaited(search());
         return;
       }
 
@@ -301,7 +302,7 @@ class DriftSearchPage extends HookConsumerWidget {
         );
       }
 
-      search();
+      unawaited(search());
     }
 
     // MEDIA PICKER
@@ -395,15 +396,18 @@ class DriftSearchPage extends HookConsumerWidget {
     handleTextSubmitted(String value) {
       switch (textSearchType.value) {
         case TextSearchType.context:
-          filter.value = filter.value.copyWith(filename: '', context: value, description: '');
+          filter.value = filter.value.copyWith(filename: '', context: value, description: '', ocr: '');
 
           break;
         case TextSearchType.filename:
-          filter.value = filter.value.copyWith(filename: value, context: '', description: '');
+          filter.value = filter.value.copyWith(filename: value, context: '', description: '', ocr: '');
 
           break;
         case TextSearchType.description:
-          filter.value = filter.value.copyWith(filename: '', context: '', description: value);
+          filter.value = filter.value.copyWith(filename: '', context: '', description: value, ocr: '');
+          break;
+        case TextSearchType.ocr:
+          filter.value = filter.value.copyWith(filename: '', context: '', description: '', ocr: value);
           break;
       }
 
@@ -414,6 +418,7 @@ class DriftSearchPage extends HookConsumerWidget {
       TextSearchType.context => Icons.image_search_rounded,
       TextSearchType.filename => Icons.abc_rounded,
       TextSearchType.description => Icons.text_snippet_outlined,
+      TextSearchType.ocr => Icons.document_scanner_outlined,
     };
 
     return Scaffold(
@@ -499,6 +504,27 @@ class DriftSearchPage extends HookConsumerWidget {
                     searchHintText.value = 'search_by_description_example'.t(context: context);
                   },
                 ),
+                FeatureCheck(
+                  feature: (features) => features.ocr,
+                  child: MenuItemButton(
+                    child: ListTile(
+                      leading: const Icon(Icons.document_scanner_outlined),
+                      title: Text(
+                        'search_by_ocr'.t(context: context),
+                        style: context.textTheme.bodyLarge?.copyWith(
+                          fontWeight: FontWeight.w500,
+                          color: textSearchType.value == TextSearchType.ocr ? context.colorScheme.primary : null,
+                        ),
+                      ),
+                      selectedColor: context.colorScheme.primary,
+                      selected: textSearchType.value == TextSearchType.ocr,
+                    ),
+                    onPressed: () {
+                      textSearchType.value = TextSearchType.ocr;
+                      searchHintText.value = 'search_by_ocr_example'.t(context: context);
+                    },
+                  ),
+                ),
               ],
             ),
           ),

mobile/lib/presentation/pages/search/paginated_search.provider.dart

@@ -4,6 +4,23 @@ import 'package:immich_mobile/domain/services/search.service.dart';
 import 'package:immich_mobile/models/search/search_filter.model.dart';
 import 'package:immich_mobile/providers/infrastructure/search.provider.dart';
 
+final searchPreFilterProvider = NotifierProvider<SearchFilterProvider, SearchFilter?>(SearchFilterProvider.new);
+
+class SearchFilterProvider extends Notifier<SearchFilter?> {
+  @override
+  SearchFilter? build() {
+    return null;
+  }
+
+  void setFilter(SearchFilter? filter) {
+    state = filter;
+  }
+
+  void clear() {
+    state = null;
+  }
+}
+
 final paginatedSearchProvider = StateNotifierProvider<PaginatedSearchNotifier, SearchResult>(
   (ref) => PaginatedSearchNotifier(ref.watch(searchServiceProvider)),
 );

mobile/lib/presentation/widgets/action_buttons/advanced_info_action_button.widget.dart

@@ -1,3 +1,5 @@
+import 'dart:async';
+
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/constants/enums.dart';
@@ -15,7 +17,7 @@ class AdvancedInfoActionButton extends ConsumerWidget {
       return;
     }
 
-    ref.read(actionProvider.notifier).troubleshoot(source, context);
+    unawaited(ref.read(actionProvider.notifier).troubleshoot(source, context));
   }
 
   @override

mobile/lib/presentation/widgets/action_buttons/share_action_button.widget.dart

@@ -39,7 +39,7 @@ class ShareActionButton extends ConsumerWidget {
       return;
     }
 
-    showDialog(
+    await showDialog(
       context: context,
       builder: (BuildContext buildContext) {
         ref.read(actionProvider.notifier).shareAssets(source, context).then((ActionResult result) {

mobile/lib/presentation/widgets/action_buttons/similar_photos_action_button.widget.dart

@@ -0,0 +1,50 @@
+import 'dart:async';
+
+import 'package:auto_route/auto_route.dart';
+import 'package:flutter/material.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/entities/asset.entity.dart';
+import 'package:immich_mobile/extensions/translate_extensions.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/action_buttons/base_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/asset_viewer/asset_viewer.state.dart';
+import 'package:immich_mobile/routing/router.dart';
+
+class SimilarPhotosActionButton extends ConsumerWidget {
+  final String assetId;
+
+  const SimilarPhotosActionButton({super.key, required this.assetId});
+
+  void _onTap(BuildContext context, WidgetRef ref) async {
+    if (!context.mounted) {
+      return;
+    }
+
+    ref.invalidate(assetViewerProvider);
+    ref
+        .read(searchPreFilterProvider.notifier)
+        .setFilter(
+          SearchFilter(
+            assetId: assetId,
+            people: {},
+            location: SearchLocationFilter(),
+            camera: SearchCameraFilter(),
+            date: SearchDateFilter(),
+            display: SearchDisplayFilters(isNotInAlbum: false, isArchive: false, isFavorite: false),
+            mediaType: AssetType.image,
+          ),
+        );
+    unawaited(context.router.popAndPush(const DriftSearchRoute()));
+  }
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    return BaseActionButton(
+      iconData: Icons.compare,
+      label: "view_similar_photos".t(context: context),
+      onPressed: () => _onTap(context, ref),
+      maxWidth: 100,
+    );
+  }
+}

mobile/lib/presentation/widgets/album/album_selector.widget.dart

@@ -12,10 +12,9 @@ import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/extensions/theme_extensions.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/models/albums/album_search.model.dart';
-import 'package:immich_mobile/pages/common/large_leading_tile.dart';
+import 'package:immich_mobile/presentation/widgets/album/album_tile.dart';
 import 'package:immich_mobile/presentation/widgets/images/thumbnail.widget.dart';
 import 'package:immich_mobile/providers/infrastructure/album.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/current_album.provider.dart';
 import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
 import 'package:immich_mobile/providers/user.provider.dart';
 import 'package:immich_mobile/routing/router.dart';
@@ -121,7 +120,7 @@ class _AlbumSelectorState extends ConsumerState<AlbumSelector> {
 
     // we need to re-filter the albums after sorting
     // so shownAlbums gets updated
-    filterAlbums();
+    unawaited(filterAlbums());
   }
 
   Future<void> filterAlbums() async {
@@ -516,38 +515,6 @@ class _AlbumList extends ConsumerWidget {
       sliver: SliverList.builder(
         itemBuilder: (_, index) {
           final album = albums[index];
-          final albumTile = LargeLeadingTile(
-            title: Text(
-              album.name,
-              maxLines: 2,
-              overflow: TextOverflow.ellipsis,
-              style: context.textTheme.titleSmall?.copyWith(fontWeight: FontWeight.w600),
-            ),
-            subtitle: Text(
-              '${'items_count'.t(context: context, args: {'count': album.assetCount})} • ${album.ownerId != userId ? 'shared_by_user'.t(context: context, args: {'user': album.ownerName}) : 'owned'.t(context: context)}',
-              overflow: TextOverflow.ellipsis,
-              style: context.textTheme.bodyMedium?.copyWith(color: context.colorScheme.onSurfaceSecondary),
-            ),
-            onTap: () => onAlbumSelected(album),
-            leadingPadding: const EdgeInsets.only(right: 16),
-            leading: album.thumbnailAssetId != null
-                ? ClipRRect(
-                    borderRadius: const BorderRadius.all(Radius.circular(15)),
-                    child: SizedBox(width: 80, height: 80, child: Thumbnail.remote(remoteId: album.thumbnailAssetId!)),
-                  )
-                : SizedBox(
-                    width: 80,
-                    height: 80,
-                    child: Container(
-                      decoration: BoxDecoration(
-                        color: context.colorScheme.surfaceContainer,
-                        borderRadius: const BorderRadius.all(Radius.circular(16)),
-                        border: Border.all(color: context.colorScheme.outline.withAlpha(50), width: 1),
-                      ),
-                      child: const Icon(Icons.photo_album_rounded, size: 24, color: Colors.grey),
-                    ),
-                  ),
-          );
           final isOwner = album.ownerId == userId;
 
           if (isOwner) {
@@ -576,11 +543,14 @@ class _AlbumList extends ConsumerWidget {
                 onDismissed: (direction) async {
                   await ref.read(remoteAlbumProvider.notifier).deleteAlbum(album.id);
                 },
-                child: albumTile,
+                child: AlbumTile(album: album, isOwner: isOwner, onAlbumSelected: onAlbumSelected),
               ),
             );
           } else {
-            return Padding(padding: const EdgeInsets.only(bottom: 8.0), child: albumTile);
+            return Padding(
+              padding: const EdgeInsets.only(bottom: 8.0),
+              child: AlbumTile(album: album, isOwner: isOwner, onAlbumSelected: onAlbumSelected),
+            );
           }
         },
         itemCount: albums.length,
@@ -709,9 +679,8 @@ class AddToAlbumHeader extends ConsumerWidget {
         return;
       }
 
-      ref.read(currentRemoteAlbumProvider.notifier).setAlbum(newAlbum);
       ref.read(multiSelectProvider.notifier).reset();
-      context.pushRoute(RemoteAlbumRoute(album: newAlbum));
+      unawaited(context.pushRoute(RemoteAlbumRoute(album: newAlbum)));
     }
 
     return SliverPadding(

mobile/lib/presentation/widgets/album/album_tile.dart

@@ -0,0 +1,51 @@
+import 'package:flutter/material.dart';
+import 'package:immich_mobile/domain/models/album/album.model.dart';
+import 'package:immich_mobile/extensions/build_context_extensions.dart';
+import 'package:immich_mobile/extensions/theme_extensions.dart';
+import 'package:immich_mobile/extensions/translate_extensions.dart';
+import 'package:immich_mobile/pages/common/large_leading_tile.dart';
+import 'package:immich_mobile/presentation/widgets/images/thumbnail.widget.dart';
+
+class AlbumTile extends StatelessWidget {
+  const AlbumTile({super.key, required this.album, required this.isOwner, this.onAlbumSelected});
+
+  final RemoteAlbum album;
+  final bool isOwner;
+  final Function(RemoteAlbum)? onAlbumSelected;
+
+  @override
+  Widget build(BuildContext context) {
+    return LargeLeadingTile(
+      title: Text(
+        album.name,
+        maxLines: 2,
+        overflow: TextOverflow.ellipsis,
+        style: context.textTheme.titleSmall?.copyWith(fontWeight: FontWeight.w600),
+      ),
+      subtitle: Text(
+        '${'items_count'.t(context: context, args: {'count': album.assetCount})} • ${isOwner ? 'owned'.t(context: context) : 'shared_by_user'.t(context: context, args: {'user': album.ownerName})}',
+        overflow: TextOverflow.ellipsis,
+        style: context.textTheme.bodyMedium?.copyWith(color: context.colorScheme.onSurfaceSecondary),
+      ),
+      onTap: () => onAlbumSelected?.call(album),
+      leadingPadding: const EdgeInsets.only(right: 16),
+      leading: album.thumbnailAssetId != null
+          ? ClipRRect(
+              borderRadius: const BorderRadius.all(Radius.circular(15)),
+              child: SizedBox(width: 80, height: 80, child: Thumbnail.remote(remoteId: album.thumbnailAssetId!)),
+            )
+          : SizedBox(
+              width: 80,
+              height: 80,
+              child: Container(
+                decoration: BoxDecoration(
+                  color: context.colorScheme.surfaceContainer,
+                  borderRadius: const BorderRadius.all(Radius.circular(16)),
+                  border: Border.all(color: context.colorScheme.outline.withAlpha(50), width: 1),
+                ),
+                child: const Icon(Icons.photo_album_rounded, size: 24, color: Colors.grey),
+              ),
+            ),
+    );
+  }
+}

mobile/lib/presentation/widgets/asset_viewer/asset_viewer.page.dart

@@ -5,6 +5,7 @@ import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/domain/models/album/album.model.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/domain/models/timeline.model.dart';
 import 'package:immich_mobile/domain/services/timeline.service.dart';
@@ -13,6 +14,7 @@ import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/extensions/platform_extensions.dart';
 import 'package:immich_mobile/extensions/scroll_extensions.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/download_status_floating_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/asset_viewer/activities_bottom_sheet.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/presentation/widgets/asset_viewer/asset_viewer.state.dart';
@@ -20,7 +22,6 @@ import 'package:immich_mobile/presentation/widgets/asset_viewer/bottom_bar.widge
 import 'package:immich_mobile/presentation/widgets/asset_viewer/bottom_sheet.widget.dart';
 import 'package:immich_mobile/presentation/widgets/asset_viewer/top_app_bar.widget.dart';
 import 'package:immich_mobile/presentation/widgets/asset_viewer/video_viewer.widget.dart';
-import 'package:immich_mobile/presentation/widgets/asset_viewer/activities_bottom_sheet.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/is_motion_video_playing.provider.dart';
@@ -28,6 +29,7 @@ import 'package:immich_mobile/providers/asset_viewer/video_player_controls_provi
 import 'package:immich_mobile/providers/asset_viewer/video_player_value_provider.dart';
 import 'package:immich_mobile/providers/cast.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/asset_viewer/current_asset.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/current_album.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/readonly_mode.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
 import 'package:immich_mobile/widgets/common/immich_loading_indicator.dart';
@@ -39,15 +41,25 @@ class AssetViewerPage extends StatelessWidget {
   final int initialIndex;
   final TimelineService timelineService;
   final int? heroOffset;
+  final RemoteAlbum? currentAlbum;
 
-  const AssetViewerPage({super.key, required this.initialIndex, required this.timelineService, this.heroOffset});
+  const AssetViewerPage({
+    super.key,
+    required this.initialIndex,
+    required this.timelineService,
+    this.heroOffset,
+    this.currentAlbum,
+  });
 
   @override
   Widget build(BuildContext context) {
     // This is necessary to ensure that the timeline service is available
     // since the Timeline and AssetViewer are on different routes / Widget subtrees.
     return ProviderScope(
-      overrides: [timelineServiceProvider.overrideWithValue(timelineService)],
+      overrides: [
+        timelineServiceProvider.overrideWithValue(timelineService),
+        currentRemoteAlbumScopedProvider.overrideWithValue(currentAlbum),
+      ],
       child: AssetViewer(initialIndex: initialIndex, heroOffset: heroOffset),
     );
   }
@@ -635,9 +647,9 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
     // Listen for control visibility changes and change system UI mode accordingly
     ref.listen(assetViewerProvider.select((value) => value.showingControls), (_, showingControls) async {
       if (showingControls) {
-        SystemChrome.setEnabledSystemUIMode(SystemUiMode.edgeToEdge);
+        unawaited(SystemChrome.setEnabledSystemUIMode(SystemUiMode.edgeToEdge));
       } else {
-        SystemChrome.setEnabledSystemUIMode(SystemUiMode.immersiveSticky);
+        unawaited(SystemChrome.setEnabledSystemUIMode(SystemUiMode.immersiveSticky));
       }
     });
 

mobile/lib/presentation/widgets/asset_viewer/bottom_sheet.widget.dart

@@ -1,3 +1,7 @@
+import 'dart:async';
+
+import 'package:auto_route/auto_route.dart';
+import 'package:collection/collection.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
@@ -8,17 +12,22 @@ import 'package:immich_mobile/domain/models/exif.model.dart';
 import 'package:immich_mobile/domain/models/setting.model.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
+import 'package:immich_mobile/presentation/widgets/album/album_tile.dart';
+import 'package:immich_mobile/presentation/widgets/asset_viewer/asset_viewer.state.dart';
 import 'package:immich_mobile/presentation/widgets/asset_viewer/bottom_sheet/sheet_location_details.widget.dart';
 import 'package:immich_mobile/presentation/widgets/asset_viewer/bottom_sheet/sheet_people_details.widget.dart';
 import 'package:immich_mobile/presentation/widgets/bottom_sheet/base_bottom_sheet.widget.dart';
 import 'package:immich_mobile/providers/haptic_feedback.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/action.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/album.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/asset_viewer/current_asset.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/current_album.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/setting.provider.dart';
 import 'package:immich_mobile/providers/routes.provider.dart';
 import 'package:immich_mobile/providers/server_info.provider.dart';
 import 'package:immich_mobile/providers/user.provider.dart';
+import 'package:immich_mobile/repositories/asset_media.repository.dart';
+import 'package:immich_mobile/routing/router.dart';
 import 'package:immich_mobile/utils/action_button.utils.dart';
 import 'package:immich_mobile/utils/bytes_units.dart';
 import 'package:immich_mobile/widgets/common/immich_toast.dart';
@@ -131,6 +140,60 @@ class _AssetDetailBottomSheet extends ConsumerWidget {
     await ref.read(actionProvider.notifier).editDateTime(ActionSource.viewer, context);
   }
 
+  Widget _buildAppearsInList(WidgetRef ref, BuildContext context) {
+    final isRemote = ref.watch(currentAssetNotifier)?.hasRemote ?? false;
+    if (!isRemote) {
+      return const SizedBox.shrink();
+    }
+
+    final remoteAsset = ref.watch(currentAssetNotifier) as RemoteAsset;
+    final userId = ref.watch(currentUserProvider)?.id;
+    final assetAlbums = ref.watch(albumsContainingAssetProvider(remoteAsset.id));
+
+    return assetAlbums.when(
+      data: (albums) {
+        if (albums.isEmpty) {
+          return const SizedBox.shrink();
+        }
+
+        albums.sortBy((a) => a.name);
+
+        return Column(
+          spacing: 12,
+          children: [
+            if (albums.isNotEmpty)
+              _SheetTile(
+                title: 'appears_in'.t(context: context).toUpperCase(),
+                titleStyle: context.textTheme.labelMedium?.copyWith(
+                  color: context.textTheme.labelMedium?.color?.withAlpha(200),
+                  fontWeight: FontWeight.w600,
+                ),
+              ),
+            Padding(
+              padding: const EdgeInsets.only(left: 24),
+              child: Column(
+                spacing: 12,
+                children: albums.map((album) {
+                  final isOwner = album.ownerId == userId;
+                  return AlbumTile(
+                    album: album,
+                    isOwner: isOwner,
+                    onAlbumSelected: (album) async {
+                      ref.invalidate(assetViewerProvider);
+                      unawaited(context.router.popAndPush(RemoteAlbumRoute(album: album)));
+                    },
+                  );
+                }).toList(),
+              ),
+            ),
+          ],
+        );
+      },
+      loading: () => const SizedBox.shrink(),
+      error: (_, __) => const SizedBox.shrink(),
+    );
+  }
+
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     final asset = ref.watch(currentAssetNotifier);
@@ -142,6 +205,47 @@ class _AssetDetailBottomSheet extends ConsumerWidget {
     final cameraTitle = _getCameraInfoTitle(exifInfo);
     final isOwner = ref.watch(currentUserProvider)?.id == (asset is RemoteAsset ? asset.ownerId : null);
 
+    // Build file info tile based on asset type
+    Widget buildFileInfoTile() {
+      if (asset is LocalAsset) {
+        final assetMediaRepository = ref.watch(assetMediaRepositoryProvider);
+        return FutureBuilder<String?>(
+          future: assetMediaRepository.getOriginalFilename(asset.id),
+          builder: (context, snapshot) {
+            final displayName = snapshot.data ?? asset.name;
+            return _SheetTile(
+              title: displayName,
+              titleStyle: context.textTheme.labelLarge,
+              leading: Icon(
+                asset.isImage ? Icons.image_outlined : Icons.videocam_outlined,
+                size: 24,
+                color: context.textTheme.labelLarge?.color,
+              ),
+              subtitle: _getFileInfo(asset, exifInfo),
+              subtitleStyle: context.textTheme.bodyMedium?.copyWith(
+                color: context.textTheme.bodyMedium?.color?.withAlpha(155),
+              ),
+            );
+          },
+        );
+      } else {
+        // For remote assets, use the name directly
+        return _SheetTile(
+          title: asset.name,
+          titleStyle: context.textTheme.labelLarge,
+          leading: Icon(
+            asset.isImage ? Icons.image_outlined : Icons.videocam_outlined,
+            size: 24,
+            color: context.textTheme.labelLarge?.color,
+          ),
+          subtitle: _getFileInfo(asset, exifInfo),
+          subtitleStyle: context.textTheme.bodyMedium?.copyWith(
+            color: context.textTheme.bodyMedium?.color?.withAlpha(155),
+          ),
+        );
+      }
+    }
+
     return SliverList.list(
       children: [
         // Asset Date and Time
@@ -163,19 +267,7 @@ class _AssetDetailBottomSheet extends ConsumerWidget {
           ),
         ),
         // File info
-        _SheetTile(
-          title: asset.name,
-          titleStyle: context.textTheme.labelLarge,
-          leading: Icon(
-            asset.isImage ? Icons.image_outlined : Icons.videocam_outlined,
-            size: 24,
-            color: context.textTheme.labelLarge?.color,
-          ),
-          subtitle: _getFileInfo(asset, exifInfo),
-          subtitleStyle: context.textTheme.bodyMedium?.copyWith(
-            color: context.textTheme.bodyMedium?.color?.withAlpha(155),
-          ),
-        ),
+        buildFileInfoTile(),
         // Camera info
         if (cameraTitle != null)
           _SheetTile(
@@ -187,7 +279,10 @@ class _AssetDetailBottomSheet extends ConsumerWidget {
               color: context.textTheme.bodyMedium?.color?.withAlpha(155),
             ),
           ),
-        const SizedBox(height: 64),
+        // Appears in (Albums)
+        _buildAppearsInList(ref, context),
+        // padding at the bottom to avoid cut-off
+        const SizedBox(height: 100),
       ],
     );
   }

mobile/lib/presentation/widgets/asset_viewer/video_viewer.widget.dart

@@ -46,6 +46,7 @@ bool _isCurrentAsset(BaseAsset asset, BaseAsset? currentAsset) {
 }
 
 class NativeVideoViewer extends HookConsumerWidget {
+  static final log = Logger('NativeVideoViewer');
   final BaseAsset asset;
   final bool showControls;
   final int playbackDelayFactor;
@@ -79,8 +80,6 @@ class NativeVideoViewer extends HookConsumerWidget {
     // Used to show the placeholder during hero animations for remote videos to avoid a stutter
     final isVisible = useState(Platform.isIOS && asset.hasLocal);
 
-    final log = Logger('NativeVideoViewerPage');
-
     final isCasting = ref.watch(castProvider.select((c) => c.isCasting));
 
     Future<VideoSource?> createSource() async {
@@ -169,7 +168,7 @@ class NativeVideoViewer extends HookConsumerWidget {
       interval: const Duration(milliseconds: 100),
       maxWaitTime: const Duration(milliseconds: 200),
     );
-    ref.listen(videoPlayerControlsProvider, (oldControls, newControls) async {
+    ref.listen(videoPlayerControlsProvider, (oldControls, newControls) {
       final playerController = controller.value;
       if (playerController == null) {
         return;
@@ -180,28 +179,14 @@ class NativeVideoViewer extends HookConsumerWidget {
         return;
       }
 
-      final oldSeek = (oldControls?.position ?? 0) ~/ 1;
-      final newSeek = newControls.position ~/ 1;
+      final oldSeek = oldControls?.position.inMilliseconds;
+      final newSeek = newControls.position.inMilliseconds;
       if (oldSeek != newSeek || newControls.restarted) {
         seekDebouncer.run(() => playerController.seekTo(newSeek));
       }
 
       if (oldControls?.pause != newControls.pause || newControls.restarted) {
-        // Make sure the last seek is complete before pausing or playing
-        // Otherwise, `onPlaybackPositionChanged` can receive outdated events
-        if (seekDebouncer.isActive) {
-          await seekDebouncer.drain();
-        }
-
-        try {
-          if (newControls.pause) {
-            await playerController.pause();
-          } else {
-            await playerController.play();
-          }
-        } catch (error) {
-          log.severe('Error pausing or playing video: $error');
-        }
+        unawaited(_onPauseChange(context, playerController, seekDebouncer, newControls.pause));
       }
     });
 
@@ -263,7 +248,7 @@ class NativeVideoViewer extends HookConsumerWidget {
         return;
       }
 
-      ref.read(videoPlaybackValueProvider.notifier).position = Duration(seconds: playbackInfo.position);
+      ref.read(videoPlaybackValueProvider.notifier).position = Duration(milliseconds: playbackInfo.position);
 
       // Check if the video is buffering
       if (playbackInfo.status == PlaybackStatus.playing) {
@@ -310,11 +295,13 @@ class NativeVideoViewer extends HookConsumerWidget {
       nc.onPlaybackReady.addListener(onPlaybackReady);
       nc.onPlaybackEnded.addListener(onPlaybackEnded);
 
-      nc.loadVideoSource(source).catchError((error) {
-        log.severe('Error loading video source: $error');
-      });
+      unawaited(
+        nc.loadVideoSource(source).catchError((error) {
+          log.severe('Error loading video source: $error');
+        }),
+      );
       final loopVideo = ref.read(appSettingsServiceProvider).getSetting<bool>(AppSettingsEnum.loopVideo);
-      nc.setLoop(!asset.isMotionPhoto && loopVideo);
+      unawaited(nc.setLoop(!asset.isMotionPhoto && loopVideo));
 
       controller.value = nc;
       Timer(const Duration(milliseconds: 200), checkIfBuffering);
@@ -388,12 +375,12 @@ class NativeVideoViewer extends HookConsumerWidget {
 
     useOnAppLifecycleStateChange((_, state) async {
       if (state == AppLifecycleState.resumed && shouldPlayOnForeground.value) {
-        controller.value?.play();
+        await controller.value?.play();
       } else if (state == AppLifecycleState.paused) {
         final videoPlaying = await controller.value?.isPlaying();
         if (videoPlaying ?? true) {
           shouldPlayOnForeground.value = true;
-          controller.value?.pause();
+          await controller.value?.pause();
         } else {
           shouldPlayOnForeground.value = false;
         }
@@ -422,4 +409,31 @@ class NativeVideoViewer extends HookConsumerWidget {
       ],
     );
   }
+
+  Future<void> _onPauseChange(
+    BuildContext context,
+    NativeVideoPlayerController controller,
+    Debouncer seekDebouncer,
+    bool isPaused,
+  ) async {
+    if (!context.mounted) {
+      return;
+    }
+
+    // Make sure the last seek is complete before pausing or playing
+    // Otherwise, `onPlaybackPositionChanged` can receive outdated events
+    if (seekDebouncer.isActive) {
+      await seekDebouncer.drain();
+    }
+
+    try {
+      if (isPaused) {
+        await controller.pause();
+      } else {
+        await controller.play();
+      }
+    } catch (error) {
+      log.severe('Error pausing or playing video: $error');
+    }
+  }
 }

mobile/lib/presentation/widgets/images/image_provider.dart

@@ -1,3 +1,5 @@
+import 'dart:async';
+
 import 'package:async/async.dart';
 import 'package:flutter/widgets.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
@@ -51,14 +53,14 @@ mixin CancellableImageProviderMixin<T extends Object> on CancellableImageProvide
   Stream<ImageInfo> loadRequest(ImageRequest request, ImageDecoderCallback decode) async* {
     if (isCancelled) {
       this.request = null;
-      evict();
+      unawaited(evict());
       return;
     }
 
     try {
       final image = await request.load(decode);
       if (image == null || isCancelled) {
-        evict();
+        unawaited(evict());
         return;
       }
       yield image;

mobile/lib/presentation/widgets/images/local_image_provider.dart

@@ -85,7 +85,7 @@ class LocalFullImageProvider extends CancellableImageProvider<LocalFullImageProv
     yield* initialImageStream();
 
     if (isCancelled) {
-      evict();
+      unawaited(evict());
       return;
     }
 
@@ -103,7 +103,7 @@ class LocalFullImageProvider extends CancellableImageProvider<LocalFullImageProv
     }
 
     if (isCancelled) {
-      evict();
+      unawaited(evict());
       return;
     }
 

mobile/lib/presentation/widgets/images/remote_image_provider.dart

@@ -87,7 +87,7 @@ class RemoteFullImageProvider extends CancellableImageProvider<RemoteFullImagePr
     yield* initialImageStream();
 
     if (isCancelled) {
-      evict();
+      unawaited(evict());
       return;
     }
 
@@ -100,7 +100,7 @@ class RemoteFullImageProvider extends CancellableImageProvider<RemoteFullImagePr
     yield* loadRequest(request, decode);
 
     if (isCancelled) {
-      evict();
+      unawaited(evict());
       return;
     }
 

mobile/lib/presentation/widgets/map/map.widget.dart

@@ -115,12 +115,14 @@ class _DriftMapState extends ConsumerState<DriftMap> {
     }
 
     final bounds = await controller.getVisibleRegion();
-    _reloadMutex.run(() async {
-      if (mounted && ref.read(mapStateProvider.notifier).setBounds(bounds)) {
-        final markers = await ref.read(mapMarkerProvider(bounds).future);
-        await reloadMarkers(markers);
-      }
-    });
+    unawaited(
+      _reloadMutex.run(() async {
+        if (mounted && ref.read(mapStateProvider.notifier).setBounds(bounds)) {
+          final markers = await ref.read(mapMarkerProvider(bounds).future);
+          await reloadMarkers(markers);
+        }
+      }),
+    );
   }
 
   Future<void> reloadMarkers(Map<String, dynamic> markers) async {
@@ -148,7 +150,7 @@ class _DriftMapState extends ConsumerState<DriftMap> {
 
     final controller = mapController;
     if (controller != null && location != null) {
-      controller.animateCamera(
+      await controller.animateCamera(
         CameraUpdate.newLatLngZoom(LatLng(location.latitude, location.longitude), MapUtils.mapZoomToAssetLevel),
         duration: const Duration(milliseconds: 800),
       );

mobile/lib/presentation/widgets/map/map_utils.dart

@@ -73,7 +73,7 @@ class MapUtils {
     try {
       bool serviceEnabled = await Geolocator.isLocationServiceEnabled();
       if (!serviceEnabled && !silent) {
-        showDialog(context: context, builder: (context) => _LocationServiceDisabledDialog(context));
+        unawaited(showDialog(context: context, builder: (context) => _LocationServiceDisabledDialog(context)));
         return (null, LocationPermission.deniedForever);
       }
 

mobile/lib/presentation/widgets/timeline/fixed/segment.model.dart

@@ -1,3 +1,4 @@
+import 'dart:async';
 import 'dart:math' as math;
 
 import 'package:auto_route/auto_route.dart';
@@ -15,8 +16,9 @@ import 'package:immich_mobile/presentation/widgets/timeline/timeline.state.dart'
 import 'package:immich_mobile/presentation/widgets/timeline/timeline_drag_region.dart';
 import 'package:immich_mobile/providers/asset_viewer/is_motion_video_playing.provider.dart';
 import 'package:immich_mobile/providers/haptic_feedback.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/current_album.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/readonly_mode.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
 import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
 import 'package:immich_mobile/routing/router.dart';
 
@@ -156,11 +158,14 @@ class _AssetTileWidget extends ConsumerWidget {
       await ref.read(timelineServiceProvider).loadAssets(assetIndex, 1);
       ref.read(isPlayingMotionVideoProvider.notifier).playing = false;
       AssetViewer.setAsset(ref, asset);
-      ctx.pushRoute(
-        AssetViewerRoute(
-          initialIndex: assetIndex,
-          timelineService: ref.read(timelineServiceProvider),
-          heroOffset: heroOffset,
+      unawaited(
+        ctx.pushRoute(
+          AssetViewerRoute(
+            initialIndex: assetIndex,
+            timelineService: ref.read(timelineServiceProvider),
+            heroOffset: heroOffset,
+            currentAlbum: ref.read(currentRemoteAlbumProvider),
+          ),
         ),
       );
     }

mobile/lib/providers/app_life_cycle.provider.dart

@@ -242,7 +242,7 @@ class AppLifeCycleNotifier extends StateNotifier<AppLifeCycleEnum> {
     }
 
     try {
-      LogService.I.flush();
+      await LogService.I.flush();
     } catch (_) {}
   }
 
@@ -255,7 +255,7 @@ class AppLifeCycleNotifier extends StateNotifier<AppLifeCycleEnum> {
 
     // Flush logs before closing database
     try {
-      LogService.I.flush();
+      await LogService.I.flush();
     } catch (_) {}
 
     // Close Isar database safely

mobile/lib/providers/asset.provider.dart

@@ -98,7 +98,7 @@ class AssetNotifier extends StateNotifier<bool> {
 
   Future<void> onNewAssetUploaded(Asset newAsset) async {
     // eTag on device is not valid after partially modifying the assets
-    Store.delete(StoreKey.assetETag);
+    await Store.delete(StoreKey.assetETag);
     await _syncService.syncNewAssetToDb(newAsset);
   }
 

mobile/lib/providers/asset_viewer/download.provider.dart

@@ -1,14 +1,16 @@
+import 'dart:async';
+
 import 'package:background_downloader/background_downloader.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:fluttertoast/fluttertoast.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/entities/asset.entity.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/models/download/download_state.model.dart';
 import 'package:immich_mobile/models/download/livephotos_medatada.model.dart';
 import 'package:immich_mobile/services/album.service.dart';
 import 'package:immich_mobile/services/download.service.dart';
-import 'package:immich_mobile/entities/asset.entity.dart';
 import 'package:immich_mobile/services/share.service.dart';
 import 'package:immich_mobile/widgets/common/immich_toast.dart';
 import 'package:immich_mobile/widgets/common/share_dialog.dart';
@@ -159,24 +161,26 @@ class DownloadStateNotifier extends StateNotifier<DownloadState> {
   }
 
   void shareAsset(Asset asset, BuildContext context) async {
-    showDialog(
-      context: context,
-      builder: (BuildContext buildContext) {
-        _shareService.shareAsset(asset, context).then((bool status) {
-          if (!status) {
-            ImmichToast.show(
-              context: context,
-              msg: 'image_viewer_page_state_provider_share_error'.tr(),
-              toastType: ToastType.error,
-              gravity: ToastGravity.BOTTOM,
-            );
-          }
-          buildContext.pop();
-        });
-        return const ShareDialog();
-      },
-      barrierDismissible: false,
-      useRootNavigator: false,
+    unawaited(
+      showDialog(
+        context: context,
+        builder: (BuildContext buildContext) {
+          _shareService.shareAsset(asset, context).then((bool status) {
+            if (!status) {
+              ImmichToast.show(
+                context: context,
+                msg: 'image_viewer_page_state_provider_share_error'.tr(),
+                toastType: ToastType.error,
+                gravity: ToastGravity.BOTTOM,
+              );
+            }
+            buildContext.pop();
+          });
+          return const ShareDialog();
+        },
+        barrierDismissible: false,
+        useRootNavigator: false,
+      ),
     );
   }
 }

mobile/lib/providers/asset_viewer/share_intent_upload.provider.dart

@@ -104,7 +104,7 @@ class ShareIntentUploadStateNotifier extends StateNotifier<List<ShareIntentAttac
   Future<void> upload(File file) async {
     final task = await _buildUploadTask(hash(file.path).toString(), file);
 
-    _uploadService.enqueueTasks([task]);
+    await _uploadService.enqueueTasks([task]);
   }
 
   Future<UploadTask> _buildUploadTask(String id, File file, {Map<String, String>? fields}) async {

mobile/lib/providers/asset_viewer/video_player_controls_provider.dart

@@ -4,7 +4,7 @@ import 'package:immich_mobile/providers/asset_viewer/video_player_value_provider
 class VideoPlaybackControls {
   const VideoPlaybackControls({required this.position, required this.pause, this.restarted = false});
 
-  final double position;
+  final Duration position;
   final bool pause;
   final bool restarted;
 }
@@ -13,7 +13,7 @@ final videoPlayerControlsProvider = StateNotifierProvider<VideoPlayerControls, V
   return VideoPlayerControls(ref);
 });
 
-const videoPlayerControlsDefault = VideoPlaybackControls(position: 0, pause: false);
+const videoPlayerControlsDefault = VideoPlaybackControls(position: Duration.zero, pause: false);
 
 class VideoPlayerControls extends StateNotifier<VideoPlaybackControls> {
   VideoPlayerControls(this.ref) : super(videoPlayerControlsDefault);
@@ -30,10 +30,10 @@ class VideoPlayerControls extends StateNotifier<VideoPlaybackControls> {
     state = videoPlayerControlsDefault;
   }
 
-  double get position => state.position;
+  Duration get position => state.position;
   bool get paused => state.pause;
 
-  set position(double value) {
+  set position(Duration value) {
     if (state.position == value) {
       return;
     }
@@ -62,7 +62,7 @@ class VideoPlayerControls extends StateNotifier<VideoPlaybackControls> {
   }
 
   void restart() {
-    state = const VideoPlaybackControls(position: 0, pause: false, restarted: true);
+    state = const VideoPlaybackControls(position: Duration.zero, pause: false, restarted: true);
     ref.read(videoPlaybackValueProvider.notifier).value = ref
         .read(videoPlaybackValueProvider.notifier)
         .value

mobile/lib/providers/asset_viewer/video_player_value_provider.dart

@@ -33,8 +33,8 @@ class VideoPlaybackValue {
     };
 
     return VideoPlaybackValue(
-      position: Duration(seconds: playbackInfo.position),
-      duration: Duration(seconds: videoInfo.duration),
+      position: Duration(milliseconds: playbackInfo.position),
+      duration: Duration(milliseconds: videoInfo.duration),
       state: status,
       volume: playbackInfo.volume,
     );

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

@@ -380,7 +380,7 @@ class BackupNotifier extends StateNotifier<BackUpState> {
 
     state = state.copyWith(backgroundBackup: isEnabled);
     if (isEnabled != Store.get(StoreKey.backgroundBackup, !isEnabled)) {
-      Store.put(StoreKey.backgroundBackup, isEnabled);
+      await Store.put(StoreKey.backgroundBackup, isEnabled);
     }
 
     if (state.backupProgress != BackUpProgressEnum.inBackground) {
@@ -474,7 +474,7 @@ class BackupNotifier extends StateNotifier<BackUpState> {
       );
       await notifyBackgroundServiceCanRun();
     } else {
-      openAppSettings();
+      await openAppSettings();
     }
   }
 
@@ -533,10 +533,10 @@ class BackupNotifier extends StateNotifier<BackUpState> {
         progressInFileSpeedUpdateTime: DateTime.now(),
         progressInFileSpeedUpdateSentBytes: 0,
       );
-      _updatePersistentAlbumsSelection();
+      await _updatePersistentAlbumsSelection();
     }
 
-    updateDiskInfo();
+    await updateDiskInfo();
   }
 
   void _onUploadProgress(int sent, int total) {

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

@@ -2,10 +2,10 @@ import 'dart:async';
 
 import 'package:connectivity_plus/connectivity_plus.dart';
 import 'package:flutter/material.dart';
-import 'package:immich_mobile/providers/backup/backup.provider.dart';
-import 'package:immich_mobile/services/backup_verification.service.dart';
 import 'package:immich_mobile/entities/asset.entity.dart';
 import 'package:immich_mobile/providers/asset.provider.dart';
+import 'package:immich_mobile/providers/backup/backup.provider.dart';
+import 'package:immich_mobile/services/backup_verification.service.dart';
 import 'package:immich_mobile/widgets/common/confirm_dialog.dart';
 import 'package:immich_mobile/widgets/common/immich_toast.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
@@ -44,7 +44,7 @@ class BackupVerification extends _$BackupVerification {
         }
         return;
       }
-      WakelockPlus.enable();
+      unawaited(WakelockPlus.enable());
 
       const limit = 100;
       final toDelete = await ref.read(backupVerificationServiceProvider).findWronglyBackedUpAssets(limit: limit);
@@ -73,7 +73,7 @@ class BackupVerification extends _$BackupVerification {
         }
       }
     } finally {
-      WakelockPlus.disable();
+      unawaited(WakelockPlus.disable());
       state = false;
     }
   }

mobile/lib/providers/backup/backup_verification.provider.g.dart

@@ -7,7 +7,7 @@ part of 'backup_verification.provider.dart';
 // **************************************************************************
 
 String _$backupVerificationHash() =>
-    r'b204e43ab575d5fa5b2ee663297f32bcee9074f5';
+    r'b4b34909ed1af3f28877ea457d53a4a18b6417f8';
 
 /// See also [BackupVerification].
 @ProviderFor(BackupVerification)

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

@@ -1,3 +1,4 @@
+import 'dart:async';
 import 'dart:io';
 
 import 'package:cancellation_token_http/http.dart';
@@ -26,11 +27,11 @@ import 'package:immich_mobile/services/backup.service.dart';
 import 'package:immich_mobile/services/backup_album.service.dart';
 import 'package:immich_mobile/services/local_notification.service.dart';
 import 'package:immich_mobile/utils/backup_progress.dart';
+import 'package:immich_mobile/utils/debug_print.dart';
 import 'package:immich_mobile/widgets/common/immich_toast.dart';
 import 'package:logging/logging.dart';
 import 'package:permission_handler/permission_handler.dart';
 import 'package:photo_manager/photo_manager.dart' show PMProgressHandler;
-import 'package:immich_mobile/utils/debug_print.dart';
 
 final manualUploadProvider = StateNotifierProvider<ManualUploadNotifier, ManualUploadState>((ref) {
   return ManualUploadNotifier(
@@ -294,7 +295,7 @@ class ManualUploadNotifier extends StateNotifier<ManualUploadState> {
           );
         }
       } else {
-        openAppSettings();
+        unawaited(openAppSettings());
         dPrint(() => "[_startUpload] Do not have permission to the gallery");
       }
     } catch (e) {

mobile/lib/providers/image/immich_local_image_provider.dart

@@ -3,7 +3,6 @@ import 'dart:io';
 import 'dart:ui' as ui;
 
 import 'package:cached_network_image/cached_network_image.dart';
-
 import 'package:flutter/foundation.dart';
 import 'package:flutter/painting.dart';
 import 'package:immich_mobile/entities/asset.entity.dart';
@@ -77,7 +76,7 @@ class ImmichLocalImageProvider extends ImageProvider<ImmichLocalImageProvider> {
     } catch (error, stack) {
       log.severe('Error loading local image ${asset.fileName}', error, stack);
     } finally {
-      chunkEvents.close();
+      unawaited(chunkEvents.close());
     }
   }
 

mobile/lib/providers/infrastructure/action.provider.dart

@@ -1,3 +1,5 @@
+import 'dart:async';
+
 import 'package:auto_route/auto_route.dart';
 import 'package:background_downloader/background_downloader.dart';
 import 'package:flutter/material.dart';
@@ -70,7 +72,7 @@ class ActionNotifier extends Notifier<void> {
   void _downloadLivePhotoCallback(TaskStatusUpdate update) async {
     if (update.status == TaskStatus.complete) {
       final livePhotosId = LivePhotosMetadata.fromJson(update.task.metaData).id;
-      _downloadService.saveLivePhotos(update.task, livePhotosId);
+      unawaited(_downloadService.saveLivePhotos(update.task, livePhotosId));
     }
   }
 
@@ -131,7 +133,7 @@ class ActionNotifier extends Notifier<void> {
     if (assets.length > 1) {
       return ActionResult(count: assets.length, success: false, error: 'Cannot troubleshoot multiple assets');
     }
-    context.pushRoute(AssetTroubleshootRoute(asset: assets.first));
+    unawaited(context.pushRoute(AssetTroubleshootRoute(asset: assets.first)));
 
     return ActionResult(count: assets.length, success: true);
   }

mobile/lib/providers/infrastructure/album.provider.dart

@@ -1,4 +1,5 @@
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/domain/models/album/album.model.dart';
 import 'package:immich_mobile/domain/models/album/local_album.model.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/domain/services/local_album.service.dart';
@@ -40,3 +41,7 @@ final remoteAlbumProvider = NotifierProvider<RemoteAlbumNotifier, RemoteAlbumSta
   RemoteAlbumNotifier.new,
   dependencies: [remoteAlbumServiceProvider],
 );
+
+final albumsContainingAssetProvider = FutureProvider.family<List<RemoteAlbum>, String>(
+  (ref, assetId) => ref.watch(remoteAlbumServiceProvider).getAlbumsContainingAsset(assetId),
+);

mobile/lib/providers/infrastructure/current_album.provider.dart

@@ -1,36 +1,30 @@
-import 'dart:async';
-
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/album/album.model.dart';
 import 'package:immich_mobile/providers/infrastructure/album.provider.dart';
 
-final currentRemoteAlbumProvider = AutoDisposeNotifierProvider<CurrentAlbumNotifier, RemoteAlbum?>(
+final currentRemoteAlbumScopedProvider = Provider<RemoteAlbum?>((ref) => null);
+final currentRemoteAlbumProvider = NotifierProvider<CurrentAlbumNotifier, RemoteAlbum?>(
   CurrentAlbumNotifier.new,
+  dependencies: [currentRemoteAlbumScopedProvider, remoteAlbumServiceProvider],
 );
 
-class CurrentAlbumNotifier extends AutoDisposeNotifier<RemoteAlbum?> {
-  KeepAliveLink? _keepAliveLink;
-  StreamSubscription<RemoteAlbum?>? _assetSubscription;
-
+class CurrentAlbumNotifier extends Notifier<RemoteAlbum?> {
   @override
-  RemoteAlbum? build() => null;
+  RemoteAlbum? build() {
+    final album = ref.watch(currentRemoteAlbumScopedProvider);
 
-  void setAlbum(RemoteAlbum album) {
-    _keepAliveLink?.close();
-    _assetSubscription?.cancel();
-    state = album;
+    if (album == null) {
+      return null;
+    }
 
-    _assetSubscription = ref.watch(remoteAlbumServiceProvider).watchAlbum(album.id).listen((updatedAlbum) {
+    final watcher = ref.watch(remoteAlbumServiceProvider).watchAlbum(album.id).listen((updatedAlbum) {
       if (updatedAlbum != null) {
         state = updatedAlbum;
       }
     });
-    _keepAliveLink = ref.keepAlive();
-  }
 
-  void dispose() {
-    _keepAliveLink?.close();
-    _assetSubscription?.cancel();
-    state = null;
+    ref.onDispose(watcher.cancel);
+
+    return album;
   }
 }

mobile/lib/providers/shared_link.provider.dart

@@ -1,3 +1,5 @@
+import 'dart:async';
+
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/models/shared_link/shared_link.model.dart';
 import 'package:immich_mobile/services/shared_link.service.dart';
@@ -16,7 +18,7 @@ class SharedLinksNotifier extends StateNotifier<AsyncValue<List<SharedLink>>> {
   Future<void> deleteLink(String id) async {
     await _sharedLinkService.deleteSharedLink(id);
     state = const AsyncLoading();
-    fetchLinks();
+    unawaited(fetchLinks());
   }
 }
 

mobile/lib/repositories/asset_media.repository.dart

@@ -1,3 +1,4 @@
+import 'dart:async';
 import 'dart:io';
 
 import 'package:device_info_plus/device_info_plus.dart';
@@ -138,18 +139,20 @@ class AssetMediaRepository {
     // we dont want to await the share result since the
     // "preparing" dialog will not disappear until
     final size = context.sizeData;
-    Share.shareXFiles(
-      downloadedXFiles,
-      sharePositionOrigin: Rect.fromPoints(Offset.zero, Offset(size.width / 3, size.height)),
-    ).then((result) async {
-      for (var file in tempFiles) {
-        try {
-          await file.delete();
-        } catch (e) {
-          _log.warning("Failed to delete temporary file: ${file.path}", e);
+    unawaited(
+      Share.shareXFiles(
+        downloadedXFiles,
+        sharePositionOrigin: Rect.fromPoints(Offset.zero, Offset(size.width / 3, size.height)),
+      ).then((result) async {
+        for (var file in tempFiles) {
+          try {
+            await file.delete();
+          } catch (e) {
+            _log.warning("Failed to delete temporary file: ${file.path}", e);
+          }
         }
-      }
-    });
+      }),
+    );
 
     return downloadedXFiles.length;
   }

mobile/lib/routing/app_navigation_observer.dart

@@ -1,3 +1,5 @@
+import 'dart:async';
+
 import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
@@ -12,7 +14,7 @@ class AppNavigationObserver extends AutoRouterObserver {
 
   @override
   Future<void> didChangeTabRoute(TabPageRoute route, TabPageRoute previousRoute) async {
-    Future(() => ref.read(inLockedViewProvider.notifier).state = false);
+    unawaited(Future(() => ref.read(inLockedViewProvider.notifier).state = false));
   }
 
   @override

mobile/lib/routing/auth_guard.dart

@@ -1,3 +1,4 @@
+import 'dart:async';
 import 'dart:io';
 
 import 'package:auto_route/auto_route.dart';
@@ -26,18 +27,18 @@ class AuthGuard extends AutoRouteGuard {
       if (res == null || res.authStatus != true) {
         // If the access token is invalid, take user back to login
         _log.fine('User token is invalid. Redirecting to login');
-        router.replaceAll([const LoginRoute()]);
+        unawaited(router.replaceAll([const LoginRoute()]));
       }
     } on StoreKeyNotFoundException catch (_) {
       // If there is no access token, take us to the login page
       _log.warning('No access token in the store.');
-      router.replaceAll([const LoginRoute()]);
+      unawaited(router.replaceAll([const LoginRoute()]));
       return;
     } on ApiException catch (e) {
       // On an unauthorized request, take us to the login page
       if (e.code == HttpStatus.unauthorized) {
         _log.warning("Unauthorized access token.");
-        router.replaceAll([const LoginRoute()]);
+        unawaited(router.replaceAll([const LoginRoute()]));
         return;
       }
     } catch (e) {

mobile/lib/routing/backup_permission_guard.dart

@@ -1,3 +1,5 @@
+import 'dart:async';
+
 import 'package:auto_route/auto_route.dart';
 import 'package:immich_mobile/providers/gallery_permission.provider.dart';
 import 'package:immich_mobile/routing/router.dart';
@@ -13,7 +15,7 @@ class BackupPermissionGuard extends AutoRouteGuard {
     if (p) {
       resolver.next(true);
     } else {
-      router.push(const PermissionOnboardingRoute());
+      unawaited(router.push(const PermissionOnboardingRoute()));
     }
   }
 }

mobile/lib/routing/gallery_guard.dart

@@ -1,3 +1,5 @@
+import 'dart:async';
+
 import 'package:auto_route/auto_route.dart';
 import 'package:immich_mobile/routing/router.dart';
 
@@ -13,12 +15,14 @@ class GalleryGuard extends AutoRouteGuard {
       // Replace instead of pushing duplicate
       final args = resolver.route.args as GalleryViewerRouteArgs;
 
-      router.replace(
-        GalleryViewerRoute(
-          renderList: args.renderList,
-          initialIndex: args.initialIndex,
-          heroOffset: args.heroOffset,
-          showStack: args.showStack,
+      unawaited(
+        router.replace(
+          GalleryViewerRoute(
+            renderList: args.renderList,
+            initialIndex: args.initialIndex,
+            heroOffset: args.heroOffset,
+            showStack: args.showStack,
+          ),
         ),
       );
       // Prevent further navigation since we replaced the route

mobile/lib/routing/locked_guard.dart

@@ -1,8 +1,9 @@
+import 'dart:async';
+
 import 'package:auto_route/auto_route.dart';
 import 'package:flutter/services.dart';
 import 'package:immich_mobile/constants/constants.dart';
 import 'package:immich_mobile/routing/router.dart';
-
 import 'package:immich_mobile/services/api.service.dart';
 import 'package:immich_mobile/services/local_auth.service.dart';
 import 'package:immich_mobile/services/secure_storage.service.dart';
@@ -30,7 +31,7 @@ class LockedGuard extends AutoRouteGuard {
 
     /// Check if a pincode has been created but this user. Show the form to create if not exist
     if (!authStatus.pinCode) {
-      router.push(PinAuthRoute(createPinCode: true));
+      unawaited(router.push(PinAuthRoute(createPinCode: true)));
     }
 
     if (authStatus.isElevated) {
@@ -42,7 +43,7 @@ class LockedGuard extends AutoRouteGuard {
     /// the user has enabled the biometric authentication
     final securePinCode = await _secureStorageService.read(kSecuredPinCode);
     if (securePinCode == null) {
-      router.push(PinAuthRoute());
+      unawaited(router.push(PinAuthRoute()));
       return;
     }
 
@@ -74,7 +75,7 @@ class LockedGuard extends AutoRouteGuard {
     } on ApiException {
       // PIN code has changed, need to re-enter to access
       await _secureStorageService.delete(kSecuredPinCode);
-      router.push(PinAuthRoute());
+      unawaited(router.push(PinAuthRoute()));
     } catch (error) {
       _log.severe("Failed to access locked page", error);
       resolver.next(false);

mobile/lib/routing/router.dart

@@ -303,7 +303,7 @@ class AppRouter extends RootStackRouter {
     AutoRoute(page: DriftBackupAlbumSelectionRoute.page, guards: [_authGuard, _duplicateGuard]),
     AutoRoute(page: LocalTimelineRoute.page, guards: [_authGuard, _duplicateGuard]),
     AutoRoute(page: MainTimelineRoute.page, guards: [_authGuard, _duplicateGuard]),
-    AutoRoute(page: RemoteAlbumRoute.page, guards: [_authGuard, _duplicateGuard]),
+    AutoRoute(page: RemoteAlbumRoute.page, guards: [_authGuard]),
     AutoRoute(
       page: AssetViewerRoute.page,
       guards: [_authGuard, _duplicateGuard],

mobile/lib/routing/router.gr.dart

@@ -448,6 +448,7 @@ class AssetViewerRoute extends PageRouteInfo<AssetViewerRouteArgs> {
     required int initialIndex,
     required TimelineService timelineService,
     int? heroOffset,
+    RemoteAlbum? currentAlbum,
     List<PageRouteInfo>? children,
   }) : super(
          AssetViewerRoute.name,
@@ -456,6 +457,7 @@ class AssetViewerRoute extends PageRouteInfo<AssetViewerRouteArgs> {
            initialIndex: initialIndex,
            timelineService: timelineService,
            heroOffset: heroOffset,
+           currentAlbum: currentAlbum,
          ),
          initialChildren: children,
        );
@@ -471,6 +473,7 @@ class AssetViewerRoute extends PageRouteInfo<AssetViewerRouteArgs> {
         initialIndex: args.initialIndex,
         timelineService: args.timelineService,
         heroOffset: args.heroOffset,
+        currentAlbum: args.currentAlbum,
       );
     },
   );
@@ -482,6 +485,7 @@ class AssetViewerRouteArgs {
     required this.initialIndex,
     required this.timelineService,
     this.heroOffset,
+    this.currentAlbum,
   });
 
   final Key? key;
@@ -492,9 +496,11 @@ class AssetViewerRouteArgs {
 
   final int? heroOffset;
 
+  final RemoteAlbum? currentAlbum;
+
   @override
   String toString() {
-    return 'AssetViewerRouteArgs{key: $key, initialIndex: $initialIndex, timelineService: $timelineService, heroOffset: $heroOffset}';
+    return 'AssetViewerRouteArgs{key: $key, initialIndex: $initialIndex, timelineService: $timelineService, heroOffset: $heroOffset, currentAlbum: $currentAlbum}';
   }
 }
 
@@ -706,36 +712,78 @@ class DownloadInfoRoute extends PageRouteInfo<void> {
 
 /// generated route for
 /// [DriftActivitiesPage]
-class DriftActivitiesRoute extends PageRouteInfo<void> {
-  const DriftActivitiesRoute({List<PageRouteInfo>? children})
-    : super(DriftActivitiesRoute.name, initialChildren: children);
+class DriftActivitiesRoute extends PageRouteInfo<DriftActivitiesRouteArgs> {
+  DriftActivitiesRoute({
+    Key? key,
+    required RemoteAlbum album,
+    List<PageRouteInfo>? children,
+  }) : super(
+         DriftActivitiesRoute.name,
+         args: DriftActivitiesRouteArgs(key: key, album: album),
+         initialChildren: children,
+       );
 
   static const String name = 'DriftActivitiesRoute';
 
   static PageInfo page = PageInfo(
     name,
     builder: (data) {
-      return const DriftActivitiesPage();
+      final args = data.argsAs<DriftActivitiesRouteArgs>();
+      return DriftActivitiesPage(key: args.key, album: args.album);
     },
   );
 }
 
+class DriftActivitiesRouteArgs {
+  const DriftActivitiesRouteArgs({this.key, required this.album});
+
+  final Key? key;
+
+  final RemoteAlbum album;
+
+  @override
+  String toString() {
+    return 'DriftActivitiesRouteArgs{key: $key, album: $album}';
+  }
+}
+
 /// generated route for
 /// [DriftAlbumOptionsPage]
-class DriftAlbumOptionsRoute extends PageRouteInfo<void> {
-  const DriftAlbumOptionsRoute({List<PageRouteInfo>? children})
-    : super(DriftAlbumOptionsRoute.name, initialChildren: children);
+class DriftAlbumOptionsRoute extends PageRouteInfo<DriftAlbumOptionsRouteArgs> {
+  DriftAlbumOptionsRoute({
+    Key? key,
+    required RemoteAlbum album,
+    List<PageRouteInfo>? children,
+  }) : super(
+         DriftAlbumOptionsRoute.name,
+         args: DriftAlbumOptionsRouteArgs(key: key, album: album),
+         initialChildren: children,
+       );
 
   static const String name = 'DriftAlbumOptionsRoute';
 
   static PageInfo page = PageInfo(
     name,
     builder: (data) {
-      return const DriftAlbumOptionsPage();
+      final args = data.argsAs<DriftAlbumOptionsRouteArgs>();
+      return DriftAlbumOptionsPage(key: args.key, album: args.album);
     },
   );
 }
 
+class DriftAlbumOptionsRouteArgs {
+  const DriftAlbumOptionsRouteArgs({this.key, required this.album});
+
+  final Key? key;
+
+  final RemoteAlbum album;
+
+  @override
+  String toString() {
+    return 'DriftAlbumOptionsRouteArgs{key: $key, album: $album}';
+  }
+}
+
 /// generated route for
 /// [DriftAlbumsPage]
 class DriftAlbumsRoute extends PageRouteInfo<void> {
@@ -1410,43 +1458,20 @@ class DriftRecentlyTakenRoute extends PageRouteInfo<void> {
 
 /// generated route for
 /// [DriftSearchPage]
-class DriftSearchRoute extends PageRouteInfo<DriftSearchRouteArgs> {
-  DriftSearchRoute({
-    Key? key,
-    SearchFilter? preFilter,
-    List<PageRouteInfo>? children,
-  }) : super(
-         DriftSearchRoute.name,
-         args: DriftSearchRouteArgs(key: key, preFilter: preFilter),
-         initialChildren: children,
-       );
+class DriftSearchRoute extends PageRouteInfo<void> {
+  const DriftSearchRoute({List<PageRouteInfo>? children})
+    : super(DriftSearchRoute.name, initialChildren: children);
 
   static const String name = 'DriftSearchRoute';
 
   static PageInfo page = PageInfo(
     name,
     builder: (data) {
-      final args = data.argsAs<DriftSearchRouteArgs>(
-        orElse: () => const DriftSearchRouteArgs(),
-      );
-      return DriftSearchPage(key: args.key, preFilter: args.preFilter);
+      return const DriftSearchPage();
     },
   );
 }
 
-class DriftSearchRouteArgs {
-  const DriftSearchRouteArgs({this.key, this.preFilter});
-
-  final Key? key;
-
-  final SearchFilter? preFilter;
-
-  @override
-  String toString() {
-    return 'DriftSearchRouteArgs{key: $key, preFilter: $preFilter}';
-  }
-}
-
 /// generated route for
 /// [DriftTrashPage]
 class DriftTrashRoute extends PageRouteInfo<void> {

mobile/lib/services/action.service.dart

@@ -1,3 +1,5 @@
+import 'dart:async';
+
 import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
@@ -50,7 +52,7 @@ class ActionService {
   );
 
   Future<void> shareLink(List<String> remoteIds, BuildContext context) async {
-    context.pushRoute(SharedLinkEditRoute(assetsList: remoteIds));
+    unawaited(context.pushRoute(SharedLinkEditRoute(assetsList: remoteIds)));
   }
 
   Future<void> favorite(List<String> remoteIds) async {

mobile/lib/services/album.service.dart

@@ -83,7 +83,7 @@ class AlbumService {
       if (selectedIds.isEmpty) {
         final numLocal = await _albumRepository.count(local: true);
         if (numLocal > 0) {
-          _syncService.removeAllLocalAlbumsAndAssets();
+          await _syncService.removeAllLocalAlbumsAndAssets();
         }
         return false;
       }

mobile/lib/services/api.service.dart

@@ -6,11 +6,11 @@ import 'package:device_info_plus/device_info_plus.dart';
 import 'package:http/http.dart';
 import 'package:immich_mobile/domain/models/store.model.dart';
 import 'package:immich_mobile/entities/store.entity.dart';
+import 'package:immich_mobile/utils/debug_print.dart';
 import 'package:immich_mobile/utils/url_helper.dart';
+import 'package:immich_mobile/utils/user_agent.dart';
 import 'package:logging/logging.dart';
 import 'package:openapi/api.dart';
-import 'package:immich_mobile/utils/user_agent.dart';
-import 'package:immich_mobile/utils/debug_print.dart';
 
 class ApiService implements Authentication {
   late ApiClient _apiClient;
@@ -86,7 +86,7 @@ class ApiService implements Authentication {
     setEndpoint(endpoint);
 
     // Save in local database for next startup
-    Store.put(StoreKey.serverEndpoint, endpoint);
+    await Store.put(StoreKey.serverEndpoint, endpoint);
     return endpoint;
   }
 

mobile/lib/services/auth.service.dart

@@ -58,7 +58,7 @@ class AuthService {
   Future<String> validateServerUrl(String url) async {
     final validUrl = await _apiService.resolveAndSetEndpoint(url);
     await _apiService.setDeviceInfoHeader();
-    Store.put(StoreKey.serverUrl, validUrl);
+    await Store.put(StoreKey.serverUrl, validUrl);
 
     return validUrl;
   }

mobile/lib/services/background.service.dart

@@ -291,7 +291,7 @@ class BackgroundService {
       case "backgroundProcessing":
       case "onAssetsChanged":
         try {
-          _clearErrorNotifications();
+          unawaited(_clearErrorNotifications());
 
           // iOS should time out after some threshold so it doesn't wait
           // indefinitely and can run later
@@ -342,7 +342,7 @@ class BackgroundService {
     );
 
     HttpSSLOptions.apply();
-    ref.read(apiServiceProvider).setAccessToken(Store.get(StoreKey.accessToken));
+    await ref.read(apiServiceProvider).setAccessToken(Store.get(StoreKey.accessToken));
     await ref.read(authServiceProvider).setOpenApiServiceEndpoint();
     dPrint(() => "[BG UPLOAD] Using endpoint: ${ref.read(apiServiceProvider).apiClient.basePath}");
 
@@ -385,7 +385,7 @@ class BackgroundService {
         await ref.read(backupAlbumRepositoryProvider).deleteAll(toDelete);
         await ref.read(backupAlbumRepositoryProvider).updateAll(toUpsert);
       } else if (Store.tryGet(StoreKey.backupFailedSince) == null) {
-        Store.put(StoreKey.backupFailedSince, DateTime.now());
+        await Store.put(StoreKey.backupFailedSince, DateTime.now());
         return false;
       }
       // Android should check for new assets added while performing backup
@@ -412,9 +412,11 @@ class BackgroundService {
     try {
       toUpload = await backupService.removeAlreadyUploadedAssets(toUpload);
     } catch (e) {
-      _showErrorNotification(
-        title: "backup_background_service_error_title".tr(),
-        content: "backup_background_service_connection_failed_message".tr(),
+      unawaited(
+        _showErrorNotification(
+          title: "backup_background_service_error_title".tr(),
+          content: "backup_background_service_connection_failed_message".tr(),
+        ),
       );
       return false;
     }
@@ -428,13 +430,15 @@ class BackgroundService {
     }
     _assetsToUploadCount = toUpload.length;
     _uploadedAssetsCount = 0;
-    _updateNotification(
-      title: "backup_background_service_in_progress_notification".tr(),
-      content: notifyTotalProgress ? formatAssetBackupProgress(_uploadedAssetsCount, _assetsToUploadCount) : null,
-      progress: 0,
-      max: notifyTotalProgress ? _assetsToUploadCount : 0,
-      indeterminate: !notifyTotalProgress,
-      onlyIfFG: !notifyTotalProgress,
+    unawaited(
+      _updateNotification(
+        title: "backup_background_service_in_progress_notification".tr(),
+        content: notifyTotalProgress ? formatAssetBackupProgress(_uploadedAssetsCount, _assetsToUploadCount) : null,
+        progress: 0,
+        max: notifyTotalProgress ? _assetsToUploadCount : 0,
+        indeterminate: !notifyTotalProgress,
+        onlyIfFG: !notifyTotalProgress,
+      ),
     );
 
     _cancellationToken = CancellationToken();
@@ -452,9 +456,11 @@ class BackgroundService {
     );
 
     if (!ok && !_cancellationToken!.isCancelled) {
-      _showErrorNotification(
-        title: "backup_background_service_error_title".tr(),
-        content: "backup_background_service_backup_failed_message".tr(),
+      unawaited(
+        _showErrorNotification(
+          title: "backup_background_service_error_title".tr(),
+          content: "backup_background_service_backup_failed_message".tr(),
+        ),
       );
     }
 

mobile/lib/services/backup_verification.service.dart

@@ -120,7 +120,7 @@ class BackupVerificationService {
     await tuple.fileMediaRepository.enableBackgroundAccess();
     final ApiService apiService = ApiService();
     apiService.setEndpoint(tuple.endpoint);
-    apiService.setAccessToken(tuple.auth);
+    await apiService.setAccessToken(tuple.auth);
     for (int i = 0; i < tuple.deleteCandidates.length; i++) {
       if (await _compareAssets(tuple.deleteCandidates[i], tuple.originals[i], apiService)) {
         result.add(tuple.deleteCandidates[i]);

mobile/lib/services/deep_link.service.dart

@@ -10,7 +10,6 @@ import 'package:immich_mobile/providers/album/current_album.provider.dart';
 import 'package:immich_mobile/providers/asset_viewer/current_asset.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/album.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/asset.provider.dart' as beta_asset_provider;
-import 'package:immich_mobile/providers/infrastructure/current_album.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/memory.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
 import 'package:immich_mobile/routing/router.dart';
@@ -29,7 +28,6 @@ final deepLinkServiceProvider = Provider(
     // Below is used for beta timeline
     ref.watch(timelineFactoryProvider),
     ref.watch(beta_asset_provider.assetServiceProvider),
-    ref.watch(currentRemoteAlbumProvider.notifier),
     ref.watch(remoteAlbumServiceProvider),
     ref.watch(driftMemoryServiceProvider),
   ),
@@ -46,7 +44,6 @@ class DeepLinkService {
   /// Used for beta timeline
   final TimelineFactory _betaTimelineFactory;
   final beta_asset_service.AssetService _betaAssetService;
-  final CurrentAlbumNotifier _betaCurrentAlbumNotifier;
   final RemoteAlbumService _betaRemoteAlbumService;
   final DriftMemoryService _betaMemoryServiceProvider;
 
@@ -58,7 +55,6 @@ class DeepLinkService {
     this._currentAlbum,
     this._betaTimelineFactory,
     this._betaAssetService,
-    this._betaCurrentAlbumNotifier,
     this._betaRemoteAlbumService,
     this._betaMemoryServiceProvider,
   );
@@ -176,7 +172,6 @@ class DeepLinkService {
         return null;
       }
 
-      _betaCurrentAlbumNotifier.setAlbum(album);
       return RemoteAlbumRoute(album: album);
     } else {
       // TODO: Remove this when beta is default

mobile/lib/services/map.service.dart

@@ -1,9 +1,9 @@
 import 'package:immich_mobile/mixins/error_logger.mixin.dart';
 import 'package:immich_mobile/models/map/map_marker.model.dart';
 import 'package:immich_mobile/services/api.service.dart';
+import 'package:immich_mobile/utils/user_agent.dart';
 import 'package:logging/logging.dart';
 import 'package:maplibre_gl/maplibre_gl.dart';
-import 'package:immich_mobile/utils/user_agent.dart';
 
 class MapService with ErrorLoggerMixin {
   final ApiService _apiService;
@@ -16,7 +16,7 @@ class MapService with ErrorLoggerMixin {
 
   Future<void> _setMapUserAgentHeader() async {
     final userAgent = await getUserAgentString();
-    setHttpHeaders({'User-Agent': userAgent});
+    await setHttpHeaders({'User-Agent': userAgent});
   }
 
   Future<Iterable<MapMarker>> getMapMarkers({

mobile/lib/services/share.service.dart

@@ -1,13 +1,15 @@
+import 'dart:async';
 import 'dart:io';
 
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/extensions/response_extensions.dart';
 import 'package:immich_mobile/entities/asset.entity.dart';
+import 'package:immich_mobile/extensions/response_extensions.dart';
 import 'package:immich_mobile/providers/api.provider.dart';
 import 'package:logging/logging.dart';
 import 'package:path_provider/path_provider.dart';
 import 'package:share_plus/share_plus.dart';
+
 import 'api.service.dart';
 
 final shareServiceProvider = Provider((ref) => ShareService(ref.watch(apiServiceProvider)));
@@ -58,9 +60,11 @@ class ShareService {
       }
 
       final size = MediaQuery.of(context).size;
-      Share.shareXFiles(
-        downloadedXFiles,
-        sharePositionOrigin: Rect.fromPoints(Offset.zero, Offset(size.width / 3, size.height)),
+      unawaited(
+        Share.shareXFiles(
+          downloadedXFiles,
+          sharePositionOrigin: Rect.fromPoints(Offset.zero, Offset(size.width / 3, size.height)),
+        ),
       );
       return true;
     } catch (error) {

mobile/lib/services/sync.service.dart

@@ -705,7 +705,7 @@ class SyncService {
     if (assets.isEmpty) return;
 
     if (Platform.isAndroid && _appSettingsService.getSetting<bool>(AppSettingsEnum.manageLocalMediaAndroid)) {
-      _toggleTrashStatusForAssets(assets);
+      await _toggleTrashStatusForAssets(assets);
     }
 
     try {

mobile/lib/services/upload.service.dart

@@ -4,6 +4,7 @@ import 'dart:io';
 
 import 'package:background_downloader/background_downloader.dart';
 import 'package:cancellation_token_http/http.dart';
+import 'package:flutter/foundation.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/constants/constants.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
@@ -17,6 +18,7 @@ import 'package:immich_mobile/providers/app_settings.provider.dart';
 import 'package:immich_mobile/providers/backup/drift_backup.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/asset.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/storage.provider.dart';
+import 'package:immich_mobile/repositories/asset_media.repository.dart';
 import 'package:immich_mobile/repositories/upload.repository.dart';
 import 'package:immich_mobile/services/api.service.dart';
 import 'package:immich_mobile/services/app_settings.service.dart';
@@ -31,6 +33,7 @@ final uploadServiceProvider = Provider((ref) {
     ref.watch(storageRepositoryProvider),
     ref.watch(localAssetRepository),
     ref.watch(appSettingsServiceProvider),
+    ref.watch(assetMediaRepositoryProvider),
   );
 
   ref.onDispose(service.dispose);
@@ -44,6 +47,7 @@ class UploadService {
     this._storageRepository,
     this._localAssetRepository,
     this._appSettingsService,
+    this._assetMediaRepository,
   ) {
     _uploadRepository.onUploadStatus = _onUploadCallback;
     _uploadRepository.onTaskProgress = _onTaskProgressCallback;
@@ -54,6 +58,7 @@ class UploadService {
   final StorageRepository _storageRepository;
   final DriftLocalAssetRepository _localAssetRepository;
   final AppSettingsService _appSettingsService;
+  final AssetMediaRepository _assetMediaRepository;
   final Logger _logger = Logger('UploadService');
 
   final StreamController<TaskStatusUpdate> _taskStatusController = StreamController<TaskStatusUpdate>.broadcast();
@@ -98,7 +103,7 @@ class UploadService {
     await _storageRepository.clearCache();
     List<UploadTask> tasks = [];
     for (final asset in localAssets) {
-      final task = await _getUploadTask(
+      final task = await getUploadTask(
         asset,
         group: kManualUploadGroup,
         priority: 1, // High priority after upload motion photo part
@@ -136,7 +141,7 @@ class UploadService {
       final batch = candidates.skip(i).take(batchSize).toList();
       List<UploadTask> tasks = [];
       for (final asset in batch) {
-        final task = await _getUploadTask(asset);
+        final task = await getUploadTask(asset);
         if (task != null) {
           tasks.add(task);
         }
@@ -209,7 +214,7 @@ class UploadService {
   void _handleTaskStatusUpdate(TaskStatusUpdate update) async {
     switch (update.status) {
       case TaskStatus.complete:
-        _handleLivePhoto(update);
+        unawaited(_handleLivePhoto(update));
 
         if (CurrentPlatform.isIOS) {
           try {
@@ -248,13 +253,13 @@ class UploadService {
         return;
       }
 
-      final uploadTask = await _getLivePhotoUploadTask(localAsset, response['id'] as String);
+      final uploadTask = await getLivePhotoUploadTask(localAsset, response['id'] as String);
 
       if (uploadTask == null) {
         return;
       }
 
-      enqueueTasks([uploadTask]);
+      await enqueueTasks([uploadTask]);
     } catch (error, stackTrace) {
       dPrint(() => "Error handling live photo upload task: $error $stackTrace");
     }
@@ -296,7 +301,8 @@ class UploadService {
     );
   }
 
-  Future<UploadTask?> _getUploadTask(LocalAsset asset, {String group = kBackupGroup, int? priority}) async {
+  @visibleForTesting
+  Future<UploadTask?> getUploadTask(LocalAsset asset, {String group = kBackupGroup, int? priority}) async {
     final entity = await _storageRepository.getAssetEntityForAsset(asset);
     if (entity == null) {
       return null;
@@ -324,7 +330,8 @@ class UploadService {
       return null;
     }
 
-    final originalFileName = entity.isLivePhoto ? p.setExtension(asset.name, p.extension(file.path)) : asset.name;
+    final fileName = await _assetMediaRepository.getOriginalFilename(asset.id) ?? asset.name;
+    final originalFileName = entity.isLivePhoto ? p.setExtension(fileName, p.extension(file.path)) : fileName;
 
     String metadata = UploadTaskMetadata(
       localAssetId: asset.id,
@@ -348,7 +355,8 @@ class UploadService {
     );
   }
 
-  Future<UploadTask?> _getLivePhotoUploadTask(LocalAsset asset, String livePhotoVideoId) async {
+  @visibleForTesting
+  Future<UploadTask?> getLivePhotoUploadTask(LocalAsset asset, String livePhotoVideoId) async {
     final entity = await _storageRepository.getAssetEntityForAsset(asset);
     if (entity == null) {
       return null;
@@ -362,12 +370,13 @@ class UploadService {
     final fields = {'livePhotoVideoId': livePhotoVideoId};
 
     final requiresWiFi = _shouldRequireWiFi(asset);
+    final originalFileName = await _assetMediaRepository.getOriginalFilename(asset.id) ?? asset.name;
 
     return buildUploadTask(
       file,
       createdAt: asset.createdAt,
       modifiedAt: asset.updatedAt,
-      originalFileName: asset.name,
+      originalFileName: originalFileName,
       deviceAssetId: asset.id,
       fields: fields,
       group: kBackupLivePhotoGroup,

mobile/lib/utils/action_button.utils.dart

@@ -14,6 +14,7 @@ import 'package:immich_mobile/presentation/widgets/action_buttons/remove_from_al
 import 'package:immich_mobile/presentation/widgets/action_buttons/remove_from_lock_folder_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/share_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/share_link_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/similar_photos_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/trash_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/unarchive_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/unstack_action_button.widget.dart';
@@ -59,7 +60,8 @@ enum ActionButtonType {
   upload,
   removeFromAlbum,
   unstack,
-  likeActivity;
+  likeActivity,
+  similarPhotos;
 
   bool shouldShow(ActionButtonContext context) {
     return switch (this) {
@@ -123,6 +125,9 @@ enum ActionButtonType {
             context.currentAlbum != null &&
             context.currentAlbum!.isActivityEnabled &&
             context.currentAlbum!.isShared,
+      ActionButtonType.similarPhotos =>
+        !context.isInLockedView && //
+            context.asset.hasRemote,
     };
   }
 
@@ -147,6 +152,7 @@ enum ActionButtonType {
       ),
       ActionButtonType.likeActivity => const LikeActivityActionButton(),
       ActionButtonType.unstack => UnStackActionButton(source: context.source),
+      ActionButtonType.similarPhotos => SimilarPhotosActionButton(assetId: (context.asset as RemoteAsset).id),
     };
   }
 }

mobile/lib/utils/map_utils.dart

@@ -1,8 +1,10 @@
+import 'dart:async';
+
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
+import 'package:geolocator/geolocator.dart';
 import 'package:immich_mobile/models/map/map_marker.model.dart';
 import 'package:immich_mobile/widgets/common/confirm_dialog.dart';
-import 'package:geolocator/geolocator.dart';
 import 'package:logging/logging.dart';
 import 'package:maplibre_gl/maplibre_gl.dart';
 
@@ -68,7 +70,7 @@ class MapUtils {
     try {
       bool serviceEnabled = await Geolocator.isLocationServiceEnabled();
       if (!serviceEnabled && !silent) {
-        showDialog(context: context, builder: (context) => _LocationServiceDisabledDialog());
+        unawaited(showDialog(context: context, builder: (context) => _LocationServiceDisabledDialog()));
         return (null, LocationPermission.deniedForever);
       }
 

mobile/lib/utils/openapi_patching.dart

@@ -46,6 +46,11 @@ dynamic upgradeDto(dynamic value, String targetType) {
         addDefault(value, 'profileChangedAt', DateTime.now().toIso8601String());
         addDefault(value, 'hasProfileImage', false);
       }
+    case 'ServerFeaturesDto':
+      if (value is Map) {
+        addDefault(value, 'ocr', false);
+      }
+      break;
   }
 }
 

mobile/lib/utils/selection_handlers.dart

@@ -101,7 +101,7 @@ Future<void> handleEditDateTime(WidgetRef ref, BuildContext context, List<Asset>
     return;
   }
 
-  ref.read(assetServiceProvider).changeDateTime(selection.toList(), dateTime);
+  await ref.read(assetServiceProvider).changeDateTime(selection.toList(), dateTime);
 }
 
 Future<void> handleEditLocation(WidgetRef ref, BuildContext context, List<Asset> selection) async {
@@ -120,7 +120,7 @@ Future<void> handleEditLocation(WidgetRef ref, BuildContext context, List<Asset>
     return;
   }
 
-  ref.read(assetServiceProvider).changeLocation(selection.toList(), location);
+  await ref.read(assetServiceProvider).changeLocation(selection.toList(), location);
 }
 
 Future<void> handleSetAssetsVisibility(

mobile/lib/widgets/album/album_viewer_appbar.dart

@@ -1,3 +1,5 @@
+import 'dart:async';
+
 import 'package:auto_route/auto_route.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
@@ -57,7 +59,7 @@ class AlbumViewerAppbar extends HookConsumerWidget implements PreferredSizeWidge
     deleteAlbum() async {
       final bool success = await ref.watch(albumProvider.notifier).deleteAlbum(album);
 
-      context.navigateTo(const TabControllerRoute(children: [AlbumsRoute()]));
+      unawaited(context.navigateTo(const TabControllerRoute(children: [AlbumsRoute()])));
 
       if (!success) {
         ImmichToast.show(
@@ -105,7 +107,7 @@ class AlbumViewerAppbar extends HookConsumerWidget implements PreferredSizeWidge
       bool isSuccess = await ref.watch(albumProvider.notifier).leaveAlbum(album);
 
       if (isSuccess) {
-        context.navigateTo(const TabControllerRoute(children: [AlbumsRoute()]));
+        unawaited(context.navigateTo(const TabControllerRoute(children: [AlbumsRoute()])));
       } else {
         context.pop();
         ImmichToast.show(

mobile/lib/widgets/album/remote_album_shared_user_icons.dart

@@ -25,7 +25,7 @@ class RemoteAlbumSharedUserIcons extends ConsumerWidget {
         }
 
         return GestureDetector(
-          onTap: () => context.pushRoute(const DriftAlbumOptionsRoute()),
+          onTap: () => context.pushRoute(DriftAlbumOptionsRoute(album: currentAlbum)),
           child: SizedBox(
             height: 50,
             child: ListView.builder(