fix: Move action button hook further out

The prior hook still had issues with minimizing the YT app. This seems to fix it.
ReVanced · Mar 6, 2024 · a181576 · a181576
1 parent a9a4a41
commit a181576
Show file tree

Hide file tree

Showing 8 changed files with 60 additions and 38 deletions.
diff --git a/api/revanced-patches.api b/api/revanced-patches.api
@@ -1748,6 +1748,7 @@ public final class app/revanced/util/BytecodeUtilsKt {
 	public static final fun indexOfFirstInstruction (Lcom/android/tools/smali/dexlib2/iface/Method;Lkotlin/jvm/functions/Function1;)I
 	public static final fun indexOfFirstWideLiteralInstructionValue (Lcom/android/tools/smali/dexlib2/iface/Method;J)I
 	public static final fun injectHideViewCall (Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod;IILjava/lang/String;Ljava/lang/String;)V
+	public static final fun resultOrThrow (Lapp/revanced/patcher/fingerprint/MethodFingerprint;)Lapp/revanced/patcher/fingerprint/MethodFingerprintResult;
 	public static final fun returnEarly (Ljava/util/List;Z)V
 	public static synthetic fun returnEarly$default (Ljava/util/List;ZILjava/lang/Object;)V
 	public static final fun transformMethods (Lapp/revanced/patcher/util/proxy/mutableTypes/MutableClass;Lkotlin/jvm/functions/Function1;)V

diff --git a/src/main/kotlin/app/revanced/patches/youtube/interaction/downloads/DownloadsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/interaction/downloads/DownloadsPatch.kt
@@ -3,16 +3,15 @@ package app.revanced.patches.youtube.interaction.downloads
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
-import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.annotation.CompatiblePackage
 import app.revanced.patcher.patch.annotation.Patch
-import app.revanced.patcher.util.smali.ExternalLabel
-import app.revanced.patches.youtube.interaction.downloads.fingerprints.DownloadButtonActionFingerprint
+import app.revanced.patches.youtube.interaction.downloads.fingerprints.DownloadActionCommandResolverFingerprint
+import app.revanced.patches.youtube.interaction.downloads.fingerprints.DownloadActionCommandResolverParentFingerprint
 import app.revanced.patches.youtube.misc.playercontrols.PlayerControlsBytecodePatch
 import app.revanced.patches.youtube.shared.fingerprints.MainActivityFingerprint
 import app.revanced.patches.youtube.video.information.VideoInformationPatch
-import app.revanced.util.exception
+import app.revanced.util.resultOrThrow
 
 @Patch(
     name = "Downloads",
@@ -41,7 +40,7 @@ import app.revanced.util.exception
 @Suppress("unused")
 object DownloadsPatch : BytecodePatch(
     setOf(
-        DownloadButtonActionFingerprint,
+        DownloadActionCommandResolverParentFingerprint,
         MainActivityFingerprint
     )
 ) {
@@ -53,26 +52,28 @@ object DownloadsPatch : BytecodePatch(
         PlayerControlsBytecodePatch.injectVisibilityCheckCall("$BUTTON_DESCRIPTOR->changeVisibility(Z)V")
 
         // Main activity is used to launch downloader intent.
-        MainActivityFingerprint.result?.mutableMethod?.apply {
+        MainActivityFingerprint.resultOrThrow().mutableMethod.apply {
             addInstruction(
                 implementation!!.instructions.lastIndex,
                 "invoke-static { p0 }, $INTEGRATIONS_CLASS_DESCRIPTOR->activityCreated(Landroid/app/Activity;)V"
             )
-        } ?: throw MainActivityFingerprint.exception
+        }
 
-        DownloadButtonActionFingerprint.result?.let {
-            it.mutableMethod.apply {
-                addInstructionsWithLabels(
-                    2,
+        DownloadActionCommandResolverFingerprint.resolve(context,
+            DownloadActionCommandResolverParentFingerprint.resultOrThrow().classDef)
+
+        DownloadActionCommandResolverFingerprint.resultOrThrow().mutableMethod.apply {
+            addInstructionsWithLabels(
+                0,
+                """
+                        invoke-static {}, $INTEGRATIONS_CLASS_DESCRIPTOR->inAppDownloadButtonOnClick()Z
+                        move-result v0
+                        if-eqz v0, :show_native_downloader
+                        return-void
+                        :show_native_downloader
+                        nop
                     """
-                            invoke-static {}, $INTEGRATIONS_CLASS_DESCRIPTOR->inAppDownloadButtonOnClick()Z
-                            move-result v0
-                            if-eqz v0, :show_dialog
-                            return-void
-                        """,
-                    ExternalLabel("show_dialog", getInstruction(2)),
-                )
-            }
-        } ?: throw DownloadButtonActionFingerprint.exception
+            )
+        }
     }
 }
diff --git a/...es/youtube/interaction/downloads/fingerprints/DownloadActionCommandResolverFingerprint.kt b/...es/youtube/interaction/downloads/fingerprints/DownloadActionCommandResolverFingerprint.kt
@@ -0,0 +1,14 @@
+package app.revanced.patches.youtube.interaction.downloads.fingerprints
+
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.MethodFingerprint
+import com.android.tools.smali.dexlib2.AccessFlags
+
+/**
+ * Resolves to the class found in [DownloadActionCommandResolverParentFingerprint].
+ */
+internal object DownloadActionCommandResolverFingerprint : MethodFingerprint(
+    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
+    returnType = "V",
+    parameters = listOf("L", "Ljava/util/Map;")
+)
diff --git a/...tube/interaction/downloads/fingerprints/DownloadActionCommandResolverParentFingerprint.kt b/...tube/interaction/downloads/fingerprints/DownloadActionCommandResolverParentFingerprint.kt
@@ -0,0 +1,17 @@
+package app.revanced.patches.youtube.interaction.downloads.fingerprints
+
+import app.revanced.patcher.extensions.or
+import app.revanced.util.patch.LiteralValueFingerprint
+import com.android.tools.smali.dexlib2.AccessFlags
+
+internal object DownloadActionCommandResolverParentFingerprint : LiteralValueFingerprint(
+    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
+    returnType = "V",
+    parameters = listOf("L", "L"),
+    strings = listOf(
+        // Strings are not unique and found in other methods.
+        "com.google.android.libraries.youtube.logging.interaction_logger",
+        "Unknown command"
+        ),
+    literalSupplier = { 16 }
+)
diff --git a/...ced/patches/youtube/interaction/downloads/fingerprints/DownloadButtonActionFingerprint.kt b/...ced/patches/youtube/interaction/downloads/fingerprints/DownloadButtonActionFingerprint.kt
diff --git a/...lin/app/revanced/patches/youtube/layout/returnyoutubedislike/ReturnYouTubeDislikePatch.kt b/...lin/app/revanced/patches/youtube/layout/returnyoutubedislike/ReturnYouTubeDislikePatch.kt
@@ -32,6 +32,7 @@ import app.revanced.patches.youtube.video.videoid.VideoIdPatch
 import app.revanced.util.exception
 import app.revanced.util.getReference
 import app.revanced.util.indexOfFirstInstruction
+import app.revanced.util.resultOrThrow
 import com.android.tools.smali.dexlib2.Opcode
 import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction
 import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
@@ -88,8 +89,6 @@ object ReturnYouTubeDislikePatch : BytecodePatch(
     private const val FILTER_CLASS_DESCRIPTOR =
         "Lapp/revanced/integrations/youtube/patches/components/ReturnYouTubeDislikeFilterPatch;"
 
-    private fun MethodFingerprint.resultOrThrow() = result ?: throw exception
-
     override fun execute(context: BytecodeContext) {
         // region Inject newVideoLoaded event handler to update dislikes when a new video is loaded.
 

diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/thumbnails/AlternativeThumbnailsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/thumbnails/AlternativeThumbnailsPatch.kt
@@ -23,7 +23,7 @@ import app.revanced.patches.youtube.layout.thumbnails.fingerprints.cronet.reques
 import app.revanced.patches.youtube.layout.thumbnails.fingerprints.cronet.request.callback.OnSucceededFingerprint
 import app.revanced.patches.youtube.misc.integrations.IntegrationsPatch
 import app.revanced.patches.youtube.misc.settings.SettingsPatch
-import app.revanced.util.exception
+import app.revanced.util.resultOrThrow
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode
 import com.android.tools.smali.dexlib2.builder.MutableMethodImplementation
@@ -144,11 +144,8 @@ object AlternativeThumbnailsPatch : BytecodePatch(
             NonInteractivePreference("revanced_alt_thumbnail_stills_about"),
         )
 
-        fun MethodFingerprint.getResultOrThrow() =
-            result ?: throw exception
-
         fun MethodFingerprint.alsoResolve(fingerprint: MethodFingerprint) =
-            also { resolve(context, fingerprint.getResultOrThrow().classDef) }.getResultOrThrow()
+            also { resolve(context, fingerprint.resultOrThrow().classDef) }.resultOrThrow()
 
         fun MethodFingerprint.resolveAndLetMutableMethod(
             fingerprint: MethodFingerprint,
@@ -172,7 +169,7 @@ object AlternativeThumbnailsPatch : BytecodePatch(
 
         // The URL is required for the failure callback hook, but the URL field is obfuscated.
         // Add a helper get method that returns the URL field.
-        RequestFingerprint.getResultOrThrow().apply {
+        RequestFingerprint.resultOrThrow().apply {
             // The url is the only string field that is set inside the constructor.
             val urlFieldInstruction = mutableMethod.getInstructions().first {
                 if (it.opcode != Opcode.IPUT_OBJECT) return@first false

diff --git a/src/main/kotlin/app/revanced/util/BytecodeUtils.kt b/src/main/kotlin/app/revanced/util/BytecodeUtils.kt
@@ -15,6 +15,9 @@ import com.android.tools.smali.dexlib2.iface.instruction.WideLiteralInstruction
 import com.android.tools.smali.dexlib2.iface.reference.Reference
 import com.android.tools.smali.dexlib2.util.MethodUtil
 
+
+fun MethodFingerprint.resultOrThrow() = result ?: throw exception
+
 /**
  * The [PatchException] of failing to resolve a [MethodFingerprint].
  *