empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Don't allow borderless images to have quotes attached.

Browse source 
Fixes #9924
This commit is contained in:
Greyson Parrelli 2020-09-24 12:11:40 -04:00
parent dbbded5250
commit fea14218a9
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java
View file

@ -3334,7 +3334,6 @@ public class ConversationActivity extends PassphraseRequiredActivity
long expiresIn = recipient.get().getExpireMessages() * 1000L; long expiresIn = recipient.get().getExpireMessages() * 1000L;
int subscriptionId = sendButton.getSelectedTransport().getSimSubscriptionId().or(-1); int subscriptionId = sendButton.getSelectedTransport().getSimSubscriptionId().or(-1);
boolean initiating = threadId == -1; boolean initiating = threadId == -1;
QuoteModel quote = inputPanel.getQuote().orNull();
SlideDeck slideDeck = new SlideDeck(); SlideDeck slideDeck = new SlideDeck();
if (MediaUtil.isGif(contentType)) { if (MediaUtil.isGif(contentType)) {
@ -3348,7 +3347,7 @@ public class ConversationActivity extends PassphraseRequiredActivity
sendMediaMessage(isSmsForced(), sendMediaMessage(isSmsForced(),
"", "",
slideDeck, slideDeck,
quote, null,
Collections.emptyList(), Collections.emptyList(),
Collections.emptyList(), Collections.emptyList(),
composeText.getMentions(), composeText.getMentions(),
@ -3356,7 +3355,7 @@ public class ConversationActivity extends PassphraseRequiredActivity
false, false,
subscriptionId, subscriptionId,
initiating, initiating,
true); false);
} }
private class UnverifiedDismissedListener implements UnverifiedBannerView.DismissListener { private class UnverifiedDismissedListener implements UnverifiedBannerView.DismissListener {