Move spoiler disabling check to post.finish()

multisite
Floens 9 years ago
parent 5f0e99e55a
commit d2e2b23ca7
  1. 5
      Clover/app/src/main/java/org/floens/chan/core/model/Post.java
  2. 3
      Clover/app/src/main/java/org/floens/chan/core/net/ChanReaderRequest.java

@ -23,6 +23,7 @@ import android.text.TextUtils;
import org.floens.chan.Chan; import org.floens.chan.Chan;
import org.floens.chan.chan.ChanParser; import org.floens.chan.chan.ChanParser;
import org.floens.chan.chan.ChanUrls; import org.floens.chan.chan.ChanUrls;
import org.floens.chan.core.settings.ChanSettings;
import org.jsoup.parser.Parser; import org.jsoup.parser.Parser;
import java.util.ArrayList; import java.util.ArrayList;
@ -182,6 +183,10 @@ public class Post {
countryUrl = ChanUrls.getCountryFlagUrl(country); countryUrl = ChanUrls.getCountryFlagUrl(country);
} }
if (ChanSettings.revealImageSpoilers.get()) {
spoiler = false;
}
ChanParser.getInstance().parse(this); ChanParser.getInstance().parse(this);
repliesTo = Collections.unmodifiableSet(repliesTo); repliesTo = Collections.unmodifiableSet(repliesTo);

@ -30,7 +30,6 @@ import org.floens.chan.core.manager.FilterEngine;
import org.floens.chan.core.model.Filter; import org.floens.chan.core.model.Filter;
import org.floens.chan.core.model.Loadable; import org.floens.chan.core.model.Loadable;
import org.floens.chan.core.model.Post; import org.floens.chan.core.model.Post;
import org.floens.chan.core.settings.ChanSettings;
import org.floens.chan.utils.Time; import org.floens.chan.utils.Time;
import java.util.ArrayList; import java.util.ArrayList;
@ -411,7 +410,7 @@ public class ChanReaderRequest extends JsonReaderRequest<ChanReaderRequest.ChanR
post.images = reader.nextInt(); post.images = reader.nextInt();
break; break;
case "spoiler": case "spoiler":
post.spoiler = reader.nextInt() == 1 && !ChanSettings.revealImageSpoilers.get(); post.spoiler = reader.nextInt() == 1;
break; break;
case "unique_ips": case "unique_ips":
post.uniqueIps = reader.nextInt(); post.uniqueIps = reader.nextInt();

Loading…
Cancel
Save