chore: lint code

This commit is contained in:
inotia00 2024-07-18 02:44:47 +09:00
parent 90d2dd9031
commit fa585ad2de
13 changed files with 34 additions and 15 deletions

View File

@ -179,7 +179,8 @@ abstract class BaseGmsCoreSupportResourcePatch(
private const val CLONE_PACKAGE_NAME_YOUTUBE_MUSIC = "com.rvx.android.apps.youtube.music"
private const val DEFAULT_PACKAGE_NAME_YOUTUBE_MUSIC = "app.rvx.android.apps.youtube.music"
internal const val ORIGINAL_PACKAGE_NAME_YOUTUBE_MUSIC = "com.google.android.apps.youtube.music"
internal const val ORIGINAL_PACKAGE_NAME_YOUTUBE_MUSIC =
"com.google.android.apps.youtube.music"
private const val PACKAGE_NAME_REGEX_PATTERN = "^[a-z]\\w*(\\.[a-z]\\w*)+\$"
}

View File

@ -33,7 +33,8 @@ abstract class BaseCronetImageUrlHookPatch(
)
) {
companion object {
private const val INTEGRATION_SHARED_CLASS_DESCRIPTOR = "$PATCHES_PATH/BypassImageRegionRestrictionsPatch;"
private const val INTEGRATION_SHARED_CLASS_DESCRIPTOR =
"$PATCHES_PATH/BypassImageRegionRestrictionsPatch;"
private lateinit var loadImageUrlMethod: MutableMethod
private var loadImageUrlIndex = 0
@ -44,10 +45,14 @@ abstract class BaseCronetImageUrlHookPatch(
private lateinit var loadImageErrorCallbackMethod: MutableMethod
private var loadImageErrorCallbackIndex = 0
}
/**
* @param highPriority If the hook should be called before all other hooks.
*/
internal fun addImageUrlHook(targetMethodClass: String = INTEGRATION_SHARED_CLASS_DESCRIPTOR, highPriority: Boolean = true) {
internal fun addImageUrlHook(
targetMethodClass: String = INTEGRATION_SHARED_CLASS_DESCRIPTOR,
highPriority: Boolean = true
) {
loadImageUrlMethod.addInstructions(
if (highPriority) 0 else loadImageUrlIndex,
"""

View File

@ -6,5 +6,5 @@ import com.android.tools.smali.dexlib2.AccessFlags
internal object MessageDigestImageUrlFingerprint : MethodFingerprint(
accessFlags = AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR,
parameters = listOf("Ljava/lang/String;", "L")
parameters = listOf("Ljava/lang/String;", "L")
)

View File

@ -6,7 +6,7 @@ import com.android.tools.smali.dexlib2.AccessFlags
internal object MessageDigestImageUrlParentFingerprint : MethodFingerprint(
accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
returnType = "Ljava/lang/String;",
parameters = listOf(),
returnType = "Ljava/lang/String;",
parameters = emptyList(),
strings = listOf("@#&=*+-_.,:!?()/~'%;\$"),
)

View File

@ -7,7 +7,11 @@ import com.android.tools.smali.dexlib2.AccessFlags
internal object OnFailureFingerprint : MethodFingerprint(
returnType = "V",
accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
parameters = listOf("Lorg/chromium/net/UrlRequest;", "Lorg/chromium/net/UrlResponseInfo;", "Lorg/chromium/net/CronetException;"),
parameters = listOf(
"Lorg/chromium/net/UrlRequest;",
"Lorg/chromium/net/UrlResponseInfo;",
"Lorg/chromium/net/CronetException;"
),
customFingerprint = { methodDef, _ ->
methodDef.name == "onFailed"
}

View File

@ -8,7 +8,7 @@ import com.android.tools.smali.dexlib2.AccessFlags
internal object OnResponseStartedFingerprint : MethodFingerprint(
returnType = "V",
accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
parameters = listOf("Lorg/chromium/net/UrlRequest;", "Lorg/chromium/net/UrlResponseInfo;"),
parameters = listOf("Lorg/chromium/net/UrlRequest;", "Lorg/chromium/net/UrlResponseInfo;"),
strings = listOf(
"Content-Length",
"Content-Type",

View File

@ -7,7 +7,7 @@ import com.android.tools.smali.dexlib2.AccessFlags
internal object OnSucceededFingerprint : MethodFingerprint(
returnType = "V",
accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
parameters = listOf("Lorg/chromium/net/UrlRequest;", "Lorg/chromium/net/UrlResponseInfo;"),
parameters = listOf("Lorg/chromium/net/UrlRequest;", "Lorg/chromium/net/UrlResponseInfo;"),
customFingerprint = { methodDef, _ ->
methodDef.name == "onSucceeded"
}

View File

@ -23,7 +23,9 @@ object AlternativeThumbnailsPatch : BaseBytecodePatch(
) {
override fun execute(context: BytecodeContext) {
CronetImageUrlHookPatch.addImageUrlHook(ALTERNATIVE_THUMBNAILS_CLASS_DESCRIPTOR)
CronetImageUrlHookPatch.addImageUrlSuccessCallbackHook(ALTERNATIVE_THUMBNAILS_CLASS_DESCRIPTOR)
CronetImageUrlHookPatch.addImageUrlSuccessCallbackHook(
ALTERNATIVE_THUMBNAILS_CLASS_DESCRIPTOR
)
CronetImageUrlHookPatch.addImageUrlErrorCallbackHook(ALTERNATIVE_THUMBNAILS_CLASS_DESCRIPTOR)
/**

View File

@ -279,7 +279,8 @@ object ShortsComponentPatch : BaseBytecodePatch(
// region patch for hide paused header
ShortsPausedHeaderFingerprint.resultOrThrow().let {
val targetMethod = it.getWalkerMethod(context, it.scanResult.patternScanResult!!.endIndex)
val targetMethod =
it.getWalkerMethod(context, it.scanResult.patternScanResult!!.endIndex)
targetMethod.apply {
addInstructionsWithLabels(

View File

@ -53,7 +53,8 @@ object BottomSheetRecyclerViewPatch : BytecodePatch(
opcode == Opcode.IPUT_OBJECT
&& getReference<FieldReference>()?.type == "Landroid/view/ViewTreeObserver${'$'}OnDrawListener;"
}
recyclerViewTreeObserverInsertIndex = getTargetIndexReversedOrThrow(onDrawListenerIndex, Opcode.CHECK_CAST) + 1
recyclerViewTreeObserverInsertIndex =
getTargetIndexReversedOrThrow(onDrawListenerIndex, Opcode.CHECK_CAST) + 1
}
}

View File

@ -179,7 +179,8 @@ object SharedResourceIdPatch : ResourcePatch() {
MusicAppDeeplinkButtonView = getId(ID, "music_app_deeplink_button_view")
Notice = getId(ID, "notice")
NotificationBigPictureIconWidth = getId(DIMEN, "notification_big_picture_icon_width")
OfflineActionsVideoDeletedUndoSnackbarText = getId(STRING, "offline_actions_video_deleted_undo_snackbar_text")
OfflineActionsVideoDeletedUndoSnackbarText =
getId(STRING, "offline_actions_video_deleted_undo_snackbar_text")
PlayerCollapseButton = getId(ID, "player_collapse_button")
PlayerVideoTitleView = getId(ID, "player_video_title_view")
PosterArtWidthDefault = getId(DIMEN, "poster_art_width_default")

View File

@ -190,7 +190,8 @@ object VideoInformationPatch : BytecodePatch(
it.mutableMethod.apply {
val literalIndex = getWideLiteralInstructionIndex(45368273)
val walkerIndex = getTargetIndexReversedOrThrow(literalIndex, Opcode.INVOKE_VIRTUAL_RANGE)
val walkerIndex =
getTargetIndexReversedOrThrow(literalIndex, Opcode.INVOKE_VIRTUAL_RANGE)
videoEndMethod =
getWalkerMethod(context, walkerIndex)

View File

@ -209,7 +209,10 @@ object VideoPlaybackPatch : BaseBytecodePatch(
VideoInformationPatch.hookBackgroundPlay("$INTEGRATIONS_RELOAD_VIDEO_CLASS_DESCRIPTOR->newVideoStarted(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;JZ)V")
VideoInformationPatch.hook("$INTEGRATIONS_VIDEO_QUALITY_CLASS_DESCRIPTOR->newVideoStarted(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;JZ)V")
VideoInformationPatch.onCreateHook(INTEGRATIONS_VIDEO_QUALITY_CLASS_DESCRIPTOR, "newVideoStarted")
VideoInformationPatch.onCreateHook(
INTEGRATIONS_VIDEO_QUALITY_CLASS_DESCRIPTOR,
"newVideoStarted"
)
// endregion