Merge ceb7654 into b936425

romtsn · web-flow · commit ac09909a1fee · 2026-06-08T11:03:45.000Z
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## Unreleased
+
+### Fixes
+
+- Session Replay: Fix `VerifyError` in Compose masking under DexGuard/R8 obfuscation ([#5507](https://github.com/getsentry/sentry-java/pull/5507))
+
 ## 8.43.1
 
 ### Fixes
diff --git a/sentry-android-replay/src/main/java/io/sentry/android/replay/util/Nodes.kt b/sentry-android-replay/src/main/java/io/sentry/android/replay/util/Nodes.kt
@@ -2,15 +2,17 @@
 
 package io.sentry.android.replay.util
 
-import android.graphics.Rect
 import androidx.compose.ui.geometry.Offset
+import androidx.compose.ui.geometry.Rect
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.ColorProducer
 import androidx.compose.ui.graphics.painter.Painter
 import androidx.compose.ui.layout.LayoutCoordinates
 import androidx.compose.ui.layout.findRootCoordinates
 import androidx.compose.ui.node.LayoutNode
 import androidx.compose.ui.text.TextLayoutResult
+import kotlin.math.ceil
+import kotlin.math.floor
 import kotlin.math.roundToInt
 
 internal class ComposeTextLayout(internal val layout: TextLayoutResult) : TextLayout {
@@ -176,7 +178,7 @@ internal fun LayoutCoordinates.boundsInWindow(rootCoordinates: LayoutCoordinates
   val boundsBottom = bounds.bottom.fastCoerceIn(0f, rootHeight)
 
   if (boundsLeft == boundsRight || boundsTop == boundsBottom) {
-    return Rect()
+    return Rect(0.0f, 0.0f, 0.0f, 0.0f)
   }
 
   val topLeft = root.localToWindow(Offset(boundsLeft, boundsTop))
@@ -200,5 +202,18 @@ internal fun LayoutCoordinates.boundsInWindow(rootCoordinates: LayoutCoordinates
   val top = fastMinOf(topLeftY, topRightY, bottomLeftY, bottomRightY)
   val bottom = fastMaxOf(topLeftY, topRightY, bottomLeftY, bottomRightY)
 
-  return Rect(left.toInt(), top.toInt(), right.toInt(), bottom.toInt())
+  return Rect(left, top, right, bottom)
+}
+
+internal fun Rect.toRect(): android.graphics.Rect {
+  // Round outward (floor min edges, ceil max edges) so that a sub-pixel but non-empty Rect doesn't
+  // collapse to a zero-width/height android.graphics.Rect. Otherwise a node could be marked visible
+  // and maskable based on the float bounds, while the integer rect the MaskRenderer draws has zero
+  // area, leaving sensitive content unmasked. Rounding outward also biases toward over-masking.
+  return android.graphics.Rect(
+    floor(left).toInt(),
+    floor(top).toInt(),
+    ceil(right).toInt(),
+    ceil(bottom).toInt(),
+  )
 }
diff --git a/sentry-android-replay/src/main/java/io/sentry/android/replay/viewhierarchy/ComposeViewHierarchyNode.kt b/sentry-android-replay/src/main/java/io/sentry/android/replay/viewhierarchy/ComposeViewHierarchyNode.kt
@@ -27,6 +27,7 @@ import io.sentry.android.replay.util.findPainter
 import io.sentry.android.replay.util.findTextColor
 import io.sentry.android.replay.util.isMaskable
 import io.sentry.android.replay.util.toOpaque
+import io.sentry.android.replay.util.toRect
 import io.sentry.android.replay.viewhierarchy.ViewHierarchyNode.GenericViewHierarchyNode
 import io.sentry.android.replay.viewhierarchy.ViewHierarchyNode.ImageViewHierarchyNode
 import io.sentry.android.replay.viewhierarchy.ViewHierarchyNode.TextViewHierarchyNode
@@ -150,8 +151,8 @@ internal object ComposeViewHierarchyNode {
       // If we're unable to retrieve the semantics configuration
       // we should play safe and mask the whole node.
       return GenericViewHierarchyNode(
-        x = visibleRect.left.toFloat(),
-        y = visibleRect.top.toFloat(),
+        x = visibleRect.left,
+        y = visibleRect.top,
         width = node.width,
         height = node.height,
         elevation = (parent?.elevation ?: 0f),
@@ -161,17 +162,17 @@ internal object ComposeViewHierarchyNode {
         isImportantForContentCapture = false, // will be set by children
         isVisible =
           !SentryLayoutNodeHelper.isTransparent(node) &&
-            visibleRect.height() > 0 &&
-            visibleRect.width() > 0,
-        visibleRect = visibleRect,
+            visibleRect.height > 0 &&
+            visibleRect.width > 0,
+        visibleRect = visibleRect.toRect(),
       )
     }
 
     val isVisible =
       !SentryLayoutNodeHelper.isTransparent(node) &&
         (semantics == null || !semantics.contains(SemanticsProperties.InvisibleToUser)) &&
-        visibleRect.height() > 0 &&
-        visibleRect.width() > 0
+        visibleRect.height > 0 &&
+        visibleRect.width > 0
     val isEditable =
       semantics?.contains(SemanticsActions.SetText) == true ||
         semantics?.contains(SemanticsProperties.EditableText) == true
@@ -206,8 +207,8 @@ internal object ComposeViewHierarchyNode {
               null
             },
           dominantColor = textColor?.toArgb()?.toOpaque(),
-          x = visibleRect.left.toFloat(),
-          y = visibleRect.top.toFloat(),
+          x = visibleRect.left,
+          y = visibleRect.top,
           width = node.width,
           height = node.height,
           elevation = (parent?.elevation ?: 0f),
@@ -216,7 +217,7 @@ internal object ComposeViewHierarchyNode {
           shouldMask = shouldMask,
           isImportantForContentCapture = true,
           isVisible = isVisible,
-          visibleRect = visibleRect,
+          visibleRect = visibleRect.toRect(),
         )
       }
       else -> {
@@ -226,8 +227,8 @@ internal object ComposeViewHierarchyNode {
 
           parent?.setImportantForCaptureToAncestors(true)
           ImageViewHierarchyNode(
-            x = visibleRect.left.toFloat(),
-            y = visibleRect.top.toFloat(),
+            x = visibleRect.left,
+            y = visibleRect.top,
             width = node.width,
             height = node.height,
             elevation = (parent?.elevation ?: 0f),
@@ -236,7 +237,7 @@ internal object ComposeViewHierarchyNode {
             isVisible = isVisible,
             isImportantForContentCapture = true,
             shouldMask = shouldMask && painter.isMaskable(),
-            visibleRect = visibleRect,
+            visibleRect = visibleRect.toRect(),
           )
         } else {
           val shouldMask = isVisible && semantics.shouldMask(isImage = false, options)
@@ -245,8 +246,8 @@ internal object ComposeViewHierarchyNode {
           // TODO: traverse the ViewHierarchyNode here again. For now we can recommend
           // TODO: using custom modifiers to obscure the entire node if it's sensitive
           GenericViewHierarchyNode(
-            x = visibleRect.left.toFloat(),
-            y = visibleRect.top.toFloat(),
+            x = visibleRect.left,
+            y = visibleRect.top,
             width = node.width,
             height = node.height,
             elevation = (parent?.elevation ?: 0f),
@@ -255,7 +256,7 @@ internal object ComposeViewHierarchyNode {
             shouldMask = shouldMask,
             isImportantForContentCapture = false, // will be set by children
             isVisible = isVisible,
-            visibleRect = visibleRect,
+            visibleRect = visibleRect.toRect(),
           )
         }
       }
