From eaeb44c48b7939d0f884a58f445abc1f2b006fac Mon Sep 17 00:00:00 2001 From: odomu <1374415225@qq.com> Date: Fri, 27 May 2022 14:15:51 +0800 Subject: [PATCH] revert: java.aesDecodeArgsBase64Str --- app/src/main/java/io/legado/app/help/JsExtensions.kt | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/io/legado/app/help/JsExtensions.kt b/app/src/main/java/io/legado/app/help/JsExtensions.kt index e0697afc7..2e6eefb9d 100644 --- a/app/src/main/java/io/legado/app/help/JsExtensions.kt +++ b/app/src/main/java/io/legado/app/help/JsExtensions.kt @@ -5,6 +5,7 @@ import android.util.Base64 import androidx.annotation.Keep import cn.hutool.crypto.digest.DigestUtil import cn.hutool.crypto.digest.HMac +import cn.hutool.crypto.symmetric.AES import io.legado.app.constant.AppConst import io.legado.app.constant.AppConst.dateFormat import io.legado.app.constant.AppLog @@ -655,12 +656,12 @@ interface JsExtensions { padding: String, iv: String ): String? { - return EncoderUtils.decryptAES( - data.encodeToByteArray(), + return AES( + mode, + padding, Base64.decode(key, Base64.NO_WRAP), - "AES/${mode}/${padding}", Base64.decode(iv, Base64.NO_WRAP) - )?.let { String(it) } + ).decryptStr(data) } /**