From 1c814141a2191d045ba9a12eef48b9efa342444e Mon Sep 17 00:00:00 2001 From: Alex Hart Date: Fri, 15 May 2020 10:43:25 -0300 Subject: [PATCH] Fix NullPointerException when trying to launch InviteActivity. --- .../securesms/ContactSelectionListFragment.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/app/src/main/java/org/thoughtcrime/securesms/ContactSelectionListFragment.java b/app/src/main/java/org/thoughtcrime/securesms/ContactSelectionListFragment.java index d59b2d216d..91dda8d7a8 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/ContactSelectionListFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/ContactSelectionListFragment.java @@ -74,6 +74,7 @@ import org.thoughtcrime.securesms.util.views.SimpleProgressDialog; import org.whispersystems.libsignal.util.guava.Optional; import java.io.IOException; +import java.util.Collections; import java.util.List; /** @@ -188,10 +189,18 @@ public final class ContactSelectionListFragment extends Fragment } public @NonNull List getSelectedContacts() { + if (cursorRecyclerViewAdapter == null) { + return Collections.emptyList(); + } + return cursorRecyclerViewAdapter.getSelectedContacts(); } public int getSelectedContactsCount() { + if (cursorRecyclerViewAdapter == null) { + return 0; + } + return cursorRecyclerViewAdapter.getSelectedContactsCount(); }