fix crash

whitechi73 · Mar 28, 2024 · 5cbb695 · 5cbb695
1 parent c014e85
commit 5cbb695
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/xposed/src/main/java/moe/fuqiuluo/shamrock/xposed/actions/AntiDetection.kt b/xposed/src/main/java/moe/fuqiuluo/shamrock/xposed/actions/AntiDetection.kt
@@ -39,7 +39,7 @@ class AntiDetection: IAction {
         if (ShamrockConfig[AntiJvmTrace])
             antiTrace()
         antiMemoryWalking()
-        antiO3Report()
+        //antiO3Report()
     }
 
     private fun antiO3Report() {

diff --git a/xposed/src/main/java/moe/fuqiuluo/shamrock/xposed/actions/interacts/SwitchStatus.kt b/xposed/src/main/java/moe/fuqiuluo/shamrock/xposed/actions/interacts/SwitchStatus.kt
@@ -9,11 +9,13 @@ import qq.service.QQInterfaces
 
 object SwitchStatus: IInteract, QQInterfaces() {
     override fun invoke(intent: Intent) {
-        AppTalker.talk("switch_status") {
-            put("account", app.currentAccountUin)
-            put("nickname", if (app is QQAppInterface) app.currentNickname else "unknown")
-            put("voice", NativeLoader.isVoiceLoaded)
-            put("core_version", ShamrockVersion)
+        if (app.isLogin) {
+            AppTalker.talk("switch_status") {
+                put("account", app.currentAccountUin)
+                put("nickname", if (app is QQAppInterface) (app.currentNickname ?: "unknown") else "unknown")
+                put("voice", NativeLoader.isVoiceLoaded)
+                put("core_version", ShamrockVersion)
+            }
         }
     }
 }