diff options
| author | Irfan Sheriff <isheriff@google.com> | 2013-01-07 14:23:07 -0800 |
|---|---|---|
| committer | Irfan Sheriff <isheriff@google.com> | 2013-01-07 15:03:15 -0800 |
| commit | 61298b3fda6779f1a80ef61f1760065b3e4d69ca (patch) | |
| tree | 395931634c9bcc80c44da8d565a3f772b7c6c1d1 /src/com/android/settings/ProxySelector.java | |
| parent | 8f716f66cf3802877a0dcd0847a2181eca1431f2 (diff) | |
| download | packages_apps_Settings-61298b3fda6779f1a80ef61f1760065b3e4d69ca.zip packages_apps_Settings-61298b3fda6779f1a80ef61f1760065b3e4d69ca.tar.gz packages_apps_Settings-61298b3fda6779f1a80ef61f1760065b3e4d69ca.tar.bz2 | |
Allow underscore in proxy hostnames
Some proxies use underscore and we should allow configuring them
Change-Id: I6b4eeac7d486ff1eb10cc14cee5ef36db0f9e278
Diffstat (limited to 'src/com/android/settings/ProxySelector.java')
| -rw-r--r-- | src/com/android/settings/ProxySelector.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/com/android/settings/ProxySelector.java b/src/com/android/settings/ProxySelector.java index f521d6d..9bb6dca 100644 --- a/src/com/android/settings/ProxySelector.java +++ b/src/com/android/settings/ProxySelector.java @@ -58,12 +58,16 @@ public class ProxySelector extends Fragment implements DialogCreatable { Button mClearButton; Button mDefaultButton; + // Allows underscore char to supports proxies that do not + // follow the spec + private static final String HC = "a-zA-Z0-9\\_"; + // Matches blank input, ips, and domain names private static final String HOSTNAME_REGEXP = - "^$|^[a-zA-Z0-9]+(\\-[a-zA-Z0-9]+)*(\\.[a-zA-Z0-9]+(\\-[a-zA-Z0-9]+)*)*$"; + "^$|^[" + HC + "]+(\\-[" + HC + "]+)*(\\.[" + HC + "]+(\\-[" + HC + "]+)*)*$"; private static final Pattern HOSTNAME_PATTERN; private static final String EXCLUSION_REGEXP = - "$|^[a-zA-Z0-9]+(\\-[a-zA-Z0-9]+)*(\\.[a-zA-Z0-9]+(\\-[a-zA-Z0-9]+)*)*$"; + "$|^[" + HC + "]+(\\-[" + HC + "]+)*(\\.[" + HC + "]+(\\-[" + HC + "]+)*)*$"; private static final Pattern EXCLUSION_PATTERN; static { HOSTNAME_PATTERN = Pattern.compile(HOSTNAME_REGEXP); |