From a157a106e8cdef25a33354d2059d4437eeb63fca Mon Sep 17 00:00:00 2001
From: Him188 <Him188@mamoe.net>
Date: Thu, 3 Oct 2019 19:34:49 +0800
Subject: [PATCH] Rename Login to LoginHandler

---
 .../net/mamoe/mirai/network/BotNetworkHandler.kt     |  5 ++---
 .../network/protocol/tim/TIMBotNetworkHandler.kt     | 12 ++++++------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/network/BotNetworkHandler.kt b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/network/BotNetworkHandler.kt
index bdcfe035d..9ee2f67f2 100644
--- a/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/network/BotNetworkHandler.kt
+++ b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/network/BotNetworkHandler.kt
@@ -1,8 +1,7 @@
 package net.mamoe.mirai.network
 
-import kotlinx.coroutines.CompletableDeferred
 import net.mamoe.mirai.network.protocol.tim.TIMBotNetworkHandler.BotSocket
-import net.mamoe.mirai.network.protocol.tim.TIMBotNetworkHandler.Login
+import net.mamoe.mirai.network.protocol.tim.TIMBotNetworkHandler.LoginHandler
 import net.mamoe.mirai.network.protocol.tim.handler.ActionPacketHandler
 import net.mamoe.mirai.network.protocol.tim.handler.DataPacketSocket
 import net.mamoe.mirai.network.protocol.tim.handler.MessagePacketHandler
@@ -23,7 +22,7 @@ import net.mamoe.mirai.network.protocol.tim.packet.login.LoginState
  *
  * 其中, [PacketHandler] 由 4 个子模块构成:
  * - [DebugPacketHandler] 输出 [Packet.toString]
- * - [Login] 处理 touch/login/verification code 相关
+ * - [LoginHandler] 处理 touch/login/verification code 相关
  * - [MessagePacketHandler] 处理消息相关(群消息/好友消息)([ServerEventPacket])
  * - [ActionPacketHandler] 处理动作相关(踢人/加入群/好友列表等)
  *
diff --git a/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/network/protocol/tim/TIMBotNetworkHandler.kt b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/network/protocol/tim/TIMBotNetworkHandler.kt
index 2ff34ab8d..26234256d 100644
--- a/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/network/protocol/tim/TIMBotNetworkHandler.kt
+++ b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/network/protocol/tim/TIMBotNetworkHandler.kt
@@ -31,7 +31,7 @@ import javax.imageio.ImageIO
 internal class TIMBotNetworkHandler(private val bot: Bot) : BotNetworkHandler {
     override val socket: BotSocket = BotSocket()
 
-    lateinit var login: Login
+    lateinit var loginHandler: LoginHandler
 
     override lateinit var message: MessagePacketHandler
     override lateinit var action: ActionPacketHandler
@@ -123,7 +123,7 @@ internal class TIMBotNetworkHandler(private val bot: Bot) : BotNetworkHandler {
 
             withContext(NetworkScope.coroutineContext) {
                 launch {
-                    login.onPacketReceived(packet)
+                    loginHandler.onPacketReceived(packet)
                 }
 
 
@@ -177,9 +177,9 @@ internal class TIMBotNetworkHandler(private val bot: Bot) : BotNetworkHandler {
         fun touch(serverAddress: String, timeoutMillis: Long): CompletableDeferred<LoginState> {
             bot.info("Connecting server: $serverAddress")
             if (this@TIMBotNetworkHandler::login.isInitialized) {
-                login.close()
+                loginHandler.close()
             }
-            login = Login()
+            loginHandler = LoginHandler()
             this.loginResult = CompletableDeferred()
 
             serverIP = serverAddress
@@ -243,7 +243,7 @@ internal class TIMBotNetworkHandler(private val bot: Bot) : BotNetworkHandler {
     /**
      * 处理登录过程
      */
-    inner class Login {
+    inner class LoginHandler {
         private lateinit var token00BA: ByteArray
         private lateinit var token0825: ByteArray//56
         private var loginTime: Int = 0
@@ -370,7 +370,7 @@ internal class TIMBotNetworkHandler(private val bot: Bot) : BotNetworkHandler {
 
                     socket.loginResult!!.complete(LoginState.SUCCESS)
 
-                    login.changeOnlineStatus(ClientLoginStatus.ONLINE)
+                    loginHandler.changeOnlineStatus(ClientLoginStatus.ONLINE)
                 }
 
                 is ServerLoginSuccessPacket -> {