shkong/OpenShamrock
1
0
Fork 0
mirror of https://github.com/whitechi73/OpenShamrock.git synced 2024-08-14 13:12:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

ShamrockPrivate: 尝试修复自发消息异常闪退

Browse Source 
Signed-off-by: WhiteChi <whitechi73@outlook.com>
This commit is contained in:
WhiteChi 2023-11-02 18:44:02 +08:00
parent dc2503b045
commit 41675ed874
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
xposed/src/main/java/moe/fuqiuluo/qqinterface/servlet/MsgSvc.kt
View File

@ -56,9 +56,10 @@ internal object MsgSvc: BaseSvc() {
qqMsgId: Long qqMsgId: Long
): Result<MsgRecord> { ): Result<MsgRecord> {
val contact = MessageHelper.generateContact(chatType, peerId) val contact = MessageHelper.generateContact(chatType, peerId)
val service = QRoute.api(IMsgService::class.java) ?:
return Result.failure(Exception("获取消息服务"))
val msg = withTimeoutOrNull(5000) { val msg = withTimeoutOrNull(5000) {
val service = QRoute.api(IMsgService::class.java)
suspendCancellableCoroutine { continuation -> suspendCancellableCoroutine { continuation ->
service.getMsgsByMsgId(contact, arrayListOf(qqMsgId)) { code, _, msgRecords -> service.getMsgsByMsgId(contact, arrayListOf(qqMsgId)) { code, _, msgRecords ->
if (code == 0 && msgRecords.isNotEmpty()) { if (code == 0 && msgRecords.isNotEmpty()) {

2
xposed/src/main/java/moe/fuqiuluo/shamrock/remote/service/listener/AioListener.kt
View File

@ -117,6 +117,8 @@ internal object AioListener: IKernelMsgListener {
} else if (record.sendStatus == MsgConstant.KSENDSTATUSFAILED) { } else if (record.sendStatus == MsgConstant.KSENDSTATUSFAILED) {
it.resume(null) it.resume(null)
} }
}.onFailure { _ ->
it.resume(null)
} }
delay(50) delay(50)
} }