owen/moshidon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #414 from TheMemeSniper/fix-autoreveal-cw

Browse Source 
fix: make autoexpand content warning option also expand cws that start with "re:"
This commit is contained in:
LucasGGamerM
2024-05-26 11:49:02 -03:00
committed by GitHub
parent d2704c1f0d 2df6d9ce60
commit 18ac0423c0
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
mastodon/src/main/java/org/joinmastodon/android/fragments/ThreadFragment.java
View File

@@ -230,10 +230,13 @@ public class ThreadFragment extends StatusListFragment implements ProvidesAssist
s.filterRevealed = oldStatus.filterRevealed; s.filterRevealed = oldStatus.filterRevealed;
} }
if (GlobalUserPreferences.autoRevealEqualSpoilers != AutoRevealMode.NEVER && if (GlobalUserPreferences.autoRevealEqualSpoilers != AutoRevealMode.NEVER &&
s.spoilerText != null && s.spoilerText != null){
s.spoilerText.equals(mainStatus.spoilerText)) { if (s.spoilerText.equals(mainStatus.spoilerText) ||
if (GlobalUserPreferences.autoRevealEqualSpoilers == AutoRevealMode.DISCUSSIONS || Objects.equals(mainStatus.account.id, s.account.id)) { (s.spoilerText.toLowerCase().startsWith("re: ") &&
s.spoilerRevealed = mainStatus.spoilerRevealed; s.spoilerText.substring(4).equals(mainStatus.spoilerText))){
if (GlobalUserPreferences.autoRevealEqualSpoilers == AutoRevealMode.DISCUSSIONS || Objects.equals(mainStatus.account.id, s.account.id)) {
s.spoilerRevealed = mainStatus.spoilerRevealed;
}
} }
} }
} }