Determine recording size based on active window (#4354)

* Determine recording size based on active window

* Extend sample app with Dialog

* Update Changelog

* Use onPreDrawListener instead of onDrawListener for determining window size

* fix(replay): Fix window tracking (#4419)

* fix(replay): Fix window tracking

* api dump

* Fix Changelog

* Fix tests

* [SR] Remove configuration from start() method (#4454)

* Remove configuration from start() method

* Open up onConfigurationChanged for Hybrid SDKs

* Address logging concerns

* Format code

* Cache last known config

* Update sentry-android-replay/src/main/java/io/sentry/android/replay/capture/BaseCaptureStrategy.kt

Co-authored-by: Roman Zavarnitsyn <[email protected]>

* Fix order

* Fix compile issue

---------

Co-authored-by: Sentry Github Bot <[email protected]>
Co-authored-by: Roman Zavarnitsyn <[email protected]>

---------

Co-authored-by: Roman Zavarnitsyn <[email protected]>
Co-authored-by: Sentry Github Bot <[email protected]>

Author: 3 people

CHANGELOG.md

@@ -15,6 +15,7 @@
 - Session Replay: Fix crash on devices with the Unisoc/Spreadtrum T606 chipset ([#4477](https://github.com/getsentry/sentry-java/pull/4477))
 - Session Replay: Fix masking of non-styled `Text` Composables ([#4361](https://github.com/getsentry/sentry-java/pull/4361))
 - Session Replay: Fix masking read-only `TextField` Composables ([#4362](https://github.com/getsentry/sentry-java/pull/4362))
+- Correctly capture Dialogs and non full-sized windows ([#4354](https://github.com/getsentry/sentry-java/pull/4354))
 
 ## 7.22.5
 

sentry-android-replay/api/sentry-android-replay.api

@@ -34,49 +34,47 @@ public final class io/sentry/android/replay/ModifierExtensionsKt {
 }
 
 public abstract interface class io/sentry/android/replay/Recorder : java/io/Closeable {
+	public abstract fun onConfigurationChanged (Lio/sentry/android/replay/ScreenshotRecorderConfig;)V
 	public abstract fun pause ()V
+	public abstract fun reset ()V
 	public abstract fun resume ()V
-	public abstract fun start (Lio/sentry/android/replay/ScreenshotRecorderConfig;)V
+	public abstract fun start ()V
 	public abstract fun stop ()V
 }
 
 public final class io/sentry/android/replay/ReplayCache : java/io/Closeable {
 	public static final field $stable I
-	public static final field Companion Lio/sentry/android/replay/ReplayCache$Companion;
 	public fun <init> (Lio/sentry/SentryOptions;Lio/sentry/protocol/SentryId;)V
 	public final fun addFrame (Ljava/io/File;JLjava/lang/String;)V
 	public static synthetic fun addFrame$default (Lio/sentry/android/replay/ReplayCache;Ljava/io/File;JLjava/lang/String;ILjava/lang/Object;)V
 	public fun close ()V
 	public final fun createVideoOf (JJIIIIILjava/io/File;)Lio/sentry/android/replay/GeneratedVideo;
 	public static synthetic fun createVideoOf$default (Lio/sentry/android/replay/ReplayCache;JJIIIIILjava/io/File;ILjava/lang/Object;)Lio/sentry/android/replay/GeneratedVideo;
-	public final fun persistSegmentValues (Ljava/lang/String;Ljava/lang/String;)V
-	public final fun rotate (J)Ljava/lang/String;
 }
 
-public final class io/sentry/android/replay/ReplayCache$Companion {
-	public final fun makeReplayCacheDir (Lio/sentry/SentryOptions;Lio/sentry/protocol/SentryId;)Ljava/io/File;
-}
-
-public final class io/sentry/android/replay/ReplayIntegration : android/content/ComponentCallbacks, io/sentry/IConnectionStatusProvider$IConnectionStatusObserver, io/sentry/Integration, io/sentry/ReplayController, io/sentry/android/replay/ScreenshotRecorderCallback, io/sentry/android/replay/gestures/TouchRecorderCallback, io/sentry/transport/RateLimiter$IRateLimitObserver, java/io/Closeable {
+public final class io/sentry/android/replay/ReplayIntegration : io/sentry/IConnectionStatusProvider$IConnectionStatusObserver, io/sentry/Integration, io/sentry/ReplayController, io/sentry/android/replay/ScreenshotRecorderCallback, io/sentry/android/replay/WindowCallback, io/sentry/android/replay/gestures/TouchRecorderCallback, io/sentry/transport/RateLimiter$IRateLimitObserver, java/io/Closeable {
 	public static final field $stable I
 	public fun <init> (Landroid/content/Context;Lio/sentry/transport/ICurrentDateProvider;)V
-	public fun <init> (Landroid/content/Context;Lio/sentry/transport/ICurrentDateProvider;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;)V
-	public synthetic fun <init> (Landroid/content/Context;Lio/sentry/transport/ICurrentDateProvider;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> (Landroid/content/Context;Lio/sentry/transport/ICurrentDateProvider;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;)V
+	public synthetic fun <init> (Landroid/content/Context;Lio/sentry/transport/ICurrentDateProvider;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public fun captureReplay (Ljava/lang/Boolean;)V
 	public fun close ()V
+	public fun disableDebugMaskingOverlay ()V
+	public fun enableDebugMaskingOverlay ()V
 	public fun getBreadcrumbConverter ()Lio/sentry/ReplayBreadcrumbConverter;
 	public final fun getReplayCacheDir ()Ljava/io/File;
 	public fun getReplayId ()Lio/sentry/protocol/SentryId;
+	public fun isDebugMaskingOverlayEnabled ()Z
 	public fun isRecording ()Z
-	public fun onConfigurationChanged (Landroid/content/res/Configuration;)V
+	public final fun onConfigurationChanged (Lio/sentry/android/replay/ScreenshotRecorderConfig;)V
 	public fun onConnectionStatusChanged (Lio/sentry/IConnectionStatusProvider$ConnectionStatus;)V
-	public fun onLowMemory ()V
 	public fun onRateLimitChanged (Lio/sentry/transport/RateLimiter;)V
 	public fun onScreenshotRecorded (Landroid/graphics/Bitmap;)V
 	public fun onScreenshotRecorded (Ljava/io/File;J)V
 	public fun onTouchEvent (Landroid/view/MotionEvent;)V
+	public fun onWindowSizeChanged (II)V
 	public fun pause ()V
-	public fun register (Lio/sentry/IHub;Lio/sentry/SentryOptions;)V
+	public fun register (Lio/sentry/IScopes;Lio/sentry/SentryOptions;)V
 	public fun resume ()V
 	public fun setBreadcrumbConverter (Lio/sentry/ReplayBreadcrumbConverter;)V
 	public fun start ()V
@@ -90,7 +88,6 @@ public abstract interface class io/sentry/android/replay/ScreenshotRecorderCallb
 
 public final class io/sentry/android/replay/ScreenshotRecorderConfig {
 	public static final field $stable I
-	public static final field Companion Lio/sentry/android/replay/ScreenshotRecorderConfig$Companion;
 	public fun <init> (IIFFII)V
 	public final fun component1 ()I
 	public final fun component2 ()I
@@ -111,10 +108,6 @@ public final class io/sentry/android/replay/ScreenshotRecorderConfig {
 	public fun toString ()Ljava/lang/String;
 }
 
-public final class io/sentry/android/replay/ScreenshotRecorderConfig$Companion {
-	public final fun from (Landroid/content/Context;Lio/sentry/SentryReplayOptions;)Lio/sentry/android/replay/ScreenshotRecorderConfig;
-}
-
 public final class io/sentry/android/replay/SentryReplayModifiers {
 	public static final field $stable I
 	public static final field INSTANCE Lio/sentry/android/replay/SentryReplayModifiers;
@@ -133,36 +126,14 @@ public final class io/sentry/android/replay/ViewExtensionsKt {
 	public static final fun sentryReplayUnmask (Landroid/view/View;)V
 }
 
-public final class io/sentry/android/replay/gestures/GestureRecorder : io/sentry/android/replay/OnRootViewsChangedListener {
-	public static final field $stable I
-	public fun <init> (Lio/sentry/SentryOptions;Lio/sentry/android/replay/gestures/TouchRecorderCallback;)V
-	public fun onRootViewsChanged (Landroid/view/View;Z)V
-	public final fun stop ()V
-}
-
-public final class io/sentry/android/replay/gestures/ReplayGestureConverter {
-	public static final field $stable I
-	public fun <init> (Lio/sentry/transport/ICurrentDateProvider;)V
-	public final fun convert (Landroid/view/MotionEvent;Lio/sentry/android/replay/ScreenshotRecorderConfig;)Ljava/util/List;
+public abstract interface class io/sentry/android/replay/WindowCallback {
+	public abstract fun onWindowSizeChanged (II)V
 }
 
 public abstract interface class io/sentry/android/replay/gestures/TouchRecorderCallback {
 	public abstract fun onTouchEvent (Landroid/view/MotionEvent;)V
 }
 
-public final class io/sentry/android/replay/util/AndroidTextLayout : io/sentry/android/replay/util/TextLayout {
-	public static final field $stable I
-	public fun <init> (Landroid/text/Layout;)V
-	public fun getDominantTextColor ()Ljava/lang/Integer;
-	public fun getEllipsisCount (I)I
-	public fun getLineBottom (I)I
-	public fun getLineCount ()I
-	public fun getLineStart (I)I
-	public fun getLineTop (I)I
-	public fun getLineVisibleEnd (I)I
-	public fun getPrimaryHorizontal (II)F
-}
-
 public class io/sentry/android/replay/util/FixedWindowCallback : android/view/Window$Callback {
 	public final field delegate Landroid/view/Window$Callback;
 	public fun <init> (Landroid/view/Window$Callback;)V
@@ -193,82 +164,3 @@ public class io/sentry/android/replay/util/FixedWindowCallback : android/view/Wi
 	public fun onWindowStartingActionMode (Landroid/view/ActionMode$Callback;I)Landroid/view/ActionMode;
 }
 
-public abstract interface class io/sentry/android/replay/util/TextLayout {
-	public abstract fun getDominantTextColor ()Ljava/lang/Integer;
-	public abstract fun getEllipsisCount (I)I
-	public abstract fun getLineBottom (I)I
-	public abstract fun getLineCount ()I
-	public abstract fun getLineStart (I)I
-	public abstract fun getLineTop (I)I
-	public abstract fun getLineVisibleEnd (I)I
-	public abstract fun getPrimaryHorizontal (II)F
-}
-
-public abstract interface class io/sentry/android/replay/video/SimpleFrameMuxer {
-	public abstract fun getVideoTime ()J
-	public abstract fun isStarted ()Z
-	public abstract fun muxVideoFrame (Ljava/nio/ByteBuffer;Landroid/media/MediaCodec$BufferInfo;)V
-	public abstract fun release ()V
-	public abstract fun start (Landroid/media/MediaFormat;)V
-}
-
-public final class io/sentry/android/replay/video/SimpleMp4FrameMuxer : io/sentry/android/replay/video/SimpleFrameMuxer {
-	public static final field $stable I
-	public fun <init> (Ljava/lang/String;F)V
-	public fun getVideoTime ()J
-	public fun isStarted ()Z
-	public fun muxVideoFrame (Ljava/nio/ByteBuffer;Landroid/media/MediaCodec$BufferInfo;)V
-	public fun release ()V
-	public fun start (Landroid/media/MediaFormat;)V
-}
-
-public abstract class io/sentry/android/replay/viewhierarchy/ViewHierarchyNode {
-	public static final field $stable I
-	public static final field Companion Lio/sentry/android/replay/viewhierarchy/ViewHierarchyNode$Companion;
-	public synthetic fun <init> (FFIIFILio/sentry/android/replay/viewhierarchy/ViewHierarchyNode;ZZZLandroid/graphics/Rect;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public synthetic fun <init> (FFIIFILio/sentry/android/replay/viewhierarchy/ViewHierarchyNode;ZZZLandroid/graphics/Rect;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun getChildren ()Ljava/util/List;
-	public final fun getDistance ()I
-	public final fun getElevation ()F
-	public final fun getHeight ()I
-	public final fun getParent ()Lio/sentry/android/replay/viewhierarchy/ViewHierarchyNode;
-	public final fun getShouldMask ()Z
-	public final fun getVisibleRect ()Landroid/graphics/Rect;
-	public final fun getWidth ()I
-	public final fun getX ()F
-	public final fun getY ()F
-	public final fun isImportantForContentCapture ()Z
-	public final fun isObscured (Lio/sentry/android/replay/viewhierarchy/ViewHierarchyNode;)Z
-	public final fun isVisible ()Z
-	public final fun setChildren (Ljava/util/List;)V
-	public final fun setImportantForCaptureToAncestors (Z)V
-	public final fun setImportantForContentCapture (Z)V
-	public final fun traverse (Lkotlin/jvm/functions/Function1;)V
-}
-
-public final class io/sentry/android/replay/viewhierarchy/ViewHierarchyNode$Companion {
-	public final fun fromView (Landroid/view/View;Lio/sentry/android/replay/viewhierarchy/ViewHierarchyNode;ILio/sentry/SentryOptions;)Lio/sentry/android/replay/viewhierarchy/ViewHierarchyNode;
-}
-
-public final class io/sentry/android/replay/viewhierarchy/ViewHierarchyNode$GenericViewHierarchyNode : io/sentry/android/replay/viewhierarchy/ViewHierarchyNode {
-	public static final field $stable I
-	public fun <init> (FFIIFILio/sentry/android/replay/viewhierarchy/ViewHierarchyNode;ZZZLandroid/graphics/Rect;)V
-	public synthetic fun <init> (FFIIFILio/sentry/android/replay/viewhierarchy/ViewHierarchyNode;ZZZLandroid/graphics/Rect;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-}
-
-public final class io/sentry/android/replay/viewhierarchy/ViewHierarchyNode$ImageViewHierarchyNode : io/sentry/android/replay/viewhierarchy/ViewHierarchyNode {
-	public static final field $stable I
-	public fun <init> (FFIIFILio/sentry/android/replay/viewhierarchy/ViewHierarchyNode;ZZZLandroid/graphics/Rect;)V
-	public synthetic fun <init> (FFIIFILio/sentry/android/replay/viewhierarchy/ViewHierarchyNode;ZZZLandroid/graphics/Rect;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-}
-
-public final class io/sentry/android/replay/viewhierarchy/ViewHierarchyNode$TextViewHierarchyNode : io/sentry/android/replay/viewhierarchy/ViewHierarchyNode {
-	public static final field $stable I
-	public fun <init> (Lio/sentry/android/replay/util/TextLayout;Ljava/lang/Integer;IIFFIIFILio/sentry/android/replay/viewhierarchy/ViewHierarchyNode;ZZZLandroid/graphics/Rect;)V
-	public synthetic fun <init> (Lio/sentry/android/replay/util/TextLayout;Ljava/lang/Integer;IIFFIIFILio/sentry/android/replay/viewhierarchy/ViewHierarchyNode;ZZZLandroid/graphics/Rect;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun getDominantColor ()Ljava/lang/Integer;
-	public final fun getLayout ()Lio/sentry/android/replay/util/TextLayout;
-	public final fun getPaddingLeft ()I
-	public final fun getPaddingTop ()I
-}
-

sentry-android-replay/src/main/java/io/sentry/android/replay/Recorder.kt

@@ -8,11 +8,15 @@ interface Recorder : Closeable {
      * at which the screenshots should be taken, and the screenshots size/resolution, which can
      * change e.g. in the case of orientation change or window size change
      */
-    fun start(recorderConfig: ScreenshotRecorderConfig)
+    fun start()
+
+    fun onConfigurationChanged(config: ScreenshotRecorderConfig)
 
     fun resume()
 
     fun pause()
 
+    fun reset()
+
     fun stop()
 }