@datadog/mobile-react-native-session-replay 2.4.2-alpha.0 → 2.4.4-alpha.0

package/DatadogSDKReactNativeSessionReplay.podspec

@@ -19,7 +19,7 @@ Pod::Spec.new do |s|
   s.dependency "React-Core"
 
   # /!\ Remember to keep the version in sync with DatadogSDKReactNative.podspec
-  s.dependency 'DatadogSessionReplay', '~> 2.14.1'
+  s.dependency 'DatadogSessionReplay', '~> 2.18.0'
   s.dependency 'DatadogSDKReactNative'
 
   s.test_spec 'Tests' do |test_spec|

package/android/build.gradle

@@ -12,7 +12,7 @@ buildscript {
   }
 
   dependencies {
-    classpath 'com.android.tools.build:gradle:7.2.2'
+    classpath 'com.android.tools.build:gradle:7.3.1'
     // noinspection DifferentKotlinGradleVersion
     classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     classpath "org.jlleitschuh.gradle:ktlint-gradle:11.5.1"
@@ -96,15 +96,19 @@ def getExtOrIntegerDefault(name) {
 android {
   compileSdkVersion getExtOrIntegerDefault('compileSdkVersion')
   buildToolsVersion getExtOrDefault('buildToolsVersion')
+
   def agpVersion = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION
+
   if (agpVersion.tokenize('.')[0].toInteger() >= 7) {
     namespace = "com.datadog.reactnative.sessionreplay"
   }
+
   if (agpVersion.tokenize('.')[0].toInteger() >= 8) {
     buildFeatures {
       buildConfig = true
     }
   }
+
   if (agpVersion.tokenize('.')[0].toInteger() < 8) {
     compileOptions {
       sourceCompatibility JavaVersion.VERSION_11
@@ -150,10 +154,6 @@ android {
   lintOptions {
     disable 'GradleCompatible'
   }
-  compileOptions {
-    sourceCompatibility JavaVersion.VERSION_11
-    targetCompatibility JavaVersion.VERSION_11
-  }
 }
 
 repositories {
@@ -188,7 +188,7 @@ dependencies {
     api "com.facebook.react:react-android:$reactNativeVersion"
   }
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-  implementation "com.datadoghq:dd-sdk-android-session-replay:2.11.0"
+  implementation "com.datadoghq:dd-sdk-android-session-replay:2.14.0"
   implementation project(path: ':datadog_mobile-react-native')
 
   testImplementation "org.junit.platform:junit-platform-launcher:1.6.2"

package/android/gradle.properties

@@ -1,4 +1,4 @@
-DatadogSDKReactNativeSessionReplay_kotlinVersion=1.7.21
+DatadogSDKReactNativeSessionReplay_kotlinVersion=1.8.21
 DatadogSDKReactNativeSessionReplay_compileSdkVersion=33
 DatadogSDKReactNativeSessionReplay_buildToolsVersion=33.0.0
 DatadogSDKReactNativeSessionReplay_targetSdkVersion=33

package/android/src/main/kotlin/com/datadog/reactnative/sessionreplay/DdSessionReplayImplementation.kt

@@ -6,10 +6,11 @@
 
 package com.datadog.reactnative.sessionreplay
 
-import com.datadog.android.Datadog
 import com.datadog.android.api.feature.FeatureSdkCore
+import com.datadog.android.sessionreplay.ImagePrivacy
 import com.datadog.android.sessionreplay.SessionReplayConfiguration
-import com.datadog.android.sessionreplay.SessionReplayPrivacy
+import com.datadog.android.sessionreplay.TextAndInputPrivacy
+import com.datadog.android.sessionreplay.TouchPrivacy
 import com.datadog.reactnative.DatadogSDKWrapperStorage
 import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReactContext
@@ -34,7 +35,7 @@ class DdSessionReplayImplementation(
         val sdkCore = DatadogSDKWrapperStorage.getSdkCore() as FeatureSdkCore
         val logger = sdkCore.internalLogger
         val configuration = SessionReplayConfiguration.Builder(replaySampleRate.toFloat())
-            .setPrivacy(buildPrivacy(defaultPrivacyLevel))
+            .configurePrivacy(defaultPrivacyLevel)
             .addExtensionSupport(ReactNativeSessionReplayExtensionSupport(reactContext, logger))
 
         if (customEndpoint != "") {
@@ -45,16 +46,30 @@ class DdSessionReplayImplementation(
         promise.resolve(null)
     }
 
-    private fun buildPrivacy(defaultPrivacyLevel: String): SessionReplayPrivacy {
-        return when (defaultPrivacyLevel?.lowercase(Locale.US)) {
-            "mask" -> SessionReplayPrivacy.MASK
-            "mask_user_input" -> SessionReplayPrivacy.MASK_USER_INPUT
-            "allow" -> SessionReplayPrivacy.ALLOW
-            else -> {
-                SessionReplayPrivacy.MASK
+    @Deprecated("Privacy should be set with separate properties mapped to " +
+            "`setImagePrivacy`, `setTouchPrivacy`, `setTextAndInputPrivacy`, but they are" +
+            " currently unavailable.")
+    private fun SessionReplayConfiguration.Builder.configurePrivacy(
+        defaultPrivacyLevel: String
+    ): SessionReplayConfiguration.Builder {
+        when (defaultPrivacyLevel.lowercase(Locale.US)) {
+            "mask" -> {
+                this.setTextAndInputPrivacy(TextAndInputPrivacy.MASK_ALL)
+                this.setImagePrivacy(ImagePrivacy.MASK_ALL)
+                this.setTouchPrivacy(TouchPrivacy.HIDE)
+            }
+            "mask_user_input" -> {
+                this.setTextAndInputPrivacy(TextAndInputPrivacy.MASK_ALL_INPUTS)
+                this.setImagePrivacy(ImagePrivacy.MASK_NONE)
+                this.setTouchPrivacy(TouchPrivacy.HIDE)
+            }
+            "allow" -> {
+                this.setTextAndInputPrivacy(TextAndInputPrivacy.MASK_SENSITIVE_INPUTS)
+                this.setImagePrivacy(ImagePrivacy.MASK_NONE)
+                this.setTouchPrivacy(TouchPrivacy.SHOW)
             }
         }
-
+        return this
     }
 
     companion object {

package/android/src/test/kotlin/com/datadog/reactnative/sessionreplay/DdSessionReplayImplementationTest.kt

@@ -6,17 +6,20 @@
 
 package com.datadog.reactnative.sessionreplay
 
+import com.datadog.android.sessionreplay.ImagePrivacy
 import com.datadog.android.sessionreplay.SessionReplayConfiguration
 import com.datadog.android.sessionreplay.SessionReplayPrivacy
+import com.datadog.android.sessionreplay.TextAndInputPrivacy
+import com.datadog.android.sessionreplay.TouchPrivacy
 import com.datadog.tools.unit.GenericAssert.Companion.assertThat
 import com.facebook.react.bridge.NativeModule
 import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReactContext
 import com.facebook.react.uimanager.UIManagerModule
 import fr.xgouchet.elmyr.annotation.DoubleForgery
-import fr.xgouchet.elmyr.annotation.Forgery
 import fr.xgouchet.elmyr.annotation.StringForgery
 import fr.xgouchet.elmyr.junit5.ForgeExtension
+import java.util.Locale
 import org.junit.jupiter.api.AfterEach
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
@@ -67,10 +70,33 @@ internal class DdSessionReplayImplementationTest {
     }
 
     @Test
-    fun `M enable session replay W enable()`(
+    fun `M enable session replay W privacy = ALLOW`(
         @DoubleForgery(min = 0.0, max = 100.0) replaySampleRate: Double,
-        @Forgery privacy: SessionReplayPrivacy,
         @StringForgery(regex = ".+") customEndpoint: String
+    ) {
+        testSessionReplayEnable("ALLOW", replaySampleRate, customEndpoint)
+    }
+
+    @Test
+    fun `M enable session replay W privacy = MASK`(
+        @DoubleForgery(min = 0.0, max = 100.0) replaySampleRate: Double,
+        @StringForgery(regex = ".+") customEndpoint: String
+    ) {
+        testSessionReplayEnable("MASK", replaySampleRate, customEndpoint)
+    }
+
+    @Test
+    fun `M enable session replay W privacy = MASK_USER_INPUT`(
+        @DoubleForgery(min = 0.0, max = 100.0) replaySampleRate: Double,
+        @StringForgery(regex = ".+") customEndpoint: String
+    ) {
+        testSessionReplayEnable("MASK_USER_INPUT", replaySampleRate, customEndpoint)
+    }
+
+    private fun testSessionReplayEnable(
+        privacy: String,
+        replaySampleRate: Double,
+        customEndpoint: String
     ) {
         // Given
         val sessionReplayConfigCaptor = argumentCaptor<SessionReplayConfiguration>()
@@ -78,7 +104,7 @@ internal class DdSessionReplayImplementationTest {
         // When
         testedSessionReplay.enable(
             replaySampleRate,
-            privacy.toString(),
+            privacy,
             customEndpoint,
             mockPromise
         )
@@ -87,8 +113,31 @@ internal class DdSessionReplayImplementationTest {
         verify(mockSessionReplay).enable(sessionReplayConfigCaptor.capture(), any())
         assertThat(sessionReplayConfigCaptor.firstValue)
             .hasFieldEqualTo("sampleRate", replaySampleRate.toFloat())
-            .hasFieldEqualTo("privacy", privacy)
             .hasFieldEqualTo("customEndpointUrl", customEndpoint)
+
+        when (privacy.lowercase(Locale.US)) {
+            "mask_user_input" -> {
+                assertThat(sessionReplayConfigCaptor.firstValue)
+                    .hasFieldEqualTo("textAndInputPrivacy", TextAndInputPrivacy.MASK_ALL_INPUTS)
+                    .hasFieldEqualTo("imagePrivacy", ImagePrivacy.MASK_NONE)
+                    .hasFieldEqualTo("touchPrivacy", TouchPrivacy.HIDE)
+            }
+            "allow" -> {
+                assertThat(sessionReplayConfigCaptor.firstValue)
+                    .hasFieldEqualTo(
+                        "textAndInputPrivacy",
+                        TextAndInputPrivacy.MASK_SENSITIVE_INPUTS
+                    )
+                    .hasFieldEqualTo("imagePrivacy", ImagePrivacy.MASK_NONE)
+                    .hasFieldEqualTo("touchPrivacy", TouchPrivacy.SHOW)
+            }
+            else -> {
+                assertThat(sessionReplayConfigCaptor.firstValue)
+                    .hasFieldEqualTo("textAndInputPrivacy", TextAndInputPrivacy.MASK_ALL)
+                    .hasFieldEqualTo("imagePrivacy", ImagePrivacy.MASK_ALL)
+                    .hasFieldEqualTo("touchPrivacy", TouchPrivacy.HIDE)
+            }
+        }
     }
 
     @Test

package/ios/Sources/RCTTextViewRecorder.swift

@@ -11,7 +11,7 @@ import React
 
 internal class RCTTextViewRecorder: SessionReplayNodeRecorder {
     internal var textObfuscator: (SessionReplayViewTreeRecordingContext) -> SessionReplayTextObfuscating = { context in
-        return context.recorder.privacy.staticTextObfuscator
+        return context.recorder.textAndInputPrivacy.staticTextObfuscator
     }
 
     internal var identifier = UUID()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@datadog/mobile-react-native-session-replay",
-  "version": "2.4.2-alpha.0",
+  "version": "2.4.4-alpha.0",
   "description": "A client-side React Native module to enable session replay with Datadog",
   "keywords": [
     "datadog",