diff --git a/src/main/kotlin/app/revanced/patches/youtube/general/miniplayer/MiniplayerPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/general/miniplayer/MiniplayerPatch.kt index 8482e06f72..c49dcfb85d 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/general/miniplayer/MiniplayerPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/general/miniplayer/MiniplayerPatch.kt @@ -93,9 +93,9 @@ object MiniplayerPatch : BaseBytecodePatch( // Modern mini player is only present and functional in 19.15+. // Resource is not present in older versions. Using it to determine, if patching an old version. - val isPatchingOldVersion = !SettingsPatch.upward1912 + val isPatchingOldVersion = !SettingsPatch.upward1915 - // From 19.12 to 19.16 using mixed up drawables for tablet modern. + // From 19.15 to 19.16 using mixed up drawables for tablet modern. val shouldFixMixedUpDrawables = YtOutlineXWhite > 0 && YtOutlinePictureInPictureWhite > 0 // region Enable tablet miniplayer. diff --git a/src/main/kotlin/app/revanced/patches/youtube/utils/settings/SettingsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/utils/settings/SettingsPatch.kt index 385c536a6c..cc57a53c24 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/utils/settings/SettingsPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/utils/settings/SettingsPatch.kt @@ -93,7 +93,7 @@ object SettingsPatch : BaseResourcePatch( internal var upward1842 = false internal var upward1849 = false internal var upward1902 = false - internal var upward1912 = false + internal var upward1915 = false internal var upward1923 = false internal var upward1925 = false internal var upward1928 = false @@ -288,7 +288,7 @@ object SettingsPatch : BaseResourcePatch( upward1842 = 234302000 <= playServicesVersion upward1849 = 235000000 <= playServicesVersion upward1902 = 240204000 < playServicesVersion - upward1912 = 241302000 <= playServicesVersion + upward1915 = 241602000 <= playServicesVersion upward1923 = 242402000 <= playServicesVersion upward1925 = 242599000 <= playServicesVersion upward1928 = 242905000 <= playServicesVersion diff --git a/src/main/kotlin/app/revanced/patches/youtube/video/playerresponse/fingerprint/PlayerParameterBuilderFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/video/playerresponse/fingerprint/PlayerParameterBuilderFingerprint.kt index 0cb4f6f3d2..39c7834cbe 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/video/playerresponse/fingerprint/PlayerParameterBuilderFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/video/playerresponse/fingerprint/PlayerParameterBuilderFingerprint.kt @@ -4,7 +4,7 @@ import app.revanced.patcher.extensions.or import app.revanced.patcher.fingerprint.MethodFingerprint import app.revanced.patches.youtube.video.playerresponse.fingerprint.PlayerParameterBuilderFingerprint.ENDS_WITH_PARAMETER_LIST import app.revanced.patches.youtube.video.playerresponse.fingerprint.PlayerParameterBuilderFingerprint.STARTS_WITH_PARAMETER_LIST -import app.revanced.patches.youtube.video.playerresponse.fingerprint.PlayerParameterBuilderFingerprint.parametersEqual +import app.revanced.util.parametersEqual import com.android.tools.smali.dexlib2.AccessFlags internal object PlayerParameterBuilderFingerprint : MethodFingerprint( @@ -48,13 +48,13 @@ internal object PlayerParameterBuilderFingerprint : MethodFingerprint( } val startsWithMethodParameterList = parameterTypes.slice(0..5) - val endsWithMethodParameterList = parameterTypes.slice(parameterSize - 7.., - parameters2: Iterable - ): Boolean { - if (parameters1.count() != parameters2.count()) return false - val iterator1 = parameters1.iterator() - parameters2.forEach { - if (!it.startsWith(iterator1.next())) return false - } - return true - } } \ No newline at end of file diff --git a/src/main/kotlin/app/revanced/util/BytecodeUtils.kt b/src/main/kotlin/app/revanced/util/BytecodeUtils.kt index c33a603d09..bb3ea6e8e7 100644 --- a/src/main/kotlin/app/revanced/util/BytecodeUtils.kt +++ b/src/main/kotlin/app/revanced/util/BytecodeUtils.kt @@ -45,6 +45,18 @@ fun MethodFingerprint.resultOrThrow() = result ?: throw exception fun MultiMethodFingerprint.resultOrThrow() = result.ifEmpty { throw exception } +fun parametersEqual( + parameters1: Iterable, + parameters2: Iterable +): Boolean { + if (parameters1.count() != parameters2.count()) return false + val iterator1 = parameters1.iterator() + parameters2.forEach { + if (!it.startsWith(iterator1.next())) return false + } + return true +} + /** * The [PatchException] of failing to resolve a [MethodFingerprint]. *