Merge release/1.109.0 into main

.github/workflows/build_notarized.yml

@@ -123,7 +123,7 @@ jobs:
         if [[ "${{ env.is-official-release }}" == "true" ]]; then
           echo "upload-to=s3" >> $GITHUB_OUTPUT
           echo "upload-to=s3" >> $GITHUB_ENV
-        elif [[ -n "${{ env.asana-task-url }}" ]]; then
+        else
           echo "upload-to=s3testbuilds" >> $GITHUB_OUTPUT
           echo "upload-to=s3testbuilds" >> $GITHUB_ENV
         fi
@@ -349,9 +349,11 @@ jobs:
         echo "🔗 [${DMG_S3_PATH}](${DMG_URL})" >> $GITHUB_STEP_SUMMARY
         echo "🔗 [${DSYM_S3_PATH}](${DSYM_URL})" >> $GITHUB_STEP_SUMMARY
 
-        bundle exec fastlane run asana_add_comment \
-          task_url:"${{ env.asana-task-url }}" \
-          comment:"New build is available at ${DMG_URL}."
+        if [[ -n "${{ env.asana-task-url }}" ]]; then
+          bundle exec fastlane run asana_add_comment \
+            task_url:"${{ env.asana-task-url }}" \
+            comment:"New build is available at ${DMG_URL}."
+        fi
 
   mattermost:
 

Configuration/BuildNumber.xcconfig

@@ -1 +1 @@
-CURRENT_PROJECT_VERSION = 277
+CURRENT_PROJECT_VERSION = 278

DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/ActiveDomainPublisher.swift

@@ -29,6 +29,7 @@ final class ActiveDomainPublisher {
     private var activeWindowControllerCancellable: AnyCancellable?
     private var activeTabViewModelCancellable: AnyCancellable?
     private var activeTabContentCancellable: AnyCancellable?
+    private var unregisterWindowControllerCancellable: AnyCancellable?
 
     @MainActor private weak var activeWindowController: MainWindowController? {
         didSet {
@@ -47,6 +48,7 @@ final class ActiveDomainPublisher {
 
         Task { @MainActor in
             subscribeToKeyWindowControllerChanges()
+            subscribeToUnregisteringWindowController()
         }
     }
 
@@ -76,6 +78,16 @@ final class ActiveDomainPublisher {
             .assign(to: \.activeDomain, onWeaklyHeld: self)
     }
 
+    @MainActor
+    private func subscribeToUnregisteringWindowController() {
+        unregisterWindowControllerCancellable = windowControllersManager.didUnregisterWindowController.sink { [weak self] in
+            guard let self else { return }
+            if self.activeWindowController == $0 {
+                self.activeWindowController = nil
+            }
+        }
+    }
+
     private func domain(from tabContent: Tab.TabContent) -> String? {
         if case .url(let url, _, _) = tabContent {
 

scripts/appcast_manager/appcastManager.swift

@@ -346,6 +346,7 @@ final class AppcastDownloader {
         prepareDirectories()
         downloadAppcast()
         dispatchGroup.wait()
+        backupAppcast()
         parseAndDownloadFilesFromAppcast()
         dispatchGroup.wait()
 
@@ -514,6 +515,26 @@ final class AppcastDownloader {
         }
     }
 
+    private func backupAppcast() {
+        // Check if backup file already exists and remove it
+        if FileManager.default.fileExists(atPath: backupFileURL.path) {
+            do {
+                try FileManager.default.removeItem(at: backupFileURL)
+            } catch {
+                print("❌ Error removing existing backup file: \(error)")
+                exit(1)
+            }
+        }
+
+        // Create a new backup of the appcast file
+        do {
+            try FileManager.default.copyItem(at: appcastFilePath, to: backupFileURL)
+        } catch {
+            print("❌ Error backing up appcast2.xml: \(error)")
+            exit(1)
+        }
+    }
+
     private func parseAndDownloadFilesFromAppcast() {
         let parser = XMLParser(contentsOf: specificDir.appendingPathComponent("appcast2.xml"))
         let delegate = AppcastXMLParserDelegate(downloadFile: downloadFile, dispatchGroup: dispatchGroup)
@@ -773,24 +794,6 @@ func writeAppcastContent(_ content: String, to filePath: URL) {
 // MARK: - Generating of New Appcast
 
 func runGenerateAppcast(with versionNumber: String, channel: String? = nil, rolloutInterval: String? = nil, keyFile: String? = nil) {
-    // Check if backup file already exists and remove it
-    if FileManager.default.fileExists(atPath: backupFileURL.path) {
-        do {
-            try FileManager.default.removeItem(at: backupFileURL)
-        } catch {
-            print("❌ Error removing existing backup file: \(error)")
-            exit(1)
-        }
-    }
-
-    // Create a new backup of the appcast file
-    do {
-        try FileManager.default.copyItem(at: appcastFilePath, to: backupFileURL)
-    } catch {
-        print("❌ Error backing up appcast2.xml: \(error)")
-        exit(1)
-    }
-
     let maximumVersions = "2"
     let maximumDeltas = "2"