From b8ca0e57adcc580b5706f1fe8c7bc9d32dd99544 Mon Sep 17 00:00:00 2001
From: Sam Lanning <sam@samlanning.com>
Date: Fri, 2 Jan 2015 21:22:42 +0000
Subject: [PATCH] Only initialise EmojiGrid when not in edit mode

Suppress initialisation of the emoji_grid_layout.xml when the
EmojiDrawer is being used in a layout where the editor is shown,
 to prevent an NPE when an editor is being used.

// FREEBIE

Closes #2288
---
 src/org/thoughtcrime/securesms/components/EmojiDrawer.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/org/thoughtcrime/securesms/components/EmojiDrawer.java b/src/org/thoughtcrime/securesms/components/EmojiDrawer.java
index ed5cb15b7c..b37b464bb9 100644
--- a/src/org/thoughtcrime/securesms/components/EmojiDrawer.java
+++ b/src/org/thoughtcrime/securesms/components/EmojiDrawer.java
@@ -74,7 +74,10 @@ public class EmojiDrawer extends KeyboardAwareLinearLayout {
     inflater.inflate(R.layout.emoji_drawer, this, true);
 
     initializeResources();
-    initializeEmojiGrid();
+
+    if (!this.isInEditMode()) {
+      initializeEmojiGrid();
+    }
   }
 
   private void initializeResources() {