From df76aef0701ed05318474352cf01ce5fba3800a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Se=C3=A1n=20Mac=20Gillicuddy?= Date: Thu, 21 May 2020 16:50:49 +0100 Subject: [PATCH] #3763 IllegalArgumentException at fetchImagesForDepictedItem - pass entityId in (#3764) --- .../nrw/commons/depictions/Media/DepictedImagesContract.java | 3 ++- .../nrw/commons/depictions/Media/DepictedImagesFragment.java | 2 +- .../nrw/commons/depictions/Media/DepictedImagesPresenter.java | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/fr/free/nrw/commons/depictions/Media/DepictedImagesContract.java b/app/src/main/java/fr/free/nrw/commons/depictions/Media/DepictedImagesContract.java index 67e59390c..d79757ecd 100644 --- a/app/src/main/java/fr/free/nrw/commons/depictions/Media/DepictedImagesContract.java +++ b/app/src/main/java/fr/free/nrw/commons/depictions/Media/DepictedImagesContract.java @@ -90,8 +90,9 @@ public interface DepictedImagesContract { /** * Fetches more images for the item and adds it to the grid view adapter + * @param entityId */ - void fetchMoreImages(); + void fetchMoreImages(String entityId); /** * fetch captions for the image using filename and replace title of on the image thumbnail(if captions are available) diff --git a/app/src/main/java/fr/free/nrw/commons/depictions/Media/DepictedImagesFragment.java b/app/src/main/java/fr/free/nrw/commons/depictions/Media/DepictedImagesFragment.java index 1c1aeaef3..6e3c128d3 100644 --- a/app/src/main/java/fr/free/nrw/commons/depictions/Media/DepictedImagesFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/depictions/Media/DepictedImagesFragment.java @@ -136,7 +136,7 @@ public class DepictedImagesFragment extends DaggerFragment implements DepictedIm if (!NetworkUtils.isInternetConnectionEstablished(getContext())) { handleNoInternet(); } else { - presenter.fetchMoreImages(); + presenter.fetchMoreImages(entityId); } } if (isLastPage) { diff --git a/app/src/main/java/fr/free/nrw/commons/depictions/Media/DepictedImagesPresenter.java b/app/src/main/java/fr/free/nrw/commons/depictions/Media/DepictedImagesPresenter.java index 372aa60a4..3e0d5a6ac 100644 --- a/app/src/main/java/fr/free/nrw/commons/depictions/Media/DepictedImagesPresenter.java +++ b/app/src/main/java/fr/free/nrw/commons/depictions/Media/DepictedImagesPresenter.java @@ -39,7 +39,6 @@ public class DepictedImagesPresenter implements DepictedImagesContract.UserActio * Wikibase enitityId for the depicted Item * Ex: Q9394 */ - private String entityId = null; private List queryList = new ArrayList<>(); @Inject @@ -79,10 +78,11 @@ public class DepictedImagesPresenter implements DepictedImagesContract.UserActio /** * Fetches more images for the item and adds it to the grid view adapter + * @param entityId */ @SuppressLint("CheckResult") @Override - public void fetchMoreImages() { + public void fetchMoreImages(String entityId) { view.progressBarVisible(true); compositeDisposable.add(depictsClient.fetchImagesForDepictedItem(entityId, queryList.size()) .subscribeOn(ioScheduler)