From 77e0e06874ccec54cc3c9205ddf6120fcb945908 Mon Sep 17 00:00:00 2001
From: Floens <floens@gmail.com>
Date: Sat, 9 May 2015 22:44:43 +0200
Subject: [PATCH] Add spoiler support

---
 .../src/main/java/org/floens/chan/core/model/PostImage.java   | 4 +++-
 .../org/floens/chan/core/presenter/ImageViewerPresenter.java  | 4 ++--
 .../java/org/floens/chan/core/presenter/ThreadPresenter.java  | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Clover/app/src/main/java/org/floens/chan/core/model/PostImage.java b/Clover/app/src/main/java/org/floens/chan/core/model/PostImage.java
index 291ec304..0469dce8 100644
--- a/Clover/app/src/main/java/org/floens/chan/core/model/PostImage.java
+++ b/Clover/app/src/main/java/org/floens/chan/core/model/PostImage.java
@@ -12,10 +12,11 @@ public class PostImage {
     public String extension;
     public int imageWidth;
     public int imageHeight;
+    public boolean spoiler;
 
     public Type type;
 
-    public PostImage(String originalName, String thumbnailUrl, String imageUrl, String filename, String extension, int imageWidth, int imageHeight) {
+    public PostImage(String originalName, String thumbnailUrl, String imageUrl, String filename, String extension, int imageWidth, int imageHeight, boolean spoiler) {
         this.originalName = originalName;
         this.thumbnailUrl = thumbnailUrl;
         this.imageUrl = imageUrl;
@@ -23,6 +24,7 @@ public class PostImage {
         this.extension = extension;
         this.imageWidth = imageWidth;
         this.imageHeight = imageHeight;
+        this.spoiler = spoiler;
 
         switch (extension) {
             case "gif":
diff --git a/Clover/app/src/main/java/org/floens/chan/core/presenter/ImageViewerPresenter.java b/Clover/app/src/main/java/org/floens/chan/core/presenter/ImageViewerPresenter.java
index 64e7665d..7b7c8803 100644
--- a/Clover/app/src/main/java/org/floens/chan/core/presenter/ImageViewerPresenter.java
+++ b/Clover/app/src/main/java/org/floens/chan/core/presenter/ImageViewerPresenter.java
@@ -155,7 +155,7 @@ public class ImageViewerPresenter implements MultiImageView.Callback, ViewPager.
     private void onLowResInCenter() {
         PostImage postImage = images.get(selectedPosition);
 
-        if (imageAutoLoad) {
+        if (imageAutoLoad && !postImage.spoiler) {
             if (postImage.type == PostImage.Type.STATIC) {
                 callback.setImageMode(postImage, MultiImageView.Mode.BIGIMAGE);
             } else if (postImage.type == PostImage.Type.GIF) {
@@ -171,7 +171,7 @@ public class ImageViewerPresenter implements MultiImageView.Callback, ViewPager.
         // Don't mistake a swipe when the pager is disabled as a tap
         if (viewPagerVisible) {
             PostImage postImage = images.get(selectedPosition);
-            if (imageAutoLoad) {
+            if (imageAutoLoad && !postImage.spoiler) {
                 if (movieAutoLoad) {
                     onExit();
                 } else {
diff --git a/Clover/app/src/main/java/org/floens/chan/core/presenter/ThreadPresenter.java b/Clover/app/src/main/java/org/floens/chan/core/presenter/ThreadPresenter.java
index 102af1c1..efbb7c63 100644
--- a/Clover/app/src/main/java/org/floens/chan/core/presenter/ThreadPresenter.java
+++ b/Clover/app/src/main/java/org/floens/chan/core/presenter/ThreadPresenter.java
@@ -231,7 +231,7 @@ public class ThreadPresenter implements ChanLoader.ChanLoaderCallback, PostAdapt
         for (int i = 0; i < chanLoader.getThread().posts.size(); i++) {
             Post item = chanLoader.getThread().posts.get(i);
             if (item.hasImage) {
-                images.add(new PostImage(String.valueOf(item.tim), item.thumbnailUrl, item.imageUrl, item.filename, item.ext, item.imageWidth, item.imageHeight));
+                images.add(new PostImage(String.valueOf(item.tim), item.thumbnailUrl, item.imageUrl, item.filename, item.ext, item.imageWidth, item.imageHeight, item.spoiler));
                 if (item.no == post.no) {
                     index = images.size() - 1;
                 }