Browse Source

Merge pull request #2030 from nextcloud/bugfix/2011/fixNPEswipeRefreshLayout

avoid NPE for swipeRefreshLayout
Andy Scherzinger 3 years ago
parent
commit
6c6077a415

+ 6 - 2
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();