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

Adding lastSentDate to broken site report #2320

Merged
merged 18 commits into from
Jan 29, 2024
Merged

Adding lastSentDate to broken site report #2320

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
803f827
broken site model removed
federicocappelli Jan 10, 2024
91ebbc8
Merge branch 'main' into fcappelli/prev_sub_breakage
federicocappelli Jan 10, 2024
b7ad7d1
Report broken site unit tests fixed
federicocappelli Jan 10, 2024
eea0468
os detection improved
federicocappelli Jan 11, 2024
3751920
Merge branch 'main' into fcappelli/prev_sub_breakage
federicocappelli Jan 11, 2024
f1c7e56
add xcargs: -skipPackagePluginValidation arg to build_app
mallexxx Jan 11, 2024
924da96
bsk updated
federicocappelli Jan 11, 2024
357e216
Merge branch 'main' into fcappelli/prev_sub_breakage
federicocappelli Jan 11, 2024
aed465e
Merge branch 'main' into fcappelli/prev_sub_breakage
federicocappelli Jan 11, 2024
3ef4689
Merge branch 'alex/fix-fastlane-builds' into fcappelli/prev_sub_breakage
federicocappelli Jan 11, 2024
f08738f
pkg fix
federicocappelli Jan 11, 2024
fdefae4
Merge branch 'main' into fcappelli/prev_sub_breakage
federicocappelli Jan 11, 2024
098e80a
Merge branch 'main' into fcappelli/prev_sub_breakage
federicocappelli Jan 11, 2024
f5442a4
commented out code removed
federicocappelli Jan 12, 2024
c569629
Merge branch 'main' into fcappelli/prev_sub_breakage
federicocappelli Jan 24, 2024
80b5d1f
typo fixed
federicocappelli Jan 25, 2024
bf5cd4f
BSK 103.0.0
federicocappelli Jan 29, 2024
8a24cb0
Merge branch 'main' into fcappelli/prev_sub_breakage
federicocappelli Jan 29, 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: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,3 +74,5 @@ fastlane/test_output

Configuration/ExternalDeveloper.xcconfig
scripts/assets

DuckDuckGoTests/NetworkProtectionVPNLocationViewModelTests.swift*.plist
14 changes: 9 additions & 5 deletions DuckDuckGo.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -577,7 +577,6 @@
987130C7294AAB9F00AB05E0 /* MenuBookmarksViewModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 987130C1294AAB9E00AB05E0 /* MenuBookmarksViewModelTests.swift */; };
987130C8294AAB9F00AB05E0 /* BookmarksTestHelpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 987130C2294AAB9E00AB05E0 /* BookmarksTestHelpers.swift */; };
987130C9294AAB9F00AB05E0 /* BookmarkUtilsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 987130C3294AAB9E00AB05E0 /* BookmarkUtilsTests.swift */; };
98728E822417E3300033960E /* BrokenSiteInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 98728E812417E3300033960E /* BrokenSiteInfo.swift */; };
9872D205247DCAC100CEF398 /* TabPreviewsSource.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9872D204247DCAC100CEF398 /* TabPreviewsSource.swift */; };
9874F9EE2187AFCE00CAF33D /* Themable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9874F9ED2187AFCE00CAF33D /* Themable.swift */; };
9875E00722316B8400B1373F /* Instruments.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9875E00622316B8400B1373F /* Instruments.swift */; };
Expand Down Expand Up @@ -879,6 +878,7 @@
F1134ED21F40EF3A00B73467 /* JsonTestDataLoader.swift in Sources */ = {isa = PBXBuildFile; fileRef = F1134ECF1F40EBE200B73467 /* JsonTestDataLoader.swift */; };
F1134ED61F40F29F00B73467 /* StatisticsUserDefaultsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = F1134ED41F40F15800B73467 /* StatisticsUserDefaultsTests.swift */; };
F114C55B1E66EB020018F95F /* NibLoading.swift in Sources */ = {isa = PBXBuildFile; fileRef = F114C55A1E66EB020018F95F /* NibLoading.swift */; };
F115ED9C2B4EFC8E001A0453 /* TestUtils in Frameworks */ = {isa = PBXBuildFile; productRef = F115ED9B2B4EFC8E001A0453 /* TestUtils */; };
F130D73A1E5776C500C45811 /* OmniBarDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = F130D7391E5776C500C45811 /* OmniBarDelegate.swift */; };
F1386BA41E6846C40062FC3C /* TabDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = F1386BA31E6846C40062FC3C /* TabDelegate.swift */; };
F13B4BC01F180D8A00814661 /* TabsModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = F13B4BBF1F180D8A00814661 /* TabsModel.swift */; };
Expand Down Expand Up @@ -2130,7 +2130,6 @@
987130C1294AAB9E00AB05E0 /* MenuBookmarksViewModelTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MenuBookmarksViewModelTests.swift; sourceTree = "<group>"; };
987130C2294AAB9E00AB05E0 /* BookmarksTestHelpers.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BookmarksTestHelpers.swift; sourceTree = "<group>"; };
987130C3294AAB9E00AB05E0 /* BookmarkUtilsTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BookmarkUtilsTests.swift; sourceTree = "<group>"; };
98728E812417E3300033960E /* BrokenSiteInfo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BrokenSiteInfo.swift; sourceTree = "<group>"; };
9872D204247DCAC100CEF398 /* TabPreviewsSource.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TabPreviewsSource.swift; sourceTree = "<group>"; };
9874F9ED2187AFCE00CAF33D /* Themable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Themable.swift; sourceTree = "<group>"; };
9875E00622316B8400B1373F /* Instruments.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Instruments.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -2711,6 +2710,7 @@
files = (
F486D3362506A037002D07D7 /* OHHTTPStubs in Frameworks */,
F486D3382506A225002D07D7 /* OHHTTPStubsSwift in Frameworks */,
F115ED9C2B4EFC8E001A0453 /* TestUtils in Frameworks */,
EEFAB4672A73C230008A38E4 /* NetworkProtectionTestUtils in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down Expand Up @@ -5513,7 +5513,6 @@
F1DF09502B039E6E008CC908 /* PrivacyDashboard */ = {
isa = PBXGroup;
children = (
98728E812417E3300033960E /* BrokenSiteInfo.swift */,
1E87615828A1517200C7C5CE /* PrivacyDashboardViewController.swift */,
984147B924F0268D00362052 /* PrivacyDashboard.storyboard */,
);
Expand Down Expand Up @@ -5754,6 +5753,7 @@
F486D3352506A037002D07D7 /* OHHTTPStubs */,
F486D3372506A225002D07D7 /* OHHTTPStubsSwift */,
EEFAB4662A73C230008A38E4 /* NetworkProtectionTestUtils */,
F115ED9B2B4EFC8E001A0453 /* TestUtils */,
);
productName = DuckDuckGoTests;
productReference = 84E341A61E2F7EFB00BDBA6F /* UnitTests.xctest */;
Expand Down Expand Up @@ -6908,7 +6908,6 @@
02EC02C429AFA33000557F1A /* AppTPBreakageFormView.swift in Sources */,
F15D43201E706CC500BF2CDC /* AutocompleteViewController.swift in Sources */,
BD862E092B30F63E0073E2EE /* VPNMetadataCollector.swift in Sources */,
98728E822417E3300033960E /* BrokenSiteInfo.swift in Sources */,
D6E83C682B23B6A3006C8AFB /* FontSettings.swift in Sources */,
31EF52E1281B3BDC0034796E /* AutofillLoginListItemViewModel.swift in Sources */,
1E4FAA6627D8DFC800ADC5B3 /* CompleteDownloadRowViewModel.swift in Sources */,
Expand Down Expand Up @@ -9978,7 +9977,7 @@
repositoryURL = "https://github.com/DuckDuckGo/BrowserServicesKit";
requirement = {
kind = exactVersion;
version = 102.0.2;
version = 103.0.0;
};
};
C14882EB27F211A000D59F0C /* XCRemoteSwiftPackageReference "SwiftSoup" */ = {
Expand Down Expand Up @@ -10209,6 +10208,11 @@
package = 98A16C2928A11BDE00A6C003 /* XCRemoteSwiftPackageReference "BrowserServicesKit" */;
productName = NetworkProtectionTestUtils;
};
F115ED9B2B4EFC8E001A0453 /* TestUtils */ = {
isa = XCSwiftPackageProductDependency;
package = 98A16C2928A11BDE00A6C003 /* XCRemoteSwiftPackageReference "BrowserServicesKit" */;
productName = TestUtils;
};
F42D541C29DCA40B004C4FF1 /* DesignResourcesKit */ = {
isa = XCSwiftPackageProductDependency;
package = F42D541B29DCA40B004C4FF1 /* XCRemoteSwiftPackageReference "DesignResourcesKit" */;
Expand Down
8 changes: 4 additions & 4 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 @@ -14,8 +14,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/DuckDuckGo/BrowserServicesKit",
"state" : {
"revision" : "072df96b846e3350b23ab32a61b6c1a0983b5e85",
"version" : "102.0.2"
"revision" : "5af8fbcff0913aa543ba3eea60cc24e706a3a4e5",
"version" : "103.0.0"
}
},
{
Expand Down Expand Up @@ -104,8 +104,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/duckduckgo/privacy-dashboard",
"state" : {
"revision" : "38336a574e13090764ba09a6b877d15ee514e371",
"version" : "3.1.1"
"revision" : "c67d268bf234760f49034a0fe7a6137a1b216b05",
"version" : "3.2.0"
}
},
{
Expand Down
7 changes: 3 additions & 4 deletions DuckDuckGo/MainViewController+Segues.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,6 @@ extension MainViewController {
os_log(#function, log: .generalLog, type: .debug)
hideAllHighlightsIfNeeded()

let brokenSiteInfo = currentTab?.getCurrentWebsiteInfo()
guard let currentURL = currentTab?.url,
let privacyInfo = currentTab?.makePrivacyInfo(url: currentURL) else {
assertionFailure("Missing fundamental data")
Expand All @@ -133,11 +132,12 @@ extension MainViewController {

let storyboard = UIStoryboard(name: "PrivacyDashboard", bundle: nil)
let controller = storyboard.instantiateInitialViewController { coder in
PrivacyDashboardViewController(coder: coder,
PrivacyDashboardViewController(coder: coder,
privacyInfo: privacyInfo,
privacyConfigurationManager: ContentBlocking.shared.privacyConfigurationManager,
contentBlockingManager: ContentBlocking.shared.contentBlockingManager,
initMode: .reportBrokenSite)
initMode: .reportBrokenSite,
breakageAdditionalInfo: self.currentTab?.makeBreakageAdditionalInfo())
}

guard let controller = controller else {
Expand All @@ -147,7 +147,6 @@ extension MainViewController {

currentTab?.privacyDashboard = controller
controller.popoverPresentationController?.delegate = controller
controller.brokenSiteInfo = brokenSiteInfo

if UIDevice.current.userInterfaceIdiom == .pad {
controller.modalPresentationStyle = .formSheet
Expand Down
130 changes: 0 additions & 130 deletions DuckDuckGo/PrivacyDashboard/BrokenSiteInfo.swift
View file
Open in desktop

This file was deleted.

Loading
Loading