mirror of
https://github.com/revanced/revanced-patches
synced 2024-11-20 17:36:51 +01:00
chore: merge branch dev to main (#1943)
This commit is contained in:
oSumAtrIX
GitHub
commit
6c9741fdc3
2
.github/config.yml
vendored
Normal file
2
.github/config.yml
vendored
Normal file
@ -0,0 +1,2 @@
|
||||
firstPRMergeComment: >
|
||||
Thank you for contributing to ReVanced. Join us on [Discord](https://revanced.app/discord) if you want to receive a contributor role.
|
||||
46
CHANGELOG.md
46
CHANGELOG.md
@ -1,3 +1,49 @@
|
||||
# [2.170.0-dev.1](https://github.com/revanced/revanced-patches/compare/v2.169.1-dev.4...v2.170.0-dev.1) (2023-04-24)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* **youtube/tablet-mini-player:** throw if fingerprint fails to resolve ([c78ab33](https://github.com/revanced/revanced-patches/commit/c78ab33a8d41694aaee60d0a3d99c51c95085489))
|
||||
|
||||
|
||||
### Features
|
||||
|
||||
* **youtube/wide-searchbar:** rename patch ([ac9ad79](https://github.com/revanced/revanced-patches/commit/ac9ad79f2ff4fbe4fa73b80bae88d12a03a287d7))
|
||||
* **youtube:** bump compatibility to `18.15.40` ([72008da](https://github.com/revanced/revanced-patches/commit/72008da28637bb6b4bf6f0e0ae1b6bce584dd696))
|
||||
* **youtube:** bump compatibility to `18.15.40` ([#1964](https://github.com/revanced/revanced-patches/issues/1964)) ([c4c6653](https://github.com/revanced/revanced-patches/commit/c4c6653c37b9675ff0f7b0f29470342c99caba34))
|
||||
* **youtube:** constrain patches to `18.15.40` ([dfbf8ab](https://github.com/revanced/revanced-patches/commit/dfbf8ab206e779fe2624d5f62c5dab170d68fce5))
|
||||
* **youtube:** remove non working patch `hide-my-mix` ([f8ea2cf](https://github.com/revanced/revanced-patches/commit/f8ea2cf3bcec3ec4bfb424ed8e4a640b505387d7))
|
||||
* **youtube:** support version `18.15.40` ([b2916a3](https://github.com/revanced/revanced-patches/commit/b2916a379a631481c0750e312d04a4c9e82590d6))
|
||||
|
||||
## [2.169.1-dev.4](https://github.com/revanced/revanced-patches/compare/v2.169.1-dev.3...v2.169.1-dev.4) (2023-04-23)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* **twitch/block-embedded-ads:** correct spelling mistake ([#1962](https://github.com/revanced/revanced-patches/issues/1962)) ([100d9dd](https://github.com/revanced/revanced-patches/commit/100d9dd7e0b9d83a96fb25c2ffda06fc018830e4))
|
||||
|
||||
## [2.169.1-dev.3](https://github.com/revanced/revanced-patches/compare/v2.169.1-dev.2...v2.169.1-dev.3) (2023-04-23)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* **youtube/hide-video-action-buttons:** fix hide action buttons not working for some users ([#1959](https://github.com/revanced/revanced-patches/issues/1959)) ([3ff1489](https://github.com/revanced/revanced-patches/commit/3ff1489b32968e9bad3361f924b7079e7b6f29e2))
|
||||
|
||||
## [2.169.1-dev.2](https://github.com/revanced/revanced-patches/compare/v2.169.1-dev.1...v2.169.1-dev.2) (2023-04-21)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* **"enable-android-debugging:** don't include by default ([14b2128](https://github.com/revanced/revanced-patches/commit/14b212844f308b95ad6ed02c455716cd84c0db01))
|
||||
|
||||
## [2.169.1-dev.1](https://github.com/revanced/revanced-patches/compare/v2.169.0...v2.169.1-dev.1) (2023-04-21)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* **youtube/sponsorblock:** correct spelling mistake ([#1941](https://github.com/revanced/revanced-patches/issues/1941)) ([d9d0fe7](https://github.com/revanced/revanced-patches/commit/d9d0fe7e236ccce348e8b3214454d29656a853c0))
|
||||
* **youtube/sponsorblock:** use lowercase letters for URL string ([#1942](https://github.com/revanced/revanced-patches/issues/1942)) ([b58842a](https://github.com/revanced/revanced-patches/commit/b58842a5f6f3fbcf06e87821bbc1ad3be7ca2fc0))
|
||||
|
||||
# [2.169.0](https://github.com/revanced/revanced-patches/compare/v2.168.0...v2.169.0) (2023-04-21)
|
||||
|
||||
|
||||
|
||||
93
README.md
93
README.md
@ -9,60 +9,59 @@ The official Patch bundle provided by ReVanced and the community.
|
||||
|
||||
| 💊 Patch | 📜 Description | 🏹 Target Version |
|
||||
|:--------:|:--------------:|:-----------------:|
|
||||
| `always-autorepeat` | Always repeats the playing video again. | 18.08.37 |
|
||||
| `always-autorepeat` | Always repeats the playing video again. | 18.15.40 |
|
||||
| `client-spoof` | Spoofs a patched client to allow playback. | all |
|
||||
| `comments` | Hides components related to comments. | 18.08.37 |
|
||||
| `copy-video-url` | Adds buttons in player to copy video links. | 18.08.37 |
|
||||
| `comments` | Hides components related to comments. | 18.15.40 |
|
||||
| `copy-video-url` | Adds buttons in player to copy video links. | 18.15.40 |
|
||||
| `custom-branding` | Changes the YouTube launcher icon and name to your choice (defaults to ReVanced). | all |
|
||||
| `custom-video-buffer` | Lets you change the buffers of videos. | 18.08.37 |
|
||||
| `custom-video-speed` | Adds more video speed options. | 18.08.37 |
|
||||
| `disable-auto-captions` | Disable forced captions from being automatically enabled. | 18.08.37 |
|
||||
| `disable-fullscreen-panels` | Disables video description and comments panel in fullscreen view. | 18.08.37 |
|
||||
| `disable-player-popup-panels` | Disables panels from appearing automatically when going into fullscreen (playlist or live chat). | 18.08.37 |
|
||||
| `disable-shorts-on-startup` | Disables playing YouTube Shorts when launching YouTube. | 18.08.37 |
|
||||
| `custom-video-buffer` | Lets you change the buffers of videos. | 18.15.40 |
|
||||
| `custom-video-speed` | Adds more video speed options. | 18.15.40 |
|
||||
| `disable-auto-captions` | Disable forced captions from being automatically enabled. | 18.15.40 |
|
||||
| `disable-fullscreen-panels` | Disables video description and comments panel in fullscreen view. | 18.15.40 |
|
||||
| `disable-player-popup-panels` | Disables panels from appearing automatically when going into fullscreen (playlist or live chat). | 18.15.40 |
|
||||
| `disable-shorts-on-startup` | Disables playing YouTube Shorts when launching YouTube. | 18.15.40 |
|
||||
| `disable-zoom-haptics` | Disables haptics when zooming. | all |
|
||||
| `downloads` | Enables downloading music and videos from YouTube. | 18.08.37 |
|
||||
| `downloads` | Enables downloading music and videos from YouTube. | 18.15.40 |
|
||||
| `enable-debugging` | Adds debugging options. | all |
|
||||
| `enable-wide-searchbar` | Replaces the search icon with a wide search bar. This will hide the YouTube logo when active. | 18.08.37 |
|
||||
| `general-ads` | Removes general ads. | 18.08.37 |
|
||||
| `hdr-auto-brightness` | Makes the brightness of HDR videos follow the system default. | 18.08.37 |
|
||||
| `hide-album-cards` | Hides the album cards below the artist description. | 18.08.37 |
|
||||
| `hide-artist-card` | Hides the artist card below the searchbar. | 18.08.37 |
|
||||
| `hide-autoplay-button` | Hides the autoplay button in the video player. | 18.08.37 |
|
||||
| `hide-breaking-news-shelf` | Hides the breaking news shelf on the homepage tab. | 18.08.37 |
|
||||
| `hide-captions-button` | Hides the captions button on video player. | 18.08.37 |
|
||||
| `general-ads` | Removes general ads. | 18.15.40 |
|
||||
| `hdr-auto-brightness` | Makes the brightness of HDR videos follow the system default. | 18.15.40 |
|
||||
| `hide-album-cards` | Hides the album cards below the artist description. | 18.15.40 |
|
||||
| `hide-artist-card` | Hides the artist card below the searchbar. | 18.15.40 |
|
||||
| `hide-autoplay-button` | Hides the autoplay button in the video player. | 18.15.40 |
|
||||
| `hide-breaking-news-shelf` | Hides the breaking news shelf on the homepage tab. | 18.15.40 |
|
||||
| `hide-captions-button` | Hides the captions button on video player. | 18.15.40 |
|
||||
| `hide-cast-button` | Hides the cast button in the video player. | all |
|
||||
| `hide-create-button` | Hides the create button in the navigation bar. | 18.08.37 |
|
||||
| `hide-crowdfunding-box` | Hides the crowdfunding box between the player and video description. | 18.08.37 |
|
||||
| `hide-email-address` | Hides the email address in the account switcher. | 18.08.37 |
|
||||
| `hide-endscreen-cards` | Hides the suggested video cards at the end of a video in fullscreen. | 18.08.37 |
|
||||
| `hide-floating-microphone-button` | Hides the floating microphone button which appears in search. | 18.08.37 |
|
||||
| `hide-info-cards` | Hides info cards in videos. | 18.08.37 |
|
||||
| `hide-my-mix` | Hides mix playlists. | 18.08.37 |
|
||||
| `hide-create-button` | Hides the create button in the navigation bar. | 18.15.40 |
|
||||
| `hide-crowdfunding-box` | Hides the crowdfunding box between the player and video description. | 18.15.40 |
|
||||
| `hide-email-address` | Hides the email address in the account switcher. | 18.15.40 |
|
||||
| `hide-endscreen-cards` | Hides the suggested video cards at the end of a video in fullscreen. | 18.15.40 |
|
||||
| `hide-floating-microphone-button` | Hides the floating microphone button which appears in search. | 18.15.40 |
|
||||
| `hide-info-cards` | Hides info cards in videos. | 18.15.40 |
|
||||
| `hide-player-buttons` | Adds the option to hide video player previous and next buttons. | all |
|
||||
| `hide-seekbar` | Hides the seekbar. | 18.08.37 |
|
||||
| `hide-shorts-button` | Hides the shorts button on the navigation bar. | 18.08.37 |
|
||||
| `hide-timestamp` | Hides timestamp in video player. | 18.08.37 |
|
||||
| `hide-video-action-buttons` | Adds the options to hide action buttons under a video. | 18.08.37 |
|
||||
| `hide-watch-in-vr` | Hides the option to watch in VR from the player settings flyout panel. | 18.08.37 |
|
||||
| `hide-watermark` | Hides creator's watermarks on videos. | 18.08.37 |
|
||||
| `minimized-playback` | Enables minimized and background playback. | 18.08.37 |
|
||||
| `old-quality-layout` | Enables the original video quality flyout in the video player settings | 18.08.37 |
|
||||
| `open-links-externally` | Open links outside of the app directly in your browser. | 18.08.37 |
|
||||
| `hide-seekbar` | Hides the seekbar. | 18.15.40 |
|
||||
| `hide-shorts-button` | Hides the shorts button on the navigation bar. | 18.15.40 |
|
||||
| `hide-timestamp` | Hides timestamp in video player. | 18.15.40 |
|
||||
| `hide-video-action-buttons` | Adds the options to hide action buttons under a video. | 18.15.40 |
|
||||
| `hide-watch-in-vr` | Hides the option to watch in VR from the player settings flyout panel. | 18.15.40 |
|
||||
| `hide-watermark` | Hides creator's watermarks on videos. | 18.15.40 |
|
||||
| `minimized-playback` | Enables minimized and background playback. | 18.15.40 |
|
||||
| `old-quality-layout` | Enables the original video quality flyout in the video player settings | 18.15.40 |
|
||||
| `open-links-externally` | Open links outside of the app directly in your browser. | 18.15.40 |
|
||||
| `premium-heading` | Shows premium branding on the home screen. | all |
|
||||
| `remember-playback-speed` | Adds the ability to remember the playback speed you chose in the video playback speed flyout. | 18.08.37 |
|
||||
| `remember-video-quality` | Adds the ability to remember the video quality you chose in the video quality flyout. | 18.08.37 |
|
||||
| `remove-player-button-background` | Removes the background from the video player buttons. | 18.08.37 |
|
||||
| `return-youtube-dislike` | Shows the dislike count of videos using the Return YouTube Dislike API. | 18.08.37 |
|
||||
| `seekbar-tapping` | Enables tap-to-seek on the seekbar of the video player. | 18.08.37 |
|
||||
| `sponsorblock` | Integrates SponsorBlock which allows skipping video segments such as sponsored content. | 18.08.37 |
|
||||
| `spoof-app-version` | Tricks YouTube into thinking, you are running an older version of the app. One of the side effects also includes restoring the old UI. | 18.08.37 |
|
||||
| `spoof-signature-verification` | Spoofs a patched client to prevent playback issues. | 18.08.37 |
|
||||
| `swipe-controls` | Adds volume and brightness swipe controls. | 18.08.37 |
|
||||
| `tablet-mini-player` | Enables the tablet mini player layout. | 18.08.37 |
|
||||
| `remember-playback-speed` | Adds the ability to remember the playback speed you chose in the video playback speed flyout. | 18.15.40 |
|
||||
| `remember-video-quality` | Adds the ability to remember the video quality you chose in the video quality flyout. | 18.15.40 |
|
||||
| `remove-player-button-background` | Removes the background from the video player buttons. | 18.15.40 |
|
||||
| `return-youtube-dislike` | Shows the dislike count of videos using the Return YouTube Dislike API. | 18.15.40 |
|
||||
| `seekbar-tapping` | Enables tap-to-seek on the seekbar of the video player. | 18.15.40 |
|
||||
| `sponsorblock` | Integrates SponsorBlock which allows skipping video segments such as sponsored content. | 18.15.40 |
|
||||
| `spoof-app-version` | Tricks YouTube into thinking, you are running an older version of the app. One of the side effects also includes restoring the old UI. | 18.15.40 |
|
||||
| `spoof-signature-verification` | Spoofs a patched client to prevent playback issues. | 18.15.40 |
|
||||
| `swipe-controls` | Adds volume and brightness swipe controls. | 18.15.40 |
|
||||
| `tablet-mini-player` | Enables the tablet mini player layout. | 18.15.40 |
|
||||
| `theme` | Applies a custom theme. | all |
|
||||
| `vanced-microg-support` | Allows YouTube ReVanced to run without root and under a different package name with Vanced MicroG. | 18.08.37 |
|
||||
| `video-ads` | Removes ads in the video player. | 18.08.37 |
|
||||
| `vanced-microg-support` | Allows YouTube ReVanced to run without root and under a different package name with Vanced MicroG. | 18.15.40 |
|
||||
| `video-ads` | Removes ads in the video player. | 18.15.40 |
|
||||
| `wide-searchbar` | Replaces the search icon with a wide search bar. This will hide the YouTube logo when active. | 18.15.40 |
|
||||
</details>
|
||||
|
||||
### [📦 `com.google.android.apps.youtube.music`](https://play.google.com/store/apps/details?id=com.google.android.apps.youtube.music)
|
||||
@ -121,7 +120,7 @@ The official Patch bundle provided by ReVanced and the community.
|
||||
| 💊 Patch | 📜 Description | 🏹 Target Version |
|
||||
|:--------:|:--------------:|:-----------------:|
|
||||
| `block-audio-ads` | Blocks audio ads in streams and VODs. | 14.6.1 |
|
||||
| `block-embedded-ads` | Blocks embedded steam ads using services like TTV.lol or PurpleAdBlocker. | 14.6.1 |
|
||||
| `block-embedded-ads` | Blocks embedded stream ads using services like TTV.lol or PurpleAdBlocker. | 14.6.1 |
|
||||
| `block-video-ads` | Blocks video ads in streams and VODs. | 14.6.1 |
|
||||
| `debug-mode` | Enables Twitch's internal debugging mode. | all |
|
||||
| `settings` | Adds settings menu to Twitch. | all |
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
kotlin.code.style = official
|
||||
version = 2.169.0
|
||||
version = 2.170.0-dev.1
|
||||
|
||||
File diff suppressed because one or more lines are too long
@ -5,11 +5,10 @@ import app.revanced.patcher.annotation.Name
|
||||
import app.revanced.patcher.annotation.Version
|
||||
import app.revanced.patcher.data.ResourceContext
|
||||
import app.revanced.patcher.patch.*
|
||||
import app.revanced.patcher.patch.annotations.DependsOn
|
||||
import app.revanced.patcher.patch.annotations.Patch
|
||||
import org.w3c.dom.Element
|
||||
|
||||
@Patch
|
||||
@Patch(false)
|
||||
@Name("enable-android-debugging")
|
||||
@Description("Enables Android debugging capabilities.")
|
||||
@Version("0.0.1")
|
||||
@ -24,7 +24,7 @@ import app.revanced.patches.twitch.misc.settings.bytecode.patch.SettingsPatch
|
||||
@Patch
|
||||
@DependsOn([VideoAdsPatch::class, IntegrationsPatch::class, SettingsPatch::class])
|
||||
@Name("block-embedded-ads")
|
||||
@Description("Blocks embedded steam ads using services like TTV.lol or PurpleAdBlocker.")
|
||||
@Description("Blocks embedded stream ads using services like TTV.lol or PurpleAdBlocker.")
|
||||
@EmbeddedAdsCompatibility
|
||||
@Version("0.0.1")
|
||||
class EmbeddedAdsPatch : BytecodePatch(
|
||||
|
||||
@ -14,7 +14,8 @@ import app.revanced.patcher.annotation.Package
|
||||
"18.05.32",
|
||||
"18.05.35",
|
||||
"18.05.40",
|
||||
"18.08.37"
|
||||
"18.08.37",
|
||||
"18.15.40"
|
||||
)
|
||||
)]
|
||||
)
|
||||
|
||||
@ -14,7 +14,8 @@ import app.revanced.patcher.annotation.Package
|
||||
"18.05.32",
|
||||
"18.05.35",
|
||||
"18.05.40",
|
||||
"18.08.37"
|
||||
"18.08.37",
|
||||
"18.15.40"
|
||||
)
|
||||
)]
|
||||
)
|
||||
|
||||
@ -14,7 +14,8 @@ import app.revanced.patcher.annotation.Package
|
||||
"18.05.32",
|
||||
"18.05.35",
|
||||
"18.05.40",
|
||||
"18.08.37"
|
||||
"18.08.37",
|
||||
"18.15.40"
|
||||
)
|
||||
)]
|
||||
)
|
||||
|
||||
@ -14,7 +14,8 @@ import app.revanced.patcher.annotation.Package
|
||||
"18.05.32",
|
||||
"18.05.35",
|
||||
"18.05.40",
|
||||
"18.08.37"
|
||||
"18.08.37",
|
||||
"18.15.40"
|
||||
)
|
||||
)]
|
||||
)
|
||||
|
||||
@ -14,7 +14,8 @@ import app.revanced.patcher.annotation.Package
|
||||
"18.05.32",
|
||||
"18.05.35",
|
||||
"18.05.40",
|
||||
"18.08.37"
|
||||
"18.08.37",
|
||||
"18.15.40"
|
||||
)
|
||||
)]
|
||||
)
|
||||
|
||||
@ -14,7 +14,8 @@ import app.revanced.patcher.annotation.Package
|
||||
"18.05.32",
|
||||
"18.05.35",
|
||||
"18.05.40",
|
||||
"18.08.37"
|
||||
"18.08.37",
|
||||
"18.15.40"
|
||||
)
|
||||
)]
|
||||
)
|
||||
|
||||
@ -14,7 +14,8 @@ import app.revanced.patcher.annotation.Package
|
||||
"18.05.32",
|
||||
"18.05.35",
|
||||
"18.05.40",
|
||||
"18.08.37"
|
||||
"18.08.37",
|
||||
"18.15.40"
|
||||
)
|
||||
)]
|
||||
)
|
||||
|
||||
@ -14,7 +14,8 @@ import app.revanced.patcher.annotation.Package
|
||||
"18.05.32",
|
||||
"18.05.35",
|
||||
"18.05.40",
|
||||
"18.08.37"
|
||||
"18.08.37",
|
||||
"18.15.40"
|
||||
)
|
||||
)]
|
||||
)
|
||||
|
||||
@ -51,12 +51,21 @@ class HideButtonsPatch : ResourcePatch {
|
||||
StringResource("revanced_hide_playlist_button_summary_on", "Playlist button is hidden"),
|
||||
StringResource("revanced_hide_playlist_button_summary_off", "Playlist button is shown")
|
||||
),
|
||||
SwitchPreference(
|
||||
"revanced_hide_clip_button",
|
||||
StringResource("revanced_hide_clip_button_title", "Hide clip button"),
|
||||
false,
|
||||
StringResource("revanced_hide_clip_button_summary_on", "Clip button is hidden"),
|
||||
StringResource("revanced_hide_clip_button_summary_off", "Clip button is shown"),
|
||||
StringResource("revanced_hide_clip_button_user_dialog_message",
|
||||
"Hiding the clip button might not work reliably. In the case it does not work, it can only be hidden by enabling \\'Hide all other action buttons\\'")
|
||||
),
|
||||
SwitchPreference(
|
||||
"revanced_hide_action_buttons",
|
||||
StringResource("revanced_hide_action_buttons_title", "Hide all other action buttons"),
|
||||
false,
|
||||
StringResource("revanced_hide_action_buttons_summary_on", "Share, remix, clip, thanks, shop, live chat buttons are hidden"),
|
||||
StringResource("revanced_hide_action_buttons_summary_off", "Share, remix, clip, thanks, shop, live chat buttons are shown")
|
||||
StringResource("revanced_hide_action_buttons_summary_on", "Share, remix, thanks, shop, live chat buttons are hidden"),
|
||||
StringResource("revanced_hide_action_buttons_summary_off", "Share, remix, thanks, shop, live chat buttons are shown")
|
||||
)
|
||||
),
|
||||
StringResource("revanced_hide_buttons_summary", "Hide or show buttons under videos")
|
||||
|
||||
@ -14,7 +14,8 @@ import app.revanced.patcher.annotation.Package
|
||||
"18.05.32",
|
||||
"18.05.35",
|
||||
"18.05.40",
|
||||
"18.08.37"
|
||||
"18.08.37",
|
||||
"18.15.40"
|
||||
)
|
||||
)]
|
||||
)
|
||||
|
||||
@ -14,7 +14,8 @@ import app.revanced.patcher.annotation.Package
|
||||
"18.05.32",
|
||||
"18.05.35",
|
||||
"18.05.40",
|
||||
"18.08.37"
|
||||
"18.08.37",
|
||||
"18.15.40"
|
||||
)
|
||||
)]
|
||||
)
|
||||
|
||||
@ -14,7 +14,8 @@ import app.revanced.patcher.annotation.Package
|
||||
"18.05.32",
|
||||
"18.05.35",
|
||||
"18.05.40",
|
||||
"18.08.37"
|
||||
"18.08.37",
|
||||
"18.15.40"
|
||||
)
|
||||
)]
|
||||
)
|
||||
|
||||
@ -13,7 +13,8 @@ import app.revanced.patcher.annotation.Package
|
||||
"18.05.32",
|
||||
"18.05.35",
|
||||
"18.05.40",
|
||||
"18.08.37"
|
||||
"18.08.37",
|
||||
"18.15.40"
|
||||
)
|
||||
)]
|
||||
)
|
||||
|
||||
@ -14,7 +14,8 @@ import app.revanced.patcher.annotation.Package
|
||||
"18.05.32",
|
||||
"18.05.35",
|
||||
"18.05.40",
|
||||
"18.08.37"
|
||||
"18.08.37",
|
||||
"18.15.40"
|
||||
)
|
||||
)]
|
||||
)
|
||||
|
||||
@ -14,7 +14,8 @@ import app.revanced.patcher.annotation.Package
|
||||
"18.05.32",
|
||||
"18.05.35",
|
||||
"18.05.40",
|
||||
"18.08.37"
|
||||
"18.08.37",
|
||||
"18.15.40"
|
||||
)
|
||||
)]
|
||||
)
|
||||
|
||||
@ -14,7 +14,8 @@ import app.revanced.patcher.annotation.Package
|
||||
"18.05.32",
|
||||
"18.05.35",
|
||||
"18.05.40",
|
||||
"18.08.37"
|
||||
"18.08.37",
|
||||
"18.15.40"
|
||||
)
|
||||
)]
|
||||
)
|
||||
|
||||
@ -14,7 +14,8 @@ import app.revanced.patcher.annotation.Package
|
||||
"18.05.32",
|
||||
"18.05.35",
|
||||
"18.05.40",
|
||||
"18.08.37"
|
||||
"18.08.37",
|
||||
"18.15.40"
|
||||
)
|
||||
)]
|
||||
)
|
||||
|
||||
@ -14,7 +14,8 @@ import app.revanced.patcher.annotation.Package
|
||||
"18.05.32",
|
||||
"18.05.35",
|
||||
"18.05.40",
|
||||
"18.08.37"
|
||||
"18.08.37",
|
||||
"18.15.40"
|
||||
)
|
||||
)]
|
||||
)
|
||||
|
||||
@ -14,7 +14,8 @@ import app.revanced.patcher.annotation.Package
|
||||
"18.05.32",
|
||||
"18.05.35",
|
||||
"18.05.40",
|
||||
"18.08.37"
|
||||
"18.08.37",
|
||||
"18.15.40"
|
||||
)
|
||||
)]
|
||||
)
|
||||
@ -14,7 +14,8 @@ import app.revanced.patcher.annotation.Package
|
||||
"18.05.32",
|
||||
"18.05.35",
|
||||
"18.05.40",
|
||||
"18.08.37"
|
||||
"18.08.37",
|
||||
"18.15.40"
|
||||
)
|
||||
)]
|
||||
)
|
||||
|
||||
@ -14,7 +14,8 @@ import app.revanced.patcher.annotation.Package
|
||||
"18.05.32",
|
||||
"18.05.35",
|
||||
"18.05.40",
|
||||
"18.08.37"
|
||||
"18.08.37",
|
||||
"18.15.40"
|
||||
)
|
||||
)]
|
||||
)
|
||||
|
||||
@ -1,22 +0,0 @@
|
||||
package app.revanced.patches.youtube.layout.hide.mixplaylists.annotations
|
||||
|
||||
import app.revanced.patcher.annotation.Compatibility
|
||||
import app.revanced.patcher.annotation.Package
|
||||
|
||||
@Compatibility(
|
||||
[Package(
|
||||
"com.google.android.youtube", arrayOf(
|
||||
"17.49.37",
|
||||
"18.03.36",
|
||||
"18.03.42",
|
||||
"18.04.35",
|
||||
"18.04.41",
|
||||
"18.05.32",
|
||||
"18.05.35",
|
||||
"18.05.40",
|
||||
"18.08.37"
|
||||
)
|
||||
)]
|
||||
)
|
||||
@Target(AnnotationTarget.CLASS)
|
||||
internal annotation class MixPlaylistsPatchCompatibility
|
||||
@ -1,24 +0,0 @@
|
||||
package app.revanced.patches.youtube.layout.hide.mixplaylists.fingerprints
|
||||
|
||||
import app.revanced.patcher.extensions.or
|
||||
import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
|
||||
import org.jf.dexlib2.AccessFlags
|
||||
import org.jf.dexlib2.Opcode
|
||||
|
||||
object CreateMixPlaylistFingerprint : MethodFingerprint(
|
||||
"V", AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR, listOf("L", "L", "L", "L", "L", "L", "L"), listOf(
|
||||
Opcode.INVOKE_DIRECT,
|
||||
Opcode.IPUT_OBJECT,
|
||||
Opcode.INVOKE_VIRTUAL,
|
||||
Opcode.IPUT_OBJECT,
|
||||
Opcode.IPUT_OBJECT,
|
||||
Opcode.IPUT_OBJECT,
|
||||
Opcode.IPUT_OBJECT,
|
||||
Opcode.NEW_INSTANCE,
|
||||
Opcode.INVOKE_DIRECT,
|
||||
Opcode.IPUT_OBJECT,
|
||||
Opcode.IPUT_OBJECT,
|
||||
Opcode.IPUT_OBJECT,
|
||||
Opcode.INVOKE_VIRTUAL,
|
||||
)
|
||||
)
|
||||
@ -1,24 +0,0 @@
|
||||
package app.revanced.patches.youtube.layout.hide.mixplaylists.fingerprints
|
||||
|
||||
import app.revanced.patcher.extensions.or
|
||||
import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
|
||||
import org.jf.dexlib2.AccessFlags
|
||||
import org.jf.dexlib2.Opcode
|
||||
|
||||
object SecondCreateMixPlaylistFingerprint : MethodFingerprint(
|
||||
"V", AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR, listOf("L", "L", "L", "L", "L", "L"), listOf(
|
||||
Opcode.INVOKE_DIRECT,
|
||||
Opcode.IPUT_OBJECT,
|
||||
Opcode.INVOKE_VIRTUAL,
|
||||
Opcode.IPUT_OBJECT,
|
||||
Opcode.IPUT_OBJECT,
|
||||
Opcode.IPUT_OBJECT,
|
||||
Opcode.IPUT_OBJECT,
|
||||
Opcode.NEW_INSTANCE,
|
||||
Opcode.INVOKE_DIRECT,
|
||||
Opcode.IPUT_OBJECT,
|
||||
Opcode.IPUT_OBJECT,
|
||||
Opcode.INVOKE_VIRTUAL,
|
||||
Opcode.RETURN_VOID
|
||||
)
|
||||
)
|
||||
@ -1,64 +0,0 @@
|
||||
package app.revanced.patches.youtube.layout.hide.mixplaylists.patch
|
||||
|
||||
import app.revanced.patcher.annotation.Description
|
||||
import app.revanced.patcher.annotation.Name
|
||||
import app.revanced.patcher.annotation.Version
|
||||
import app.revanced.patcher.data.BytecodeContext
|
||||
import app.revanced.patcher.extensions.addInstruction
|
||||
import app.revanced.patcher.extensions.instruction
|
||||
import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
|
||||
import app.revanced.patcher.patch.BytecodePatch
|
||||
import app.revanced.patcher.patch.PatchResult
|
||||
import app.revanced.patcher.patch.PatchResultSuccess
|
||||
import app.revanced.patcher.patch.annotations.DependsOn
|
||||
import app.revanced.patcher.patch.annotations.Patch
|
||||
import app.revanced.patches.shared.settings.preference.impl.StringResource
|
||||
import app.revanced.patches.shared.settings.preference.impl.SwitchPreference
|
||||
import app.revanced.patches.youtube.layout.hide.mixplaylists.annotations.MixPlaylistsPatchCompatibility
|
||||
import app.revanced.patches.youtube.layout.hide.mixplaylists.fingerprints.CreateMixPlaylistFingerprint
|
||||
import app.revanced.patches.youtube.layout.hide.mixplaylists.fingerprints.SecondCreateMixPlaylistFingerprint
|
||||
import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
|
||||
import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
|
||||
import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
|
||||
|
||||
@Patch
|
||||
@DependsOn([IntegrationsPatch::class])
|
||||
@Name("hide-my-mix")
|
||||
@Description("Hides mix playlists.")
|
||||
@MixPlaylistsPatchCompatibility
|
||||
@Version("0.0.1")
|
||||
class MixPlaylistsPatch : BytecodePatch(
|
||||
listOf(
|
||||
CreateMixPlaylistFingerprint, SecondCreateMixPlaylistFingerprint
|
||||
)
|
||||
) {
|
||||
override fun execute(context: BytecodeContext): PatchResult {
|
||||
SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
|
||||
SwitchPreference(
|
||||
"revanced_hide_mix_playlists",
|
||||
StringResource("revanced_hide_mix_playlists_title", "Hide mix playlists"),
|
||||
false,
|
||||
StringResource("revanced_hide_mix_playlists_summary_on", "Mix playlists are hidden"),
|
||||
StringResource("revanced_hide_mix_playlists_summary_off", "Mix playlists are shown")
|
||||
)
|
||||
)
|
||||
|
||||
arrayOf(CreateMixPlaylistFingerprint, SecondCreateMixPlaylistFingerprint).forEach(::addHook)
|
||||
|
||||
return PatchResultSuccess()
|
||||
}
|
||||
|
||||
private fun addHook(fingerprint: MethodFingerprint) {
|
||||
with (fingerprint.result!!) {
|
||||
val insertIndex = scanResult.patternScanResult!!.endIndex - 3
|
||||
|
||||
val register = (mutableMethod.instruction(insertIndex - 2) as OneRegisterInstruction).registerA
|
||||
|
||||
mutableMethod.addInstruction(
|
||||
insertIndex,
|
||||
"invoke-static {v$register}, Lapp/revanced/integrations/patches/HideMixPlaylistsPatch;->hideMixPlaylists(Landroid/view/View;)V"
|
||||
)
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
@ -14,7 +14,8 @@ import app.revanced.patcher.annotation.Package
|
||||
"18.05.32",
|
||||
"18.05.35",
|
||||
"18.05.40",
|
||||
"18.08.37"
|
||||
"18.08.37",
|
||||
"18.15.40"
|
||||
)
|
||||
)]
|
||||
)
|
||||
|
||||
@ -14,7 +14,8 @@ import app.revanced.patcher.annotation.Package
|
||||
"18.05.32",
|
||||
"18.05.35",
|
||||
"18.05.40",
|
||||
"18.08.37"
|
||||
"18.08.37",
|
||||
"18.15.40"
|
||||
)
|
||||
)]
|
||||
)
|
||||
|
||||
@ -14,7 +14,8 @@ import app.revanced.patcher.annotation.Package
|
||||
"18.05.32",
|
||||
"18.05.35",
|
||||
"18.05.40",
|
||||
"18.08.37"
|
||||
"18.08.37",
|
||||
"18.15.40"
|
||||
)
|
||||
)]
|
||||
)
|
||||
|
||||
@ -14,7 +14,8 @@ import app.revanced.patcher.annotation.Package
|
||||
"18.05.32",
|
||||
"18.05.35",
|
||||
"18.05.40",
|
||||
"18.08.37"
|
||||
"18.08.37",
|
||||
"18.15.40"
|
||||
)
|
||||
)]
|
||||
)
|
||||
|
||||
@ -14,7 +14,8 @@ import app.revanced.patcher.annotation.Package
|
||||
"18.05.32",
|
||||
"18.05.35",
|
||||
"18.05.40",
|
||||
"18.08.37"
|
||||
"18.08.37",
|
||||
"18.15.40"
|
||||
)
|
||||
)]
|
||||
)
|
||||
|
||||
@ -14,7 +14,8 @@ import app.revanced.patcher.annotation.Package
|
||||
"18.05.32",
|
||||
"18.05.35",
|
||||
"18.05.40",
|
||||
"18.08.37"
|
||||
"18.08.37",
|
||||
"18.15.40"
|
||||
)
|
||||
)]
|
||||
)
|
||||
|
||||
@ -14,7 +14,8 @@ import app.revanced.patcher.annotation.Package
|
||||
"18.05.32",
|
||||
"18.05.35",
|
||||
"18.05.40",
|
||||
"18.08.37"
|
||||
"18.08.37",
|
||||
"18.15.40"
|
||||
)
|
||||
)]
|
||||
)
|
||||
|
||||
@ -14,7 +14,8 @@ import app.revanced.patcher.annotation.Package
|
||||
"18.05.32",
|
||||
"18.05.35",
|
||||
"18.05.40",
|
||||
"18.08.37"
|
||||
"18.08.37",
|
||||
"18.15.40"
|
||||
)
|
||||
)]
|
||||
)
|
||||
|
||||
@ -3,6 +3,6 @@ package app.revanced.patches.youtube.layout.returnyoutubedislike.annotations
|
||||
import app.revanced.patcher.annotation.Compatibility
|
||||
import app.revanced.patcher.annotation.Package
|
||||
|
||||
@Compatibility([Package("com.google.android.youtube", arrayOf("18.08.37"))])
|
||||
@Compatibility([Package("com.google.android.youtube", arrayOf("18.15.40"))])
|
||||
@Target(AnnotationTarget.CLASS)
|
||||
internal annotation class ReturnYouTubeDislikeCompatibility
|
||||
@ -1,13 +1,10 @@
|
||||
package app.revanced.patches.youtube.layout.returnyoutubedislike.fingerprints
|
||||
|
||||
import app.revanced.patcher.extensions.or
|
||||
import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
|
||||
import org.jf.dexlib2.AccessFlags
|
||||
import org.jf.dexlib2.Opcode
|
||||
|
||||
object ShortsTextComponentParentFingerprint : MethodFingerprint(
|
||||
returnType = "V",
|
||||
access = AccessFlags.PROTECTED or AccessFlags.FINAL,
|
||||
parameters = listOf("L", "L"),
|
||||
opcodes = listOf(
|
||||
Opcode.INVOKE_STATIC,
|
||||
|
||||
@ -16,15 +16,16 @@ object TextComponentAtomicReferenceFingerprint : MethodFingerprint(
|
||||
Opcode.MOVE_OBJECT, // available unused register
|
||||
Opcode.MOVE_OBJECT_FROM16,
|
||||
Opcode.MOVE_OBJECT_FROM16,
|
||||
Opcode.MOVE_FROM16,
|
||||
Opcode.MOVE_OBJECT_FROM16,
|
||||
Opcode.MOVE_OBJECT_FROM16,
|
||||
Opcode.INVOKE_VIRTUAL, // CharSequence atomic reference
|
||||
Opcode.MOVE_RESULT_OBJECT,
|
||||
Opcode.CHECK_CAST,
|
||||
Opcode.MOVE_OBJECT, // CharSequence reference, and control flow label. Insert code here.
|
||||
Opcode.INVOKE_VIRTUAL_RANGE,
|
||||
Opcode.INVOKE_VIRTUAL,
|
||||
Opcode.MOVE_RESULT,
|
||||
Opcode.IF_EQZ,
|
||||
Opcode.INVOKE_VIRTUAL_RANGE,
|
||||
Opcode.INVOKE_VIRTUAL,
|
||||
Opcode.MOVE_RESULT_OBJECT,
|
||||
Opcode.GOTO,
|
||||
Opcode.CONST_4,
|
||||
|
||||
@ -26,6 +26,7 @@ import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
|
||||
import app.revanced.patches.youtube.misc.playertype.patch.PlayerTypeHookPatch
|
||||
import app.revanced.patches.youtube.misc.video.videoid.patch.VideoIdPatch
|
||||
import org.jf.dexlib2.builder.instruction.BuilderInstruction35c
|
||||
import org.jf.dexlib2.iface.instruction.FiveRegisterInstruction
|
||||
import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
|
||||
import org.jf.dexlib2.iface.instruction.ReferenceInstruction
|
||||
import org.jf.dexlib2.iface.instruction.TwoRegisterInstruction
|
||||
@ -101,14 +102,15 @@ class ReturnYouTubeDislikePatch : BytecodePatch(
|
||||
|
||||
textComponentContextFingerprintResult.mutableMethod.apply {
|
||||
// Get the conversion context obfuscated field name, and the registers for the AtomicReference and CharSequence
|
||||
val conversionContextFieldName =
|
||||
(instruction(conversionContextIndex) as ReferenceInstruction).reference.toString()
|
||||
val contextRegister = // any free register
|
||||
val conversionContextFieldReference =
|
||||
(instruction(conversionContextIndex) as ReferenceInstruction).reference
|
||||
// any free register
|
||||
val contextRegister =
|
||||
(instruction(atomicReferenceStartIndex) as TwoRegisterInstruction).registerB
|
||||
val atomicReferenceRegister =
|
||||
(instruction(atomicReferenceStartIndex + 4) as BuilderInstruction35c).registerC
|
||||
(instruction(atomicReferenceStartIndex + 5) as FiveRegisterInstruction).registerC
|
||||
|
||||
val insertIndex = atomicReferenceStartIndex + 7
|
||||
val insertIndex = atomicReferenceStartIndex + 8
|
||||
val moveCharSequenceInstruction = instruction(insertIndex) as TwoRegisterInstruction
|
||||
val charSequenceRegister = moveCharSequenceInstruction.registerB
|
||||
|
||||
@ -117,10 +119,10 @@ class ReturnYouTubeDislikePatch : BytecodePatch(
|
||||
replaceInstruction(insertIndex, "move-object/from16 v$contextRegister, p0")
|
||||
addInstructions(
|
||||
insertIndex + 1, """
|
||||
iget-object v$contextRegister, v$contextRegister, $conversionContextFieldName # copy obfuscated context field into free register
|
||||
iget-object v$contextRegister, v$contextRegister, $conversionContextFieldReference # copy obfuscated context field into free register
|
||||
invoke-static {v$contextRegister, v$atomicReferenceRegister, v$charSequenceRegister}, $INTEGRATIONS_PATCH_CLASS_DESCRIPTOR->onLithoTextLoaded(Ljava/lang/Object;Ljava/util/concurrent/atomic/AtomicReference;Ljava/lang/CharSequence;)Ljava/lang/CharSequence;
|
||||
move-result-object v$charSequenceRegister
|
||||
move-object v${moveCharSequenceInstruction.registerA}, v${moveCharSequenceInstruction.registerB} # original instruction at the insertion point
|
||||
move-object v${moveCharSequenceInstruction.registerA}, v${charSequenceRegister} # original instruction at the insertion point
|
||||
"""
|
||||
)
|
||||
}
|
||||
|
||||
@ -14,7 +14,8 @@ import app.revanced.patcher.annotation.Package
|
||||
"18.05.32",
|
||||
"18.05.35",
|
||||
"18.05.40",
|
||||
"18.08.37"
|
||||
"18.08.37",
|
||||
"18.15.40"
|
||||
)
|
||||
)]
|
||||
)
|
||||
|
||||
@ -0,0 +1,13 @@
|
||||
package app.revanced.patches.youtube.layout.searchbar.fingerprints
|
||||
|
||||
import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
|
||||
import org.jf.dexlib2.Opcode
|
||||
|
||||
object CreateSearchSuggestionsFingerprint : MethodFingerprint(
|
||||
opcodes = listOf(
|
||||
Opcode.INVOKE_STATIC,
|
||||
Opcode.MOVE_RESULT,
|
||||
Opcode.CONST_4
|
||||
),
|
||||
strings = listOf("ss_rds")
|
||||
)
|
||||
@ -1,27 +0,0 @@
|
||||
package app.revanced.patches.youtube.layout.searchbar.fingerprints
|
||||
|
||||
import app.revanced.patcher.extensions.or
|
||||
import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
|
||||
import org.jf.dexlib2.AccessFlags
|
||||
import org.jf.dexlib2.Opcode
|
||||
|
||||
object DrawActionBarFingerprint : MethodFingerprint(
|
||||
"V",
|
||||
AccessFlags.PRIVATE or AccessFlags.FINAL,
|
||||
listOf("I", "I"),
|
||||
listOf(
|
||||
Opcode.INVOKE_STATIC,
|
||||
Opcode.MOVE_RESULT_OBJECT,
|
||||
Opcode.INVOKE_VIRTUAL,
|
||||
Opcode.MOVE_RESULT_OBJECT,
|
||||
Opcode.SGET_OBJECT,
|
||||
Opcode.INVOKE_VIRTUAL,
|
||||
Opcode.IGET_OBJECT,
|
||||
Opcode.INVOKE_VIRTUAL,
|
||||
Opcode.IGET_OBJECT,
|
||||
Opcode.CONST,
|
||||
Opcode.INVOKE_VIRTUAL,
|
||||
Opcode.IGET_OBJECT,
|
||||
Opcode.INVOKE_STATIC,
|
||||
),
|
||||
)
|
||||
@ -17,51 +17,22 @@ import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
|
||||
import app.revanced.patches.shared.settings.preference.impl.StringResource
|
||||
import app.revanced.patches.shared.settings.preference.impl.SwitchPreference
|
||||
import app.revanced.patches.youtube.layout.searchbar.annotations.WideSearchbarCompatibility
|
||||
import app.revanced.patches.youtube.layout.searchbar.fingerprints.DrawActionBarFingerprint
|
||||
import app.revanced.patches.youtube.layout.searchbar.fingerprints.CreateSearchSuggestionsFingerprint
|
||||
import app.revanced.patches.youtube.layout.searchbar.fingerprints.SetWordmarkHeaderFingerprint
|
||||
import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
|
||||
import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
|
||||
|
||||
@Patch
|
||||
@DependsOn([IntegrationsPatch::class, SettingsPatch::class])
|
||||
@Name("enable-wide-searchbar")
|
||||
@Name("wide-searchbar")
|
||||
@Description("Replaces the search icon with a wide search bar. This will hide the YouTube logo when active.")
|
||||
@WideSearchbarCompatibility
|
||||
@Version("0.0.1")
|
||||
class WideSearchbarPatch : BytecodePatch(
|
||||
listOf(
|
||||
SetWordmarkHeaderFingerprint, DrawActionBarFingerprint
|
||||
SetWordmarkHeaderFingerprint, CreateSearchSuggestionsFingerprint
|
||||
)
|
||||
) {
|
||||
private companion object {
|
||||
/**
|
||||
* Walk a fingerprints method at a given index mutably.
|
||||
*
|
||||
* @param index The index to walk at.
|
||||
* @param fromFingerprint The fingerprint to walk the method on.
|
||||
* @return The [MutableMethod] which was walked on.
|
||||
*/
|
||||
fun BytecodeContext.walkMutable(index: Int, fromFingerprint: MethodFingerprint) =
|
||||
fromFingerprint.result?.let {
|
||||
toMethodWalker(it.method).nextMethod(index, true).getMethod() as MutableMethod
|
||||
} ?: throw SetWordmarkHeaderFingerprint.toErrorResult()
|
||||
|
||||
|
||||
/**
|
||||
* Injects instructions required for certain methods.
|
||||
*
|
||||
*/
|
||||
fun MutableMethod.injectSearchBarHook() {
|
||||
addInstructions(
|
||||
implementation!!.instructions.size - 1,
|
||||
"""
|
||||
invoke-static {}, Lapp/revanced/integrations/patches/NewActionbarPatch;->getNewActionBar()Z
|
||||
move-result p0
|
||||
"""
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
override fun execute(context: BytecodeContext): PatchResult {
|
||||
SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
|
||||
SwitchPreference(
|
||||
@ -73,16 +44,45 @@ class WideSearchbarPatch : BytecodePatch(
|
||||
)
|
||||
)
|
||||
|
||||
val result = DrawActionBarFingerprint.result ?: return DrawActionBarFingerprint.toErrorResult()
|
||||
val result = CreateSearchSuggestionsFingerprint.result ?: return CreateSearchSuggestionsFingerprint.toErrorResult()
|
||||
|
||||
// patch methods
|
||||
mapOf(
|
||||
SetWordmarkHeaderFingerprint to 1,
|
||||
DrawActionBarFingerprint to result.scanResult.patternScanResult!!.endIndex
|
||||
CreateSearchSuggestionsFingerprint to result.scanResult.patternScanResult!!.startIndex
|
||||
).forEach { (fingerprint, callIndex) ->
|
||||
context.walkMutable(callIndex, fingerprint).injectSearchBarHook()
|
||||
}
|
||||
|
||||
return PatchResultSuccess()
|
||||
}
|
||||
|
||||
private companion object {
|
||||
/**
|
||||
* Walk a fingerprints method at a given index mutably.
|
||||
*
|
||||
* @param index The index to walk at.
|
||||
* @param fromFingerprint The fingerprint to walk the method on.
|
||||
* @return The [MutableMethod] which was walked on.
|
||||
*/
|
||||
fun BytecodeContext.walkMutable(index: Int, fromFingerprint: MethodFingerprint) =
|
||||
fromFingerprint.result?.let {
|
||||
toMethodWalker(it.method).nextMethod(index, true).getMethod() as MutableMethod
|
||||
} ?: throw fromFingerprint.toErrorResult()
|
||||
|
||||
|
||||
/**
|
||||
* Injects instructions required for certain methods.
|
||||
*
|
||||
*/
|
||||
fun MutableMethod.injectSearchBarHook() {
|
||||
addInstructions(
|
||||
implementation!!.instructions.size - 1,
|
||||
"""
|
||||
invoke-static {}, Lapp/revanced/integrations/patches/WideSearchbarPatch;->enableWideSearchbar()Z
|
||||
move-result p0
|
||||
"""
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -4,7 +4,7 @@ import app.revanced.patcher.annotation.Compatibility
|
||||
import app.revanced.patcher.annotation.Package
|
||||
|
||||
@Compatibility(
|
||||
[Package("com.google.android.youtube", arrayOf("18.08.37"))]
|
||||
[Package("com.google.android.youtube", arrayOf("18.08.37", "18.15.40"))]
|
||||
)
|
||||
@Target(AnnotationTarget.CLASS)
|
||||
internal annotation class SponsorBlockCompatibility
|
||||
@ -21,7 +21,9 @@ import app.revanced.patches.shared.fingerprints.SeekbarFingerprint
|
||||
import app.revanced.patches.shared.fingerprints.SeekbarOnDrawFingerprint
|
||||
import app.revanced.patches.shared.mapping.misc.patch.ResourceMappingPatch
|
||||
import app.revanced.patches.youtube.layout.sponsorblock.annotations.SponsorBlockCompatibility
|
||||
import app.revanced.patches.youtube.layout.sponsorblock.bytecode.fingerprints.*
|
||||
import app.revanced.patches.youtube.layout.sponsorblock.bytecode.fingerprints.AppendTimeFingerprint
|
||||
import app.revanced.patches.youtube.layout.sponsorblock.bytecode.fingerprints.PlayerOverlaysLayoutInitFingerprint
|
||||
import app.revanced.patches.youtube.layout.sponsorblock.bytecode.fingerprints.RectangleFieldInvalidatorFingerprint
|
||||
import app.revanced.patches.youtube.layout.sponsorblock.resource.patch.SponsorBlockResourcePatch
|
||||
import app.revanced.patches.youtube.misc.autorepeat.fingerprints.AutoRepeatFingerprint
|
||||
import app.revanced.patches.youtube.misc.autorepeat.fingerprints.AutoRepeatParentFingerprint
|
||||
@ -153,14 +155,22 @@ class SponsorBlockBytecodePatch : BytecodePatch(
|
||||
/*
|
||||
* Draw segment
|
||||
*/
|
||||
val drawSegmentInstructionInsertIndex = (seekbarMethodInstructions.size - 1 - 2)
|
||||
val (canvasInstance, centerY) = (seekbarMethodInstructions[drawSegmentInstructionInsertIndex] as FiveRegisterInstruction).let {
|
||||
it.registerC to it.registerE
|
||||
|
||||
// Find the drawCircle call and draw the segment before it
|
||||
for (i in seekbarMethodInstructions.size - 1 downTo 0) {
|
||||
val invokeInstruction = seekbarMethodInstructions[i] as? ReferenceInstruction ?: continue
|
||||
if ((invokeInstruction.reference as MethodReference).name != "drawCircle") continue
|
||||
|
||||
val (canvasInstance, centerY) = (invokeInstruction as FiveRegisterInstruction).let {
|
||||
it.registerC to it.registerE
|
||||
}
|
||||
seekbarMethod.addInstruction(
|
||||
i,
|
||||
"invoke-static {v$canvasInstance, v$centerY}, $INTEGRATIONS_SEGMENT_PLAYBACK_CONTROLLER_CLASS_DESCRIPTOR->drawSponsorTimeBars(Landroid/graphics/Canvas;F)V"
|
||||
)
|
||||
|
||||
break
|
||||
}
|
||||
seekbarMethod.addInstruction(
|
||||
drawSegmentInstructionInsertIndex,
|
||||
"invoke-static {v$canvasInstance, v$centerY}, $INTEGRATIONS_SEGMENT_PLAYBACK_CONTROLLER_CLASS_DESCRIPTOR->drawSponsorTimeBars(Landroid/graphics/Canvas;F)V"
|
||||
)
|
||||
|
||||
/*
|
||||
* Voting & Shield button
|
||||
|
||||
@ -14,7 +14,8 @@ import app.revanced.patcher.annotation.Package
|
||||
"18.05.32",
|
||||
"18.05.35",
|
||||
"18.05.40",
|
||||
"18.08.37"
|
||||
"18.08.37",
|
||||
"18.15.40"
|
||||
)
|
||||
)]
|
||||
)
|
||||
|
||||
@ -14,7 +14,8 @@ import app.revanced.patcher.annotation.Package
|
||||
"18.05.32",
|
||||
"18.05.35",
|
||||
"18.05.40",
|
||||
"18.08.37"
|
||||
"18.08.37",
|
||||
"18.15.40"
|
||||
)
|
||||
)]
|
||||
)
|
||||
|
||||
@ -3,6 +3,6 @@ package app.revanced.patches.youtube.layout.tabletminiplayer.annotations
|
||||
import app.revanced.patcher.annotation.Compatibility
|
||||
import app.revanced.patcher.annotation.Package
|
||||
|
||||
@Compatibility([Package("com.google.android.youtube", arrayOf("18.08.37"))])
|
||||
@Compatibility([Package("com.google.android.youtube", arrayOf("18.15.40"))])
|
||||
@Target(AnnotationTarget.CLASS)
|
||||
internal annotation class TabletMiniPlayerCompatibility
|
||||
|
||||
@ -9,5 +9,5 @@ object MiniPlayerOverrideParentFingerprint : MethodFingerprint(
|
||||
returnType = "L",
|
||||
access = AccessFlags.PUBLIC or AccessFlags.STATIC,
|
||||
parameters = listOf("L"),
|
||||
strings = listOf("VIDEO_QUALITIES_QUICK_MENU_BOTTOM_SHEET_FRAGMENT")
|
||||
strings = listOf("PLAYBACK_RATE_MENU_BOTTOM_SHEET_FRAGMENT")
|
||||
)
|
||||
@ -67,10 +67,9 @@ class TabletMiniPlayerPatch : BytecodePatch(
|
||||
*/
|
||||
MiniPlayerOverrideParentFingerprint.result?.let {
|
||||
if (!MiniPlayerOverrideFingerprint.resolve(context, it.classDef))
|
||||
return MiniPlayerOverrideFingerprint.toErrorResult()
|
||||
throw MiniPlayerOverrideFingerprint.toErrorResult()
|
||||
|
||||
MiniPlayerOverrideFingerprint.addProxyCall()
|
||||
|
||||
} ?: return MiniPlayerOverrideParentFingerprint.toErrorResult()
|
||||
|
||||
/*
|
||||
|
||||
@ -14,7 +14,8 @@ import app.revanced.patcher.annotation.Package
|
||||
"18.05.32",
|
||||
"18.05.35",
|
||||
"18.05.40",
|
||||
"18.08.37"
|
||||
"18.08.37",
|
||||
"18.15.40"
|
||||
)
|
||||
)]
|
||||
)
|
||||
|
||||
@ -4,16 +4,17 @@ import app.revanced.patcher.annotation.Description
|
||||
import app.revanced.patcher.annotation.Name
|
||||
import app.revanced.patcher.annotation.Version
|
||||
import app.revanced.patcher.data.ResourceContext
|
||||
import app.revanced.patcher.patch.*
|
||||
import app.revanced.patcher.patch.PatchResult
|
||||
import app.revanced.patcher.patch.PatchResultSuccess
|
||||
import app.revanced.patcher.patch.ResourcePatch
|
||||
import app.revanced.patcher.patch.annotations.DependsOn
|
||||
import app.revanced.patcher.patch.annotations.Patch
|
||||
import app.revanced.patches.all.misc.debugging.patch.EnableAndroidDebuggingPatch
|
||||
import app.revanced.patches.shared.settings.preference.impl.StringResource
|
||||
import app.revanced.patches.shared.settings.preference.impl.SwitchPreference
|
||||
import app.revanced.patches.youtube.misc.debugging.annotations.DebuggingCompatibility
|
||||
import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
|
||||
import app.revanced.patches.all.misc.debugging.patch.EnableAndroidDebuggingPatch
|
||||
import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
|
||||
import org.w3c.dom.Element
|
||||
|
||||
@Patch
|
||||
@Name("enable-debugging")
|
||||
|
||||
@ -14,7 +14,8 @@ import app.revanced.patcher.annotation.Package
|
||||
"18.05.32",
|
||||
"18.05.35",
|
||||
"18.05.40",
|
||||
"18.08.37"
|
||||
"18.08.37",
|
||||
"18.15.40"
|
||||
)
|
||||
)]
|
||||
)
|
||||
|
||||
@ -14,7 +14,8 @@ import app.revanced.patcher.annotation.Package
|
||||
"18.05.32",
|
||||
"18.05.35",
|
||||
"18.05.40",
|
||||
"18.08.37"
|
||||
"18.08.37",
|
||||
"18.15.40"
|
||||
)
|
||||
)]
|
||||
)
|
||||
|
||||
@ -14,7 +14,8 @@ import app.revanced.patcher.annotation.Package
|
||||
"18.05.32",
|
||||
"18.05.35",
|
||||
"18.05.40",
|
||||
"18.08.37"
|
||||
"18.08.37",
|
||||
"18.15.40"
|
||||
)
|
||||
)]
|
||||
)
|
||||
|
||||
@ -14,7 +14,8 @@ import app.revanced.patcher.annotation.Package
|
||||
"18.05.32",
|
||||
"18.05.35",
|
||||
"18.05.40",
|
||||
"18.08.37"
|
||||
"18.08.37",
|
||||
"18.15.40"
|
||||
)
|
||||
)]
|
||||
)
|
||||
|
||||
@ -14,7 +14,8 @@ import app.revanced.patcher.annotation.Package
|
||||
"18.05.32",
|
||||
"18.05.35",
|
||||
"18.05.40",
|
||||
"18.08.37"
|
||||
"18.08.37",
|
||||
"18.15.40"
|
||||
)
|
||||
)]
|
||||
)
|
||||
|
||||
@ -14,7 +14,8 @@ import app.revanced.patcher.annotation.Package
|
||||
"18.05.32",
|
||||
"18.05.35",
|
||||
"18.05.40",
|
||||
"18.08.37"
|
||||
"18.08.37",
|
||||
"18.15.40"
|
||||
)
|
||||
)]
|
||||
)
|
||||
|
||||
@ -9,5 +9,5 @@ object ComponentContextParserFingerprint : MethodFingerprint(
|
||||
Opcode.IPUT_OBJECT,
|
||||
Opcode.NEW_INSTANCE
|
||||
),
|
||||
strings = listOf("LoggingProperties are not in proto format")
|
||||
strings = listOf("Component was not found %s because it was removed due to duplicate converter bindings")
|
||||
)
|
||||
@ -10,7 +10,6 @@ import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
|
||||
import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
|
||||
import app.revanced.patcher.patch.BytecodePatch
|
||||
import app.revanced.patcher.patch.PatchResult
|
||||
import app.revanced.patcher.patch.PatchResultError
|
||||
import app.revanced.patcher.patch.PatchResultSuccess
|
||||
import app.revanced.patcher.patch.annotations.DependsOn
|
||||
import app.revanced.patcher.util.smali.ExternalLabel
|
||||
@ -22,6 +21,7 @@ import app.revanced.patches.youtube.misc.litho.filter.fingerprints.ReadComponent
|
||||
import org.jf.dexlib2.iface.instruction.Instruction
|
||||
import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
|
||||
import org.jf.dexlib2.iface.instruction.ReferenceInstruction
|
||||
import org.jf.dexlib2.iface.instruction.TwoRegisterInstruction
|
||||
|
||||
@DependsOn([IntegrationsPatch::class])
|
||||
@Description("Hooks the method which parses the bytes into a ComponentContext to filter components.")
|
||||
@ -44,15 +44,15 @@ class LithoFilterPatch : BytecodePatch(
|
||||
val insertHookIndex = result.scanResult.patternScanResult!!.endIndex
|
||||
val builderMethodDescriptor = instruction(builderMethodIndex).descriptor
|
||||
val emptyComponentFieldDescriptor = instruction(emptyComponentFieldIndex).descriptor
|
||||
// Register is overwritten right after it is used for this patch, therefore free to clobber.
|
||||
val clobberedRegister = instruction(insertHookIndex).oneRegister
|
||||
// Register is overwritten right after it is used in this patch, therefore free to clobber.
|
||||
val clobberedRegister = instruction(insertHookIndex - 1).twoRegisterA
|
||||
|
||||
@Suppress("UnnecessaryVariable")
|
||||
// The register, this patch clobbers, is previously used for the StringBuilder,
|
||||
// later on a new StringBuilder is instantiated on it.
|
||||
val stringBuilderRegister = clobberedRegister
|
||||
|
||||
val identifierRegister = instruction(ReadComponentIdentifierFingerprint.patternScanEndIndex).oneRegister
|
||||
val identifierRegister = instruction(ReadComponentIdentifierFingerprint.patternScanEndIndex).oneRegisterA
|
||||
|
||||
addInstructions(
|
||||
insertHookIndex, // right after setting the component.pathBuilder field,
|
||||
@ -69,7 +69,7 @@ class LithoFilterPatch : BytecodePatch(
|
||||
listOf(ExternalLabel("not_an_ad", instruction(insertHookIndex)))
|
||||
)
|
||||
}
|
||||
} ?: return PatchResultError("Could not find the method to hook.")
|
||||
} ?: return ComponentContextParserFingerprint.toErrorResult()
|
||||
|
||||
return PatchResultSuccess()
|
||||
}
|
||||
@ -81,8 +81,10 @@ class LithoFilterPatch : BytecodePatch(
|
||||
val Instruction.descriptor
|
||||
get() = (this as ReferenceInstruction).reference.toString()
|
||||
|
||||
val Instruction.oneRegister
|
||||
val Instruction.oneRegisterA
|
||||
get() = (this as OneRegisterInstruction).registerA
|
||||
|
||||
val Instruction.twoRegisterA
|
||||
get() = (this as TwoRegisterInstruction).registerA
|
||||
}
|
||||
}
|
||||
@ -14,7 +14,8 @@ import app.revanced.patcher.annotation.Package
|
||||
"18.05.32",
|
||||
"18.05.35",
|
||||
"18.05.40",
|
||||
"18.08.37"
|
||||
"18.08.37",
|
||||
"18.15.40"
|
||||
)
|
||||
)]
|
||||
)
|
||||
|
||||
@ -14,7 +14,8 @@ import app.revanced.patcher.annotation.Package
|
||||
"18.05.32",
|
||||
"18.05.35",
|
||||
"18.05.40",
|
||||
"18.08.37"
|
||||
"18.08.37",
|
||||
"18.15.40"
|
||||
)
|
||||
)]
|
||||
)
|
||||
|
||||
@ -14,7 +14,8 @@ import app.revanced.patcher.annotation.Package
|
||||
"18.05.32",
|
||||
"18.05.35",
|
||||
"18.05.40",
|
||||
"18.08.37"
|
||||
"18.08.37",
|
||||
"18.15.40"
|
||||
)
|
||||
)]
|
||||
)
|
||||
|
||||
@ -14,7 +14,8 @@ import app.revanced.patcher.annotation.Package
|
||||
"18.05.32",
|
||||
"18.05.35",
|
||||
"18.05.40",
|
||||
"18.08.37"
|
||||
"18.08.37",
|
||||
"18.15.40"
|
||||
)
|
||||
)]
|
||||
)
|
||||
|
||||
@ -14,7 +14,8 @@ import app.revanced.patcher.annotation.Package
|
||||
"18.05.32",
|
||||
"18.05.35",
|
||||
"18.05.40",
|
||||
"18.08.37"
|
||||
"18.08.37",
|
||||
"18.15.40"
|
||||
)
|
||||
)]
|
||||
)
|
||||
|
||||
@ -4,7 +4,7 @@ import app.revanced.patcher.annotation.Compatibility
|
||||
import app.revanced.patcher.annotation.Package
|
||||
|
||||
@Compatibility(
|
||||
[Package("com.google.android.youtube", arrayOf("18.08.37"))]
|
||||
[Package("com.google.android.youtube", arrayOf("18.08.37", "18.15.40"))]
|
||||
)
|
||||
@Target(AnnotationTarget.CLASS)
|
||||
internal annotation class VideoInformationCompatibility
|
||||
|
||||
@ -4,7 +4,7 @@ import app.revanced.patcher.annotation.Compatibility
|
||||
import app.revanced.patcher.annotation.Package
|
||||
|
||||
@Compatibility(
|
||||
[Package("com.google.android.youtube", arrayOf("18.08.37"))]
|
||||
[Package("com.google.android.youtube", arrayOf("18.08.37", "18.15.40"))]
|
||||
)
|
||||
@Target(AnnotationTarget.CLASS)
|
||||
internal annotation class RememberVideoQualityCompatibility
|
||||
|
||||
@ -14,7 +14,8 @@ import app.revanced.patcher.annotation.Package
|
||||
"18.05.32",
|
||||
"18.05.35",
|
||||
"18.05.40",
|
||||
"18.08.37"
|
||||
"18.08.37",
|
||||
"18.15.40"
|
||||
)
|
||||
)]
|
||||
)
|
||||
|
||||
@ -4,7 +4,7 @@ import app.revanced.patcher.annotation.Compatibility
|
||||
import app.revanced.patcher.annotation.Package
|
||||
|
||||
@Compatibility(
|
||||
[Package("com.google.android.youtube", arrayOf("18.08.37"))]
|
||||
[Package("com.google.android.youtube", arrayOf("18.08.37", "18.15.40"))]
|
||||
)
|
||||
@Target(AnnotationTarget.CLASS)
|
||||
internal annotation class RememberPlaybackSpeedCompatibility
|
||||
|
||||
@ -14,7 +14,8 @@ import app.revanced.patcher.annotation.Package
|
||||
"18.05.32",
|
||||
"18.05.35",
|
||||
"18.05.40",
|
||||
"18.08.37"
|
||||
"18.08.37",
|
||||
"18.15.40"
|
||||
)
|
||||
)]
|
||||
)
|
||||
|
||||
@ -15,7 +15,8 @@ import app.revanced.patcher.annotation.Package
|
||||
"18.05.32",
|
||||
"18.05.35",
|
||||
"18.05.40",
|
||||
"18.08.37"
|
||||
"18.08.37",
|
||||
"18.15.40"
|
||||
)
|
||||
)]
|
||||
)
|
||||
|
||||
@ -97,7 +97,7 @@
|
||||
<string name="sb_skip_ignore">Disable</string>
|
||||
|
||||
<string name="sb_about">About</string>
|
||||
<string name="sb_about_api">Sponsor.Ajay.app</string>
|
||||
<string name="sb_about_api">sponsor.ajay.app</string>
|
||||
<string name="sb_about_api_sum">Data is provided by the SponsorBlock API. Tap here to learn more and see downloads for other platforms</string>
|
||||
<string name="sb_about_made_by">ReVanced integration by JakubWeg,\nrecoded by oSumAtrIX</string>
|
||||
|
||||
@ -154,7 +154,7 @@
|
||||
<string name="sb_stats_username_change">Tap here to change your username</string>
|
||||
<string name="sb_stats_username_change_unknown_error" formatted="false">Unable to change username: Status: %d %s</string>
|
||||
<string name="sb_stats_username_changed">Username successfully changed</string>
|
||||
<string name="sb_stats_reputation" formatted="false">You\'re reputation is <b>%.2f</b></string>
|
||||
<string name="sb_stats_reputation" formatted="false">Your reputation is <b>%.2f</b></string>
|
||||
<string name="sb_stats_submissions" formatted="false">You\'ve created <b>%s</b> segments</string>
|
||||
<string name="sb_stats_saved_zero">SponsorBlock leaderboard</string>
|
||||
<string name="sb_stats_saved" formatted="false">You\'ve saved people from <b>%s</b> segments</string>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user