Skip to content
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
- There were cases where we created options that ended up unused but we failed to clean those up.
- No longer log a warning if a logging integration cannot initialize Sentry due to missing DSN ([#5075](https://github.com/getsentry/sentry-java/pull/5075))
- While this may have been useful to some, it caused lots of confusion.
- Session Replay: Add `androidx.camera.view.PreviewView` to default `maskedViewClasses` to mask camera previews by default. ([#5097](https://github.com/getsentry/sentry-java/pull/5097))

### Dependencies

Expand Down
3 changes: 3 additions & 0 deletions sentry-android-replay/proguard-rules.pro
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,6 @@
-keepnames class com.google.android.exoplayer2.ui.PlayerView
-dontwarn com.google.android.exoplayer2.ui.StyledPlayerView
-keepnames class com.google.android.exoplayer2.ui.StyledPlayerView
# Rules to detect a PreviewView view to later mask it
-dontwarn androidx.camera.view.PreviewView
-keepnames class androidx.camera.view.PreviewView
Original file line number Diff line number Diff line change
Expand Up @@ -437,6 +437,7 @@ class SessionCaptureStrategyTest {
"android.widget.TextView",
"android.webkit.WebView",
"android.widget.VideoView",
"androidx.camera.view.PreviewView",
"androidx.media3.ui.PlayerView",
"com.google.android.exoplayer2.ui.PlayerView",
"com.google.android.exoplayer2.ui.StyledPlayerView",
Expand Down
2 changes: 1 addition & 1 deletion sentry/api/sentry.api
Original file line number Diff line number Diff line change
Expand Up @@ -3904,6 +3904,7 @@ public final class io/sentry/SentryReplayEvent$ReplayType$Deserializer : io/sent

public final class io/sentry/SentryReplayOptions {
public static final field ANDROIDX_MEDIA_VIEW_CLASS_NAME Ljava/lang/String;
public static final field CAMERAX_PREVIEW_VIEW_CLASS_NAME Ljava/lang/String;
public static final field EXOPLAYER_CLASS_NAME Ljava/lang/String;
public static final field EXOPLAYER_STYLED_CLASS_NAME Ljava/lang/String;
public static final field IMAGE_VIEW_CLASS_NAME Ljava/lang/String;
Expand Down Expand Up @@ -7937,4 +7938,3 @@ public final class io/sentry/vendor/gson/stream/MalformedJsonException : java/io
public fun <init> (Ljava/lang/String;Ljava/lang/Throwable;)V
public fun <init> (Ljava/lang/Throwable;)V
}

2 changes: 2 additions & 0 deletions sentry/src/main/java/io/sentry/SentryReplayOptions.java
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ public final class SentryReplayOptions {
public static final String IMAGE_VIEW_CLASS_NAME = "android.widget.ImageView";
public static final String WEB_VIEW_CLASS_NAME = "android.webkit.WebView";
public static final String VIDEO_VIEW_CLASS_NAME = "android.widget.VideoView";
public static final String CAMERAX_PREVIEW_VIEW_CLASS_NAME = "androidx.camera.view.PreviewView";
public static final String ANDROIDX_MEDIA_VIEW_CLASS_NAME = "androidx.media3.ui.PlayerView";
public static final String EXOPLAYER_CLASS_NAME = "com.google.android.exoplayer2.ui.PlayerView";
public static final String EXOPLAYER_STYLED_CLASS_NAME =
Expand Down Expand Up @@ -219,6 +220,7 @@ public SentryReplayOptions(final boolean empty, final @Nullable SdkVersion sdkVe
maskViewClasses.add(IMAGE_VIEW_CLASS_NAME);
maskViewClasses.add(WEB_VIEW_CLASS_NAME);
maskViewClasses.add(VIDEO_VIEW_CLASS_NAME);
maskViewClasses.add(CAMERAX_PREVIEW_VIEW_CLASS_NAME);
maskViewClasses.add(ANDROIDX_MEDIA_VIEW_CLASS_NAME);
maskViewClasses.add(EXOPLAYER_CLASS_NAME);
maskViewClasses.add(EXOPLAYER_STYLED_CLASS_NAME);
Expand Down
Loading