From 4b63648a79828839fcced9eabb5bda64d9379a89 Mon Sep 17 00:00:00 2001 From: tarsin Date: Thu, 25 May 2023 15:02:00 +0800 Subject: [PATCH] Revert "Decode cf protected email, step 2, Resolve #1102" This reverts commit 74c6bfa479c46cf2f503ee5b3fd997cf139482f3. --- .../java/com/hippo/ehviewer/client/EhEngine.kt | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/com/hippo/ehviewer/client/EhEngine.kt b/app/src/main/java/com/hippo/ehviewer/client/EhEngine.kt index 46416da7a..d0326f271 100644 --- a/app/src/main/java/com/hippo/ehviewer/client/EhEngine.kt +++ b/app/src/main/java/com/hippo/ehviewer/client/EhEngine.kt @@ -55,14 +55,12 @@ import okhttp3.MediaType.Companion.toMediaType import okhttp3.MultipartBody import okhttp3.Request import okhttp3.RequestBody.Companion.asRequestBody -import okio.ByteString.Companion.decodeHex import org.json.JSONArray import org.jsoup.Jsoup import org.jsoup.nodes.Element import org.jsoup.nodes.TextNode import java.io.File import java.util.function.Consumer -import kotlin.experimental.xor import kotlin.math.ceil private const val TAG = "EhEngine" @@ -131,13 +129,11 @@ private fun resolveEmailProtected(origin: String): String { if (EMAIL_PROTECTED in text()) { if (EMAIL_PROTECTED in ownText()) { forEachNode( - Consumer { node -> - if (node is TextNode) { - if (EMAIL_PROTECTED in node.text()) { - val encoded = attr("data-cfemail").chunked(2).toMutableList() - val k = encoded.removeFirst().decodeHex()[0] - val email = encoded.map { it.decodeHex()[0] xor k }.fold("") { s, c -> s + c.toInt().toChar() } - resolvedEmailList.add(email) + Consumer { + if (it is TextNode) { + if (EMAIL_PROTECTED in it.text()) { + val encoded = attr("data-cfemail") + resolvedEmailList.add(encoded) } } },