From 0ca7c4bc10fa8e65db771e0fc45dee1ae6aa4dee Mon Sep 17 00:00:00 2001 From: Him188 Date: Thu, 30 Jan 2020 20:39:58 +0800 Subject: [PATCH 1/2] Fix import --- .../mamoe/mirai/qqandroid/network/QQAndroidBotNetworkHandler.kt | 2 ++ 1 file changed, 2 insertions(+) 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 0db9bec14..4775be542 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 @@ -15,10 +15,12 @@ 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.* +import net.mamoe.mirai.qqandroid.network.protocol.packet.list.FriendList 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 import net.mamoe.mirai.utils.* +import net.mamoe.mirai.utils.cryptor.contentToString import net.mamoe.mirai.utils.io.* import kotlin.coroutines.CoroutineContext From db4954bae18717bda22b80ca3ebb1f171092d723 Mon Sep 17 00:00:00 2001 From: Him188 Date: Thu, 30 Jan 2020 20:48:22 +0800 Subject: [PATCH 2/2] Make public --- .../mirai/qqandroid/io/serialization/SerializationUtils.kt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/io/serialization/SerializationUtils.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/io/serialization/SerializationUtils.kt index bf3daae17..8bcd9fdf5 100644 --- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/io/serialization/SerializationUtils.kt +++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/io/serialization/SerializationUtils.kt @@ -50,8 +50,7 @@ fun ByteReadPacket.decodeUniPacket(deserializer: DeserializationS } } - -private fun ByteReadPacket.decodeUniRequestPacketAndDeserialize(name: String? = null, block: (ByteArray) -> R): R { +fun ByteReadPacket.decodeUniRequestPacketAndDeserialize(name: String? = null, block: (ByteArray) -> R): R { val request = this.readRemainingAsJceStruct(RequestPacket.serializer()) return block(if (name == null) when (request.iVersion.toInt()) {