Update Settings: Update PIR Settings Item #5397
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
28 tasks
This stack of pull requests is managed by Graphite. Learn more about stacking. |
24 tasks
mikescamell
force-pushed
the
feature/mike/update-settings/update-ppro-vpn-item
branch
from
d306ac3 to
2dbfc5b
Compare
mikescamell
force-pushed
the
feature/mike/update-settings/update-pir-item
branch
from
9b7fcfa to
1cf3f4e
Compare
mikescamell
force-pushed
the
feature/mike/update-settings/update-ppro-vpn-item
branch
from
2dbfc5b to
72f177a
Compare
mikescamell
force-pushed
the
feature/mike/update-settings/update-pir-item
branch
from
1cf3f4e to
ad94878
Compare
mikescamell
force-pushed
the
feature/mike/update-settings/update-ppro-vpn-item
branch
from
72f177a to
76b9911
Compare
mikescamell
force-pushed
the
feature/mike/update-settings/update-pir-item
branch
from
ad94878 to
955be80
Compare
mikescamell
force-pushed
the
feature/mike/update-settings/update-ppro-vpn-item
branch
from
76b9911 to
49dea28
Compare
mikescamell
force-pushed
the
feature/mike/update-settings/update-pir-item
branch
from
955be80 to
b9ccd81
Compare
malmstein
approved these changes
Dec 18, 2024
mikescamell
force-pushed
the
feature/mike/update-settings/update-ppro-vpn-item
branch
from
b9956a7 to
8bde9db
Compare
mikescamell
force-pushed
the
feature/mike/update-settings/update-pir-item
branch
from
b9ccd81 to
2c2bed6
Compare
copy paste of legacy
We'll need more states to represent our new VPN statuses as we'll see in upcoming commits.
The VPN status states have changed for the new settings as we need to know more about the subscription status of the VPN to correctly render the new states, therefore we need to know if we're in a waiting state so we can in future render an "Activating" state We
Locked and Unlocked are no longer sufficient for us to render the correct states. We add a new NetPVisibilityState which tells us if we should show the VPN item to the user, and if we do, what it's subscription state is. I'm not entirely sure about nesting the subscription status, or having this as a property of Visible state, I'm open to suggestions
With all the new information and states we can now render the VPN item correctly and kill off some of the legacy code we copied over
Seeing as we will aim to get rid of the netpAccessState.getLegacyState() function we need to change to use the new netpAccessState.getState() in the RealVpnTileStateProvider Practically the same, just rejigged the order to make more sense
This is an internal only class used to determine the state for the settings item as we need to know more information about the user's subscription to determine how to show the new VPN item
After talking to Aitor about onboarding we decided even though no one could give me an answer yesterday RE if we still want onboarding checks we should probably add this back in so we're consistent with previous behaviour
mikescamell
force-pushed
the
feature/mike/update-settings/update-ppro-vpn-item
branch
from
8bde9db to
81c774d
Compare
mikescamell
force-pushed
the
feature/mike/update-settings/update-ppro-vpn-item
branch
from
81c774d to
da4e853
Compare
The PirSubscriptionManager mimics our Manager for the VPN, exposing the status of PIR so we can render the viewstates correctly
mikescamell
force-pushed
the
feature/mike/update-settings/update-pir-item
branch
from
2c2bed6 to
28c7763
Compare
malmstein
reviewed
Dec 19, 2024
Base automatically changed from
feature/mike/update-settings/update-ppro-vpn-item
to
develop
December 19, 2024 16:20
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Task/Issue URL: https://app.asana.com/0/1207908166761516/1208966262488272/f
Description
Adds support for different PIR (Private Information Removal) subscription states in the settings menu, including active, expired, activating, and hidden states. Introduces a new subscription manager to handle PIR status and updates the UI to reflect these states with appropriate icons and interactions.
Steps to test this PR
Prerequisite: Enable
newSettingsfeature togglePrerequisite: Apply the patch in the Asana task
Note: Only the VPN item, PIR and possibly the Settings item will be seen, depending on the different states. ITR is not included as part of this PR and so is not visible.
PIR Subscribed
RealSubscriptionschange ln 77 toreturn flowOf(listOf(NetP, PIR))Unsubscribed
SubscriptionManagerchange ln 442 toreturn SubscriptionStatus.UNKNOWNPIR Expired
SubscriptionManagerchange ln 442 toreturn SubscriptionStatus.EXPIREDPPro Activating
SubscriptionManagerchange ln 442 toreturn SubscriptionStatus.WAITINGNo Entitlement
SubscriptionManagerchange ln 442 toreturn SubscriptionStatus.AUTO_RENEWABLERealSubscriptionschange ln 77 toreturn flowOf(listOf())Legacy Support
newSettingsUI changes