From fbd04cbe7bfb0b72ce0b6611700e3903812057b8 Mon Sep 17 00:00:00 2001 From: Konrad Pozniak Date: Thu, 25 Jul 2019 12:17:07 +0200 Subject: [PATCH] fix the "always mark media as sensitive" setting not being respected (#1407) --- .../java/com/keylesspalace/tusky/ComposeActivity.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java b/app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java index 28cea2e50..b49b4c687 100644 --- a/app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java +++ b/app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java @@ -518,7 +518,7 @@ public final class ComposeActivity replyContentTextView.setText(intent.getStringExtra(REPLYING_STATUS_CONTENT_EXTRA)); } - statusMarkSensitive = intent.getBooleanExtra(SENSITIVE_EXTRA, false); + statusMarkSensitive = intent.getBooleanExtra(SENSITIVE_EXTRA, statusMarkSensitive); } // After the starting state is finalised, the interface can be set to reflect this state. @@ -1963,7 +1963,8 @@ public final class ComposeActivity private String replyingStatusContent; @Nullable private ArrayList mediaAttachments; - private boolean sensitive = false; + @Nullable + private Boolean sensitive; public IntentBuilder savedTootUid(int uid) { @@ -2071,7 +2072,9 @@ public final class ComposeActivity if (mediaAttachments != null) { intent.putParcelableArrayListExtra(MEDIA_ATTACHMENTS_EXTRA, mediaAttachments); } - intent.putExtra(SENSITIVE_EXTRA, sensitive); + if(sensitive != null) { + intent.putExtra(SENSITIVE_EXTRA, sensitive); + } return intent; } }