Skip to content

Commit 78c85c4

Browse files
committed
Add missing disposable logic.
1 parent df37a07 commit 78c85c4

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

app/src/main/java/fr/free/nrw/commons/auth/LoginActivity.java

+5-2
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@
5252
import fr.free.nrw.commons.utils.ViewUtil;
5353
import io.reactivex.Observable;
5454
import io.reactivex.android.schedulers.AndroidSchedulers;
55+
import io.reactivex.disposables.CompositeDisposable;
5556
import io.reactivex.schedulers.Schedulers;
5657
import timber.log.Timber;
5758

@@ -83,6 +84,7 @@ public class LoginActivity extends AccountAuthenticatorActivity {
8384
ProgressDialog progressDialog;
8485
private AppCompatDelegate delegate;
8586
private LoginTextWatcher textWatcher = new LoginTextWatcher();
87+
private CompositeDisposable compositeDisposable = new CompositeDisposable();
8688

8789
private Boolean loginCurrentlyInProgress = false;
8890
private Boolean errorMessageShown = false;
@@ -195,6 +197,7 @@ protected void onResume() {
195197

196198
@Override
197199
protected void onDestroy() {
200+
compositeDisposable.clear();
198201
try {
199202
// To prevent leaked window when finish() is called, see http://stackoverflow.com/questions/32065854/activity-has-leaked-window-at-alertdialog-show-method
200203
if (progressDialog != null && progressDialog.isShowing()) {
@@ -219,10 +222,10 @@ private void performLogin() {
219222
String twoFactorCode = twoFactorEdit.getText().toString();
220223

221224
showLoggingProgressBar();
222-
Observable.fromCallable(() -> login(username, password, twoFactorCode))
225+
compositeDisposable.add(Observable.fromCallable(() -> login(username, password, twoFactorCode))
223226
.subscribeOn(Schedulers.io())
224227
.observeOn(AndroidSchedulers.mainThread())
225-
.subscribe(result -> handleLogin(username, rawUsername, password, result));
228+
.subscribe(result -> handleLogin(username, rawUsername, password, result)));
226229
}
227230

228231
private String login(String username, String password, String twoFactorCode) {

0 commit comments

Comments
 (0)