From 4dea7d2a52b994fcda1399e119589c43a262060c Mon Sep 17 00:00:00 2001 From: Grishka Date: Wed, 11 Oct 2023 00:27:26 +0300 Subject: [PATCH] Retain CWs but expand them when showCWs setting is off #323, closes #87 --- .../android/ui/displayitems/StatusDisplayItem.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java index 73cb85d4..3e78fdef 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java +++ b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java @@ -125,11 +125,11 @@ public abstract class StatusDisplayItem{ items.add(spoilerItem); contentItems=spoilerItem.contentItems; status.spoilerRevealed=false; - }else if(!TextUtils.isEmpty(statusForContent.spoilerText) && AccountSessionManager.get(accountID).getLocalPreferences().showCWs){ + }else if(!TextUtils.isEmpty(statusForContent.spoilerText)){ SpoilerStatusDisplayItem spoilerItem=new SpoilerStatusDisplayItem(parentID, fragment, null, status, statusForContent, Type.SPOILER); items.add(spoilerItem); contentItems=spoilerItem.contentItems; - status.spoilerRevealed=false; + status.spoilerRevealed=!AccountSessionManager.get(accountID).getLocalPreferences().showCWs; }else{ contentItems=items; }