Skip to content

Commit 69e5d56

Browse files
romtsnromtsn
committed
Clean up slop
1 parent 2b8e4aa commit 69e5d56

File tree

4 files changed

+39
-30
lines changed

4 files changed

+39
-30
lines changed

‎sentry-android-core/src/main/java/io/sentry/android/core/SentryScreenshotOptions.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ public void setMaskAllImages(final boolean maskAllImages) {
4343
private void addSensitiveViewClasses() {
4444
addMaskViewClass(WEB_VIEW_CLASS_NAME);
4545
addMaskViewClass(VIDEO_VIEW_CLASS_NAME);
46+
addMaskViewClass(CAMERAX_PREVIEW_VIEW_CLASS_NAME);
4647
addMaskViewClass(ANDROIDX_MEDIA_VIEW_CLASS_NAME);
4748
addMaskViewClass(EXOPLAYER_CLASS_NAME);
4849
addMaskViewClass(EXOPLAYER_STYLED_CLASS_NAME);
@@ -51,6 +52,7 @@ private void addSensitiveViewClasses() {
5152
private void removeSensitiveViewClasses() {
5253
getMaskViewClasses().remove(WEB_VIEW_CLASS_NAME);
5354
getMaskViewClasses().remove(VIDEO_VIEW_CLASS_NAME);
55+
getMaskViewClasses().remove(CAMERAX_PREVIEW_VIEW_CLASS_NAME);
5456
getMaskViewClasses().remove(ANDROIDX_MEDIA_VIEW_CLASS_NAME);
5557
getMaskViewClasses().remove(EXOPLAYER_CLASS_NAME);
5658
getMaskViewClasses().remove(EXOPLAYER_STYLED_CLASS_NAME);

‎sentry/api/sentry.api‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3357,6 +3357,10 @@ public abstract class io/sentry/SentryMaskingOptions {
33573357
public static final field TEXT_VIEW_CLASS_NAME Ljava/lang/String;
33583358
public static final field VIDEO_VIEW_CLASS_NAME Ljava/lang/String;
33593359
public static final field WEB_VIEW_CLASS_NAME Ljava/lang/String;
3360+
protected field maskViewClasses Ljava/util/Set;
3361+
protected field maskViewContainerClass Ljava/lang/String;
3362+
protected field unmaskViewClasses Ljava/util/Set;
3363+
protected field unmaskViewContainerClass Ljava/lang/String;
33603364
public fun <init> ()V
33613365
public fun addMaskViewClass (Ljava/lang/String;)V
33623366
public fun addUnmaskViewClass (Ljava/lang/String;)V

‎sentry/src/main/java/io/sentry/SentryMaskingOptions.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public abstract class SentryMaskingOptions {
3232
*
3333
* <p>Default is empty.
3434
*/
35-
private Set<String> maskViewClasses = new CopyOnWriteArraySet<>();
35+
protected Set<String> maskViewClasses = new CopyOnWriteArraySet<>();
3636

3737
/**
3838
* Ignore all views with the specified class names from masking. The class name is the fully
@@ -44,13 +44,13 @@ public abstract class SentryMaskingOptions {
4444
*
4545
* <p>Default is empty.
4646
*/
47-
private Set<String> unmaskViewClasses = new CopyOnWriteArraySet<>();
47+
protected Set<String> unmaskViewClasses = new CopyOnWriteArraySet<>();
4848

4949
/** The class name of the view container that masks all of its children. */
50-
private @Nullable String maskViewContainerClass = null;
50+
protected @Nullable String maskViewContainerClass = null;
5151

5252
/** The class name of the view container that unmasks its direct children. */
53-
private @Nullable String unmaskViewContainerClass = null;
53+
protected @Nullable String unmaskViewContainerClass = null;
5454

5555
/**
5656
* Mask all text content. Draws a rectangle of text bounds with text color on top. By default only
@@ -60,10 +60,10 @@ public abstract class SentryMaskingOptions {
6060
*/
6161
public void setMaskAllText(final boolean maskAllText) {
6262
if (maskAllText) {
63-
addMaskViewClass(TEXT_VIEW_CLASS_NAME);
63+
maskViewClasses.add(TEXT_VIEW_CLASS_NAME);
6464
unmaskViewClasses.remove(TEXT_VIEW_CLASS_NAME);
6565
} else {
66-
addUnmaskViewClass(TEXT_VIEW_CLASS_NAME);
66+
unmaskViewClasses.add(TEXT_VIEW_CLASS_NAME);
6767
maskViewClasses.remove(TEXT_VIEW_CLASS_NAME);
6868
}
6969
}
@@ -78,10 +78,10 @@ public void setMaskAllText(final boolean maskAllText) {
7878
*/
7979
public void setMaskAllImages(final boolean maskAllImages) {
8080
if (maskAllImages) {
81-
addMaskViewClass(IMAGE_VIEW_CLASS_NAME);
81+
maskViewClasses.add(IMAGE_VIEW_CLASS_NAME);
8282
unmaskViewClasses.remove(IMAGE_VIEW_CLASS_NAME);
8383
} else {
84-
addUnmaskViewClass(IMAGE_VIEW_CLASS_NAME);
84+
unmaskViewClasses.add(IMAGE_VIEW_CLASS_NAME);
8585
maskViewClasses.remove(IMAGE_VIEW_CLASS_NAME);
8686
}
8787
}

‎sentry/src/main/java/io/sentry/SentryReplayOptions.java‎

Lines changed: 25 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ public final class SentryReplayOptions extends SentryMaskingOptions {
1919

2020
private static final String CUSTOM_MASKING_INTEGRATION_NAME = "ReplayCustomMasking";
2121
private volatile boolean customMaskingTracked = false;
22-
private boolean defaultsInitialized = false;
2322

2423
/**
2524
* Maximum size in bytes for network request/response bodies to be captured in replays. Bodies
@@ -175,15 +174,15 @@ public enum SentryReplayQuality {
175174

176175
public SentryReplayOptions(final boolean empty, final @Nullable SdkVersion sdkVersion) {
177176
if (!empty) {
178-
setMaskAllText(true);
179-
setMaskAllImages(true);
180-
addMaskViewClass(WEB_VIEW_CLASS_NAME);
181-
addMaskViewClass(VIDEO_VIEW_CLASS_NAME);
182-
addMaskViewClass(CAMERAX_PREVIEW_VIEW_CLASS_NAME);
183-
addMaskViewClass(ANDROIDX_MEDIA_VIEW_CLASS_NAME);
184-
addMaskViewClass(EXOPLAYER_CLASS_NAME);
185-
addMaskViewClass(EXOPLAYER_STYLED_CLASS_NAME);
186-
defaultsInitialized = true;
177+
// Add default mask classes directly without setting usingCustomMasking flag
178+
maskViewClasses.add(TEXT_VIEW_CLASS_NAME);
179+
maskViewClasses.add(IMAGE_VIEW_CLASS_NAME);
180+
maskViewClasses.add(WEB_VIEW_CLASS_NAME);
181+
maskViewClasses.add(VIDEO_VIEW_CLASS_NAME);
182+
maskViewClasses.add(CAMERAX_PREVIEW_VIEW_CLASS_NAME);
183+
maskViewClasses.add(ANDROIDX_MEDIA_VIEW_CLASS_NAME);
184+
maskViewClasses.add(EXOPLAYER_CLASS_NAME);
185+
maskViewClasses.add(EXOPLAYER_STYLED_CLASS_NAME);
187186
this.sdkVersion = sdkVersion;
188187
}
189188
}
@@ -238,34 +237,38 @@ public void setSessionSampleRate(final @Nullable Double sessionSampleRate) {
238237

239238
@Override
240239
public void setMaskAllText(final boolean maskAllText) {
241-
if (!maskAllText && defaultsInitialized) {
240+
if (maskAllText) {
241+
maskViewClasses.add(TEXT_VIEW_CLASS_NAME);
242+
unmaskViewClasses.remove(TEXT_VIEW_CLASS_NAME);
243+
} else {
242244
trackCustomMasking();
245+
unmaskViewClasses.add(TEXT_VIEW_CLASS_NAME);
246+
maskViewClasses.remove(TEXT_VIEW_CLASS_NAME);
243247
}
244-
super.setMaskAllText(maskAllText);
245248
}
246249

247250
@Override
248251
public void setMaskAllImages(final boolean maskAllImages) {
249-
if (!maskAllImages && defaultsInitialized) {
252+
if (maskAllImages) {
253+
maskViewClasses.add(IMAGE_VIEW_CLASS_NAME);
254+
unmaskViewClasses.remove(IMAGE_VIEW_CLASS_NAME);
255+
} else {
250256
trackCustomMasking();
257+
unmaskViewClasses.add(IMAGE_VIEW_CLASS_NAME);
258+
maskViewClasses.remove(IMAGE_VIEW_CLASS_NAME);
251259
}
252-
super.setMaskAllImages(maskAllImages);
253260
}
254261

255262
@Override
256263
public void addMaskViewClass(final @NotNull String className) {
257-
if (defaultsInitialized) {
258-
trackCustomMasking();
259-
}
260-
super.addMaskViewClass(className);
264+
trackCustomMasking();
265+
this.maskViewClasses.add(className);
261266
}
262267

263268
@Override
264269
public void addUnmaskViewClass(final @NotNull String className) {
265-
if (defaultsInitialized) {
266-
trackCustomMasking();
267-
}
268-
super.addUnmaskViewClass(className);
270+
trackCustomMasking();
271+
this.unmaskViewClasses.add(className);
269272
}
270273

271274
@ApiStatus.Internal

0 commit comments

Comments
 (0)