From 8b1a059abb159d2c901b7540cfe436cf020c1e55 Mon Sep 17 00:00:00 2001 From: Alibek Omarov Date: Mon, 3 Feb 2020 22:34:28 +0600 Subject: [PATCH] Fix NPE --- .../com/keylesspalace/tusky/viewdata/NotificationViewData.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/com/keylesspalace/tusky/viewdata/NotificationViewData.java b/app/src/main/java/com/keylesspalace/tusky/viewdata/NotificationViewData.java index 32d66efb..c1cb2304 100644 --- 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));