chore: Merge branch dev to main

CHANGELOG.md

@@ -1,3 +1,9 @@
+## [1.47.1-dev.1](https://github.com/crimera/piko/compare/v1.47.0...v1.47.1-dev.1) (2024-12-22)
+
+### Bug Fixes
+
+* Improve getUsername fingerprint ([af617af](https://github.com/crimera/piko/commit/af617af523bfa7df00a232a51364ea9e8ea4d34f))
+
 ## [1.47.0](https://github.com/crimera/piko/compare/v1.46.1...v1.47.0) (2024-12-14)
 
 ### Features

gradle.properties

@@ -1,4 +1,4 @@
 org.gradle.parallel = true
 org.gradle.caching = true
 kotlin.code.style = official
-version = 1.47.0
+version = 1.47.1-dev.1

src/main/kotlin/crimera/patches/twitter/misc/shareMenu/nativeDownloader/NativeDownloaderHooksPatch.kt

@@ -11,12 +11,14 @@ import app.revanced.patcher.patch.annotation.Patch
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
 import com.android.tools.smali.dexlib2.Opcode
 import com.android.tools.smali.dexlib2.builder.instruction.BuilderInstruction21c
+import com.android.tools.smali.dexlib2.dexbacked.instruction.DexBackedInstruction35c
+import com.android.tools.smali.dexlib2.iface.reference.Reference
 
 internal abstract class NativeDownloaderMethodFingerprint(
     private val methodName: String,
 ) : MethodFingerprint(customFingerprint = { methodDef, classDef ->
-        methodDef.name == methodName && classDef.toString() == "Lapp/revanced/integrations/twitter/patches/NativeDownloader;"
-    })
+    methodDef.name == methodName && classDef.toString() == "Lapp/revanced/integrations/twitter/patches/NativeDownloader;"
+})
 
 internal object TweetObjectFingerprint : MethodFingerprint(strings = listOf("https://x.com/%1\$s/status/%2\$d"))
 
@@ -28,57 +30,75 @@ internal object GetTweetUsernameFingerprint : NativeDownloaderMethodFingerprint(
 
 internal object GetTweetMediaFingerprint : NativeDownloaderMethodFingerprint("getTweetMedia")
 
+internal object GetUserNameMethodCaller : MethodFingerprint(
+    returnType = "Z", opcodes = listOf(
+        Opcode.IGET_OBJECT,
+        Opcode.IGET_OBJECT,
+        Opcode.IGET_OBJECT,
+        Opcode.IGET_OBJECT,
+        Opcode.INVOKE_STATIC,
+        Opcode.MOVE_RESULT,
+        Opcode.RETURN
+    )
+)
+
 @Patch(
     compatiblePackages = [CompatiblePackage("com.twitter.android")],
 )
-class NativeDownloaderHooksPatch :
-    BytecodePatch(
-        setOf(
-            GetTweetClassFingerprint,
-            GetTweetIdFingerprint,
-            GetTweetUsernameFingerprint,
-            GetTweetMediaFingerprint,
-            TweetObjectFingerprint,
-        ),
-    ) {
+class NativeDownloaderHooksPatch : BytecodePatch(
+    setOf(
+        GetTweetClassFingerprint,
+        GetTweetIdFingerprint,
+        GetTweetUsernameFingerprint,
+        GetTweetMediaFingerprint,
+        GetUserNameMethodCaller,
+        TweetObjectFingerprint,
+    ),
+) {
     private fun MutableMethod.changeFirstString(value: String) {
         this.getInstructions().firstOrNull { it.opcode == Opcode.CONST_STRING }?.let { instruction ->
             val register = (instruction as BuilderInstruction21c).registerA
             this.replaceInstruction(instruction.location.index, "const-string v$register, \"$value\"")
         } ?: throw PatchException("const-string not found for method: ${this.name}")
     }
 
+    private fun Reference.getMethodFromReference(): Char {
+        val ref = this.toString()
+        val index = ref.indexOf("->")
+        return ref[index + 2]
+    }
+
     override fun execute(context: BytecodeContext) {
         val getTweetObjectFingerprint = TweetObjectFingerprint.result ?: throw PatchException("bruh")
 
         val tweetObjectClass = getTweetObjectFingerprint.classDef
         val tweetObjectClassName = tweetObjectClass.toString().removePrefix("L").removeSuffix(";")
 
-        val getIdMethod =
-            tweetObjectClass.methods.firstOrNull { mutableMethod ->
-                mutableMethod.name == "getId"
-            } ?: throw PatchException("getIdMethod not found")
-
-        val getUsernameMethod =
-            tweetObjectClass.methods
-                .filter { mutableMethod ->
-                    mutableMethod.returnType == "Ljava/lang/String;" && mutableMethod.implementation?.registerCount == 2
-                }.getOrNull(1) ?: throw PatchException("getUsernameMethod not found")
-
-        val getMediaObjectMethod =
-            tweetObjectClass.methods.firstOrNull { methodDef ->
-                methodDef.implementation
-                    ?.instructions
-                    ?.map { it.opcode }
-                    ?.toList() ==
-                    listOf(
-                        Opcode.IGET_OBJECT,
-                        Opcode.IGET_OBJECT,
-                        Opcode.IGET_OBJECT,
-                        Opcode.IGET_OBJECT,
-                        Opcode.RETURN_OBJECT,
-                    )
-            } ?: throw PatchException("getMediaObject not found")
+        val getIdMethod = tweetObjectClass.methods.firstOrNull { mutableMethod ->
+            mutableMethod.name == "getId"
+        } ?: throw PatchException("getIdMethod not found")
+
+        val getUserNameMethodCaller =
+            GetUserNameMethodCaller.result ?: throw PatchException("Could not find UserNameMethodCaller fingerprint")
+        val getUserNameMethodName = getUserNameMethodCaller.method.implementation?.instructions?.firstOrNull { t ->
+            t.opcode == Opcode.INVOKE_STATIC
+        }.let {
+            (it as DexBackedInstruction35c).reference.getMethodFromReference()
+        }
+
+        val getUsernameMethod = tweetObjectClass.methods.firstOrNull { mutableMethod ->
+            mutableMethod.name.contains(getUserNameMethodName) && mutableMethod.returnType == "Ljava/lang/String;"
+        } ?: throw PatchException("getUsernameMethod not found")
+
+        val getMediaObjectMethod = tweetObjectClass.methods.firstOrNull { methodDef ->
+            methodDef.implementation?.instructions?.map { it.opcode }?.toList() == listOf(
+                Opcode.IGET_OBJECT,
+                Opcode.IGET_OBJECT,
+                Opcode.IGET_OBJECT,
+                Opcode.IGET_OBJECT,
+                Opcode.RETURN_OBJECT,
+            )
+        } ?: throw PatchException("getMediaObject not found")
 
         GetTweetClassFingerprint.result?.mutableMethod?.changeFirstString(tweetObjectClassName)
             ?: throw GetTweetClassFingerprint.exception