fix #4114: replace strings with patterns in parsers

Some strings are really meant to be used as regular strings and not as
regular expressions.

5 files changed, 14 insertions, 9 deletions

diff --git a/main/src/cgeo/geocaching/connector/gc/GCParser.java b/main/src/cgeo/geocaching/connector/gc/GCParser.java
index 1430e80..f704da6 100644
--- a/main/src/cgeo/geocaching/connector/gc/GCParser.java
+++ b/main/src/cgeo/geocaching/connector/gc/GCParser.java
@@ -125,7 +125,7 @@ public abstract class GCParser {
 
         page = page.substring(startPos + 1, endPos - startPos + 1); // cut between <table> and </table>
 
-        final String[] rows = page.split("<tr class=");
+        final String[] rows = StringUtils.splitByWholeSeparator(page, "<tr class=");
         final int rows_count = rows.length;
 
         int excludedCaches = 0;
@@ -709,10 +709,10 @@ public abstract class GCParser {
                     wpList = wpList.substring(wpBegin + 7, wpEnd);
                 }
 
-                final String[] wpItems = wpList.split("<tr");
+                final String[] wpItems = StringUtils.splitByWholeSeparator(wpList, "<tr");
 
                 for (int j = 1; j < wpItems.length; j++) {
-                    String[] wp = wpItems[j].split("<td");
+                    String[] wp = StringUtils.splitByWholeSeparator(wpItems[j], "<td");
 
                     // waypoint name
                     // res is null during the unit tests
@@ -738,7 +738,7 @@ public abstract class GCParser {
 
                     j++;
                     if (wpItems.length > j) {
-                        wp = wpItems[j].split("<td");
+                        wp = StringUtils.splitByWholeSeparator(wpItems[j], "<td");
                     }
 
                     // waypoint note
diff --git a/main/src/cgeo/geocaching/connector/oc/OkapiClient.java b/main/src/cgeo/geocaching/connector/oc/OkapiClient.java
index f664d93..dde2bbb 100644
--- a/main/src/cgeo/geocaching/connector/oc/OkapiClient.java
+++ b/main/src/cgeo/geocaching/connector/oc/OkapiClient.java
@@ -56,6 +56,7 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.TimeZone;
+import java.util.regex.Pattern;
 
 final class OkapiClient {
 
@@ -131,6 +132,8 @@ final class OkapiClient {
     private static final String METHOD_SEARCH_NEAREST = "services/caches/search/nearest";
     private static final String METHOD_RETRIEVE_CACHES = "services/caches/geocaches";
 
+    private static final Pattern PATTERN_TIMEZONE = Pattern.compile("([+-][01][0-9]):([03])0");
+
     public static Geocache getCache(final String geoCode) {
         final Parameters params = new Parameters("cache_code", geoCode);
         final IConnector connector = ConnectorFactory.getConnector(geoCode);
@@ -578,7 +581,7 @@ final class OkapiClient {
     }
 
     private static Date parseDate(final String date) {
-        final String strippedDate = date.replaceAll("\\+0([0-9]){1}\\:00", "+0$100");
+        final String strippedDate = PATTERN_TIMEZONE.matcher(date).replaceAll("$1$20");
         try {
             return ISO8601DATEFORMAT.parse(strippedDate);
         } catch (final ParseException e) {
diff --git a/main/src/cgeo/geocaching/files/GPXParser.java b/main/src/cgeo/geocaching/files/GPXParser.java
index 89ee887..370b8aa 100644
--- a/main/src/cgeo/geocaching/files/GPXParser.java
+++ b/main/src/cgeo/geocaching/files/GPXParser.java
@@ -454,7 +454,7 @@ public abstract class GPXParser extends FileParser {
 
             @Override
             public void end(String body) {
-                final String[] content = body.split("\\|");
+                final String[] content = StringUtils.split(body, '|');
                 if (content.length > 0) {
                     type = content[0].toLowerCase(Locale.US).trim();
                 }
diff --git a/main/src/cgeo/geocaching/files/LocParser.java b/main/src/cgeo/geocaching/files/LocParser.java
index 2871d77..13f8cca 100644
--- a/main/src/cgeo/geocaching/files/LocParser.java
+++ b/main/src/cgeo/geocaching/files/LocParser.java
@@ -88,7 +88,7 @@ public final class LocParser extends FileParser {
         }
         // >> premium only
 
-        final String[] points = fileContent.split("<waypoint>");
+        final String[] points = StringUtils.splitByWholeSeparator(fileContent, "<waypoint>");
 
         // parse coordinates
         for (String pointString : points) {
diff --git a/main/src/cgeo/geocaching/network/Network.java b/main/src/cgeo/geocaching/network/Network.java
index ec6ec4f..57e6698 100644
--- a/main/src/cgeo/geocaching/network/Network.java
+++ b/main/src/cgeo/geocaching/network/Network.java
@@ -26,6 +26,7 @@ import ch.boye.httpclientandroidlib.params.CoreConnectionPNames;
 import ch.boye.httpclientandroidlib.params.CoreProtocolPNames;
 import ch.boye.httpclientandroidlib.params.HttpParams;
 import ch.boye.httpclientandroidlib.util.EntityUtils;
+
 import org.apache.commons.lang3.CharEncoding;
 import org.apache.commons.lang3.StringUtils;
 import org.eclipse.jdt.annotation.Nullable;
@@ -43,6 +44,7 @@ import java.io.InputStream;
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import java.net.URLEncoder;
+import java.util.regex.Pattern;
 
 public abstract class Network {
 
@@ -51,7 +53,7 @@ public abstract class Network {
     /** Native user agent, taken from a Android 2.2 Nexus **/
     private final static String NATIVE_USER_AGENT = "Mozilla/5.0 (Linux; U; Android 2.2; en-us; Nexus One Build/FRF91) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1";
 
-    private static final String PATTERN_PASSWORD = "(?<=[\\?&])[Pp]ass(w(or)?d)?=[^&#$]+";
+    private static final Pattern PATTERN_PASSWORD = Pattern.compile("(?<=[\\?&])[Pp]ass(w(or)?d)?=[^&#$]+");
 
     private final static HttpParams clientParams = new BasicHttpParams();
 
@@ -63,7 +65,7 @@ public abstract class Network {
     }
 
     private static String hidePassword(final String message) {
-        return message.replaceAll(PATTERN_PASSWORD, "password=***");
+        return PATTERN_PASSWORD.matcher(message).replaceAll("password=***");
     }
 
     private static HttpClient getHttpClient() {