Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-18 15:56:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix rendering when editing a message with spoilers.

Browse Source
This commit is contained in:
Cody Henthorne
2023-06-21 13:08:00 -04:00
parent 1d0a87f52a
commit 15035f4eb3
2 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/thoughtcrime/securesms/components/InputPanel.java
View File

@@ -45,6 +45,7 @@ import org.thoughtcrime.securesms.components.emoji.MediaKeyboard;
import org.thoughtcrime.securesms.components.voice.VoiceNotePlaybackState;
import org.thoughtcrime.securesms.conversation.ConversationMessage;
import org.thoughtcrime.securesms.conversation.ConversationStickerSuggestionAdapter;
import org.thoughtcrime.securesms.conversation.MessageStyler;
import org.thoughtcrime.securesms.conversation.VoiceNoteDraftView;
import org.thoughtcrime.securesms.database.DraftTable;
import org.thoughtcrime.securesms.database.model.MediaMmsMessageRecord;
@@ -396,6 +397,7 @@ public class InputPanel extends LinearLayout
public void enterEditMessageMode(@NonNull GlideRequests glideRequests, @NonNull ConversationMessage conversationMessageToEdit, boolean fromDraft) {
SpannableString textToEdit = conversationMessageToEdit.getDisplayBody(getContext());
if (!fromDraft) {
MessageStyler.convertSpoilersToComposeMode(textToEdit);
composeText.setText(textToEdit);
composeText.setSelection(textToEdit.length());
}

16
app/src/main/java/org/thoughtcrime/securesms/conversation/MessageStyler.kt
View File

@@ -261,6 +261,22 @@ object MessageStyler {
}
}
@JvmStatic
fun convertSpoilersToComposeMode(text: Spannable) {
SpoilerAnnotation.getSpoilerAndClickAnnotations(text)
.forEach { (spoiler, clickSpan) ->
val start = text.getSpanStart(spoiler)
val end = text.getSpanEnd(spoiler)
val convertedSpoiler = copyStyleSpan(spoiler, start, end - start)
text.removeSpan(spoiler)
text.setSpan(convertedSpoiler, start, end, SPAN_FLAGS)
if (clickSpan != null) {
text.removeSpan(clickSpan)
}
}
}
fun Any.isSupportedStyle(): Boolean {
return when (this) {
is CharacterStyle -> isSupportedCharacterStyle()