Fixes #2441, sets oc userid as OwnerUserId

3 files changed, 15 insertions, 3 deletions

diff --git a/main/src/cgeo/geocaching/connector/oc/OC11XMLParser.java b/main/src/cgeo/geocaching/connector/oc/OC11XMLParser.java
index e44b0a5..3c2a826 100644
--- a/main/src/cgeo/geocaching/connector/oc/OC11XMLParser.java
+++ b/main/src/cgeo/geocaching/connector/oc/OC11XMLParser.java
@@ -405,12 +405,23 @@ public class OC11XMLParser {
         });
 
         // cache.userid
-        cacheNode.getChild("userid").setEndTextElementListener(new EndTextElementListener() {
+        final Element useridNode = cacheNode.getChild("userid");
+
+        useridNode.setStartElementListener(new StartElementListener() {
+
+            @Override
+            public void start(Attributes attributes) {
+                if (attributes.getIndex("id") > -1) {
+                    cacheHolder.cache.setOwnerUserId(attributes.getValue("id"));
+                }
+            }
+        });
+
+        useridNode.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 d361a7e..678654f 100644
--- a/main/src/cgeo/geocaching/connector/oc/OCXMLApiConnector.java
+++ b/main/src/cgeo/geocaching/connector/oc/OCXMLApiConnector.java
@@ -54,7 +54,7 @@ public class OCXMLApiConnector extends OCConnector implements ISearchByGeocode,
 
     @Override
     public boolean isOwner(ICache cache) {
-        return StringUtils.equalsIgnoreCase(cache.getOwnerUserId(), Settings.getOCConnectorUserName());
+        return StringUtils.equalsIgnoreCase(cache.getOwnerDisplayName(), Settings.getOCConnectorUserName());
     }
 
 }
diff --git a/tests/src/cgeo/geocaching/connector/opencaching/OCXMLTest.java b/tests/src/cgeo/geocaching/connector/opencaching/OCXMLTest.java
index 92c2063..52e5649 100644
--- a/tests/src/cgeo/geocaching/connector/opencaching/OCXMLTest.java
+++ b/tests/src/cgeo/geocaching/connector/opencaching/OCXMLTest.java
@@ -44,6 +44,7 @@ public class OCXMLTest extends CGeoTestCase {
             assertNotNull(cache);
 
             assertTrue(cache.isOwner());
+            assertEquals("180571", cache.getOwnerUserId());
         } finally {
             Settings.setOCConnectorUserName(oldOCName);
         }