Fix stuck in 接收中

fuqiuluo · Jan 23, 2024 · d6c4d53 · d6c4d53
1 parent 7bdfc09
commit d6c4d53
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/app/src/main/java/moe/fuqiuluo/entries/InfoSyncPush.kt b/app/src/main/java/moe/fuqiuluo/entries/InfoSyncPush.kt
@@ -9,14 +9,15 @@ import kotlinx.serialization.protobuf.ProtoNumber
 @Serializable
 data class InfoSyncPush(
     @ProtoNumber(3) val type: Int = Int.MIN_VALUE,
+    @ProtoNumber(4) val pushId: Long = Long.MIN_VALUE,
     @ProtoNumber(8) val syncContent: InfoSyncPushContent? = null,
 )
 
 @Serializable
 data class InfoSyncPushContent(
     @ProtoNumber(3) val head: SyncInfoHead? = null,
     @ProtoNumber(4) val body: ArrayList<SyncInfoBody>? = null,
-
+    @ProtoNumber(5) val subHead: SyncInfoHead? = null,
 )
 
 @Serializable

diff --git a/app/src/main/java/moe/qwq/miko/internals/helper/NTServiceFetcher.kt b/app/src/main/java/moe/qwq/miko/internals/helper/NTServiceFetcher.kt
@@ -7,6 +7,7 @@ import com.tencent.qqnt.kernel.api.impl.MsgService
 import de.robv.android.xposed.XposedBridge
 import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.decodeFromByteArray
+import kotlinx.serialization.encodeToByteArray
 import kotlinx.serialization.protobuf.ProtoBuf
 import moe.fuqiuluo.entries.InfoSyncPush
 import moe.fuqiuluo.entries.MessagePush
@@ -42,7 +43,9 @@ internal object NTServiceFetcher {
             if (cmd == "trpc.msg.register_proxy.RegisterProxy.InfoSyncPush") {
                 val syncPush = ProtoBuf.decodeFromByteArray<InfoSyncPush>(buffer)
                 if (AioListener.onInfoSyncPush(syncPush)) {
-                    it.result = Unit
+                    it.result = ProtoBuf.encodeToByteArray(syncPush.copy(
+                        syncContent = syncPush.syncContent?.copy(body = arrayListOf())
+                    ))
                 }
             } else if (cmd == "trpc.msg.olpush.OlPushService.MsgPush") {
                 val msgPush = ProtoBuf.decodeFromByteArray<MessagePush>(buffer)