Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions android/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@

<application
android:name=".MainApplication"
android:networkSecurityConfig="@xml/network_security_config"
android:allowBackup="true"
android:enableOnBackInvokedCallback="false"
android:hardwareAccelerated="true"
Expand Down
7 changes: 7 additions & 0 deletions android/src/main/res/xml/network_security_config.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<network-security-config>
<base-config cleartextTrafficPermitted="true">
<trust-anchors>
<certificates src="system" /> <certificates src="user" /> </trust-anchors>
</base-config>
</network-security-config>
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ import com.xiaoyv.bangumi.core_resource.resources.settings_domain_bgm
import com.xiaoyv.bangumi.core_resource.resources.settings_domain_pixiv
import com.xiaoyv.bangumi.core_resource.resources.settings_dou_ban
import com.xiaoyv.bangumi.core_resource.resources.settings_network
import com.xiaoyv.bangumi.core_resource.resources.settings_proxy_bgm
import com.xiaoyv.bangumi.core_resource.resources.settings_proxy_none
import com.xiaoyv.bangumi.core_resource.resources.settings_timeout_request
import com.xiaoyv.bangumi.core_resource.resources.settings_timeout_socket
import com.xiaoyv.bangumi.core_resource.resources.settings_update_channel
Expand Down Expand Up @@ -118,6 +120,17 @@ private fun SettingsNetworkScreenContent(
onActionEvent(SettingsNetworkEvent.Action.OnUpdate(settings.network.copy(bgmHost = it)))
}
)

SettingOptionItem(
title = stringResource(Res.string.settings_proxy_bgm),
value = TabTokens.settingBangumiProxyItems
.find { it.type == settings.network.bgmProxy }?.displayText()
?: if (settings.network.bgmProxy.isBlank()) stringResource(Res.string.settings_proxy_none) else settings.network.bgmProxy,
items = TabTokens.settingBangumiProxyItems,
onClick = {
onActionEvent(SettingsNetworkEvent.Action.OnUpdate(settings.network.copy(bgmProxy = it)))
}
)
}

SettingContainer(label = { Text(text = stringResource(Res.string.global_req_timeout)) }) {
Expand Down Expand Up @@ -215,4 +228,3 @@ private fun SettingsNetworkScreenContent(
}
}


4 changes: 4 additions & 0 deletions internal/workers/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
node_modules/
dist/
.wrangler/
.dev.vars
2 changes: 2 additions & 0 deletions internal/workers/.vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
{
}
3 changes: 3 additions & 0 deletions internal/workers/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Bangumi API Proxy

基于 Cloudflare Workers 的 Bangumi API 代理服务。支持代理所有 Bangumi 相关域名的请求,解决跨域和cookies的问题。
Loading
Loading