cleanup

# Conflicts:
#	mobile/android/app/src/main/kotlin/app/alextran/immich/sync/Messages.g.kt
#	mobile/ios/Runner/Sync/Messages.g.swift
#	mobile/lib/platform/native_sync_api.g.dart

mobile/android/app/src/main/AndroidManifest.xml

@@ -89,6 +89,20 @@
         <data android:mimeType="video/*" />
       </intent-filter>
 
+      <!-- Allow Immich to act as an image viewer -->
+      <intent-filter android:label="View in Immich">
+        <action android:name="android.intent.action.VIEW" />
+        <category android:name="android.intent.category.DEFAULT" />
+        <data android:scheme="content" android:mimeType="image/*" />
+      </intent-filter>
+
+      <!-- Allow Immich to act as a video viewer -->
+      <intent-filter android:label="View in Immich">
+        <action android:name="android.intent.action.VIEW" />
+        <category android:name="android.intent.category.DEFAULT" />
+        <data android:scheme="content" android:mimeType="video/*" />
+      </intent-filter>
+
       <!-- immich:// URL scheme handling -->
       <intent-filter>
         <action android:name="android.intent.action.VIEW" />

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

@@ -1,6 +1,7 @@
 package app.alextran.immich
 
 import android.content.Context
+import android.content.Intent
 import android.os.Build
 import android.os.ext.SdkExtensions
 import app.alextran.immich.background.BackgroundEngineLock
@@ -17,9 +18,12 @@ import app.alextran.immich.images.LocalImageApi
 import app.alextran.immich.images.LocalImagesImpl
 import app.alextran.immich.images.RemoteImageApi
 import app.alextran.immich.images.RemoteImagesImpl
+import app.alextran.immich.permission.PermissionApi
+import app.alextran.immich.permission.PermissionApiImpl
 import app.alextran.immich.sync.NativeSyncApi
 import app.alextran.immich.sync.NativeSyncApiImpl26
 import app.alextran.immich.sync.NativeSyncApiImpl30
+import app.alextran.immich.viewintent.ViewIntentPlugin
 import io.flutter.embedding.android.FlutterFragmentActivity
 import io.flutter.embedding.engine.FlutterEngine
 
@@ -29,6 +33,11 @@ class MainActivity : FlutterFragmentActivity() {
     registerPlugins(this, flutterEngine)
   }
 
+  override fun onNewIntent(intent: Intent) {
+    super.onNewIntent(intent)
+    setIntent(intent)
+  }
+
   companion object {
     fun registerPlugins(ctx: Context, flutterEngine: FlutterEngine) {
       HttpClientManager.initialize(ctx)
@@ -44,15 +53,19 @@ class MainActivity : FlutterFragmentActivity() {
         } else {
           NativeSyncApiImpl30(ctx)
         }
+      val permissionApiImpl = PermissionApiImpl(ctx)
       NativeSyncApi.setUp(messenger, nativeSyncApiImpl)
+      PermissionApi.setUp(messenger, permissionApiImpl)
       LocalImageApi.setUp(messenger, LocalImagesImpl(ctx))
       RemoteImageApi.setUp(messenger, RemoteImagesImpl(ctx))
 
       BackgroundWorkerFgHostApi.setUp(messenger, BackgroundWorkerApiImpl(ctx))
       ConnectivityApi.setUp(messenger, ConnectivityApiImpl(ctx))
 
+      flutterEngine.plugins.add(ViewIntentPlugin())
       flutterEngine.plugins.add(backgroundEngineLockImpl)
       flutterEngine.plugins.add(nativeSyncApiImpl)
+      flutterEngine.plugins.add(permissionApiImpl)
     }
 
     fun cancelPlugins(flutterEngine: FlutterEngine) {
@@ -60,6 +73,8 @@ class MainActivity : FlutterFragmentActivity() {
         flutterEngine.plugins.get(NativeSyncApiImpl26::class.java) as ImmichPlugin?
           ?: flutterEngine.plugins.get(NativeSyncApiImpl30::class.java) as ImmichPlugin?
       nativeApi?.detachFromEngine()
+      val permissionApi = flutterEngine.plugins.get(PermissionApiImpl::class.java) as ImmichPlugin?
+      permissionApi?.detachFromEngine()
     }
   }
 }

mobile/android/app/src/main/kotlin/app/alextran/immich/permission/ManageMediaPermissionDelegate.kt

@@ -0,0 +1,96 @@
+package app.alextran.immich.permission
+
+import android.content.Context
+import android.content.Intent
+import android.os.Build
+import android.provider.MediaStore
+import android.provider.Settings
+import androidx.core.net.toUri
+import io.flutter.embedding.engine.plugins.activity.ActivityPluginBinding
+import io.flutter.plugin.common.PluginRegistry
+
+class ManageMediaPermissionDelegate(
+  context: Context,
+  private val requestCode: Int = 1003,
+) : PluginRegistry.ActivityResultListener {
+  private val ctx = context.applicationContext
+  private var activityBinding: ActivityPluginBinding? = null
+  private var pendingResult: ((Result<Boolean>) -> Unit)? = null
+
+  fun hasManageMediaPermission(): Boolean {
+    return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+      MediaStore.canManageMedia(ctx)
+    } else {
+      false
+    }
+  }
+
+  fun requestManageMediaPermission(callback: (Result<Boolean>) -> Unit) {
+    if (hasManageMediaPermission()) {
+      callback(Result.success(true))
+      return
+    }
+
+    openManageMediaPermissionSettings(callback)
+  }
+
+  fun manageMediaPermission(callback: (Result<Boolean>) -> Unit) {
+    openManageMediaPermissionSettings(callback)
+  }
+
+  private fun openManageMediaPermissionSettings(callback: (Result<Boolean>) -> Unit) {
+    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S) {
+      callback(Result.success(false))
+      return
+    }
+
+    val activity = activityBinding?.activity
+    if (activity == null) {
+      callback(Result.failure(FlutterError("NO_ACTIVITY", "Activity not available", null)))
+      return
+    }
+
+    pendingResult = callback
+    val intent = Intent(Settings.ACTION_REQUEST_MANAGE_MEDIA).apply {
+      data = "package:${activity.packageName}".toUri()
+    }
+    try {
+      activity.startActivityForResult(intent, requestCode)
+    } catch (e: Exception) {
+      pendingResult = null
+      callback(
+        Result.failure(
+          FlutterError("ACTIVITY_LAUNCH_FAILED", "Failed to launch MANAGE_MEDIA settings", e.toString())
+        )
+      )
+    }
+  }
+
+  fun onAttachedToActivity(binding: ActivityPluginBinding) {
+    activityBinding = binding
+    binding.addActivityResultListener(this)
+  }
+
+  fun onDetachedFromActivity() {
+    failPending("ACTIVITY_DETACHED", "Activity detached before MANAGE_MEDIA result")
+    activityBinding?.removeActivityResultListener(this)
+    activityBinding = null
+  }
+
+  override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?): Boolean {
+    if (requestCode == this.requestCode) {
+      val callback = pendingResult
+      pendingResult = null
+      callback?.invoke(Result.success(hasManageMediaPermission()))
+      return true
+    }
+
+    return false
+  }
+
+  private fun failPending(code: String, message: String) {
+    val callback = pendingResult ?: return
+    pendingResult = null
+    callback(Result.failure(FlutterError(code, message, null)))
+  }
+}

mobile/android/app/src/main/kotlin/app/alextran/immich/permission/PermissionApi.g.kt

@@ -0,0 +1,128 @@
+// Autogenerated from Pigeon (v26.3.4), do not edit directly.
+// See also: https://pub.dev/packages/pigeon
+@file:Suppress("UNCHECKED_CAST", "ArrayInDataClass")
+
+package app.alextran.immich.permission
+
+import android.util.Log
+import io.flutter.plugin.common.BasicMessageChannel
+import io.flutter.plugin.common.BinaryMessenger
+import io.flutter.plugin.common.EventChannel
+import io.flutter.plugin.common.MessageCodec
+import io.flutter.plugin.common.StandardMethodCodec
+import io.flutter.plugin.common.StandardMessageCodec
+import java.io.ByteArrayOutputStream
+import java.nio.ByteBuffer
+private object PermissionApiPigeonUtils {
+
+  fun wrapResult(result: Any?): List<Any?> {
+    return listOf(result)
+  }
+
+  fun wrapError(exception: Throwable): List<Any?> {
+    return if (exception is FlutterError) {
+      listOf(
+        exception.code,
+        exception.message,
+        exception.details
+      )
+    } else {
+      listOf(
+        exception.javaClass.simpleName,
+        exception.toString(),
+        "Cause: " + exception.cause + ", Stacktrace: " + Log.getStackTraceString(exception)
+      )
+    }
+  }
+}
+
+/**
+ * Error class for passing custom error details to Flutter via a thrown PlatformException.
+ * @property code The error code.
+ * @property message The error message.
+ * @property details The error details. Must be a datatype supported by the api codec.
+ */
+class FlutterError (
+  val code: String,
+  override val message: String? = null,
+  val details: Any? = null
+) : RuntimeException()
+private open class PermissionApiPigeonCodec : StandardMessageCodec() {
+  override fun readValueOfType(type: Byte, buffer: ByteBuffer): Any? {
+    return     super.readValueOfType(type, buffer)
+  }
+  override fun writeValue(stream: ByteArrayOutputStream, value: Any?)   {
+    super.writeValue(stream, value)
+  }
+}
+
+
+/** Generated interface from Pigeon that represents a handler of messages from Flutter. */
+interface PermissionApi {
+  fun hasManageMediaPermission(): Boolean
+  fun requestManageMediaPermission(callback: (Result<Boolean>) -> Unit)
+  fun manageMediaPermission(callback: (Result<Boolean>) -> Unit)
+
+  companion object {
+    /** The codec used by PermissionApi. */
+    val codec: MessageCodec<Any?> by lazy {
+      PermissionApiPigeonCodec()
+    }
+    /** Sets up an instance of `PermissionApi` to handle messages through the `binaryMessenger`. */
+    @JvmOverloads
+    fun setUp(binaryMessenger: BinaryMessenger, api: PermissionApi?, messageChannelSuffix: String = "") {
+      val separatedMessageChannelSuffix = if (messageChannelSuffix.isNotEmpty()) ".$messageChannelSuffix" else ""
+      run {
+        val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.immich_mobile.PermissionApi.hasManageMediaPermission$separatedMessageChannelSuffix", codec)
+        if (api != null) {
+          channel.setMessageHandler { _, reply ->
+            val wrapped: List<Any?> = try {
+              listOf(api.hasManageMediaPermission())
+            } catch (exception: Throwable) {
+              PermissionApiPigeonUtils.wrapError(exception)
+            }
+            reply.reply(wrapped)
+          }
+        } else {
+          channel.setMessageHandler(null)
+        }
+      }
+      run {
+        val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.immich_mobile.PermissionApi.requestManageMediaPermission$separatedMessageChannelSuffix", codec)
+        if (api != null) {
+          channel.setMessageHandler { _, reply ->
+            api.requestManageMediaPermission{ result: Result<Boolean> ->
+              val error = result.exceptionOrNull()
+              if (error != null) {
+                reply.reply(PermissionApiPigeonUtils.wrapError(error))
+              } else {
+                val data = result.getOrNull()
+                reply.reply(PermissionApiPigeonUtils.wrapResult(data))
+              }
+            }
+          }
+        } else {
+          channel.setMessageHandler(null)
+        }
+      }
+      run {
+        val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.immich_mobile.PermissionApi.manageMediaPermission$separatedMessageChannelSuffix", codec)
+        if (api != null) {
+          channel.setMessageHandler { _, reply ->
+            api.manageMediaPermission{ result: Result<Boolean> ->
+              val error = result.exceptionOrNull()
+              if (error != null) {
+                reply.reply(PermissionApiPigeonUtils.wrapError(error))
+              } else {
+                val data = result.getOrNull()
+                reply.reply(PermissionApiPigeonUtils.wrapResult(data))
+              }
+            }
+          }
+        } else {
+          channel.setMessageHandler(null)
+        }
+      }
+    }
+  }
+}

mobile/android/app/src/main/kotlin/app/alextran/immich/permission/PermissionApiImpl.kt

@@ -0,0 +1,37 @@
+package app.alextran.immich.permission
+
+import android.content.Context
+import app.alextran.immich.core.ImmichPlugin
+import io.flutter.embedding.engine.plugins.activity.ActivityAware
+import io.flutter.embedding.engine.plugins.activity.ActivityPluginBinding
+
+class PermissionApiImpl(context: Context) : ImmichPlugin(), PermissionApi, ActivityAware {
+  private val manageMediaPermissionDelegate = ManageMediaPermissionDelegate(context)
+
+  override fun hasManageMediaPermission(): Boolean =
+    manageMediaPermissionDelegate.hasManageMediaPermission()
+
+  override fun requestManageMediaPermission(callback: (Result<Boolean>) -> Unit) {
+    manageMediaPermissionDelegate.requestManageMediaPermission { completeWhenActive(callback, it) }
+  }
+
+  override fun manageMediaPermission(callback: (Result<Boolean>) -> Unit) {
+    manageMediaPermissionDelegate.manageMediaPermission { completeWhenActive(callback, it) }
+  }
+
+  override fun onAttachedToActivity(binding: ActivityPluginBinding) {
+    manageMediaPermissionDelegate.onAttachedToActivity(binding)
+  }
+
+  override fun onDetachedFromActivityForConfigChanges() {
+    manageMediaPermissionDelegate.onDetachedFromActivity()
+  }
+
+  override fun onReattachedToActivityForConfigChanges(binding: ActivityPluginBinding) {
+    manageMediaPermissionDelegate.onAttachedToActivity(binding)
+  }
+
+  override fun onDetachedFromActivity() {
+    manageMediaPermissionDelegate.onDetachedFromActivity()
+  }
+}

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

@@ -0,0 +1,133 @@
+package app.alextran.immich.sync
+
+import android.app.Activity
+import android.content.ContentResolver
+import android.content.ContentUris
+import android.content.Context
+import android.content.Intent
+import android.net.Uri
+import android.os.Build
+import android.os.Bundle
+import android.provider.MediaStore
+import androidx.annotation.RequiresApi
+import io.flutter.embedding.engine.plugins.activity.ActivityPluginBinding
+import io.flutter.plugin.common.PluginRegistry
+
+class MediaTrashDelegate(
+  context: Context,
+  private val trashRequestCode: Int = 1002,
+) : PluginRegistry.ActivityResultListener {
+  private val ctx = context.applicationContext
+  private var activityBinding: ActivityPluginBinding? = null
+  private var pendingResult: ((Result<Boolean>) -> Unit)? = null
+
+  private fun hasManageMediaPermission(): Boolean {
+    return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+      MediaStore.canManageMedia(ctx)
+    } else {
+      false
+    }
+  }
+
+  fun restoreFromTrashById(mediaId: String, type: Long, callback: (Result<Boolean>) -> Unit) {
+    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.R || !hasManageMediaPermission()) {
+      callback(Result.failure(FlutterError("PERMISSION_DENIED", "Media permission required", null)))
+      return
+    }
+
+    val id = mediaId.toLongOrNull()
+    if (id == null) {
+      callback(Result.failure(FlutterError("INVALID_ID", "The file id is not a valid number: $mediaId", null)))
+      return
+    }
+
+    if (!isInTrash(id)) {
+      callback(Result.failure(FlutterError("TRASH_NOT_FOUND", "Item with id=$id not found in trash", null)))
+      return
+    }
+
+    restoreUri(ContentUris.withAppendedId(contentUriForType(type.toInt()), id), callback)
+  }
+
+  @RequiresApi(Build.VERSION_CODES.R)
+  private fun restoreUri(
+    contentUri: Uri,
+    callback: (Result<Boolean>) -> Unit,
+  ) {
+    val activity = activityBinding?.activity
+    if (activity == null) {
+      callback(Result.failure(FlutterError("NO_ACTIVITY", "Activity not available", null)))
+      return
+    }
+
+    try {
+      val pendingIntent = MediaStore.createTrashRequest(ctx.contentResolver, listOf(contentUri), false)
+      pendingResult = callback
+      activity.startIntentSenderForResult(
+        pendingIntent.intentSender,
+        trashRequestCode,
+        null,
+        0,
+        0,
+        0,
+      )
+    } catch (e: Exception) {
+      pendingResult = null
+      callback(
+        Result.failure(
+          FlutterError("TRASH_ERROR", "Error creating or starting trash request", e.toString())
+        )
+      )
+    }
+  }
+
+  @RequiresApi(Build.VERSION_CODES.R)
+  private fun isInTrash(id: Long): Boolean {
+    val filesUri = MediaStore.Files.getContentUri(MediaStore.VOLUME_EXTERNAL)
+    val args = Bundle().apply {
+      putString(ContentResolver.QUERY_ARG_SQL_SELECTION, "${MediaStore.Files.FileColumns._ID}=?")
+      putStringArray(ContentResolver.QUERY_ARG_SQL_SELECTION_ARGS, arrayOf(id.toString()))
+      putInt(MediaStore.QUERY_ARG_MATCH_TRASHED, MediaStore.MATCH_ONLY)
+      putInt(ContentResolver.QUERY_ARG_LIMIT, 1)
+    }
+    return ctx.contentResolver.query(filesUri, arrayOf(MediaStore.Files.FileColumns._ID), args, null)
+      ?.use { it.moveToFirst() } == true
+  }
+
+  private fun contentUriForType(type: Int): Uri =
+    when (type) {
+      // Same order as AssetType from Dart.
+      1 -> MediaStore.Images.Media.EXTERNAL_CONTENT_URI
+      2 -> MediaStore.Video.Media.EXTERNAL_CONTENT_URI
+      3 -> MediaStore.Audio.Media.EXTERNAL_CONTENT_URI
+      else -> MediaStore.Files.getContentUri(MediaStore.VOLUME_EXTERNAL)
+    }
+
+  fun onAttachedToActivity(binding: ActivityPluginBinding) {
+    activityBinding = binding
+    binding.addActivityResultListener(this)
+  }
+
+  fun onDetachedFromActivity() {
+    failPending("ACTIVITY_DETACHED", "Activity detached before trash result")
+    activityBinding?.removeActivityResultListener(this)
+    activityBinding = null
+  }
+
+  override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?): Boolean {
+    if (requestCode == trashRequestCode) {
+      val callback = pendingResult
+      pendingResult = null
+      callback?.invoke(Result.success(resultCode == Activity.RESULT_OK))
+      return true
+    }
+
+    return false
+  }
+
+  private fun failPending(code: String, message: String) {
+    val callback = pendingResult ?: return
+    pendingResult = null
+    callback(Result.failure(FlutterError(code, message, null)))
+  }
+}

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

@@ -553,6 +553,7 @@ interface NativeSyncApi {
   fun hashAssets(assetIds: List<String>, allowNetworkAccess: Boolean, callback: (Result<List<HashResult>>) -> Unit)
   fun cancelHashing()
   fun getTrashedAssets(): Map<String, List<PlatformAsset>>
+  fun restoreFromTrashById(mediaId: String, type: Long, callback: (Result<Boolean>) -> Unit)
   fun getCloudIdForAssetIds(assetIds: List<String>): List<CloudIdResult>
 
   companion object {
@@ -747,6 +748,27 @@ interface NativeSyncApi {
           channel.setMessageHandler(null)
         }
       }
+      run {
+        val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.immich_mobile.NativeSyncApi.restoreFromTrashById$separatedMessageChannelSuffix", codec)
+        if (api != null) {
+          channel.setMessageHandler { message, reply ->
+            val args = message as List<Any?>
+            val mediaIdArg = args[0] as String
+            val typeArg = args[1] as Long
+            api.restoreFromTrashById(mediaIdArg, typeArg) { result: Result<Boolean> ->
+              val error = result.exceptionOrNull()
+              if (error != null) {
+                reply.reply(MessagesPigeonUtils.wrapError(error))
+              } else {
+                val data = result.getOrNull()
+                reply.reply(MessagesPigeonUtils.wrapResult(data))
+              }
+            }
+          }
+        } else {
+          channel.setMessageHandler(null)
+        }
+      }
       run {
         val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.immich_mobile.NativeSyncApi.getCloudIdForAssetIds$separatedMessageChannelSuffix", codec, taskQueue)
         if (api != null) {

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

@@ -17,6 +17,8 @@ import com.bumptech.glide.Glide
 import com.bumptech.glide.load.ImageHeaderParser
 import com.bumptech.glide.load.ImageHeaderParserUtils
 import com.bumptech.glide.load.resource.bitmap.DefaultImageHeaderParser
+import io.flutter.embedding.engine.plugins.activity.ActivityAware
+import io.flutter.embedding.engine.plugins.activity.ActivityPluginBinding
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
@@ -39,10 +41,11 @@ sealed class AssetResult {
 private const val TAG = "NativeSyncApiImplBase"
 
 @SuppressLint("InlinedApi")
-open class NativeSyncApiImplBase(context: Context) : ImmichPlugin() {
+open class NativeSyncApiImplBase(context: Context) : ImmichPlugin(), ActivityAware {
   private val ctx: Context = context.applicationContext
 
   private var hashTask: Job? = null
+  private val mediaTrashDelegate = MediaTrashDelegate(ctx)
 
   companion object {
     private const val MAX_CONCURRENT_HASH_OPERATIONS = 16
@@ -448,6 +451,26 @@ open class NativeSyncApiImplBase(context: Context) : ImmichPlugin() {
     hashTask = null
   }
 
+  fun restoreFromTrashById(mediaId: String, type: Long, callback: (Result<Boolean>) -> Unit) {
+    mediaTrashDelegate.restoreFromTrashById(mediaId, type) { completeWhenActive(callback, it) }
+  }
+
+  override fun onAttachedToActivity(binding: ActivityPluginBinding) {
+    mediaTrashDelegate.onAttachedToActivity(binding)
+  }
+
+  override fun onDetachedFromActivityForConfigChanges() {
+    mediaTrashDelegate.onDetachedFromActivity()
+  }
+
+  override fun onReattachedToActivityForConfigChanges(binding: ActivityPluginBinding) {
+    mediaTrashDelegate.onAttachedToActivity(binding)
+  }
+
+  override fun onDetachedFromActivity() {
+    mediaTrashDelegate.onDetachedFromActivity()
+  }
+
   // This method is only implemented on iOS; on Android, we do not have a concept of cloud IDs
   @Suppress("unused", "UNUSED_PARAMETER")
   fun getCloudIdForAssetIds(assetIds: List<String>): List<CloudIdResult> {

mobile/android/app/src/main/kotlin/app/alextran/immich/viewintent/ViewIntent.g.kt

@@ -0,0 +1,292 @@
+// Autogenerated from Pigeon (v26.3.4), do not edit directly.
+// See also: https://pub.dev/packages/pigeon
+@file:Suppress("UNCHECKED_CAST", "ArrayInDataClass")
+
+package app.alextran.immich.viewintent
+
+import android.util.Log
+import io.flutter.plugin.common.BasicMessageChannel
+import io.flutter.plugin.common.BinaryMessenger
+import io.flutter.plugin.common.EventChannel
+import io.flutter.plugin.common.MessageCodec
+import io.flutter.plugin.common.StandardMethodCodec
+import io.flutter.plugin.common.StandardMessageCodec
+import java.io.ByteArrayOutputStream
+import java.nio.ByteBuffer
+private object ViewIntentPigeonUtils {
+
+  fun wrapResult(result: Any?): List<Any?> {
+    return listOf(result)
+  }
+
+  fun wrapError(exception: Throwable): List<Any?> {
+    return if (exception is FlutterError) {
+      listOf(
+        exception.code,
+        exception.message,
+        exception.details
+      )
+    } else {
+      listOf(
+        exception.javaClass.simpleName,
+        exception.toString(),
+        "Cause: " + exception.cause + ", Stacktrace: " + Log.getStackTraceString(exception)
+      )
+    }
+  }
+  fun doubleEquals(a: Double, b: Double): Boolean {
+    // Normalize -0.0 to 0.0 and handle NaN equality.
+    return (if (a == 0.0) 0.0 else a) == (if (b == 0.0) 0.0 else b) || (a.isNaN() && b.isNaN())
+  }
+
+  fun floatEquals(a: Float, b: Float): Boolean {
+    // Normalize -0.0 to 0.0 and handle NaN equality.
+    return (if (a == 0.0f) 0.0f else a) == (if (b == 0.0f) 0.0f else b) || (a.isNaN() && b.isNaN())
+  }
+
+  fun doubleHash(d: Double): Int {
+    // Normalize -0.0 to 0.0 and handle NaN to ensure consistent hash codes.
+    val normalized = if (d == 0.0) 0.0 else d
+    val bits = java.lang.Double.doubleToLongBits(normalized)
+    return (bits xor (bits ushr 32)).toInt()
+  }
+
+  fun floatHash(f: Float): Int {
+    // Normalize -0.0 to 0.0 and handle NaN to ensure consistent hash codes.
+    val normalized = if (f == 0.0f) 0.0f else f
+    return java.lang.Float.floatToIntBits(normalized)
+  }
+
+  fun deepEquals(a: Any?, b: Any?): Boolean {
+    if (a === b) {
+      return true
+    }
+    if (a == null || b == null) {
+      return false
+    }
+    if (a is ByteArray && b is ByteArray) {
+      return a.contentEquals(b)
+    }
+    if (a is IntArray && b is IntArray) {
+      return a.contentEquals(b)
+    }
+    if (a is LongArray && b is LongArray) {
+      return a.contentEquals(b)
+    }
+    if (a is DoubleArray && b is DoubleArray) {
+      if (a.size != b.size) return false
+      for (i in a.indices) {
+        if (!doubleEquals(a[i], b[i])) return false
+      }
+      return true
+    }
+    if (a is FloatArray && b is FloatArray) {
+      if (a.size != b.size) return false
+      for (i in a.indices) {
+        if (!floatEquals(a[i], b[i])) return false
+      }
+      return true
+    }
+    if (a is Array<*> && b is Array<*>) {
+      if (a.size != b.size) return false
+      for (i in a.indices) {
+        if (!deepEquals(a[i], b[i])) return false
+      }
+      return true
+    }
+    if (a is List<*> && b is List<*>) {
+      if (a.size != b.size) return false
+      val iterA = a.iterator()
+      val iterB = b.iterator()
+      while (iterA.hasNext() && iterB.hasNext()) {
+        if (!deepEquals(iterA.next(), iterB.next())) return false
+      }
+      return true
+    }
+    if (a is Map<*, *> && b is Map<*, *>) {
+      if (a.size != b.size) return false
+      for (entry in a) {
+        val key = entry.key
+        var found = false
+        for (bEntry in b) {
+          if (deepEquals(key, bEntry.key)) {
+            if (deepEquals(entry.value, bEntry.value)) {
+              found = true
+              break
+            } else {
+              return false
+            }
+          }
+        }
+        if (!found) return false
+      }
+      return true
+    }
+    if (a is Double && b is Double) {
+      return doubleEquals(a, b)
+    }
+    if (a is Float && b is Float) {
+      return floatEquals(a, b)
+    }
+    return a == b
+  }
+
+  fun deepHash(value: Any?): Int {
+    return when (value) {
+      null -> 0
+      is ByteArray -> value.contentHashCode()
+      is IntArray -> value.contentHashCode()
+      is LongArray -> value.contentHashCode()
+      is DoubleArray -> {
+        var result = 1
+        for (item in value) {
+          result = 31 * result + doubleHash(item)
+        }
+        result
+      }
+      is FloatArray -> {
+        var result = 1
+        for (item in value) {
+          result = 31 * result + floatHash(item)
+        }
+        result
+      }
+      is Array<*> -> {
+        var result = 1
+        for (item in value) {
+          result = 31 * result + deepHash(item)
+        }
+        result
+      }
+      is List<*> -> {
+        var result = 1
+        for (item in value) {
+          result = 31 * result + deepHash(item)
+        }
+        result
+      }
+      is Map<*, *> -> {
+        var result = 0
+        for (entry in value) {
+          result += ((deepHash(entry.key) * 31) xor deepHash(entry.value))
+        }
+        result
+      }
+      is Double -> doubleHash(value)
+      is Float -> floatHash(value)
+      else -> value.hashCode()
+    }
+  }
+
+}
+
+/**
+ * Error class for passing custom error details to Flutter via a thrown PlatformException.
+ * @property code The error code.
+ * @property message The error message.
+ * @property details The error details. Must be a datatype supported by the api codec.
+ */
+class FlutterError (
+  val code: String,
+  override val message: String? = null,
+  val details: Any? = null
+) : RuntimeException()
+
+/** Generated class from Pigeon that represents data sent in messages. */
+data class ViewIntentPayload (
+  val path: String? = null,
+  val mimeType: String,
+  val localAssetId: String? = null
+)
+ {
+  companion object {
+    fun fromList(pigeonVar_list: List<Any?>): ViewIntentPayload {
+      val path = pigeonVar_list[0] as String?
+      val mimeType = pigeonVar_list[1] as String
+      val localAssetId = pigeonVar_list[2] as String?
+      return ViewIntentPayload(path, mimeType, localAssetId)
+    }
+  }
+  fun toList(): List<Any?> {
+    return listOf(
+      path,
+      mimeType,
+      localAssetId,
+    )
+  }
+  override fun equals(other: Any?): Boolean {
+    if (other == null || other.javaClass != javaClass) {
+      return false
+    }
+    if (this === other) {
+      return true
+    }
+    val other = other as ViewIntentPayload
+    return ViewIntentPigeonUtils.deepEquals(this.path, other.path) && ViewIntentPigeonUtils.deepEquals(this.mimeType, other.mimeType) && ViewIntentPigeonUtils.deepEquals(this.localAssetId, other.localAssetId)
+  }
+
+  override fun hashCode(): Int {
+    var result = javaClass.hashCode()
+    result = 31 * result + ViewIntentPigeonUtils.deepHash(this.path)
+    result = 31 * result + ViewIntentPigeonUtils.deepHash(this.mimeType)
+    result = 31 * result + ViewIntentPigeonUtils.deepHash(this.localAssetId)
+    return result
+  }
+}
+private open class ViewIntentPigeonCodec : StandardMessageCodec() {
+  override fun readValueOfType(type: Byte, buffer: ByteBuffer): Any? {
+    return when (type) {
+      129.toByte() -> {
+        return (readValue(buffer) as? List<Any?>)?.let {
+          ViewIntentPayload.fromList(it)
+        }
+      }
+      else -> super.readValueOfType(type, buffer)
+    }
+  }
+  override fun writeValue(stream: ByteArrayOutputStream, value: Any?)   {
+    when (value) {
+      is ViewIntentPayload -> {
+        stream.write(129)
+        writeValue(stream, value.toList())
+      }
+      else -> super.writeValue(stream, value)
+    }
+  }
+}
+
+
+/** Generated interface from Pigeon that represents a handler of messages from Flutter. */
+interface ViewIntentHostApi {
+  fun consumeViewIntent(callback: (Result<ViewIntentPayload?>) -> Unit)
+
+  companion object {
+    /** The codec used by ViewIntentHostApi. */
+    val codec: MessageCodec<Any?> by lazy {
+      ViewIntentPigeonCodec()
+    }
+    /** Sets up an instance of `ViewIntentHostApi` to handle messages through the `binaryMessenger`. */
+    @JvmOverloads
+    fun setUp(binaryMessenger: BinaryMessenger, api: ViewIntentHostApi?, messageChannelSuffix: String = "") {
+      val separatedMessageChannelSuffix = if (messageChannelSuffix.isNotEmpty()) ".$messageChannelSuffix" else ""
+      run {
+        val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.immich_mobile.ViewIntentHostApi.consumeViewIntent$separatedMessageChannelSuffix", codec)
+        if (api != null) {
+          channel.setMessageHandler { _, reply ->
+            api.consumeViewIntent{ result: Result<ViewIntentPayload?> ->
+              val error = result.exceptionOrNull()
+              if (error != null) {
+                reply.reply(ViewIntentPigeonUtils.wrapError(error))
+              } else {
+                val data = result.getOrNull()
+                reply.reply(ViewIntentPigeonUtils.wrapResult(data))
+              }
+            }
+          }
+        } else {
+          channel.setMessageHandler(null)
+        }
+      }
+    }
+  }
+}

mobile/android/app/src/main/kotlin/app/alextran/immich/viewintent/ViewIntentPlugin.kt

@@ -0,0 +1,219 @@
+package app.alextran.immich.viewintent
+
+import android.app.Activity
+import android.content.ContentUris
+import android.content.Context
+import android.content.Intent
+import android.net.Uri
+import android.os.Build
+import android.provider.DocumentsContract
+import android.provider.MediaStore
+import android.provider.OpenableColumns
+import android.util.Log
+import android.webkit.MimeTypeMap
+import io.flutter.embedding.engine.plugins.FlutterPlugin
+import io.flutter.embedding.engine.plugins.activity.ActivityAware
+import io.flutter.embedding.engine.plugins.activity.ActivityPluginBinding
+import io.flutter.plugin.common.PluginRegistry
+import java.io.File
+import java.io.FileOutputStream
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.cancel
+import kotlinx.coroutines.launch
+
+private const val TAG = "ViewIntentPlugin"
+
+class ViewIntentPlugin : FlutterPlugin, ActivityAware, PluginRegistry.NewIntentListener, ViewIntentHostApi {
+  private var context: Context? = null
+  private var activity: Activity? = null
+  private var pendingIntent: Intent? = null
+  private val ioScope = CoroutineScope(SupervisorJob() + Dispatchers.IO)
+
+  override fun onAttachedToEngine(binding: FlutterPlugin.FlutterPluginBinding) {
+    context = binding.applicationContext
+    ViewIntentHostApi.setUp(binding.binaryMessenger, this)
+  }
+
+  override fun onDetachedFromEngine(binding: FlutterPlugin.FlutterPluginBinding) {
+    ViewIntentHostApi.setUp(binding.binaryMessenger, null)
+    ioScope.cancel()
+    context = null
+  }
+
+  override fun onAttachedToActivity(binding: ActivityPluginBinding) {
+    activity = binding.activity
+    pendingIntent = binding.activity.intent
+    binding.addOnNewIntentListener(this)
+  }
+
+  override fun onDetachedFromActivityForConfigChanges() {
+    activity = null
+  }
+
+  override fun onReattachedToActivityForConfigChanges(binding: ActivityPluginBinding) {
+    onAttachedToActivity(binding)
+  }
+
+  override fun onDetachedFromActivity() {
+    activity = null
+  }
+
+  override fun onNewIntent(intent: Intent): Boolean {
+    pendingIntent = intent
+    return false
+  }
+
+  override fun consumeViewIntent(callback: (Result<ViewIntentPayload?>) -> Unit) {
+    val context = context ?: run {
+      callback(Result.success(null))
+      return
+    }
+    val intent = pendingIntent ?: activity?.intent
+
+    if (intent?.action != Intent.ACTION_VIEW) {
+      callback(Result.success(null))
+      return
+    }
+
+    val uri = intent.data
+    if (uri == null) {
+      callback(Result.success(null))
+      return
+    }
+
+    ioScope.launch {
+      try {
+        val mimeType = context.contentResolver.getType(uri) ?: intent.type
+        if (mimeType == null || (!mimeType.startsWith("image/") && !mimeType.startsWith("video/"))) {
+          callback(Result.success(null))
+          return@launch
+        }
+
+        val localAssetId = extractLocalAssetId(context, uri, mimeType)
+        val tempFilePath = if (localAssetId == null) {
+          copyUriToTempFile(context, uri, mimeType)?.absolutePath ?: run {
+            callback(Result.success(null))
+            return@launch
+          }
+        } else {
+          null
+        }
+        val payload = ViewIntentPayload(
+          path = tempFilePath,
+          mimeType = mimeType,
+          localAssetId = localAssetId,
+        )
+        consumeViewIntent(intent)
+        callback(Result.success(payload))
+      } catch (e: Exception) {
+        callback(Result.failure(e))
+      }
+    }
+  }
+
+  private fun consumeViewIntent(currentIntent: Intent) {
+    pendingIntent = Intent(currentIntent).apply {
+      action = null
+      data = null
+      type = null
+    }
+    activity?.intent = pendingIntent
+  }
+
+  private fun extractLocalAssetId(context: Context, uri: Uri, mimeType: String): String? {
+    return tryExtractDocumentLocalAssetId(context, uri)
+      ?: tryParseContentUriId(uri)
+      ?: tryParseLastPathSegmentId(uri)
+      ?: resolveLocalIdByNameAndSize(context, uri, mimeType)
+  }
+
+  private fun tryExtractDocumentLocalAssetId(context: Context, uri: Uri): String? {
+    return try {
+      if (!DocumentsContract.isDocumentUri(context, uri)) return null
+      val docId = DocumentsContract.getDocumentId(uri)
+      if (docId.isBlank() || docId.startsWith("raw:")) return null
+      val parsed = docId.substringAfter(':', docId)
+      if (parsed.isNotEmpty() && parsed.all(Char::isDigit)) parsed else null
+    } catch (e: Exception) {
+      Log.w(TAG, "Failed to resolve local asset id from document URI: $uri", e)
+      null
+    }
+  }
+
+  private fun tryParseContentUriId(uri: Uri): String? {
+    return try {
+      val parsed = ContentUris.parseId(uri)
+      if (parsed >= 0) parsed.toString() else null
+    } catch (e: Exception) {
+      Log.w(TAG, "Failed to parse local asset id from content URI: $uri", e)
+      null
+    }
+  }
+
+  private fun tryParseLastPathSegmentId(uri: Uri): String? {
+    val segment = uri.lastPathSegment ?: return null
+    return if (segment.all(Char::isDigit)) segment else null
+  }
+
+  private fun copyUriToTempFile(context: Context, uri: Uri, mimeType: String): File? {
+    return try {
+      val extension = MimeTypeMap.getSingleton().getExtensionFromMimeType(mimeType)?.let { ".$it" }
+      val tempFile = File.createTempFile("view_intent_", extension, context.cacheDir)
+      context.contentResolver.openInputStream(uri)?.use { inputStream ->
+        FileOutputStream(tempFile).use { outputStream ->
+          inputStream.copyTo(outputStream)
+        }
+      } ?: return null
+      tempFile
+    } catch (_: Exception) {
+      null
+    }
+  }
+
+  private fun resolveLocalIdByNameAndSize(context: Context, uri: Uri, mimeType: String): String? {
+    val metaProjection = arrayOf(OpenableColumns.DISPLAY_NAME, OpenableColumns.SIZE)
+    val (displayName, size) =
+      try {
+        context.contentResolver.query(uri, metaProjection, null, null, null)?.use { cursor ->
+          if (!cursor.moveToFirst()) return null
+          val nameIdx = cursor.getColumnIndex(OpenableColumns.DISPLAY_NAME)
+          val sizeIdx = cursor.getColumnIndex(OpenableColumns.SIZE)
+          val name = if (nameIdx >= 0) cursor.getString(nameIdx) else null
+          val bytes = if (sizeIdx >= 0) cursor.getLong(sizeIdx) else -1L
+          if (name.isNullOrBlank() || bytes < 0) return null
+          name to bytes
+        } ?: return null
+      } catch (_: Exception) {
+        return null
+      }
+
+    val tableUri = when {
+      mimeType.startsWith("image/") -> MediaStore.Images.Media.EXTERNAL_CONTENT_URI
+      mimeType.startsWith("video/") -> MediaStore.Video.Media.EXTERNAL_CONTENT_URI
+      else -> if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+        MediaStore.Files.getContentUri(MediaStore.VOLUME_EXTERNAL)
+      } else {
+        MediaStore.Files.getContentUri("external")
+      }
+    }
+    return try {
+      context.contentResolver
+        .query(
+          tableUri,
+          arrayOf(MediaStore.MediaColumns._ID),
+          "${MediaStore.MediaColumns.DISPLAY_NAME}=? AND ${MediaStore.MediaColumns.SIZE}=?",
+          arrayOf(displayName, size.toString()),
+          "${MediaStore.MediaColumns.DATE_MODIFIED} DESC",
+        )?.use { cursor ->
+          if (!cursor.moveToFirst()) return null
+          val idIndex = cursor.getColumnIndex(MediaStore.MediaColumns._ID)
+          if (idIndex < 0) return null
+          cursor.getLong(idIndex).toString()
+        }
+    } catch (_: Exception) {
+      null
+    }
+  }
+}

mobile/ios/Runner.xcodeproj/project.pbxproj

@@ -19,6 +19,8 @@
 		B21E34AC2E5B09190031FDB9 /* BackgroundWorker.swift in Sources */ = {isa = PBXBuildFile; fileRef = B21E34AB2E5B09100031FDB9 /* BackgroundWorker.swift */; };
 		B25D377A2E72CA15008B6CA7 /* Connectivity.g.swift in Sources */ = {isa = PBXBuildFile; fileRef = B25D37782E72CA15008B6CA7 /* Connectivity.g.swift */; };
 		B25D377C2E72CA26008B6CA7 /* ConnectivityApiImpl.swift in Sources */ = {isa = PBXBuildFile; fileRef = B25D377B2E72CA20008B6CA7 /* ConnectivityApiImpl.swift */; };
+		B2EE00022E72CA15008B6CA7 /* PermissionApi.g.swift in Sources */ = {isa = PBXBuildFile; fileRef = B2EE00012E72CA15008B6CA7 /* PermissionApi.g.swift */; };
+		B2EE00042E72CA15008B6CA7 /* PermissionApiImpl.swift in Sources */ = {isa = PBXBuildFile; fileRef = B2EE00032E72CA15008B6CA7 /* PermissionApiImpl.swift */; };
 		B2BE315F2E5E5229006EEF88 /* BackgroundWorker.g.swift in Sources */ = {isa = PBXBuildFile; fileRef = B2BE315E2E5E5229006EEF88 /* BackgroundWorker.g.swift */; };
 		D218389C4A4C4693F141F7D1 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 886774DBDDE6B35BF2B4F2CD /* Pods_Runner.framework */; };
 		F02538E92DFBCBDD008C3FA3 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
@@ -105,6 +107,8 @@
 		B21E34AB2E5B09100031FDB9 /* BackgroundWorker.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BackgroundWorker.swift; sourceTree = "<group>"; };
 		B25D37782E72CA15008B6CA7 /* Connectivity.g.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Connectivity.g.swift; sourceTree = "<group>"; };
 		B25D377B2E72CA20008B6CA7 /* ConnectivityApiImpl.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConnectivityApiImpl.swift; sourceTree = "<group>"; };
+		B2EE00012E72CA15008B6CA7 /* PermissionApi.g.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PermissionApi.g.swift; sourceTree = "<group>"; };
+		B2EE00032E72CA15008B6CA7 /* PermissionApiImpl.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PermissionApiImpl.swift; sourceTree = "<group>"; };
 		B2BE315E2E5E5229006EEF88 /* BackgroundWorker.g.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BackgroundWorker.g.swift; sourceTree = "<group>"; };
 		E0E99CDC17B3EB7FA8BA2332 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
 		F0B57D382DF764BD00DC5BCC /* WidgetExtension.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = WidgetExtension.appex; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -283,6 +287,7 @@
 				B25D37792E72CA15008B6CA7 /* Connectivity */,
 				B21E34A62E5AF9760031FDB9 /* Background */,
 				B2CF7F8C2DDE4EBB00744BF6 /* Sync */,
+				B2EE00052E72CA15008B6CA7 /* Permission */,
 				FA9973382CF6DF4B000EF859 /* Runner.entitlements */,
 				FAC7416727DB9F5500C668D8 /* RunnerProfile.entitlements */,
 				97C146FA1CF9000F007C117D /* Main.storyboard */,
@@ -317,6 +322,15 @@
 			path = Connectivity;
 			sourceTree = "<group>";
 		};
+		B2EE00052E72CA15008B6CA7 /* Permission */ = {
+			isa = PBXGroup;
+			children = (
+				B2EE00032E72CA15008B6CA7 /* PermissionApiImpl.swift */,
+				B2EE00012E72CA15008B6CA7 /* PermissionApi.g.swift */,
+			);
+			path = Permission;
+			sourceTree = "<group>";
+		};
 		FAC6F8B62D287F120078CB2F /* ShareExtension */ = {
 			isa = PBXGroup;
 			children = (
@@ -619,6 +633,8 @@
 				FE5499F42F1197D8006016CB /* RemoteImages.g.swift in Sources */,
 				FE5FE4AE2F30FBC000A71243 /* ImageProcessing.swift in Sources */,
 				B25D377A2E72CA15008B6CA7 /* Connectivity.g.swift in Sources */,
+				B2EE00022E72CA15008B6CA7 /* PermissionApi.g.swift in Sources */,
+				B2EE00042E72CA15008B6CA7 /* PermissionApiImpl.swift in Sources */,
 				FE5499F82F1198E2006016CB /* RemoteImagesImpl.swift in Sources */,
 				FEAFA8732E4D42F4001E47FE /* Thumbhash.swift in Sources */,
 				B25D377C2E72CA26008B6CA7 /* ConnectivityApiImpl.swift in Sources */,

mobile/ios/Runner/AppDelegate.swift

@@ -26,6 +26,7 @@ import native_video_player
 
   public static func registerPlugins(with registry: FlutterPluginRegistry, messenger: FlutterBinaryMessenger) {
     NativeSyncApiImpl.register(with: registry.registrar(forPlugin: NativeSyncApiImpl.name)!)
+    PermissionApiSetup.setUp(binaryMessenger: messenger, api: PermissionApiImpl())
     LocalImageApiSetup.setUp(binaryMessenger: messenger, api: LocalImageApiImpl())
     RemoteImageApiSetup.setUp(binaryMessenger: messenger, api: RemoteImageApiImpl())
     BackgroundWorkerFgHostApiSetup.setUp(binaryMessenger: messenger, api: BackgroundWorkerApiImpl())

mobile/ios/Runner/Permission/PermissionApi.g.swift

@@ -0,0 +1,106 @@
+// Autogenerated from Pigeon (v26.3.4), do not edit directly.
+// See also: https://pub.dev/packages/pigeon
+
+import Foundation
+
+#if os(iOS)
+  import Flutter
+#elseif os(macOS)
+  import FlutterMacOS
+#else
+  #error("Unsupported platform.")
+#endif
+
+private func wrapResult(_ result: Any?) -> [Any?] {
+  return [result]
+}
+
+private func wrapError(_ error: Any) -> [Any?] {
+  if let pigeonError = error as? PigeonError {
+    return [
+      pigeonError.code,
+      pigeonError.message,
+      pigeonError.details,
+    ]
+  }
+  if let flutterError = error as? FlutterError {
+    return [
+      flutterError.code,
+      flutterError.message,
+      flutterError.details,
+    ]
+  }
+  return [
+    "\(error)",
+    "\(Swift.type(of: error))",
+    "Stacktrace: \(Thread.callStackSymbols)",
+  ]
+}
+
+private func isNullish(_ value: Any?) -> Bool {
+  return value is NSNull || value == nil
+}
+
+private func nilOrValue<T>(_ value: Any?) -> T? {
+  if value is NSNull { return nil }
+  return value as! T?
+}
+
+/// Generated protocol from Pigeon that represents a handler of messages from Flutter.
+protocol PermissionApi {
+  func hasManageMediaPermission() throws -> Bool
+  func requestManageMediaPermission(completion: @escaping (Result<Bool, Error>) -> Void)
+  func manageMediaPermission(completion: @escaping (Result<Bool, Error>) -> Void)
+}
+
+/// Generated setup class from Pigeon to handle messages through the `binaryMessenger`.
+class PermissionApiSetup {
+  static var codec: FlutterStandardMessageCodec { FlutterStandardMessageCodec.sharedInstance() }
+  /// Sets up an instance of `PermissionApi` to handle messages through the `binaryMessenger`.
+  static func setUp(binaryMessenger: FlutterBinaryMessenger, api: PermissionApi?, messageChannelSuffix: String = "") {
+    let channelSuffix = messageChannelSuffix.count > 0 ? ".\(messageChannelSuffix)" : ""
+    let hasManageMediaPermissionChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.immich_mobile.PermissionApi.hasManageMediaPermission\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec)
+    if let api = api {
+      hasManageMediaPermissionChannel.setMessageHandler { _, reply in
+        do {
+          let result = try api.hasManageMediaPermission()
+          reply(wrapResult(result))
+        } catch {
+          reply(wrapError(error))
+        }
+      }
+    } else {
+      hasManageMediaPermissionChannel.setMessageHandler(nil)
+    }
+    let requestManageMediaPermissionChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.immich_mobile.PermissionApi.requestManageMediaPermission\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec)
+    if let api = api {
+      requestManageMediaPermissionChannel.setMessageHandler { _, reply in
+        api.requestManageMediaPermission { result in
+          switch result {
+          case .success(let res):
+            reply(wrapResult(res))
+          case .failure(let error):
+            reply(wrapError(error))
+          }
+        }
+      }
+    } else {
+      requestManageMediaPermissionChannel.setMessageHandler(nil)
+    }
+    let manageMediaPermissionChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.immich_mobile.PermissionApi.manageMediaPermission\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec)
+    if let api = api {
+      manageMediaPermissionChannel.setMessageHandler { _, reply in
+        api.manageMediaPermission { result in
+          switch result {
+          case .success(let res):
+            reply(wrapResult(res))
+          case .failure(let error):
+            reply(wrapError(error))
+          }
+        }
+      }
+    } else {
+      manageMediaPermissionChannel.setMessageHandler(nil)
+    }
+  }
+}

mobile/ios/Runner/Permission/PermissionApiImpl.swift

@@ -0,0 +1,15 @@
+import Foundation
+
+class PermissionApiImpl: PermissionApi {
+  func hasManageMediaPermission() throws -> Bool {
+    return false
+  }
+
+  func requestManageMediaPermission(completion: @escaping (Result<Bool, Error>) -> Void) {
+    completion(.success(false))
+  }
+
+  func manageMediaPermission(completion: @escaping (Result<Bool, Error>) -> Void) {
+    completion(.success(false))
+  }
+}

mobile/ios/Runner/Sync/Messages.g.swift

@@ -537,6 +537,7 @@ protocol NativeSyncApi {
   func hashAssets(assetIds: [String], allowNetworkAccess: Bool, completion: @escaping (Result<[HashResult], Error>) -> Void)
   func cancelHashing() throws
   func getTrashedAssets() throws -> [String: [PlatformAsset]]
+  func restoreFromTrashById(mediaId: String, type: Int64, completion: @escaping (Result<Bool, Error>) -> Void)
   func getCloudIdForAssetIds(assetIds: [String]) throws -> [CloudIdResult]
 }
 
@@ -721,6 +722,24 @@ class NativeSyncApiSetup {
     } else {
       getTrashedAssetsChannel.setMessageHandler(nil)
     }
+    let restoreFromTrashByIdChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.immich_mobile.NativeSyncApi.restoreFromTrashById\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec)
+    if let api = api {
+      restoreFromTrashByIdChannel.setMessageHandler { message, reply in
+        let args = message as! [Any?]
+        let mediaIdArg = args[0] as! String
+        let typeArg = args[1] as! Int64
+        api.restoreFromTrashById(mediaId: mediaIdArg, type: typeArg) { result in
+          switch result {
+          case .success(let res):
+            reply(wrapResult(res))
+          case .failure(let error):
+            reply(wrapError(error))
+          }
+        }
+      }
+    } else {
+      restoreFromTrashByIdChannel.setMessageHandler(nil)
+    }
     let getCloudIdForAssetIdsChannel = taskQueue == nil
       ? FlutterBasicMessageChannel(name: "dev.flutter.pigeon.immich_mobile.NativeSyncApi.getCloudIdForAssetIds\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec)
       : FlutterBasicMessageChannel(name: "dev.flutter.pigeon.immich_mobile.NativeSyncApi.getCloudIdForAssetIds\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec, taskQueue: taskQueue)

mobile/ios/Runner/Sync/MessagesImpl.swift

@@ -318,7 +318,7 @@ class NativeSyncApiImpl: ImmichPlugin, NativeSyncApi, FlutterPlugin {
       }
     }
   }
-  
+
   func cancelHashing() {
     hashTask?.cancel()
     hashTask = nil
@@ -382,6 +382,10 @@ class NativeSyncApiImpl: ImmichPlugin, NativeSyncApi, FlutterPlugin {
   func getTrashedAssets() throws -> [String: [PlatformAsset]] {
     throw PigeonError(code: "UNSUPPORTED_OS", message: "This feature not supported on iOS.", details: nil)
   }
+
+  func restoreFromTrashById(mediaId: String, type: Int64, completion: @escaping (Result<Bool, Error>) -> Void) {
+    completion(.success(false))
+  }
   
   private func getAssetsFromAlbum(in album: PHAssetCollection, options: PHFetchOptions) -> PHFetchResult<PHAsset> {
     // Ensure to actually getting all assets for the Recents album

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

@@ -9,10 +9,10 @@ import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:immich_mobile/extensions/platform_extensions.dart';
 import 'package:immich_mobile/infrastructure/repositories/local_album.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/local_asset.repository.dart';
-import 'package:immich_mobile/infrastructure/repositories/storage.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/trashed_local_asset.repository.dart';
 import 'package:immich_mobile/platform/native_sync_api.g.dart';
-import 'package:immich_mobile/repositories/local_files_manager.repository.dart';
+import 'package:immich_mobile/repositories/asset_media.repository.dart';
+import 'package:immich_mobile/repositories/permission.repository.dart';
 import 'package:immich_mobile/utils/datetime_helpers.dart';
 import 'package:immich_mobile/utils/diff.dart';
 import 'package:logging/logging.dart';
@@ -23,29 +23,29 @@ class LocalSyncService {
   final DriftLocalAssetRepository _localAssetRepository;
   final NativeSyncApi _nativeSyncApi;
   final DriftTrashedLocalAssetRepository _trashedLocalAssetRepository;
-  final LocalFilesManagerRepository _localFilesManager;
-  final StorageRepository _storageRepository;
+  final AssetMediaRepository _assetMediaRepository;
+  final IPermissionRepository _permissionRepository;
   final Logger _log = Logger("DeviceSyncService");
 
   LocalSyncService({
     required DriftLocalAlbumRepository localAlbumRepository,
     required DriftLocalAssetRepository localAssetRepository,
     required DriftTrashedLocalAssetRepository trashedLocalAssetRepository,
-    required LocalFilesManagerRepository localFilesManager,
-    required StorageRepository storageRepository,
+    required AssetMediaRepository assetMediaRepository,
+    required IPermissionRepository permissionRepository,
     required NativeSyncApi nativeSyncApi,
   }) : _localAlbumRepository = localAlbumRepository,
        _localAssetRepository = localAssetRepository,
        _trashedLocalAssetRepository = trashedLocalAssetRepository,
-       _localFilesManager = localFilesManager,
-       _storageRepository = storageRepository,
+       _assetMediaRepository = assetMediaRepository,
+       _permissionRepository = permissionRepository,
        _nativeSyncApi = nativeSyncApi;
 
   Future<void> sync({bool full = false}) async {
     final Stopwatch stopwatch = Stopwatch()..start();
     try {
       if (CurrentPlatform.isAndroid && Store.get(StoreKey.manageLocalMediaAndroid, false)) {
-        final hasPermission = await _localFilesManager.hasManageMediaPermission();
+        final hasPermission = await _permissionRepository.hasManageMediaPermission();
         if (hasPermission) {
           await _syncTrashedAssets();
         } else {
@@ -373,7 +373,7 @@ class LocalSyncService {
 
     final assetsToRestore = await _trashedLocalAssetRepository.getToRestore();
     if (assetsToRestore.isNotEmpty) {
-      final restoredIds = await _localFilesManager.restoreAssetsFromTrash(assetsToRestore);
+      final restoredIds = await _assetMediaRepository.restoreAssetsFromTrash(assetsToRestore);
       await _trashedLocalAssetRepository.applyRestoredAssets(restoredIds);
     } else {
       _log.info("syncTrashedAssets, No remote assets found for restoration");
@@ -381,15 +381,15 @@ class LocalSyncService {
 
     final localAssetsToTrash = await _trashedLocalAssetRepository.getToTrash();
     if (localAssetsToTrash.isNotEmpty) {
-      final mediaUrls = await Future.wait(
-        localAssetsToTrash.values
-            .expand((e) => e)
-            .map((localAsset) => _storageRepository.getAssetEntityForAsset(localAsset).then((e) => e?.getMediaUrl())),
-      );
-      _log.info("Moving to trash ${mediaUrls.join(", ")} assets");
-      final result = await _localFilesManager.moveToTrash(mediaUrls.nonNulls.toList());
-      if (result) {
-        await _trashedLocalAssetRepository.trashLocalAsset(localAssetsToTrash);
+      final localIds = localAssetsToTrash.values.expand((assets) => assets).map((asset) => asset.id).toList();
+      _log.info("Moving to trash ${localIds.join(", ")} assets");
+      final movedIds = await _assetMediaRepository.deleteAll(localIds);
+      if (movedIds.isNotEmpty) {
+        final movedAssetsByAlbum = localAssetsToTrash.map(
+          (albumId, assets) => MapEntry(albumId, assets.where((asset) => movedIds.contains(asset.id)).toList()),
+        )..removeWhere((_, assets) => assets.isEmpty);
+
+        await _trashedLocalAssetRepository.trashLocalAsset(movedAssetsByAlbum);
       }
     } else {
       _log.info("syncTrashedAssets, No assets found in backup-enabled albums for move to trash");

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

@@ -9,12 +9,12 @@ import 'package:immich_mobile/domain/models/sync_event.model.dart';
 import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:immich_mobile/extensions/platform_extensions.dart';
 import 'package:immich_mobile/infrastructure/repositories/local_asset.repository.dart';
-import 'package:immich_mobile/infrastructure/repositories/storage.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/sync_api.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/sync_migration.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/sync_stream.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/trashed_local_asset.repository.dart';
-import 'package:immich_mobile/repositories/local_files_manager.repository.dart';
+import 'package:immich_mobile/repositories/asset_media.repository.dart';
+import 'package:immich_mobile/repositories/permission.repository.dart';
 import 'package:immich_mobile/services/api.service.dart';
 import 'package:immich_mobile/utils/semver.dart';
 import 'package:logging/logging.dart';
@@ -34,8 +34,8 @@ class SyncStreamService {
   final SyncStreamRepository _syncStreamRepository;
   final DriftLocalAssetRepository _localAssetRepository;
   final DriftTrashedLocalAssetRepository _trashedLocalAssetRepository;
-  final LocalFilesManagerRepository _localFilesManager;
-  final StorageRepository _storageRepository;
+  final AssetMediaRepository _assetMediaRepository;
+  final IPermissionRepository _permissionRepository;
   final SyncMigrationRepository _syncMigrationRepository;
   final ApiService _api;
   final bool Function()? _cancelChecker;
@@ -45,8 +45,8 @@ class SyncStreamService {
     required SyncStreamRepository syncStreamRepository,
     required DriftLocalAssetRepository localAssetRepository,
     required DriftTrashedLocalAssetRepository trashedLocalAssetRepository,
-    required LocalFilesManagerRepository localFilesManager,
-    required StorageRepository storageRepository,
+    required AssetMediaRepository assetMediaRepository,
+    required IPermissionRepository permissionRepository,
     required SyncMigrationRepository syncMigrationRepository,
     required ApiService api,
     bool Function()? cancelChecker,
@@ -54,8 +54,8 @@ class SyncStreamService {
        _syncStreamRepository = syncStreamRepository,
        _localAssetRepository = localAssetRepository,
        _trashedLocalAssetRepository = trashedLocalAssetRepository,
-       _localFilesManager = localFilesManager,
-       _storageRepository = storageRepository,
+       _assetMediaRepository = assetMediaRepository,
+       _permissionRepository = permissionRepository,
        _syncMigrationRepository = syncMigrationRepository,
        _api = api,
        _cancelChecker = cancelChecker;
@@ -500,22 +500,22 @@ class SyncStreamService {
   }
 
   Future<void> _trashLocalAssets(Map<String, List<LocalAsset>> localAssetsToTrash) async {
-    final mediaUrls = await Future.wait(
-      localAssetsToTrash.values
-          .expand((e) => e)
-          .map((localAsset) => _storageRepository.getAssetEntityForAsset(localAsset).then((e) => e?.getMediaUrl())),
-    );
-    _logger.info("Moving to trash ${mediaUrls.join(", ")} assets");
-    final result = await _localFilesManager.moveToTrash(mediaUrls.nonNulls.toList());
-    if (result) {
-      await _trashedLocalAssetRepository.trashLocalAsset(localAssetsToTrash);
+    final localIds = localAssetsToTrash.values.expand((assets) => assets).map((asset) => asset.id).toList();
+    _logger.info("Moving to trash ${localIds.join(", ")} assets");
+    final movedIds = await _assetMediaRepository.deleteAll(localIds);
+    if (movedIds.isNotEmpty) {
+      final movedAssetsByAlbum = localAssetsToTrash.map(
+        (albumId, assets) => MapEntry(albumId, assets.where((asset) => movedIds.contains(asset.id)).toList()),
+      )..removeWhere((_, assets) => assets.isEmpty);
+
+      await _trashedLocalAssetRepository.trashLocalAsset(movedAssetsByAlbum);
     }
   }
 
   Future<void> _applyRemoteRestoreToLocal() async {
     final assetsToRestore = await _trashedLocalAssetRepository.getToRestore();
     if (assetsToRestore.isNotEmpty) {
-      final restoredIds = await _localFilesManager.restoreAssetsFromTrash(assetsToRestore);
+      final restoredIds = await _assetMediaRepository.restoreAssetsFromTrash(assetsToRestore);
       await _trashedLocalAssetRepository.applyRestoredAssets(restoredIds);
     } else {
       _logger.info("No remote assets found for restoration");
@@ -523,7 +523,7 @@ class SyncStreamService {
   }
 
   Future<void> _syncAssetTrashStatus(List<String> remoteIds) async {
-    if (!(await _localFilesManager.hasManageMediaPermission())) {
+    if (!(await _permissionRepository.hasManageMediaPermission())) {
       _logger.warning("Syncing asset trash status cannot proceed because MANAGE_MEDIA permission is missing");
       return;
     }
@@ -533,7 +533,7 @@ class SyncStreamService {
   }
 
   Future<void> _syncAssetDeletion(List<String> remoteIds) async {
-    if (!(await _localFilesManager.hasManageMediaPermission())) {
+    if (!(await _permissionRepository.hasManageMediaPermission())) {
       _logger.warning("Syncing asset deletion cannot proceed because MANAGE_MEDIA permission is missing");
       return;
     }

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

@@ -17,6 +17,8 @@ typedef TimelineBucketSource = Stream<List<Bucket>> Function();
 
 typedef TimelineQuery = ({TimelineAssetSource assetSource, TimelineBucketSource bucketSource, TimelineOrigin origin});
 
+enum TimelineStatus { uninitialized, ready, disposed }
+
 enum TimelineOrigin {
   main,
   localAlbum,
@@ -101,9 +103,13 @@ class TimelineService {
   int _bufferOffset = 0;
   List<BaseAsset> _buffer = [];
   StreamSubscription? _bucketSubscription;
+  final StreamController<TimelineStatus> _statusController = StreamController<TimelineStatus>.broadcast();
 
   int _totalAssets = 0;
   int get totalAssets => _totalAssets;
+  TimelineStatus _status = TimelineStatus.uninitialized;
+  TimelineStatus get status => _status;
+  bool get isReady => _status == TimelineStatus.ready;
 
   TimelineService(TimelineQuery query)
     : this._(assetSource: query.assetSource, bucketSource: query.bucketSource, origin: query.origin);
@@ -139,12 +145,17 @@ class TimelineService {
 
         // change the state's total assets count only after the buffer is reloaded
         _totalAssets = totalAssets;
+        if (_status == TimelineStatus.uninitialized) {
+          _status = TimelineStatus.ready;
+          _statusController.add(_status);
+        }
         EventStream.shared.emit(const TimelineReloadEvent());
       });
     });
   }
 
   Stream<List<Bucket>> Function() get watchBuckets => _bucketSource;
+  Stream<TimelineStatus> watchStatus() => _statusController.stream;
 
   Future<List<BaseAsset>> loadAssets(int index, int count) => _mutex.run(() => _loadAssets(index, count));
 
@@ -247,5 +258,12 @@ class TimelineService {
     _bucketSubscription = null;
     _buffer = [];
     _bufferOffset = 0;
+    if (_status != TimelineStatus.disposed) {
+      _status = TimelineStatus.disposed;
+      if (!_statusController.isClosed) {
+        _statusController.add(_status);
+      }
+    }
+    await _statusController.close();
   }
 }

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

@@ -678,6 +678,7 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
       return query.map((row) => row.toDto()).get();
     }
   }
+
 }
 
 List<Bucket> _generateBuckets(int count) {

mobile/lib/main.dart

@@ -24,6 +24,7 @@ import 'package:immich_mobile/pages/common/splash_screen.page.dart';
 import 'package:immich_mobile/platform/background_worker_lock_api.g.dart';
 import 'package:immich_mobile/providers/app_life_cycle.provider.dart';
 import 'package:immich_mobile/providers/asset_viewer/share_intent_upload.provider.dart';
+import 'package:immich_mobile/providers/view_intent/view_intent_handler.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/db.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/metadata.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/platform.provider.dart';
@@ -128,6 +129,7 @@ class ImmichAppState extends ConsumerState<ImmichApp> with WidgetsBindingObserve
       case AppLifecycleState.resumed:
         dPrint(() => "[APP STATE] resumed");
         ref.read(appStateProvider.notifier).handleAppResume();
+        unawaited(ref.read(viewIntentHandlerProvider).onAppResumed());
         break;
       case AppLifecycleState.inactive:
         dPrint(() => "[APP STATE] inactive");
@@ -233,6 +235,7 @@ class ImmichAppState extends ConsumerState<ImmichApp> with WidgetsBindingObserve
       }
     });
 
+    ref.read(viewIntentHandlerProvider).init();
     ref.read(shareIntentUploadProvider.notifier).init();
   }
 

mobile/lib/models/view_intent/view_intent_payload.extension.dart

@@ -0,0 +1,35 @@
+import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
+import 'package:immich_mobile/platform/view_intent_api.g.dart';
+import 'package:path/path.dart';
+
+extension ViewIntentPayloadX on ViewIntentPayload {
+  String get fileName {
+    final resolvedPath = path;
+    if (resolvedPath != null && resolvedPath.isNotEmpty) {
+      return basename(resolvedPath);
+    }
+    return localAssetId ?? 'view_intent_asset';
+  }
+
+  bool get isImage => mimeType.toLowerCase().startsWith('image/');
+
+  bool get isVideo => mimeType.toLowerCase().startsWith('video/');
+
+  AssetPlaybackStyle get playbackStyle {
+    if (isVideo) {
+      return AssetPlaybackStyle.video;
+    }
+
+    final normalizedMimeType = mimeType.toLowerCase();
+    if (normalizedMimeType == 'image/gif' || normalizedMimeType == 'image/webp') {
+      return AssetPlaybackStyle.imageAnimated;
+    }
+
+    final normalizedPath = path?.toLowerCase();
+    if (normalizedPath != null && (normalizedPath.endsWith('.gif') || normalizedPath.endsWith('.webp'))) {
+      return AssetPlaybackStyle.imageAnimated;
+    }
+
+    return AssetPlaybackStyle.image;
+  }
+}

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

@@ -17,6 +17,7 @@ import 'package:immich_mobile/providers/auth.provider.dart';
 import 'package:immich_mobile/providers/background_sync.provider.dart';
 import 'package:immich_mobile/providers/backup/drift_backup.provider.dart';
 import 'package:immich_mobile/providers/server_info.provider.dart';
+import 'package:immich_mobile/providers/view_intent/view_intent_handler.provider.dart';
 import 'package:immich_mobile/providers/websocket.provider.dart';
 import 'package:immich_mobile/routing/router.dart';
 import 'package:immich_mobile/theme/color_scheme.dart';
@@ -314,6 +315,7 @@ class SplashScreenPageState extends ConsumerState<SplashScreenPage> {
       final wsProvider = ref.read(websocketProvider.notifier);
       final backgroundManager = ref.read(backgroundSyncProvider);
       final backupProvider = ref.read(driftBackupProvider.notifier);
+      final viewIntentHandler = ref.read(viewIntentHandlerProvider);
 
       unawaited(
         ref.read(authProvider.notifier).saveAuthInfo(accessToken: accessToken).then(
@@ -328,6 +330,8 @@ class SplashScreenPageState extends ConsumerState<SplashScreenPage> {
                 backgroundManager.syncRemote().then((success) => syncSuccess = success),
               ]);
 
+              await viewIntentHandler.flushDeferredViewIntent();
+
               if (syncSuccess) {
                 await Future.wait([
                   backgroundManager.hashAssets().then((_) {

mobile/lib/platform/native_sync_api.g.dart

@@ -9,14 +9,22 @@ import 'dart:typed_data' show Float64List, Int32List, Int64List;
 import 'package:flutter/services.dart';
 import 'package:meta/meta.dart' show immutable, protected, visibleForTesting;
 
-Object? _extractReplyValueOrThrow(List<Object?>? replyList, String channelName, {required bool isNullValid}) {
+Object? _extractReplyValueOrThrow(
+    List<Object?>? replyList,
+    String channelName, {
+    required bool isNullValid,
+}) {
   if (replyList == null) {
     throw PlatformException(
       code: 'channel-error',
       message: 'Unable to establish connection on channel: "$channelName".',
     );
   } else if (replyList.length > 1) {
-    throw PlatformException(code: replyList[0]! as String, message: replyList[1] as String?, details: replyList[2]);
+    throw PlatformException(
+      code: replyList[0]! as String,
+      message: replyList[1] as String?,
+      details: replyList[2],
+    );
   } else if (!isNullValid && (replyList.isNotEmpty && replyList[0] == null)) {
     throw PlatformException(
       code: 'null-error',
@@ -37,7 +45,9 @@ bool _deepEquals(Object? a, Object? b) {
     return a == b;
   }
   if (a is List && b is List) {
-    return a.length == b.length && a.indexed.every(((int, dynamic) item) => _deepEquals(item.$2, b[item.$1]));
+    return a.length == b.length &&
+        a.indexed
+            .every(((int, dynamic) item) => _deepEquals(item.$2, b[item.$1]));
   }
   if (a is Map && b is Map) {
     if (a.length != b.length) {
@@ -86,7 +96,15 @@ int _deepHash(Object? value) {
   return value.hashCode;
 }
 
-enum PlatformAssetPlaybackStyle { unknown, image, video, imageAnimated, livePhoto, videoLooping }
+
+enum PlatformAssetPlaybackStyle {
+  unknown,
+  image,
+  video,
+  imageAnimated,
+  livePhoto,
+  videoLooping,
+}
 
 class PlatformAsset {
   PlatformAsset({
@@ -154,8 +172,7 @@ class PlatformAsset {
   }
 
   Object encode() {
-    return _toList();
-  }
+    return _toList();  }
 
   static PlatformAsset decode(Object result) {
     result as List<Object?>;
@@ -186,20 +203,7 @@ class PlatformAsset {
     if (identical(this, other)) {
       return true;
     }
-    return _deepEquals(id, other.id) &&
-        _deepEquals(name, other.name) &&
-        _deepEquals(type, other.type) &&
-        _deepEquals(createdAt, other.createdAt) &&
-        _deepEquals(updatedAt, other.updatedAt) &&
-        _deepEquals(width, other.width) &&
-        _deepEquals(height, other.height) &&
-        _deepEquals(durationMs, other.durationMs) &&
-        _deepEquals(orientation, other.orientation) &&
-        _deepEquals(isFavorite, other.isFavorite) &&
-        _deepEquals(adjustmentTime, other.adjustmentTime) &&
-        _deepEquals(latitude, other.latitude) &&
-        _deepEquals(longitude, other.longitude) &&
-        _deepEquals(playbackStyle, other.playbackStyle);
+    return _deepEquals(id, other.id) && _deepEquals(name, other.name) && _deepEquals(type, other.type) && _deepEquals(createdAt, other.createdAt) && _deepEquals(updatedAt, other.updatedAt) && _deepEquals(width, other.width) && _deepEquals(height, other.height) && _deepEquals(durationMs, other.durationMs) && _deepEquals(orientation, other.orientation) && _deepEquals(isFavorite, other.isFavorite) && _deepEquals(adjustmentTime, other.adjustmentTime) && _deepEquals(latitude, other.latitude) && _deepEquals(longitude, other.longitude) && _deepEquals(playbackStyle, other.playbackStyle);
   }
 
   @override
@@ -227,12 +231,17 @@ class PlatformAlbum {
   int assetCount;
 
   List<Object?> _toList() {
-    return <Object?>[id, name, updatedAt, isCloud, assetCount];
+    return <Object?>[
+      id,
+      name,
+      updatedAt,
+      isCloud,
+      assetCount,
+    ];
   }
 
   Object encode() {
-    return _toList();
-  }
+    return _toList();  }
 
   static PlatformAlbum decode(Object result) {
     result as List<Object?>;
@@ -254,11 +263,7 @@ class PlatformAlbum {
     if (identical(this, other)) {
       return true;
     }
-    return _deepEquals(id, other.id) &&
-        _deepEquals(name, other.name) &&
-        _deepEquals(updatedAt, other.updatedAt) &&
-        _deepEquals(isCloud, other.isCloud) &&
-        _deepEquals(assetCount, other.assetCount);
+    return _deepEquals(id, other.id) && _deepEquals(name, other.name) && _deepEquals(updatedAt, other.updatedAt) && _deepEquals(isCloud, other.isCloud) && _deepEquals(assetCount, other.assetCount);
   }
 
   @override
@@ -267,7 +272,12 @@ class PlatformAlbum {
 }
 
 class SyncDelta {
-  SyncDelta({required this.hasChanges, required this.updates, required this.deletes, required this.assetAlbums});
+  SyncDelta({
+    required this.hasChanges,
+    required this.updates,
+    required this.deletes,
+    required this.assetAlbums,
+  });
 
   bool hasChanges;
 
@@ -278,12 +288,16 @@ class SyncDelta {
   Map<String, List<String>> assetAlbums;
 
   List<Object?> _toList() {
-    return <Object?>[hasChanges, updates, deletes, assetAlbums];
+    return <Object?>[
+      hasChanges,
+      updates,
+      deletes,
+      assetAlbums,
+    ];
   }
 
   Object encode() {
-    return _toList();
-  }
+    return _toList();  }
 
   static SyncDelta decode(Object result) {
     result as List<Object?>;
@@ -304,10 +318,7 @@ class SyncDelta {
     if (identical(this, other)) {
       return true;
     }
-    return _deepEquals(hasChanges, other.hasChanges) &&
-        _deepEquals(updates, other.updates) &&
-        _deepEquals(deletes, other.deletes) &&
-        _deepEquals(assetAlbums, other.assetAlbums);
+    return _deepEquals(hasChanges, other.hasChanges) && _deepEquals(updates, other.updates) && _deepEquals(deletes, other.deletes) && _deepEquals(assetAlbums, other.assetAlbums);
   }
 
   @override
@@ -316,7 +327,11 @@ class SyncDelta {
 }
 
 class HashResult {
-  HashResult({required this.assetId, this.error, this.hash});
+  HashResult({
+    required this.assetId,
+    this.error,
+    this.hash,
+  });
 
   String assetId;
 
@@ -325,16 +340,23 @@ class HashResult {
   String? hash;
 
   List<Object?> _toList() {
-    return <Object?>[assetId, error, hash];
+    return <Object?>[
+      assetId,
+      error,
+      hash,
+    ];
   }
 
   Object encode() {
-    return _toList();
-  }
+    return _toList();  }
 
   static HashResult decode(Object result) {
     result as List<Object?>;
-    return HashResult(assetId: result[0]! as String, error: result[1] as String?, hash: result[2] as String?);
+    return HashResult(
+      assetId: result[0]! as String,
+      error: result[1] as String?,
+      hash: result[2] as String?,
+    );
   }
 
   @override
@@ -355,7 +377,11 @@ class HashResult {
 }
 
 class CloudIdResult {
-  CloudIdResult({required this.assetId, this.error, this.cloudId});
+  CloudIdResult({
+    required this.assetId,
+    this.error,
+    this.cloudId,
+  });
 
   String assetId;
 
@@ -364,16 +390,23 @@ class CloudIdResult {
   String? cloudId;
 
   List<Object?> _toList() {
-    return <Object?>[assetId, error, cloudId];
+    return <Object?>[
+      assetId,
+      error,
+      cloudId,
+    ];
   }
 
   Object encode() {
-    return _toList();
-  }
+    return _toList();  }
 
   static CloudIdResult decode(Object result) {
     result as List<Object?>;
-    return CloudIdResult(assetId: result[0]! as String, error: result[1] as String?, cloudId: result[2] as String?);
+    return CloudIdResult(
+      assetId: result[0]! as String,
+      error: result[1] as String?,
+      cloudId: result[2] as String?,
+    );
   }
 
   @override
@@ -385,9 +418,7 @@ class CloudIdResult {
     if (identical(this, other)) {
       return true;
     }
-    return _deepEquals(assetId, other.assetId) &&
-        _deepEquals(error, other.error) &&
-        _deepEquals(cloudId, other.cloudId);
+    return _deepEquals(assetId, other.assetId) && _deepEquals(error, other.error) && _deepEquals(cloudId, other.cloudId);
   }
 
   @override
@@ -395,6 +426,7 @@ class CloudIdResult {
   int get hashCode => _deepHash(<Object?>[runtimeType, ..._toList()]);
 }
 
+
 class _PigeonCodec extends StandardMessageCodec {
   const _PigeonCodec();
   @override
@@ -402,22 +434,22 @@ class _PigeonCodec extends StandardMessageCodec {
     if (value is int) {
       buffer.putUint8(4);
       buffer.putInt64(value);
-    } else if (value is PlatformAssetPlaybackStyle) {
+    }    else if (value is PlatformAssetPlaybackStyle) {
       buffer.putUint8(129);
       writeValue(buffer, value.index);
-    } else if (value is PlatformAsset) {
+    }    else if (value is PlatformAsset) {
       buffer.putUint8(130);
       writeValue(buffer, value.encode());
-    } else if (value is PlatformAlbum) {
+    }    else if (value is PlatformAlbum) {
       buffer.putUint8(131);
       writeValue(buffer, value.encode());
-    } else if (value is SyncDelta) {
+    }    else if (value is SyncDelta) {
       buffer.putUint8(132);
       writeValue(buffer, value.encode());
-    } else if (value is HashResult) {
+    }    else if (value is HashResult) {
       buffer.putUint8(133);
       writeValue(buffer, value.encode());
-    } else if (value is CloudIdResult) {
+    }    else if (value is CloudIdResult) {
       buffer.putUint8(134);
       writeValue(buffer, value.encode());
     } else {
@@ -452,8 +484,8 @@ class NativeSyncApi {
   /// available for dependency injection.  If it is left null, the default
   /// BinaryMessenger will be used which routes to the host platform.
   NativeSyncApi({BinaryMessenger? binaryMessenger, String messageChannelSuffix = ''})
-    : pigeonVar_binaryMessenger = binaryMessenger,
-      pigeonVar_messageChannelSuffix = messageChannelSuffix.isNotEmpty ? '.$messageChannelSuffix' : '';
+      : pigeonVar_binaryMessenger = binaryMessenger,
+        pigeonVar_messageChannelSuffix = messageChannelSuffix.isNotEmpty ? '.$messageChannelSuffix' : '';
   final BinaryMessenger? pigeonVar_binaryMessenger;
 
   static const MessageCodec<Object?> pigeonChannelCodec = _PigeonCodec();
@@ -461,8 +493,7 @@ class NativeSyncApi {
   final String pigeonVar_messageChannelSuffix;
 
   Future<bool> shouldFullSync() async {
-    final pigeonVar_channelName =
-        'dev.flutter.pigeon.immich_mobile.NativeSyncApi.shouldFullSync$pigeonVar_messageChannelSuffix';
+    final pigeonVar_channelName = 'dev.flutter.pigeon.immich_mobile.NativeSyncApi.shouldFullSync$pigeonVar_messageChannelSuffix';
     final pigeonVar_channel = BasicMessageChannel<Object?>(
       pigeonVar_channelName,
       pigeonChannelCodec,
@@ -472,16 +503,16 @@ class NativeSyncApi {
     final pigeonVar_replyList = await pigeonVar_sendFuture as List<Object?>?;
 
     final Object? pigeonVar_replyValue = _extractReplyValueOrThrow(
-      pigeonVar_replyList,
-      pigeonVar_channelName,
-      isNullValid: false,
-    );
+        pigeonVar_replyList,
+        pigeonVar_channelName,
+        isNullValid: false,
+    )
+    ;
     return pigeonVar_replyValue! as bool;
   }
 
   Future<SyncDelta> getMediaChanges() async {
-    final pigeonVar_channelName =
-        'dev.flutter.pigeon.immich_mobile.NativeSyncApi.getMediaChanges$pigeonVar_messageChannelSuffix';
+    final pigeonVar_channelName = 'dev.flutter.pigeon.immich_mobile.NativeSyncApi.getMediaChanges$pigeonVar_messageChannelSuffix';
     final pigeonVar_channel = BasicMessageChannel<Object?>(
       pigeonVar_channelName,
       pigeonChannelCodec,
@@ -491,16 +522,16 @@ class NativeSyncApi {
     final pigeonVar_replyList = await pigeonVar_sendFuture as List<Object?>?;
 
     final Object? pigeonVar_replyValue = _extractReplyValueOrThrow(
-      pigeonVar_replyList,
-      pigeonVar_channelName,
-      isNullValid: false,
-    );
+        pigeonVar_replyList,
+        pigeonVar_channelName,
+        isNullValid: false,
+    )
+    ;
     return pigeonVar_replyValue! as SyncDelta;
   }
 
   Future<void> checkpointSync() async {
-    final pigeonVar_channelName =
-        'dev.flutter.pigeon.immich_mobile.NativeSyncApi.checkpointSync$pigeonVar_messageChannelSuffix';
+    final pigeonVar_channelName = 'dev.flutter.pigeon.immich_mobile.NativeSyncApi.checkpointSync$pigeonVar_messageChannelSuffix';
     final pigeonVar_channel = BasicMessageChannel<Object?>(
       pigeonVar_channelName,
       pigeonChannelCodec,
@@ -509,12 +540,16 @@ class NativeSyncApi {
     final Future<Object?> pigeonVar_sendFuture = pigeonVar_channel.send(null);
     final pigeonVar_replyList = await pigeonVar_sendFuture as List<Object?>?;
 
-    _extractReplyValueOrThrow(pigeonVar_replyList, pigeonVar_channelName, isNullValid: true);
+    _extractReplyValueOrThrow(
+        pigeonVar_replyList,
+        pigeonVar_channelName,
+        isNullValid: true,
+    )
+    ;
   }
 
   Future<void> clearSyncCheckpoint() async {
-    final pigeonVar_channelName =
-        'dev.flutter.pigeon.immich_mobile.NativeSyncApi.clearSyncCheckpoint$pigeonVar_messageChannelSuffix';
+    final pigeonVar_channelName = 'dev.flutter.pigeon.immich_mobile.NativeSyncApi.clearSyncCheckpoint$pigeonVar_messageChannelSuffix';
     final pigeonVar_channel = BasicMessageChannel<Object?>(
       pigeonVar_channelName,
       pigeonChannelCodec,
@@ -523,12 +558,16 @@ class NativeSyncApi {
     final Future<Object?> pigeonVar_sendFuture = pigeonVar_channel.send(null);
     final pigeonVar_replyList = await pigeonVar_sendFuture as List<Object?>?;
 
-    _extractReplyValueOrThrow(pigeonVar_replyList, pigeonVar_channelName, isNullValid: true);
+    _extractReplyValueOrThrow(
+        pigeonVar_replyList,
+        pigeonVar_channelName,
+        isNullValid: true,
+    )
+    ;
   }
 
   Future<List<String>> getAssetIdsForAlbum(String albumId) async {
-    final pigeonVar_channelName =
-        'dev.flutter.pigeon.immich_mobile.NativeSyncApi.getAssetIdsForAlbum$pigeonVar_messageChannelSuffix';
+    final pigeonVar_channelName = 'dev.flutter.pigeon.immich_mobile.NativeSyncApi.getAssetIdsForAlbum$pigeonVar_messageChannelSuffix';
     final pigeonVar_channel = BasicMessageChannel<Object?>(
       pigeonVar_channelName,
       pigeonChannelCodec,
@@ -538,16 +577,16 @@ class NativeSyncApi {
     final pigeonVar_replyList = await pigeonVar_sendFuture as List<Object?>?;
 
     final Object? pigeonVar_replyValue = _extractReplyValueOrThrow(
-      pigeonVar_replyList,
-      pigeonVar_channelName,
-      isNullValid: false,
-    );
+        pigeonVar_replyList,
+        pigeonVar_channelName,
+        isNullValid: false,
+    )
+    ;
     return (pigeonVar_replyValue! as List<Object?>).cast<String>();
   }
 
   Future<List<PlatformAlbum>> getAlbums() async {
-    final pigeonVar_channelName =
-        'dev.flutter.pigeon.immich_mobile.NativeSyncApi.getAlbums$pigeonVar_messageChannelSuffix';
+    final pigeonVar_channelName = 'dev.flutter.pigeon.immich_mobile.NativeSyncApi.getAlbums$pigeonVar_messageChannelSuffix';
     final pigeonVar_channel = BasicMessageChannel<Object?>(
       pigeonVar_channelName,
       pigeonChannelCodec,
@@ -557,16 +596,16 @@ class NativeSyncApi {
     final pigeonVar_replyList = await pigeonVar_sendFuture as List<Object?>?;
 
     final Object? pigeonVar_replyValue = _extractReplyValueOrThrow(
-      pigeonVar_replyList,
-      pigeonVar_channelName,
-      isNullValid: false,
-    );
+        pigeonVar_replyList,
+        pigeonVar_channelName,
+        isNullValid: false,
+    )
+    ;
     return (pigeonVar_replyValue! as List<Object?>).cast<PlatformAlbum>();
   }
 
   Future<int> getAssetsCountSince(String albumId, int timestamp) async {
-    final pigeonVar_channelName =
-        'dev.flutter.pigeon.immich_mobile.NativeSyncApi.getAssetsCountSince$pigeonVar_messageChannelSuffix';
+    final pigeonVar_channelName = 'dev.flutter.pigeon.immich_mobile.NativeSyncApi.getAssetsCountSince$pigeonVar_messageChannelSuffix';
     final pigeonVar_channel = BasicMessageChannel<Object?>(
       pigeonVar_channelName,
       pigeonChannelCodec,
@@ -576,16 +615,16 @@ class NativeSyncApi {
     final pigeonVar_replyList = await pigeonVar_sendFuture as List<Object?>?;
 
     final Object? pigeonVar_replyValue = _extractReplyValueOrThrow(
-      pigeonVar_replyList,
-      pigeonVar_channelName,
-      isNullValid: false,
-    );
+        pigeonVar_replyList,
+        pigeonVar_channelName,
+        isNullValid: false,
+    )
+    ;
     return pigeonVar_replyValue! as int;
   }
 
   Future<List<PlatformAsset>> getAssetsForAlbum(String albumId, {int? updatedTimeCond}) async {
-    final pigeonVar_channelName =
-        'dev.flutter.pigeon.immich_mobile.NativeSyncApi.getAssetsForAlbum$pigeonVar_messageChannelSuffix';
+    final pigeonVar_channelName = 'dev.flutter.pigeon.immich_mobile.NativeSyncApi.getAssetsForAlbum$pigeonVar_messageChannelSuffix';
     final pigeonVar_channel = BasicMessageChannel<Object?>(
       pigeonVar_channelName,
       pigeonChannelCodec,
@@ -595,16 +634,16 @@ class NativeSyncApi {
     final pigeonVar_replyList = await pigeonVar_sendFuture as List<Object?>?;
 
     final Object? pigeonVar_replyValue = _extractReplyValueOrThrow(
-      pigeonVar_replyList,
-      pigeonVar_channelName,
-      isNullValid: false,
-    );
+        pigeonVar_replyList,
+        pigeonVar_channelName,
+        isNullValid: false,
+    )
+    ;
     return (pigeonVar_replyValue! as List<Object?>).cast<PlatformAsset>();
   }
 
   Future<List<HashResult>> hashAssets(List<String> assetIds, {bool allowNetworkAccess = false}) async {
-    final pigeonVar_channelName =
-        'dev.flutter.pigeon.immich_mobile.NativeSyncApi.hashAssets$pigeonVar_messageChannelSuffix';
+    final pigeonVar_channelName = 'dev.flutter.pigeon.immich_mobile.NativeSyncApi.hashAssets$pigeonVar_messageChannelSuffix';
     final pigeonVar_channel = BasicMessageChannel<Object?>(
       pigeonVar_channelName,
       pigeonChannelCodec,
@@ -614,16 +653,16 @@ class NativeSyncApi {
     final pigeonVar_replyList = await pigeonVar_sendFuture as List<Object?>?;
 
     final Object? pigeonVar_replyValue = _extractReplyValueOrThrow(
-      pigeonVar_replyList,
-      pigeonVar_channelName,
-      isNullValid: false,
-    );
+        pigeonVar_replyList,
+        pigeonVar_channelName,
+        isNullValid: false,
+    )
+    ;
     return (pigeonVar_replyValue! as List<Object?>).cast<HashResult>();
   }
 
   Future<void> cancelHashing() async {
-    final pigeonVar_channelName =
-        'dev.flutter.pigeon.immich_mobile.NativeSyncApi.cancelHashing$pigeonVar_messageChannelSuffix';
+    final pigeonVar_channelName = 'dev.flutter.pigeon.immich_mobile.NativeSyncApi.cancelHashing$pigeonVar_messageChannelSuffix';
     final pigeonVar_channel = BasicMessageChannel<Object?>(
       pigeonVar_channelName,
       pigeonChannelCodec,
@@ -632,12 +671,16 @@ class NativeSyncApi {
     final Future<Object?> pigeonVar_sendFuture = pigeonVar_channel.send(null);
     final pigeonVar_replyList = await pigeonVar_sendFuture as List<Object?>?;
 
-    _extractReplyValueOrThrow(pigeonVar_replyList, pigeonVar_channelName, isNullValid: true);
+    _extractReplyValueOrThrow(
+        pigeonVar_replyList,
+        pigeonVar_channelName,
+        isNullValid: true,
+    )
+    ;
   }
 
   Future<Map<String, List<PlatformAsset>>> getTrashedAssets() async {
-    final pigeonVar_channelName =
-        'dev.flutter.pigeon.immich_mobile.NativeSyncApi.getTrashedAssets$pigeonVar_messageChannelSuffix';
+    final pigeonVar_channelName = 'dev.flutter.pigeon.immich_mobile.NativeSyncApi.getTrashedAssets$pigeonVar_messageChannelSuffix';
     final pigeonVar_channel = BasicMessageChannel<Object?>(
       pigeonVar_channelName,
       pigeonChannelCodec,
@@ -647,16 +690,35 @@ class NativeSyncApi {
     final pigeonVar_replyList = await pigeonVar_sendFuture as List<Object?>?;
 
     final Object? pigeonVar_replyValue = _extractReplyValueOrThrow(
-      pigeonVar_replyList,
-      pigeonVar_channelName,
-      isNullValid: false,
-    );
+        pigeonVar_replyList,
+        pigeonVar_channelName,
+        isNullValid: false,
+    )
+    ;
     return (pigeonVar_replyValue! as Map<Object?, Object?>).cast<String, List<PlatformAsset>>();
   }
 
+  Future<bool> restoreFromTrashById(String mediaId, int type) async {
+    final pigeonVar_channelName = 'dev.flutter.pigeon.immich_mobile.NativeSyncApi.restoreFromTrashById$pigeonVar_messageChannelSuffix';
+    final pigeonVar_channel = BasicMessageChannel<Object?>(
+      pigeonVar_channelName,
+      pigeonChannelCodec,
+      binaryMessenger: pigeonVar_binaryMessenger,
+    );
+    final Future<Object?> pigeonVar_sendFuture = pigeonVar_channel.send(<Object?>[mediaId, type]);
+    final pigeonVar_replyList = await pigeonVar_sendFuture as List<Object?>?;
+
+    final Object? pigeonVar_replyValue = _extractReplyValueOrThrow(
+        pigeonVar_replyList,
+        pigeonVar_channelName,
+        isNullValid: false,
+    )
+    ;
+    return pigeonVar_replyValue! as bool;
+  }
+
   Future<List<CloudIdResult>> getCloudIdForAssetIds(List<String> assetIds) async {
-    final pigeonVar_channelName =
-        'dev.flutter.pigeon.immich_mobile.NativeSyncApi.getCloudIdForAssetIds$pigeonVar_messageChannelSuffix';
+    final pigeonVar_channelName = 'dev.flutter.pigeon.immich_mobile.NativeSyncApi.getCloudIdForAssetIds$pigeonVar_messageChannelSuffix';
     final pigeonVar_channel = BasicMessageChannel<Object?>(
       pigeonVar_channelName,
       pigeonChannelCodec,
@@ -666,10 +728,11 @@ class NativeSyncApi {
     final pigeonVar_replyList = await pigeonVar_sendFuture as List<Object?>?;
 
     final Object? pigeonVar_replyValue = _extractReplyValueOrThrow(
-      pigeonVar_replyList,
-      pigeonVar_channelName,
-      isNullValid: false,
-    );
+        pigeonVar_replyList,
+        pigeonVar_channelName,
+        isNullValid: false,
+    )
+    ;
     return (pigeonVar_replyValue! as List<Object?>).cast<CloudIdResult>();
   }
 }

mobile/lib/platform/permission_api.g.dart

@@ -0,0 +1,119 @@
+// Autogenerated from Pigeon (v26.3.4), do not edit directly.
+// See also: https://pub.dev/packages/pigeon
+// ignore_for_file: unused_import, unused_shown_name
+// ignore_for_file: type=lint
+
+import 'dart:async';
+import 'dart:typed_data' show Float64List, Int32List, Int64List;
+
+import 'package:flutter/services.dart';
+import 'package:meta/meta.dart' show immutable, protected, visibleForTesting;
+
+Object? _extractReplyValueOrThrow(List<Object?>? replyList, String channelName, {required bool isNullValid}) {
+  if (replyList == null) {
+    throw PlatformException(
+      code: 'channel-error',
+      message: 'Unable to establish connection on channel: "$channelName".',
+    );
+  } else if (replyList.length > 1) {
+    throw PlatformException(code: replyList[0]! as String, message: replyList[1] as String?, details: replyList[2]);
+  } else if (!isNullValid && (replyList.isNotEmpty && replyList[0] == null)) {
+    throw PlatformException(
+      code: 'null-error',
+      message: 'Host platform returned null value for non-null return value.',
+    );
+  }
+  return replyList.firstOrNull;
+}
+
+class _PigeonCodec extends StandardMessageCodec {
+  const _PigeonCodec();
+  @override
+  void writeValue(WriteBuffer buffer, Object? value) {
+    if (value is int) {
+      buffer.putUint8(4);
+      buffer.putInt64(value);
+    } else {
+      super.writeValue(buffer, value);
+    }
+  }
+
+  @override
+  Object? readValueOfType(int type, ReadBuffer buffer) {
+    switch (type) {
+      default:
+        return super.readValueOfType(type, buffer);
+    }
+  }
+}
+
+class PermissionApi {
+  /// Constructor for [PermissionApi].  The [binaryMessenger] named argument is
+  /// available for dependency injection.  If it is left null, the default
+  /// BinaryMessenger will be used which routes to the host platform.
+  PermissionApi({BinaryMessenger? binaryMessenger, String messageChannelSuffix = ''})
+    : pigeonVar_binaryMessenger = binaryMessenger,
+      pigeonVar_messageChannelSuffix = messageChannelSuffix.isNotEmpty ? '.$messageChannelSuffix' : '';
+  final BinaryMessenger? pigeonVar_binaryMessenger;
+
+  static const MessageCodec<Object?> pigeonChannelCodec = _PigeonCodec();
+
+  final String pigeonVar_messageChannelSuffix;
+
+  Future<bool> hasManageMediaPermission() async {
+    final pigeonVar_channelName =
+        'dev.flutter.pigeon.immich_mobile.PermissionApi.hasManageMediaPermission$pigeonVar_messageChannelSuffix';
+    final pigeonVar_channel = BasicMessageChannel<Object?>(
+      pigeonVar_channelName,
+      pigeonChannelCodec,
+      binaryMessenger: pigeonVar_binaryMessenger,
+    );
+    final Future<Object?> pigeonVar_sendFuture = pigeonVar_channel.send(null);
+    final pigeonVar_replyList = await pigeonVar_sendFuture as List<Object?>?;
+
+    final Object? pigeonVar_replyValue = _extractReplyValueOrThrow(
+      pigeonVar_replyList,
+      pigeonVar_channelName,
+      isNullValid: false,
+    );
+    return pigeonVar_replyValue! as bool;
+  }
+
+  Future<bool> requestManageMediaPermission() async {
+    final pigeonVar_channelName =
+        'dev.flutter.pigeon.immich_mobile.PermissionApi.requestManageMediaPermission$pigeonVar_messageChannelSuffix';
+    final pigeonVar_channel = BasicMessageChannel<Object?>(
+      pigeonVar_channelName,
+      pigeonChannelCodec,
+      binaryMessenger: pigeonVar_binaryMessenger,
+    );
+    final Future<Object?> pigeonVar_sendFuture = pigeonVar_channel.send(null);
+    final pigeonVar_replyList = await pigeonVar_sendFuture as List<Object?>?;
+
+    final Object? pigeonVar_replyValue = _extractReplyValueOrThrow(
+      pigeonVar_replyList,
+      pigeonVar_channelName,
+      isNullValid: false,
+    );
+    return pigeonVar_replyValue! as bool;
+  }
+
+  Future<bool> manageMediaPermission() async {
+    final pigeonVar_channelName =
+        'dev.flutter.pigeon.immich_mobile.PermissionApi.manageMediaPermission$pigeonVar_messageChannelSuffix';
+    final pigeonVar_channel = BasicMessageChannel<Object?>(
+      pigeonVar_channelName,
+      pigeonChannelCodec,
+      binaryMessenger: pigeonVar_binaryMessenger,
+    );
+    final Future<Object?> pigeonVar_sendFuture = pigeonVar_channel.send(null);
+    final pigeonVar_replyList = await pigeonVar_sendFuture as List<Object?>?;
+
+    final Object? pigeonVar_replyValue = _extractReplyValueOrThrow(
+      pigeonVar_replyList,
+      pigeonVar_channelName,
+      isNullValid: false,
+    );
+    return pigeonVar_replyValue! as bool;
+  }
+}

mobile/lib/platform/view_intent_api.g.dart

@@ -0,0 +1,191 @@
+// Autogenerated from Pigeon (v26.3.4), do not edit directly.
+// See also: https://pub.dev/packages/pigeon
+// ignore_for_file: unused_import, unused_shown_name
+// ignore_for_file: type=lint
+
+import 'dart:async';
+import 'dart:typed_data' show Float64List, Int32List, Int64List;
+
+import 'package:flutter/services.dart';
+import 'package:meta/meta.dart' show immutable, protected, visibleForTesting;
+
+Object? _extractReplyValueOrThrow(List<Object?>? replyList, String channelName, {required bool isNullValid}) {
+  if (replyList == null) {
+    throw PlatformException(
+      code: 'channel-error',
+      message: 'Unable to establish connection on channel: "$channelName".',
+    );
+  } else if (replyList.length > 1) {
+    throw PlatformException(code: replyList[0]! as String, message: replyList[1] as String?, details: replyList[2]);
+  } else if (!isNullValid && (replyList.isNotEmpty && replyList[0] == null)) {
+    throw PlatformException(
+      code: 'null-error',
+      message: 'Host platform returned null value for non-null return value.',
+    );
+  }
+  return replyList.firstOrNull;
+}
+
+bool _deepEquals(Object? a, Object? b) {
+  if (identical(a, b)) {
+    return true;
+  }
+  if (a is double && b is double) {
+    if (a.isNaN && b.isNaN) {
+      return true;
+    }
+    return a == b;
+  }
+  if (a is List && b is List) {
+    return a.length == b.length && a.indexed.every(((int, dynamic) item) => _deepEquals(item.$2, b[item.$1]));
+  }
+  if (a is Map && b is Map) {
+    if (a.length != b.length) {
+      return false;
+    }
+    for (final MapEntry<Object?, Object?> entryA in a.entries) {
+      bool found = false;
+      for (final MapEntry<Object?, Object?> entryB in b.entries) {
+        if (_deepEquals(entryA.key, entryB.key)) {
+          if (_deepEquals(entryA.value, entryB.value)) {
+            found = true;
+            break;
+          } else {
+            return false;
+          }
+        }
+      }
+      if (!found) {
+        return false;
+      }
+    }
+    return true;
+  }
+  return a == b;
+}
+
+int _deepHash(Object? value) {
+  if (value is List) {
+    return Object.hashAll(value.map(_deepHash));
+  }
+  if (value is Map) {
+    int result = 0;
+    for (final MapEntry<Object?, Object?> entry in value.entries) {
+      result += (_deepHash(entry.key) * 31) ^ _deepHash(entry.value);
+    }
+    return result;
+  }
+  if (value is double && value.isNaN) {
+    // Normalize NaN to a consistent hash.
+    return 0x7FF8000000000000.hashCode;
+  }
+  if (value is double && value == 0.0) {
+    // Normalize -0.0 to 0.0 so they have the same hash code.
+    return 0.0.hashCode;
+  }
+  return value.hashCode;
+}
+
+class ViewIntentPayload {
+  ViewIntentPayload({this.path, required this.mimeType, this.localAssetId});
+
+  String? path;
+
+  String mimeType;
+
+  String? localAssetId;
+
+  List<Object?> _toList() {
+    return <Object?>[path, mimeType, localAssetId];
+  }
+
+  Object encode() {
+    return _toList();
+  }
+
+  static ViewIntentPayload decode(Object result) {
+    result as List<Object?>;
+    return ViewIntentPayload(
+      path: result[0] as String?,
+      mimeType: result[1]! as String,
+      localAssetId: result[2] as String?,
+    );
+  }
+
+  @override
+  // ignore: avoid_equals_and_hash_code_on_mutable_classes
+  bool operator ==(Object other) {
+    if (other is! ViewIntentPayload || other.runtimeType != runtimeType) {
+      return false;
+    }
+    if (identical(this, other)) {
+      return true;
+    }
+    return _deepEquals(path, other.path) &&
+        _deepEquals(mimeType, other.mimeType) &&
+        _deepEquals(localAssetId, other.localAssetId);
+  }
+
+  @override
+  // ignore: avoid_equals_and_hash_code_on_mutable_classes
+  int get hashCode => _deepHash(<Object?>[runtimeType, ..._toList()]);
+}
+
+class _PigeonCodec extends StandardMessageCodec {
+  const _PigeonCodec();
+  @override
+  void writeValue(WriteBuffer buffer, Object? value) {
+    if (value is int) {
+      buffer.putUint8(4);
+      buffer.putInt64(value);
+    } else if (value is ViewIntentPayload) {
+      buffer.putUint8(129);
+      writeValue(buffer, value.encode());
+    } else {
+      super.writeValue(buffer, value);
+    }
+  }
+
+  @override
+  Object? readValueOfType(int type, ReadBuffer buffer) {
+    switch (type) {
+      case 129:
+        return ViewIntentPayload.decode(readValue(buffer)!);
+      default:
+        return super.readValueOfType(type, buffer);
+    }
+  }
+}
+
+class ViewIntentHostApi {
+  /// Constructor for [ViewIntentHostApi].  The [binaryMessenger] named argument is
+  /// available for dependency injection.  If it is left null, the default
+  /// BinaryMessenger will be used which routes to the host platform.
+  ViewIntentHostApi({BinaryMessenger? binaryMessenger, String messageChannelSuffix = ''})
+    : pigeonVar_binaryMessenger = binaryMessenger,
+      pigeonVar_messageChannelSuffix = messageChannelSuffix.isNotEmpty ? '.$messageChannelSuffix' : '';
+  final BinaryMessenger? pigeonVar_binaryMessenger;
+
+  static const MessageCodec<Object?> pigeonChannelCodec = _PigeonCodec();
+
+  final String pigeonVar_messageChannelSuffix;
+
+  Future<ViewIntentPayload?> consumeViewIntent() async {
+    final pigeonVar_channelName =
+        'dev.flutter.pigeon.immich_mobile.ViewIntentHostApi.consumeViewIntent$pigeonVar_messageChannelSuffix';
+    final pigeonVar_channel = BasicMessageChannel<Object?>(
+      pigeonVar_channelName,
+      pigeonChannelCodec,
+      binaryMessenger: pigeonVar_binaryMessenger,
+    );
+    final Future<Object?> pigeonVar_sendFuture = pigeonVar_channel.send(null);
+    final pigeonVar_replyList = await pigeonVar_sendFuture as List<Object?>?;
+
+    final Object? pigeonVar_replyValue = _extractReplyValueOrThrow(
+      pigeonVar_replyList,
+      pigeonVar_channelName,
+      isNullValid: true,
+    );
+    return pigeonVar_replyValue as ViewIntentPayload?;
+  }
+}

mobile/lib/presentation/pages/dev/main_timeline.page.dart

@@ -1,16 +1,25 @@
+import 'dart:async';
+
 import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/presentation/widgets/memory/memory_lane.widget.dart';
 import 'package:immich_mobile/presentation/widgets/timeline/timeline.widget.dart';
 import 'package:immich_mobile/providers/infrastructure/memory.provider.dart';
+import 'package:immich_mobile/providers/view_intent/view_intent_main_timeline_ready.provider.dart';
 
 @RoutePage()
-class MainTimelinePage extends ConsumerWidget {
+class MainTimelinePage extends HookConsumerWidget {
   const MainTimelinePage({super.key});
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
+    useEffect(() {
+      unawaited(Future<void>(() => ref.read(viewIntentMainTimelineReadyProvider.notifier).markMountedOnce()));
+      return null;
+    }, const []);
+
     final hasMemories = ref.watch(driftMemoryFutureProvider.select((state) => state.value?.isNotEmpty ?? false));
     return Timeline(
       topSliverWidget: const SliverToBoxAdapter(child: DriftMemoryLane()),

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

@@ -1,4 +1,5 @@
 import 'dart:async';
+import 'dart:io';
 
 import 'package:flutter/material.dart';
 import 'package:fluttertoast/fluttertoast.dart';
@@ -7,9 +8,11 @@ import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.dart';
+import 'package:immich_mobile/providers/view_intent/view_intent_file_path.provider.dart';
 import 'package:immich_mobile/providers/backup/asset_upload_progress.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/action.provider.dart';
 import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
+import 'package:immich_mobile/services/foreground_upload.service.dart';
 import 'package:immich_mobile/widgets/common/immich_toast.dart';
 import 'package:immich_ui/immich_ui.dart';
 
@@ -26,7 +29,11 @@ class UploadActionButton extends ConsumerWidget {
     }
 
     final isTimeline = source == ActionSource.timeline;
+    final viewerIntentFilePath = source == ActionSource.viewer ? ref.read(viewIntentFilePathProvider) : null;
     List<LocalAsset>? assets;
+    var isUploadDialogOpen = false;
+    var wasUploadCancelled = false;
+    Future<void>? uploadDialogFuture;
 
     if (source == ActionSource.timeline) {
       assets = ref.read(multiSelectProvider).selectedAssets.whereType<LocalAsset>().toList();
@@ -35,22 +42,44 @@ class UploadActionButton extends ConsumerWidget {
       }
       ref.read(multiSelectProvider.notifier).reset();
     } else {
-      unawaited(
-        showDialog(
-          context: context,
-          barrierDismissible: false,
-          builder: (dialogContext) => const _UploadProgressDialog(),
-        ),
-      );
+      isUploadDialogOpen = true;
+      uploadDialogFuture =
+          showDialog<void>(
+            context: context,
+            barrierDismissible: false,
+            builder: (dialogContext) => _UploadProgressDialog(
+              onCancel: () {
+                wasUploadCancelled = true;
+              },
+            ),
+          ).whenComplete(() {
+            isUploadDialogOpen = false;
+          });
+      unawaited(uploadDialogFuture);
     }
 
-    final result = await ref.read(actionProvider.notifier).upload(source, assets: assets);
+    var success = false;
+    if (!isTimeline && viewerIntentFilePath != null) {
+      var hasError = false;
+      await ref
+          .read(foregroundUploadServiceProvider)
+          .uploadShareIntent(
+            [File(viewerIntentFilePath)],
+            onError: (fileId, errorMessage) {
+              hasError = true;
+            },
+          );
+      success = !hasError;
+    } else {
+      final result = await ref.read(actionProvider.notifier).upload(source, assets: assets);
+      success = result.success;
+    }
 
-    if (!isTimeline && context.mounted) {
+    if (!isTimeline && context.mounted && isUploadDialogOpen) {
       Navigator.of(context, rootNavigator: true).pop();
     }
 
-    if (context.mounted && !result.success) {
+    if (context.mounted && !success && !wasUploadCancelled) {
       ImmichToast.show(
         context: context,
         msg: 'scaffold_body_error_occurred'.t(context: context),
@@ -73,7 +102,9 @@ class UploadActionButton extends ConsumerWidget {
 }
 
 class _UploadProgressDialog extends ConsumerWidget {
-  const _UploadProgressDialog();
+  final VoidCallback onCancel;
+
+  const _UploadProgressDialog({required this.onCancel});
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
@@ -103,7 +134,8 @@ class _UploadProgressDialog extends ConsumerWidget {
           onPressed: () {
             ref.read(manualUploadCancelTokenProvider)?.complete();
             ref.read(manualUploadCancelTokenProvider.notifier).state = null;
-            Navigator.of(context).pop();
+            onCancel();
+            Navigator.of(context, rootNavigator: true).pop();
           },
           labelText: 'cancel'.t(context: context),
         ),

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

@@ -1,4 +1,5 @@
 import 'dart:async';
+import 'dart:io';
 import 'dart:math' as math;
 
 import 'package:auto_route/auto_route.dart';
@@ -21,6 +22,7 @@ import 'package:immich_mobile/providers/asset_viewer/asset_viewer.provider.dart'
 import 'package:immich_mobile/providers/asset_viewer/is_motion_video_playing.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/metadata.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
+import 'package:immich_mobile/providers/view_intent/view_intent_file_path.provider.dart';
 import 'package:immich_mobile/widgets/common/immich_loading_indicator.dart';
 import 'package:immich_mobile/widgets/photo_view/photo_view.dart';
 
@@ -323,14 +325,18 @@ class _AssetPageState extends ConsumerState<AssetPage> {
     required PhotoViewHeroAttributes? heroAttributes,
     required bool isCurrent,
     required bool isPlayingMotionVideo,
+    required String? localFilePath,
   }) {
     final size = context.sizeData;
+    final imageProvider = localFilePath != null
+        ? FileImage(File(localFilePath))
+        : getFullImageProvider(asset, size: size);
 
     if (asset.isImage && !isPlayingMotionVideo) {
       return PhotoView(
         key: Key(asset.heroTag),
         index: widget.index,
-        imageProvider: getFullImageProvider(asset, size: size),
+        imageProvider: imageProvider,
         heroAttributes: heroAttributes,
         loadingBuilder: (context, progress, index) => const Center(child: ImmichLoadingIndicator()),
         gaplessPlayback: true,
@@ -377,12 +383,9 @@ class _AssetPageState extends ConsumerState<AssetPage> {
       child: NativeVideoViewer(
         key: _NativeVideoViewerKey(asset.heroTag),
         asset: asset,
+        localFilePath: localFilePath,
         isCurrent: isCurrent,
-        image: Image(
-          image: getFullImageProvider(asset, size: size),
-          fit: BoxFit.contain,
-          alignment: Alignment.center,
-        ),
+        image: Image(image: imageProvider, fit: BoxFit.contain, alignment: Alignment.center),
       ),
     );
   }
@@ -393,6 +396,7 @@ class _AssetPageState extends ConsumerState<AssetPage> {
     _showingDetails = ref.watch(assetViewerProvider.select((s) => s.showingDetails));
     final stackIndex = ref.watch(assetViewerProvider.select((s) => s.stackIndex));
     final isPlayingMotionVideo = ref.watch(isPlayingMotionVideoProvider);
+    final timelineOrigin = ref.read(timelineServiceProvider).origin;
 
     final asset = _asset;
     if (asset == null) {
@@ -421,6 +425,8 @@ class _AssetPageState extends ConsumerState<AssetPage> {
       _scrollController.snapPosition.snapOffset = _snapOffset;
     }
 
+    final viewIntentFilePath = timelineOrigin == TimelineOrigin.deepLink ? ref.watch(viewIntentFilePathProvider) : null;
+
     return Stack(
       children: [
         SingleChildScrollView(
@@ -440,6 +446,7 @@ class _AssetPageState extends ConsumerState<AssetPage> {
                         : null,
                     isCurrent: isCurrent,
                     isPlayingMotionVideo: isPlayingMotionVideo,
+                    localFilePath: viewIntentFilePath,
                   ),
                 ),
                 IgnorePointer(

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

@@ -64,18 +64,7 @@ class AssetViewer extends ConsumerStatefulWidget {
   ConsumerState createState() => _AssetViewerState();
 
   static void setAsset(WidgetRef ref, BaseAsset asset) {
-    ref.read(assetViewerProvider.notifier).reset();
-
-    // Hide controls by default for videos
-    if (asset.isVideo) {
-      ref.read(assetViewerProvider.notifier).setControls(false);
-    }
-
-    _setAsset(ref, asset);
-  }
-
-  static void _setAsset(WidgetRef ref, BaseAsset asset) {
-    ref.read(assetViewerProvider.notifier).setAsset(asset);
+    prepareAssetViewerState(ref.read(assetViewerProvider.notifier), asset);
   }
 }
 
@@ -89,6 +78,7 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
 
   StreamSubscription? _reloadSubscription;
   KeepAliveLink? _stackChildrenKeepAlive;
+  bool _disposeStarted = false;
 
   void _onTapNavigate(int direction) {
     final page = _pageController.page?.toInt();
@@ -123,6 +113,7 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
 
   @override
   void dispose() {
+    _disposeStarted = true;
     _pageController.dispose();
     _preloader.dispose();
     _reloadSubscription?.cancel();
@@ -160,14 +151,17 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
   }
 
   void _onAssetChanged(int index) async {
+    if (!mounted) {
+      return;
+    }
     _currentPage = index;
 
     final asset = await ref.read(timelineServiceProvider).getAssetAsync(index);
-    if (asset == null) {
+    if (!mounted || asset == null) {
       return;
     }
 
-    AssetViewer._setAsset(ref, asset);
+    ref.read(assetViewerProvider.notifier).setAsset(asset);
     _preloader.preload(index, context.sizeData);
     _handleCasting();
     _stackChildrenKeepAlive?.close();
@@ -203,6 +197,9 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
   }
 
   void _onEvent(Event event) {
+    if (!mounted || _disposeStarted) {
+      return;
+    }
     switch (event) {
       case TimelineReloadEvent():
         _onTimelineReloadEvent();
@@ -226,13 +223,20 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
   void _onTimelineReloadEvent() {
     final timelineService = ref.read(timelineServiceProvider);
     final totalAssets = timelineService.totalAssets;
+    final currentAsset = ref.read(assetViewerProvider).currentAsset;
+    final isViewerTransitionInProgress = ref.read(
+      assetViewerProvider.select((value) => value.isViewerTransitionInProgress),
+    );
+
+    if (isViewerTransitionInProgress) {
+      return;
+    }
 
     if (totalAssets == 0) {
       context.maybePop();
       return;
     }
 
-    final currentAsset = ref.read(assetViewerProvider).currentAsset;
     final assetIndex = currentAsset != null ? timelineService.getIndex(currentAsset.heroTag) : null;
     final index = (assetIndex ?? _currentPage).clamp(0, totalAssets - 1);
 

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

@@ -1,4 +1,5 @@
 import 'dart:async';
+import 'dart:io';
 
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
@@ -19,6 +20,7 @@ import 'package:native_video_player/native_video_player.dart';
 
 class NativeVideoViewer extends ConsumerStatefulWidget {
   final BaseAsset asset;
+  final String? localFilePath;
   final bool isCurrent;
   final bool showControls;
   final Widget image;
@@ -26,6 +28,7 @@ class NativeVideoViewer extends ConsumerStatefulWidget {
   const NativeVideoViewer({
     super.key,
     required this.asset,
+    this.localFilePath,
     required this.image,
     this.isCurrent = false,
     this.showControls = true,
@@ -106,6 +109,19 @@ class _NativeVideoViewerState extends ConsumerState<NativeVideoViewer> with Widg
     }
 
     try {
+      final localFilePath = widget.localFilePath;
+      if (localFilePath != null) {
+        final file = File(localFilePath);
+        if (!await file.exists()) {
+          throw Exception('No file found for the video');
+        }
+
+        return VideoSource.init(
+          path: CurrentPlatform.isAndroid ? file.uri.toString() : file.path,
+          type: VideoSourceType.file,
+        );
+      }
+
       if (videoAsset.hasLocal && videoAsset.livePhotoVideoId == null) {
         final id = videoAsset is LocalAsset ? videoAsset.id : (videoAsset as RemoteAsset).localId!;
         final file = await StorageRepository().getFileForAsset(id);

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

@@ -10,6 +10,7 @@ class AssetViewerState {
   final bool isZoomed;
   final BaseAsset? currentAsset;
   final int stackIndex;
+  final bool isViewerTransitionInProgress;
 
   const AssetViewerState({
     this.backgroundOpacity = 1.0,
@@ -18,6 +19,7 @@ class AssetViewerState {
     this.isZoomed = false,
     this.currentAsset,
     this.stackIndex = 0,
+    this.isViewerTransitionInProgress = false,
   });
 
   AssetViewerState copyWith({
@@ -27,6 +29,7 @@ class AssetViewerState {
     bool? isZoomed,
     BaseAsset? currentAsset,
     int? stackIndex,
+    bool? isViewerTransitionInProgress,
   }) {
     return AssetViewerState(
       backgroundOpacity: backgroundOpacity ?? this.backgroundOpacity,
@@ -35,6 +38,7 @@ class AssetViewerState {
       isZoomed: isZoomed ?? this.isZoomed,
       currentAsset: currentAsset ?? this.currentAsset,
       stackIndex: stackIndex ?? this.stackIndex,
+      isViewerTransitionInProgress: isViewerTransitionInProgress ?? this.isViewerTransitionInProgress,
     );
   }
 
@@ -57,7 +61,8 @@ class AssetViewerState {
         other.showingControls == showingControls &&
         other.isZoomed == isZoomed &&
         other.currentAsset == currentAsset &&
-        other.stackIndex == stackIndex;
+        other.stackIndex == stackIndex &&
+        other.isViewerTransitionInProgress == isViewerTransitionInProgress;
   }
 
   @override
@@ -67,7 +72,8 @@ class AssetViewerState {
       showingControls.hashCode ^
       isZoomed.hashCode ^
       currentAsset.hashCode ^
-      stackIndex.hashCode;
+      stackIndex.hashCode ^
+      isViewerTransitionInProgress.hashCode;
 }
 
 class AssetViewerStateNotifier extends Notifier<AssetViewerState> {
@@ -137,10 +143,28 @@ class AssetViewerStateNotifier extends Notifier<AssetViewerState> {
     }
     state = state.copyWith(stackIndex: index);
   }
+
+  void setViewerTransitionInProgress(bool isInProgress) {
+    if (isInProgress == state.isViewerTransitionInProgress) {
+      return;
+    }
+    state = state.copyWith(isViewerTransitionInProgress: isInProgress);
+  }
 }
 
 final assetViewerProvider = NotifierProvider<AssetViewerStateNotifier, AssetViewerState>(AssetViewerStateNotifier.new);
 
+void prepareAssetViewerState(AssetViewerStateNotifier notifier, BaseAsset asset) {
+  notifier.reset();
+
+  // Hide controls by default for videos before the viewer is shown.
+  if (asset.isVideo) {
+    notifier.setControls(false);
+  }
+
+  notifier.setAsset(asset);
+}
+
 final _watchedCurrentAssetProvider = StreamProvider<BaseAsset?>((ref) {
   ref.watch(assetViewerProvider.select((s) => s.currentAsset?.heroTag));
   final asset = ref.read(assetViewerProvider).currentAsset;

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

@@ -1,101 +1,101 @@
-import 'dart:io';
-
-import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/models/upload/share_intent_attachment.model.dart';
-import 'package:immich_mobile/routing/router.dart';
-import 'package:immich_mobile/services/share_intent_service.dart';
-import 'package:immich_mobile/services/foreground_upload.service.dart';
-import 'package:logging/logging.dart';
-import 'package:path/path.dart' as p;
-
-final shareIntentUploadProvider = StateNotifierProvider<ShareIntentUploadStateNotifier, List<ShareIntentAttachment>>(
-  ((ref) => ShareIntentUploadStateNotifier(
-    ref.watch(appRouterProvider),
-    ref.read(foregroundUploadServiceProvider),
-    ref.read(shareIntentServiceProvider),
-  )),
-);
-
-class ShareIntentUploadStateNotifier extends StateNotifier<List<ShareIntentAttachment>> {
-  final AppRouter router;
-  final ForegroundUploadService _foregroundUploadService;
-  final ShareIntentService _shareIntentService;
-  final Logger _logger = Logger('ShareIntentUploadStateNotifier');
-
-  ShareIntentUploadStateNotifier(this.router, this._foregroundUploadService, this._shareIntentService) : super([]);
-
-  void init() {
-    _shareIntentService.onSharedMedia = onSharedMedia;
-    _shareIntentService.init();
-  }
-
-  void onSharedMedia(List<ShareIntentAttachment> attachments) {
-    router.removeWhere((route) => route.name == "ShareIntentRoute");
-    clearAttachments();
-    addAttachments(attachments);
-    router.push(ShareIntentRoute(attachments: attachments));
-  }
-
-  void addAttachments(List<ShareIntentAttachment> attachments) {
-    if (attachments.isEmpty) {
-      return;
-    }
-    state = [...state, ...attachments];
-  }
-
-  void removeAttachment(ShareIntentAttachment attachment) {
-    final updatedState = state.where((element) => element != attachment).toList();
-    if (updatedState.length != state.length) {
-      state = updatedState;
-    }
-  }
-
-  void clearAttachments() {
-    if (state.isEmpty) {
-      return;
-    }
-
-    state = [];
-  }
-
-  Future<void> uploadAll(List<File> files) async {
-    for (final file in files) {
-      final fileId = p.hash(file.path).toString();
-      _updateStatus(fileId, UploadStatus.running);
-    }
-
-    await _foregroundUploadService.uploadShareIntent(
-      files,
-      onProgress: (fileId, bytes, totalBytes) {
-        final progress = totalBytes > 0 ? bytes / totalBytes : 0.0;
-        _updateProgress(fileId, progress);
-      },
-      onSuccess: (fileId) {
-        _updateStatus(fileId, UploadStatus.complete, progress: 1.0);
-      },
-      onError: (fileId, errorMessage) {
-        _logger.warning("Upload failed for file: $fileId, error: $errorMessage");
-        _updateStatus(fileId, UploadStatus.failed);
-      },
-    );
-  }
-
-  void _updateStatus(String fileId, UploadStatus status, {double? progress}) {
-    final id = int.parse(fileId);
-    state = [
-      for (final attachment in state)
-        if (attachment.id == id)
-          attachment.copyWith(status: status, uploadProgress: progress ?? attachment.uploadProgress)
-        else
-          attachment,
-    ];
-  }
-
-  void _updateProgress(String fileId, double progress) {
-    final id = int.parse(fileId);
-    state = [
-      for (final attachment in state)
-        if (attachment.id == id) attachment.copyWith(uploadProgress: progress) else attachment,
-    ];
-  }
-}
+import 'dart:io';
+
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/models/upload/share_intent_attachment.model.dart';
+import 'package:immich_mobile/routing/router.dart';
+import 'package:immich_mobile/services/foreground_upload.service.dart';
+import 'package:immich_mobile/services/share_intent_service.dart';
+import 'package:logging/logging.dart';
+import 'package:path/path.dart' as p;
+
+final shareIntentUploadProvider = StateNotifierProvider<ShareIntentUploadStateNotifier, List<ShareIntentAttachment>>(
+  ((ref) => ShareIntentUploadStateNotifier(
+    ref.watch(appRouterProvider),
+    ref.read(foregroundUploadServiceProvider),
+    ref.read(shareIntentServiceProvider),
+  )),
+);
+
+class ShareIntentUploadStateNotifier extends StateNotifier<List<ShareIntentAttachment>> {
+  final AppRouter router;
+  final ForegroundUploadService _foregroundUploadService;
+  final ShareIntentService _shareIntentService;
+  final Logger _logger = Logger('ShareIntentUploadStateNotifier');
+
+  ShareIntentUploadStateNotifier(this.router, this._foregroundUploadService, this._shareIntentService) : super([]);
+
+  void init() {
+    _shareIntentService.onSharedMedia = onSharedMedia;
+    _shareIntentService.init();
+  }
+
+  void onSharedMedia(List<ShareIntentAttachment> attachments) {
+    router.removeWhere((route) => route.name == "ShareIntentRoute");
+    clearAttachments();
+    addAttachments(attachments);
+    router.push(ShareIntentRoute(attachments: attachments));
+  }
+
+  void addAttachments(List<ShareIntentAttachment> attachments) {
+    if (attachments.isEmpty) {
+      return;
+    }
+    state = [...state, ...attachments];
+  }
+
+  void removeAttachment(ShareIntentAttachment attachment) {
+    final updatedState = state.where((element) => element != attachment).toList();
+    if (updatedState.length != state.length) {
+      state = updatedState;
+    }
+  }
+
+  void clearAttachments() {
+    if (state.isEmpty) {
+      return;
+    }
+
+    state = [];
+  }
+
+  Future<void> uploadAll(List<File> files) async {
+    for (final file in files) {
+      final fileId = p.hash(file.path).toString();
+      _updateStatus(fileId, UploadStatus.running);
+    }
+
+    await _foregroundUploadService.uploadShareIntent(
+      files,
+      onProgress: (fileId, bytes, totalBytes) {
+        final progress = totalBytes > 0 ? bytes / totalBytes : 0.0;
+        _updateProgress(fileId, progress);
+      },
+      onSuccess: (fileId, _) {
+        _updateStatus(fileId, UploadStatus.complete, progress: 1.0);
+      },
+      onError: (fileId, errorMessage) {
+        _logger.warning("Upload failed for file: $fileId, error: $errorMessage");
+        _updateStatus(fileId, UploadStatus.failed);
+      },
+    );
+  }
+
+  void _updateStatus(String fileId, UploadStatus status, {double? progress}) {
+    final id = int.parse(fileId);
+    state = [
+      for (final attachment in state)
+        if (attachment.id == id)
+          attachment.copyWith(status: status, uploadProgress: progress ?? attachment.uploadProgress)
+        else
+          attachment,
+    ];
+  }
+
+  void _updateProgress(String fileId, double progress) {
+    final id = int.parse(fileId);
+    state = [
+      for (final attachment in state)
+        if (attachment.id == id) attachment.copyWith(uploadProgress: progress) else attachment,
+    ];
+  }
+}

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

@@ -31,11 +31,12 @@ class ActionResult {
   final int count;
   final bool success;
   final String? error;
+  final List<String> remoteAssetIds;
 
-  const ActionResult({required this.count, required this.success, this.error});
+  const ActionResult({required this.count, required this.success, this.error, this.remoteAssetIds = const []});
 
   @override
-  String toString() => 'ActionResult(count: $count, success: $success, error: $error)';
+  String toString() => 'ActionResult(count: $count, success: $success, error: $error, remoteAssetIds: $remoteAssetIds)';
 }
 
 class ActionNotifier extends Notifier<void> {
@@ -489,10 +490,14 @@ class ActionNotifier extends Notifier<void> {
 
   Future<ActionResult> upload(ActionSource source, {List<LocalAsset>? assets}) async {
     final assetsToUpload = assets ?? _getAssets(source).whereType<LocalAsset>().toList();
+    if (assetsToUpload.isEmpty) {
+      return const ActionResult(count: 0, success: false, error: 'No assets to upload');
+    }
 
     final progressNotifier = ref.read(assetUploadProgressProvider.notifier);
     final cancelToken = Completer<void>();
     ref.read(manualUploadCancelTokenProvider.notifier).state = cancelToken;
+    final remoteAssetIds = <String>[];
 
     // Initialize progress for all assets
     for (final asset in assetsToUpload) {
@@ -509,6 +514,7 @@ class ActionNotifier extends Notifier<void> {
             progressNotifier.setProgress(localAssetId, progress);
           },
           onSuccess: (localAssetId, remoteAssetId) {
+            remoteAssetIds.add(remoteAssetId);
             progressNotifier.remove(localAssetId);
           },
           onError: (localAssetId, errorMessage) {
@@ -516,7 +522,14 @@ class ActionNotifier extends Notifier<void> {
           },
         ),
       );
-      return ActionResult(count: assetsToUpload.length, success: true);
+      final uploadedCount = remoteAssetIds.length;
+      final success = uploadedCount == assetsToUpload.length;
+      return ActionResult(
+        count: assetsToUpload.length,
+        success: success,
+        error: success ? null : 'Uploaded $uploadedCount/${assetsToUpload.length} assets successfully',
+        remoteAssetIds: remoteAssetIds,
+      );
     } catch (error, stack) {
       _logger.severe('Failed manually upload assets', error, stack);
       return ActionResult(count: assetsToUpload.length, success: false, error: error.toString());

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

@@ -3,9 +3,10 @@ import 'package:immich_mobile/domain/services/background_worker.service.dart';
 import 'package:immich_mobile/platform/background_worker_api.g.dart';
 import 'package:immich_mobile/platform/background_worker_lock_api.g.dart';
 import 'package:immich_mobile/platform/connectivity_api.g.dart';
-import 'package:immich_mobile/platform/native_sync_api.g.dart';
 import 'package:immich_mobile/platform/local_image_api.g.dart';
+import 'package:immich_mobile/platform/native_sync_api.g.dart';
 import 'package:immich_mobile/platform/network_api.g.dart';
+import 'package:immich_mobile/platform/permission_api.g.dart';
 import 'package:immich_mobile/platform/remote_image_api.g.dart';
 
 final backgroundWorkerFgServiceProvider = Provider((_) => BackgroundWorkerFgService(BackgroundWorkerFgHostApi()));
@@ -16,6 +17,8 @@ final backgroundWorkerLockServiceProvider = Provider<BackgroundWorkerLockService
 
 final nativeSyncApiProvider = Provider<NativeSyncApi>((_) => NativeSyncApi());
 
+final permissionApiProvider = Provider<PermissionApi>((_) => PermissionApi());
+
 final connectivityApiProvider = Provider<ConnectivityApi>((_) => ConnectivityApi());
 
 final localImageApi = LocalImageApi();

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

@@ -11,8 +11,8 @@ import 'package:immich_mobile/providers/infrastructure/asset.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/cancel.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/db.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/platform.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/storage.provider.dart';
-import 'package:immich_mobile/repositories/local_files_manager.repository.dart';
+import 'package:immich_mobile/repositories/asset_media.repository.dart';
+import 'package:immich_mobile/repositories/permission.repository.dart';
 
 final syncMigrationRepositoryProvider = Provider((ref) => SyncMigrationRepository(ref.watch(driftProvider)));
 
@@ -22,8 +22,8 @@ final syncStreamServiceProvider = Provider(
     syncStreamRepository: ref.watch(syncStreamRepositoryProvider),
     localAssetRepository: ref.watch(localAssetRepository),
     trashedLocalAssetRepository: ref.watch(trashedLocalAssetRepository),
-    localFilesManager: ref.watch(localFilesManagerRepositoryProvider),
-    storageRepository: ref.watch(storageRepositoryProvider),
+    assetMediaRepository: ref.watch(assetMediaRepositoryProvider),
+    permissionRepository: ref.watch(permissionRepositoryProvider),
     syncMigrationRepository: ref.watch(syncMigrationRepositoryProvider),
     api: ref.watch(apiServiceProvider),
     cancelChecker: ref.watch(cancellationProvider),
@@ -39,8 +39,8 @@ final localSyncServiceProvider = Provider(
     localAlbumRepository: ref.watch(localAlbumRepository),
     localAssetRepository: ref.watch(localAssetRepository),
     trashedLocalAssetRepository: ref.watch(trashedLocalAssetRepository),
-    localFilesManager: ref.watch(localFilesManagerRepositoryProvider),
-    storageRepository: ref.watch(storageRepositoryProvider),
+    assetMediaRepository: ref.watch(assetMediaRepositoryProvider),
+    permissionRepository: ref.watch(permissionRepositoryProvider),
     nativeSyncApi: ref.watch(nativeSyncApiProvider),
   ),
 );

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

@@ -41,3 +41,23 @@ final timelineUsersProvider = StreamProvider<List<String>>((ref) {
 
   return ref.watch(timelineRepositoryProvider).watchTimelineUserIds(currentUserId);
 });
+
+final timelineStatusProvider = StreamProvider.autoDispose.family<TimelineStatus, TimelineService>((
+  ref,
+  timelineService,
+) async* {
+  yield timelineService.status;
+  yield* timelineService.watchStatus();
+});
+
+Future<void> waitForTimelineReady(TimelineService timelineService, Duration timeout) {
+  if (timelineService.isReady) {
+    return Future.value();
+  }
+
+  return timelineService
+      .watchStatus()
+      .firstWhere((status) => status == TimelineStatus.ready)
+      .timeout(timeout)
+      .then((_) {});
+}

mobile/lib/providers/view_intent/view_intent_file_path.provider.dart

@@ -0,0 +1,31 @@
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+
+class ViewIntentFilePathNotifier extends Notifier<String?> {
+  @override
+  String? build() => null;
+
+  void setPath(String path) {
+    if (state == path) {
+      return;
+    }
+    state = path;
+  }
+
+  void clear() {
+    if (state == null) {
+      return;
+    }
+    state = null;
+  }
+
+  void clearIfMatch(String path) {
+    if (state != path) {
+      return;
+    }
+    state = null;
+  }
+}
+
+final viewIntentFilePathProvider = NotifierProvider<ViewIntentFilePathNotifier, String?>(
+  ViewIntentFilePathNotifier.new,
+);

mobile/lib/providers/view_intent/view_intent_handler.provider.dart

@@ -0,0 +1,23 @@
+import 'dart:io';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/platform/view_intent_api.g.dart';
+import 'package:immich_mobile/providers/view_intent/view_intent_handler_android.dart';
+import 'package:immich_mobile/providers/view_intent/view_intent_handler_stub.dart';
+
+abstract class ViewIntentHandler {
+  void init();
+
+  Future<void> onAppResumed();
+
+  Future<void> flushDeferredViewIntent();
+
+  Future<void> handle(ViewIntentPayload attachment);
+}
+
+final viewIntentHandlerProvider = Provider<ViewIntentHandler>((ref) {
+  if (Platform.isAndroid) {
+    return AndroidViewIntentHandler(ref);
+  }
+
+  return const StubViewIntentHandler();
+});

mobile/lib/providers/view_intent/view_intent_handler_android.dart

@@ -0,0 +1,118 @@
+import 'dart:async';
+
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
+import 'package:immich_mobile/domain/services/timeline.service.dart';
+import 'package:immich_mobile/platform/view_intent_api.g.dart';
+import 'package:immich_mobile/providers/asset_viewer/asset_viewer.provider.dart';
+import 'package:immich_mobile/providers/auth.provider.dart';
+import 'package:immich_mobile/providers/view_intent/view_intent_file_path.provider.dart';
+import 'package:immich_mobile/providers/view_intent/view_intent_handler.provider.dart';
+import 'package:immich_mobile/providers/view_intent/view_intent_main_timeline_ready.provider.dart';
+import 'package:immich_mobile/providers/view_intent/view_intent_pending.provider.dart';
+import 'package:immich_mobile/routing/router.dart';
+import 'package:immich_mobile/services/view_intent.service.dart';
+import 'package:immich_mobile/services/view_intent_asset_resolver.service.dart';
+import 'package:logging/logging.dart';
+
+class AndroidViewIntentHandler implements ViewIntentHandler {
+  final Ref _ref;
+  final ViewIntentService _viewIntentService;
+  final ViewIntentAssetResolver _viewIntentAssetResolver;
+  final AppRouter _router;
+  static final Logger _logger = Logger('ViewIntentHandler');
+
+  AndroidViewIntentHandler(Ref ref)
+    : _ref = ref,
+      _viewIntentService = ref.read(viewIntentServiceProvider),
+      _viewIntentAssetResolver = ref.read(viewIntentAssetResolverProvider),
+      _router = ref.watch(appRouterProvider);
+
+  @override
+  void init() {
+    // Covers cold start from a view intent before the first lifecycle "resumed".
+    unawaited(onAppResumed());
+  }
+
+  @override
+  Future<void> onAppResumed() => _checkForViewIntent();
+
+  @override
+  Future<void> flushDeferredViewIntent() => _flushPending();
+
+  Future<void> _checkForViewIntent() async {
+    final attachment = await _viewIntentService.consumeViewIntent();
+    if (attachment != null) {
+      await handle(attachment);
+      return;
+    }
+
+    if (_ref.read(viewIntentPendingProvider) == null) {
+      await _viewIntentService.cleanupStaleTempFiles();
+    }
+  }
+
+  Future<void> _flushPending() async {
+    if (_ref.read(viewIntentPendingProvider) == null) {
+      return;
+    }
+
+    try {
+      await _ref.read(viewIntentMainTimelineReadyProvider.notifier).wait(timeout: const Duration(seconds: 3));
+    } catch (_) {
+      return;
+    }
+
+    final pendingAttachment = _ref.read(viewIntentPendingProvider.notifier).takeIfFresh();
+    _logger.info('flushPending, pendingAttachment:$pendingAttachment}');
+    if (pendingAttachment != null) {
+      await handle(pendingAttachment);
+    }
+  }
+
+  @override
+  Future<void> handle(ViewIntentPayload attachment) async {
+    _logger.info(
+      'handle attachment, mimeType:${attachment.mimeType}, localAssetId=${attachment.localAssetId}, path=${attachment.path}, isAuthenticated:${_ref.read(authProvider).isAuthenticated}',
+    );
+
+    if (!_ref.read(authProvider).isAuthenticated) {
+      _ref.read(viewIntentPendingProvider.notifier).defer(attachment);
+      return;
+    }
+
+    final resolvedAsset = await _viewIntentAssetResolver.resolve(attachment);
+    _logger.fine('resolved view intent asset: ${resolvedAsset.asset}');
+    await _openAssetViewer(
+      resolvedAsset.asset,
+      resolvedAsset.timelineService,
+      viewIntentFilePath: resolvedAsset.viewIntentFilePath,
+    );
+  }
+
+  Future<void> _openAssetViewer(BaseAsset asset, TimelineService timelineService, {String? viewIntentFilePath}) async {
+    final notifier = _ref.read(assetViewerProvider.notifier);
+    notifier.setViewerTransitionInProgress(true);
+    try {
+      prepareAssetViewerState(notifier, asset);
+      if (viewIntentFilePath != null) {
+        _ref.read(viewIntentFilePathProvider.notifier).setPath(viewIntentFilePath);
+        unawaited(_viewIntentService.setManagedTempFilePath(viewIntentFilePath));
+      } else {
+        _ref.read(viewIntentFilePathProvider.notifier).clear();
+        unawaited(_viewIntentService.cleanupManagedTempFile());
+      }
+
+      // Mirror the home-screen widget pattern: replace the route stack so
+      // the viewer sits directly on top of the main timeline. Back-press
+      // from the viewer lands the user on the timeline rather than on
+      // whatever route happened to be current (e.g. splash, login).
+      await _router.replaceAll([
+        const TabShellRoute(),
+        AssetViewerRoute(initialIndex: 0, timelineService: timelineService),
+      ]);
+    } finally {
+      notifier.setViewerTransitionInProgress(false);
+    }
+  }
+}

mobile/lib/providers/view_intent/view_intent_handler_stub.dart

@@ -0,0 +1,18 @@
+import 'package:immich_mobile/platform/view_intent_api.g.dart';
+import 'package:immich_mobile/providers/view_intent/view_intent_handler.provider.dart';
+
+class StubViewIntentHandler implements ViewIntentHandler {
+  const StubViewIntentHandler();
+
+  @override
+  void init() {}
+
+  @override
+  Future<void> onAppResumed() async {}
+
+  @override
+  Future<void> flushDeferredViewIntent() async {}
+
+  @override
+  Future<void> handle(ViewIntentPayload attachment) async {}
+}

mobile/lib/providers/view_intent/view_intent_main_timeline_ready.provider.dart

@@ -0,0 +1,59 @@
+import 'dart:async';
+
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/domain/services/timeline.service.dart';
+import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
+
+final viewIntentMainTimelineReadyProvider = NotifierProvider<ViewIntentMainTimelineReadyNotifier, bool>(
+  ViewIntentMainTimelineReadyNotifier.new,
+);
+
+class ViewIntentMainTimelineReadyNotifier extends Notifier<bool> {
+  Completer<void>? _readyCompleter;
+  bool _hasSeenMainTimeline = false;
+  bool _hasTimelineUsers = false;
+  bool _isTimelineReady = false;
+
+  @override
+  bool build() {
+    _readyCompleter ??= Completer<void>();
+
+    final timelineUsers = ref.watch(timelineUsersProvider).valueOrNull;
+    final timelineService = ref.watch(timelineServiceProvider);
+    final timelineStatus = ref.watch(timelineStatusProvider(timelineService)).valueOrNull ?? timelineService.status;
+
+    _hasTimelineUsers = timelineUsers != null && timelineUsers.isNotEmpty;
+    _isTimelineReady = timelineStatus == TimelineStatus.ready;
+
+    final isReady = _computeReady();
+    _completeWaitersIfReady(isReady);
+    return isReady;
+  }
+
+  Future<void> wait({required Duration timeout}) {
+    if (state) {
+      return Future.value();
+    }
+
+    return _readyCompleter!.future.timeout(timeout);
+  }
+
+  void markMountedOnce() {
+    _hasSeenMainTimeline = true;
+    final isReady = _computeReady();
+    state = isReady;
+    _completeWaitersIfReady(isReady);
+  }
+
+  bool _computeReady() => _hasSeenMainTimeline && _hasTimelineUsers && _isTimelineReady;
+
+  void _completeWaitersIfReady(bool isReady) {
+    if (isReady) {
+      if (!(_readyCompleter?.isCompleted ?? true)) {
+        _readyCompleter?.complete();
+      }
+    } else if (_readyCompleter?.isCompleted ?? true) {
+      _readyCompleter = Completer<void>();
+    }
+  }
+}

mobile/lib/providers/view_intent/view_intent_pending.provider.dart

@@ -0,0 +1,39 @@
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/platform/view_intent_api.g.dart';
+
+final viewIntentNowProvider = Provider<DateTime Function()>((ref) => DateTime.now);
+
+final viewIntentPendingProvider = NotifierProvider<ViewIntentPendingNotifier, ViewIntentPayload?>(
+  ViewIntentPendingNotifier.new,
+);
+
+class ViewIntentPendingNotifier extends Notifier<ViewIntentPayload?> {
+  static const _ttl = Duration(minutes: 10);
+
+  DateTime? _deferredAt;
+
+  @override
+  ViewIntentPayload? build() => null;
+
+  void defer(ViewIntentPayload attachment) {
+    _deferredAt = ref.read(viewIntentNowProvider)();
+    state = attachment;
+  }
+
+  ViewIntentPayload? takeIfFresh() {
+    final attachment = state;
+    final deferredAt = _deferredAt;
+    state = null;
+    _deferredAt = null;
+
+    if (attachment == null) {
+      return null;
+    }
+
+    if (deferredAt != null && ref.read(viewIntentNowProvider)().difference(deferredAt) > _ttl) {
+      return null;
+    }
+
+    return attachment;
+  }
+}

mobile/lib/repositories/asset_media.repository.dart

@@ -8,19 +8,24 @@ import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/extensions/platform_extensions.dart';
 import 'package:immich_mobile/extensions/response_extensions.dart';
+import 'package:immich_mobile/platform/native_sync_api.g.dart';
+import 'package:immich_mobile/providers/infrastructure/platform.provider.dart';
 import 'package:immich_mobile/repositories/asset_api.repository.dart';
 import 'package:logging/logging.dart';
 import 'package:path_provider/path_provider.dart';
 import 'package:photo_manager/photo_manager.dart';
 import 'package:share_plus/share_plus.dart';
 
-final assetMediaRepositoryProvider = Provider((ref) => AssetMediaRepository(ref.watch(assetApiRepositoryProvider)));
+final assetMediaRepositoryProvider = Provider(
+  (ref) => AssetMediaRepository(ref.watch(assetApiRepositoryProvider), ref.watch(nativeSyncApiProvider)),
+);
 
 class AssetMediaRepository {
   final AssetApiRepository _assetApiRepository;
+  final NativeSyncApi _nativeSyncApi;
   static final Logger _log = Logger("AssetMediaRepository");
 
-  const AssetMediaRepository(this._assetApiRepository);
+  const AssetMediaRepository(this._assetApiRepository, this._nativeSyncApi);
 
   Future<bool> _androidSupportsTrash() async {
     if (Platform.isAndroid) {
@@ -45,6 +50,27 @@ class AssetMediaRepository {
     return PhotoManager.editor.deleteWithIds(ids);
   }
 
+  Future<bool> _restoreFromTrashById(String mediaId, int type) async {
+    try {
+      return await _nativeSyncApi.restoreFromTrashById(mediaId, type);
+    } catch (e, s) {
+      _log.warning('Error restore file from trash by Id', e, s);
+      return false;
+    }
+  }
+
+  Future<List<String>> restoreAssetsFromTrash(Iterable<LocalAsset> assets) async {
+    final restoredIds = <String>[];
+    for (final asset in assets) {
+      _log.info("Restoring from trash, localId: ${asset.id}, checksum: ${asset.checksum}");
+      final result = await _restoreFromTrashById(asset.id, asset.type.index);
+      if (result) {
+        restoredIds.add(asset.id);
+      }
+    }
+    return restoredIds;
+  }
+
   Future<AssetEntity?> get(String id) async {
     final entity = await AssetEntity.fromId(id);
     return entity;

mobile/lib/repositories/local_files_manager.repository.dart

@@ -1,51 +0,0 @@
-import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
-import 'package:immich_mobile/services/local_files_manager.service.dart';
-import 'package:logging/logging.dart';
-
-final localFilesManagerRepositoryProvider = Provider(
-  (ref) => LocalFilesManagerRepository(ref.watch(localFileManagerServiceProvider)),
-);
-
-class LocalFilesManagerRepository {
-  LocalFilesManagerRepository(this._service);
-
-  final Logger _logger = Logger('LocalFilesManagerRepo');
-  final LocalFilesManagerService _service;
-
-  Future<bool> moveToTrash(List<String> mediaUrls) async {
-    return await _service.moveToTrash(mediaUrls);
-  }
-
-  Future<bool> restoreFromTrash(String fileName, int type) async {
-    return await _service.restoreFromTrash(fileName, type);
-  }
-
-  Future<bool> requestManageMediaPermission() async {
-    return await _service.requestManageMediaPermission();
-  }
-
-  Future<bool> hasManageMediaPermission() async {
-    return await _service.hasManageMediaPermission();
-  }
-
-  Future<bool> manageMediaPermission() async {
-    return await _service.manageMediaPermission();
-  }
-
-  Future<List<String>> restoreAssetsFromTrash(Iterable<LocalAsset> assets) async {
-    final restoredIds = <String>[];
-    for (final asset in assets) {
-      _logger.info("Restoring from trash, localId: ${asset.id}, remoteId: ${asset.checksum}");
-      try {
-        final result = await _service.restoreFromTrashById(asset.id, asset.type.index);
-        if (result) {
-          restoredIds.add(asset.id);
-        }
-      } catch (e) {
-        _logger.warning("Restoring failure: $e");
-      }
-    }
-    return restoredIds;
-  }
-}

mobile/lib/repositories/permission.repository.dart

@@ -1,12 +1,16 @@
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/platform/permission_api.g.dart';
+import 'package:immich_mobile/providers/infrastructure/platform.provider.dart';
 import 'package:permission_handler/permission_handler.dart';
 
-final permissionRepositoryProvider = Provider((_) {
-  return const PermissionRepository();
+final permissionRepositoryProvider = Provider((ref) {
+  return PermissionRepository(ref.watch(permissionApiProvider));
 });
 
 class PermissionRepository implements IPermissionRepository {
-  const PermissionRepository();
+  final PermissionApi _permissionApi;
+
+  const PermissionRepository(this._permissionApi);
 
   @override
   Future<bool> hasLocationWhenInUsePermission() {
@@ -34,6 +38,21 @@ class PermissionRepository implements IPermissionRepository {
   Future<bool> openSettings() {
     return openAppSettings();
   }
+
+  @override
+  Future<bool> hasManageMediaPermission() {
+    return _permissionApi.hasManageMediaPermission();
+  }
+
+  @override
+  Future<bool> requestManageMediaPermission() {
+    return _permissionApi.requestManageMediaPermission();
+  }
+
+  @override
+  Future<bool> manageMediaPermission() {
+    return _permissionApi.manageMediaPermission();
+  }
 }
 
 abstract interface class IPermissionRepository {
@@ -42,4 +61,7 @@ abstract interface class IPermissionRepository {
   Future<bool> hasLocationAlwaysPermission();
   Future<bool> requestLocationAlwaysPermission();
   Future<bool> openSettings();
+  Future<bool> hasManageMediaPermission();
+  Future<bool> requestManageMediaPermission();
+  Future<bool> manageMediaPermission();
 }

mobile/lib/services/foreground_upload.service.dart

@@ -151,7 +151,7 @@ class ForegroundUploadService {
     List<File> files, {
     Completer<void>? cancelToken,
     void Function(String fileId, int bytes, int totalBytes)? onProgress,
-    void Function(String fileId)? onSuccess,
+    void Function(String fileId, String remoteAssetId)? onSuccess,
     void Function(String fileId, String errorMessage)? onError,
   }) async {
     if (files.isEmpty) {
@@ -171,7 +171,7 @@ class ForegroundUploadService {
         );
 
         if (result.isSuccess) {
-          onSuccess?.call(fileId);
+          onSuccess?.call(fileId, result.remoteAssetId!);
         } else if (!result.isCancelled && result.errorMessage != null) {
           onError?.call(fileId, result.errorMessage!);
         }

mobile/lib/services/local_files_manager.service.dart

@@ -1,66 +0,0 @@
-import 'package:flutter/services.dart';
-import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:logging/logging.dart';
-
-final localFileManagerServiceProvider = Provider<LocalFilesManagerService>((ref) => const LocalFilesManagerService());
-
-class LocalFilesManagerService {
-  const LocalFilesManagerService();
-
-  static final Logger _logger = Logger('LocalFilesManager');
-  static const MethodChannel _channel = MethodChannel('file_trash');
-
-  Future<bool> moveToTrash(List<String> mediaUrls) async {
-    try {
-      return await _channel.invokeMethod('moveToTrash', {'mediaUrls': mediaUrls});
-    } catch (e, s) {
-      _logger.warning('Error moving file to trash', e, s);
-      return false;
-    }
-  }
-
-  Future<bool> restoreFromTrash(String fileName, int type) async {
-    try {
-      return await _channel.invokeMethod('restoreFromTrash', {'fileName': fileName, 'type': type});
-    } catch (e, s) {
-      _logger.warning('Error restore file from trash', e, s);
-      return false;
-    }
-  }
-
-  Future<bool> restoreFromTrashById(String mediaId, int type) async {
-    try {
-      return await _channel.invokeMethod('restoreFromTrash', {'mediaId': mediaId, 'type': type});
-    } catch (e, s) {
-      _logger.warning('Error restore file from trash by Id', e, s);
-      return false;
-    }
-  }
-
-  Future<bool> requestManageMediaPermission() async {
-    try {
-      return await _channel.invokeMethod('requestManageMediaPermission');
-    } catch (e, s) {
-      _logger.warning('Error requesting manage media permission', e, s);
-      return false;
-    }
-  }
-
-  Future<bool> hasManageMediaPermission() async {
-    try {
-      return await _channel.invokeMethod('hasManageMediaPermission');
-    } catch (e, s) {
-      _logger.warning('Error requesting manage media permission state', e, s);
-      return false;
-    }
-  }
-
-  Future<bool> manageMediaPermission() async {
-    try {
-      return await _channel.invokeMethod('manageMediaPermission');
-    } catch (e, s) {
-      _logger.warning('Error requesting manage media permission settings', e, s);
-      return false;
-    }
-  }
-}

mobile/lib/services/view_intent.service.dart

@@ -0,0 +1,91 @@
+import 'dart:io';
+
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/platform/view_intent_api.g.dart';
+import 'package:path/path.dart' as p;
+import 'package:path_provider/path_provider.dart';
+
+final viewIntentServiceProvider = Provider((ref) => ViewIntentService(ViewIntentHostApi()));
+
+class ViewIntentService {
+  final ViewIntentHostApi _viewIntentHostApi;
+  final Future<Directory> Function() _temporaryDirectory;
+  String? _managedTempFilePath;
+
+  ViewIntentService(this._viewIntentHostApi, {Future<Directory> Function()? temporaryDirectory})
+    : _temporaryDirectory = temporaryDirectory ?? getTemporaryDirectory;
+
+  Future<ViewIntentPayload?> consumeViewIntent() async {
+    try {
+      return await _viewIntentHostApi.consumeViewIntent();
+    } catch (_) {
+      // Ignore errors - view intent might not be present
+      return null;
+    }
+  }
+
+  Future<void> setManagedTempFilePath(String path) async {
+    final previous = _managedTempFilePath;
+    if (previous == path) {
+      return;
+    }
+    _managedTempFilePath = path;
+    if (previous != null) {
+      await cleanupTempFile(previous);
+    }
+  }
+
+  Future<void> cleanupManagedTempFile() async {
+    final path = _managedTempFilePath;
+    _managedTempFilePath = null;
+    if (path != null) {
+      await cleanupTempFile(path);
+    }
+  }
+
+  Future<void> cleanupManagedTempFileIfCurrent(String path) async {
+    if (_managedTempFilePath == path) {
+      _managedTempFilePath = null;
+    }
+    await cleanupTempFile(path);
+  }
+
+  Future<void> cleanupTempFile(String path) async {
+    if (!_isManagedTempFile(path)) {
+      return;
+    }
+
+    try {
+      final file = File(path);
+      if (await file.exists()) {
+        await file.delete();
+      }
+    } catch (_) {
+      // Best-effort cleanup only.
+    }
+  }
+
+  Future<void> cleanupStaleTempFiles() async {
+    try {
+      final tempDirectory = await _temporaryDirectory();
+      await for (final entity in tempDirectory.list()) {
+        if (entity is! File) {
+          continue;
+        }
+
+        final path = entity.path;
+        if (!_isManagedTempFile(path) || path == _managedTempFilePath) {
+          continue;
+        }
+
+        await entity.delete();
+      }
+    } catch (_) {
+      // Best-effort cleanup only.
+    }
+  }
+
+  bool _isManagedTempFile(String path) {
+    return p.basename(path).startsWith('view_intent_') && p.basename(p.dirname(path)) == 'cache';
+  }
+}

mobile/lib/services/view_intent_asset_resolver.service.dart

@@ -0,0 +1,90 @@
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
+import 'package:immich_mobile/domain/services/timeline.service.dart';
+import 'package:immich_mobile/infrastructure/repositories/local_asset.repository.dart';
+import 'package:immich_mobile/models/view_intent/view_intent_payload.extension.dart';
+import 'package:immich_mobile/platform/view_intent_api.g.dart';
+import 'package:immich_mobile/providers/infrastructure/asset.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
+import 'package:logging/logging.dart';
+
+class ViewIntentResolvedAsset {
+  final BaseAsset asset;
+  final TimelineService timelineService;
+
+  /// Path to the materialized temp file backing this asset, if any. Set only
+  /// for the transient deep-link case (no DB-backed local asset). The upload
+  /// flow reads this to know which file to upload.
+  final String? viewIntentFilePath;
+
+  const ViewIntentResolvedAsset({required this.asset, required this.timelineService, this.viewIntentFilePath});
+}
+
+final viewIntentAssetResolverProvider = Provider<ViewIntentAssetResolver>(
+  (ref) => ViewIntentAssetResolver(
+    localAssetRepository: ref.read(localAssetRepository),
+    timelineFactory: ref.read(timelineFactoryProvider),
+  ),
+);
+
+/// Resolves an incoming ACTION_VIEW intent into the data the asset viewer
+/// needs: a [BaseAsset] and a [TimelineService] containing it.
+///
+/// Always wraps the resolved asset in a 1-element [TimelineOrigin.deepLink]
+/// timeline — mirroring how the app's home-screen widgets open a single
+/// asset. We don't try to map the asset to its position in the user's main
+/// timeline because that would require ROW_NUMBER queries over the full
+/// merged timeline (slow at scale) and complex "wait until the main timeline
+/// service is ready at that index" coordination. Back-navigation from the
+/// viewer lands on the main timeline because the handler pushes the viewer
+/// on top of [TabShellRoute].
+class ViewIntentAssetResolver {
+  final DriftLocalAssetRepository _localAssetRepository;
+  final TimelineFactory _timelineFactory;
+  static final Logger _logger = Logger('ViewIntentAssetResolver');
+
+  const ViewIntentAssetResolver({
+    required DriftLocalAssetRepository localAssetRepository,
+    required TimelineFactory timelineFactory,
+  }) : _localAssetRepository = localAssetRepository,
+       _timelineFactory = timelineFactory;
+
+  Future<ViewIntentResolvedAsset> resolve(ViewIntentPayload attachment) async {
+    final localAssetId = attachment.localAssetId;
+    final path = attachment.path;
+    _logger.fine('resolve start, localAssetId=$localAssetId, path=$path, mimeType=${attachment.mimeType}');
+
+    if (localAssetId == null && path == null) {
+      throw StateError('ViewIntent resolution requires either a localAssetId or a materialized file path.');
+    }
+
+    // Prefer the DB-backed local asset when we have one — it carries richer
+    // metadata than the transient model we'd otherwise synthesise.
+    final localAsset = localAssetId != null ? await _localAssetRepository.getById(localAssetId) : null;
+    final asset = localAsset ?? _toTransientAsset(attachment);
+
+    return ViewIntentResolvedAsset(
+      asset: asset,
+      timelineService: _timelineFactory.fromAssets([asset], TimelineOrigin.deepLink),
+      // viewIntentFilePath is only meaningful for the transient case — the
+      // DB-backed local asset carries its own path/URI for the upload flow.
+      viewIntentFilePath: localAsset == null ? path : null,
+    );
+  }
+
+  LocalAsset _toTransientAsset(ViewIntentPayload attachment) {
+    final now = DateTime.now();
+    return LocalAsset(
+      // TODO(Ombodi): Introduce a file-backed BaseAsset for path-only view intents.
+      // The viewer currently expects a BaseAsset, so this temporary LocalAsset
+      // adapts an unmanaged file into the existing timeline/viewer pipeline.
+      id: attachment.localAssetId ?? '-${attachment.path!.hashCode.abs()}',
+      name: attachment.fileName,
+      type: attachment.isVideo ? AssetType.video : AssetType.image,
+      createdAt: now,
+      updatedAt: now,
+      isEdited: false,
+      playbackStyle: attachment.playbackStyle,
+    );
+  }
+}

mobile/lib/widgets/forms/login/login_form.dart

@@ -21,8 +21,9 @@ import 'package:immich_mobile/providers/background_sync.provider.dart';
 import 'package:immich_mobile/providers/gallery_permission.provider.dart';
 import 'package:immich_mobile/providers/oauth.provider.dart';
 import 'package:immich_mobile/providers/server_info.provider.dart';
+import 'package:immich_mobile/providers/view_intent/view_intent_handler.provider.dart';
 import 'package:immich_mobile/providers/websocket.provider.dart';
-import 'package:immich_mobile/repositories/local_files_manager.repository.dart';
+import 'package:immich_mobile/repositories/permission.repository.dart';
 import 'package:immich_mobile/routing/router.dart';
 import 'package:immich_mobile/utils/provider_utils.dart';
 import 'package:immich_mobile/utils/url_helper.dart';
@@ -182,9 +183,11 @@ class LoginForm extends HookConsumerWidget {
 
     Future<void> handleSyncFlow() async {
       final backgroundManager = ref.read(backgroundSyncProvider);
+      final viewIntentHandler = ref.read(viewIntentHandlerProvider);
 
       await backgroundManager.syncLocal(full: true);
       await backgroundManager.syncRemote();
+      await viewIntentHandler.flushDeferredViewIntent();
       await backgroundManager.hashAssets();
 
       if (MetadataRepository.instance.appConfig.backup.syncAlbums) {
@@ -193,7 +196,7 @@ class LoginForm extends HookConsumerWidget {
     }
 
     getManageMediaPermission() async {
-      final hasPermission = await ref.read(localFilesManagerRepositoryProvider).hasManageMediaPermission();
+      final hasPermission = await ref.read(permissionRepositoryProvider).hasManageMediaPermission();
       if (!hasPermission) {
         await showDialog(
           context: context,
@@ -224,7 +227,7 @@ class LoginForm extends HookConsumerWidget {
                 ),
                 TextButton(
                   onPressed: () {
-                    ref.read(localFilesManagerRepositoryProvider).requestManageMediaPermission();
+                    unawaited(ref.read(permissionRepositoryProvider).requestManageMediaPermission());
                     Navigator.of(context).pop();
                   },
                   child: Text(
@@ -259,7 +262,7 @@ class LoginForm extends HookConsumerWidget {
           }
           unawaited(handleSyncFlow());
           ref.read(websocketProvider.notifier).connect();
-          unawaited(context.replaceRoute(const TabShellRoute()));
+          unawaited(context.router.replaceAll([const TabShellRoute()]));
           return;
         }
       } catch (error) {
@@ -346,7 +349,7 @@ class LoginForm extends HookConsumerWidget {
               await getManageMediaPermission();
             }
             unawaited(handleSyncFlow());
-            unawaited(context.replaceRoute(const TabShellRoute()));
+            unawaited(context.router.replaceAll([const TabShellRoute()]));
             return;
           }
         } catch (error, stack) {

mobile/lib/widgets/settings/advanced_settings.dart

@@ -10,7 +10,7 @@ import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/providers/infrastructure/metadata.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/platform.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/readonly_mode.provider.dart';
-import 'package:immich_mobile/repositories/local_files_manager.repository.dart';
+import 'package:immich_mobile/repositories/permission.repository.dart';
 import 'package:immich_mobile/services/app_settings.service.dart';
 import 'package:immich_mobile/utils/bytes_units.dart';
 import 'package:immich_mobile/utils/hooks/app_settings_update_hook.dart';
@@ -57,9 +57,7 @@ class AdvancedSettings extends HookConsumerWidget {
       () async {
         isManageMediaSupported.value = await checkAndroidVersion();
         if (isManageMediaSupported.value) {
-          manageMediaAndroidPermission.value = await ref
-              .read(localFilesManagerRepositoryProvider)
-              .hasManageMediaPermission();
+          manageMediaAndroidPermission.value = await ref.read(permissionRepositoryProvider).hasManageMediaPermission();
         }
       }();
       return null;
@@ -82,7 +80,7 @@ class AdvancedSettings extends HookConsumerWidget {
               subtitle: "advanced_settings_sync_remote_deletions_subtitle".tr(),
               onChanged: (value) async {
                 if (value) {
-                  final result = await ref.read(localFilesManagerRepositoryProvider).requestManageMediaPermission();
+                  final result = await ref.read(permissionRepositoryProvider).requestManageMediaPermission();
                   manageLocalMediaAndroid.value = result;
                   manageMediaAndroidPermission.value = result;
                 }
@@ -96,7 +94,7 @@ class AdvancedSettings extends HookConsumerWidget {
                   ? const Color.fromARGB(255, 243, 188, 106)
                   : null,
               onActionTap: () async {
-                final result = await ref.read(localFilesManagerRepositoryProvider).manageMediaPermission();
+                final result = await ref.read(permissionRepositoryProvider).manageMediaPermission();
                 manageMediaAndroidPermission.value = result;
               },
             ),

mobile/mise.toml

@@ -29,7 +29,8 @@ run = [
   "dart run pigeon --input pigeon/background_worker_lock_api.dart",
   "dart run pigeon --input pigeon/connectivity_api.dart",
   "dart run pigeon --input pigeon/network_api.dart",
-  "dart format lib/platform/native_sync_api.g.dart lib/platform/local_image_api.g.dart lib/platform/remote_image_api.g.dart lib/platform/background_worker_api.g.dart lib/platform/background_worker_lock_api.g.dart lib/platform/connectivity_api.g.dart lib/platform/network_api.g.dart",
+    "dart run pigeon --input pigeon/view_intent_api.dart",
+    "dart format lib/platform/native_sync_api.g.dart lib/platform/local_image_api.g.dart lib/platform/remote_image_api.g.dart lib/platform/background_worker_api.g.dart lib/platform/background_worker_lock_api.g.dart lib/platform/connectivity_api.g.dart lib/platform/network_api.g.dart lib/platform/view_intent_api.g.dart",
 ]
 
 [tasks."codegen:translation"]

mobile/pigeon/native_sync_api.dart

@@ -11,14 +11,7 @@ import 'package:pigeon/pigeon.dart';
     dartPackageName: 'immich_mobile',
   ),
 )
-enum PlatformAssetPlaybackStyle {
-  unknown,
-  image,
-  video,
-  imageAnimated,
-  livePhoto,
-  videoLooping,
-}
+enum PlatformAssetPlaybackStyle { unknown, image, video, imageAnimated, livePhoto, videoLooping }
 
 class PlatformAsset {
   final String id;
@@ -142,6 +135,9 @@ abstract class NativeSyncApi {
   @TaskQueue(type: TaskQueueType.serialBackgroundThread)
   Map<String, List<PlatformAsset>> getTrashedAssets();
 
+  @async
+  bool restoreFromTrashById(String mediaId, int type);
+
   @TaskQueue(type: TaskQueueType.serialBackgroundThread)
   List<CloudIdResult> getCloudIdForAssetIds(List<String> assetIds);
 }

mobile/pigeon/permission_api.dart

@@ -0,0 +1,23 @@
+import 'package:pigeon/pigeon.dart';
+
+@ConfigurePigeon(
+  PigeonOptions(
+    dartOut: 'lib/platform/permission_api.g.dart',
+    swiftOut: 'ios/Runner/Permission/PermissionApi.g.swift',
+    swiftOptions: SwiftOptions(),
+    kotlinOut: 'android/app/src/main/kotlin/app/alextran/immich/permission/PermissionApi.g.kt',
+    kotlinOptions: KotlinOptions(package: 'app.alextran.immich.permission'),
+    dartOptions: DartOptions(),
+    dartPackageName: 'immich_mobile',
+  ),
+)
+@HostApi()
+abstract class PermissionApi {
+  bool hasManageMediaPermission();
+
+  @async
+  bool requestManageMediaPermission();
+
+  @async
+  bool manageMediaPermission();
+}

mobile/pigeon/view_intent_api.dart

@@ -0,0 +1,24 @@
+import 'package:pigeon/pigeon.dart';
+
+@ConfigurePigeon(
+  PigeonOptions(
+    dartOut: 'lib/platform/view_intent_api.g.dart',
+    kotlinOut: 'android/app/src/main/kotlin/app/alextran/immich/viewintent/ViewIntent.g.kt',
+    kotlinOptions: KotlinOptions(package: 'app.alextran.immich.viewintent'),
+    dartOptions: DartOptions(),
+    dartPackageName: 'immich_mobile',
+  ),
+)
+class ViewIntentPayload {
+  final String? path;
+  final String mimeType;
+  final String? localAssetId;
+
+  const ViewIntentPayload({this.path, required this.mimeType, this.localAssetId});
+}
+
+@HostApi()
+abstract class ViewIntentHostApi {
+  @async
+  ViewIntentPayload? consumeViewIntent();
+}

mobile/test/domain/services/local_sync_service_test.dart

@@ -10,17 +10,15 @@ import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/local_album.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/local_asset.repository.dart';
-import 'package:immich_mobile/infrastructure/repositories/storage.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/store.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/trashed_local_asset.repository.dart';
 import 'package:immich_mobile/platform/native_sync_api.g.dart';
-import 'package:immich_mobile/repositories/local_files_manager.repository.dart';
+import 'package:immich_mobile/repositories/asset_media.repository.dart';
 import 'package:mocktail/mocktail.dart';
 
 import '../../domain/service.mock.dart';
 import '../../fixtures/asset.stub.dart';
 import '../../infrastructure/repository.mock.dart';
-import '../../mocks/asset_entity.mock.dart';
 import '../../repository.mocks.dart';
 
 void main() {
@@ -28,8 +26,8 @@ void main() {
   late DriftLocalAlbumRepository mockLocalAlbumRepository;
   late DriftLocalAssetRepository mockLocalAssetRepository;
   late DriftTrashedLocalAssetRepository mockTrashedLocalAssetRepository;
-  late LocalFilesManagerRepository mockLocalFilesManager;
-  late StorageRepository mockStorageRepository;
+  late AssetMediaRepository mockAssetMediaRepository;
+  late MockPermissionRepository mockPermissionRepository;
   late MockNativeSyncApi mockNativeSyncApi;
   late Drift db;
 
@@ -51,8 +49,8 @@ void main() {
     mockLocalAlbumRepository = MockLocalAlbumRepository();
     mockLocalAssetRepository = MockLocalAssetRepository();
     mockTrashedLocalAssetRepository = MockTrashedLocalAssetRepository();
-    mockLocalFilesManager = MockLocalFilesManagerRepository();
-    mockStorageRepository = MockStorageRepository();
+    mockAssetMediaRepository = MockAssetMediaRepository();
+    mockPermissionRepository = MockPermissionRepository();
     mockNativeSyncApi = MockNativeSyncApi();
 
     when(() => mockNativeSyncApi.shouldFullSync()).thenAnswer((_) async => false);
@@ -65,25 +63,28 @@ void main() {
     when(() => mockTrashedLocalAssetRepository.getToTrash()).thenAnswer((_) async => {});
     when(() => mockTrashedLocalAssetRepository.applyRestoredAssets(any())).thenAnswer((_) async {});
     when(() => mockTrashedLocalAssetRepository.trashLocalAsset(any())).thenAnswer((_) async {});
-    when(() => mockLocalFilesManager.moveToTrash(any<List<String>>())).thenAnswer((_) async => true);
+    when(() => mockAssetMediaRepository.deleteAll(any())).thenAnswer((invocation) async {
+      final ids = invocation.positionalArguments.first as List<String>;
+      return ids;
+    });
 
     sut = LocalSyncService(
       localAlbumRepository: mockLocalAlbumRepository,
       localAssetRepository: mockLocalAssetRepository,
       trashedLocalAssetRepository: mockTrashedLocalAssetRepository,
-      localFilesManager: mockLocalFilesManager,
-      storageRepository: mockStorageRepository,
+      assetMediaRepository: mockAssetMediaRepository,
+      permissionRepository: mockPermissionRepository,
       nativeSyncApi: mockNativeSyncApi,
     );
 
     await Store.put(StoreKey.manageLocalMediaAndroid, false);
-    when(() => mockLocalFilesManager.hasManageMediaPermission()).thenAnswer((_) async => false);
+    when(() => mockPermissionRepository.hasManageMediaPermission()).thenAnswer((_) async => false);
   });
 
   group('LocalSyncService - syncTrashedAssets gating', () {
     test('invokes syncTrashedAssets when Android flag enabled and permission granted', () async {
       await Store.put(StoreKey.manageLocalMediaAndroid, true);
-      when(() => mockLocalFilesManager.hasManageMediaPermission()).thenAnswer((_) async => true);
+      when(() => mockPermissionRepository.hasManageMediaPermission()).thenAnswer((_) async => true);
 
       await sut.sync();
 
@@ -93,7 +94,7 @@ void main() {
 
     test('skips syncTrashedAssets when store flag disabled', () async {
       await Store.put(StoreKey.manageLocalMediaAndroid, false);
-      when(() => mockLocalFilesManager.hasManageMediaPermission()).thenAnswer((_) async => true);
+      when(() => mockPermissionRepository.hasManageMediaPermission()).thenAnswer((_) async => true);
 
       await sut.sync();
 
@@ -102,7 +103,7 @@ void main() {
 
     test('skips syncTrashedAssets when MANAGE_MEDIA permission absent', () async {
       await Store.put(StoreKey.manageLocalMediaAndroid, true);
-      when(() => mockLocalFilesManager.hasManageMediaPermission()).thenAnswer((_) async => false);
+      when(() => mockPermissionRepository.hasManageMediaPermission()).thenAnswer((_) async => false);
 
       await sut.sync();
 
@@ -114,7 +115,7 @@ void main() {
       addTearDown(() => debugDefaultTargetPlatformOverride = TargetPlatform.android);
 
       await Store.put(StoreKey.manageLocalMediaAndroid, true);
-      when(() => mockLocalFilesManager.hasManageMediaPermission()).thenAnswer((_) async => true);
+      when(() => mockPermissionRepository.hasManageMediaPermission()).thenAnswer((_) async => true);
 
       await sut.sync();
 
@@ -131,13 +132,13 @@ void main() {
         durationMs: 0,
         orientation: 0,
         isFavorite: false,
-        playbackStyle: PlatformAssetPlaybackStyle.image
+        playbackStyle: PlatformAssetPlaybackStyle.image,
       );
 
       final assetsToRestore = [LocalAssetStub.image1];
       when(() => mockTrashedLocalAssetRepository.getToRestore()).thenAnswer((_) async => assetsToRestore);
       final restoredIds = ['image1'];
-      when(() => mockLocalFilesManager.restoreAssetsFromTrash(any())).thenAnswer((invocation) async {
+      when(() => mockAssetMediaRepository.restoreAssetsFromTrash(any())).thenAnswer((invocation) async {
         final Iterable<LocalAsset> requested = invocation.positionalArguments.first as Iterable<LocalAsset>;
         expect(requested, orderedEquals(assetsToRestore));
         return restoredIds;
@@ -150,10 +151,6 @@ void main() {
         },
       );
 
-      final assetEntity = MockAssetEntity();
-      when(() => assetEntity.getMediaUrl()).thenAnswer((_) async => 'content://local-trash');
-      when(() => mockStorageRepository.getAssetEntityForAsset(localAssetToTrash)).thenAnswer((_) async => assetEntity);
-
       await sut.processTrashedAssets({
         'album-a': [platformAsset],
       });
@@ -168,12 +165,11 @@ void main() {
       expect(trashedEntry.asset.name, platformAsset.name);
       verify(() => mockTrashedLocalAssetRepository.getToTrash()).called(1);
 
-      verify(() => mockLocalFilesManager.restoreAssetsFromTrash(any())).called(1);
+      verify(() => mockAssetMediaRepository.restoreAssetsFromTrash(any())).called(1);
       verify(() => mockTrashedLocalAssetRepository.applyRestoredAssets(restoredIds)).called(1);
 
-      verify(() => mockStorageRepository.getAssetEntityForAsset(localAssetToTrash)).called(1);
-      final moveArgs = verify(() => mockLocalFilesManager.moveToTrash(captureAny())).captured.single as List<String>;
-      expect(moveArgs, ['content://local-trash']);
+      final moveArgs = verify(() => mockAssetMediaRepository.deleteAll(captureAny())).captured.single as List<String>;
+      expect(moveArgs, ['local-trash']);
       final trashArgs =
           verify(() => mockTrashedLocalAssetRepository.trashLocalAsset(captureAny())).captured.single
               as Map<String, List<LocalAsset>>;
@@ -181,6 +177,26 @@ void main() {
       expect(trashArgs['album-a'], [localAssetToTrash]);
     });
 
+    test('records only local assets that were moved to device trash', () async {
+      final movedAsset = LocalAssetStub.image1.copyWith(id: 'moved-local', checksum: 'checksum-moved');
+      final skippedAsset = LocalAssetStub.image2.copyWith(id: 'skipped-local', checksum: 'checksum-skipped');
+      when(() => mockTrashedLocalAssetRepository.getToTrash()).thenAnswer(
+        (_) async => {
+          'album-a': [movedAsset],
+          'album-b': [skippedAsset],
+        },
+      );
+      when(() => mockAssetMediaRepository.deleteAll(any())).thenAnswer((_) async => ['moved-local']);
+
+      await sut.processTrashedAssets({});
+
+      final trashArgs =
+          verify(() => mockTrashedLocalAssetRepository.trashLocalAsset(captureAny())).captured.single
+              as Map<String, List<LocalAsset>>;
+      expect(trashArgs.keys, ['album-a']);
+      expect(trashArgs['album-a'], [movedAsset]);
+    });
+
     test('does not attempt restore when repository has no assets to restore', () async {
       when(() => mockTrashedLocalAssetRepository.getToRestore()).thenAnswer((_) async => []);
 
@@ -190,7 +206,7 @@ void main() {
           verify(() => mockTrashedLocalAssetRepository.processTrashSnapshot(captureAny())).captured.single
               as Iterable<TrashedAsset>;
       expect(trashedSnapshot, isEmpty);
-      verifyNever(() => mockLocalFilesManager.restoreAssetsFromTrash(any()));
+      verifyNever(() => mockAssetMediaRepository.restoreAssetsFromTrash(any()));
       verifyNever(() => mockTrashedLocalAssetRepository.applyRestoredAssets(any()));
     });
 
@@ -199,7 +215,7 @@ void main() {
 
       await sut.processTrashedAssets({});
 
-      verifyNever(() => mockLocalFilesManager.moveToTrash(any()));
+      verifyNever(() => mockAssetMediaRepository.deleteAll(any()));
       verifyNever(() => mockTrashedLocalAssetRepository.trashLocalAsset(any()));
     });
   });
@@ -215,7 +231,7 @@ void main() {
         isFavorite: false,
         createdAt: 1700000000,
         updatedAt: 1732000000,
-        playbackStyle: PlatformAssetPlaybackStyle.image
+        playbackStyle: PlatformAssetPlaybackStyle.image,
       );
 
       final localAsset = platformAsset.toLocalAsset();

mobile/test/domain/services/sync_stream_service_test.dart

@@ -12,12 +12,11 @@ import 'package:immich_mobile/domain/services/sync_stream.service.dart';
 import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/local_asset.repository.dart';
-import 'package:immich_mobile/infrastructure/repositories/storage.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/store.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/sync_api.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/sync_stream.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/trashed_local_asset.repository.dart';
-import 'package:immich_mobile/repositories/local_files_manager.repository.dart';
+import 'package:immich_mobile/repositories/asset_media.repository.dart';
 import 'package:immich_mobile/utils/semver.dart';
 import 'package:mocktail/mocktail.dart';
 import 'package:openapi/api.dart';
@@ -26,7 +25,6 @@ import '../../api.mocks.dart';
 import '../../fixtures/asset.stub.dart';
 import '../../fixtures/sync_stream.stub.dart';
 import '../../infrastructure/repository.mock.dart';
-import '../../mocks/asset_entity.mock.dart';
 import '../../repository.mocks.dart';
 import '../../service.mocks.dart';
 
@@ -52,8 +50,8 @@ void main() {
   late SyncApiRepository mockSyncApiRepo;
   late DriftLocalAssetRepository mockLocalAssetRepo;
   late DriftTrashedLocalAssetRepository mockTrashedLocalAssetRepo;
-  late LocalFilesManagerRepository mockLocalFilesManagerRepo;
-  late StorageRepository mockStorageRepo;
+  late AssetMediaRepository mockAssetMediaRepo;
+  late MockPermissionRepository mockPermissionRepo;
   late MockApiService mockApi;
   late MockServerApi mockServerApi;
   late MockSyncMigrationRepository mockSyncMigrationRepo;
@@ -86,8 +84,8 @@ void main() {
     mockSyncApiRepo = MockSyncApiRepository();
     mockLocalAssetRepo = MockLocalAssetRepository();
     mockTrashedLocalAssetRepo = MockTrashedLocalAssetRepository();
-    mockLocalFilesManagerRepo = MockLocalFilesManagerRepository();
-    mockStorageRepo = MockStorageRepository();
+    mockAssetMediaRepo = MockAssetMediaRepository();
+    mockPermissionRepo = MockPermissionRepository();
     mockAbortCallbackWrapper = _MockAbortCallbackWrapper();
     mockResetCallbackWrapper = _MockAbortCallbackWrapper();
     mockApi = MockApiService();
@@ -159,8 +157,8 @@ void main() {
       syncStreamRepository: mockSyncStreamRepo,
       localAssetRepository: mockLocalAssetRepo,
       trashedLocalAssetRepository: mockTrashedLocalAssetRepo,
-      localFilesManager: mockLocalFilesManagerRepo,
-      storageRepository: mockStorageRepo,
+      assetMediaRepository: mockAssetMediaRepo,
+      permissionRepository: mockPermissionRepo,
       api: mockApi,
       syncMigrationRepository: mockSyncMigrationRepo,
     );
@@ -170,10 +168,12 @@ void main() {
     when(() => mockTrashedLocalAssetRepo.getToRestore()).thenAnswer((_) async => []);
     when(() => mockTrashedLocalAssetRepo.applyRestoredAssets(any())).thenAnswer((_) async {});
     hasManageMediaPermission = false;
-    when(() => mockLocalFilesManagerRepo.hasManageMediaPermission()).thenAnswer((_) async => hasManageMediaPermission);
-    when(() => mockLocalFilesManagerRepo.moveToTrash(any())).thenAnswer((_) async => true);
-    when(() => mockLocalFilesManagerRepo.restoreAssetsFromTrash(any())).thenAnswer((_) async => []);
-    when(() => mockStorageRepo.getAssetEntityForAsset(any())).thenAnswer((_) async => null);
+    when(() => mockPermissionRepo.hasManageMediaPermission()).thenAnswer((_) async => hasManageMediaPermission);
+    when(() => mockAssetMediaRepo.deleteAll(any())).thenAnswer((invocation) async {
+      final ids = invocation.positionalArguments.first as List<String>;
+      return ids;
+    });
+    when(() => mockAssetMediaRepo.restoreAssetsFromTrash(any())).thenAnswer((_) async => []);
     await Store.put(StoreKey.manageLocalMediaAndroid, false);
   });
 
@@ -241,8 +241,8 @@ void main() {
         syncStreamRepository: mockSyncStreamRepo,
         localAssetRepository: mockLocalAssetRepo,
         trashedLocalAssetRepository: mockTrashedLocalAssetRepo,
-        localFilesManager: mockLocalFilesManagerRepo,
-        storageRepository: mockStorageRepo,
+        assetMediaRepository: mockAssetMediaRepo,
+        permissionRepository: mockPermissionRepo,
         cancelChecker: cancellationChecker.call,
         api: mockApi,
         syncMigrationRepository: mockSyncMigrationRepo,
@@ -282,8 +282,8 @@ void main() {
         syncStreamRepository: mockSyncStreamRepo,
         localAssetRepository: mockLocalAssetRepo,
         trashedLocalAssetRepository: mockTrashedLocalAssetRepo,
-        localFilesManager: mockLocalFilesManagerRepo,
-        storageRepository: mockStorageRepo,
+        assetMediaRepository: mockAssetMediaRepo,
+        permissionRepository: mockPermissionRepo,
         cancelChecker: cancellationChecker.call,
         api: mockApi,
         syncMigrationRepository: mockSyncMigrationRepo,
@@ -424,18 +424,10 @@ void main() {
         return assetsByAlbum;
       });
 
-      final localEntity = MockAssetEntity();
-      when(() => localEntity.getMediaUrl()).thenAnswer((_) async => 'content://local-only');
-      when(() => mockStorageRepo.getAssetEntityForAsset(localAsset)).thenAnswer((_) async => localEntity);
-
-      final mergedEntity = MockAssetEntity();
-      when(() => mergedEntity.getMediaUrl()).thenAnswer((_) async => 'content://merged-local');
-      when(() => mockStorageRepo.getAssetEntityForAsset(mergedAsset)).thenAnswer((_) async => mergedEntity);
-
-      when(() => mockLocalFilesManagerRepo.moveToTrash(any())).thenAnswer((invocation) async {
-        final urls = invocation.positionalArguments.first as List<String>;
-        expect(urls, unorderedEquals(['content://local-only', 'content://merged-local']));
-        return true;
+      when(() => mockAssetMediaRepo.deleteAll(any())).thenAnswer((invocation) async {
+        final ids = invocation.positionalArguments.first as List<String>;
+        expect(ids, unorderedEquals(['local-only', 'merged-local']));
+        return ids;
       });
 
       final events = [
@@ -461,10 +453,51 @@ void main() {
 
       await simulateEvents(events);
 
-      verify(() => mockTrashedLocalAssetRepo.trashLocalAsset(assetsByAlbum)).called(1);
+      final trashArgs =
+          verify(() => mockTrashedLocalAssetRepo.trashLocalAsset(captureAny())).captured.single
+              as Map<String, List<LocalAsset>>;
+      expect(trashArgs.keys, unorderedEquals(['album-a', 'album-b']));
+      expect(trashArgs['album-a'], [localAsset]);
+      expect(trashArgs['album-b'], [mergedAsset]);
+      verify(() => mockAssetMediaRepo.deleteAll(any())).called(1);
       verify(() => mockSyncApiRepo.ack(['asset-remote-only-3'])).called(1);
     });
 
+    test("records only assets that were moved to device trash", () async {
+      final movedAsset = LocalAssetStub.image1.copyWith(id: 'moved-local', checksum: 'checksum-moved');
+      final skippedAsset = LocalAssetStub.image2.copyWith(id: 'skipped-local', checksum: 'checksum-skipped');
+      when(() => mockLocalAssetRepo.getAssetsFromBackupAlbums(any())).thenAnswer(
+        (_) async => {
+          'album-a': [movedAsset],
+          'album-b': [skippedAsset],
+        },
+      );
+      when(() => mockAssetMediaRepo.deleteAll(any())).thenAnswer((_) async => ['moved-local']);
+
+      final events = [
+        SyncStreamStub.assetTrashed(
+          id: 'remote-moved',
+          checksum: movedAsset.checksum!,
+          ack: 'asset-remote-moved',
+          trashedAt: DateTime(2025, 5, 1),
+        ),
+        SyncStreamStub.assetTrashed(
+          id: 'remote-skipped',
+          checksum: skippedAsset.checksum!,
+          ack: 'asset-remote-skipped',
+          trashedAt: DateTime(2025, 5, 2),
+        ),
+      ];
+
+      await simulateEvents(events);
+
+      final trashArgs =
+          verify(() => mockTrashedLocalAssetRepo.trashLocalAsset(captureAny())).captured.single
+              as Map<String, List<LocalAsset>>;
+      expect(trashArgs.keys, ['album-a']);
+      expect(trashArgs['album-a'], [movedAsset]);
+    });
+
     test("skips device trashing when no local assets match the remote trash payload", () async {
       final events = [
         SyncStreamStub.assetTrashed(
@@ -478,7 +511,7 @@ void main() {
       await simulateEvents(events);
 
       verify(() => mockLocalAssetRepo.getAssetsFromBackupAlbums(any())).called(1);
-      verifyNever(() => mockLocalFilesManagerRepo.moveToTrash(any()));
+      verifyNever(() => mockAssetMediaRepo.deleteAll(any()));
       verifyNever(() => mockTrashedLocalAssetRepo.trashLocalAsset(any()));
     });
 
@@ -494,7 +527,7 @@ void main() {
       await simulateEvents(events);
 
       verify(() => mockLocalAssetRepo.getAssetsFromBackupAlbums(any())).called(1);
-      verifyNever(() => mockLocalFilesManagerRepo.moveToTrash(any()));
+      verifyNever(() => mockAssetMediaRepo.deleteAll(any()));
       verify(() => mockSyncStreamRepo.deleteAssetsV1(any())).called(1);
     });
 
@@ -505,7 +538,7 @@ void main() {
       when(() => mockTrashedLocalAssetRepo.getToRestore()).thenAnswer((_) async => trashedAssets);
 
       final restoredIds = ['trashed-1'];
-      when(() => mockLocalFilesManagerRepo.restoreAssetsFromTrash(any())).thenAnswer((invocation) async {
+      when(() => mockAssetMediaRepo.restoreAssetsFromTrash(any())).thenAnswer((invocation) async {
         final Iterable<LocalAsset> requestedAssets = invocation.positionalArguments.first as Iterable<LocalAsset>;
         expect(requestedAssets, orderedEquals(trashedAssets));
         return restoredIds;

mobile/test/providers/view_intent/view_intent_handler_android_test.dart

@@ -0,0 +1,276 @@
+import 'dart:async';
+
+import 'package:auto_route/auto_route.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/domain/models/timeline.model.dart';
+import 'package:immich_mobile/domain/services/timeline.service.dart';
+import 'package:immich_mobile/domain/services/user.service.dart';
+import 'package:immich_mobile/models/auth/auth_state.model.dart';
+import 'package:immich_mobile/platform/view_intent_api.g.dart';
+import 'package:immich_mobile/providers/auth.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
+import 'package:immich_mobile/providers/view_intent/view_intent_handler_android.dart';
+import 'package:immich_mobile/providers/view_intent/view_intent_main_timeline_ready.provider.dart';
+import 'package:immich_mobile/providers/view_intent/view_intent_pending.provider.dart';
+import 'package:immich_mobile/routing/router.dart';
+import 'package:immich_mobile/services/view_intent.service.dart';
+import 'package:immich_mobile/services/view_intent_asset_resolver.service.dart';
+import 'package:immich_mobile/services/auth.service.dart';
+import 'package:immich_mobile/services/api.service.dart';
+import 'package:immich_mobile/services/secure_storage.service.dart';
+import 'package:immich_mobile/services/widget.service.dart';
+import 'package:mocktail/mocktail.dart';
+
+class MockViewIntentHostApi extends Mock implements ViewIntentHostApi {}
+
+class MockViewIntentAssetResolver extends Mock implements ViewIntentAssetResolver {}
+
+class MockAppRouter extends Mock implements AppRouter {}
+
+class MockAuthService extends Mock implements AuthService {}
+
+class MockApiService extends Mock implements ApiService {}
+
+class MockUserService extends Mock implements UserService {}
+
+class MockSecureStorageService extends Mock implements SecureStorageService {}
+
+class MockWidgetService extends Mock implements WidgetService {}
+
+class FakePageRouteInfo extends Fake implements PageRouteInfo<dynamic> {}
+
+class FakeTimelineService extends Fake implements TimelineService {}
+
+class TestViewIntentService extends ViewIntentService {
+  ViewIntentPayload? consumedAttachment;
+  int cleanupStaleTempFilesCalls = 0;
+  int cleanupManagedTempFileCalls = 0;
+  final List<String> managedTempPaths = [];
+
+  TestViewIntentService() : super(MockViewIntentHostApi());
+
+  @override
+  Future<ViewIntentPayload?> consumeViewIntent() async => consumedAttachment;
+
+  @override
+  Future<void> cleanupStaleTempFiles() async {
+    cleanupStaleTempFilesCalls++;
+  }
+
+  @override
+  Future<void> cleanupManagedTempFile() async {
+    cleanupManagedTempFileCalls++;
+  }
+
+  @override
+  Future<void> setManagedTempFilePath(String path) async {
+    managedTempPaths.add(path);
+  }
+}
+
+class TestAuthNotifier extends AuthNotifier {
+  TestAuthNotifier(Ref ref, AuthState initial)
+    : super(
+        MockAuthService(),
+        MockApiService(),
+        MockUserService(),
+        MockSecureStorageService(),
+        MockWidgetService(),
+        ref,
+      ) {
+    state = initial;
+  }
+
+  void setAuthenticated(bool isAuthenticated) {
+    state = state.copyWith(isAuthenticated: isAuthenticated);
+  }
+}
+
+final _handlerProvider = Provider<AndroidViewIntentHandler>((ref) => AndroidViewIntentHandler(ref));
+
+void main() {
+  TestWidgetsFlutterBinding.ensureInitialized();
+
+  late TestViewIntentService viewIntentService;
+  late MockViewIntentAssetResolver resolver;
+  late MockAppRouter router;
+  late TestAuthNotifier authNotifier;
+  late ProviderContainer container;
+  late AndroidViewIntentHandler handler;
+  late ViewIntentPayload payload;
+  late LocalAsset deepLinkAsset;
+  late TimelineService deepLinkTimelineService;
+
+  setUpAll(() {
+    registerFallbackValue(FakePageRouteInfo());
+    registerFallbackValue(<PageRouteInfo<dynamic>>[]);
+    registerFallbackValue(FakeTimelineService());
+    registerFallbackValue(
+      ViewIntentPayload(path: '/tmp/fallback.jpg', mimeType: 'image/jpeg', localAssetId: 'fallback'),
+    );
+  });
+
+  setUp(() async {
+    viewIntentService = TestViewIntentService();
+    resolver = MockViewIntentAssetResolver();
+    router = MockAppRouter();
+    payload = ViewIntentPayload(path: '/tmp/incoming.jpg', mimeType: 'image/jpeg', localAssetId: 'local-1');
+    deepLinkAsset = _localAsset(id: 'local-1');
+    deepLinkTimelineService = await _createReadyTimelineService([deepLinkAsset], TimelineOrigin.deepLink);
+
+    when(() => router.replaceAll(any())).thenAnswer((_) async {});
+
+    container = ProviderContainer(
+      overrides: [
+        viewIntentServiceProvider.overrideWithValue(viewIntentService),
+        viewIntentAssetResolverProvider.overrideWithValue(resolver),
+        appRouterProvider.overrideWithValue(router),
+        // viewIntentMainTimelineReadyProvider reads both of these to compute
+        // its ready state — without them wait() never resolves.
+        timelineServiceProvider.overrideWithValue(deepLinkTimelineService),
+        timelineUsersProvider.overrideWith((ref) => Stream.value(['user-1'])),
+        authProvider.overrideWith((ref) {
+          authNotifier = TestAuthNotifier(ref, _authState(isAuthenticated: true));
+          return authNotifier;
+        }),
+      ],
+    );
+
+    authNotifier = container.read(authProvider.notifier) as TestAuthNotifier;
+    await container.read(timelineUsersProvider.future);
+    handler = container.read(_handlerProvider);
+
+    addTearDown(() async {
+      await deepLinkTimelineService.dispose();
+      container.dispose();
+    });
+  });
+
+  test('handle defers unauthenticated attachment', () async {
+    authNotifier.setAuthenticated(false);
+
+    await handler.handle(payload);
+
+    expect(container.read(viewIntentPendingProvider), payload);
+    verifyNever(() => resolver.resolve(any()));
+  });
+
+  testWidgets('flushDeferredViewIntent waits for main timeline readiness before flushing pending attachment', (
+    tester,
+  ) async {
+    authNotifier.setAuthenticated(false);
+    container.read(viewIntentPendingProvider.notifier).defer(payload);
+    authNotifier.setAuthenticated(true);
+
+    when(() => resolver.resolve(payload)).thenAnswer((_) async {
+      return ViewIntentResolvedAsset(asset: deepLinkAsset, timelineService: deepLinkTimelineService);
+    });
+
+    unawaited(handler.flushDeferredViewIntent());
+    await tester.pump();
+
+    expect(container.read(viewIntentPendingProvider), payload);
+    verifyNever(() => resolver.resolve(any()));
+
+    container.read(viewIntentMainTimelineReadyProvider.notifier).markMountedOnce();
+    await tester.pump();
+    await tester.pump();
+    await tester.idle();
+
+    expect(container.read(viewIntentPendingProvider), isNull);
+    verify(() => resolver.resolve(payload)).called(1);
+  });
+
+  test('flushDeferredViewIntent does nothing when there is no pending attachment', () async {
+    await handler.flushDeferredViewIntent();
+
+    verifyNever(() => resolver.resolve(any()));
+  });
+
+  test('onAppResumed cleans stale temp files when no attachment is present', () async {
+    viewIntentService.consumedAttachment = null;
+
+    await handler.onAppResumed();
+
+    expect(viewIntentService.cleanupStaleTempFilesCalls, 1);
+    verifyNever(() => resolver.resolve(any()));
+  });
+
+  test('onAppResumed does not clean stale temp files while pending attachment exists', () async {
+    viewIntentService.consumedAttachment = null;
+    container.read(viewIntentPendingProvider.notifier).defer(payload);
+
+    await handler.onAppResumed();
+
+    expect(viewIntentService.cleanupStaleTempFilesCalls, 0);
+    verifyNever(() => resolver.resolve(any()));
+  });
+
+  testWidgets('onAppResumed handles attachment immediately when authenticated', (tester) async {
+    viewIntentService.consumedAttachment = payload;
+    when(() => resolver.resolve(payload)).thenAnswer(
+      (_) async => ViewIntentResolvedAsset(asset: deepLinkAsset, timelineService: deepLinkTimelineService),
+    );
+
+    unawaited(handler.onAppResumed());
+    await tester.pump();
+    await tester.pump();
+    await tester.pump();
+    await tester.idle();
+
+    verify(() => resolver.resolve(payload)).called(1);
+    // Routes the user to [TabShell, AssetViewer] so back-press lands on the
+    // main timeline — mirrors the home-screen widget navigation pattern.
+    final captured = verify(() => router.replaceAll(captureAny())).captured;
+    expect(captured, hasLength(1));
+    final routes = captured.single as List<PageRouteInfo<dynamic>>;
+    expect(routes, hasLength(2));
+    expect(routes[0].routeName, TabShellRoute.name);
+    expect(routes[1].routeName, AssetViewerRoute.name);
+  });
+}
+
+AuthState _authState({required bool isAuthenticated}) {
+  return AuthState(
+    deviceId: 'device-1',
+    userId: 'user-1',
+    userEmail: 'user@example.com',
+    isAuthenticated: isAuthenticated,
+    name: 'User',
+    isAdmin: false,
+    profileImagePath: '',
+  );
+}
+
+LocalAsset _localAsset({required String id}) {
+  return LocalAsset(
+    id: id,
+    name: '$id.jpg',
+    checksum: 'checksum-1',
+    type: AssetType.image,
+    createdAt: DateTime(2026, 4, 20),
+    updatedAt: DateTime(2026, 4, 20),
+    playbackStyle: AssetPlaybackStyle.image,
+    isEdited: false,
+  );
+}
+
+TimelineService _timelineServiceFromAssets(List<BaseAsset> assets, TimelineOrigin origin) {
+  return TimelineService((
+    assetSource: (index, count) async => assets.skip(index).take(count).toList(),
+    bucketSource: () => Stream.value([Bucket(assetCount: assets.length)]),
+    origin: origin,
+  ));
+}
+
+Future<TimelineService> _createReadyTimelineService(List<BaseAsset> assets, TimelineOrigin origin) async {
+  final timelineService = _timelineServiceFromAssets(assets, origin);
+
+  if (!timelineService.isReady) {
+    await timelineService.watchStatus().firstWhere((status) => status == TimelineStatus.ready);
+  }
+
+  return timelineService;
+}

mobile/test/providers/view_intent/view_intent_pending_provider_test.dart

@@ -0,0 +1,64 @@
+import 'package:flutter_test/flutter_test.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/platform/view_intent_api.g.dart';
+import 'package:immich_mobile/providers/view_intent/view_intent_pending.provider.dart';
+
+void main() {
+  late DateTime now;
+  late ProviderContainer container;
+
+  final attachment = ViewIntentPayload(
+    path: '/tmp/file.jpg',
+    mimeType: 'image/jpeg',
+    localAssetId: '42',
+  );
+
+  setUp(() {
+    now = DateTime(2026, 4, 17, 12);
+    container = ProviderContainer(
+      overrides: [viewIntentNowProvider.overrideWithValue(() => now)],
+    );
+    addTearDown(container.dispose);
+  });
+
+  test('defer stores pending attachment', () {
+    container.read(viewIntentPendingProvider.notifier).defer(attachment);
+
+    expect(container.read(viewIntentPendingProvider), attachment);
+  });
+
+  test('takeIfFresh returns pending attachment once', () {
+    container.read(viewIntentPendingProvider.notifier).defer(attachment);
+
+    final first = container.read(viewIntentPendingProvider.notifier).takeIfFresh();
+    final second = container.read(viewIntentPendingProvider.notifier).takeIfFresh();
+
+    expect(first, attachment);
+    expect(second, isNull);
+  });
+
+  test('takeIfFresh drops expired attachment', () {
+    container.read(viewIntentPendingProvider.notifier).defer(attachment);
+    now = now.add(const Duration(minutes: 11));
+
+    final result = container.read(viewIntentPendingProvider.notifier).takeIfFresh();
+
+    expect(result, isNull);
+    expect(container.read(viewIntentPendingProvider), isNull);
+  });
+
+  test('newer deferred attachment replaces older one', () {
+    final newerAttachment = ViewIntentPayload(
+      path: '/tmp/file-2.jpg',
+      mimeType: 'image/jpeg',
+      localAssetId: '43',
+    );
+
+    container.read(viewIntentPendingProvider.notifier).defer(attachment);
+    container.read(viewIntentPendingProvider.notifier).defer(newerAttachment);
+
+    final result = container.read(viewIntentPendingProvider.notifier).takeIfFresh();
+
+    expect(result, newerAttachment);
+  });
+}

mobile/test/repository.mocks.dart

@@ -3,17 +3,17 @@ import 'package:immich_mobile/repositories/asset_media.repository.dart';
 import 'package:immich_mobile/repositories/auth.repository.dart';
 import 'package:immich_mobile/repositories/auth_api.repository.dart';
 import 'package:immich_mobile/domain/services/tag.service.dart';
-import 'package:immich_mobile/repositories/local_files_manager.repository.dart';
+import 'package:immich_mobile/repositories/permission.repository.dart';
 import 'package:mocktail/mocktail.dart';
 
 class MockAssetApiRepository extends Mock implements AssetApiRepository {}
 
 class MockAssetMediaRepository extends Mock implements AssetMediaRepository {}
 
+class MockPermissionRepository extends Mock implements IPermissionRepository {}
+
 class MockAuthApiRepository extends Mock implements AuthApiRepository {}
 
 class MockAuthRepository extends Mock implements AuthRepository {}
 
-class MockLocalFilesManagerRepository extends Mock implements LocalFilesManagerRepository {}
-
 class MockTagService extends Mock implements TagService {}

mobile/test/services/view_intent_asset_resolver_test.dart

@@ -0,0 +1,123 @@
+import 'dart:async';
+
+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/domain/models/timeline.model.dart';
+import 'package:immich_mobile/domain/services/timeline.service.dart';
+import 'package:immich_mobile/platform/view_intent_api.g.dart';
+import 'package:immich_mobile/providers/infrastructure/asset.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
+import 'package:immich_mobile/services/view_intent_asset_resolver.service.dart';
+import 'package:mocktail/mocktail.dart';
+
+import '../infrastructure/repository.mock.dart';
+
+class MockTimelineFactory extends Mock implements TimelineFactory {}
+
+void main() {
+  late MockDriftLocalAssetRepository mockLocalAssetRepository;
+  late MockTimelineFactory timelineFactory;
+  late List<TimelineService> createdTimelineServices;
+  late ProviderContainer container;
+
+  setUp(() {
+    mockLocalAssetRepository = MockDriftLocalAssetRepository();
+    timelineFactory = MockTimelineFactory();
+    createdTimelineServices = [];
+
+    when(() => timelineFactory.fromAssets(any(), TimelineOrigin.deepLink)).thenAnswer((invocation) {
+      final assets = List<BaseAsset>.from(invocation.positionalArguments[0] as List<BaseAsset>);
+      final timelineService = _timelineServiceFromAssets(assets, TimelineOrigin.deepLink);
+      createdTimelineServices.add(timelineService);
+      return timelineService;
+    });
+
+    container = ProviderContainer(
+      overrides: [
+        localAssetRepository.overrideWith((ref) => mockLocalAssetRepository),
+        timelineFactoryProvider.overrideWith((ref) => timelineFactory),
+      ],
+    );
+
+    addTearDown(() async {
+      for (final timelineService in createdTimelineServices) {
+        await timelineService.dispose();
+      }
+      container.dispose();
+    });
+  });
+
+  test('returns DB-backed local asset wrapped in a 1-element deep-link timeline', () async {
+    final localAsset = _localAsset(id: 'local-1', checksum: 'checksum-1');
+    when(() => mockLocalAssetRepository.getById('local-1')).thenAnswer((_) async => localAsset);
+
+    final result = await _resolve(container, _payload(localAssetId: 'local-1'));
+
+    expect(result.asset, equals(localAsset));
+    expect(result.timelineService.origin, TimelineOrigin.deepLink);
+    expect(result.viewIntentFilePath, isNull, reason: 'DB-backed assets carry their own source — no temp file needed');
+  });
+
+  test('returns transient asset with temp file path when localAssetId has no DB row', () async {
+    when(() => mockLocalAssetRepository.getById('local-1')).thenAnswer((_) async => null);
+
+    final result = await _resolve(container, _payload(localAssetId: 'local-1', path: '/tmp/incoming.jpg'));
+
+    expect(result.asset, isA<LocalAsset>());
+    expect(result.timelineService.origin, TimelineOrigin.deepLink);
+    expect(result.viewIntentFilePath, '/tmp/incoming.jpg');
+  });
+
+  test('returns transient asset for path-only attachment', () async {
+    final result = await _resolve(
+      container,
+      _payload(localAssetId: null, path: '/tmp/incoming.webp', mimeType: 'image/webp'),
+    );
+
+    expect(result.asset, isA<LocalAsset>());
+    expect(result.timelineService.origin, TimelineOrigin.deepLink);
+    expect(result.viewIntentFilePath, '/tmp/incoming.webp');
+
+    final asset = result.asset as LocalAsset;
+    expect(asset.localId, startsWith('-'));
+    expect(asset.name, 'incoming.webp');
+    expect(asset.playbackStyle, AssetPlaybackStyle.imageAnimated);
+  });
+
+  test('throws when neither localAssetId nor path is provided', () async {
+    await expectLater(
+      _resolve(container, _payload(localAssetId: null, path: null)),
+      throwsA(isA<StateError>()),
+    );
+  });
+}
+
+Future<ViewIntentResolvedAsset> _resolve(ProviderContainer container, ViewIntentPayload payload) {
+  return container.read(viewIntentAssetResolverProvider).resolve(payload);
+}
+
+ViewIntentPayload _payload({String? localAssetId = 'local-1', String? path, String mimeType = 'image/jpeg'}) {
+  return ViewIntentPayload(path: path, mimeType: mimeType, localAssetId: localAssetId);
+}
+
+LocalAsset _localAsset({required String id, String? checksum}) {
+  return LocalAsset(
+    id: id,
+    name: '$id.jpg',
+    checksum: checksum,
+    type: AssetType.image,
+    createdAt: DateTime(2026, 4, 20),
+    updatedAt: DateTime(2026, 4, 20),
+    playbackStyle: AssetPlaybackStyle.image,
+    isEdited: false,
+  );
+}
+
+TimelineService _timelineServiceFromAssets(List<BaseAsset> assets, TimelineOrigin origin) {
+  return TimelineService((
+    assetSource: (index, count) async => assets.skip(index).take(count).toList(),
+    bucketSource: () => Stream.value([Bucket(assetCount: assets.length)]),
+    origin: origin,
+  ));
+}

mobile/test/services/view_intent_service_test.dart

@@ -0,0 +1,96 @@
+import 'dart:io';
+
+import 'package:flutter_test/flutter_test.dart';
+import 'package:immich_mobile/platform/view_intent_api.g.dart';
+import 'package:immich_mobile/services/view_intent.service.dart';
+import 'package:mocktail/mocktail.dart';
+
+class MockViewIntentHostApi extends Mock implements ViewIntentHostApi {}
+
+void main() {
+  late MockViewIntentHostApi hostApi;
+  late ViewIntentService service;
+  late Directory tempRoot;
+  late Directory cacheDir;
+
+  final attachment = ViewIntentPayload(
+    path: '/tmp/file.jpg',
+    mimeType: 'image/jpeg',
+    localAssetId: '42',
+  );
+
+  setUp(() {
+    hostApi = MockViewIntentHostApi();
+    tempRoot = Directory.systemTemp.createTempSync('view-intent-root');
+    cacheDir = Directory('${tempRoot.path}/cache')..createSync();
+    service = ViewIntentService(hostApi, temporaryDirectory: () async => cacheDir);
+  });
+
+  tearDown(() async {
+    clearInteractions(hostApi);
+    if (await tempRoot.exists()) {
+      await tempRoot.delete(recursive: true);
+    }
+  });
+
+  test('consumeViewIntent returns null when no attachment', () async {
+    when(() => hostApi.consumeViewIntent()).thenAnswer((_) async => null);
+
+    final result = await service.consumeViewIntent();
+
+    expect(result, isNull);
+    verify(() => hostApi.consumeViewIntent()).called(1);
+  });
+
+  test('consumeViewIntent returns attachment when present', () async {
+    when(() => hostApi.consumeViewIntent()).thenAnswer((_) async => attachment);
+
+    final result = await service.consumeViewIntent();
+
+    expect(result, attachment);
+    verify(() => hostApi.consumeViewIntent()).called(1);
+  });
+
+  test('consumeViewIntent swallows host api errors', () async {
+    when(() => hostApi.consumeViewIntent()).thenThrow(Exception('boom'));
+
+    final result = await service.consumeViewIntent();
+
+    expect(result, isNull);
+    verify(() => hostApi.consumeViewIntent()).called(1);
+  });
+
+  test('setManagedTempFilePath cleans previous managed temp file', () async {
+    final firstFile = File('${cacheDir.path}/view_intent_first.jpg')..writeAsStringSync('first');
+    final secondFile = File('${cacheDir.path}/view_intent_second.jpg')..writeAsStringSync('second');
+
+    await service.setManagedTempFilePath(firstFile.path);
+    await service.setManagedTempFilePath(secondFile.path);
+
+    expect(await firstFile.exists(), isFalse);
+    expect(await secondFile.exists(), isTrue);
+
+    await service.cleanupManagedTempFile();
+    expect(await secondFile.exists(), isFalse);
+  });
+
+  test('cleanupTempFile ignores non-managed paths', () async {
+    final nonManagedFile = File('${tempRoot.path}/plain_file.jpg')..writeAsStringSync('content');
+
+    await service.cleanupTempFile(nonManagedFile.path);
+
+    expect(await nonManagedFile.exists(), isTrue);
+  });
+
+  test('cleanupStaleTempFiles removes view-intent temp files and keeps unrelated files', () async {
+    final firstFile = File('${cacheDir.path}/view_intent_first.jpg')..writeAsStringSync('first');
+    final secondFile = File('${cacheDir.path}/view_intent_second.jpg')..writeAsStringSync('second');
+    final unrelatedFile = File('${cacheDir.path}/plain_file.jpg')..writeAsStringSync('plain');
+
+    await service.cleanupStaleTempFiles();
+
+    expect(await firstFile.exists(), isFalse);
+    expect(await secondFile.exists(), isFalse);
+    expect(await unrelatedFile.exists(), isTrue);
+  });
+}

server/Dockerfile

@@ -88,8 +88,8 @@ ENV NODE_ENV=production \
 COPY --from=server /output/server-pruned ./server
 COPY --from=web /usr/src/app/web/build /build/www
 COPY --from=cli /output/cli-pruned ./cli
-COPY --from=plugins /app/packages/plugin-core/dist /build/plugins/immich-core-plugin/dist
-COPY --from=plugins /app/packages/plugin-core/manifest.json /build/plugins/immich-core-plugin/manifest.json
+COPY --from=plugins /app/packages/plugin-core/dist /build/plugins/immich-plugin-core/dist
+COPY --from=plugins /app/packages/plugin-core/manifest.json /build/plugins/immich-plugin-core/manifest.json
 RUN ln -s ../../cli/bin/immich server/bin/immich
 COPY LICENSE /licenses/LICENSE.txt
 COPY LICENSE /LICENSE

server/src/schema/migrations/1773175313374-Test.ts

@@ -1,9 +0,0 @@
-import { Kysely, sql } from 'kysely';
-
-export async function up(db: Kysely<any>): Promise<void> {
-  await sql`ALTER TABLE "workflow" ADD "updateId" uuid NOT NULL DEFAULT immich_uuid_v7();`.execute(db);
-}
-
-export async function down(db: Kysely<any>): Promise<void> {
-  await sql`ALTER TABLE "workflow" DROP COLUMN "updateId";`.execute(db);
-}

web/src/lib/components/album-page/AlbumSummary.svelte

@@ -3,18 +3,15 @@
   import type { AlbumResponseDto } from '@immich/sdk';
   import { t } from 'svelte-i18n';
 
-  type Props = {
+  interface Props {
     album: AlbumResponseDto;
-  };
+  }
 
-  const { album }: Props = $props();
-  const startDate = album.startDate;
+  let { album }: Props = $props();
 </script>
 
 <span class="my-2 flex gap-2 text-sm font-medium text-gray-500" data-testid="album-details">
-  {#if startDate}
-    <span>{getAlbumDateRange(startDate, album.endDate ?? startDate)}</span>
-    <span>•</span>
-  {/if}
+  <span>{getAlbumDateRange(album)}</span>
+  <span>•</span>
   <span>{$t('items_count', { values: { count: album.assetCount } })}</span>
 </span>

web/src/lib/constants.ts

@@ -34,12 +34,6 @@ export const dateFormats = {
     month: 'short',
     day: 'numeric',
     year: 'numeric',
-    timeZone: 'UTC',
-  } satisfies Intl.DateTimeFormatOptions,
-  albumShort: {
-    month: 'short',
-    year: 'numeric',
-    timeZone: 'UTC',
   } satisfies Intl.DateTimeFormatOptions,
   settings: {
     month: 'short',

web/src/lib/utils/date-time.spec.ts

@@ -1,93 +1,66 @@
 import { writable } from 'svelte/store';
-import { locale } from '$lib/stores/preferences.store';
 import { getAlbumDateRange, getShortDateRange } from './date-time';
 
-vitest.mock('$lib/stores/preferences.store', () => ({
-  locale: writable('en'),
-}));
-
 describe('getShortDateRange', () => {
   beforeEach(() => {
     vi.stubEnv('TZ', 'UTC');
-    locale.set('en');
   });
 
   afterAll(() => {
     vi.unstubAllEnvs();
-    locale.set('en');
   });
 
-  it('should correctly return long month if start and end date are within the same month', () => {
-    expect(getShortDateRange('2022-01-01T00:00:00.000Z', '2022-01-31T00:00:00.000Z')).toEqual('January 2022');
+  it('should correctly return month if start and end date are within the same month', () => {
+    expect(getShortDateRange('2022-01-01T00:00:00.000Z', '2022-01-31T00:00:00.000Z')).toEqual('Jan 2022');
   });
 
   it('should correctly return month range if start and end date are in separate months within the same year', () => {
-    expect(getShortDateRange('2022-01-01T00:00:00.000Z', '2022-02-01T00:00:00.000Z')).toEqual('Jan – Feb 2022');
+    expect(getShortDateRange('2022-01-01T00:00:00.000Z', '2022-02-01T00:00:00.000Z')).toEqual('Jan - Feb 2022');
   });
 
   it('should correctly return range if start and end date are in separate months and years', () => {
-    expect(getShortDateRange('2021-12-01T00:00:00.000Z', '2022-01-01T00:00:00.000Z')).toEqual('Dec 2021 – Jan 2022');
+    expect(getShortDateRange('2021-12-01T00:00:00.000Z', '2022-01-01T00:00:00.000Z')).toEqual('Dec 2021 - Jan 2022');
   });
 
-  it('should correctly return long month if start and end date are within the same month, ignoring local time zone', () => {
+  it('should correctly return month if start and end date are within the same month, ignoring local time zone', () => {
     vi.stubEnv('TZ', 'UTC+6');
-    expect(getShortDateRange('2022-01-01T00:00:00.000Z', '2022-01-31T00:00:00.000Z')).toEqual('January 2022');
+    expect(getShortDateRange('2022-01-01T00:00:00.000Z', '2022-01-31T00:00:00.000Z')).toEqual('Jan 2022');
   });
 
   it('should correctly return month range if start and end date are in separate months within the same year, ignoring local time zone', () => {
     vi.stubEnv('TZ', 'UTC+6');
-    expect(getShortDateRange('2022-01-01T00:00:00.000Z', '2022-02-01T00:00:00.000Z')).toEqual('Jan – Feb 2022');
+    expect(getShortDateRange('2022-01-01T00:00:00.000Z', '2022-02-01T00:00:00.000Z')).toEqual('Jan - Feb 2022');
   });
 
   it('should correctly return range if start and end date are in separate months and years, ignoring local time zone', () => {
     vi.stubEnv('TZ', 'UTC+6');
-    expect(getShortDateRange('2021-12-01T00:00:00.000Z', '2022-01-01T00:00:00.000Z')).toEqual('Dec 2021 – Jan 2022');
-  });
-
-  it('should correctly return range if start and end date are in separate months and years, ignoring local time zone', () => {
-    vi.stubEnv('TZ', 'UTC-6');
-    expect(getShortDateRange('2021-12-01T00:00:00.000Z', '2022-01-01T00:00:00.000Z')).toEqual('Dec 2021 – Jan 2022');
-  });
-
-  it('should use the correct locale to return month range', () => {
-    locale.set('fr');
-    expect(getShortDateRange('2022-01-01T00:00:00.000Z', '2022-02-01T00:00:00.000Z')).toEqual('janv.–févr. 2022');
-  });
-
-  it('should use the correct locale to return month-year range', () => {
-    locale.set('fr');
-    expect(getShortDateRange('2021-12-01T00:00:00.000Z', '2022-01-01T00:00:00.000Z')).toEqual('déc. 2021 – janv. 2022');
+    expect(getShortDateRange('2021-12-01T00:00:00.000Z', '2022-01-01T00:00:00.000Z')).toEqual('Dec 2021 - Jan 2022');
   });
 });
 
-describe('getAlbumDateRange', () => {
+describe('getAlbumDate', () => {
   beforeAll(() => {
-    vi.stubEnv('TZ', 'UTC');
+    process.env.TZ = 'UTC';
+
+    vitest.mock('$lib/stores/preferences.store', () => ({
+      locale: writable('en'),
+    }));
   });
 
-  afterAll(() => {
-    vi.unstubAllEnvs();
+  it('should work with only a start date', () => {
+    expect(getAlbumDateRange({ startDate: '2021-01-01T00:00:00Z' })).toEqual('Jan 1, 2021');
   });
 
-  it('should work', () => {
-    expect(getAlbumDateRange('2021-01-01T00:00:00Z', '2021-01-05T00:00:00Z')).toEqual('Jan 1 – 5, 2021');
+  it('should work with a start and end date', () => {
+    expect(
+      getAlbumDateRange({
+        startDate: '2021-01-01T00:00:00Z',
+        endDate: '2021-01-05T00:00:00Z',
+      }),
+    ).toEqual('Jan 1, 2021 - Jan 5, 2021');
   });
 
-  it('should work with a single day range', () => {
-    expect(getAlbumDateRange('2021-01-01T09:00:00Z', '2021-01-01T10:00:00Z')).toEqual('Jan 1, 2021');
-  });
-
-  it('should work with positive time zone present', () => {
-    expect(getAlbumDateRange('2021-01-01T00:00:00+05:00', '2021-01-01T00:00:00+05:00')).toEqual('Jan 1, 2021');
-  });
-
-  it('should work with negative time zone present', () => {
-    expect(getAlbumDateRange('2021-01-01T00:00:00-05:00', '2021-01-01T00:00:00-05:00')).toEqual('Jan 1, 2021');
-  });
-
-  it('should use the proper locale', () => {
-    locale.set('fr');
-    expect(getAlbumDateRange('2020-03-26T12:00:00Z', '2021-12-01T00:00:00Z')).toEqual('26 mars 2020 – 1 déc. 2021');
-    locale.set('en');
+  it('should work with the new date format', () => {
+    expect(getAlbumDateRange({ startDate: '2021-01-01T00:00:00+05:00' })).toEqual('Jan 1, 2021');
   });
 });

web/src/lib/utils/date-time.ts

@@ -7,28 +7,69 @@ export function parseUtcDate(date: string) {
   return DateTime.fromISO(date, { zone: 'UTC' }).toUTC();
 }
 
-const getDateRange = (startTimestamp: string, endTimestamp: string, format: 'short' | 'long') => {
+export const getShortDateRange = (startTimestamp: string, endTimestamp: string) => {
   const userLocale = get(locale);
-  const startDate = DateTime.fromISO(startTimestamp).setZone('UTC');
-  const endDate = DateTime.fromISO(endTimestamp).setZone('UTC').setLocale(userLocale);
+  let startDate = DateTime.fromISO(startTimestamp).setZone('UTC');
+  let endDate = DateTime.fromISO(endTimestamp).setZone('UTC');
 
-  if (startDate.year === endDate.year && startDate.month === endDate.month && format === 'short') {
-    return endDate.toLocaleString({ month: 'long', year: 'numeric' });
+  if (userLocale) {
+    startDate = startDate.setLocale(userLocale);
+    endDate = endDate.setLocale(userLocale);
   }
 
-  const formatter = new Intl.DateTimeFormat(
-    userLocale,
-    format === 'short' ? dateFormats.albumShort : dateFormats.album,
-  );
-  return formatter.formatRange(startDate.toJSDate(), endDate.toJSDate());
+  const endDateLocalized = endDate.toLocaleString({
+    month: 'short',
+    year: 'numeric',
+  });
+
+  if (startDate.year === endDate.year) {
+    if (startDate.month === endDate.month) {
+      // Same year and month.
+      // e.g.: aug. 2024
+      return endDateLocalized;
+    } else {
+      // Same year but different month.
+      // e.g.: jul. - sept. 2024
+      const startMonthLocalized = startDate.toLocaleString({
+        month: 'short',
+      });
+      return `${startMonthLocalized} - ${endDateLocalized}`;
+    }
+  } else {
+    // Different year.
+    // e.g.: feb. 2021 - sept. 2024
+    const startDateLocalized = startDate.toLocaleString({
+      month: 'short',
+      year: 'numeric',
+    });
+    return `${startDateLocalized} - ${endDateLocalized}`;
+  }
 };
 
-/**
- * Get localized date range in short format like 'Oct – Nov 2026', with full month if start and end are the same: 'October 2026'
- */
-export const getShortDateRange = (start: string, end: string) => getDateRange(start, end, 'short');
+const formatDate = (date?: string) => {
+  if (!date) {
+    return;
+  }
 
-export const getAlbumDateRange = (start: string, end: string) => getDateRange(start, end, 'long');
+  // without timezone
+  const localDate = date.replace(/Z$/, '').replace(/\+.+$/, '');
+  return localDate ? new Date(localDate).toLocaleDateString(get(locale), dateFormats.album) : undefined;
+};
+
+export const getAlbumDateRange = (album: { startDate?: string; endDate?: string }) => {
+  const start = formatDate(album.startDate);
+  const end = formatDate(album.endDate);
+
+  if (start && end && start !== end) {
+    return `${start} - ${end}`;
+  }
+
+  if (start) {
+    return start;
+  }
+
+  return '';
+};
 
 /**
  * Use this to convert from "5pm EST" to "5pm UTC"