improve restart callback sequence

SirLYC · Jun 29, 2019 · 1021e3b · 1021e3b
1 parent e450f81
commit 1021e3b
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 28 deletions.
diff --git a/config.gradle b/config.gradle
@@ -7,7 +7,7 @@ ext {
             'targetSdkVersion' : 28,
             'minSdkVersion'    : 19,
             'versionCode'      : 1,
-            'versionName'      : '0.6.1-beta'
+            'versionName'      : '0.6.2-beta'
     ]
     deps = [
             'kotlin-stdlib'       : "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version",

diff --git a/downloader/src/main/java/com/lyc/downloader/DownloadManager.java b/downloader/src/main/java/com/lyc/downloader/DownloadManager.java
@@ -421,14 +421,7 @@ private void submitInner(String url, String path, String filename, ISubmitCallba
                     } catch (RemoteException e) {
                         Logger.e(TAG, "submitSuccess", e);
                     }
-                    IDownloadTasksChangeCallback downloadTasksChangeCallback = this.downloadTasksChangeCallback;
-                    if (downloadTasksChangeCallback != null) {
-                        try {
-                            downloadTasksChangeCallback.onNewDownloadTaskArrive(downloadInfo);
-                        } catch (RemoteException e) {
-                            Logger.e(TAG, "onNewDownloadTaskArrive", e);
-                        }
-                    }
+                    notifyDownloadManagerArrive(downloadInfo);
                     schedule();
                 } else {
                     try {
@@ -490,25 +483,55 @@ public void startAll() {
     public void startOrResume(long id, boolean restart) {
         DownloadExecutors.message.execute(() -> {
             DownloadTask downloadTask = taskTable.get(id);
-            if (downloadTask == null && restart) {
+            final DownloadInfo info = infoTable.get(id);
+            if ((downloadTask == null || info == null) && restart) {
                 DownloadExecutors.io.execute(() -> {
                     DownloadInfo downloadInfo = daoSession.getDownloadInfoDao().load(id);
                     if (downloadInfo != null) {
                         DownloadExecutors.message.execute(() -> {
                             DownloadTask newDownloadTask = new DownloadTask(downloadInfo, client);
                             taskTable.put(id, newDownloadTask);
                             infoTable.put(id, downloadInfo);
+                            notifyDownloadManagerArrive(downloadInfo);
                             enqueueTask(id, true, true);
                         });
                     }
                 });
             } else if (downloadTask != null && ((pausingTasksId.remove(id) | errorTasksId.remove(id)) ||
                     downloadTask.getState() == FINISH)) {
+                if (restart) {
+                    info.setDownloadedSize(0);
+                    info.setTotalSize(0);
+                    info.setLastModified(null);
+                    onDownloadUpdateInfo(info);
+                }
                 enqueueTask(id, restart, true);
             }
         });
     }
 
+    private void notifyDownloadManagerArrive(DownloadInfo info) {
+        try {
+            final IDownloadTasksChangeCallback downloadTasksChangeCallback = this.downloadTasksChangeCallback;
+            if (downloadTasksChangeCallback != null) {
+                downloadTasksChangeCallback.onNewDownloadTaskArrive(info);
+            }
+        } catch (RemoteException e) {
+            Logger.e("DownloadManager", "onNewDownloadTaskArrive", e);
+        }
+    }
+
+    private void notifyDownloadInfoRemoved(long id) {
+        final IDownloadTasksChangeCallback downloadTasksChangeCallback = this.downloadTasksChangeCallback;
+        if (downloadTasksChangeCallback != null) {
+            try {
+                downloadTasksChangeCallback.onDownloadTaskRemove(id);
+            } catch (RemoteException e) {
+                Logger.e("DownloadManager", "onNewDownloadTaskArrive", e);
+            }
+        }
+    }
+
     @Override
     public void pause(long id) {
         DownloadExecutors.message.execute(() -> {
@@ -525,14 +548,7 @@ public void cancel(long id) {
             DownloadTask downloadTask = taskTable.get(id);
             if (downloadTask == null) return;
             downloadTask.cancel();
-            IDownloadTasksChangeCallback downloadTasksChangeCallback = this.downloadTasksChangeCallback;
-            if (downloadTasksChangeCallback != null) {
-                try {
-                    downloadTasksChangeCallback.onDownloadTaskRemove(id);
-                } catch (RemoteException e) {
-                    Logger.e(TAG, "onDownloadTaskRemove", e);
-                }
-            }
+            notifyDownloadInfoRemoved(id);
         });
     }
 
@@ -567,14 +583,7 @@ public void delete(long id, boolean deleteFile) {
                 errorTasksId.remove(id);
                 pausingTasksId.remove(id);
                 downloadTask.delete(deleteFile);
-                IDownloadTasksChangeCallback downloadTasksChangeCallback = this.downloadTasksChangeCallback;
-                if (downloadTasksChangeCallback != null) {
-                    try {
-                        downloadTasksChangeCallback.onDownloadTaskRemove(id);
-                    } catch (RemoteException e) {
-                        Logger.e(TAG, "onDownloadTaskRemove", e);
-                    }
-                }
+                notifyDownloadInfoRemoved(id);
                 schedule();
             } else {
                 Logger.w("DownloadManager", "delete a task that is not present in DownloadManager! find in db. id = " + id);

diff --git a/downloader/src/main/java/com/lyc/downloader/DownloadTasksChangeListener.java b/downloader/src/main/java/com/lyc/downloader/DownloadTasksChangeListener.java
@@ -10,15 +10,15 @@
 public interface DownloadTasksChangeListener {
 
     /**
-     * notified when a new download Task is added to
+     * Notified when a new download Task is added to
      * {@link DownloadManager}
      *
      * @param downloadInfo new-added info about download task
      */
     void onNewDownloadTaskArrive(DownloadInfo downloadInfo);
 
     /**
-     * notified when a download task is deleted
+     * Notified when a download task is deleted
      *
      * @param id the id of the download task
      */