From 519ee2e2068964b1ce68521fb4ca572c6bfa89cf Mon Sep 17 00:00:00 2001
From: HinataKato <57648531+HinataKato@users.noreply.github.com>
Date: Wed, 1 Jan 2025 22:32:21 +0800
Subject: [PATCH] fix: replace b23.tv with bili2233.cn (#1598)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
修复因链接更换导致的净化失效 #1597
---
app/src/main/java/me/iacn/biliroaming/hook/ShareHook.kt | 6 +++---
app/src/main/res/values-zh-rTW/strings.xml | 2 +-
app/src/main/res/values/strings.xml | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/app/src/main/java/me/iacn/biliroaming/hook/ShareHook.kt b/app/src/main/java/me/iacn/biliroaming/hook/ShareHook.kt
index 321a0abbfb..e10b5f0626 100644
--- a/app/src/main/java/me/iacn/biliroaming/hook/ShareHook.kt
+++ b/app/src/main/java/me/iacn/biliroaming/hook/ShareHook.kt
@@ -12,7 +12,7 @@ import java.net.HttpURLConnection
import java.net.URL
class ShareHook(classLoader: ClassLoader) : BaseHook(classLoader) {
- private val contentUrlPattern = Regex("""[\s\S]*(https?://b23\.tv/\S*)$""")
+ private val contentUrlPattern = Regex("""[\s\S]*(https?://bili2233\.cn/\S*)$""")
private fun String.resolveB23URL(): String {
val conn = URL(this).openConnection() as HttpURLConnection
@@ -66,7 +66,7 @@ class ShareHook(classLoader: ClassLoader) : BaseHook(classLoader) {
if (purifyShareEnabled) {
hookAfterMethod("getLink") { param ->
(param.result as? String)?.takeIf {
- it.startsWith("https://b23.tv") || it.startsWith("http://b23.tv")
+ it.startsWith("https://bili2233.cn") || it.startsWith("http://bili2233.cn")
}?.let {
val targetUrl = Uri.parse(it).buildUpon().query("").build().toString()
param.result = targetUrl.resolveB23URL().also { r -> param.thisObject.setObjectField("link", r) }
@@ -79,7 +79,7 @@ class ShareHook(classLoader: ClassLoader) : BaseHook(classLoader) {
}?.let { contentUrl ->
val resolvedUrl = (param.thisObject.getObjectField("link")?.let { it as String } ?: contentUrl)
.let {
- if (it.startsWith("https://b23.tv") || it.startsWith("http://b23.tv"))
+ if (it.startsWith("https://bili2233.cn") || it.startsWith("http://bili2233.cn"))
it.resolveB23URL()
else it
}
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 2f3710c255..a451739eba 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -141,7 +141,7 @@
修改我的頁面樣式
開啟改為列表,關閉改為按鈕
淨化分享
- 把分享連結中的 b23.tv 短連結換成正常連結
+ 把分享連結中的 bili2233.cn 短連結換成正常連結
開啟自訂連結
僅支援 bilibili:// 開頭的格式
在【我的】頁面新增自訂按鈕
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 0e322f0417..bd506b0929 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -143,7 +143,7 @@
修改我的页面样式
开启改为列表,关闭改为按钮
净化分享
- 把分享链接中的 b23.tv 短链接换成正常链接
+ 把分享链接中的 bili2233.cn 短链接换成正常链接
开启自定义链接
仅支持 bilibili:// 开头的格式
在【我的】页面添加自定义按钮