new: register for geokrety URLs in Android

8 files changed, 72 insertions, 13 deletions

diff --git a/main/src/cgeo/geocaching/TrackableActivity.java b/main/src/cgeo/geocaching/TrackableActivity.java
index dcfd80a..34f546a 100644
--- a/main/src/cgeo/geocaching/TrackableActivity.java
+++ b/main/src/cgeo/geocaching/TrackableActivity.java
@@ -130,6 +130,8 @@ public class TrackableActivity extends AbstractViewPagerActivity<TrackableActivi
 
         // try to get data from URI
         if (geocode == null && guid == null && id == null && uri != null) {
+            geocode = ConnectorFactory.getTrackableFromURL(uri.toString());
+
             final String uriHost = uri.getHost().toLowerCase(Locale.US);
             if (uriHost.contains("geocaching.com")) {
                 geocode = uri.getQueryParameter("tracker");
diff --git a/main/src/cgeo/geocaching/connector/ConnectorFactory.java b/main/src/cgeo/geocaching/connector/ConnectorFactory.java
index 0081951..fa9b02f 100644
--- a/main/src/cgeo/geocaching/connector/ConnectorFactory.java
+++ b/main/src/cgeo/geocaching/connector/ConnectorFactory.java
@@ -200,6 +200,12 @@ public final class ConnectorFactory {
         return TRACKABLE_CONNECTORS;
     }
 
+    /**
+     * Get the geocode of a trackable from a URL.
+     * 
+     * @param url
+     * @return {@code null} if the URL cannot be decoded
+     */
     public static String getTrackableFromURL(final String url) {
         if (url == null) {
             return null;
diff --git a/main/src/cgeo/geocaching/connector/gc/GCConnector.java b/main/src/cgeo/geocaching/connector/gc/GCConnector.java
index e946748..34e99d2 100644
--- a/main/src/cgeo/geocaching/connector/gc/GCConnector.java
+++ b/main/src/cgeo/geocaching/connector/gc/GCConnector.java
@@ -285,7 +285,22 @@ public class GCConnector extends AbstractConnector implements ISearchByGeocode,
 
     @Override
     protected String getCacheUrlPrefix() {
-        return CACHE_URL_SHORT;
+        return null; // UNUSED
+    }
+
+    @Override
+    public String getGeocodeFromUrl(String url) {
+        // coord.info URLs
+        String code = StringUtils.substringAfterLast(url, "coord.info/");
+        if (code != null && canHandle(code)) {
+            return code;
+        }
+        // expanded geocaching.com URLs
+        code = StringUtils.substringBetween(url, "/geocache/", "_");
+        if (code != null && canHandle(code)) {
+            return code;
+        }
+        return null;
     }
 
     @Override
diff --git a/main/src/cgeo/geocaching/connector/trackable/AbstractTrackableConnector.java b/main/src/cgeo/geocaching/connector/trackable/AbstractTrackableConnector.java
index 69efddc..fb554b9 100644
--- a/main/src/cgeo/geocaching/connector/trackable/AbstractTrackableConnector.java
+++ b/main/src/cgeo/geocaching/connector/trackable/AbstractTrackableConnector.java
@@ -4,6 +4,7 @@ import cgeo.geocaching.connector.AbstractConnector;
 import cgeo.geocaching.connector.UserAction;
 
 import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;
 
 import java.util.List;
 
@@ -15,7 +16,8 @@ public abstract class AbstractTrackableConnector implements TrackableConnector {
     }
 
     @Override
-    public String getTrackableCodeFromUrl(@NonNull String url) {
+    public @Nullable
+    String getTrackableCodeFromUrl(@NonNull String url) {
         return null;
     }
 
diff --git a/main/src/cgeo/geocaching/connector/trackable/GeokretyConnector.java b/main/src/cgeo/geocaching/connector/trackable/GeokretyConnector.java
index 8387076..03052f9 100644
--- a/main/src/cgeo/geocaching/connector/trackable/GeokretyConnector.java
+++ b/main/src/cgeo/geocaching/connector/trackable/GeokretyConnector.java
@@ -4,6 +4,10 @@ import cgeo.geocaching.Trackable;
 import cgeo.geocaching.network.Network;
 import cgeo.geocaching.utils.Log;
 
+import org.apache.commons.lang3.StringUtils;
+import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;
+
 import java.util.regex.Pattern;
 
 public class GeokretyConnector extends AbstractTrackableConnector {
@@ -29,7 +33,7 @@ public class GeokretyConnector extends AbstractTrackableConnector {
         return GeokretyParser.parse(page);
     }
 
-    private static int getId(String geocode) {
+    protected static int getId(String geocode) {
         try {
             final String hex = geocode.substring(2);
             return Integer.parseInt(hex, 16);
@@ -39,4 +43,25 @@ public class GeokretyConnector extends AbstractTrackableConnector {
         return -1;
     }
 
+    @Override
+    public @Nullable
+    String getTrackableCodeFromUrl(@NonNull String url) {
+        // http://geokrety.org/konkret.php?id=38545
+        String id = StringUtils.substringAfterLast(url, "konkret.php?id=");
+        if (StringUtils.isNumeric(id)) {
+            return geocode(Integer.parseInt(id));
+        }
+        return null;
+    }
+
+    /**
+     * Get geocode from geokrety id
+     *
+     * @param id
+     * @return
+     */
+    public static String geocode(final int id) {
+        return String.format("GK%04X", id);
+    }
+
 }
diff --git a/main/src/cgeo/geocaching/connector/trackable/GeokretyParser.java b/main/src/cgeo/geocaching/connector/trackable/GeokretyParser.java
index ee8c8c0..0e64abd 100644
--- a/main/src/cgeo/geocaching/connector/trackable/GeokretyParser.java
+++ b/main/src/cgeo/geocaching/connector/trackable/GeokretyParser.java
@@ -37,8 +37,8 @@ public class GeokretyParser {
             public void start(Attributes attributes) {
                 try {
                     final String kretyId = attributes.getValue("id");
-                    if (StringUtils.isNotBlank(kretyId)) {
-                        trackable.setGeocode(geocode(Integer.parseInt(kretyId)));
+                    if (StringUtils.isNumeric(kretyId)) {
+                        trackable.setGeocode(GeokretyConnector.geocode(Integer.parseInt(kretyId)));
                     }
                     final String distance = attributes.getValue("dist");
                     if (StringUtils.isNotBlank(distance)) {
@@ -88,8 +88,4 @@ public class GeokretyParser {
         }
         return null;
     }
-
-    protected static String geocode(final int id) {
-        return String.format("GK%04X", id);
-    }
 }
diff --git a/main/src/cgeo/geocaching/connector/trackable/TrackableConnector.java b/main/src/cgeo/geocaching/connector/trackable/TrackableConnector.java
index 0990d96..6071b5f 100644
--- a/main/src/cgeo/geocaching/connector/trackable/TrackableConnector.java
+++ b/main/src/cgeo/geocaching/connector/trackable/TrackableConnector.java
@@ -4,6 +4,7 @@ import cgeo.geocaching.Trackable;
 import cgeo.geocaching.connector.UserAction;
 
 import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;
 
 import java.util.List;
 
@@ -21,7 +22,8 @@ public interface TrackableConnector {
 
     public Trackable searchTrackable(String geocode, String guid, String id);
 
-    public String getTrackableCodeFromUrl(final @NonNull String url);
+    public @Nullable
+    String getTrackableCodeFromUrl(final @NonNull String url);
 
     public @NonNull
     List<UserAction> getUserActions();
diff --git a/main/src/cgeo/geocaching/connector/trackable/TravelBugConnector.java b/main/src/cgeo/geocaching/connector/trackable/TravelBugConnector.java
index dad285c..77848d7 100644
--- a/main/src/cgeo/geocaching/connector/trackable/TravelBugConnector.java
+++ b/main/src/cgeo/geocaching/connector/trackable/TravelBugConnector.java
@@ -7,6 +7,7 @@ import cgeo.geocaching.connector.gc.GCParser;
 
 import org.apache.commons.lang3.StringUtils;
 import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;
 
 import java.util.List;
 import java.util.regex.Pattern;
@@ -20,7 +21,7 @@ public class TravelBugConnector extends AbstractTrackableConnector {
 
     @Override
     public boolean canHandleTrackable(String geocode) {
-        return TravelBugConnector.PATTERN_TB_CODE.matcher(geocode).matches();
+        return TravelBugConnector.PATTERN_TB_CODE.matcher(geocode).matches() && !StringUtils.startsWithIgnoreCase(geocode, "GC");
     }
 
     @Override
@@ -54,8 +55,18 @@ public class TravelBugConnector extends AbstractTrackableConnector {
     }
 
     @Override
-    public String getTrackableCodeFromUrl(@NonNull String url) {
-        return StringUtils.substringAfterLast(url, "?tracker=");
+    public @Nullable
+    String getTrackableCodeFromUrl(@NonNull String url) {
+        // coord.info URLs
+        String code = StringUtils.substringAfterLast(url, "coord.info/");
+        if (code != null && canHandleTrackable(code)) {
+            return code;
+        }
+        code = StringUtils.substringAfterLast(url, "?tracker=");
+        if (code != null && canHandleTrackable(code)) {
+            return code;
+        }
+        return null;
     }
 
     @Override