From f230a86d12590e01a2a353dff878c3470cff1828 Mon Sep 17 00:00:00 2001 From: gedoor Date: Fri, 6 Nov 2020 21:05:50 +0800 Subject: [PATCH 1/3] =?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/updateLog.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/assets/updateLog.md b/app/src/main/assets/updateLog.md index e97480f4e..f3d242231 100644 --- a/app/src/main/assets/updateLog.md +++ b/app/src/main/assets/updateLog.md @@ -10,7 +10,7 @@ * 替换编辑界面添加正则学习教程 * 去除解析目录时拼接相对url,提升解析速度 * 自动分段优化 by [tumuyan](https://github.com/tumuyan) -* web支持图片显示 +* web支持图片显示 by [六月](https://github.com/Celeter) **2020/11/01** * 导入本地添加智能扫描,菜单-智能扫描,扫描当前文件夹包括子文件夹下所有文件 From 768bb8bdc3c9d8b621774ef5a8d6c6b641e68675 Mon Sep 17 00:00:00 2001 From: gedoor Date: Fri, 6 Nov 2020 21:11:25 +0800 Subject: [PATCH 2/3] =?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/java/io/legado/app/utils/EncoderUtils.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 406aa3815..8f0ba0303 100644 --- a/app/src/main/java/io/legado/app/utils/EncoderUtils.kt +++ b/app/src/main/java/io/legado/app/utils/EncoderUtils.kt @@ -25,8 +25,8 @@ object EncoderUtils { return tmp.toString() } - fun base64Decode(str: String): String { - val bytes = Base64.decode(str, Base64.DEFAULT) + fun base64Decode(str: String, flags: Int = Base64.DEFAULT): String { + val bytes = Base64.decode(str, flags) return try { String(bytes, StandardCharsets.UTF_8) } catch (e: Exception) { From 55aedfeceebac1fc4c22d85ec20b28439ff0011d Mon Sep 17 00:00:00 2001 From: gedoor Date: Fri, 6 Nov 2020 21:12:26 +0800 Subject: [PATCH 3/3] =?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/java/io/legado/app/utils/EncoderUtils.kt | 2 ++ 1 file changed, 2 insertions(+) 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 8f0ba0303..8d7b904f8 100644 --- a/app/src/main/java/io/legado/app/utils/EncoderUtils.kt +++ b/app/src/main/java/io/legado/app/utils/EncoderUtils.kt @@ -25,6 +25,7 @@ object EncoderUtils { return tmp.toString() } + @JvmOverloads fun base64Decode(str: String, flags: Int = Base64.DEFAULT): String { val bytes = Base64.decode(str, flags) return try { @@ -34,6 +35,7 @@ object EncoderUtils { } } + @JvmOverloads fun base64Encode(str: String, flags: Int = Base64.NO_WRAP): String? { return Base64.encodeToString(str.toByteArray(), flags) }