owen/moshidon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #275 from davidmhewitt/fix-duplicate-emoji-crash

Browse Source 
Fix crash on duplicate custom emojis
This commit is contained in:
Gregory K
2022-11-01 21:51:24 +03:00
committed by GitHub
parent 0ee494bcfc 244f2ed911
commit 4f8f698911
1 changed files with 10 additions and 1 deletions
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;