yutou/tachiyomi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Make query non nullable, it fixes some bugs in the catalogue

Browse Source
This commit is contained in:
len 2016-04-27 00:56:37 +02:00
parent de6cc8394e
commit 5d396bfb7c
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/CataloguePresenter.kt
View File

@ -52,7 +52,7 @@ class CataloguePresenter : BasePresenter<CatalogueFragment>() {
/** /**
* Query from the view. * Query from the view.
*/ */
var query: String? = null var query = ""
private set private set
/** /**
@ -104,7 +104,7 @@ class CataloguePresenter : BasePresenter<CatalogueFragment>() {
source = getLastUsedSource() source = getLastUsedSource()
if (savedState != null) { if (savedState != null) {
query = savedState.getString(QUERY_KEY) query = savedState.getString(QUERY_KEY, "")
} }
startableLatestCache(GET_MANGA_DETAILS, startableLatestCache(GET_MANGA_DETAILS,
@ -160,7 +160,7 @@ class CataloguePresenter : BasePresenter<CatalogueFragment>() {
fun setActiveSource(source: Source) { fun setActiveSource(source: Source) {
prefs.lastUsedCatalogueSource().set(source.id) prefs.lastUsedCatalogueSource().set(source.id)
this.source = source this.source = source
restartPager(null) restartPager()
} }
/** /**
@ -168,7 +168,7 @@ class CataloguePresenter : BasePresenter<CatalogueFragment>() {
* *
* @param query the query, or null if searching popular manga. * @param query the query, or null if searching popular manga.
*/ */
fun restartPager(query: String?) { fun restartPager(query: String = "") {
this.query = query this.query = query
stop(REQUEST_PAGE) stop(REQUEST_PAGE)
lastMangasPage = null lastMangasPage = null
@ -215,10 +215,10 @@ class CataloguePresenter : BasePresenter<CatalogueFragment>() {
nextMangasPage.url = lastMangasPage!!.nextPageUrl nextMangasPage.url = lastMangasPage!!.nextPageUrl
} }
val observable = if (query.isNullOrEmpty()) val observable = if (query.isEmpty())
source.pullPopularMangasFromNetwork(nextMangasPage) source.pullPopularMangasFromNetwork(nextMangasPage)
else else
source.searchMangasFromNetwork(nextMangasPage, query!!) source.searchMangasFromNetwork(nextMangasPage, query)
return observable.subscribeOn(Schedulers.io()) return observable.subscribeOn(Schedulers.io())
.doOnNext { lastMangasPage = it } .doOnNext { lastMangasPage = it }