diff --git a/Package.resolved b/Package.resolved index 13dbd555d..0b2b63760 100644 --- a/Package.resolved +++ b/Package.resolved @@ -50,8 +50,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/duckduckgo/privacy-dashboard", "state" : { - "revision" : "3f58e008d4e9d1b56ab12dbb95bd891045cf2758", - "version" : "8.0.0" + "branch" : "pr-releases/pr-302", + "revision" : "05d04de7505117b32949b2007e5a56ba2d39469b" } }, { diff --git a/Package.swift b/Package.swift index d4cd200d4..9c6a8e0bf 100644 --- a/Package.swift +++ b/Package.swift @@ -56,7 +56,7 @@ let package = Package( .package(url: "https://github.com/duckduckgo/sync_crypto", exact: "0.4.0"), .package(url: "https://github.com/gumob/PunycodeSwift.git", exact: "3.0.0"), .package(url: "https://github.com/duckduckgo/content-scope-scripts", exact: "7.5.0"), - .package(url: "https://github.com/duckduckgo/privacy-dashboard", exact: "8.0.0"), + .package(url: "https://github.com/duckduckgo/privacy-dashboard", branch: "pr-releases/pr-302"), .package(url: "https://github.com/httpswift/swifter.git", exact: "1.5.0"), .package(url: "https://github.com/duckduckgo/bloom_cpp.git", exact: "3.0.0"), .package(url: "https://github.com/1024jp/GzipSwift.git", exact: "6.0.1"), diff --git a/Sources/PrivacyDashboard/PrivacyDashboardController.swift b/Sources/PrivacyDashboard/PrivacyDashboardController.swift index e804fdd2d..5bc696c1e 100644 --- a/Sources/PrivacyDashboard/PrivacyDashboardController.swift +++ b/Sources/PrivacyDashboard/PrivacyDashboardController.swift @@ -368,10 +368,13 @@ extension PrivacyDashboardController: PrivacyDashboardUserScriptDelegate { } func userScriptDidRequestShowReportBrokenSite(_ userScript: PrivacyDashboardUserScript) { + eventMapping.fire(.showReportBrokenSite) + } + + func userScriptDidRequestReportBrokenSiteShown(_ userScript: PrivacyDashboardUserScript) { eventMapping.fire(.reportBrokenSiteShown, parameters: [ PrivacyDashboardEvents.Parameters.source: source.rawValue ]) - eventMapping.fire(.showReportBrokenSite) } func userScript(_ userScript: PrivacyDashboardUserScript, setHeight height: Int) { @@ -379,7 +382,9 @@ extension PrivacyDashboardController: PrivacyDashboardUserScriptDelegate { } func userScript(_ userScript: PrivacyDashboardUserScript, didRequestSubmitBrokenSiteReportWithCategory category: String, description: String) { - eventMapping.fire(.reportBrokenSiteSent) + eventMapping.fire(.reportBrokenSiteSent, parameters: [ + PrivacyDashboardEvents.Parameters.source: source.rawValue + ]) delegate?.privacyDashboardController(self, didRequestSubmitBrokenSiteReportWithCategory: category, description: description) } diff --git a/Sources/PrivacyDashboard/PrivacyDashboardUserScript.swift b/Sources/PrivacyDashboard/PrivacyDashboardUserScript.swift index 27d13ef56..f00c94df6 100644 --- a/Sources/PrivacyDashboard/PrivacyDashboardUserScript.swift +++ b/Sources/PrivacyDashboard/PrivacyDashboardUserScript.swift @@ -31,6 +31,7 @@ protocol PrivacyDashboardUserScriptDelegate: AnyObject { func userScript(_ userScript: PrivacyDashboardUserScript, setHeight height: Int) func userScriptDidRequestClose(_ userScript: PrivacyDashboardUserScript) func userScriptDidRequestShowReportBrokenSite(_ userScript: PrivacyDashboardUserScript) + func userScriptDidRequestReportBrokenSiteShown(_ userScript: PrivacyDashboardUserScript) func userScript(_ userScript: PrivacyDashboardUserScript, didRequestSubmitBrokenSiteReportWithCategory category: String, description: String) func userScript(_ userScript: PrivacyDashboardUserScript, didRequestOpenUrlInNewTab: URL) func userScript(_ userScript: PrivacyDashboardUserScript, didRequestOpenSettings: String) @@ -107,6 +108,7 @@ final class PrivacyDashboardUserScript: NSObject, StaticUserScript { case privacyDashboardSetSize case privacyDashboardClose case privacyDashboardShowReportBrokenSite + case privacyDashboardReportBrokenSiteShown case privacyDashboardSubmitBrokenSiteReport case privacyDashboardOpenUrlInNewTab case privacyDashboardOpenSettings @@ -143,6 +145,8 @@ final class PrivacyDashboardUserScript: NSObject, StaticUserScript { handleClose() case .privacyDashboardShowReportBrokenSite: handleShowReportBrokenSite() + case .privacyDashboardReportBrokenSiteShown: + handleReportBrokenSiteShown() case .privacyDashboardSubmitBrokenSiteReport: handleSubmitBrokenSiteReport(message: message) case .privacyDashboardOpenUrlInNewTab: @@ -196,6 +200,10 @@ final class PrivacyDashboardUserScript: NSObject, StaticUserScript { delegate?.userScriptDidRequestShowReportBrokenSite(self) } + private func handleReportBrokenSiteShown() { + delegate?.userScriptDidRequestReportBrokenSiteShown(self) + } + private func handleSubmitBrokenSiteReport(message: WKScriptMessage) { guard let dict = message.body as? [String: Any], let category = dict["category"] as? String,