aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorblafoo <github@blafoo.de>2012-03-17 10:12:53 +0100
committerblafoo <github@blafoo.de>2012-03-17 10:14:45 +0100
commit468a43b9a408c67f7693a4f0b7e5a4f531e7db6b (patch)
tree5cd2045997f396ead1be35e279a39794b9674aa7 /main
parentdc8279bf0c0a2dbb7ef7b41f6cc17e38244ccddf (diff)
downloadcgeo-468a43b9a408c67f7693a4f0b7e5a4f531e7db6b.zip
cgeo-468a43b9a408c67f7693a4f0b7e5a4f531e7db6b.tar.gz
cgeo-468a43b9a408c67f7693a4f0b7e5a4f531e7db6b.tar.bz2
Non-reliable coords for Basic Members. Fixes #1285
Diffstat (limited to 'main')
-rw-r--r--main/src/cgeo/geocaching/cgBase.java6
-rw-r--r--main/src/cgeo/geocaching/files/LocParser.java1
2 files changed, 2 insertions, 5 deletions
diff --git a/main/src/cgeo/geocaching/cgBase.java b/main/src/cgeo/geocaching/cgBase.java
index 0023499..fb5b23a 100644
--- a/main/src/cgeo/geocaching/cgBase.java
+++ b/main/src/cgeo/geocaching/cgBase.java
@@ -314,7 +314,7 @@ public class cgBase {
recaptchaText = thread.getText();
}
- if (cids.size() > 0 && (recaptchaChallenge == null || StringUtils.isNotBlank(recaptchaText))) {
+ if (cids.size() > 0 && (Settings.isPremiumMember() || showCaptcha) && (recaptchaChallenge == null || StringUtils.isNotBlank(recaptchaText))) {
Log.i(Settings.tag, "Trying to get .loc for " + cids.size() + " caches");
try {
@@ -355,10 +355,6 @@ public class cgBase {
LocParser.parseLoc(searchResult, coordinates);
- // now we have the coords...
- for (cgCache cache : searchResult.getCachesFromSearchResult(LoadFlags.LOAD_CACHE_OR_DB)) {
- cache.setReliableLatLon(true);
- }
} catch (Exception e) {
Log.e(Settings.tag, "cgBase.parseSearch.CIDs: " + e.toString());
}
diff --git a/main/src/cgeo/geocaching/files/LocParser.java b/main/src/cgeo/geocaching/files/LocParser.java
index 6dfc70d..029d049 100644
--- a/main/src/cgeo/geocaching/files/LocParser.java
+++ b/main/src/cgeo/geocaching/files/LocParser.java
@@ -70,6 +70,7 @@ public final class LocParser extends FileParser {
cache.setTerrain(coord.getTerrain());
cache.setSize(coord.getSize());
cache.setGeocode(coord.getGeocode().toUpperCase());
+ cache.setReliableLatLon(true);
if (StringUtils.isBlank(cache.getName())) {
cache.setName(coord.getName());
}