Skip to content
This repository was archived by the owner on Feb 24, 2025. It is now read-only.

Update onboarding-related error states #1504

Merged
diegoreymendez merged 11 commits into from
Aug 23, 2023
Merged

Update onboarding-related error states #1504

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
8c7a85a
Adds entitlements for review and CI builds for some of our agents (#1…
diegoreymendez Aug 10, 2023
7e60e38
Turns NetworkProtectionStatusView into a composite view and separates…
diegoreymendez Aug 10, 2023
9307755
Implements NetP onboarding UserDefaults and debug menu options (#1474)
diegoreymendez Aug 14, 2023
5b10101
Merge branch 'develop' into diego/feature-network-protection-onboarding
diegoreymendez Aug 14, 2023
bbd4e29
Implements new onboarding UI/UX (#1464)
diegoreymendez Aug 14, 2023
a4cced6
Merge branch 'develop' into diego/feature-network-protection-onboarding
diegoreymendez Aug 16, 2023
f1d1284
Design adjustments for Network Protection onboarding views (#1484)
diegoreymendez Aug 18, 2023
23825e7
Implements solution for System Extension activation issues (#1502)
diegoreymendez Aug 19, 2023
7a1f432
Adjusted the toggle behaviour which was slightly off
diegoreymendez Aug 19, 2023
2110ab2
Changes the shared UserDefaults to not need unwrapping
diegoreymendez Aug 23, 2023
c360fc4
Merges the latest from develop
diegoreymendez Aug 23, 2023
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
5 changes: 2 additions & 3 deletions Configuration/App/NetworkProtection/DuckDuckGoAgent.xcconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,8 @@ INFOPLIST_KEY_NSPrincipalClass = Application
//CODE_SIGN_STYLE[config=Debug][sdk=*] = Manual
//CODE_SIGN_STYLE[config=Release][sdk=*] = Manual

// Left empty intentionally as we currently only support debug and release builds
CODE_SIGN_ENTITLEMENTS[config=Review][sdk=macosx*] =
CODE_SIGN_ENTITLEMENTS[config=CI][sdk=macosx*] =
CODE_SIGN_ENTITLEMENTS[config=Review][sdk=macosx*] = DuckDuckGoAgent/DuckDuckGoAgent.entitlements
CODE_SIGN_ENTITLEMENTS[config=CI][sdk=macosx*] = DuckDuckGoAgent/DuckDuckGoAgent.entitlements
CODE_SIGN_ENTITLEMENTS[config=Debug][sdk=macosx*] = DuckDuckGoAgent/DuckDuckGoAgent.entitlements
CODE_SIGN_ENTITLEMENTS[config=Release][sdk=macosx*] = DuckDuckGoAgent/DuckDuckGoAgent.entitlements

Expand Down
5 changes: 2 additions & 3 deletions Configuration/App/NetworkProtection/DuckDuckGoNotifications.xcconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,8 @@ GENERATE_INFOPLIST_FILE = YES
INFOPLIST_KEY_LSUIElement = YES
INFOPLIST_KEY_NSPrincipalClass = Application

// Left empty intentionally as we currently only support debug and release builds
CODE_SIGN_ENTITLEMENTS[config=Review][sdk=macosx*] =
CODE_SIGN_ENTITLEMENTS[config=CI][sdk=macosx*] =
CODE_SIGN_ENTITLEMENTS[config=Review][sdk=macosx*] = DuckDuckGoNotifications/DuckDuckGoNotifications.entitlements
CODE_SIGN_ENTITLEMENTS[config=CI][sdk=macosx*] = DuckDuckGoNotifications/DuckDuckGoNotifications.entitlements
CODE_SIGN_ENTITLEMENTS[config=Debug][sdk=macosx*] = DuckDuckGoNotifications/DuckDuckGoNotifications.entitlements
CODE_SIGN_ENTITLEMENTS[config=Release][sdk=macosx*] = DuckDuckGoNotifications/DuckDuckGoNotifications.entitlements

Expand Down
22 changes: 22 additions & 0 deletions DuckDuckGo.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1319,6 +1319,8 @@
56D145F229E6F06D00E3488A /* MockBookmarkManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 56D145F029E6F06D00E3488A /* MockBookmarkManager.swift */; };
56D6A3D629DB2BAB0055215A /* ContinueSetUpView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 56D6A3D529DB2BAB0055215A /* ContinueSetUpView.swift */; };
56D6A3D729DB2BAB0055215A /* ContinueSetUpView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 56D6A3D529DB2BAB0055215A /* ContinueSetUpView.swift */; };
7B05829E2A812AC000AC3F7C /* NetworkProtectionOnboardingMenu.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B05829D2A812AC000AC3F7C /* NetworkProtectionOnboardingMenu.swift */; };
7B05829F2A812AC000AC3F7C /* NetworkProtectionOnboardingMenu.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B05829D2A812AC000AC3F7C /* NetworkProtectionOnboardingMenu.swift */; };
7B1E819E27C8874900FF0E60 /* ContentOverlayPopover.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B1E819B27C8874900FF0E60 /* ContentOverlayPopover.swift */; };
7B1E819F27C8874900FF0E60 /* ContentOverlay.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 7B1E819C27C8874900FF0E60 /* ContentOverlay.storyboard */; };
7B1E81A027C8874900FF0E60 /* ContentOverlayViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B1E819D27C8874900FF0E60 /* ContentOverlayViewController.swift */; };
Expand All @@ -1337,7 +1339,13 @@
7B736E582A4A22B700F9922A /* Main.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B5F14C52A145D6A0060320F /* Main.swift */; };
7B736E6A2A4A22FC00F9922A /* enableOnDemand.app in Embed NetP Controller Apps */ = {isa = PBXBuildFile; fileRef = 7B736E5F2A4A22B700F9922A /* enableOnDemand.app */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
7B838C382A1DD8DD00E05A13 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 4B2D06522A11D19B00DE1F49 /* Assets.xcassets */; };
7B934C3E2A866CFF00FC8F9C /* NetworkProtectionOnboardingMenu.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B934C3D2A866CFF00FC8F9C /* NetworkProtectionOnboardingMenu.swift */; };
7B934C3F2A866CFF00FC8F9C /* NetworkProtectionOnboardingMenu.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B934C3D2A866CFF00FC8F9C /* NetworkProtectionOnboardingMenu.swift */; };
7B934C412A866DD400FC8F9C /* UserDefaults+NetworkProtectionShared.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B934C402A866DD400FC8F9C /* UserDefaults+NetworkProtectionShared.swift */; };
7BA4727D26F01BC400EAA165 /* CoreDataTestUtilities.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B9292C42667104B00AD2C21 /* CoreDataTestUtilities.swift */; };
7BAF9E4B2A8A3CC9002D3B6E /* UserDefaults+NetworkProtectionShared.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B934C402A866DD400FC8F9C /* UserDefaults+NetworkProtectionShared.swift */; };
7BAF9E4C2A8A3CCA002D3B6E /* UserDefaults+NetworkProtectionShared.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B934C402A866DD400FC8F9C /* UserDefaults+NetworkProtectionShared.swift */; };
7BAF9E4D2A8A3CCB002D3B6E /* UserDefaults+NetworkProtectionShared.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B934C402A866DD400FC8F9C /* UserDefaults+NetworkProtectionShared.swift */; };
7BB108592A43375D000AB95F /* PFMoveApplication.m in Sources */ = {isa = PBXBuildFile; fileRef = 7BB108582A43375D000AB95F /* PFMoveApplication.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
7BBD45B12A691AB500C83CA9 /* NetworkProtectionDebugUtilities.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7BBD45B02A691AB500C83CA9 /* NetworkProtectionDebugUtilities.swift */; };
7BBD45B22A691AB500C83CA9 /* NetworkProtectionDebugUtilities.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7BBD45B02A691AB500C83CA9 /* NetworkProtectionDebugUtilities.swift */; };
Expand Down Expand Up @@ -2591,6 +2599,7 @@
56D145ED29E6DAD900E3488A /* DataImportProviderTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DataImportProviderTests.swift; sourceTree = "<group>"; };
56D145F029E6F06D00E3488A /* MockBookmarkManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockBookmarkManager.swift; sourceTree = "<group>"; };
56D6A3D529DB2BAB0055215A /* ContinueSetUpView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ContinueSetUpView.swift; sourceTree = "<group>"; };
7B05829D2A812AC000AC3F7C /* NetworkProtectionOnboardingMenu.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NetworkProtectionOnboardingMenu.swift; sourceTree = "<group>"; };
7B1E819B27C8874900FF0E60 /* ContentOverlayPopover.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ContentOverlayPopover.swift; sourceTree = "<group>"; };
7B1E819C27C8874900FF0E60 /* ContentOverlay.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = ContentOverlay.storyboard; sourceTree = "<group>"; };
7B1E819D27C8874900FF0E60 /* ContentOverlayViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ContentOverlayViewController.swift; sourceTree = "<group>"; };
Expand All @@ -2607,6 +2616,8 @@
7B5291882A1697680022E406 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
7B5291892A169BC90022E406 /* NetworkProtectionDeveloperID.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = NetworkProtectionDeveloperID.xcconfig; sourceTree = "<group>"; };
7B736E5F2A4A22B700F9922A /* enableOnDemand.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = enableOnDemand.app; sourceTree = BUILT_PRODUCTS_DIR; };
7B934C3D2A866CFF00FC8F9C /* NetworkProtectionOnboardingMenu.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NetworkProtectionOnboardingMenu.swift; sourceTree = "<group>"; };
7B934C402A866DD400FC8F9C /* UserDefaults+NetworkProtectionShared.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UserDefaults+NetworkProtectionShared.swift"; sourceTree = "<group>"; };
7B9459632A4A5BAF0012535A /* NetworkProtectionEnableOnDemand.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = NetworkProtectionEnableOnDemand.xcconfig; sourceTree = "<group>"; };
7BB108572A43375D000AB95F /* PFMoveApplication.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PFMoveApplication.h; sourceTree = "<group>"; };
7BB108582A43375D000AB95F /* PFMoveApplication.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PFMoveApplication.m; sourceTree = "<group>"; };
Expand Down Expand Up @@ -4012,8 +4023,10 @@
children = (
4B4D60642A0B29FA00BCD287 /* LoginItem.swift */,
7BE146062A6A83C700C313B8 /* NetworkProtectionDebugMenu.swift */,
7B05829D2A812AC000AC3F7C /* NetworkProtectionOnboardingMenu.swift */,
7B430EA02A71411A00BAC4A1 /* NetworkProtectionSimulateFailureMenu.swift */,
7BBD45B02A691AB500C83CA9 /* NetworkProtectionDebugUtilities.swift */,
7B934C3D2A866CFF00FC8F9C /* NetworkProtectionOnboardingMenu.swift */,
7BBD45B32A691C3A00C83CA9 /* NetworkProtectionLoginItemsManager.swift */,
B602E81C2A1E25B0006D261F /* NEOnDemandRuleExtension.swift */,
4B4D60652A0B29FA00BCD287 /* NetworkProtectionNavBarButtonModel.swift */,
Expand Down Expand Up @@ -6551,6 +6564,7 @@
children = (
EEAD7A6E2A1D3E1F002A24E7 /* AppLauncher.swift */,
B6F92BA42A691A44002ABA6B /* NetworkProtectionUserDefaultsConstants.swift */,
7B934C402A866DD400FC8F9C /* UserDefaults+NetworkProtectionShared.swift */,
);
path = AppAndExtensionAndAgentTargets;
sourceTree = "<group>";
Expand Down Expand Up @@ -7685,6 +7699,7 @@
85774B042A71CDD000DE0561 /* BlockMenuItem.swift in Sources */,
3706FB19293F65D500E42796 /* FireViewController.swift in Sources */,
4B4D60D42A0C84F700BCD287 /* UserText+NetworkProtection.swift in Sources */,
7B05829F2A812AC000AC3F7C /* NetworkProtectionOnboardingMenu.swift in Sources */,
3707C71F294B5D2900682A9F /* WKUserContentControllerExtension.swift in Sources */,
3706FB1A293F65D500E42796 /* OutlineSeparatorViewCell.swift in Sources */,
3706FB1B293F65D500E42796 /* SafariDataImporter.swift in Sources */,
Expand Down Expand Up @@ -7802,6 +7817,7 @@
3706FB80293F65D500E42796 /* NSAlert+ActiveDownloadsTermination.swift in Sources */,
3707C717294B5D0F00682A9F /* FindInPageTabExtension.swift in Sources */,
3706FB81293F65D500E42796 /* IndexPathExtension.swift in Sources */,
7BAF9E4B2A8A3CC9002D3B6E /* UserDefaults+NetworkProtectionShared.swift in Sources */,
B6685E3D29A602D90043D2EE /* ExternalAppSchemeHandler.swift in Sources */,
B6E1491029A5C30500AAFBE8 /* ContentBlockingTabExtension.swift in Sources */,
3706FB82293F65D500E42796 /* PasswordManagementNoteItemView.swift in Sources */,
Expand Down Expand Up @@ -7891,6 +7907,7 @@
85774B002A713D3B00DE0561 /* BookmarksBarMenuFactory.swift in Sources */,
B602E81E2A1E25B1006D261F /* NEOnDemandRuleExtension.swift in Sources */,
3706FBC7293F65D500E42796 /* HistoryStore.swift in Sources */,
7B934C3F2A866CFF00FC8F9C /* NetworkProtectionOnboardingMenu.swift in Sources */,
3706FBC8293F65D500E42796 /* FirePopoverCollectionViewItem.swift in Sources */,
3706FBC9293F65D500E42796 /* ArrayExtension.swift in Sources */,
3706FBCA293F65D500E42796 /* CrashReportSender.swift in Sources */,
Expand Down Expand Up @@ -8464,6 +8481,7 @@
7B2DDD052A93BEE20039D884 /* FeatureProtectedTunnelController.swift in Sources */,
B6F92BA22A691580002ABA6B /* UserDefaultsWrapper.swift in Sources */,
4B2D065B2A11D1FF00DE1F49 /* Logging.swift in Sources */,
7BAF9E4C2A8A3CCA002D3B6E /* UserDefaults+NetworkProtectionShared.swift in Sources */,
4B2D06572A11D19B00DE1F49 /* DuckDuckGoAgentAppDelegate.swift in Sources */,
7B2DDCFA2A93B25F0039D884 /* KeychainType+ClientDefault.swift in Sources */,
7B2DDD072A93C17D0039D884 /* UserText.swift in Sources */,
Expand All @@ -8490,6 +8508,7 @@
EEC589DC2A4F1CE800BCD60C /* AppLauncher.swift in Sources */,
7B2DDD032A93BBEC0039D884 /* NetworkProtectionBouncer.swift in Sources */,
B65DA5F02A77CC3C00CBEE8D /* Bundle+NetworkProtectionExtensions.swift in Sources */,
7BAF9E4D2A8A3CCB002D3B6E /* UserDefaults+NetworkProtectionShared.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -9076,6 +9095,7 @@
B64C84E32692DC9F0048FEBE /* PermissionAuthorizationViewController.swift in Sources */,
4B92929D26670D2A00AD2C21 /* BookmarkNode.swift in Sources */,
B693955226F04BEB0015B914 /* LongPressButton.swift in Sources */,
7B934C3E2A866CFF00FC8F9C /* NetworkProtectionOnboardingMenu.swift in Sources */,
B6085D062743905F00A9C456 /* CoreDataStore.swift in Sources */,
B6DB3AF6278EA0130024C5C4 /* BundleExtension.swift in Sources */,
4B0511E1262CAA8600F6079C /* NSOpenPanelExtensions.swift in Sources */,
Expand Down Expand Up @@ -9154,6 +9174,7 @@
4B139AFD26B60BD800894F82 /* NSImageExtensions.swift in Sources */,
85625996269C953C00EE44BC /* PasswordManagementViewController.swift in Sources */,
4BB99D0226FE191E001E4761 /* ImportedBookmarks.swift in Sources */,
7B934C412A866DD400FC8F9C /* UserDefaults+NetworkProtectionShared.swift in Sources */,
B626A75A29921FAA00053070 /* NavigationActionPolicyExtension.swift in Sources */,
B603FD9E2A02712E00F3FCA9 /* CIImageExtension.swift in Sources */,
AA6EF9B3250785D5004754E6 /* NSMenuExtension.swift in Sources */,
Expand Down Expand Up @@ -9189,6 +9210,7 @@
4B92928B26670D1700AD2C21 /* BookmarksOutlineView.swift in Sources */,
4BF01C00272AE74C00884A61 /* CountryList.swift in Sources */,
37CD54CC27F2FDD100F1F7B9 /* PreferencesSection.swift in Sources */,
7B05829E2A812AC000AC3F7C /* NetworkProtectionOnboardingMenu.swift in Sources */,
4B4D60B62A0C847D00BCD287 /* NetworkProtectionNavBarButtonModel.swift in Sources */,
FD23FD2D2886A81D007F6985 /* AutoconsentManagement.swift in Sources */,
4B4D60D32A0C84F700BCD287 /* UserText+NetworkProtection.swift in Sources */,
Expand Down
2 changes: 1 addition & 1 deletion DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 9 additions & 1 deletion DuckDuckGo/Common/Utilities/UserDefaultsWrapper.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import Foundation

extension UserDefaults {
/// The app group's shared UserDefaults
static let shared = UserDefaults(suiteName: Bundle.main.appGroupName)
static let shared = UserDefaults(suiteName: Bundle.main.appGroupName)!
}

@propertyWrapper
Expand Down Expand Up @@ -129,6 +129,7 @@ public struct UserDefaultsWrapper<T> {
case firstLaunchDate = "first.app.launch.date"

// Network Protection

case networkProtectionOnDemandActivation = "netp.ondemand"
case networkProtectionShouldEnforceRoutes = "netp.enforce-routes"
case networkProtectionShouldIncludeAllNetworks = "netp.include-all-networks"
Expand All @@ -143,6 +144,13 @@ public struct UserDefaultsWrapper<T> {

case agentLaunchTime = "netp.agent.launch-time"

// Network Protection: Shared Defaults
// ---
// Please note that shared defaults MUST have a name that matches exactly their value,
// or else KVO will just not work as of 2023-08-07
Comment on lines +149 to +150
Copy link
Collaborator

@samsymons samsymons Aug 20, 2023

Choose a reason for hiding this comment

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

Are we able to add more context here as to why the date is important? (i.e. link to a PR or Asana task with more info)


case networkProtectionOnboardingStatusRawValue = "networkProtectionOnboardingStatusRawValue"

// Experiments
case pixelExperimentInstalled = "pixel.experiment.installed"
case pixelExperimentCohort = "pixel.experiment.cohort"
Expand Down
Loading