chore(release): 2.78.0 [skip ci]

# [2.78.0](https://github.com/revanced/revanced-patches/compare/v2.77.1...v2.78.0) (2022-10-02)

### Features

* **youtube/general-ads:** check for ad in identifier ([fe6f3bd](9166024b01))

CHANGELOG.md

@@ -1,3 +1,59 @@
+# [2.78.0](https://github.com/revanced/revanced-patches/compare/v2.77.1...v2.78.0) (2022-10-02)
+
+
+### Features
+
+* **youtube/general-ads:** check for ad in identifier ([fd0506e](https://github.com/revanced/revanced-patches/commit/fd0506eb95dbf398eb7d6bfa8732f517b9867545))
+
+## [2.77.1](https://github.com/revanced/revanced-patches/compare/v2.77.0...v2.77.1) (2022-10-01)
+
+
+### Bug Fixes
+
+* **tiktok/tiktok-downloads:** add missing patch dependencies ([#686](https://github.com/revanced/revanced-patches/issues/686)) ([5c3b4ed](https://github.com/revanced/revanced-patches/commit/5c3b4ed0530e89d50db3b5bb9893e1ef4b463bae))
+
+# [2.77.0](https://github.com/revanced/revanced-patches/compare/v2.76.3...v2.77.0) (2022-10-01)
+
+
+### Features
+
+* **youtube/hdr-auto-brightness:** increase strength of fingerprint ([2379b58](https://github.com/revanced/revanced-patches/commit/2379b5892b3505c8780f475bbc56f520613fa31d))
+
+## [2.76.3](https://github.com/revanced/revanced-patches/compare/v2.76.2...v2.76.3) (2022-10-01)
+
+
+### Performance Improvements
+
+* **general-ads:** hook pathBuilder ([b9bad0b](https://github.com/revanced/revanced-patches/commit/b9bad0bb922bbd44ddf2acbfae87243beb28851a))
+
+## [2.76.2](https://github.com/revanced/revanced-patches/compare/v2.76.1...v2.76.2) (2022-09-30)
+
+
+### Bug Fixes
+
+* **twitter/monochrome-icon:** add missing `File.write` call ([#682](https://github.com/revanced/revanced-patches/issues/682)) ([de22e3f](https://github.com/revanced/revanced-patches/commit/de22e3f03ef1d6db08f9446f02e687721d9017d7))
+
+## [2.76.1](https://github.com/revanced/revanced-patches/compare/v2.76.0...v2.76.1) (2022-09-30)
+
+
+### Bug Fixes
+
+* **disable-startup-shorts-player:** remove redundant opcode pattern ([#679](https://github.com/revanced/revanced-patches/issues/679)) ([5197a24](https://github.com/revanced/revanced-patches/commit/5197a24cc5ecc1b51cdc5c00c77c873b86394994))
+
+# [2.76.0](https://github.com/revanced/revanced-patches/compare/v2.75.2...v2.76.0) (2022-09-30)
+
+
+### Features
+
+* bump YouTube Music patches compatibility to v5.26.52 ([#681](https://github.com/revanced/revanced-patches/issues/681)) ([f195734](https://github.com/revanced/revanced-patches/commit/f195734925dd41596d058f9cbf2b7e619a8d5833))
+
+## [2.75.2](https://github.com/revanced/revanced-patches/compare/v2.75.1...v2.75.2) (2022-09-30)
+
+
+### Bug Fixes
+
+* **twitter patches.:** use wider compatible Java API for writing to file ([#678](https://github.com/revanced/revanced-patches/issues/678)) ([4448de8](https://github.com/revanced/revanced-patches/commit/4448de80a6277862d81c7a29b9489e4fbec48496))
+
 ## [2.75.1](https://github.com/revanced/revanced-patches/compare/v2.75.0...v2.75.1) (2022-09-29)
 
 

README.md

@@ -82,16 +82,16 @@ The official Patch bundle provided by ReVanced and the community.
 
 | 💊 Patch | 📜 Description | 🏹 Target Version |
 |:--------:|:--------------:|:-----------------:|
-| `exclusive-audio-playback` | Enables the option to play music without video. | 5.25.51 |
+| `exclusive-audio-playback` | Enables the option to play music without video. | 5.26.52 |
-| `codecs-unlock` | Adds more audio codec options. The new audio codecs usually result in better audio quality. | 5.25.51 |
+| `codecs-unlock` | Adds more audio codec options. The new audio codecs usually result in better audio quality. | 5.26.52 |
-| `music-microg-support` | Allows YouTube Music ReVanced to run without root and under a different package name. | 5.25.51 |
+| `music-microg-support` | Allows YouTube Music ReVanced to run without root and under a different package name. | 5.26.52 |
-| `music-video-ads` | Removes ads in the music player. | 5.25.51 |
+| `music-video-ads` | Removes ads in the music player. | 5.26.52 |
-| `tasteBuilder-remover` | Removes the "Tell us which artists you like" card from the home screen. | 5.25.51 |
+| `tasteBuilder-remover` | Removes the "Tell us which artists you like" card from the home screen. | 5.26.52 |
-| `minimized-playback-music` | Enables minimized playback on Kids music. | 5.25.51 |
+| `minimized-playback-music` | Enables minimized playback on Kids music. | 5.26.52 |
-| `compact-header` | Hides the music category bar at the top of the homepage. | 5.25.51 |
+| `compact-header` | Hides the music category bar at the top of the homepage. | 5.26.52 |
-| `upgrade-button-remover` | Removes the upgrade tab from the pivot bar. | 5.25.51 |
+| `upgrade-button-remover` | Removes the upgrade tab from the pivot bar. | 5.26.52 |
-| `hide-get-premium` | Removes all "Get Premium" evidences from the avatar menu. | 5.25.51 |
+| `hide-get-premium` | Removes all "Get Premium" evidences from the avatar menu. | 5.26.52 |
-| `background-play` | Enables playing music in the background. | 5.25.51 |
+| `background-play` | Enables playing music in the background. | 5.26.52 |
 </details>
 
 ### 📦 `com.google.android.youtube`

gradle.properties

@@ -1,2 +1,2 @@
 kotlin.code.style = official
-version = 2.75.1
+version = 2.78.0

src/main/kotlin/app/revanced/patches/music/ad/video/annotations/MusicVideoAdsCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.apps.youtube.music", arrayOf("5.14.53", "5.16.51", "5.17.51", "5.21.52", "5.22.54", "5.23.50","5.25.51")
+        "com.google.android.apps.youtube.music", arrayOf("5.14.53", "5.16.51", "5.17.51", "5.21.52", "5.22.54", "5.23.50", "5.25.51", "5.25.52", "5.26.52")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/music/audio/codecs/annotations/CodecsUnlockCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.apps.youtube.music", arrayOf("5.14.53", "5.16.51", "5.17.51", "5.21.52", "5.22.54", "5.23.50","5.25.51")
+        "com.google.android.apps.youtube.music", arrayOf("5.14.53", "5.16.51", "5.17.51", "5.21.52", "5.22.54", "5.23.50", "5.25.51", "5.25.52", "5.26.52")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/music/audio/exclusiveaudio/annotations/ExclusiveAudioCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.apps.youtube.music", arrayOf("5.14.53", "5.16.51", "5.17.51", "5.21.52", "5.22.54", "5.23.50","5.25.51")
+        "com.google.android.apps.youtube.music", arrayOf("5.14.53", "5.16.51", "5.17.51", "5.21.52", "5.22.54", "5.23.50", "5.25.51", "5.25.52", "5.26.52")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/music/layout/compactheader/annotations/CompactHeaderCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.apps.youtube.music", arrayOf("5.14.53", "5.16.51", "5.21.52", "5.22.54", "5.23.50","5.25.51")
+        "com.google.android.apps.youtube.music", arrayOf("5.14.53", "5.16.51", "5.21.52", "5.22.54", "5.23.50", "5.25.51", "5.25.52", "5.26.52")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/music/layout/minimizedplayback/annotations/MinimizedPlaybackCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.apps.youtube.music", arrayOf("5.14.53", "5.16.51", "5.17.51", "5.21.52", "5.22.54", "5.23.50","5.25.51")
+        "com.google.android.apps.youtube.music", arrayOf("5.14.53", "5.16.51", "5.17.51", "5.21.52", "5.22.54", "5.23.50", "5.25.51", "5.25.52", "5.26.52")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/music/layout/premium/annotations/HideGetPremiumCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.apps.youtube.music", arrayOf("5.14.53", "5.16.51", "5.17.51", "5.21.52", "5.22.54", "5.23.50","5.25.51")
+        "com.google.android.apps.youtube.music", arrayOf("5.14.53", "5.16.51", "5.17.51", "5.21.52", "5.22.54", "5.23.50", "5.25.51", "5.25.52", "5.26.52")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/music/layout/tastebuilder/annotations/RemoveTasteBuilderCompatibility.kt

@@ -10,7 +10,7 @@ import app.revanced.patcher.annotation.Package
  */
 @Compatibility(
     [Package(
-        "com.google.android.apps.youtube.music", arrayOf("5.21.52", "5.22.54", "5.23.50","5.25.51")
+        "com.google.android.apps.youtube.music", arrayOf("5.21.52", "5.22.54", "5.23.50", "5.25.51", "5.25.52", "5.26.52")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/music/layout/upgradebutton/annotations/RemoveUpgradeButtonCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.apps.youtube.music", arrayOf("5.14.53", "5.16.51", "5.17.51", "5.21.52", "5.22.54", "5.23.50","5.25.51")
+        "com.google.android.apps.youtube.music", arrayOf("5.14.53", "5.16.51", "5.17.51", "5.21.52", "5.22.54", "5.23.50", "5.25.51", "5.25.52", "5.26.52")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/music/misc/microg/annotations/MusicMicroGPatchCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.apps.youtube.music", arrayOf("5.14.53", "5.16.51", "5.17.51", "5.21.52", "5.22.54", "5.23.50","5.25.51")
+        "com.google.android.apps.youtube.music", arrayOf("5.14.53", "5.16.51", "5.17.51", "5.21.52", "5.22.54", "5.23.50", "5.25.51", "5.25.52", "5.26.52")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/music/premium/backgroundplay/annotations/BackgroundPlayCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.apps.youtube.music", arrayOf("5.14.53", "5.16.51", "5.17.51", "5.21.52", "5.22.54", "5.23.50","5.25.51")
+        "com.google.android.apps.youtube.music", arrayOf("5.14.53", "5.16.51", "5.17.51", "5.21.52", "5.22.54", "5.23.50", "5.25.51", "5.25.52", "5.26.52")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/tiktok/interaction/downloads/patch/DownloadsPatch.kt

@@ -12,6 +12,7 @@ import app.revanced.patcher.extensions.replaceInstructions
 import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultError
 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
@@ -20,13 +21,16 @@ import app.revanced.patches.tiktok.interaction.downloads.fingerprints.ACLCommonS
 import app.revanced.patches.tiktok.interaction.downloads.fingerprints.ACLCommonShareFingerprint2
 import app.revanced.patches.tiktok.interaction.downloads.fingerprints.ACLCommonShareFingerprint3
 import app.revanced.patches.tiktok.interaction.downloads.fingerprints.DownloadPathParentFingerprint
+import app.revanced.patches.tiktok.misc.integrations.patch.TikTokIntegrationsPatch
 import app.revanced.patches.tiktok.misc.settings.fingerprints.SettingsStatusLoadFingerprint
+import app.revanced.patches.tiktok.misc.settings.patch.TikTokSettingsPatch
 import org.jf.dexlib2.Opcode
 import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
 import org.jf.dexlib2.iface.instruction.ReferenceInstruction
 import org.jf.dexlib2.iface.reference.StringReference
 
 @Patch
+@DependsOn([TikTokIntegrationsPatch::class, TikTokSettingsPatch::class])
 @Name("tiktok-download")
 @Description("Removes download restrictions and changes the default path to download to.")
 @DownloadsCompatibility

src/main/kotlin/app/revanced/patches/twitter/misc/dynamiccolor/patch/DynamicColorPatch.kt

@@ -10,6 +10,7 @@ import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.patch.impl.ResourcePatch
 import app.revanced.patches.twitter.misc.dynamiccolor.annotations.DynamicColorCompatibility
+import java.io.FileWriter
 import java.nio.file.Files
 
 @Patch
@@ -28,16 +29,13 @@ class DynamicColorPatch : ResourcePatch() {
         val valuesNightV31Directory = resDirectory.resolve("values-night-v31")
         if (!valuesNightV31Directory.isDirectory) Files.createDirectories(valuesNightV31Directory.toPath())
 
-        listOf(valuesV31Directory, valuesNightV31Directory).forEach {
+        listOf(valuesV31Directory, valuesNightV31Directory).forEach { it ->
             val colorsXml = it.resolve("colors.xml")
 
             if(!colorsXml.exists()) {
-                Files.writeString(
+                FileWriter(colorsXml).use {
-                    colorsXml.toPath(),
+                    it.write("<?xml version=\"1.0\" encoding=\"utf-8\"?><resources></resources>")
-                    "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n" +
+                }
-                            "<resources>\n" +
-                            "</resources>"
-                )
             }
         }
 

src/main/kotlin/app/revanced/patches/twitter/misc/monochrome/patch/MonochromeIconPatch.kt

@@ -3,7 +3,6 @@ package app.revanced.patches.twitter.misc.monochrome.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.DomFileEditor
 import app.revanced.patcher.data.impl.ResourceData
 import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultError
@@ -11,6 +10,7 @@ import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.patch.impl.ResourcePatch
 import app.revanced.patches.twitter.misc.monochrome.annotations.MonochromeIconCompatibility
+import java.io.FileWriter
 import java.nio.file.Files
 
 @Patch
@@ -26,27 +26,29 @@ class MonochromeIconPatch : ResourcePatch() {
         val mipmapV33Directory = resDirectory.resolve("mipmap-anydpi-v33")
         if (!mipmapV33Directory.isDirectory) Files.createDirectories(mipmapV33Directory.toPath())
 
-        Files.writeString(
+        FileWriter(mipmapV33Directory.resolve("ic_launcher_twitter.xml")).use {
-            mipmapV33Directory.resolve("ic_launcher_twitter.xml").toPath(),
+            it.write(
-            "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n" +
+                "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n" +
-            "<adaptive-icon\n" +
+                        "<adaptive-icon\n" +
-            "  xmlns:android=\"http://schemas.android.com/apk/res/android\">\n" +
+                        "  xmlns:android=\"http://schemas.android.com/apk/res/android\">\n" +
-            "    <background android:drawable=\"@color/ic_launcher_background\" />\n" +
+                        "    <background android:drawable=\"@color/ic_launcher_background\" />\n" +
-            "    <foreground android:drawable=\"@mipmap/ic_launcher_twitter_foreground\" />\n" +
+                        "    <foreground android:drawable=\"@mipmap/ic_launcher_twitter_foreground\" />\n" +
-            "    <monochrome android:drawable=\"@mipmap/ic_launcher_twitter_foreground\" />\n" +
+                        "    <monochrome android:drawable=\"@mipmap/ic_launcher_twitter_foreground\" />\n" +
-            "</adaptive-icon>"
+                        "</adaptive-icon>"
-        )
+            )
+        }
 
-        Files.writeString(
+        FileWriter(mipmapV33Directory.resolve("ic_launcher_twitter_round.xml")).use {
-            mipmapV33Directory.resolve("ic_launcher_twitter_round.xml").toPath(),
+            it.write(
-            "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n" +
+                "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n" +
-            "<adaptive-icon\n" +
+                        "<adaptive-icon\n" +
-            "  xmlns:android=\"http://schemas.android.com/apk/res/android\">\n" +
+                        "  xmlns:android=\"http://schemas.android.com/apk/res/android\">\n" +
-            "    <background android:drawable=\"@color/ic_launcher_background\" />\n" +
+                        "    <background android:drawable=\"@color/ic_launcher_background\" />\n" +
-            "    <foreground android:drawable=\"@mipmap/ic_launcher_twitter_foreground\" />\n" +
+                        "    <foreground android:drawable=\"@mipmap/ic_launcher_twitter_foreground\" />\n" +
-            "    <monochrome android:drawable=\"@mipmap/ic_launcher_twitter_foreground\" />\n" +
+                        "    <monochrome android:drawable=\"@mipmap/ic_launcher_twitter_foreground\" />\n" +
-            "</adaptive-icon>"
+                        "</adaptive-icon>"
-        )
+            )
+        }
 
         return PatchResultSuccess()
     }

src/main/kotlin/app/revanced/patches/youtube/ad/general/bytecode/extensions/MethodExtensions.kt

@@ -1,12 +1,8 @@
 package app.revanced.patches.youtube.ad.general.bytecode.extensions
 
-import app.revanced.patcher.extensions.addInstructions
 import app.revanced.patcher.extensions.softCompareTo
 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.builder.BuilderInstruction
-import org.jf.dexlib2.builder.MutableMethodImplementation
 import org.jf.dexlib2.iface.Method
 import org.jf.dexlib2.iface.instruction.Instruction
 import org.jf.dexlib2.iface.instruction.ReferenceInstruction
@@ -16,21 +12,6 @@ import org.jf.dexlib2.iface.reference.Reference
 import org.jf.dexlib2.immutable.reference.ImmutableMethodReference
 
 internal object MethodExtensions {
-    internal fun MutableMethodImplementation.insertBlocks(
-        startIndex: Int,
-        vararg blocks: List<BuilderInstruction>,
-    ) {
-        blocks.reversed().forEach {
-            this.addInstructions(
-                startIndex, it
-            )
-        }
-    }
-
-    internal fun MutableClass.addMethod(mutableMethod: MutableMethod) {
-        this.methods.add(mutableMethod)
-    }
-
     internal fun MutableClass.findMutableMethodOf(
         method: Method
     ) = this.methods.first {

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

@@ -6,6 +6,9 @@ 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.instruction
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
 import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultError
 import app.revanced.patcher.patch.PatchResultSuccess
@@ -14,23 +17,18 @@ 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
+import app.revanced.patcher.util.smali.ExternalLabel
 import app.revanced.patches.youtube.ad.general.annotation.GeneralAdsCompatibility
-import app.revanced.patches.youtube.ad.general.bytecode.extensions.MethodExtensions.addMethod
 import app.revanced.patches.youtube.ad.general.bytecode.extensions.MethodExtensions.findMutableMethodOf
-import app.revanced.patches.youtube.ad.general.bytecode.extensions.MethodExtensions.insertBlocks
 import app.revanced.patches.youtube.ad.general.bytecode.extensions.MethodExtensions.toDescriptor
-import app.revanced.patches.youtube.ad.general.bytecode.utils.MethodUtils.createMutableMethod
 import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
 import app.revanced.patches.youtube.misc.mapping.patch.ResourceMappingResourcePatch
 import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
 import app.revanced.patches.youtube.misc.settings.framework.components.impl.StringResource
 import app.revanced.patches.youtube.misc.settings.framework.components.impl.SwitchPreference
 import org.jf.dexlib2.Opcode
-import org.jf.dexlib2.builder.MutableMethodImplementation
+import org.jf.dexlib2.builder.instruction.BuilderInstruction10x
-import org.jf.dexlib2.builder.instruction.*
+import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
-import org.jf.dexlib2.iface.MethodImplementation
-import org.jf.dexlib2.iface.instruction.ReferenceInstruction
 import org.jf.dexlib2.iface.instruction.formats.Instruction21c
 import org.jf.dexlib2.iface.instruction.formats.Instruction22c
 import org.jf.dexlib2.iface.instruction.formats.Instruction31i
@@ -38,7 +36,6 @@ import org.jf.dexlib2.iface.instruction.formats.Instruction35c
 import org.jf.dexlib2.iface.reference.FieldReference
 import org.jf.dexlib2.iface.reference.MethodReference
 import org.jf.dexlib2.iface.reference.StringReference
-import org.jf.dexlib2.immutable.reference.ImmutableMethodReference
 
 @Patch
 @DependsOn([ResourceMappingResourcePatch::class, IntegrationsPatch::class, SettingsPatch::class])
@@ -170,13 +167,6 @@ class GeneralBytecodeAdsPatch : BytecodePatch() {
                 StringResource("revanced_adremover_paid_content_enabled_summary_on", "Paid content is hidden"),
                 StringResource("revanced_adremover_paid_content_enabled_summary_off", "Paid content is shown")
             ),
-            SwitchPreference(
-                "revanced_adremover_suggested",
-                StringResource("revanced_adremover_suggested_enabled_title", "Remove personal suggestions"),
-                true,
-                StringResource("revanced_adremover_suggested_enabled_summary_on", "Personal suggestions are hidden"),
-                StringResource("revanced_adremover_suggested_enabled_summary_off", "Personal suggestions are shown")
-            ),
             SwitchPreference(
                 "revanced_adremover_hide_suggestions",
                 StringResource("revanced_adremover_hide_suggestions_enabled_title", "Hide suggestions"),
@@ -329,72 +319,54 @@ class GeneralBytecodeAdsPatch : BytecodePatch() {
                                 }
 
                                 stringReferences[2] -> { // Litho ads
-                                    // create proxied method.
                                     val proxy = data.proxy(classDef)
                                     val proxiedClass = proxy.resolve()
 
-                                    // add getIsEmpty method
-                                    proxiedClass.addGetIsEmptyMethod()
-
-                                    // get required method to patch and get references from
                                     val lithoMethod = getLithoMethod(proxiedClass)
-                                        ?: return PatchResultError("Could not find required litho method to patch.")
+                                        ?: return PatchResultError("Could not find required Litho method to patch.")
-                                    val lithoMethodImplementation = lithoMethod.implementation!!
 
-                                    // create and add getTemplateName method
+                                    val instructionWithNeededDescriptor =
-                                    val getTemplateMethod =
+                                        lithoMethod.implementation!!.instructions.indexOfFirst {
-                                        proxiedClass.createGetTemplateNameMethod(lithoMethodImplementation)
+                                            it.opcode == Opcode.INVOKE_STATIC_RANGE
-                                    proxiedClass.addMethod(getTemplateMethod)
+                                        }
 
-                                    val lithoInstructions = lithoMethodImplementation.instructions
+                                    // get required descriptors
-                                    val thisType = proxiedClass.type
+                                    val createEmptyComponentDescriptor =
-                                    val templateNameParameterType = getTemplateMethod.parameterTypes.first()
+                                        lithoMethod.instruction(instructionWithNeededDescriptor)
+                                            .toDescriptor<MethodReference>()
+                                    val emptyComponentFieldDescriptor =
+                                        lithoMethod.instruction(instructionWithNeededDescriptor + 2)
+                                            .toDescriptor<FieldReference>()
 
-                                    // get reference descriptors
+                                    val pathBuilderAnchorFingerprint = object : MethodFingerprint(
-                                    val indexOfReference1 = lithoInstructions.indexOfFirst {
+                                        opcodes = listOf(
-                                        it.opcode == Opcode.INVOKE_STATIC_RANGE
+                                            Opcode.CONST_16,
-                                    }
+                                            Opcode.INVOKE_VIRTUAL,
-                                    val descriptor1 =
+                                            Opcode.IPUT_OBJECT
-                                        lithoInstructions.elementAt(indexOfReference1).toDescriptor<MethodReference>()
+                                        )
-                                    val descriptor2 = lithoInstructions.elementAt(indexOfReference1 + 2)
+                                    ) {}
-                                        .toDescriptor<FieldReference>()
 
-                                    // create label
+                                    val pathBuilderScanResult = pathBuilderAnchorFingerprint.also {
-                                    val lithoRemoveLabel = lithoMethodImplementation.newLabelForIndex(0)
+                                        it.resolve(data, lithoMethod, classDef)
+                                    }.result!!.scanResult.patternScanResult!!
 
-                                    // create branch instructions
+                                    val clobberedRegister =
-                                    val ifEqzFirstInstruction =
+                                        (lithoMethod.instruction(pathBuilderScanResult.startIndex) as OneRegisterInstruction).registerA
-                                        BuilderInstruction21t(Opcode.IF_EQZ, 0, lithoRemoveLabel)
-                                    val ifEqzSecondInstruction =
-                                        BuilderInstruction21t(Opcode.IF_EQZ, 1, lithoRemoveLabel)
 
-                                    // create blocks
+                                    val insertIndex = pathBuilderScanResult.endIndex + 1
-                                    val block1 = """
+                                    lithoMethod.addInstructions(
-                                        invoke-static/range {p3}, $thisType->getTemplateName($templateNameParameterType)Ljava/lang/String;
+                                        insertIndex, // right after setting the component.pathBuilder field,
-                                        move-result-object v0
+                                        """
-                                    """.toInstructions(lithoMethod)
+                                                invoke-static {v5, v2}, Lapp/revanced/integrations/patches/GeneralBytecodeAdsPatch;->isAdComponent(Ljava/lang/StringBuilder;Ljava/lang/String;)Z
-                                    val block2 = """
+                                                move-result v$clobberedRegister
-                                        move-object/from16 v1, p3
+                                                if-eqz v$clobberedRegister, :not_an_ad
-                                        iget-object v2, v1, $templateNameParameterType->b:Ljava/nio/ByteBuffer;
+                                                move-object/from16 v2, p1
-                                        invoke-static {v0, v2}, Lapp/revanced/integrations/patches/GeneralBytecodeAdsPatch;->containsAd(Ljava/lang/String;Ljava/nio/ByteBuffer;)Z
+                                                invoke-static {v2}, $createEmptyComponentDescriptor
-                                        move-result v1
+                                                move-result-object v0
-                                    """.toInstructions(lithoMethod)
+                                                iget-object v0, v0, $emptyComponentFieldDescriptor
-                                    val block3 = """
+                                                return-object v0
-                                        move-object/from16 v2, p1
+                                            """,
-                                        invoke-static {v2}, $descriptor1
+                                        listOf(ExternalLabel("not_an_ad", lithoMethod.instruction(insertIndex)))
-                                        move-result-object v0
-                                        iget-object v0, v0, $descriptor2
-                                        return-object v0
-                                    """.toInstructions(lithoMethod)
-
-                                    // insert blocks and branch instructions
-                                    lithoMethodImplementation.insertBlocks(
-                                        0,
-                                        block1,
-                                        listOf(ifEqzFirstInstruction),
-                                        block2,
-                                        listOf(ifEqzSecondInstruction),
-                                        block3,
                                     )
                                 }
                             }
@@ -414,142 +386,4 @@ class GeneralBytecodeAdsPatch : BytecodePatch() {
             instruction.opcode == Opcode.CONST && (instruction as Instruction31i).narrowLiteral == lithoConstant
         } ?: false
     }
-
-    private fun MutableClass.addGetIsEmptyMethod() {
-        val getIsEmptyImplementation = MutableMethodImplementation(1)
-
-        // create target instructions
-        val firstTargetInstruction = BuilderInstruction11n(Opcode.CONST_4, 0, 1)
-        val secondTargetInstruction = BuilderInstruction11n(Opcode.CONST_4, 0, 0)
-
-        // add instructions to the instruction list
-        getIsEmptyImplementation.addInstructions(
-            0, listOf(
-                // BuilderInstruction21t(Opcode.IF_EQZ, 0, first),
-                BuilderInstruction35c(
-                    Opcode.INVOKE_VIRTUAL,
-                    1,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    ImmutableMethodReference("Ljava/lang/String;", "isEmpty", null, "Z")
-                ),
-                BuilderInstruction11x(Opcode.MOVE_RESULT, 0),
-                // BuilderInstruction21t(Opcode.IF_EQZ, 0, second),
-                // BuilderInstruction10t(Opcode.GOTO, first),
-                secondTargetInstruction,
-                BuilderInstruction11x(Opcode.RETURN, 0),
-                firstTargetInstruction,
-                BuilderInstruction11x(Opcode.RETURN, 0),
-            )
-        )
-
-        val getIsEmptyInstructions = getIsEmptyImplementation.instructions
-
-        // create labels for the target instructions
-        val firstLabel =
-            getIsEmptyImplementation.newLabelForIndex(getIsEmptyInstructions.indexOf(firstTargetInstruction))
-        val secondLabel =
-            getIsEmptyImplementation.newLabelForIndex(getIsEmptyInstructions.indexOf(secondTargetInstruction))
-
-        // create branch instructions to the labels
-        val ifEqzFirstInstruction = BuilderInstruction21t(Opcode.IF_EQZ, 0, firstLabel)
-        val ifEqzSecondInstruction = BuilderInstruction21t(Opcode.IF_EQZ, 0, secondLabel)
-        val gotoInstruction = BuilderInstruction10t(Opcode.GOTO, firstLabel)
-
-        // insert remaining branch instructions, order of adding those instructions is important
-        getIsEmptyImplementation.addInstructions(
-            2, listOf(
-                ifEqzSecondInstruction, gotoInstruction
-            )
-        )
-        getIsEmptyImplementation.addInstruction(
-            0, ifEqzFirstInstruction
-        )
-
-        this.addMethod(
-            createMutableMethod(
-                this.type, "getIsEmpty", "Z", "Ljava/lang/String;", getIsEmptyImplementation
-            )
-        )
-    }
-
-    private fun MutableClass.createGetTemplateNameMethod(lithoMethodImplementation: MethodImplementation): MutableMethod {
-        var counter = 1
-        val descriptors = buildList {
-            for (instruction in lithoMethodImplementation.instructions) {
-                if (instruction !is ReferenceInstruction) continue
-                if (counter++ > 4) break
-
-                add(instruction.toDescriptor<MethodReference>())
-            }
-        }
-
-        val getTemplateNameImplementation = MutableMethodImplementation(2)
-
-        // create code blocks
-        val block1 = """
-            invoke-virtual {p0}, ${descriptors[0]}
-            move-result-object p0
-            const v0, $lithoConstant
-            invoke-static {p0, v0}, ${descriptors[1]}
-            move-result-object p0
-        """.toInstructions()
-        val block2 = """
-              invoke-static {p0}, ${descriptors[2]}
-              move-result-object p0
-              invoke-virtual {p0}, ${descriptors[3]}
-              move-result-object v0
-              invoke-static {v0}, ${this.type}->getIsEmpty(Ljava/lang/String;)Z
-              move-result v0
-        """.toInstructions()
-        val block3 = """
-              invoke-virtual {p0}, ${descriptors[3]}
-              move-result-object p0
-              return-object p0
-        """.toInstructions()
-
-        // create target instruction
-        val targetInstruction = BuilderInstruction11n(Opcode.CONST_4, 1, 0)
-        // and remaining instruction
-        val returnInstruction = BuilderInstruction11x(Opcode.RETURN_OBJECT, 1)
-
-        // insert blocks and instructions
-        getTemplateNameImplementation.insertBlocks(
-            0,
-            block1,
-            block2,
-            block3,
-            listOf(
-                targetInstruction, returnInstruction
-            ),
-        )
-
-        // create label for target instruction
-        val targetInstructionLabel =
-            getTemplateNameImplementation.newLabelForIndex(getTemplateNameImplementation.instructions.size - 2)
-
-        // create branch instructions to the label
-        val ifEqzInstruction = BuilderInstruction21t(Opcode.IF_EQZ, 1, targetInstructionLabel)
-        val ifNezInstruction = BuilderInstruction21t(Opcode.IF_NEZ, 0, targetInstructionLabel)
-
-        // insert branch instructions
-        getTemplateNameImplementation.addInstruction(
-            block1.size, ifEqzInstruction
-        )
-        getTemplateNameImplementation.addInstruction(
-            block1.size + block2.size + 1, ifNezInstruction
-        )
-
-        // create the method
-        return createMutableMethod(
-            this.type,
-            "getTemplateName",
-            "Ljava/lang/String;",
-            descriptors[0].split("->")[0], // a bit weird to get the type this way,
-            getTemplateNameImplementation
-        )
-    }
 }

src/main/kotlin/app/revanced/patches/youtube/layout/startupshortsreset/fingerprints/ActionOpenShortsFingerprint.kt

@@ -14,27 +14,6 @@ import org.jf.dexlib2.Opcode
 @StartupShortsResetCompatibility
 @Version("0.0.1")
 object ActionOpenShortsFingerprint : MethodFingerprint(
-    "V", AccessFlags.PUBLIC or AccessFlags.FINAL, listOf("L", "L"), listOf(
+    "V", AccessFlags.PUBLIC or AccessFlags.FINAL, listOf("L", "L"),
-        Opcode.IF_EQZ,
+    strings = listOf("com.google.android.youtube.action.open.shorts"),
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.CONST_STRING,
-        Opcode.CONST_4,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT,
-        Opcode.IPUT_BOOLEAN,
-        Opcode.IGET_BOOLEAN,
-        Opcode.IF_NEZ,
-        Opcode.IF_EQZ,
-        Opcode.INVOKE_STATIC,
-        Opcode.MOVE_RESULT,
-        Opcode.IF_EQZ,
-        Opcode.IGET_OBJECT,
-        Opcode.IF_EQZ,
-        Opcode.IGET_OBJECT,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.IF_EQZ,
-        Opcode.CONST_CLASS,
-    ),
-    listOf("com.google.android.youtube.action.open.shorts"),
 )

src/main/kotlin/app/revanced/patches/youtube/misc/hdrbrightness/fingerprints/HDRBrightnessFingerprint.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patches.youtube.misc.hdrbrightness.annotations.HDRBrightnessCompatibility
-import org.jf.dexlib2.AccessFlags
+import org.jf.dexlib2.Opcode
 
 @Name("hdr-brightness-fingerprint")
 @MatchingMethod(
@@ -14,6 +14,7 @@ import org.jf.dexlib2.AccessFlags
 @HDRBrightnessCompatibility
 @Version("0.0.1")
 object HDRBrightnessFingerprint : MethodFingerprint(
-    "V", AccessFlags.FINAL.value,
+    "V",
+    opcodes = listOf(Opcode.CMPL_FLOAT),
     strings = listOf("c.SettingNotFound;", "screen_brightness", "android.mediaview"),
 )