From c359207f1f4844275060e11ea0a85a2fb6e517e4 Mon Sep 17 00:00:00 2001 From: Greyson Parrelli Date: Fri, 7 Jul 2023 11:04:33 -0400 Subject: [PATCH] Fix potential NPE in MediaOverviewPageFragment. --- .../mediaoverview/MediaOverviewPageFragment.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediaoverview/MediaOverviewPageFragment.java b/app/src/main/java/org/thoughtcrime/securesms/mediaoverview/MediaOverviewPageFragment.java index 05e59c23dc..f663d81f0c 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mediaoverview/MediaOverviewPageFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/mediaoverview/MediaOverviewPageFragment.java @@ -211,9 +211,11 @@ public final class MediaOverviewPageFragment extends Fragment @Override public void onDestroy() { super.onDestroy(); - int childCount = recyclerView.getChildCount(); - for (int i = 0; i < childCount; i++) { - adapter.detach(recyclerView.getChildViewHolder(recyclerView.getChildAt(i))); + if (recyclerView != null) { + int childCount = recyclerView.getChildCount(); + for (int i = 0; i < childCount; i++) { + adapter.detach(recyclerView.getChildViewHolder(recyclerView.getChildAt(i))); + } } }