From 2576a696a7fb94f7b00a20e9687035b00957c62c Mon Sep 17 00:00:00 2001 From: Marcel Hibbe Date: Thu, 12 May 2022 15:51:18 +0200 Subject: [PATCH] avoid NPE for swipeRefreshLayout fix #2011 Signed-off-by: Marcel Hibbe --- .../talk/controllers/ConversationsListController.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ConversationsListController.java b/app/src/main/java/com/nextcloud/talk/controllers/ConversationsListController.java index 4d0f893a5..5feab71f2 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/ConversationsListController.java +++ b/app/src/main/java/com/nextcloud/talk/controllers/ConversationsListController.java @@ -408,7 +408,9 @@ public class ConversationsListController extends BaseController implements Searc adapter.setHeadersShown(true); adapter.updateDataSet(searchableConversationItems, false); adapter.showAllHeaders(); - swipeRefreshLayout.setEnabled(false); + if (swipeRefreshLayout != null) { + swipeRefreshLayout.setEnabled(false); + } return true; } @@ -417,7 +419,9 @@ public class ConversationsListController extends BaseController implements Searc adapter.setHeadersShown(false); adapter.updateDataSet(conversationItems, false); adapter.hideAllHeaders(); - swipeRefreshLayout.setEnabled(true); + if (swipeRefreshLayout != null) { + swipeRefreshLayout.setEnabled(true); + } searchView.onActionViewCollapsed(); MainActivity activity = (MainActivity) getActivity();