refactor: move patches to correct package

2022-12-02 04:04:48 +01:00
parent 796d4dc407
commit 7bd544e171
8 changed files with 18 additions and 19 deletions
@@ -0,0 +1,13 @@
+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.41.37")
+    )]
+)
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.RUNTIME)
+internal annotation class FixPlaybackCompatibility
@@ -0,0 +1,52 @@
+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()
+    }
+}
@@ -0,0 +1,14 @@
+package app.revanced.patches.youtube.misc.fix.spoof.annotations
+
+import app.revanced.patcher.annotation.Compatibility
+import app.revanced.patcher.annotation.Package
+
+@Compatibility(
+    [
+        Package("com.google.android.youtube"),
+        Package("com.vanced.android.youtube")
+    ]
+)
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.RUNTIME)
+internal annotation class ClientSpoofCompatibility
@@ -0,0 +1,11 @@
+package app.revanced.patches.youtube.misc.fix.spoof.fingerprints
+
+
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import org.jf.dexlib2.Opcode
+
+object UserAgentHeaderBuilderFingerprint : MethodFingerprint(
+    parameters = listOf("L", "L", "L"),
+    opcodes = listOf(Opcode.MOVE_RESULT_OBJECT, Opcode.INVOKE_VIRTUAL),
+    strings = listOf("(Linux; U; Android "),
+)
@@ -0,0 +1,37 @@
+package app.revanced.patches.youtube.misc.fix.spoof.patch
+
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.extensions.addInstruction
+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.Patch
+import app.revanced.patches.youtube.misc.fix.spoof.annotations.ClientSpoofCompatibility
+import app.revanced.patches.youtube.misc.fix.spoof.fingerprints.UserAgentHeaderBuilderFingerprint
+import org.jf.dexlib2.iface.instruction.FiveRegisterInstruction
+
+@Patch
+@Name("client-spoof")
+@Description("Spoofs the YouTube or Vanced client to prevent playback issues.")
+@ClientSpoofCompatibility
+@Version("0.0.1")
+class ClientSpoofPatch : BytecodePatch(
+    listOf(UserAgentHeaderBuilderFingerprint)
+) {
+    override fun execute(context: BytecodeContext): PatchResult {
+        val result = UserAgentHeaderBuilderFingerprint.result!!
+        val method = result.mutableMethod
+
+        val insertIndex = result.scanResult.patternScanResult!!.endIndex
+        val packageNameRegister = (method.instruction(insertIndex) as FiveRegisterInstruction).registerD
+
+        val originalPackageName = "com.google.android.youtube"
+        method.addInstruction(insertIndex, "const-string v$packageNameRegister, \"$originalPackageName\"")
+
+        return PatchResultSuccess()
+    }
+}