Minor code cleanup

This commit is contained in:
NerdNumber9 2018-06-09 19:54:26 -04:00
parent 71c10df270
commit 4342584c32
2 changed files with 2 additions and 4 deletions

View File

@ -1,6 +1,5 @@
package eu.kanade.tachiyomi.data.backup.serializer package eu.kanade.tachiyomi.data.backup.serializer
import android.telecom.DisconnectCause.REMOTE
import com.github.salomonbrys.kotson.typeAdapter import com.github.salomonbrys.kotson.typeAdapter
import com.google.gson.TypeAdapter import com.google.gson.TypeAdapter
import com.google.gson.stream.JsonToken import com.google.gson.stream.JsonToken

View File

@ -289,7 +289,7 @@ class EHentai(override val id: Long,
val currentImage = getElementById("img").attr("src") val currentImage = getElementById("img").attr("src")
//Each press of the retry button will choose another server //Each press of the retry button will choose another server
select("#loadfail").attr("onclick").nullIfBlank()?.let { select("#loadfail").attr("onclick").nullIfBlank()?.let {
page.url = addParam(page.url, "nl", it.substring(it.indexOf('\'') + 1 .. it.lastIndexOf('\'') - 1)) page.url = addParam(page.url, "nl", it.substring(it.indexOf('\'') + 1 until it.lastIndexOf('\'')))
} }
return currentImage return currentImage
} }
@ -425,8 +425,7 @@ class EHentai(override val id: Long,
} }
} }
//Explicit type arg for listOf() to workaround this: KT-16570 class AdvancedGroup : UriGroup<Filter<*>>("Advanced Options", listOf(
class AdvancedGroup : UriGroup<Filter<*>>("Advanced Options", listOf<Filter<*>>(
AdvancedOption("Search Gallery Name", "f_sname", true), AdvancedOption("Search Gallery Name", "f_sname", true),
AdvancedOption("Search Gallery Tags", "f_stags", true), AdvancedOption("Search Gallery Tags", "f_stags", true),
AdvancedOption("Search Gallery Description", "f_sdesc"), AdvancedOption("Search Gallery Description", "f_sdesc"),