Make user agent version match the client version being sent

Author: Nuckyz

extensions/spotify/src/main/java/app/revanced/extension/spotify/misc/fix/ClientTokenFetcher.java

@@ -58,10 +58,9 @@ static ClienttokenHttp.ClientTokenRequest buildSpoofedClientTokenRequest(String
 
     @Nullable
     static ClienttokenHttp.ClientTokenResponse fetchClientToken(
-            @NonNull String androidUserAgent,
             @NonNull ClienttokenHttp.ClientTokenRequest originalClientTokenRequest
     ) throws IOException {
-        String iosUserAgent = getIOSUserAgent(androidUserAgent);
+        String iosUserAgent = getIOSUserAgent();
         if (iosUserAgent == null) {
             return null;
         }
@@ -102,17 +101,17 @@ static HttpURLConnection createProtobufRequestConnection(String url) throws IOEx
     }
 
     @Nullable
-    static String getIOSUserAgent(@NonNull String androidUserAgent) {
-        Pattern iosSpotifyVersionPattern = Pattern.compile("Spotify/(\\d+\\.\\d+\\.\\d+)\\.\\d+");
-        Matcher androidSpotifyVersionMatcher = iosSpotifyVersionPattern.matcher(androidUserAgent);
+    static String getIOSUserAgent() {
+        Pattern iosSpotifyVersionPattern = Pattern.compile("iphone-(\\d+\\.\\d+\\.\\d+)\\.\\d+");
+        Matcher iosSpotifyVersionMatcher = iosSpotifyVersionPattern.matcher(getClientVersion());
 
-        if (!androidSpotifyVersionMatcher.find()) {
-            Logger.printException(() -> "Failed to match iOS Spotify version from original android User-Agent. " +
-                    "Original User-Agent: " + androidUserAgent);
+        if (!iosSpotifyVersionMatcher.find()) {
+            Logger.printException(() -> "Failed to match iOS Spotify version from the client version " +
+                    getClientVersion());
             return null;
         }
 
-        String iosSpotifyVersion = androidSpotifyVersionMatcher.group(1);
+        String iosSpotifyVersion = iosSpotifyVersionMatcher.group(1);
         return "Spotify/" + iosSpotifyVersion + " iOS/" +
                 getSystemVersion() + " (" +
                 getHardwareMachine() + ")";

extensions/spotify/src/main/java/app/revanced/extension/spotify/misc/fix/RequestListener.java

@@ -43,15 +43,9 @@ public Response serve(@NonNull IHTTPSession request) {
                 return newResponse(INTERNAL_ERROR);
             }
 
-            String androidUserAgent = request.getHeaders().get("user-agent");
-            if (androidUserAgent == null) {
-                Logger.printException(() -> "Failed to find original android User-Agent");
-                return newResponse(INTERNAL_ERROR);
-            }
-
             try {
                 ClienttokenHttp.ClientTokenResponse clientTokenResponse =
-                        ClientTokenFetcher.fetchClientToken(androidUserAgent, clientTokenRequest);
+                        ClientTokenFetcher.fetchClientToken(clientTokenRequest);
 
                 if (clientTokenResponse == null) {
                     return newResponse(INTERNAL_ERROR);