v1.5.3

Merge branch 'dev' of https://github.com/particle-box/PurrfectSnap into dev
feat: continuous snap feature!
2026-03-25 21:59:31 +05:30 · 2026-03-24 03:37:30 +05:30 · 2026-03-24 03:36:39 +05:30 · 2026-03-22 20:32:16 +05:30 · 2026-03-22 20:31:25 +05:30 · 2026-03-22 20:30:34 +05:30
29 changed files with 2056 additions and 444 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -20,3 +20,4 @@ security/allowed_codes.local.*
 valdi/node_modules/
 hs_err_pid*.log
 replay_pid*.log
+.vs
--- a/.kotlin/sessions/kotlin-compiler-9309063494563612695.salive
+++ b/.kotlin/sessions/kotlin-compiler-9309063494563612695.salive
--- a/app/src/main/kotlin/me/eternal/purrfectsnap/ui/manager/MainActivity.kt
+++ b/app/src/main/kotlin/me/eternal/purrfectsnap/ui/manager/MainActivity.kt
@@ -214,13 +214,20 @@ class MainActivity : ComponentActivity() {
                            val statusBarHeight = WindowInsets.statusBars.asPaddingValues().calculateTopPadding()
                            navigation.NavContent(contentPadding, startDestination)

-                            // Theme Reveal Overlay
-                            navigation.themeRevealState.pendingReveal?.let { revealRequest ->
-                                CircularRevealOverlay(
-                                    context = managerContext,
-                                    request = revealRequest,
-                                    onComplete = { navigation.themeRevealState.clearReveal() }
-                                )
+                            // Theme Reveal Overlay (Android 13+ only for stability)
+                            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+                                navigation.themeRevealState.pendingReveal?.let { revealRequest ->
+                                    CircularRevealOverlay(
+                                        context = managerContext,
+                                        request = revealRequest,
+                                        onComplete = { navigation.themeRevealState.clearReveal() }
+                                    )
+                                }
+                            } else {
+                                // Instantly clear reveal state on older versions
+                                navigation.themeRevealState.pendingReveal?.let {
+                                    navigation.themeRevealState.clearReveal()
+                                }
                            }

                            Box(
--- a/app/src/main/kotlin/me/eternal/purrfectsnap/ui/manager/pages/features/FeaturesRootSection.kt
+++ b/app/src/main/kotlin/me/eternal/purrfectsnap/ui/manager/pages/features/FeaturesRootSection.kt
@@ -53,8 +53,6 @@ import androidx.compose.ui.text.input.TextFieldValue
 import androidx.compose.ui.unit.DpOffset
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import androidx.compose.ui.window.Dialog
-import androidx.compose.ui.window.DialogProperties
 import androidx.compose.ui.zIndex
 import androidx.core.net.toUri
 import androidx.lifecycle.Lifecycle
@@ -78,6 +76,8 @@ import me.eternal.purrfectsnap.ui.manager.Routes
 import me.eternal.purrfectsnap.ui.manager.ManagerTheme
 import me.eternal.purrfectsnap.ui.manager.theme.PurrfectPalette
 import me.eternal.purrfectsnap.ui.util.*
+import me.eternal.purrfectsnap.ui.util.Dialog
+import me.eternal.purrfectsnap.ui.util.DialogProperties
 import org.json.JSONArray
 import org.json.JSONObject
 import kotlin.math.max
@@ -1273,11 +1273,65 @@ class FeaturesRootSection : Routes.Route() {
                                    }
                                }

-                                IconButton(onClick = { 
-                                    haptic.performHapticFeedback(HapticFeedbackType.LongPress)
-                                    showSearchBar = !showSearchBar 
-                                }) {
-                                    Icon(imageVector = if (showSearchBar) Icons.Filled.Close else Icons.Filled.Search, contentDescription = null, tint = Color.White)
+                                Row(
+                                    verticalAlignment = Alignment.CenterVertically,
+                                    horizontalArrangement = Arrangement.spacedBy(4.dp)
+                                ) {
+                                    IconButton(onClick = {
+                                        haptic.performHapticFeedback(HapticFeedbackType.LongPress)
+                                        showSearchBar = !showSearchBar
+                                    }) {
+                                        Icon(
+                                            imageVector = if (showSearchBar) Icons.Filled.Close else Icons.Filled.Search,
+                                            contentDescription = null,
+                                            tint = Color.White
+                                        )
+                                    }
+
+                                    if (context.activity != null) {
+                                        Box {
+                                            IconButton(onClick = {
+                                                haptic.performHapticFeedback(HapticFeedbackType.LongPress)
+                                                showExportDropdownMenu = !showExportDropdownMenu
+                                            }) {
+                                                Icon(
+                                                    imageVector = Icons.Filled.MoreVert,
+                                                    contentDescription = null,
+                                                    tint = Color.White
+                                                )
+                                            }
+                                            DropdownMenu(
+                                                expanded = showExportDropdownMenu,
+                                                onDismissRequest = { showExportDropdownMenu = false },
+                                                offset = DpOffset(0.dp, 8.dp),
+                                                containerColor = Color(0xFF161821),
+                                                shape = RoundedCornerShape(14.dp),
+                                                tonalElevation = 8.dp,
+                                                shadowElevation = 12.dp
+                                            ) {
+                                                actions.forEach { (name, icon, action) ->
+                                                    DropdownMenuItem(
+                                                        leadingIcon = {
+                                                            Icon(
+                                                                imageVector = icon,
+                                                                contentDescription = null,
+                                                                tint = PurrfectPalette.glowPrimary
+                                                            )
+                                                        },
+                                                        text = { Text(text = name ?: "", color = Color.White) },
+                                                        onClick = {
+                                                            action()()
+                                                            showExportDropdownMenu = false
+                                                        },
+                                                        colors = MenuDefaults.itemColors(
+                                                            textColor = Color.White,
+                                                            leadingIconColor = PurrfectPalette.glowPrimary
+                                                        )
+                                                    )
+                                                }
+                                            }
+                                        }
+                                    }
                                }
                            }
                        }
--- a/app/src/main/kotlin/me/eternal/purrfectsnap/ui/manager/pages/themes/aphelion/AphelionTasksView.kt
+++ b/app/src/main/kotlin/me/eternal/purrfectsnap/ui/manager/pages/themes/aphelion/AphelionTasksView.kt
@@ -97,6 +97,13 @@ fun TasksRootSection.AphelionTasksScreen(nav: NavBackStackEntry) {
            .fillMaxSize()
            .background(PurrfectPalette.backgroundGradient)
    ) {
+        val scrollOffset = routes.navigation?.globalScrollOffset ?: 0
+        val focusFactor = (scrollOffset.toFloat() / Motion.HEADER_MORPH_THRESHOLD).coerceIn(0f, 1f)
+        val statusBarHeight = WindowInsets.statusBars.asPaddingValues().calculateTopPadding()
+        
+        val containerTopPadding = androidx.compose.ui.unit.lerp(statusBarHeight + 2.dp, 0.dp, focusFactor)
+        val topCorners = androidx.compose.ui.unit.lerp(28.dp, 0.dp, focusFactor)
+
        val subtitle = if (activeTasks.isNotEmpty()) {
            translation.format(
                "summary_active",
@@ -110,13 +117,13 @@ fun TasksRootSection.AphelionTasksScreen(nav: NavBackStackEntry) {
            )
        }

-        // The "Structured Glass" Container (1:1 with build 33a7e8f)
+        // The "Structured Glass" Container (Dynamically Morphed)
        Surface(
            modifier = Modifier
                .fillMaxSize()
                .padding(horizontal = 12.dp)
-                .padding(top = 12.dp),
-            shape = RoundedCornerShape(topStart = 28.dp, topEnd = 28.dp, bottomStart = 0.dp, bottomEnd = 0.dp),
+                .padding(top = containerTopPadding),
+            shape = RoundedCornerShape(topStart = topCorners, topEnd = topCorners, bottomStart = 0.dp, bottomEnd = 0.dp),
            color = Color.White.copy(alpha = 0.04f),
            tonalElevation = 0.dp,
            shadowElevation = 0.dp,
@@ -128,7 +135,7 @@ fun TasksRootSection.AphelionTasksScreen(nav: NavBackStackEntry) {
                contentPadding = PaddingValues(
                    start = 10.dp,
                    end = 10.dp,
-                    top = controlsHeight,
+                    top = controlsHeight - 44.dp,
                    bottom = routes.bottomPadding + 20.dp
                ),
                verticalArrangement = Arrangement.spacedBy(16.dp)
--- a/app/src/main/kotlin/me/eternal/purrfectsnap/ui/manager/theme/aphelion/CircularRevealOverlay.kt
+++ b/app/src/main/kotlin/me/eternal/purrfectsnap/ui/manager/theme/aphelion/CircularRevealOverlay.kt
@@ -7,11 +7,7 @@ import androidx.annotation.RequiresApi
 import androidx.compose.animation.core.*
 import androidx.compose.foundation.Canvas
 import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.DisposableEffect
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.remember
+import androidx.compose.runtime.*
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.drawscope.drawIntoCanvas
 import androidx.compose.ui.graphics.nativeCanvas
@@ -24,14 +20,12 @@ import me.eternal.purrfectsnap.RemoteSideContext

 private const val REVEAL_DURATION_MS = 3200
 private const val WAVE_BAND_WIDTH_PX = 300f
-private const val BLUR_ZONE_PX = 120f
-private const val BLUR_RADIUS = 30f
-private const val FADE_ZONE_PX = 80f

 // "Explosive Dissipation" Easing: Instant high velocity at start, rapid energy loss, ending in a slow crawl.
 private val AphelionEasing = CubicBezierEasing(0.0f, 0.0f, 0.2f, 1.0f)

@Composable
+@RequiresApi(Build.VERSION_CODES.TIRAMISU)
 fun CircularRevealOverlay(
    context: RemoteSideContext,
    request: ThemeRevealRequest,
@@ -87,17 +81,17 @@ fun CircularRevealOverlay(
        label = "wave_time_value"
    )

+    // --- AGSL SHADER LOGIC (Android 13+) ---
+    
    val runtimeShader = remember(bitmap) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-            android.graphics.RuntimeShader(WaveEdgeShader.AGSL).apply {
-                setInputShader("content", BitmapShader(bitmap, Shader.TileMode.CLAMP, Shader.TileMode.CLAMP))
-            }
-        } else null
+        android.graphics.RuntimeShader(WaveEdgeShader.AGSL).apply {
+            setInputShader("content", BitmapShader(bitmap, Shader.TileMode.CLAMP, Shader.TileMode.CLAMP))
+        }
    }

-    val shaderPaint = remember(runtimeShader, bitmap) {
+    val shaderPaint = remember(runtimeShader) {
        android.graphics.Paint(android.graphics.Paint.ANTI_ALIAS_FLAG).apply {
-            shader = runtimeShader ?: BitmapShader(bitmap, Shader.TileMode.CLAMP, Shader.TileMode.CLAMP)
+            shader = runtimeShader
        }
    }

@@ -106,118 +100,12 @@ fun CircularRevealOverlay(
        val center = request.originCenter

        drawIntoCanvas { canvas ->
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU && runtimeShader != null) {
-                runtimeShader.setFloatUniform("revealRadius", radius)
-                runtimeShader.setFloatUniform("revealCenter", center.x, center.y)
-                runtimeShader.setFloatUniform("bandWidth", WAVE_BAND_WIDTH_PX)
-                runtimeShader.setFloatUniform("time", timeValue)
-                runtimeShader.setFloatUniform("uProgress", progress)
-                canvas.nativeCanvas.drawRect(0f, 0f, size.width, size.height, shaderPaint)
-            } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-                drawWithBlurReveal(canvas.nativeCanvas, bitmap, radius, center.x, center.y, size.width, size.height)
-            } else {
-                drawWithClipFade(canvas.nativeCanvas, bitmap, radius, center.x, center.y, size.width, size.height)
-            }
+            runtimeShader.setFloatUniform("revealRadius", radius)
+            runtimeShader.setFloatUniform("revealCenter", center.x, center.y)
+            runtimeShader.setFloatUniform("bandWidth", WAVE_BAND_WIDTH_PX)
+            runtimeShader.setFloatUniform("time", timeValue)
+            runtimeShader.setFloatUniform("uProgress", progress)
+            canvas.nativeCanvas.drawRect(0f, 0f, size.width, size.height, shaderPaint)
        }
    }
 }
-
-@RequiresApi(Build.VERSION_CODES.S)
-private fun drawWithBlurReveal(
-    canvas: android.graphics.Canvas,
-    bitmap: android.graphics.Bitmap,
-    radius: Float,
-    centerX: Float,
-    centerY: Float,
-    canvasWidth: Float,
-    canvasHeight: Float
-) {
-    val innerRingRadius = (radius - BLUR_ZONE_PX).coerceAtLeast(0f)
-    val holePath = android.graphics.Path().apply {
-        fillType = android.graphics.Path.FillType.EVEN_ODD
-        addRect(0f, 0f, canvasWidth, canvasHeight, android.graphics.Path.Direction.CW)
-        addCircle(centerX, centerY, radius, android.graphics.Path.Direction.CW)
-    }
-    canvas.save()
-    canvas.clipPath(holePath)
-    canvas.drawRect(0f, 0f, canvasWidth, canvasHeight,
-        android.graphics.Paint(android.graphics.Paint.ANTI_ALIAS_FLAG).apply {
-            shader = BitmapShader(bitmap, Shader.TileMode.CLAMP, Shader.TileMode.CLAMP)
-        }
-    )
-    canvas.restore()
-
-    val ringPath = android.graphics.Path().apply {
-        fillType = android.graphics.Path.FillType.EVEN_ODD
-        addCircle(centerX, centerY, radius, android.graphics.Path.Direction.CW)
-        addCircle(centerX, centerY, innerRingRadius, android.graphics.Path.Direction.CW)
-    }
-
-    val renderNode = android.graphics.RenderNode("blurRing").apply {
-        setPosition(0, 0, canvasWidth.toInt(), canvasHeight.toInt())
-        setRenderEffect(android.graphics.RenderEffect.createBlurEffect(BLUR_RADIUS, BLUR_RADIUS, Shader.TileMode.CLAMP))
-    }
-    val nodeCanvas = renderNode.beginRecording()
-    nodeCanvas.save()
-    nodeCanvas.clipPath(ringPath)
-    nodeCanvas.drawBitmap(bitmap, 0f, 0f, null)
-    nodeCanvas.restore()
-    renderNode.endRecording()
-    canvas.drawRenderNode(renderNode)
-
-    val shimmerPaint = android.graphics.Paint(android.graphics.Paint.ANTI_ALIAS_FLAG).apply {
-        shader = android.graphics.RadialGradient(
-            centerX, centerY, radius,
-            intArrayOf(android.graphics.Color.TRANSPARENT, android.graphics.Color.argb(50, 255, 255, 255), android.graphics.Color.TRANSPARENT),
-            floatArrayOf((innerRingRadius / radius).coerceIn(0f, 1f), ((radius - BLUR_ZONE_PX * 0.25f) / radius).coerceIn(0f, 1f), 1f),
-            Shader.TileMode.CLAMP
-        )
-    }
-    canvas.save()
-    canvas.clipPath(ringPath)
-    canvas.drawRect(0f, 0f, canvasWidth, canvasHeight, shimmerPaint)
-    canvas.restore()
-}
-
-private fun drawWithClipFade(
-    canvas: android.graphics.Canvas,
-    bitmap: android.graphics.Bitmap,
-    radius: Float,
-    centerX: Float,
-    centerY: Float,
-    canvasWidth: Float,
-    canvasHeight: Float
-) {
-    val innerFadeRadius = (radius - FADE_ZONE_PX).coerceAtLeast(0f)
-    val holePath = android.graphics.Path().apply {
-        fillType = android.graphics.Path.FillType.EVEN_ODD
-        addRect(0f, 0f, canvasWidth, canvasHeight, android.graphics.Path.Direction.CW)
-        addCircle(centerX, centerY, radius, android.graphics.Path.Direction.CW)
-    }
-    canvas.save()
-    canvas.clipPath(holePath)
-    canvas.drawRect(0f, 0f, canvasWidth, canvasHeight,
-        android.graphics.Paint(android.graphics.Paint.ANTI_ALIAS_FLAG).apply {
-            shader = BitmapShader(bitmap, Shader.TileMode.CLAMP, Shader.TileMode.CLAMP)
-        }
-    )
-    canvas.restore()
-
-    val ringPath = android.graphics.Path().apply {
-        fillType = android.graphics.Path.FillType.EVEN_ODD
-        addCircle(centerX, centerY, radius, android.graphics.Path.Direction.CW)
-        addCircle(centerX, centerY, innerFadeRadius, android.graphics.Path.Direction.CW)
-    }
-    val fadePaint = android.graphics.Paint(android.graphics.Paint.ANTI_ALIAS_FLAG).apply {
-        shader = android.graphics.RadialGradient(
-            centerX, centerY, radius,
-            intArrayOf(android.graphics.Color.TRANSPARENT, android.graphics.Color.argb(80, 255, 255, 255)),
-            floatArrayOf((innerFadeRadius / radius).coerceIn(0f, 1f), 1f),
-            Shader.TileMode.CLAMP
-        )
-    }
-    canvas.save()
-    canvas.clipPath(ringPath)
-    canvas.drawRect(0f, 0f, canvasWidth, canvasHeight, fadePaint)
-    canvas.restore()
-}
--- a/app/src/main/kotlin/me/eternal/purrfectsnap/ui/util/AlertDialogs.kt
+++ b/app/src/main/kotlin/me/eternal/purrfectsnap/ui/util/AlertDialogs.kt
@@ -40,7 +40,6 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import me.eternal.purrfectsnap.common.config.ConfigFlag
 import androidx.compose.ui.viewinterop.AndroidView
-import androidx.compose.ui.window.Dialog as StandardDialog
 import androidx.core.net.toUri
 import com.github.skydoves.colorpicker.compose.*
 import com.google.gson.JsonParser
@@ -67,6 +66,7 @@ import org.osmdroid.views.overlay.Marker
 import org.osmdroid.views.overlay.Overlay
 import java.io.File
 import me.eternal.purrfectsnap.ui.util.purrfectSwitchColors
+import me.eternal.purrfectsnap.ui.util.Dialog as StandardDialog


 class AlertDialogs(
@@ -1093,7 +1093,7 @@ class AlertDialogs(
                val lat = remember { mutableStateOf(coordinates.first.toString()) }
                val lon = remember { mutableStateOf(coordinates.second.toString()) }

-                Dialog(
+                StandardDialog(
                    onDismissRequest = {
                    customCoordinatesDialog = false
                    },
@@ -1398,7 +1398,7 @@ class AlertDialogs(

        // Add/Edit message dialog
        if (showAddDialog) {
-            Dialog(
+            StandardDialog(
                onDismissRequest = { showAddDialog = false },
                properties = DialogProperties(
                    usePlatformDefaultWidth = false
--- a/app/src/main/kotlin/me/eternal/purrfectsnap/ui/util/AndroidDialogCustom.kt
+++ b/app/src/main/kotlin/me/eternal/purrfectsnap/ui/util/AndroidDialogCustom.kt
@@ -4,12 +4,28 @@ package me.eternal.purrfectsnap.ui.util
 import android.annotation.SuppressLint
 import android.app.Activity
 import android.content.Context
+import android.content.ContextWrapper
 import android.graphics.Outline
 import android.os.Build
 import android.provider.Settings
 import android.view.*
+import android.view.View.OnAttachStateChangeListener
 import androidx.activity.ComponentDialog
 import androidx.activity.addCallback
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.fadeOut
+import androidx.compose.animation.scaleIn
+import androidx.compose.animation.scaleOut
+import androidx.compose.animation.core.spring
+import androidx.compose.animation.core.tween
+import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.interaction.MutableInteractionSource
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.width
 import androidx.compose.runtime.*
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.ExperimentalComposeUiApi
@@ -19,9 +35,12 @@ import androidx.compose.ui.layout.Layout
 import androidx.compose.ui.platform.*
 import androidx.compose.ui.semantics.dialog
 import androidx.compose.ui.semantics.semantics
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.Density
 import androidx.compose.ui.unit.LayoutDirection
 import androidx.compose.ui.unit.dp
+import androidx.compose.ui.window.Popup
+import androidx.compose.ui.window.PopupProperties
 import androidx.compose.ui.window.SecureFlagPolicy
 import androidx.core.view.WindowCompat
 import androidx.lifecycle.findViewTreeLifecycleOwner
@@ -33,6 +52,12 @@ import androidx.savedstate.setViewTreeSavedStateRegistryOwner
 import java.util.UUID
 import kotlin.math.roundToInt

+private tailrec fun Context.findActivity(): Activity? = when (this) {
+    is Activity -> this
+    is ContextWrapper -> baseContext?.findActivity()
+    else -> null
+}
+
 class DialogProperties constructor(
    val dismissOnBackPress: Boolean = true,
    val dismissOnClickOutside: Boolean = true,
@@ -83,6 +108,17 @@ fun Dialog(
    content: @Composable () -> Unit
 ) {
    val view = LocalView.current
+    var forceInline by remember(view) { mutableStateOf(false) }
+    val hostActivity = remember(view) { view.context.findActivity() }
+    val shouldUseInline = forceInline || hostActivity == null || hostActivity.isFinishing || hostActivity.isDestroyed
+    if (shouldUseInline) {
+        InlineDialog(
+            onDismissRequest = onDismissRequest,
+            dismissOnClickOutside = properties.dismissOnClickOutside,
+            content = content
+        )
+        return
+    }
    val density = LocalDensity.current
    val layoutDirection = LocalLayoutDirection.current
    val composition = rememberCompositionContext()
@@ -110,11 +146,30 @@ fun Dialog(
    }

    DisposableEffect(dialog) {
-        // Set the dialog's window type to TYPE_APPLICATION_OVERLAY so it's compatible with compose overlays
-        if (Settings.canDrawOverlays(view.context) && view.context !is Activity) {
-            dialog.window?.setType(WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY)
+        val showDialog = {
+            try {
+                dialog.prepareWindowForHost()
+                if (!dialog.isShowing) {
+                    dialog.show()
+                }
+            } catch (_: WindowManager.BadTokenException) {
+                forceInline = true
+            }
+        }
+
+        if (view.isAttachedToWindow || view.windowToken != null || view.rootView?.windowToken != null) {
+            showDialog()
+        } else {
+            val listener = object : OnAttachStateChangeListener {
+                override fun onViewAttachedToWindow(v: View) {
+                    v.removeOnAttachStateChangeListener(this)
+                    showDialog()
+                }
+
+                override fun onViewDetachedFromWindow(v: View) = Unit
+            }
+            view.addOnAttachStateChangeListener(listener)
        }
-        dialog.show()

        onDispose {
            dialog.dismiss()
@@ -131,6 +186,75 @@ fun Dialog(
    }
 }

+@Composable
+private fun InlineDialog(
+    onDismissRequest: () -> Unit,
+    dismissOnClickOutside: Boolean,
+    content: @Composable () -> Unit
+) {
+    val density = LocalDensity.current
+    val displayMetrics = LocalContext.current.resources.displayMetrics
+    val screenWidthDp = with(density) { displayMetrics.widthPixels.toDp() }
+    val screenHeightDp = with(density) { displayMetrics.heightPixels.toDp() }
+    val interactionSource = remember { MutableInteractionSource() }
+    var visible by remember { mutableStateOf(false) }
+
+    LaunchedEffect(Unit) {
+        visible = true
+    }
+
+    Popup(
+        alignment = androidx.compose.ui.Alignment.Center,
+        properties = PopupProperties(
+            focusable = true,
+            dismissOnBackPress = true,
+            dismissOnClickOutside = dismissOnClickOutside
+        ),
+        onDismissRequest = onDismissRequest
+    ) {
+        Box(
+            modifier = Modifier
+                .width(screenWidthDp)
+                .height(screenHeightDp)
+                .then(
+                    if (dismissOnClickOutside) {
+                        Modifier.clickable(
+                            interactionSource = interactionSource,
+                            indication = null,
+                            onClick = onDismissRequest
+                        )
+                    } else {
+                        Modifier
+                    }
+                )
+                .semantics { dialog() },
+            contentAlignment = androidx.compose.ui.Alignment.Center
+        ) {
+            AnimatedVisibility(
+                visible = visible,
+                enter = fadeIn(animationSpec = tween(180)) + scaleIn(
+                    initialScale = 0.92f,
+                    animationSpec = spring(dampingRatio = 0.82f, stiffness = 520f)
+                ),
+                exit = fadeOut(animationSpec = tween(120)) + scaleOut(
+                    targetScale = 0.96f,
+                    animationSpec = tween(120)
+                )
+            ) {
+                Box(
+                    modifier = Modifier.clickable(
+                        interactionSource = interactionSource,
+                        indication = null,
+                        onClick = {}
+                    )
+                ) {
+                    content()
+                }
+            }
+        }
+    }
+}
+
 interface DialogWindowProvider {
    val window: Window
 }
@@ -279,6 +403,26 @@ private class DialogWrapper(
        }
    }

+    fun prepareWindowForHost() {
+        val hostActivity = composeView.context.findActivity()
+        val hostToken = composeView.applicationWindowToken
+            ?: composeView.windowToken
+            ?: composeView.rootView?.applicationWindowToken
+            ?: composeView.rootView?.windowToken
+        if (hostActivity == null) {
+            when {
+                hostToken != null -> window?.setType(WindowManager.LayoutParams.TYPE_APPLICATION_ATTACHED_DIALOG)
+                Settings.canDrawOverlays(composeView.context) -> window?.setType(WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY)
+            }
+        }
+        if (hostToken != null) {
+            window?.attributes = window?.attributes?.apply {
+                token = hostToken
+            }
+        }
+        hostActivity?.let { setOwnerActivity(it) }
+    }
+
    private fun setLayoutDirection(layoutDirection: LayoutDirection) {
        dialogLayout.layoutDirection = when (layoutDirection) {
            LayoutDirection.Ltr -> android.util.LayoutDirection.LTR
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -33,8 +33,8 @@ tasks.register<GetVersionTask>("getVersion") {
 }

 // You can still set these for legacy use by submodules or scripts:
-rootProject.ext.set("appVersionName", providers.gradleProperty("APP_VERSION_NAME").orElse("1.4.5").get())
-rootProject.ext.set("appVersionCode", providers.gradleProperty("APP_VERSION_CODE").orElse("285").get().toInt())
+rootProject.ext.set("appVersionName", providers.gradleProperty("APP_VERSION_NAME").orElse("1.5.3").get())
+rootProject.ext.set("appVersionCode", providers.gradleProperty("APP_VERSION_CODE").orElse("298").get().toInt())
 rootProject.ext.set("applicationId", "me.eternal.purrfectsnap")
 // buildHash: when PurrfectSnap or Snapchat is updated, mappings become outdated and auto-regenerate.
 // Include version code so each release has a different hash; use random for uniqueness within same version.
--- a/changelogs-stable.txt
+++ b/changelogs-stable.txt
@@ -1,3 +1,36 @@
+## v1.5.3
+- New: Mark as Seen Mode(Limit per run[Custom] or Complete Queue)
+- Fix: PurrfectSnap crash if you try to open any dialog setting through in-app overlay
+- New: Translucent Dialogs & refreshed animation
+- Fix: Adjusted Snap Preview Location
+
+## v1.5.2
+- New: Continuous snap sender feature!
+- Fix: Snap send failure for E2E Chats
+
+## v1.5.1
+- Fix: Splitting issue for video snaps sent through gallery media send override!
+- New: Toggle to turn off/on splitting for video snaps sent through send override
+- Fix: Aphelion task page layout optimization(tq to Kaladin)
+
+## v1.5.0
+- Fix: Skip when marking as seen for newer versions of Snapchat
+- New: Hide Conversation Toolbox UI
+
+## v1.4.9
+- Fix: Force AMOLED Theme for newer versions of Snapchat
+- New: Redesign some dialogs(Call confirmation & Mark Snaps as seen)
+
+## v1.4.8
+- Fix: Crash Issues for some devices
+- Fix: Crash when using the theme button in android 11 & 12(tq to Kaladin) 
+- Fix: Both side call recording for newer versions of snapchat
+- Fix: Missing Accept Key button for E2E Encryption for newer versions of snapchat
+
+## v1.4.6
+- Fix: Half Swipe Notifications for newer versions of snapchat
+- Fix: No Config import/export button if Aphelion theme is turned off
+
 ## v1.4.5
 - New: Spoof Snap Score Locally(tq to RSR)
 - New: Video Recording Timer(tq to RSR)
--- a/common/src/main/assets/lang/en_UK.json
+++ b/common/src/main/assets/lang/en_UK.json
@@ -1190,6 +1190,14 @@
                        "name": "Mark Snap as Seen Button",
                        "description": "Adds a button to mark a Snap as seen when viewing it.\nThis will work even when Stealth Mode is enabled"
                    },
+                    "mark_snap_as_seen_processing_mode": {
+                        "name": "Mark Snaps as Seen Mode",
+                        "description": "Choose whether to process a limited number of snaps per run or the entire queue at once"
+                    },
+                    "mark_snap_as_seen_limit": {
+                        "name": "Mark Snaps as Seen Limit",
+                        "description": "How many snaps to process per run when the mode is set to limit"
+                    },
                    "skip_when_marking_as_seen": {
                        "name": "Skip When Marking as Seen",
                        "description": "Automatically skips to the next Snap when marking a Snap as seen.\nUse in combination with Mark Snap as Seen Button"
@@ -3639,4 +3647,4 @@
        "openai": "OpenAI",
        "openrouter": "OpenRouter"
    }
-}
+}
--- a/common/src/main/assets/lang/en_US.json
+++ b/common/src/main/assets/lang/en_US.json
@@ -1254,6 +1254,14 @@
                        "name": "Mark Snap as Seen Button",
                        "description": "Adds a button to mark a Snap as seen when viewing it.\nThis will work even when Stealth Mode is enabled"
                    },
+                    "mark_snap_as_seen_processing_mode": {
+                        "name": "Mark Snaps as Seen Mode",
+                        "description": "Choose whether to process a limited number of snaps per run or the entire queue at once"
+                    },
+                    "mark_snap_as_seen_limit": {
+                        "name": "Mark Snaps as Seen Limit",
+                        "description": "How many snaps to process per run when the mode is set to limit"
+                    },
                    "skip_when_marking_as_seen": {
                        "name": "Skip When Marking as Seen",
                        "description": "Automatically skips to the next Snap when marking a Snap as seen.\nUse in combination with Mark Snap as Seen Button"
@@ -2190,6 +2198,10 @@
                            "force_message_encryption": {
                                "name": "Force Message Encryption",
                                "description": "Prevents sending encrypted messages to people who don't have E2E Encryption enabled only when multiple conversations are selected"
+                            },
+                            "hide_conversation_toolbox_ui": {
+                                "name": "Hide Conversation Toolbox UI",
+                                "description": "Hides the PurrfectSnap conversation toolbox button that appears in Snapchat when End-To-End Encryption is enabled"
                            }
                        }
                    },
@@ -2510,6 +2522,10 @@
                "remove_audio_note_duration": "Remove Audio Note Duration",
                "remove_audio_note_transcript_capability": "Remove Audio Note Transcript Capability"
            },
+            "mark_snap_as_seen_processing_mode": {
+                "limit": "Limit Per Run",
+                "complete": "Complete Queue"
+            },
            "hide_ui_components": {
                "hide_profile_call_buttons": "Remove Profile Call Buttons",
                "hide_chat_call_buttons": "Remove Chat Call Buttons",
@@ -3323,6 +3339,13 @@
        "title": "Send media as",
        "duration": "Duration: {duration}",
        "saveable_snap_hint": "Make Snap saveable in the chat",
+        "single_send_hint": "Send as one snap",
+        "continuous_send_toggle": "Continuous snap sender",
+        "continuous_send_count_label": "Send count",
+        "continuous_send_count_placeholder": "Enter number of sends",
+        "continuous_send_hint": "This will send the same snap to the same recipient multiple times.",
+        "continuous_send_invalid_count": "Enter a valid send count greater than 0",
+        "continuous_send_single_send_conflict": "Continuous sending is not available while 'Send as one snap' is enabled for split media.",
        "unlimited_duration": "Unlimited",
        "schedule": "Schedule",
        "select_time": "Select time",
@@ -3426,10 +3449,10 @@
        "search": {
            "placeholder": "Search"
        },
-        "filters": {
-            "newest_first": "Newest first",
-            "pick_a_date": "Pick a date",
-            "title": "Filters",
+    "filters": {
+        "newest_first": "Newest first",
+        "pick_a_date": "Pick a date",
+        "title": "Filters",
            "search_by": "Search by",
            "since": "Since",
            "until": "Until",
@@ -3444,7 +3467,7 @@
                "started_typing": "Started typing",
                "stopped_typing": "Stopped typing",
                "started_speaking": "Started speaking",
-                "stopped_speaking": "Stopped speaking",
+            "stopped_speaking": "Stopped speaking",
                "started_peeking": "Started peeking",
                "stopped_peeking": "Stopped peeking",
                "message_read": "Read message",
--- a/common/src/main/kotlin/me/eternal/purrfectsnap/common/config/impl/Experimental.kt
+++ b/common/src/main/kotlin/me/eternal/purrfectsnap/common/config/impl/Experimental.kt
@@ -51,6 +51,7 @@ class Experimental : ConfigContainer() {
    class E2EEConfig : ConfigContainer(hasGlobalState = true) {
        val encryptedMessageIndicator = boolean("encrypted_message_indicator")
        val forceMessageEncryption = boolean("force_message_encryption")
+        val hideConversationToolboxUi = boolean("hide_conversation_toolbox_ui")
    }

    class AccountSwitcherConfig : ConfigContainer(hasGlobalState = true) {
--- a/common/src/main/kotlin/me/eternal/purrfectsnap/common/config/impl/MessagingTweaks.kt
+++ b/common/src/main/kotlin/me/eternal/purrfectsnap/common/config/impl/MessagingTweaks.kt
@@ -205,6 +205,12 @@ class MessagingTweaks : ConfigContainer() {
    val unlimitedSnapViewTime = boolean("unlimited_snap_view_time")
    val autoMarkAsRead = multiple("auto_mark_as_read", "snap_reply", "conversation_read", "save_snap_in_chat") { requireRestart() }
    val markSnapAsSeenButton = boolean("mark_snap_as_seen_button") { requireRestart() }
+    val markSnapAsSeenProcessingMode = unique("mark_snap_as_seen_processing_mode", "limit", "complete").apply {
+        set("limit")
+    }
+    val markSnapAsSeenLimit = integer("mark_snap_as_seen_limit", defaultValue = 50) {
+        inputCheck = { it.toIntOrNull()?.coerceAtLeast(1) != null }
+    }
    val skipWhenMarkingAsSeen = boolean("skip_when_marking_as_seen") { requireRestart() }
    val loopMediaPlayback = boolean("loop_media_playback") { requireRestart() }
    val disableReplayInFF = boolean("disable_replay_in_ff")
--- a/core/src/main/kotlin/me/eternal/purrfectsnap/core/features/impl/downloader/CallRecorder.kt
+++ b/core/src/main/kotlin/me/eternal/purrfectsnap/core/features/impl/downloader/CallRecorder.kt
@@ -6,8 +6,13 @@ import android.media.AudioFormat
 import android.media.AudioRecord
 import android.media.AudioTrack
 import android.media.MediaRecorder
+import android.media.audiofx.AcousticEchoCanceler
+import android.media.audiofx.NoiseSuppressor
 import android.os.ParcelFileDescriptor
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
 import kotlinx.coroutines.delay
+import kotlinx.coroutines.isActive
 import kotlinx.coroutines.launch
 import me.eternal.purrfectsnap.core.ui.InAppOverlay
 import me.eternal.purrfectsnap.bridge.call.CallDownloadSession
@@ -26,12 +31,21 @@ class CallRecorder : Feature("Call Recorder") {
    private var wasInCall = false
    private var callDownloadSession: CallDownloadSession? = null
    private val streams = ConcurrentHashMap<Int, CallStreamWrapper>()
+    private val activeRemoteStreams = ConcurrentHashMap.newKeySet<Int>()
+    private var fallbackMicRecord: AudioRecord? = null
+    private var fallbackMicJob: Job? = null
+    private var fallbackMicStartupJob: Job? = null
+    private var pendingCallEndJob: Job? = null
+    private var lastRemoteActivityTimestamp = 0L
+    private var selfSideStreamOpened = false

    private val uiState get() = context.inAppOverlay.callRecorderState
    private val callRecorderConfig get() = context.config.downloader.callRecorder

    inner class CallStreamWrapper(
        private val audioFormat: AudioFormat,
+        private val sourceLabel: String = "unknown",
+        private val onStreamOpened: (() -> Unit)? = null,
        private val startTimestamp: Long = System.currentTimeMillis(),
    ) {
        private var stream: OutputStream? = null
@@ -49,6 +63,11 @@ class CallRecorder : Feature("Call Recorder") {
                            audioFormat.encoding
                        ) ?: return
                    )
+                    context.log.verbose(
+                        "Opened call stream source=$sourceLabel sampleRate=${audioFormat.sampleRate} channels=${audioFormat.channelCount} encoding=${audioFormat.encoding}",
+                        "CallRecorder"
+                    )
+                    onStreamOpened?.invoke()
                }
            }
            runCatching { stream?.write(buffer) }
@@ -63,6 +82,9 @@ class CallRecorder : Feature("Call Recorder") {
    private fun finalizeSession() {
        val session = callDownloadSession ?: return
        context.log.verbose("Finalizing call recording session")
+        pendingCallEndJob?.cancel()
+        pendingCallEndJob = null
+        stopFallbackMicCapture("finalizeSession")
        runCatching { session.end() }
        callDownloadSession = null
        streams.values.forEach { it.close() }
@@ -80,12 +102,14 @@ class CallRecorder : Feature("Call Recorder") {
            }
            
            ensureSessionStarted()
+            scheduleFallbackMicCapture()
        }
    }
    
    private fun stopRecording() {
        if (uiState.isRecording) {
            uiState.isRecording = false
+            stopFallbackMicCapture("stopRecording")
            finalizeSession()
        }
    }
@@ -93,6 +117,11 @@ class CallRecorder : Feature("Call Recorder") {
    private fun onCallStarted(conversationId: String) {
        if (wasInCall) return
        wasInCall = true
+        activeRemoteStreams.clear()
+        lastRemoteActivityTimestamp = 0L
+        pendingCallEndJob?.cancel()
+        pendingCallEndJob = null
+        selfSideStreamOpened = false
        
        val author = (if (context.database.getConversationType(conversationId) == 1) {
            context.database.getFeedEntryByConversationId(conversationId)?.feedDisplayName
@@ -120,6 +149,11 @@ class CallRecorder : Feature("Call Recorder") {
    private fun onCallEnded() {
        context.log.verbose("onCallEnded cleanup. wasInCall=$wasInCall, showOverlay=${uiState.showOverlay}")
        wasInCall = false
+        activeRemoteStreams.clear()
+        lastRemoteActivityTimestamp = 0L
+        pendingCallEndJob?.cancel()
+        pendingCallEndJob = null
+        stopFallbackMicCapture("onCallEnded")
        finalizeSession()
        streams.clear()
        
@@ -178,6 +212,36 @@ class CallRecorder : Feature("Call Recorder") {
        }
    }

+    private fun markRemoteStreamActive(streamId: Int, reason: String) {
+        lastRemoteActivityTimestamp = System.currentTimeMillis()
+        pendingCallEndJob?.cancel()
+        pendingCallEndJob = null
+        if (activeRemoteStreams.add(streamId)) {
+            context.log.verbose("Remote stream active id=$streamId reason=$reason", "CallRecorder")
+        }
+    }
+
+    private fun markRemoteStreamInactive(streamId: Int, reason: String) {
+        if (activeRemoteStreams.remove(streamId)) {
+            context.log.verbose("Remote stream inactive id=$streamId reason=$reason", "CallRecorder")
+        }
+        scheduleCallEndCheck(reason)
+    }
+
+    private fun scheduleCallEndCheck(reason: String, delayMs: Long = 1500L) {
+        if (!wasInCall || lastRemoteActivityTimestamp == 0L || activeRemoteStreams.isNotEmpty()) return
+        pendingCallEndJob?.cancel()
+        pendingCallEndJob = context.coroutineScope.launch {
+            delay(delayMs)
+            if (!wasInCall) return@launch
+            if (activeRemoteStreams.isNotEmpty()) return@launch
+            val idleFor = System.currentTimeMillis() - lastRemoteActivityTimestamp
+            if (idleFor < delayMs) return@launch
+            context.log.verbose("Call end detected via remote inactivity reason=$reason idleFor=${idleFor}ms", "CallRecorder")
+            onCallEnded()
+        }
+    }
+
    private fun ensureSessionStarted() {
        if (callDownloadSession != null) return
        val conversationId = context.feature(Messaging::class).openedConversationUUID?.toString()
@@ -186,6 +250,209 @@ class CallRecorder : Feature("Call Recorder") {
        onCallStarted(conversationId)
    }

+    private fun isCallContextActive(): Boolean {
+        return wasInCall || uiState.showOverlay || uiState.isRecording
+    }
+
+    private fun isDirectVoiceCaptureSource(audioSource: Int?): Boolean {
+        return audioSource == MediaRecorder.AudioSource.VOICE_COMMUNICATION ||
+            audioSource == MediaRecorder.AudioSource.VOICE_CALL ||
+            audioSource == MediaRecorder.AudioSource.VOICE_UPLINK
+    }
+
+    private fun isLikelyCallMicSource(audioSource: Int?): Boolean {
+        return audioSource == MediaRecorder.AudioSource.DEFAULT ||
+            audioSource == MediaRecorder.AudioSource.MIC ||
+            audioSource == MediaRecorder.AudioSource.VOICE_RECOGNITION ||
+            audioSource == MediaRecorder.AudioSource.UNPROCESSED ||
+            audioSource == MediaRecorder.AudioSource.VOICE_PERFORMANCE
+    }
+
+    private fun registerAudioRecordStream(audioRecord: AudioRecord, reason: String): CallStreamWrapper? {
+        val streamId = audioRecord.hashCode()
+        streams[streamId]?.let { return it }
+
+        val audioSource = runCatching { audioRecord.audioSource }.getOrNull()
+        val shouldCapture = isDirectVoiceCaptureSource(audioSource) ||
+            (isCallContextActive() && isLikelyCallMicSource(audioSource))
+        if (!shouldCapture) return null
+
+        val format = runCatching { audioRecord.format }.getOrNull() ?: return null
+        if (format.sampleRate <= 0 || format.channelCount <= 0) return null
+
+        return CallStreamWrapper(
+            audioFormat = format,
+            sourceLabel = "self-internal:$reason",
+            onStreamOpened = {
+                selfSideStreamOpened = true
+                if (audioRecord !== fallbackMicRecord) {
+                    stopFallbackMicCapture("internalSelfStreamOpened")
+                }
+            }
+        ).also {
+            streams[streamId] = it
+            context.log.verbose(
+                "Registered AudioRecord stream source=$audioSource reason=$reason sampleRate=${format.sampleRate} channels=${format.channelCount}",
+                "CallRecorder"
+            )
+            if (isDirectVoiceCaptureSource(audioSource) || isCallContextActive()) {
+                ensureSessionStarted()
+            }
+        }
+    }
+
+    private fun shouldCaptureSelfSide(): Boolean {
+        return callRecorderConfig.callRecorder.get() != "only_record_others"
+    }
+
+    private fun scheduleFallbackMicCapture() {
+        if (!shouldCaptureSelfSide() || selfSideStreamOpened || fallbackMicJob != null) return
+        fallbackMicStartupJob?.cancel()
+        fallbackMicStartupJob = context.coroutineScope.launch {
+            delay(1200)
+            if (!isActive || !uiState.isRecording || selfSideStreamOpened || fallbackMicJob != null) return@launch
+            startFallbackMicCapture()
+        }
+    }
+
+    private fun startFallbackMicCapture() {
+        if (!shouldCaptureSelfSide() || selfSideStreamOpened || fallbackMicJob != null || !uiState.isRecording) return
+
+        val sampleRate = 48_000
+        val channelMask = AudioFormat.CHANNEL_IN_MONO
+        val encoding = AudioFormat.ENCODING_PCM_16BIT
+        val minBufferSize = AudioRecord.getMinBufferSize(sampleRate, channelMask, encoding)
+        if (minBufferSize <= 0) {
+            context.log.warn("Fallback mic capture unavailable: invalid min buffer size $minBufferSize", "CallRecorder")
+            return
+        }
+
+        val audioFormat = AudioFormat.Builder()
+            .setSampleRate(sampleRate)
+            .setChannelMask(channelMask)
+            .setEncoding(encoding)
+            .build()
+
+        val audioRecord = runCatching {
+            AudioRecord.Builder()
+                .setAudioSource(MediaRecorder.AudioSource.MIC)
+                .setAudioFormat(audioFormat)
+                .setBufferSizeInBytes(minBufferSize * 2)
+                .build()
+        }.getOrElse {
+            context.log.error("Failed to create fallback mic recorder", it)
+            return
+        }
+
+        if (audioRecord.state != AudioRecord.STATE_INITIALIZED) {
+            context.log.warn("Fallback mic recorder failed to initialize", "CallRecorder")
+            runCatching { audioRecord.release() }
+            return
+        }
+
+        fallbackMicRecord = audioRecord
+        context.log.verbose("Starting fallback mic capture", "CallRecorder")
+
+        fallbackMicJob = context.coroutineScope.launch(Dispatchers.IO) {
+            val buffer = ByteArray(minBufferSize.coerceAtLeast(2048))
+            val fallbackWrapper = CallStreamWrapper(
+                audioFormat = audioFormat,
+                sourceLabel = "self-fallback",
+                onStreamOpened = {
+                    selfSideStreamOpened = true
+                }
+            )
+            val echoCanceler = AcousticEchoCanceler.create(audioRecord.audioSessionId)?.apply {
+                enabled = true
+            }
+            val noiseSuppressor = NoiseSuppressor.create(audioRecord.audioSessionId)?.apply {
+                enabled = true
+            }
+
+            try {
+                audioRecord.startRecording()
+                while (isActive && uiState.isRecording && isCallContextActive() && fallbackMicRecord === audioRecord) {
+                    val bytesRead = runCatching {
+                        audioRecord.read(buffer, 0, buffer.size, AudioRecord.READ_BLOCKING)
+                    }.getOrElse {
+                        context.log.error("Fallback mic read failed", it)
+                        break
+                    }
+
+                    if (bytesRead > 0) {
+                        fallbackWrapper.write(buffer.copyOf(bytesRead))
+                    } else {
+                        delay(10)
+                    }
+                }
+            } catch (e: Exception) {
+                context.log.error("Fallback mic capture crashed", e)
+            } finally {
+                fallbackWrapper.close()
+                runCatching { audioRecord.stop() }
+                echoCanceler?.release()
+                noiseSuppressor?.release()
+                runCatching { audioRecord.release() }
+                if (fallbackMicRecord === audioRecord) {
+                    fallbackMicRecord = null
+                    fallbackMicJob = null
+                }
+                context.log.verbose("Stopped fallback mic capture", "CallRecorder")
+            }
+        }
+    }
+
+    private fun stopFallbackMicCapture(reason: String) {
+        fallbackMicStartupJob?.cancel()
+        fallbackMicStartupJob = null
+        if (fallbackMicJob != null || fallbackMicRecord != null) {
+            context.log.verbose("Stopping fallback mic capture reason=$reason", "CallRecorder")
+        }
+        fallbackMicJob?.cancel()
+        fallbackMicJob = null
+        fallbackMicRecord?.let { record ->
+            runCatching { record.stop() }
+            runCatching { record.release() }
+        }
+        fallbackMicRecord = null
+    }
+
+    private fun isVoiceCommunicationTrack(attributes: AudioAttributes?, streamType: Int?): Boolean {
+        return attributes?.usage == AudioAttributes.USAGE_VOICE_COMMUNICATION ||
+            streamType == AudioManager.STREAM_VOICE_CALL ||
+            streamType == 6
+    }
+
+    private fun registerAudioTrackStream(audioTrack: AudioTrack, reason: String): CallStreamWrapper? {
+        val streamId = audioTrack.hashCode()
+        streams[streamId]?.let { return it }
+
+        val attributes = runCatching { audioTrack.audioAttributes }.getOrNull()
+        val streamType = runCatching { audioTrack.streamType }.getOrNull()
+        val isVoiceCommunication = isVoiceCommunicationTrack(attributes, streamType)
+        val shouldCapture = isVoiceCommunication ||
+            (isCallContextActive() && attributes?.usage == AudioAttributes.USAGE_UNKNOWN)
+        if (!shouldCapture) return null
+
+        val format = runCatching { audioTrack.format }.getOrNull() ?: return null
+        if (format.sampleRate <= 0 || format.channelCount <= 0) return null
+
+        return CallStreamWrapper(
+            audioFormat = format,
+            sourceLabel = "remote:$reason"
+        ).also {
+            streams[streamId] = it
+            markRemoteStreamActive(streamId, "register:$reason")
+            context.log.verbose(
+                "Registered AudioTrack stream streamType=$streamType usage=${attributes?.usage} reason=$reason sampleRate=${format.sampleRate} channels=${format.channelCount}",
+                "CallRecorder"
+            )
+            if (isVoiceCommunication || isCallContextActive()) {
+                ensureSessionStarted()
+            }
+        }
+    }
+
    private fun clampCopyRange(offset: Int, requestedLength: Int, maxLength: Int): Pair<Int, Int>? {
        if (requestedLength <= 0 || maxLength <= 0) return null
        val safeOffset = offset.coerceAtLeast(0).coerceAtMost(maxLength)
@@ -209,6 +476,13 @@ class CallRecorder : Feature("Call Recorder") {
        }
    }

+    private fun copyFloatArrayToByteArray(data: FloatArray, offset: Int, sampleCount: Int): ByteArray? {
+        val (safeOffset, safeLength) = clampCopyRange(offset, sampleCount, data.size) ?: return null
+        return ByteArray(safeLength * Float.SIZE_BYTES).also {
+            ByteBuffer.wrap(it).order(ByteOrder.LITTLE_ENDIAN).asFloatBuffer().put(data, safeOffset, safeLength)
+        }
+    }
+
    override fun init() {
        if (callRecorderConfig.callRecorder.getNullable() == null) return
        
@@ -224,30 +498,16 @@ class CallRecorder : Feature("Call Recorder") {
        AudioRecord::class.java.apply {
            if (recorderConfig == "only_record_others") return@apply
            hookConstructor(HookStage.AFTER) { param ->
-                val attributes = runCatching { param.arg<AudioAttributes>(0) }.getOrNull()
-                val audioSource = runCatching { param.arg<Int>(0) }.getOrNull()
-                val isVoiceCommunication = attributes?.usage == AudioAttributes.USAGE_VOICE_COMMUNICATION ||
-                    audioSource == MediaRecorder.AudioSource.VOICE_COMMUNICATION
-                val shouldCapture = isVoiceCommunication ||
-                    (wasInCall && attributes?.usage == AudioAttributes.USAGE_UNKNOWN)
-
-                if (shouldCapture) {
-                    val format = AudioFormat.Builder()
-                        .setSampleRate(if (attributes != null) param.arg<AudioFormat>(1).sampleRate else param.arg(1))
-                        .setChannelMask(if (attributes != null) param.arg<AudioFormat>(1).channelMask else param.arg(2))
-                        .setEncoding(if (attributes != null) param.arg<AudioFormat>(1).encoding else param.arg(3))
-                        .build()
-                    streams[param.thisObject<Any>().hashCode()] = CallStreamWrapper(format)
-                    if (isVoiceCommunication) {
-                        ensureSessionStarted()
-                    }
-                }
+                registerAudioRecordStream(param.thisObject<AudioRecord>(), "constructor")
            }

            hook("read", HookStage.AFTER) { param ->
                val result = param.getResult() as? Int ?: 0
                if (result <= 0) return@hook
-                val wrapper = streams[param.thisObject<Any>().hashCode()] ?: return@hook
+                val audioRecord = param.thisObject<AudioRecord>()
+                val wrapper = streams[param.thisObject<Any>().hashCode()]
+                    ?: registerAudioRecordStream(audioRecord, "read")
+                    ?: return@hook
                
                val buffer = when (val data = param.arg<Any>(0)) {
                    is ByteBuffer -> copyAudioRecordByteBuffer(data, result) ?: return@hook
@@ -263,11 +523,19 @@ class CallRecorder : Feature("Call Recorder") {
                            ByteBuffer.wrap(it).order(ByteOrder.LITTLE_ENDIAN).asShortBuffer().put(data, safeOffset, safeLength)
                        }
                    }
+                    is FloatArray -> {
+                        val offset = param.argNullable<Int>(1) ?: 0
+                        copyFloatArrayToByteArray(data, offset, result) ?: return@hook
+                    }
                    else -> return@hook
                }
                wrapper.write(buffer)
            }

+            hook("startRecording", HookStage.AFTER) {
+                registerAudioRecordStream(it.thisObject<AudioRecord>(), "startRecording")
+            }
+
            hook("stop", HookStage.BEFORE) { checkStreamsAndCleanup() }
            hook("release", HookStage.BEFORE) { 
                streams.remove(it.thisObject<Any>().hashCode())?.close()
@@ -278,29 +546,15 @@ class CallRecorder : Feature("Call Recorder") {
        AudioTrack::class.java.apply {
            if (recorderConfig == "only_record_self") return@apply
            hookConstructor(HookStage.AFTER) { param ->
-                val attributes = runCatching { param.arg<AudioAttributes>(0) }.getOrNull()
-                val streamType = runCatching { param.arg<Int>(0) }.getOrNull()
-                val isVoiceCommunication = attributes?.usage == AudioAttributes.USAGE_VOICE_COMMUNICATION ||
-                    streamType == AudioManager.STREAM_VOICE_CALL ||
-                    streamType == 6
-                val shouldCapture = isVoiceCommunication ||
-                    (wasInCall && attributes?.usage == AudioAttributes.USAGE_UNKNOWN)
-
-                if (shouldCapture) {
-                    val format = AudioFormat.Builder()
-                        .setSampleRate(if (attributes != null) param.arg<AudioFormat>(1).sampleRate else param.arg(1))
-                        .setChannelMask(if (attributes != null) param.arg<AudioFormat>(1).channelMask else param.arg(2))
-                        .setEncoding(if (attributes != null) param.arg<AudioFormat>(1).encoding else param.arg(3))
-                        .build()
-                    streams[param.thisObject<Any>().hashCode()] = CallStreamWrapper(format)
-                    if (isVoiceCommunication) {
-                        ensureSessionStarted()
-                    }
-                }
+                registerAudioTrackStream(param.thisObject<AudioTrack>(), "constructor")
            }

            hook("write", HookStage.BEFORE) { param ->
-                val wrapper = streams[param.thisObject<Any>().hashCode()] ?: return@hook
+                val streamId = param.thisObject<Any>().hashCode()
+                markRemoteStreamActive(streamId, "write")
+                val wrapper = streams[streamId]
+                    ?: registerAudioTrackStream(param.thisObject<AudioTrack>(), "write")
+                    ?: return@hook
                val data = param.arg<Any>(0)

                val buffer = when (data) {
@@ -328,13 +582,34 @@ class CallRecorder : Feature("Call Recorder") {
                            ByteBuffer.wrap(it).order(ByteOrder.LITTLE_ENDIAN).asShortBuffer().put(data, safeOffset, safeLength)
                        }
                    }
+                    is FloatArray -> {
+                        val offset = param.argNullable<Int>(1) ?: 0
+                        val requestedSize = param.argNullable<Int>(2) ?: data.size
+                        copyFloatArrayToByteArray(data, offset, requestedSize) ?: return@hook
+                    }
                    else -> return@hook
                }
                wrapper.write(buffer)
            }

-            hook("stop", HookStage.BEFORE) { checkStreamsAndCleanup() }
+            hook("play", HookStage.AFTER) {
+                val audioTrack = it.thisObject<AudioTrack>()
+                markRemoteStreamActive(audioTrack.hashCode(), "play")
+                registerAudioTrackStream(audioTrack, "play")
+            }
+
+            hook("stop", HookStage.AFTER) {
+                markRemoteStreamInactive(it.thisObject<Any>().hashCode(), "stop")
+                checkStreamsAndCleanup()
+            }
+            hook("pause", HookStage.AFTER) {
+                markRemoteStreamInactive(it.thisObject<Any>().hashCode(), "pause")
+            }
+            hook("flush", HookStage.AFTER) {
+                markRemoteStreamInactive(it.thisObject<Any>().hashCode(), "flush")
+            }
            hook("release", HookStage.BEFORE) { 
+                markRemoteStreamInactive(it.thisObject<Any>().hashCode(), "release")
                streams.remove(it.thisObject<Any>().hashCode())?.close()
                checkStreamsAndCleanup()
            }
--- a/core/src/main/kotlin/me/eternal/purrfectsnap/core/features/impl/experiments/EndToEndEncryption.kt
+++ b/core/src/main/kotlin/me/eternal/purrfectsnap/core/features/impl/experiments/EndToEndEncryption.kt
@@ -8,13 +8,20 @@ import android.graphics.drawable.shapes.Shape
 import android.view.View
 import android.view.ViewGroup
 import android.widget.LinearLayout
+import androidx.compose.foundation.background
+import androidx.compose.foundation.border
 import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.Button
-import androidx.compose.material3.Card
 import androidx.compose.material3.Text
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.Brush
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.sp
 import androidx.compose.ui.unit.dp
 import me.eternal.purrfectsnap.common.data.ContentType
 import me.eternal.purrfectsnap.common.data.MessageState
@@ -29,9 +36,10 @@ import me.eternal.purrfectsnap.common.util.protobuf.ProtoWriter
 import me.eternal.purrfectsnap.core.event.events.impl.*
 import me.eternal.purrfectsnap.core.features.MessagingRuleFeature
 import me.eternal.purrfectsnap.core.features.impl.ui.ConversationToolbox
+import me.eternal.purrfectsnap.core.ui.PurrfectOverlayPalette
+import me.eternal.purrfectsnap.core.ui.PurrfectOverlayTheme
 import me.eternal.purrfectsnap.core.ui.ViewAppearanceHelper
 import me.eternal.purrfectsnap.core.ui.addForegroundDrawable
-import me.eternal.purrfectsnap.core.ui.findParent
 import me.eternal.purrfectsnap.core.ui.removeForegroundDrawable
 import me.eternal.purrfectsnap.core.util.EvictingMap
 import me.eternal.purrfectsnap.core.util.hook.HookStage
@@ -185,6 +193,16 @@ class EndToEndEncryption : MessagingRuleFeature(
        }
    }

+    private fun resolveKeyActionContainer(startView: View): ViewGroup? {
+        val ancestors = generateSequence(startView) { current ->
+            current.parent as? View
+        }.filterIsInstance<ViewGroup>().toList()
+
+        return ancestors.firstOrNull { candidate ->
+            candidate is LinearLayout && candidate.orientation == LinearLayout.VERTICAL
+        } ?: ancestors.firstOrNull()
+    }
+
    @SuppressLint("SetTextI18n", "DiscouragedApi")
    override fun init() {
        if (!isEnabled) return
@@ -231,30 +249,34 @@ class EndToEndEncryption : MessagingRuleFeature(
        }

        onNextActivityCreate(defer = true) {
-            context.feature(ConversationToolbox::class).addComposable(translation["confirmation_dialogs.title"], filter = {
-                context.database.getDMOtherParticipant(it) != null
-            }) { dialog, conversationId ->
-                val friendId = remember {
-                    context.database.getDMOtherParticipant(conversationId)
-                } ?: return@addComposable
-                val fingerprint = remember {
-                    runCatching {
-                        e2eeInterface.getSecretFingerprint(friendId)
-                    }.getOrNull()
-                }
-                if (fingerprint != null) {
-                    Text(translation.format("toolbox.shared_key_fingerprint", "fingerprint" to fingerprint))
-                } else {
-                    Text(translation["toolbox.no_shared_key"])
-                }
-                Spacer(modifier = Modifier.height(10.dp))
-                Button(onClick = {
-                    dialog.dismiss()
-                    warnKeyOverwrite(friendId) {
-                        askForKeys(conversationId)
+            val hideConversationToolboxUi by context.config.experimental.e2eEncryption.hideConversationToolboxUi
+
+            if (!hideConversationToolboxUi) {
+                context.feature(ConversationToolbox::class).addComposable(translation["confirmation_dialogs.title"], filter = {
+                    context.database.getDMOtherParticipant(it) != null
+                }) { dialog, conversationId ->
+                    val friendId = remember {
+                        context.database.getDMOtherParticipant(conversationId)
+                    } ?: return@addComposable
+                    val fingerprint = remember {
+                        runCatching {
+                            e2eeInterface.getSecretFingerprint(friendId)
+                        }.getOrNull()
+                    }
+                    if (fingerprint != null) {
+                        Text(translation.format("toolbox.shared_key_fingerprint", "fingerprint" to fingerprint))
+                    } else {
+                        Text(translation["toolbox.no_shared_key"])
+                    }
+                    Spacer(modifier = Modifier.height(10.dp))
+                    Button(onClick = {
+                        dialog.dismiss()
+                        warnKeyOverwrite(friendId) {
+                            askForKeys(conversationId)
+                        }
+                    }) {
+                        Text(translation["toolbox.initiate_exchange_button"])
                    }
-                }) {
-                    Text(translation["toolbox.initiate_exchange_button"])
                }
            }

@@ -264,9 +286,7 @@ class EndToEndEncryption : MessagingRuleFeature(

            context.event.subscribe(BindViewEvent::class) { event ->
                event.chatMessage { conversationId, messageId ->
-                    val viewGroup = event.view.findParent(maxIteration = 3) {
-                        it is LinearLayout
-                    } as? ViewGroup ?: event.view.parent as? ViewGroup ?: return@chatMessage
+                    val viewGroup = resolveKeyActionContainer(event.view) ?: return@chatMessage

                    viewGroup.findViewWithTag<View>(specialCard)?.also {
                        viewGroup.removeView(it)
@@ -289,27 +309,45 @@ class EndToEndEncryption : MessagingRuleFeature(
                    val publicKey = pkRequests[messageId.toLong()]

                    if (publicKey != null || secret != null) {
-                        viewGroup.addView(createComposeView(context.mainActivity!!) {
-                            Card(
-                                modifier = Modifier.fillMaxWidth().padding(8.dp),
-                                onClick = {
-                                    if (publicKey != null) {
-                                        handlePublicKeyRequest(conversationId, publicKey)
-                                    }
-                                    if (secret != null) {
-                                        handleSecretResponse(conversationId, secret)
-                                    }
-                                }
-                            ) {
+                        createComposeView(viewGroup.context) {
+                            PurrfectOverlayTheme {
+                                val actionShape = RoundedCornerShape(22.dp)
+                                val borderBrush = Brush.linearGradient(
+                                    listOf(
+                                        PurrfectOverlayPalette.glowPrimary.copy(alpha = 0.70f),
+                                        PurrfectOverlayPalette.glowSecondary.copy(alpha = 0.55f),
+                                    )
+                                )
+
                                Box(
-                                    modifier = Modifier.fillMaxWidth().padding(5.dp),
+                                    modifier = Modifier
+                                        .fillMaxWidth()
+                                        .padding(top = 10.dp, bottom = 6.dp),
                                    contentAlignment = Alignment.Center
                                ) {
-                                    if (publicKey != null) {
-                                        Text(translation["accept_public_key_button"])
-                                    }
-                                    if (secret != null) {
-                                        Text(translation["accept_secret_button"])
+                                    Box(
+                                        modifier = Modifier
+                                            .clip(actionShape)
+                                            .background(PurrfectOverlayPalette.cardOverlay, actionShape)
+                                            .border(1.15.dp, borderBrush, actionShape)
+                                            .padding(horizontal = 18.dp, vertical = 11.dp)
+                                    ) {
+                                        if (publicKey != null) {
+                                            Text(
+                                                text = translation["accept_public_key_button"],
+                                                color = PurrfectOverlayPalette.textPrimary,
+                                                fontSize = 15.sp,
+                                                fontWeight = FontWeight.SemiBold
+                                            )
+                                        }
+                                        if (secret != null) {
+                                            Text(
+                                                text = translation["accept_secret_button"],
+                                                color = PurrfectOverlayPalette.textPrimary,
+                                                fontSize = 15.sp,
+                                                fontWeight = FontWeight.SemiBold
+                                            )
+                                        }
                                    }
                                }
                            }
@@ -319,7 +357,16 @@ class EndToEndEncryption : MessagingRuleFeature(
                                ViewGroup.LayoutParams.MATCH_PARENT,
                                ViewGroup.LayoutParams.WRAP_CONTENT,
                            )
-                        })
+                            setOnClickListener {
+                                if (publicKey != null) {
+                                    handlePublicKeyRequest(conversationId, publicKey)
+                                }
+                                if (secret != null) {
+                                    handleSecretResponse(conversationId, secret)
+                                }
+                            }
+                            viewGroup.addView(this)
+                        }
                    }
                }
            }
@@ -353,6 +400,7 @@ class EndToEndEncryption : MessagingRuleFeature(
            context.event.subscribe(SendMessageWithContentEvent::class) { event ->
                val messageContent = event.messageContent
                val destinations = event.destinations
+                if (messageContent.contentType != ContentType.CHAT) return@subscribe

                val e2eeConversations = destinations.getEndToEndConversations().takeIf { it.isNotEmpty() } ?: return@subscribe

@@ -384,10 +432,6 @@ class EndToEndEncryption : MessagingRuleFeature(
                            context.longToast(translation["encryption_failed_toast"])
                        }
                    }
-
-                    if (event.messageContent.contentType == ContentType.SNAP) {
-                        event.messageContent.contentType = ContentType.EXTERNAL_MEDIA
-                    }
                }
            }

--- a/core/src/main/kotlin/me/eternal/purrfectsnap/core/features/impl/experiments/MediaFilePicker.kt
+++ b/core/src/main/kotlin/me/eternal/purrfectsnap/core/features/impl/experiments/MediaFilePicker.kt
@@ -2,12 +2,18 @@ package me.eternal.purrfectsnap.core.features.impl.experiments

 import android.annotation.SuppressLint
 import android.app.Activity
+import android.content.ContentUris
 import android.content.ContentResolver
+import android.content.ContentValues
 import android.content.Intent
 import android.database.Cursor
 import android.database.CursorWrapper
+import android.media.MediaExtractor
+import android.media.MediaFormat
 import android.media.MediaMetadataRetriever
+import android.media.MediaMuxer
 import android.net.Uri
+import android.os.Build
 import android.os.ParcelFileDescriptor
 import android.provider.MediaStore
 import android.webkit.MimeTypeMap
@@ -36,6 +42,7 @@ import androidx.compose.ui.draw.shadow
 import androidx.compose.ui.graphics.Brush
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.dp
+import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import me.eternal.purrfectsnap.common.data.FileType
 import me.eternal.purrfectsnap.common.ui.createComposeView
@@ -47,17 +54,308 @@ import me.eternal.purrfectsnap.core.features.Feature
 import me.eternal.purrfectsnap.core.ui.PurrfectOverlayPalette
 import me.eternal.purrfectsnap.core.ui.PurrfectOverlayTheme
 import me.eternal.purrfectsnap.core.util.dataBuilder
+import me.eternal.purrfectsnap.core.util.hook.Hooker
 import me.eternal.purrfectsnap.core.util.hook.HookStage
 import me.eternal.purrfectsnap.core.util.hook.hook
+import me.eternal.purrfectsnap.core.util.ktx.getObjectFieldOrNull
 import me.eternal.purrfectsnap.mapper.impl.ChatMediaDrawerMapper
+import java.io.File
 import java.io.InputStream
 import java.lang.reflect.Method
+import java.nio.ByteBuffer
 import kotlin.random.Random

 class MediaFilePicker : Feature("Media File Picker") {
+    companion object {
+        private const val SNAP_CHUNK_DURATION_MS = 10_000L
+        private val queuedSplitItems = ArrayDeque<Any>()
+        private val queuedSplitItemIds = ArrayDeque<String>()
+        private val queuedSplitCleanupUris = mutableMapOf<String, String>()
+        private var originalUnsplitItem: Any? = null
+        private var reusableOriginalItem: Any? = null
+        private var queuedOverrideType: String? = null
+        private var bypassSplitOnce = false
+        private var sendSingleItemHandler: ((Any) -> Boolean)? = null
+        private var cleanupItemHandler: ((String) -> Unit)? = null
+
+        fun hasQueuedSplitItems(): Boolean = queuedSplitItems.isNotEmpty()
+        fun hasPendingSplitCleanup(): Boolean = queuedSplitItemIds.isNotEmpty()
+        fun hasOriginalUnsplitItem(): Boolean = originalUnsplitItem != null
+        fun hasReusableOriginalItem(): Boolean = reusableOriginalItem != null
+        fun setQueuedOverrideType(value: String?) {
+            queuedOverrideType = value
+        }
+        fun getQueuedOverrideType(): String? = queuedOverrideType
+        fun clearQueuedSplitItems(deleteTempItems: Boolean = true) {
+            if (deleteTempItems) {
+                val cleanup = cleanupItemHandler
+                queuedSplitCleanupUris.values.toList().forEach { uri ->
+                    cleanup?.invoke(uri)
+                }
+            }
+            queuedSplitItems.clear()
+            queuedSplitItemIds.clear()
+            queuedSplitCleanupUris.clear()
+            originalUnsplitItem = null
+            queuedOverrideType = null
+        }
+        fun sendReusableOriginalItem(): Boolean {
+            val item = reusableOriginalItem ?: return false
+            bypassSplitOnce = true
+            val sender = sendSingleItemHandler ?: return false
+            return sender(item)
+        }
+        private fun queueSplitItems(items: List<Any>, preparedItems: List<PreparedMediaItem>, originalItem: Any?) {
+            clearQueuedSplitItems(deleteTempItems = false)
+            originalUnsplitItem = originalItem
+            items.drop(1).forEach { queuedSplitItems.addLast(it) }
+            preparedItems.forEach {
+                queuedSplitItemIds.addLast(it.itemId)
+                queuedSplitCleanupUris[it.itemId] = it.uri
+            }
+        }
+        fun sendOriginalUnsplitItem(): Boolean {
+            val item = originalUnsplitItem ?: return false
+            val overrideType = queuedOverrideType
+            clearQueuedSplitItems(deleteTempItems = true)
+            queuedOverrideType = overrideType
+            bypassSplitOnce = true
+            val sender = sendSingleItemHandler ?: return false
+            return sender(item)
+        }
+        fun handleCurrentQueuedItemSuccess(): Boolean {
+            queuedSplitItemIds.removeFirstOrNull()?.let { itemId ->
+                queuedSplitCleanupUris.remove(itemId)?.let { uri ->
+                    cleanupItemHandler?.invoke(uri)
+                }
+            }
+            if (queuedSplitItems.isEmpty()) {
+                queuedOverrideType = null
+                return false
+            }
+            val next = queuedSplitItems.removeFirstOrNull() ?: run {
+                queuedOverrideType = null
+                return false
+            }
+            val sender = sendSingleItemHandler ?: return false
+            val result = sender(next)
+            if (!result) {
+                queuedSplitItems.addFirst(next)
+            }
+            return result
+        }
+    }
+
    var lastMediaDuration: Long? = null
        private set

+    private data class PreparedMediaItem(
+        val itemId: String,
+        val durationMs: Long,
+        val uri: String
+    )
+
+    private fun splitVideoIntoChunks(
+        inputFile: File,
+        chunkDurationMs: Long = SNAP_CHUNK_DURATION_MS
+    ): List<File> {
+        val durationMs = extractMediaDuration(Uri.fromFile(inputFile)) ?: return emptyList()
+        if (durationMs <= chunkDurationMs) return listOf(inputFile)
+
+        val retriever = MediaMetadataRetriever()
+        val rotation = runCatching {
+            retriever.setDataSource(inputFile.absolutePath)
+            retriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_VIDEO_ROTATION)?.toIntOrNull() ?: 0
+        }.getOrDefault(0).also {
+            runCatching { retriever.release() }
+        }
+
+        val outputFiles = mutableListOf<File>()
+        var chunkStartMs = 0L
+        var chunkIndex = 0
+
+        while (chunkStartMs < durationMs) {
+            val chunkEndMs = minOf(chunkStartMs + chunkDurationMs, durationMs)
+            val outputFile = File.createTempFile("purrfectsnap_chunk_${chunkIndex}_", ".mp4", context.androidContext.cacheDir)
+            val extractor = MediaExtractor()
+            val muxer = MediaMuxer(outputFile.absolutePath, MediaMuxer.OutputFormat.MUXER_OUTPUT_MPEG_4)
+            val trackMap = mutableMapOf<Int, Int>()
+            val chunkStartUs = chunkStartMs * 1000
+            val chunkEndUs = chunkEndMs * 1000
+            var muxerStarted = false
+            var wroteAnySample = false
+
+            try {
+                extractor.setDataSource(inputFile.absolutePath)
+
+                repeat(extractor.trackCount) { trackIndex ->
+                    val format = extractor.getTrackFormat(trackIndex)
+                    val mime = format.getString(MediaFormat.KEY_MIME) ?: return@repeat
+                    if (!mime.startsWith("video/") && !mime.startsWith("audio/")) return@repeat
+                    extractor.selectTrack(trackIndex)
+                    trackMap[trackIndex] = muxer.addTrack(format)
+                }
+
+                if (rotation != 0) {
+                    muxer.setOrientationHint(rotation)
+                }
+
+                val maxBufferSize = (0 until extractor.trackCount).maxOfOrNull { trackIndex ->
+                    extractor.getTrackFormat(trackIndex).let { format ->
+                        if (format.containsKey(MediaFormat.KEY_MAX_INPUT_SIZE)) {
+                            format.getInteger(MediaFormat.KEY_MAX_INPUT_SIZE)
+                        } else {
+                            1024 * 1024
+                        }
+                    }
+                } ?: (1024 * 1024)
+
+                val buffer = ByteBuffer.allocateDirect(maxBufferSize)
+                val bufferInfo = android.media.MediaCodec.BufferInfo()
+                muxer.start()
+                muxerStarted = true
+
+                extractor.seekTo(chunkStartUs, MediaExtractor.SEEK_TO_PREVIOUS_SYNC)
+
+                while (true) {
+                    bufferInfo.offset = 0
+                    bufferInfo.size = extractor.readSampleData(buffer, 0)
+                    if (bufferInfo.size < 0) break
+
+                    val sampleTimeUs = extractor.sampleTime
+                    if (sampleTimeUs < 0) break
+                    if (sampleTimeUs < chunkStartUs) {
+                        extractor.advance()
+                        continue
+                    }
+                    if (sampleTimeUs >= chunkEndUs) break
+
+                    val sampleTrackIndex = extractor.sampleTrackIndex
+                    val muxerTrackIndex = trackMap[sampleTrackIndex]
+                    if (muxerTrackIndex != null) {
+                        bufferInfo.presentationTimeUs = sampleTimeUs - chunkStartUs
+                        bufferInfo.flags = extractor.sampleFlags
+                        muxer.writeSampleData(muxerTrackIndex, buffer, bufferInfo)
+                        wroteAnySample = true
+                    }
+                    extractor.advance()
+                }
+
+                if (wroteAnySample) {
+                    outputFiles += outputFile
+                } else {
+                    outputFile.delete()
+                }
+            } catch (throwable: Throwable) {
+                outputFile.delete()
+                outputFiles.forEach { it.delete() }
+                throw throwable
+            } finally {
+                if (muxerStarted) {
+                    runCatching { muxer.stop() }
+                }
+                runCatching { muxer.release() }
+                runCatching { extractor.release() }
+            }
+
+            chunkStartMs += chunkDurationMs
+            chunkIndex++
+        }
+
+        return outputFiles
+    }
+
+    private fun registerTemporaryVideo(file: File, displayName: String): PreparedMediaItem {
+        val resolver = context.androidContext.contentResolver
+        val values = ContentValues().apply {
+            put(MediaStore.Video.Media.DISPLAY_NAME, displayName)
+            put(MediaStore.Video.Media.MIME_TYPE, "video/mp4")
+            put(MediaStore.Video.Media.RELATIVE_PATH, "Movies/.PurrfectSnap")
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+                put(MediaStore.Video.Media.IS_PENDING, 1)
+            }
+        }
+
+        val uri = resolver.insert(MediaStore.Video.Media.EXTERNAL_CONTENT_URI, values)
+            ?: error("Failed to create MediaStore entry")
+
+        runCatching {
+            resolver.openOutputStream(uri)?.use { output ->
+                file.inputStream().use { input -> input.copyTo(output) }
+            } ?: error("Failed to open MediaStore output stream")
+
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+                resolver.update(uri, ContentValues().apply {
+                    put(MediaStore.Video.Media.IS_PENDING, 0)
+                }, null, null)
+            }
+        }.onFailure {
+            resolver.delete(uri, null, null)
+            throw it
+        }
+
+        val durationMs = extractMediaDuration(uri) ?: 0L
+        val itemId = uri.lastPathSegment ?: error("Failed to resolve MediaStore item id")
+
+        context.coroutineScope.launch {
+            delay(120_000)
+            runCatching { resolver.delete(uri, null, null) }
+        }
+
+        return PreparedMediaItem(itemId = itemId, durationMs = durationMs, uri = uri.toString())
+    }
+
+    private fun buildDrawerItems(itemClass: Any, mediaItems: List<PreparedMediaItem>): List<Any> {
+        return mediaItems.mapIndexedNotNull { index, mediaItem ->
+            itemClass.dataBuilder {
+                from("_item") {
+                    set("_cameraRollSource", "Snapchat")
+                    set("_contentUri", "")
+                    set("_durationMs", mediaItem.durationMs.toDouble())
+                    set("_disabled", false)
+                    set("_imageRotation", 0.0)
+                    set("_width", 1080.0)
+                    set("_height", 1920.0)
+                    set("_timestampMs", (System.currentTimeMillis() + index).toDouble())
+                    from("_itemId") {
+                        set("_itemId", mediaItem.itemId)
+                        set("_type", "VIDEO")
+                    }
+                }
+                set("_order", index.toDouble())
+            }
+        }
+    }
+
+    private fun prepareChunkedItemsFromMediaStoreId(itemId: String, durationMs: Long): List<PreparedMediaItem>? {
+        val numericId = itemId.toLongOrNull() ?: return null
+        val effectiveDurationMs = durationMs.takeIf { it > 0 } ?: extractMediaDuration(
+            ContentUris.withAppendedId(MediaStore.Video.Media.EXTERNAL_CONTENT_URI, numericId)
+        ) ?: return null
+        if (effectiveDurationMs <= SNAP_CHUNK_DURATION_MS) return null
+
+        val sourceUri = ContentUris.withAppendedId(MediaStore.Video.Media.EXTERNAL_CONTENT_URI, numericId)
+        val sourceFile = File.createTempFile("purrfectsnap_gallery_source_", ".mp4", context.androidContext.cacheDir)
+
+        return runCatching {
+            context.androidContext.contentResolver.openInputStream(sourceUri)?.use { input ->
+                sourceFile.outputStream().use { output -> input.copyTo(output) }
+            } ?: error("Failed to open source gallery video")
+
+            val chunkFiles = splitVideoIntoChunks(sourceFile, SNAP_CHUNK_DURATION_MS)
+            val preparedItems = chunkFiles.mapIndexed { index, file ->
+                registerTemporaryVideo(file, "purrfectsnap_gallery_chunk_${System.currentTimeMillis()}_$index.mp4")
+            }
+            chunkFiles.forEach { if (it != sourceFile) it.delete() }
+            preparedItems
+        }.also {
+            sourceFile.delete()
+        }.getOrElse {
+            context.log.error("Failed to prepare split gallery items", it)
+            null
+        }
+    }
+
    private fun extractMediaDuration(uri: Uri): Long? {
        val retriever = MediaMetadataRetriever()
        return runCatching {
@@ -96,6 +394,7 @@ class MediaFilePicker : Feature("Media File Picker") {
            var sendItemsMethod: Method? = null
            var drawerViewClass: Class<*>? = null
            var sendItemsListItemClassFallback: Class<*>? = null
+            var sendItemsHookedHandler: Any? = null

            context.mappings.useMapper(ChatMediaDrawerMapper::class) {
                val drawerCls = chatMediaDrawerClass.getAsClass() ?: return@useMapper
@@ -115,6 +414,72 @@ class MediaFilePicker : Feature("Media File Picker") {
                sendItemsMethod = sendItems
                handlerParamMethod.hook(HookStage.AFTER) {
                    chatMediaDrawerActionHandler = it.arg(0)
+                    val handlerInstance = chatMediaDrawerActionHandler
+                    sendSingleItemHandler = sendSingleItem@{ item ->
+                        runCatching {
+                            sendItemsMethod?.invoke(chatMediaDrawerActionHandler, listOf<Any>(), listOf(item))
+                            true
+                        }.getOrElse { throwable ->
+                            context.log.error("MediaFilePicker: Failed to send queued split item", throwable)
+                            false
+                        }
+                    }
+                    cleanupItemHandler = { uriString ->
+                        runCatching {
+                            context.androidContext.contentResolver.delete(Uri.parse(uriString), null, null)
+                        }.onFailure {
+                            context.log.warn("MediaFilePicker: Failed to delete temp split media: ${it.message}")
+                        }
+                    }
+                    if (sendItemsHookedHandler === handlerInstance) return@hook
+                    sendItemsHookedHandler = handlerInstance
+
+                    Hooker.hookObjectMethod(
+                        handlerInstance::class.java,
+                        handlerInstance,
+                        sendItemsName,
+                        HookStage.BEFORE
+                    ) { param ->
+                        if (bypassSplitOnce) {
+                            bypassSplitOnce = false
+                            return@hookObjectMethod
+                        }
+                        val currentItems = (param.argNullable<Any>(1) as? List<*>)?.filterNotNull() ?: return@hookObjectMethod
+                        if (currentItems.isEmpty()) return@hookObjectMethod
+                        reusableOriginalItem = currentItems.firstOrNull()
+
+                        val itemClass = sendItems.genericParameterTypes.getOrNull(1)?.getTypeArguments()?.firstOrNull()
+                            ?: sendItemsListItemClassFallback
+                            ?: currentItems.firstOrNull()?.javaClass
+                            ?: return@hookObjectMethod
+
+                        val preparedExpandedItems = mutableListOf<PreparedMediaItem>()
+                        var didExpand = false
+                        val expandedItems = currentItems.flatMap { item ->
+                            val baseItem = item.getObjectFieldOrNull("_item") ?: return@flatMap listOf(item)
+                            val durationMs = ((baseItem.getObjectFieldOrNull("_durationMs") as? Double)?.toLong())
+                                ?: ((baseItem.getObjectFieldOrNull("_durationMs") as? Long))
+                                ?: 0L
+                            val itemId = baseItem.getObjectFieldOrNull("_itemId")
+                                ?.getObjectFieldOrNull("_itemId")
+                                ?.toString()
+                                ?: return@flatMap listOf(item)
+
+                            val splitItems = prepareChunkedItemsFromMediaStoreId(itemId, durationMs)
+                            if (splitItems.isNullOrEmpty()) {
+                                listOf(item)
+                            } else {
+                                didExpand = true
+                                preparedExpandedItems.addAll(splitItems)
+                                buildDrawerItems(itemClass, splitItems)
+                            }
+                        }
+
+                        if (didExpand && expandedItems.isNotEmpty()) {
+                            queueSplitItems(expandedItems, preparedExpandedItems, currentItems.firstOrNull())
+                            param.setArg(1, listOf(expandedItems.first()))
+                        }
+                    }
                }
            }

@@ -171,7 +536,7 @@ class MediaFilePicker : Feature("Media File Picker") {
                    return@subscribe
                }

-                fun sendMedia() {
+                fun sendMedia(items: List<PreparedMediaItem>? = null) {
                    val method = sendItemsMethod ?: return
                    val itemClass = method.genericParameterTypes.getOrNull(1)?.getTypeArguments()?.firstOrNull()
                        ?: sendItemsListItemClassFallback
@@ -180,27 +545,13 @@ class MediaFilePicker : Feature("Media File Picker") {
                        context.inAppOverlay.showStatusToast(Icons.Default.Error, "Failed to send media (incompatible version).")
                        return
                    }
-                    val item = itemClass.dataBuilder {
-                        from("_item") {
-                            set("_cameraRollSource", "Snapchat")
-                            set("_contentUri", "")
-                            set("_durationMs", (lastMediaDuration ?: 0L).toDouble())
-                            set("_disabled", false)
-                            set("_imageRotation", 0.0)
-                            set("_width", 1080.0)
-                            set("_height", 1920.0)
-                            set("_timestampMs", System.currentTimeMillis().toDouble())
-                            from("_itemId") {
-                                set("_itemId", firstVideoId.toString())
-                                set("_type", "VIDEO")
-                            }
-                        }
-                        set("_order", 0.0)
-                    } ?: run {
+                    val mediaItems = items ?: listOf(PreparedMediaItem(firstVideoId.toString(), lastMediaDuration ?: 0L, ""))
+                    val builtItems = buildDrawerItems(itemClass, mediaItems)
+                    if (builtItems.size != mediaItems.size) {
                        context.inAppOverlay.showStatusToast(Icons.Default.Error, "Failed to build media item.")
                        return
                    }
-                    method.invoke(chatMediaDrawerActionHandler, listOf<Any>(), listOf(item))
+                    method.invoke(chatMediaDrawerActionHandler, listOf<Any>(), builtItems)
                }

                fun startConversion(audioOnly: Boolean) {
@@ -238,8 +589,25 @@ class MediaFilePicker : Feature("Media File Picker") {
                        context.inAppOverlay.showStatusToast(Icons.Default.CheckCircleOutline, "Media converted successfully.")

                        runCatching {
-                            mediaInputStream = ParcelFileDescriptor.AutoCloseInputStream(pfd)
-                            sendMedia()
+                            if (!audioOnly && (lastMediaDuration ?: 0L) > 10_000L) {
+                                val convertedFile = File.createTempFile("purrfectsnap_source_", ".$outputExtension", context.androidContext.cacheDir)
+                                ParcelFileDescriptor.AutoCloseInputStream(pfd).use { input ->
+                                    convertedFile.outputStream().use { output -> input.copyTo(output) }
+                                }
+
+                                val chunkFiles = splitVideoIntoChunks(convertedFile)
+                                val preparedItems = chunkFiles.mapIndexed { index, file ->
+                                    registerTemporaryVideo(file, "purrfectsnap_chunk_${System.currentTimeMillis()}_$index.mp4")
+                                }
+
+                                chunkFiles.forEach { if (it != convertedFile) it.delete() }
+                                convertedFile.delete()
+
+                                sendMedia(preparedItems)
+                            } else {
+                                mediaInputStream = ParcelFileDescriptor.AutoCloseInputStream(pfd)
+                                sendMedia()
+                            }
                        }.onFailure {
                            mediaInputStream = null
                            context.log.error(it)
--- a/core/src/main/kotlin/me/eternal/purrfectsnap/core/features/impl/messaging/AutoMarkAsRead.kt
+++ b/core/src/main/kotlin/me/eternal/purrfectsnap/core/features/impl/messaging/AutoMarkAsRead.kt
@@ -1,18 +1,32 @@
 package me.eternal.purrfectsnap.core.features.impl.messaging

-import android.widget.ProgressBar
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
 import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Visibility
 import androidx.compose.material.icons.filled.WarningAmber
+import androidx.compose.material.icons.filled.Info
+import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.material3.Text
+import androidx.compose.runtime.mutableIntStateOf
+import androidx.compose.ui.unit.dp
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
+import me.eternal.purrfectsnap.common.ui.createComposeAlertDialog
 import me.eternal.purrfectsnap.common.data.ContentType
 import me.eternal.purrfectsnap.common.data.MessageUpdate
 import me.eternal.purrfectsnap.core.event.events.impl.OnSnapInteractionEvent
 import me.eternal.purrfectsnap.core.event.events.impl.SendMessageWithContentEvent
 import me.eternal.purrfectsnap.core.features.Feature
 import me.eternal.purrfectsnap.core.features.impl.spying.StealthMode
+import me.eternal.purrfectsnap.core.ui.PurrfectGlassCard
+import me.eternal.purrfectsnap.core.ui.PurrfectOverlayPalette
+import me.eternal.purrfectsnap.core.ui.PurrfectOverlayTheme
 import me.eternal.purrfectsnap.core.ui.ViewAppearanceHelper
 import me.eternal.purrfectsnap.core.util.CallbackBuilder
 import me.eternal.purrfectsnap.core.util.hook.HookStage
@@ -26,6 +40,54 @@ import kotlin.random.Random

 class AutoMarkAsRead : Feature("Auto Mark As Read") {
    val canMarkConversationAsRead by lazy { context.config.messaging.autoMarkAsRead.get().contains("conversation_read") }
+    private val markAsSeenBatchSize = 50
+    private val markAsSeenBatchCooldownMs = 4000L
+
+    private data class PendingSnapMessage(
+        val clientMessageId: Long,
+        val creationTimestamp: Long
+    )
+
+    private fun String?.isRateLimited(): Boolean {
+        val value = this ?: return false
+        return value.contains("RESOURCE_EXHAUSTED", ignoreCase = true) ||
+            value.contains("Rate limited", ignoreCase = true)
+    }
+
+    private fun showRateLimitedDialog(processed: Int, total: Int) {
+        val activity = context.mainActivity ?: run {
+            context.inAppOverlay.showStatusToast(
+                Icons.Default.WarningAmber,
+                "Rate limited after $processed/$total snaps. Try again later."
+            )
+            return
+        }
+
+        createComposeAlertDialog(activity) {
+            PurrfectOverlayTheme {
+                PurrfectGlassCard(
+                    modifier = androidx.compose.ui.Modifier.fillMaxWidth(),
+                    title = "Rate Limited",
+                    subtitle = "Snapchat stopped the mark-as-seen run to protect your account",
+                    icon = Icons.Default.WarningAmber
+                ) {
+                    Column(
+                        modifier = androidx.compose.ui.Modifier.fillMaxWidth(),
+                        verticalArrangement = Arrangement.spacedBy(12.dp)
+                    ) {
+                        Text(
+                            text = "Processed $processed of $total snaps before the request was rate limited.",
+                            color = PurrfectOverlayPalette.textSecondary
+                        )
+                        Text(
+                            text = "No bypass was attempted. Wait a bit and run it again, or lower the per-run limit in settings.",
+                            color = PurrfectOverlayPalette.textSecondary
+                        )
+                    }
+                }
+            }
+        }.show()
+    }

    fun markConversationsAsRead(conversationIds: List<String>) {
        conversationIds.forEach { conversationId ->
@@ -50,36 +112,123 @@ class AutoMarkAsRead : Feature("Auto Mark As Read") {
        }
    }

+    private fun getPendingSnapMessageIds(conversationId: String, requestedLimit: Int?): List<Long> {
+        val collected = mutableListOf<PendingSnapMessage>()
+        val pageSize = 200
+        var page = 0
+
+        while (true) {
+            val messages = context.database.getMessagesFromConversationId(conversationId, pageSize, page) ?: break
+            messages.forEach { message ->
+                if (message.contentType != ContentType.SNAP.id && message.contentType != ContentType.EXTERNAL_MEDIA.id) return@forEach
+                if (message.isViewedByUser == 1 || message.readTimestamp > 0L) return@forEach
+                collected += PendingSnapMessage(
+                    clientMessageId = message.clientMessageId.toLong(),
+                    creationTimestamp = message.creationTimestamp
+                )
+            }
+            if (messages.size < pageSize) break
+            if (requestedLimit != null && collected.size >= requestedLimit) break
+            page++
+        }
+
+        return collected
+            .distinctBy { it.clientMessageId }
+            .sortedBy { it.creationTimestamp }
+            .let { pending ->
+                if (requestedLimit != null) pending.take(requestedLimit) else pending
+            }
+            .map { it.clientMessageId }
+    }
+
    fun markSnapsAsSeen(conversationId: String) {
        val messaging = context.feature(Messaging::class)
-        val messageIds = messaging.getFeedCachedMessageIds(conversationId)?.takeIf { it.isNotEmpty() } ?: run {
-            context.inAppOverlay.showStatusToast(
-                Icons.Default.WarningAmber,
-                context.translation["mark_as_seen.no_unseen_snaps_toast"]
-            )
-            return
+        val processingMode = context.config.messaging.markSnapAsSeenProcessingMode.get()
+        val configuredLimit = context.config.messaging.markSnapAsSeenLimit.get()
+            .coerceAtLeast(1)
+        val requestedLimit = if (processingMode == "complete") null else configuredLimit
+        val messageIds = getPendingSnapMessageIds(conversationId, requestedLimit)
+            .ifEmpty {
+                messaging.getFeedCachedMessageIds(conversationId)
+                    ?.map { it.toLong() }
+                    ?.takeIf { it.isNotEmpty() }
+                    ?.let { cached ->
+                        if (requestedLimit != null) cached.take(requestedLimit) else cached
+                    }
+                    ?: run {
+                        context.inAppOverlay.showStatusToast(
+                            Icons.Default.WarningAmber,
+                            context.translation["mark_as_seen.no_unseen_snaps_toast"]
+                        )
+                        return
+                    }
+            }
+        val targetMessageIds = if (requestedLimit == null) {
+            messageIds
+        } else {
+            messageIds.take(requestedLimit)
        }

        var job: Job? = null
-        val dialog = ViewAppearanceHelper.newAlertDialogBuilder(context.mainActivity)
-            .setTitle("Processing...")
-            .setView(ProgressBar(context.mainActivity).apply {
-                setPadding(10, 10, 10, 10)
-            })
-            .setOnDismissListener { job?.cancel() }
-            .show()
+        val processedCount = mutableIntStateOf(0)
+        var rateLimitedAt: Int? = null
+        val dialog = createComposeAlertDialog(context.mainActivity!!, builder = {
+            setOnDismissListener { job?.cancel() }
+        }) {
+            PurrfectOverlayTheme {
+                PurrfectGlassCard(
+                    modifier = androidx.compose.ui.Modifier.fillMaxWidth(),
+                    title = "Marking Snaps as Seen",
+                    subtitle = "Updating read state for queued snaps",
+                    icon = Icons.Default.Visibility
+                ) {
+                    Column(
+                        modifier = androidx.compose.ui.Modifier.fillMaxWidth(),
+                        verticalArrangement = Arrangement.spacedBy(12.dp),
+                        horizontalAlignment = androidx.compose.ui.Alignment.CenterHorizontally
+                    ) {
+                        CircularProgressIndicator(
+                            color = PurrfectOverlayPalette.glowSecondary,
+                            trackColor = PurrfectOverlayPalette.glowPrimary.copy(alpha = 0.18f)
+                        )
+                        Text(
+                            text = "${processedCount.intValue}/${targetMessageIds.size}",
+                            color = PurrfectOverlayPalette.textSecondary
+                        )
+                    }
+                }
+            }
+        }.apply { show() }

        context.coroutineScope.launch(Dispatchers.IO) {
-            messageIds.forEach { messageId ->
-                markSnapAsSeen(conversationId, messageId)
+            targetMessageIds.forEachIndexed { index, messageId ->
+                val result = markSnapAsSeen(conversationId, messageId)
+                if (result.isRateLimited()) {
+                    rateLimitedAt = processedCount.intValue
+                    return@launch
+                }
                delay(Random.nextLong(20, 60))
                context.runOnUiThread {
-                    dialog.setTitle("Processing... (${messageIds.indexOf(messageId) + 1}/${messageIds.size})")
+                    processedCount.intValue = index + 1
+                }
+                val processed = index + 1
+                if (processed < targetMessageIds.size && processed % markAsSeenBatchSize == 0) {
+                    delay(markAsSeenBatchCooldownMs)
                }
            }
        }.also { job = it }.invokeOnCompletion {
            context.runOnUiThread {
                dialog.dismiss()
+                if (rateLimitedAt != null) {
+                    val processedIndex = rateLimitedAt!!
+                    processedCount.intValue = processedIndex
+                    showRateLimitedDialog(processedIndex, targetMessageIds.size)
+                } else if (requestedLimit != null && targetMessageIds.size < messageIds.size) {
+                    context.inAppOverlay.showStatusToast(
+                        Icons.Default.Info,
+                        "Processed ${targetMessageIds.size} of ${messageIds.size} unseen snaps."
+                    )
+                }
            }
        }
    }
@@ -153,4 +302,4 @@ class AutoMarkAsRead : Feature("Auto Mark As Read") {
            }
        }
    }
-}
+}
--- a/core/src/main/kotlin/me/eternal/purrfectsnap/core/features/impl/messaging/CallButtonsOverride.kt
+++ b/core/src/main/kotlin/me/eternal/purrfectsnap/core/features/impl/messaging/CallButtonsOverride.kt
@@ -3,8 +3,28 @@ package me.eternal.purrfectsnap.core.features.impl.messaging
 import android.view.MotionEvent
 import android.view.View
 import android.view.ViewGroup
+import androidx.compose.foundation.background
+import androidx.compose.foundation.border
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Call
+import androidx.compose.material3.Button
+import androidx.compose.material3.ButtonDefaults
+import androidx.compose.material3.Text
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Brush
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.unit.dp
+import me.eternal.purrfectsnap.common.ui.createComposeAlertDialog
 import me.eternal.purrfectsnap.core.event.events.impl.AddViewEvent
 import me.eternal.purrfectsnap.core.features.Feature
+import me.eternal.purrfectsnap.core.ui.PurrfectGlassCard
+import me.eternal.purrfectsnap.core.ui.PurrfectOverlayPalette
+import me.eternal.purrfectsnap.core.ui.PurrfectOverlayTheme
 import me.eternal.purrfectsnap.core.ui.ViewAppearanceHelper
 import me.eternal.purrfectsnap.core.ui.children
 import me.eternal.purrfectsnap.core.ui.hideViewCompletely
@@ -16,12 +36,46 @@ class CallButtonsOverride : Feature("CallButtonsOverride") {
    private fun hookTouchEvent(param: HookAdapter, motionEvent: MotionEvent, onConfirm: () -> Unit) {
        if (motionEvent.action != MotionEvent.ACTION_UP) return
        param.setResult(true)
-        ViewAppearanceHelper.newAlertDialogBuilder(context.mainActivity)
-            .setTitle(context.translation["call_start_confirmation.dialog_title"])
-            .setMessage(context.translation["call_start_confirmation.dialog_message"])
-            .setPositiveButton(context.translation["button.positive"]) { _, _ -> onConfirm() }
-            .setNeutralButton(context.translation["button.negative"]) { _, _ -> }
-            .show()
+        createComposeAlertDialog(context.mainActivity!!) { alertDialog ->
+            PurrfectOverlayTheme {
+                PurrfectGlassCard(
+                    modifier = Modifier.fillMaxWidth(),
+                    title = context.translation["call_start_confirmation.dialog_title"],
+                    subtitle = context.translation["call_start_confirmation.dialog_message"],
+                    icon = Icons.Default.Call
+                ) {
+                    val actionShape = RoundedCornerShape(16.dp)
+                    Row(
+                        modifier = Modifier.fillMaxWidth(),
+                        horizontalArrangement = Arrangement.spacedBy(10.dp, androidx.compose.ui.Alignment.CenterHorizontally)
+                    ) {
+                        Button(
+                            modifier = Modifier.width(120.dp),
+                            onClick = { alertDialog.dismiss() },
+                            colors = ButtonDefaults.buttonColors(
+                                containerColor = Color.White.copy(alpha = 0.08f),
+                                contentColor = Color.White
+                            )
+                        ) {
+                            Text(context.translation["button.negative"])
+                        }
+                        Button(
+                            modifier = Modifier.width(120.dp),
+                            onClick = {
+                                alertDialog.dismiss()
+                                onConfirm()
+                            },
+                            colors = ButtonDefaults.buttonColors(
+                                containerColor = PurrfectOverlayPalette.glowPrimary.copy(alpha = 0.26f),
+                                contentColor = Color.White
+                            )
+                        ) {
+                            Text(context.translation["button.positive"])
+                        }
+                    }
+                }
+            }
+        }.show()
    }

    override fun init() {
--- a/core/src/main/kotlin/me/eternal/purrfectsnap/core/features/impl/messaging/SendOverride.kt
+++ b/core/src/main/kotlin/me/eternal/purrfectsnap/core/features/impl/messaging/SendOverride.kt
@@ -22,6 +22,9 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
+import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.foundation.text.KeyboardActions
+import androidx.compose.ui.text.input.KeyboardType
 import kotlinx.coroutines.*
 import me.eternal.purrfectsnap.bridge.task.TaskListener
 import me.eternal.purrfectsnap.common.data.ContentType
@@ -32,19 +35,26 @@ import me.eternal.purrfectsnap.common.util.protobuf.ProtoWriter
 import me.eternal.purrfectsnap.core.event.events.impl.MediaUploadEvent
 import me.eternal.purrfectsnap.core.event.events.impl.NativeUnaryCallEvent
 import me.eternal.purrfectsnap.core.event.events.impl.SendMessageWithContentEvent
+import me.eternal.purrfectsnap.core.event.events.impl.UnaryCallEvent
 import me.eternal.purrfectsnap.core.features.Feature
 import me.eternal.purrfectsnap.core.features.impl.experiments.MediaFilePicker
 import me.eternal.purrfectsnap.core.messaging.MessageSender
 import me.eternal.purrfectsnap.core.ui.PurrfectOverlayPalette
 import me.eternal.purrfectsnap.core.ui.PurrfectOverlayTheme
+import me.eternal.purrfectsnap.core.wrapper.impl.MessageContent
+import me.eternal.purrfectsnap.core.wrapper.impl.MessageDestinations
 import me.eternal.purrfectsnap.core.util.ktx.getObjectFieldOrNull
 import me.eternal.purrfectsnap.core.util.ktx.setObjectField
+import me.eternal.purrfectsnap.core.util.CallbackBuilder
 import me.eternal.purrfectsnap.core.util.hook.HookStage
 import me.eternal.purrfectsnap.core.util.hook.Hooker
 import me.eternal.purrfectsnap.core.util.hook.hook
 import me.eternal.purrfectsnap.core.util.hook.hookConstructor
+import me.eternal.purrfectsnap.mapper.impl.CallbackMapper
 import java.text.SimpleDateFormat
 import java.util.Calendar
+import java.util.Collections
+import java.util.IdentityHashMap
 import java.util.Locale
 import kotlin.time.DurationUnit
 import kotlin.time.toDuration
@@ -54,9 +64,45 @@ import kotlin.time.toDuration
 class SendOverride : Feature("Send Override") {
    companion object {
        private const val NOTIFICATION_CHANNEL_ID = "scheduled_send"
+        private val internalMultipartSend = ThreadLocal.withInitial { false }
+        private var queuedOriginalItemRepeatCount = 0
+        private var queuedOriginalItemRepeatOverrideType: String? = null
+
+        private fun queueOriginalItemRepeats(repeatCount: Int, overrideType: String) {
+            queuedOriginalItemRepeatCount = repeatCount
+            queuedOriginalItemRepeatOverrideType = overrideType
+            MediaFilePicker.setQueuedOverrideType(overrideType)
+        }
+
+        private fun clearQueuedOriginalItemRepeats() {
+            queuedOriginalItemRepeatCount = 0
+            queuedOriginalItemRepeatOverrideType = null
+        }
+
+        private fun handleQueuedOriginalItemRepeatSuccess(): Boolean {
+            if (queuedOriginalItemRepeatCount <= 0) {
+                clearQueuedOriginalItemRepeats()
+                return false
+            }
+
+            val overrideType = queuedOriginalItemRepeatOverrideType ?: run {
+                clearQueuedOriginalItemRepeats()
+                return false
+            }
+
+            queuedOriginalItemRepeatCount--
+            MediaFilePicker.setQueuedOverrideType(overrideType)
+            val result = MediaFilePicker.sendReusableOriginalItem()
+            if (!result) {
+                queuedOriginalItemRepeatCount++
+                clearQueuedOriginalItemRepeats()
+            }
+            return result
+        }
    }
    
    private var selectedType by mutableStateOf("SNAP")
+    private var disableSplitForCurrentSend by mutableStateOf(false)
    private var customDuration by mutableFloatStateOf(10f)
    private var scheduledTime by mutableStateOf<Long?>(null)
    private var showClockPicker by mutableStateOf(false)
@@ -66,7 +112,6 @@ class SendOverride : Feature("Send Override") {
    private val backgroundHookLock = Any()
    private var backgroundHookRefs = 0
    private var backgroundHooks: List<Hooker.HookHandle>? = null
-
    private fun acquireScheduledSendBackground(): () -> Unit {
        if (!context.config.messaging.scheduledSendAllowRunningInBackground.get()) return {}
        var enableFailed = false
@@ -362,7 +407,12 @@ class SendOverride : Feature("Send Override") {
            }
        }

+        context.event.subscribe(UnaryCallEvent::class, priority = 100) { event ->
+            if (event.uri != "/messagingcoreservice.MessagingCoreService/CreateContentMessage") return@subscribe
+        }
+
        context.event.subscribe(SendMessageWithContentEvent::class, priority = -100) { event ->
+            if (internalMultipartSend.get() == true) return@subscribe
            postSavePolicy = null
            if (event.destinations.stories?.isNotEmpty() == true && event.destinations.conversations?.isEmpty() == true) return@subscribe
            val localMessageContent = event.messageContent
@@ -394,6 +444,7 @@ class SendOverride : Feature("Send Override") {
            val recipientName = recipientNames.joinToString(", ")

            event.canceled = true
+            event.adapter.setResult(null)

            fun invokeOriginalAndRestoreResult(ev: SendMessageWithContentEvent) {
                val result = ev.adapter.invokeOriginal()
@@ -401,9 +452,54 @@ class SendOverride : Feature("Send Override") {
                ev.canceled = false
            }

-            fun sendMedia(overrideType: String, snapDurationMs: Int?): Boolean {
+            val sendMessageCallbackClass by lazy {
+                lateinit var result: Class<*>
+                context.mappings.useMapper(CallbackMapper::class) {
+                    result = callbacks.getClass("SendMessageCallback") ?: error("Failed to resolve SendMessageCallback")
+                }
+                result
+            }
+
+            fun cloneDestinations(source: MessageDestinations): Any {
+                return context.gson.fromJson(
+                    context.gson.toJson(source.instanceNonNull()),
+                    context.classCache.messageDestinations
+                )
+            }
+
+            val sendMessageWithContentMethod by lazy {
+                sequence {
+                    var current: Class<*>? = context.classCache.conversationManager
+                    while (current != null && current != Any::class.java && current != Object::class.java) {
+                        yield(current)
+                        current = current.superclass
+                    }
+                }.flatMap { it.declaredMethods.asSequence() }
+                    .first { it.name == "sendMessageWithContent" }
+            }
+
+            val originalMessageJson = context.gson.toJson(localMessageContent.instanceNonNull())
+            val originalCallback = event.adapter.args().getOrNull(2)
+            val conversationManagerInstance by lazy {
+                context.feature(Messaging::class).conversationManager?.instanceNonNull()
+            }
+
+            fun invokeCallbackError(callback: Any?, error: Any?) {
+                runCatching {
+                    callback?.javaClass?.methods?.firstOrNull { method ->
+                        method.name == "onError" && method.parameterCount == 1
+                    }?.invoke(callback, error)
+                }
+            }
+
+            fun applyOverride(
+                targetMessageContent: MessageContent,
+                targetReader: ProtoReader,
+                overrideType: String,
+                snapDurationMs: Int?
+            ): Boolean {
                val bypassLimit = context.config.experimental.nativeHooks.valdiHooks.bypassCameraRollLimit.get()
-                if (overrideType != "ORIGINAL" && !bypassLimit && (messageProtoReader.followPath(3)?.getCount(3) ?: 0) > 1) {
+                if (overrideType != "ORIGINAL" && !bypassLimit && (targetReader.followPath(3)?.getCount(3) ?: 0) > 1) {
                    context.inAppOverlay.showStatusToast(
                        icon = Icons.Default.WarningAmber,
                        context.translation["gallery_media_send_override.multiple_media_toast"]
@@ -416,10 +512,10 @@ class SendOverride : Feature("Send Override") {
                        val savePolicyValue = if (overrideType == "SAVEABLE_SNAP") 2 else 1
                        postSavePolicy = savePolicyValue

-                        val extras = messageProtoReader.followPath(3, 3, 13)?.getBuffer()
+                        val extras = targetReader.followPath(3, 3, 13)?.getBuffer()

-                        if (localMessageContent.contentType != ContentType.SNAP) {
-                            localMessageContent.content = ProtoWriter().apply {
+                        if (targetMessageContent.contentType != ContentType.SNAP) {
+                            targetMessageContent.content = ProtoWriter().apply {
                                from(11) {
                                    from(5) {
                                        from(1) {
@@ -440,11 +536,11 @@ class SendOverride : Feature("Send Override") {
                            }.toByteArray()
                        }

-                        localMessageContent.contentType = ContentType.SNAP
-                        localMessageContent.content = ProtoEditor(localMessageContent.content!!).apply {
+                        targetMessageContent.contentType = ContentType.SNAP
+                        targetMessageContent.content = ProtoEditor(targetMessageContent.content!!).apply {
                            edit(11, 5, 2) {
                                arrayOf(6, 7, 8).forEach { remove(it) }
-                                addVarInt(5, messageProtoReader.getVarInt(3, 3, 5, 2, 5) ?: messageProtoReader.getVarInt(11, 5, 2, 5) ?: 1)
+                                addVarInt(5, targetReader.getVarInt(3, 3, 5, 2, 5) ?: targetReader.getVarInt(11, 5, 2, 5) ?: 1)
                                if (snapDurationMs != null && overrideType != "SAVEABLE_SNAP") {
                                    addVarInt(8, snapDurationMs / 1000)
                                    if (snapDurationMs / 1000 <= 0) {
@@ -474,11 +570,11 @@ class SendOverride : Feature("Send Override") {
                        if (shouldPreventSave) {
                            postSavePolicy = 1 // PROHIBITED
                        }
-                        localMessageContent.contentType = ContentType.NOTE
+                        targetMessageContent.contentType = ContentType.NOTE
                        val stripMeta = context.config.messaging.stripMediaMetadata.get()
                        val omitTranscript = stripMeta.contains("remove_audio_note_transcript_capability")
-                        val rawDurationMs = messageProtoReader.getVarInt(3, 3, 5, 1, 1, 15)?.toLong()
-                            ?: messageProtoReader.getVarInt(3, 3, 5, 2, 8)?.toLong()?.times(1000)
+                        val rawDurationMs = targetReader.getVarInt(3, 3, 5, 1, 1, 15)?.toLong()
+                            ?: targetReader.getVarInt(3, 3, 5, 2, 8)?.toLong()?.times(1000)
                            ?: (context.feature(MediaFilePicker::class).lastMediaDuration ?: 0).toLong()
                        val durationForProto = minOf(rawDurationMs, MessageSender.VOICE_NOTE_MAX_DURATION_MS)
                        val audioNoteProto = MessageSender.audioNoteProto(
@@ -487,7 +583,7 @@ class SendOverride : Feature("Send Override") {
                        )
                        
                        // Set save policy in the proto if prevent audio is enabled
-                        localMessageContent.content = if (shouldPreventSave) {
+                        targetMessageContent.content = if (shouldPreventSave) {
                            // Check which path structure exists in the audio note proto
                            val protoReader = ProtoReader(audioNoteProto)
                            val hasNestedPath = protoReader.followPath(6, 1, 1) != null
@@ -519,7 +615,7 @@ class SendOverride : Feature("Send Override") {
                            Class.forName(
                                "com.snapchat.client.messaging.SavePolicy",
                                false,
-                                localMessageContent.instanceNonNull().javaClass.classLoader
+                                targetMessageContent.instanceNonNull().javaClass.classLoader
                            )
                        }.getOrNull()

@@ -537,7 +633,7 @@ class SendOverride : Feature("Send Override") {
                                }.getOrNull()

                                if (policyEnum != null) {
-                                    localMessageContent.instanceNonNull().setObjectField("mSavePolicy", policyEnum)
+                                    targetMessageContent.instanceNonNull().setObjectField("mSavePolicy", policyEnum)
                                }
                            }
                        }
@@ -549,17 +645,228 @@ class SendOverride : Feature("Send Override") {
                return true
            }

-            val resolvedOverrideType = configOverrideType?.takeIf { it != "always_ask" }
+            fun createMessageContentFromOriginal(): MessageContent {
+                return MessageContent(
+                    context.gson.fromJson(originalMessageJson, context.classCache.localMessageContent)
+                ).also { messageContent ->
+                    val visited = Collections.newSetFromMap(IdentityHashMap<Any, Boolean>())
+
+                    fun shouldScrubField(fieldName: String): Boolean {
+                        if (fieldName == "mId") return false
+                        return fieldName in setOf("mMessageId", "mQuotedMessageId") ||
+                            fieldName.contains("AttemptId", ignoreCase = true) ||
+                            fieldName.contains("ClientMessageId", ignoreCase = true) ||
+                            fieldName.contains("ClientId", ignoreCase = true) ||
+                            fieldName.contains("MessageUuid", ignoreCase = true) ||
+                            fieldName.contains("UUID", ignoreCase = true)
+                    }
+
+                    fun scrubValue(value: Any?) {
+                        if (value == null) return
+                        if (!visited.add(value)) return
+
+                        when (value) {
+                            is String, is Number, is Boolean, is ByteArray, is Enum<*> -> return
+                            is Iterable<*> -> {
+                                value.forEach { scrubValue(it) }
+                                return
+                            }
+                            is Map<*, *> -> {
+                                value.values.forEach { scrubValue(it) }
+                                return
+                            }
+                        }
+
+                        sequence<Class<*>> {
+                            var current: Class<*>? = value.javaClass
+                            while (current != null && current != Any::class.java && current != Object::class.java) {
+                                yield(current)
+                                current = current.superclass
+                            }
+                        }.flatMap { it.declaredFields.asSequence() }
+                            .forEach { field ->
+                                runCatching {
+                                    field.isAccessible = true
+                                    if (shouldScrubField(field.name)) {
+                                        when (field.type) {
+                                            java.lang.Long.TYPE -> field.setLong(value, 0L)
+                                            java.lang.Integer.TYPE -> field.setInt(value, 0)
+                                            java.lang.Boolean.TYPE -> field.setBoolean(value, false)
+                                            else -> field.set(value, null)
+                                        }
+                                    } else {
+                                        scrubValue(field.get(value))
+                                    }
+                                }
+                            }
+                    }
+
+                    scrubValue(messageContent.instanceNonNull())
+                }
+            }
+
+            fun invokeSendManually(messageContent: MessageContent, callback: Any?) {
+                val conversationManager = conversationManagerInstance ?: error("ConversationManager is null")
+                internalMultipartSend.set(true)
+                try {
+                    sendMessageWithContentMethod.invoke(
+                        conversationManager,
+                        cloneDestinations(event.destinations),
+                        messageContent.instanceNonNull(),
+                        callback
+                    )
+                } finally {
+                    internalMultipartSend.set(false)
+                }
+            }
+
+            fun sendMediaManual(
+                sourceMessageContent: MessageContent,
+                overrideType: String,
+                snapDurationMs: Int?,
+                completionCallback: Any?
+            ): Boolean {
+                val sourceReader = ProtoReader(sourceMessageContent.content ?: return false)
+                val mediaCount = sourceReader.followPath(3)?.getCount(3) ?: 0
+                if (overrideType != "ORIGINAL" && mediaCount > 1) {
+                    val mediaBuffers = mutableListOf<ByteArray>()
+                    sourceReader.followPath(3)?.eachBuffer { id, buffer ->
+                        if (id == 3) mediaBuffers.add(buffer)
+                    }
+                    if (mediaBuffers.isEmpty()) return false
+
+                    fun buildPartMessageContent(partIndex: Int): MessageContent {
+                        val partContent = createMessageContentFromOriginal()
+                        val metadata = partContent.instanceNonNull().getObjectFieldOrNull("mExternalContentMetadata")
+                        val refs = ArrayList(partContent.localMediaReferences ?: arrayListOf())
+                        val contentRefs = (metadata?.getObjectFieldOrNull("mContentReferences") as? ArrayList<*>)?.toCollection(ArrayList())
+                        val encryptionRefs = (metadata?.getObjectFieldOrNull("mRemoteMediaEncryption") as? ArrayList<*>)?.toCollection(ArrayList())
+                        partContent.content = ProtoEditor(partContent.content!!).apply {
+                            edit(3) {
+                                remove(3)
+                                addBuffer(3, mediaBuffers[partIndex])
+                            }
+                        }.toByteArray()
+                        if (partIndex < refs.size) {
+                            partContent.localMediaReferences = arrayListOf(refs[partIndex])
+                        }
+                        metadata?.let {
+                            if (contentRefs != null && partIndex < contentRefs.size) {
+                                it.setObjectField("mContentReferences", arrayListOf(contentRefs[partIndex]))
+                            }
+                            if (encryptionRefs != null && partIndex < encryptionRefs.size) {
+                                it.setObjectField("mRemoteMediaEncryption", arrayListOf(encryptionRefs[partIndex]))
+                            }
+                        }
+                        return partContent
+                    }
+
+                    fun sendPart(partIndex: Int) {
+                        postSavePolicy = null
+                        val partContent = buildPartMessageContent(partIndex)
+                        val partReader = ProtoReader(partContent.content ?: return)
+                        if (!applyOverride(partContent, partReader, overrideType, snapDurationMs)) return
+
+                        val callback = if (partIndex == mediaCount - 1) {
+                            completionCallback
+                        } else {
+                            CallbackBuilder(sendMessageCallbackClass)
+                                .override("onSuccess") {
+                                    sendPart(partIndex + 1)
+                                }
+                                .override("onError", shouldUnhook = false) {
+                                    invokeCallbackError(completionCallback, it.argNullable<Any>(0))
+                                }
+                                .build()
+                        }
+
+                        invokeSendManually(partContent, callback)
+                    }
+
+                    sendPart(0)
+                    return true
+                }
+
+                postSavePolicy = null
+                val targetReader = ProtoReader(sourceMessageContent.content ?: return false)
+                if (!applyOverride(sourceMessageContent, targetReader, overrideType, snapDurationMs)) return false
+                invokeSendManually(sourceMessageContent, completionCallback)
+                return true
+            }
+
+            fun sendRepeatedMediaManual(
+                repeatCount: Int,
+                overrideType: String,
+                snapDurationMs: Int?
+            ): Boolean {
+                if (repeatCount <= 0) return false
+
+                fun sendIteration(index: Int) {
+                    val callback = if (index == repeatCount - 1) {
+                        originalCallback
+                    } else {
+                        CallbackBuilder(sendMessageCallbackClass)
+                            .override("onSuccess") {
+                                sendIteration(index + 1)
+                            }
+                            .override("onError", shouldUnhook = false) {
+                                invokeCallbackError(originalCallback, it.argNullable<Any>(0))
+                            }
+                            .build()
+                    }
+
+                    val preparedContent = createMessageContentFromOriginal()
+                    if (!sendMediaManual(preparedContent, overrideType, snapDurationMs, callback)) {
+                        invokeCallbackError(originalCallback, "Failed to send")
+                    }
+                }
+
+                sendIteration(0)
+                return true
+            }
+
+            fun sendMedia(overrideType: String, snapDurationMs: Int?): Boolean {
+                postSavePolicy = null
+                return applyOverride(localMessageContent, messageProtoReader, overrideType, snapDurationMs)
+            }
+
+            val resolvedOverrideType = MediaFilePicker.getQueuedOverrideType()
+                ?: configOverrideType?.takeIf { it != "always_ask" }
+
+            fun attachQueuedRepeatCallbacks(sendEvent: SendMessageWithContentEvent) {
+                sendEvent.addCallbackResult("onSuccess") {
+                    context.runOnUiThread {
+                        val handledSplit = MediaFilePicker.handleCurrentQueuedItemSuccess()
+                        val handledRepeat = if (!handledSplit) {
+                            handleQueuedOriginalItemRepeatSuccess()
+                        } else {
+                            false
+                        }
+                        if (!handledSplit && !handledRepeat) {
+                            MediaFilePicker.clearQueuedSplitItems()
+                            clearQueuedOriginalItemRepeats()
+                        }
+                    }
+                }
+                sendEvent.addCallbackResult("onError") {
+                    MediaFilePicker.clearQueuedSplitItems()
+                    clearQueuedOriginalItemRepeats()
+                }
+            }
+
            if (resolvedOverrideType != null) {
+                if (MediaFilePicker.hasPendingSplitCleanup() || MediaFilePicker.getQueuedOverrideType() != null || queuedOriginalItemRepeatCount > 0) {
+                    attachQueuedRepeatCallbacks(event)
+                }
                if (sendMedia(resolvedOverrideType, 10000)) {
-                    invokeOriginalAndRestoreResult(event)
+                    if (event.canceled) invokeOriginalAndRestoreResult(event)
                }
                return@subscribe
            }

            context.runOnUiThread {
                val recipientNameForTask = recipientName
-                val mediaCount = messageProtoReader.followPath(3)?.getCount(3) ?: 0
+                                val mediaCount = messageProtoReader.followPath(3)?.getCount(3) ?: 0
                
                createComposeAlertDialog(context.mainActivity!!) { alertDialog ->
                    PurrfectOverlayTheme {
@@ -649,6 +956,8 @@ class SendOverride : Feature("Send Override") {
                                    context.translation.getCategory("features.options.gallery_media_send_override")
                                }
                                var scheduleEnabled by remember { mutableStateOf(false) }
+                                var continuousSendEnabled by remember { mutableStateOf(false) }
+                                var continuousSendCount by remember { mutableStateOf("2") }

                                Text(
                                    fontSize = 20.sp,
@@ -713,6 +1022,21 @@ class SendOverride : Feature("Send Override") {
                                fun toggleSaveable() {
                                    selectedType = if (selectedType == "SAVEABLE_SNAP") "SNAP" else "SAVEABLE_SNAP"
                                }
+                                Row(
+                                    modifier = Modifier.fillMaxWidth().clickable {
+                                        disableSplitForCurrentSend = !disableSplitForCurrentSend
+                                    },
+                                    horizontalArrangement = Arrangement.spacedBy(4.dp),
+                                    verticalAlignment = Alignment.CenterVertically
+                                ) {
+                                    Checkbox(
+                                        checked = disableSplitForCurrentSend,
+                                        onCheckedChange = {
+                                            disableSplitForCurrentSend = it
+                                        }
+                                    )
+                                    Text(text = mainTranslation["single_send_hint"], lineHeight = 15.sp)
+                                }
                                Row(
                                    modifier = Modifier.fillMaxWidth().clickable {
                                        toggleSaveable()
@@ -749,6 +1073,42 @@ class SendOverride : Feature("Send Override") {
                            }
                        }

+                        Row(
+                            modifier = Modifier.fillMaxWidth().clickable {
+                                continuousSendEnabled = !continuousSendEnabled
+                            },
+                            horizontalArrangement = Arrangement.spacedBy(4.dp),
+                            verticalAlignment = Alignment.CenterVertically
+                        ) {
+                            Checkbox(
+                                checked = continuousSendEnabled,
+                                onCheckedChange = {
+                                    continuousSendEnabled = it
+                                }
+                            )
+                            Text(text = mainTranslation["continuous_send_toggle"], lineHeight = 15.sp)
+                        }
+
+                        if (continuousSendEnabled) {
+                            OutlinedTextField(
+                                value = continuousSendCount,
+                                onValueChange = { value ->
+                                    continuousSendCount = value.filter(Char::isDigit).take(3)
+                                },
+                                modifier = Modifier.fillMaxWidth(),
+                                singleLine = true,
+                                label = { Text(mainTranslation["continuous_send_count_label"]) },
+                                placeholder = { Text(mainTranslation["continuous_send_count_placeholder"]) },
+                                keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Number),
+                                keyboardActions = KeyboardActions.Default
+                            )
+                            Text(
+                                text = mainTranslation["continuous_send_hint"],
+                                fontSize = 12.sp,
+                                color = Color.White.copy(alpha = 0.72f)
+                            )
+                        }
+
                        Row(
                            modifier = Modifier.fillMaxWidth(),
                            horizontalArrangement = Arrangement.SpaceEvenly,
@@ -913,8 +1273,46 @@ class SendOverride : Feature("Send Override") {
                                Text(context.translation["button.cancel"])
                            }
                            Button(onClick = {
-                                alertDialog.dismiss()
                                val finalSelectedType = selectedType
+                                val repeatCount = if (continuousSendEnabled) {
+                                    continuousSendCount.toIntOrNull()?.takeIf { it > 0 }
+                                } else {
+                                    1
+                                }
+                                if (repeatCount == null) {
+                                    context.inAppOverlay.showStatusToast(
+                                        icon = Icons.Default.WarningAmber,
+                                        text = mainTranslation["continuous_send_invalid_count"]
+                                    )
+                                    return@Button
+                                }
+                                if (repeatCount > 1 && disableSplitForCurrentSend && MediaFilePicker.hasOriginalUnsplitItem()) {
+                                    context.inAppOverlay.showStatusToast(
+                                        icon = Icons.Default.WarningAmber,
+                                        text = mainTranslation["continuous_send_single_send_conflict"]
+                                    )
+                                    return@Button
+                                }
+                                alertDialog.dismiss()
+                                if (disableSplitForCurrentSend && MediaFilePicker.hasOriginalUnsplitItem()) {
+                                    MediaFilePicker.setQueuedOverrideType(finalSelectedType)
+                                    if (!MediaFilePicker.sendOriginalUnsplitItem()) {
+                                        MediaFilePicker.setQueuedOverrideType(null)
+                                    }
+                                    return@Button
+                                } else if (MediaFilePicker.hasPendingSplitCleanup()) {
+                                    MediaFilePicker.setQueuedOverrideType(finalSelectedType)
+                                    event.addCallbackResult("onSuccess") {
+                                        context.runOnUiThread {
+                                            if (!MediaFilePicker.handleCurrentQueuedItemSuccess()) {
+                                                MediaFilePicker.clearQueuedSplitItems()
+                                            }
+                                        }
+                                    }
+                                    event.addCallbackResult("onError") {
+                                        MediaFilePicker.clearQueuedSplitItems()
+                                    }
+                                }
                                val delayMs = scheduledTime?.let { it - System.currentTimeMillis() }
                                if (delayMs != null && delayMs > 0) {
                                    val taskHash = java.util.UUID.randomUUID().toString()
@@ -960,8 +1358,11 @@ class SendOverride : Feature("Send Override") {

                                        context.bridgeClient.getTaskInterface().updateTaskProgress(taskHash, "Sending...", 100)

-                                        if (sendMedia(finalSelectedType, if (finalSelectedType != "SAVEABLE_SNAP") convertDuration(customDuration) else null)) {
-                                            invokeOriginalAndRestoreResult(event)
+                                        if (sendRepeatedMediaManual(
+                                                repeatCount,
+                                                finalSelectedType,
+                                                if (finalSelectedType != "SAVEABLE_SNAP") convertDuration(customDuration) else null
+                                            )) {
                                            val successText = context.translation.format("schedule_sent_to", "name" to recipientNameForTask) ?: "Sent to $recipientNameForTask"
                                            context.inAppOverlay.showStatusToast(
                                                icon = Icons.Filled.CheckCircle,
@@ -1008,8 +1409,24 @@ class SendOverride : Feature("Send Override") {
                                        }
                                    }
                                } else {
-                                    if (sendMedia(finalSelectedType, if (finalSelectedType != "SAVEABLE_SNAP") convertDuration(customDuration) else null)) {
-                                        invokeOriginalAndRestoreResult(event)
+                                    if (repeatCount == 1) {
+                                        if (sendMedia(finalSelectedType, if (finalSelectedType != "SAVEABLE_SNAP") convertDuration(customDuration) else null)) {
+                                            invokeOriginalAndRestoreResult(event)
+                                        }
+                                    } else if (MediaFilePicker.hasReusableOriginalItem()) {
+                                        queueOriginalItemRepeats(repeatCount - 1, finalSelectedType)
+                                        attachQueuedRepeatCallbacks(event)
+                                        if (sendMedia(finalSelectedType, if (finalSelectedType != "SAVEABLE_SNAP") convertDuration(customDuration) else null)) {
+                                            invokeOriginalAndRestoreResult(event)
+                                        } else {
+                                            clearQueuedOriginalItemRepeats()
+                                        }
+                                    } else {
+                                        sendRepeatedMediaManual(
+                                            repeatCount,
+                                            finalSelectedType,
+                                            if (finalSelectedType != "SAVEABLE_SNAP") convertDuration(customDuration) else null
+                                        )
                                    }
                                }
                            }) {
--- a/core/src/main/kotlin/me/eternal/purrfectsnap/core/features/impl/spying/FriendTracker.kt
+++ b/core/src/main/kotlin/me/eternal/purrfectsnap/core/features/impl/spying/FriendTracker.kt
@@ -37,6 +37,11 @@ class FriendTracker : Feature("Friend Tracker") {
        ))
    } }
    private val conversationEntries = mutableMapOf<Pair<String, String>, Long>()
+    private val peekingStateListeners = mutableListOf<(String, String, Boolean) -> Unit>()
+
+    fun addOnPeekingStateChangedListener(listener: (conversationId: String, userId: String, peeking: Boolean) -> Unit) {
+        peekingStateListeners.add(listener)
+    }

    private fun getTrackedEvents(eventType: TrackerEventType): TrackerEventsResult? {
        return runCatching {
@@ -207,6 +212,12 @@ class FriendTracker : Feature("Friend Tracker") {
            else -> {}
        }

+        when (eventType) {
+            TrackerEventType.STARTED_PEEKING -> peekingStateListeners.forEach { it(conversationId, userId, true) }
+            TrackerEventType.STOPPED_PEEKING -> peekingStateListeners.forEach { it(conversationId, userId, false) }
+            else -> {}
+        }
+
        dispatchEvents(eventType, conversationId, userId)
    }

@@ -261,7 +272,8 @@ class FriendTracker : Feature("Friend Tracker") {
                typing = stateMap[4],
                wasTyping = stateMap[5],
                speaking = stateMap[6] && stateMap[4],
-                peeking = stateMap[8]
+                // Snapchat appears to have shifted the peeking flag by one bit on newer builds.
+                peeking = stateMap.getOrElse(8) { false } || stateMap.getOrElse(9) { false }
            )
        }

@@ -385,7 +397,8 @@ class FriendTracker : Feature("Friend Tracker") {

    override fun init() {
        val sessionEventsConfig = context.config.friendTracker
-        if (sessionEventsConfig.globalState != true) return
+        val shouldProcessSessionEvents = sessionEventsConfig.globalState == true || peekingStateListeners.isNotEmpty()
+        if (!shouldProcessSessionEvents) return

        if (sessionEventsConfig.allowRunningInBackground.get()) {
            findClass("com.snapchat.client.duplex.DuplexClient\$CppProxy").apply {
@@ -402,7 +415,7 @@ class FriendTracker : Feature("Friend Tracker") {
            }
        }

-        if (sessionEventsConfig.recordMessagingEvents.get()) {
+        if (sessionEventsConfig.recordMessagingEvents.get() || peekingStateListeners.isNotEmpty()) {
            val messageHandlerClass = findClass("com.snapchat.client.duplex.MessageHandler\$CppProxy").apply {
                hook("onReceive", HookStage.BEFORE) { param ->
                    param.setResult(null)
--- a/core/src/main/kotlin/me/eternal/purrfectsnap/core/features/impl/spying/HalfSwipeNotifier.kt
+++ b/core/src/main/kotlin/me/eternal/purrfectsnap/core/features/impl/spying/HalfSwipeNotifier.kt
@@ -6,17 +6,10 @@ import android.app.NotificationManager
 import android.app.PendingIntent
 import me.eternal.purrfectsnap.common.Constants
 import me.eternal.purrfectsnap.core.features.Feature
-import me.eternal.purrfectsnap.core.util.hook.HookStage
-import me.eternal.purrfectsnap.core.util.hook.hook
-import me.eternal.purrfectsnap.core.util.hook.hookConstructor
-import me.eternal.purrfectsnap.core.util.ktx.getObjectField
-import me.eternal.purrfectsnap.mapper.impl.CallbackMapper
-import java.util.concurrent.ConcurrentHashMap
 import kotlin.time.Duration.Companion.milliseconds

 class HalfSwipeNotifier : Feature("Half Swipe Notifier") {
-    private val peekingConversations = ConcurrentHashMap<String, List<String>>()
-    private val startPeekingTimestamps = ConcurrentHashMap<String, Long>()
+    private val startPeekingTimestamps = java.util.concurrent.ConcurrentHashMap<String, Long>()
    private val halfSwipeListeners = mutableListOf<(String, String, Long) -> Unit>()

    private val notificationManager get() = context.androidContext.getSystemService(NotificationManager::class.java)
@@ -39,44 +32,11 @@ class HalfSwipeNotifier : Feature("Half Swipe Notifier") {

    override fun init() {
        if (context.config.messaging.halfSwipeNotifier.globalState != true) return
-        lateinit var presenceService: Any
-
-        findClass("com.snapchat.talkcorev3.PresenceService\$CppProxy").hookConstructor(HookStage.AFTER) {
-            presenceService = it.thisObject()
-        }
-
-        context.mappings.useMapper(CallbackMapper::class) {
-            callbacks.getClass("PresenceServiceDelegate")?.hook("notifyActiveConversationsChanged", HookStage.BEFORE) {
-                val activeConversations = presenceService::class.java.methods.find { it.name == "getActiveConversations" }?.invoke(presenceService) as? Map<*, *> ?: return@hook // conversationId, conversationInfo (this.mPeekingParticipants)
-
-                if (activeConversations.isEmpty()) {
-                    peekingConversations.forEach {
-                        val conversationId = it.key
-                        val peekingParticipantsIds = it.value
-                        peekingParticipantsIds.forEach { userId ->
-                            endPeeking(conversationId, userId)
-                        }
-                    }
-                    peekingConversations.clear()
-                    return@hook
-                }
-
-                activeConversations.forEach { (conversationId, conversationInfo) ->
-                    val peekingParticipantsIds = (conversationInfo?.getObjectField("mPeekingParticipants") as? List<*>)?.map { it.toString() } ?: return@forEach
-                    val cachedPeekingParticipantsIds = peekingConversations[conversationId] ?: emptyList()
-
-                    val newPeekingParticipantsIds = peekingParticipantsIds - cachedPeekingParticipantsIds.toSet()
-                    val exitedPeekingParticipantsIds = cachedPeekingParticipantsIds - peekingParticipantsIds.toSet()
-
-                    newPeekingParticipantsIds.forEach { userId ->
-                        startPeeking(conversationId.toString(), userId)
-                    }
-
-                    exitedPeekingParticipantsIds.forEach { userId ->
-                        endPeeking(conversationId.toString(), userId)
-                    }
-                    peekingConversations[conversationId.toString()] = peekingParticipantsIds
-                }
+        context.feature(FriendTracker::class).addOnPeekingStateChangedListener { conversationId, userId, peeking ->
+            if (peeking) {
+                startPeeking(conversationId, userId)
+            } else {
+                endPeeking(conversationId, userId)
            }
        }
    }
@@ -139,4 +99,4 @@ class HalfSwipeNotifier : Feature("Half Swipe Notifier") {
                }
        }
    }
-}
+}
--- a/core/src/main/kotlin/me/eternal/purrfectsnap/core/features/impl/ui/CustomTheming.kt
+++ b/core/src/main/kotlin/me/eternal/purrfectsnap/core/features/impl/ui/CustomTheming.kt
@@ -1,10 +1,13 @@
 package me.eternal.purrfectsnap.core.features.impl.ui

 import android.content.res.TypedArray
+import android.graphics.drawable.ColorDrawable
 import android.util.TypedValue
+import android.view.View
 import me.eternal.purrfectsnap.core.features.Feature
 import me.eternal.purrfectsnap.core.util.hook.HookStage
 import me.eternal.purrfectsnap.core.util.hook.hook
+import me.eternal.purrfectsnap.core.util.hook.hookConstructor
 import me.eternal.purrfectsnap.core.util.ktx.getObjectField

 class CustomTheming : Feature("Custom Theming") {
@@ -50,37 +53,80 @@ class CustomTheming : Feature("Custom Theming") {
        ).any { it in name }
    }

+    private fun patchTypedArray(result: TypedArray, attrIds: IntArray?) {
+        val requestedAttrs = attrIds?.takeIf { it.isNotEmpty() } ?: return
+        val typedArrayData = runCatching { result.getObjectField("mData") as IntArray }.getOrNull() ?: return
+        val stride = (typedArrayData.size / requestedAttrs.size).takeIf { it >= 2 } ?: return
+
+        requestedAttrs.forEachIndexed { index, attrId ->
+            val offset = index * stride
+            if (offset + 1 >= typedArrayData.size) return@forEachIndexed
+
+            val type = typedArrayData[offset]
+            if (type !in colorTypes) return@forEachIndexed
+
+            val originalColor = runCatching { result.getColor(index, Int.MIN_VALUE) }.getOrNull()
+                ?.takeIf { it != Int.MIN_VALUE }
+                ?: return@forEachIndexed
+
+            val attrName = runCatching { context.androidContext.resources.getResourceEntryName(attrId) }.getOrNull()
+            val shouldPatch = attrId in patchedAttrIds || shouldPatch(attrId, attrName, originalColor)
+            if (!shouldPatch) return@forEachIndexed
+
+            typedArrayData[offset + 1] = amoledBlack
+            if (patchedAttrIds.add(attrId)) {
+                context.log.verbose(
+                    "[AMOLED PATCH] Patched attrId 0x${attrId.toString(16)} (${attrName ?: "unknown"}) from 0x${originalColor.toUInt().toString(16)} to AMOLED black"
+                )
+            }
+        }
+    }
+
+    private fun patchProgrammaticColor(color: Int): Int {
+        return if (isNearBlackOpaque(color) && color != amoledBlack) amoledBlack else color
+    }
+
    override fun init() {
        if (!context.config.userInterface.forceAmoledTheme.get()) return

        onNextActivityCreate {
            context.androidContext.theme.javaClass
-                .getMethod("obtainStyledAttributes", IntArray::class.java)
-                .hook(HookStage.AFTER) { param ->
-                    val array = param.arg<IntArray>(0)
-                    val attrId = array[0]
-                    val result = param.getResult() as TypedArray
-                    val type = result.getType(0)
-                    if (type !in colorTypes) return@hook
-
-                    val originalColor = runCatching { result.getColor(0, Int.MIN_VALUE) }.getOrNull()
-                        ?.takeIf { it != Int.MIN_VALUE }
-                        ?: return@hook
-
-                    val attrName = runCatching { context.androidContext.resources.getResourceEntryName(attrId) }.getOrNull()
-                    val shouldPatch = attrId in patchedAttrIds || shouldPatch(attrId, attrName, originalColor)
-                    if (!shouldPatch) return@hook
-
-                    val typedArrayData = runCatching { result.getObjectField("mData") as IntArray }.getOrNull() ?: return@hook
-                    if (typedArrayData.size < 2) return@hook
-
-                    typedArrayData[1] = amoledBlack
-                    if (patchedAttrIds.add(attrId)) {
-                        context.log.verbose(
-                            "[AMOLED PATCH] Patched attrId 0x${attrId.toString(16)} (${attrName ?: "unknown"}) from 0x${originalColor.toUInt().toString(16)} to AMOLED black"
-                        )
-                    }
+                .hook("obtainStyledAttributes", HookStage.AFTER) { param ->
+                    val requestedAttrs = param.args().firstOrNull { it is IntArray } as? IntArray
+                    val result = param.getResult() as? TypedArray ?: return@hook
+                    patchTypedArray(result, requestedAttrs)
                }
+
+            context.androidContext.javaClass
+                .hook("obtainStyledAttributes", HookStage.AFTER) { param ->
+                    val requestedAttrs = param.args().firstOrNull { it is IntArray } as? IntArray
+                    val result = param.getResult() as? TypedArray ?: return@hook
+                    patchTypedArray(result, requestedAttrs)
+                }
+
+            View::class.java.hook("setBackgroundColor", HookStage.BEFORE) { param ->
+                val color = param.argNullable<Int>(0) ?: return@hook
+                val patched = patchProgrammaticColor(color)
+                if (patched != color) {
+                    param.setArg(0, patched)
+                }
+            }
+
+            ColorDrawable::class.java.hookConstructor(HookStage.BEFORE) { param ->
+                val color = param.argNullable<Int>(0) ?: return@hookConstructor
+                val patched = patchProgrammaticColor(color)
+                if (patched != color) {
+                    param.setArg(0, patched)
+                }
+            }
+
+            ColorDrawable::class.java.hook("setColor", HookStage.BEFORE) { param ->
+                val color = param.argNullable<Int>(0) ?: return@hook
+                val patched = patchProgrammaticColor(color)
+                if (patched != color) {
+                    param.setArg(0, patched)
+                }
+            }
        }
    }
 }
--- a/core/src/main/kotlin/me/eternal/purrfectsnap/core/features/impl/ui/MessageIndicators.kt
+++ b/core/src/main/kotlin/me/eternal/purrfectsnap/core/features/impl/ui/MessageIndicators.kt
@@ -137,4 +137,4 @@ class MessageIndicators : Feature("Message Indicators") {
            }
        }
    }
-}
+}
--- a/core/src/main/kotlin/me/eternal/purrfectsnap/core/features/impl/ui/SnapPreview.kt
+++ b/core/src/main/kotlin/me/eternal/purrfectsnap/core/features/impl/ui/SnapPreview.kt
@@ -28,6 +28,8 @@ class SnapPreview : Feature("SnapPreview") {
    private val bitmapCache = EvictingMap<String, Bitmap>(50) // filePath => bitmap

    private val fetchJobTab = randomTag()
+    private val previewHorizontalAdjustmentDp = 16
+    private val previewVerticalAdjustmentDp = 10

    override fun init() {
        if (!context.config.userInterface.snapPreview.get()) return
@@ -47,9 +49,11 @@ class SnapPreview : Feature("SnapPreview") {
        }

        onNextActivityCreate {
-            val (chatMediaCardHeight, chatMediaCardSnapMargin, chatMediaCardSnapMarginStartSdl) = context.userInterface.run {
-                Triple(dpToPx(60), dpToPx(10), dpToPx(15))
-            }
+            val chatMediaCardHeight = context.userInterface.dpToPx(60)
+            val chatMediaCardSnapMargin = context.userInterface.dpToPx(10)
+            val chatMediaCardSnapMarginStartSdl = context.userInterface.dpToPx(15)
+            val previewHorizontalAdjustment = context.userInterface.dpToPx(previewHorizontalAdjustmentDp)
+            val previewVerticalAdjustment = context.userInterface.dpToPx(previewVerticalAdjustmentDp)

            fun decodeMedia(file: File) = runCatching {
                bitmapCache.getOrPut(file.absolutePath) {
@@ -91,8 +95,8 @@ class SnapPreview : Feature("SnapPreview") {
                            val bitmap = bitmapCache[mediaFilePath] ?: return

                            canvas.drawBitmap(bitmap,
-                                canvas.width.toFloat() - bitmap.width - chatMediaCardSnapMarginStartSdl.toFloat() - chatMediaCardSnapMargin.toFloat(),
-                                (canvas.height - bitmap.height) / 2f,
+                                canvas.width.toFloat() - bitmap.width - chatMediaCardSnapMarginStartSdl.toFloat() - chatMediaCardSnapMargin.toFloat() + previewHorizontalAdjustment,
+                                (canvas.height - bitmap.height) / 2f + previewVerticalAdjustment,
                                null
                            )
                        }
@@ -101,4 +105,4 @@ class SnapPreview : Feature("SnapPreview") {
            }
        }
    }
-}
+}
--- a/core/src/main/kotlin/me/eternal/purrfectsnap/core/ui/ViewAppearanceHelper.kt
+++ b/core/src/main/kotlin/me/eternal/purrfectsnap/core/ui/ViewAppearanceHelper.kt
@@ -47,16 +47,31 @@ fun View.addForegroundDrawable(tag: String, drawable: Drawable) {
    updateForegroundDrawable()
 }

-fun View.triggerCloseTouchEvent() {
-    arrayOf(MotionEvent.ACTION_DOWN, MotionEvent.ACTION_UP).forEach {
-        this.dispatchTouchEvent(
-            MotionEvent.obtain(
-                SystemClock.uptimeMillis(),
-                SystemClock.uptimeMillis(),
-                it, 0f, 0f, 0
-            )
-        )
-    }
+fun View.dispatchSyntheticTap(x: Float, y: Float, tapDurationMs: Long = 50L) {
+    val downTime = SystemClock.uptimeMillis()
+    val downEvent = MotionEvent.obtain(downTime, downTime, MotionEvent.ACTION_DOWN, x, y, 0)
+    dispatchTouchEvent(downEvent)
+    downEvent.recycle()
+
+    val upEvent = MotionEvent.obtain(downTime, downTime + tapDurationMs, MotionEvent.ACTION_UP, x, y, 0)
+    dispatchTouchEvent(upEvent)
+    upEvent.recycle()
+}
+
+fun View.triggerCloseTouchEvent(x: Float = 0f, y: Float = 0f, tapDurationMs: Long = 50L) {
+    dispatchSyntheticTap(x, y, tapDurationMs)
+}
+
+fun View.triggerCloseTouchEventAtFraction(
+    xFraction: Float,
+    yFraction: Float = 0.5f,
+    tapDurationMs: Long = 50L
+) {
+    val targetWidth = width.takeIf { it > 0 } ?: measuredWidth
+    val targetHeight = height.takeIf { it > 0 } ?: measuredHeight
+    val x = if (targetWidth > 0) targetWidth * xFraction.coerceIn(0f, 1f) else 0f
+    val y = if (targetHeight > 0) targetHeight * yFraction.coerceIn(0f, 1f) else 0f
+    triggerCloseTouchEvent(x, y, tapDurationMs)
 }

 fun Activity.triggerRootCloseTouchEvent() {
--- a/core/src/main/kotlin/me/eternal/purrfectsnap/core/ui/menu/impl/OperaViewerIcons.kt
+++ b/core/src/main/kotlin/me/eternal/purrfectsnap/core/ui/menu/impl/OperaViewerIcons.kt
@@ -45,6 +45,7 @@ import me.eternal.purrfectsnap.core.ui.iterateParent
 import me.eternal.purrfectsnap.core.ui.menu.AbstractMenu
 import me.eternal.purrfectsnap.core.ui.randomTag
 import me.eternal.purrfectsnap.core.ui.triggerCloseTouchEvent
+import me.eternal.purrfectsnap.core.ui.triggerCloseTouchEventAtFraction
 import me.eternal.purrfectsnap.core.util.SNAPCHAT_13_80_VERSION
 import me.eternal.purrfectsnap.core.util.hook.HookStage
 import me.eternal.purrfectsnap.core.util.hook.hook
@@ -259,23 +260,113 @@ class OperaViewerIcons : AbstractMenu() {
            visibleRect.width() > 0
    }

-    private fun hasVisibleOpenLayout(view: View): Boolean {
+    private fun findVisibleOpenLayout(view: View): View? {
        if (view.javaClass.hasNameSuffixInHierarchy("OpenLayout") && isActuallyVisible(view)) {
-            return true
+            return view
        }

-        val viewGroup = view as? ViewGroup ?: return false
+        val viewGroup = view as? ViewGroup ?: return null
        for (index in 0 until viewGroup.childCount) {
-            if (hasVisibleOpenLayout(viewGroup.getChildAt(index))) {
-                return true
-            }
+            findVisibleOpenLayout(viewGroup.getChildAt(index))?.let { return it }
        }
-        return false
+        return null
+    }
+
+    private fun findVisibleModernViewerContainer(): View? {
+        val contentView = context.mainActivity?.findViewById<ViewGroup>(android.R.id.content) ?: return null
+        return findVisibleOpenLayout(contentView)
    }

    private fun hasVisibleModernViewerContainer(): Boolean {
-        val contentView = context.mainActivity?.findViewById<ViewGroup>(android.R.id.content) ?: return false
-        return hasVisibleOpenLayout(contentView)
+        return findVisibleModernViewerContainer() != null
+    }
+
+    private fun currentViewerMessageContext(mediaDownloader: MediaDownloader): OperaViewerMessageContext? {
+        return mediaDownloader.resolveViewerMessageContextFromParamMap()?.also {
+            viewerMessageContextState.value = it
+        } ?: viewerMessageContextState.value
+    }
+
+    private fun hasViewerAdvanced(
+        mediaDownloader: MediaDownloader,
+        originalMessageContext: OperaViewerMessageContext
+    ): Boolean {
+        if (!hasVisibleModernViewerContainer()) {
+            return true
+        }
+
+        return currentViewerMessageContext(mediaDownloader)?.let { it != originalMessageContext } == true
+    }
+
+    private suspend fun waitForViewerAdvance(
+        mediaDownloader: MediaDownloader,
+        originalMessageContext: OperaViewerMessageContext,
+        timeoutMs: Long
+    ): Boolean {
+        var elapsedMs = 0L
+        while (elapsedMs < timeoutMs) {
+            delay(40)
+            elapsedMs += 40
+            if (hasViewerAdvanced(mediaDownloader, originalMessageContext)) {
+                return true
+            }
+        }
+
+        return hasViewerAdvanced(mediaDownloader, originalMessageContext)
+    }
+
+    private fun dispatchLegacySkipGesture(parent: ViewGroup?) {
+        if (parent != null) {
+            var touchedParent = false
+            parent.iterateParent {
+                touchedParent = true
+                it.triggerCloseTouchEvent()
+                false
+            }
+            if (touchedParent) return
+        }
+
+        context.mainActivity
+            ?.findViewById<View>(android.R.id.content)
+            ?.triggerCloseTouchEvent()
+    }
+
+    private fun dispatchForwardHotZoneTap(target: View?, xFraction: Float) {
+        target?.triggerCloseTouchEventAtFraction(xFraction = xFraction, yFraction = 0.5f)
+    }
+
+    private suspend fun skipMarkedSnap(
+        parent: ViewGroup?,
+        mediaDownloader: MediaDownloader,
+        originalMessageContext: OperaViewerMessageContext
+    ) {
+        val contentView = context.mainActivity?.findViewById<ViewGroup>(android.R.id.content)
+        val skipAttempts = listOf<suspend () -> Unit>(
+            {
+                dispatchLegacySkipGesture(parent)
+            },
+            {
+                dispatchForwardHotZoneTap(findVisibleModernViewerContainer() ?: contentView, 0.88f)
+            },
+            {
+                dispatchForwardHotZoneTap(contentView ?: findVisibleModernViewerContainer(), 0.88f)
+            },
+            {
+                val target = findVisibleModernViewerContainer() ?: contentView
+                dispatchForwardHotZoneTap(target, 0.88f)
+                delay(55)
+                if (!hasViewerAdvanced(mediaDownloader, originalMessageContext)) {
+                    dispatchForwardHotZoneTap(target, 0.94f)
+                }
+            }
+        )
+
+        for ((index, attempt) in skipAttempts.withIndex()) {
+            attempt()
+            if (waitForViewerAdvance(mediaDownloader, originalMessageContext, if (index == 0) 120L else 180L)) {
+                return
+            }
+        }
    }

    private fun Class<*>?.hasNameSuffixInHierarchy(suffix: String): Boolean {
@@ -326,7 +417,8 @@ class OperaViewerIcons : AbstractMenu() {
    }

    private suspend fun markCurrentSnapAsSeen(parent: ViewGroup?) {
-        val messageContext = resolveCurrentMessageContext(context.feature(MediaDownloader::class)) ?: return
+        val mediaDownloader = context.feature(MediaDownloader::class)
+        val messageContext = resolveCurrentMessageContext(mediaDownloader) ?: return
        val result = context.feature(AutoMarkAsRead::class).markSnapAsSeen(
            messageContext.conversationId,
            messageContext.clientMessageId
@@ -335,16 +427,7 @@ class OperaViewerIcons : AbstractMenu() {
        if (result == "DUPLICATEREQUEST" || result == null) {
            if (context.config.messaging.skipWhenMarkingAsSeen.get()) {
                withContext(Dispatchers.Main) {
-                    if (parent != null) {
-                        parent.iterateParent {
-                            it.triggerCloseTouchEvent()
-                            false
-                        }
-                    } else {
-                        context.mainActivity
-                            ?.findViewById<View>(android.R.id.content)
-                            ?.triggerCloseTouchEvent()
-                    }
+                    skipMarkedSnap(parent, mediaDownloader, messageContext)
                }
            }
        }
--- a/core/src/main/kotlin/me/eternal/purrfectsnap/core/wrapper/impl/ConversationManager.kt
+++ b/core/src/main/kotlin/me/eternal/purrfectsnap/core/wrapper/impl/ConversationManager.kt
@@ -117,18 +117,29 @@ class ConversationManager(
            set("mServerConversationId",  conversationId.toSnapUUID().instanceNonNull())
            set("mServerMessageId", serverMessageId)
        }
+        val conversationUuid = conversationId.toSnapUUID().instanceNonNull()

-        fetchMessageByServerId.invoke(
-            instanceNonNull(),
-            serverMessageIdentifier,
-            CallbackBuilder(getCallbackClass("FetchMessageCallback"))
-                .override("onFetchMessageComplete") { param ->
-                    onSuccess(Message(param.arg(0)))
-                }
-                .override("onError") {
-                    onError(it.arg<Any>(0).toString())
-                }.build()
-        )
+        val callback = CallbackBuilder(getCallbackClass("FetchMessageCallback"))
+            .override("onFetchMessageComplete") { param ->
+                onSuccess(Message(param.arg(0)))
+            }
+            .override("onError") {
+                onError(it.arg<Any>(0).toString())
+            }.build()
+
+        val args = fetchMessageByServerId.parameterTypes.mapIndexed { index, parameterType ->
+            when {
+                parameterType.isInstance(serverMessageIdentifier) -> serverMessageIdentifier
+                parameterType.isInstance(callback) -> callback
+                parameterType.isInstance(conversationUuid) -> conversationUuid
+                parameterType == Boolean::class.javaPrimitiveType || parameterType == Boolean::class.javaObjectType -> false
+                else -> throw IllegalStateException(
+                    "Unsupported fetchMessageByServerId parameter at index $index: ${parameterType.name}"
+                )
+            }
+        }.toTypedArray()
+
+        fetchMessageByServerId.invoke(instanceNonNull(), *args)
    }

    fun fetchMessagesByServerIds(conversationId: String, serverMessageIds: List<Long>, onSuccess: (List<Message>) -> Unit, onError: (error: String) -> Unit) {
--- a/gradle.properties
+++ b/gradle.properties
@@ -7,10 +7,11 @@ org.gradle.configuration-cache=true
 org.gradle.configuration-cache.problems=warn
 nativeAbis=arm64-v8a

-APP_VERSION_NAME=1.4.5
-APP_VERSION_CODE=285
+APP_VERSION_NAME=1.5.3
+APP_VERSION_CODE=298
 debug_build_hash=18fe2a814d0e2eb5
 psIntegrityPinnedSha256=
 EXPECTED_CERT_SHA256=0f188cb17d8ea4902ee15ce98f4928ba4226a4790fa3c52f62d776b08e46ca1c
 android.disallowKotlinSourceSets=false
 android.sourceset.disallowProvider=false
+ksp.incremental=false
Author	SHA1	Message	Date
ΞTΞRNAL	dbbc52b67f	v1.5.3	2026-03-25 21:59:31 +05:30
ΞTΞRNAL	b7c8042a93	Merge branch 'dev' of https://github.com/particle-box/PurrfectSnap into dev	2026-03-24 03:37:30 +05:30
ΞTΞRNAL	141b5e16a0	feat: continuous snap feature!	2026-03-24 03:36:39 +05:30
ΞTΞRNAL	901e4f81b8	fix: Missing changes	2026-03-22 20:32:16 +05:30
ΞTΞRNAL	a4e86b5ab4	fix(PR): Aphelion task page layout optimization by Kaladin Aphelion task page layout optimization	2026-03-22 20:31:25 +05:30
ΞTΞRNAL	bdc6d12739	fix: splitting issue for snaps sent through send override	2026-03-22 20:30:34 +05:30
DarkKnight2122	6c8d5297c8	Task page layout harmonization.	2026-03-22 19:43:20 +05:30
ΞTΞRNAL	7a8ad81d48	v1.5.0	2026-03-21 16:40:54 +05:30
ΞTΞRNAL	7db60d6eb1	fix: skip when marking as seen for newer snap versions	2026-03-21 11:39:59 +05:30
ΞTΞRNAL	565a8b8287	v1.4.9	2026-03-21 03:48:43 +05:30
ΞTΞRNAL	1c612ebc8e	fix: force AMOLED theme for newer snap versions	2026-03-21 02:09:33 +05:30
ΞTΞRNAL	8db363a8f0	add missing changelog	2026-03-20 22:19:18 +05:30
ΞTΞRNAL	4fab5cc4ab	fix(PR): Crash when using the theme button in android 11 & 12 by Kaladin fix: Crash when using the theme button in android 11 & 12.	2026-03-20 22:18:12 +05:30
ΞTΞRNAL	a7a15702f3	v1.4.8	2026-03-20 22:16:37 +05:30
DarkKnight2122	04aaefc748	fix: optimize theme reveal fallbacks for Android 11 and 12	2026-03-20 19:22:55 +05:30
ΞTΞRNAL	58c4be44f2	v1.4.6	2026-03-20 05:05:25 +05:30