Update Settings: Update VPN settings item

[mikescamell]

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

Description

Updates the VPN settings item to match new designs. As the new designs require us to know more about the subscription state we need to expose more Subscription Statuses so we can reflect that in the settings screen like the "Waiting" state that is equivalent to our new "Activating" state.

The biggest thing to note is that now it's not like it used to be where we had just 2 states, locked and unlocked, we now more readily show the user the VPN item and what it's subscription state is.

I'm still waiting on answers regarding the onboarded state

And connecting state but I can always circle back later and address these as necessary.

Designs

Steps to test this PR

Prerequisite: Enable newSettings feature toggle

Prerequisite: Apply the patch in the Asana task

Note: Only the VPN item and possibly the Settings item will be seen, depending on the different states. PIR, ITR are not included as part of this PR and so are not visible.

VPN Subscribed and Off

• Open New Settings
• Verify VPN item is visible with colored icon and status is off
• Click VPN item
• VPN settings screen should open

VPN Subscribed and On

• In NetworkProtectionStateImpl change ln 98 to return flowOf(CONNECTED)
• Open New Settings
• Verify VPN item is visible with colored icon and status is on
• Click VPN item
• VPN settings screen should open

Unsubscribed

• In SubscriptionManager change ln 442 to return SubscriptionStatus.UNKNOWN
• Open New Settings
• Verify VPN item is not visible

VPN Expired

• In SubscriptionManager change ln 442 to return SubscriptionStatus.EXPIRED
• Open New Settings
• Verify VPN item is visible with grey icon and is not clickable, and status is off
• Click VPN item
• Nothing should happen

PPro Activating

• In SubscriptionManager change ln 442 to return SubscriptionStatus.WAITING
• Open New Settings
• Verify VPN item is visible with grey icon and status is off
• Click VPN item
• Nothing should happen

No Entitlement

• In SubscriptionManager change ln 442 to return SubscriptionStatus.AUTO_RENEWABLE
• In RealSubscriptions change ln 77 to return flowOf(listOf())
• Open New Settings
• Verify VPN item is not visible

Legacy Support

• Turn off newSettings
• Verify old VPN settings works by repeating steps above

UI changes

Before	After

[mikescamell]

• Update Settings: Translations #5412
• Update Settings: Update ITR settings item  #5398
• Update Settings: Update PIR Settings Item #5397
• Update Settings: Update VPN settings item #5394 👈 (View in Graphite)
• develop

This stack of pull requests is managed by Graphite. Learn more about stacking.

[malmstein]

Works as expected, check with @aitorvs and @karlenDimla for changes related to NetP API.

[malmstein]

As discussed offline, the only thing I’d look into changing is to move all the UI States into the impl module because they don’t need to be exposed.

[mikescamell]

Works as expected, check with @aitorvs and @karlenDimla for changes related to NetP API.

Please hold off checking until I've made some changes, I think we can move the new NetworkProtectionAccessState API to the impl module as no other module is using it.

[aitorvs]

Works as expected, check with @aitorvs and @karlenDimla for changes related to NetP API.

Please hold off checking until I've made some changes, I think we can move the new NetworkProtectionAccessState API to the impl module as no other module is using it.

I will review the changes.
We should not need to change the VPN public API to revamp settings.
And I've seen some odd changes, for instance we're moving subscription state to the netp public API, that should not be.

[aitorvs]

Should this logic be here?
If I understand correctly, a user can have an inactive subscription but continue using the VPN as long as they don't open settings? That seems odd/wrong?

[mikescamell]

I'm taking the logic that already exists in NetworkProtectionAccessStateImpl and adding it here.

   override suspend fun getStateFlow(): Flow<NetPAccessState> = withContext(dispatcherProvider.io()) {
        netpSubscriptionManager.vpnStatus().map { status ->
            if (!status.isActive()) {
                // if entitlement check succeeded and no entitlement, reset state and hide access.
                handleRevokedVPNState()
                Locked
            } else {
                UnLocked
            }
        }
    }

This is only ever called by the current NetP Settings item: ProSettingNetPViewModel (LegacyProSettingNetPViewModel in this PR)

Once the new Settings is rolled out, NetworkProtectionAccessStateImpl.getStateFlow will never be called, so I wanted to ensure the behaviour stays the same when that eventually happens.

[mikescamell]

As discussed on Zoom, this is existing behaviour in the Legacy ProSettingNetPViewModel and therefore I'm going to leave it as is so as not to affect existing behaviour.