From 693738960908b475417f29a4940dc8388f0cdce4 Mon Sep 17 00:00:00 2001 From: Nick Robson Date: Wed, 19 Dec 2018 11:02:05 +0100 Subject: [PATCH] Fix NPE when thumbnail is null in ThumbableInputMedia --- .../message/input/media/ThumbableInputMedia.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/jtelegrambotapi-core/src/main/java/com/jtelegram/api/message/input/media/ThumbableInputMedia.java b/jtelegrambotapi-core/src/main/java/com/jtelegram/api/message/input/media/ThumbableInputMedia.java index f55ecc4ec..f9597c6fd 100644 --- a/jtelegrambotapi-core/src/main/java/com/jtelegram/api/message/input/media/ThumbableInputMedia.java +++ b/jtelegrambotapi-core/src/main/java/com/jtelegram/api/message/input/media/ThumbableInputMedia.java @@ -4,12 +4,13 @@ import com.jtelegram.api.message.input.file.InputFile; import com.jtelegram.api.message.input.file.LocalInputFile; import com.jtelegram.api.requests.message.framework.ParseMode; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Objects; import lombok.Getter; import lombok.ToString; -import java.util.Arrays; -import java.util.List; - @Getter @ToString(callSuper = true) public abstract class ThumbableInputMedia extends InputMedia { @@ -24,6 +25,10 @@ protected ThumbableInputMedia(InputMediaType type, InputFile media, String capti @Override public List getAllMedia() { - return Arrays.asList(getMedia(), thumbnail); + List media = new ArrayList<>(); + media.add(getMedia()); + media.add(thumbnail); + media.removeIf(Objects::isNull); + return Collections.unmodifiableList(media); } }