Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix crash(es) caused by failing to dispose Rx observables #2669

Merged
merged 24 commits into from
Mar 19, 2019
Merged

Fix crash(es) caused by failing to dispose Rx observables #2669

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
3657487
Add missing global error handler.
dbrant Mar 19, 2019
4d0db8d
Remove unnecessary disposable container.
dbrant Mar 19, 2019
d6e630f
Add missing disposal logic.
dbrant Mar 19, 2019
df37a07
Add convenience CompoundDisposable to BaseActivity.
dbrant Mar 19, 2019
78c85c4
Add missing disposable logic.
dbrant Mar 19, 2019
b1ad7a2
Add missing dispose logic.
dbrant Mar 19, 2019
9033acc
Add missing dispose logic.
dbrant Mar 19, 2019
e1fbb02
Fix additional missing Rx disposal logic.
dbrant Mar 19, 2019
d4f3fa7
Fix even more Rx dispose logic.
dbrant Mar 19, 2019
d6ab30f
Simplify dispose logic.
dbrant Mar 19, 2019
d1c83a6
Remove redundant CompositeDisposable.
dbrant Mar 19, 2019
c2a20ce
Properly contain and dispose of additional observables.
dbrant Mar 19, 2019
5ab731d
Remove unnecessary disposable container.
dbrant Mar 19, 2019
69b4326
Add missing disposal logic.
dbrant Mar 19, 2019
0e261d8
Add convenience CompoundDisposable to BaseActivity.
dbrant Mar 19, 2019
f15972c
Add missing disposable logic.
dbrant Mar 19, 2019
078234b
Add missing dispose logic.
dbrant Mar 19, 2019
f812f37
Add missing dispose logic.
dbrant Mar 19, 2019
90a0548
Fix additional missing Rx disposal logic.
dbrant Mar 19, 2019
94bf47b
Fix even more Rx dispose logic.
dbrant Mar 19, 2019
51e119e
Simplify dispose logic.
dbrant Mar 19, 2019
3c8dc09
Remove redundant CompositeDisposable.
dbrant Mar 19, 2019
cfeed69
Merge branch 'RxFixes2' of github.com:dbrant/apps-android-commons int…
dbrant Mar 19, 2019
14a2975
Merge branch 'RxFixes3' into RxFixes2
dbrant Mar 19, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix even more Rx dispose logic.
  • Loading branch information
@dbrant
dbrant committed Mar 19, 2019
commit 94bf47bcc53ee8980dd6e23683986908daef39a1
9 changes: 4 additions & 5 deletions app/src/main/java/fr/free/nrw/commons/explore/images/SearchImageFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
import android.annotation.SuppressLint;
import android.content.res.Configuration;
import android.os.Bundle;
import android.os.Handler;
import androidx.recyclerview.widget.GridLayoutManager;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
Expand Down Expand Up @@ -142,12 +141,12 @@ public void updateImageList(String query) {
bottomProgressBar.setVisibility(GONE);
queryList.clear();
imagesAdapter.clear();
okHttpJsonApiClient.searchImages(query, queryList.size())
compositeDisposable.add(okHttpJsonApiClient.searchImages(query, queryList.size())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.timeout(TIMEOUT_SECONDS, TimeUnit.SECONDS)
.doOnSubscribe(disposable -> saveQuery(query))
.subscribe(this::handleSuccess, this::handleError);
.subscribe(this::handleSuccess, this::handleError));
}


Expand All @@ -159,11 +158,11 @@ public void addImagesToList(String query) {
this.query = query;
bottomProgressBar.setVisibility(View.VISIBLE);
progressBar.setVisibility(GONE);
okHttpJsonApiClient.searchImages(query, queryList.size())
compositeDisposable.add(okHttpJsonApiClient.searchImages(query, queryList.size())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.timeout(TIMEOUT_SECONDS, TimeUnit.SECONDS)
.subscribe(this::handlePaginationSuccess, this::handleError);
.subscribe(this::handlePaginationSuccess, this::handleError));
}

/**
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -420,15 +420,15 @@ public void onDeleteButtonClicked(){
private void onDeleteClicked(Spinner spinner) {
String reason = spinner.getSelectedItem().toString();
Single<String> deletionReason = reasonBuilder.getReason(media, reason);
deletionReason
compositeDisposable.add(deletionReason
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(s -> {
DeleteTask deleteTask = new DeleteTask(getActivity(), media, reason);
deleteTask.execute();
isDeleted = true;
enableDeleteButton(false);
});
}));
}

@OnClick(R.id.seeMore)
Expand Down