Merge branch 'main' into sam/mac-deprecated-remote-messaging-attribute

# By Christopher Brind (1) and others # Via GitHub * main: [DuckPlayer] 6 - Init updates and Watch on YouTube (#3066) New Tab Page Shortcuts section (#3104) Fix VPN configuration removal to stop the tunnel (#3099) avoid resizing webview when keyboard shows/hides (#3094) Add support for skipping sending usage pixels for remote messages (#3106) # Conflicts: # DuckDuckGo.xcodeproj/project.pbxproj # DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
duckduckgo · Jul 19, 2024 · ad03b7f · ad03b7f
2 parents aff341c + 01a1c38
commit ad03b7f
Show file tree

Hide file tree

Showing 55 changed files with 1,159 additions and 489 deletions.
diff --git a/Core/Logging.swift b/Core/Logging.swift
@@ -31,6 +31,7 @@ public extension OSLog {
         case autoconsentLog = "DDG Autoconsent"
         case configurationLog = "DDG Configuration"
         case syncLog = "DDG Sync"
+        case duckPlayerLog = "Duck Player"
     }
 
     @OSLogWrapper(.generalLog) static var generalLog
@@ -40,6 +41,7 @@ public extension OSLog {
     @OSLogWrapper(.autoconsentLog) static var autoconsentLog
     @OSLogWrapper(.configurationLog) static var configurationLog
     @OSLogWrapper(.syncLog) static var syncLog
+    @OSLogWrapper(.duckPlayerLog) static var duckPlayerLog
 
     // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
     // To activate Logging Categories add categories here:
@@ -50,7 +52,8 @@ public extension OSLog {
         .adAttributionLog,
         .lifecycleLog,
         .configurationLog,
-        .syncLog
+        .syncLog,
+        .duckPlayerLog
     ]
 #endif
 

diff --git a/Core/UserDefaultsPropertyWrapper.swift b/Core/UserDefaultsPropertyWrapper.swift
@@ -150,9 +150,10 @@ public struct UserDefaultsWrapper<T> {
 
         case duckPlayerMode = "com.duckduckgo.ios.duckPlayerMode"
         case duckPlayerAskModeOverlayHidden = "com.duckduckgo.ios.duckPlayerAskModeOverlayHidden"
-
+        
         case vpnRedditWorkaroundInstalled = "com.duckduckgo.ios.vpn.workaroundInstalled"
 
+
         // Debug keys
 
         case debugNewTabPageSectionsEnabledKey = "com.duckduckgo.ios.debug.newTabPageSectionsEnabled"

diff --git a/DuckDuckGo.xcodeproj/project.pbxproj b/DuckDuckGo.xcodeproj/project.pbxproj
diff --git a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -138,7 +138,7 @@
     {
       "identity" : "swift-argument-parser",
       "kind" : "remoteSourceControl",
-      "location" : "https://github.com/apple/swift-argument-parser.git",
+      "location" : "https://github.com/apple/swift-argument-parser",
       "state" : {
         "revision" : "0fbc8848e389af3bb55c182bc19ca9d5dc2f255b",
         "version" : "1.4.0"

diff --git a/DuckDuckGo.xcodeproj/xcshareddata/xcschemes/DuckDuckGo.xcscheme b/DuckDuckGo.xcodeproj/xcshareddata/xcschemes/DuckDuckGo.xcscheme
@@ -64,6 +64,9 @@
                <Test
                   Identifier = "AutoconsentMessageProtocolTests/testEval()">
                </Test>
+               <Test
+                  Identifier = "SyncSettingsViewControllerErrorTests/test_WhenAccountRemoved_ErrorHandlerSyncDidTurnOffCalled()">
+               </Test>
             </SkippedTests>
          </TestableReference>
          <TestableReference

diff --git a/DuckDuckGo/AutocompleteSuggestionsModel.swift b/DuckDuckGo/AutocompleteSuggestionsModel.swift
diff --git a/DuckDuckGo/AutofillLoginSettingsListViewController.swift b/DuckDuckGo/AutofillLoginSettingsListViewController.swift
@@ -33,6 +33,7 @@ enum AutofillSettingsSource: String {
     case appIconShortcut = "app_icon_shortcut"
     case homeScreenWidget = "home_screen_widget"
     case lockScreenWidget = "lock_screen_widget"
+    case newTabPageShortcut = "new_tab_page_shortcut"
 }
 
 protocol AutofillLoginSettingsListViewControllerDelegate: AnyObject {

diff --git a/DuckDuckGo/BrowserChromeManager.swift b/DuckDuckGo/BrowserChromeManager.swift
@@ -62,7 +62,8 @@ class BrowserChromeManager: NSObject, UIScrollViewDelegate {
 
         scrollView.delegate = self
 
-        observation = scrollView.observe(\.contentSize, options: .new) { [weak self] scrollView, _ in
+        observation = scrollView.observe(\.contentSize, options: .new) { [weak self] scrollView, observation in
+            guard observation.newValue != observation.oldValue else { return }
             self?.scrollViewDidResizeContent(scrollView)
         }
     }