chore: merge branch dev to main (#1492)

CHANGELOG.md

@@ -1,3 +1,17 @@
+# [2.155.0-dev.1](https://github.com/revanced/revanced-patches/compare/v2.154.1-dev.1...v2.155.0-dev.1) (2023-01-15)
+
+
+### Features
+
+* **youtube:** remove `fix-playback` patch ([edcb6cc](https://github.com/revanced/revanced-patches/commit/edcb6cc94961aaebe2df884db3049b2afa79f38f))
+
+## [2.154.1-dev.1](https://github.com/revanced/revanced-patches/compare/v2.154.0...v2.154.1-dev.1) (2023-01-15)
+
+
+### Bug Fixes
+
+* **youtube/open-links-directly:** use better titles and correct descriptions ([#1488](https://github.com/revanced/revanced-patches/issues/1488)) ([2874bbe](https://github.com/revanced/revanced-patches/commit/2874bbef154d28e56b5928048a255409a956a012))
+
 # [2.154.0](https://github.com/revanced/revanced-patches/compare/v2.153.0...v2.154.0) (2023-01-13)
 
 

README.md

@@ -46,7 +46,7 @@ The official Patch bundle provided by ReVanced and the community.
 | `microg-support` | Allows YouTube ReVanced to run without root and under a different package name with Vanced MicroG. | 17.49.37 |
 | `minimized-playback` | Enables minimized and background playback. | 17.49.37 |
 | `old-quality-layout` | Enables the original video quality flyout in the video player settings | 17.49.37 |
-| `open-links-directly` | Bypasses URL redirects and opens links directly inside YouTube app. | 17.49.37 |
+| `open-links-directly` | Bypasses https://youtube.com/redirect URLs. | 17.49.37 |
 | `premium-heading` | Shows premium branding on the home screen. | all |
 | `remember-playback-rate` | Adds the ability to remember the playback rate you chose in the video playback rate flyout. | 17.49.37 |
 | `remember-video-quality` | Adds the ability to remember the video quality you chose in the video quality flyout. | 17.49.37 |

build.gradle.kts

@@ -20,7 +20,7 @@ repositories {
 }
 
 dependencies {
-    implementation("app.revanced:revanced-patcher:6.4.0")
+    implementation("app.revanced:revanced-patcher:6.4.1")
     implementation("app.revanced:multidexlib2:2.5.2.r2")
     // Required for meta
     implementation("com.google.code.gson:gson:2.10")

gradle.properties

@@ -1,2 +1,2 @@
 kotlin.code.style = official
-version = 2.154.0
+version = 2.155.0-dev.1

src/main/kotlin/app/revanced/patches/youtube/ad/video/patch/VideoAdsPatch.kt

@@ -16,12 +16,11 @@ import app.revanced.patches.shared.settings.preference.impl.StringResource
 import app.revanced.patches.shared.settings.preference.impl.SwitchPreference
 import app.revanced.patches.youtube.ad.video.annotations.VideoAdsCompatibility
 import app.revanced.patches.youtube.ad.video.fingerprints.LoadVideoAdsFingerprint
-import app.revanced.patches.youtube.misc.fix.playback.patch.FixPlaybackPatch
 import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
 import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
 
 @Patch
-@DependsOn([IntegrationsPatch::class, SettingsPatch::class, FixPlaybackPatch::class])
+@DependsOn([IntegrationsPatch::class, SettingsPatch::class])
 @Name("video-ads")
 @Description("Removes ads in the video player.")
 @VideoAdsCompatibility

src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/annotations/FixPlaybackCompatibility.kt

@@ -1,13 +0,0 @@
-package app.revanced.patches.youtube.misc.fix.playback.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility(
-    [Package(
-        "com.google.android.youtube", arrayOf("17.49.37")
-    )]
-)
-@Target(AnnotationTarget.CLASS)
-@Retention(AnnotationRetention.RUNTIME)
-internal annotation class FixPlaybackCompatibility

src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/patch/FixPlaybackPatch.kt

@@ -1,52 +0,0 @@
-package app.revanced.patches.youtube.misc.fix.playback.patch
-
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.data.ResourceContext
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.ResourcePatch
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patches.shared.settings.preference.impl.StringResource
-import app.revanced.patches.shared.settings.preference.impl.SwitchPreference
-import app.revanced.patches.youtube.misc.fix.playback.annotations.FixPlaybackCompatibility
-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.video.information.patch.VideoInformationPatch
-import app.revanced.patches.youtube.misc.video.videoid.patch.VideoIdPatch
-
-@DependsOn([
-    IntegrationsPatch::class,
-    VideoInformationPatch::class, // updates video length and adds method to seek in video, necessary for this patch
-    SettingsPatch::class,
-    VideoIdPatch::class
-])
-@Name("fix-playback")
-@Description("Fixes the issue with videos not playing when video ads are removed.")
-@FixPlaybackCompatibility
-@Version("0.0.1")
-class FixPlaybackPatch : ResourcePatch {
-    override fun execute(context: ResourceContext): PatchResult {
-        SettingsPatch.PreferenceScreen.MISC.addPreferences(
-            SwitchPreference(
-                "revanced_fix_playback",
-                StringResource("revanced_fix_playback_title", "Fix video playback issues"),
-                false,
-                StringResource(
-                    "revanced_fix_playback_summary_on",
-                    "The fix is enabled"
-                ),
-                StringResource(
-                    "revanced_fix_playback_summary_off",
-                    "The fix is disabled"
-                )
-            )
-        )
-
-        // If a new video loads, fix the playback issue
-        VideoIdPatch.injectCall("Lapp/revanced/integrations/patches/FixPlaybackPatch;->newVideoLoaded(Ljava/lang/String;)V")
-
-        return PatchResultSuccess()
-    }
-}

src/main/kotlin/app/revanced/patches/youtube/misc/openlinksdirectly/patch/OpenLinksDirectlyPatch.kt

@@ -25,7 +25,7 @@ import org.jf.dexlib2.iface.instruction.formats.Instruction35c
 @Patch
 @DependsOn([IntegrationsPatch::class, SettingsPatch::class])
 @Name("open-links-directly")
-@Description("Bypasses URL redirects and opens links directly inside YouTube app.")
+@Description("Bypasses https://youtube.com/redirect URLs.")
 @OpenLinksDirectlyCompatibility
 @Version("0.0.1")
 class OpenLinksDirectlyPatch : BytecodePatch(
@@ -37,10 +37,10 @@ class OpenLinksDirectlyPatch : BytecodePatch(
         SettingsPatch.PreferenceScreen.MISC.addPreferences(
             SwitchPreference(
                 "revanced_uri_redirect",
-                StringResource("revanced_uri_redirect_title", "Open YouTube links inside app"),
+                StringResource("revanced_uri_redirect_title", "Bypass URL redirects"),
                 true,
-                StringResource("revanced_uri_redirect_summary_on", "Links opened inside YouTube ReVanced"),
+                StringResource("revanced_uri_redirect_summary_on", "Bypassing URL redirects"),
-                StringResource("revanced_uri_redirect_summary_off", "Links opened in web browser")
+                StringResource("revanced_uri_redirect_summary_off", "Following default redirect policy")
             )
         )