Skip to content

Commit d4f3fa7

Browse files
committed
Fix even more Rx dispose logic.
1 parent e1fbb02 commit d4f3fa7

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

app/src/main/java/fr/free/nrw/commons/explore/images/SearchImageFragment.java

+4-5
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import android.annotation.SuppressLint;
55
import android.content.res.Configuration;
66
import android.os.Bundle;
7-
import android.os.Handler;
87
import androidx.recyclerview.widget.GridLayoutManager;
98
import androidx.recyclerview.widget.LinearLayoutManager;
109
import androidx.recyclerview.widget.RecyclerView;
@@ -142,12 +141,12 @@ public void updateImageList(String query) {
142141
bottomProgressBar.setVisibility(GONE);
143142
queryList.clear();
144143
imagesAdapter.clear();
145-
okHttpJsonApiClient.searchImages(query, queryList.size())
144+
compositeDisposable.add(okHttpJsonApiClient.searchImages(query, queryList.size())
146145
.subscribeOn(Schedulers.io())
147146
.observeOn(AndroidSchedulers.mainThread())
148147
.timeout(TIMEOUT_SECONDS, TimeUnit.SECONDS)
149148
.doOnSubscribe(disposable -> saveQuery(query))
150-
.subscribe(this::handleSuccess, this::handleError);
149+
.subscribe(this::handleSuccess, this::handleError));
151150
}
152151

153152

@@ -159,11 +158,11 @@ public void addImagesToList(String query) {
159158
this.query = query;
160159
bottomProgressBar.setVisibility(View.VISIBLE);
161160
progressBar.setVisibility(GONE);
162-
okHttpJsonApiClient.searchImages(query, queryList.size())
161+
compositeDisposable.add(okHttpJsonApiClient.searchImages(query, queryList.size())
163162
.subscribeOn(Schedulers.io())
164163
.observeOn(AndroidSchedulers.mainThread())
165164
.timeout(TIMEOUT_SECONDS, TimeUnit.SECONDS)
166-
.subscribe(this::handlePaginationSuccess, this::handleError);
165+
.subscribe(this::handlePaginationSuccess, this::handleError));
167166
}
168167

169168
/**

app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -420,15 +420,15 @@ public void onDeleteButtonClicked(){
420420
private void onDeleteClicked(Spinner spinner) {
421421
String reason = spinner.getSelectedItem().toString();
422422
Single<String> deletionReason = reasonBuilder.getReason(media, reason);
423-
deletionReason
423+
compositeDisposable.add(deletionReason
424424
.subscribeOn(Schedulers.io())
425425
.observeOn(AndroidSchedulers.mainThread())
426426
.subscribe(s -> {
427427
DeleteTask deleteTask = new DeleteTask(getActivity(), media, reason);
428428
deleteTask.execute();
429429
isDeleted = true;
430430
enableDeleteButton(false);
431-
});
431+
}));
432432
}
433433

434434
@OnClick(R.id.seeMore)

0 commit comments

Comments
 (0)