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
2020-03-17 19:46:32 +01:00 · 2020-03-17 19:46:32 +01:00 · 9c4898117e
commit 9c4898117e
parent 6a87e3e352
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
@ -249,7 +249,7 @@ class ComposeViewModel
                            content,
                            spoilerText,
                            statusVisibility.value!!.serverString(),
-                            mediaUris.isNotEmpty() && markMediaAsSensitive.value!!,
+                            mediaUris.isNotEmpty() && (markMediaAsSensitive.value!! || showContentWarning.value!!),
                            mediaIds,
                            mediaUris.map { it.toString() },
                            mediaDescriptions,