From 683fb8f0f0e22a5c7a640f34c141aea01642ff60 Mon Sep 17 00:00:00 2001
From: Levi Bard <taktaktaktaktaktaktaktaktaktak@gmail.com>
Date: Tue, 17 Mar 2020 19:46:32 +0100
Subject: [PATCH] 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
---
 .../keylesspalace/tusky/components/compose/ComposeViewModel.kt  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/com/keylesspalace/tusky/components/compose/ComposeViewModel.kt b/app/src/main/java/com/keylesspalace/tusky/components/compose/ComposeViewModel.kt
index 166b6499..cb820c25 100644
--- 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,