chore: undo unrelated button change

mobile/android/app/CMakeLists.txt

@@ -7,7 +7,6 @@ project(native_buffer LANGUAGES C)
 
 add_library(native_buffer SHARED
     src/main/cpp/native_buffer.c
-    src/main/cpp/native_image.c
 )
 
 target_link_libraries(native_buffer jnigraphics)

mobile/android/app/src/main/cpp/native_image.c

@@ -1,109 +0,0 @@
-#include <jni.h>
-#include <stdlib.h>
-#include <stdint.h>
-#include <android/bitmap.h>
-
-// Cache-friendly block size for the tiled rotation (in pixels). 32x32 uint32 = 4KB, fits L1.
-#define TILE 32
-
-// EXIF orientation values (androidx.exifinterface.media.ExifInterface.ORIENTATION_*).
-enum {
-  ORIENTATION_FLIP_HORIZONTAL = 2,
-  ORIENTATION_ROTATE_180 = 3,
-  ORIENTATION_FLIP_VERTICAL = 4,
-  ORIENTATION_TRANSPOSE = 5,
-  ORIENTATION_ROTATE_90 = 6,
-  ORIENTATION_TRANSVERSE = 7,
-  ORIENTATION_ROTATE_270 = 8,
-};
-
-// The orientations that swap width and height. Must stay in sync with affine_for's dim usage.
-static int swaps_dims(int o) {
-  return o == ORIENTATION_ROTATE_90 || o == ORIENTATION_ROTATE_270 ||
-         o == ORIENTATION_TRANSPOSE || o == ORIENTATION_TRANSVERSE;
-}
-
-// A source pixel (sx, sy) maps to destination index base + sx*stepX + sy*stepY, where dw is the
-// destination width. This affine form covers all 8 EXIF orientations and matches the pixel layout
-// of Bitmap.createBitmap(src, matrixForExifOrientation(o)). int64_t so it stays correct on
-// armeabi-v7a (32-bit long) regardless of how large MAX_RAW_DECODE_PIXELS grows.
-static void affine_for(int o, int sw, int sh, int dw, int64_t *base, int64_t *stepX, int64_t *stepY) {
-  switch (o) {
-    case ORIENTATION_ROTATE_90:       *base = sh - 1;                             *stepX = dw;  *stepY = -1;  break;
-    case ORIENTATION_ROTATE_270:      *base = (int64_t) (sw - 1) * dw;            *stepX = -dw; *stepY = 1;   break;
-    case ORIENTATION_ROTATE_180:      *base = (int64_t) (sh - 1) * dw + (sw - 1); *stepX = -1;  *stepY = -dw; break;
-    case ORIENTATION_FLIP_HORIZONTAL: *base = sw - 1;                             *stepX = -1;  *stepY = dw;  break;
-    case ORIENTATION_FLIP_VERTICAL:   *base = (int64_t) (sh - 1) * dw;            *stepX = 1;   *stepY = -dw; break;
-    case ORIENTATION_TRANSPOSE:       *base = 0;                                  *stepX = dw;  *stepY = 1;   break;
-    case ORIENTATION_TRANSVERSE:      *base = (int64_t) (sw - 1) * dw + (sh - 1); *stepX = -dw; *stepY = -1;  break;
-    default:                          *base = 0;                                  *stepX = 1;   *stepY = dw;  break;
-  }
-}
-
-// Copy each source pixel (whole uint32, so channel order/premult is irrelevant) to its rotated
-// destination, walking TILE x TILE blocks so the scattered writes of a 90/270 transpose stay
-// cache-resident. dst is densely packed (rowBytes == dw*4, no padding), which the affine math relies on.
-static void rotate_tiled(const uint8_t *src, int srcStride, uint32_t *dst,
-                         int sw, int sh, int64_t base, int64_t stepX, int64_t stepY) {
-  for (int ty = 0; ty < sh; ty += TILE) {
-    int yEnd = ty + TILE < sh ? ty + TILE : sh;
-    for (int tx = 0; tx < sw; tx += TILE) {
-      int xEnd = tx + TILE < sw ? tx + TILE : sw;
-      for (int sy = ty; sy < yEnd; sy++) {
-        const uint32_t *srcRow = (const uint32_t *) (src + (size_t) sy * srcStride);
-        int64_t idx = base + (int64_t) sy * stepY + (int64_t) tx * stepX;
-        for (int sx = tx; sx < xEnd; sx++) {
-          dst[idx] = srcRow[sx];
-          idx += stepX;
-        }
-      }
-    }
-  }
-}
-
-// Rotates an RGBA_8888 bitmap to the given EXIF orientation into a freshly malloc'd buffer (free it
-// via NativeBuffer.free). Fills outInfo with {width, height, rowBytes} and returns the buffer
-// address, or 0 if the bitmap can't be handled (e.g. a non-8888 format) so the caller can fall back.
-JNIEXPORT jlong JNICALL
-Java_app_alextran_immich_NativeImage_rotate(
-    JNIEnv *env, jclass clazz, jobject bitmap, jint orientation, jintArray outInfo) {
-  AndroidBitmapInfo info;
-  if (AndroidBitmap_getInfo(env, bitmap, &info) != ANDROID_BITMAP_RESULT_SUCCESS) {
-    return 0;
-  }
-  if (info.format != ANDROID_BITMAP_FORMAT_RGBA_8888) {
-    return 0;
-  }
-
-  int sw = (int) info.width;
-  int sh = (int) info.height;
-  int dw = swaps_dims(orientation) ? sh : sw;
-  int dh = swaps_dims(orientation) ? sw : sh;
-
-  uint32_t *dst = (uint32_t *) malloc((size_t) dw * dh * 4);
-  if (dst == NULL) {
-    return 0;
-  }
-
-  void *srcPixels = NULL;
-  if (AndroidBitmap_lockPixels(env, bitmap, &srcPixels) != ANDROID_BITMAP_RESULT_SUCCESS) {
-    free(dst);
-    return 0;
-  }
-
-  int64_t base, stepX, stepY;
-  affine_for(orientation, sw, sh, dw, &base, &stepX, &stepY);
-  rotate_tiled((const uint8_t *) srcPixels, (int) info.stride, dst, sw, sh, base, stepX, stepY);
-
-  AndroidBitmap_unlockPixels(env, bitmap);
-
-  jint dims[3] = {dw, dh, dw * 4};
-  (*env)->SetIntArrayRegion(env, outInfo, 0, 3, dims);
-  // Keep ownership in C until the buffer is safely handed back: if outInfo was somehow too small,
-  // SetIntArrayRegion left a pending exception and Kotlin will never receive (or free) dst.
-  if ((*env)->ExceptionCheck(env)) {
-    free(dst);
-    return 0;
-  }
-  return (jlong) dst;
-}

mobile/android/app/src/main/kotlin/app/alextran/immich/NativeImage.kt

@@ -1,19 +0,0 @@
-package app.alextran.immich
-
-import android.graphics.Bitmap
-
-object NativeImage {
-  init {
-    // rotate() is compiled into the native_buffer shared lib (which already links jnigraphics).
-    System.loadLibrary("native_buffer")
-  }
-
-  /**
-   * Rotates an RGBA_8888 [bitmap] to the given EXIF [orientation], writing the result into a freshly
-   * malloc'd native buffer. Returns the buffer address (free it with [NativeBuffer.free]) and fills
-   * [outInfo] with {width, height, rowBytes}. Returns 0 when the bitmap can't be handled (e.g. a
-   * non-8888 config) so the caller can fall back.
-   */
-  @JvmStatic
-  external fun rotate(bitmap: Bitmap, orientation: Int, outInfo: IntArray): Long
-}

mobile/android/app/src/main/kotlin/app/alextran/immich/images/LocalImagesImpl.kt

@@ -12,9 +12,7 @@ import android.provider.MediaStore.Images
 import android.provider.MediaStore.Video
 import android.util.Size
 import androidx.annotation.RequiresApi
-import androidx.exifinterface.media.ExifInterface
 import app.alextran.immich.NativeBuffer
-import app.alextran.immich.NativeImage
 import kotlin.math.*
 import java.io.IOException
 import java.util.concurrent.Executors
@@ -183,88 +181,35 @@ class LocalImagesImpl(context: Context) : LocalImageApi {
     val id = assetId.toLong()
 
     signal.throwIfCanceled()
+    val bitmap = if (isVideo) {
+      decodeVideoThumbnail(id, size, signal)
+    } else {
+      decodeImage(id, size, signal)
+    }
+
     try {
-      val res = if (isVideo) {
-        decodeVideoThumbnail(id, size, signal).toNativeBuffer()
-      } else {
-        val (bitmap, orientation) = decodeImage(id, size, signal)
-        signal.throwIfCanceled()
-        if (orientation == ExifInterface.ORIENTATION_NORMAL || orientation == ExifInterface.ORIENTATION_UNDEFINED) {
-          bitmap.toNativeBuffer()
-        } else {
-          rotateToNativeBuffer(bitmap, orientation, signal)
-        }
-      }
-      // Don't re-check cancellation here: res owns a malloc'd buffer, and bailing to CANCELLED would
-      // orphan it. Deliver it; Dart frees the buffer itself if the request was cancelled meanwhile.
+      signal.throwIfCanceled()
+      val res = bitmap.toNativeBuffer()
+      signal.throwIfCanceled()
       callback(Result.success(res))
     } catch (e: Exception) {
       callback(if (e is OperationCanceledException) CANCELLED else Result.failure(e))
     }
   }
 
-  // Returns the decoded bitmap plus the EXIF orientation that still needs applying. Only Q+ raw
-  // decodes come back unrotated (ImageDecoder / loadThumbnail skip EXIF for raw like DNG); every
-  // other path already orients itself, so it reports ORIENTATION_NORMAL.
-  private fun decodeImage(id: Long, size: Size, signal: CancellationSignal): Pair<Bitmap, Int> {
+  private fun decodeImage(id: Long, size: Size, signal: CancellationSignal): Bitmap {
     signal.throwIfCanceled()
     val uri = ContentUris.withAppendedId(Images.Media.EXTERNAL_CONTENT_URI, id)
-    val handleRaw = Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q && isRawMime(uri)
-    val orientation = if (handleRaw) rawOrientation(uri) else ExifInterface.ORIENTATION_NORMAL
-
     if (size.width <= 0 || size.height <= 0 || size.width > 768 || size.height > 768) {
-      // A "load original" request is unsized -> a full-res decode (a sized > 768 just samples to target).
-      return decodeSource(uri, size, signal) to orientation
+      return decodeSource(uri, size, signal)
     }
 
-    val bitmap = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+    return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
       resolver.loadThumbnail(uri, size, signal)
     } else {
       signal.setOnCancelListener { Images.Thumbnails.cancelThumbnailRequest(resolver, id) }
       Images.Thumbnails.getThumbnail(resolver, id, Images.Thumbnails.MINI_KIND, OPTIONS)
     }
-    return bitmap to orientation
-  }
-
-  private fun isRawMime(uri: Uri): Boolean {
-    val mime = resolver.getType(uri) ?: return false
-    return mime.startsWith("image/x-") || mime == "image/dng"
-  }
-
-  private fun rawOrientation(uri: Uri): Int {
-    return resolver.openInputStream(uri)?.use {
-      ExifInterface(it).getAttributeInt(ExifInterface.TAG_ORIENTATION, ExifInterface.ORIENTATION_NORMAL)
-    } ?: ExifInterface.ORIENTATION_NORMAL
-  }
-
-  // ImageDecoder / loadThumbnail skip EXIF orientation for raw (e.g. DNG) on Q+, so the decoded
-  // bitmap comes back unrotated. Rotate it into the output buffer in native code (one pass, no
-  // intermediate rotated bitmap).
-  private fun rotateToNativeBuffer(bitmap: Bitmap, orientation: Int, signal: CancellationSignal): Map<String, Long> {
-    signal.throwIfCanceled()
-    // Force ARGB_8888: the native rotate needs a lockable 8888 buffer, and toNativeBuffer() below
-    // allocates width*height*4 (an F16/HDR decode would otherwise under-allocate). No-op for the
-    // common already-8888 case.
-    val src = if (bitmap.config != Bitmap.Config.ARGB_8888) {
-      val converted = bitmap.copy(Bitmap.Config.ARGB_8888, false)
-      bitmap.recycle()
-      converted ?: throw IOException("could not convert bitmap to ARGB_8888")
-    } else {
-      bitmap
-    }
-    try {
-      val info = IntArray(3)
-      val pointer = NativeImage.rotate(src, orientation, info)
-      if (pointer == 0L) throw IOException("native rotate failed for orientation $orientation")
-      return mapOf(
-        "pointer" to pointer,
-        "width" to info[0].toLong(),
-        "height" to info[1].toLong(),
-        "rowBytes" to info[2].toLong()
-      )
-    } finally {
-      if (!src.isRecycled) src.recycle()
-    }
   }
 
   private fun decodeVideoThumbnail(id: Long, target: Size, signal: CancellationSignal): Bitmap {

mobile/lib/constants/enums.dart

@@ -9,6 +9,8 @@ enum SortOrder {
 
 enum TextSearchType { context, filename, description, ocr }
 
+enum AssetVisibilityEnum { timeline, hidden, archive, locked }
+
 enum ActionSource { timeline, viewer }
 
 enum ShareAssetType { original, preview }

mobile/lib/domain/models/asset/remote_asset.model.dart

@@ -52,8 +52,6 @@ class RemoteAsset extends BaseAsset {
 
   bool get isTrashed => deletedAt != null;
 
-  bool get isStacked => stackId != null;
-
   @override
   String toString() {
     return '''Asset {

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

@@ -10,7 +10,6 @@ import 'package:immich_mobile/infrastructure/entities/remote_asset.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/remote_asset.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/stack.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
-import 'package:immich_mobile/utils/option.dart';
 import 'package:maplibre_gl/maplibre_gl.dart';
 
 class RemoteAssetRepository extends DriftDatabaseRepository {
@@ -287,20 +286,4 @@ class RemoteAssetRepository extends DriftDatabaseRepository {
       ..orderBy([(row) => OrderingTerm.asc(row.sequence)]);
     return query.map((row) => row.toDto()!).get();
   }
-
-  Future<void> update(
-    List<String> remoteIds, {
-    Option<bool> isFavorite = const .none(),
-    Option<AssetVisibility> visibility = const .none(),
-  }) {
-    final companion = RemoteAssetEntityCompanion(
-      visibility: visibility.toDriftValue(),
-      isFavorite: isFavorite.toDriftValue(),
-    );
-    return _db.batch((batch) {
-      for (final remoteId in remoteIds) {
-        batch.update(_db.remoteAssetEntity, companion, where: (e) => e.id.equals(remoteId));
-      }
-    });
-  }
 }

mobile/lib/presentation/actions/favorite.action.dart

@@ -3,29 +3,25 @@ import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/generated/translations.g.dart';
 import 'package:immich_mobile/presentation/actions/action.dart';
 import 'package:immich_mobile/providers/infrastructure/asset.provider.dart';
-import 'package:immich_mobile/utils/asset_filter.dart';
 import 'package:immich_ui/immich_ui.dart';
 
 class FavoriteAction extends AssetAction<RemoteAsset> {
-  final bool favorite;
+  final bool shouldFavorite;
 
-  FavoriteAction({required super.assets}) : favorite = assets.any((asset) => !asset.isFavorite);
+  FavoriteAction({required super.assets}) : shouldFavorite = assets.any((asset) => !asset.isFavorite);
 
   @override
-  IconData get icon => favorite ? Icons.favorite_border_rounded : Icons.favorite_rounded;
+  IconData get icon => shouldFavorite ? Icons.favorite_border_rounded : Icons.favorite_rounded;
 
   @override
-  String label(ActionScope scope) => favorite ? scope.context.t.favorite : scope.context.t.unfavorite;
+  String label(ActionScope scope) => shouldFavorite ? scope.context.t.favorite : scope.context.t.unfavorite;
 
   @override
-  Iterable<RemoteAsset> filter(ActionScope scope) {
-    final owned = AssetFilter(assets).owned(scope.authUser.id);
-    if (favorite) {
-      return owned.notFavorites();
-    } else {
-      return owned.favorites();
-    }
-  }
+  Iterable<RemoteAsset> filter(ActionScope scope) => assets
+      .where(
+        (asset) => asset is RemoteAsset && asset.ownerId == scope.authUser.id && asset.isFavorite == !shouldFavorite,
+      )
+      .cast<RemoteAsset>();
 
   @override
   bool isVisible(ActionScope scope) => filter(scope).isNotEmpty;
@@ -35,8 +31,8 @@ class FavoriteAction extends AssetAction<RemoteAsset> {
     final ActionScope(:ref) = scope;
     final assets = filter(scope).map((asset) => asset.id).toList(growable: false);
 
-    await ref.read(assetServiceProvider).updateFavorite(assets, favorite);
-    final message = favorite
+    await ref.read(assetServiceProvider).updateFavorite(assets, shouldFavorite);
+    final message = shouldFavorite
         ? StaticTranslations.instance.favorite_action_prompt(count: assets.length)
         : StaticTranslations.instance.unfavorite_action_prompt(count: assets.length);
     snackbar.success(message);

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

@@ -1,4 +0,0 @@
-import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/repositories/toast.repository.dart';
-
-final toastRepositoryProvider = Provider<ToastRepository>((ref) => const .new());

mobile/lib/repositories/asset_api.repository.dart

@@ -1,14 +1,12 @@
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:http/http.dart';
-import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
+import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/domain/models/asset_edit.model.dart' hide AssetEditAction;
 import 'package:immich_mobile/domain/models/stack.model.dart';
 import 'package:immich_mobile/providers/api.provider.dart';
 import 'package:immich_mobile/repositories/api.repository.dart';
-import 'package:immich_mobile/utils/option.dart';
 import 'package:maplibre_gl/maplibre_gl.dart';
-import 'package:openapi/api.dart' as api show AssetVisibility;
-import 'package:openapi/api.dart' hide AssetVisibility;
+import 'package:openapi/api.dart';
 
 final assetApiRepositoryProvider = Provider(
   (ref) => AssetApiRepository(
@@ -43,7 +41,7 @@ class AssetApiRepository extends ApiRepository {
     return response?.count ?? 0;
   }
 
-  Future<void> updateVisibility(List<String> ids, AssetVisibility visibility) async {
+  Future<void> updateVisibility(List<String> ids, AssetVisibilityEnum visibility) async {
     return _api.updateAssets(AssetBulkUpdateDto(ids: ids, visibility: Optional.present(_mapVisibility(visibility))));
   }
 
@@ -79,11 +77,11 @@ class AssetApiRepository extends ApiRepository {
     return _api.downloadAssetWithHttpInfo(id, edited: edited);
   }
 
-  api.AssetVisibility _mapVisibility(AssetVisibility visibility) => switch (visibility) {
-    AssetVisibility.timeline => api.AssetVisibility.timeline,
-    AssetVisibility.hidden => api.AssetVisibility.hidden,
-    AssetVisibility.locked => api.AssetVisibility.locked,
-    AssetVisibility.archive => api.AssetVisibility.archive,
+  _mapVisibility(AssetVisibilityEnum visibility) => switch (visibility) {
+    AssetVisibilityEnum.timeline => AssetVisibility.timeline,
+    AssetVisibilityEnum.hidden => AssetVisibility.hidden,
+    AssetVisibilityEnum.locked => AssetVisibility.locked,
+    AssetVisibilityEnum.archive => AssetVisibility.archive,
   };
 
   Future<String?> getAssetMIMEType(String assetId) async {
@@ -108,20 +106,6 @@ class AssetApiRepository extends ApiRepository {
   Future<void> removeEdits(String assetId) async {
     return _api.removeAssetEdits(assetId);
   }
-
-  Future<void> update(
-    List<String> remoteIds, {
-    Option<bool> isFavorite = const .none(),
-    Option<AssetVisibility> visibility = const .none(),
-  }) {
-    return _api.updateAssets(
-      AssetBulkUpdateDto(
-        ids: remoteIds,
-        isFavorite: isFavorite.toOptional(),
-        visibility: visibility.map(_mapVisibility).toOptional(),
-      ),
-    );
-  }
 }
 
 extension on StackResponseDto {

mobile/lib/repositories/toast.repository.dart

@@ -1,26 +0,0 @@
-import 'dart:async';
-
-import 'package:immich_ui/immich_ui.dart';
-
-class ToastOption {
-  final Duration? timeout;
-  final FutureOr<void> Function()? onUndo;
-
-  const ToastOption({this.timeout, this.onUndo});
-}
-
-class ToastRepository {
-  const ToastRepository();
-
-  FutureOr<void> success(String message, {ToastOption? toast}) {
-    snackbar.success(message, duration: toast?.timeout);
-  }
-
-  FutureOr<void> info(String message, {ToastOption? toast}) {
-    snackbar.info(message, duration: toast?.timeout);
-  }
-
-  FutureOr<void> error(String message, {ToastOption? toast}) {
-    snackbar.error(message, duration: toast?.timeout);
-  }
-}

mobile/lib/services/action.service.dart

@@ -79,17 +79,17 @@ class ActionService {
   }
 
   Future<void> archive(List<String> remoteIds) async {
-    await _assetApiRepository.updateVisibility(remoteIds, .archive);
+    await _assetApiRepository.updateVisibility(remoteIds, AssetVisibilityEnum.archive);
     await _remoteAssetRepository.updateVisibility(remoteIds, AssetVisibility.archive);
   }
 
   Future<void> unArchive(List<String> remoteIds) async {
-    await _assetApiRepository.updateVisibility(remoteIds, .timeline);
+    await _assetApiRepository.updateVisibility(remoteIds, AssetVisibilityEnum.timeline);
     await _remoteAssetRepository.updateVisibility(remoteIds, AssetVisibility.timeline);
   }
 
   Future<void> moveToLockFolder(List<String> remoteIds, List<String> localIds) async {
-    await _assetApiRepository.updateVisibility(remoteIds, .locked);
+    await _assetApiRepository.updateVisibility(remoteIds, AssetVisibilityEnum.locked);
     await _remoteAssetRepository.updateVisibility(remoteIds, AssetVisibility.locked);
 
     // Ask user if they want to delete local copies
@@ -99,7 +99,7 @@ class ActionService {
   }
 
   Future<void> removeFromLockFolder(List<String> remoteIds) async {
-    await _assetApiRepository.updateVisibility(remoteIds, .timeline);
+    await _assetApiRepository.updateVisibility(remoteIds, AssetVisibilityEnum.timeline);
     await _remoteAssetRepository.updateVisibility(remoteIds, AssetVisibility.timeline);
   }
 

mobile/lib/utils/asset_filter.dart

@@ -1,28 +0,0 @@
-import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
-
-extension type const AssetFilter<T extends BaseAsset>(Iterable<T> assets) implements Iterable<T> {
-  AssetFilter<T> where(bool Function(T asset) test) => AssetFilter(assets.where(test));
-  AssetFilter<T> whereNot(bool Function(T asset) test) => AssetFilter(assets.where((asset) => !test(asset)));
-
-  AssetFilter<T> type(AssetType type) => where((asset) => asset.type == type);
-  AssetFilter<T> favorites() => where(_isFavorite);
-  AssetFilter<T> notFavorites() => whereNot(_isFavorite);
-
-  AssetFilter<RemoteAsset> remote() => AssetFilter(assets.whereType<RemoteAsset>());
-  AssetFilter<RemoteAsset> owned(String ownerId) => remote().where((asset) => asset.ownerId == ownerId);
-  AssetFilter<RemoteAsset> visibility(AssetVisibility visibility) => remote().where(_hasVisibility(visibility));
-  AssetFilter<RemoteAsset> notVisibility(AssetVisibility visibility) => remote().whereNot(_hasVisibility(visibility));
-  AssetFilter<RemoteAsset> archived() => visibility(.archive);
-  AssetFilter<RemoteAsset> notArchived() => notVisibility(.archive);
-  AssetFilter<RemoteAsset> stacked() => remote().where(_isStacked);
-  AssetFilter<RemoteAsset> notStacked() => remote().whereNot(_isStacked);
-
-  AssetFilter<LocalAsset> local() => AssetFilter(assets.whereType<LocalAsset>());
-  AssetFilter<LocalAsset> backedUp() => local().where(_isBackedUp);
-}
-
-bool _isFavorite(BaseAsset asset) => asset.isFavorite;
-bool _isStacked(RemoteAsset asset) => asset.isStacked;
-bool _isBackedUp(LocalAsset asset) => asset.remoteAssetId != null;
-bool Function(RemoteAsset asset) _hasVisibility(AssetVisibility visibility) =>
-    (asset) => asset.visibility == visibility;

mobile/lib/utils/option.dart

@@ -1,4 +1,3 @@
-import 'package:drift/drift.dart';
 import 'package:openapi/api.dart' show Optional;
 
 sealed class Option<T> {
@@ -22,11 +21,6 @@ sealed class Option<T> {
     None() => null,
   };
 
-  Option<U> map<U>(U Function(T value) f) => switch (this) {
-    Some(:final value) => Some(f(value)),
-    None() => None<U>(),
-  };
-
   U fold<U>(U Function(T value) onSome, U Function() onNone) => switch (this) {
     Some(:final value) => onSome(value),
     None() => onNone(),
@@ -71,10 +65,3 @@ extension OptionToOptional<T> on Option<T> {
     Some(:final value) => Optional.present(value),
   };
 }
-
-extension OptionToDriftValue<T> on Option<T> {
-  Value<T> toDriftValue() => switch (this) {
-    Some(:final value) => Value(value),
-    None() => const Value.absent(),
-  };
-}

mobile/packages/ui/lib/src/snackbar.dart

@@ -6,23 +6,18 @@ final scaffoldMessengerKey = GlobalKey<ScaffoldMessengerState>();
 class SnackbarManager {
   const SnackbarManager();
 
-  ScaffoldFeatureController<SnackBar, SnackBarClosedReason>? show(
-    String message,
-    SnackbarType type, {
-    Duration? duration,
-  }) {
+  ScaffoldFeatureController<SnackBar, SnackBarClosedReason>? show(String message, SnackbarType type) {
     final messenger = scaffoldMessengerKey.currentState;
     final context = scaffoldMessengerKey.currentContext;
     if (messenger == null || context == null) {
       return null;
     }
 
-    duration ??= const .new(seconds: 4);
     messenger.hideCurrentSnackBar();
-    return messenger.showSnackBar(_build(context, message, type, duration));
+    return messenger.showSnackBar(_build(context, message, type));
   }
 
-  SnackBar _build(BuildContext context, String message, SnackbarType type, Duration duration) {
+  SnackBar _build(BuildContext context, String message, SnackbarType type) {
     final theme = Theme.of(context);
     final colors = theme.extension<ImmichColors>() ?? ImmichColors.harmonized(theme.colorScheme);
     final (IconData icon, Color background, Color foreground) = switch (type) {
@@ -34,7 +29,7 @@ class SnackbarManager {
     return SnackBar(
       behavior: .floating,
       backgroundColor: background,
-      duration: duration,
+      duration: const .new(seconds: 4),
       shape: const RoundedRectangleBorder(borderRadius: .all(.circular(ImmichRadius.sm))),
       content: Row(
         children: [
@@ -53,14 +48,11 @@ class SnackbarManager {
     );
   }
 
-  ScaffoldFeatureController<SnackBar, SnackBarClosedReason>? info(String message, {Duration? duration}) =>
-      show(message, .info, duration: duration);
+  ScaffoldFeatureController<SnackBar, SnackBarClosedReason>? info(String message) => show(message, .info);
 
-  ScaffoldFeatureController<SnackBar, SnackBarClosedReason>? success(String message, {Duration? duration}) =>
-      show(message, .success, duration: duration);
+  ScaffoldFeatureController<SnackBar, SnackBarClosedReason>? success(String message) => show(message, .success);
 
-  ScaffoldFeatureController<SnackBar, SnackBarClosedReason>? error(String message, {Duration? duration}) =>
-      show(message, .error, duration: duration);
+  ScaffoldFeatureController<SnackBar, SnackBarClosedReason>? error(String message) => show(message, .error);
 }
 
 const snackbar = SnackbarManager();

mobile/test/flutter_test_config.dart

@@ -1,13 +0,0 @@
-import 'dart:async';
-
-import 'package:easy_localization/easy_localization.dart';
-import 'package:flutter/foundation.dart';
-import 'package:logging/logging.dart';
-
-Future<void> testExecutable(FutureOr<void> Function() testMain) async {
-  Logger.root.level = Level.OFF;
-  EasyLocalization.logger.enableBuildModes = [];
-  // ignore: banned-usage
-  debugPrint = (String? message, {int? wrapWidth}) {};
-  return testMain();
-}

mobile/test/modules/map/map_theme_override_test.dart

@@ -1,4 +1,5 @@
 @Skip('Flaky test, needs investigation')
+@Tags(['widget'])
 library;
 
 import 'package:drift/drift.dart';

mobile/test/unit/factories/remote_asset_factory.dart

@@ -5,14 +5,7 @@ import '../../utils.dart';
 class RemoteAssetFactory {
   const RemoteAssetFactory();
 
-  static RemoteAsset create({
-    String? id,
-    String? name,
-    String? ownerId,
-    bool isFavorite = false,
-    AssetVisibility visibility = AssetVisibility.timeline,
-    String? stackId,
-  }) {
+  static RemoteAsset create({String? id, String? name, String? ownerId, bool isFavorite = false}) {
     id = TestUtils.uuid(id);
 
     return RemoteAsset(
@@ -24,8 +17,6 @@ class RemoteAssetFactory {
       createdAt: TestUtils.yesterday(),
       updatedAt: TestUtils.now(),
       isFavorite: isFavorite,
-      visibility: visibility,
-      stackId: stackId,
       isEdited: false,
     );
   }

mobile/test/unit/mocks.dart

@@ -1,10 +1,7 @@
 import 'dart:typed_data';
 
 import 'package:immich_mobile/constants/enums.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/models/user.model.dart';
-import 'package:immich_mobile/platform/native_sync_api.g.dart';
 import 'package:mocktail/mocktail.dart' as mock;
 import 'package:mocktail/mocktail.dart';
 
@@ -15,11 +12,11 @@ import 'factories/local_asset_factory.dart';
 import 'factories/user_factory.dart';
 
 class RepositoryMocks {
-  final localAlbum = LocalAlbumRepositoryStub(MockLocalAlbumRepository());
-  final localAsset = LocalAssetRepositoryStub(MockDriftLocalAssetRepository());
+  final localAlbum = MockLocalAlbumRepository();
+  final localAsset = MockDriftLocalAssetRepository();
   final trashedAsset = MockTrashedLocalAssetRepository();
 
-  final nativeApi = NativeSyncApiStub(MockNativeSyncApi());
+  final nativeApi = MockNativeSyncApi();
 
   RepositoryMocks() {
     resetAll();
@@ -27,34 +24,17 @@ class RepositoryMocks {
 
   void resetAll() {
     _registerFallbacks();
-    localAlbum.reset();
-    localAsset.reset();
+    reset(localAlbum);
+    reset(localAsset);
     reset(trashedAsset);
-    nativeApi.reset();
-    _stubLocalAlbumRepository();
-    _stubLocalAssetRepository();
-    _stubNativeSyncApi();
-  }
-
-  void _stubLocalAlbumRepository() {
-    when(localAlbum.getBackupAlbums).thenAnswer((_) async => []);
-    when(localAlbum.getAssetsToHash).thenAnswer((_) async => []);
-  }
-
-  void _stubLocalAssetRepository() {
-    when(localAsset.reconcileHashesFromCloudId).thenAnswer((_) async => {});
-    when(localAsset.updateHashes).thenAnswer((_) async => {});
-  }
-
-  void _stubNativeSyncApi() {
-    when(nativeApi.hashAssets).thenAnswer((_) async => []);
+    reset(nativeApi);
   }
 }
 
 class ServiceMocks {
-  final partner = PartnerServiceStub(MockPartnerService());
-  final user = UserServiceStub(MockUserService());
-  final asset = AssetServiceStub(MockAssetService());
+  final PartnerStub partner = PartnerStub(MockPartnerService());
+  final UserStub user = UserStub(MockUserService());
+  final asset = AssetStub(MockAssetService());
 
   ServiceMocks() {
     resetAll();
@@ -98,28 +78,11 @@ void _registerFallbacks() {
   registerFallbackValue(Uint8List(0));
 }
 
-extension type const Stub<T extends Mock>(T mockedClass) {
-  void reset() => mock.reset(mockedClass);
+extension type const Stub<T extends Mock>(T mockedService) {
+  void reset() => mock.reset(mockedService);
 }
 
-extension type const LocalAlbumRepositoryStub(MockLocalAlbumRepository repo) implements Stub<MockLocalAlbumRepository> {
-  Future<List<LocalAlbum>> Function() get getBackupAlbums =>
-      () => repo.getBackupAlbums();
-
-  Future<List<LocalAsset>> Function() get getAssetsToHash =>
-      () => repo.getAssetsToHash(any());
-}
-
-extension type const LocalAssetRepositoryStub(MockDriftLocalAssetRepository repo)
-    implements Stub<MockDriftLocalAssetRepository> {
-  Future<void> Function() get reconcileHashesFromCloudId =>
-      () => repo.reconcileHashesFromCloudId();
-
-  Future<void> Function() get updateHashes =>
-      () => repo.updateHashes(any());
-}
-
-extension type const PartnerServiceStub(MockPartnerService service) implements Stub<MockPartnerService> {
+extension type const PartnerStub(MockPartnerService service) implements Stub<MockPartnerService> {
   Stream<Iterable<User>> Function() get getCandidates =>
       () => service.getCandidates(any());
 
@@ -147,7 +110,7 @@ extension type const PartnerServiceStub(MockPartnerService service) implements S
       );
 }
 
-extension type const UserServiceStub(MockUserService service) implements Stub<MockUserService> {
+extension type const UserStub(MockUserService service) implements Stub<MockUserService> {
   UserDto Function() get getMyUser =>
       () => service.getMyUser();
 
@@ -164,12 +127,7 @@ extension type const UserServiceStub(MockUserService service) implements Stub<Mo
       () => service.createProfileImage(any(), any());
 }
 
-extension type const AssetServiceStub(MockAssetService service) implements Stub<MockAssetService> {
+extension type const AssetStub(MockAssetService service) implements Stub<MockAssetService> {
   Future<void> Function() get updateFavorite =>
       () => service.updateFavorite(any(), any());
 }
-
-extension type const NativeSyncApiStub(MockNativeSyncApi api) implements Stub<MockNativeSyncApi> {
-  Future<List<HashResult>> Function() get hashAssets =>
-      () => api.hashAssets(any(), allowNetworkAccess: any(named: 'allowNetworkAccess'));
-}

mobile/test/unit/presentation/actions/asset_debug_action_test.dart

@@ -6,7 +6,7 @@ import 'package:immich_mobile/presentation/actions/asset_debug.action.dart';
 import 'package:immich_ui/immich_ui.dart';
 
 import '../../factories/remote_asset_factory.dart';
-import '../presentation_context.dart';
+import '../../presentation_context.dart';
 
 void main() {
   late PresentationContext context;
@@ -23,8 +23,8 @@ void main() {
   group('AssetDebugAction', () {
     testWidgets('visible for a single asset when advanced troubleshooting is on', (tester) async {
       await tester.pumpTestWidget(
-        context,
         ActionIconButtonWidget(action: AssetDebugAction(assets: [RemoteAssetFactory.create()])),
+        overrides: context.overrides,
       );
 
       expect(find.byType(ImmichIconButton), findsOneWidget);
@@ -32,10 +32,10 @@ void main() {
 
     testWidgets('hidden for multiple assets', (tester) async {
       await tester.pumpTestWidget(
-        context,
         ActionIconButtonWidget(
           action: AssetDebugAction(assets: [RemoteAssetFactory.create(), RemoteAssetFactory.create()]),
         ),
+        overrides: context.overrides,
       );
 
       expect(find.byType(ImmichIconButton), findsNothing);
@@ -44,8 +44,8 @@ void main() {
     testWidgets('hidden when advanced troubleshooting is off', (tester) async {
       await StoreService.I.put(StoreKey.advancedTroubleshooting, false);
       await tester.pumpTestWidget(
-        context,
         ActionIconButtonWidget(action: AssetDebugAction(assets: [RemoteAssetFactory.create()])),
+        overrides: context.overrides,
       );
 
       expect(find.byType(ImmichIconButton), findsNothing);

mobile/test/unit/presentation/actions/favorite_action_test.dart

@@ -1,26 +1,30 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/presentation/actions/favorite.action.dart';
+import 'package:immich_mobile/providers/infrastructure/asset.provider.dart';
 import 'package:mocktail/mocktail.dart';
 
-import '../../../domain/service.mock.dart';
 import '../../factories/remote_asset_factory.dart';
-import '../presentation_context.dart';
+import '../../presentation_context.dart';
 
 void main() {
   late PresentationContext context;
-  late MockAssetService assetService;
 
   setUp(() async {
     context = await PresentationContext.create();
-    assetService = context.service.asset.service;
   });
 
   tearDown(() {
     context.dispose();
   });
 
+  List<Override> overrides() => [
+    ...context.overrides,
+    assetServiceProvider.overrideWithValue(context.mocks.asset.service),
+  ];
+
   RemoteAsset owned({bool isFavorite = false}) =>
       RemoteAssetFactory.create(ownerId: context.currentUser.id, isFavorite: isFavorite);
 
@@ -28,48 +32,48 @@ void main() {
     testWidgets('favorites the eligible owned assets', (tester) async {
       final asset = owned();
 
-      await tester.pumpTestAction(context, FavoriteAction(assets: [asset]));
+      await tester.pumpTestAction(FavoriteAction(assets: [asset]), overrides: overrides());
 
-      verify(() => assetService.updateFavorite([asset.id], true)).called(1);
+      verify(() => context.mocks.asset.service.updateFavorite([asset.id], true)).called(1);
     });
 
     testWidgets('unfavorite the eligible owned assets', (tester) async {
       final asset = owned(isFavorite: true);
 
-      await tester.pumpTestAction(context, FavoriteAction(assets: [asset]));
+      await tester.pumpTestAction(FavoriteAction(assets: [asset]), overrides: overrides());
 
-      verify(() => assetService.updateFavorite([asset.id], false)).called(1);
+      verify(() => context.mocks.asset.service.updateFavorite([asset.id], false)).called(1);
     });
 
     testWidgets('ignores assets owned by someone else', (tester) async {
       final mine = owned();
       final theirs = RemoteAssetFactory.create();
 
-      await tester.pumpTestAction(context, FavoriteAction(assets: [mine, theirs]));
+      await tester.pumpTestAction(FavoriteAction(assets: [mine, theirs]), overrides: overrides());
 
-      verify(() => assetService.updateFavorite([mine.id], true)).called(1);
+      verify(() => context.mocks.asset.service.updateFavorite([mine.id], true)).called(1);
     });
 
     testWidgets('batches every eligible owned asset into a single call', (tester) async {
       final first = owned();
       final second = owned();
 
-      await tester.pumpTestAction(context, FavoriteAction(assets: [first, second]));
+      await tester.pumpTestAction(FavoriteAction(assets: [first, second]), overrides: overrides());
 
-      verify(() => assetService.updateFavorite([first.id, second.id], true)).called(1);
+      verify(() => context.mocks.asset.service.updateFavorite([first.id, second.id], true)).called(1);
     });
 
     testWidgets('skips owned assets already in the target state', (tester) async {
       final stale = owned();
       final alreadyFavorite = owned(isFavorite: true);
 
-      await tester.pumpTestAction(context, FavoriteAction(assets: [stale, alreadyFavorite]));
+      await tester.pumpTestAction(FavoriteAction(assets: [stale, alreadyFavorite]), overrides: overrides());
 
-      verify(() => assetService.updateFavorite([stale.id], true)).called(1);
+      verify(() => context.mocks.asset.service.updateFavorite([stale.id], true)).called(1);
     });
 
     testWidgets('shows a confirmation snackbar on success', (tester) async {
-      await tester.pumpTestAction(context, FavoriteAction(assets: [owned()]));
+      await tester.pumpTestAction(FavoriteAction(assets: [owned()]), overrides: overrides());
       await tester.pumpUntilFound(find.byType(SnackBar));
 
       expect(find.byType(SnackBar), findsOneWidget);

mobile/test/unit/presentation/actions/partner_action_test.dart

@@ -4,19 +4,17 @@ import 'package:flutter_test/flutter_test.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/user.model.dart';
 import 'package:immich_mobile/presentation/actions/partner.action.dart';
+import 'package:immich_mobile/providers/infrastructure/user.provider.dart';
 import 'package:mocktail/mocktail.dart';
 
-import '../../../domain/service.mock.dart';
 import '../../factories/user_factory.dart';
-import '../presentation_context.dart';
+import '../../presentation_context.dart';
 
 void main() {
   late PresentationContext context;
-  late MockPartnerService partnerService;
 
   setUp(() async {
     context = await PresentationContext.create();
-    partnerService = context.service.partner.service;
   });
 
   tearDown(() {
@@ -24,6 +22,8 @@ void main() {
   });
 
   List<Override> overrides({List<User> candidates = const []}) => [
+    ...context.overrides,
+    partnerServiceProvider.overrideWithValue(context.mocks.partner.service),
     candidatesStateProvider.overrideWith((ref) => Stream<Iterable<User>>.value(candidates)),
   ];
 
@@ -31,24 +31,22 @@ void main() {
     testWidgets('creates a partner for the selected candidate', (tester) async {
       final candidate = UserFactory.create();
 
-      await tester.pumpTestAction(context, const PartnerAddAction(), overrides: overrides(candidates: [candidate]));
+      await tester.pumpTestAction(const PartnerAddAction(), overrides: overrides(candidates: [candidate]));
       await tester.pumpUntilFound(find.text(candidate.name));
       await tester.tap(find.text(candidate.name));
       await tester.pumpAndSettle();
 
-      verify(() => partnerService.create(sharedById: context.currentUser.id, sharedWithId: candidate.id)).called(1);
+      verify(
+        () => context.mocks.partner.service.create(sharedById: context.currentUser.id, sharedWithId: candidate.id),
+      ).called(1);
     });
 
     testWidgets('creates nothing when the selection dialog is dismissed', (tester) async {
-      await tester.pumpTestAction(
-        context,
-        const PartnerAddAction(),
-        overrides: overrides(candidates: [UserFactory.create()]),
-      );
+      await tester.pumpTestAction(const PartnerAddAction(), overrides: overrides(candidates: [UserFactory.create()]));
       await tester.sendKeyEvent(LogicalKeyboardKey.escape); // dismiss without selecting
       await tester.pumpAndSettle();
 
-      verifyNever(context.service.partner.create);
+      verifyNever(context.mocks.partner.create);
     });
   });
 
@@ -56,27 +54,27 @@ void main() {
     testWidgets('deletes the partner after confirmation', (tester) async {
       final partner = UserFactory.create();
       await tester.pumpTestAction(
-        context,
         PartnerRemoveAction(sharedWithId: partner.id, partnerName: partner.name),
         overrides: overrides(),
       );
       await tester.tap(find.byType(TextButton).last); // confirm
       await tester.pumpAndSettle();
 
-      verify(() => partnerService.delete(sharedById: context.currentUser.id, sharedWithId: partner.id)).called(1);
+      verify(
+        () => context.mocks.partner.service.delete(sharedById: context.currentUser.id, sharedWithId: partner.id),
+      ).called(1);
     });
 
     testWidgets('deletes nothing when the confirmation is cancelled', (tester) async {
       final partner = UserFactory.create();
       await tester.pumpTestAction(
-        context,
         PartnerRemoveAction(sharedWithId: partner.id, partnerName: partner.name),
         overrides: overrides(),
       );
       await tester.tap(find.byType(TextButton).first); // cancel
       await tester.pumpAndSettle();
 
-      verifyNever(context.service.partner.delete);
+      verifyNever(context.mocks.partner.delete);
     });
   });
 }

mobile/test/unit/presentation/actions/timeline_action_test.dart

@@ -7,7 +7,7 @@ import 'package:immich_mobile/presentation/actions/timeline.action.dart';
 import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
 
 import '../../factories/remote_asset_factory.dart';
-import '../presentation_context.dart';
+import '../../presentation_context.dart';
 
 class _FakeAction extends BaseAction {
   _FakeAction({this.visible = true, this.error});
@@ -48,7 +48,8 @@ void main() {
     context.dispose();
   });
 
-  List<Override> overrides() => [
+  List<Override> seededOverrides() => [
+    ...context.overrides,
     multiSelectProvider.overrideWith(
       () => MultiSelectNotifier(
         MultiSelectState(selectedAssets: {RemoteAssetFactory.create()}, lockedSelectionAssets: const {}),
@@ -60,7 +61,6 @@ void main() {
     late ActionScope scope;
     late ProviderContainer container;
     await tester.pumpTestWidget(
-      context,
       Consumer(
         builder: (innerContext, ref, _) {
           scope = ActionScope(context: innerContext, ref: ref, authUser: context.currentUser);
@@ -68,7 +68,7 @@ void main() {
           return const SizedBox.shrink();
         },
       ),
-      overrides: overrides(),
+      overrides: seededOverrides(),
     );
     return (scope, container);
   }
@@ -97,8 +97,8 @@ void main() {
 
     testWidgets('delegates visibility to the wrapped action', (tester) async {
       await tester.pumpTestWidget(
-        context,
         ActionIconButtonWidget(action: TimelineAction(action: _FakeAction(visible: false))),
+        overrides: context.overrides,
       );
 
       expect(find.byType(ActionIconButtonWidget), findsOneWidget);

mobile/test/unit/presentation/partner_page_test.dart

@@ -7,7 +7,7 @@ import 'package:immich_mobile/presentation/actions/partner.action.dart';
 
 import '../factories/partner_user_factory.dart';
 import '../factories/user_factory.dart';
-import 'presentation_context.dart';
+import '../presentation_context.dart';
 
 void main() {
   late PresentationContext context;
@@ -19,7 +19,7 @@ void main() {
     testWidgets('shows the empty-state add button when there are no partners', (tester) async {
       final action = const PartnerAddAction();
 
-      await tester.pumpTestWidget(context, const PartnerSharedByList(partners: []));
+      await tester.pumpTestWidget(const PartnerSharedByList(partners: []), overrides: context.overrides);
 
       expect(find.byType(ListView), findsNothing);
       expect(find.widgetWithIcon(TextButton, action.icon), findsOneWidget);
@@ -28,7 +28,8 @@ void main() {
     testWidgets('renders a tile per partner with name and email', (tester) async {
       final partner1 = PartnerFactory.create();
       final partner2 = PartnerFactory.create();
-      await tester.pumpTestWidget(context, PartnerSharedByList(partners: [partner1, partner2]));
+      await tester.pumpTestWidget(PartnerSharedByList(partners: [partner1, partner2]), overrides: context.overrides);
+
       expect(find.byType(ListTile), findsNWidgets(2));
       expect(find.text(partner1.name), findsOneWidget);
       expect(find.text(partner1.email), findsOneWidget);
@@ -40,7 +41,7 @@ void main() {
       final partner1 = PartnerFactory.create(inTimeline: true);
       final partner2 = PartnerFactory.create();
       final action = const PartnerRemoveAction(sharedWithId: '', partnerName: '');
-      await tester.pumpTestWidget(context, PartnerSharedByList(partners: [partner1, partner2]));
+      await tester.pumpTestWidget(PartnerSharedByList(partners: [partner1, partner2]), overrides: context.overrides);
       expect(find.byIcon(action.icon), findsNWidgets(2));
     });
   });
@@ -61,12 +62,13 @@ void main() {
     }
 
     List<Override> withCandidates(List<User> candidates) => [
+      ...context.overrides,
       candidatesStateProvider.overrideWith((ref) => Stream<Iterable<User>>.value(candidates)),
     ];
 
     testWidgets('renders an option per candidate fetched from the provider', (tester) async {
       final user = UserFactory.create();
-      await tester.pumpTestWidget(context, dialogWidget(), overrides: withCandidates([user]));
+      await tester.pumpTestWidget(dialogWidget(), overrides: withCandidates([user]));
 
       await tester.tap(find.byKey(dialogButtonKey));
       await tester.pumpAndSettle();
@@ -76,7 +78,7 @@ void main() {
     });
 
     testWidgets('shows no options when the provider returns no candidates', (tester) async {
-      await tester.pumpTestWidget(context, dialogWidget(), overrides: withCandidates(const []));
+      await tester.pumpTestWidget(dialogWidget(), overrides: withCandidates(const []));
 
       await tester.tap(find.byKey(dialogButtonKey));
       await tester.pumpAndSettle();
@@ -87,11 +89,7 @@ void main() {
     testWidgets('pops the selected candidate when an option is tapped', (tester) async {
       final user = UserFactory.create();
       User? selected;
-      await tester.pumpTestWidget(
-        context,
-        dialogWidget(onClosed: (user) => selected = user),
-        overrides: withCandidates([user]),
-      );
+      await tester.pumpTestWidget(dialogWidget(onClosed: (user) => selected = user), overrides: withCandidates([user]));
 
       await tester.tap(find.byKey(dialogButtonKey));
       await tester.pumpAndSettle();

mobile/test/unit/presentation_context.dart

@@ -13,21 +13,16 @@ import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/store.repository.dart';
 import 'package:immich_mobile/presentation/actions/action.dart';
 import 'package:immich_mobile/presentation/actions/action.widget.dart';
-import 'package:immich_mobile/providers/infrastructure/asset.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/user.provider.dart';
 import 'package:immich_mobile/providers/user.provider.dart';
 import 'package:immich_ui/immich_ui.dart';
 import 'package:mocktail/mocktail.dart';
 
-import '../../test_utils.dart';
-import '../factories/user_factory.dart';
-import '../mocks.dart';
+import '../test_utils.dart';
+import 'factories/user_factory.dart';
+import 'mocks.dart';
 
 class PresentationContext {
-  PresentationContext._({required UserDto user})
-    : currentUser = user,
-      service = ServiceMocks(),
-      repository = RepositoryMocks() {
+  PresentationContext._({required UserDto user}) : currentUser = user, mocks = ServiceMocks() {
     setup();
   }
 
@@ -36,14 +31,9 @@ class PresentationContext {
   static Drift? _db;
 
   final UserDto currentUser;
-  final ServiceMocks service;
-  final RepositoryMocks repository;
+  final ServiceMocks mocks;
 
-  List<Override> get overrides => [
-    currentUserProvider.overrideWith((ref) => CurrentUserProvider(service.user.service)),
-    assetServiceProvider.overrideWithValue(service.asset.service),
-    partnerServiceProvider.overrideWithValue(service.partner.service),
-  ];
+  List<Override> get overrides => [currentUserProvider.overrideWith((ref) => CurrentUserProvider(mocks.user.service))];
 
   static Future<PresentationContext> create() async {
     TestUtils.init();
@@ -57,18 +47,18 @@ class PresentationContext {
   }
 
   void setup() {
-    when(service.user.tryGetMyUser).thenReturn(currentUser);
+    when(mocks.user.tryGetMyUser).thenReturn(currentUser);
   }
 
   void dispose() {
     addTearDown(() {
-      service.resetAll();
+      mocks.resetAll();
     });
   }
 }
 
 extension PumpPresentationWidget on WidgetTester {
-  Future<void> pumpTestWidget(PresentationContext context, Widget widget, {List<Override> overrides = const []}) async {
+  Future<void> pumpTestWidget(Widget widget, {List<Override> overrides = const []}) async {
     await pumpWidget(
       EasyLocalization(
         supportedLocales: locales.values.toList(),
@@ -79,7 +69,7 @@ extension PumpPresentationWidget on WidgetTester {
         useFallbackTranslations: true,
         assetLoader: const CodegenLoader(),
         child: ProviderScope(
-          overrides: [...context.overrides, ...overrides],
+          overrides: overrides,
           child: Builder(
             builder: (context) => MaterialApp(
               debugShowCheckedModeBanner: false,
@@ -96,12 +86,8 @@ extension PumpPresentationWidget on WidgetTester {
     await pumpAndSettle();
   }
 
-  Future<void> pumpTestAction(
-    PresentationContext context,
-    BaseAction action, {
-    List<Override> overrides = const [],
-  }) async {
-    await pumpTestWidget(context, ActionIconButtonWidget(action: action), overrides: overrides);
+  Future<void> pumpTestAction(BaseAction action, {List<Override> overrides = const []}) async {
+    await pumpTestWidget(ActionIconButtonWidget(action: action), overrides: overrides);
     await tap(find.byType(ImmichIconButton));
     await pump();
   }

mobile/test/unit/services/hash_service_test.dart

@@ -14,11 +14,14 @@ void main() {
 
   setUp(() {
     sut = HashService(
-      localAlbumRepository: mocks.localAlbum.repo,
-      localAssetRepository: mocks.localAsset.repo,
-      nativeSyncApi: mocks.nativeApi.api,
+      localAlbumRepository: mocks.localAlbum,
+      localAssetRepository: mocks.localAsset,
+      nativeSyncApi: mocks.nativeApi,
       trashedLocalAssetRepository: mocks.trashedAsset,
     );
+
+    when(() => mocks.localAsset.reconcileHashesFromCloudId()).thenAnswer((_) async => {});
+    when(() => mocks.localAsset.updateHashes(any())).thenAnswer((_) async => {});
   });
 
   tearDown(() {
@@ -29,20 +32,22 @@ void main() {
     group('hashAssets', () {
       test('skips albums with no assets to hash', () async {
         final album = LocalAlbumFactory.create(assetCount: 0);
-        when(mocks.localAlbum.getBackupAlbums).thenAnswer((_) async => [album]);
+        when(() => mocks.localAlbum.getBackupAlbums()).thenAnswer((_) async => [album]);
+        when(() => mocks.localAlbum.getAssetsToHash(album.id)).thenAnswer((_) async => []);
 
         await sut.hashAssets();
 
-        verifyNever(mocks.nativeApi.hashAssets);
+        verifyNever(() => mocks.nativeApi.hashAssets(any(), allowNetworkAccess: any(named: 'allowNetworkAccess')));
       });
 
       test('skips empty batches', () async {
         final album = LocalAlbumFactory.create();
-        when(mocks.localAlbum.getBackupAlbums).thenAnswer((_) async => [album]);
+        when(() => mocks.localAlbum.getBackupAlbums()).thenAnswer((_) async => [album]);
+        when(() => mocks.localAlbum.getAssetsToHash(album.id)).thenAnswer((_) async => []);
 
         await sut.hashAssets();
 
-        verifyNever(mocks.nativeApi.hashAssets);
+        verifyNever(() => mocks.nativeApi.hashAssets(any(), allowNetworkAccess: any(named: 'allowNetworkAccess')));
       });
 
       test('processes assets when available', () async {
@@ -50,17 +55,15 @@ void main() {
         final asset = LocalAssetFactory.create();
         final result = HashResult(assetId: asset.id, hash: 'test-hash');
 
-        when(mocks.localAlbum.getBackupAlbums).thenAnswer((_) async => [album]);
-        when(() => mocks.localAlbum.repo.getAssetsToHash(album.id)).thenAnswer((_) async => [asset]);
-        when(
-          () => mocks.nativeApi.api.hashAssets([asset.id], allowNetworkAccess: false),
-        ).thenAnswer((_) async => [result]);
+        when(() => mocks.localAlbum.getBackupAlbums()).thenAnswer((_) async => [album]);
+        when(() => mocks.localAlbum.getAssetsToHash(album.id)).thenAnswer((_) async => [asset]);
+        when(() => mocks.nativeApi.hashAssets([asset.id], allowNetworkAccess: false)).thenAnswer((_) async => [result]);
 
         await sut.hashAssets();
 
-        verify(() => mocks.nativeApi.api.hashAssets([asset.id], allowNetworkAccess: false)).called(1);
+        verify(() => mocks.nativeApi.hashAssets([asset.id], allowNetworkAccess: false)).called(1);
         final captured =
-            verify(() => mocks.localAsset.repo.updateHashes(captureAny())).captured.first as Map<String, String>;
+            verify(() => mocks.localAsset.updateHashes(captureAny())).captured.first as Map<String, String>;
         expect(captured.length, 1);
         expect(captured[asset.id], result.hash);
       });
@@ -69,16 +72,16 @@ void main() {
         final album = LocalAlbumFactory.create();
         final asset = LocalAssetFactory.create();
 
-        when(mocks.localAlbum.getBackupAlbums).thenAnswer((_) async => [album]);
-        when(() => mocks.localAlbum.repo.getAssetsToHash(album.id)).thenAnswer((_) async => [asset]);
+        when(() => mocks.localAlbum.getBackupAlbums()).thenAnswer((_) async => [album]);
+        when(() => mocks.localAlbum.getAssetsToHash(album.id)).thenAnswer((_) async => [asset]);
         when(
-          () => mocks.nativeApi.api.hashAssets([asset.id], allowNetworkAccess: false),
+          () => mocks.nativeApi.hashAssets([asset.id], allowNetworkAccess: false),
         ).thenAnswer((_) async => [HashResult(assetId: asset.id, error: 'Failed to hash')]);
 
         await sut.hashAssets();
 
         final captured =
-            verify(() => mocks.localAsset.repo.updateHashes(captureAny())).captured.first as Map<String, String>;
+            verify(() => mocks.localAsset.updateHashes(captureAny())).captured.first as Map<String, String>;
         expect(captured.length, 0);
       });
 
@@ -86,25 +89,25 @@ void main() {
         final album = LocalAlbumFactory.create();
         final asset = LocalAssetFactory.create();
 
-        when(mocks.localAlbum.getBackupAlbums).thenAnswer((_) async => [album]);
-        when(() => mocks.localAlbum.repo.getAssetsToHash(album.id)).thenAnswer((_) async => [asset]);
+        when(() => mocks.localAlbum.getBackupAlbums()).thenAnswer((_) async => [album]);
+        when(() => mocks.localAlbum.getAssetsToHash(album.id)).thenAnswer((_) async => [asset]);
         when(
-          () => mocks.nativeApi.api.hashAssets([asset.id], allowNetworkAccess: false),
+          () => mocks.nativeApi.hashAssets([asset.id], allowNetworkAccess: false),
         ).thenAnswer((_) async => [HashResult(assetId: asset.id, hash: null)]);
 
         await sut.hashAssets();
 
         final captured =
-            verify(() => mocks.localAsset.repo.updateHashes(captureAny())).captured.first as Map<String, String>;
+            verify(() => mocks.localAsset.updateHashes(captureAny())).captured.first as Map<String, String>;
         expect(captured.length, 0);
       });
 
       test('batches by size limit', () async {
         const batchSize = 2;
         final sut = HashService(
-          localAlbumRepository: mocks.localAlbum.repo,
-          localAssetRepository: mocks.localAsset.repo,
-          nativeSyncApi: mocks.nativeApi.api,
+          localAlbumRepository: mocks.localAlbum,
+          localAssetRepository: mocks.localAsset,
+          nativeSyncApi: mocks.nativeApi,
           batchSize: batchSize,
           trashedLocalAssetRepository: mocks.trashedAsset,
         );
@@ -116,9 +119,12 @@ void main() {
 
         final capturedCalls = <List<String>>[];
 
-        when(mocks.localAlbum.getBackupAlbums).thenAnswer((_) async => [album]);
-        when(() => mocks.localAlbum.repo.getAssetsToHash(album.id)).thenAnswer((_) async => [asset1, asset2, asset3]);
-        when(mocks.nativeApi.hashAssets).thenAnswer((invocation) async {
+        when(() => mocks.localAsset.updateHashes(any())).thenAnswer((_) async => {});
+        when(() => mocks.localAlbum.getBackupAlbums()).thenAnswer((_) async => [album]);
+        when(() => mocks.localAlbum.getAssetsToHash(album.id)).thenAnswer((_) async => [asset1, asset2, asset3]);
+        when(() => mocks.nativeApi.hashAssets(any(), allowNetworkAccess: any(named: 'allowNetworkAccess'))).thenAnswer((
+          invocation,
+        ) async {
           final assetIds = invocation.positionalArguments[0] as List<String>;
           capturedCalls.add(List<String>.from(assetIds));
           return assetIds.map((id) => HashResult(assetId: id, hash: '$id-hash')).toList();
@@ -130,7 +136,7 @@ void main() {
         expect(capturedCalls[0], [asset1.id, asset2.id], reason: 'First call should batch the first two assets');
         expect(capturedCalls[1], [asset3.id], reason: 'Second call should have the remaining asset');
 
-        verify(() => mocks.localAsset.repo.updateHashes(any())).called(2);
+        verify(() => mocks.localAsset.updateHashes(any())).called(2);
       });
 
       test('handles mixed success and failure in batch', () async {
@@ -138,9 +144,9 @@ void main() {
         final asset1 = LocalAssetFactory.create();
         final asset2 = LocalAssetFactory.create();
 
-        when(mocks.localAlbum.getBackupAlbums).thenAnswer((_) async => [album]);
-        when(() => mocks.localAlbum.repo.getAssetsToHash(album.id)).thenAnswer((_) async => [asset1, asset2]);
-        when(() => mocks.nativeApi.api.hashAssets([asset1.id, asset2.id], allowNetworkAccess: false)).thenAnswer(
+        when(() => mocks.localAlbum.getBackupAlbums()).thenAnswer((_) async => [album]);
+        when(() => mocks.localAlbum.getAssetsToHash(album.id)).thenAnswer((_) async => [asset1, asset2]);
+        when(() => mocks.nativeApi.hashAssets([asset1.id, asset2.id], allowNetworkAccess: false)).thenAnswer(
           (_) async => [
             HashResult(assetId: asset1.id, hash: 'asset1-hash'),
             HashResult(assetId: asset2.id, error: 'Failed to hash asset2'),
@@ -150,7 +156,7 @@ void main() {
         await sut.hashAssets();
 
         final captured =
-            verify(() => mocks.localAsset.repo.updateHashes(captureAny())).captured.first as Map<String, String>;
+            verify(() => mocks.localAsset.updateHashes(captureAny())).captured.first as Map<String, String>;
         expect(captured.length, 1);
         expect(captured[asset1.id], 'asset1-hash');
       });
@@ -161,18 +167,20 @@ void main() {
         final asset1 = LocalAssetFactory.create();
         final asset2 = LocalAssetFactory.create();
 
-        when(mocks.localAlbum.getBackupAlbums).thenAnswer((_) async => [selectedAlbum, nonSelectedAlbum]);
-        when(() => mocks.localAlbum.repo.getAssetsToHash(selectedAlbum.id)).thenAnswer((_) async => [asset1]);
-        when(() => mocks.localAlbum.repo.getAssetsToHash(nonSelectedAlbum.id)).thenAnswer((_) async => [asset2]);
-        when(mocks.nativeApi.hashAssets).thenAnswer((invocation) async {
+        when(() => mocks.localAlbum.getBackupAlbums()).thenAnswer((_) async => [selectedAlbum, nonSelectedAlbum]);
+        when(() => mocks.localAlbum.getAssetsToHash(selectedAlbum.id)).thenAnswer((_) async => [asset1]);
+        when(() => mocks.localAlbum.getAssetsToHash(nonSelectedAlbum.id)).thenAnswer((_) async => [asset2]);
+        when(() => mocks.nativeApi.hashAssets(any(), allowNetworkAccess: any(named: 'allowNetworkAccess'))).thenAnswer((
+          invocation,
+        ) async {
           final assetIds = invocation.positionalArguments[0] as List<String>;
           return assetIds.map((id) => HashResult(assetId: id, hash: '$id-hash')).toList();
         });
 
         await sut.hashAssets();
 
-        verify(() => mocks.nativeApi.api.hashAssets([asset1.id], allowNetworkAccess: true)).called(1);
-        verify(() => mocks.nativeApi.api.hashAssets([asset2.id], allowNetworkAccess: false)).called(1);
+        verify(() => mocks.nativeApi.hashAssets([asset1.id], allowNetworkAccess: true)).called(1);
+        verify(() => mocks.nativeApi.hashAssets([asset2.id], allowNetworkAccess: false)).called(1);
       });
     });
   });

mobile/test/unit/utils/asset_filter_test.dart

@@ -1,200 +0,0 @@
-import 'package:flutter_test/flutter_test.dart';
-import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
-import 'package:immich_mobile/utils/asset_filter.dart';
-
-import '../factories/local_asset_factory.dart';
-import '../factories/remote_asset_factory.dart';
-
-void main() {
-  group('AssetFilter', () {
-    group('type promotion', () {
-      test('a bare filter retains every BaseAsset', () {
-        final remoteAsset = RemoteAssetFactory.create();
-        final localAsset = LocalAssetFactory.create();
-
-        final AssetFilter<BaseAsset> filter = AssetFilter(<BaseAsset>[remoteAsset, localAsset]);
-
-        expect(filter.toList(), [remoteAsset, localAsset]);
-      });
-
-      test('remote keeps only remote assets', () {
-        final remoteAsset = RemoteAssetFactory.create();
-        final localAsset = LocalAssetFactory.create();
-
-        final AssetFilter<RemoteAsset> remoteOnly = AssetFilter(<BaseAsset>[remoteAsset, localAsset]).remote();
-
-        expect(remoteOnly.toList(), [remoteAsset]);
-      });
-
-      test('local keeps only local assets', () {
-        final remoteAsset = RemoteAssetFactory.create();
-        final localAsset = LocalAssetFactory.create();
-
-        final AssetFilter<LocalAsset> localOnly = AssetFilter(<BaseAsset>[remoteAsset, localAsset]).local();
-
-        expect(localOnly.toList(), [localAsset]);
-      });
-
-      test('owned promotes to RemoteAsset and drops local assets', () {
-        final remoteAsset = RemoteAssetFactory.create();
-        final localAsset = LocalAssetFactory.create();
-
-        final AssetFilter<RemoteAsset> remoteOnly = AssetFilter(<BaseAsset>[
-          remoteAsset,
-          localAsset,
-        ]).owned(remoteAsset.ownerId);
-
-        expect(remoteOnly.toList(), [remoteAsset]);
-      });
-
-      test('backedUp promotes to LocalAsset and drops remote assets', () {
-        final syncedPhoto = LocalAssetFactory.create().copyWith(remoteId: 'remote');
-        final offlinePhoto = LocalAssetFactory.create();
-        final remotePhoto = RemoteAssetFactory.create();
-
-        final AssetFilter<LocalAsset> syncedPhotos = AssetFilter(<BaseAsset>[
-          syncedPhoto,
-          offlinePhoto,
-          remotePhoto,
-        ]).backedUp();
-
-        expect(syncedPhotos.toList(), [syncedPhoto]);
-      });
-    });
-
-    group('named filters', () {
-      test('owned keeps only assets of the given owner', () {
-        final asset1 = RemoteAssetFactory.create();
-        final asset2 = RemoteAssetFactory.create();
-
-        final alexPhotos = AssetFilter([asset1, asset2]).owned(asset1.ownerId);
-
-        expect(alexPhotos.toList(), [asset1]);
-      });
-
-      test('favorites keeps only favorite assets', () {
-        final asset1 = RemoteAssetFactory.create(isFavorite: true);
-        final asset2 = RemoteAssetFactory.create(ownerId: asset1.ownerId);
-
-        final favorites = AssetFilter([asset1, asset2]).favorites();
-
-        expect(favorites.toList(), [asset1]);
-      });
-
-      test('type keeps only assets of the given type', () {
-        final image = RemoteAssetFactory.create();
-        final video = RemoteAssetFactory.create(ownerId: image.ownerId).copyWith(type: .video);
-
-        final videos = AssetFilter([image, video]).type(.video);
-
-        expect(videos.toList(), [video]);
-      });
-
-      test('visibility keeps only assets with the given visibility', () {
-        final locked = RemoteAssetFactory.create(visibility: AssetVisibility.locked);
-        final onTimeline = RemoteAssetFactory.create(ownerId: locked.ownerId);
-
-        final lockedPhotos = AssetFilter([locked, onTimeline]).visibility(.locked);
-
-        expect(lockedPhotos.toList(), [locked]);
-      });
-
-      test('archived keeps only archived assets', () {
-        final archived = RemoteAssetFactory.create(visibility: AssetVisibility.archive);
-        final onTimeline = RemoteAssetFactory.create(ownerId: archived.ownerId);
-
-        final archivedPhotos = AssetFilter([archived, onTimeline]).archived();
-
-        expect(archivedPhotos.toList(), [archived]);
-      });
-
-      test('stacked keeps only assets belonging to a stack', () {
-        final stacked = RemoteAssetFactory.create(stackId: 'stack');
-        final loose = RemoteAssetFactory.create(ownerId: stacked.ownerId);
-
-        final stackedPhotos = AssetFilter([stacked, loose]).stacked();
-
-        expect(stackedPhotos.toList(), [stacked]);
-      });
-    });
-
-    group('inversion', () {
-      test('notArchived keeps every non-archived visibility', () {
-        final archived = RemoteAssetFactory.create(visibility: AssetVisibility.archive);
-        final onTimeline = RemoteAssetFactory.create(ownerId: archived.ownerId, visibility: AssetVisibility.timeline);
-        final hidden = RemoteAssetFactory.create(ownerId: archived.ownerId, visibility: AssetVisibility.hidden);
-        final locked = RemoteAssetFactory.create(ownerId: archived.ownerId, visibility: AssetVisibility.locked);
-
-        final visiblePhotos = AssetFilter([archived, onTimeline, hidden, locked]).notArchived();
-
-        expect(visiblePhotos.toSet(), {onTimeline, hidden, locked});
-      });
-
-      test('notVisibility keeps every asset not at the target visibility', () {
-        final archived = RemoteAssetFactory.create(visibility: AssetVisibility.archive);
-        final onTimeline = RemoteAssetFactory.create(ownerId: archived.ownerId, visibility: AssetVisibility.timeline);
-        final locked = RemoteAssetFactory.create(ownerId: archived.ownerId, visibility: AssetVisibility.locked);
-
-        final toArchive = AssetFilter([archived, onTimeline, locked]).notVisibility(.archive);
-
-        expect(toArchive.toSet(), {onTimeline, locked});
-      });
-
-      test('notStacked keeps only assets without a stack', () {
-        final stacked = RemoteAssetFactory.create(stackId: 'stack');
-        final loose = RemoteAssetFactory.create(ownerId: stacked.ownerId);
-
-        final loosePhotos = AssetFilter([stacked, loose]).notStacked();
-
-        expect(loosePhotos.toList(), [loose]);
-      });
-
-      test('whereNot inverts an arbitrary predicate', () {
-        final favorite = RemoteAssetFactory.create(isFavorite: true);
-        final regular = RemoteAssetFactory.create(ownerId: favorite.ownerId);
-
-        final nonFavorites = AssetFilter([favorite, regular]).whereNot((asset) => asset.isFavorite);
-
-        expect(nonFavorites.toList(), [regular]);
-      });
-
-      test('notFavorites keeps only non-favorite assets', () {
-        final favorite = RemoteAssetFactory.create(isFavorite: true);
-        final regular = RemoteAssetFactory.create(ownerId: favorite.ownerId);
-
-        final nonFavorites = AssetFilter([favorite, regular]).notFavorites();
-
-        expect(nonFavorites.toList(), [regular]);
-      });
-    });
-
-    group('chaining', () {
-      test('combines predicates across owner, visibility and stack', () {
-        final asset = RemoteAssetFactory.create();
-        final wrongOwner = RemoteAssetFactory.create();
-        final archived = RemoteAssetFactory.create(ownerId: asset.ownerId, visibility: AssetVisibility.archive);
-        final stacked = RemoteAssetFactory.create(ownerId: asset.ownerId, stackId: 'stack-1');
-        final localPhoto = LocalAssetFactory.create();
-
-        final result = AssetFilter(<BaseAsset>[
-          asset,
-          wrongOwner,
-          archived,
-          stacked,
-          localPhoto,
-        ]).owned(asset.ownerId).notArchived().notStacked();
-
-        expect(result.toList(), [asset]);
-      });
-
-      test('a base filter after a promotion retains the promoted type', () {
-        final favorite = RemoteAssetFactory.create(isFavorite: true);
-        final regular = RemoteAssetFactory.create(ownerId: favorite.ownerId);
-
-        final AssetFilter<RemoteAsset> result = AssetFilter([favorite, regular]).owned(favorite.ownerId).favorites();
-
-        expect(result.toList(), [favorite]);
-      });
-    });
-  });
-}

mobile/test/widget_tester_extensions.dart

@@ -1,51 +1,27 @@
-import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/constants/locales.dart';
-import 'package:immich_mobile/generated/codegen_loader.g.dart';
 
 extension PumpConsumerWidget on WidgetTester {
-  /// Wraps the provided [widget] with a localized Material app such that it
-  /// becomes:
-  ///
-  /// EasyLocalization
-  ///   |-ProviderScope
-  ///     |-MaterialApp (localization delegates wired up)
-  ///       |-Material
-  ///         |-[widget]
+  /// Wraps the provided [widget] with Material app such that it becomes:
   ///
+  /// ProviderScope
+  ///   |-MaterialApp
+  ///     |-Material
+  ///       |-[widget]
   Future<void> pumpConsumerWidget(
     Widget widget, {
     Duration? duration,
     EnginePhase phase = EnginePhase.sendSemanticsUpdate,
     List<Override> overrides = const [],
   }) async {
-    await pumpWidget(
-      EasyLocalization(
-        supportedLocales: locales.values.toList(),
-        path: translationsPath,
-        startLocale: locales.values.first,
-        fallbackLocale: locales.values.first,
-        saveLocale: false,
-        useFallbackTranslations: true,
-        assetLoader: const CodegenLoader(),
-        child: ProviderScope(
-          overrides: overrides,
-          child: Builder(
-            builder: (context) => MaterialApp(
-              debugShowCheckedModeBanner: false,
-              localizationsDelegates: context.localizationDelegates,
-              supportedLocales: context.supportedLocales,
-              locale: context.locale,
-              home: Material(child: widget),
-            ),
-          ),
-        ),
+    return pumpWidget(
+      ProviderScope(
+        overrides: overrides,
+        child: MaterialApp(debugShowCheckedModeBanner: false, home: Material(child: widget)),
       ),
       duration: duration,
       phase: phase,
     );
-    await pumpAndSettle();
   }
 }

pnpm-lock.yaml

@@ -786,8 +786,8 @@ importers:
         specifier: workspace:*
         version: link:../packages/sdk
       '@immich/ui':
-        specifier: ^0.81.1
-        version: 0.81.1(@sveltejs/kit@2.65.1(@opentelemetry/api@1.9.1)(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.56.3(@typescript-eslint/types@8.61.0))(vite@8.0.16(@types/node@24.13.2)(esbuild@0.28.1)(jiti@2.7.0)(sass@1.101.0)(terser@5.48.0)(tsx@4.22.4)(yaml@2.9.0)))(svelte@5.56.3(@typescript-eslint/types@8.61.0))(typescript@6.0.3)(vite@8.0.16(@types/node@24.13.2)(esbuild@0.28.1)(jiti@2.7.0)(sass@1.101.0)(terser@5.48.0)(tsx@4.22.4)(yaml@2.9.0)))(svelte@5.56.3(@typescript-eslint/types@8.61.0))
+        specifier: ^0.83.0
+        version: 0.83.0(@sveltejs/kit@2.65.1(@opentelemetry/api@1.9.1)(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.56.3(@typescript-eslint/types@8.61.0))(vite@8.0.16(@types/node@24.13.2)(esbuild@0.28.1)(jiti@2.7.0)(sass@1.101.0)(terser@5.48.0)(tsx@4.22.4)(yaml@2.9.0)))(svelte@5.56.3(@typescript-eslint/types@8.61.0))(typescript@6.0.3)(vite@8.0.16(@types/node@24.13.2)(esbuild@0.28.1)(jiti@2.7.0)(sass@1.101.0)(terser@5.48.0)(tsx@4.22.4)(yaml@2.9.0)))(svelte@5.56.3(@typescript-eslint/types@8.61.0))
       '@mapbox/mapbox-gl-rtl-text':
         specifier: 0.4.0
         version: 0.4.0
@@ -3250,8 +3250,8 @@ packages:
     resolution: {integrity: sha512-O1SJ+BbeFVsUTF4af1MfagJZM+lPgLjI8lQ3SZNjpo8SGJReSbUl2ii03OKuGni/G0yp2GnRLpOTNSHYGtVrcg==}
     hasBin: true
 
-  '@immich/ui@0.81.1':
-    resolution: {integrity: sha512-7g173hArs7OS5CfHUG+ZJVQp1iCvFZzBmm+f2uH1WChlFdcwty5DLilYrDBszWuPIvu8wTX2AXTneS/KYBCUxw==}
+  '@immich/ui@0.83.0':
+    resolution: {integrity: sha512-Xh3R3yhn8/Qyq8lGWIiVmturA+dHXtmW/h++AGb2UAwS/58qu7ssocO/HWIamaSpkgjPGotlWpPIpUJq1zh9FQ==}
     peerDependencies:
       '@sveltejs/kit': ^2.13.0
       svelte: ^5.0.0
@@ -16111,7 +16111,7 @@ snapshots:
       pg-connection-string: 2.13.0
       postgres: 3.4.9
 
-  '@immich/ui@0.81.1(@sveltejs/kit@2.65.1(@opentelemetry/api@1.9.1)(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.56.3(@typescript-eslint/types@8.61.0))(vite@8.0.16(@types/node@24.13.2)(esbuild@0.28.1)(jiti@2.7.0)(sass@1.101.0)(terser@5.48.0)(tsx@4.22.4)(yaml@2.9.0)))(svelte@5.56.3(@typescript-eslint/types@8.61.0))(typescript@6.0.3)(vite@8.0.16(@types/node@24.13.2)(esbuild@0.28.1)(jiti@2.7.0)(sass@1.101.0)(terser@5.48.0)(tsx@4.22.4)(yaml@2.9.0)))(svelte@5.56.3(@typescript-eslint/types@8.61.0))':
+  '@immich/ui@0.83.0(@sveltejs/kit@2.65.1(@opentelemetry/api@1.9.1)(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.56.3(@typescript-eslint/types@8.61.0))(vite@8.0.16(@types/node@24.13.2)(esbuild@0.28.1)(jiti@2.7.0)(sass@1.101.0)(terser@5.48.0)(tsx@4.22.4)(yaml@2.9.0)))(svelte@5.56.3(@typescript-eslint/types@8.61.0))(typescript@6.0.3)(vite@8.0.16(@types/node@24.13.2)(esbuild@0.28.1)(jiti@2.7.0)(sass@1.101.0)(terser@5.48.0)(tsx@4.22.4)(yaml@2.9.0)))(svelte@5.56.3(@typescript-eslint/types@8.61.0))':
     dependencies:
       '@internationalized/date': 3.12.2
       '@mdi/js': 7.4.47
@@ -21092,21 +21092,21 @@ snapshots:
       signal-exit: 3.0.7
       strip-final-newline: 2.0.0
 
-  exiftool-vendored.exe@13.59.0:
-    optional: true
+  exiftool-vendored.exe@13.59.0: {}
 
-  exiftool-vendored.pl@13.59.0: {}
+  exiftool-vendored.pl@13.59.0:
+    optional: true
 
   exiftool-vendored@35.21.0:
     dependencies:
       '@photostructure/tz-lookup': 11.5.0
       '@types/luxon': 3.7.1
       batch-cluster: 17.3.1
-      exiftool-vendored.pl: 13.59.0
+      exiftool-vendored.exe: 13.59.0
       he: 1.2.0
       luxon: 3.7.2
     optionalDependencies:
-      exiftool-vendored.exe: 13.59.0
+      exiftool-vendored.pl: 13.59.0
 
   expand-template@2.0.3:
     optional: true

pnpm-workspace.yaml

@@ -66,4 +66,4 @@ injectWorkspacePackages: true
 shamefullyHoist: false
 verifyDepsBeforeRun: install
 minimumReleaseAgeExclude:
-  - '@immich/ui@0.81.1'
+  - '@immich/ui@0.83.0'

server/src/repositories/metadata.repository.ts

@@ -53,10 +53,10 @@ export interface ImmichTags extends Omit<Tags, TagsWithWrongTypes> {
     RegionList: {
       Area: {
         // (X,Y) // center of the rectangle
-        X: number | string;
-        Y: number | string;
-        W: number | string;
-        H: number | string;
+        X: number;
+        Y: number;
+        W: number;
+        H: number;
         Unit: string;
       };
       Rotation?: number;

server/src/services/metadata.service.spec.ts

@@ -39,10 +39,7 @@ const forSidecarJob = (
   };
 };
 
-const makeFaceTags = (
-  face: Partial<{ Name: string }> = {},
-  orientation?: ImmichTags['Orientation'],
-): Partial<ImmichTags> => ({
+const makeFaceTags = (face: Partial<{ Name: string }> = {}, orientation?: ImmichTags['Orientation']) => ({
   Orientation: orientation,
   RegionInfo: {
     AppliedToDimensions: { W: 1000, H: 100, Unit: 'pixel' },
@@ -1374,35 +1371,6 @@ describe(MetadataService.name, () => {
       expect(mocks.person.updateAll).not.toHaveBeenCalled();
     });
 
-    it('should handle string coordinates in face region bounding box calculation by limiting to 16 decimal places', async () => {
-      const asset = AssetFactory.create();
-      const person = PersonFactory.create();
-
-      mocks.assetJob.getForMetadataExtraction.mockResolvedValue(getForMetadataExtraction(asset));
-      mocks.systemMetadata.get.mockResolvedValue({ metadata: { faces: { import: true } } });
-      const faceTags = makeFaceTags({ Name: person.name });
-
-      // Simulating EXIF returning a string with >16 decimal places
-      faceTags.RegionInfo!.RegionList[0].Area.X = '0.48564814814814824';
-      faceTags.RegionInfo!.RegionList[0].Area.W = '0.2';
-
-      mockReadTags(faceTags);
-      mocks.person.getDistinctNames.mockResolvedValue([]);
-      mocks.person.createAll.mockResolvedValue([person.id]);
-      mocks.person.update.mockResolvedValue(person);
-
-      await sut.handleMetadataExtraction({ id: asset.id });
-
-      expect(mocks.person.refreshFaces).toHaveBeenCalledWith(
-        [
-          expect.objectContaining({
-            boundingBoxX1: Math.floor((0.485_648_148_148_148_2 - 0.2 / 2) * 1000),
-          }),
-        ],
-        [],
-      );
-    });
-
     it('should apply metadata face tags creating new people', async () => {
       const asset = AssetFactory.create();
       const person = PersonFactory.create();

server/src/services/metadata.service.ts

@@ -854,13 +854,6 @@ export class MetadataService extends BaseService {
     // update area coordinates and dimensions in RegionList assuming "normalized" unit as per MWG guidelines
     const adjustedRegionList = regionInfo.RegionList.map((region) => {
       let { X, Y, W, H } = region.Area;
-
-      // EXIF floats with >16 decimals are serialized as strings. Ensure they are numbers.
-      X = Number(X);
-      Y = Number(Y);
-      W = Number(W);
-      H = Number(H);
-
       switch (orientation) {
         case ExifOrientation.MirrorHorizontal: {
           X = 1 - X;
@@ -933,21 +926,16 @@ export class MetadataService extends BaseService {
       const loweredName = region.Name.toLowerCase();
       const personId = existingNameMap.get(loweredName) || this.cryptoRepository.randomUUID();
 
-      const X = Number(region.Area.X);
-      const Y = Number(region.Area.Y);
-      const W = Number(region.Area.W);
-      const H = Number(region.Area.H);
-
       const face = {
         id: this.cryptoRepository.randomUUID(),
         personId,
         assetId: asset.id,
         imageWidth,
         imageHeight,
-        boundingBoxX1: Math.floor((X - W / 2) * imageWidth),
-        boundingBoxY1: Math.floor((Y - H / 2) * imageHeight),
-        boundingBoxX2: Math.floor((X + W / 2) * imageWidth),
-        boundingBoxY2: Math.floor((Y + H / 2) * imageHeight),
+        boundingBoxX1: Math.floor((region.Area.X - region.Area.W / 2) * imageWidth),
+        boundingBoxY1: Math.floor((region.Area.Y - region.Area.H / 2) * imageHeight),
+        boundingBoxX2: Math.floor((region.Area.X + region.Area.W / 2) * imageWidth),
+        boundingBoxY2: Math.floor((region.Area.Y + region.Area.H / 2) * imageHeight),
         sourceType: SourceType.Exif,
       };
 

web/package.json

@@ -27,7 +27,7 @@
     "@formatjs/icu-messageformat-parser": "^3.0.0",
     "@immich/justified-layout-wasm": "^0.4.3",
     "@immich/sdk": "workspace:*",
-    "@immich/ui": "^0.81.1",
+    "@immich/ui": "^0.83.0",
     "@mapbox/mapbox-gl-rtl-text": "0.4.0",
     "@mdi/js": "^7.4.47",
     "@noble/hashes": "^2.2.0",

web/src/lib/components/asset-viewer/AssetViewer.svelte

@@ -14,6 +14,7 @@
   import { authManager } from '$lib/managers/auth-manager.svelte';
   import { editManager, EditToolType } from '$lib/managers/edit/edit-manager.svelte';
   import { eventManager } from '$lib/managers/event-manager.svelte';
+  import type { TimelineAsset } from '$lib/managers/timeline-manager/types';
   import { getAssetActions } from '$lib/services/asset.service';
   import { faceManager } from '$lib/stores/face.svelte';
   import { ocrManager } from '$lib/stores/ocr.svelte';
@@ -23,6 +24,7 @@
   import type { OnUndoDelete } from '$lib/utils/actions';
   import { navigateToAsset } from '$lib/utils/asset-utils';
   import { handleError } from '$lib/utils/handle-error';
+  import { navigate } from '$lib/utils/navigation';
   import { InvocationTracker } from '$lib/utils/invocationTracker';
   import { SlideshowHistory } from '$lib/utils/slideshow-history';
   import { toTimelineAsset } from '$lib/utils/timeline-util';
@@ -149,6 +151,15 @@
     }
   };
 
+  const onAssetsUndoArchive = async (assets: TimelineAsset[]) => {
+    if (assets.length === 0) {
+      return;
+    }
+    const restoredAsset = assets[0];
+    await assetViewerManager.setAssetId(restoredAsset.id);
+    await navigate({ targetRoute: 'current', assetId: restoredAsset.id });
+  };
+
   onMount(() => {
     syncAssetViewerOpenClass(true);
     const slideshowStateUnsubscribe = slideshowState.subscribe((value) => {
@@ -475,7 +486,7 @@
 </script>
 
 <CommandPaletteDefaultProvider name={$t('assets')} actions={[Tag, TagPeople]} />
-<OnEvents {onAssetUpdate} />
+<OnEvents {onAssetUpdate} {onAssetsUndoArchive} />
 
 <svelte:document
   bind:fullscreenElement

web/src/lib/components/shared-components/map/Map.svelte

@@ -309,12 +309,12 @@
     untrack(() => map?.jumpTo({ center, zoom }));
   });
 
-  const onAssetsDelete = async () => {
+  const onAssetsChanged = async () => {
     mapMarkers = await loadMapMarkers();
   };
 </script>
 
-<OnEvents {onAssetsDelete} />
+<OnEvents onAssetsDelete={onAssetsChanged} onAssetsArchive={onAssetsChanged} onAssetsUnarchive={onAssetsChanged} />
 
 <!--  We handle style loading ourselves so we set style blank here -->
 <MapLibre

web/src/lib/managers/event-manager.svelte.ts

@@ -16,6 +16,7 @@ import type {
   UserAdminResponseDto,
   WorkflowResponseDto,
 } from '@immich/sdk';
+import type { TimelineAsset } from '$lib/managers/timeline-manager/types';
 import { BaseEventManager } from '$lib/utils/base-event-manager.svelte';
 import type { TreeNode } from '$lib/utils/tree-utils';
 
@@ -35,6 +36,8 @@ export type Events = {
 
   AssetUpdate: [AssetResponseDto];
   AssetsArchive: [string[]];
+  AssetsUnarchive: [TimelineAsset[]];
+  AssetsUndoArchive: [TimelineAsset[]];
   AssetsDelete: [string[]];
   AssetEditsApplied: [string];
   AssetsTag: [string[]];

web/src/lib/managers/timeline-manager/timeline-manager.svelte.ts

@@ -1,4 +1,4 @@
-import { AssetOrder, getAssetInfo, getTimeBuckets, AssetOrderBy, type AssetResponseDto } from '@immich/sdk';
+import { AssetOrder, AssetOrderBy, getAssetInfo, getTimeBuckets, type AssetResponseDto } from '@immich/sdk';
 import { clamp, isEqual } from 'lodash-es';
 import { SvelteDate, SvelteSet } from 'svelte/reactivity';
 import { VirtualScrollManager } from '$lib/managers/VirtualScrollManager/VirtualScrollManager.svelte';
@@ -114,7 +114,15 @@ export class TimelineManager extends VirtualScrollManager {
 
     this.#unsubscribes.push(
       eventManager.on({
-        AssetUpdate: (asset: AssetResponseDto) => this.#updateAssets([toTimelineAsset(asset)]),
+        AssetUpdate: (asset: AssetResponseDto) => {
+          const timelineAsset = toTimelineAsset(asset);
+          if (this.#options.albumId || this.#options.personId) {
+            this.#updateAssets([timelineAsset]);
+          } else {
+            this.upsertAssets([timelineAsset]);
+          }
+        },
+        AssetsUnarchive: (assets) => this.upsertAssets(assets),
       }),
     );
   }

web/src/lib/utils/asset-utils.ts

@@ -17,13 +17,14 @@ import {
   type StackResponseDto,
   type UserResponseDto,
 } from '@immich/sdk';
-import { toastManager } from '@immich/ui';
+import { toastManager, type ToastShow } from '@immich/ui';
 import { DateTime } from 'luxon';
 import { t } from 'svelte-i18n';
 import { get } from 'svelte/store';
 import type { AssetMultiSelectManager } from '$lib/managers/asset-multi-select-manager.svelte';
 import { authManager } from '$lib/managers/auth-manager.svelte';
 import { downloadManager } from '$lib/managers/download-manager.svelte';
+import { eventManager } from '$lib/managers/event-manager.svelte';
 import { TimelineManager } from '$lib/managers/timeline-manager/timeline-manager.svelte';
 import type { TimelineAsset } from '$lib/managers/timeline-manager/types';
 import { downloadBlob, downloadRequest, withError } from '$lib/utils';
@@ -31,6 +32,7 @@ import { getByteUnitString } from '$lib/utils/byte-units';
 import { getFormatter } from '$lib/utils/i18n';
 import { navigate } from '$lib/utils/navigation';
 import { asQueryString } from '$lib/utils/shared-links';
+import { toTimelineAsset } from '$lib/utils/timeline-util';
 import { handleError } from './handle-error';
 
 export const tagAssets = async ({
@@ -400,7 +402,12 @@ export const toggleArchive = async (asset: AssetResponseDto) => {
     });
 
     asset.isArchived = data.isArchived;
-    toastManager.primary(asset.isArchived ? $t(`added_to_archive`) : $t(`removed_from_archive`));
+    if (asset.isArchived) {
+      const timelineAsset = toTimelineAsset(asset);
+      showUndoArchiveToast($t('added_to_archive'), [timelineAsset]);
+    } else {
+      toastManager.primary($t('removed_from_archive'));
+    }
   } catch (error) {
     handleError(error, $t('errors.unable_to_add_remove_archive', { values: { archived: asset.isArchived } }));
   }
@@ -408,7 +415,46 @@ export const toggleArchive = async (asset: AssetResponseDto) => {
   return asset;
 };
 
-export const archiveAssets = async (assets: { id: string }[], visibility: AssetVisibility) => {
+const showUndoArchiveToast = (description: string, assets: TimelineAsset[]) => {
+  const $t = get(t);
+  const toast: ToastShow & { onClose?: () => void } = {
+    description,
+    button: (close) => ({
+      label: $t('undo'),
+      onclick: () => {
+        close();
+        void undoArchiveAssets(assets);
+      },
+    }),
+  };
+  toastManager.primary(toast);
+};
+
+const undoArchiveAssets = async (assets: TimelineAsset[]) => {
+  const $t = get(t);
+  try {
+    const ids = assets.map((a) => a.id);
+    if (ids.length > 0) {
+      await updateAssets({
+        assetBulkUpdateDto: {
+          ids,
+          visibility: AssetVisibility.Timeline,
+        },
+      });
+    }
+
+    for (const asset of assets) {
+      asset.visibility = AssetVisibility.Timeline;
+    }
+    eventManager.emit('AssetsUnarchive', assets);
+    eventManager.emit('AssetsUndoArchive', assets);
+    toastManager.success($t('unarchived_count', { values: { count: assets.length } }));
+  } catch (error) {
+    handleError(error, $t('errors.unable_to_archive_unarchive', { values: { archived: false } }));
+  }
+};
+
+export const archiveAssets = async (assets: TimelineAsset[], visibility: AssetVisibility) => {
   const ids = assets.map(({ id }) => id);
   const $t = get(t);
 
@@ -419,11 +465,11 @@ export const archiveAssets = async (assets: { id: string }[], visibility: AssetV
       });
     }
 
-    toastManager.primary(
-      visibility === AssetVisibility.Archive
-        ? $t('archived_count', { values: { count: ids.length } })
-        : $t('unarchived_count', { values: { count: ids.length } }),
-    );
+    if (visibility === AssetVisibility.Archive) {
+      showUndoArchiveToast($t('archived_count', { values: { count: ids.length } }), assets);
+    } else {
+      toastManager.primary($t('unarchived_count', { values: { count: ids.length } }));
+    }
   } catch (error) {
     handleError(
       error,

web/src/lib/utils/timeline-util.ts

@@ -165,7 +165,10 @@ export const toTimelineAsset = (unknownAsset: AssetResponseDto | TimelineAsset):
   const people = assetResponse.people?.map((person) => person.name) || [];
 
   const localDateTime = fromISODateTimeUTCToObject(assetResponse.localDateTime);
-  const fileCreatedAt = fromISODateTimeToObject(assetResponse.fileCreatedAt, assetResponse.exifInfo?.timeZone ?? 'UTC');
+  // Keep this consistent with the bucket loader (getTimes), which stores fileCreatedAt as UTC
+  // components. The timeline sorts assets within a day by fileCreatedAt, so a mismatched
+  // representation here would place re-inserted assets (e.g. undo archive) in the wrong spot.
+  const fileCreatedAt = fromISODateTimeUTCToObject(assetResponse.fileCreatedAt);
   const createdAt = fromISODateTimeUTCToObject(assetResponse.createdAt);
 
   return {

web/src/routes/(user)/people/[personId]/[[photos=photos]]/[[assetId=id]]/+page.svelte

@@ -329,6 +329,7 @@
   onPersonAssetDelete={handlePersonAssetDelete}
   onAssetsDelete={updateAssetCount}
   onAssetsArchive={updateAssetCount}
+  onAssetsUnarchive={updateAssetCount}
 />
 
 <main