Lomanic/BarInsta
1
0
Fork 0
mirror of https://github.com/KokaKiwi/BarInsta synced 2025-10-31 11:35:34 +00:00
Code Issues Releases Wiki Activity

Check currentFeedStoryIndex every time before accessing models list. Fixes: https://github.com/austinhuang0131/barinsta/issues/819

Browse Source
This commit is contained in:
Ammar Githam 2021-03-18 22:03:56 +09:00
parent 863a06f3af
commit 1cd75356c7
1 changed files with 36 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/awais/instagrabber/fragments/StoryViewerFragment.java
View File

@ -684,12 +684,11 @@ public class StoryViewerFragment extends Fragment {
String currentStoryMediaId = null; String currentStoryMediaId = null;
final Type type = options.getType(); final Type type = options.getType();
StoryViewerOptions fetchOptions = null; StoryViewerOptions fetchOptions = null;
if (currentFeedStoryIndex >= 0) {
switch (type) { switch (type) {
case HIGHLIGHT: { case HIGHLIGHT: {
final HighlightsViewModel highlightsViewModel = (HighlightsViewModel) viewModel; final HighlightsViewModel highlightsViewModel = (HighlightsViewModel) viewModel;
final List<HighlightModel> models = highlightsViewModel.getList().getValue(); final List<HighlightModel> models = highlightsViewModel.getList().getValue();
if (models == null || models.isEmpty() || currentFeedStoryIndex >= models.size()) { if (models == null || models.isEmpty() || currentFeedStoryIndex >= models.size() || currentFeedStoryIndex < 0) {
Toast.makeText(context, R.string.downloader_unknown_error, Toast.LENGTH_SHORT).show(); Toast.makeText(context, R.string.downloader_unknown_error, Toast.LENGTH_SHORT).show();
return; return;
} }
@ -702,7 +701,7 @@ public class StoryViewerFragment extends Fragment {
case FEED_STORY_POSITION: { case FEED_STORY_POSITION: {
final FeedStoriesViewModel feedStoriesViewModel = (FeedStoriesViewModel) viewModel; final FeedStoriesViewModel feedStoriesViewModel = (FeedStoriesViewModel) viewModel;
final List<FeedStoryModel> models = feedStoriesViewModel.getList().getValue(); final List<FeedStoryModel> models = feedStoriesViewModel.getList().getValue();
if (models == null) return; if (models == null || currentFeedStoryIndex >= models.size() || currentFeedStoryIndex < 0) return;
final FeedStoryModel model = models.get(currentFeedStoryIndex); final FeedStoryModel model = models.get(currentFeedStoryIndex);
currentStoryMediaId = model.getStoryMediaId(); currentStoryMediaId = model.getStoryMediaId();
currentStoryUsername = model.getProfileModel().getUsername(); currentStoryUsername = model.getProfileModel().getUsername();
@ -715,7 +714,7 @@ public class StoryViewerFragment extends Fragment {
case STORY_ARCHIVE: { case STORY_ARCHIVE: {
final ArchivesViewModel archivesViewModel = (ArchivesViewModel) viewModel; final ArchivesViewModel archivesViewModel = (ArchivesViewModel) viewModel;
final List<HighlightModel> models = archivesViewModel.getList().getValue(); final List<HighlightModel> models = archivesViewModel.getList().getValue();
if (models == null || models.isEmpty() || currentFeedStoryIndex >= models.size()) { if (models == null || models.isEmpty() || currentFeedStoryIndex >= models.size() || currentFeedStoryIndex < 0) {
Toast.makeText(context, R.string.downloader_unknown_error, Toast.LENGTH_SHORT).show(); Toast.makeText(context, R.string.downloader_unknown_error, Toast.LENGTH_SHORT).show();
return; return;
} }
@ -726,7 +725,6 @@ public class StoryViewerFragment extends Fragment {
break; break;
} }
} }
}
if (type == Type.USER) { if (type == Type.USER) {
currentStoryMediaId = String.valueOf(options.getId()); currentStoryMediaId = String.valueOf(options.getId());
currentStoryUsername = options.getName(); currentStoryUsername = options.getName();