feat(youtube/enable-wide-searchbar): bump compatibility to v17.45.36

src/main/kotlin/app/revanced/extensions/Extensions.kt

@@ -1,12 +1,23 @@
 package app.revanced.extensions
 
 import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.extensions.MethodFingerprintExtensions.name
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.patch.PatchResultError
 import app.revanced.patcher.util.proxy.mutableTypes.MutableClass
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
 import org.jf.dexlib2.iface.Method
 import org.jf.dexlib2.util.MethodUtil
 import org.w3c.dom.Node
 
+// TODO: populate this to all patches
+/**
+ * Convert a [MethodFingerprint] to a [PatchResultError].
+ *
+ * @return A [PatchResultError] for the [MethodFingerprint].
+ */
+fun MethodFingerprint.toErrorResult() = PatchResultError("Failed to resolve $name")
+
 /**
  * Find the [MutableMethod] from a given [Method] in a [MutableClass].
  *

src/main/kotlin/app/revanced/patches/youtube/layout/pivotbar/createbutton/patch/CreateButtonRemoverPatch.kt

@@ -1,5 +1,6 @@
 package app.revanced.patches.youtube.layout.pivotbar.createbutton.patch
 
+import app.revanced.extensions.toErrorResult
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
@@ -19,7 +20,6 @@ import app.revanced.patches.youtube.layout.pivotbar.fingerprints.InitializeButto
 import app.revanced.patches.youtube.layout.pivotbar.resource.patch.ResolvePivotBarFingerprintsPatch
 import app.revanced.patches.youtube.layout.pivotbar.utils.InjectionUtils.REGISTER_TEMPLATE_REPLACEMENT
 import app.revanced.patches.youtube.layout.pivotbar.utils.InjectionUtils.injectHook
-import app.revanced.patches.youtube.layout.pivotbar.utils.InjectionUtils.toErrorResult
 import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
 import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
 

src/main/kotlin/app/revanced/patches/youtube/layout/pivotbar/resource/patch/ResolvePivotBarFingerprintsPatch.kt

@@ -1,5 +1,6 @@
 package app.revanced.patches.youtube.layout.pivotbar.resource.patch
 
+import app.revanced.extensions.toErrorResult
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.data.BytecodeContext
@@ -13,7 +14,6 @@ import app.revanced.patches.shared.mapping.misc.patch.ResourceMappingPatch
 import app.revanced.patches.youtube.layout.pivotbar.annotations.PivotBarCompatibility
 import app.revanced.patches.youtube.layout.pivotbar.fingerprints.InitializeButtonsFingerprint
 import app.revanced.patches.youtube.layout.pivotbar.fingerprints.PivotBarConstructorFingerprint
-import app.revanced.patches.youtube.layout.pivotbar.utils.InjectionUtils.toErrorResult
 
 @DependsOn([ResourceMappingPatch::class])
 @PivotBarCompatibility

src/main/kotlin/app/revanced/patches/youtube/layout/pivotbar/shortsbutton/patch/ShortsButtonRemoverPatch.kt

@@ -1,5 +1,6 @@
 package app.revanced.patches.youtube.layout.pivotbar.shortsbutton.patch
 
+import app.revanced.extensions.toErrorResult
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
@@ -19,7 +20,6 @@ import app.revanced.patches.youtube.layout.pivotbar.shortsbutton.fingerprints.Pi
 import app.revanced.patches.youtube.layout.pivotbar.shortsbutton.fingerprints.PivotBarShortsButtonViewFingerprint
 import app.revanced.patches.youtube.layout.pivotbar.utils.InjectionUtils.REGISTER_TEMPLATE_REPLACEMENT
 import app.revanced.patches.youtube.layout.pivotbar.utils.InjectionUtils.injectHook
-import app.revanced.patches.youtube.layout.pivotbar.utils.InjectionUtils.toErrorResult
 import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
 import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
 

src/main/kotlin/app/revanced/patches/youtube/layout/pivotbar/utils/InjectionUtils.kt

@@ -1,10 +1,7 @@
 package app.revanced.patches.youtube.layout.pivotbar.utils
 
-import app.revanced.patcher.extensions.MethodFingerprintExtensions.name
 import app.revanced.patcher.extensions.addInstruction
 import app.revanced.patcher.extensions.instruction
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patcher.patch.PatchResultError
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
 import org.jf.dexlib2.Opcode.MOVE_RESULT_OBJECT
 import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
@@ -30,7 +27,4 @@ internal object InjectionUtils {
             hook.replace("REGISTER_INDEX", register.toString()),
         )
     }
-
-    // TODO: move this to a global extension class and use it in all patches
-    fun MethodFingerprint.toErrorResult() = PatchResultError("Failed to resolve $name")
 }

src/main/kotlin/app/revanced/patches/youtube/layout/widesearchbar/annotations/WideSearchbarCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.36.37", "17.41.37", "17.42.35", "17.43.36")
+        "com.google.android.youtube", arrayOf("17.36.37", "17.41.37", "17.42.35", "17.43.36", "17.45.36")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/youtube/layout/widesearchbar/fingerprints/IsInOfflineModeCheckFingerprint.kt

@@ -0,0 +1,8 @@
+package app.revanced.patches.youtube.layout.widesearchbar.fingerprints
+
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+
+object IsInOfflineModeCheckFingerprint : MethodFingerprint(
+    "L",
+    strings = listOf("bundle_is_in_offline_mode")
+)

src/main/kotlin/app/revanced/patches/youtube/layout/widesearchbar/fingerprints/IsInOfflineModeCheckResultFingerprint.kt

@@ -0,0 +1,18 @@
+package app.revanced.patches.youtube.layout.widesearchbar.fingerprints
+
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import org.jf.dexlib2.Opcode
+
+object IsInOfflineModeCheckResultFingerprint : MethodFingerprint(
+    "L",
+    parameters = listOf("L", "L", "L", "L", "L"),
+    opcodes = listOf(
+        Opcode.INVOKE_STATIC,
+        Opcode.MOVE_RESULT,
+        Opcode.IF_EQZ,
+        Opcode.NEW_INSTANCE,
+        Opcode.MOVE_OBJECT,
+        Opcode.MOVE_OBJECT,
+        Opcode.MOVE_OBJECT,
+    ),
+)

src/main/kotlin/app/revanced/patches/youtube/layout/widesearchbar/fingerprints/SetWordmarkHeaderFingerprint.kt

@@ -0,0 +1,22 @@
+package app.revanced.patches.youtube.layout.widesearchbar.fingerprints
+
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import org.jf.dexlib2.AccessFlags
+import org.jf.dexlib2.Opcode
+
+object SetWordmarkHeaderFingerprint : MethodFingerprint(
+    "V", AccessFlags.PUBLIC or AccessFlags.FINAL, listOf("L"),
+    opcodes = listOf(
+        Opcode.IGET_OBJECT,
+        Opcode.INVOKE_STATIC,
+        Opcode.MOVE_RESULT,
+        Opcode.IF_NEZ,
+        Opcode.IGET_BOOLEAN,
+        Opcode.IF_EQZ,
+        Opcode.IGET_OBJECT,
+        Opcode.CONST,
+        Opcode.INVOKE_STATIC,
+    ),
+    customFingerprint = { methodDef -> methodDef.parameterTypes.first() == "Landroid/widget/ImageView;" }
+)

src/main/kotlin/app/revanced/patches/youtube/layout/widesearchbar/patch/WideSearchbarPatch.kt

@@ -1,27 +1,28 @@
 package app.revanced.patches.youtube.layout.widesearchbar.patch
 
+import app.revanced.extensions.toErrorResult
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.data.toMethodWalker
 import app.revanced.patcher.extensions.addInstructions
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
+import app.revanced.patches.shared.settings.preference.impl.StringResource
+import app.revanced.patches.shared.settings.preference.impl.SwitchPreference
 import app.revanced.patches.youtube.layout.widesearchbar.annotations.WideSearchbarCompatibility
-import app.revanced.patches.youtube.layout.widesearchbar.fingerprints.WideSearchbarOneFingerprint
-import app.revanced.patches.youtube.layout.widesearchbar.fingerprints.WideSearchbarOneParentFingerprint
-import app.revanced.patches.youtube.layout.widesearchbar.fingerprints.WideSearchbarTwoFingerprint
-import app.revanced.patches.youtube.layout.widesearchbar.fingerprints.WideSearchbarTwoParentFingerprint
+import app.revanced.patches.youtube.layout.widesearchbar.fingerprints.IsInOfflineModeCheckFingerprint
+import app.revanced.patches.youtube.layout.widesearchbar.fingerprints.IsInOfflineModeCheckResultFingerprint
+import app.revanced.patches.youtube.layout.widesearchbar.fingerprints.SetWordmarkHeaderFingerprint
 import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
 import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
-import app.revanced.patches.shared.settings.preference.impl.StringResource
-import app.revanced.patches.shared.settings.preference.impl.SwitchPreference
 
 @Patch
 @DependsOn([IntegrationsPatch::class, SettingsPatch::class])
@@ -31,9 +32,38 @@ import app.revanced.patches.shared.settings.preference.impl.SwitchPreference
 @Version("0.0.1")
 class WideSearchbarPatch : BytecodePatch(
     listOf(
-        WideSearchbarOneParentFingerprint, WideSearchbarTwoParentFingerprint
+        SetWordmarkHeaderFingerprint, IsInOfflineModeCheckFingerprint
     )
 ) {
+    private companion object {
+        /**
+         * Walk a fingerprints method at a given index mutably.
+         *
+         * @param index The index to walk at.
+         * @param fromFingerprint The fingerprint to walk the method on.
+         * @return The [MutableMethod] which was walked on.
+         */
+        fun BytecodeContext.walkMutable(index: Int, fromFingerprint: MethodFingerprint) =
+            fromFingerprint.result?.let {
+                toMethodWalker(it.method).nextMethod(index, true).getMethod() as MutableMethod
+            } ?: throw SetWordmarkHeaderFingerprint.toErrorResult()
+
+
+        /**
+         * Injects instructions required for certain methods.
+         *
+         */
+        fun MutableMethod.injectSearchBarHook() {
+            addInstructions(
+                implementation!!.instructions.size - 1,
+                """
+                    invoke-static {}, Lapp/revanced/integrations/patches/NewActionbarPatch;->getNewActionBar()Z
+                    move-result p0
+                """
+            )
+        }
+    }
+
     override fun execute(context: BytecodeContext): PatchResult {
         SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
             SwitchPreference(
@@ -45,76 +75,20 @@ class WideSearchbarPatch : BytecodePatch(
             )
         )
 
-        WideSearchbarOneFingerprint.resolve(context, WideSearchbarOneParentFingerprint.result!!.classDef)
-        WideSearchbarTwoFingerprint.resolve(context, WideSearchbarTwoParentFingerprint.result!!.classDef)
-
-        val resultOne = WideSearchbarOneFingerprint.result
+        // resolve fingerprints
+        IsInOfflineModeCheckFingerprint.result?.let {
+            if (!IsInOfflineModeCheckResultFingerprint.resolve(context, it.classDef))
+                return IsInOfflineModeCheckResultFingerprint.toErrorResult()
+        } ?: return IsInOfflineModeCheckFingerprint.toErrorResult()
 
-        //This should be the method aF in class fbn
-        val targetMethodOne =
-            context.toMethodWalker(resultOne!!.method)
-                .nextMethod(resultOne.scanResult.patternScanResult!!.endIndex, true).getMethod() as MutableMethod
-
-        //Since both methods have the same smali code, inject instructions using a method.
-        addInstructions(targetMethodOne)
-
-        val resultTwo = WideSearchbarTwoFingerprint.result
-
-        //This should be the method aB in class fbn
-        val targetMethodTwo =
-            context.toMethodWalker(resultTwo!!.method)
-                .nextMethod(resultTwo.scanResult.patternScanResult!!.startIndex, true).getMethod() as MutableMethod
-
-        //Since both methods have the same smali code, inject instructions using a method.
-        addInstructions(targetMethodTwo)
+        // patch methods
+        mapOf(
+            SetWordmarkHeaderFingerprint to 1,
+            IsInOfflineModeCheckResultFingerprint to 0
+        ).forEach { (fingerprint, callIndex) ->
+            context.walkMutable(callIndex, fingerprint).injectSearchBarHook()
+        }
 
         return PatchResultSuccess()
     }
-
-    private fun addInstructions(method: MutableMethod) {
-        val index = method.implementation!!.instructions.size - 1
-        method.addInstructions(
-            index, """
-            invoke-static {}, Lapp/revanced/integrations/patches/NewActionbarPatch;->getNewActionBar()Z
-            move-result p0
-        """
-        )
-    }
-
-    //targetMethodOne: in class fbn
-    /*
-    .method public static aF(Ltxm;)Z
-        invoke-virtual {p0}, Ltxm;->b()Lahah;
-        move-result-object p0
-        iget-object p0, p0, Lahah;->e:Lakfd;
-        if-nez p0, :cond_a
-        sget-object p0, Lakfd;->a:Lakfd;
-        :cond_a
-        iget-boolean p0, p0, Lakfd;->V:Z
-        //added code here:
-            invoke-static {}, app/revanced/integrations/patches/NewActionbarPatch;->getNewActionBar()Z
-            move-result p0
-        //original code here:
-        return p0
-    .end method
-   */
-
-    //targetMethodTwo: in class fbn
-    /*
-    .method public static aB(Ltxm;)Z
-        invoke-virtual {p0}, Ltxm;->b()Lahah;
-        move-result-object p0
-        iget-object p0, p0, Lahah;->e:Lakfd;
-        if-nez p0, :cond_a
-        sget-object p0, Lakfd;->a:Lakfd;
-        :cond_a
-        iget-boolean p0, p0, Lakfd;->y:Z
-        //added code here:
-            invoke-static {}, app/revanced/integrations/patches/NewActionbarPatch;->getNewActionBar()Z
-            move-result p0
-        //original code here:
-        return p0
-    .end method
-
-    */
 }