chore(release): 2.81.7 [skip ci]

## [2.81.7](https://github.com/revanced/revanced-patches/compare/v2.81.6...v2.81.7) (2022-10-10) ### Bug Fixes * **video-ads:** invert the condition to hide ads ([ac66364](7eb2a0b1bc))
fix(video-ads): invert the condition to hide ads
2026-01-17 16:23:56 +00:00 · 2022-10-10 15:15:45 +00:00 · 2022-10-10 17:12:53 +02:00 · 2022-10-10 13:53:46 +00:00 · 2022-10-10 15:51:32 +02:00 · 2022-10-10 13:08:57 +00:00
6 changed files with 80 additions and 60 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,52 @@
+## [2.81.7](https://github.com/revanced/revanced-patches/compare/v2.81.6...v2.81.7) (2022-10-10)
+
+
+### Bug Fixes
+
+* **video-ads:** invert the condition to hide ads ([a32af95](https://github.com/revanced/revanced-patches/commit/a32af951566a7187ae2618ef08f9298f78f8ea8c))
+
+## [2.81.6](https://github.com/revanced/revanced-patches/compare/v2.81.5...v2.81.6) (2022-10-10)
+
+
+### Bug Fixes
+
+* **video-ads:** return empty list in correct method ([bbcf050](https://github.com/revanced/revanced-patches/commit/bbcf0501d4be0c43eddb7a9b3c32394222efc8f0))
+
+## [2.81.5](https://github.com/revanced/revanced-patches/compare/v2.81.4...v2.81.5) (2022-10-10)
+
+
+### Bug Fixes
+
+* **video-ads:** clobber unused register ([0feb607](https://github.com/revanced/revanced-patches/commit/0feb6073dd3de5dc179ffa9fde2da24439986431))
+
+## [2.81.4](https://github.com/revanced/revanced-patches/compare/v2.81.3...v2.81.4) (2022-10-10)
+
+
+### Bug Fixes
+
+* **general-ads:** invalid smali syntax ([86224c1](https://github.com/revanced/revanced-patches/commit/86224c1f601c1bd22c0ce4dcf2a8e79ea3b8b2ae))
+
+## [2.81.3](https://github.com/revanced/revanced-patches/compare/v2.81.2...v2.81.3) (2022-10-10)
+
+
+### Bug Fixes
+
+* **video-ads:** return empty ad list instead of null ([f6c5027](https://github.com/revanced/revanced-patches/commit/f6c5027981a2b55bbcd2e55d294ebfd5e6f0b527))
+
+## [2.81.2](https://github.com/revanced/revanced-patches/compare/v2.81.1...v2.81.2) (2022-10-08)
+
+
+### Bug Fixes
+
+* **theme:** include coloring the playlist action bar ([#742](https://github.com/revanced/revanced-patches/issues/742)) ([6766ec8](https://github.com/revanced/revanced-patches/commit/6766ec8f31da6dd71fff0ae4b7044af5ec4a5dfd))
+
+## [2.81.1](https://github.com/revanced/revanced-patches/compare/v2.81.0...v2.81.1) (2022-10-07)
+
+
+### Bug Fixes
+
+* **video-ads:** block remaining video ads ([fbc83a2](https://github.com/revanced/revanced-patches/commit/fbc83a22d37012394311a87d27202b7cc86e047d))
+
 # [2.81.0](https://github.com/revanced/revanced-patches/compare/v2.80.0...v2.81.0) (2022-10-06)


--- a/gradle.properties
+++ b/gradle.properties
@@ -1,2 +1,2 @@
 kotlin.code.style = official
-version = 2.81.0
+version = 2.81.7
--- a/src/main/kotlin/app/revanced/patches/youtube/ad/video/fingerprints/ShowVideoAdsFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/ad/video/fingerprints/ShowVideoAdsFingerprint.kt
@@ -2,16 +2,18 @@ package app.revanced.patches.youtube.ad.video.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.impl.MethodFingerprint
 import app.revanced.patches.youtube.ad.video.annotations.VideoAdsCompatibility
-import org.jf.dexlib2.AccessFlags
+import org.jf.dexlib2.Opcode

-@Name("show-video-ads-method-fingerprint")
+@Name("load-ads-fingerprint")

@VideoAdsCompatibility
@Version("0.0.1")
-object ShowVideoAdsFingerprint : MethodFingerprint(
-    "V", AccessFlags.PUBLIC or AccessFlags.FINAL, listOf("Z")
+object LoadAdsFingerprint : MethodFingerprint(
+    opcodes = listOf(Opcode.INVOKE_INTERFACE_RANGE),
+    customFingerprint = { method ->
+        method.parameterTypes.size > 0 && method.parameterTypes.first().endsWith("InstreamAdBreak;")
+    }
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/ad/video/fingerprints/ShowVideoAdsConstructorFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/ad/video/fingerprints/ShowVideoAdsConstructorFingerprint.kt
@@ -1,35 +0,0 @@
-package app.revanced.patches.youtube.ad.video.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.impl.MethodFingerprint
-import app.revanced.patches.youtube.ad.video.annotations.VideoAdsCompatibility
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-
-@Name("show-video-ads-constructor-fingerprint")
-@FuzzyPatternScanMethod(2) // FIXME: Test this threshold and find the best value.
-@VideoAdsCompatibility
-@Version("0.0.1")
-object ShowVideoAdsConstructorFingerprint : MethodFingerprint(
-    "V", AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR, listOf("L", "L", "L"), listOf(
-        Opcode.INVOKE_DIRECT,
-        Opcode.NEW_INSTANCE,
-        Opcode.INVOKE_DIRECT,
-        Opcode.IPUT_OBJECT,
-        Opcode.NEW_INSTANCE,
-        null, // either CONST_4 or CONST_16
-        Opcode.INVOKE_DIRECT,
-        Opcode.IPUT_OBJECT,
-        Opcode.NEW_INSTANCE,
-        Opcode.INVOKE_DIRECT,
-        Opcode.IPUT_OBJECT,
-        Opcode.IPUT_OBJECT,
-        Opcode.IPUT_OBJECT,
-        Opcode.CONST_4,
-        Opcode.IPUT_BOOLEAN,
-        Opcode.RETURN_VOID
-    )
-)
--- a/src/main/kotlin/app/revanced/patches/youtube/ad/video/patch/VideoAdsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/ad/video/patch/VideoAdsPatch.kt
@@ -5,15 +5,15 @@ import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.addInstructions
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
+import app.revanced.patcher.extensions.instruction
 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.smali.ExternalLabel
 import app.revanced.patches.youtube.ad.video.annotations.VideoAdsCompatibility
-import app.revanced.patches.youtube.ad.video.fingerprints.ShowVideoAdsConstructorFingerprint
-import app.revanced.patches.youtube.ad.video.fingerprints.ShowVideoAdsFingerprint
+import app.revanced.patches.youtube.ad.video.fingerprints.LoadAdsFingerprint
 import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
 import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
 import app.revanced.patches.youtube.misc.settings.framework.components.impl.StringResource
@@ -27,7 +27,7 @@ import app.revanced.patches.youtube.misc.settings.framework.components.impl.Swit
@Version("0.0.1")
 class VideoAdsPatch : BytecodePatch(
    listOf(
-        ShowVideoAdsConstructorFingerprint
+        LoadAdsFingerprint
    )
 ) {
    override fun execute(context: BytecodeContext): PatchResult {
@@ -41,18 +41,22 @@ class VideoAdsPatch : BytecodePatch(
            )
        )

-        ShowVideoAdsFingerprint.resolve(
-            context, ShowVideoAdsConstructorFingerprint.result!!.classDef
-        )
-
-        // Override the parameter by calling shouldShowAds and setting the parameter to the result
-        ShowVideoAdsFingerprint.result!!.mutableMethod.addInstructions(
-            0, """
-                invoke-static { }, Lapp/revanced/integrations/patches/VideoAdsPatch;->shouldShowAds()Z
-                move-result v1
-            """
-        )
+        with(LoadAdsFingerprint.result!!) {
+            val insertIndex = scanResult.patternScanResult!!.startIndex
+            with(mutableMethod) {
+                addInstructions(
+                    insertIndex,
+                    """ 
+                            invoke-static { }, Lapp/revanced/integrations/patches/VideoAdsPatch;->shouldShowAds()Z
+                            move-result v4
+                            if-eqz v4, :show_video_ads
+                            return-object v3
+                         """,
+                    listOf(ExternalLabel("show_video_ads", instruction(insertIndex)))
+                )
+            }
+        }

        return PatchResultSuccess()
    }
-}
+}
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/theme/patch/ThemePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/theme/patch/ThemePatch.kt
@@ -29,10 +29,10 @@ class ThemePatch : ResourcePatch {
                val node = resourcesNode.childNodes.item(i) as? Element ?: continue

                node.textContent = when (node.getAttribute("name")) {
-                    "yt_black1", "yt_black1_opacity95", "yt_black2", "yt_black3", "yt_black4",
+                    "yt_black1", "yt_black1_opacity95", "yt_black1_opacity98", "yt_black2", "yt_black3", "yt_black4",
                    "yt_status_bar_background_dark" -> darkThemeBackgroundColor

-                    "yt_white1", "yt_white1_opacity95", "yt_white2", "yt_white3",
+                    "yt_white1", "yt_white1_opacity95", "yt_white1_opacity98", "yt_white2", "yt_white3",
                    "yt_white4" -> lightThemeBackgroundColor

                    else -> continue
@@ -62,4 +62,4 @@ class ThemePatch : ResourcePatch {
            )
        )
    }
-}
+}
Author	SHA1	Message	Date
semantic-release-bot	1eadafb098	chore(release): 2.81.7 [skip ci] ## [2.81.7](https://github.com/revanced/revanced-patches/compare/v2.81.6...v2.81.7) (2022-10-10) ### Bug Fixes * video-ads: invert the condition to hide ads ([`ac66364`](`7eb2a0b1bc`))	2022-10-10 15:15:45 +00:00
oSumAtrIX	7eb2a0b1bc	fix(video-ads): invert the condition to hide ads	2022-10-10 17:12:53 +02:00
semantic-release-bot	a13e294978	chore(release): 2.81.6 [skip ci] ## [2.81.6](https://github.com/revanced/revanced-patches/compare/v2.81.5...v2.81.6) (2022-10-10) ### Bug Fixes * video-ads: return empty list in correct method ([`ef095b1`](`a3548ed524`))	2022-10-10 13:53:46 +00:00
oSumAtrIX	a3548ed524	fix(video-ads): return empty list in correct method	2022-10-10 15:51:32 +02:00
semantic-release-bot	37cbbccec5	chore(release): 2.81.5 [skip ci] ## [2.81.5](https://github.com/revanced/revanced-patches/compare/v2.81.4...v2.81.5) (2022-10-10) ### Bug Fixes * video-ads: clobber unused register ([`d5fbf10`](`4e83400de4`))	2022-10-10 13:08:57 +00:00
oSumAtrIX	4e83400de4	fix(video-ads): clobber unused register	2022-10-10 15:06:27 +02:00
semantic-release-bot	e9e5f7b018	chore(release): 2.81.4 [skip ci] ## [2.81.4](https://github.com/revanced/revanced-patches/compare/v2.81.3...v2.81.4) (2022-10-10) ### Bug Fixes * general-ads: invalid smali syntax ([`1772dcf`](`01be9fd79e`))	2022-10-10 12:30:28 +00:00
oSumAtrIX	01be9fd79e	fix(general-ads): invalid smali syntax	2022-10-10 14:28:35 +02:00
semantic-release-bot	e8faa5d944	chore(release): 2.81.3 [skip ci] ## [2.81.3](https://github.com/revanced/revanced-patches/compare/v2.81.2...v2.81.3) (2022-10-10) ### Bug Fixes * video-ads: return empty ad list instead of null ([`9f9ad19`](`9ac84ae720`))	2022-10-10 11:56:13 +00:00
oSumAtrIX	9ac84ae720	fix(video-ads): return empty ad list instead of null	2022-10-10 13:50:24 +02:00
semantic-release-bot	52424bd6ab	chore(release): 2.81.2 [skip ci] ## [2.81.2](https://github.com/revanced/revanced-patches/compare/v2.81.1...v2.81.2) (2022-10-08) ### Bug Fixes * theme: include coloring the playlist action bar ([#742](https://github.com/revanced/revanced-patches/issues/742)) ([`24f52e9`](`4c2d6466cc`))	2022-10-08 23:47:09 +00:00
OxrxL	4c2d6466cc	fix(theme): include coloring the playlist action bar (#742 )	2022-10-09 01:44:50 +02:00
semantic-release-bot	6bcae6ddeb	chore(release): 2.81.1 [skip ci] ## [2.81.1](https://github.com/revanced/revanced-patches/compare/v2.81.0...v2.81.1) (2022-10-07) ### Bug Fixes * video-ads: block remaining video ads ([`6618e53`](`65cee57493`))	2022-10-07 21:04:25 +00:00
oSumAtrIX	65cee57493	fix(video-ads): block remaining video ads	2022-10-07 23:02:01 +02:00