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

Commit 1926ed9f authored by Robin Lee's avatar Robin Lee Committed by Android (Google) Code Review
Browse files

Merge "Don't show always-on option connecting PPTP vpn" into nyc-mr1-dev

parents b0a4c897 07127d83

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

+3 −3
Original line number Diff line number Diff line
@@ -316,12 +316,12 @@ class ConfigDialog extends AlertDialog implements TextWatcher, 
    }



    private boolean validate(boolean editing) {

        if (!editing) {

            return mUsername.getText().length() != 0 && mPassword.getText().length() != 0;

        }

        if (mAlwaysOnVpn.isChecked() && !getProfile().isValidLockdownProfile()) {

            return false;

        }

        if (!editing) {

            return mUsername.getText().length() != 0 && mPassword.getText().length() != 0;

        }

        if (mName.getText().length() == 0 || mServer.getText().length() == 0 ||

                !validateAddresses(mDnsServers.getText().toString(), false) ||

                !validateAddresses(mRoutes.getText().toString(), true)) {