fix sig null bug

tastelessjolt · Jul 13, 2019 · 792e985 · 792e985
1 parent 93d34e9
commit 792e985
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git a/app/src/main/java/me/harshithgoka/youtubedl/YoutubeDL/Extractor.java b/app/src/main/java/me/harshithgoka/youtubedl/YoutubeDL/Extractor.java
@@ -134,21 +134,17 @@ public String extractSignatureFunction(String video_id, String player_url, Strin
                 funcPatterns.add(new Pair<>("\\bc\\s*&&\\s*[a-zA-Z0-9]+\\.set\\([^,]+\\s*,\\s*\\([^)]*\\)\\s*\\(\\s*(?P<sig>[a-zA-Z0-9$]+)\\(", 1));
 
                 func_name = findFuncName(funcPatterns, response);
-                if (func_name == null) {
+                if (func_name == null || func_name.isEmpty()) {
+                    Log.e("DECSIG", "Couldn't find func name. (New function name detected)");
                     return null;
                 }
 
 
 
-                if (func_name.isEmpty()){
-                    this.func_name = func_name;
-                    Fun fun = jsInterpreter.extractFunction(func_name);
-                    jsInterpreter.setSigFun(fun);
+                Fun fun = jsInterpreter.extractFunction(func_name);
+                jsInterpreter.setSigFun(fun);
 
-                    player_cache.put(playerID, jsInterpreter);
-                } else {
-                    return null ;
-                }
+                player_cache.put(playerID, jsInterpreter);
 
             } catch (Exception e) {
                 e.printStackTrace();
@@ -208,8 +204,12 @@ public String decryptSignature(String s, String video_id, String player_url) {
 
         String sig = extractSignatureFunction(video_id, player_url, s);
 
-        Log.d(TAG + "enc", s);
-        Log.d(TAG + "dec", sig);
+        if (sig == null) {
+            return null;
+        }
+
+        Log.d(TAG + "enc", "" + s);
+        Log.d(TAG + "dec", "" + sig);
         Log.d(TAG, video_id);
         Log.d(TAG, player_url);
 

diff --git a/build.gradle b/build.gradle
@@ -8,7 +8,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.4.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sat Aug 25 00:46:48 IST 2018
+#Sat Jul 13 11:54:48 IST 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip