Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7f96c4c8 authored by Robin Lee's avatar Robin Lee
Browse files

Update string: lockdown confirmation dialog title 

The most common string shown previously was:
  "Set always-on VPN?"

It's now a different string:
  "Only allow connections through VPN?"

This makes more sense because the only way to get to this dialog in
stock Settings is by first enabling a specific VPN and afterwards
trying to set the same VPN to lockdown mode.

In this case the prompt should specifically refer to lockdown, not
having a VPN connection in general (because the user clearly already
has one).

Test: m Settings -j20, install a VPN, connect to it, open Settings > Network > Vpn > {VPN name} and select 'only allow connections through VPN'. Verify the title is now the one referred to in the commit message.
Fix: 34491069
Change-Id: Ic74a8b91eb8ae64fbe15723c173281f4ede52b06
parent 0f28cbd2

res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -5411,6 +5411,8 @@ 
    <string name="vpn_not_supported_by_this_app">Not supported by this app</string>

    <!-- Preference title for forcing all network connections to go through VPN. -->

    <string name="vpn_require_connection">Only allow connections through VPN</string>

    <!-- Dialog message title to confirm forcing all network connections to go through VPN. [CHAR LIMIT=40] -->

    <string name="vpn_require_connection_title">Require VPN connection?</string>

    <!-- Preference summary when the preference to force all network connections to go through a VPN is enabled, blocking all other network traffic. In this case apps must use the VPN for all connections. -->

    <string name="vpn_lockdown_active">Lockdown active</string>

    <!-- Preference summary when the preference to force all network connections to go through a VPN is disabled. In this case use of the VPN is optional for apps. -->

src/com/android/settings/vpn2/ConfirmLockdownFragment.java

+2 −1
Original line number Diff line number Diff line
@@ -78,7 +78,8 @@ public class ConfirmLockdownFragment extends InstrumentedDialogFragment 
        final boolean wasLockdown = getArguments().getBoolean(ARG_LOCKDOWN_SRC);

        final boolean nowLockdown = getArguments().getBoolean(ARG_LOCKDOWN_DST);



        final int titleId = replacing ? R.string.vpn_replace_vpn_title : R.string.vpn_set_vpn_title;

        final int titleId = (nowLockdown ? R.string.vpn_require_connection_title :

                (replacing ? R.string.vpn_replace_vpn_title : R.string.vpn_set_vpn_title));

        final int actionId =

                (replacing ? R.string.vpn_replace :

                (nowLockdown ? R.string.vpn_turn_on : R.string.okay));