Skip to content

Fix bug of search history randomly not saved #13173

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

Closed
ghost wants to merge 1 commit into from
+43 −15
Closed

Fix bug of search history randomly not saved #13173

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
58 changes: 43 additions & 15 deletions app/src/main/java/org/schabi/newpipe/fragments/list/search/SearchFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,8 @@
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;

Expand Down Expand Up @@ -707,12 +709,20 @@ private void showDeleteSuggestionDialog(final SuggestionItem item) {
.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();
Expand Down Expand Up @@ -865,13 +875,24 @@ private void search(@NonNull final String theSearchString,
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
Expand Down Expand Up @@ -1154,11 +1175,18 @@ public void onSuggestionItemSwiped(@NonNull final RecyclerView.ViewHolder viewHo
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);
}
}
Loading