From 9beff06fb1f5a0c8504fea73569e1d0d098c0de4 Mon Sep 17 00:00:00 2001 From: Hocuri Date: Thu, 12 Nov 2020 14:28:04 +0100 Subject: [PATCH] Fix #1726 --- .../thoughtcrime/securesms/ConversationItem.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/org/thoughtcrime/securesms/ConversationItem.java b/src/org/thoughtcrime/securesms/ConversationItem.java index 3d5ea4d95..553060c72 100644 --- a/src/org/thoughtcrime/securesms/ConversationItem.java +++ b/src/org/thoughtcrime/securesms/ConversationItem.java @@ -21,11 +21,6 @@ import android.content.Intent; import android.content.res.TypedArray; import android.graphics.Color; import android.graphics.PorterDuff; -import androidx.annotation.DimenRes; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.appcompat.app.AlertDialog; - import android.graphics.Rect; import android.text.SpannableString; import android.text.Spanned; @@ -40,6 +35,11 @@ import android.view.ViewGroup; import android.widget.LinearLayout; import android.widget.TextView; +import androidx.annotation.DimenRes; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.appcompat.app.AlertDialog; + import com.b44t.messenger.DcChat; import com.b44t.messenger.DcContact; import com.b44t.messenger.DcMsg; @@ -571,7 +571,10 @@ public class ConversationItem extends LinearLayout if (msg != null) { author = dcContext.getRecipient(dcContext.getContact(msg.getFromId())); if (msg.getType() != DcMsg.DC_MSG_TEXT) { - slideDeck.addSlide(MediaUtil.getSlideForMsg(context, msg)); + Slide slide = MediaUtil.getSlideForMsg(context, msg); + if (slide != null) { + slideDeck.addSlide(slide); + } } }