From af2a22dd8774c83375ee992e25568f495ecfab76 Mon Sep 17 00:00:00 2001 From: oSumAtrIX Date: Wed, 23 Nov 2022 00:20:46 +0100 Subject: [PATCH] feat!: apply changes from ReVanced Patcher --- README-template.md | 2 -- src/main/kotlin/app/revanced/meta/json/Generator.kt | 2 -- src/main/kotlin/app/revanced/meta/json/JsonPatch.kt | 1 - .../hexeditor/ad/fingerprints/PrimaryAdsFingerprint.kt | 6 ------ .../misc/pro/fingerprints/CheckProFingerprint.kt | 6 ------ .../ShowMusicVideoAdsConstructorFingerprint.kt | 7 ------- .../video/fingerprints/ShowMusicVideoAdsFingerprint.kt | 8 -------- .../fingerprints/AllCodecsReferenceFingerprint.kt | 7 +------ .../audio/codecs/fingerprints/CodecsLockFingerprint.kt | 7 +------ .../fingerprints/AudioOnlyEnablerFingerprint.kt | 10 ---------- .../fingerprints/ExclusiveAudioFingerprint.kt | 7 +------ .../CompactHeaderConstructorFingerprint.kt | 6 ------ .../MinimizedPlaybackManagerFingerprint.kt | 6 ------ .../premium/fingerprints/HideGetPremiumFingerprint.kt | 6 ------ .../fingerprints/HideGetPremiumParentFingerprint.kt | 6 ------ .../fingerprints/TasteBuilderConstructorFingerprint.kt | 7 +------ .../fingerprints/PivotBarConstructorFingerprint.kt | 7 +------ .../microg/fingerprints/CastContextFetchFingerprint.kt | 7 ------- .../fingerprints/CastDynamiteModuleFingerprint.kt | 7 ------- .../fingerprints/CastDynamiteModuleV2Fingerprint.kt | 7 ------- .../fingerprints/GooglePlayUtilityFingerprint.kt | 8 -------- .../music/misc/microg/fingerprints/PrimeFingerprint.kt | 7 ------- .../microg/fingerprints/ServiceCheckFingerprint.kt | 7 +------ .../BackgroundPlaybackDisableFingerprint.kt | 7 +------ .../nyx/misc/pro/fingerprints/CheckProFingerprint.kt | 6 ------ .../premiumicon/fingerprints/PremiumIconFingerprint.kt | 6 ------ .../DisableCaptureRestrictionAudioDriverFingerprint.kt | 7 ------- .../fingerprints/AddPremiumNavbarTabFingerprint.kt | 6 ------ .../AddPremiumNavbarTabParentFingerprint.kt | 6 ------ .../fingerprints/CheckLockedThemesFingerprint.kt | 6 ------ .../themeunlock/fingerprints/SetThemeFingerprint.kt | 6 ------ .../fingerprints/ConvertHelpFeedItemListFingerprint.kt | 6 ------ .../ad/fingerprints/FeedItemListCloneFingerprint.kt | 6 ------ .../fingerprints/FeedApiServiceLIZFingerprint.kt | 6 ------ .../fingerprints/ACLCommonShareFingerprint.kt | 6 ------ .../fingerprints/DownloadPathParentFingerprint.kt | 6 ------ .../fingerprints/AwemeGetVideoControlFingerprint.kt | 6 ------ .../fingerprints/SpeedControlParentFingerprint.kt | 6 ------ .../fingerprints/MandatoryLoginServiceFingerprint.kt | 6 ------ .../misc/integrations/fingerprints/InitFingerprint.kt | 6 ------ .../fingerprints/GoogleAuthAvailableFingerprint.kt | 6 ------ .../GoogleOneTapAuthAvailableFingerprint.kt | 6 ------ .../fingerprints/AboutOnClickMethodFingerprint.kt | 6 ------ .../AdPersonalizationActivityOnCreateFingerprint.kt | 6 ------ .../fingerprints/SettingsOnViewCreatedFingerprint.kt | 6 ------ .../fingerprints/SettingsStatusLoadFingerprint.kt | 6 ------ .../fingerprints/AudioAdsPresenterPlayFingerprint.kt | 6 ------ .../ad/video/fingerprints/AdsManagerFingerprint.kt | 6 ------ .../CheckAdEligibilityLambdaFingerprint.kt | 7 ------- .../fingerprints/ContentConfigShowAdsFingerprint.kt | 6 ------ .../DeletedMessageClickableSpanCtorFingerprint.kt | 7 ------- .../fingerprints/SetHasModAccessFingerprint.kt | 6 ------ .../fingerprints/IsDebugConfigEnabledFingerprint.kt | 6 ------ .../fingerprints/IsOmVerificationEnabledFingerprint.kt | 6 ------ .../fingerprints/ShouldShowDebugOptionsFingerprint.kt | 6 ------ .../fingerprints/TimelineTweetJsonParserFingerprint.kt | 6 ------ .../fingerprints/GetCertMessagingFingerprint.kt | 6 ------ .../fingerprints/GetCertRegistrationFingerprint.kt | 6 ------ .../fingerprints/PromoCodeUnlockFingerprint.kt | 7 ------- .../fingerprints/ReelConstructorFingerprint.kt | 6 ------ .../ad/video/fingerprints/LoadVideoAdsFingerprint.kt | 6 ------ .../seekbar/fingerprints/SeekbarTappingFingerprint.kt | 7 +------ .../fingerprints/SeekbarTappingParentFingerprint.kt | 7 +------ .../SwipeControlsHostActivityFingerprint.kt | 7 ------- .../fingerprints/StartVideoInformerFingerprint.kt | 7 +------ .../SubtitleButtonControllerFingerprint.kt | 6 ------ .../fingerprints/SubtitleTrackFingerprint.kt | 6 ------ .../fingerprints/AutoNavInformerFingerprint.kt | 6 ------ .../fingerprints/LayoutConstructorFingerprint.kt | 6 ------ .../fingerprints/ShortsCommentsButtonFingerprint.kt | 6 ------ .../fingerprints/FullscreenViewAdderFingerprint.kt | 6 ------ .../FullscreenViewAdderParentFingerprint.kt | 6 ------ .../bytecode/fingerprints/AlbumCardsFingerprint.kt | 6 ------ .../fingerprints/CrowdfundingBoxFingerprint.kt | 6 ------ .../bytecode/fingerprints/LayoutCircleFingerprint.kt | 6 ------ .../bytecode/fingerprints/LayoutIconFingerprint.kt | 6 ------ .../bytecode/fingerprints/LayoutVideoFingerprint.kt | 6 ------ .../fingerprints/InfocardsIncognitoFingerprint.kt | 6 ------ .../InfocardsIncognitoParentFingerprint.kt | 6 ------ .../fingerprints/InfocardsMethodCallFingerprint.kt | 6 ------ .../fingerprints/CreateMixPlaylistFingerprint.kt | 6 ------ .../fingerprints/SecondCreateMixPlaylistFingerprint.kt | 6 ------ .../fingerprints/TimeCounterFingerprint.kt | 7 +------ .../fingerprints/QualityMenuViewInflateFingerprint.kt | 6 ------ .../AccountSwitcherAccessibilityLabelFingerprint.kt | 6 ------ .../PivotBarCreateButtonViewFingerprint.kt | 6 ------ .../pivotbar/fingerprints/PivotBarFingerprint.kt | 6 ------ .../fingerprints/PivotBarEnumFingerprint.kt | 6 ------ .../PivotBarShortsButtonViewFingerprint.kt | 6 ------ .../EngagementPanelControllerFingerprint.kt | 7 +------ .../layout/reels/fingerprints/HideReelsFingerprint.kt | 6 ------ .../fingerprints/DislikeFingerprint.kt | 6 ------ .../fingerprints/LikeFingerprint.kt | 7 +------ .../fingerprints/RemoveLikeFingerprint.kt | 6 ------ .../fingerprints/TextComponentFingerprint.kt | 6 ------ .../fingerprints/TextComponentSpecParentFingerprint.kt | 6 ------ .../bytecode/fingerprints/AppendTimeFingerprint.kt | 7 ------- .../CreateVideoPlayerSeekbarFingerprint.kt | 6 ------ .../fingerprints/NextGenWatchLayoutFingerprint.kt | 7 ------- .../PlayerOverlaysLayoutInitFingerprint.kt | 7 ------- .../RectangleFieldInvalidatorFingerprint.kt | 6 ------ .../fingerprints/ShortsPlayerConstructorFingerprint.kt | 7 +------ .../fingerprints/UserWasInShortsFingerprint.kt | 7 +------ .../MiniPlayerDimensionsCalculatorFingerprint.kt | 7 +------ .../fingerprints/MiniPlayerOverrideFingerprint.kt | 6 ------ .../MiniPlayerOverrideNoContextFingerprint.kt | 6 ------ .../MiniPlayerResponseModelSizeCheckFingerprint.kt | 6 ------ .../layout/theme/fingerprints/LithoThemeFingerprint.kt | 6 ------ .../watchinvr/fingerprints/WatchinVRFingerprint.kt | 6 ------ .../watermark/fingerprints/HideWatermarkFingerprint.kt | 6 ------ .../fingerprints/HideWatermarkParentFingerprint.kt | 6 ------ .../fingerprints/WideSearchbarOneFingerprint.kt | 7 ------- .../fingerprints/WideSearchbarOneParentFingerprint.kt | 6 ------ .../fingerprints/WideSearchbarTwoFingerprint.kt | 7 ------- .../fingerprints/WideSearchbarTwoParentFingerprint.kt | 6 ------ .../autorepeat/fingerprints/AutoRepeatFingerprint.kt | 6 ------ .../fingerprints/AutoRepeatParentFingerprint.kt | 6 ------ .../fingerprints/UserAgentHeaderBuilderFingerprint.kt | 7 ------- .../fingerprints/HDRBrightnessFingerprint.kt | 6 ------ .../misc/integrations/fingerprints/InitFingerprint.kt | 6 ------ .../integrations/fingerprints/ServiceFingerprint.kt | 6 ------ .../fingerprints/StandalonePlayerFingerprint.kt | 6 ------ .../fingerprints/ComponentContextParserFingerprint.kt | 6 ------ .../fingerprints/EmptyComponentBuilderFingerprint.kt | 6 ------ .../microg/fingerprints/CastContextFetchFingerprint.kt | 6 ------ .../fingerprints/CastDynamiteModuleFingerprint.kt | 6 ------ .../fingerprints/CastDynamiteModuleV2Fingerprint.kt | 6 ------ .../fingerprints/GooglePlayUtilityFingerprint.kt | 6 ------ .../microg/fingerprints/IntegrityCheckFingerprint.kt | 6 ------ .../misc/microg/fingerprints/PrimeFingerprint.kt | 6 ------ .../microg/fingerprints/ServiceCheckFingerprint.kt | 6 ------ .../fingerprints/MinimizedPlaybackKidsFingerprint.kt | 6 ------ .../MinimizedPlaybackManagerFingerprint.kt | 7 +------ .../MinimizedPlaybackSettingsFingerprint.kt | 7 +------ .../fingerprints/BottomControlsInflateFingerprint.kt | 6 ------ .../PlayerControlsVisibilityFingerprint.kt | 6 ------ .../PlayerOverlaysOnFinishInflateFingerprint.kt | 6 ------ .../fingerprint/UpdatePlayerTypeFingerprint.kt | 7 ------- .../fingerprints/LicenseActivityFingerprint.kt | 8 -------- .../bytecode/fingerprints/ThemeSetterAppFingerprint.kt | 6 ------ .../fingerprints/ThemeSetterSystemFingerprint.kt | 7 ------- .../CreateVideoPlayerSeekbarFingerprint.kt | 7 ------- .../PlayerControllerSetTimeReferenceFingerprint.kt | 8 +------- .../information/fingerprints/PlayerInitFingerprint.kt | 7 ------- .../video/information/fingerprints/SeekFingerprint.kt | 7 ------- .../information/fingerprints/VideoLengthFingerprint.kt | 8 +------- .../information/fingerprints/VideoTimeFingerprint.kt | 7 ------- .../fingerprints/VideoQualityReferenceFingerprint.kt | 6 ------ .../fingerprints/VideoQualitySetterFingerprint.kt | 7 ------- .../fingerprints/VideoUserQualityChangeFingerprint.kt | 6 ------ .../fingerprints/SpeedArrayGeneratorFingerprint.kt | 8 -------- .../custom/fingerprints/SpeedLimiterFingerprint.kt | 8 -------- .../custom/fingerprints/VideoSpeedPatchFingerprint.kt | 6 ------ .../video/videoid/fingerprint/VideoIdFingerprint.kt | 7 ------- .../videobuffer/fingerprints/MaxBufferFingerprint.kt | 7 ------- .../fingerprints/PlaybackBufferFingerprint.kt | 7 ------- .../videobuffer/fingerprints/ReBufferFingerprint.kt | 7 ------- .../zoomhaptics/fingerprints/ZoomHapticsFingerprint.kt | 1 - .../fingerprints/WatchWhileActivityFingerprint.kt | 7 ------- 159 files changed, 20 insertions(+), 980 deletions(-) diff --git a/README-template.md b/README-template.md index d6c75707b..f9ddf51ba 100644 --- a/README-template.md +++ b/README-template.md @@ -18,7 +18,6 @@ The file contains an array of objects, each object representing a patch. The obj | `description` | The description of the patch. | | `version` | The version of the patch. | | `excluded` | Whether the patch is excluded by default. If `true`, the patch must never be included by default. | -| `deprecated` | Whether the patch is deprecated. | | `options` | An array of options for this patch. | | `options.key` | The key of the option. | | `options.title` | The title of the option. | @@ -39,7 +38,6 @@ Example: "description": "Adds the ability to remember the video quality you chose in the video quality flyout.", "version": "0.0.1", "excluded": false, - "deprecated": false, "options": [], "dependencies": [ "integrations", diff --git a/src/main/kotlin/app/revanced/meta/json/Generator.kt b/src/main/kotlin/app/revanced/meta/json/Generator.kt index b7a87a439..cc762ee62 100644 --- a/src/main/kotlin/app/revanced/meta/json/Generator.kt +++ b/src/main/kotlin/app/revanced/meta/json/Generator.kt @@ -3,7 +3,6 @@ package app.revanced.meta.json import app.revanced.meta.Bundle import app.revanced.patcher.extensions.PatchExtensions.compatiblePackages import app.revanced.patcher.extensions.PatchExtensions.dependencies -import app.revanced.patcher.extensions.PatchExtensions.deprecated import app.revanced.patcher.extensions.PatchExtensions.description import app.revanced.patcher.extensions.PatchExtensions.include import app.revanced.patcher.extensions.PatchExtensions.options @@ -22,7 +21,6 @@ fun generateJson(bundle: Bundle) { it.description ?: "This patch has no description.", it.version ?: "0.0.0", !it.include, - it.deprecated != null, it.options?.map { option -> Option( option.key, diff --git a/src/main/kotlin/app/revanced/meta/json/JsonPatch.kt b/src/main/kotlin/app/revanced/meta/json/JsonPatch.kt index 9099fc31e..8a0d597cc 100644 --- a/src/main/kotlin/app/revanced/meta/json/JsonPatch.kt +++ b/src/main/kotlin/app/revanced/meta/json/JsonPatch.kt @@ -7,7 +7,6 @@ data class JsonPatch( val description: String, val version: String, val excluded: Boolean, - val deprecated: Boolean, val options: Array