From 41675ed874555d1cb0f8d0774a3f167417f2ed39 Mon Sep 17 00:00:00 2001 From: WhiteChi Date: Thu, 2 Nov 2023 18:44:02 +0800 Subject: [PATCH] =?UTF-8?q?`ShamrockPrivate`:=20=E5=B0=9D=E8=AF=95?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=87=AA=E5=8F=91=E6=B6=88=E6=81=AF=E5=BC=82?= =?UTF-8?q?=E5=B8=B8=E9=97=AA=E9=80=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: WhiteChi --- .../src/main/java/moe/fuqiuluo/qqinterface/servlet/MsgSvc.kt | 3 ++- .../fuqiuluo/shamrock/remote/service/listener/AioListener.kt | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/xposed/src/main/java/moe/fuqiuluo/qqinterface/servlet/MsgSvc.kt b/xposed/src/main/java/moe/fuqiuluo/qqinterface/servlet/MsgSvc.kt index 6672f14..072b8a4 100644 --- a/xposed/src/main/java/moe/fuqiuluo/qqinterface/servlet/MsgSvc.kt +++ b/xposed/src/main/java/moe/fuqiuluo/qqinterface/servlet/MsgSvc.kt @@ -56,9 +56,10 @@ internal object MsgSvc: BaseSvc() { qqMsgId: Long ): Result { val contact = MessageHelper.generateContact(chatType, peerId) + val service = QRoute.api(IMsgService::class.java) ?: + return Result.failure(Exception("获取消息服务")) val msg = withTimeoutOrNull(5000) { - val service = QRoute.api(IMsgService::class.java) suspendCancellableCoroutine { continuation -> service.getMsgsByMsgId(contact, arrayListOf(qqMsgId)) { code, _, msgRecords -> if (code == 0 && msgRecords.isNotEmpty()) { diff --git a/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/service/listener/AioListener.kt b/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/service/listener/AioListener.kt index f37697d..86094f5 100644 --- a/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/service/listener/AioListener.kt +++ b/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/service/listener/AioListener.kt @@ -117,6 +117,8 @@ internal object AioListener: IKernelMsgListener { } else if (record.sendStatus == MsgConstant.KSENDSTATUSFAILED) { it.resume(null) } + }.onFailure { _ -> + it.resume(null) } delay(50) }