Don't allow borderless images to have quotes attached.

Fixes #9924
signalapp · Sep 24, 2020 · fea1421 · fea1421
1 parent dbbded5
commit fea1421
Showing 1 changed file with 2 additions and 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
@@ -3334,7 +3334,6 @@ private void sendKeyboardImage(@NonNull Uri uri, @NonNull String contentType, @N
     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,15 +3347,15 @@ private void sendKeyboardImage(@NonNull Uri uri, @NonNull String contentType, @N
     sendMediaMessage(isSmsForced(),
                      "",
                      slideDeck,
-                     quote,
+                     null,
                      Collections.emptyList(),
                      Collections.emptyList(),
                      composeText.getMentions(),
                      expiresIn,
                      false,
                      subscriptionId,
                      initiating,
-                     true);
+                     false);
   }
 
   private class UnverifiedDismissedListener implements UnverifiedBannerView.DismissListener {