From 0a2c73f2469fe359162b5c973f86ea2e409272ac Mon Sep 17 00:00:00 2001 From: "M. Dietrich" Date: Wed, 3 Sep 2014 17:44:38 +0200 Subject: improve emo mapping --- src/eu/siacs/conversations/utils/UIHelper.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/eu/siacs/conversations/utils/UIHelper.java b/src/eu/siacs/conversations/utils/UIHelper.java index f717c5da..768bc063 100644 --- a/src/eu/siacs/conversations/utils/UIHelper.java +++ b/src/eu/siacs/conversations/utils/UIHelper.java @@ -559,17 +559,20 @@ public class UIHelper { } private static final EmoticonPattern[] patterns = new EmoticonPattern[] { - new EmoticonPattern(":-?\\)", 0x1f603), - new EmoticonPattern(";-?\\)", 0x1f609), new EmoticonPattern(":-?D", 0x1f600), - new EmoticonPattern(":-?[Ppb]", 0x1f60b), - new EmoticonPattern("8-?\\)", 0x1f60e), + new EmoticonPattern("\\^\\^", 0x1f601), + new EmoticonPattern(":'D", 0x1f602), + new EmoticonPattern("\\]-?D", 0x1f608), + new EmoticonPattern(";-?\\)", 0x1f609), + new EmoticonPattern(":-?\\)", 0x1f60a), + new EmoticonPattern("[B8]-?\\)", 0x1f60e), new EmoticonPattern(":-?\\|", 0x1f610), new EmoticonPattern(":-?[/\\\\]", 0x1f615), new EmoticonPattern(":-?\\*", 0x1f617), - new EmoticonPattern(":-?[0Oo]", 0x1f62e), + new EmoticonPattern(":-?[Ppb]", 0x1f61b), new EmoticonPattern(":-?\\(", 0x1f61e), - new EmoticonPattern("\\^\\^", 0x1f601), + new EmoticonPattern(":-?[0Oo]", 0x1f62e), + new EmoticonPattern("\\\\o/", 0x1F631), }; public static String transformAsciiEmoticons(String body) { -- cgit v1.2.3