fix: Resolve merge conflicts with main and integrate trackCustomMasking

Move trackCustomMasking() to SentryMaskingOptions as an abstract method
so it can be called polymorphically from replay view hierarchy code.
SentryReplayOptions provides the real implementation, while
SentryScreenshotOptions provides a no-op. Also adds
CAMERAX_PREVIEW_VIEW_CLASS_NAME to SentryMaskingOptions.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Author: romtsn

sentry-android-core/api/sentry-android-core.api

@@ -455,6 +455,7 @@ public final class io/sentry/android/core/SentryPerformanceProvider {
 public final class io/sentry/android/core/SentryScreenshotOptions : io/sentry/SentryMaskingOptions {
 	public fun <init> ()V
 	public fun setMaskAllImages (Z)V
+	public fun trackCustomMasking ()V
 }
 
 public class io/sentry/android/core/SentryUserFeedbackButton : android/widget/Button {

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

@@ -19,6 +19,11 @@ public SentryScreenshotOptions() {
     // maskViewClasses starts empty, so nothing is masked by default.
   }
 
+  @Override
+  public void trackCustomMasking() {
+    // No-op for screenshots, custom masking tracking is only relevant for session replay.
+  }
+
   /**
    * {@inheritDoc}
    *

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") {
-      options.sessionReplay.trackCustomMasking()
+      options.trackCustomMasking()
       return false
     }
 
     if (sentryPrivacyModifier == "mask") {
-      options.sessionReplay.trackCustomMasking()
+      options.trackCustomMasking()
       return true
     }
 

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

@@ -291,15 +291,15 @@ internal sealed class ViewHierarchyNode(
         (tag as? String)?.lowercase()?.contains(SENTRY_UNMASK_TAG) == true ||
           getTag(R.id.sentry_privacy) == "unmask"
       ) {
-        options.sessionReplay.trackCustomMasking()
+        options.trackCustomMasking()
         return false
       }
 
       if (
         (tag as? String)?.lowercase()?.contains(SENTRY_MASK_TAG) == true ||
           getTag(R.id.sentry_privacy) == "mask"
       ) {
-        options.sessionReplay.trackCustomMasking()
+        options.trackCustomMasking()
         return true
       }
 

sentry/api/sentry.api

@@ -3368,6 +3368,7 @@ public abstract class io/sentry/SentryMaskingOptions {
 	public fun setMaskAllText (Z)V
 	public fun setMaskViewContainerClass (Ljava/lang/String;)V
 	public fun setUnmaskViewContainerClass (Ljava/lang/String;)V
+	public abstract fun trackCustomMasking ()V
 }
 
 public final class io/sentry/SentryMetricsEvent : io/sentry/JsonSerializable, io/sentry/JsonUnknown {
@@ -3928,6 +3929,8 @@ public final class io/sentry/SentryReplayOptions : io/sentry/SentryMaskingOption
 	public static final field MAX_NETWORK_BODY_SIZE I
 	public fun <init> (Ljava/lang/Double;Ljava/lang/Double;Lio/sentry/protocol/SdkVersion;)V
 	public fun <init> (ZLio/sentry/protocol/SdkVersion;)V
+	public fun addMaskViewClass (Ljava/lang/String;)V
+	public fun addUnmaskViewClass (Ljava/lang/String;)V
 	public fun getErrorReplayDuration ()J
 	public fun getFrameRate ()I
 	public fun getNetworkDetailAllowUrls ()Ljava/util/List;
@@ -3948,6 +3951,8 @@ public final class io/sentry/SentryReplayOptions : io/sentry/SentryMaskingOption
 	public fun isSessionReplayForErrorsEnabled ()Z
 	public fun isTrackConfiguration ()Z
 	public fun setDebug (Z)V
+	public fun setMaskAllImages (Z)V
+	public fun setMaskAllText (Z)V
 	public fun setNetworkCaptureBodies (Z)V
 	public fun setNetworkDetailAllowUrls (Ljava/util/List;)V
 	public fun setNetworkDetailDenyUrls (Ljava/util/List;)V

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

@@ -2,6 +2,7 @@
 
 import java.util.Set;
 import java.util.concurrent.CopyOnWriteArraySet;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -119,4 +120,8 @@ public void setMaskViewContainerClass(@NotNull String containerClass) {
   public void setUnmaskViewContainerClass(@NotNull String containerClass) {
     unmaskViewContainerClass = containerClass;
   }
+
+  /** Hook for subclasses to track custom masking usage. */
+  @ApiStatus.Internal
+  public abstract void trackCustomMasking();
 }

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

@@ -297,7 +297,7 @@ public long getSessionDuration() {
     return sessionDuration;
   }
 
-  @ApiStatus.Internal
+  @Override
   public void trackCustomMasking() {
     if (!customMaskingTracked) {
       customMaskingTracked = true;