From c247935f1a4f2ad0c18ee1a00d99bac90215ce21 Mon Sep 17 00:00:00 2001 From: tzm Date: Fri, 11 Oct 2019 01:08:40 +0200 Subject: [PATCH] Fix NPE when has no contact permissions. Fixes #9048 Co-authored-by: Alan Evans --- .../thoughtcrime/securesms/ContactSelectionListFragment.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/org/thoughtcrime/securesms/ContactSelectionListFragment.java b/src/org/thoughtcrime/securesms/ContactSelectionListFragment.java index e1e95cd5aa..c5e19bee6e 100644 --- a/src/org/thoughtcrime/securesms/ContactSelectionListFragment.java +++ b/src/org/thoughtcrime/securesms/ContactSelectionListFragment.java @@ -254,7 +254,7 @@ public final class ContactSelectionListFragment extends Fragment } @Override - public void onLoadFinished(@NonNull Loader loader, Cursor data) { + public void onLoadFinished(@NonNull Loader loader, @Nullable Cursor data) { swipeRefresh.setVisibility(View.VISIBLE); showContactsLayout.setVisibility(View.GONE); @@ -265,7 +265,7 @@ public final class ContactSelectionListFragment extends Fragment } emptyText.setText(R.string.contact_selection_group_activity__no_contacts); - boolean useFastScroller = data.getCount() > 20; + boolean useFastScroller = data != null && data.getCount() > 20; recyclerView.setVerticalScrollBarEnabled(!useFastScroller); if (useFastScroller) { fastScroller.setVisibility(View.VISIBLE);