From 828b5a3cd1fec188973e3b96966761c904facda1 Mon Sep 17 00:00:00 2001 From: Ashish Kumar Date: Wed, 10 Jul 2019 14:40:34 +0530 Subject: [PATCH] Closes #3061 (#3062) * Added null check for contribution with position in ContributionsListFragment --- .../contributions/ContributionsListFragment.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java index 4c6d54641..f37debe7b 100644 --- a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java @@ -199,7 +199,10 @@ public class ContributionsListFragment extends CommonsDaggerSupportFragment { }else if(layoutManager instanceof GridLayoutManager){ lastVisibleItemPosition=((GridLayoutManager)layoutManager).findLastCompletelyVisibleItemPosition(); } - outState.putString(VISIBLE_ITEM_ID,findIdOfItemWithPosition(lastVisibleItemPosition)); + String idOfItemWithPosition = findIdOfItemWithPosition(lastVisibleItemPosition); + if (null != idOfItemWithPosition) { + outState.putString(VISIBLE_ITEM_ID, idOfItemWithPosition); + } } @Override @@ -216,8 +219,13 @@ public class ContributionsListFragment extends CommonsDaggerSupportFragment { * @param position * @return */ + @Nullable private String findIdOfItemWithPosition(int position) { - return callback.getContributionForPosition(position).getContentUri().getLastPathSegment(); + Contribution contributionForPosition = callback.getContributionForPosition(position); + if (null != contributionForPosition) { + return contributionForPosition.getContentUri().getLastPathSegment(); + } + return null; } }