Merge branch 'feature/cw-above-text' into fork

2022-11-17 00:56:08 +01:00
parent 0a711ca4ba 753624a185
commit 7bcfd8939e
7 changed files with 67 additions and 10 deletions
--- a/mastodon/src/main/java/org/joinmastodon/android/model/Status.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/model/Status.java
@@ -1,5 +1,6 @@
 package org.joinmastodon.android.model;

+import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.api.ObjectValidationException;
 import org.joinmastodon.android.api.RequiredField;
 import org.joinmastodon.android.events.StatusCountersUpdatedEvent;
@@ -78,7 +79,7 @@ public class Status extends BaseModel implements DisplayItemsParent{
 		if(reblog!=null)
 			reblog.postprocess();

-		spoilerRevealed=!sensitive;
+		spoilerRevealed=GlobalUserPreferences.alwaysExpandContentWarnings || !sensitive;
 	}

 	@Override