empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Fix NPE in FTS when snippet is null.

Browse source
This commit is contained in:
Greyson Parrelli 2018-06-06 08:08:52 -07:00
parent 3731e2a74a
commit 6bc7f2a5a4
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/org/thoughtcrime/securesms/ConversationListItem.java
View file

@ -315,13 +315,17 @@ public class ConversationListItem extends RelativeLayout
unreadIndicator.setVisibility(View.VISIBLE); unreadIndicator.setVisibility(View.VISIBLE);
} }
private Spanned getHighlightedSpan(@NonNull Locale locale, private Spanned getHighlightedSpan(@NonNull Locale locale,
@Nullable String value, @Nullable String value,
@Nullable String highlight) @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); return new SpannableString(value);
} }