Merge branch 'dev' into revanced-extended

Author: inotia00

.github/workflows/build_pull_request.yml

@@ -18,7 +18,7 @@ jobs:
         uses: actions/setup-java@v5
         with:
           distribution: "zulu"
-          java-version: "21"
+          java-version: "17"
 
       - name: Cache Gradle
         uses: burrunan/gradle-cache-action@v3

.github/workflows/release.yml

@@ -23,7 +23,7 @@ jobs:
         uses: actions/setup-java@v5
         with:
           distribution: "zulu"
-          java-version: "21"
+          java-version: "17"
 
       - name: Cache Gradle
         uses: burrunan/gradle-cache-action@v3

.idea/misc.xml

@@ -28,8 +28,8 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_21
-        targetCompatibility = JavaVersion.VERSION_21
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
 }
 
@@ -39,6 +39,7 @@ dependencies {
 
     implementation(libs.collections4)
     implementation(libs.gson)
+    implementation(libs.kotlinx.coroutines.core)
     implementation(libs.lang3)
     implementation(libs.nanojson)
     implementation(libs.okhttp3)

README.md

@@ -99,7 +99,7 @@ public static CharSequence onLithoTextLoaded(@NonNull Object conversionContext,
                                                  @NonNull CharSequence original) {
         if (EXTERNAL_DOWNLOADER_ACTION_BUTTON &&
                 downloadButtonLabel.isEmpty() &&
-                conversionContext.toString().contains("music_download_button.eml")) {
+                conversionContext.toString().contains("music_download_button.")) {
             downloadButtonLabel = original.toString();
             Logger.printDebug(() -> "set download button label: " + original);
         }

extensions/shared/build.gradle.kts

@@ -4,12 +4,13 @@
 
 @SuppressWarnings("unused")
 public class MusicAdsPatch {
+    private static final boolean HIDE_MUSIC_ADS = Settings.HIDE_MUSIC_ADS.get();
 
     public static boolean hideMusicAds() {
-        return Settings.HIDE_MUSIC_ADS.get();
+        return HIDE_MUSIC_ADS;
     }
 
     public static boolean hideMusicAds(boolean original) {
-        return !Settings.HIDE_MUSIC_ADS.get() && original;
+        return !HIDE_MUSIC_ADS && original;
     }
 }

extensions/shared/src/main/java/app/revanced/extension/music/patches/actionbar/ActionBarPatch.java

@@ -8,7 +8,7 @@
 
 @SuppressWarnings("unused")
 public final class ActionButtonsFilter extends Filter {
-    private static final String VIDEO_ACTION_BAR_PATH_PREFIX = "video_action_bar.eml";
+    private static final String VIDEO_ACTION_BAR_PATH_PREFIX = "video_action_bar.";
 
     private final StringFilterGroup actionBarRule;
     private final StringFilterGroup bufferFilterPathRule;
@@ -23,19 +23,19 @@ public ActionButtonsFilter() {
 
         bufferFilterPathRule = new StringFilterGroup(
                 null,
-                "|ContainerType|button.eml"
+                "|ContainerType|button."
         );
         final StringFilterGroup downloadButton = new StringFilterGroup(
                 Settings.HIDE_ACTION_BUTTON_DOWNLOAD,
-                "music_download_button.eml"
+                "music_download_button."
         );
         final StringFilterGroup likeDislikeContainer = new StringFilterGroup(
                 Settings.HIDE_ACTION_BUTTON_LIKE_DISLIKE,
-                "segmented_like_dislike_button.eml"
+                "segmented_like_dislike_button."
         );
         final StringFilterGroup songVideoButton = new StringFilterGroup(
                 Settings.HIDE_ACTION_BUTTON_SONG_VIDEO,
-                "music_audio_video_button.eml"
+                "music_audio_video_button."
         );
         addPathCallbacks(
                 bufferFilterPathRule,

extensions/shared/src/main/java/app/revanced/extension/music/patches/ads/MusicAdsPatch.java

@@ -10,12 +10,12 @@ public final class AdsFilter extends Filter {
     public AdsFilter() {
         final StringFilterGroup alertBannerPromo = new StringFilterGroup(
                 Settings.HIDE_PROMOTION_ALERT_BANNER,
-                "alert_banner_promo.eml"
+                "alert_banner_promo."
         );
 
         final StringFilterGroup paidPromotionLabel = new StringFilterGroup(
                 Settings.HIDE_PAID_PROMOTION_LABEL,
-                "music_paid_content_overlay.eml"
+                "music_paid_content_overlay."
         );
 
         addIdentifierCallbacks(alertBannerPromo, paidPromotionLabel);

extensions/shared/src/main/java/app/revanced/extension/music/patches/components/ActionButtonsFilter.java

@@ -11,22 +11,22 @@ public LayoutComponentsFilter() {
 
         final StringFilterGroup buttonShelf = new StringFilterGroup(
                 Settings.HIDE_BUTTON_SHELF,
-                "entry_point_button_shelf.eml"
+                "entry_point_button_shelf."
         );
 
         final StringFilterGroup carouselShelf = new StringFilterGroup(
                 Settings.HIDE_CAROUSEL_SHELF,
-                "music_grid_item_carousel.eml"
+                "music_grid_item_carousel."
         );
 
         final StringFilterGroup playlistCardShelf = new StringFilterGroup(
                 Settings.HIDE_PLAYLIST_CARD_SHELF,
-                "music_container_card_shelf.eml"
+                "music_container_card_shelf."
         );
 
         final StringFilterGroup sampleShelf = new StringFilterGroup(
                 Settings.HIDE_SAMPLE_SHELF,
-                "immersive_card_shelf.eml"
+                "immersive_card_shelf."
         );
 
         addIdentifierCallbacks(