From c49406c2ceda6fa8653dc630cfcc1c0fc8254f2e Mon Sep 17 00:00:00 2001 From: Him188 Date: Thu, 30 Jan 2020 20:35:13 +0800 Subject: [PATCH] Avoid leaking --- .../qqandroid/network/QQAndroidBotNetworkHandler.kt | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/QQAndroidBotNetworkHandler.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/QQAndroidBotNetworkHandler.kt index b63ec5f14..c49920ee5 100644 --- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/QQAndroidBotNetworkHandler.kt +++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/QQAndroidBotNetworkHandler.kt @@ -14,10 +14,7 @@ import net.mamoe.mirai.event.broadcast import net.mamoe.mirai.network.BotNetworkHandler import net.mamoe.mirai.qqandroid.QQAndroidBot import net.mamoe.mirai.qqandroid.event.PacketReceivedEvent -import net.mamoe.mirai.qqandroid.network.protocol.packet.KnownPacketFactories -import net.mamoe.mirai.qqandroid.network.protocol.packet.OutgoingPacket -import net.mamoe.mirai.qqandroid.network.protocol.packet.PacketFactory -import net.mamoe.mirai.qqandroid.network.protocol.packet.PacketLogger +import net.mamoe.mirai.qqandroid.network.protocol.packet.* import net.mamoe.mirai.qqandroid.network.protocol.packet.login.LoginPacket import net.mamoe.mirai.qqandroid.network.protocol.packet.login.LoginPacket.LoginPacketResponse.* import net.mamoe.mirai.qqandroid.network.protocol.packet.login.StatSvc @@ -53,7 +50,9 @@ internal class QQAndroidBotNetworkHandler(bot: QQAndroidBot) : BotNetworkHandler is Captcha -> when (response) { is Captcha.Picture -> { - var result = bot.configuration.loginSolver.onSolvePicCaptcha(bot, response.data) + var result = response.data.withUse { + bot.configuration.loginSolver.onSolvePicCaptcha(bot, this) + } if (result == null || result.length != 4) { //refresh captcha result = "ABCD"