diff options
| -rw-r--r-- | main/res/values/changelog_release.xml | 1 | ||||
| -rw-r--r-- | main/src/cgeo/geocaching/utils/CheckerUtils.java | 2 | ||||
| -rw-r--r-- | tests/src/cgeo/geocaching/utils/CheckerUtilsTest.java | 6 |
3 files changed, 8 insertions, 1 deletions
diff --git a/main/res/values/changelog_release.xml b/main/res/values/changelog_release.xml index bbd7517..7e2baaf 100644 --- a/main/res/values/changelog_release.xml +++ b/main/res/values/changelog_release.xml @@ -24,6 +24,7 @@ · Fix: Copy to clipboard not possible on Android 5.1\n · Fix: Cache links in Groundspeaks weekly mails not opening\n · Fix: Heading line had wrong target when started from compass\n + · Fix: Crash opening geochecker from cache\n \n \n <b>Known Limitations/Bugs:</b>\n diff --git a/main/src/cgeo/geocaching/utils/CheckerUtils.java b/main/src/cgeo/geocaching/utils/CheckerUtils.java index bb21059..aece66b 100644 --- a/main/src/cgeo/geocaching/utils/CheckerUtils.java +++ b/main/src/cgeo/geocaching/utils/CheckerUtils.java @@ -12,7 +12,7 @@ import android.util.Patterns; import java.util.regex.Matcher; public final class CheckerUtils { - private static final String[] CHECKERS = { "geocheck.org", "geochecker.com", "certitudes.org" }; + private static final String[] CHECKERS = { "geocheck.org/geo_inputchkcoord.php?", "geochecker.com/index.php?", "certitudes.org/certitude?" }; private CheckerUtils() { // utility class diff --git a/tests/src/cgeo/geocaching/utils/CheckerUtilsTest.java b/tests/src/cgeo/geocaching/utils/CheckerUtilsTest.java index fa7c7e7..ade3366 100644 --- a/tests/src/cgeo/geocaching/utils/CheckerUtilsTest.java +++ b/tests/src/cgeo/geocaching/utils/CheckerUtilsTest.java @@ -14,6 +14,12 @@ public class CheckerUtilsTest extends TestCase { assertUrl("http://www.certitudes.org/certitude?wp=GC5MVX7", "http://www.certitudes.org/certitude?wp=GC5MVX7"); assertUrl("http://geochecker.com/index.php?code=e001928e3c2682ec2bae0f24b9d02cfb&action=check&wp=474350573454&name=47656f636865636b6572205465737420666f72204e33382030302e303030205737362030302e303030", "http://geochecker.com/index.php?code=e001928e3c2682ec2bae0f24b9d02cfb&action=check&wp=474350573454&name=47656f636865636b6572205465737420666f72204e33382030302e303030205737362030302e303030"); assertUrl("<p>Haarige Aussichten gibt es <a href=\"http://www.geochecker.com/index.php?code=cd52752a8649c5e385a624b5341176f9&action=check&wp=4743314a43384b&name=4b61747a656e&language=German\">hier</a>.</p></span>", "http://www.geochecker.com/index.php?code=cd52752a8649c5e385a624b5341176f9&action=check&wp=4743314a43384b&name=4b61747a656e&language=German"); + assertUrl("<p>Haarige Aussichten gibt es <a href=\"http://www.geochecker.com/index.php?code=cd52752a8649c5e385a624b5341176f9&action=check&wp=4743314a43384b&name=4b61747a656e&language=German\">hier</a>.</p></span>", "http://www.geochecker.com/index.php?code=cd52752a8649c5e385a624b5341176f9&action=check&wp=4743314a43384b&name=4b61747a656e&language=German"); + assertUrl("Deine Lösung für die Koordinaten dieses Multis kannst du auf geochecker.com überprüfen. <a href=\"http://www.geochecker.com/index.php?code=3a08a604fe68fd8d09417ae530bb671a&action=check&wp=4743354d523847&name=4e534720556e74657265732046657565726261636874616c&language=german\">GeoChecker.com</a>", "http://www.geochecker.com/index.php?code=3a08a604fe68fd8d09417ae530bb671a&action=check&wp=4743354d523847&name=4e534720556e74657265732046657565726261636874616c&language=german"); + } + + public static void testAvoidNonLink() { + assertUrl("some text... geochecker.com ... some more text", null); } private static void assertUrl(final String description, final String expected) { |