Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2025-12-23 20:48:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix NPE when secondary story does not have media and is not a text story.

Browse Source
This commit is contained in:
Alex Hart
2022-03-18 13:10:58 -03:00
committed by Greyson Parrelli
parent f798866619
commit 3c2bd032ba
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/org/thoughtcrime/securesms/stories/landing/StoriesLandingItem.kt
View File

@@ -112,6 +112,7 @@ object StoriesLandingItem {
avatarView.setStoryRingFromState(model.data.storyViewState) avatarView.setStoryRingFromState(model.data.storyViewState)
@Suppress("CascadeIf")
if (record.storyType.isTextStory) { if (record.storyType.isTextStory) {
storyPreview.setImageResource(GlideApp.with(storyPreview), StoryTextPostModel.parseFrom(record), 0, 0) storyPreview.setImageResource(GlideApp.with(storyPreview), StoryTextPostModel.parseFrom(record), 0, 0)
} else if (record.slideDeck.thumbnailSlide != null) { } else if (record.slideDeck.thumbnailSlide != null) {
@@ -123,12 +124,17 @@ object StoriesLandingItem {
if (model.data.secondaryStory != null) { if (model.data.secondaryStory != null) {
val secondaryRecord = model.data.secondaryStory.messageRecord as MediaMmsMessageRecord val secondaryRecord = model.data.secondaryStory.messageRecord as MediaMmsMessageRecord
@Suppress("CascadeIf")
if (secondaryRecord.storyType.isTextStory) { if (secondaryRecord.storyType.isTextStory) {
storyMulti.setImageResource(GlideApp.with(storyPreview), StoryTextPostModel.parseFrom(secondaryRecord), 0, 0) storyMulti.setImageResource(GlideApp.with(storyPreview), StoryTextPostModel.parseFrom(secondaryRecord), 0, 0)
} else { storyMulti.visible = true
} else if (secondaryRecord.slideDeck.thumbnailSlide != null) {
storyMulti.setImageResource(GlideApp.with(storyPreview), secondaryRecord.slideDeck.thumbnailSlide!!, false, true) storyMulti.setImageResource(GlideApp.with(storyPreview), secondaryRecord.slideDeck.thumbnailSlide!!, false, true)
storyMulti.visible = true
} else {
storyMulti.clear(GlideApp.with(storyPreview))
storyMulti.visible = false
} }
storyMulti.visible = true
} else { } else {
storyMulti.visible = false storyMulti.visible = false
} }