1 files changed, 8 insertions, 10 deletions
diff --git a/main/src/cgeo/geocaching/connector/oc/OkapiClient.java b/main/src/cgeo/geocaching/connector/oc/OkapiClient.java
index 189b6a4..309969e 100644
--- a/main/src/cgeo/geocaching/connector/oc/OkapiClient.java
+++ b/main/src/cgeo/geocaching/connector/oc/OkapiClient.java
@@ -1,12 +1,12 @@
 package cgeo.geocaching.connector.oc;
 
+import cgeo.geocaching.DataStore;
 import cgeo.geocaching.Geocache;
 import cgeo.geocaching.Image;
 import cgeo.geocaching.LogEntry;
 import cgeo.geocaching.R;
 import cgeo.geocaching.Waypoint;
-import cgeo.geocaching.cgData;
-import cgeo.geocaching.cgeoapplication;
+import cgeo.geocaching.CgeoApplication;
 import cgeo.geocaching.connector.ConnectorFactory;
 import cgeo.geocaching.connector.IConnector;
 import cgeo.geocaching.connector.LogResult;
@@ -265,7 +265,7 @@ final class OkapiClient {
 
             parseCoreCache(response, cache);
 
-            cgData.saveCache(cache, EnumSet.of(SaveFlag.SAVE_CACHE));
+            DataStore.saveCache(cache, EnumSet.of(SaveFlag.SAVE_CACHE));
         } catch (final JSONException e) {
             Log.e("OkapiClient.parseSmallCache", e);
         }
@@ -297,7 +297,7 @@ final class OkapiClient {
             final StringBuilder description = new StringBuilder(500);
             if (!response.isNull("gc_code")) {
                 final String gccode = response.getString("gc_code");
-                description.append(cgeoapplication.getInstance().getResources()
+                description.append(CgeoApplication.getInstance().getResources()
                         .getString(R.string.cache_listed_on, GCConnector.getInstance().getName()))
                         .append(": <a href=\"http://coord.info/")
                         .append(gccode)
@@ -316,11 +316,9 @@ final class OkapiClient {
             if (images != null) {
                 for (int i = 0; i < images.length(); i++) {
                     final JSONObject imageResponse = images.getJSONObject(i);
-                    if (imageResponse.getBoolean(CACHE_IMAGE_IS_SPOILER)) {
-                        final String title = imageResponse.getString(CACHE_IMAGE_CAPTION);
-                        final String url = absoluteUrl(imageResponse.getString(CACHE_IMAGE_URL), cache.getGeocode());
-                        cache.addSpoiler(new Image(url, title));
-                    }
+                    final String title = imageResponse.getString(CACHE_IMAGE_CAPTION);
+                    final String url = absoluteUrl(imageResponse.getString(CACHE_IMAGE_URL), cache.getGeocode());
+                    cache.addSpoiler(new Image(url, title));
                 }
             }
 
@@ -340,7 +338,7 @@ final class OkapiClient {
 
             cache.setDetailedUpdatedNow();
             // save full detailed caches
-            cgData.saveCache(cache, EnumSet.of(SaveFlag.SAVE_DB));
+            DataStore.saveCache(cache, EnumSet.of(SaveFlag.SAVE_DB));
         } catch (final JSONException e) {
             Log.e("OkapiClient.parseCache", e);
         }