From 9d3cebf4302ffe1d975c8b84963e281633562768 Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Thu, 25 Feb 2021 09:29:25 -0500
Subject: [PATCH] Fix possible NPE in ConversationListAdapter.

---
 .../securesms/conversationlist/ConversationListAdapter.java   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListAdapter.java b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListAdapter.java
index e5433fa2c6..2644fa7698 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListAdapter.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListAdapter.java
@@ -175,6 +175,10 @@ class ConversationListAdapter extends ListAdapter<Conversation, RecyclerView.Vie
   public long getItemId(int position) {
     Conversation item = getItem(position);
 
+    if (item == null) {
+      return 0;
+    }
+
     switch (item.getType()) {
       case THREAD:          return item.getThreadRecord().getThreadId();
       case PINNED_HEADER:   return -1;