Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-22 01:40:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix crash with incorrectly tagged story.

Browse Source
This commit is contained in:
Alex Hart
2022-03-09 14:04:07 -04:00
committed by Cody Henthorne
parent 78214fb39b
commit 6048208c8c
2 changed files with 22 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/thoughtcrime/securesms/stories/viewer/page/StoryViewerPageRepository.kt
View File

@@ -172,7 +172,7 @@ class StoryViewerPageRepository(context: Context) {
}
private fun getContent(record: MmsMessageRecord): StoryPost.Content {
return if (record.storyType.isTextStory) {
return if (record.storyType.isTextStory || record.slideDeck.asAttachments().isEmpty()) {
StoryPost.Content.TextContent(
uri = Uri.parse("story_text_post://${record.id}"),
recordId = record.id

38
app/src/main/java/org/thoughtcrime/securesms/stories/viewer/text/StoryTextPostViewModel.kt
View File

@@ -18,24 +18,28 @@ class StoryTextPostViewModel(recordId: Long, repository: StoryTextPostRepository
val state: LiveData<StoryTextPostState> = store.stateLiveData
init {
disposables += repository.getRecord(recordId).subscribeBy(
onSuccess = { record ->
store.update { state ->
state.copy(
storyTextPost = StoryTextPost.parseFrom(Base64.decode(record.body)),
linkPreview = record.linkPreviews.firstOrNull(),
loadState = StoryTextPostState.LoadState.LOADED
)
}
},
onError = {
store.update { state ->
state.copy(
loadState = StoryTextPostState.LoadState.FAILED
)
}
disposables += repository.getRecord(recordId)
.map { record ->
StoryTextPost.parseFrom(Base64.decode(record.body)) to record.linkPreviews.firstOrNull()
}
)
.subscribeBy(
onSuccess = { (post, previews) ->
store.update { state ->
state.copy(
storyTextPost = post,
linkPreview = previews,
loadState = StoryTextPostState.LoadState.LOADED
)
}
},
onError = {
store.update { state ->
state.copy(
loadState = StoryTextPostState.LoadState.FAILED
)
}
}
)
}
override fun onCleared() {