From b8f97a7072d37e6aab26238a5620991b0b8a14ce Mon Sep 17 00:00:00 2001
From: lookshe <github@lookshe.org>
Date: Tue, 29 Mar 2016 20:58:44 +0200
Subject: Fixes FS#174: Displaying of ASCII emoticons differs

---
 .../java/github/ankushsachdeva/emojicon/EmojiconHandler.java  | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'libs/emojicon/src/main/java/github/ankushsachdeva/emojicon/EmojiconHandler.java')

diff --git a/libs/emojicon/src/main/java/github/ankushsachdeva/emojicon/EmojiconHandler.java b/libs/emojicon/src/main/java/github/ankushsachdeva/emojicon/EmojiconHandler.java
index f611a263..b6804b6d 100644
--- a/libs/emojicon/src/main/java/github/ankushsachdeva/emojicon/EmojiconHandler.java
+++ b/libs/emojicon/src/main/java/github/ankushsachdeva/emojicon/EmojiconHandler.java
@@ -1445,7 +1445,7 @@ public final class EmojiconHandler {
         map.put(Pattern.compile(smile), resource);
     }
 
-    private static boolean getSmiledText(Context context, Spannable spannable) {
+    private static boolean getSmiledText(Context context, Spannable spannable, int size) {
         // remove spans throughout all text
         EmojiconImageSpan[] oldSpans = spannable.getSpans(0, spannable.length(), EmojiconImageSpan.class);
         for (int i = 0; i < oldSpans.length; i++) {
@@ -1495,7 +1495,7 @@ public final class EmojiconHandler {
                     }
                 }
                 if (set) {
-                    spannable.setSpan(new EmojiconImageSpan(context, entry.getValue()),
+                    spannable.setSpan(new EmojiconImageSpan(context, entry.getValue(), size),
                             matcher.start(), matcher.end(),
                             Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
                     hasChanges = true;
@@ -1514,9 +1514,10 @@ public final class EmojiconHandler {
      * @param index
      * @param length
      */
-    public static void addEmojis(Context context, Spannable text, int emojiSize, int index, int length) {
+    public static boolean addEmojis(Context context, Spannable text, int emojiSize, int index, int length) {
+        boolean hasChanges = false;
         if (isParseEmoticons()) {
-            getSmiledText(context, text);
+            hasChanges = getSmiledText(context, text, emojiSize);
         }
         int textLength = text.length();
         int textLengthToProcessMax = textLength - index;
@@ -1633,7 +1634,9 @@ public final class EmojiconHandler {
 
             if (icon > 0) {
                 text.setSpan(new EmojiconSpan(context, icon, emojiSize), i, i + skip, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+                hasChanges = true;
             }
         }
+        return hasChanges;
     }
 }
-- 
cgit v1.2.3