Feature/android r

.gitignore

@@ -44,6 +44,18 @@ version
 .pub-cache/
 .pub/
 build/
+.idea/
+
+android/.classpath
+android/.project
+android/.settings
+android/.settings/
+android/example/.classpath
+android/example/.project
+android/example/.settings
+android/example/.settings/
+example/ios/Flutter/flutter_export_environment.sh
+.vscode/
 flutter_*.png
 linked_*.ds
 unlinked.ds
@@ -95,4 +107,4 @@ coverage/
 !**/ios/**/default.mode2v3
 !**/ios/**/default.pbxuser
 !**/ios/**/default.perspectivev3
-!/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages
+!/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages

CHANGELOG.md

@@ -1,4 +1,9 @@
 
+## 1.7.2 - 24-01-2022
+
+* fix bug on Android
+* upgrade Android dependencies (WorkerManager 2.7.1)
+
 ## 1.7.1 - 08-10-2021
 
 * fix bug resume download on Android

android/.gitignore

@@ -6,3 +6,6 @@
 .DS_Store
 /build
 /captures
+/.classpath
+/.project
+/.settings

android/build.gradle

@@ -8,7 +8,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.4'
+        classpath 'com.android.tools.build:gradle:4.1.0'
     }
 }
 
@@ -38,8 +38,12 @@ android {
 }
 
 dependencies {
-    implementation 'androidx.work:work-runtime:2.7.0-rc01'
+    implementation 'androidx.work:work-runtime:2.7.1'
     implementation 'androidx.annotation:annotation:1.2.0'
     implementation 'androidx.core:core:1.6.0'
     implementation 'androidx.fragment:fragment:1.3.6'
+    implementation 'com.mpatric:mp3agic:0.9.0'
+//    implementation files('/Users/trope/flutter/bin/cache/artifacts/engine/android-x64/flutter.jar')
+
+
 }

android/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

android/src/main/java/vn/hunghd/flutterdownloader/DownloadQueue.java

@@ -0,0 +1,73 @@
+package vn.hunghd.flutterdownloader;
+
+import android.content.Context;
+import android.util.Log;
+
+import androidx.work.WorkManager;
+import androidx.work.WorkRequest;
+
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.Map;
+import java.util.Queue;
+import java.util.UUID;
+
+public final class DownloadQueue {
+    private static DownloadQueue instance;
+    private final Queue<UUID> queue = new LinkedList<>();
+    private final Map<UUID, WorkRequest> queueMap = new HashMap<>();
+
+    private Context context;
+    private boolean nothingOnWorker = true;
+
+    private DownloadQueue(Context context) {
+        this.context = context;
+    }
+
+    public static DownloadQueue getInstance(Context context) {
+        if (instance == null) {
+            instance = new DownloadQueue(context);
+        }
+        return instance;
+    }
+
+    public void doQueue() {
+        final UUID id = queue.poll();
+        if (id == null) {
+            reset();
+        } else {
+            if (queueMap.containsKey(id)){
+                final WorkRequest request = queueMap.get(id);
+                startWork(request);
+            } else {
+                doQueue();
+            }
+        }
+    }
+    private void startWork(WorkRequest e){
+        nothingOnWorker = false;
+        WorkManager.getInstance(context).enqueue(e);
+    }
+    public void reset() {
+        queue.clear();
+        queueMap.clear();
+        nothingOnWorker = true;
+    }
+
+    public void removeTask(UUID e) {
+        if(queue.remove(e)){
+            queueMap.remove(e);
+            if(queue.isEmpty()){
+                nothingOnWorker = true;
+            }
+        }
+    }
+    public void add(WorkRequest e) {
+        if (queue.isEmpty() && nothingOnWorker) {
+            startWork(e);
+        } else {
+            queue.add(e.getId());
+            queueMap.put(e.getId(),e);
+        }
+    }
+}

android/src/main/java/vn/hunghd/flutterdownloader/DownloadTask.java

@@ -15,9 +15,16 @@ public class DownloadTask {
     boolean openFileFromNotification;
     long timeCreated;
     boolean saveInPublicStorage;
+    String albumName;
+    String artistName;
+    String artistId;
+    String playlistId;
+    String albumId;
+    String musicId;
 
     DownloadTask(int primaryId, String taskId, int status, int progress, String url, String filename, String savedDir,
-                 String headers, String mimeType, boolean resumable, boolean showNotification, boolean openFileFromNotification, long timeCreated, boolean saveInPublicStorage) {
+                 String headers, String mimeType, boolean resumable, boolean showNotification, boolean openFileFromNotification,
+                 long timeCreated, boolean saveInPublicStorage, String albumName, String artistName, String artistId, String playlistId, String albumId, String musicId) {
         this.primaryId = primaryId;
         this.taskId = taskId;
         this.status = status;
@@ -31,11 +38,23 @@ public class DownloadTask {
         this.showNotification = showNotification;
         this.openFileFromNotification = openFileFromNotification;
         this.timeCreated = timeCreated;
+        this.albumName = albumName;
+        this.artistName = artistName;
+        this.artistId = artistId;
+        this.playlistId = playlistId;
+        this.albumId = albumId;
+        this.musicId = musicId;
         this.saveInPublicStorage = saveInPublicStorage;
     }
 
     @Override
     public String toString() {
-        return "DownloadTask{taskId=" + taskId + ",status=" + status + ",progress=" + progress + ",url=" + url + ",filename=" + filename + ",savedDir=" + savedDir + ",headers=" + headers + ", saveInPublicStorage= " + saveInPublicStorage + "}";
+        return "DownloadTask{taskId=" + taskId + ",status=" + status + ",progress=" + progress +
+                ",url=" + url + ",filename=" + filename + ",savedDir=" + savedDir + ",headers=" +
+                headers + "saveInPublicStorage= " + saveInPublicStorage + ",albumName=" + albumName + ",artistName=" + artistName +
+                ",artistId=" + artistId +
+                ",playlistId=" + playlistId +
+                ",albumId=" + albumId +
+                ",musicId=" + musicId + "}";
     }
 }