From d58041773aa702dfeb556bea2426a66ded6f9dd1 Mon Sep 17 00:00:00 2001
From: Conny Duck <k.pozniak@gmx.at>
Date: Tue, 27 Nov 2018 21:07:15 +0100
Subject: [PATCH] fix crash in ComposeActivity when loading no Emojis

---
 app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java b/app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java
index cf693246..8894249b 100644
--- a/app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java
+++ b/app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java
@@ -313,6 +313,9 @@ public final class ComposeActivity
                 @Override
                 public void onResponse(@NonNull Call<List<Emoji>> call, @NonNull Response<List<Emoji>> response) {
                     emojiList = response.body();
+                    if(emojiList == null) {
+                        emojiList = Collections.emptyList();
+                    }
                     Collections.sort(emojiList, (a, b) -> a.getShortcode().toLowerCase().compareTo(b.getShortcode().toLowerCase()));
                     setEmojiList(emojiList);
                     cacheInstanceMetadata(activeAccount);