Skip to content

Commit df37a07

Browse files
committed
Add convenience CompoundDisposable to BaseActivity.
...to be used by subclasses, and gets disposed automatically.
1 parent d6e630f commit df37a07

File tree

2 files changed

+11
-5
lines changed

2 files changed

+11
-5
lines changed

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

+3-4
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,12 @@ protected void onSaveInstanceState(Bundle outState) {
5858
* Makes API call to check if user is blocked from Commons. If the user is blocked, a snackbar
5959
* is created to notify the user
6060
*/
61-
protected void showBlockStatus()
62-
{
63-
Observable.fromCallable(() -> mediaWikiApi.isUserBlockedFromCommons())
61+
protected void showBlockStatus() {
62+
compositeDisposable.add(Observable.fromCallable(() -> mediaWikiApi.isUserBlockedFromCommons())
6463
.subscribeOn(Schedulers.io())
6564
.observeOn(AndroidSchedulers.mainThread())
6665
.filter(result -> result)
6766
.subscribe(result -> ViewUtil.showShortSnackbar(findViewById(android.R.id.content), R.string.block_notification)
68-
);
67+
));
6968
}
7069
}

app/src/main/java/fr/free/nrw/commons/theme/BaseActivity.java

+8-1
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,14 @@
88
import fr.free.nrw.commons.R;
99
import fr.free.nrw.commons.di.CommonsDaggerAppCompatActivity;
1010
import fr.free.nrw.commons.kvstore.JsonKvStore;
11-
import fr.free.nrw.commons.kvstore.JsonKvStore;
11+
import io.reactivex.disposables.CompositeDisposable;
1212

1313
public abstract class BaseActivity extends CommonsDaggerAppCompatActivity {
1414
@Inject
1515
@Named("default_preferences")
1616
public JsonKvStore defaultKvStore;
1717

18+
protected CompositeDisposable compositeDisposable = new CompositeDisposable();
1819
protected boolean wasPreviouslyDarkTheme;
1920

2021
@Override
@@ -33,4 +34,10 @@ protected void onResume() {
3334

3435
super.onResume();
3536
}
37+
38+
@Override
39+
protected void onDestroy() {
40+
super.onDestroy();
41+
compositeDisposable.clear();
42+
}
3643
}

0 commit comments

Comments
 (0)