Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2025-12-24 04:58:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Do not jumbo styled emojis.

Browse Source
This commit is contained in:
Cody Henthorne
2023-07-18 16:18:11 -04:00
committed by Nicholas
parent 4910050891
commit 7375a9e06b
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiTextView.java
View File

@@ -34,6 +34,7 @@ import org.thoughtcrime.securesms.components.emoji.parsing.EmojiParser;
import org.thoughtcrime.securesms.components.mention.MentionAnnotation;
import org.thoughtcrime.securesms.components.mention.MentionRendererDelegate;
import org.thoughtcrime.securesms.components.spoiler.SpoilerRendererDelegate;
import org.thoughtcrime.securesms.conversation.MessageStyler;
import org.thoughtcrime.securesms.emoji.JumboEmoji;
import org.thoughtcrime.securesms.keyvalue.SignalStore;
import org.thoughtcrime.securesms.util.Util;
@@ -151,7 +152,12 @@ public class EmojiTextView extends AppCompatTextView {
public void setText(@Nullable CharSequence text, BufferType type) {
EmojiParser.CandidateList candidates = isInEditMode() ? null : EmojiProvider.getCandidates(text);
if (scaleEmojis && candidates != null && candidates.allEmojis && (candidates.hasJumboForAll() || JumboEmoji.canDownloadJumbo(getContext()))) {
if (scaleEmojis &&
candidates != null &&
candidates.allEmojis &&
(candidates.hasJumboForAll() || JumboEmoji.canDownloadJumbo(getContext())) &&
(text instanceof Spanned && !MessageStyler.hasStyling((Spanned) text)))
{
int emojis = candidates.size();
float scale = 1.0f;

2
app/src/main/java/org/thoughtcrime/securesms/util/MessageRecordUtil.kt
View File

@@ -54,7 +54,7 @@ fun MessageRecord.isBorderless(context: Context): Boolean {
}
fun MessageRecord.hasNoBubble(context: Context): Boolean =
hasSticker() || isBorderless(context) || (isTextOnly(context) && isJumbomoji(context))
hasSticker() || isBorderless(context) || (isTextOnly(context) && isJumbomoji(context) && messageRanges?.rangesList?.isEmpty() == true)
fun MessageRecord.hasOnlyThumbnail(context: Context): Boolean {
return hasThumbnail() &&