Duckplayer New Tab + Refactor

DuckDuckGo/DuckPlayer/DuckPlayerNavigationHandler.swift

@@ -301,7 +301,7 @@
     private func fireDuckPlayerPixels(webView: WKWebView) {
 
         // First daily unique user Duck Player view
         dailyPixelFiring.fireDaily(.duckPlayerDailyUniqueView, withAdditionalParameters: ["settings": duckPlayerMode.stringValue])        
 
         // Duck Player viewed with Always setting, referred from YouTube (automatic)
         if (referrer == .youtube) && duckPlayerMode == .enabled {
@@ -525,7 +525,7 @@
         }
 
 
 
     }
 
     /// Determines if the current tab is a new tab based on the targetFrame request and other params
@@ -560,7 +560,7 @@
     ///   - navigationAction: The `WKNavigationAction` to handle.
     ///   - webView: The `WKWebView` where navigation is occurring.
     @MainActor
     func handleDuckNavigation(_ navigationAction: WKNavigationAction, webView: WKWebView) {
 
         Logger.duckPlayer.debug("Handling Navigation for \(webView.url?.absoluteString ?? "")")
 
@@ -648,7 +648,7 @@
     /// - Parameter webView: The `WKWebView` whose URL has changed.
     /// - Returns: A result indicating whether the URL change was handled.
     @MainActor
     func handleURLChange(webView: WKWebView) -> DuckPlayerNavigationHandlerURLChangeResult {
 
         // We want to prevent multiple simultaneous redirects
         // This can be caused by Duplicate Nav events, and quick URL changes
@@ -793,7 +793,6 @@
     func handleAttach(webView: WKWebView) {
 
         // Reset referrer and initial settings
-        duckPlayer.settings.allowFirstVideo = false
         referrer = .other
 
         // Ensure feature and mode are enabled
@@ -836,7 +835,7 @@
         // This is a fallback as the WKNavigation Delegate does not
         // Always fires finishLoading (For JS Navigation) which
         // triggers handleDidFinishLoading
-        DispatchQueue.main.asyncAfter(deadline: .now() + 2.0) {
+        DispatchQueue.main.asyncAfter(deadline: .now() + 1.0) {
             self.duckPlayer.settings.allowFirstVideo = false
         }
 
@@ -880,7 +879,7 @@
             return false
         }
 
         let parameters = getDuckPlayerParameters(url: url)        
 
         // Only account for in 'Always' mode
         if duckPlayerMode == .disabled {

DuckDuckGo/DuckPlayer/DuckPlayerSettings.swift

@@ -173,7 +173,11 @@ final class DuckPlayerSettingsDefault: DuckPlayerSettings {
     }
 
     /// Flag to allow the first video to play without redirection.
-    var allowFirstVideo: Bool = false
+    var allowFirstVideo: Bool = false {
+        didSet {
+            print("DP: Allow first video: \(allowFirstVideo)")
+        }
+    }
 
     /// Determines if Duck Player should open videos in a new tab.
     var openInNewTab: Bool {