From fea14218a999d5731a7fa49a3cba9726dc2b0ed9 Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Thu, 24 Sep 2020 12:11:40 -0400
Subject: [PATCH] Don't allow borderless images to have quotes attached.

Fixes #9924
---
 .../securesms/conversation/ConversationActivity.java         | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java
index 2a4e275843..ed7281a67c 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java
@@ -3334,7 +3334,6 @@ public class ConversationActivity extends PassphraseRequiredActivity
     long       expiresIn      = recipient.get().getExpireMessages() * 1000L;
     int        subscriptionId = sendButton.getSelectedTransport().getSimSubscriptionId().or(-1);
     boolean    initiating     = threadId == -1;
-    QuoteModel quote          = inputPanel.getQuote().orNull();
     SlideDeck  slideDeck      = new SlideDeck();
 
     if (MediaUtil.isGif(contentType)) {
@@ -3348,7 +3347,7 @@ public class ConversationActivity extends PassphraseRequiredActivity
     sendMediaMessage(isSmsForced(),
                      "",
                      slideDeck,
-                     quote,
+                     null,
                      Collections.emptyList(),
                      Collections.emptyList(),
                      composeText.getMentions(),
@@ -3356,7 +3355,7 @@ public class ConversationActivity extends PassphraseRequiredActivity
                      false,
                      subscriptionId,
                      initiating,
-                     true);
+                     false);
   }
 
   private class UnverifiedDismissedListener implements UnverifiedBannerView.DismissListener {