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

Support Quote reply with Sticker/Contact/Docs

Browse source
This commit is contained in:
Sagar 2025-01-19 20:11:33 +05:30
parent 28c280947f
commit 79ad46117d
2 changed files with 16 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java
View file

@ -81,7 +81,6 @@ import org.thoughtcrime.securesms.attachments.DatabaseAttachment;
import org.thoughtcrime.securesms.badges.BadgeImageView;
import org.thoughtcrime.securesms.badges.gifts.GiftMessageView;
import org.thoughtcrime.securesms.badges.gifts.OpenableGift;
import org.thoughtcrime.securesms.billing.upgrade.UpgradeToStartMediaBackupSheet;
import org.thoughtcrime.securesms.calls.links.CallLinks;
import org.thoughtcrime.securesms.components.AlertView;
import org.thoughtcrime.securesms.components.AudioView;
@ -145,7 +144,6 @@ import org.thoughtcrime.securesms.util.MessageRecordUtil;
import org.thoughtcrime.securesms.util.PlaceholderURLSpan;
import org.thoughtcrime.securesms.util.Projection;
import org.thoughtcrime.securesms.util.ProjectionList;
import org.thoughtcrime.securesms.util.RemoteConfig;
import org.thoughtcrime.securesms.util.SearchUtil;
import org.thoughtcrime.securesms.util.ThemeUtil;
import org.thoughtcrime.securesms.util.UrlClickHandler;
@ -680,6 +678,12 @@ public final class ConversationItem extends RelativeLayout implements BindableCo
int availableWidth;
if (hasAudio(messageRecord)) {
availableWidth = audioViewStub.get().getMeasuredWidth() + ViewUtil.getLeftMargin(audioViewStub.get()) + ViewUtil.getRightMargin(audioViewStub.get());
} else if((hasSticker(messageRecord) && isCaptionlessMms(messageRecord)) || isBorderless(messageRecord)) {
availableWidth = stickerStub.get().getMeasuredWidth() + ViewUtil.getLeftMargin(stickerStub.get()) + ViewUtil.getRightMargin(stickerStub.get());
} else if(hasSharedContact(messageRecord)) {
availableWidth = sharedContactStub.get().getMeasuredWidth() + ViewUtil.getLeftMargin(sharedContactStub.get()) + ViewUtil.getRightMargin(sharedContactStub.get());
} else if(hasDocument(messageRecord)) {
availableWidth = documentViewStub.get().getMeasuredWidth() + ViewUtil.getLeftMargin(documentViewStub.get()) + ViewUtil.getRightMargin(documentViewStub.get());
} else if (!isViewOnceMessage(messageRecord) && (hasThumbnail(messageRecord) || hasBigImageLinkPreview(messageRecord))) {
availableWidth = mediaThumbnailStub.require().getMeasuredWidth();
} else {

25
app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt
View file

@ -804,8 +804,7 @@ class ConversationFragment :
override fun onStickerSelected(sticker: StickerRecord) {
sendSticker(
stickerRecord = sticker,
clearCompose = false
stickerRecord = sticker
)
}
@ -1521,7 +1520,7 @@ class ConversationFragment :
when (data) {
is ShareOrDraftData.SendKeyboardImage -> sendMessageWithoutComposeInput(slide = data.slide, clearCompose = false)
is ShareOrDraftData.SendSticker -> sendMessageWithoutComposeInput(slide = data.slide, clearCompose = true)
is ShareOrDraftData.SendSticker -> sendMessageWithoutComposeInput(slide = data.slide)
is ShareOrDraftData.SetText -> composeText.setDraftText(data.text)
is ShareOrDraftData.SetLocation -> attachmentManager.setLocation(data.location, MediaConstraints.getPushMediaConstraints())
is ShareOrDraftData.SetEditMessage -> {
@ -1809,8 +1808,7 @@ class ConversationFragment :
}
private fun sendSticker(
stickerRecord: StickerRecord,
clearCompose: Boolean
stickerRecord: StickerRecord
) {
val stickerLocator = StickerLocator(stickerRecord.packId, stickerRecord.packKey, stickerRecord.stickerId, stickerRecord.emoji)
val slide = StickerSlide(
@ -1821,7 +1819,7 @@ class ConversationFragment :
stickerRecord.contentType
)
sendMessageWithoutComposeInput(slide = slide, clearCompose = clearCompose)
sendMessageWithoutComposeInput(slide = slide)
viewModel.updateStickerLastUsedTime(stickerRecord, System.currentTimeMillis().milliseconds)
}
@ -1829,7 +1827,6 @@ class ConversationFragment :
private fun sendMessageWithoutComposeInput(
slide: Slide? = null,
contacts: List<Contact> = emptyList(),
quote: QuoteModel? = null,
clearCompose: Boolean = true
) {
sendMessage(
@ -1840,7 +1837,6 @@ class ConversationFragment :
mentions = emptyList(),
bodyRanges = null,
messageToEdit = null,
quote = quote,
linkPreviews = emptyList(),
bypassPreSendSafetyNumberCheck = true
)
@ -1889,12 +1885,12 @@ class ConversationFragment :
if (slideDeck == null) {
val voiceNote: DraftTable.Draft? = draftViewModel.voiceNoteDraft
if (voiceNote != null) {
sendMessageWithoutComposeInput(slide = AudioSlide.createFromVoiceNoteDraft(voiceNote), clearCompose = true)
sendMessageWithoutComposeInput(slide = AudioSlide.createFromVoiceNoteDraft(voiceNote))
return
}
}
if (body.isNullOrBlank() && slideDeck?.containsMediaSlide() != true && preUploadResults.isEmpty() && contacts.isEmpty()) {
if (body.isBlank() && slideDeck?.containsMediaSlide() != true && preUploadResults.isEmpty() && contacts.isEmpty()) {
Log.i(TAG, "Unable to send due to empty message")
toast(R.string.ConversationActivity_message_is_empty_exclamation)
return
@ -3677,8 +3673,7 @@ class ConversationFragment :
private inner class ActivityResultCallbacks : ConversationActivityResultContracts.Callbacks {
override fun onSendContacts(contacts: List<Contact>) {
sendMessageWithoutComposeInput(
contacts = contacts,
clearCompose = false
contacts = contacts
)
}
@ -4129,8 +4124,7 @@ class ConversationFragment :
override fun onStickerSuggestionSelected(sticker: StickerRecord) {
sendSticker(
stickerRecord = sticker,
clearCompose = true
stickerRecord = sticker
)
}
@ -4414,8 +4408,7 @@ class ConversationFragment :
val audioSlide = AudioSlide(draft.uri, draft.size, MediaUtil.AUDIO_AAC, true)
sendMessageWithoutComposeInput(
slide = audioSlide,
quote = inputPanel.quote.orNull()
slide = audioSlide
)
}