chore(release): 2.0.2 [skip ci]

## [2.0.2](https://github.com/revanced/revanced-patches/compare/v2.0.1...v2.0.2) (2022-06-27)

### Bug Fixes

* some more refactoring of integrations, add hide-watermark patch ([#63](https://github.com/revanced/revanced-patches/issues/63)) ([c5dfe3e](c5dfe3e842))

CHANGELOG.md

@@ -1,3 +1,18 @@
+## [2.0.2](https://github.com/revanced/revanced-patches/compare/v2.0.1...v2.0.2) (2022-06-27)
+
+
+### Bug Fixes
+
+* some more refactoring of integrations, add hide-watermark patch ([#63](https://github.com/revanced/revanced-patches/issues/63)) ([feb09c5](https://github.com/revanced/revanced-patches/commit/feb09c56f475e2537a67d3636b08737848158a8e))
+
+## [2.0.1](https://github.com/revanced/revanced-patches/compare/v2.0.0...v2.0.1) (2022-06-26)
+
+
+### Bug Fixes
+
+* invalid string in strings list ([f08b53b](https://github.com/revanced/revanced-patches/commit/f08b53b07d93bd8ac6e7da376ea6e6023e53076e))
+* migrate to new `proxy` api ([db32ffe](https://github.com/revanced/revanced-patches/commit/db32ffe56a8e73177bef724ee10eda9a28b367b8))
+
 # [2.0.0](https://github.com/revanced/revanced-patches/compare/v1.11.0...v2.0.0) (2022-06-26)
 
 

build.gradle.kts

@@ -22,7 +22,7 @@ repositories {
 dependencies {
     implementation(kotlin("stdlib"))
 
-    implementation("app.revanced:revanced-patcher:2.0.0")
+    implementation("app.revanced:revanced-patcher:2.0.1")
     implementation("app.revanced:multidexlib2:2.5.2.r2")
 }
 

gradle.properties

@@ -1,2 +1,2 @@
 kotlin.code.style = official
-version = 2.0.0
+version = 2.0.2

src/main/kotlin/app/revanced/patches/youtube/ad/general/bytecode/patch/GeneralBytecodeAdsPatch.kt

@@ -5,14 +5,13 @@ 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.data.impl.proxy
 import app.revanced.patcher.extensions.addInstructions
-import app.revanced.patcher.patch.annotations.Dependencies
-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.PatchResultError
 import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.annotations.Dependencies
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patcher.patch.impl.BytecodePatch
 import app.revanced.patcher.util.proxy.mutableTypes.MutableClass
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
 import app.revanced.patcher.util.smali.toInstructions
@@ -245,20 +244,20 @@ class GeneralBytecodeAdsPatch : BytecodePatch(
                                     val block1 = """
                                         invoke-static/range {p3}, $thisType->getTemplateName($templateNameParameterType)Ljava/lang/String;
                                         move-result-object v0
-                                    """.trimIndent().toInstructions(lithoMethod)
+                                    """.toInstructions(lithoMethod)
                                     val block2 = """
                                         move-object/from16 v1, p3
                                         iget-object v2, v1, $templateNameParameterType->b:Ljava/nio/ByteBuffer;
                                         invoke-static {v0, v2}, Lapp/revanced/integrations/patches/GeneralBytecodeAdsPatch;->containsAd(Ljava/lang/String;Ljava/nio/ByteBuffer;)Z
                                         move-result v1
-                                    """.trimIndent().toInstructions(lithoMethod)
+                                    """.toInstructions(lithoMethod)
                                     val block3 = """
                                         move-object/from16 v2, p1
                                         invoke-static {v2}, $descriptor1
                                         move-result-object v0
                                         iget-object v0, v0, $descriptor2
                                         return-object v0
-                                    """.trimIndent().toInstructions(lithoMethod)
+                                    """.toInstructions(lithoMethod)
 
                                     // insert blocks and branch instructions
                                     lithoMethodImplementation.insertBlocks(
@@ -369,7 +368,7 @@ class GeneralBytecodeAdsPatch : BytecodePatch(
             const v0, $lithoConstant
             invoke-static {p0, v0}, ${descriptors[1]}
             move-result-object p0
-        """.trimIndent().toInstructions()
+        """.toInstructions()
         val block2 = """
               invoke-static {p0}, ${descriptors[2]}
               move-result-object p0
@@ -377,12 +376,12 @@ class GeneralBytecodeAdsPatch : BytecodePatch(
               move-result-object v0
               invoke-static {v0}, ${this.type}->getIsEmpty(Ljava/lang/String;)Z
               move-result v0
-        """.trimIndent().toInstructions()
+        """.toInstructions()
         val block3 = """
               invoke-virtual {p0}, ${descriptors[3]}
               move-result-object p0
               return-object p0
-        """.trimIndent().toInstructions()
+        """.toInstructions()
 
         // create target instruction
         val targetInstruction = BuilderInstruction11n(Opcode.CONST_4, 1, 0)

src/main/kotlin/app/revanced/patches/youtube/layout/castbutton/patch/HideCastButtonPatch.kt

@@ -4,7 +4,6 @@ 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.data.impl.proxy
 import app.revanced.patcher.extensions.addInstructions
 import app.revanced.patcher.patch.annotations.Dependencies
 import app.revanced.patcher.patch.annotations.Patch

src/main/kotlin/app/revanced/patches/youtube/layout/fullscreenpanels/patch/FullscreenPanelsRemoverPatch.kt

@@ -4,7 +4,6 @@ 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.data.impl.proxy
 import app.revanced.patcher.extensions.addInstructions
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.patch.impl.BytecodePatch

src/main/kotlin/app/revanced/patches/youtube/layout/shorts/button/patch/ShortsButtonRemoverPatch.kt

@@ -38,6 +38,7 @@ class ShortsButtonRemoverPatch : BytecodePatch(
         val moveViewInstruction = buttonsViewImplementation.instructions[buttonsViewResult.patternScanResult!!.endIndex]
         val viewRegister = (moveViewInstruction as OneRegisterInstruction).registerA
 
+
         // Save the tab enum in XGlobals to avoid smali/register workarounds
         tabEnumResult.mutableMethod.addInstruction(
             tabEnumResult.patternScanResult!!.endIndex + 1,

src/main/kotlin/app/revanced/patches/youtube/layout/watermark/annotations/HideWaterwarkCompatibility.kt

@@ -0,0 +1,13 @@
+package app.revanced.patches.youtube.layout.watermark.annotations
+
+import app.revanced.patcher.annotation.Compatibility
+import app.revanced.patcher.annotation.Package
+
+@Compatibility(
+    [Package(
+        "com.google.android.youtube", arrayOf("17.24.34", "17.24.35")
+    )]
+)
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.RUNTIME)
+internal annotation class HideWatermarkCompatibility

src/main/kotlin/app/revanced/patches/youtube/layout/watermark/fingerprints/HideWatermarkFingerprint.kt

@@ -0,0 +1,21 @@
+package app.revanced.patches.youtube.layout.watermark.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.FuzzyPatternScanMethod
+import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patches.youtube.layout.watermark.annotations.HideWatermarkCompatibility
+import org.jf.dexlib2.AccessFlags
+
+@Name("hide-watermark-signature")
+@MatchingMethod(
+    "Ljvy;", "<init>"
+)
+@FuzzyPatternScanMethod(3)
+@HideWatermarkCompatibility
+@Version("0.0.1")
+object HideWatermarkFingerprint : MethodFingerprint (
+    "V", AccessFlags.PUBLIC or AccessFlags.FINAL, listOf("L", "L"), null ,null, null
+)

src/main/kotlin/app/revanced/patches/youtube/layout/watermark/fingerprints/HideWatermarkParentFingerprint.kt

@@ -0,0 +1,21 @@
+package app.revanced.patches.youtube.layout.watermark.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.FuzzyPatternScanMethod
+import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patches.youtube.layout.watermark.annotations.HideWatermarkCompatibility
+import org.jf.dexlib2.AccessFlags
+
+@Name("hide-watermark-parent-signature")
+@MatchingMethod(
+    "Ljvy;", "<init>"
+)
+@FuzzyPatternScanMethod(3)
+@HideWatermarkCompatibility
+@Version("0.0.1")
+object HideWatermarkParentFingerprint : MethodFingerprint (
+    "L", AccessFlags.PUBLIC or AccessFlags.FINAL, null, null, listOf("player_overlay_in_video_programming"), null
+)

src/main/kotlin/app/revanced/patches/youtube/layout/watermark/patch/HideWatermarkPatch.kt

@@ -0,0 +1,51 @@
+package app.revanced.patches.youtube.layout.watermark.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.utils.MethodFingerprintUtils.resolve
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultError
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.annotations.Dependencies
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patcher.patch.impl.BytecodePatch
+import app.revanced.patches.youtube.layout.watermark.annotations.HideWatermarkCompatibility
+import app.revanced.patches.youtube.layout.watermark.fingerprints.HideWatermarkParentFingerprint
+import app.revanced.patches.youtube.layout.watermark.fingerprints.HideWatermarkFingerprint
+import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
+
+@Patch
+@Dependencies(dependencies = [IntegrationsPatch::class])
+@Name("hide-watermark")
+@Description("Hide Watermark on the page.")
+@HideWatermarkCompatibility
+@Version("0.0.1")
+class HideWatermarkPatch : BytecodePatch(
+    listOf(
+        HideWatermarkParentFingerprint
+    )
+) {
+    override fun execute(data: BytecodeData): PatchResult {
+        HideWatermarkFingerprint.resolve(data, HideWatermarkParentFingerprint.result!!.classDef)
+        val result = HideWatermarkFingerprint.result
+            ?: return PatchResultError("Required parent method could not be found.")
+
+        val method = result.mutableMethod
+        val line = method.implementation!!.instructions.size - 5
+
+        method.removeInstruction(line)
+        method.addInstructions(
+            line, """
+            invoke-static {}, Lapp/revanced/integrations/patches/BrandingWaterMarkPatch;->isBrandingWatermarkShown()Z
+            move-result p2
+        """
+        )
+
+        return PatchResultSuccess()
+    }
+}

src/main/kotlin/app/revanced/patches/youtube/misc/integrations/patch/IntegrationsPatch.kt

@@ -28,7 +28,7 @@ class IntegrationsPatch : BytecodePatch(
     )
 ) {
     override fun execute(data: BytecodeData): PatchResult {
-        if (data.findClass("Lapp/revanced/integrations/utils/Globals") == null)
+        if (data.findClass("Lapp/revanced/integrations/utils/ReVancedUtils") == null)
             return PatchResultError("Integrations have not been merged yet. This patch can not succeed without the integrations.")
 
         val result = InitFingerprint.result!!
@@ -40,7 +40,7 @@ class IntegrationsPatch : BytecodePatch(
         method.addInstructions(
             0, """
                   invoke-static {v$count}, Lapp/revanced/integrations/sponsorblock/StringRef;->setContext(Landroid/content/Context;)V
-                  sput-object v$count, Lapp/revanced/integrations/utils/Globals;->context:Landroid/content/Context;
+                  sput-object v$count, Lapp/revanced/integrations/utils/ReVancedUtils;->context:Landroid/content/Context;
             """
         )
 
@@ -56,10 +56,10 @@ class IntegrationsPatch : BytecodePatch(
                 null,
                 ImmutableMethodImplementation(
                     1, """
-                        invoke-static { }, Lapp/revanced/integrations/utils/Globals;->getAppContext()Landroid/content/Context;
+                        invoke-static { }, Lapp/revanced/integrations/utils/ReVancedUtils;->getAppContext()Landroid/content/Context;
                         move-result-object v0
                         return-object v0
-                    """.trimIndent().toInstructions(), null, null
+                    """.toInstructions(), null, null
                 )
             ).toMutable()
         )

src/main/kotlin/app/revanced/patches/youtube/misc/mapping/patch/ResourceIdMappingProviderResourcePatch.kt

@@ -5,9 +5,9 @@ import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.data.impl.ResourceData
-import app.revanced.patcher.patch.impl.ResourcePatch
 import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.impl.ResourcePatch
 import org.w3c.dom.Element
 
 @Name("resource-id-mapping-provider-resource-patch-dependency")
@@ -20,7 +20,7 @@ class ResourceIdMappingProviderResourcePatch : ResourcePatch() {
     }
 
     override fun execute(data: ResourceData): PatchResult {
-        data.getXmlEditor("res/values/public.xml").use { editor ->
+        data.xmlEditor["res/values/public.xml"].use { editor ->
             resourceMappings = buildMap {
                 editor.file.documentElement.doRecursively { node ->
                     if (node !is Element) return@doRecursively

src/main/kotlin/app/revanced/patches/youtube/misc/microg/fingerprints/IntegrityCheckFingerprint.kt

@@ -78,5 +78,5 @@ object IntegrityCheckFingerprint : MethodFingerprint(
         Opcode.CONST_STRING,
         Opcode.GOTO,
         Opcode.NEW_ARRAY
-    ), listOf("This should never happen.", "GooglePlayServicesUtil", "Google Play Store fingerprint invalid.")
+    ), listOf("This should never happen.", "GooglePlayServicesUtil", "Google Play Store signature invalid.")
 )

src/main/kotlin/app/revanced/patches/youtube/misc/microg/patch/bytecode/MicroGBytecodePatch.kt

@@ -5,7 +5,6 @@ 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.data.impl.proxy
 import app.revanced.patcher.extensions.addInstructions
 import app.revanced.patcher.extensions.replaceInstruction
 import app.revanced.patcher.patch.annotations.Dependencies
@@ -14,7 +13,6 @@ import app.revanced.patcher.patch.impl.BytecodePatch
 import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.util.proxy.mutableTypes.MutableClass
-import app.revanced.patcher.util.smali.toInstruction
 import app.revanced.patches.youtube.layout.castbutton.patch.HideCastButtonPatch
 import app.revanced.patches.youtube.misc.manifest.patch.FixLocaleConfigErrorPatch
 import app.revanced.patches.youtube.misc.microg.annotations.MicroGPatchCompatibility

src/main/kotlin/app/revanced/patches/youtube/misc/microg/patch/resource/MicroGResourcePatch.kt

@@ -4,10 +4,9 @@ import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.data.impl.ResourceData
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patcher.patch.impl.ResourcePatch
 import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.impl.ResourcePatch
 import app.revanced.patches.youtube.misc.microg.annotations.MicroGPatchCompatibility
 import app.revanced.patches.youtube.misc.microg.shared.Constants.BASE_MICROG_PACKAGE_NAME
 import app.revanced.patches.youtube.misc.microg.shared.Constants.REVANCED_APP_NAME
@@ -19,7 +18,7 @@ import app.revanced.patches.youtube.misc.microg.shared.Constants.REVANCED_PACKAG
 @Version("0.0.1")
 class MicroGResourcePatch : ResourcePatch() {
     override fun execute(data: ResourceData): PatchResult {
-        data.getXmlEditor("res/xml/settings_fragment.xml").use {
+        data.xmlEditor["res/xml/settings_fragment.xml"].use {
             val settingsElementIntent = it.file.createElement("intent")
             settingsElementIntent.setAttribute("android:targetPackage", "$BASE_MICROG_PACKAGE_NAME.android.gms")
             settingsElementIntent.setAttribute("android:targetClass", "org.microg.gms.ui.SettingsActivity")