shkong/OpenShamrock
1
0
Fork 0
mirror of https://github.com/whitechi73/OpenShamrock.git synced 2024-08-14 13:12:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

Shamrock: Määritetty tunnus ei vaadi suuraakkosia

Browse Source
This commit is contained in:
WhiteChi 2023-12-19 01:21:08 +08:00
parent 741d2c7a84
commit 34eccda233
4 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
xposed/src/main/java/moe/fuqiuluo/shamrock/remote/plugin/Auth.kt
View File

@ -15,7 +15,7 @@ private suspend fun ApplicationCall.checkToken() {
?: fetchOrNull("ticket") ?: fetchOrNull("ticket")
?: fetchOrNull("access_token") ?: fetchOrNull("access_token")
?: throw ErrorTokenException ?: throw ErrorTokenException
if (accessToken.startsWith("Bearer ")) { if (accessToken.startsWith("Bearer ", ignoreCase = true)) {
accessToken = accessToken.substring(7) accessToken = accessToken.substring(7)
} }
if (token != accessToken) { if (token != accessToken) {

2
xposed/src/main/java/moe/fuqiuluo/shamrock/remote/service/WebSocketService.kt
View File

@ -66,7 +66,7 @@ internal class WebSocketService(
.ifNullOrEmpty(handshake.getFieldValue("ticket")) .ifNullOrEmpty(handshake.getFieldValue("ticket"))
.ifNullOrEmpty(handshake.getFieldValue("Authorization")) .ifNullOrEmpty(handshake.getFieldValue("Authorization"))
?: throw ErrorTokenException ?: throw ErrorTokenException
if (accessToken.startsWith("Bearer ")) { if (accessToken.startsWith("Bearer ", ignoreCase = true)) {
accessToken = accessToken.substring(7) accessToken = accessToken.substring(7)
} }
val tokenList = token.split(",", "|", "，") val tokenList = token.split(",", "|", "，")

5
xposed/src/main/java/moe/fuqiuluo/shamrock/remote/service/api/WebSocketClientServlet.kt
View File

@ -106,7 +106,10 @@ internal abstract class WebSocketClientServlet(
} }
private fun startHeartbeatTimer() { private fun startHeartbeatTimer() {
if (heartbeatInterval <= 0) return if (heartbeatInterval <= 0) {
LogCenter.log("被动WebSocket心跳间隔为0，不启动心跳", Level.WARN)
return
}
timer( timer(
name = "heartbeat", name = "heartbeat",
initialDelay = 0, initialDelay = 0,

2
xposed/src/main/java/moe/fuqiuluo/shamrock/remote/service/api/WebSocketTransmitServlet.kt
View File

@ -78,6 +78,8 @@ internal abstract class WebSocketTransmitServlet(
) )
) )
} }
} else {
LogCenter.log("主动WebSocket心跳间隔为0，不启动心跳", Level.WARN)
} }
} }