Skip to content

Remove combinedPermissionView feature flag and old permission flow #4472

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

Open
tomasstrba wants to merge 11 commits into
base: main
Choose a base branch
from
Open

Remove combinedPermissionView feature flag and old permission flow #4472

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
3f8e53d
Remove outdated PermissionsTests and PopupHandlingUITests
tomasstrba Apr 14, 2026
465f6ff
Remove PermissionAuthorization storyboard and old view controller code
tomasstrba Apr 14, 2026
28048a2
Remove newPermissionView flag from permission model layer
tomasstrba Apr 14, 2026
4f00780
Remove newPermissionView flag from navigation and UI files
tomasstrba Apr 14, 2026
20a6976
Remove newPermissionView guard from WebNotificationsHandler
tomasstrba Apr 14, 2026
005e1e5
Remove combinedPermissionView/newPermissionView feature flag definitions
tomasstrba Apr 16, 2026
0f832db
Remove unused featureFlagger parameter from permission popovers
tomasstrba Apr 17, 2026
c001922
Remove legacy permission button outlets and action methods
tomasstrba Apr 17, 2026
d5bc520
Fix CI failures: SwiftLint, test assertions, and embedded config SHA
tomasstrba Apr 19, 2026
6de0770
Revert config file changes - handled in separate repository
tomasstrba Apr 20, 2026
af12b52
Revert config changes and fix remaining test assertion
tomasstrba Apr 20, 2026
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
1 change: 0 additions & 1 deletion SharedPackages/BrowserServicesKit/Sources/PrivacyConfig/Features/PrivacyFeature.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,6 @@ public enum PrivacyFeature: String {
case duckAiChatHistory
case serp
case popupBlocking
case combinedPermissionView
case pageContext
case webExtensions
case forceDarkModeOnWebsites
Expand Down
21 changes: 7 additions & 14 deletions macOS/DuckDuckGo-macOS.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -862,7 +862,7 @@
3706FCD6293F65D500E42796 /* httpsMobileV2FalsePositives.json in Resources */ = {isa = PBXBuildFile; fileRef = 4B67742A255DBEB800025BD8 /* httpsMobileV2FalsePositives.json */; };
3706FCD8293F65D500E42796 /* BookmarksBar.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 4BD18F04283F151F00058124 /* BookmarksBar.storyboard */; };
3706FCDB293F65D500E42796 /* Feedback.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = AA3863C427A1E28F00749AB5 /* Feedback.storyboard */; };
3706FCE1293F65D500E42796 /* PermissionAuthorization.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = B64C84DD2692D7400048FEBE /* PermissionAuthorization.storyboard */; };

3706FCE6293F65D500E42796 /* social_images in Resources */ = {isa = PBXBuildFile; fileRef = EA18D1C9272F0DC8006DC101 /* social_images */; };
3706FCEA293F65D500E42796 /* PasswordManager.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 85625993269C8F9600EE44BC /* PasswordManager.storyboard */; };
3706FCED293F65D500E42796 /* httpsMobileV2Bloom.bin in Resources */ = {isa = PBXBuildFile; fileRef = 4B677428255DBEB800025BD8 /* httpsMobileV2Bloom.bin */; };
Expand Down Expand Up @@ -2328,7 +2328,7 @@
8400DC4F2C6E2770006509D2 /* SteppedScrollView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8400DC4D2C6E2770006509D2 /* SteppedScrollView.swift */; };
8402A7BD2E9F8C5B00ACA20C /* FireCoordinatorIntegrationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8402A7BA2E9F7CA000ACA20C /* FireCoordinatorIntegrationTests.swift */; };
8402A7BE2E9F8C5B00ACA20C /* FireCoordinatorIntegrationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8402A7BA2E9F7CA000ACA20C /* FireCoordinatorIntegrationTests.swift */; };
8409BD742ED878B200E39FA7 /* PopupHandlingUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8409BD732ED878B200E39FA7 /* PopupHandlingUITests.swift */; };

8409BD782ED878C400E39FA7 /* popup-delayed.html in Resources */ = {isa = PBXBuildFile; fileRef = 8409BD752ED878C400E39FA7 /* popup-delayed.html */; };
8409BD792ED878C400E39FA7 /* popup-servicenow.html in Resources */ = {isa = PBXBuildFile; fileRef = 8409BD772ED878C400E39FA7 /* popup-servicenow.html */; };
8409BD7A2ED878C400E39FA7 /* popup-links.html in Resources */ = {isa = PBXBuildFile; fileRef = 8409BD762ED878C400E39FA7 /* popup-links.html */; };
Expand Down Expand Up @@ -3159,7 +3159,7 @@
B645D8F629FA95440024461F /* WKProcessPoolExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = B645D8F529FA95440024461F /* WKProcessPoolExtension.swift */; };
B645D8F729FA95440024461F /* WKProcessPoolExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = B645D8F529FA95440024461F /* WKProcessPoolExtension.swift */; };
B647EFBB2922584B00BA628D /* AdClickAttributionTabExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = B647EFBA2922584B00BA628D /* AdClickAttributionTabExtension.swift */; };
B64C84DE2692D7400048FEBE /* PermissionAuthorization.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = B64C84DD2692D7400048FEBE /* PermissionAuthorization.storyboard */; };

B64C84E32692DC9F0048FEBE /* PermissionAuthorizationViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B64C84E22692DC9F0048FEBE /* PermissionAuthorizationViewController.swift */; };
B64C84EB2692DD650048FEBE /* PermissionAuthorizationPopover.swift in Sources */ = {isa = PBXBuildFile; fileRef = B64C84EA2692DD650048FEBE /* PermissionAuthorizationPopover.swift */; };
B64C84F1269310120048FEBE /* PermissionManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = B64C84F0269310120048FEBE /* PermissionManager.swift */; };
Expand Down Expand Up @@ -4183,7 +4183,7 @@
EE3424612BA0853900173B1B /* VPNUninstaller.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE34245D2BA0853900173B1B /* VPNUninstaller.swift */; };
EE3ED86E2E561B770026B962 /* DismissableSyncDeviceButtonModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE3ED86D2E561B770026B962 /* DismissableSyncDeviceButtonModel.swift */; };
EE3ED86F2E561B770026B962 /* DismissableSyncDeviceButtonModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE3ED86D2E561B770026B962 /* DismissableSyncDeviceButtonModel.swift */; };
EE42CBCC2BC8004700AD411C /* PermissionsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE42CBCB2BC8004700AD411C /* PermissionsTests.swift */; };

EE4624E42E69DB53001CD9E6 /* FeatureFlagger+Sync.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE4624E32E69DB49001CD9E6 /* FeatureFlagger+Sync.swift */; };
EE4624E52E69DB53001CD9E6 /* FeatureFlagger+Sync.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE4624E32E69DB49001CD9E6 /* FeatureFlagger+Sync.swift */; };
EE4E15FC2EBCB98A006D1C2D /* NewReportFeedbackView.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE4E15FB2EBCB983006D1C2D /* NewReportFeedbackView.swift */; };
Expand Down Expand Up @@ -5626,7 +5626,7 @@
8400DC4A2C6E26AE006509D2 /* BookmarksBarCollectionView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BookmarksBarCollectionView.swift; sourceTree = "<group>"; };
8400DC4D2C6E2770006509D2 /* SteppedScrollView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SteppedScrollView.swift; sourceTree = "<group>"; };
8402A7BA2E9F7CA000ACA20C /* FireCoordinatorIntegrationTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FireCoordinatorIntegrationTests.swift; sourceTree = "<group>"; };
8409BD732ED878B200E39FA7 /* PopupHandlingUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PopupHandlingUITests.swift; sourceTree = "<group>"; };

8409BD752ED878C400E39FA7 /* popup-delayed.html */ = {isa = PBXFileReference; lastKnownFileType = text.html; path = "popup-delayed.html"; sourceTree = "<group>"; };
8409BD762ED878C400E39FA7 /* popup-links.html */ = {isa = PBXFileReference; lastKnownFileType = text.html; path = "popup-links.html"; sourceTree = "<group>"; };
8409BD772ED878C400E39FA7 /* popup-servicenow.html */ = {isa = PBXFileReference; lastKnownFileType = text.html; path = "popup-servicenow.html"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -6152,7 +6152,7 @@
B644B43929D565DB003FA9AB /* SearchNonexistentDomainTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchNonexistentDomainTests.swift; sourceTree = "<group>"; };
B645D8F529FA95440024461F /* WKProcessPoolExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WKProcessPoolExtension.swift; sourceTree = "<group>"; };
B647EFBA2922584B00BA628D /* AdClickAttributionTabExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AdClickAttributionTabExtension.swift; sourceTree = "<group>"; };
B64C84DD2692D7400048FEBE /* PermissionAuthorization.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = PermissionAuthorization.storyboard; sourceTree = "<group>"; };

B64C84E22692DC9F0048FEBE /* PermissionAuthorizationViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PermissionAuthorizationViewController.swift; sourceTree = "<group>"; };
B64C84EA2692DD650048FEBE /* PermissionAuthorizationPopover.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PermissionAuthorizationPopover.swift; sourceTree = "<group>"; };
B64C84F0269310120048FEBE /* PermissionManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PermissionManager.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -6715,7 +6715,7 @@
EE339227291BDEFD009F62C1 /* JSAlertController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = JSAlertController.swift; sourceTree = "<group>"; };
EE34245D2BA0853900173B1B /* VPNUninstaller.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VPNUninstaller.swift; sourceTree = "<group>"; };
EE3ED86D2E561B770026B962 /* DismissableSyncDeviceButtonModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DismissableSyncDeviceButtonModel.swift; sourceTree = "<group>"; };
EE42CBCB2BC8004700AD411C /* PermissionsTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PermissionsTests.swift; sourceTree = "<group>"; };

EE4624E32E69DB49001CD9E6 /* FeatureFlagger+Sync.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "FeatureFlagger+Sync.swift"; sourceTree = "<group>"; };
EE4E15FB2EBCB983006D1C2D /* NewReportFeedbackView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NewReportFeedbackView.swift; sourceTree = "<group>"; };
EE54F7B22BBFEA48006218DB /* BookmarksAndFavoritesTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BookmarksAndFavoritesTests.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -9452,10 +9452,8 @@
844905502E55C9C80054F4FD /* MaliciousSiteProtectionUITests.swift */,
8449054A2E55BBD60054F4FD /* NavigationProtectionUITests.swift */,
56A054522C2592CE007D8FAB /* OnboardingUITests.swift */,
EE42CBCB2BC8004700AD411C /* PermissionsTests.swift */,
1DE28D602EEB4A7E00C07F15 /* NewPermissionViewTests.swift */,
BB4339DA2C7F9606005D7ED7 /* PinnedTabsTests.swift */,
8409BD732ED878B200E39FA7 /* PopupHandlingUITests.swift */,
842FE38A2E0C28EF00E4F9E4 /* PrintingTests.swift */,
8449054E2E55BBEE0054F4FD /* PrivacyDashboardUITests.swift */,
5680BCA62F17EC6400BD624E /* SSLErrorTests.swift */,
Expand Down Expand Up @@ -11745,7 +11743,6 @@
B64C84DC2692D6FC0048FEBE /* View */ = {
isa = PBXGroup;
children = (
B64C84DD2692D7400048FEBE /* PermissionAuthorization.storyboard */,
B64C84E22692DC9F0048FEBE /* PermissionAuthorizationViewController.swift */,
1D532BB32ED8D3D300D219FA /* PermissionAuthorizationSwiftUIView.swift */,
B64C84EA2692DD650048FEBE /* PermissionAuthorizationPopover.swift */,
Expand Down Expand Up @@ -13913,7 +13910,6 @@
3706FCD8293F65D500E42796 /* BookmarksBar.storyboard in Resources */,
3706FCDB293F65D500E42796 /* Feedback.storyboard in Resources */,
B658BAB72B0F848D00D1F2C7 /* Localizable.xcstrings in Resources */,
3706FCE1293F65D500E42796 /* PermissionAuthorization.storyboard in Resources */,
CD2AB5C62C8222FE0019EB49 /* phishingFilterSet.json in Resources */,
7B122A992DE4717400B84F63 /* AppStoreInfoPlist.xcstrings in Resources */,
3706FCE6293F65D500E42796 /* social_images in Resources */,
Expand Down Expand Up @@ -14146,7 +14142,6 @@
4BD18F05283F151F00058124 /* BookmarksBar.storyboard in Resources */,
AA3863C527A1E28F00749AB5 /* Feedback.storyboard in Resources */,
B658BAB62B0F845D00D1F2C7 /* Localizable.xcstrings in Resources */,
B64C84DE2692D7400048FEBE /* PermissionAuthorization.storyboard in Resources */,
CD2AB5C52C8222FE0019EB49 /* phishingFilterSet.json in Resources */,
EA18D1CA272F0DC8006DC101 /* social_images in Resources */,
BD384AC92BBC821A00EF3735 /* vpn-dark-mode.json in Resources */,
Expand Down Expand Up @@ -16659,14 +16654,12 @@
8449054F2E55BBEE0054F4FD /* PrivacyDashboardUITests.swift in Sources */,
844905412E54A3540054F4FD /* AddressBarUITests.swift in Sources */,
844905452E54ADD40054F4FD /* AutoconsentUITests.swift in Sources */,
EE42CBCC2BC8004700AD411C /* PermissionsTests.swift in Sources */,
4B7948192F81DFC400DA4028 /* TabNavigationMenuItemTests.swift in Sources */,
1DE28D612EEB4A7E00C07F15 /* NewPermissionViewTests.swift in Sources */,
844905432E54A3600054F4FD /* AddressBarSpoofingUITests.swift in Sources */,
844905492E55A9740054F4FD /* SearchNonexistentDomainUITests.swift in Sources */,
7B4CE8E726F02135009134B1 /* TabBarTests.swift in Sources */,
BB0346F52CEB80B400D23E05 /* DownloadsUITests.swift in Sources */,
8409BD742ED878B200E39FA7 /* PopupHandlingUITests.swift in Sources */,
84A03D2E2DDC275200A3685B /* BookmarksBarVisibilityTests.swift in Sources */,
EEBCE6822BA444FA00B9DF00 /* XCUIElementExtension.swift in Sources */,
31DE49212EE2299500F3940A /* AIChatMultilinePasteTests.swift in Sources */,
Expand Down
5 changes: 0 additions & 5 deletions macOS/DuckDuckGo-macOS.xcodeproj/xcshareddata/xcschemes/macOS UI Tests CI.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,6 @@
BlueprintName = "UI Tests"
ReferencedContainer = "container:DuckDuckGo-macOS.xcodeproj">
</BuildableReference>
<SkippedTests>
<Test
Identifier = "PermissionsTests">
</Test>
</SkippedTests>
</TestableReference>
</Testables>
</TestAction>
Expand Down
5 changes: 0 additions & 5 deletions macOS/DuckDuckGo-macOS.xcodeproj/xcshareddata/xcschemes/macOS UI Tests.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,6 @@
BlueprintName = "UI Tests"
ReferencedContainer = "container:DuckDuckGo-macOS.xcodeproj">
</BuildableReference>
<SkippedTests>
<Test
Identifier = "PermissionsTests">
</Test>
</SkippedTests>
</TestableReference>
</Testables>
</TestAction>
Expand Down
2 changes: 1 addition & 1 deletion macOS/DuckDuckGo/AIChat/Sidebar/AIChatViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -493,7 +493,7 @@ final class AIChatViewController: NSViewController {

private func showPermissionAuthorizationPopover(for query: PermissionAuthorizationQuery) {
let popover = permissionAuthorizationPopover ?? {
let popover = PermissionAuthorizationPopover(featureFlagger: NSApp.delegateTyped.featureFlagger)
let popover = PermissionAuthorizationPopover()
self.permissionAuthorizationPopover = popover
return popover
}()
Expand Down
6 changes: 3 additions & 3 deletions macOS/DuckDuckGo/Application/AppDelegate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -819,16 +819,16 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
if AppVersion.runType.requiresEnvironment {
fireproofDomains = FireproofDomains(store: FireproofDomainsStore(database: database.db, tableName: "FireproofDomains"), tld: tld)
faviconManager = FaviconManager(cacheType: .standard(database.db), bookmarkManager: bookmarkManager, fireproofDomains: fireproofDomains, privacyConfigurationManager: privacyConfigurationManager)
permissionManager = PermissionManager(store: LocalPermissionStore(database: database.db), featureFlagger: featureFlagger)
permissionManager = PermissionManager(store: LocalPermissionStore(database: database.db))
} else {
fireproofDomains = FireproofDomains(store: FireproofDomainsStore(context: nil), tld: tld)
faviconManager = FaviconManager(cacheType: .inMemory, bookmarkManager: bookmarkManager, fireproofDomains: fireproofDomains, privacyConfigurationManager: privacyConfigurationManager)
permissionManager = PermissionManager(store: LocalPermissionStore(database: nil), featureFlagger: featureFlagger)
permissionManager = PermissionManager(store: LocalPermissionStore(database: nil))
}
#else
fireproofDomains = FireproofDomains(store: FireproofDomainsStore(database: database.db, tableName: "FireproofDomains"), tld: tld)
faviconManager = FaviconManager(cacheType: .standard(database.db), bookmarkManager: bookmarkManager, fireproofDomains: fireproofDomains, privacyConfigurationManager: privacyConfigurationManager)
permissionManager = PermissionManager(store: LocalPermissionStore(database: database.db), featureFlagger: featureFlagger)
permissionManager = PermissionManager(store: LocalPermissionStore(database: database.db))
#endif
notificationService = UserNotificationAuthorizationService()

Expand Down
2 changes: 1 addition & 1 deletion macOS/DuckDuckGo/ContentBlocker/AppPrivacyConfigurationDataProvider.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ final class AppPrivacyConfigurationDataProvider: EmbeddedDataProvider {

public struct Constants {
public static let embeddedDataETag = "\"ee9cd2f12a4d76f7692bc66e3233d135\""
public static let embeddedDataSHA = "9664a46ca58ed15e793e6873201a5df56d763222eda3b4bfc8c09bbe126251b6"
public static let embeddedDataSHA = "d9867c3c702a4c5faceffa55a855f89997c331e142bd5750ac05cabeec8d6a8d"
Comment thread
tomasstrba marked this conversation as resolved.
Outdated
}

public enum EnvironmentKeys {
Expand Down
2 changes: 1 addition & 1 deletion macOS/DuckDuckGo/ContentBlocker/Resources/macos-config.json
View file
Open in desktop
Comment thread
tomasstrba marked this conversation as resolved.

Large diffs are not rendered by default.

Loading
Loading