aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBananeweizen <bananeweizen@gmx.de>2015-02-21 07:09:09 +0100
committerBananeweizen <bananeweizen@gmx.de>2015-02-21 07:09:09 +0100
commit5d001f813364ef96988ab432d59e2a3c82dd60d5 (patch)
tree798dc40bf71ac565777cd90fb44fd44fb5de9985
parentaa33a5cf8e55609c9eec52ef947cad8f7220307b (diff)
downloadcgeo-5d001f813364ef96988ab432d59e2a3c82dd60d5.zip
cgeo-5d001f813364ef96988ab432d59e2a3c82dd60d5.tar.gz
cgeo-5d001f813364ef96988ab432d59e2a3c82dd60d5.tar.bz2
avoid exception logged when searching a cache
-rw-r--r--main/src/cgeo/geocaching/connector/oc/OCCZConnector.java3
-rw-r--r--tests/src/cgeo/geocaching/connector/oc/OCCZConnectorTest.java4
2 files changed, 4 insertions, 3 deletions
diff --git a/main/src/cgeo/geocaching/connector/oc/OCCZConnector.java b/main/src/cgeo/geocaching/connector/oc/OCCZConnector.java
index 0ffbbef..f1ece61 100644
--- a/main/src/cgeo/geocaching/connector/oc/OCCZConnector.java
+++ b/main/src/cgeo/geocaching/connector/oc/OCCZConnector.java
@@ -17,6 +17,9 @@ public class OCCZConnector extends OCConnector {
@Override
@Nullable
public String getGeocodeFromUrl(@NonNull final String url) {
+ if (!StringUtils.containsIgnoreCase(url, "opencaching.cz")) {
+ return null;
+ }
final String id = StringUtils.substringAfter(url, "cacheid=");
try {
final String geocode = GEOCODE_PREFIX + StringUtils.leftPad(Integer.toHexString(Integer.valueOf(id)), 4, '0');
diff --git a/tests/src/cgeo/geocaching/connector/oc/OCCZConnectorTest.java b/tests/src/cgeo/geocaching/connector/oc/OCCZConnectorTest.java
index bf271b3..52fc5c8 100644
--- a/tests/src/cgeo/geocaching/connector/oc/OCCZConnectorTest.java
+++ b/tests/src/cgeo/geocaching/connector/oc/OCCZConnectorTest.java
@@ -1,9 +1,6 @@
package cgeo.geocaching.connector.oc;
import static org.assertj.core.api.Assertions.assertThat;
-
-import cgeo.geocaching.connector.oc.OCCZConnector;
-
import junit.framework.TestCase;
public class OCCZConnectorTest extends TestCase {
@@ -11,6 +8,7 @@ public class OCCZConnectorTest extends TestCase {
public static void testGetGeocodeFromUrl() throws Exception {
final OCCZConnector connector = new OCCZConnector();
assertThat(connector.getGeocodeFromUrl("http://opencaching.cz/viewcache.php?cacheid=610")).isEqualTo("OZ0262");
+ assertThat(connector.getGeocodeFromUrl("http://www.opencaching.de/viewcache.php?cacheid=151223")).isNull();
}
}