- Update org.redwid.android.youtube.dl:python to 0.6.5 version;

- Bump app version to 1.0.2

Author: Redwid

.travis.yml

@@ -34,9 +34,9 @@ before_deploy:
   - git tag $TRAVIS_TAG
 
 deploy:
-  dry_run: true
+  #dry_run: true
   provider: releases
   api_key: $GITHUB_OAUTH_TOKEN
   file: app/build/outputs/apk/debug/app-debug.apk
   skip_cleanup: true
-  name: '1.0.1'
+  name: '1.0.2'

lib/build.gradle

@@ -13,7 +13,7 @@ android {
         minSdkVersion 14
         targetSdkVersion 28
         versionCode 1
-        versionName "1.0"
+        versionName "1.0.2"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
@@ -26,18 +26,18 @@ android {
 }
 
 dependencies {
-    implementation 'androidx.appcompat:appcompat:1.0.0'
+    implementation 'androidx.appcompat:appcompat:1.0.2'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha2'
     implementation 'androidx.recyclerview:recyclerview:1.0.0'
 
     implementation 'com.jakewharton.timber:timber:4.7.0'
 
-    implementation 'org.redwid.android.youtube.dl:python:0.6.3:arm64-v8a@aar'
-    implementation 'org.redwid.android.youtube.dl:python:0.6.3:armeabi-v7a@aar'
+    implementation 'org.redwid.android.youtube.dl:python:0.6.5:arm64-v8a@aar'
+    implementation 'org.redwid.android.youtube.dl:python:0.6.5:armeabi-v7a@aar'
 
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'androidx.test:runner:1.1.0-beta02'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0-beta02'
+    androidTestImplementation 'androidx.test:runner:1.3.0-alpha01'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0-alpha01'
 }
 
 uploadArchives {

lib/src/main/java/org/redwid/android/youtube/dl/TaskWorkerThread.java

@@ -23,6 +23,7 @@ public interface TaskWorkerThreadListener {
     private UnpackTask unpackTask;
 
     private boolean active = true;
+    private Object taskInProgress = new Object();
 
     public TaskWorkerThread(final Context context) {
         this.context = context;
@@ -32,12 +33,20 @@ public TaskWorkerThread(final Context context) {
     public void run() {
         while (active) {
             if (!list.isEmpty()) {
-                try {
-                    performTask();
-                }
-                catch (Exception e) {
-                    Timber.e(e, "ERROR in run()");
-                }
+
+                final String stringUrl = list.get(0);
+                Timber.i("performTask(), stringUrl: %s", stringUrl);
+
+                final Thread thread = new Thread(new Runnable() {
+                    @Override
+                    public void run() {
+                        performTask(stringUrl);
+                        wakeUpTaskInProgress();
+                    }
+                });
+                thread.start();
+
+                sleepTaskInProgress();
             }
             else {
                 Timber.i("run() sleep");
@@ -46,6 +55,25 @@ public void run() {
         }
     }
 
+    private void sleepTaskInProgress() {
+        Timber.i("sleepTaskInProgress() begin");
+        synchronized (taskInProgress) {
+            try {
+                taskInProgress.wait(10000);
+            } catch (InterruptedException e) {
+                Timber.e(e, "EROR in sleepTaskInProgress() interrupted");
+            }
+        }
+        Timber.i("sleepTaskInProgress() done");
+    }
+
+    private void wakeUpTaskInProgress() {
+        Timber.i("wakeUpTaskInProgress()");
+        synchronized (taskInProgress) {
+            taskInProgress.notify();
+        }
+    }
+
     public void cancel() {
         active = false;
     }
@@ -67,35 +95,37 @@ private synchronized void sleep() {
         try {
             Timber.i("sleep() begin ...");
             wait();
+            Timber.i("sleep() done ...");
         } catch (InterruptedException e) {
-            Timber.i("sleep() end ...");
+            Timber.e(e,"ERROR in sleep()");
         }
     }
 
-    private void performTask() {
+    private void performTask(final String stringUrl) {
         Timber.i("performTask()");
-
-        if(unpackTask == null) {
-            unpackTask = new UnpackTask();
-            if(!unpackTask.unpack(context.getApplicationContext())) {
-                unpackTask = null;
+        try {
+            if (unpackTask == null) {
+                unpackTask = new UnpackTask();
+                if (!unpackTask.unpack(context.getApplicationContext())) {
+                    unpackTask = null;
+                }
             }
-        }
 
-        final String stringUrl = list.get(0);
-        Timber.i("performTask(), stringUrl: %s", stringUrl);
-
-        final YoutubeDlWorker youtubeDlWorker = new YoutubeDlWorker();
-        if(youtubeDlWorker.process(context.getApplicationContext(), stringUrl)) {
-            Timber.i("performTask(), success");
-        }
-        list.remove(0);
-        if(list.isEmpty()) {
-            Timber.i("performTask(), list.isEmpty()");
-            if(context instanceof TaskWorkerThreadListener) {
-                Timber.i("performTask(), context instanceof TaskWorkerThreadListener");
-                ((TaskWorkerThreadListener)context).onCompleteAllItems();
+            final YoutubeDlWorker youtubeDlWorker = new YoutubeDlWorker();
+            if (youtubeDlWorker.process(context.getApplicationContext(), stringUrl)) {
+                Timber.i("performTask(), success");
             }
+            list.remove(stringUrl);
+            if (list.isEmpty()) {
+                Timber.i("performTask(), list.isEmpty()");
+                if (context instanceof TaskWorkerThreadListener) {
+                    Timber.i("performTask(), context instanceof TaskWorkerThreadListener");
+                    ((TaskWorkerThreadListener) context).onCompleteAllItems();
+                }
+            }
+        }
+        catch (Exception e) {
+            Timber.e(e, "ERROR in performTask(%s)", stringUrl);
         }
     }
 }

lib/src/main/res/values/strings.xml

@@ -1,5 +1,5 @@
 <resources>
     <string name="app_name">lib</string>
-    <string name="private_version">24_04_2019</string>
+    <string name="private_version">25_06_2019</string>
     <string name="notification_channel_name">Youtube-Dl Service</string>
 </resources>