github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2025-02-25 03:30:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into core/pkgsso

Browse Source
This commit is contained in:
Karlatemp 2023-06-29 13:37:48 +08:00
parent ed7eca7f6b
commit c080cd19f2
No known key found for this signature in database
GPG Key ID: BA173CA2B9956C59
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mirai-core/src/commonMain/kotlin/network/QQAndroidClient.kt
View File

@ -20,15 +20,13 @@ import net.mamoe.mirai.internal.QQAndroidBot
import net.mamoe.mirai.internal.network.components.AccountSecrets import net.mamoe.mirai.internal.network.components.AccountSecrets
import net.mamoe.mirai.internal.network.components.SsoProcessorContext import net.mamoe.mirai.internal.network.components.SsoProcessorContext
import net.mamoe.mirai.internal.network.components.SsoSession import net.mamoe.mirai.internal.network.components.SsoSession
import net.mamoe.mirai.internal.network.components.encryptServiceOrNull
import net.mamoe.mirai.internal.network.protocol.data.jce.FileStoragePushFSSvcList import net.mamoe.mirai.internal.network.protocol.data.jce.FileStoragePushFSSvcList
import net.mamoe.mirai.internal.network.protocol.packet.Tlv import net.mamoe.mirai.internal.network.protocol.packet.Tlv
import net.mamoe.mirai.internal.spi.EncryptService
import net.mamoe.mirai.internal.utils.AtomicIntSeq import net.mamoe.mirai.internal.utils.AtomicIntSeq
import net.mamoe.mirai.internal.utils.MiraiProtocolInternal import net.mamoe.mirai.internal.utils.MiraiProtocolInternal
import net.mamoe.mirai.internal.utils.NetworkType import net.mamoe.mirai.internal.utils.NetworkType
import net.mamoe.mirai.utils.* import net.mamoe.mirai.utils.*
import kotlin.jvm.Synchronized
import kotlin.jvm.Volatile
import kotlin.random.Random import kotlin.random.Random
@ -85,7 +83,7 @@ internal open class QQAndroidClient(
override var loginState = 0 override var loginState = 0
val supportedEncrypt by lazy { val supportedEncrypt by lazy {
EncryptService.instance?.supports(bot.configuration.protocol) ?: false bot.encryptServiceOrNull?.supports(bot.configuration.protocol) ?: false
} }
var onlineStatus: OnlineStatus = OnlineStatus.ONLINE var onlineStatus: OnlineStatus = OnlineStatus.ONLINE

1
mirai-core/src/commonMain/kotlin/network/protocol/packet/login/wtlogin/WtLogin9.kt
View File

@ -202,6 +202,7 @@ internal object WtLogin9 : WtLoginExt {
if (client.supportedEncrypt) { if (client.supportedEncrypt) {
t544ForToken( t544ForToken(
client = client,
uin = client.uin, uin = client.uin,
protocol = client.bot.configuration.protocol, protocol = client.bot.configuration.protocol,
guid = client.device.guid, guid = client.device.guid,

2
mirai-core/src/commonMain/kotlin/spi/EncryptService.kt
View File

@ -50,7 +50,7 @@ public interface EncryptService : BaseService {
/** /**
* Returns `false` if not supported. * Returns `false` if not supported.
*/ */
public fun supports(protocol: BotConfiguration.MiraiProtocol) : Boolean { public fun supports(protocol: BotConfiguration.MiraiProtocol): Boolean {
return protocol != BotConfiguration.MiraiProtocol.ANDROID_WATCH return protocol != BotConfiguration.MiraiProtocol.ANDROID_WATCH
} }