neoris/NewPipe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix bug of search history randomly not saved

Browse Source 
Don't create disposable from operation of storing search to history
because we certainly want this to complete. But create disposable
from subscriber functions which handles showing snackbar notifiying
user about not being to save search

Disposable was created in `search` method and then alsmost immediately
was called `startLoading` which disposed "all" disposables including
our operation of search storing (if it was unlucky enough to not finish
before this moment)
This commit is contained in:
Yevhen Babiichuk (DustDFG) 2026-01-14 17:05:38 +02:00
parent 15b5cef6c2
commit f1f2b398ab
1 changed files with 43 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
app/src/main/java/org/schabi/newpipe/fragments/list/search/SearchFragment.java
View File

@ -85,6 +85,8 @@ import io.reactivex.rxjava3.core.Observable;
import io.reactivex.rxjava3.core.Single;
import io.reactivex.rxjava3.disposables.CompositeDisposable;
import io.reactivex.rxjava3.disposables.Disposable;
import io.reactivex.rxjava3.observers.DisposableMaybeObserver;
import io.reactivex.rxjava3.observers.DisposableSingleObserver;
import io.reactivex.rxjava3.schedulers.Schedulers;
import io.reactivex.rxjava3.subjects.PublishSubject;
@ -707,12 +709,20 @@ public class SearchFragment extends BaseListFragment<SearchInfo, ListExtractor.I
.setPositiveButton(R.string.delete, (dialog, which) -> {
final Disposable onDelete = historyRecordManager.deleteSearchHistory(query)
.observeOn(AndroidSchedulers.mainThread())
.subscribe(
howManyDeleted -> suggestionPublisher
.onNext(getSearchEditString()),
throwable -> showSnackBarError(new ErrorInfo(throwable,
.subscribeWith(new DisposableSingleObserver<Integer>() {
@Override
public void onSuccess(final Integer howManyDeleted) {
suggestionPublisher.onNext(getSearchEditString());
}
@Override
public void onError(final Throwable e) {
showSnackBarError(new ErrorInfo(e,
UserAction.DELETE_FROM_HISTORY,
"Deleting item failed")));
"Deleting item failed"));
}
});
disposables.add(onDelete);
})
.show();
@ -865,13 +875,24 @@ public class SearchFragment extends BaseListFragment<SearchInfo, ListExtractor.I
hideKeyboardSearch();
// store search query if search history is enabled
disposables.add(historyRecordManager.onSearched(serviceId, theSearchString)
.observeOn(AndroidSchedulers.mainThread())
.subscribe(
ignored -> {
},
throwable -> showSnackBarError(new ErrorInfo(throwable, UserAction.SEARCHED,
theSearchString, serviceId))
.subscribeWith(new DisposableMaybeObserver<Long>() {
@Override
public void onError(final Throwable throwable) {
showSnackBarError(new ErrorInfo(throwable, UserAction.SEARCHED,
theSearchString, serviceId));
}
@Override
public void onComplete() {
}
@Override
public void onSuccess(final Long ignored) {
}
}
));
// load search results
@ -1154,11 +1175,18 @@ public class SearchFragment extends BaseListFragment<SearchInfo, ListExtractor.I
final String query = suggestionListAdapter.getCurrentList().get(position).query;
final Disposable onDelete = historyRecordManager.deleteSearchHistory(query)
.observeOn(AndroidSchedulers.mainThread())
.subscribe(
howManyDeleted -> suggestionPublisher
.onNext(getSearchEditString()),
throwable -> showSnackBarError(new ErrorInfo(throwable,
UserAction.DELETE_FROM_HISTORY, "Deleting item failed")));
.subscribeWith(new DisposableSingleObserver<Integer>() {
@Override
public void onSuccess(final Integer howManyDeleted) {
suggestionPublisher.onNext(getSearchEditString());
}
@Override
public void onError(final Throwable e) {
showSnackBarError(new ErrorInfo(e,
UserAction.DELETE_FROM_HISTORY, "Deleting item failed"));
}
});
disposables.add(onDelete);
}
}