Merge pull request #454 from crimera/dev

chore: Merge branch `dev` to `main`

Author: crimera

CHANGELOG.md

@@ -1,3 +1,17 @@
+## [1.44.0-dev.1](https://github.com/crimera/piko/compare/v1.43.0...v1.44.0-dev.1) (2024-11-02)
+
+### Features
+
+* **Twitter:** Added `Custom translator` patch ([737fb9e](https://github.com/crimera/piko/commit/737fb9eaa0b8da7f020b93c314f5da60f961e345))
+
+### Refactors
+
+* **Twitter:** Change translator icon ([bf5f027](https://github.com/crimera/piko/commit/bf5f027f80507cf0db5b3dfd208d26b131987eca))
+* **Twitter:** refactor `Custom downloader` patch ([42cc752](https://github.com/crimera/piko/commit/42cc752c599f978f455f84ae9a917f7bb457af98))
+* **Twitter:** Refactor `Custom downloader` patch ([1e966f7](https://github.com/crimera/piko/commit/1e966f7f519b7d947e0b516f8bc0ca0c55c1d623))
+* **Twitter:** Refactor hooks filename ([2daa292](https://github.com/crimera/piko/commit/2daa2922c7225711fd1aa5d0556493e068026e0a))
+* **Twitter:** renamed 'Share menu button' fingerprints to hooks ([395c221](https://github.com/crimera/piko/commit/395c2217fc5f5b18cdc76568c3845140f76940d6))
+
 ## [1.43.0](https://github.com/crimera/piko/compare/v1.42.1...v1.43.0) (2024-10-29)
 
 ### Bug Fixes

gradle.properties

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

patches.json

@@ -26,10 +26,10 @@ import crimera.patches.twitter.misc.settings.fingerprints.UrlInterpreterActivity
     compatiblePackages = [CompatiblePackage("com.twitter.android")],
 )
 object SettingsPatch : BytecodePatch(
-    setOf(SettingsFingerprint, AuthorizeAppActivity, IntegrationsUtilsFingerprint,UrlInterpreterActivity)
+    setOf(SettingsFingerprint, AuthorizeAppActivity, IntegrationsUtilsFingerprint, UrlInterpreterActivity),
 ) {
     private const val INTEGRATIONS_PACKAGE = "Lapp/revanced/integrations/twitter"
-    private const val UTILS_DESCRIPTOR = "$INTEGRATIONS_PACKAGE/Utils"
+    const val UTILS_DESCRIPTOR = "$INTEGRATIONS_PACKAGE/Utils"
     private const val ACTIVITY_HOOK_CLASS = "Lapp/revanced/integrations/twitter/settings/ActivityHook;"
     private const val DEEPLINK_HOOK_CLASS = "Lapp/revanced/integrations/twitter/settings/DeepLink;"
     private const val ADD_PREF_DESCRIPTOR =
@@ -45,26 +45,39 @@ object SettingsPatch : BytecodePatch(
         "invoke-static {}, $ACTIVITY_HOOK_CLASS->startSettingsActivity()V"
 
     override fun execute(context: BytecodeContext) {
-        val result = SettingsFingerprint.result
-            ?: throw PatchException("Fingerprint not found")
+        val result =
+            SettingsFingerprint.result
+                ?: throw PatchException("Fingerprint not found")
 
         val initMethod = result.mutableClass.methods.first()
 
-        val arrayCreation = initMethod.getInstructions()
-            .first { it.opcode == Opcode.FILLED_NEW_ARRAY_RANGE }.location.index+1
+        val arrayCreation =
+            initMethod
+                .getInstructions()
+                .first { it.opcode == Opcode.FILLED_NEW_ARRAY_RANGE }
+                .location.index + 1
 
-        initMethod.getInstruction<BuilderInstruction11x>(arrayCreation).registerA.also { reg->
-            initMethod.addInstructions(arrayCreation+1, """
+        initMethod.getInstruction<BuilderInstruction11x>(arrayCreation).registerA.also { reg ->
+            initMethod.addInstructions(
+                arrayCreation + 1,
+                """
                 const-string v1, "pref_mod"
                 invoke-static {v$reg, v1}, $ADD_PREF_DESCRIPTOR
                 move-result-object v$reg
-            """)
+            """,
+            )
         }
 
         val prefCLickedMethod = result.mutableClass.methods.find { it.returnType == "Z" }!!
-        val constIndex = prefCLickedMethod.getInstructions().first{ it.opcode == Opcode.CONST_4 }.location.index
+        val constIndex =
+            prefCLickedMethod
+                .getInstructions()
+                .first { it.opcode == Opcode.CONST_4 }
+                .location.index
 
-        prefCLickedMethod.addInstructionsWithLabels(1, """
+        prefCLickedMethod.addInstructionsWithLabels(
+            1,
+            """
             const-string v1, "pref_mod" 
             invoke-virtual {p1, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
             move-result v2
@@ -77,40 +90,44 @@ object SettingsPatch : BytecodePatch(
             const/4 v3, 0x1
             return v3 
         """,
-            ExternalLabel("cont", prefCLickedMethod.getInstruction(constIndex))
+            ExternalLabel("cont", prefCLickedMethod.getInstruction(constIndex)),
         )
 
         AuthorizeAppActivity.result?.apply {
             mutableMethod.addInstructionsWithLabels(
-                1, """
+                1,
+                """
                 invoke-static {p0}, $ACTIVITY_HOOK_CLASS->create(Landroid/app/Activity;)Z
                 move-result v0
                 if-nez v0, :no_piko_settings_init
                 """.trimIndent(),
                 ExternalLabel(
                     "no_piko_settings_init",
-                    mutableMethod.getInstructions().first { it.opcode == Opcode.RETURN_VOID })
+                    mutableMethod.getInstructions().first { it.opcode == Opcode.RETURN_VOID },
+                ),
             )
         } ?: throw PatchException("ProxySettingsActivityFingerprint not found")
 
         UrlInterpreterActivity.result?.apply {
             val instructions = mutableMethod.getInstructions()
-            val loc = instructions.first { it.opcode == Opcode.INVOKE_SUPER }.location.index+1
+            val loc = instructions.first { it.opcode == Opcode.INVOKE_SUPER }.location.index + 1
             mutableMethod.addInstructionsWithLabels(
-                loc, """
+                loc,
+                """
                 invoke-static {p0}, $DEEPLINK_HOOK_CLASS->deeplink(Landroid/app/Activity;)Z
                 move-result v0
                 if-nez v0, :deep_link
                 """.trimIndent(),
                 ExternalLabel(
                     "deep_link",
-                    instructions.first { it.opcode == Opcode.RETURN_VOID })
+                    instructions.first { it.opcode == Opcode.RETURN_VOID },
+                ),
             )
         } ?: throw PatchException("UrlInterpreterActivity not found")
 
         IntegrationsUtilsFingerprint.result!!.mutableMethod.addInstruction(
             0,
-            "${SSTS_DESCRIPTOR}->load()V"
+            "${SSTS_DESCRIPTOR}->load()V",
         )
     }
-}
+}