mirror/mihon
1
0
Fork 0
mirror of https://github.com/mihonapp/mihon.git synced 2025-06-26 02:57:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

Replace hamcrest with assertj. ChaptersSubject now uses only one observeOn.

Browse Source
This commit is contained in:
inorichi
2016-01-06 16:08:15 +01:00
parent dd833852ad
commit 73aa93773c
4 changed files with 26 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/eu/kanade/mangafeed/ui/manga/chapter/ChaptersPresenter.java
View File

@ -120,22 +120,20 @@ public class ChaptersPresenter extends BasePresenter<ChaptersFragment> {
}
private Observable<PostResult> getOnlineChaptersObs() {
return source
.pullChaptersFromNetwork(manga.url)
return source.pullChaptersFromNetwork(manga.url)
.subscribeOn(Schedulers.io())
.flatMap(chapters -> db.insertOrRemoveChapters(manga, chapters))
.observeOn(AndroidSchedulers.mainThread());
}
private Observable<List<Chapter>> getDbChaptersObs() {
return chaptersSubject
.observeOn(Schedulers.io())
.flatMap(this::applyChapterFilters)
return chaptersSubject.flatMap(this::applyChapterFilters)
.observeOn(AndroidSchedulers.mainThread());
}
private Observable<List<Chapter>> applyChapterFilters(List<Chapter> chapters) {
Observable<Chapter> observable = Observable.from(chapters);
Observable<Chapter> observable = Observable.from(chapters)
.subscribeOn(Schedulers.io());
if (onlyUnread) {
observable = observable.filter(chapter -> !chapter.read);
}