change: set ownerUserId for OC caches

Some parts of our code expect this field to have some useful values.
Therefore don't leave it empty for OC caches.

2 files changed, 7 insertions, 2 deletions

diff --git a/main/src/cgeo/geocaching/connector/oc/OkapiClient.java b/main/src/cgeo/geocaching/connector/oc/OkapiClient.java
index 3c93488..1294353 100644
--- a/main/src/cgeo/geocaching/connector/oc/OkapiClient.java
+++ b/main/src/cgeo/geocaching/connector/oc/OkapiClient.java
@@ -328,8 +328,11 @@ final class OkapiClient {
             parseCoreCache(response, cache);
 
             // not used: url
-            final JSONObject owner = response.getJSONObject(CACHE_OWNER);
-            cache.setOwnerDisplayName(parseUser(owner));
+            final JSONObject ownerObject = response.getJSONObject(CACHE_OWNER);
+            final String owner = parseUser(ownerObject);
+            cache.setOwnerDisplayName(owner);
+            // OpenCaching has no distinction between user id and user display name. Set the ID anyway to simplify c:geo workflows.
+            cache.setOwnerUserId(owner);
 
             cache.getLogCounts().put(LogType.FOUND_IT, response.getInt(CACHE_FOUNDS));
             cache.getLogCounts().put(LogType.DIDNT_FIND_IT, response.getInt(CACHE_NOTFOUNDS));
diff --git a/tests/src/cgeo/geocaching/connector/oc/OkapiClientTest.java b/tests/src/cgeo/geocaching/connector/oc/OkapiClientTest.java
index 05d676b..2c1d06c 100644
--- a/tests/src/cgeo/geocaching/connector/oc/OkapiClientTest.java
+++ b/tests/src/cgeo/geocaching/connector/oc/OkapiClientTest.java
@@ -22,6 +22,8 @@ public class OkapiClientTest extends CGeoTestCase {
         assertThat(cache.getGeocode()).isEqualTo(geoCode);
         assertThat(cache.getName()).isEqualTo("Oshkosh Municipal Tank");
         assertThat(cache.isDetailed()).isTrue();
+        assertThat(cache.getOwnerDisplayName()).isNotEmpty();
+        assertThat(cache.getOwnerUserId()).isEqualTo(cache.getOwnerDisplayName());
     }
 
     public static void testOCSearchMustWorkWithoutOAuthAccessTokens() {