Add NetP widget #2142

samsymons · 2023-11-09T22:30:56Z

Task/Issue URL: https://app.asana.com/0/414235014887631/1205921206830836/f
Tech Design URL:
CC: @graeme

Description:

This PR adds a NetP widget. It's only available in the debug and alpha builds, and only available on iOS 17.

Steps to test this PR:

First, update the #if ALPHA checks in this PR to include DEBUG - the alpha checks are because we would like to get the widget into the alpha builds, but we need CI to support Xcode 15, which we can't do for any workflows that run tests unfortunately
Run the app on your device
Add the widget from the widget UI
Toggle NetP within the app, check that the widget state updates accordingly
Try the "Connect" and "Disconnect" buttons inside the widget - note that the widget does not show connecting/disconnecting states, this functionality is pretty hacky at the moment

Device Testing:

OS Testing:

iOS 14
iOS 15
iOS 16

Theme Testing:

Light theme
Dark theme

Internal references:

Software Engineering Expectations
Technical Design Template

* develop: Release 7.95.0 (#2122) Add toggling of NetP Notifications to iOS (#2112) Fix for deeplink crash when preparing webview preview (#2116) Integrates the latest DBP changes in BSK (#2108) Switch to next phase of new experiment for UA (#2118) Update BSK with autofill 9.0.0 (#2103) Add an “Open VPN Settings” quick action (#2089)

* develop: Add e2e test for email protection deep-links (#2123) Update to config v4 (#2114)

# By Christopher Brind (3) and others # Via GitHub (1) and Michal Smaga (1) * develop: Support environment setting (#2140) Update BSK (#2136) Update BSK for NetP change (#2134) Update test to match exact tracker (#2133) Avoid AppTP DB initialization when disabled (#2090) re-enable keyboard shortcuts (#2132) fix favorite launch with keyboard bug (#2131) Fix syncing empty favorites folders (#2121) kill variant when receiving atb update (#2130) Adding 'protectionsState' to breakage form submission (#2120) Release 7.96.0 (#2128) Update remote messaging production url (#2124) Alert user about abnormal app conditions (#2110) # Conflicts: # DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

samsymons · 2023-11-09T22:31:26Z

DuckDuckGo/AppDelegate.swift

-        mainViewController?.clearNavigationStack()
+        // mainViewController?.clearNavigationStack()


Need to fix this, it was getting in the way of the open URL functionality. I'll update it to avoid this check depending on the URL.

DuckDuckGo/NetworkProtectionStatusViewModel.swift

github-actions · 2023-11-09T22:32:46Z

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

Generated by 🚫 dangerJS against 8163d28

DuckDuckGo/AppDelegate+AppDeepLinks.swift

DuckDuckGo.xcodeproj/project.pbxproj

DuckDuckGo/VPNIntents.swift

samsymons · 2023-11-09T23:30:45Z

⚠️ I just remembered that we don't yet support Xcode 15. I'll try and find a workaround for this - perhaps it can be used for the alpha build only.

… 15.

graeme · 2023-11-10T09:28:04Z

PacketTunnelProvider/NetworkProtection/NetworkProtectionPacketTunnelProvider.swift

@@ -209,6 +213,14 @@ final class NetworkProtectionPacketTunnelProvider: PacketTunnelProvider {
            source.resume()
        }
    }
+
+    private func observeServerChanges() {


I think we should also utilise the observable UserDefaults pattern with this.

graeme · 2023-11-10T09:30:01Z

Widgets/VPNWidget.swift

+@available(iOSApplicationExtension 17.0, *)
+struct VPNStatusView: View {
+    @Environment(\.widgetFamily) var family: WidgetFamily
+    var entry: VPNStatusTimelineProvider.Entry


I see that a lot of this has a very synchronous data flow. I’m not sure where the limitations lie with that but let’s have a quick chat about it now I’ve seen the PR.

graeme

I think this looks generally good, but I’d like to try and understand a bit more about what the limitations are for us being able to observe changes from the extension. It might be that there’s still something we can do that hasn’t been tried to make it a bit more reactive.

* develop: Sync form factor specific favorites (#2029) Add Sync e2e test flows (#2127) switch to true|false for protectionsState param (#2137)

This reverts commit 6e54998.

This reverts commit 0d6e124.

WidgetsExtensionAlpha.entitlements

DuckDuckGo/AppDelegate.swift

graeme

Look good! Just need to figure out what to do with the commented out code + also will need to come back to do Localization before shipping to external users. But that can be done in a later task.

* develop: Normalize ampUrl in breakage pixel (#2154) Bump submodules/privacy-reference-tests from `0d23f76` to `7519c3d` (#2135) Properly refresh home page favorites view when updating favorites display mode (#2148) Add DesignResourcesKit to SyncUI (#2147)

# By Brad Slayter (1) and others # Via Graeme Arthur (2) and others * develop: Add NetP widget (#2142) Normalize ampUrl in breakage pixel (#2154) Bump submodules/privacy-reference-tests from `0d23f76` to `7519c3d` (#2135) Properly refresh home page favorites view when updating favorites display mode (#2148) # Conflicts: # DuckDuckGo/AppDelegate.swift

* develop: (36 commits) Rolls back a BSK change by mistake Updates BSK Updates BSK Document LinkPresentation usage (#2172) Autofill "Never Save for this Site" feature (#2104) Use upstream fastlane 2.217.0 (#2161) Update about screen (#2152) Fixes a crasher due to a test line merged by mistake. (#2162) remove return user pixel (#2146) Revert to auto signing (#2158) BSK changes for NetP iOS Geoswitching (#2141) Update sync e2e tests to new setup flow (#2151) Fix for duplicated "atb" in Pixel request (#2139) Updating tests to support latest reference tests (#2145) Add NetP widget (#2142) Normalize ampUrl in breakage pixel (#2154) Update embedded files Update version number Bump submodules/privacy-reference-tests from `0d23f76` to `7519c3d` (#2135) Properly refresh home page favorites view when updating favorites display mode (#2148) ...

samsymons added 14 commits October 27, 2023 11:37

Add a status widget.

1d14222

Add buttons to the widget

ac10fd9

Merge branch 'develop' into sam/hack-days-netp-widget

c4cb5a8

* develop: Add e2e test for email protection deep-links (#2123) Update to config v4 (#2114)

Move the widget into its own file.

2746f58

Update entitlements.

4eb355b

Remove some logging.

97c42dc

Allow opening NetP settings via the widget.

114caa8

Remove reliance on a BSK branch.

62e2e40

Only show the widget for DEBUG and ALPHA builds.

419e34a

Copy tweak.

f2e35b0

Clean up intents.

8bc904b

Fix an issue in the entitlements file.

764704c

samsymons requested a review from graeme November 9, 2023 22:30

samsymons commented Nov 9, 2023

View reviewed changes

DuckDuckGo/NetworkProtectionStatusViewModel.swift Outdated Show resolved Hide resolved

samsymons added 2 commits November 9, 2023 14:38

Update copy.

c5b3873

Fix SwiftLint.

c7ec473

samsymons commented Nov 9, 2023

View reviewed changes

DuckDuckGo/AppDelegate+AppDeepLinks.swift Show resolved Hide resolved

Check VPN status every 0.5 seconds during the intent.

0010fa8

samsymons commented Nov 9, 2023

View reviewed changes

DuckDuckGo.xcodeproj/project.pbxproj Show resolved Hide resolved

samsymons commented Nov 9, 2023

View reviewed changes

DuckDuckGo/VPNIntents.swift Show resolved Hide resolved

samsymons added 2 commits November 9, 2023 16:25

Only use the widget in alpha builds, and have alphas built with Xcode…

9026343

… 15.

Fix a compilation error for release builds.

ea6223b

graeme reviewed Nov 10, 2023

View reviewed changes

samsymons added 8 commits November 10, 2023 10:16

Merge branch 'develop' into sam/hack-days-netp-widget

0f6d0e3

* develop: Sync form factor specific favorites (#2029) Add Sync e2e test flows (#2127) switch to true|false for protectionsState param (#2137)

Have the VPN widget update tied to the VPN status.

176cc1e

Remove a log statement.

05e30b3

Temporarily remove develop branch check.

0d6e124

Try a SyncUI package fix.

6e54998

Revert "Try a SyncUI package fix."

3f70080

This reverts commit 6e54998.

Revert "Temporarily remove develop branch check."

4cc2db5

This reverts commit 0d6e124.

Update alpha entitlements.

69f284a

samsymons commented Nov 10, 2023

View reviewed changes

WidgetsExtensionAlpha.entitlements Outdated Show resolved Hide resolved

graeme reviewed Nov 13, 2023

View reviewed changes

DuckDuckGo/AppDelegate.swift Show resolved Hide resolved

graeme approved these changes Nov 13, 2023

View reviewed changes

samsymons added 4 commits November 13, 2023 14:29

Use the group ID prefix for alpha entitlements.

5685360

Only clear the nav stack if it isn’t the open VPN action.

f3e6881

Remove the custom widget background color.

8163d28

samsymons merged commit 7243cb6 into develop Nov 13, 2023
9 checks passed

samsymons deleted the sam/hack-days-netp-widget branch November 13, 2023 23:40

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add NetP widget #2142

Add NetP widget #2142

samsymons commented Nov 9, 2023 •

edited

Loading

samsymons Nov 9, 2023

github-actions bot commented Nov 9, 2023 •

edited

Loading

samsymons commented Nov 9, 2023

graeme Nov 10, 2023

graeme Nov 10, 2023

graeme left a comment •

edited

Loading

graeme left a comment

		mainViewController?.clearNavigationStack()
		// mainViewController?.clearNavigationStack()

Add NetP widget #2142

Add NetP widget #2142

Conversation

samsymons commented Nov 9, 2023 • edited Loading

Internal references:

samsymons Nov 9, 2023

Choose a reason for hiding this comment

github-actions bot commented Nov 9, 2023 • edited Loading

samsymons commented Nov 9, 2023

graeme Nov 10, 2023

Choose a reason for hiding this comment

graeme Nov 10, 2023

Choose a reason for hiding this comment

graeme left a comment • edited Loading

Choose a reason for hiding this comment

graeme left a comment

Choose a reason for hiding this comment

samsymons commented Nov 9, 2023 •

edited

Loading

github-actions bot commented Nov 9, 2023 •

edited

Loading

graeme left a comment •

edited

Loading