From f8520d83be01f93eb89c73f84ef148c665978904 Mon Sep 17 00:00:00 2001 From: Nicholas Date: Thu, 8 Dec 2022 09:07:45 -0500 Subject: [PATCH] Add null checks for FABs in conversation list. Fixes #12651. --- .../ConversationListFragment.java | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 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 722646595c3..a82d5671db9 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java @@ -1145,16 +1145,24 @@ private void handleCreateConversation(long threadId, Recipient recipient, int di } private void fadeOutButtonsAndMegaphone(int fadeDuration) { - ViewUtil.fadeOut(fab, fadeDuration); - ViewUtil.fadeOut(cameraFab, fadeDuration); + if (fab != null) { + ViewUtil.fadeOut(fab, fadeDuration); + } + if (cameraFab != null) { + ViewUtil.fadeOut(cameraFab, fadeDuration); + } if (megaphoneContainer.resolved()) { ViewUtil.fadeOut(megaphoneContainer.get(), fadeDuration); } } private void fadeInButtonsAndMegaphone(int fadeDuration) { - ViewUtil.fadeIn(fab, fadeDuration); - ViewUtil.fadeIn(cameraFab, fadeDuration); + if (fab != null) { + ViewUtil.fadeIn(fab, fadeDuration); + } + if (cameraFab != null) { + ViewUtil.fadeIn(cameraFab, fadeDuration); + } if (megaphoneContainer.resolved()) { ViewUtil.fadeIn(megaphoneContainer.get(), fadeDuration); }