From 61ae3580615bf6d47c56d16e369671b3e0cd3df8 Mon Sep 17 00:00:00 2001 From: Xwite <1797350009@qq.com> Date: Wed, 15 Mar 2023 10:59:06 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/assets/help/jsHelp.md | 2 +- .../main/java/io/legado/app/help/crypto/AsymmetricCrypto.kt | 4 +--- app/src/main/java/io/legado/app/help/crypto/README.md | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/app/src/main/assets/help/jsHelp.md b/app/src/main/assets/help/jsHelp.md index 1aea29474..e0580fed3 100644 --- a/app/src/main/assets/help/jsHelp.md +++ b/app/src/main/assets/help/jsHelp.md @@ -219,7 +219,7 @@ java.createAsymmetricCrypto(transformation) //解密为ByteArray String cipher.decrypt(data, usePublicKey: Boolean? = true ) -cipher.decryptStr(data, usePublicKey: Boolean? = true +cipher.decryptStr(data: String!!, usePublicKey: Boolean? = true ) //加密为ByteArray Base64字符 HEX字符 cipher.encrypt(data, usePublicKey: Boolean? = true diff --git a/app/src/main/java/io/legado/app/help/crypto/AsymmetricCrypto.kt b/app/src/main/java/io/legado/app/help/crypto/AsymmetricCrypto.kt index 7da81dc49..1639c8def 100644 --- a/app/src/main/java/io/legado/app/help/crypto/AsymmetricCrypto.kt +++ b/app/src/main/java/io/legado/app/help/crypto/AsymmetricCrypto.kt @@ -41,11 +41,9 @@ class AsymmetricCrypto(algorithm: String) : HutoolAsymmetricCrypto(algorithm) { } @JvmOverloads - fun decryptStr(data: Any, usePublicKey: Boolean? = true): String { + fun decryptStr(data: String, usePublicKey: Boolean? = true): String { return when { - data is ByteArray -> decryptStr(data, getKeyType(usePublicKey)) data is String -> decryptStr(data, getKeyType(usePublicKey)) - data is InputStream -> decryptStr(data, getKeyType(usePublicKey)) else -> throw IllegalArgumentException("Unexpected input type") } } diff --git a/app/src/main/java/io/legado/app/help/crypto/README.md b/app/src/main/java/io/legado/app/help/crypto/README.md index 5d698b19f..db0a88349 100644 --- a/app/src/main/java/io/legado/app/help/crypto/README.md +++ b/app/src/main/java/io/legado/app/help/crypto/README.md @@ -8,7 +8,7 @@ fun setPrivateKey(key: ByteArray): T fun setPrivateKey(key: String): T fun decrypt(data: Any, usePublicKey: Boolean? = true): ByteArray? -fun decryptStr(data: Any, usePublicKey: Boolean? = true): String? +fun decryptStr(data: String, usePublicKey: Boolean? = true): String? fun encrypt(data: Any, usePublicKey: Boolean? = true): ByteArray? fun encryptHex(data: Any, usePublicKey: Boolean? = true): String?