RUMM-1931 PR comments addressed

DataDog · Feb 8, 2022 · c43e372 · c43e372
1 parent 773f394
commit c43e372
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/Datadog/Example/Scenarios/WebView/WebViewTrackingFixtureViewController.swift b/Datadog/Example/Scenarios/WebView/WebViewTrackingFixtureViewController.swift
@@ -24,6 +24,10 @@ class ShopistWebviewViewController: UIViewController {
     private let request = URLRequest(url: URL(string: "https://shopist.io")!)
     private var webView: WKWebView!
 
+    deinit {
+        webView.configuration.userContentController.stopTrackingDatadogEvents()
+    }
+
     override func viewDidLoad() {
         super.viewDidLoad()
 

diff --git a/Sources/Datadog/FeaturesIntegration/WebView/WKUserContentController+Datadog.swift b/Sources/Datadog/FeaturesIntegration/WebView/WKUserContentController+Datadog.swift
@@ -30,7 +30,7 @@ public extension WKUserContentController {
     /// Disables Datadog iOS SDK and Datadog Browser SDK integration.
     ///
     /// Removes Datadog's ScriptMessageHandler and UserScript from the caller.
-    /// _NOTE:_ This method **must** be called when the webview can be deinitialized.
+    /// - Note: This method **must** be called when the webview can be deinitialized.
     func stopTrackingDatadogEvents() {
         removeScriptMessageHandler(forName: DatadogMessageHandler.name)
 

diff --git a/Tests/DatadogTests/Datadog/RUM/WebView/WKUserContentController+DatadogTests.swift b/Tests/DatadogTests/Datadog/RUM/WebView/WKUserContentController+DatadogTests.swift
@@ -24,9 +24,7 @@ final class DDUserContentController: WKUserContentController {
 }
 
 final class MockMessageHandler: NSObject, WKScriptMessageHandler {
-    func userContentController(_ userContentController: WKUserContentController, didReceive message: WKScriptMessage) {
-        return
-    }
+    func userContentController(_ userContentController: WKUserContentController, didReceive message: WKScriptMessage) { }
 }
 
 final class MockScriptMessage: WKScriptMessage {