fix(YouTube - Hook YouTube Music actions): App crashes when first ins…

…talled
anddea · Oct 23, 2024 · 554ebec · 554ebec
1 parent 23958f4
commit 554ebec
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/...main/java/app/revanced/integrations/youtube/patches/general/YouTubeMusicActionsPatch.java b/...main/java/app/revanced/integrations/youtube/patches/general/YouTubeMusicActionsPatch.java
@@ -38,11 +38,6 @@ private static boolean isYouTubeMusicEnabled() {
         return ExtendedUtils.isPackageEnabled(PACKAGE_NAME_YOUTUBE_MUSIC);
     }
 
-    // Modified by a patch. Do not touch.
-    public static String getRVXMusicPackageName() {
-        return "com.google.android.apps.youtube.music";
-    }
-
     public static final class HookYouTubeMusicAvailability implements Setting.Availability {
         @Override
         public boolean isAvailable() {

diff --git a/app/src/main/java/app/revanced/integrations/youtube/patches/utils/PatchStatus.java b/app/src/main/java/app/revanced/integrations/youtube/patches/utils/PatchStatus.java
@@ -37,4 +37,9 @@ public static boolean ToolBarComponents() {
         return false;
     }
 
+    // Modified by a patch. Do not touch.
+    public static String RVXMusicPackageName() {
+        return "com.google.android.apps.youtube.music";
+    }
+
 }
diff --git a/app/src/main/java/app/revanced/integrations/youtube/settings/Settings.java b/app/src/main/java/app/revanced/integrations/youtube/settings/Settings.java
@@ -39,6 +39,7 @@
 import app.revanced.integrations.youtube.patches.misc.WatchHistoryPatch.WatchHistoryType;
 import app.revanced.integrations.youtube.patches.misc.client.AppClient.ClientType;
 import app.revanced.integrations.youtube.patches.shorts.AnimationFeedbackPatch.AnimationType;
+import app.revanced.integrations.youtube.patches.utils.PatchStatus;
 import app.revanced.integrations.youtube.sponsorblock.SponsorBlockSettings;
 
 @SuppressWarnings("unused")
@@ -191,7 +192,7 @@ public class Settings extends BaseSettings {
     public static final StringSetting EXTERNAL_DOWNLOADER_PACKAGE_NAME_PLAYLIST = new StringSetting("revanced_external_downloader_package_name_playlist", "com.deniscerri.ytdl");
     public static final BooleanSetting OVERRIDE_YOUTUBE_MUSIC_BUTTON = new BooleanSetting("revanced_override_youtube_music_button", FALSE, true
             , new YouTubeMusicActionsPatch.HookYouTubeMusicAvailability());
-    public static final StringSetting THIRD_PARTY_YOUTUBE_MUSIC_PACKAGE_NAME = new StringSetting("revanced_third_party_youtube_music_package_name", YouTubeMusicActionsPatch.getRVXMusicPackageName(), true
+    public static final StringSetting THIRD_PARTY_YOUTUBE_MUSIC_PACKAGE_NAME = new StringSetting("revanced_third_party_youtube_music_package_name", PatchStatus.RVXMusicPackageName(), true
             , new YouTubeMusicActionsPatch.HookYouTubeMusicPackageNameAvailability());
 
     // PreferenceScreen: General - Settings menu