From c1ce2546921e157533754d2b371d879a3c28e28f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20Brey?= Date: Tue, 22 Nov 2022 13:52:54 +0100 Subject: [PATCH] GalleryFragment: fix crash when scrolling slowly until the end of the list MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Álvaro Brey --- .../com/owncloud/android/ui/fragment/GalleryFragment.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/src/main/java/com/owncloud/android/ui/fragment/GalleryFragment.java b/app/src/main/java/com/owncloud/android/ui/fragment/GalleryFragment.java index 5da98c4ba46b..8e9c3edf75a0 100644 --- a/app/src/main/java/com/owncloud/android/ui/fragment/GalleryFragment.java +++ b/app/src/main/java/com/owncloud/android/ui/fragment/GalleryFragment.java @@ -340,6 +340,10 @@ private void loadMoreWhenEndReached(@NonNull RecyclerView recyclerView, int dy) int totalItemCount = gridLayoutManager.getItemCount(); int lastVisibleItem = gridLayoutManager.findLastCompletelyVisibleItemPosition(); + if (lastVisibleItem == RecyclerView.NO_POSITION) { + return; + } + if ((totalItemCount - visibleItemCount) <= (lastVisibleItem + MAX_ITEMS_PER_ROW) && (totalItemCount - visibleItemCount) > 0) { // Almost reached the end, continue to load new photos