Fix NPE in FTS when snippet is null.

fork-5.53.8
Greyson Parrelli 2018-06-06 08:08:52 -07:00
rodzic 3731e2a74a
commit 6bc7f2a5a4
1 zmienionych plików z 7 dodań i 3 usunięć

Wyświetl plik

@ -315,13 +315,17 @@ public class ConversationListItem extends RelativeLayout
unreadIndicator.setVisibility(View.VISIBLE);
}
private Spanned getHighlightedSpan(@NonNull Locale locale,
private Spanned getHighlightedSpan(@NonNull Locale locale,
@Nullable String value,
@Nullable String highlight)
{
value = value != null ? value.replaceAll("\n", " ") : null;
if (value == null) {
return new SpannableString("");
}
if (value == null || highlight == null) {
value = value.replaceAll("\n", " ");
if (highlight == null) {
return new SpannableString(value);
}