TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-06-08 16:58:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix possible crash with null thread body.

Browse Source
This commit is contained in:
Greyson Parrelli 2020-06-06 20:08:36 -04:00
parent 1234899ea1
commit d33873d59a
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListItem.java
View File

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