diff --git a/xposed/src/main/java/moe/fuqiuluo/qqinterface/servlet/BaseSvc.kt b/xposed/src/main/java/moe/fuqiuluo/qqinterface/servlet/BaseSvc.kt index d42894d..8679bea 100644 --- a/xposed/src/main/java/moe/fuqiuluo/qqinterface/servlet/BaseSvc.kt +++ b/xposed/src/main/java/moe/fuqiuluo/qqinterface/servlet/BaseSvc.kt @@ -23,7 +23,7 @@ import kotlin.concurrent.timer import kotlin.coroutines.resume import kotlin.coroutines.suspendCoroutine -abstract class BaseSvc { +internal abstract class BaseSvc { companion object { val currentUin: String get() = app.currentAccountUin diff --git a/xposed/src/main/java/moe/fuqiuluo/qqinterface/servlet/CardSvc.kt b/xposed/src/main/java/moe/fuqiuluo/qqinterface/servlet/CardSvc.kt index acd74f1..c2f9d44 100644 --- a/xposed/src/main/java/moe/fuqiuluo/qqinterface/servlet/CardSvc.kt +++ b/xposed/src/main/java/moe/fuqiuluo/qqinterface/servlet/CardSvc.kt @@ -27,8 +27,12 @@ import tencent.im.oidb.oidb_sso import kotlin.coroutines.resume internal object CardSvc: BaseSvc() { - private val GetModelShowLock = Mutex() - private val refreshCardLock = Mutex() + private val GetModelShowLock by lazy { + Mutex() + } + private val refreshCardLock by lazy { + Mutex() + } suspend fun getModelShow(uin: Long = app.longAccountUin): String { return GetModelShowLock.withLock { diff --git a/xposed/src/main/java/moe/fuqiuluo/qqinterface/servlet/FileSvc.kt b/xposed/src/main/java/moe/fuqiuluo/qqinterface/servlet/FileSvc.kt index e023fcd..b2bb214 100644 --- a/xposed/src/main/java/moe/fuqiuluo/qqinterface/servlet/FileSvc.kt +++ b/xposed/src/main/java/moe/fuqiuluo/qqinterface/servlet/FileSvc.kt @@ -11,7 +11,6 @@ import tencent.im.oidb.cmd0x6d8.oidb_0x6d8 import tencent.im.oidb.oidb_sso internal object FileSvc: BaseSvc() { - fun createFileFolder(groupId: String, folderName: String) { sendOidb("OidbSvc.0x6d7_0", 1751, 0, protobufOf( 1 to mapOf( diff --git a/xposed/src/main/java/moe/fuqiuluo/qqinterface/servlet/FriendSvc.kt b/xposed/src/main/java/moe/fuqiuluo/qqinterface/servlet/FriendSvc.kt index 73daad5..eba1f6c 100644 --- a/xposed/src/main/java/moe/fuqiuluo/qqinterface/servlet/FriendSvc.kt +++ b/xposed/src/main/java/moe/fuqiuluo/qqinterface/servlet/FriendSvc.kt @@ -1,8 +1,10 @@ +@file:OptIn(DelicateCoroutinesApi::class) package moe.fuqiuluo.qqinterface.servlet import com.tencent.mobileqq.data.Friends import com.tencent.mobileqq.friend.api.IFriendDataService import com.tencent.mobileqq.friend.api.IFriendHandlerService +import kotlinx.coroutines.DelicateCoroutinesApi import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.delay import kotlinx.coroutines.launch diff --git a/xposed/src/main/java/moe/fuqiuluo/qqinterface/servlet/GroupSvc.kt b/xposed/src/main/java/moe/fuqiuluo/qqinterface/servlet/GroupSvc.kt index 2393c3d..6089d47 100644 --- a/xposed/src/main/java/moe/fuqiuluo/qqinterface/servlet/GroupSvc.kt +++ b/xposed/src/main/java/moe/fuqiuluo/qqinterface/servlet/GroupSvc.kt @@ -38,8 +38,12 @@ import java.nio.ByteBuffer import kotlin.coroutines.resume internal object GroupSvc: BaseSvc() { - private val RefreshTroopMemberInfoLock = Mutex() - private val RefreshTroopMemberListLock = Mutex() + private val RefreshTroopMemberInfoLock by lazy { + Mutex() + } + private val RefreshTroopMemberListLock by lazy { + Mutex() + } private lateinit var METHOD_REQ_MEMBER_INFO: Method private lateinit var METHOD_REQ_MEMBER_INFO_V2: Method diff --git a/xposed/src/main/java/moe/fuqiuluo/shamrock/helper/ContactHelper.kt b/xposed/src/main/java/moe/fuqiuluo/shamrock/helper/ContactHelper.kt index 3218302..8bab209 100644 --- a/xposed/src/main/java/moe/fuqiuluo/shamrock/helper/ContactHelper.kt +++ b/xposed/src/main/java/moe/fuqiuluo/shamrock/helper/ContactHelper.kt @@ -4,7 +4,6 @@ import com.tencent.qqnt.kernel.nativeinterface.MsgConstant import kotlinx.coroutines.suspendCancellableCoroutine import moe.fuqiuluo.qqinterface.servlet.FriendSvc import moe.fuqiuluo.qqinterface.servlet.GroupSvc -import moe.fuqiuluo.qqinterface.servlet.MsgSvc import moe.fuqiuluo.shamrock.xposed.helper.NTServiceFetcher import kotlin.coroutines.resume diff --git a/xposed/src/main/java/moe/fuqiuluo/shamrock/xposed/helper/NTServiceFetcher.kt b/xposed/src/main/java/moe/fuqiuluo/shamrock/xposed/helper/NTServiceFetcher.kt index 96c2bd7..04e6259 100644 --- a/xposed/src/main/java/moe/fuqiuluo/shamrock/xposed/helper/NTServiceFetcher.kt +++ b/xposed/src/main/java/moe/fuqiuluo/shamrock/xposed/helper/NTServiceFetcher.kt @@ -73,8 +73,8 @@ internal object NTServiceFetcher { LogCenter.log("Register MSG listener successfully.") msgService.addMsgListener(AioListener) - groupService.addKernelGroupListener(GroupEventListener) - LogCenter.log("Register Group listener successfully.") + //groupService.addKernelGroupListener(GroupEventListener) + //LogCenter.log("Register Group listener successfully.") PrimitiveListener.registerListener() } catch (e: Throwable) {