From 47a288c614f90c03b02b992117fee3d903ca37c1 Mon Sep 17 00:00:00 2001 From: Him188 Date: Fri, 17 Apr 2020 10:40:39 +0800 Subject: [PATCH] Fix #220 --- .../net/mamoe/mirai/qqandroid/network/highway/HighwayHelper.kt | 2 +- .../kotlin/net/mamoe/mirai/qqandroid/utils/byteArrays.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/highway/HighwayHelper.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/highway/HighwayHelper.kt index 9fe9308b1..7498107b5 100644 --- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/highway/HighwayHelper.kt +++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/highway/HighwayHelper.kt @@ -140,7 +140,7 @@ internal object HighwayHelper { val headLength = readInt() discardExact(4) val proto = readProtoBuf(CSDataHighwayHead.RspDataHighwayHead.serializer(), length = headLength) - check(proto.errorCode == 0) { "image upload failed: Transfer errno=${proto.errorCode}" } + check(proto.errorCode == 0) { "highway transfer failed, error ${proto.errorCode}" } } } } diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/utils/byteArrays.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/utils/byteArrays.kt index 9c56fddf8..a149413de 100644 --- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/utils/byteArrays.kt +++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/utils/byteArrays.kt @@ -94,7 +94,7 @@ internal fun UByteArray.toUHexString(separator: String = " ", offset: Int = 0, l @Suppress("NOTHING_TO_INLINE") internal inline fun ByteArray.encodeToString(offset: Int = 0, charset: Charset = Charsets.UTF_8): String = - String(this, charset = charset, offset = offset) + String(this, charset = charset, offset = offset, length = this.size - offset) @PublishedApi internal inline fun ByteArray.toReadPacket(offset: Int = 0, length: Int = this.size - offset) =