javara999/mihon-bookoasis
1
0
Fork 0
Code Issues Pull Requests Actions 7 Packages Projects Releases 5 Wiki Activity

Upgrade storio to 1.7.0

Browse Source
This commit is contained in:
inorichi
2015-12-29 21:47:03 +01:00
parent 62535c77ae
commit b0ad72afad
9 changed files with 35 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/eu/kanade/mangafeed/ui/catalogue/CataloguePresenter.java
+1 -2
View File
@@ -134,8 +134,7 @@ public class CataloguePresenter extends BasePresenter<CatalogueFragment> {
}
private Manga networkToLocalManga(Manga networkManga) {
List<Manga> dbResult = db.getManga(networkManga.url, source.getId()).executeAsBlocking();
Manga localManga = !dbResult.isEmpty() ? dbResult.get(0) : null;
Manga localManga = db.getManga(networkManga.url, source.getId()).executeAsBlocking();
if (localManga == null) {
PutResult result = db.insertManga(networkManga).executeAsBlocking();
networkManga.id = result.insertedId();
app/src/main/java/eu/kanade/mangafeed/ui/manga/MangaPresenter.java
-1
View File
@@ -38,7 +38,6 @@ public class MangaPresenter extends BasePresenter<MangaActivity> {
private Observable<Manga> getDbMangaObservable() {
return db.getManga(mangaId).createObservable()
.subscribeOn(Schedulers.io())
.flatMap(Observable::from)
.observeOn(AndroidSchedulers.mainThread())
.doOnNext(manga -> EventBus.getDefault().postSticky(manga));
}
app/src/main/java/eu/kanade/mangafeed/ui/manga/chapter/ChaptersPresenter.java
+1 -2
View File
@@ -191,8 +191,7 @@ public class ChaptersPresenter extends BasePresenter<ChaptersFragment> {
}
public Chapter getNextUnreadChapter() {
List<Chapter> chapters = db.getNextUnreadChapter(manga).executeAsBlocking();
return !chapters.isEmpty() ? chapters.get(0) : null;
return db.getNextUnreadChapter(manga).executeAsBlocking();
}
public void markChaptersRead(Observable<Chapter> selectedChapters, boolean read) {
app/src/main/java/eu/kanade/mangafeed/ui/manga/myanimelist/MyAnimeListPresenter.java
-1
View File
@@ -45,7 +45,6 @@ public class MyAnimeListPresenter extends BasePresenter<MyAnimeListFragment> {
restartableLatestCache(GET_MANGA_SYNC,
() -> db.getMangaSync(manga, myAnimeList).createObservable()
.flatMap(Observable::from)
.doOnNext(mangaSync -> this.mangaSync = mangaSync)
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread()),
app/src/main/java/eu/kanade/mangafeed/ui/reader/ReaderPresenter.java
+1 -3
View File
@@ -249,7 +249,7 @@ public class ReaderPresenter extends BasePresenter<ReaderActivity> {
if (pageList == null)
return;
db.getMangaSync(manga).createObservable()
db.getMangasSync(manga).createObservable()
.take(1)
.flatMap(Observable::from)
.doOnNext(mangaSync -> {
@@ -281,12 +281,10 @@ public class ReaderPresenter extends BasePresenter<ReaderActivity> {
private void getAdjacentChapters() {
add(db.getNextChapter(chapter).createObservable()
.take(1)
.flatMap(Observable::from)
.subscribe(result -> nextChapter = result));
add(db.getPreviousChapter(chapter).createObservable()
.take(1)
.flatMap(Observable::from)
.subscribe(result -> previousChapter = result));
}