Lint fixes

duckduckgo · Nov 12, 2024 · 09f7795 · 09f7795
1 parent 2daac15
commit 09f7795
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/DuckDuckGo/DuckPlayer/DuckPlayerNavigationHandler.swift b/DuckDuckGo/DuckPlayer/DuckPlayerNavigationHandler.swift
@@ -575,7 +575,7 @@ final class DuckPlayerNavigationHandler: NSObject {
             // Watch in YT videos always open in new tab
             redirectToYouTubeVideo(url: url, webView: webView, forceNewTab: true)
         }
-    }    
+    }
 
 }
 
@@ -671,18 +671,18 @@ extension DuckPlayerNavigationHandler: DuckPlayerNavigationHandling {
         // Update the Referrer based on the first URL change detected
         setReferrer(webView: webView)
 
-        // Overlay Usage Pixel handling
-        if let url = webView.url {
-            duckPlayerOverlayUsagePixels?.handleNavigationAndFirePixels(url: url, duckPlayerMode: duckPlayerMode)
-        }
-
         // We don't want YouTube redirects happening while default navigation is happening
         // This can be caused by Duplicate Nav events, and quick URL changes
         if let lastTimestamp = lastNavigationHandling,
            Date().timeIntervalSince(lastTimestamp) < lastNavigationHandlingThrottleDuration {
             return .notHandled(.duplicateNavigation)
         }
 
+        // Overlay Usage Pixel handling
+        if let url = webView.url {
+            duckPlayerOverlayUsagePixels?.handleNavigationAndFirePixels(url: url, duckPlayerMode: duckPlayerMode)
+        }
+
         // Check if DuckPlayer feature is enabled
         guard isDuckPlayerFeatureEnabled else {
             return .notHandled(.featureOff)

diff --git a/DuckDuckGo/DuckPlayer/DuckPlayerOverlayUsagePixels.swift b/DuckDuckGo/DuckPlayer/DuckPlayerOverlayUsagePixels.swift
@@ -89,9 +89,8 @@ final class DuckPlayerOverlayUsagePixels: DuckPlayerOverlayPixelFiring {
             }
         }
 
-        // Refined truncation logic:
+        // Truncation logic: Remove all URLs up to the last occurrence of the current URL in normalized form
         if let lastOccurrenceIndex = (0..<navigationHistory.count - 1).last(where: { navigationHistory[$0].forComparison() == comparisonURL }) {
-            // Truncate history to keep only up to the last occurrence of the current URL in normalized form
             navigationHistory = Array(navigationHistory.prefix(upTo: lastOccurrenceIndex + 1))
         }
 

diff --git a/DuckDuckGo/TabViewController.swift b/DuckDuckGo/TabViewController.swift
@@ -867,7 +867,7 @@ class TabViewController: UIViewController {
         }
 
         if webView.canGoBack {
-            webView.goBack()            
+            webView.goBack()
             chromeDelegate?.omniBar.resignFirstResponder()
             return
         }