diff --git a/src/en/aniwave/build.gradle b/src/en/aniwave/build.gradle index 1643d4040..093d8b623 100644 --- a/src/en/aniwave/build.gradle +++ b/src/en/aniwave/build.gradle @@ -8,7 +8,7 @@ ext { extName = 'Aniwave' pkgNameSuffix = 'en.nineanime' extClass = '.Aniwave' - extVersionCode = 62 + extVersionCode = 63 } dependencies { diff --git a/src/en/aniwave/src/eu/kanade/tachiyomi/animeextension/en/nineanime/extractors/VidsrcExtractor.kt b/src/en/aniwave/src/eu/kanade/tachiyomi/animeextension/en/nineanime/extractors/VidsrcExtractor.kt index 4cc97602f..caf8be9a6 100644 --- a/src/en/aniwave/src/eu/kanade/tachiyomi/animeextension/en/nineanime/extractors/VidsrcExtractor.kt +++ b/src/en/aniwave/src/eu/kanade/tachiyomi/animeextension/en/nineanime/extractors/VidsrcExtractor.kt @@ -1,47 +1,42 @@ package eu.kanade.tachiyomi.animeextension.en.nineanime.extractors -import android.util.Base64 -import app.cash.quickjs.QuickJs +import android.app.Application +import android.os.Handler +import android.os.Looper +import android.webkit.JavascriptInterface +import android.webkit.WebResourceRequest +import android.webkit.WebResourceResponse +import android.webkit.WebSettings +import android.webkit.WebView +import android.webkit.WebViewClient import eu.kanade.tachiyomi.animeextension.en.nineanime.MediaResponseBody import eu.kanade.tachiyomi.animesource.model.Track import eu.kanade.tachiyomi.animesource.model.Video import eu.kanade.tachiyomi.lib.playlistutils.PlaylistUtils import eu.kanade.tachiyomi.network.GET import eu.kanade.tachiyomi.util.parseAs -import kotlinx.serialization.json.Json -import okhttp3.CacheControl import okhttp3.Headers import okhttp3.HttpUrl.Companion.toHttpUrl import okhttp3.OkHttpClient import uy.kohesive.injekt.injectLazy +import java.io.ByteArrayInputStream import java.net.URLDecoder -import javax.crypto.Cipher -import javax.crypto.spec.SecretKeySpec +import java.util.concurrent.CountDownLatch +import java.util.concurrent.TimeUnit class VidsrcExtractor(private val client: OkHttpClient, private val headers: Headers) { - private val json: Json by injectLazy() - private val playlistUtils by lazy { PlaylistUtils(client, headers) } - private val cacheControl = CacheControl.Builder().noStore().build() - private val noCacheClient = client.newBuilder() - .cache(null) - .build() - - private val keys by lazy { - noCacheClient.newCall( - GET("https://raw.githubusercontent.com/Claudemirovsky/worstsource-keys/keys/keys.json", cache = cacheControl), - ).execute().parseAs>() - } - fun videosFromUrl(embedLink: String, name: String, type: String): List