From 086b708cf7429faacc5635e4fd23fd690d199470 Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Mon, 17 Aug 2020 10:07:58 -0400
Subject: [PATCH] Fix NPE when double-tapping the conversation pinning icon.

---
 .../conversationlist/ConversationListFragment.java   | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java
index 9df7f0356a..2ca8fcc0ff 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java
@@ -763,7 +763,11 @@ public class ConversationListFragment extends MainFragment implements ActionMode
       db.pinConversations(toPin);
 
       return null;
-    }, unused -> actionMode.finish());
+    }, unused -> {
+      if (actionMode != null) {
+        actionMode.finish();
+      }
+    });
   }
 
   private void handleUnpinAllSelected() {
@@ -775,7 +779,11 @@ public class ConversationListFragment extends MainFragment implements ActionMode
       db.unpinConversations(toPin);
 
       return null;
-    }, unused -> actionMode.finish());
+    }, unused -> {
+      if (actionMode != null) {
+        actionMode.finish();
+      }
+    });
   }
 
   private void handleSelectAllThreads() {