From a9258f848da7bdcb848babc41d3f367a214670ad Mon Sep 17 00:00:00 2001 From: inotia00 <108592928+inotia00@users.noreply.github.com> Date: Mon, 10 Feb 2025 17:39:26 +0900 Subject: [PATCH] fix build error --- .../music/patches/player/PlayerPatch.java | 6 ----- .../revanced/patches/shared/Fingerprints.kt | 21 ------------------ .../shared/captions/BaseAutoCaptionsPatch.kt | 1 - .../patches/shared/captions/Fingerprints.kt | 22 +++++++++++++++++++ .../patches/youtube/utils/Fingerprints.kt | 11 ---------- 5 files changed, 22 insertions(+), 39 deletions(-) diff --git a/extensions/shared/src/main/java/app/revanced/extension/music/patches/player/PlayerPatch.java b/extensions/shared/src/main/java/app/revanced/extension/music/patches/player/PlayerPatch.java index 2f74ede2e..ffc217e14 100644 --- a/extensions/shared/src/main/java/app/revanced/extension/music/patches/player/PlayerPatch.java +++ b/extensions/shared/src/main/java/app/revanced/extension/music/patches/player/PlayerPatch.java @@ -108,12 +108,6 @@ public class PlayerPatch { return colors; } - public static boolean changeSeekBarPosition(boolean original) { - return SETTINGS_INITIALIZED - ? CHANGE_SEEK_BAR_POSITION - : original; - } - public static boolean disableMiniPlayerGesture() { return Settings.DISABLE_MINIPLAYER_GESTURE.get(); } diff --git a/patches/src/main/kotlin/app/revanced/patches/shared/Fingerprints.kt b/patches/src/main/kotlin/app/revanced/patches/shared/Fingerprints.kt index 9665230b9..f9e6b4460 100644 --- a/patches/src/main/kotlin/app/revanced/patches/shared/Fingerprints.kt +++ b/patches/src/main/kotlin/app/revanced/patches/shared/Fingerprints.kt @@ -95,27 +95,6 @@ fun indexOfSpannableStringInstruction(method: Method) = method.indexOfFirstInstr getReference()?.toString() == SPANNABLE_STRING_REFERENCE } -internal val startVideoInformerFingerprint = legacyFingerprint( - name = "startVideoInformerFingerprint", - returnType = "V", - accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL, - opcodes = listOf( - Opcode.INVOKE_INTERFACE, - Opcode.RETURN_VOID - ), - strings = listOf("pc"), - customFingerprint = { method, _ -> - method.implementation - ?.instructions - ?.withIndex() - ?.filter { (_, instruction) -> - instruction.opcode == Opcode.CONST_STRING - } - ?.map { (index, _) -> index } - ?.size == 1 - } -) - internal val videoLengthFingerprint = legacyFingerprint( name = "videoLengthFingerprint", returnType = "V", diff --git a/patches/src/main/kotlin/app/revanced/patches/shared/captions/BaseAutoCaptionsPatch.kt b/patches/src/main/kotlin/app/revanced/patches/shared/captions/BaseAutoCaptionsPatch.kt index 26c19b4cf..ae3d48eed 100644 --- a/patches/src/main/kotlin/app/revanced/patches/shared/captions/BaseAutoCaptionsPatch.kt +++ b/patches/src/main/kotlin/app/revanced/patches/shared/captions/BaseAutoCaptionsPatch.kt @@ -6,7 +6,6 @@ import app.revanced.patcher.extensions.InstructionExtensions.getInstruction import app.revanced.patcher.patch.bytecodePatch import app.revanced.patcher.util.smali.ExternalLabel import app.revanced.patches.shared.extension.Constants.PATCHES_PATH -import app.revanced.patches.shared.startVideoInformerFingerprint import app.revanced.util.fingerprint.methodOrThrow private const val EXTENSION_CLASS_DESCRIPTOR = diff --git a/patches/src/main/kotlin/app/revanced/patches/shared/captions/Fingerprints.kt b/patches/src/main/kotlin/app/revanced/patches/shared/captions/Fingerprints.kt index 0f2bb490e..34efb7b19 100644 --- a/patches/src/main/kotlin/app/revanced/patches/shared/captions/Fingerprints.kt +++ b/patches/src/main/kotlin/app/revanced/patches/shared/captions/Fingerprints.kt @@ -3,6 +3,28 @@ package app.revanced.patches.shared.captions import app.revanced.util.fingerprint.legacyFingerprint import app.revanced.util.or import com.android.tools.smali.dexlib2.AccessFlags +import com.android.tools.smali.dexlib2.Opcode + +internal val startVideoInformerFingerprint = legacyFingerprint( + name = "startVideoInformerFingerprint", + returnType = "V", + accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL, + opcodes = listOf( + Opcode.INVOKE_INTERFACE, + Opcode.RETURN_VOID + ), + strings = listOf("pc"), + customFingerprint = { method, _ -> + method.implementation + ?.instructions + ?.withIndex() + ?.filter { (_, instruction) -> + instruction.opcode == Opcode.CONST_STRING + } + ?.map { (index, _) -> index } + ?.size == 1 + } +) internal val storyboardRendererDecoderRecommendedLevelFingerprint = legacyFingerprint( name = "storyboardRendererDecoderRecommendedLevelFingerprint", diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/utils/Fingerprints.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/utils/Fingerprints.kt index b1387c2aa..3a579a948 100644 --- a/patches/src/main/kotlin/app/revanced/patches/youtube/utils/Fingerprints.kt +++ b/patches/src/main/kotlin/app/revanced/patches/youtube/utils/Fingerprints.kt @@ -48,17 +48,6 @@ fun indexOfSpannedCharSequenceInstruction(method: Method) = reference.returnType == "Ljava/lang/CharSequence;" } -internal val engagementPanelBuilderFingerprint = legacyFingerprint( - name = "engagementPanelBuilderFingerprint", - returnType = "L", - accessFlags = AccessFlags.PRIVATE or AccessFlags.FINAL, - parameters = listOf("L", "L", "Z", "Z"), - strings = listOf( - "EngagementPanelController: cannot show EngagementPanel before EngagementPanelController.init() has been called.", - "[EngagementPanel] Cannot show EngagementPanel before EngagementPanelController.init() has been called." - ) -) - internal val layoutConstructorFingerprint = legacyFingerprint( name = "layoutConstructorFingerprint", returnType = "V",