Merge 92de082 into 41fa056

romtsn · web-flow · commit ae1cec9addf2 · 2026-03-02T11:06:20.000Z
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -31,6 +31,7 @@
 ### Fixes
 
 - Fix crash when unregistering `SystemEventsBroadcastReceiver` with try-catch block. ([#5106](https://github.com/getsentry/sentry-java/pull/5106))
+- Use `peekDecorView` instead of `getDecorView` in `SentryGestureListener` to avoid forcing view hierarchy construction ([#5134](https://github.com/getsentry/sentry-java/pull/5134))
 
 ### Dependencies
 
diff --git a/sentry-android-core/src/main/java/io/sentry/android/core/internal/gestures/SentryGestureListener.java b/sentry-android-core/src/main/java/io/sentry/android/core/internal/gestures/SentryGestureListener.java
@@ -347,7 +347,7 @@ void applyScope(final @NotNull IScope scope, final @NotNull ITransaction transac
       return null;
     }
 
-    final View decorView = window.getDecorView();
+    final View decorView = window.peekDecorView();
     if (decorView == null) {
       options
           .getLogger()
diff --git a/sentry-android-core/src/test/java/io/sentry/android/core/internal/gestures/SentryGestureListenerPeekDecorViewTest.kt b/sentry-android-core/src/test/java/io/sentry/android/core/internal/gestures/SentryGestureListenerPeekDecorViewTest.kt
@@ -0,0 +1,48 @@
+package io.sentry.android.core.internal.gestures
+
+import android.app.Activity
+import android.view.MotionEvent
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import io.sentry.Breadcrumb
+import io.sentry.IScopes
+import io.sentry.android.core.SentryAndroidOptions
+import io.sentry.util.LazyEvaluator
+import kotlin.test.Test
+import kotlin.test.assertNull
+import org.junit.runner.RunWith
+import org.mockito.kotlin.any
+import org.mockito.kotlin.anyOrNull
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.never
+import org.mockito.kotlin.verify
+import org.robolectric.Robolectric.buildActivity
+
+@RunWith(AndroidJUnit4::class)
+class SentryGestureListenerPeekDecorViewTest {
+
+  @Test
+  fun `does not force decor view creation when peekDecorView returns null`() {
+    // A plain Activity that never calls setContentView — peekDecorView() should return null
+    val activity = buildActivity(Activity::class.java).create().get()
+
+    // Sanity check: decor view has not been created yet
+    assertNull(activity.window.peekDecorView())
+
+    val scopes = mock<IScopes>()
+    val options =
+      SentryAndroidOptions().apply {
+        isEnableUserInteractionBreadcrumbs = true
+        gestureTargetLocators = listOf(AndroidViewGestureTargetLocator(LazyEvaluator { true }))
+        dsn = "https://key@sentry.io/proj"
+      }
+
+    val sut = SentryGestureListener(activity, scopes, options)
+    sut.onSingleTapUp(mock<MotionEvent>())
+
+    // The key assertion: peekDecorView is still null — we did not force view hierarchy creation
+    assertNull(activity.window.peekDecorView())
+
+    // And no breadcrumb was captured
+    verify(scopes, never()).addBreadcrumb(any<Breadcrumb>(), anyOrNull())
+  }
+}
diff --git a/sentry-android-core/src/test/java/io/sentry/android/core/internal/gestures/ViewHelpers.kt b/sentry-android-core/src/test/java/io/sentry/android/core/internal/gestures/ViewHelpers.kt
@@ -22,7 +22,7 @@ internal inline fun <reified T : View> Window.mockDecorView(
   finalize: (T) -> Unit = {},
 ): T {
   val view = mockView(id, event, touchWithinBounds, clickable, visible, context, finalize)
-  whenever(decorView).doReturn(view)
+  whenever(peekDecorView()).doReturn(view)
   return view
 }
 

Original file line number	Diff line number	Diff line change
`@@ -347,7 +347,7 @@ void applyScope(final @NotNull IScope scope, final @NotNull ITransaction transac`
`347`	`347`	`return null;`
`348`	`348`	`}`
`349`	`349`
`350`		`- final View decorView = window.getDecorView();`
	`350`	`+ final View decorView = window.peekDecorView();`
`351`	`351`	`if (decorView == null) {`
`352`	`352`	`options`
`353`	`353`	`.getLogger()`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ internal inline fun <reified T : View> Window.mockDecorView(`
`22`	`22`	`finalize: (T) -> Unit = {},`
`23`	`23`	`): T {`
`24`	`24`	`val view = mockView(id, event, touchWithinBounds, clickable, visible, context, finalize)`
`25`		`- whenever(decorView).doReturn(view)`
	`25`	`+ whenever(peekDecorView()).doReturn(view)`
`26`	`26`	`return view`
`27`	`27`	`}`
`28`	`28`