ReVanced/revanced-patches-ex
1
0
Fork 0
mirror of https://github.com/inotia00/revanced-patches.git synced 2025-05-05 17:14:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

chore: lint code

Browse Source
This commit is contained in:
inotia00 2024-10-13 02:02:48 +09:00
parent 4bc63034d3
commit d20582b494
4 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/kotlin/app/revanced/patches/youtube/general/miniplayer/MiniplayerPatch.kt
View File

@ -93,9 +93,9 @@ object MiniplayerPatch : BaseBytecodePatch(
// Modern mini player is only present and functional in 19.15+. // 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. // 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 val shouldFixMixedUpDrawables = YtOutlineXWhite > 0 && YtOutlinePictureInPictureWhite > 0
// region Enable tablet miniplayer. // region Enable tablet miniplayer.

4
src/main/kotlin/app/revanced/patches/youtube/utils/settings/SettingsPatch.kt
View File

@ -93,7 +93,7 @@ object SettingsPatch : BaseResourcePatch(
internal var upward1842 = false internal var upward1842 = false
internal var upward1849 = false internal var upward1849 = false
internal var upward1902 = false internal var upward1902 = false
internal var upward1912 = false internal var upward1915 = false
internal var upward1923 = false internal var upward1923 = false
internal var upward1925 = false internal var upward1925 = false
internal var upward1928 = false internal var upward1928 = false
@ -288,7 +288,7 @@ object SettingsPatch : BaseResourcePatch(
upward1842 = 234302000 <= playServicesVersion upward1842 = 234302000 <= playServicesVersion
upward1849 = 235000000 <= playServicesVersion upward1849 = 235000000 <= playServicesVersion
upward1902 = 240204000 < playServicesVersion upward1902 = 240204000 < playServicesVersion
upward1912 = 241302000 <= playServicesVersion upward1915 = 241602000 <= playServicesVersion
upward1923 = 242402000 <= playServicesVersion upward1923 = 242402000 <= playServicesVersion
upward1925 = 242599000 <= playServicesVersion upward1925 = 242599000 <= playServicesVersion
upward1928 = 242905000 <= playServicesVersion upward1928 = 242905000 <= playServicesVersion

24
src/main/kotlin/app/revanced/patches/youtube/video/playerresponse/fingerprint/PlayerParameterBuilderFingerprint.kt
View File

@ -4,7 +4,7 @@ import app.revanced.patcher.extensions.or
import app.revanced.patcher.fingerprint.MethodFingerprint 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.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.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 import com.android.tools.smali.dexlib2.AccessFlags
internal object PlayerParameterBuilderFingerprint : MethodFingerprint( internal object PlayerParameterBuilderFingerprint : MethodFingerprint(
@ -48,13 +48,13 @@ internal object PlayerParameterBuilderFingerprint : MethodFingerprint(
} }
val startsWithMethodParameterList = parameterTypes.slice(0..5) val startsWithMethodParameterList = parameterTypes.slice(0..5)
val endsWithMethodParameterList = parameterTypes.slice(parameterSize - 7..<parameterSize) val endsWithMethodParameterList = parameterTypes.slice(parameterSize - 7..< parameterSize)
parametersEqual(STARTS_WITH_PARAMETER_LIST, startsWithMethodParameterList) parametersEqual(STARTS_WITH_PARAMETER_LIST, startsWithMethodParameterList) &&
&& parametersEqual(ENDS_WITH_PARAMETER_LIST, endsWithMethodParameterList) parametersEqual(ENDS_WITH_PARAMETER_LIST, endsWithMethodParameterList)
} }
) { ) {
val STARTS_WITH_PARAMETER_LIST = listOf( private val STARTS_WITH_PARAMETER_LIST = listOf(
"Ljava/lang/String;", // VideoId. "Ljava/lang/String;", // VideoId.
"[B", "[B",
"Ljava/lang/String;", // Player parameters proto buffer. "Ljava/lang/String;", // Player parameters proto buffer.
@ -62,7 +62,7 @@ internal object PlayerParameterBuilderFingerprint : MethodFingerprint(
"I", "I",
"I" "I"
) )
val ENDS_WITH_PARAMETER_LIST = listOf( private val ENDS_WITH_PARAMETER_LIST = listOf(
"Ljava/util/Set;", "Ljava/util/Set;",
"Ljava/lang/String;", "Ljava/lang/String;",
"Ljava/lang/String;", "Ljava/lang/String;",
@ -71,16 +71,4 @@ internal object PlayerParameterBuilderFingerprint : MethodFingerprint(
"Z", "Z",
"Z" "Z"
) )
fun parametersEqual(
parameters1: Iterable<CharSequence>,
parameters2: Iterable<CharSequence>
): Boolean {
if (parameters1.count() != parameters2.count()) return false
val iterator1 = parameters1.iterator()
parameters2.forEach {
if (!it.startsWith(iterator1.next())) return false
}
return true
}
} }

12
src/main/kotlin/app/revanced/util/BytecodeUtils.kt
View File

@ -45,6 +45,18 @@ fun MethodFingerprint.resultOrThrow() = result ?: throw exception
fun MultiMethodFingerprint.resultOrThrow() = result.ifEmpty { throw exception } fun MultiMethodFingerprint.resultOrThrow() = result.ifEmpty { throw exception }
fun parametersEqual(
parameters1: Iterable<CharSequence>,
parameters2: Iterable<CharSequence>
): 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]. * The [PatchException] of failing to resolve a [MethodFingerprint].
* *