From 08612363dc84727f3242ab759fff4aff07d240f6 Mon Sep 17 00:00:00 2001
From: Xwite <1797350009@qq.com>
Date: Wed, 15 Mar 2023 11:03:37 +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, 5 insertions(+), 3 deletions(-)

diff --git a/app/src/main/assets/help/jsHelp.md b/app/src/main/assets/help/jsHelp.md
index e0580fed3..f95eb73ab 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: String!!,  usePublicKey: Boolean? = true
+cipher.decryptStr(data, 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 1639c8def..fb2a2c302 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,9 +41,11 @@ class AsymmetricCrypto(algorithm: String) : HutoolAsymmetricCrypto(algorithm) {
     }
 
     @JvmOverloads
-    fun decryptStr(data: String, usePublicKey: Boolean? = true): String {
+    fun decryptStr(data: Any, usePublicKey: Boolean? = true): String {
         return when {
+            data is ByteArray -> String(decrypt(data, getKeyType(usePublicKey)))
             data is String -> decryptStr(data, getKeyType(usePublicKey))
+            data is InputStream -> String(decrypt(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 db0a88349..5d698b19f 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: String, usePublicKey: Boolean? = true): String?
+fun decryptStr(data: Any, usePublicKey: Boolean? = true): String?
 
 fun encrypt(data: Any, usePublicKey: Boolean? = true): ByteArray?
 fun encryptHex(data: Any, usePublicKey: Boolean? = true): String?