diff --git a/app/src/main/java/com/github/yeriomin/yalpstore/ReviewStorageIterator.java b/app/src/main/java/com/github/yeriomin/yalpstore/ReviewStorageIterator.java index 41458a987..c12997376 100644 --- a/app/src/main/java/com/github/yeriomin/yalpstore/ReviewStorageIterator.java +++ b/app/src/main/java/com/github/yeriomin/yalpstore/ReviewStorageIterator.java @@ -46,7 +46,8 @@ public class ReviewStorageIterator extends ReviewIterator { } private List current() { - int offset = PAGE_SIZE * page; - return list.subList(offset, offset + PAGE_SIZE); + int from = PAGE_SIZE * page; + int to = from + PAGE_SIZE; + return (from < 0 || to > list.size()) ? new ArrayList() : list.subList(from, to); } }