Skip to content

Commit 46847f0

Browse files
Fix issue 3137 (#3637)
* Fix issue 3137 * Remove import Timber * Remove unnecessary space
1 parent 62f1764 commit 46847f0

File tree

3 files changed

+17
-15
lines changed

3 files changed

+17
-15
lines changed

app/src/main/java/fr/free/nrw/commons/explore/depictions/SearchDepictionsFragment.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,7 @@ public void updateDepictionList(String query) {
147147
*/
148148
@Override
149149
public void initErrorView() {
150+
isLoading = false;
150151
progressBar.setVisibility(GONE);
151152
bottomProgressBar.setVisibility(GONE);
152153
depictionNotFound.setVisibility(VISIBLE);
@@ -195,10 +196,11 @@ public void onSuccess(List<DepictedItem> mediaList) {
195196
}
196197

197198
@Override
198-
public void loadingDepictions() {
199+
public void loadingDepictions(boolean isLoading) {
199200
depictionNotFound.setVisibility(GONE);
200201
bottomProgressBar.setVisibility(View.VISIBLE);
201202
progressBar.setVisibility(GONE);
203+
this.isLoading = isLoading;
202204
}
203205

204206
@Override

app/src/main/java/fr/free/nrw/commons/explore/depictions/SearchDepictionsFragmentContract.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ interface View {
3232
/**
3333
* load depictions
3434
*/
35-
void loadingDepictions();
35+
void loadingDepictions(boolean isLoading);
3636

3737
/**
3838
* clear adapter

app/src/main/java/fr/free/nrw/commons/explore/depictions/SearchDepictionsFragmentPresenter.java

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -82,19 +82,19 @@ public void onDetachView() {
8282
*/
8383
@Override
8484
public void updateDepictionList(String query, int pageSize, boolean reInitialise) {
85-
this.query = query;
86-
view.loadingDepictions();
87-
if (reInitialise) {
88-
size = 0;
89-
}
90-
saveQuery();
91-
compositeDisposable.add(depictsClient.searchForDepictions(query, 25, offset)
92-
.subscribeOn(ioScheduler)
93-
.observeOn(mainThreadScheduler)
94-
.timeout(TIMEOUT_SECONDS, TimeUnit.SECONDS)
95-
.doOnSubscribe(disposable -> saveQuery())
96-
.collect(ArrayList<DepictedItem>::new, ArrayList::add)
97-
.subscribe(this::handleSuccess, this::handleError));
85+
this.query = query;
86+
view.loadingDepictions(true);
87+
if (reInitialise) {
88+
size = 0;
89+
}
90+
saveQuery();
91+
compositeDisposable.add(depictsClient.searchForDepictions(query, 25, offset)
92+
.subscribeOn(ioScheduler)
93+
.observeOn(mainThreadScheduler)
94+
.timeout(TIMEOUT_SECONDS, TimeUnit.SECONDS)
95+
.doOnSubscribe(disposable -> saveQuery())
96+
.collect(ArrayList<DepictedItem>::new, ArrayList::add)
97+
.subscribe(this::handleSuccess, this::handleError));
9898
}
9999

100100
/**

0 commit comments

Comments
 (0)