From 23c1fea1b0eb0d0700ebe781edadcfb2a29b7342 Mon Sep 17 00:00:00 2001 From: Xwite <1797350009@qq.com> Date: Tue, 14 Mar 2023 13:21:36 +0800 Subject: [PATCH] [skip ci] --- app/src/main/assets/help/jsHelp.md | 8 ++++++-- app/src/main/java/io/legado/app/help/JsEncodeUtils.kt | 8 ++++---- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/app/src/main/assets/help/jsHelp.md b/app/src/main/assets/help/jsHelp.md index 84f9c3f8d..9285dc661 100644 --- a/app/src/main/assets/help/jsHelp.md +++ b/app/src/main/assets/help/jsHelp.md @@ -159,6 +159,11 @@ java.hexDecodeToString(hex: String) utf8 编码为hexString java.hexEncodeToString(utf8: String) ``` +* 标识id +``` +java.randomUUID() +java.androidId() +``` * 文件 > 所有对于文件的读写删操作都是相对路径,只能操作阅读缓存/android/data/{package}/cache/内的文件 ``` @@ -206,11 +211,10 @@ cipher.encryptBase64(data) cipher.encryptHex(data) ``` * 非对称加密 RSA/ECIES(不支持) -> algorithm: RSA, RSA/ECB/PKCS1Padding, RSA/ECB/NoPadding, RSA/None/NoPadding, RSA/None/NoPadding > 输入参数密钥 支持ByteArray|**Utf8String** ``` //创建cipher -java.createAsymmetricCrypto(algorithm, privateKey, publicKey) +java.createAsymmetricCrypto(transformation, privateKey, publicKey) ``` > 解密加密参数 data支持ByteArray|Base64String|HexString|InputStream > keyType: 1 使用公钥 2 使用私钥 diff --git a/app/src/main/java/io/legado/app/help/JsEncodeUtils.kt b/app/src/main/java/io/legado/app/help/JsEncodeUtils.kt index e360fde7b..ab068b43d 100644 --- a/app/src/main/java/io/legado/app/help/JsEncodeUtils.kt +++ b/app/src/main/java/io/legado/app/help/JsEncodeUtils.kt @@ -71,20 +71,20 @@ interface JsEncodeUtils { /* keys都为null时使用随机密钥 */ fun createAsymmetricCrypto( - algorithm: String, + transformation: String, privateKey: ByteArray?, publicKey: ByteArray? ): AsymmetricCrypto { - return AsymmetricCrypto(algorithm, privateKey, publicKey) + return AsymmetricCrypto(transformation, privateKey, publicKey) } fun createAsymmetricCrypto( - algorithm: String, + transformation: String, privateKey: String?, publicKey: String? ): AsymmetricCrypto { return createAsymmetricCrypto( - algorithm, + transformation, privateKey?.encodeToByteArray(), publicKey?.encodeToByteArray() )