Skip to content

Commit 3c8dc09

Browse files
committed
Remove redundant CompositeDisposable.
1 parent 51e119e commit 3c8dc09

File tree

1 file changed

+2
-8
lines changed

1 file changed

+2
-8
lines changed

app/src/main/java/fr/free/nrw/commons/upload/UploadActivity.java

+2-8
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import android.app.ProgressDialog;
66
import android.content.Intent;
77
import android.net.Uri;
8-
import android.os.Build;
98
import android.os.Bundle;
109
import com.google.android.material.textfield.TextInputLayout;
1110
import androidx.appcompat.app.AlertDialog;
@@ -67,7 +66,6 @@
6766
import fr.free.nrw.commons.utils.ViewUtil;
6867
import io.reactivex.Observable;
6968
import io.reactivex.android.schedulers.AndroidSchedulers;
70-
import io.reactivex.disposables.CompositeDisposable;
7169
import io.reactivex.schedulers.Schedulers;
7270
import timber.log.Timber;
7371

@@ -134,7 +132,6 @@ public class UploadActivity extends BaseActivity implements UploadView, SimilarI
134132

135133
private DescriptionsAdapter descriptionsAdapter;
136134
private RVRendererAdapter<CategoryItem> categoriesAdapter;
137-
private CompositeDisposable compositeDisposable;
138135
private ProgressDialog progressDialog;
139136

140137

@@ -145,7 +142,6 @@ protected void onCreate(Bundle savedInstanceState) {
145142

146143
setContentView(R.layout.activity_upload);
147144
ButterKnife.bind(this);
148-
compositeDisposable = new CompositeDisposable();
149145

150146
configureLayout();
151147
configureTopCard();
@@ -211,8 +207,6 @@ private void checkStoragePermissions() {
211207
@Override
212208
protected void onPause() {
213209
presenter.removeView();
214-
compositeDisposable.dispose();
215-
compositeDisposable = new CompositeDisposable();
216210
super.onPause();
217211
}
218212

@@ -571,7 +565,7 @@ private void configurePolicy() {
571565
@SuppressLint("CheckResult")
572566
private void updateCategoryList(String filter) {
573567
List<String> imageTitleList = presenter.getImageTitleList();
574-
Observable.fromIterable(categoriesModel.getSelectedCategories())
568+
compositeDisposable.add(Observable.fromIterable(categoriesModel.getSelectedCategories())
575569
.subscribeOn(Schedulers.io())
576570
.observeOn(AndroidSchedulers.mainThread())
577571
.doOnSubscribe(disposable -> {
@@ -602,7 +596,7 @@ private void updateCategoryList(String filter) {
602596
categoriesSearchContainer.setError("No categories found");
603597
}
604598
}
605-
);
599+
));
606600
}
607601

608602
private void receiveSharedItems() {

0 commit comments

Comments
 (0)