Update gradle and dependencies

advancedDownloader/build.gradle

@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 
 android {
  compileSdkVersion 22
- buildToolsVersion '25.0.0'
+ buildToolsVersion '27.0.3'
 
  defaultConfig {
  applicationId "at.huber.youtubeDownloader"
@@ -25,6 +25,6 @@ repositories {
 
 dependencies {
  compile project(':youtubeExtractor')
- compile 'org.aspectj:aspectjrt:1.8.8'
- compile 'com.googlecode.mp4parser:isoparser:1.1.17'
+ compile 'org.aspectj:aspectjrt:1.8.13'
+ compile 'com.googlecode.mp4parser:isoparser:1.1.22'
 }

build.gradle

@@ -2,10 +2,10 @@
 
 buildscript {
  repositories {
- jcenter()
+ google()
  }
  dependencies {
- classpath 'com.android.tools.build:gradle:2.3.3'
+ classpath 'com.android.tools.build:gradle:3.0.1'
 
  // NOTE: Do not place your application dependencies here; they belong
  // in the individual module build.gradle files
@@ -14,7 +14,7 @@ buildscript {
 
 allprojects {
  repositories {
- jcenter()
+ google()
  maven { url "https://jitpack.io" }
  }
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Tue Mar 07 19:37:01 CET 2017
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
-distributionUrl=https\:https://services.gradle.org/distributions/gradle-4.0.1-all.zip
+#Wed Feb 14 13:40:41 CET 2018
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\:https://services.gradle.org/distributions/gradle-4.1-all.zip

sampleApp/build.gradle

@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 
 android {
  compileSdkVersion 22
- buildToolsVersion '25.0.0'
+ buildToolsVersion '27.0.3'
 
  defaultConfig {
  applicationId "at.huber.sampleDownload"

youtubeExtractor/build.gradle

@@ -1,19 +1,19 @@
 apply plugin: 'com.android.library'
 
 android {
- compileSdkVersion 23
- buildToolsVersion '25.0.0'
+ compileSdkVersion 27
+ buildToolsVersion '27.0.3'
 
  defaultConfig {
  minSdkVersion 14
- targetSdkVersion 23
+ targetSdkVersion 27
  versionCode 1
  versionName "1.0"
  }
 }
 
 dependencies {
- compile('com.github.evgenyneu:js-evaluator-for-android:v1.0.7') {
+ compile('com.github.evgenyneu:js-evaluator-for-android:v4.0.0') {
  exclude module: 'appcompat-v7'
  }
 }

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

@@ -34,7 +34,7 @@ public abstract class YouTubeExtractor extends AsyncTask<String, Void, SparseArr
 
  private final static boolean CACHING = true;
 
- protected static boolean LOGGING = false;
+ static boolean LOGGING = false;
 
  private final static String LOG_TAG = "YouTubeExtractor";
  private final static String CACHE_FILE_NAME = "decipher_js_funct";
@@ -719,20 +719,30 @@ private void decipherViaWebView(final SparseArray<String> encSignatures) {
 
  @Override
  public void run() {
- JsEvaluator js = new JsEvaluator(context);
- js.evaluate(stb.toString(),
- new JsCallback() {
- @Override
- public void onResult(final String result) {
- lock.lock();
- try {
- decipheredSignature = result;
- jsExecuting.signal();
- } finally {
- lock.unlock();
- }
- }
- });
+ new JsEvaluator(context).evaluate(stb.toString(), new JsCallback() {
+ @Override
+ public void onResult(String result) {
+ lock.lock();
+ try {
+ decipheredSignature = result;
+ jsExecuting.signal();
+ } finally {
+ lock.unlock();
+ }
+ }
+
+ @Override
+ public void onError(String errorMessage) {
+ lock.lock();
+ try {
+ if(LOGGING)
+ Log.e(LOG_TAG, errorMessage);
+ jsExecuting.signal();
+ } finally {
+ lock.unlock();
+ }
+ }
+ });
  }
  });
  }