mirror
/
Signal-Android
kopia lustrzana https://github.com/ryukoposting/Signal-Android
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Null check RecyclerView references in search bar callbacks.

main
Nicholas 2022-11-16 09:42:13 -05:00 zatwierdzone przez Alex Hart
rodzic fa02ee1d3d
commit 13ed122c3e
1 zmienionych plików z 9 dodań i 5 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

14
app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java
Wyświetl plik

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