Fix signature deciphering

Author: HaarigerHarald

build.gradle

@@ -6,7 +6,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.3'
+        classpath 'com.android.tools.build:gradle:3.6.2'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Sat Jan 18 23:01:49 CET 2020
+#Sat Apr 18 21:27:46 CEST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip

sampleApp/build.gradle

@@ -6,6 +6,7 @@ android {
     defaultConfig {
         applicationId "at.huber.sampleDownload"
         minSdkVersion 14
+        //noinspection ExpiredTargetSdkVersion
         targetSdkVersion 22
         versionCode 1
         versionName "1.0"

youtubeExtractor/src/main/java/at/huber/youtubeExtractor/YouTubeExtractor.java

@@ -77,12 +77,11 @@ public abstract class YouTubeExtractor extends AsyncTask<String, Void, SparseArr
     private static final Pattern patUrl = Pattern.compile("\"url\"\\s*:\\s*\"(.+?)\"");
     private static final Pattern patCipher = Pattern.compile("\"cipher\"\\s*:\\s*\"(.+?)\"");
     private static final Pattern patCipherUrl = Pattern.compile("url=(.+?)(\\\\\\\\u0026|\\z)");
-    private static final Pattern patYtPlayer = Pattern.compile("<\\s*script\\s*>((.+?)jsbin\\\\/(player(_ias)?-(.+?).js)(.+?))</\\s*script\\s*>");
 
     private static final Pattern patVariableFunction = Pattern.compile("([{; =])([a-zA-Z$][a-zA-Z0-9$]{0,2})\\.([a-zA-Z$][a-zA-Z0-9$]{0,2})\\(");
     private static final Pattern patFunction = Pattern.compile("([{; =])([a-zA-Z$_][a-zA-Z0-9$]{0,2})\\(");
-  
-    private static final Pattern patDecryptionJsFile = Pattern.compile("jsbin\\\\/(player(_ias)?-(.+?).js)");
+    
+    private static final Pattern patDecryptionJsFile = Pattern.compile("\\\\/s\\\\/player\\\\/([^\"]+?)\\.js");
     private static final Pattern patSignatureDecFunction = Pattern.compile("\\b([\\w$]{2})\\s*=\\s*function\\((\\w+)\\)\\{\\s*\\2=\\s*\\2\\.split\\(\"\"\\)\\s*;");
 
     private static final SparseArray<Format> FORMAT_MAP = new SparseArray<>();
@@ -298,14 +297,12 @@ private SparseArray<YtFile> getStreamUrls() throws IOException, InterruptedExcep
             try {
                 reader = new BufferedReader(new InputStreamReader(urlConnection.getInputStream()));
                 String line;
+                StringBuilder sbStreamMap = new StringBuilder();
                 while ((line = reader.readLine()) != null) {
                     // Log.d("line", line);
-                    mat = patYtPlayer.matcher(line);
-                    if (mat.find()) {
-                        streamMap = line.replace("\\\"", "\"");
-                        break;
-                    }
+                    sbStreamMap.append(line.replace("\\\"", "\""));
                 }
+                streamMap = sbStreamMap.toString();
             } finally {
                 reader.close();
                 urlConnection.disconnect();
@@ -314,9 +311,7 @@ private SparseArray<YtFile> getStreamUrls() throws IOException, InterruptedExcep
 
             mat = patDecryptionJsFile.matcher(streamMap);
             if (mat.find()) {
-                curJsFileName = mat.group(1).replace("\\/", "/");
-                if (mat.group(2) != null)
-                    curJsFileName.replace(mat.group(2), "");
+                curJsFileName = mat.group(0).replace("\\/", "/");
                 if (decipherJsFileName == null || !decipherJsFileName.equals(curJsFileName)) {
                     decipherFunctions = null;
                     decipherFunctionName = null;
@@ -425,7 +420,7 @@ private SparseArray<YtFile> getStreamUrls() throws IOException, InterruptedExcep
     private boolean decipherSignature(final SparseArray<String> encSignatures) throws IOException {
         // Assume the functions don't change that much
         if (decipherFunctionName == null || decipherFunctions == null) {
-            String decipherFunctUrl = "https://s.ytimg.com/yts/jsbin/" + decipherJsFileName;
+            String decipherFunctUrl = "https://youtube.com" + decipherJsFileName;
 
             BufferedReader reader = null;
             String javascriptFile;