From 8407f2ff695e8956e4e8ded7b50ec26de814411f Mon Sep 17 00:00:00 2001 From: Alex Hart Date: Tue, 17 May 2022 09:28:17 -0300 Subject: [PATCH] Add guard against out of bounds indices in story viewer. --- .../securesms/stories/viewer/StoryViewerViewModel.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/StoryViewerViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/StoryViewerViewModel.kt index 268f61fbc5..8d06fc7112 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/StoryViewerViewModel.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/StoryViewerViewModel.kt @@ -108,7 +108,7 @@ class StoryViewerViewModel( fun onGoToNext(recipientId: RecipientId) { store.update { - if (it.pages[it.page] == recipientId) { + if (it.page in it.pages.indices && it.pages[it.page] == recipientId) { updatePages(it, it.page + 1) } else { it @@ -118,7 +118,7 @@ class StoryViewerViewModel( fun onGoToPrevious(recipientId: RecipientId) { store.update { - if (it.pages[it.page] == recipientId) { + if (it.page in it.pages.indices && it.pages[it.page] == recipientId) { updatePages(it, max(0, it.page - 1)) } else { it