diff --git a/src/en/nineanime/build.gradle b/src/en/nineanime/build.gradle index 9c1f484a..c8baffe8 100644 --- a/src/en/nineanime/build.gradle +++ b/src/en/nineanime/build.gradle @@ -1,7 +1,7 @@ ext { extName = 'Aniwave' extClass = '.Aniwave' - extVersionCode = 69 + extVersionCode = 70 } apply from: "$rootDir/common.gradle" diff --git a/src/en/nineanime/src/eu/kanade/tachiyomi/animeextension/en/nineanime/Aniwave.kt b/src/en/nineanime/src/eu/kanade/tachiyomi/animeextension/en/nineanime/Aniwave.kt index 355ebe15..7d36e8fb 100644 --- a/src/en/nineanime/src/eu/kanade/tachiyomi/animeextension/en/nineanime/Aniwave.kt +++ b/src/en/nineanime/src/eu/kanade/tachiyomi/animeextension/en/nineanime/Aniwave.kt @@ -3,6 +3,7 @@ package eu.kanade.tachiyomi.animeextension.en.nineanime import android.app.Application import android.content.SharedPreferences import android.widget.Toast +import androidx.preference.EditTextPreference import androidx.preference.ListPreference import androidx.preference.MultiSelectListPreference import androidx.preference.PreferenceScreen @@ -89,7 +90,7 @@ class Aniwave : ConfigurableAnimeSource, ParsedAnimeHttpSource() { override fun searchAnimeRequest(page: Int, query: String, filters: AnimeFilterList): Request { val filters = AniwaveFilters.getSearchParameters(filters) - val vrf = if (query.isNotBlank()) utils.vrfEncrypt(query) else "" + val vrf = if (query.isNotBlank()) utils.vrfEncrypt(getEncryptionKey(), query) else "" var url = "$baseUrl/filter?keyword=$query" if (filters.genre.isNotBlank()) url += filters.genre @@ -101,7 +102,7 @@ class Aniwave : ConfigurableAnimeSource, ParsedAnimeHttpSource() { if (filters.language.isNotBlank()) url += filters.language if (filters.rating.isNotBlank()) url += filters.rating - return GET("$url&sort=${filters.sort}&page=$page&$vrf", refererHeaders) + return GET("$url&sort=${filters.sort}&page=$page&vrf=$vrf", refererHeaders) } override fun searchAnimeSelector(): String = popularAnimeSelector() @@ -139,7 +140,7 @@ class Aniwave : ConfigurableAnimeSource, ParsedAnimeHttpSource() { override fun episodeListRequest(anime: SAnime): Request { val id = client.newCall(GET(baseUrl + anime.url)).execute().asJsoup() .selectFirst("div[data-id]")!!.attr("data-id") - val vrf = utils.vrfEncrypt(id) + val vrf = utils.vrfEncrypt(getEncryptionKey(), id) val listHeaders = headers.newBuilder().apply { add("Accept", "application/json, text/javascript, */*; q=0.01") @@ -147,7 +148,7 @@ class Aniwave : ConfigurableAnimeSource, ParsedAnimeHttpSource() { add("X-Requested-With", "XMLHttpRequest") }.build() - return GET("$baseUrl/ajax/episode/list/$id?$vrf#${anime.url}", listHeaders) + return GET("$baseUrl/ajax/episode/list/$id?vrf=$vrf#${anime.url}", listHeaders) } override fun episodeListSelector() = "div.episodes ul > li > a" @@ -195,8 +196,8 @@ class Aniwave : ConfigurableAnimeSource, ParsedAnimeHttpSource() { override fun videoListRequest(episode: SEpisode): Request { val ids = episode.url.substringBefore("&") - val vrf = utils.vrfEncrypt(ids) - val url = "/ajax/server/list/$ids?$vrf" + val vrf = utils.vrfEncrypt(getEncryptionKey(), ids) + val url = "/ajax/server/list/$ids?vrf=$vrf" val epurl = episode.url.substringAfter("epurl=") val listHeaders = headers.newBuilder().apply { @@ -248,7 +249,7 @@ class Aniwave : ConfigurableAnimeSource, ParsedAnimeHttpSource() { private val mp4uploadExtractor by lazy { Mp4uploadExtractor(client) } private fun extractVideo(server: VideoData, epUrl: String): List