Fix possible crash with null thread body.

fork-5.53.8
Greyson Parrelli 2020-06-06 20:08:36 -04:00
rodzic 1234899ea1
commit d33873d59a
1 zmienionych plików z 2 dodań i 1 usunięć

Wyświetl plik

@ -56,6 +56,7 @@ import org.thoughtcrime.securesms.util.ExpirationUtil;
import org.thoughtcrime.securesms.util.MediaUtil;
import org.thoughtcrime.securesms.util.SearchUtil;
import org.thoughtcrime.securesms.util.ThemeUtil;
import org.thoughtcrime.securesms.util.Util;
import org.thoughtcrime.securesms.util.ViewUtil;
import java.util.Collections;
@ -446,7 +447,7 @@ public class ConversationListItem extends RelativeLayout
} else if (extra != null && extra.isRemoteDelete()) {
return new SpannableString(emphasisAdded(context.getString(R.string.ThreadRecord_this_message_was_deleted)));
} else {
return new SpannableString(thread.getBody());
return new SpannableString(Util.emptyIfNull(thread.getBody()));
}
}
}