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.

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

Bye bye NETWORK_PROTECTION #2509

Merged
merged 5 commits into from
Apr 8, 2024
Merged

Bye bye NETWORK_PROTECTION #2509

merged 5 commits into from
Apr 8, 2024

Conversation

diegoreymendez
Copy link
Contributor

@diegoreymendez diegoreymendez commented Mar 27, 2024

Task/Issue URL: https://app.asana.com/0/0/1206935409526736/f

Description:

Removes the NETWORK_PROTECTION feature flag.

Testing:

Test that the full VPN experience works.
Please, take your time to review the whole set of changes. Tick each viewed file and move through all of them. Even if it takes long that's ok.


Internal references:

Pull Request Review Checklist
Software Engineering Expectations
Technical Design Template
Pull Request Documentation

@diegoreymendez diegoreymendez marked this pull request as ready for review March 27, 2024 01:57
Copy link
Contributor

github-actions bot commented Mar 27, 2024

Warnings
⚠️ PR has more than 500 lines of code changing. Consider splitting into smaller PRs if possible.

Generated by 🚫 dangerJS against 0590e3f

@github-actions github-actions bot added the bot: not in app board Added by automation for pull requests with tasks not added to macOS App Board Asana project label Mar 27, 2024
@diegoreymendez diegoreymendez added DO NOT MERGE and removed bot: not in app board Added by automation for pull requests with tasks not added to macOS App Board Asana project labels Mar 27, 2024
@diegoreymendez diegoreymendez self-assigned this Mar 27, 2024
@@ -81,7 +78,7 @@ final class AppDelegate: NSObject, NSApplicationDelegate, FileDownloadManagerDel
let bookmarksManager = LocalBookmarkManager.shared
var privacyDashboardWindow: NSWindow?

#if NETWORK_PROTECTION && SUBSCRIPTION
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

NETWORK_PROTECTION && OTHER_FLAG becomes always OTHER_FLAG

@@ -582,8 +573,6 @@ func updateSubscriptionStatus() {
#endif
}

#if NETWORK_PROTECTION || DBP
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

NETWORK_PROTECTION || OTHER_FLAG becomes always true and is hence removed

dataBrokerProtectionUserDefaults: .dbp
)
#else
return HomePageRemoteMessaging()
#endif
Copy link
Contributor Author

@diegoreymendez diegoreymendez Mar 27, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The bottom 2 conditions go away because NETWORK_PROTECTION is always true, so we stick to only the top two conditions.

Copy link
Collaborator

@graeme graeme left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good. Smoke tested too and all is working as expected.

@diegoreymendez diegoreymendez merged commit 70c8419 into main Apr 8, 2024
17 checks passed
@diegoreymendez diegoreymendez deleted the diego/bye-bye-netp branch April 8, 2024 15:07
samsymons added a commit that referenced this pull request Apr 8, 2024
* main: (22 commits)
  Removes last instance of NETWORK_PROTECTION flag (#2573)
  Bye bye NETWORK_PROTECTION (#2509)
  QWD: Enable Hide/Show for Autofill Credit Card Number and CVV (#2539)
  Removed the VPN waitlist beta pixels (#2555)
  VPN: Cleanup authorize call (#2565)
  Revert "VPN: Cleanup authorize call (#2553)"
  VPN: Cleanup authorize call (#2553)
  Improves underlying error pixel information (#2543)
  Fixes the VPN restarting logic on update (#2545)
  fix download save panel disappearing on navigation (#2549)
  Add CI support for handling installation attribution (#2502)
  Fix usertext comment to ensure it matches localizable string (#2546)
  Update Neighbor Report (#2542)
  DBP: Compare by url and not name (#2544)
  Adds a series of UI tests for Bookmarks Bar visibility
  Improve Handling of noData Import Errors (#2494)
  Use the default action button style for VPN onboarding (#2529)
  Closing empty tabs after download (#2510)
  Add Web UI loading state pixels (#2531)
  fix localization warnings (#2288)
  ...
samsymons added a commit that referenced this pull request Apr 8, 2024
…flagger

# By Diego Rey Mendez (7) and others
# Via GitHub
* main:
  Automatically close VPN popover when the app goes into the background (#2562)
  Fix last known VPN crash and missing IPC registration (#2579)
  Create a new window when making a feedback form if necessary (#2563)
  Improve VPN uninstallation reliability (#2560)
  Removes last instance of NETWORK_PROTECTION flag (#2573)
  Bye bye NETWORK_PROTECTION (#2509)
  QWD: Enable Hide/Show for Autofill Credit Card Number and CVV (#2539)
  Removed the VPN waitlist beta pixels (#2555)
  VPN: Cleanup authorize call (#2565)
  Revert "VPN: Cleanup authorize call (#2553)"
  VPN: Cleanup authorize call (#2553)
  Improves underlying error pixel information (#2543)

# Conflicts:
#	DuckDuckGo.xcodeproj/project.pbxproj
#	DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants