fix slop

Author: markushi

sentry-android-replay/src/main/java/io/sentry/android/replay/viewhierarchy/ComposeViewHierarchyNode.kt

@@ -85,12 +85,12 @@ internal object ComposeViewHierarchyNode {
   ): Boolean {
     val sentryPrivacyModifier = this?.getOrNull(SentryReplayModifiers.SentryPrivacy)
     if (sentryPrivacyModifier == "unmask") {
-      SentryReplayOptions.trackCustomMasking()
+      options.sessionReplay.trackCustomMasking()
       return false
     }
 
     if (sentryPrivacyModifier == "mask") {
-      SentryReplayOptions.trackCustomMasking()
+      options.sessionReplay.trackCustomMasking()
       return true
     }
 

sentry-android-replay/src/main/java/io/sentry/android/replay/viewhierarchy/ViewHierarchyNode.kt

@@ -8,7 +8,6 @@ import android.view.ViewParent
 import android.widget.ImageView
 import android.widget.TextView
 import io.sentry.SentryOptions
-import io.sentry.SentryReplayOptions
 import io.sentry.android.replay.R
 import io.sentry.android.replay.util.AndroidTextLayout
 import io.sentry.android.replay.util.TextLayout
@@ -292,15 +291,15 @@ internal sealed class ViewHierarchyNode(
         (tag as? String)?.lowercase()?.contains(SENTRY_UNMASK_TAG) == true ||
           getTag(R.id.sentry_privacy) == "unmask"
       ) {
-        SentryReplayOptions.trackCustomMasking()
+        options.sessionReplay.trackCustomMasking()
         return false
       }
 
       if (
         (tag as? String)?.lowercase()?.contains(SENTRY_MASK_TAG) == true ||
           getTag(R.id.sentry_privacy) == "mask"
       ) {
-        SentryReplayOptions.trackCustomMasking()
+        options.sessionReplay.trackCustomMasking()
         return true
       }
 

sentry/api/sentry.api

@@ -3953,6 +3953,7 @@ public final class io/sentry/SentryReplayOptions {
 	public fun setSessionSampleRate (Ljava/lang/Double;)V
 	public fun setTrackConfiguration (Z)V
 	public fun setUnmaskViewContainerClass (Ljava/lang/String;)V
+	public fun trackCustomMasking ()V
 }
 
 public final class io/sentry/SentryReplayOptions$SentryReplayQuality : java/lang/Enum {

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

@@ -15,12 +15,11 @@
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.annotations.TestOnly;
 
 public final class SentryReplayOptions {
 
   private static final String CUSTOM_MASKING_INTEGRATION_NAME = "ReplayCustomMasking";
-  private static volatile boolean customMaskingTracked = false;
+  private volatile boolean customMaskingTracked = false;
 
   public static final String TEXT_VIEW_CLASS_NAME = "android.widget.TextView";
   public static final String IMAGE_VIEW_CLASS_NAME = "android.widget.ImageView";
@@ -382,18 +381,13 @@ public void setUnmaskViewContainerClass(@NotNull String containerClass) {
   }
 
   @ApiStatus.Internal
-  public static void trackCustomMasking() {
+  public void trackCustomMasking() {
     if (!customMaskingTracked) {
       customMaskingTracked = true;
       addIntegrationToSdkVersion(CUSTOM_MASKING_INTEGRATION_NAME);
     }
   }
 
-  @TestOnly
-  public static void resetCustomMaskingTracked() {
-    customMaskingTracked = false;
-  }
-
   @ApiStatus.Internal
   public boolean isTrackConfiguration() {
     return trackConfiguration;

sentry/src/test/java/io/sentry/SentryReplayOptionsTest.kt

@@ -11,7 +11,6 @@ class SentryReplayOptionsTest {
   @BeforeTest
   fun setup() {
     SentryIntegrationPackageStorage.getInstance().clearStorage()
-    SentryReplayOptions.resetCustomMaskingTracked()
   }
 
   @Test
@@ -177,16 +176,11 @@ class SentryReplayOptionsTest {
     assertFalse(hasCustomMaskingIntegration())
   }
 
-  @Test
-  fun `trackCustomMasking adds ReplayCustomMasking integration`() {
-    SentryReplayOptions.trackCustomMasking()
-    assertTrue(hasCustomMaskingIntegration())
-  }
-
   @Test
   fun `trackCustomMasking only adds integration once`() {
-    SentryReplayOptions.trackCustomMasking()
-    SentryReplayOptions.trackCustomMasking()
+    val options = SentryReplayOptions(false, null)
+    options.setMaskAllText(true)
+    options.setMaskAllImages(true)
     assertTrue(hasCustomMaskingIntegration())
     assertEquals(
       1,