Address CR comments on hide override

DataDog · Oct 23, 2024 · f798be8 · f798be8
1 parent af9e61b
commit f798be8
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 20 deletions.
diff --git a/DatadogSessionReplay/Sources/UIView+SessionReplayPrivacyOverrides+objc.swift b/DatadogSessionReplay/Sources/UIView+SessionReplayPrivacyOverrides+objc.swift
@@ -54,15 +54,8 @@ public final class objc_SessionReplayPrivacyOverrides: NSObject {
 
     /// Hidden privacy override (e.g., mark a view as hidden, rendering it as an opaque wireframe in replays).
     @objc public var hide: NSNumber? {
-        get {
-            guard let hide = _swift.hide else {
-                return nil
-            }
-            return NSNumber(value: hide)
-        }
-        set {
-            _swift.hide = newValue?.boolValue
-        }
+        get { _swift.hide.map { NSNumber(value: $0) } }
+        set { _swift.hide = newValue?.boolValue }
     }
 }
 

diff --git a/DatadogSessionReplay/Tests/DDSessionReplayOverridesTests.swift b/DatadogSessionReplay/Tests/DDSessionReplayOverridesTests.swift
@@ -80,7 +80,7 @@ class DDSessionReplayOverrideTests: XCTestCase {
         let textAndInputPrivacy: objc_TextAndInputPrivacyLevelOverride = .mockRandom()
         let imagePrivacy: objc_ImagePrivacyLevelOverride = .mockRandom()
         let touchPrivacy: objc_TouchPrivacyLevelOverride = .mockRandom()
-        let hidePrivacy = NSNumber.mockRandomHidePrivacy()
+        let hidePrivacy = NSNumber.mockRandomBoolean()
 
         // When
         let overrides = objc_SessionReplayPrivacyOverrides(view: UIView())
@@ -114,7 +114,7 @@ class DDSessionReplayOverrideTests: XCTestCase {
         let textAndInputPrivacy: objc_TextAndInputPrivacyLevelOverride = .mockRandom()
         let imagePrivacy: objc_ImagePrivacyLevelOverride = .mockRandom()
         let touchPrivacy: objc_TouchPrivacyLevelOverride = .mockRandom()
-        let hidePrivacy = NSNumber.mockRandomHidePrivacy()
+        let hidePrivacy = NSNumber.mockRandomBoolean()
 
         // When
         view.ddSessionReplayPrivacyOverrides.textAndInputPrivacy = textAndInputPrivacy
@@ -147,7 +147,7 @@ class DDSessionReplayOverrideTests: XCTestCase {
         let textAndInputPrivacy: objc_TextAndInputPrivacyLevelOverride = .mockRandom()
         let imagePrivacy: objc_ImagePrivacyLevelOverride = .mockRandom()
         let touchPrivacy: objc_TouchPrivacyLevelOverride = .mockRandom()
-        let hidePrivacy = NSNumber.mockRandomHidePrivacy()
+        let hidePrivacy = NSNumber.mockRandomBoolean()
 
         // When (set in Swift)
         view.dd.sessionReplayPrivacyOverrides.textAndInputPrivacy = textAndInputPrivacy._swift
@@ -168,7 +168,7 @@ class DDSessionReplayOverrideTests: XCTestCase {
         let textAndInputPrivacy: objc_TextAndInputPrivacyLevelOverride = .mockRandom()
         let imagePrivacy: objc_ImagePrivacyLevelOverride = .mockRandom()
         let touchPrivacy: objc_TouchPrivacyLevelOverride = .mockRandom()
-        let hidePrivacy = NSNumber.mockRandomHidePrivacy()
+        let hidePrivacy = NSNumber.mockRandomBoolean()
 
         // When (set in ObjC)
         view.ddSessionReplayPrivacyOverrides.textAndInputPrivacy = textAndInputPrivacy
@@ -192,7 +192,7 @@ class DDSessionReplayOverrideTests: XCTestCase {
             tempView.ddSessionReplayPrivacyOverrides.textAndInputPrivacy = .mockRandom()
             tempView.ddSessionReplayPrivacyOverrides.imagePrivacy = .mockRandom()
             tempView.ddSessionReplayPrivacyOverrides.touchPrivacy = .mockRandom()
-            tempView.ddSessionReplayPrivacyOverrides.hide = NSNumber.mockRandomHidePrivacy()
+            tempView.ddSessionReplayPrivacyOverrides.hide = NSNumber.mockRandomBoolean()
         }
 
         XCTAssertNil(view?.ddSessionReplayPrivacyOverrides.textAndInputPrivacy)

diff --git a/DatadogSessionReplay/Tests/Mocks/PrivacyOverridesMock+objc.swift b/DatadogSessionReplay/Tests/Mocks/PrivacyOverridesMock+objc.swift
@@ -42,12 +42,8 @@ extension objc_TouchPrivacyLevelOverride: AnyMockable, RandomMockable {
 }
 
 extension NSNumber {
-    static func mockAnyHidePrivacy() -> NSNumber? {
-        return NSNumber(value: true)
-    }
-
-    static func mockRandomHidePrivacy() -> NSNumber? {
-        return [true, false].randomElement().map { NSNumber(value: $0) } ?? nil
+    static func mockRandomBoolean() -> NSNumber? {
+        NSNumber(value: [true, false].randomElement()!)
     }
 }
 #endif