Merge remote-tracking branch 'origin/master'

6fff5b27 · jiahua.liu · a8551fd3 · db4954ba · 6fff5b27
Commit 6fff5b27 authored Jan 30, 2020 by jiahua.liu
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 2 deletions

mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/io/serialization/SerializationUtils.kt ...oe/mirai/qqandroid/io/serialization/SerializationUtils.kt +1 -2

No files found.
--- 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 <T : ProtoBuf> ByteReadPacket.decodeUniPacket(deserializer: DeserializationS
    }
 }

-
-private fun <R> ByteReadPacket.decodeUniRequestPacketAndDeserialize(name: String? = null, block: (ByteArray) -> R): R {
+fun <R> ByteReadPacket.decodeUniRequestPacketAndDeserialize(name: String? = null, block: (ByteArray) -> R): R {
    val request = this.readRemainingAsJceStruct(RequestPacket.serializer())

    return block(if (name == null) when (request.iVersion.toInt()) {