chore(release): 2.111.3 [skip ci]

## [2.111.3](https://github.com/revanced/revanced-patches/compare/v2.111.2...v2.111.3) (2022-11-18)

### Bug Fixes

* **youtube/litho-filter:** use correct type for switch case ([#1068](https://github.com/revanced/revanced-patches/issues/1068)) ([c0123af](3ad2c42a53))

CHANGELOG.md

@@ -1,3 +1,17 @@
+## [2.111.3](https://github.com/revanced/revanced-patches/compare/v2.111.2...v2.111.3) (2022-11-18)
+
+
+### Bug Fixes
+
+* **youtube/litho-filter:** use correct type for switch case ([#1068](https://github.com/revanced/revanced-patches/issues/1068)) ([ab03511](https://github.com/revanced/revanced-patches/commit/ab03511e23d07c7c40b58eae5791fb2a798289de))
+
+## [2.111.2](https://github.com/revanced/revanced-patches/compare/v2.111.1...v2.111.2) (2022-11-18)
+
+
+### Bug Fixes
+
+* **youtube/general-ads:** import correct compatibility annotation ([#1065](https://github.com/revanced/revanced-patches/issues/1065)) ([db2085c](https://github.com/revanced/revanced-patches/commit/db2085c217311a8b7d45a01c03c6162bc60a9298))
+
 ## [2.111.1](https://github.com/revanced/revanced-patches/compare/v2.111.0...v2.111.1) (2022-11-18)
 
 # [2.111.0](https://github.com/revanced/revanced-patches/compare/v2.110.0...v2.111.0) (2022-11-15)

README.md

@@ -110,6 +110,7 @@ The official Patch bundle provided by ReVanced and the community.
 | `custom-branding` | Changes the YouTube launcher icon and name to your choice (defaults to ReVanced). | all |
 | `premium-heading` | Shows premium branding on the home screen. | all |
 | `old-quality-layout` | Enables the original quality flyout menu. | 17.43.36 |
+| `general-ads` | Removes general ads. | 17.43.36 |
 | `video-ads` | Removes ads in the video player. | 17.43.36 |
 | `swipe-controls` | Adds volume and brightness swipe controls. | 17.43.36 |
 | `downloads` | Enables downloading music and videos from YouTube. | 17.43.36 |
@@ -127,16 +128,6 @@ The official Patch bundle provided by ReVanced and the community.
 | `hdr-auto-brightness` | Makes the brightness of HDR videos follow the system default. | 17.43.36 |
 </details>
 
-### 📦 `com.reddit.frontpage`
-<details>
-
-| 💊 Patch | 📜 Description | 🏹 Target Version |
-|:--------:|:--------------:|:-----------------:|
-| `general-ads` | Removes general ads. | all |
-| `premium-icon-reddit` | Unlocks premium Reddit app icons. | all |
-| `general-reddit-ads` | Removes general ads from the Reddit frontpage and subreddits. | all |
-</details>
-
 ### 📦 `com.vanced.android.youtube`
 <details>
 
@@ -189,6 +180,15 @@ The official Patch bundle provided by ReVanced and the community.
 | `music-microg-support` | Allows YouTube Music ReVanced to run without root and under a different package name. | 5.31.50 |
 </details>
 
+### 📦 `com.reddit.frontpage`
+<details>
+
+| 💊 Patch | 📜 Description | 🏹 Target Version |
+|:--------:|:--------------:|:-----------------:|
+| `premium-icon-reddit` | Unlocks premium Reddit app icons. | all |
+| `general-reddit-ads` | Removes general ads from the Reddit frontpage and subreddits. | all |
+</details>
+
 ### 📦 `com.awedea.nyx`
 <details>
 

gradle.properties

@@ -1,2 +1,2 @@
 kotlin.code.style = official
-version = 2.111.1
+version = 2.111.3

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

@@ -9,7 +9,7 @@ import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.ResourcePatch
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.reddit.ad.general.annotations.GeneralAdsCompatibility
+import app.revanced.patches.youtube.ad.general.annotation.GeneralAdsCompatibility
 import app.revanced.patches.youtube.misc.litho.filter.patch.LithoFilterPatch
 import app.revanced.patches.youtube.misc.manifest.patch.FixLocaleConfigErrorPatch
 import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch

src/main/kotlin/app/revanced/patches/youtube/misc/litho/filter/patch/LithoFilterPatch.kt

@@ -47,15 +47,15 @@ class LithoFilterPatch : BytecodePatch(
                 addInstructions(
                     insertHookIndex, // right after setting the component.pathBuilder field,
                     """
-                             invoke-static {v5, v2}, Lapp/revanced/integrations/patches/LithoFilterPatch;->filter(Ljava/lang/StringBuilder;Ljava/lang/String;)Z
+                        invoke-static {v5, v2}, Lapp/revanced/integrations/patches/LithoFilterPatch;->filter(Ljava/lang/StringBuilder;Ljava/lang/String;)Z
-                             move-result v$clobberedRegister
+                        move-result v$clobberedRegister
-                             if-eqz v$clobberedRegister, :not_an_ad
+                        if-eqz v$clobberedRegister, :not_an_ad
-                             move-object/from16 v2, p1
+                        move-object/from16 v2, p1
-                             invoke-static {v2}, $builderMethodDescriptor
+                        invoke-static {v2}, $builderMethodDescriptor
-                             move-result-object v0
+                        move-result-object v0
-                             iget-object v0, v0, $emptyComponentFieldDescriptor
+                        iget-object v0, v0, $emptyComponentFieldDescriptor
-                             return-object v0
+                        return-object v0
-                         """,
+                    """,
                     listOf(ExternalLabel("not_an_ad", instruction(insertHookIndex)))
                 )
             }
@@ -65,22 +65,14 @@ class LithoFilterPatch : BytecodePatch(
     }
 
     private companion object {
-        fun Instruction.toDescriptor() = when (val reference = (this as ReferenceInstruction).reference) {
+        fun Instruction.toDescriptor() = when (val reference = (this as? ReferenceInstruction)?.reference) {
-            MethodReference::class -> {
+            is MethodReference -> "${reference.definingClass}->${reference.name}(${
-                val methodReference = reference as MethodReference
+                reference.parameterTypes.joinToString(
-                "${methodReference.definingClass}->${methodReference.name}(${
+                    ""
-                    methodReference.parameterTypes.joinToString(
+                ) { it }
-                        ""
+            })${reference.returnType}"
-                    ) { it }
+            is FieldReference -> "${reference.definingClass}->${reference.name}:${reference.type}"
-                })${methodReference.returnType}"
-            }
-
-            FieldReference::class -> {
-                val fieldReference = reference as FieldReference
-                "${fieldReference.definingClass}->${fieldReference.name}:${fieldReference.type}"
-            }
-
             else -> throw PatchResultError("Unsupported reference type")
         }
     }
-}
+}