Restore Android client playback ability and upgrade client version (…

…without changing mobile player params) (#76)

* fixed android client without removing or changing mobile player params

* Update README.md

.gitignore

@@ -4,6 +4,7 @@
 # Log file
 *.log
 
+
 # BlueJ files
 *.ctxt
 
@@ -28,6 +29,7 @@ replay_pid*
 .DS_Store
 */build/*
 build
+.vscode/*
 
 application.yml
 playerconfigs/*

README.md

@@ -196,7 +196,7 @@ Currently, the following clients are available for use:
 - `ANDROID`
   - ❌ Heavily restricted, frequently dysfunctional.
 - `ANDROID_MUSIC`
-  - ✔ Opus formats.
+  - ✔ No opus formats for livestreams (requires transcoding).
   - ❌ No playlist/livestream support.
 - `ANDROID_VR`
   - ✔ Opus formats.

common/src/main/java/dev/lavalink/youtube/clients/Android.java

@@ -49,7 +49,7 @@ protected ClientConfig getBaseClientConfig(@NotNull HttpInterface httpInterface)
     @Override
     @NotNull
     public String getPlayerParams() {
-        return MOBILE_PLAYER_PARAMS;
+        return null;
     }
 
     @Override

common/src/main/java/dev/lavalink/youtube/clients/AndroidMusic.java

@@ -41,6 +41,12 @@ protected ClientConfig getBaseClientConfig(@NotNull HttpInterface httpInterface)
         return BASE_CONFIG.copy();
     }
 
+    @Override
+    @NotNull
+    public String getPlayerParams() {
+        return MOBILE_PLAYER_PARAMS;
+    }
+
     @Override
     @NotNull
     protected JsonBrowser extractMixPlaylistData(@NotNull JsonBrowser json) {

common/src/main/java/dev/lavalink/youtube/clients/AndroidVr.java

@@ -32,6 +32,12 @@ protected ClientConfig getBaseClientConfig(@NotNull HttpInterface httpInterface)
         return BASE_CONFIG.copy();
     }
 
+    @Override
+    @NotNull
+    public String getPlayerParams() {
+        return MOBILE_PLAYER_PARAMS;
+    }
+
     @Override
     @NotNull
     public String getIdentifier() {

common/src/main/java/dev/lavalink/youtube/clients/skeleton/NonMusicClient.java

@@ -93,11 +93,15 @@ protected JsonBrowser loadTrackInfoFromInnertube(@NotNull YoutubeAudioSourceMana
                 .withThirdPartyEmbedUrl("https://google.com");
         }
 
-        String payload = config.withRootField("videoId", videoId)
+        config.withRootField("videoId", videoId)
             .withRootField("racyCheckOk", true)
-            .withRootField("contentCheckOk", true)
-            .withRootField("params", getPlayerParams())
-            .withPlaybackSignatureTimestamp(signatureCipher.scriptTimestamp)
+            .withRootField("contentCheckOk", true);
+
+        if (getPlayerParams() != null) {
+            config.withRootField("params" , getPlayerParams());
+        }
+
+        String payload = config.withPlaybackSignatureTimestamp(signatureCipher.scriptTimestamp)
             .setAttributes(httpInterface)
             .toJsonString();