From 714b275e6750e9dbb09f40eecf2170aca90d9e56 Mon Sep 17 00:00:00 2001 From: Celeter Date: Thu, 24 Oct 2019 19:17:49 +0800 Subject: [PATCH] =?UTF-8?q?js=E6=96=B9=E6=B3=95=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/io/legado/app/help/JsExtensions.kt | 10 +++++++--- .../io/legado/app/model/analyzeRule/AnalyzeRule.kt | 10 +++++++--- app/src/main/java/io/legado/app/utils/EncoderUtils.kt | 6 +++--- 3 files changed, 17 insertions(+), 9 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 754751b01..1ddc8f169 100644 --- a/app/src/main/java/io/legado/app/help/JsExtensions.kt +++ b/app/src/main/java/io/legado/app/help/JsExtensions.kt @@ -27,14 +27,18 @@ object JsExtensions { * js实现解码,不能删 */ fun base64Decode(str: String): String { - return EncoderUtils.base64Decode(str) + return EncoderUtils.base64Decode(str, Base64.NO_WRAP) + } + + fun base64Decode(str: String, flags: Int): String { + return EncoderUtils.base64Decode(str, flags) } fun base64Encode(str: String): String? { - return EncoderUtils.base64Encode(str) + return EncoderUtils.base64Encode(str, Base64.NO_WRAP) } - fun base64Encode(str: String, flags: Int = Base64.NO_WRAP): String? { + fun base64Encode(str: String, flags: Int): String? { return EncoderUtils.base64Encode(str, flags) } diff --git a/app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeRule.kt b/app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeRule.kt index c97fc7b98..4547594e6 100644 --- a/app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeRule.kt +++ b/app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeRule.kt @@ -574,14 +574,18 @@ class AnalyzeRule(private var book: BaseBook? = null) { * js实现解码,不能删 */ fun base64Decode(str: String): String { - return EncoderUtils.base64Decode(str) + return EncoderUtils.base64Decode(str, Base64.NO_WRAP) + } + + fun base64Decode(str: String, flags: Int): String { + return EncoderUtils.base64Decode(str, flags) } fun base64Encode(str: String): String? { - return EncoderUtils.base64Encode(str) + return EncoderUtils.base64Encode(str, Base64.NO_WRAP) } - fun base64Encode(str: String, flags: Int = Base64.NO_WRAP): String? { + fun base64Encode(str: String, flags: Int): String? { return EncoderUtils.base64Encode(str, flags) } diff --git a/app/src/main/java/io/legado/app/utils/EncoderUtils.kt b/app/src/main/java/io/legado/app/utils/EncoderUtils.kt index 4858113e3..55e401d48 100644 --- a/app/src/main/java/io/legado/app/utils/EncoderUtils.kt +++ b/app/src/main/java/io/legado/app/utils/EncoderUtils.kt @@ -24,8 +24,8 @@ object EncoderUtils { return tmp.toString() } - fun base64Decode(str: String): String { - val bytes = Base64.decode(str, Base64.DEFAULT) + fun base64Decode(str: String, flags: Int): String { + val bytes = Base64.decode(str, flags) return try { String(bytes, StandardCharsets.UTF_8) } catch (e: Exception) { @@ -33,7 +33,7 @@ object EncoderUtils { } } - fun base64Encode(str: String, flags: Int = Base64.NO_WRAP): String? { + fun base64Encode(str: String, flags: Int): String? { return Base64.encodeToString(str.toByteArray(), flags) } } \ No newline at end of file