Mastodon
/
mastodon-app-ufficiale-android
mirror of https://github.com/mastodon/mastodon-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix crash on duplicate custom emojis 

Fixes #274

Add a merge function to `Collectors.toMap` to discard any duplicate custom emojis that may be returned if a user uses the same custom emoji in both their name and profile.
This commit is contained in:
David Hewitt 2022-11-01 14:45:00 +00:00
parent 0ee494bcfc
commit 244f2ed911
No known key found for this signature in database
GPG Key ID: DF8BD0CF898CA8BA
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mastodon/src/main/java/org/joinmastodon/android/ui/text/HtmlParser.java
View File

@ -129,7 +129,16 @@ public class HtmlParser{
} }
public static void parseCustomEmoji(SpannableStringBuilder ssb, List<Emoji> emojis){ public static void parseCustomEmoji(SpannableStringBuilder ssb, List<Emoji> emojis){
Map<String, Emoji> emojiByCode=emojis.stream().collect(Collectors.toMap(e->e.shortcode, Function.identity())); Map<String, Emoji> emojiByCode =
emojis.stream()
.collect(
Collectors.toMap(e->e.shortcode, Function.identity(), (emoji1, emoji2) -> {
// Ignore duplicate shortcodes and just take the first, it will be
// the same emoji anyway
return emoji1;
})
);
Matcher matcher=EMOJI_CODE_PATTERN.matcher(ssb); Matcher matcher=EMOJI_CODE_PATTERN.matcher(ssb);
int spanCount=0; int spanCount=0;
CustomEmojiSpan lastSpan=null; CustomEmojiSpan lastSpan=null;