github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2025-04-03 14:20:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove redundant runBlocking in tlv544

Browse Source
This commit is contained in:
sandtechnology 2023-04-15 01:24:54 +08:00 committed by Him188
parent dd7dedae39
commit 108e2fe0c3
No known key found for this signature in database
GPG Key ID: BA439CDDCF652375
1 changed files with 18 additions and 20 deletions

38
mirai-core/src/commonMain/kotlin/network/protocol/packet/Tlv.kt
View File

@ -907,20 +907,18 @@ internal suspend fun TlvMapWriter.t544ForToken( // 1348
subCommandId: Int,
commandStr: String
) {
val dataIn = buildPacket {
writeFully(buildPacket {
writeLong(uin)
}.readBytes(4))
writeShortLVByteArray(guid)
writeShortLVString(sdkVersion)
writeInt(subCommandId)
writeInt(0)
}
val result = EncryptWorkerService.doTLVEncrypt(uin, 0x544, dataIn.readBytes(), commandStr)
tlv(0x544) {
val dataIn = buildPacket {
writeFully(buildPacket {
writeLong(uin)
}.readBytes(4))
writeShortLVByteArray(guid)
writeShortLVString(sdkVersion)
writeInt(subCommandId)
writeInt(0)
}
runBlocking {
val result = EncryptWorkerService.doTLVEncrypt(uin, 0x544, dataIn.readBytes(), commandStr)
writeFully(result ?: "".toByteArray()) // Empty str means native throws exception
}
writeFully(result ?: "".toByteArray()) // Empty str means native throws exception
}
}
@ -931,15 +929,15 @@ internal suspend fun TlvMapWriter.t544ForVerify( // 1348
subCommandId: Int,
commandStr: String
) {
val dataIn = buildPacket {
writeLong(uin)
writeShortLVByteArray(guid)
writeShortLVString(sdkVersion)
writeInt(subCommandId)
}
val result = EncryptWorkerService.doTLVEncrypt(uin, 0x544, dataIn.readBytes(), commandStr)
tlv(0x544) {
val dataIn = buildPacket {
writeLong(uin)
writeShortLVByteArray(guid)
writeShortLVString(sdkVersion)
writeInt(subCommandId)
}
runBlocking {
val result = EncryptWorkerService.doTLVEncrypt(uin, 0x544, dataIn.readBytes(), commandStr)
writeFully(result ?: "".toByteArray()) // Empty str means native throws exception
}
}