diff options
| author | Samuel Tardieu <sam@rfc1149.net> | 2012-05-10 11:40:24 +0200 |
|---|---|---|
| committer | Samuel Tardieu <sam@rfc1149.net> | 2012-05-10 11:51:17 +0200 |
| commit | 3c0dbc1685db1b1fe7f29e5e91ac6c992b6c942c (patch) | |
| tree | 4110f472559a6ecf8164bf6fa15869760f64703e | |
| parent | 1a464a8b22467dfd9f4f5ddd76065528510a0987 (diff) | |
| download | cgeo-3c0dbc1685db1b1fe7f29e5e91ac6c992b6c942c.zip cgeo-3c0dbc1685db1b1fe7f29e5e91ac6c992b6c942c.tar.gz cgeo-3c0dbc1685db1b1fe7f29e5e91ac6c992b6c942c.tar.bz2 | |
Fix #1520: display gc.com resources present on trackable descriptions
URLs without scheme and host in trackable description were not fetched
from geocaching.com as the connector did not acknowledge that it can
handle trackables by geocode.
| -rw-r--r-- | main/src/cgeo/geocaching/connector/gc/GCConnector.java | 2 | ||||
| -rw-r--r-- | tests/src/cgeo/geocaching/connector/gc/GCConnectorTest.java | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/main/src/cgeo/geocaching/connector/gc/GCConnector.java b/main/src/cgeo/geocaching/connector/gc/GCConnector.java index 4288a72..f0d85ff 100644 --- a/main/src/cgeo/geocaching/connector/gc/GCConnector.java +++ b/main/src/cgeo/geocaching/connector/gc/GCConnector.java @@ -45,7 +45,7 @@ public class GCConnector extends AbstractConnector implements ISearchByGeocode, if (geocode == null) { return false; } - return GCConstants.PATTERN_GC_CODE.matcher(geocode).matches(); + return GCConstants.PATTERN_GC_CODE.matcher(geocode).matches() || GCConstants.PATTERN_TB_CODE.matcher(geocode).matches(); } @Override diff --git a/tests/src/cgeo/geocaching/connector/gc/GCConnectorTest.java b/tests/src/cgeo/geocaching/connector/gc/GCConnectorTest.java index 065589b..12e7e22 100644 --- a/tests/src/cgeo/geocaching/connector/gc/GCConnectorTest.java +++ b/tests/src/cgeo/geocaching/connector/gc/GCConnectorTest.java @@ -30,6 +30,12 @@ public class GCConnectorTest extends AbstractResourceInstrumentationTestCase { } } + public static void testCanHandle() { + assertTrue(GCConnector.getInstance().canHandle("GC2MEGA")); + assertTrue(GCConnector.getInstance().canHandle("TB3F651")); + assertFalse(GCConnector.getInstance().canHandle("OXZZZZZ")); + } + public static void testBaseCodings() { assertEquals(2045702, GCConstants.gccodeToGCId("GC2MEGA")); } |
