Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2025-12-24 04:58:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Null check RecyclerView references in search bar callbacks.

Browse Source
This commit is contained in:
Nicholas
2022-11-16 09:42:13 -05:00
committed by Alex Hart
parent fa02ee1d3d
commit 13ed122c3e
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java
View File

@@ -661,23 +661,27 @@ public class ConversationListFragment extends MainFragment implements ActionMode
viewModel.onSearchQueryUpdated(trimmed);
if (trimmed.length() > 0) {
if (activeAdapter != searchAdapter) {
if (activeAdapter != searchAdapter && list != null) {
setAdapter(searchAdapter);
list.removeItemDecoration(searchAdapterDecoration);
list.addItemDecoration(searchAdapterDecoration);
}
} else {
if (activeAdapter != defaultAdapter) {
list.removeItemDecoration(searchAdapterDecoration);
setAdapter(defaultAdapter);
if (list != null) {
list.removeItemDecoration(searchAdapterDecoration);
setAdapter(defaultAdapter);
}
}
}
}
@Override
public void onSearchClosed() {
list.removeItemDecoration(searchAdapterDecoration);
setAdapter(defaultAdapter);
if (list != null) {
list.removeItemDecoration(searchAdapterDecoration);
setAdapter(defaultAdapter);
}
requireCallback().onSearchClosed();
fadeInButtonsAndMegaphone(250);
}