From bc8f1d2157053393d3678800a9d6453c9dee9cc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20=C5=81yp?= Date: Fri, 8 Nov 2024 16:35:07 +0100 Subject: [PATCH 1/4] Remove experiment code --- DuckDuckGo.xcodeproj/project.pbxproj | 2 +- .../xcshareddata/swiftpm/Package.resolved | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/DuckDuckGo.xcodeproj/project.pbxproj b/DuckDuckGo.xcodeproj/project.pbxproj index d5521f14fb..88cf9ff01a 100644 --- a/DuckDuckGo.xcodeproj/project.pbxproj +++ b/DuckDuckGo.xcodeproj/project.pbxproj @@ -11952,7 +11952,7 @@ isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/DuckDuckGo/BrowserServicesKit"; requirement = { - branch = "mgurgel/improved-breakage-form"; + branch = "jacek/new-breakage-form"; kind = branch; }; }; diff --git a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 3ccecebfa0..8743dd0da0 100644 --- a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -32,8 +32,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/DuckDuckGo/BrowserServicesKit", "state" : { - "branch" : "mgurgel/improved-breakage-form", - "revision" : "c77e36efe790bc01af9b152fc0ef0fbb35a32f82" + "branch" : "jacek/new-breakage-form", + "revision" : "9f5a4af0c16522251d3f578aba61099afab3b254" } }, { @@ -122,8 +122,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/duckduckgo/privacy-dashboard", "state" : { - "revision" : "3f58e008d4e9d1b56ab12dbb95bd891045cf2758", - "version" : "8.0.0" + "branch" : "pr-releases/pr-196", + "revision" : "1c355be4c27d067b8f3b7435274865a02d949f52" } }, { From 67343f54080ba72edc4def50473aace6921e33b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20=C5=81yp?= Date: Fri, 8 Nov 2024 16:35:07 +0100 Subject: [PATCH 2/4] Not firing reportBrokenSiteShown automatically --- DuckDuckGo.xcodeproj/project.pbxproj | 2 +- .../xcshareddata/swiftpm/Package.resolved | 8 ++++---- DuckDuckGo/MainViewController+Segues.swift | 11 ----------- 3 files changed, 5 insertions(+), 16 deletions(-) diff --git a/DuckDuckGo.xcodeproj/project.pbxproj b/DuckDuckGo.xcodeproj/project.pbxproj index 88cf9ff01a..ab5afb2ae7 100644 --- a/DuckDuckGo.xcodeproj/project.pbxproj +++ b/DuckDuckGo.xcodeproj/project.pbxproj @@ -11952,7 +11952,7 @@ isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/DuckDuckGo/BrowserServicesKit"; requirement = { - branch = "jacek/new-breakage-form"; + branch = "mgurgel/improved-breakage-form-pixel"; kind = branch; }; }; diff --git a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 8743dd0da0..50131cdf7e 100644 --- a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -32,8 +32,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/DuckDuckGo/BrowserServicesKit", "state" : { - "branch" : "jacek/new-breakage-form", - "revision" : "9f5a4af0c16522251d3f578aba61099afab3b254" + "branch" : "mgurgel/improved-breakage-form-pixel", + "revision" : "89cdcdc2e18e8a4df5ee69c48b1b2ace828ae929" } }, { @@ -122,8 +122,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/duckduckgo/privacy-dashboard", "state" : { - "branch" : "pr-releases/pr-196", - "revision" : "1c355be4c27d067b8f3b7435274865a02d949f52" + "branch" : "pr-releases/pr-302", + "revision" : "05d04de7505117b32949b2007e5a56ba2d39469b" } }, { diff --git a/DuckDuckGo/MainViewController+Segues.swift b/DuckDuckGo/MainViewController+Segues.swift index f1ddf10815..714d5e67b3 100644 --- a/DuckDuckGo/MainViewController+Segues.swift +++ b/DuckDuckGo/MainViewController+Segues.swift @@ -108,10 +108,6 @@ extension MainViewController { return } - if entryPoint == .report { - fireBrokenSiteReportShown() - } - let storyboard = UIStoryboard(name: "PrivacyDashboard", bundle: nil) let controller = storyboard.instantiateInitialViewController { coder in PrivacyDashboardViewController(coder: coder, @@ -141,13 +137,6 @@ extension MainViewController { present(controller, animated: true) } - private func fireBrokenSiteReportShown() { - let parameters = [ - PrivacyDashboardEvents.Parameters.source: BrokenSiteReport.Source.appMenu.rawValue - ] - Pixel.fire(pixel: .reportBrokenSiteShown, withAdditionalParameters: parameters) - } - func segueToNegativeFeedbackForm() { Logger.lifecycle.debug(#function) hideAllHighlightsIfNeeded() From bef0bb0c902a30e4a9f057d6be0e2fda4ecf03be Mon Sep 17 00:00:00 2001 From: Marcos Gurgel Date: Fri, 17 Jan 2025 14:02:40 +0000 Subject: [PATCH 3/4] BSK update --- .../project.xcworkspace/xcshareddata/swiftpm/Package.resolved | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 50131cdf7e..5d793464f4 100644 --- a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -33,7 +33,7 @@ "location" : "https://github.com/DuckDuckGo/BrowserServicesKit", "state" : { "branch" : "mgurgel/improved-breakage-form-pixel", - "revision" : "89cdcdc2e18e8a4df5ee69c48b1b2ace828ae929" + "revision" : "6a2da92ab10011097a4eab63df846e5f14374675" } }, { From 246902672943f4fa5f4e24a787c4d60c6eee1f2b Mon Sep 17 00:00:00 2001 From: Marcos Gurgel Date: Fri, 17 Jan 2025 14:42:30 +0000 Subject: [PATCH 4/4] BSK update --- .../project.xcworkspace/xcshareddata/swiftpm/Package.resolved | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 5d793464f4..864e1affd9 100644 --- a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -33,7 +33,7 @@ "location" : "https://github.com/DuckDuckGo/BrowserServicesKit", "state" : { "branch" : "mgurgel/improved-breakage-form-pixel", - "revision" : "6a2da92ab10011097a4eab63df846e5f14374675" + "revision" : "f85a4199ba4251921ecff6d110527c8d5c44e329" } }, {