From 7f9a687328665311e3e4c1db19afbf9f683b1c13 Mon Sep 17 00:00:00 2001
From: gedoor <gekunfei@live.com>
Date: Mon, 19 Jul 2021 20:51:57 +0800
Subject: [PATCH] =?UTF-8?q?Revert=20"=E4=BC=98=E5=8C=96"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 12b0bc5d
---
 app/src/main/java/io/legado/app/utils/HtmlFormatter.kt | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/io/legado/app/utils/HtmlFormatter.kt b/app/src/main/java/io/legado/app/utils/HtmlFormatter.kt
index 3fe6f8d6f..cae9b2251 100644
--- a/app/src/main/java/io/legado/app/utils/HtmlFormatter.kt
+++ b/app/src/main/java/io/legado/app/utils/HtmlFormatter.kt
@@ -26,8 +26,10 @@ object HtmlFormatter {
 
     fun formatKeepImg(html: String?, redirectUrl: URL?): String {
         html ?: return ""
-        val keepImgHtml = formatKeepImg(html)
-
+        val keepImgHtml = html.replace(wrapHtmlRegex, "\n")
+            .replace(notImgHtmlRegex, "")
+            .replace("\\n\\s*$|^\\s*\\n".toRegex(), "")
+            .replace("\\n\\s*\\n".toRegex(), "\n")
         //正则的“|”处于顶端而不处于（）中时，具有类似||的熔断效果，故以此机制简化原来的代码
         val matcher = formatImagePattern.matcher(keepImgHtml)
         var appendPos = 0
@@ -36,8 +38,7 @@ object HtmlFormatter {
             var param = ""
             sb.append(
                 keepImgHtml.substring(appendPos, matcher.start()), "<img src=\"${
-                    NetworkUtils.getAbsoluteURL(
-                        redirectUrl,
+                    NetworkUtils.getAbsoluteURL(redirectUrl,
                         matcher.group(1)?.let {
                             val urlMatcher = AnalyzeUrl.paramPattern.matcher(it)
                             if (urlMatcher.find()) {