chore(release): 2.32.0 [skip ci]

# [2.32.0](https://github.com/revanced/revanced-patches/compare/v2.31.0...v2.32.0) (2022-08-04)

### Features

* `promo-code-unlock` patch ([#292](https://github.com/revanced/revanced-patches/issues/292)) ([7925ca9](7925ca97c4))

CHANGELOG.md

@@ -1,3 +1,17 @@
+# [2.32.0](https://github.com/revanced/revanced-patches/compare/v2.31.0...v2.32.0) (2022-08-04)
+
+
+### Features
+
+* `promo-code-unlock` patch ([#292](https://github.com/revanced/revanced-patches/issues/292)) ([d5df2e6](https://github.com/revanced/revanced-patches/commit/d5df2e68f47cbb3d374b8ce24769872959014051))
+
+# [2.31.0](https://github.com/revanced/revanced-patches/compare/v2.30.1...v2.31.0) (2022-08-03)
+
+
+### Features
+
+* remove `force-vp9-codec` patch ([#287](https://github.com/revanced/revanced-patches/issues/287)) ([e428978](https://github.com/revanced/revanced-patches/commit/e42897801b20e7439969954753e2c15c85eb41b5))
+
 ## [2.30.1](https://github.com/revanced/revanced-patches/compare/v2.30.0...v2.30.1) (2022-08-03)
 
 

README.md

@@ -37,6 +37,14 @@ Official patches by ReVanced
 | `exclusive-audio-playback` | Enables the option to play music without video. | 5.16.51 |
 </details>
 
+### 📦 `de.dwd.warnapp`
+<details>
+
+| 💊 Patch | 📜 Description | 🏹 Target Version |
+|:--------:|:--------------:|:-----------------:|
+| `promo-code-unlock` | Disables the validation of promo code. Any code will work to unlock all features. | all |
+</details>
+
 ### 📦 `com.google.android.youtube`
 <details>
 
@@ -58,7 +66,6 @@ Official patches by ReVanced
 | `hide-watermark` | Hides creator's watermarks on videos. | 17.29.34 |
 | `sponsorblock` | Integrate SponsorBlock. | 17.29.34 |
 | `enable-wide-searchbar` | Replaces the search icon with a wide search bar. This will hide the YouTube logo when active. | 17.29.34 |
-| `force-vp9-codec` | Forces the VP9 codec for videos. | 17.29.34 |
 | `custom-video-buffer` | Lets you change the buffers of videos. Has no use without settings yet. | 17.29.34 |
 | `always-autorepeat` | Always repeats the playing video again. | 17.29.34 |
 | `microg-support` | Allows YouTube ReVanced to run without root and under a different package name with Vanced MicroG | 17.29.34 |

gradle.properties

@@ -1,2 +1,2 @@
 kotlin.code.style = official
-version = 2.30.1
+version = 2.32.0

src/main/kotlin/app/revanced/patches/warnwetter/misc/promocode/annotations/PromoCodeUnlockCompatibility.kt

@@ -1,13 +1,13 @@
-package app.revanced.patches.youtube.misc.forcevp9.annotations
+package app.revanced.patches.warnwetter.misc.promocode.annotations
 
 import app.revanced.patcher.annotation.Compatibility
 import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.26.35", "17.27.39", "17.28.34", "17.29.34")
+        "de.dwd.warnapp", arrayOf()
     )]
 )
 @Target(AnnotationTarget.CLASS)
 @Retention(AnnotationRetention.RUNTIME)
-internal annotation class ForceVP9Compatibility
+internal annotation class PromoCodeUnlockCompatibility

src/main/kotlin/app/revanced/patches/warnwetter/misc/promocode/fingerprints/PromoCodeUnlockFingerprint.kt

@@ -0,0 +1,26 @@
+package app.revanced.patches.warnwetter.misc.promocode.fingerprints
+
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
+import app.revanced.patches.youtube.layout.createbutton.annotations.CreateButtonCompatibility
+import org.jf.dexlib2.AccessFlags
+import org.jf.dexlib2.Opcode
+
+@Name("promo-code-unlock-fingerprint")
+@MatchingMethod(
+    "Lde/dwd/warnapp/model/PromoTokenVerification;", "isValid"
+)
+@CreateButtonCompatibility
+@Version("0.0.1")
+object PromoCodeUnlockFingerprint : MethodFingerprint(
+    null,
+    null,
+    null,
+    null,
+    null,
+    { methodDef ->
+        methodDef.definingClass.endsWith("PromoTokenVerification;") && methodDef.name == "isValid"
+    }
+)

src/main/kotlin/app/revanced/patches/warnwetter/misc/promocode/patch/PromoCodeUnlockPatch.kt

@@ -0,0 +1,42 @@
+package app.revanced.patches.warnwetter.misc.promocode.patch
+
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.impl.BytecodeData
+import app.revanced.patcher.extensions.removeInstruction
+import app.revanced.patcher.extensions.removeInstructions
+import app.revanced.patcher.extensions.addInstructions
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patcher.patch.impl.BytecodePatch
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patches.warnwetter.misc.promocode.annotations.PromoCodeUnlockCompatibility
+import app.revanced.patches.warnwetter.misc.promocode.fingerprints.PromoCodeUnlockFingerprint
+
+@Patch
+@Name("promo-code-unlock")
+@Description("Disables the validation of promo code. Any code will work to unlock all features.")
+@PromoCodeUnlockCompatibility
+@Version("0.0.1")
+class PromoCodeUnlockPatch : BytecodePatch(
+    listOf(
+        PromoCodeUnlockFingerprint
+    )
+) {
+
+    override fun execute(data: BytecodeData): PatchResult {
+        val method = PromoCodeUnlockFingerprint.result!!.mutableMethod
+        method.addInstructions(
+            0,
+            """
+                const/4 v0, 0x1
+                return v0
+            """
+        )
+
+        return PatchResultSuccess()
+    }
+
+
+}

src/main/kotlin/app/revanced/patches/youtube/misc/forcevp9/fingerprints/ForceVP9CodecFingerprint.kt

@@ -1,48 +0,0 @@
-package app.revanced.patches.youtube.misc.forcevp9.fingerprints
-
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.annotation.DirectPatternScanMethod
-import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patches.youtube.misc.forcevp9.annotations.ForceVP9Compatibility
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-
-@Name("force-vp9-codec-fingerprint")
-@MatchingMethod(
-    "Lpzs;", "aI"
-)
-@DirectPatternScanMethod
-@ForceVP9Compatibility
-@Version("0.0.1")
-object ForceVP9CodecFingerprint : MethodFingerprint(
-    "Z", AccessFlags.PUBLIC or AccessFlags.STATIC, listOf("L", "I"), listOf(
-        Opcode.SGET, Opcode.IF_NEZ, Opcode.INVOKE_STATIC
-    ), null, null
-)
-
-/*
-public static boolean aI(Context context, int i) {
-    if (b == 0) {
-        aH(context);
-    }
-    return b >= i; // Override to: return Lapp/revanced/integrations/patches/ForceCodecPatch->shouldForceVP9()
-}
-
-.method public static aI(Landroid/content/Context;I)Z
-    sget v0, Lpzs;->b:I
-    if-nez v0, :cond_7
-    invoke-static {p0}, Lpzs;->aH(Landroid/content/Context;)V
-    :cond_7
-    //remove after here, and inject only our code
-    sget p0, Lpzs;->b:I
-    if-lt p0, p1, :cond_d
-    const/4 p0, 0x1
-    return p0
-    :cond_d
-    const/4 p0, 0x0
-    return p0
-.end method
- */

src/main/kotlin/app/revanced/patches/youtube/misc/forcevp9/fingerprints/ForceVP9CodecFingerprintTwo.kt

@@ -1,73 +0,0 @@
-package app.revanced.patches.youtube.misc.forcevp9.fingerprints
-
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.annotation.DirectPatternScanMethod
-import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patches.youtube.misc.forcevp9.annotations.ForceVP9Compatibility
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-
-@Name("force-vp9-codec-fingerprint-two")
-@MatchingMethod(
-    "Lpzs;", "aO"
-)
-@DirectPatternScanMethod
-@ForceVP9Compatibility
-@Version("0.0.1")
-object ForceVP9CodecFingerprintTwo : MethodFingerprint(
-    "Z", AccessFlags.PUBLIC or AccessFlags.STATIC, listOf("I"), listOf(
-        Opcode.INVOKE_STATIC, Opcode.MOVE_RESULT_OBJECT, Opcode.CONST_4
-    ), null, null
-)
-
-/*
-public static boolean aO(int i) {
-    Pair aG = aG();
-    return (aG == null ? 0 : Math.min(((Integer) aG.first).intValue(), ((Integer) aG.second).intValue())) >= i;
-    //replace line with: return Lapp/revanced/integrations/patches/ForceCodecPatch/shouldForceVP9();
-}
-
-becomes:
-public static boolean aO(int i) {
-    return Lapp/revanced/integrations/patches/ForceCodecPatch/shouldForceVP9();
-}
-
-.method public static aO(I)Z
-    invoke-static {}, Lpzs;->aG()Landroid/util/Pair;
-    move-result-object v0
-    const/4 v1, 0x0
-    if-nez v0, :cond_9
-    const/4 v0, 0x0
-    goto :goto_1d
-    :cond_9
-    iget-object v2, v0, Landroid/util/Pair;->first:Ljava/lang/Object;
-    check-cast v2, Ljava/lang/Integer;
-    invoke-virtual {v2}, Ljava/lang/Integer;->intValue()I
-    move-result v2
-    iget-object v0, v0, Landroid/util/Pair;->second:Ljava/lang/Object;
-    check-cast v0, Ljava/lang/Integer;
-    invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
-    move-result v0
-    invoke-static {v2, v0}, Ljava/lang/Math;->min(II)I
-    move-result v0
-    :goto_1d
-    if-lt v0, p0, :cond_21
-    const/4 p0, 0x1
-    return p0
-    :cond_21
-    return v1
-.end method
-
-
-becomes:
-.method public static aO(I)Z
-    invoke-static {}, Lapp/revanced/integrations/patches/ForceCodecPatch;->shouldForceVP9()Z
-    move-result v0
-    return v0
-.end method
-
-
- */

src/main/kotlin/app/revanced/patches/youtube/misc/forcevp9/fingerprints/ForceVP9ParentFingerprint.kt

@@ -1,24 +0,0 @@
-package app.revanced.patches.youtube.misc.forcevp9.fingerprints
-
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.annotation.DirectPatternScanMethod
-import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patches.youtube.misc.forcevp9.annotations.ForceVP9Compatibility
-import org.jf.dexlib2.AccessFlags
-
-@Name("force-vp9-codec-parent-fingerprint")
-@MatchingMethod(
-    "Lqaa;", "U"
-)
-@DirectPatternScanMethod
-@ForceVP9Compatibility
-@Version("0.0.1")
-object ForceVP9ParentFingerprint : MethodFingerprint(
-    "L", AccessFlags.PUBLIC or AccessFlags.STATIC, listOf(), null,
-    listOf(
-        "sys.display-size", "x"
-    )
-)

src/main/kotlin/app/revanced/patches/youtube/misc/forcevp9/fingerprints/ReplaceDeviceInfoFingerprint.kt

@@ -1,30 +0,0 @@
-package app.revanced.patches.youtube.misc.forcevp9.fingerprints
-
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.annotation.DirectPatternScanMethod
-import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patches.youtube.misc.forcevp9.annotations.ForceVP9Compatibility
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.iface.instruction.ReferenceInstruction
-import org.jf.dexlib2.iface.reference.FieldReference
-
-@Name("replace-device-info-parent-fingerprint")
-@MatchingMethod(
-    "Lvjb;", "e"
-)
-@DirectPatternScanMethod
-@ForceVP9Compatibility
-@Version("0.0.1")
-object ReplaceDeviceInfoFingerprint : MethodFingerprint(
-    "L", AccessFlags.PUBLIC or AccessFlags.FINAL, listOf(), null,
-    null,
-    customFingerprint = { methodDef ->
-        methodDef.implementation!!.instructions.any {
-            ((it as? ReferenceInstruction)?.reference as? FieldReference)?.definingClass.equals("Landroid/os/Build;")
-                    && ((it as? ReferenceInstruction)?.reference as? FieldReference)?.name.equals("MANUFACTURER")
-        }
-    }
-)

src/main/kotlin/app/revanced/patches/youtube/misc/forcevp9/fingerprints/ReplaceDeviceInfoParentFingerprint.kt

@@ -1,24 +0,0 @@
-package app.revanced.patches.youtube.misc.forcevp9.fingerprints
-
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.annotation.DirectPatternScanMethod
-import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patches.youtube.misc.forcevp9.annotations.ForceVP9Compatibility
-import org.jf.dexlib2.AccessFlags
-
-@Name("replace-device-info-parent-fingerprint")
-@MatchingMethod(
-    "Lvjb;", "b"
-)
-@DirectPatternScanMethod
-@ForceVP9Compatibility
-@Version("0.0.1")
-object ReplaceDeviceInfoParentFingerprint : MethodFingerprint(
-    "L", AccessFlags.PUBLIC or AccessFlags.FINAL, listOf(), null,
-    listOf(
-        "Failed to read the client side experiments map from the disk"
-    )
-)

src/main/kotlin/app/revanced/patches/youtube/misc/forcevp9/patch/ForceVP9CodecPatch.kt

@@ -1,87 +0,0 @@
-package app.revanced.patches.youtube.misc.forcevp9.patch
-
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.data.impl.BytecodeData
-import app.revanced.patcher.extensions.addInstructions
-import app.revanced.patcher.extensions.removeInstruction
-import app.revanced.patcher.extensions.removeInstructions
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprintResult
-import app.revanced.patcher.fingerprint.method.utils.MethodFingerprintUtils.resolve
-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.patch.impl.BytecodePatch
-import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
-import app.revanced.patches.youtube.misc.forcevp9.annotations.ForceVP9Compatibility
-import app.revanced.patches.youtube.misc.forcevp9.fingerprints.*
-import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
-import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
-import org.jf.dexlib2.iface.instruction.ReferenceInstruction
-import org.jf.dexlib2.iface.reference.FieldReference
-
-@Patch
-@DependsOn([IntegrationsPatch::class])
-@Name("force-vp9-codec")
-@Description("Forces the VP9 codec for videos.")
-@ForceVP9Compatibility
-@Version("0.0.1")
-class ForceVP9CodecPatch : BytecodePatch(
-    listOf(
-        ForceVP9ParentFingerprint, ReplaceDeviceInfoParentFingerprint
-    )
-) {
-    override fun execute(data: BytecodeData): PatchResult {
-        val classDef = ForceVP9ParentFingerprint.result!!.classDef
-        ForceVP9CodecFingerprint.resolve(data, classDef)
-        ForceVP9CodecFingerprintTwo.resolve(data, classDef)
-
-        replaceInstructions(ForceVP9CodecFingerprint.result!!)
-        replaceInstructions(ForceVP9CodecFingerprintTwo.result!!)
-
-        ReplaceDeviceInfoFingerprint.resolve(data, ReplaceDeviceInfoParentFingerprint.result!!.classDef)
-        var method = ReplaceDeviceInfoFingerprint.result!!.mutableMethod
-        replaceDeviceInfos("Manufacturer", method)
-        replaceDeviceInfos("Model", method)
-
-        return PatchResultSuccess()
-    }
-
-    private fun replaceInstructions(result: MethodFingerprintResult) {
-        val method = result.mutableMethod
-        method.removeInstructions(0, method.implementation!!.instructions.size - 1)
-        method.addInstructions(
-            0, """
-            invoke-static {}, Lapp/revanced/integrations/patches/ForceCodecPatch;->shouldForceVP9()Z
-            move-result v0
-            return v0
-        """
-        )
-    }
-
-    private fun replaceDeviceInfos(name: String, method: MutableMethod) {
-        var impl = method.implementation!!
-        //find target instruction for Build.name.uppercase() and replace that with our method
-        impl.instructions.filter {
-            ((it as? ReferenceInstruction)?.reference as? FieldReference)?.let { field ->
-                //sget-object v1, Landroid/os/Build;->MANUFACTURER:Ljava/lang/String;
-                //sget-object v1, Landroid/os/Build;->MODEL:Ljava/lang/String;
-                field.definingClass == "Landroid/os/Build;" && field.name == name.uppercase()
-            } == true
-        }.forEach { instruction ->
-            val index = method.implementation!!.instructions.indexOf(instruction)
-            val register = (instruction as OneRegisterInstruction).registerA
-
-            // inject the call to
-            method.removeInstruction(index)
-            method.addInstructions(
-                index, """
-                invoke-static {}, Lapp/revanced/integrations/patches/ForceCodecPatch;->get$name()Ljava/lang/String;
-                move-result-object v$register
-            """
-            )
-        }
-    }
-}