From d2e2b23ca794d9d722b9deb21f086adabcc2f9ec Mon Sep 17 00:00:00 2001
From: Floens <floens@gmail.com>
Date: Tue, 16 Aug 2016 12:32:13 +0200
Subject: [PATCH] Move spoiler disabling check to post.finish()

---
 .../app/src/main/java/org/floens/chan/core/model/Post.java   | 5 +++++
 .../java/org/floens/chan/core/net/ChanReaderRequest.java     | 3 +--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/Clover/app/src/main/java/org/floens/chan/core/model/Post.java b/Clover/app/src/main/java/org/floens/chan/core/model/Post.java
index 985975df..3847bcdd 100644
--- a/Clover/app/src/main/java/org/floens/chan/core/model/Post.java
+++ b/Clover/app/src/main/java/org/floens/chan/core/model/Post.java
@@ -23,6 +23,7 @@ import android.text.TextUtils;
 import org.floens.chan.Chan;
 import org.floens.chan.chan.ChanParser;
 import org.floens.chan.chan.ChanUrls;
+import org.floens.chan.core.settings.ChanSettings;
 import org.jsoup.parser.Parser;
 
 import java.util.ArrayList;
@@ -182,6 +183,10 @@ public class Post {
             countryUrl = ChanUrls.getCountryFlagUrl(country);
         }
 
+        if (ChanSettings.revealImageSpoilers.get()) {
+            spoiler = false;
+        }
+
         ChanParser.getInstance().parse(this);
 
         repliesTo = Collections.unmodifiableSet(repliesTo);
diff --git a/Clover/app/src/main/java/org/floens/chan/core/net/ChanReaderRequest.java b/Clover/app/src/main/java/org/floens/chan/core/net/ChanReaderRequest.java
index cb683e69..860ceab1 100644
--- a/Clover/app/src/main/java/org/floens/chan/core/net/ChanReaderRequest.java
+++ b/Clover/app/src/main/java/org/floens/chan/core/net/ChanReaderRequest.java
@@ -30,7 +30,6 @@ import org.floens.chan.core.manager.FilterEngine;
 import org.floens.chan.core.model.Filter;
 import org.floens.chan.core.model.Loadable;
 import org.floens.chan.core.model.Post;
-import org.floens.chan.core.settings.ChanSettings;
 import org.floens.chan.utils.Time;
 
 import java.util.ArrayList;
@@ -411,7 +410,7 @@ public class ChanReaderRequest extends JsonReaderRequest<ChanReaderRequest.ChanR
                     post.images = reader.nextInt();
                     break;
                 case "spoiler":
-                    post.spoiler = reader.nextInt() == 1 && !ChanSettings.revealImageSpoilers.get();
+                    post.spoiler = reader.nextInt() == 1;
                     break;
                 case "unique_ips":
                     post.uniqueIps = reader.nextInt();