From 837f86bdd33df7262373e712f583c5716f90e623 Mon Sep 17 00:00:00 2001
From: Alex Hart <alex@signal.org>
Date: Fri, 22 Jul 2022 10:59:30 -0300
Subject: [PATCH] Fix NPE when launching conversation bubble.

---
 .../securesms/conversation/ConversationIntents.java          | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationIntents.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationIntents.java
index 136169d77..e4ad45d89 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationIntents.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationIntents.java
@@ -74,7 +74,10 @@ public class ConversationIntents {
   static @NonNull Bundle createParentFragmentArguments(@NonNull Intent intent) {
     Bundle bundle = new Bundle();
 
-    bundle.putAll(intent.getExtras());
+    if (intent.getExtras() != null) {
+      bundle.putAll(intent.getExtras());
+    }
+
     bundle.putParcelable(INTENT_DATA, intent.getData());
     bundle.putString(INTENT_TYPE, intent.getType());