From 9be90a589e211f24e89f2e95fc9cb71a3a4c7ef6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Asiel=20D=C3=ADaz=20Ben=C3=ADtez?= Date: Wed, 4 Aug 2021 09:05:33 -0400 Subject: [PATCH] avoid NullPointerException (#2013) --- .../thoughtcrime/securesms/ConversationListFragment.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/org/thoughtcrime/securesms/ConversationListFragment.java b/src/org/thoughtcrime/securesms/ConversationListFragment.java index 7cc125877..e7f076dcd 100644 --- a/src/org/thoughtcrime/securesms/ConversationListFragment.java +++ b/src/org/thoughtcrime/securesms/ConversationListFragment.java @@ -418,7 +418,14 @@ public class ConversationListFragment extends Fragment } else { listflags |= DcContext.DC_GCL_ADD_ALLDONE_HINT; } - DcChatlist chatlist = DcHelper.getContext(getContext()).getChatlist(listflags, queryFilter.isEmpty() ? null : queryFilter, 0); + + Context context = getContext(); + if (context == null) { + // can't load chat list at this time, see: https://github.com/deltachat/deltachat-android/issues/2012 + Log.w(TAG, "Ignoring call to loadChatlist()"); + return; + } + DcChatlist chatlist = DcHelper.getContext(context).getChatlist(listflags, queryFilter.isEmpty() ? null : queryFilter, 0); Util.runOnMain(() -> { if (chatlist.getCnt() <= 0 && TextUtils.isEmpty(queryFilter)) {