PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Robin Lee
2016-07-06 10:30:12 +00:00
committed by Android (Google) Code Review
parent b0a4c897ac 07127d83a6
commit 1926ed9f83
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/vpn2/ConfigDialog.java
View File

@@ -316,12 +316,12 @@ class ConfigDialog extends AlertDialog implements TextWatcher,
} }
private boolean validate(boolean editing) { private boolean validate(boolean editing) {
if (!editing) {
return mUsername.getText().length() != 0 && mPassword.getText().length() != 0;
}
if (mAlwaysOnVpn.isChecked() && !getProfile().isValidLockdownProfile()) { if (mAlwaysOnVpn.isChecked() && !getProfile().isValidLockdownProfile()) {
return false; return false;
} }
if (!editing) {
return mUsername.getText().length() != 0 && mPassword.getText().length() != 0;
}
if (mName.getText().length() == 0 || mServer.getText().length() == 0 || if (mName.getText().length() == 0 || mServer.getText().length() == 0 ||
!validateAddresses(mDnsServers.getText().toString(), false) || !validateAddresses(mDnsServers.getText().toString(), false) ||
!validateAddresses(mRoutes.getText().toString(), true)) { !validateAddresses(mRoutes.getText().toString(), true)) {