From a8003961c3596a845a7dddad750fbc448d077af6 Mon Sep 17 00:00:00 2001 From: Dominik Kapusta Date: Tue, 23 Jan 2024 09:57:33 +0100 Subject: [PATCH 1/3] Bump version to 1.71.2 (110) --- Configuration/BuildNumber.xcconfig | 2 +- Configuration/Version.xcconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Configuration/BuildNumber.xcconfig b/Configuration/BuildNumber.xcconfig index e7e11e01de..e52662199e 100644 --- a/Configuration/BuildNumber.xcconfig +++ b/Configuration/BuildNumber.xcconfig @@ -1 +1 @@ -CURRENT_PROJECT_VERSION = 108 +CURRENT_PROJECT_VERSION = 110 diff --git a/Configuration/Version.xcconfig b/Configuration/Version.xcconfig index 89eb687577..0897efb0a9 100644 --- a/Configuration/Version.xcconfig +++ b/Configuration/Version.xcconfig @@ -1 +1 @@ -MARKETING_VERSION = 1.71.1 +MARKETING_VERSION = 1.71.2 From 4aff4a7bad8011f4790dcc90b4f60542c7b12fc3 Mon Sep 17 00:00:00 2001 From: Alexey Martemyanov Date: Tue, 23 Jan 2024 15:20:22 +0600 Subject: [PATCH 2/3] Alex/disable onboarding existing users (#2105) Task/Issue URL: https://app.asana.com/0/1177771139624306/1206416810557971/f Description: Disables onboarding for users having Data directory --- DuckDuckGo/Application/AppDelegate.swift | 8 ++++++++ DuckDuckGo/Common/Utilities/UserDefaultsWrapper.swift | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/DuckDuckGo/Application/AppDelegate.swift b/DuckDuckGo/Application/AppDelegate.swift index e85d6aaf1d..6812968476 100644 --- 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(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 index 3204cde614..286d5842fa 100644 --- a/DuckDuckGo/Common/Utilities/UserDefaultsWrapper.swift +++ b/DuckDuckGo/Common/Utilities/UserDefaultsWrapper.swift @@ -245,7 +245,7 @@ public struct UserDefaultsWrapper { return value } - set { + nonmutating set { setValue(newValue) } } From 348f97cbde06eefab4a415d8db2d9e48a90b5c5d Mon Sep 17 00:00:00 2001 From: Dax the Duck Date: Tue, 23 Jan 2024 09:53:42 +0000 Subject: [PATCH 3/3] Bump version to 1.72.0 (111) --- Configuration/BuildNumber.xcconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Configuration/BuildNumber.xcconfig b/Configuration/BuildNumber.xcconfig index e52662199e..5cd7816a1d 100644 --- a/Configuration/BuildNumber.xcconfig +++ b/Configuration/BuildNumber.xcconfig @@ -1 +1 @@ -CURRENT_PROJECT_VERSION = 110 +CURRENT_PROJECT_VERSION = 111