commit 6864195aa0195831a0cfbe92cd37f76c09df43b8
author Irfan Sheriff <isheriff@google.com> Tue Mar 22 19:30:22 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue Mar 22 19:30:22 2011 -0700
tree 26900f67e7cc5087d939a2fc04825068bd174e61
parent 36f7f4a773b19121850699ca5b617fe3a1c6bd16
parent ae3ccfd07e149d56c8ed3ce3faf7d89fd434f235

Merge "Fix ANR with bypass proxy regex" into honeycomb-mr1

src/com/android/settings/ProxySelector.java

diff --git a/src/com/android/settings/ProxySelector.java b/src/com/android/settings/ProxySelector.java
index bdb32e3..909496e 100644
--- a/src/com/android/settings/ProxySelector.java
+++ b/src/com/android/settings/ProxySelector.java
@@ -62,13 +62,12 @@
     private static final String HOSTNAME_REGEXP =
             "^$|^[a-zA-Z0-9]+(\\-[a-zA-Z0-9]+)*(\\.[a-zA-Z0-9]+(\\-[a-zA-Z0-9]+)*)*$";
     private static final Pattern HOSTNAME_PATTERN;
-    private static final String EXCLLIST_REGEXP =
-            "$|^(.?[a-zA-Z0-9]+(\\-[a-zA-Z0-9]+)*(\\.[a-zA-Z0-9]+(\\-[a-zA-Z0-9]+)*)*)+" +
-            "(,(.?[a-zA-Z0-9]+(\\-[a-zA-Z0-9]+)*(\\.[a-zA-Z0-9]+(\\-[a-zA-Z0-9]+)*)*))*$";
-    private static final Pattern EXCLLIST_PATTERN;
+    private static final String EXCLUSION_REGEXP =
+            "$|^(.?[a-zA-Z0-9]+(\\-[a-zA-Z0-9]+)*(\\.[a-zA-Z0-9]+(\\-[a-zA-Z0-9]+)*)*)+$";
+    private static final Pattern EXCLUSION_PATTERN;
     static {
         HOSTNAME_PATTERN = Pattern.compile(HOSTNAME_REGEXP);
-        EXCLLIST_PATTERN = Pattern.compile(EXCLLIST_REGEXP);
+        EXCLUSION_PATTERN = Pattern.compile(EXCLUSION_REGEXP);
     }
 
     private static final int ERROR_DIALOG_ID = 0;
@@ -201,11 +200,14 @@
      */
     public static int validate(String hostname, String port, String exclList) {
         Matcher match = HOSTNAME_PATTERN.matcher(hostname);
-        Matcher listMatch = EXCLLIST_PATTERN.matcher(exclList);
+        String exclListArray[] = exclList.split(",");
 
         if (!match.matches()) return R.string.proxy_error_invalid_host;
 
-        if (!listMatch.matches()) return R.string.proxy_error_invalid_exclusion_list;
+        for (String excl : exclListArray) {
+            Matcher m = EXCLUSION_PATTERN.matcher(excl);
+            if (!m.matches()) return R.string.proxy_error_invalid_exclusion_list;
+        }
 
         if (hostname.length() > 0 && port.length() == 0) {
             return R.string.proxy_error_empty_port;