Android login Captcha complete

mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/QQAndroidBotNetworkHandler.kt

@@ -43,7 +43,8 @@ internal class QQAndroidBotNetworkHandler(bot: QQAndroidBot) : BotNetworkHandler
                         result = "ABCD"
                     }
                     bot.logger.info("提交验证码")
-                    LoginPacket.SubCommand2(bot.client, response.sign, result)
+                    val captchaResponse: LoginPacket.LoginPacketResponse =
+                        LoginPacket.SubCommand2(bot.client, response.sign, result).sendAndExpect()
                 }
                 is Captcha.Slider -> {
                     bot.logger.info("需要滑动验证码")

mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/login/LoginPacket.kt

@@ -38,6 +38,8 @@ internal object LoginPacket : PacketFactory<LoginPacket.LoginPacketResponse>("wt
         ): OutgoingPacket = buildLoginOutgoingPacket(client, bodyType = 2) { sequenceId ->
             writeSsoPacket(client, subAppId, commandName, sequenceId = sequenceId) {
                 writeOicqRequestPacket(client, EncryptMethodECDH7(client.ecdh), 0x0810) {
+                    writeShort(2) // subCommand
+                    writeShort(4) // count of TLVs, probably ignored by server?
                     t2(captchaAnswer, captchaSign, 0)
                     t8(2052)
                     t104(client.t104)