Ensure media are marked sensitive any time there's a content warning (#1728)

Addresses the most critical part of #1725, and may also apply to #1721
4 years ago · 683fb8f0f0
parent 7d9f1c8e9a
commit 683fb8f0f0
1 changed files with 1 additions and 1 deletions
--- a/app/src/main/java/com/keylesspalace/tusky/components/compose/ComposeViewModel.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/components/compose/ComposeViewModel.kt
@ -309,7 +309,7 @@ class ComposeViewModel
                            content,
                            spoilerText,
                            statusVisibility.value!!.serverString(),
-                            mediaUris.isNotEmpty() && markMediaAsSensitive.value!!,
+                            mediaUris.isNotEmpty() && (markMediaAsSensitive.value!! || showContentWarning.value!!),
                            mediaIds,
                            mediaUris.map { it.toString() },
                            mediaDescriptions,