From 8011b308c2fad0d73d5f6e498b197530815af2d1 Mon Sep 17 00:00:00 2001
From: Jake McGinty <me@jake.su>
Date: Thu, 14 May 2015 17:38:32 -0700
Subject: [PATCH] invalidateSelf() on the main thread

Closes #3170
// FREEBIE
---
 .../securesms/components/emoji/EmojiProvider.java     | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/org/thoughtcrime/securesms/components/emoji/EmojiProvider.java b/src/org/thoughtcrime/securesms/components/emoji/EmojiProvider.java
index b70e7eaae..858a3f7d1 100644
--- a/src/org/thoughtcrime/securesms/components/emoji/EmojiProvider.java
+++ b/src/org/thoughtcrime/securesms/components/emoji/EmojiProvider.java
@@ -8,6 +8,8 @@ import android.graphics.Paint;
 import android.graphics.PixelFormat;
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
+import android.os.Handler;
+import android.os.Looper;
 import android.text.Spannable;
 import android.text.SpannableStringBuilder;
 import android.text.style.ImageSpan;
@@ -35,6 +37,7 @@ public class EmojiProvider {
   private static volatile EmojiProvider                      instance = null;
   private static final    SparseArray<SoftReference<Bitmap>> bitmaps  = new SparseArray<>();
   private static final    Paint                              paint    = new Paint();
+  private static final    Handler                            handler  = new Handler(Looper.getMainLooper());
   static { paint.setFilterBitmap(true); }
 
   private final SparseArray<DrawInfo> offsets = new SparseArray<>();
@@ -84,7 +87,6 @@ public class EmojiProvider {
         try {
           loadPage(page);
           if (pageLoadListener != null) {
-            Log.w(TAG, "onPageLoaded("+page+")");
             pageLoadListener.onPageLoaded();
           }
         } catch (IOException ioe) {
@@ -107,6 +109,7 @@ public class EmojiProvider {
       final InputStream bitmapStream  = context.getAssets().open(file);
       final Bitmap      bitmap        = BitmapUtil.createScaledBitmap(measureStream, bitmapStream, (float) bigDrawSize / (float) EMOJI_RAW_SIZE);
       bitmaps.put(page, new SoftReference<>(bitmap));
+      Log.w(TAG, "onPageLoaded(" + page + ")");
     } catch (IOException ioe) {
       Log.w(TAG, ioe);
       throw ioe;
@@ -172,7 +175,11 @@ public class EmojiProvider {
       if (bitmaps.get(page) == null || bitmaps.get(page).get() == null) {
         preloadPage(page, new PageLoadedListener() {
           @Override public void onPageLoaded() {
-            invalidateSelf();
+            handler.post(new Runnable() {
+              @Override public void run() {
+                invalidateSelf();
+              }
+            });
           }
         });
         return;