Skip to content

Fix NPE when thumbnail is null in ThumbableInputMedia #38

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 5, 2019
Merged

Fix NPE when thumbnail is null in ThumbableInputMedia #38

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions ...mbotapi-core/src/main/java/com/jtelegram/api/message/input/media/ThumbableInputMedia.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -24,6 +25,10 @@ protected ThumbableInputMedia(InputMediaType type, InputFile media, String capti

@Override
public List<InputFile> getAllMedia() {
return Arrays.asList(getMedia(), thumbnail);
List<InputFile> media = new ArrayList<>();
media.add(getMedia());
media.add(thumbnail);
media.removeIf(Objects::isNull);
return Collections.unmodifiableList(media);
}
}