diff --git a/src/main/kotlin/app/revanced/patches/shared/gms/BaseGmsCoreSupportResourcePatch.kt b/src/main/kotlin/app/revanced/patches/shared/gms/BaseGmsCoreSupportResourcePatch.kt index fcfef07c6..bda0aece3 100644 --- a/src/main/kotlin/app/revanced/patches/shared/gms/BaseGmsCoreSupportResourcePatch.kt +++ b/src/main/kotlin/app/revanced/patches/shared/gms/BaseGmsCoreSupportResourcePatch.kt @@ -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*)+\$" } diff --git a/src/main/kotlin/app/revanced/patches/shared/imageurlhook/BaseCronetImageUrlHookPatch.kt b/src/main/kotlin/app/revanced/patches/shared/imageurlhook/BaseCronetImageUrlHookPatch.kt index ef52f6478..8adebbc47 100644 --- a/src/main/kotlin/app/revanced/patches/shared/imageurlhook/BaseCronetImageUrlHookPatch.kt +++ b/src/main/kotlin/app/revanced/patches/shared/imageurlhook/BaseCronetImageUrlHookPatch.kt @@ -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, """ diff --git a/src/main/kotlin/app/revanced/patches/shared/imageurlhook/fingerprints/MessageDigestImageUrlFingerprint.kt b/src/main/kotlin/app/revanced/patches/shared/imageurlhook/fingerprints/MessageDigestImageUrlFingerprint.kt index 824bd9077..7222ac24c 100644 --- a/src/main/kotlin/app/revanced/patches/shared/imageurlhook/fingerprints/MessageDigestImageUrlFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/shared/imageurlhook/fingerprints/MessageDigestImageUrlFingerprint.kt @@ -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") ) \ No newline at end of file diff --git a/src/main/kotlin/app/revanced/patches/shared/imageurlhook/fingerprints/MessageDigestImageUrlParentFingerprint.kt b/src/main/kotlin/app/revanced/patches/shared/imageurlhook/fingerprints/MessageDigestImageUrlParentFingerprint.kt index c5d7c1e6a..69506a5a8 100644 --- a/src/main/kotlin/app/revanced/patches/shared/imageurlhook/fingerprints/MessageDigestImageUrlParentFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/shared/imageurlhook/fingerprints/MessageDigestImageUrlParentFingerprint.kt @@ -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("@#&=*+-_.,:!?()/~'%;\$"), ) \ No newline at end of file diff --git a/src/main/kotlin/app/revanced/patches/shared/imageurlhook/fingerprints/cronet/request/callback/OnFailureFingerprint.kt b/src/main/kotlin/app/revanced/patches/shared/imageurlhook/fingerprints/cronet/request/callback/OnFailureFingerprint.kt index 050f44b47..47016e494 100644 --- a/src/main/kotlin/app/revanced/patches/shared/imageurlhook/fingerprints/cronet/request/callback/OnFailureFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/shared/imageurlhook/fingerprints/cronet/request/callback/OnFailureFingerprint.kt @@ -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" } diff --git a/src/main/kotlin/app/revanced/patches/shared/imageurlhook/fingerprints/cronet/request/callback/OnResponseStartedFingerprint.kt b/src/main/kotlin/app/revanced/patches/shared/imageurlhook/fingerprints/cronet/request/callback/OnResponseStartedFingerprint.kt index 8de8301d0..0b48e4595 100644 --- a/src/main/kotlin/app/revanced/patches/shared/imageurlhook/fingerprints/cronet/request/callback/OnResponseStartedFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/shared/imageurlhook/fingerprints/cronet/request/callback/OnResponseStartedFingerprint.kt @@ -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", diff --git a/src/main/kotlin/app/revanced/patches/shared/imageurlhook/fingerprints/cronet/request/callback/OnSucceededFingerprint.kt b/src/main/kotlin/app/revanced/patches/shared/imageurlhook/fingerprints/cronet/request/callback/OnSucceededFingerprint.kt index 70b291ac9..664fe910c 100644 --- a/src/main/kotlin/app/revanced/patches/shared/imageurlhook/fingerprints/cronet/request/callback/OnSucceededFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/shared/imageurlhook/fingerprints/cronet/request/callback/OnSucceededFingerprint.kt @@ -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" } diff --git a/src/main/kotlin/app/revanced/patches/youtube/alternative/thumbnails/AlternativeThumbnailsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/alternative/thumbnails/AlternativeThumbnailsPatch.kt index 10af0c38b..210ec59e6 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/alternative/thumbnails/AlternativeThumbnailsPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/alternative/thumbnails/AlternativeThumbnailsPatch.kt @@ -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) /** diff --git a/src/main/kotlin/app/revanced/patches/youtube/shorts/components/ShortsComponentPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/shorts/components/ShortsComponentPatch.kt index 7645098b7..7bd645ca9 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/shorts/components/ShortsComponentPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/shorts/components/ShortsComponentPatch.kt @@ -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( diff --git a/src/main/kotlin/app/revanced/patches/youtube/utils/recyclerview/BottomSheetRecyclerViewPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/utils/recyclerview/BottomSheetRecyclerViewPatch.kt index 514d22838..b04544925 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/utils/recyclerview/BottomSheetRecyclerViewPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/utils/recyclerview/BottomSheetRecyclerViewPatch.kt @@ -53,7 +53,8 @@ object BottomSheetRecyclerViewPatch : BytecodePatch( opcode == Opcode.IPUT_OBJECT && getReference()?.type == "Landroid/view/ViewTreeObserver${'$'}OnDrawListener;" } - recyclerViewTreeObserverInsertIndex = getTargetIndexReversedOrThrow(onDrawListenerIndex, Opcode.CHECK_CAST) + 1 + recyclerViewTreeObserverInsertIndex = + getTargetIndexReversedOrThrow(onDrawListenerIndex, Opcode.CHECK_CAST) + 1 } } diff --git a/src/main/kotlin/app/revanced/patches/youtube/utils/resourceid/SharedResourceIdPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/utils/resourceid/SharedResourceIdPatch.kt index 38ed2c2b0..a696b5919 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/utils/resourceid/SharedResourceIdPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/utils/resourceid/SharedResourceIdPatch.kt @@ -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") diff --git a/src/main/kotlin/app/revanced/patches/youtube/video/information/VideoInformationPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/video/information/VideoInformationPatch.kt index 2212b3f62..fd3d96233 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/video/information/VideoInformationPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/video/information/VideoInformationPatch.kt @@ -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) diff --git a/src/main/kotlin/app/revanced/patches/youtube/video/playback/VideoPlaybackPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/video/playback/VideoPlaybackPatch.kt index aa720bb5f..4349c7db2 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/video/playback/VideoPlaybackPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/video/playback/VideoPlaybackPatch.kt @@ -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