diff --git a/app/src/main/java/eu/kanade/tachiyomi/source/online/all/EHentai.kt b/app/src/main/java/eu/kanade/tachiyomi/source/online/all/EHentai.kt index b913260ac..bf942fdb0 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/source/online/all/EHentai.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/source/online/all/EHentai.kt @@ -724,7 +724,7 @@ class EHentai( }) } - val outJson = JsonParser().parse(client.newCall(Request.Builder() + val outJson = JsonParser.parseString(client.newCall(Request.Builder() .url(EH_API_BASE) .post(RequestBody.create(JSON, json.toString())) .build()).execute().body!!.string()).obj diff --git a/app/src/main/java/eu/kanade/tachiyomi/source/online/all/Hitomi.kt b/app/src/main/java/eu/kanade/tachiyomi/source/online/all/Hitomi.kt index 93692bcc3..60e7d2474 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/source/online/all/Hitomi.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/source/online/all/Hitomi.kt @@ -44,7 +44,6 @@ import uy.kohesive.injekt.injectLazy */ class Hitomi : HttpSource(), LewdSource, UrlImportableSource { private val prefs: PreferencesHelper by injectLazy() - private val jsonParser by lazy { JsonParser() } override val id = HITOMI_SOURCE_ID @@ -365,7 +364,7 @@ class Hitomi : HttpSource(), LewdSource, UrlImpo override fun pageListParse(response: Response): List { val hlId = response.request.url.pathSegments.last().removeSuffix(".js").toLong() val str = response.body!!.string() - val json = jsonParser.parse(str.removePrefix("var galleryinfo = ")) + val json = JsonParser.parseString(str.removePrefix("var galleryinfo = ")) return json["files"].array.mapIndexed { index, jsonElement -> val hash = jsonElement["hash"].string val ext = if (jsonElement["haswebp"].string == "0") jsonElement["name"].string.split('.').last() else "webp" diff --git a/app/src/main/java/eu/kanade/tachiyomi/source/online/all/NHentai.kt b/app/src/main/java/eu/kanade/tachiyomi/source/online/all/NHentai.kt index 2a583f88d..e9e61532b 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/source/online/all/NHentai.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/source/online/all/NHentai.kt @@ -173,7 +173,7 @@ class NHentai(context: Context) : HttpSource(), LewdSource, UrlIm ?: continue val pageList = PAGE_LIST_REGEX.find(script)?.groupValues?.getOrNull(1) ?: continue - return jsonParser.parse(pageList).array.take(totalPages).map { + return JsonParser.parseString(pageList).array.take(totalPages).map { it.string }.mapIndexed { index, pageName -> Page( @@ -462,8 +462,6 @@ class HBrowse : HttpSource(), LewdSource, UrlIm private val PAGE_LIST_REGEX = Regex("list *= *(\\[.*]);") private val TOTAL_PAGES_REGEX = Regex("totalPages *= *([0-9]*);") - private val jsonParser by lazy { JsonParser() } - private const val BASE_COOKIES = "thumbnails=1;" private val NS_MAPPINGS = mapOf( diff --git a/app/src/main/java/eu/kanade/tachiyomi/source/online/english/Tsumino.kt b/app/src/main/java/eu/kanade/tachiyomi/source/online/english/Tsumino.kt index 436c2d927..fa1f0ca5b 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/source/online/english/Tsumino.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/source/online/english/Tsumino.kt @@ -1,7 +1,6 @@ package eu.kanade.tachiyomi.source.online.english import android.net.Uri -import com.google.gson.JsonParser import eu.kanade.tachiyomi.network.asObservableSuccess import eu.kanade.tachiyomi.source.model.FilterList import eu.kanade.tachiyomi.source.model.SManga @@ -120,7 +119,6 @@ class Tsumino(delegate: HttpSource) : DelegatedHttpSource(delegate), ) companion object { - val jsonParser by lazy { JsonParser() } val TM_DATE_FORMAT = SimpleDateFormat("yyyy MMM dd", Locale.US) private val ASP_NET_COOKIE_NAME = "ASP.NET_SessionId" } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourcePresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourcePresenter.kt index b16d8cf79..32c0cf400 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourcePresenter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourcePresenter.kt @@ -406,7 +406,6 @@ open class BrowseSourcePresenter( } // EXH --> - private val jsonParser = JsonParser() private val filterSerializer = FilterSerializer() fun saveSearches(searches: List) { val otherSerialized = prefs.eh_savedSearches().getOrDefault().filter { @@ -428,7 +427,7 @@ open class BrowseSourcePresenter( try { val id = it.substringBefore(':').toLong() if (id != source.id) return@map null - val content = jsonParser.parse(it.substringAfter(':')).obj + val content = JsonParser.parseString(it.substringAfter(':')).obj val originalFilters = source.getFilterList() filterSerializer.deserialize(originalFilters, content["filters"].array) EXHSavedSearch(content["name"].string, diff --git a/app/src/main/java/exh/ui/captcha/BrowserActionActivity.kt b/app/src/main/java/exh/ui/captcha/BrowserActionActivity.kt index 762d188ef..83bdbaf95 100644 --- a/app/src/main/java/exh/ui/captcha/BrowserActionActivity.kt +++ b/app/src/main/java/exh/ui/captcha/BrowserActionActivity.kt @@ -49,7 +49,6 @@ class BrowserActionActivity : AppCompatActivity() { private val networkHelper: NetworkHelper by injectLazy() val httpClient = networkHelper.client - private val jsonParser = JsonParser() private var currentLoopId: String? = null private var validateCurrentLoopId: String? = null @@ -155,7 +154,7 @@ class BrowserActionActivity : AppCompatActivity() { .asObservableSuccess() .subscribeOn(Schedulers.io()) .map { - val json = jsonParser.parse(it.body!!.string()) + val json = JsonParser.parseString(it.body!!.string()) it.close() json["token"].string }.melt() @@ -292,7 +291,7 @@ class BrowserActionActivity : AppCompatActivity() { .build()) .build()).asObservableSuccess() }.map { response -> - jsonParser.parse(response.body!!.string())["results"][0]["alternatives"][0]["transcript"].string.trim() + JsonParser.parseString(response.body!!.string())["results"][0]["alternatives"][0]["transcript"].string.trim() }.toSingle() }