mirror of
https://github.com/nextcloud/talk-android
synced 2025-06-23 21:50:31 +01:00
Merge pull request #2030 from nextcloud/bugfix/2011/fixNPEswipeRefreshLayout
avoid NPE for swipeRefreshLayout
This commit is contained in:
commit
6c6077a415
@ -408,7 +408,9 @@ public class ConversationsListController extends BaseController implements Searc
|
|||||||
adapter.setHeadersShown(true);
|
adapter.setHeadersShown(true);
|
||||||
adapter.updateDataSet(searchableConversationItems, false);
|
adapter.updateDataSet(searchableConversationItems, false);
|
||||||
adapter.showAllHeaders();
|
adapter.showAllHeaders();
|
||||||
swipeRefreshLayout.setEnabled(false);
|
if (swipeRefreshLayout != null) {
|
||||||
|
swipeRefreshLayout.setEnabled(false);
|
||||||
|
}
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -417,7 +419,9 @@ public class ConversationsListController extends BaseController implements Searc
|
|||||||
adapter.setHeadersShown(false);
|
adapter.setHeadersShown(false);
|
||||||
adapter.updateDataSet(conversationItems, false);
|
adapter.updateDataSet(conversationItems, false);
|
||||||
adapter.hideAllHeaders();
|
adapter.hideAllHeaders();
|
||||||
swipeRefreshLayout.setEnabled(true);
|
if (swipeRefreshLayout != null) {
|
||||||
|
swipeRefreshLayout.setEnabled(true);
|
||||||
|
}
|
||||||
|
|
||||||
searchView.onActionViewCollapsed();
|
searchView.onActionViewCollapsed();
|
||||||
MainActivity activity = (MainActivity) getActivity();
|
MainActivity activity = (MainActivity) getActivity();
|
||||||
|
Loading…
Reference in New Issue
Block a user