From 61298b3fda6779f1a80ef61f1760065b3e4d69ca Mon Sep 17 00:00:00 2001 From: Irfan Sheriff Date: Mon, 7 Jan 2013 14:23:07 -0800 Subject: [PATCH] Allow underscore in proxy hostnames Some proxies use underscore and we should allow configuring them Change-Id: I6b4eeac7d486ff1eb10cc14cee5ef36db0f9e278 --- src/com/android/settings/ProxySelector.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/com/android/settings/ProxySelector.java b/src/com/android/settings/ProxySelector.java index f521d6dc60b..9bb6dca742a 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);