From 9887a556a30960ff00aea010b2c566b56e16208c Mon Sep 17 00:00:00 2001
From: Bananeweizen <bananeweizen@gmx.de>
Date: Thu, 8 Nov 2012 18:08:56 +0100
Subject: fix #2149: spoilers not shown

---
 main/src/cgeo/geocaching/cgCache.java                  | 7 +++++++
 main/src/cgeo/geocaching/connector/gc/GCParser.java    | 7 +------
 main/src/cgeo/geocaching/connector/oc/OkapiClient.java | 6 +-----
 3 files changed, 9 insertions(+), 11 deletions(-)

(limited to 'main/src')

diff --git a/main/src/cgeo/geocaching/cgCache.java b/main/src/cgeo/geocaching/cgCache.java
index 3ea49e9..461a15e 100644
--- a/main/src/cgeo/geocaching/cgCache.java
+++ b/main/src/cgeo/geocaching/cgCache.java
@@ -685,6 +685,13 @@ public class cgCache implements ICache, IWaypoint {
         return inventory;
     }
 
+    public void addSpoiler(final cgImage spoiler) {
+        if (spoilers == null) {
+            spoilers = new ArrayList<cgImage>();
+        }
+        spoilers.add(spoiler);
+    }
+
     @Override
     public List<cgImage> getSpoilers() {
         if (spoilers == null) {
diff --git a/main/src/cgeo/geocaching/connector/gc/GCParser.java b/main/src/cgeo/geocaching/connector/gc/GCParser.java
index bce3f7d..218d4fc 100644
--- a/main/src/cgeo/geocaching/connector/gc/GCParser.java
+++ b/main/src/cgeo/geocaching/connector/gc/GCParser.java
@@ -543,12 +543,7 @@ public abstract class GCParser {
                 if (matcherSpoilersInside.group(3) != null) {
                     description = matcherSpoilersInside.group(3);
                 }
-                final cgImage spoiler = new cgImage(url, title, description);
-
-                if (cache.getSpoilers() == null) {
-                    cache.setSpoilers(new ArrayList<cgImage>());
-                }
-                cache.getSpoilers().add(spoiler);
+                cache.addSpoiler(new cgImage(url, title, description));
             }
         } catch (Exception e) {
             // failed to parse cache spoilers
diff --git a/main/src/cgeo/geocaching/connector/oc/OkapiClient.java b/main/src/cgeo/geocaching/connector/oc/OkapiClient.java
index 8bdb9a4..87cc3a1 100644
--- a/main/src/cgeo/geocaching/connector/oc/OkapiClient.java
+++ b/main/src/cgeo/geocaching/connector/oc/OkapiClient.java
@@ -159,11 +159,7 @@ final public class OkapiClient {
                     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());
-                        final cgImage image = new cgImage(url, title);
-                        if (cache.getSpoilers() == null) {
-                            cache.setSpoilers(new ArrayList<cgImage>());
-                        }
-                        cache.getSpoilers().add(image);
+                        cache.addSpoiler(new cgImage(url, title));
                     }
                 }
             }
-- 
cgit v1.1