From 36d7b7887ad8bee1b839523133b0bc8ae7a5843c Mon Sep 17 00:00:00 2001
From: Maciek Grzybowski <maciek.grzybowski@datadoghq.com>
Date: Fri, 5 May 2023 16:26:17 +0200
Subject: [PATCH 1/7] REPLAY-1610 Centralise the classification of "sensitive
 text"

---
 .../Recorder/Utilities/UIKitExtensions.swift  | 36 +++++++++++++++++++
 .../NodeRecorders/UITextFieldRecorder.swift   |  4 +--
 .../NodeRecorders/UITextViewRecorder.swift    |  4 +--
 .../Tests/Mocks/UIKitMocks.swift              | 24 +++++++++++++
 .../Utilties/UIKitExtensionsTests.swift       | 30 ++++++++++++++++
 .../UITextFieldRecorderTests.swift            |  4 +--
 .../UITextViewRecorderTests.swift             |  4 +--
 7 files changed, 96 insertions(+), 10 deletions(-)

diff --git a/DatadogSessionReplay/Sources/Recorder/Utilities/UIKitExtensions.swift b/DatadogSessionReplay/Sources/Recorder/Utilities/UIKitExtensions.swift
index 5cb1587cd0..5e78617b60 100644
--- a/DatadogSessionReplay/Sources/Recorder/Utilities/UIKitExtensions.swift
+++ b/DatadogSessionReplay/Sources/Recorder/Utilities/UIKitExtensions.swift
@@ -15,3 +15,39 @@ internal extension UIView {
         }
     }
 }
+
+/// Sensitive text content types as defined in Session Replay.
+internal let sensitiveContentTypes: Set<UITextContentType> = {
+    var all: Set<UITextContentType> = [
+        .password,
+        .emailAddress,
+        .telephoneNumber,
+        .addressCity, .addressState, .addressCityAndState, .fullStreetAddress, .streetAddressLine1, .streetAddressLine2, .postalCode,
+        .creditCardNumber
+    ]
+
+    if #available(iOS 12.0, *) {
+        all.formUnion([.newPassword, .oneTimeCode])
+    }
+
+    return all
+}()
+
+internal extension UITextInputTraits {
+    /// Whether or not these input traits describe a "sensitive text" as we define it in Session Replay.
+    ///
+    /// Sensitive texts include:
+    /// - passwords, e-mails, phone numbers, address information, credit card numbers and one-time codes;
+    /// - all texts marked explicitly as secure entry.
+    var isSensitiveText: Bool {
+        if isSecureTextEntry == true {
+            return true
+        }
+
+        if let contentType = textContentType, let contentType = contentType {
+            return sensitiveContentTypes.contains(contentType)
+        }
+
+        return false
+    }
+}
diff --git a/DatadogSessionReplay/Sources/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UITextFieldRecorder.swift b/DatadogSessionReplay/Sources/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UITextFieldRecorder.swift
index 57937c9215..b136c92f1d 100644
--- a/DatadogSessionReplay/Sources/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UITextFieldRecorder.swift
+++ b/DatadogSessionReplay/Sources/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UITextFieldRecorder.swift
@@ -83,8 +83,6 @@ internal struct UITextFieldRecorder: NodeRecorder {
         let textFrame = attributes.frame
             .insetBy(dx: 5, dy: 5) // 5 points padding
 
-        let isSensitiveText = textField.isSecureTextEntry || textField.textContentType == .emailAddress || textField.textContentType == .telephoneNumber
-
         let builder = UITextFieldWireframesBuilder(
             wireframeRect: textFrame,
             attributes: attributes,
@@ -95,7 +93,7 @@ internal struct UITextFieldRecorder: NodeRecorder {
             isPlaceholderText: isPlaceholder,
             font: textField.font,
             fontScalingEnabled: textField.adjustsFontSizeToFitWidth,
-            textObfuscator: textObfuscator(context, isSensitiveText)
+            textObfuscator: textObfuscator(context, textField.isSensitiveText)
         )
         return Node(viewAttributes: attributes, wireframesBuilder: builder)
     }
diff --git a/DatadogSessionReplay/Sources/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UITextViewRecorder.swift b/DatadogSessionReplay/Sources/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UITextViewRecorder.swift
index a82f15668d..085c8b1bcb 100644
--- a/DatadogSessionReplay/Sources/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UITextViewRecorder.swift
+++ b/DatadogSessionReplay/Sources/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UITextViewRecorder.swift
@@ -27,8 +27,6 @@ internal struct UITextViewRecorder: NodeRecorder {
             return InvisibleElement.constant
         }
 
-        let isSensitiveText = textView.isSecureTextEntry || textView.textContentType == .emailAddress || textView.textContentType == .telephoneNumber
-
         let builder = UITextViewWireframesBuilder(
             wireframeID: context.ids.nodeID(for: textView),
             attributes: attributes,
@@ -36,7 +34,7 @@ internal struct UITextViewRecorder: NodeRecorder {
             textAlignment: textView.textAlignment,
             textColor: textView.textColor?.cgColor ?? UIColor.black.cgColor,
             font: textView.font,
-            textObfuscator: textObfuscator(context, isSensitiveText),
+            textObfuscator: textObfuscator(context, textView.isSensitiveText),
             contentRect: CGRect(origin: textView.contentOffset, size: textView.contentSize)
         )
         let node = Node(viewAttributes: attributes, wireframesBuilder: builder)
diff --git a/DatadogSessionReplay/Tests/Mocks/UIKitMocks.swift b/DatadogSessionReplay/Tests/Mocks/UIKitMocks.swift
index 1bb54596d8..1b784909cc 100644
--- a/DatadogSessionReplay/Tests/Mocks/UIKitMocks.swift
+++ b/DatadogSessionReplay/Tests/Mocks/UIKitMocks.swift
@@ -81,3 +81,27 @@ extension UIView.ContentMode {
         UIView.ContentMode(rawValue: Int.random(in: 0...12)) ?? .scaleToFill
     }
 }
+
+extension UITextContentType: RandomMockable {
+    static var allCases: Set<UITextContentType> {
+        var all: Set<UITextContentType> = [
+            .name, .namePrefix, .givenName, .middleName, .familyName, .nameSuffix, .nickname,
+            .jobTitle, .organizationName, .location, .fullStreetAddress, .streetAddressLine1,
+            .streetAddressLine2, .addressCity, .addressState, .addressCityAndState, .sublocality,
+            .countryName, .postalCode, .telephoneNumber, .emailAddress, .URL, .creditCardNumber,
+            .username, .password
+        ]
+
+        if #available(iOS 15.0, *) {
+            all.formUnion([.shipmentTrackingNumber, .flightNumber, .dateTime])
+        }
+
+        if #available(iOS 12.0, *) {
+            all.formUnion([.newPassword, .oneTimeCode])
+        }
+
+        return all
+    }
+
+    public static func mockRandom() -> UITextContentType { allCases.randomElement()! }
+}
diff --git a/DatadogSessionReplay/Tests/Recorder/Utilties/UIKitExtensionsTests.swift b/DatadogSessionReplay/Tests/Recorder/Utilties/UIKitExtensionsTests.swift
index dc9ac76a6f..f9b6af7d48 100644
--- a/DatadogSessionReplay/Tests/Recorder/Utilties/UIKitExtensionsTests.swift
+++ b/DatadogSessionReplay/Tests/Recorder/Utilties/UIKitExtensionsTests.swift
@@ -7,6 +7,7 @@
 import XCTest
 import UIKit
 @testable import DatadogSessionReplay
+@testable import TestUtilities
 
 class UIKitExtensionsTests: XCTestCase {
     func testUsesDarkMode() {
@@ -27,4 +28,33 @@ class UIKitExtensionsTests: XCTestCase {
             XCTAssertFalse(darkView.usesDarkMode)
         }
     }
+
+    // swiftlint:disable opening_brace
+    func testIsSensitiveText() {
+       class Mock: NSObject, UITextInputTraits {
+            var isSecureTextEntry = false
+            var textContentType: UITextContentType! = nil // swiftlint:disable:this implicitly_unwrapped_optional
+        }
+
+        // Given
+        let sensitiveTextMock = Mock()
+        let nonSensitiveTextMock = Mock()
+        let nonSensitiveContentTypes = UITextContentType.allCases.subtracting(sensitiveContentTypes)
+
+        // When
+        oneOrMoreOf([
+            { sensitiveTextMock.isSecureTextEntry = true },
+            { sensitiveTextMock.textContentType = sensitiveContentTypes.randomElement() },
+        ])
+        oneOrMoreOf([
+            { nonSensitiveTextMock.isSecureTextEntry = false },
+            { nonSensitiveTextMock.textContentType = nil },
+            { nonSensitiveTextMock.textContentType = nonSensitiveContentTypes.randomElement() },
+        ])
+
+        // Then
+        XCTAssertTrue(sensitiveTextMock.isSensitiveText)
+        XCTAssertFalse(nonSensitiveTextMock.isSensitiveText)
+    }
+    // swiftlint:enable opening_brace
 }
diff --git a/DatadogSessionReplay/Tests/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UITextFieldRecorderTests.swift b/DatadogSessionReplay/Tests/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UITextFieldRecorderTests.swift
index 2375b9b240..048d213698 100644
--- a/DatadogSessionReplay/Tests/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UITextFieldRecorderTests.swift
+++ b/DatadogSessionReplay/Tests/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UITextFieldRecorderTests.swift
@@ -84,9 +84,9 @@ class UITextFieldRecorderTests: XCTestCase {
         XCTAssertTrue(try textObfuscator(in: .maskUserInput) is FixLegthMaskObfuscator)
 
         // When
-        oneOf([
+        oneOrMoreOf([
             { self.textField.isSecureTextEntry = true },
-            { self.textField.textContentType = [.telephoneNumber, .emailAddress].randomElement()! },
+            { self.textField.textContentType = sensitiveContentTypes.randomElement() },
         ])
 
         // Then
diff --git a/DatadogSessionReplay/Tests/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UITextViewRecorderTests.swift b/DatadogSessionReplay/Tests/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UITextViewRecorderTests.swift
index 9c5b4ec185..519684ab98 100644
--- a/DatadogSessionReplay/Tests/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UITextViewRecorderTests.swift
+++ b/DatadogSessionReplay/Tests/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UITextViewRecorderTests.swift
@@ -74,9 +74,9 @@ class UITextViewRecorderTests: XCTestCase {
         XCTAssertTrue(try textObfuscator(in: .maskUserInput) is SpacePreservingMaskObfuscator)
 
         // When
-        oneOf([
+        oneOrMoreOf([
             { self.textView.isSecureTextEntry = true },
-            { self.textView.textContentType = [.telephoneNumber, .emailAddress].randomElement()! },
+            { self.textView.textContentType = sensitiveContentTypes.randomElement() },
         ])
 
         // Then

From ec294a66eafa847dc907779128d5c459bef976bb Mon Sep 17 00:00:00 2001
From: Maciek Grzybowski <maciek.grzybowski@datadoghq.com>
Date: Fri, 5 May 2023 16:35:33 +0200
Subject: [PATCH 2/7] REPLAY-1610 Change the falue of fix-length mask

---
 .../Sources/Processor/Privacy/TextObfuscator.swift          | 6 +++---
 .../Tests/Processor/Privacy/TextObfuscatorTests.swift       | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/DatadogSessionReplay/Sources/Processor/Privacy/TextObfuscator.swift b/DatadogSessionReplay/Sources/Processor/Privacy/TextObfuscator.swift
index 879c0de82c..794e62e681 100644
--- a/DatadogSessionReplay/Sources/Processor/Privacy/TextObfuscator.swift
+++ b/DatadogSessionReplay/Sources/Processor/Privacy/TextObfuscator.swift
@@ -19,7 +19,7 @@ internal struct TextObfuscators {
     let nop = NOPTextObfuscator()
     /// Text obfuscator that replaces each character with `"x"` mask.
     let spacePreservingMask = SpacePreservingMaskObfuscator()
-    /// Text obfuscator that replaces whole text with fixed-length `"xxx"` mask (three asterics).
+    /// Text obfuscator that replaces whole text with fixed-length `"***"` mask (three asterics).
     let fixLegthMask = FixLegthMaskObfuscator()
 }
 
@@ -49,9 +49,9 @@ internal struct SpacePreservingMaskObfuscator: TextObfuscating {
     }
 }
 
-/// Text obfuscator which replaces entire text with fix-length `"xxx"` mask value.
+/// Text obfuscator which replaces entire text with fix-length `"***"` mask value.
 internal struct FixLegthMaskObfuscator: TextObfuscating {
-    private static let maskedString = "xxx"
+    private static let maskedString = "***"
 
     func mask(text: String) -> String { Self.maskedString }
 }
diff --git a/DatadogSessionReplay/Tests/Processor/Privacy/TextObfuscatorTests.swift b/DatadogSessionReplay/Tests/Processor/Privacy/TextObfuscatorTests.swift
index ff2700ee6c..b9135ea61d 100644
--- a/DatadogSessionReplay/Tests/Processor/Privacy/TextObfuscatorTests.swift
+++ b/DatadogSessionReplay/Tests/Processor/Privacy/TextObfuscatorTests.swift
@@ -54,7 +54,7 @@ class FixLegthMaskObfuscatorTests: XCTestCase {
     let obfuscator = FixLegthMaskObfuscator()
 
     func testWhenObfuscatingItAlwaysReplacesTextItWithConstantMask() {
-        let expectedMask = "xxx"
+        let expectedMask = "***"
 
         XCTAssertEqual(obfuscator.mask(text: .mockRandom(among: .alphanumericsAndWhitespace)), expectedMask)
         XCTAssertEqual(obfuscator.mask(text: .mockRandom(among: .allUnicodes)), expectedMask)

From 71677703020d230d274c019835e66deecfe0bc07 Mon Sep 17 00:00:00 2001
From: Maciek Grzybowski <maciek.grzybowski@datadoghq.com>
Date: Fri, 5 May 2023 17:02:48 +0200
Subject: [PATCH 3/7] REPLAY-1610 Align rules of text masking

---
 .../SRHost/Fixtures/Basic.storyboard          | 24 ++++++++++++++-----
 .../NodeRecorders/UISegmentRecorder.swift     |  4 ++--
 .../NodeRecorders/UITextFieldRecorder.swift   | 24 ++++++++++++-------
 .../NodeRecorders/UITextViewRecorder.swift    | 22 +++++++++++------
 .../UITextFieldRecorderTests.swift            | 11 ++++++++-
 .../UITextViewRecorderTests.swift             | 15 ++++++++++--
 6 files changed, 73 insertions(+), 27 deletions(-)

diff --git a/DatadogSessionReplay/SRSnapshotTests/SRHost/Fixtures/Basic.storyboard b/DatadogSessionReplay/SRSnapshotTests/SRHost/Fixtures/Basic.storyboard
index 49b2efd5dc..d46defffe2 100644
--- a/DatadogSessionReplay/SRSnapshotTests/SRHost/Fixtures/Basic.storyboard
+++ b/DatadogSessionReplay/SRSnapshotTests/SRHost/Fixtures/Basic.storyboard
@@ -78,9 +78,9 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="20" translatesAutoresizingMaskIntoConstraints="NO" id="5e8-XJ-d05">
-                                <rect key="frame" x="20" y="79" width="353" height="617.33333333333337"/>
+                                <rect key="frame" x="20" y="79" width="353" height="686"/>
                                 <subviews>
-                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Title" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="nE2-nF-tR0">
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Labels" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="nE2-nF-tR0">
                                         <rect key="frame" x="0.0" y="0.0" width="353" height="36"/>
                                         <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                         <fontDescription key="fontDescription" type="boldSystem" pointSize="30"/>
@@ -101,7 +101,7 @@
                                         <nil key="textColor"/>
                                         <nil key="highlightedColor"/>
                                     </label>
-                                    <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" text="Text Views" textAlignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="K5s-RK-Xqf">
+                                    <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" editable="NO" text="Text Views" textAlignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="K5s-RK-Xqf">
                                         <rect key="frame" x="0.0" y="281.33333333333331" width="353" height="40"/>
                                         <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                                         <constraints>
@@ -111,8 +111,14 @@
                                         <fontDescription key="fontDescription" type="system" pointSize="30"/>
                                         <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
                                     </textView>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Editable:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ckm-Kp-yLh">
+                                        <rect key="frame" x="0.0" y="341.33333333333331" width="353" height="14.333333333333314"/>
+                                        <fontDescription key="fontDescription" type="system" pointSize="12"/>
+                                        <nil key="textColor"/>
+                                        <nil key="highlightedColor"/>
+                                    </label>
                                     <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" textAlignment="natural" translatesAutoresizingMaskIntoConstraints="NO" id="43n-fB-GL1">
-                                        <rect key="frame" x="0.0" y="341.33333333333331" width="353" height="128"/>
+                                        <rect key="frame" x="0.0" y="375.66666666666669" width="353" height="128"/>
                                         <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="128" id="Xep-n3-nDX"/>
@@ -122,8 +128,14 @@
                                         <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                         <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
                                     </textView>
-                                    <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" textAlignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="7DW-74-qEX">
-                                        <rect key="frame" x="0.0" y="489.33333333333337" width="353" height="128"/>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Non-editable:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="NFk-Bb-d0Y">
+                                        <rect key="frame" x="0.0" y="523.66666666666663" width="353" height="14.333333333333371"/>
+                                        <fontDescription key="fontDescription" type="system" pointSize="12"/>
+                                        <nil key="textColor"/>
+                                        <nil key="highlightedColor"/>
+                                    </label>
+                                    <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" editable="NO" textAlignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="7DW-74-qEX">
+                                        <rect key="frame" x="0.0" y="558" width="353" height="128"/>
                                         <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="128" id="c5V-bh-7NW"/>
diff --git a/DatadogSessionReplay/Sources/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UISegmentRecorder.swift b/DatadogSessionReplay/Sources/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UISegmentRecorder.swift
index fa40f48c01..7e1b992148 100644
--- a/DatadogSessionReplay/Sources/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UISegmentRecorder.swift
+++ b/DatadogSessionReplay/Sources/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UISegmentRecorder.swift
@@ -10,8 +10,8 @@ internal struct UISegmentRecorder: NodeRecorder {
     var textObfuscator: (ViewTreeRecordingContext) -> TextObfuscating = { context in
         switch context.recorder.privacy {
         case .allowAll:         return context.textObfuscators.nop
-        case .maskAll:          return context.textObfuscators.spacePreservingMask
-        case .maskUserInput:    return context.textObfuscators.spacePreservingMask
+        case .maskAll:          return context.textObfuscators.fixLegthMask
+        case .maskUserInput:    return context.textObfuscators.fixLegthMask
         }
     }
 
diff --git a/DatadogSessionReplay/Sources/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UITextFieldRecorder.swift b/DatadogSessionReplay/Sources/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UITextFieldRecorder.swift
index b136c92f1d..fe53c37c41 100644
--- a/DatadogSessionReplay/Sources/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UITextFieldRecorder.swift
+++ b/DatadogSessionReplay/Sources/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UITextFieldRecorder.swift
@@ -13,15 +13,21 @@ internal struct UITextFieldRecorder: NodeRecorder {
     private let iconsRecorder: UIImageViewRecorder
     private let subtreeRecorder: ViewTreeRecorder
 
-    var textObfuscator: (ViewTreeRecordingContext, _ isSensitiveText: Bool) -> TextObfuscating = { context, isSensitiveText in
-        if isSensitiveText {
+    var textObfuscator: (ViewTreeRecordingContext, _ isSensitive: Bool, _ isPlaceholder: Bool) -> TextObfuscating = { context, isSensitive, isPlaceholder in
+        if isPlaceholder {
+            switch context.recorder.privacy {
+            case .allowAll:         return context.textObfuscators.nop
+            case .maskAll:          return context.textObfuscators.fixLegthMask
+            case .maskUserInput:    return context.textObfuscators.nop
+            }
+        } else if isSensitive {
             return context.textObfuscators.fixLegthMask
-        }
-
-        switch context.recorder.privacy {
-        case .allowAll:         return context.textObfuscators.nop
-        case .maskAll:          return context.textObfuscators.spacePreservingMask
-        case .maskUserInput:    return context.textObfuscators.fixLegthMask
+        } else {
+            switch context.recorder.privacy {
+            case .allowAll:         return context.textObfuscators.nop
+            case .maskAll:          return context.textObfuscators.fixLegthMask
+            case .maskUserInput:    return context.textObfuscators.fixLegthMask
+            }
         }
     }
 
@@ -93,7 +99,7 @@ internal struct UITextFieldRecorder: NodeRecorder {
             isPlaceholderText: isPlaceholder,
             font: textField.font,
             fontScalingEnabled: textField.adjustsFontSizeToFitWidth,
-            textObfuscator: textObfuscator(context, textField.isSensitiveText)
+            textObfuscator: textObfuscator(context, textField.isSensitiveText, isPlaceholder)
         )
         return Node(viewAttributes: attributes, wireframesBuilder: builder)
     }
diff --git a/DatadogSessionReplay/Sources/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UITextViewRecorder.swift b/DatadogSessionReplay/Sources/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UITextViewRecorder.swift
index 085c8b1bcb..9efc9ccc60 100644
--- a/DatadogSessionReplay/Sources/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UITextViewRecorder.swift
+++ b/DatadogSessionReplay/Sources/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UITextViewRecorder.swift
@@ -7,15 +7,23 @@
 import UIKit
 
 internal struct UITextViewRecorder: NodeRecorder {
-    var textObfuscator: (ViewTreeRecordingContext, _ isSensitiveText: Bool) -> TextObfuscating = { context, isSensitiveText in
-        if isSensitiveText {
+    var textObfuscator: (ViewTreeRecordingContext, _ isSensitive: Bool, _ isEditable: Bool) -> TextObfuscating = { context, isSensitive, isEditable in
+        if isSensitive {
             return context.textObfuscators.fixLegthMask
         }
 
-        switch context.recorder.privacy {
-        case .allowAll:         return context.textObfuscators.nop
-        case .maskAll:          return context.textObfuscators.spacePreservingMask
-        case .maskUserInput:    return context.textObfuscators.spacePreservingMask
+        if isEditable {
+            switch context.recorder.privacy {
+            case .allowAll:         return context.textObfuscators.nop
+            case .maskAll:          return context.textObfuscators.fixLegthMask
+            case .maskUserInput:    return context.textObfuscators.fixLegthMask
+            }
+        } else {
+            switch context.recorder.privacy {
+            case .allowAll:         return context.textObfuscators.nop
+            case .maskAll:          return context.textObfuscators.spacePreservingMask
+            case .maskUserInput:    return context.textObfuscators.nop
+            }
         }
     }
 
@@ -34,7 +42,7 @@ internal struct UITextViewRecorder: NodeRecorder {
             textAlignment: textView.textAlignment,
             textColor: textView.textColor?.cgColor ?? UIColor.black.cgColor,
             font: textView.font,
-            textObfuscator: textObfuscator(context, textView.isSensitiveText),
+            textObfuscator: textObfuscator(context, textView.isSensitiveText, textView.isEditable),
             contentRect: CGRect(origin: textView.contentOffset, size: textView.contentSize)
         )
         let node = Node(viewAttributes: attributes, wireframesBuilder: builder)
diff --git a/DatadogSessionReplay/Tests/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UITextFieldRecorderTests.swift b/DatadogSessionReplay/Tests/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UITextFieldRecorderTests.swift
index 048d213698..5747da37fb 100644
--- a/DatadogSessionReplay/Tests/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UITextFieldRecorderTests.swift
+++ b/DatadogSessionReplay/Tests/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UITextFieldRecorderTests.swift
@@ -80,7 +80,7 @@ class UITextFieldRecorderTests: XCTestCase {
         }
 
         XCTAssertTrue(try textObfuscator(in: .allowAll) is NOPTextObfuscator)
-        XCTAssertTrue(try textObfuscator(in: .maskAll) is SpacePreservingMaskObfuscator)
+        XCTAssertTrue(try textObfuscator(in: .maskAll) is FixLegthMaskObfuscator)
         XCTAssertTrue(try textObfuscator(in: .maskUserInput) is FixLegthMaskObfuscator)
 
         // When
@@ -91,6 +91,15 @@ class UITextFieldRecorderTests: XCTestCase {
 
         // Then
         XCTAssertTrue(try textObfuscator(in: .mockRandom()) is FixLegthMaskObfuscator)
+
+        // When
+        textField.text = nil
+        textField.placeholder = .mockRandom()
+
+        // Then
+        XCTAssertTrue(try textObfuscator(in: .allowAll) is NOPTextObfuscator)
+        XCTAssertTrue(try textObfuscator(in: .maskAll) is FixLegthMaskObfuscator)
+        XCTAssertTrue(try textObfuscator(in: .maskUserInput) is NOPTextObfuscator)
     }
 }
 // swiftlint:enable opening_brace
diff --git a/DatadogSessionReplay/Tests/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UITextViewRecorderTests.swift b/DatadogSessionReplay/Tests/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UITextViewRecorderTests.swift
index 519684ab98..661ae2ec0b 100644
--- a/DatadogSessionReplay/Tests/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UITextViewRecorderTests.swift
+++ b/DatadogSessionReplay/Tests/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UITextViewRecorderTests.swift
@@ -70,17 +70,28 @@ class UITextViewRecorderTests: XCTestCase {
         }
 
         XCTAssertTrue(try textObfuscator(in: .allowAll) is NOPTextObfuscator)
-        XCTAssertTrue(try textObfuscator(in: .maskAll) is SpacePreservingMaskObfuscator)
-        XCTAssertTrue(try textObfuscator(in: .maskUserInput) is SpacePreservingMaskObfuscator)
+        XCTAssertTrue(try textObfuscator(in: .maskAll) is FixLegthMaskObfuscator)
+        XCTAssertTrue(try textObfuscator(in: .maskUserInput) is FixLegthMaskObfuscator)
 
         // When
         oneOrMoreOf([
             { self.textView.isSecureTextEntry = true },
             { self.textView.textContentType = sensitiveContentTypes.randomElement() },
+            { self.textView.isEditable = .mockRandom() } // no matter if editable or not
         ])
 
         // Then
         XCTAssertTrue(try textObfuscator(in: .mockRandom()) is FixLegthMaskObfuscator)
+
+        // When
+        textView.isEditable = false
+        textView.isSecureTextEntry = false // non-sensitive
+        textView.textContentType = nil // non-sensitive
+
+        // Then
+        XCTAssertTrue(try textObfuscator(in: .allowAll) is NOPTextObfuscator)
+        XCTAssertTrue(try textObfuscator(in: .maskAll) is SpacePreservingMaskObfuscator)
+        XCTAssertTrue(try textObfuscator(in: .maskUserInput) is NOPTextObfuscator)
     }
 }
 // swiftlint:enable opening_brace

From 49676b8337938f2831126498b7012957f20f45a8 Mon Sep 17 00:00:00 2001
From: Maciek Grzybowski <maciek.grzybowski@datadoghq.com>
Date: Fri, 5 May 2023 17:20:16 +0200
Subject: [PATCH 4/7] REPLAY-1610 Erase the value of Slider if masking is
 applied

---
 .../NodeRecorders/UISliderRecorder.swift      | 39 ++++++++++++++++++-
 1 file changed, 37 insertions(+), 2 deletions(-)

diff --git a/DatadogSessionReplay/Sources/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UISliderRecorder.swift b/DatadogSessionReplay/Sources/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UISliderRecorder.swift
index 35d1ee6b86..980f5b23d6 100644
--- a/DatadogSessionReplay/Sources/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UISliderRecorder.swift
+++ b/DatadogSessionReplay/Sources/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UISliderRecorder.swift
@@ -27,6 +27,7 @@ internal struct UISliderRecorder: NodeRecorder {
             thumbWireframeID: ids[3],
             value: (min: slider.minimumValue, max: slider.maximumValue, current: slider.value),
             isEnabled: slider.isEnabled,
+            isMasked: context.recorder.privacy.shouldMaskInputElements,
             minTrackTintColor: slider.minimumTrackTintColor?.cgColor ?? slider.tintColor?.cgColor,
             maxTrackTintColor: slider.maximumTrackTintColor?.cgColor,
             thumbTintColor: slider.thumbTintColor?.cgColor
@@ -46,11 +47,45 @@ internal struct UISliderWireframesBuilder: NodeWireframesBuilder {
     let thumbWireframeID: WireframeID
     let value: (min: Float, max: Float, current: Float)
     let isEnabled: Bool
+    let isMasked: Bool
     let minTrackTintColor: CGColor?
     let maxTrackTintColor: CGColor?
     let thumbTintColor: CGColor?
 
     func buildWireframes(with builder: WireframesBuilder) -> [SRWireframe] {
+        if isMasked {
+            return createMasked(with: builder)
+        } else {
+            return createNotMasked(with: builder)
+        }
+    }
+
+    private func createMasked(with builder: WireframesBuilder) -> [SRWireframe] {
+        let trackFrame = wireframeRect.divided(atDistance: 3, from: .minYEdge)
+            .slice
+            .putInside(wireframeRect, horizontalAlignment: .left, verticalAlignment: .middle)
+
+        let track = builder.createShapeWireframe(
+            id: minTrackWireframeID,
+            frame: trackFrame,
+            borderColor: nil,
+            borderWidth: nil,
+            backgroundColor: SystemColors.tertiarySystemFill,
+            cornerRadius: wireframeRect.height * 0.5,
+            opacity: isEnabled ? attributes.alpha : 0.5
+        )
+
+        // Create background wireframe if the underlying `UIView` has any appearance:
+        if attributes.hasAnyAppearance {
+            let background = builder.createShapeWireframe(id: backgroundWireframeID, frame: attributes.frame, attributes: attributes)
+
+            return [background, track]
+        } else {
+            return [track]
+        }
+    }
+
+    private func createNotMasked(with builder: WireframesBuilder) -> [SRWireframe] {
         guard value.max > value.min else {
             return [] // illegal, should not happen
         }
@@ -106,9 +141,9 @@ internal struct UISliderWireframesBuilder: NodeWireframesBuilder {
 
         if attributes.hasAnyAppearance {
             // Create background wireframe only if view declares visible background
-            let backgorund = builder.createShapeWireframe(id: backgroundWireframeID, frame: wireframeRect, attributes: attributes)
+            let background = builder.createShapeWireframe(id: backgroundWireframeID, frame: wireframeRect, attributes: attributes)
 
-            return [backgorund, leftTrack, rightTrack, thumb]
+            return [background, leftTrack, rightTrack, thumb]
         } else {
             return [leftTrack, rightTrack, thumb]
         }

From f20737735a1318d343e5e9358953681c7fbc87a3 Mon Sep 17 00:00:00 2001
From: Maciek Grzybowski <maciek.grzybowski@datadoghq.com>
Date: Mon, 8 May 2023 10:49:01 +0200
Subject: [PATCH 5/7] REPLAY-1610 Cleanup

---
 .../Processor/Privacy/TextObfuscator.swift    | 54 +++++++++++++++++--
 .../Recorder/Utilities/UIKitExtensions.swift  |  8 +--
 .../NodeRecorders/UIDatePickerRecorder.swift  | 18 ++-----
 .../NodeRecorders/UILabelRecorder.swift       |  6 +--
 .../NodeRecorders/UIPickerViewRecorder.swift  |  6 +--
 .../NodeRecorders/UISegmentRecorder.swift     |  6 +--
 .../NodeRecorders/UITextFieldRecorder.swift   | 14 ++---
 .../NodeRecorders/UITextViewRecorder.swift    | 14 ++---
 .../ViewTreeRecordingContext.swift            |  2 +-
 .../ViewTreeSnapshotBuilder.swift             |  8 +--
 .../Tests/Mocks/RecorderMocks.swift           |  6 +--
 .../Privacy/TextObfuscatorTests.swift         | 25 +++++++++
 .../Utilties/UIKitExtensionsTests.swift       |  1 -
 .../UITextViewRecorderTests.swift             |  2 +-
 .../ViewTreeSnapshotBuilderTests.swift        |  4 +-
 15 files changed, 101 insertions(+), 73 deletions(-)

diff --git a/DatadogSessionReplay/Sources/Processor/Privacy/TextObfuscator.swift b/DatadogSessionReplay/Sources/Processor/Privacy/TextObfuscator.swift
index 794e62e681..d8efdb1bf1 100644
--- a/DatadogSessionReplay/Sources/Processor/Privacy/TextObfuscator.swift
+++ b/DatadogSessionReplay/Sources/Processor/Privacy/TextObfuscator.swift
@@ -13,14 +13,58 @@ internal protocol TextObfuscating {
     func mask(text: String) -> String
 }
 
-/// Available text obfuscators.
-internal struct TextObfuscators {
+/// Text obfuscation strategies for different text types.
+internal struct TextObfuscation {
     /// Text obfuscator that returns original text (no obfuscation).
-    let nop = NOPTextObfuscator()
+    private let nop = NOPTextObfuscator()
     /// Text obfuscator that replaces each character with `"x"` mask.
-    let spacePreservingMask = SpacePreservingMaskObfuscator()
+    private let spacePreservingMask = SpacePreservingMaskObfuscator()
     /// Text obfuscator that replaces whole text with fixed-length `"***"` mask (three asterics).
-    let fixLegthMask = FixLegthMaskObfuscator()
+    private let fixLegthMask = FixLegthMaskObfuscator()
+
+    /// Returns "Sensitive Text" obfuscator for given `privacyLevel`.
+    ///
+    /// In Session Replay, "Sensitive Text" is:
+    /// - passwords, e-mails and phone numbers marked in a platform-specific way
+    /// - AND other forms of sensitivity in text available to each platform
+    func sensitiveTextObfuscator(for privacyLevel: SessionReplayPrivacy) -> TextObfuscating {
+        return fixLegthMask
+    }
+
+    /// Returns "Input & Option Text" obfuscator for given `privacyLevel`.
+    ///
+    /// In Session Replay, "Input & Option Text" is:
+    /// - a text entered by the user with a keyboard or other text-input device
+    /// - OR a custom (non-generic) value in selection elements
+    func inputAndOptionTextObfuscator(for privacyLevel: SessionReplayPrivacy) -> TextObfuscating {
+        switch privacyLevel {
+        case .allowAll:         return nop
+        case .maskAll:          return fixLegthMask
+        case .maskUserInput:    return fixLegthMask
+        }
+    }
+
+    /// Returns "Static Text" obfuscator for given `privacyLevel`.
+    ///
+    /// In Session Replay, "Static Text" is a text not directly entered by the user.
+    func staticTextObfuscator(for privacyLevel: SessionReplayPrivacy) -> TextObfuscating {
+        switch privacyLevel {
+        case .allowAll:         return nop
+        case .maskAll:          return spacePreservingMask
+        case .maskUserInput:    return nop
+        }
+    }
+
+    /// Returns "Hint Text" obfuscator for given `privacyLevel`.
+    ///
+    /// In Session Replay, "Hint Text" is a static text in editable text elements or option selectors, displayed when there isn't any value set.
+    func hintTextObfuscator(for privacyLevel: SessionReplayPrivacy) -> TextObfuscating {
+        switch privacyLevel {
+        case .allowAll:         return nop
+        case .maskAll:          return fixLegthMask
+        case .maskUserInput:    return nop
+        }
+    }
 }
 
 /// Text obfuscator which replaces all readable characters with space-preserving `"x"` characters.
diff --git a/DatadogSessionReplay/Sources/Recorder/Utilities/UIKitExtensions.swift b/DatadogSessionReplay/Sources/Recorder/Utilities/UIKitExtensions.swift
index 5e78617b60..5b29af606a 100644
--- a/DatadogSessionReplay/Sources/Recorder/Utilities/UIKitExtensions.swift
+++ b/DatadogSessionReplay/Sources/Recorder/Utilities/UIKitExtensions.swift
@@ -34,11 +34,11 @@ internal let sensitiveContentTypes: Set<UITextContentType> = {
 }()
 
 internal extension UITextInputTraits {
-    /// Whether or not these input traits describe a "sensitive text" as we define it in Session Replay.
+    /// Whether or not these input traits describe a "Sensitive Text".
     ///
-    /// Sensitive texts include:
-    /// - passwords, e-mails, phone numbers, address information, credit card numbers and one-time codes;
-    /// - all texts marked explicitly as secure entry.
+    /// In Session Replay, "Sensitive Text" is:
+    /// - passwords, e-mails and phone numbers marked in a platform-specific way
+    /// - AND other forms of sensitivity in text available to each platform
     var isSensitiveText: Bool {
         if isSecureTextEntry == true {
             return true
diff --git a/DatadogSessionReplay/Sources/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UIDatePickerRecorder.swift b/DatadogSessionReplay/Sources/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UIDatePickerRecorder.swift
index 9bd2db6251..d9a62a3c6d 100644
--- a/DatadogSessionReplay/Sources/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UIDatePickerRecorder.swift
+++ b/DatadogSessionReplay/Sources/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UIDatePickerRecorder.swift
@@ -73,11 +73,7 @@ private struct WheelsStyleDatePickerRecorder {
         nodeRecorders: [
             UIPickerViewRecorder(
                 textObfuscator: { context in
-                    switch context.recorder.privacy {
-                    case .allowAll:         return context.textObfuscators.nop
-                    case .maskAll:          return context.textObfuscators.spacePreservingMask
-                    case .maskUserInput:    return context.textObfuscators.spacePreservingMask
-                    }
+                    return context.textObfuscation.staticTextObfuscator(for: context.recorder.privacy)
                 }
             )
         ]
@@ -97,11 +93,7 @@ private struct InlineStyleDatePickerRecorder {
         self.viewRecorder = UIViewRecorder()
         self.labelRecorder = UILabelRecorder(
             textObfuscator: { context in
-                switch context.recorder.privacy {
-                case .allowAll:         return context.textObfuscators.nop
-                case .maskAll:          return context.textObfuscators.spacePreservingMask
-                case .maskUserInput:    return context.textObfuscators.spacePreservingMask
-                }
+                return context.textObfuscation.staticTextObfuscator(for: context.recorder.privacy)
             }
         )
         self.subtreeRecorder = ViewTreeRecorder(
@@ -144,11 +136,7 @@ private struct CompactStyleDatePickerRecorder {
             UIViewRecorder(),
             UILabelRecorder(
                 textObfuscator: { context in
-                    switch context.recorder.privacy {
-                    case .allowAll:         return context.textObfuscators.nop
-                    case .maskAll:          return context.textObfuscators.spacePreservingMask
-                    case .maskUserInput:    return context.textObfuscators.spacePreservingMask
-                    }
+                    return context.textObfuscation.staticTextObfuscator(for: context.recorder.privacy)
                 }
             )
         ]
diff --git a/DatadogSessionReplay/Sources/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UILabelRecorder.swift b/DatadogSessionReplay/Sources/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UILabelRecorder.swift
index d89c6de90b..713ac41907 100644
--- a/DatadogSessionReplay/Sources/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UILabelRecorder.swift
+++ b/DatadogSessionReplay/Sources/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UILabelRecorder.swift
@@ -14,11 +14,7 @@ internal class UILabelRecorder: NodeRecorder {
     init(
         builderOverride: @escaping (UILabelWireframesBuilder) -> UILabelWireframesBuilder = { $0 },
         textObfuscator: @escaping (ViewTreeRecordingContext) -> TextObfuscating = { context in
-            switch context.recorder.privacy {
-            case .allowAll:         return context.textObfuscators.nop
-            case .maskAll:          return context.textObfuscators.spacePreservingMask
-            case .maskUserInput:    return context.textObfuscators.nop
-            }
+            return context.textObfuscation.staticTextObfuscator(for: context.recorder.privacy)
         }
     ) {
         self.builderOverride = builderOverride
diff --git a/DatadogSessionReplay/Sources/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UIPickerViewRecorder.swift b/DatadogSessionReplay/Sources/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UIPickerViewRecorder.swift
index 1e4ed1e18e..b10b7527e2 100644
--- a/DatadogSessionReplay/Sources/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UIPickerViewRecorder.swift
+++ b/DatadogSessionReplay/Sources/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UIPickerViewRecorder.swift
@@ -25,11 +25,7 @@ internal struct UIPickerViewRecorder: NodeRecorder {
 
     init(
         textObfuscator: @escaping (ViewTreeRecordingContext) -> TextObfuscating = { context in
-            switch context.recorder.privacy {
-            case .allowAll:         return context.textObfuscators.nop
-            case .maskAll:          return context.textObfuscators.fixLegthMask
-            case .maskUserInput:    return context.textObfuscators.fixLegthMask
-            }
+            return context.textObfuscation.inputAndOptionTextObfuscator(for: context.recorder.privacy)
         }
     ) {
         self.selectionRecorder = ViewTreeRecorder(nodeRecorders: [UIViewRecorder()])
diff --git a/DatadogSessionReplay/Sources/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UISegmentRecorder.swift b/DatadogSessionReplay/Sources/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UISegmentRecorder.swift
index 7e1b992148..d30549769c 100644
--- a/DatadogSessionReplay/Sources/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UISegmentRecorder.swift
+++ b/DatadogSessionReplay/Sources/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UISegmentRecorder.swift
@@ -8,11 +8,7 @@ import UIKit
 
 internal struct UISegmentRecorder: NodeRecorder {
     var textObfuscator: (ViewTreeRecordingContext) -> TextObfuscating = { context in
-        switch context.recorder.privacy {
-        case .allowAll:         return context.textObfuscators.nop
-        case .maskAll:          return context.textObfuscators.fixLegthMask
-        case .maskUserInput:    return context.textObfuscators.fixLegthMask
-        }
+        return context.textObfuscation.inputAndOptionTextObfuscator(for: context.recorder.privacy)
     }
 
     func semantics(of view: UIView, with attributes: ViewAttributes, in context: ViewTreeRecordingContext) -> NodeSemantics? {
diff --git a/DatadogSessionReplay/Sources/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UITextFieldRecorder.swift b/DatadogSessionReplay/Sources/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UITextFieldRecorder.swift
index fe53c37c41..af4dae6c56 100644
--- a/DatadogSessionReplay/Sources/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UITextFieldRecorder.swift
+++ b/DatadogSessionReplay/Sources/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UITextFieldRecorder.swift
@@ -15,19 +15,11 @@ internal struct UITextFieldRecorder: NodeRecorder {
 
     var textObfuscator: (ViewTreeRecordingContext, _ isSensitive: Bool, _ isPlaceholder: Bool) -> TextObfuscating = { context, isSensitive, isPlaceholder in
         if isPlaceholder {
-            switch context.recorder.privacy {
-            case .allowAll:         return context.textObfuscators.nop
-            case .maskAll:          return context.textObfuscators.fixLegthMask
-            case .maskUserInput:    return context.textObfuscators.nop
-            }
+            return context.textObfuscation.hintTextObfuscator(for: context.recorder.privacy)
         } else if isSensitive {
-            return context.textObfuscators.fixLegthMask
+            return context.textObfuscation.sensitiveTextObfuscator(for: context.recorder.privacy)
         } else {
-            switch context.recorder.privacy {
-            case .allowAll:         return context.textObfuscators.nop
-            case .maskAll:          return context.textObfuscators.fixLegthMask
-            case .maskUserInput:    return context.textObfuscators.fixLegthMask
-            }
+            return context.textObfuscation.inputAndOptionTextObfuscator(for: context.recorder.privacy)
         }
     }
 
diff --git a/DatadogSessionReplay/Sources/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UITextViewRecorder.swift b/DatadogSessionReplay/Sources/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UITextViewRecorder.swift
index 9efc9ccc60..c77c1e578f 100644
--- a/DatadogSessionReplay/Sources/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UITextViewRecorder.swift
+++ b/DatadogSessionReplay/Sources/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UITextViewRecorder.swift
@@ -9,21 +9,13 @@ import UIKit
 internal struct UITextViewRecorder: NodeRecorder {
     var textObfuscator: (ViewTreeRecordingContext, _ isSensitive: Bool, _ isEditable: Bool) -> TextObfuscating = { context, isSensitive, isEditable in
         if isSensitive {
-            return context.textObfuscators.fixLegthMask
+            return context.textObfuscation.sensitiveTextObfuscator(for: context.recorder.privacy)
         }
 
         if isEditable {
-            switch context.recorder.privacy {
-            case .allowAll:         return context.textObfuscators.nop
-            case .maskAll:          return context.textObfuscators.fixLegthMask
-            case .maskUserInput:    return context.textObfuscators.fixLegthMask
-            }
+            return context.textObfuscation.inputAndOptionTextObfuscator(for: context.recorder.privacy)
         } else {
-            switch context.recorder.privacy {
-            case .allowAll:         return context.textObfuscators.nop
-            case .maskAll:          return context.textObfuscators.spacePreservingMask
-            case .maskUserInput:    return context.textObfuscators.nop
-            }
+            return context.textObfuscation.staticTextObfuscator(for: context.recorder.privacy)
         }
     }
 
diff --git a/DatadogSessionReplay/Sources/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/ViewTreeRecordingContext.swift b/DatadogSessionReplay/Sources/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/ViewTreeRecordingContext.swift
index e0a8695b95..6fbbc2f4ea 100644
--- a/DatadogSessionReplay/Sources/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/ViewTreeRecordingContext.swift
+++ b/DatadogSessionReplay/Sources/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/ViewTreeRecordingContext.swift
@@ -21,7 +21,7 @@ internal struct ViewTreeRecordingContext {
     /// Provides base64 image data with a built in caching mechanism.
     let imageDataProvider: ImageDataProviding
     /// Available text obfuscators to use accordingly to current privacy mode.
-    let textObfuscators: TextObfuscators
+    let textObfuscation: TextObfuscation
     /// Variable view controller related context
     var viewControllerContext: ViewControllerContext = .init()
 }
diff --git a/DatadogSessionReplay/Sources/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/ViewTreeSnapshotBuilder.swift b/DatadogSessionReplay/Sources/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/ViewTreeSnapshotBuilder.swift
index fc8ab61065..1dd60b8488 100644
--- a/DatadogSessionReplay/Sources/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/ViewTreeSnapshotBuilder.swift
+++ b/DatadogSessionReplay/Sources/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/ViewTreeSnapshotBuilder.swift
@@ -17,8 +17,8 @@ internal struct ViewTreeSnapshotBuilder {
     let idsGenerator: NodeIDGenerator
     /// Provides base64 image data with a built in caching mechanism.
     let imageDataProvider: ImageDataProviding
-    /// Available text obfuscators to use by different recorders in response to current privacy mode.
-    let textObfuscators: TextObfuscators
+    /// Text obfuscation strategies for different text types.
+    let textObfuscation: TextObfuscation
 
     /// Builds the `ViewTreeSnapshot` for given root view.
     ///
@@ -33,7 +33,7 @@ internal struct ViewTreeSnapshotBuilder {
             coordinateSpace: rootView,
             ids: idsGenerator,
             imageDataProvider: imageDataProvider,
-            textObfuscators: textObfuscators
+            textObfuscation: textObfuscation
         )
         let snapshot = ViewTreeSnapshot(
             date: recorderContext.date.addingTimeInterval(recorderContext.rumContext.viewServerTimeOffset ?? 0),
@@ -51,7 +51,7 @@ extension ViewTreeSnapshotBuilder {
             viewTreeRecorder: ViewTreeRecorder(nodeRecorders: createDefaultNodeRecorders()),
             idsGenerator: NodeIDGenerator(),
             imageDataProvider: ImageDataProvider(),
-            textObfuscators: TextObfuscators()
+            textObfuscation: TextObfuscation()
         )
     }
 }
diff --git a/DatadogSessionReplay/Tests/Mocks/RecorderMocks.swift b/DatadogSessionReplay/Tests/Mocks/RecorderMocks.swift
index 47da704cfc..3d42cbfc5c 100644
--- a/DatadogSessionReplay/Tests/Mocks/RecorderMocks.swift
+++ b/DatadogSessionReplay/Tests/Mocks/RecorderMocks.swift
@@ -286,7 +286,7 @@ extension ViewTreeRecordingContext: AnyMockable, RandomMockable {
             coordinateSpace: UIView.mockRandom(),
             ids: NodeIDGenerator(),
             imageDataProvider: mockRandomImageDataProvider(),
-            textObfuscators: TextObfuscators()
+            textObfuscation: TextObfuscation()
         )
     }
 
@@ -295,14 +295,14 @@ extension ViewTreeRecordingContext: AnyMockable, RandomMockable {
         coordinateSpace: UICoordinateSpace = UIView.mockAny(),
         ids: NodeIDGenerator = NodeIDGenerator(),
         imageDataProvider: ImageDataProviding = MockImageDataProvider(),
-        textObfuscators: TextObfuscators = TextObfuscators()
+        textObfuscation: TextObfuscation = TextObfuscation()
     ) -> ViewTreeRecordingContext {
         return .init(
             recorder: recorder,
             coordinateSpace: coordinateSpace,
             ids: ids,
             imageDataProvider: imageDataProvider,
-            textObfuscators: textObfuscators
+            textObfuscation: textObfuscation
         )
     }
 }
diff --git a/DatadogSessionReplay/Tests/Processor/Privacy/TextObfuscatorTests.swift b/DatadogSessionReplay/Tests/Processor/Privacy/TextObfuscatorTests.swift
index b9135ea61d..80b36fc3b9 100644
--- a/DatadogSessionReplay/Tests/Processor/Privacy/TextObfuscatorTests.swift
+++ b/DatadogSessionReplay/Tests/Processor/Privacy/TextObfuscatorTests.swift
@@ -8,6 +8,31 @@ import XCTest
 @testable import DatadogSessionReplay
 @testable import TestUtilities
 
+class TextObfuscationTests: XCTestCase {
+    let obfuscation = TextObfuscation()
+
+    func testSensitiveTextObfuscation() {
+        XCTAssertTrue(obfuscation.sensitiveTextObfuscator(for: .mockRandom()) is FixLegthMaskObfuscator)
+    }
+
+    func testInputAndOptionTextObfuscation() {
+        XCTAssertTrue(obfuscation.inputAndOptionTextObfuscator(for: .allowAll) is NOPTextObfuscator)
+        XCTAssertTrue(obfuscation.inputAndOptionTextObfuscator(for: .maskAll) is FixLegthMaskObfuscator)
+        XCTAssertTrue(obfuscation.inputAndOptionTextObfuscator(for: .maskUserInput) is FixLegthMaskObfuscator)
+    }
+
+    func testStaticTextObfuscation() {
+        XCTAssertTrue(obfuscation.staticTextObfuscator(for: .allowAll) is NOPTextObfuscator)
+        XCTAssertTrue(obfuscation.staticTextObfuscator(for: .maskAll) is SpacePreservingMaskObfuscator)
+        XCTAssertTrue(obfuscation.staticTextObfuscator(for: .maskUserInput) is NOPTextObfuscator)    }
+
+    func testHintTextObfuscation() {
+        XCTAssertTrue(obfuscation.hintTextObfuscator(for: .allowAll) is NOPTextObfuscator)
+        XCTAssertTrue(obfuscation.hintTextObfuscator(for: .maskAll) is FixLegthMaskObfuscator)
+        XCTAssertTrue(obfuscation.hintTextObfuscator(for: .maskUserInput) is NOPTextObfuscator)
+    }
+}
+
 class SpacePreservingMaskObfuscatorTests: XCTestCase {
     let obfuscator = SpacePreservingMaskObfuscator()
 
diff --git a/DatadogSessionReplay/Tests/Recorder/Utilties/UIKitExtensionsTests.swift b/DatadogSessionReplay/Tests/Recorder/Utilties/UIKitExtensionsTests.swift
index f9b6af7d48..6d21495a16 100644
--- a/DatadogSessionReplay/Tests/Recorder/Utilties/UIKitExtensionsTests.swift
+++ b/DatadogSessionReplay/Tests/Recorder/Utilties/UIKitExtensionsTests.swift
@@ -7,7 +7,6 @@
 import XCTest
 import UIKit
 @testable import DatadogSessionReplay
-@testable import TestUtilities
 
 class UIKitExtensionsTests: XCTestCase {
     func testUsesDarkMode() {
diff --git a/DatadogSessionReplay/Tests/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UITextViewRecorderTests.swift b/DatadogSessionReplay/Tests/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UITextViewRecorderTests.swift
index 661ae2ec0b..e904641af9 100644
--- a/DatadogSessionReplay/Tests/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UITextViewRecorderTests.swift
+++ b/DatadogSessionReplay/Tests/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UITextViewRecorderTests.swift
@@ -74,10 +74,10 @@ class UITextViewRecorderTests: XCTestCase {
         XCTAssertTrue(try textObfuscator(in: .maskUserInput) is FixLegthMaskObfuscator)
 
         // When
+        textView.isEditable = .mockRandom()
         oneOrMoreOf([
             { self.textView.isSecureTextEntry = true },
             { self.textView.textContentType = sensitiveContentTypes.randomElement() },
-            { self.textView.isEditable = .mockRandom() } // no matter if editable or not
         ])
 
         // Then
diff --git a/DatadogSessionReplay/Tests/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/ViewTreeSnapshotBuilderTests.swift b/DatadogSessionReplay/Tests/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/ViewTreeSnapshotBuilderTests.swift
index 013bbacb2f..c39e7269df 100644
--- a/DatadogSessionReplay/Tests/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/ViewTreeSnapshotBuilderTests.swift
+++ b/DatadogSessionReplay/Tests/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/ViewTreeSnapshotBuilderTests.swift
@@ -18,7 +18,7 @@ class ViewTreeSnapshotBuilderTests: XCTestCase {
             viewTreeRecorder: ViewTreeRecorder(nodeRecorders: [nodeRecorder]),
             idsGenerator: NodeIDGenerator(),
             imageDataProvider: MockImageDataProvider(),
-            textObfuscators: TextObfuscators()
+            textObfuscation: TextObfuscation()
         )
 
         // When
@@ -41,7 +41,7 @@ class ViewTreeSnapshotBuilderTests: XCTestCase {
             viewTreeRecorder: ViewTreeRecorder(nodeRecorders: [nodeRecorder]),
             idsGenerator: NodeIDGenerator(),
             imageDataProvider: MockImageDataProvider(),
-            textObfuscators: TextObfuscators()
+            textObfuscation: TextObfuscation()
         )
 
         // When

From 3c7e5625674e1a9438628e357a105ec5c9e75bbd Mon Sep 17 00:00:00 2001
From: Maciek Grzybowski <maciek.grzybowski@datadoghq.com>
Date: Wed, 10 May 2023 10:18:35 +0200
Subject: [PATCH 6/7] REPLAY-1610 CR feedback - fix typo

---
 .../Sources/Processor/Privacy/TextObfuscator.swift   | 12 ++++++------
 DatadogSessionReplay/Tests/Mocks/RecorderMocks.swift |  2 +-
 .../Processor/Privacy/TextObfuscatorTests.swift      | 12 ++++++------
 .../NodeRecorders/UITextFieldRecorderTests.swift     |  8 ++++----
 .../NodeRecorders/UITextViewRecorderTests.swift      |  6 +++---
 5 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/DatadogSessionReplay/Sources/Processor/Privacy/TextObfuscator.swift b/DatadogSessionReplay/Sources/Processor/Privacy/TextObfuscator.swift
index d8efdb1bf1..012643b704 100644
--- a/DatadogSessionReplay/Sources/Processor/Privacy/TextObfuscator.swift
+++ b/DatadogSessionReplay/Sources/Processor/Privacy/TextObfuscator.swift
@@ -20,7 +20,7 @@ internal struct TextObfuscation {
     /// Text obfuscator that replaces each character with `"x"` mask.
     private let spacePreservingMask = SpacePreservingMaskObfuscator()
     /// Text obfuscator that replaces whole text with fixed-length `"***"` mask (three asterics).
-    private let fixLegthMask = FixLegthMaskObfuscator()
+    private let fixLengthMask = FixLengthMaskObfuscator()
 
     /// Returns "Sensitive Text" obfuscator for given `privacyLevel`.
     ///
@@ -28,7 +28,7 @@ internal struct TextObfuscation {
     /// - passwords, e-mails and phone numbers marked in a platform-specific way
     /// - AND other forms of sensitivity in text available to each platform
     func sensitiveTextObfuscator(for privacyLevel: SessionReplayPrivacy) -> TextObfuscating {
-        return fixLegthMask
+        return fixLengthMask
     }
 
     /// Returns "Input & Option Text" obfuscator for given `privacyLevel`.
@@ -39,8 +39,8 @@ internal struct TextObfuscation {
     func inputAndOptionTextObfuscator(for privacyLevel: SessionReplayPrivacy) -> TextObfuscating {
         switch privacyLevel {
         case .allowAll:         return nop
-        case .maskAll:          return fixLegthMask
-        case .maskUserInput:    return fixLegthMask
+        case .maskAll:          return fixLengthMask
+        case .maskUserInput:    return fixLengthMask
         }
     }
 
@@ -61,7 +61,7 @@ internal struct TextObfuscation {
     func hintTextObfuscator(for privacyLevel: SessionReplayPrivacy) -> TextObfuscating {
         switch privacyLevel {
         case .allowAll:         return nop
-        case .maskAll:          return fixLegthMask
+        case .maskAll:          return fixLengthMask
         case .maskUserInput:    return nop
         }
     }
@@ -94,7 +94,7 @@ internal struct SpacePreservingMaskObfuscator: TextObfuscating {
 }
 
 /// Text obfuscator which replaces entire text with fix-length `"***"` mask value.
-internal struct FixLegthMaskObfuscator: TextObfuscating {
+internal struct FixLengthMaskObfuscator: TextObfuscating {
     private static let maskedString = "***"
 
     func mask(text: String) -> String { Self.maskedString }
diff --git a/DatadogSessionReplay/Tests/Mocks/RecorderMocks.swift b/DatadogSessionReplay/Tests/Mocks/RecorderMocks.swift
index 3d42cbfc5c..702ce59365 100644
--- a/DatadogSessionReplay/Tests/Mocks/RecorderMocks.swift
+++ b/DatadogSessionReplay/Tests/Mocks/RecorderMocks.swift
@@ -272,7 +272,7 @@ internal class TextObfuscatorMock: TextObfuscating {
 }
 
 internal func mockRandomTextObfuscator() -> TextObfuscating {
-    return [NOPTextObfuscator(), SpacePreservingMaskObfuscator(), FixLegthMaskObfuscator()].randomElement()!
+    return [NOPTextObfuscator(), SpacePreservingMaskObfuscator(), FixLengthMaskObfuscator()].randomElement()!
 }
 
 extension ViewTreeRecordingContext: AnyMockable, RandomMockable {
diff --git a/DatadogSessionReplay/Tests/Processor/Privacy/TextObfuscatorTests.swift b/DatadogSessionReplay/Tests/Processor/Privacy/TextObfuscatorTests.swift
index 80b36fc3b9..240609f678 100644
--- a/DatadogSessionReplay/Tests/Processor/Privacy/TextObfuscatorTests.swift
+++ b/DatadogSessionReplay/Tests/Processor/Privacy/TextObfuscatorTests.swift
@@ -12,13 +12,13 @@ class TextObfuscationTests: XCTestCase {
     let obfuscation = TextObfuscation()
 
     func testSensitiveTextObfuscation() {
-        XCTAssertTrue(obfuscation.sensitiveTextObfuscator(for: .mockRandom()) is FixLegthMaskObfuscator)
+        XCTAssertTrue(obfuscation.sensitiveTextObfuscator(for: .mockRandom()) is FixLengthMaskObfuscator)
     }
 
     func testInputAndOptionTextObfuscation() {
         XCTAssertTrue(obfuscation.inputAndOptionTextObfuscator(for: .allowAll) is NOPTextObfuscator)
-        XCTAssertTrue(obfuscation.inputAndOptionTextObfuscator(for: .maskAll) is FixLegthMaskObfuscator)
-        XCTAssertTrue(obfuscation.inputAndOptionTextObfuscator(for: .maskUserInput) is FixLegthMaskObfuscator)
+        XCTAssertTrue(obfuscation.inputAndOptionTextObfuscator(for: .maskAll) is FixLengthMaskObfuscator)
+        XCTAssertTrue(obfuscation.inputAndOptionTextObfuscator(for: .maskUserInput) is FixLengthMaskObfuscator)
     }
 
     func testStaticTextObfuscation() {
@@ -28,7 +28,7 @@ class TextObfuscationTests: XCTestCase {
 
     func testHintTextObfuscation() {
         XCTAssertTrue(obfuscation.hintTextObfuscator(for: .allowAll) is NOPTextObfuscator)
-        XCTAssertTrue(obfuscation.hintTextObfuscator(for: .maskAll) is FixLegthMaskObfuscator)
+        XCTAssertTrue(obfuscation.hintTextObfuscator(for: .maskAll) is FixLengthMaskObfuscator)
         XCTAssertTrue(obfuscation.hintTextObfuscator(for: .maskUserInput) is NOPTextObfuscator)
     }
 }
@@ -75,8 +75,8 @@ class SpacePreservingMaskObfuscatorTests: XCTestCase {
     }
 }
 
-class FixLegthMaskObfuscatorTests: XCTestCase {
-    let obfuscator = FixLegthMaskObfuscator()
+class FixLengthMaskObfuscatorTests: XCTestCase {
+    let obfuscator = FixLengthMaskObfuscator()
 
     func testWhenObfuscatingItAlwaysReplacesTextItWithConstantMask() {
         let expectedMask = "***"
diff --git a/DatadogSessionReplay/Tests/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UITextFieldRecorderTests.swift b/DatadogSessionReplay/Tests/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UITextFieldRecorderTests.swift
index 5747da37fb..8f53c8b7db 100644
--- a/DatadogSessionReplay/Tests/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UITextFieldRecorderTests.swift
+++ b/DatadogSessionReplay/Tests/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UITextFieldRecorderTests.swift
@@ -80,8 +80,8 @@ class UITextFieldRecorderTests: XCTestCase {
         }
 
         XCTAssertTrue(try textObfuscator(in: .allowAll) is NOPTextObfuscator)
-        XCTAssertTrue(try textObfuscator(in: .maskAll) is FixLegthMaskObfuscator)
-        XCTAssertTrue(try textObfuscator(in: .maskUserInput) is FixLegthMaskObfuscator)
+        XCTAssertTrue(try textObfuscator(in: .maskAll) is FixLengthMaskObfuscator)
+        XCTAssertTrue(try textObfuscator(in: .maskUserInput) is FixLengthMaskObfuscator)
 
         // When
         oneOrMoreOf([
@@ -90,7 +90,7 @@ class UITextFieldRecorderTests: XCTestCase {
         ])
 
         // Then
-        XCTAssertTrue(try textObfuscator(in: .mockRandom()) is FixLegthMaskObfuscator)
+        XCTAssertTrue(try textObfuscator(in: .mockRandom()) is FixLengthMaskObfuscator)
 
         // When
         textField.text = nil
@@ -98,7 +98,7 @@ class UITextFieldRecorderTests: XCTestCase {
 
         // Then
         XCTAssertTrue(try textObfuscator(in: .allowAll) is NOPTextObfuscator)
-        XCTAssertTrue(try textObfuscator(in: .maskAll) is FixLegthMaskObfuscator)
+        XCTAssertTrue(try textObfuscator(in: .maskAll) is FixLengthMaskObfuscator)
         XCTAssertTrue(try textObfuscator(in: .maskUserInput) is NOPTextObfuscator)
     }
 }
diff --git a/DatadogSessionReplay/Tests/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UITextViewRecorderTests.swift b/DatadogSessionReplay/Tests/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UITextViewRecorderTests.swift
index e904641af9..80d212d855 100644
--- a/DatadogSessionReplay/Tests/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UITextViewRecorderTests.swift
+++ b/DatadogSessionReplay/Tests/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UITextViewRecorderTests.swift
@@ -70,8 +70,8 @@ class UITextViewRecorderTests: XCTestCase {
         }
 
         XCTAssertTrue(try textObfuscator(in: .allowAll) is NOPTextObfuscator)
-        XCTAssertTrue(try textObfuscator(in: .maskAll) is FixLegthMaskObfuscator)
-        XCTAssertTrue(try textObfuscator(in: .maskUserInput) is FixLegthMaskObfuscator)
+        XCTAssertTrue(try textObfuscator(in: .maskAll) is FixLengthMaskObfuscator)
+        XCTAssertTrue(try textObfuscator(in: .maskUserInput) is FixLengthMaskObfuscator)
 
         // When
         textView.isEditable = .mockRandom()
@@ -81,7 +81,7 @@ class UITextViewRecorderTests: XCTestCase {
         ])
 
         // Then
-        XCTAssertTrue(try textObfuscator(in: .mockRandom()) is FixLegthMaskObfuscator)
+        XCTAssertTrue(try textObfuscator(in: .mockRandom()) is FixLengthMaskObfuscator)
 
         // When
         textView.isEditable = false

From 667852aa5f85120849246e6e99e8cf96c052a72e Mon Sep 17 00:00:00 2001
From: Maciek Grzybowski <maciek.grzybowski@datadoghq.com>
Date: Wed, 10 May 2023 11:42:32 +0200
Subject: [PATCH 7/7] REPLAY-1610 CR feedback - rearrange how obfuscators are
 provided through `context`

---
 .../Drafts/SessionReplayConfiguration.swift   | 31 -------
 .../Processor/Privacy/TextObfuscator.swift    | 58 +------------
 .../NodeRecorders/UIDatePickerRecorder.swift  |  6 +-
 .../NodeRecorders/UILabelRecorder.swift       |  2 +-
 .../NodeRecorders/UIPickerViewRecorder.swift  |  2 +-
 .../NodeRecorders/UISegmentRecorder.swift     |  2 +-
 .../NodeRecorders/UITextFieldRecorder.swift   |  6 +-
 .../NodeRecorders/UITextViewRecorder.swift    |  6 +-
 .../ViewTreeRecordingContext.swift            |  2 -
 .../ViewTreeSnapshotBuilder.swift             |  8 +-
 .../Sources/SessionReplayPrivacy.swift        | 84 +++++++++++++++++++
 .../Tests/Mocks/RecorderMocks.swift           |  9 +-
 .../Privacy/TextObfuscatorTests.swift         | 25 ------
 .../ViewTreeSnapshotBuilderTests.swift        |  6 +-
 .../Tests/SessionReplayPrivacyTests.swift     | 43 ++++++++++
 15 files changed, 148 insertions(+), 142 deletions(-)
 create mode 100644 DatadogSessionReplay/Sources/SessionReplayPrivacy.swift
 create mode 100644 DatadogSessionReplay/Tests/SessionReplayPrivacyTests.swift

diff --git a/DatadogSessionReplay/Sources/Drafts/SessionReplayConfiguration.swift b/DatadogSessionReplay/Sources/Drafts/SessionReplayConfiguration.swift
index 76fa785322..a81048457a 100644
--- a/DatadogSessionReplay/Sources/Drafts/SessionReplayConfiguration.swift
+++ b/DatadogSessionReplay/Sources/Drafts/SessionReplayConfiguration.swift
@@ -26,34 +26,3 @@ public struct SessionReplayConfiguration {
         self.customUploadURL = customUploadURL
     }
 }
-
-/// Session Replay content recording policy.
-/// It describes the way in which sensitive content (e.g. text or images) should be captured.
-public enum SessionReplayPrivacy {
-    /// Record all content as it is.
-    /// When using this option: all text, images and other information will be recorded and presented in the player.
-    case allowAll
-
-    /// Mask all content.
-    /// When using this option: all characters in texts will be replaced with "x", images will be
-    /// replaced with placeholders and other content will be masked accordingly, so the original
-    /// information will not be presented in the player.
-    ///
-    /// This is the default content policy.
-    case maskAll
-
-    /// Mask input elements, but record all other content as it is.
-    /// When uing this option: all user input and selected values (text fields, switches, pickers, segmented controls etc.) will be masked,
-    /// but static text (e.g. in labels) will be not.
-    case maskUserInput
-}
-
-internal extension SessionReplayPrivacy {
-    /// If input elements should be masked in this privacy mode.
-    var shouldMaskInputElements: Bool {
-        switch self {
-        case .maskAll, .maskUserInput: return true
-        case .allowAll: return false
-        }
-    }
-}
diff --git a/DatadogSessionReplay/Sources/Processor/Privacy/TextObfuscator.swift b/DatadogSessionReplay/Sources/Processor/Privacy/TextObfuscator.swift
index 012643b704..73c4030432 100644
--- a/DatadogSessionReplay/Sources/Processor/Privacy/TextObfuscator.swift
+++ b/DatadogSessionReplay/Sources/Processor/Privacy/TextObfuscator.swift
@@ -13,64 +13,10 @@ internal protocol TextObfuscating {
     func mask(text: String) -> String
 }
 
-/// Text obfuscation strategies for different text types.
-internal struct TextObfuscation {
-    /// Text obfuscator that returns original text (no obfuscation).
-    private let nop = NOPTextObfuscator()
-    /// Text obfuscator that replaces each character with `"x"` mask.
-    private let spacePreservingMask = SpacePreservingMaskObfuscator()
-    /// Text obfuscator that replaces whole text with fixed-length `"***"` mask (three asterics).
-    private let fixLengthMask = FixLengthMaskObfuscator()
-
-    /// Returns "Sensitive Text" obfuscator for given `privacyLevel`.
-    ///
-    /// In Session Replay, "Sensitive Text" is:
-    /// - passwords, e-mails and phone numbers marked in a platform-specific way
-    /// - AND other forms of sensitivity in text available to each platform
-    func sensitiveTextObfuscator(for privacyLevel: SessionReplayPrivacy) -> TextObfuscating {
-        return fixLengthMask
-    }
-
-    /// Returns "Input & Option Text" obfuscator for given `privacyLevel`.
-    ///
-    /// In Session Replay, "Input & Option Text" is:
-    /// - a text entered by the user with a keyboard or other text-input device
-    /// - OR a custom (non-generic) value in selection elements
-    func inputAndOptionTextObfuscator(for privacyLevel: SessionReplayPrivacy) -> TextObfuscating {
-        switch privacyLevel {
-        case .allowAll:         return nop
-        case .maskAll:          return fixLengthMask
-        case .maskUserInput:    return fixLengthMask
-        }
-    }
-
-    /// Returns "Static Text" obfuscator for given `privacyLevel`.
-    ///
-    /// In Session Replay, "Static Text" is a text not directly entered by the user.
-    func staticTextObfuscator(for privacyLevel: SessionReplayPrivacy) -> TextObfuscating {
-        switch privacyLevel {
-        case .allowAll:         return nop
-        case .maskAll:          return spacePreservingMask
-        case .maskUserInput:    return nop
-        }
-    }
-
-    /// Returns "Hint Text" obfuscator for given `privacyLevel`.
-    ///
-    /// In Session Replay, "Hint Text" is a static text in editable text elements or option selectors, displayed when there isn't any value set.
-    func hintTextObfuscator(for privacyLevel: SessionReplayPrivacy) -> TextObfuscating {
-        switch privacyLevel {
-        case .allowAll:         return nop
-        case .maskAll:          return fixLengthMask
-        case .maskUserInput:    return nop
-        }
-    }
-}
-
 /// Text obfuscator which replaces all readable characters with space-preserving `"x"` characters.
 internal struct SpacePreservingMaskObfuscator: TextObfuscating {
     /// The character to mask text with.
-    let maskCharacter: UnicodeScalar = "x"
+    private static let maskCharacter: UnicodeScalar = "x"
 
     /// Masks given `text` by replacing all not whitespace characters with `"x"`.
     /// - Parameter text: the text to be masked
@@ -85,7 +31,7 @@ internal struct SpacePreservingMaskObfuscator: TextObfuscating {
             case " ", "\n", "\r", "\t":
                 masked.unicodeScalars.append(nextScalar)
             default:
-                masked.unicodeScalars.append(maskCharacter)
+                masked.unicodeScalars.append(SpacePreservingMaskObfuscator.maskCharacter)
             }
         }
 
diff --git a/DatadogSessionReplay/Sources/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UIDatePickerRecorder.swift b/DatadogSessionReplay/Sources/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UIDatePickerRecorder.swift
index d9a62a3c6d..0d184c618b 100644
--- a/DatadogSessionReplay/Sources/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UIDatePickerRecorder.swift
+++ b/DatadogSessionReplay/Sources/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UIDatePickerRecorder.swift
@@ -73,7 +73,7 @@ private struct WheelsStyleDatePickerRecorder {
         nodeRecorders: [
             UIPickerViewRecorder(
                 textObfuscator: { context in
-                    return context.textObfuscation.staticTextObfuscator(for: context.recorder.privacy)
+                    return context.recorder.privacy.staticTextObfuscator
                 }
             )
         ]
@@ -93,7 +93,7 @@ private struct InlineStyleDatePickerRecorder {
         self.viewRecorder = UIViewRecorder()
         self.labelRecorder = UILabelRecorder(
             textObfuscator: { context in
-                return context.textObfuscation.staticTextObfuscator(for: context.recorder.privacy)
+                return context.recorder.privacy.staticTextObfuscator
             }
         )
         self.subtreeRecorder = ViewTreeRecorder(
@@ -136,7 +136,7 @@ private struct CompactStyleDatePickerRecorder {
             UIViewRecorder(),
             UILabelRecorder(
                 textObfuscator: { context in
-                    return context.textObfuscation.staticTextObfuscator(for: context.recorder.privacy)
+                    return context.recorder.privacy.staticTextObfuscator
                 }
             )
         ]
diff --git a/DatadogSessionReplay/Sources/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UILabelRecorder.swift b/DatadogSessionReplay/Sources/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UILabelRecorder.swift
index 713ac41907..125a73b63f 100644
--- a/DatadogSessionReplay/Sources/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UILabelRecorder.swift
+++ b/DatadogSessionReplay/Sources/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UILabelRecorder.swift
@@ -14,7 +14,7 @@ internal class UILabelRecorder: NodeRecorder {
     init(
         builderOverride: @escaping (UILabelWireframesBuilder) -> UILabelWireframesBuilder = { $0 },
         textObfuscator: @escaping (ViewTreeRecordingContext) -> TextObfuscating = { context in
-            return context.textObfuscation.staticTextObfuscator(for: context.recorder.privacy)
+            return context.recorder.privacy.staticTextObfuscator
         }
     ) {
         self.builderOverride = builderOverride
diff --git a/DatadogSessionReplay/Sources/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UIPickerViewRecorder.swift b/DatadogSessionReplay/Sources/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UIPickerViewRecorder.swift
index b10b7527e2..d8c250c7d0 100644
--- a/DatadogSessionReplay/Sources/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UIPickerViewRecorder.swift
+++ b/DatadogSessionReplay/Sources/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UIPickerViewRecorder.swift
@@ -25,7 +25,7 @@ internal struct UIPickerViewRecorder: NodeRecorder {
 
     init(
         textObfuscator: @escaping (ViewTreeRecordingContext) -> TextObfuscating = { context in
-            return context.textObfuscation.inputAndOptionTextObfuscator(for: context.recorder.privacy)
+            return context.recorder.privacy.inputAndOptionTextObfuscator
         }
     ) {
         self.selectionRecorder = ViewTreeRecorder(nodeRecorders: [UIViewRecorder()])
diff --git a/DatadogSessionReplay/Sources/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UISegmentRecorder.swift b/DatadogSessionReplay/Sources/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UISegmentRecorder.swift
index d30549769c..d9fff76894 100644
--- a/DatadogSessionReplay/Sources/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UISegmentRecorder.swift
+++ b/DatadogSessionReplay/Sources/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UISegmentRecorder.swift
@@ -8,7 +8,7 @@ import UIKit
 
 internal struct UISegmentRecorder: NodeRecorder {
     var textObfuscator: (ViewTreeRecordingContext) -> TextObfuscating = { context in
-        return context.textObfuscation.inputAndOptionTextObfuscator(for: context.recorder.privacy)
+        return context.recorder.privacy.inputAndOptionTextObfuscator
     }
 
     func semantics(of view: UIView, with attributes: ViewAttributes, in context: ViewTreeRecordingContext) -> NodeSemantics? {
diff --git a/DatadogSessionReplay/Sources/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UITextFieldRecorder.swift b/DatadogSessionReplay/Sources/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UITextFieldRecorder.swift
index af4dae6c56..892a609fba 100644
--- a/DatadogSessionReplay/Sources/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UITextFieldRecorder.swift
+++ b/DatadogSessionReplay/Sources/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UITextFieldRecorder.swift
@@ -15,11 +15,11 @@ internal struct UITextFieldRecorder: NodeRecorder {
 
     var textObfuscator: (ViewTreeRecordingContext, _ isSensitive: Bool, _ isPlaceholder: Bool) -> TextObfuscating = { context, isSensitive, isPlaceholder in
         if isPlaceholder {
-            return context.textObfuscation.hintTextObfuscator(for: context.recorder.privacy)
+            return context.recorder.privacy.hintTextObfuscator
         } else if isSensitive {
-            return context.textObfuscation.sensitiveTextObfuscator(for: context.recorder.privacy)
+            return context.recorder.privacy.sensitiveTextObfuscator
         } else {
-            return context.textObfuscation.inputAndOptionTextObfuscator(for: context.recorder.privacy)
+            return context.recorder.privacy.inputAndOptionTextObfuscator
         }
     }
 
diff --git a/DatadogSessionReplay/Sources/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UITextViewRecorder.swift b/DatadogSessionReplay/Sources/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UITextViewRecorder.swift
index c77c1e578f..3a455599a5 100644
--- a/DatadogSessionReplay/Sources/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UITextViewRecorder.swift
+++ b/DatadogSessionReplay/Sources/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/NodeRecorders/UITextViewRecorder.swift
@@ -9,13 +9,13 @@ import UIKit
 internal struct UITextViewRecorder: NodeRecorder {
     var textObfuscator: (ViewTreeRecordingContext, _ isSensitive: Bool, _ isEditable: Bool) -> TextObfuscating = { context, isSensitive, isEditable in
         if isSensitive {
-            return context.textObfuscation.sensitiveTextObfuscator(for: context.recorder.privacy)
+            return context.recorder.privacy.sensitiveTextObfuscator
         }
 
         if isEditable {
-            return context.textObfuscation.inputAndOptionTextObfuscator(for: context.recorder.privacy)
+            return context.recorder.privacy.inputAndOptionTextObfuscator
         } else {
-            return context.textObfuscation.staticTextObfuscator(for: context.recorder.privacy)
+            return context.recorder.privacy.staticTextObfuscator
         }
     }
 
diff --git a/DatadogSessionReplay/Sources/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/ViewTreeRecordingContext.swift b/DatadogSessionReplay/Sources/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/ViewTreeRecordingContext.swift
index 6fbbc2f4ea..a52454afef 100644
--- a/DatadogSessionReplay/Sources/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/ViewTreeRecordingContext.swift
+++ b/DatadogSessionReplay/Sources/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/ViewTreeRecordingContext.swift
@@ -20,8 +20,6 @@ internal struct ViewTreeRecordingContext {
     let ids: NodeIDGenerator
     /// Provides base64 image data with a built in caching mechanism.
     let imageDataProvider: ImageDataProviding
-    /// Available text obfuscators to use accordingly to current privacy mode.
-    let textObfuscation: TextObfuscation
     /// Variable view controller related context
     var viewControllerContext: ViewControllerContext = .init()
 }
diff --git a/DatadogSessionReplay/Sources/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/ViewTreeSnapshotBuilder.swift b/DatadogSessionReplay/Sources/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/ViewTreeSnapshotBuilder.swift
index 1dd60b8488..d82b7b3729 100644
--- a/DatadogSessionReplay/Sources/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/ViewTreeSnapshotBuilder.swift
+++ b/DatadogSessionReplay/Sources/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/ViewTreeSnapshotBuilder.swift
@@ -17,8 +17,6 @@ internal struct ViewTreeSnapshotBuilder {
     let idsGenerator: NodeIDGenerator
     /// Provides base64 image data with a built in caching mechanism.
     let imageDataProvider: ImageDataProviding
-    /// Text obfuscation strategies for different text types.
-    let textObfuscation: TextObfuscation
 
     /// Builds the `ViewTreeSnapshot` for given root view.
     ///
@@ -32,8 +30,7 @@ internal struct ViewTreeSnapshotBuilder {
             recorder: recorderContext,
             coordinateSpace: rootView,
             ids: idsGenerator,
-            imageDataProvider: imageDataProvider,
-            textObfuscation: textObfuscation
+            imageDataProvider: imageDataProvider
         )
         let snapshot = ViewTreeSnapshot(
             date: recorderContext.date.addingTimeInterval(recorderContext.rumContext.viewServerTimeOffset ?? 0),
@@ -50,8 +47,7 @@ extension ViewTreeSnapshotBuilder {
         self.init(
             viewTreeRecorder: ViewTreeRecorder(nodeRecorders: createDefaultNodeRecorders()),
             idsGenerator: NodeIDGenerator(),
-            imageDataProvider: ImageDataProvider(),
-            textObfuscation: TextObfuscation()
+            imageDataProvider: ImageDataProvider()
         )
     }
 }
diff --git a/DatadogSessionReplay/Sources/SessionReplayPrivacy.swift b/DatadogSessionReplay/Sources/SessionReplayPrivacy.swift
new file mode 100644
index 0000000000..6da33cedcf
--- /dev/null
+++ b/DatadogSessionReplay/Sources/SessionReplayPrivacy.swift
@@ -0,0 +1,84 @@
+/*
+ * Unless explicitly stated otherwise all files in this repository are licensed under the Apache License Version 2.0.
+ * This product includes software developed at Datadog (https://www.datadoghq.com/).
+ * Copyright 2019-Present Datadog, Inc.
+ */
+
+/// Session Replay content recording policy.
+/// It describes the way in which sensitive content (e.g. text or images) should be captured.
+public enum SessionReplayPrivacy {
+    /// Record all content as it is.
+    /// When using this option: all text, images and other information will be recorded and presented in the player.
+    case allowAll
+
+    /// Mask all content.
+    /// When using this option: all characters in texts will be replaced with "x", images will be
+    /// replaced with placeholders and other content will be masked accordingly, so the original
+    /// information will not be presented in the player.
+    ///
+    /// This is the default content policy.
+    case maskAll
+
+    /// Mask input elements, but record all other content as it is.
+    /// When uing this option: all user input and selected values (text fields, switches, pickers, segmented controls etc.) will be masked,
+    /// but static text (e.g. in labels) will be not.
+    case maskUserInput
+}
+
+/// Text obfuscation strategies for different text types.
+internal extension SessionReplayPrivacy {
+    /// Returns "Sensitive Text" obfuscator for given `privacyLevel`.
+    ///
+    /// In Session Replay, "Sensitive Text" is:
+    /// - passwords, e-mails and phone numbers marked in a platform-specific way
+    /// - AND other forms of sensitivity in text available to each platform
+    var sensitiveTextObfuscator: TextObfuscating {
+        return FixLengthMaskObfuscator()
+    }
+
+    /// Returns "Input & Option Text" obfuscator for given `privacyLevel`.
+    ///
+    /// In Session Replay, "Input & Option Text" is:
+    /// - a text entered by the user with a keyboard or other text-input device
+    /// - OR a custom (non-generic) value in selection elements
+    var inputAndOptionTextObfuscator: TextObfuscating {
+        switch self {
+        case .allowAll:         return NOPTextObfuscator()
+        case .maskAll:          return FixLengthMaskObfuscator()
+        case .maskUserInput:    return FixLengthMaskObfuscator()
+        }
+    }
+
+    /// Returns "Static Text" obfuscator for given `privacyLevel`.
+    ///
+    /// In Session Replay, "Static Text" is a text not directly entered by the user.
+    var staticTextObfuscator: TextObfuscating {
+        switch self {
+        case .allowAll:         return NOPTextObfuscator()
+        case .maskAll:          return SpacePreservingMaskObfuscator()
+        case .maskUserInput:    return NOPTextObfuscator()
+        }
+    }
+
+    /// Returns "Hint Text" obfuscator for given `privacyLevel`.
+    ///
+    /// In Session Replay, "Hint Text" is a static text in editable text elements or option selectors, displayed when there isn't any value set.
+    var hintTextObfuscator: TextObfuscating {
+        switch self {
+        case .allowAll:         return NOPTextObfuscator()
+        case .maskAll:          return FixLengthMaskObfuscator()
+        case .maskUserInput:    return NOPTextObfuscator()
+        }
+    }
+}
+
+/// Other convenience helpers.
+internal extension SessionReplayPrivacy {
+    /// If input elements should be masked in this privacy mode.
+    var shouldMaskInputElements: Bool {
+        switch self {
+        case .maskAll, .maskUserInput: return true
+        case .allowAll: return false
+        }
+    }
+}
diff --git a/DatadogSessionReplay/Tests/Mocks/RecorderMocks.swift b/DatadogSessionReplay/Tests/Mocks/RecorderMocks.swift
index 702ce59365..be49f77b73 100644
--- a/DatadogSessionReplay/Tests/Mocks/RecorderMocks.swift
+++ b/DatadogSessionReplay/Tests/Mocks/RecorderMocks.swift
@@ -285,8 +285,7 @@ extension ViewTreeRecordingContext: AnyMockable, RandomMockable {
             recorder: .mockRandom(),
             coordinateSpace: UIView.mockRandom(),
             ids: NodeIDGenerator(),
-            imageDataProvider: mockRandomImageDataProvider(),
-            textObfuscation: TextObfuscation()
+            imageDataProvider: mockRandomImageDataProvider()
         )
     }
 
@@ -294,15 +293,13 @@ extension ViewTreeRecordingContext: AnyMockable, RandomMockable {
         recorder: Recorder.Context = .mockAny(),
         coordinateSpace: UICoordinateSpace = UIView.mockAny(),
         ids: NodeIDGenerator = NodeIDGenerator(),
-        imageDataProvider: ImageDataProviding = MockImageDataProvider(),
-        textObfuscation: TextObfuscation = TextObfuscation()
+        imageDataProvider: ImageDataProviding = MockImageDataProvider()
     ) -> ViewTreeRecordingContext {
         return .init(
             recorder: recorder,
             coordinateSpace: coordinateSpace,
             ids: ids,
-            imageDataProvider: imageDataProvider,
-            textObfuscation: textObfuscation
+            imageDataProvider: imageDataProvider
         )
     }
 }
diff --git a/DatadogSessionReplay/Tests/Processor/Privacy/TextObfuscatorTests.swift b/DatadogSessionReplay/Tests/Processor/Privacy/TextObfuscatorTests.swift
index 240609f678..f0fd41cf4e 100644
--- a/DatadogSessionReplay/Tests/Processor/Privacy/TextObfuscatorTests.swift
+++ b/DatadogSessionReplay/Tests/Processor/Privacy/TextObfuscatorTests.swift
@@ -8,31 +8,6 @@ import XCTest
 @testable import DatadogSessionReplay
 @testable import TestUtilities
 
-class TextObfuscationTests: XCTestCase {
-    let obfuscation = TextObfuscation()
-
-    func testSensitiveTextObfuscation() {
-        XCTAssertTrue(obfuscation.sensitiveTextObfuscator(for: .mockRandom()) is FixLengthMaskObfuscator)
-    }
-
-    func testInputAndOptionTextObfuscation() {
-        XCTAssertTrue(obfuscation.inputAndOptionTextObfuscator(for: .allowAll) is NOPTextObfuscator)
-        XCTAssertTrue(obfuscation.inputAndOptionTextObfuscator(for: .maskAll) is FixLengthMaskObfuscator)
-        XCTAssertTrue(obfuscation.inputAndOptionTextObfuscator(for: .maskUserInput) is FixLengthMaskObfuscator)
-    }
-
-    func testStaticTextObfuscation() {
-        XCTAssertTrue(obfuscation.staticTextObfuscator(for: .allowAll) is NOPTextObfuscator)
-        XCTAssertTrue(obfuscation.staticTextObfuscator(for: .maskAll) is SpacePreservingMaskObfuscator)
-        XCTAssertTrue(obfuscation.staticTextObfuscator(for: .maskUserInput) is NOPTextObfuscator)    }
-
-    func testHintTextObfuscation() {
-        XCTAssertTrue(obfuscation.hintTextObfuscator(for: .allowAll) is NOPTextObfuscator)
-        XCTAssertTrue(obfuscation.hintTextObfuscator(for: .maskAll) is FixLengthMaskObfuscator)
-        XCTAssertTrue(obfuscation.hintTextObfuscator(for: .maskUserInput) is NOPTextObfuscator)
-    }
-}
-
 class SpacePreservingMaskObfuscatorTests: XCTestCase {
     let obfuscator = SpacePreservingMaskObfuscator()
 
diff --git a/DatadogSessionReplay/Tests/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/ViewTreeSnapshotBuilderTests.swift b/DatadogSessionReplay/Tests/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/ViewTreeSnapshotBuilderTests.swift
index c39e7269df..e1e18f7298 100644
--- a/DatadogSessionReplay/Tests/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/ViewTreeSnapshotBuilderTests.swift
+++ b/DatadogSessionReplay/Tests/Recorder/ViewTreeSnapshotProducer/ViewTreeSnapshot/ViewTreeSnapshotBuilderTests.swift
@@ -17,8 +17,7 @@ class ViewTreeSnapshotBuilderTests: XCTestCase {
         let builder = ViewTreeSnapshotBuilder(
             viewTreeRecorder: ViewTreeRecorder(nodeRecorders: [nodeRecorder]),
             idsGenerator: NodeIDGenerator(),
-            imageDataProvider: MockImageDataProvider(),
-            textObfuscation: TextObfuscation()
+            imageDataProvider: MockImageDataProvider()
         )
 
         // When
@@ -40,8 +39,7 @@ class ViewTreeSnapshotBuilderTests: XCTestCase {
         let builder = ViewTreeSnapshotBuilder(
             viewTreeRecorder: ViewTreeRecorder(nodeRecorders: [nodeRecorder]),
             idsGenerator: NodeIDGenerator(),
-            imageDataProvider: MockImageDataProvider(),
-            textObfuscation: TextObfuscation()
+            imageDataProvider: MockImageDataProvider()
         )
 
         // When
diff --git a/DatadogSessionReplay/Tests/SessionReplayPrivacyTests.swift b/DatadogSessionReplay/Tests/SessionReplayPrivacyTests.swift
new file mode 100644
index 0000000000..ae16caca04
--- /dev/null
+++ b/DatadogSessionReplay/Tests/SessionReplayPrivacyTests.swift
@@ -0,0 +1,43 @@
+/*
+ * Unless explicitly stated otherwise all files in this repository are licensed under the Apache License Version 2.0.
+ * This product includes software developed at Datadog (https://www.datadoghq.com/).
+ * Copyright 2019-Present Datadog, Inc.
+ */
+
+import XCTest
+@testable import DatadogSessionReplay
+
+class SessionReplayPrivacyTests: XCTestCase {
+    // MARK: - Text obfuscation strategies
+
+    func testSensitiveTextObfuscation() {
+        XCTAssertTrue(SessionReplayPrivacy.allowAll.sensitiveTextObfuscator is FixLengthMaskObfuscator)
+        XCTAssertTrue(SessionReplayPrivacy.maskAll.sensitiveTextObfuscator is FixLengthMaskObfuscator)
+        XCTAssertTrue(SessionReplayPrivacy.maskUserInput.sensitiveTextObfuscator is FixLengthMaskObfuscator)
+    }
+
+    func testInputAndOptionTextObfuscation() {
+        XCTAssertTrue(SessionReplayPrivacy.allowAll.inputAndOptionTextObfuscator is NOPTextObfuscator)
+        XCTAssertTrue(SessionReplayPrivacy.maskAll.inputAndOptionTextObfuscator is FixLengthMaskObfuscator)
+        XCTAssertTrue(SessionReplayPrivacy.maskUserInput.inputAndOptionTextObfuscator is FixLengthMaskObfuscator)
+    }
+
+    func testStaticTextObfuscation() {
+        XCTAssertTrue(SessionReplayPrivacy.allowAll.staticTextObfuscator is NOPTextObfuscator)
+        XCTAssertTrue(SessionReplayPrivacy.maskAll.staticTextObfuscator is SpacePreservingMaskObfuscator)
+        XCTAssertTrue(SessionReplayPrivacy.maskUserInput.staticTextObfuscator is NOPTextObfuscator)    }
+
+    func testHintTextObfuscation() {
+        XCTAssertTrue(SessionReplayPrivacy.allowAll.hintTextObfuscator is NOPTextObfuscator)
+        XCTAssertTrue(SessionReplayPrivacy.maskAll.hintTextObfuscator is FixLengthMaskObfuscator)
+        XCTAssertTrue(SessionReplayPrivacy.maskUserInput.hintTextObfuscator is NOPTextObfuscator)
+    }
+
+    // MARK: - Convenience helpers
+
+    func testShouldMaskInputElements() {
+        XCTAssertFalse(SessionReplayPrivacy.allowAll.shouldMaskInputElements)
+        XCTAssertTrue(SessionReplayPrivacy.maskAll.shouldMaskInputElements)
+        XCTAssertTrue(SessionReplayPrivacy.maskUserInput.shouldMaskInputElements)
+    }
+}