Merge branch 'master' into oc_icons

- changed icons
- repaired test class

67 files changed, 50 insertions, 8 deletions

diff --git a/main/project/attributes/svgs/poisonoak.svg b/main/project/attributes/svgs/poisonoak.svg
index d3b3265..f0a0a6d 100644
--- a/main/project/attributes/svgs/poisonoak.svg
+++ b/main/project/attributes/svgs/poisonoak.svg
@@ -14,7 +14,7 @@
    id="svg2"
    version="1.1"
    inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="Neues Dokument 1">
+   sodipodi:docname="poisonoak.svg">
   <defs
      id="defs4" />
   <sodipodi:namedview
@@ -47,7 +47,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -58,13 +58,13 @@
      transform="translate(-33.924109,-240.92962)">
     <path
        style="fill:#ffffff;fill-opacity:1;stroke:none"
-       d="m 366.0358,240.93362 c 134.05764,-0.72222 381.36726,96.50796 317.14286,214.28571 -217.49585,48.31337 -461.30786,45.34455 -642.745711,0 C -7.4327303,316.77773 219.55517,241.72276 366.0358,240.93362 z"
+       d="m 365.6954,295.21873 c 113.84883,-0.61335 323.87722,81.95966 269.33447,181.98274 -184.70896,41.03027 -391.767,38.50899 -545.853604,0 C 48.526203,359.62956 241.29632,295.88891 365.6954,295.21873 z"
        id="rect2985"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="sccs" />
     <path
        style="fill:#ffffff;fill-opacity:1;stroke:none"
-       d="m 282.85714,512.36219 c 62.97609,8.45248 117.02391,2.7382 162.85714,0 68.69037,68.69037 98.99495,321.00505 0,420 -38.3858,38.3858 -124.47134,38.3858 -162.85714,0 -98.99495,-98.99495 -68.69037,-351.30963 0,-420 z"
+       d="m 295.05569,525.73021 c 53.48262,7.17829 99.38289,2.32542 138.30689,0 58.33549,58.33549 84.07174,272.61444 0,356.68618 -32.59925,32.59925 -105.70764,32.59925 -138.30689,0 -84.07174,-84.07174 -58.33549,-298.35069 0,-356.68618 z"
        id="rect2987"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="ccccc" />
diff --git a/main/res/drawable-mdpi/attribute__strikethru.png b/main/res/drawable-mdpi/attribute__strikethru.png
index 3087d79..68475a1 100644
--- a/main/res/drawable-mdpi/attribute__strikethru.png
+++ b/main/res/drawable-mdpi/attribute__strikethru.png
diff --git a/main/res/drawable-mdpi/attribute_abandonedbuilding.png b/main/res/drawable-mdpi/attribute_abandonedbuilding.png
index 242a656..b8eac27 100644
--- a/main/res/drawable-mdpi/attribute_abandonedbuilding.png
+++ b/main/res/drawable-mdpi/attribute_abandonedbuilding.png
diff --git a/main/res/drawable-mdpi/attribute_aircraft.png b/main/res/drawable-mdpi/attribute_aircraft.png
index 675b584..0c5f731 100644
--- a/main/res/drawable-mdpi/attribute_aircraft.png
+++ b/main/res/drawable-mdpi/attribute_aircraft.png
diff --git a/main/res/drawable-mdpi/attribute_all_seasons.png b/main/res/drawable-mdpi/attribute_all_seasons.png
index 1c5ffb4..f7acdea 100644
--- a/main/res/drawable-mdpi/attribute_all_seasons.png
+++ b/main/res/drawable-mdpi/attribute_all_seasons.png
diff --git a/main/res/drawable-mdpi/attribute_arithmetic.png b/main/res/drawable-mdpi/attribute_arithmetic.png
index 49a28ab..df77b23 100644
--- a/main/res/drawable-mdpi/attribute_arithmetic.png
+++ b/main/res/drawable-mdpi/attribute_arithmetic.png
diff --git a/main/res/drawable-mdpi/attribute_ask_owner.png b/main/res/drawable-mdpi/attribute_ask_owner.png
index 1e3e763..f3c7240 100644
--- a/main/res/drawable-mdpi/attribute_ask_owner.png
+++ b/main/res/drawable-mdpi/attribute_ask_owner.png
diff --git a/main/res/drawable-mdpi/attribute_available.png b/main/res/drawable-mdpi/attribute_available.png
index 3714804..bcfefa7 100644
--- a/main/res/drawable-mdpi/attribute_available.png
+++ b/main/res/drawable-mdpi/attribute_available.png
diff --git a/main/res/drawable-mdpi/attribute_breeding.png b/main/res/drawable-mdpi/attribute_breeding.png
index 9df1b8c..2012c2f 100644
--- a/main/res/drawable-mdpi/attribute_breeding.png
+++ b/main/res/drawable-mdpi/attribute_breeding.png
diff --git a/main/res/drawable-mdpi/attribute_cave.png b/main/res/drawable-mdpi/attribute_cave.png
index f720634..b52095d 100644
--- a/main/res/drawable-mdpi/attribute_cave.png
+++ b/main/res/drawable-mdpi/attribute_cave.png
diff --git a/main/res/drawable-mdpi/attribute_compass.png b/main/res/drawable-mdpi/attribute_compass.png
index 20698ae..efa2b25 100644
--- a/main/res/drawable-mdpi/attribute_compass.png
+++ b/main/res/drawable-mdpi/attribute_compass.png
diff --git a/main/res/drawable-mdpi/attribute_cow.png b/main/res/drawable-mdpi/attribute_cow.png
index 010f27d..d64d152 100644
--- a/main/res/drawable-mdpi/attribute_cow.png
+++ b/main/res/drawable-mdpi/attribute_cow.png
diff --git a/main/res/drawable-mdpi/attribute_danger.png b/main/res/drawable-mdpi/attribute_danger.png
index 93a3e63..051227e 100644
--- a/main/res/drawable-mdpi/attribute_danger.png
+++ b/main/res/drawable-mdpi/attribute_danger.png
diff --git a/main/res/drawable-mdpi/attribute_day.png b/main/res/drawable-mdpi/attribute_day.png
index ecc83af..a92e56c 100644
--- a/main/res/drawable-mdpi/attribute_day.png
+++ b/main/res/drawable-mdpi/attribute_day.png
diff --git a/main/res/drawable-mdpi/attribute_fee.png b/main/res/drawable-mdpi/attribute_fee.png
index bc83174..d9dd5e2 100644
--- a/main/res/drawable-mdpi/attribute_fee.png
+++ b/main/res/drawable-mdpi/attribute_fee.png
diff --git a/main/res/drawable-mdpi/attribute_field_puzzle.png b/main/res/drawable-mdpi/attribute_field_puzzle.png
index 4b2c44e..5fc07ca 100644
--- a/main/res/drawable-mdpi/attribute_field_puzzle.png
+++ b/main/res/drawable-mdpi/attribute_field_puzzle.png
diff --git a/main/res/drawable-mdpi/attribute_firstaid.png b/main/res/drawable-mdpi/attribute_firstaid.png
index 0497b53..2439bc3 100644
--- a/main/res/drawable-mdpi/attribute_firstaid.png
+++ b/main/res/drawable-mdpi/attribute_firstaid.png
diff --git a/main/res/drawable-mdpi/attribute_flashlight.png b/main/res/drawable-mdpi/attribute_flashlight.png
index df303d4..5b11acd 100644
--- a/main/res/drawable-mdpi/attribute_flashlight.png
+++ b/main/res/drawable-mdpi/attribute_flashlight.png
diff --git a/main/res/drawable-mdpi/attribute_frontyard.png b/main/res/drawable-mdpi/attribute_frontyard.png
index 119e2e7..5bc6712 100644
--- a/main/res/drawable-mdpi/attribute_frontyard.png
+++ b/main/res/drawable-mdpi/attribute_frontyard.png
diff --git a/main/res/drawable-mdpi/attribute_hike_long.png b/main/res/drawable-mdpi/attribute_hike_long.png
index bd5f804..2c41b3d 100644
--- a/main/res/drawable-mdpi/attribute_hike_long.png
+++ b/main/res/drawable-mdpi/attribute_hike_long.png
diff --git a/main/res/drawable-mdpi/attribute_hike_med.png b/main/res/drawable-mdpi/attribute_hike_med.png
index a3c6931..67ad4cd 100644
--- a/main/res/drawable-mdpi/attribute_hike_med.png
+++ b/main/res/drawable-mdpi/attribute_hike_med.png
diff --git a/main/res/drawable-mdpi/attribute_hike_short.png b/main/res/drawable-mdpi/attribute_hike_short.png
index d7eeae3..d6186fa 100644
--- a/main/res/drawable-mdpi/attribute_hike_short.png
+++ b/main/res/drawable-mdpi/attribute_hike_short.png
diff --git a/main/res/drawable-mdpi/attribute_hills.png b/main/res/drawable-mdpi/attribute_hills.png
index 475228d..207824f 100644
--- a/main/res/drawable-mdpi/attribute_hills.png
+++ b/main/res/drawable-mdpi/attribute_hills.png
diff --git a/main/res/drawable-mdpi/attribute_hunting.png b/main/res/drawable-mdpi/attribute_hunting.png
index b74df8a..11be3b0 100644
--- a/main/res/drawable-mdpi/attribute_hunting.png
+++ b/main/res/drawable-mdpi/attribute_hunting.png
diff --git a/main/res/drawable-mdpi/attribute_in_water.png b/main/res/drawable-mdpi/attribute_in_water.png
index b5c3cc1..087f3b0 100644
--- a/main/res/drawable-mdpi/attribute_in_water.png
+++ b/main/res/drawable-mdpi/attribute_in_water.png
diff --git a/main/res/drawable-mdpi/attribute_inside.png b/main/res/drawable-mdpi/attribute_inside.png
index 7d138cb..316c1ec 100644
--- a/main/res/drawable-mdpi/attribute_inside.png
+++ b/main/res/drawable-mdpi/attribute_inside.png
diff --git a/main/res/drawable-mdpi/attribute_investigation.png b/main/res/drawable-mdpi/attribute_investigation.png
index 4ea2a74..99b21b2 100644
--- a/main/res/drawable-mdpi/attribute_investigation.png
+++ b/main/res/drawable-mdpi/attribute_investigation.png
diff --git a/main/res/drawable-mdpi/attribute_kids.png b/main/res/drawable-mdpi/attribute_kids.png
index 60b0a5c..b268a6c 100644
--- a/main/res/drawable-mdpi/attribute_kids.png
+++ b/main/res/drawable-mdpi/attribute_kids.png
diff --git a/main/res/drawable-mdpi/attribute_landf.png b/main/res/drawable-mdpi/attribute_landf.png
index bb8d9a0..082bdeb 100644
--- a/main/res/drawable-mdpi/attribute_landf.png
+++ b/main/res/drawable-mdpi/attribute_landf.png
diff --git a/main/res/drawable-mdpi/attribute_letterbox.png b/main/res/drawable-mdpi/attribute_letterbox.png
index 442eeb4..a186001 100644
--- a/main/res/drawable-mdpi/attribute_letterbox.png
+++ b/main/res/drawable-mdpi/attribute_letterbox.png
diff --git a/main/res/drawable-mdpi/attribute_link_only.png b/main/res/drawable-mdpi/attribute_link_only.png
index 9f5ccff..2cef71b 100644
--- a/main/res/drawable-mdpi/attribute_link_only.png
+++ b/main/res/drawable-mdpi/attribute_link_only.png
diff --git a/main/res/drawable-mdpi/attribute_maintenance.png b/main/res/drawable-mdpi/attribute_maintenance.png
index d1073f5..f191c96 100644
--- a/main/res/drawable-mdpi/attribute_maintenance.png
+++ b/main/res/drawable-mdpi/attribute_maintenance.png
diff --git a/main/res/drawable-mdpi/attribute_moving_target.png b/main/res/drawable-mdpi/attribute_moving_target.png
index 650610f..c897538 100644
--- a/main/res/drawable-mdpi/attribute_moving_target.png
+++ b/main/res/drawable-mdpi/attribute_moving_target.png
diff --git a/main/res/drawable-mdpi/attribute_nightcache.png b/main/res/drawable-mdpi/attribute_nightcache.png
index e51c377..e9b114a 100644
--- a/main/res/drawable-mdpi/attribute_nightcache.png
+++ b/main/res/drawable-mdpi/attribute_nightcache.png
diff --git a/main/res/drawable-mdpi/attribute_no_gps.png b/main/res/drawable-mdpi/attribute_no_gps.png
index d1f4fa3..e0bcb44 100644
--- a/main/res/drawable-mdpi/attribute_no_gps.png
+++ b/main/res/drawable-mdpi/attribute_no_gps.png
diff --git a/main/res/drawable-mdpi/attribute_oc_only.png b/main/res/drawable-mdpi/attribute_oc_only.png
index dcffb15..bad932f 100644
--- a/main/res/drawable-mdpi/attribute_oc_only.png
+++ b/main/res/drawable-mdpi/attribute_oc_only.png
diff --git a/main/res/drawable-mdpi/attribute_onehour.png b/main/res/drawable-mdpi/attribute_onehour.png
index a789215..8d999a7 100644
--- a/main/res/drawable-mdpi/attribute_onehour.png
+++ b/main/res/drawable-mdpi/attribute_onehour.png
diff --git a/main/res/drawable-mdpi/attribute_other_cache.png b/main/res/drawable-mdpi/attribute_other_cache.png
index 3e4584a..f9b63b5 100644
--- a/main/res/drawable-mdpi/attribute_other_cache.png
+++ b/main/res/drawable-mdpi/attribute_other_cache.png
diff --git a/main/res/drawable-mdpi/attribute_overnight.png b/main/res/drawable-mdpi/attribute_overnight.png
index a011dbe..41b538e 100644
--- a/main/res/drawable-mdpi/attribute_overnight.png
+++ b/main/res/drawable-mdpi/attribute_overnight.png
diff --git a/main/res/drawable-mdpi/attribute_parkngrab.png b/main/res/drawable-mdpi/attribute_parkngrab.png
index db4ded6..1622473 100644
--- a/main/res/drawable-mdpi/attribute_parkngrab.png
+++ b/main/res/drawable-mdpi/attribute_parkngrab.png
diff --git a/main/res/drawable-mdpi/attribute_partnership.png b/main/res/drawable-mdpi/attribute_partnership.png
index 2f7435d..8b94092 100644
--- a/main/res/drawable-mdpi/attribute_partnership.png
+++ b/main/res/drawable-mdpi/attribute_partnership.png
diff --git a/main/res/drawable-mdpi/attribute_poi.png b/main/res/drawable-mdpi/attribute_poi.png
index 67b15cf..7f8f28a 100644
--- a/main/res/drawable-mdpi/attribute_poi.png
+++ b/main/res/drawable-mdpi/attribute_poi.png
diff --git a/main/res/drawable-mdpi/attribute_poisonoak.png b/main/res/drawable-mdpi/attribute_poisonoak.png
index d30e6a9..13b73c3 100644
--- a/main/res/drawable-mdpi/attribute_poisonoak.png
+++ b/main/res/drawable-mdpi/attribute_poisonoak.png
diff --git a/main/res/drawable-mdpi/attribute_puzzle.png b/main/res/drawable-mdpi/attribute_puzzle.png
index a6fbe3b..f7efe46 100644
--- a/main/res/drawable-mdpi/attribute_puzzle.png
+++ b/main/res/drawable-mdpi/attribute_puzzle.png
diff --git a/main/res/drawable-mdpi/attribute_railway.png b/main/res/drawable-mdpi/attribute_railway.png
index dacff4d..47e841b 100644
--- a/main/res/drawable-mdpi/attribute_railway.png
+++ b/main/res/drawable-mdpi/attribute_railway.png
diff --git a/main/res/drawable-mdpi/attribute_s_tool.png b/main/res/drawable-mdpi/attribute_s_tool.png
index 8504676..cb23090 100644
--- a/main/res/drawable-mdpi/attribute_s_tool.png
+++ b/main/res/drawable-mdpi/attribute_s_tool.png
diff --git a/main/res/drawable-mdpi/attribute_seasonal.png b/main/res/drawable-mdpi/attribute_seasonal.png
index 3082a14..77c277c 100644
--- a/main/res/drawable-mdpi/attribute_seasonal.png
+++ b/main/res/drawable-mdpi/attribute_seasonal.png
diff --git a/main/res/drawable-mdpi/attribute_snow_proof.png b/main/res/drawable-mdpi/attribute_snow_proof.png
index 5a90cf8..4a98e99 100644
--- a/main/res/drawable-mdpi/attribute_snow_proof.png
+++ b/main/res/drawable-mdpi/attribute_snow_proof.png
diff --git a/main/res/drawable-mdpi/attribute_specific_times.png b/main/res/drawable-mdpi/attribute_specific_times.png
index 77f9e7e..074a1d2 100644
--- a/main/res/drawable-mdpi/attribute_specific_times.png
+++ b/main/res/drawable-mdpi/attribute_specific_times.png
diff --git a/main/res/drawable-mdpi/attribute_stealth.png b/main/res/drawable-mdpi/attribute_stealth.png
index 2852fd2..4d92cdb 100644
--- a/main/res/drawable-mdpi/attribute_stealth.png
+++ b/main/res/drawable-mdpi/attribute_stealth.png
diff --git a/main/res/drawable-mdpi/attribute_swamp.png b/main/res/drawable-mdpi/attribute_swamp.png
index c6ec6be..bc06506 100644
--- a/main/res/drawable-mdpi/attribute_swamp.png
+++ b/main/res/drawable-mdpi/attribute_swamp.png
diff --git a/main/res/drawable-mdpi/attribute_syringe.png b/main/res/drawable-mdpi/attribute_syringe.png
index ced5285..e483bbc 100644
--- a/main/res/drawable-mdpi/attribute_syringe.png
+++ b/main/res/drawable-mdpi/attribute_syringe.png
diff --git a/main/res/drawable-mdpi/attribute_teamwork.png b/main/res/drawable-mdpi/attribute_teamwork.png
index 907e983..94a50e7 100644
--- a/main/res/drawable-mdpi/attribute_teamwork.png
+++ b/main/res/drawable-mdpi/attribute_teamwork.png
diff --git a/main/res/drawable-mdpi/attribute_thorn.png b/main/res/drawable-mdpi/attribute_thorn.png
index c066355..3339d17 100644
--- a/main/res/drawable-mdpi/attribute_thorn.png
+++ b/main/res/drawable-mdpi/attribute_thorn.png
diff --git a/main/res/drawable-mdpi/attribute_ticks.png b/main/res/drawable-mdpi/attribute_ticks.png
index dba85fb..b24d1b9 100644
--- a/main/res/drawable-mdpi/attribute_ticks.png
+++ b/main/res/drawable-mdpi/attribute_ticks.png
diff --git a/main/res/drawable-mdpi/attribute_tide.png b/main/res/drawable-mdpi/attribute_tide.png
index 51f3872..0da23fe 100644
--- a/main/res/drawable-mdpi/attribute_tide.png
+++ b/main/res/drawable-mdpi/attribute_tide.png
diff --git a/main/res/drawable-mdpi/attribute_treeclimbing.png b/main/res/drawable-mdpi/attribute_treeclimbing.png
index 51aed8b..25993cc 100644
--- a/main/res/drawable-mdpi/attribute_treeclimbing.png
+++ b/main/res/drawable-mdpi/attribute_treeclimbing.png
diff --git a/main/res/drawable-mdpi/attribute_unknown.png b/main/res/drawable-mdpi/attribute_unknown.png
index 8643380..909ef34 100644
--- a/main/res/drawable-mdpi/attribute_unknown.png
+++ b/main/res/drawable-mdpi/attribute_unknown.png
diff --git a/main/res/drawable-mdpi/attribute_uv.png b/main/res/drawable-mdpi/attribute_uv.png
index 18b6e9a..473ff8d 100644
--- a/main/res/drawable-mdpi/attribute_uv.png
+++ b/main/res/drawable-mdpi/attribute_uv.png
diff --git a/main/res/drawable-mdpi/attribute_webcam.png b/main/res/drawable-mdpi/attribute_webcam.png
index 6f82a79..5828ae5 100644
--- a/main/res/drawable-mdpi/attribute_webcam.png
+++ b/main/res/drawable-mdpi/attribute_webcam.png
diff --git a/main/res/drawable-mdpi/attribute_wirelessbeacon.png b/main/res/drawable-mdpi/attribute_wirelessbeacon.png
index 74d70ca..73aeaca 100644
--- a/main/res/drawable-mdpi/attribute_wirelessbeacon.png
+++ b/main/res/drawable-mdpi/attribute_wirelessbeacon.png
diff --git a/main/src/cgeo/geocaching/connector/oc/OC11XMLParser.java b/main/src/cgeo/geocaching/connector/oc/OC11XMLParser.java
index 1b36d2c..a9c041c 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,6 +404,16 @@ 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);
+            }
+        });
+
         // cache.attributes.attribute
         final Element attributeNode = cacheNode.getChild("attributes").getChild("attribute");
 
diff --git a/main/src/cgeo/geocaching/connector/oc/OCConnector.java b/main/src/cgeo/geocaching/connector/oc/OCConnector.java
index 661f506..62dfb4c 100644
--- a/main/src/cgeo/geocaching/connector/oc/OCConnector.java
+++ b/main/src/cgeo/geocaching/connector/oc/OCConnector.java
@@ -1,7 +1,7 @@
 package cgeo.geocaching.connector.oc;
 
-import cgeo.geocaching.ICache;
 import cgeo.geocaching.Geocache;
+import cgeo.geocaching.ICache;
 import cgeo.geocaching.connector.AbstractConnector;
 import cgeo.geocaching.enumerations.CacheRealm;
 
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());
+    }
+
 }
diff --git a/main/src/cgeo/geocaching/connector/oc/OCXMLClient.java b/main/src/cgeo/geocaching/connector/oc/OCXMLClient.java
index 3e4d5b6..dee7bb9 100644
--- a/main/src/cgeo/geocaching/connector/oc/OCXMLClient.java
+++ b/main/src/cgeo/geocaching/connector/oc/OCXMLClient.java
@@ -99,7 +99,7 @@ public class OCXMLClient {
     }
 
     private static Parameters getOCXmlQueryParameters(final boolean withDescription, final boolean withLogs, final boolean withImages) {
-        return new Parameters("modifiedsince", "20060320000000",
+        return new Parameters("modifiedsince", "20000101000000",
                 "user", "0",
                 "cache", "1",
                 "cachedesc", withDescription ? "1" : "0",
diff --git a/main/src/cgeo/geocaching/maps/CGeoMap.java b/main/src/cgeo/geocaching/maps/CGeoMap.java
index 88cf2dc..921412b 100644
--- a/main/src/cgeo/geocaching/maps/CGeoMap.java
+++ b/main/src/cgeo/geocaching/maps/CGeoMap.java
@@ -8,10 +8,10 @@ import cgeo.geocaching.SearchResult;
 import cgeo.geocaching.Settings;
 import cgeo.geocaching.StoredList;
 import cgeo.geocaching.Waypoint;
-import cgeo.geocaching.activity.ActivityMixin;
 import cgeo.geocaching.cgData;
 import cgeo.geocaching.cgeoapplication;
 import cgeo.geocaching.cgeocaches;
+import cgeo.geocaching.activity.ActivityMixin;
 import cgeo.geocaching.connector.ConnectorFactory;
 import cgeo.geocaching.connector.gc.Login;
 import cgeo.geocaching.enumerations.CacheType;
@@ -494,6 +494,8 @@ public class CGeoMap extends AbstractMap implements OnMapDragListener, ViewFacto
             for (String geocode : dirtyCaches) {
                 Geocache cache = cgData.loadCache(geocode, LoadFlags.LOAD_WAYPOINTS);
                 if (cache != null) {
+                    // new collection type needs to remove first
+                    caches.remove(cache);
                     // re-add to update the freshness
                     caches.add(cache);
                 }
diff --git a/tests/src/cgeo/geocaching/connector/opencaching/OCXMLTest.java b/tests/src/cgeo/geocaching/connector/opencaching/OCXMLTest.java
index 7cfd261..92c2063 100644
--- a/tests/src/cgeo/geocaching/connector/opencaching/OCXMLTest.java
+++ b/tests/src/cgeo/geocaching/connector/opencaching/OCXMLTest.java
@@ -34,4 +34,26 @@ public class OCXMLTest extends CGeoTestCase {
             Settings.setOCConnectorUserName(oldOCName);
         }
     }
+
+    public static void testOCOwner() {
+        String oldOCName = Settings.getOCConnectorUserName();
+        try {
+            Settings.setOCConnectorUserName("andi12.2");
+            String geoCode = "OCC9BE";
+            Geocache cache = OCXMLClient.getCache(geoCode);
+            assertNotNull(cache);
+
+            assertTrue(cache.isOwner());
+        } finally {
+            Settings.setOCConnectorUserName(oldOCName);
+        }
+    }
+
+    public static void testOC0537Description() {
+        String geoCode = "OC0537";
+        Geocache cache = OCXMLClient.getCache(geoCode);
+        assertNotNull(cache);
+
+        assertFalse(cache.getDescription().length() < 100);
+    }
 }