Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge hotfix changes from 7.147.1 #3674

Merged
merged 4 commits into from
Dec 4, 2024
+8 −5
Merged

Merge hotfix changes from 7.147.1 #3674

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3989edd
cherry picked - already approved in https://github.com/duckduckgo/iOS…
brindy Dec 4, 2024
de7705c
Use actor isolation for `SubscriptionFeatureMappingCache` (#3670)
miasma13 Dec 4, 2024
b55028c
Release 7.147.1-0 (#3672)
miasma13 Dec 4, 2024
835dcc2
Merge tag '7.147.1' into michal/include-hotfix-changes
miasma13 Dec 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion DuckDuckGo.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11313,7 +11313,7 @@
repositoryURL = "https://github.com/DuckDuckGo/BrowserServicesKit";
requirement = {
kind = exactVersion;
version = 216.0.1;
version = "216.0.1-1";
};
};
9F8FE9472BAE50E50071E372 /* XCRemoteSwiftPackageReference "lottie-spm" */ = {
Expand Down
4 changes: 2 additions & 2 deletions DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/DuckDuckGo/BrowserServicesKit",
"state" : {
"revision" : "59f8fb2f850f8a0482c604d07396e01e8de59d21",
"version" : "216.0.1"
"revision" : "3517357ecd9d5e9ef7ef2f229c0ebc6460f309e6",
"version" : "216.0.1-1"
}
},
{
Expand Down
5 changes: 4 additions & 1 deletion DuckDuckGo/AppDependencyProvider.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,10 @@ final class AppDependencyProvider: DependencyProvider {
}
}

let subscriptionManager = DefaultSubscriptionManager(storePurchaseManager: DefaultStorePurchaseManager(subscriptionFeatureMappingCache: subscriptionFeatureMappingCache),
let storePurchaseManager = DefaultStorePurchaseManager(subscriptionFeatureMappingCache: subscriptionFeatureMappingCache,
subscriptionFeatureFlagger: subscriptionFeatureFlagger)

let subscriptionManager = DefaultSubscriptionManager(storePurchaseManager: storePurchaseManager,
accountManager: accountManager,
subscriptionEndpointService: subscriptionService,
authEndpointService: authService,
Expand Down
2 changes: 1 addition & 1 deletion DuckDuckGo/TextZoomEditorModel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,11 @@ class TextZoomEditorModel: ObservableObject {
NotificationCenter.default.post(
name: AppUserDefaults.Notifications.textZoomChange,
object: nil)
DailyPixel.fire(pixel: .textZoomChangedOnPageDaily)
}

func onDismiss() {
guard initialValue.rawValue != TextZoomLevel.allCases[value].rawValue else { return }
DailyPixel.fire(pixel: .textZoomChangedOnPageDaily)
Pixel.fire(.textZoomChangedOnPage, withAdditionalParameters: [
PixelParameters.textZoomInitial: String(initialValue.rawValue),
PixelParameters.textZoomUpdated: String(TextZoomLevel.allCases[value].rawValue),
Expand Down
Loading