Fix crash in conversation search.

This commit is contained in:
Greyson Parrelli 2019-12-04 10:12:34 -05:00
parent a079e479ec
commit 1fc63b7597

View File

@ -64,19 +64,27 @@ public class ConversationSearchViewModel extends AndroidViewModel {
} }
void onMoveUp() { void onMoveUp() {
if (result.getValue() == null) {
return;
}
debouncer.clear(); debouncer.clear();
CursorList<MessageResult> messages = (CursorList<MessageResult>) result.getValue().getResults(); List<MessageResult> messages = result.getValue().getResults();
int position = Math.min(result.getValue().getPosition() + 1, messages.size() - 1); int position = Math.min(result.getValue().getPosition() + 1, messages.size() - 1);
result.setValue(new SearchResult(messages, position)); result.setValue(new SearchResult(messages, position));
} }
void onMoveDown() { void onMoveDown() {
if (result.getValue() == null) {
return;
}
debouncer.clear(); debouncer.clear();
CursorList<MessageResult> messages = (CursorList<MessageResult>) result.getValue().getResults(); List<MessageResult> messages = result.getValue().getResults();
int position = Math.max(result.getValue().getPosition() - 1, 0); int position = Math.max(result.getValue().getPosition() - 1, 0);
result.setValue(new SearchResult(messages, position)); result.setValue(new SearchResult(messages, position));
} }