From 68ba984f08224c21338d88e3427a49deede3596c Mon Sep 17 00:00:00 2001
From: Him188 <Him188@mamoe.net>
Date: Fri, 17 Jan 2020 12:19:55 +0800
Subject: [PATCH] Simplify

---
 .../network/QQAndroidBotNetworkHandler.kt     | 26 +++++++++----------
 1 file changed, 12 insertions(+), 14 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 6b29913fb..e5e1892d0 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
@@ -36,21 +36,19 @@ internal class QQAndroidBotNetworkHandler(bot: QQAndroidBot) : BotNetworkHandler
         println("SessionTicketKey=${bot.client.wLoginSigInfo.wtSessionTicketKey.toUHexString()}")
     }
 
-    internal fun launchPacketProcessor(rawInput: ByteReadPacket): Job {
-        return launch(CoroutineName("Incoming Packet handler")) {
-            rawInput.debugPrint("Received").use { input ->
-                if (input.remaining == 0L) {
-                    bot.logger.error("Empty packet received. Consider if bad packet was sent.")
-                    return@launch
+    internal fun launchPacketProcessor(rawInput: ByteReadPacket): Job = launch(CoroutineName("Incoming Packet handler")) {
+        rawInput.debugPrint("Received").use { input ->
+            if (input.remaining == 0L) {
+                bot.logger.error("Empty packet received. Consider if bad packet was sent.")
+                return@launch
+            }
+            KnownPacketFactories.parseIncomingPacket(bot, input) { packet: Packet, packetId: PacketId, sequenceId: Int ->
+                if (PacketReceivedEvent(packet).broadcast().cancelled) {
+                    return@parseIncomingPacket
                 }
-                KnownPacketFactories.parseIncomingPacket(bot, input) { packet: Packet, packetId: PacketId, sequenceId: Int ->
-                    if (PacketReceivedEvent(packet).broadcast().cancelled) {
-                        return@parseIncomingPacket
-                    }
-                    packetListeners.forEach { listener ->
-                        if (listener.filter(packetId, sequenceId) && packetListeners.remove(listener)) {
-                            listener.complete(packet)
-                        }
+                packetListeners.forEach { listener ->
+                    if (listener.filter(packetId, sequenceId) && packetListeners.remove(listener)) {
+                        listener.complete(packet)
                     }
                 }
             }