From 25493473b51b69a612cf680060d03f7bc0b9ec02 Mon Sep 17 00:00:00 2001 From: inotia00 Date: Tue, 25 Jul 2023 02:28:20 +0900 Subject: [PATCH] fix(youtube): some fingerprints are located in the wrong path --- .../overlaybutton/alwaysrepeat/patch/AlwaysRepeatPatch.kt | 4 ++-- .../playerbuttonbg}/fingerprints/PlayerPatchFingerprint.kt | 2 +- .../playerbuttonbg/patch/HidePlayerButtonBackgroundPatch.kt | 2 +- .../fingerprints/VideoEndFingerprint.kt | 2 +- .../fingerprints/VideoEndParentFingerprint.kt | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) rename src/main/kotlin/app/revanced/patches/youtube/{utils => player/playerbuttonbg}/fingerprints/PlayerPatchFingerprint.kt (80%) rename src/main/kotlin/app/revanced/patches/youtube/{overlaybutton/alwaysrepeat => utils}/fingerprints/VideoEndFingerprint.kt (85%) rename src/main/kotlin/app/revanced/patches/youtube/{overlaybutton/alwaysrepeat => utils}/fingerprints/VideoEndParentFingerprint.kt (85%) diff --git a/src/main/kotlin/app/revanced/patches/youtube/overlaybutton/alwaysrepeat/patch/AlwaysRepeatPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/overlaybutton/alwaysrepeat/patch/AlwaysRepeatPatch.kt index 9d0564301..be0e50465 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/overlaybutton/alwaysrepeat/patch/AlwaysRepeatPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/overlaybutton/alwaysrepeat/patch/AlwaysRepeatPatch.kt @@ -13,8 +13,8 @@ import app.revanced.patcher.patch.PatchResultSuccess import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod import app.revanced.patcher.util.smali.ExternalLabel import app.revanced.patches.youtube.overlaybutton.alwaysrepeat.fingerprints.AutoNavInformerFingerprint -import app.revanced.patches.youtube.overlaybutton.alwaysrepeat.fingerprints.VideoEndFingerprint -import app.revanced.patches.youtube.overlaybutton.alwaysrepeat.fingerprints.VideoEndParentFingerprint +import app.revanced.patches.youtube.utils.fingerprints.VideoEndFingerprint +import app.revanced.patches.youtube.utils.fingerprints.VideoEndParentFingerprint import app.revanced.util.integrations.Constants.UTILS_PATH import app.revanced.util.integrations.Constants.VIDEO_PATH import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction diff --git a/src/main/kotlin/app/revanced/patches/youtube/utils/fingerprints/PlayerPatchFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/player/playerbuttonbg/fingerprints/PlayerPatchFingerprint.kt similarity index 80% rename from src/main/kotlin/app/revanced/patches/youtube/utils/fingerprints/PlayerPatchFingerprint.kt rename to src/main/kotlin/app/revanced/patches/youtube/player/playerbuttonbg/fingerprints/PlayerPatchFingerprint.kt index 6a6917b72..0e6e385fd 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/utils/fingerprints/PlayerPatchFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/player/playerbuttonbg/fingerprints/PlayerPatchFingerprint.kt @@ -1,4 +1,4 @@ -package app.revanced.patches.youtube.utils.fingerprints +package app.revanced.patches.youtube.player.playerbuttonbg.fingerprints import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint diff --git a/src/main/kotlin/app/revanced/patches/youtube/player/playerbuttonbg/patch/HidePlayerButtonBackgroundPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/player/playerbuttonbg/patch/HidePlayerButtonBackgroundPatch.kt index c83c2f614..93ce2ef5b 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/player/playerbuttonbg/patch/HidePlayerButtonBackgroundPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/player/playerbuttonbg/patch/HidePlayerButtonBackgroundPatch.kt @@ -12,7 +12,7 @@ import app.revanced.patcher.patch.PatchResultSuccess import app.revanced.patcher.patch.annotations.DependsOn import app.revanced.patcher.patch.annotations.Patch import app.revanced.patches.youtube.utils.annotations.YouTubeCompatibility -import app.revanced.patches.youtube.utils.fingerprints.PlayerPatchFingerprint +import app.revanced.patches.youtube.player.playerbuttonbg.fingerprints.PlayerPatchFingerprint import app.revanced.patches.youtube.utils.playerbutton.patch.PlayerButtonHookPatch import app.revanced.patches.youtube.utils.settings.resource.patch.SettingsPatch import app.revanced.util.integrations.Constants.INTEGRATIONS_PATH diff --git a/src/main/kotlin/app/revanced/patches/youtube/overlaybutton/alwaysrepeat/fingerprints/VideoEndFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/utils/fingerprints/VideoEndFingerprint.kt similarity index 85% rename from src/main/kotlin/app/revanced/patches/youtube/overlaybutton/alwaysrepeat/fingerprints/VideoEndFingerprint.kt rename to src/main/kotlin/app/revanced/patches/youtube/utils/fingerprints/VideoEndFingerprint.kt index 10eb31c01..d76c257a5 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/overlaybutton/alwaysrepeat/fingerprints/VideoEndFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/utils/fingerprints/VideoEndFingerprint.kt @@ -1,4 +1,4 @@ -package app.revanced.patches.youtube.overlaybutton.alwaysrepeat.fingerprints +package app.revanced.patches.youtube.utils.fingerprints import app.revanced.patcher.extensions.or import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint diff --git a/src/main/kotlin/app/revanced/patches/youtube/overlaybutton/alwaysrepeat/fingerprints/VideoEndParentFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/utils/fingerprints/VideoEndParentFingerprint.kt similarity index 85% rename from src/main/kotlin/app/revanced/patches/youtube/overlaybutton/alwaysrepeat/fingerprints/VideoEndParentFingerprint.kt rename to src/main/kotlin/app/revanced/patches/youtube/utils/fingerprints/VideoEndParentFingerprint.kt index 67bf6ad52..1fc6f649d 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/overlaybutton/alwaysrepeat/fingerprints/VideoEndParentFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/utils/fingerprints/VideoEndParentFingerprint.kt @@ -1,4 +1,4 @@ -package app.revanced.patches.youtube.overlaybutton.alwaysrepeat.fingerprints +package app.revanced.patches.youtube.utils.fingerprints import app.revanced.patcher.extensions.or import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint