Fix NPE

5 years ago · 8b1a059abb
parent a109089f7b
commit 8b1a059abb
1 changed files with 1 additions and 1 deletions
--- a/app/src/main/java/com/keylesspalace/tusky/viewdata/NotificationViewData.java
+++ b/app/src/main/java/com/keylesspalace/tusky/viewdata/NotificationViewData.java
@ -102,7 +102,7 @@ public abstract class NotificationViewData {
                    type == concrete.type &&
                    Objects.equals(id, concrete.id) &&
                    account.getId().equals(concrete.account.getId()) &&
-                    emoji.equals(concrete.emoji) &&
+                    (emoji != null && concrete.emoji != null && emoji.equals(concrete.emoji)) &&
                    (statusViewData == concrete.statusViewData ||
                            statusViewData != null &&
                                    statusViewData.deepEquals(concrete.statusViewData));