From 454e9a99fc25819b54df3705ec75151cadf3b283 Mon Sep 17 00:00:00 2001 From: Greyson Parrelli Date: Thu, 23 Mar 2023 14:41:40 -0400 Subject: [PATCH] Fix possible NPE in ConversationListFragment. --- .../conversationlist/ConversationListFragment.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 e9ef72e899..7ce4c6e7c3 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java @@ -984,7 +984,11 @@ public class ConversationListFragment extends MainFragment implements ActionMode startupStopwatch.split("first-render"); startupStopwatch.stop(TAG); mediaControllerOwner.getVoiceNoteMediaController().finishPostpone(); - requireCallback().getSearchToolbar().get(); + + if (getParentFragment() != null) { + requireCallback().getSearchToolbar().get(); + } + if (getContext() != null) { ConversationFragment.prepare(getContext()); }