2 files changed, 7 insertions, 20 deletions

diff --git a/main/src/cgeo/geocaching/connector/oc/OkapiClient.java b/main/src/cgeo/geocaching/connector/oc/OkapiClient.java
index 9920e6f..3c99bc9 100644
--- a/main/src/cgeo/geocaching/connector/oc/OkapiClient.java
+++ b/main/src/cgeo/geocaching/connector/oc/OkapiClient.java
@@ -137,7 +137,6 @@ final public class OkapiClient {
         return parseCache(data);
     }
 
-    // Assumes level 3 OAuth
     public static List<Geocache> getCachesAround(final Geopoint center, OCApiConnector connector) {
         String centerString = GeopointFormatter.format(GeopointFormatter.Format.LAT_DECDEGREE_RAW, center) + SEPARATOR + GeopointFormatter.format(GeopointFormatter.Format.LON_DECDEGREE_RAW, center);
         final Parameters params = new Parameters("search_method", METHOD_SEARCH_NEAREST);
@@ -145,12 +144,7 @@ final public class OkapiClient {
         valueMap.put("center", centerString);
         valueMap.put("limit", "20");
 
-        if (connector.getSupportedAuthLevel() != OAuthLevel.Level3) {
-            Log.e("Calling OkapiClient.getCachesAround with wrong connector");
-            return Collections.emptyList();
-        }
-
-        addFilterParams(valueMap);
+        addFilterParams(valueMap, connector);
 
         params.add("search_params", new JSONObject(valueMap).toString());
 
@@ -180,13 +174,7 @@ final public class OkapiClient {
         final Map<String, String> valueMap = new LinkedHashMap<String, String>();
         valueMap.put("bbox", bboxString);
 
-        // FIXME Why is this testing level 3? The to be used service is level 1 only.
-        if (connector.getSupportedAuthLevel() != OAuthLevel.Level3) {
-            Log.e("Calling OkapiClient.getCachesBBox with wrong connector");
-            return Collections.emptyList();
-        }
-
-        addFilterParams(valueMap);
+        addFilterParams(valueMap, connector);
 
         params.add("search_params", new JSONObject(valueMap).toString());
 
@@ -641,12 +629,11 @@ final public class OkapiClient {
         return "en";
     }
 
-    // assumes level 3 oauth
-    private static void addFilterParams(final Map<String, String> valueMap) {
+    private static void addFilterParams(final Map<String, String> valueMap, OCApiConnector connector) {
         if (!Settings.isExcludeDisabledCaches()) {
             valueMap.put("status", "Available|Temporarily unavailable");
         }
-        if (Settings.isExcludeMyCaches()) {
+        if (Settings.isExcludeMyCaches() && connector.getSupportedAuthLevel() == OAuthLevel.Level3) {
             valueMap.put("exclude_my_own", "true");
             valueMap.put("found_status", "notfound_only");
         }
diff --git a/main/src/cgeo/geocaching/files/LocParser.java b/main/src/cgeo/geocaching/files/LocParser.java
index 49b9d6e..1cfb2a3 100644
--- a/main/src/cgeo/geocaching/files/LocParser.java
+++ b/main/src/cgeo/geocaching/files/LocParser.java
@@ -76,7 +76,7 @@ public final class LocParser extends FileParser {
         if (StringUtils.isBlank(cache.getName())) {
             cache.setName(coord.getName());
         }
-        cache.setOwnerDisplayName(coord.getOwnerDisplayName());
+        cache.setOwnerUserId(coord.getOwnerUserId());
     }
 
     static Map<String, Geocache> parseCoordinates(final String fileContent) {
@@ -152,8 +152,8 @@ public final class LocParser extends FileParser {
         if (matcherName.find()) {
             final String name = matcherName.group(1).trim();
             String ownerName = StringUtils.trim(StringUtils.substringAfterLast(name, NAME_OWNER_SEPARATOR));
-            if (StringUtils.isEmpty(cache.getOwnerDisplayName()) && StringUtils.isNotEmpty(ownerName)) {
-                cache.setOwnerDisplayName(ownerName);
+            if (StringUtils.isEmpty(cache.getOwnerUserId()) && StringUtils.isNotEmpty(ownerName)) {
+                cache.setOwnerUserId(ownerName);
             }
             cache.setName(StringUtils.substringBeforeLast(name, NAME_OWNER_SEPARATOR).trim());
         } else {