Merge branch 'release/1.72.0'

duckduckgo · Jan 23, 2024 · 7716ee4 · 7716ee4
2 parents b0b2076 + 348f97c
commit 7716ee4
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 5 deletions.
diff --git a/Configuration/BuildNumber.xcconfig b/Configuration/BuildNumber.xcconfig
@@ -1 +1 @@
-CURRENT_PROJECT_VERSION = 109
+CURRENT_PROJECT_VERSION = 111
diff --git a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -122,8 +122,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/apple/swift-syntax.git",
       "state" : {
-        "revision" : "43c802fb7f96e090dde015344a94b5e85779eff1",
-        "version" : "509.1.0"
+        "revision" : "64889f0c732f210a935a0ad7cda38f77f876262d",
+        "version" : "509.1.1"
       }
     },
     {
@@ -147,7 +147,7 @@
     {
       "identity" : "trackerradarkit",
       "kind" : "remoteSourceControl",
-      "location" : "https://github.com/duckduckgo/TrackerRadarKit",
+      "location" : "https://github.com/duckduckgo/TrackerRadarKit.git",
       "state" : {
         "revision" : "a6b7ba151d9dc6684484f3785293875ec01cc1ff",
         "version" : "1.2.2"

diff --git a/DuckDuckGo/Application/AppDelegate.swift b/DuckDuckGo/Application/AppDelegate.swift
@@ -102,6 +102,14 @@ final class AppDelegate: NSObject, NSApplicationDelegate, FileDownloadManagerDel
             fileStore = EncryptedFileStore()
         }
 
+        // keep this on top!
+        // disable onboarding for existing users
+        let isOnboardingFinished = UserDefaultsWrapper<Bool>(key: .onboardingFinished, defaultValue: false)
+        if !isOnboardingFinished.wrappedValue,
+           FileManager.default.fileExists(atPath: URL.sandboxApplicationSupportURL.path) {
+            isOnboardingFinished.wrappedValue = true
+        }
+
         let internalUserDeciderStore = InternalUserDeciderStore(fileStore: fileStore)
         internalUserDecider = DefaultInternalUserDecider(store: internalUserDeciderStore)
 

diff --git a/DuckDuckGo/Common/Utilities/UserDefaultsWrapper.swift b/DuckDuckGo/Common/Utilities/UserDefaultsWrapper.swift
@@ -245,7 +245,7 @@ public struct UserDefaultsWrapper<T> {
 
             return value
         }
-        set {
+        nonmutating set {
             setValue(newValue)
         }
     }
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		CURRENT_PROJECT_VERSION = 109
		CURRENT_PROJECT_VERSION = 111
-Original file line number
+Diff line change
@@ Expand Up / @@ -245,7 +245,7 @@ public struct UserDefaultsWrapper<T> { @@
                 return value
             }
-            set {
+            nonmutating set {
                 setValue(newValue)
             }
         }
@@ Expand Down @@