assign tab delegate when attaching

duckduckgo · Apr 3, 2024 · 8c9c6d6 · 8c9c6d6
1 parent 6b30b04
commit 8c9c6d6
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/DuckDuckGo/MainViewController.swift b/DuckDuckGo/MainViewController.swift
@@ -196,7 +196,6 @@ class MainViewController: UIViewController {
 
         super.init(nibName: nil, bundle: nil)
 
-        tabManager.delegate = self
         bindFavoritesDisplayMode()
         bindSyncService()
     }
@@ -228,7 +227,6 @@ class MainViewController: UIViewController {
 
         super.init(nibName: nil, bundle: nil)
 
-        self.tabManager.delegate = self
 
         bindSyncService()
     }
@@ -984,6 +982,7 @@ class MainViewController: UIViewController {
         currentTab?.progressWorker.progressBar = nil
         currentTab?.chromeDelegate = nil
 
+        tab.delegate = self
         addToContentContainer(controller: tab)
 
         viewCoordinator.logoContainer.isHidden = true

diff --git a/DuckDuckGo/TabManager.swift b/DuckDuckGo/TabManager.swift
@@ -35,7 +35,6 @@ class TabManager {
     private let historyManager: HistoryManager
     private let syncService: DDGSyncing
     private var previewsSource: TabPreviewsSource
-    weak var delegate: TabDelegate?
 
     @UserDefaultsWrapper(key: .faviconTabsCacheNeedsCleanup, defaultValue: true)
     var tabsCacheNeedsCleanup: Bool
@@ -78,7 +77,6 @@ class TabManager {
         controller.attachWebView(configuration: configuration,
                                  andLoadRequest: url == nil ? nil : URLRequest.userInitiated(url!),
                                  consumeCookies: !model.hasActiveTabs)
-        controller.delegate = delegate
         controller.loadViewIfNeeded()
         return controller
     }
@@ -150,7 +148,6 @@ class TabManager {
                                  andLoadRequest: request,
                                  consumeCookies: !model.hasActiveTabs,
                                  loadingInitiatedByParentTab: true)
-        controller.delegate = delegate
         controller.loadViewIfNeeded()
         controller.applyInheritedAttribution(inheritedAttribution)
         tabControllerCache.append(controller)