Skip to content
This repository was archived by the owner on Feb 24, 2025. It is now read-only.

Commit a05189d

Browse files
jaceklypjaceklyp
committed
Merge branch 'release/7.125.0'
2 parents 58fca83 + d1db87d commit a05189d

4 files changed

Lines changed: 39 additions & 33 deletions

File tree

‎Core/PixelEvent.swift‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -732,6 +732,8 @@ extension Pixel {
732732
case reportBrokenSiteFeedbackCategorySubmitted
733733
case reportBrokenSiteTogglePromptNo
734734
case reportBrokenSiteTogglePromptYes
735+
case reportBrokenSiteSkipToggleStep
736+
case reportBrokenSiteToggleProtectionOff
735737

736738
}
737739

@@ -1444,6 +1446,8 @@ extension Pixel.Event {
14441446
case .reportBrokenSiteFeedbackCategorySubmitted: return "m_report-broken-site_feedback-category-submitted"
14451447
case .reportBrokenSiteTogglePromptNo: return "m_report-broken-site_toggle-prompt-no"
14461448
case .reportBrokenSiteTogglePromptYes: return "m_report-broken-site_toggle-prompt-yes"
1449+
case .reportBrokenSiteSkipToggleStep: return "m_report-broken-site_skip-toggle-step"
1450+
case .reportBrokenSiteToggleProtectionOff: return "m_report-broken-site_toggle-protection-off"
14471451
}
14481452
}
14491453
}

‎DuckDuckGo.xcodeproj/project.pbxproj‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -7977,7 +7977,7 @@
79777977
CODE_SIGN_ENTITLEMENTS = PacketTunnelProvider/PacketTunnelProvider.entitlements;
79787978
CODE_SIGN_IDENTITY = "Apple Development";
79797979
CODE_SIGN_STYLE = Automatic;
7980-
CURRENT_PROJECT_VERSION = 0;
7980+
CURRENT_PROJECT_VERSION = 1;
79817981
DEVELOPMENT_TEAM = HKE973VLUW;
79827982
GCC_C_LANGUAGE_STANDARD = gnu11;
79837983
GENERATE_INFOPLIST_FILE = YES;
@@ -8014,7 +8014,7 @@
80148014
CODE_SIGN_IDENTITY = "iPhone Distribution";
80158015
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
80168016
CODE_SIGN_STYLE = Manual;
8017-
CURRENT_PROJECT_VERSION = 0;
8017+
CURRENT_PROJECT_VERSION = 1;
80188018
DEVELOPMENT_TEAM = "";
80198019
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = HKE973VLUW;
80208020
GCC_C_LANGUAGE_STANDARD = gnu11;
@@ -8106,7 +8106,7 @@
81068106
CODE_SIGN_IDENTITY = "iPhone Developer";
81078107
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
81088108
CODE_SIGN_STYLE = Automatic;
8109-
CURRENT_PROJECT_VERSION = 0;
8109+
CURRENT_PROJECT_VERSION = 1;
81108110
GCC_C_LANGUAGE_STANDARD = gnu11;
81118111
INFOPLIST_FILE = ShareExtension/Info.plist;
81128112
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
@@ -8134,7 +8134,7 @@
81348134
CODE_SIGN_IDENTITY = "iPhone Developer";
81358135
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
81368136
CODE_SIGN_STYLE = Manual;
8137-
CURRENT_PROJECT_VERSION = 0;
8137+
CURRENT_PROJECT_VERSION = 1;
81388138
DEVELOPMENT_TEAM = "";
81398139
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = HKE973VLUW;
81408140
GCC_C_LANGUAGE_STANDARD = gnu11;
@@ -8284,7 +8284,7 @@
82848284
CODE_SIGN_ENTITLEMENTS = DuckDuckGo/DuckDuckGo.entitlements;
82858285
CODE_SIGN_IDENTITY = "iPhone Distribution";
82868286
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
8287-
CURRENT_PROJECT_VERSION = 0;
8287+
CURRENT_PROJECT_VERSION = 1;
82888288
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
82898289
DEVELOPMENT_ASSET_PATHS = "";
82908290
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = HKE973VLUW;
@@ -8310,7 +8310,7 @@
83108310
CODE_SIGN_ENTITLEMENTS = DuckDuckGo/DuckDuckGo.entitlements;
83118311
CODE_SIGN_IDENTITY = "iPhone Distribution";
83128312
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
8313-
CURRENT_PROJECT_VERSION = 0;
8313+
CURRENT_PROJECT_VERSION = 1;
83148314
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = HKE973VLUW;
83158315
INFOPLIST_FILE = DuckDuckGo/Info.plist;
83168316
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
@@ -8380,7 +8380,7 @@
83808380
CODE_SIGN_IDENTITY = "iPhone Developer";
83818381
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
83828382
CODE_SIGN_STYLE = Automatic;
8383-
CURRENT_PROJECT_VERSION = 0;
8383+
CURRENT_PROJECT_VERSION = 1;
83848384
DEAD_CODE_STRIPPING = NO;
83858385
GCC_C_LANGUAGE_STANDARD = gnu11;
83868386
INFOPLIST_FILE = Widgets/Info.plist;
@@ -8415,7 +8415,7 @@
84158415
CODE_SIGN_IDENTITY = "iPhone Developer";
84168416
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
84178417
CODE_SIGN_STYLE = Manual;
8418-
CURRENT_PROJECT_VERSION = 0;
8418+
CURRENT_PROJECT_VERSION = 1;
84198419
DEAD_CODE_STRIPPING = NO;
84208420
DEVELOPMENT_TEAM = "";
84218421
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = HKE973VLUW;
@@ -8449,7 +8449,7 @@
84498449
CODE_SIGN_IDENTITY = "iPhone Developer";
84508450
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
84518451
CODE_SIGN_STYLE = Automatic;
8452-
CURRENT_PROJECT_VERSION = 0;
8452+
CURRENT_PROJECT_VERSION = 1;
84538453
GCC_C_LANGUAGE_STANDARD = gnu11;
84548454
INFOPLIST_FILE = OpenAction/Info.plist;
84558455
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
@@ -8480,7 +8480,7 @@
84808480
CODE_SIGN_IDENTITY = "iPhone Developer";
84818481
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
84828482
CODE_SIGN_STYLE = Manual;
8483-
CURRENT_PROJECT_VERSION = 0;
8483+
CURRENT_PROJECT_VERSION = 1;
84848484
DEVELOPMENT_TEAM = "";
84858485
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = HKE973VLUW;
84868486
GCC_C_LANGUAGE_STANDARD = gnu11;
@@ -8795,7 +8795,7 @@
87958795
CODE_SIGN_ENTITLEMENTS = DuckDuckGo/DuckDuckGoAlpha.entitlements;
87968796
CODE_SIGN_IDENTITY = "iPhone Distribution";
87978797
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
8798-
CURRENT_PROJECT_VERSION = 0;
8798+
CURRENT_PROJECT_VERSION = 1;
87998799
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
88008800
DEVELOPMENT_ASSET_PATHS = "";
88018801
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = HKE973VLUW;
@@ -8827,7 +8827,7 @@
88278827
CODE_SIGN_IDENTITY = "iPhone Developer";
88288828
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
88298829
CODE_SIGN_STYLE = Automatic;
8830-
CURRENT_PROJECT_VERSION = 0;
8830+
CURRENT_PROJECT_VERSION = 1;
88318831
GCC_C_LANGUAGE_STANDARD = gnu11;
88328832
INFOPLIST_FILE = ShareExtension/Info.plist;
88338833
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
@@ -8856,7 +8856,7 @@
88568856
CODE_SIGN_IDENTITY = "iPhone Developer";
88578857
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
88588858
CODE_SIGN_STYLE = Automatic;
8859-
CURRENT_PROJECT_VERSION = 0;
8859+
CURRENT_PROJECT_VERSION = 1;
88608860
GCC_C_LANGUAGE_STANDARD = gnu11;
88618861
INFOPLIST_FILE = OpenAction/Info.plist;
88628862
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
@@ -8890,7 +8890,7 @@
88908890
CODE_SIGN_IDENTITY = "iPhone Developer";
88918891
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
88928892
CODE_SIGN_STYLE = Automatic;
8893-
CURRENT_PROJECT_VERSION = 0;
8893+
CURRENT_PROJECT_VERSION = 1;
88948894
DEAD_CODE_STRIPPING = NO;
88958895
GCC_C_LANGUAGE_STANDARD = gnu11;
88968896
INFOPLIST_FILE = Widgets/Info.plist;
@@ -8921,7 +8921,7 @@
89218921
CODE_SIGN_ENTITLEMENTS = PacketTunnelProvider/PacketTunnelProviderAlpha.entitlements;
89228922
CODE_SIGN_IDENTITY = "Apple Development";
89238923
CODE_SIGN_STYLE = Automatic;
8924-
CURRENT_PROJECT_VERSION = 0;
8924+
CURRENT_PROJECT_VERSION = 1;
89258925
DEVELOPMENT_TEAM = HKE973VLUW;
89268926
GCC_C_LANGUAGE_STANDARD = gnu11;
89278927
GENERATE_INFOPLIST_FILE = YES;
@@ -8954,11 +8954,11 @@
89548954
CLANG_ENABLE_MODULES = YES;
89558955
CODE_SIGN_IDENTITY = "";
89568956
CODE_SIGN_STYLE = Automatic;
8957-
CURRENT_PROJECT_VERSION = 0;
8957+
CURRENT_PROJECT_VERSION = 1;
89588958
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
89598959
DEFINES_MODULE = YES;
89608960
DYLIB_COMPATIBILITY_VERSION = 1;
8961-
DYLIB_CURRENT_VERSION = 0;
8961+
DYLIB_CURRENT_VERSION = 1;
89628962
DYLIB_INSTALL_NAME_BASE = "@rpath";
89638963
INFOPLIST_FILE = Core/Info.plist;
89648964
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
@@ -9194,7 +9194,7 @@
91949194
CODE_SIGN_ENTITLEMENTS = DuckDuckGo/DuckDuckGoAlpha.entitlements;
91959195
CODE_SIGN_IDENTITY = "iPhone Distribution";
91969196
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
9197-
CURRENT_PROJECT_VERSION = 0;
9197+
CURRENT_PROJECT_VERSION = 1;
91989198
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
91999199
DEVELOPMENT_ASSET_PATHS = "";
92009200
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = HKE973VLUW;
@@ -9222,7 +9222,7 @@
92229222
CODE_SIGN_IDENTITY = "Apple Development";
92239223
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
92249224
CODE_SIGN_STYLE = Manual;
9225-
CURRENT_PROJECT_VERSION = 0;
9225+
CURRENT_PROJECT_VERSION = 1;
92269226
DEVELOPMENT_TEAM = "";
92279227
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = HKE973VLUW;
92289228
GCC_C_LANGUAGE_STANDARD = gnu11;
@@ -9255,7 +9255,7 @@
92559255
CODE_SIGN_IDENTITY = "iPhone Developer";
92569256
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
92579257
CODE_SIGN_STYLE = Manual;
9258-
CURRENT_PROJECT_VERSION = 0;
9258+
CURRENT_PROJECT_VERSION = 1;
92599259
DEVELOPMENT_TEAM = "";
92609260
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = HKE973VLUW;
92619261
GCC_C_LANGUAGE_STANDARD = gnu11;
@@ -9293,7 +9293,7 @@
92939293
CODE_SIGN_IDENTITY = "iPhone Developer";
92949294
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
92959295
CODE_SIGN_STYLE = Manual;
9296-
CURRENT_PROJECT_VERSION = 0;
9296+
CURRENT_PROJECT_VERSION = 1;
92979297
DEAD_CODE_STRIPPING = NO;
92989298
DEVELOPMENT_TEAM = "";
92999299
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = HKE973VLUW;
@@ -9329,7 +9329,7 @@
93299329
CODE_SIGN_IDENTITY = "Apple Development";
93309330
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
93319331
CODE_SIGN_STYLE = Manual;
9332-
CURRENT_PROJECT_VERSION = 0;
9332+
CURRENT_PROJECT_VERSION = 1;
93339333
DEVELOPMENT_TEAM = "";
93349334
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = HKE973VLUW;
93359335
GCC_C_LANGUAGE_STANDARD = gnu11;
@@ -9364,11 +9364,11 @@
93649364
CLANG_ENABLE_MODULES = YES;
93659365
CODE_SIGN_IDENTITY = "";
93669366
CODE_SIGN_STYLE = Automatic;
9367-
CURRENT_PROJECT_VERSION = 0;
9367+
CURRENT_PROJECT_VERSION = 1;
93689368
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
93699369
DEFINES_MODULE = YES;
93709370
DYLIB_COMPATIBILITY_VERSION = 1;
9371-
DYLIB_CURRENT_VERSION = 0;
9371+
DYLIB_CURRENT_VERSION = 1;
93729372
DYLIB_INSTALL_NAME_BASE = "@rpath";
93739373
INFOPLIST_FILE = Core/Info.plist;
93749374
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
@@ -9544,11 +9544,11 @@
95449544
CLANG_ENABLE_MODULES = YES;
95459545
CODE_SIGN_IDENTITY = "";
95469546
CODE_SIGN_STYLE = Automatic;
9547-
CURRENT_PROJECT_VERSION = 0;
9547+
CURRENT_PROJECT_VERSION = 1;
95489548
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
95499549
DEFINES_MODULE = YES;
95509550
DYLIB_COMPATIBILITY_VERSION = 1;
9551-
DYLIB_CURRENT_VERSION = 0;
9551+
DYLIB_CURRENT_VERSION = 1;
95529552
DYLIB_INSTALL_NAME_BASE = "@rpath";
95539553
INFOPLIST_FILE = Core/Info.plist;
95549554
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
@@ -9577,10 +9577,10 @@
95779577
CLANG_ENABLE_MODULES = YES;
95789578
CODE_SIGN_IDENTITY = "";
95799579
CODE_SIGN_STYLE = Automatic;
9580-
CURRENT_PROJECT_VERSION = 0;
9580+
CURRENT_PROJECT_VERSION = 1;
95819581
DEFINES_MODULE = YES;
95829582
DYLIB_COMPATIBILITY_VERSION = 1;
9583-
DYLIB_CURRENT_VERSION = 0;
9583+
DYLIB_CURRENT_VERSION = 1;
95849584
DYLIB_INSTALL_NAME_BASE = "@rpath";
95859585
INFOPLIST_FILE = Core/Info.plist;
95869586
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
@@ -9782,7 +9782,7 @@
97829782
repositoryURL = "https://github.com/DuckDuckGo/BrowserServicesKit";
97839783
requirement = {
97849784
kind = exactVersion;
9785-
version = 157.1.0;
9785+
version = "158.0.0";
97869786
};
97879787
};
97889788
9F8FE9472BAE50E50071E372 /* XCRemoteSwiftPackageReference "lottie-spm" */ = {

‎DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved‎

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎DuckDuckGo/PrivacyDashboard/PrivacyDashboardViewController.swift‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,8 @@ final class PrivacyDashboardViewController: UIViewController {
8686
case .overallCategorySelected: domainEvent = .reportBrokenSiteOverallCategorySelected
8787
case .reportBrokenSiteShown: domainEvent = .reportBrokenSiteShown
8888
case .reportBrokenSiteSent: domainEvent = .reportBrokenSiteSent
89+
case .skipToggleStep: domainEvent = .reportBrokenSiteSkipToggleStep
90+
case .toggleProtectionOff: domainEvent = .reportBrokenSiteToggleProtectionOff
8991
}
9092
if let parameters {
9193
Pixel.fire(pixel: domainEvent, withAdditionalParameters: parameters)

0 commit comments

Comments
 (0)