aboutsummaryrefslogtreecommitdiffstats
path: root/main/src
diff options
context:
space:
mode:
authorrsudev <rasch@munin-soft.de>2013-02-11 20:53:00 +0100
committerrsudev <rasch@munin-soft.de>2013-02-11 20:53:00 +0100
commit770b16ebbc0f89d088aa3a8dfca2277864b61b24 (patch)
treeca5763890905473ced955706cf46bb2875a32e83 /main/src
parent09422472f4230ba92ff8747b54d1908847f764d4 (diff)
downloadcgeo-770b16ebbc0f89d088aa3a8dfca2277864b61b24.zip
cgeo-770b16ebbc0f89d088aa3a8dfca2277864b61b24.tar.gz
cgeo-770b16ebbc0f89d088aa3a8dfca2277864b61b24.tar.bz2
Fix #2441, Owner information not shown for OC.de caches
Extended oc connector to return owner state as well
Diffstat (limited to 'main/src')
-rw-r--r--main/src/cgeo/geocaching/connector/oc/OC11XMLParser.java4
-rw-r--r--main/src/cgeo/geocaching/connector/oc/OCXMLApiConnector.java8
2 files changed, 11 insertions, 1 deletions
diff --git a/main/src/cgeo/geocaching/connector/oc/OC11XMLParser.java b/main/src/cgeo/geocaching/connector/oc/OC11XMLParser.java
index 9739beb..6d2de02 100644
--- a/main/src/cgeo/geocaching/connector/oc/OC11XMLParser.java
+++ b/main/src/cgeo/geocaching/connector/oc/OC11XMLParser.java
@@ -394,7 +394,7 @@ public class OC11XMLParser {
}
});
- // cache.terrain
+ // cache.datehidden
cacheNode.getChild("datehidden").setEndTextElementListener(new EndTextElementListener() {
@Override
@@ -404,11 +404,13 @@ public class OC11XMLParser {
}
});
+ // cache.userid
cacheNode.getChild("userid").setEndTextElementListener(new EndTextElementListener() {
@Override
public void end(String body) {
cacheHolder.cache.setOwnerDisplayName(body);
+ cacheHolder.cache.setOwnerUserId(body);
}
});
diff --git a/main/src/cgeo/geocaching/connector/oc/OCXMLApiConnector.java b/main/src/cgeo/geocaching/connector/oc/OCXMLApiConnector.java
index 69707b9..d361a7e 100644
--- a/main/src/cgeo/geocaching/connector/oc/OCXMLApiConnector.java
+++ b/main/src/cgeo/geocaching/connector/oc/OCXMLApiConnector.java
@@ -1,6 +1,7 @@
package cgeo.geocaching.connector.oc;
import cgeo.geocaching.Geocache;
+import cgeo.geocaching.ICache;
import cgeo.geocaching.SearchResult;
import cgeo.geocaching.Settings;
import cgeo.geocaching.connector.capability.ISearchByCenter;
@@ -10,6 +11,8 @@ import cgeo.geocaching.geopoint.Geopoint;
import cgeo.geocaching.geopoint.Viewport;
import cgeo.geocaching.utils.CancellableHandler;
+import org.apache.commons.lang3.StringUtils;
+
public class OCXMLApiConnector extends OCConnector implements ISearchByGeocode, ISearchByCenter, ISearchByViewPort {
private final static double SEARCH_DISTANCE_LIMIT = 15.0;
@@ -49,4 +52,9 @@ public class OCXMLApiConnector extends OCConnector implements ISearchByGeocode,
return Settings.isOCConnectorActive();
}
+ @Override
+ public boolean isOwner(ICache cache) {
+ return StringUtils.equalsIgnoreCase(cache.getOwnerUserId(), Settings.getOCConnectorUserName());
+ }
+
}