Update dependencies and some linting (#1631)

This commit is contained in:
jmir1
2023-05-21 18:42:23 +02:00
committed by GitHub
parent 60eb7a9262
commit 3a8120cb59
161 changed files with 982 additions and 1003 deletions

View File

@ -4,7 +4,6 @@ import android.util.Base64
import dev.datlag.jsunpacker.JsUnpacker
import eu.kanade.tachiyomi.animesource.model.Video
import eu.kanade.tachiyomi.network.GET
import kotlinx.serialization.decodeFromString
import kotlinx.serialization.json.Json
import kotlinx.serialization.json.JsonObject
import kotlinx.serialization.json.jsonPrimitive
@ -57,7 +56,7 @@ class GdrivePlayerExtractor(private val client: OkHttpClient) {
val salt = json["s"]!!.jsonPrimitive.content
val encodedCiphetext = json["ct"]!!.jsonPrimitive.content
val ciphertext = Base64.decode(encodedCiphetext, Base64.DEFAULT)
val (key, iv) = GenerateKeyAndIv(password, salt.decodeHex())
val (key, iv) = generateKeyAndIv(password, salt.decodeHex())
?: return null
val keySpec = SecretKeySpec(key, "AES")
val ivSpec = IvParameterSpec(iv)
@ -68,7 +67,7 @@ class GdrivePlayerExtractor(private val client: OkHttpClient) {
}
// https://stackoverflow.com/a/41434590/8166854
private fun GenerateKeyAndIv(
private fun generateKeyAndIv(
password: ByteArray,
salt: ByteArray,
hashAlgorithm: String = "MD5",