Merge branch 'release/0.31.0'

.github/workflows/pr.yml

@@ -20,15 +20,10 @@ jobs:
     - name: Check out the code
       uses: actions/checkout@v3
 
-    - name: Fetch PR's target branch
-      run: git fetch --no-tags --prune --depth=1 origin ${{ github.base_ref }}
-
     - name: Run SwiftLint on files changed in the PR
-      uses: ayoy/[email protected].2
+      uses: norio-nomura/[email protected].1
       with:
         args: --strict --force-exclude
-      env:
-        DIFF_BASE: ${{ github.base_ref }}
 
   shellcheck:
 
@@ -86,3 +81,21 @@ jobs:
       with:
         report_paths: unittests.xml
 
+  verify-autoconsent-bundle:
+    name: 'Verify autoconsent bundle'
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 16
+          cache: 'npm'
+      - name: Build bundle
+        run: |
+          npm ci
+          npm run rebuild-autoconsent
+      - name: Verify clean tree
+        run: |
+          git update-index --refresh 
+          git diff-index --quiet HEAD --

.gitmodules

@@ -1,6 +1,3 @@
 [submodule "Submodules/duckduckgo-find-in-page"]
 	path = Submodules/duckduckgo-find-in-page
 	url = [email protected]:more-duckduckgo-org/duckduckgo-find-in-page.git
-[submodule "Submodules/duckduckgo-privacy-dashboard"]
-	path = Submodules/duckduckgo-privacy-dashboard
-	url = [email protected]:more-duckduckgo-org/duckduckgo-privacy-dashboard.git

.swiftlint.yml

@@ -1,4 +1,3 @@
-
 disabled_rules:
   - trailing_whitespace
   - no_space_in_method_call
@@ -7,6 +6,7 @@ disabled_rules:
   - compiler_protocol_init
   - unused_setter_value
   - line_length
+  - type_name
 
 opt_in_rules:
   - file_header
@@ -29,11 +29,6 @@ identifier_name:
   max_length:
     warning: 40
     error: 60
-type_name:
-  min_length: 3
-  max_length:
-    warning: 80
-    error: 100
 file_length:
   warning: 1200
   error: 1200

Configuration/Version.xcconfig

@@ -1,2 +1,2 @@
-MARKETING_VERSION = 0.30.8
+MARKETING_VERSION = 0.31.0
 

DuckDuckGo.xcodeproj/xcshareddata/xcschemes/DuckDuckGo Privacy Browser.xcscheme

@@ -67,9 +67,6 @@
                ReferencedContainer = "container:DuckDuckGo.xcodeproj">
             </BuildableReference>
             <SkippedTests>
-               <Test
-                  Identifier = "AutoconsentMessageProtocolTests/testInitResponds()">
-               </Test>
                <Test
                   Identifier = "CBRCompileTimeReporterTests">
                </Test>

DuckDuckGo/App Delegate/AppDelegate.swift

@@ -108,6 +108,8 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
 
         stateRestorationManager.applicationDidFinishLaunching()
 
+        BWManager.shared.initCommunication()
+
         if WindowsManager.windows.isEmpty {
             WindowsManager.openNewWindow(lazyLoadTabs: true)
         }

DuckDuckGo/Assets.xcassets/Images/Autofill/BitwardenIcon.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "BitwardenIcon.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

DuckDuckGo/Assets.xcassets/Images/Autofill/BitwardenLogin.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "BitwardenLogin.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

DuckDuckGo/Assets.xcassets/Images/Autofill/PasswordManager-lock.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "PasswordManager-lock.pdf",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

DuckDuckGo/Assets.xcassets/Images/Bitwarden/BitwardenClock.imageset/Contents.json

@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "BitwardenClock.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}

DuckDuckGo/Assets.xcassets/Images/Bitwarden/BitwardenLock.imageset/Contents.json

@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "BitwardenLock.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}

DuckDuckGo/Assets.xcassets/Images/Bitwarden/BitwardenLogo.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "Bitwarden-Flat-32.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

DuckDuckGo/Assets.xcassets/Images/Bitwarden/BitwardenLogoSmall.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "BitwardenLogoSmall.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

DuckDuckGo/Assets.xcassets/Images/Bitwarden/BitwardenSettingsIllustration.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "Bitwarden Settings Illustration.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "Bitwarden Settings [email protected]",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "Bitwarden Settings [email protected]",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

DuckDuckGo/Assets.xcassets/Images/Bitwarden/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

DuckDuckGo/Assets.xcassets/Images/Bitwarden/MacAppStoreButton.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "Mac App Store Button.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "Mac App Store [email protected]",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "Mac App Store [email protected]",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

DuckDuckGo/Autoconsent/AutoconsentUserScript.swift

@@ -20,6 +20,7 @@ import WebKit
 import os
 import BrowserServicesKit
 import UserScript
+import PrivacyDashboard
 
 protocol AutoconsentUserScriptDelegate: AnyObject {
     func autoconsentUserScript(consentStatus: CookieConsentInfo)

DuckDuckGo/Autofill/ContentOverlayPopover.swift

@@ -93,8 +93,6 @@ extension ContentOverlayPopover: ContentOverlayUserScriptDelegate {
         }
         let rect = NSRect(x: x, y: y, width: rectWidth, height: inputPosition.height)
 
-        // On open initialize to default size to reduce flicker
-        viewController.requestResizeToSize(CGSize(width: 0, height: 0))
         viewController.autofillInterfaceToChild = websiteAutofillUserScript
         viewController.setType(serializedInputContext: serializedInputContext, zoomFactor: zoomFactor)
 

DuckDuckGo/Autofill/ContentOverlayViewController.swift

@@ -37,7 +37,7 @@ public final class ContentOverlayViewController: NSViewController, EmailManagerR
     }()
 
     lazy var vaultManager: SecureVaultManager = {
-        let manager = SecureVaultManager()
+        let manager = SecureVaultManager(passwordManager: PasswordManagerCoordinator.shared)
         manager.delegate = self
         return manager
     }()
@@ -49,6 +49,9 @@ public final class ContentOverlayViewController: NSViewController, EmailManagerR
         appearanceCancellable = NSApp.publisher(for: \.effectiveAppearance).map { $0 as NSAppearance? }.sink { [weak self] appearance in
             self?.webView.appearance = appearance
         }
+
+        // Initialize to default size to reduce flicker
+        requestResizeToSize(CGSize(width: 0, height: 0))
     }
 
     public func setType(serializedInputContext: String, zoomFactor: CGFloat?) {
@@ -232,7 +235,7 @@ extension ContentOverlayViewController: SecureVaultManagerDelegate {
         // no-op on macOS
     }
 
-    public func secureVaultManager(_: SecureVaultManager, didAutofill type: AutofillType, withObjectId objectId: Int64) {
+    public func secureVaultManager(_: SecureVaultManager, didAutofill type: AutofillType, withObjectId objectId: String) {
         Pixel.fire(.formAutofilled(kind: type.formAutofillKind))
     }
 

DuckDuckGo/Bridging.h

@@ -12,3 +12,4 @@
 #import "WKNavigationAction+Private.h"
 
 #import "WKGeolocationProvider.h"
+#import "BWEncryption.h"

DuckDuckGo/Browser Tab/Model/ContentScopeFeatureFlagging.swift

@@ -22,10 +22,11 @@ import BrowserServicesKit
 extension ContentScopeFeatureToggles {
 
     static let supportedFeaturesOnMacOS = ContentScopeFeatureToggles(emailProtection: true,
-                                                                    credentialsAutofill: true,
-                                                                    identitiesAutofill: true,
-                                                                    creditCardsAutofill: true,
-                                                                    credentialsSaving: true,
-                                                                    passwordGeneration: true,
-                                                                    inlineIconCredentials: true)
+                                                                     credentialsAutofill: true,
+                                                                     identitiesAutofill: true,
+                                                                     creditCardsAutofill: true,
+                                                                     credentialsSaving: true,
+                                                                     passwordGeneration: true,
+                                                                     inlineIconCredentials: true,
+                                                                     thirdPartyCredentialsProvider: true)
 }