Don't block incoming chat markers

R0rt1z2 · Apr 29, 2023 · 3495257 · 3495257
1 parent 43291e5
commit 3495257
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 13 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -5,7 +5,7 @@ plugins {
 
 ext.versionMajor = 1
 ext.versionMinor = 2
-ext.versionPatch = 3
+ext.versionPatch = 4
 ext.grindrVersion = '9.7.0'
 
 private String genVersionName() {

diff --git a/app/src/main/java/com/eljaviluki/grindrplus/Hooks.kt b/app/src/main/java/com/eljaviluki/grindrplus/Hooks.kt
@@ -1197,19 +1197,20 @@ object Hooks {
 
     fun dontSendChatMarkers() {
         findAndHookMethod(
-            "org.jivesoftware.smack.packet.Stanza",
+            GApp.xmpp.ChatMarkersManager,
             Hooker.pkgParam.classLoader,
-            "addExtension",
-            "org.jivesoftware.smack.packet.ExtensionElement",
-            object : XC_MethodHook() {
-                override fun beforeHookedMethod(param: MethodHookParam) {
-                    if (param.args[0] == null) return
-                    val elementName = callMethod(param.args[0], "getElementName") as String
-                    if (elementName in arrayOf("received", "displayed")) {
-                        param.args[0] = null
-                    }
-                }
-            }
+            GApp.xmpp.ChatMarkersManager_.addDisplayedExtension,
+            "org.jivesoftware.smack.chat2.Chat",
+            "org.jivesoftware.smack.packet.Message",
+            XC_MethodReplacement.DO_NOTHING
+        )
+        findAndHookMethod(
+            GApp.xmpp.ChatMarkersManager,
+            Hooker.pkgParam.classLoader,
+            GApp.xmpp.ChatMarkersManager_.addReceivedExtension,
+            "org.jivesoftware.smack.chat2.Chat",
+            "org.jivesoftware.smack.packet.Message",
+            XC_MethodReplacement.DO_NOTHING
         )
     }
 

diff --git a/app/src/main/java/com/eljaviluki/grindrplus/Obfuscation.kt b/app/src/main/java/com/eljaviluki/grindrplus/Obfuscation.kt
@@ -317,6 +317,13 @@ object Obfuscation {
             object ChatMessageManager_ {
                 const val handleIncomingChatMessage = "p"
             }
+
+            const val ChatMarkersManager = "$_xmpp.i"
+
+            object ChatMarkersManager_ {
+                const val addDisplayedExtension = "d"
+                const val addReceivedExtension = "f"
+            }
         }
     }
 }