diff --git a/app/src/main/java/com/gh/download/DownloadTask.java b/app/src/main/java/com/gh/download/DownloadTask.java index 8342cce7a5..cdd92c09dd 100644 --- a/app/src/main/java/com/gh/download/DownloadTask.java +++ b/app/src/main/java/com/gh/download/DownloadTask.java @@ -53,8 +53,7 @@ public class DownloadTask implements DownloadListener { public void start() { // 从下载历史里获取过去下载的进度信息 - DownloadEntry downloadEntry = null; - downloadEntry = DownloadDao.getInstance(context).get(entry.getUrl()); + DownloadEntry downloadEntry = DownloadDao.getInstance(context).get(entry.getUrl()); if (downloadEntry != null) { entry = downloadEntry; @@ -68,7 +67,6 @@ public class DownloadTask implements DownloadListener { } else { Trace.getInstance().debug(DownloadTask.class.getSimpleName(), "start==>" + "First log into history!"); - } downloadThread = new DownloadThread(context, this.entry, this); @@ -144,7 +142,7 @@ public class DownloadTask implements DownloadListener { || status == DownloadStatus.neterror) { HashMap map = DataChanger.getInstance().getDownloadingTasks(); Iterator iterator = map.keySet().iterator(); - String key = null; + String key; while (iterator.hasNext()) { key = iterator.next(); DownloadTask task = map.get(key); @@ -173,13 +171,11 @@ public class DownloadTask implements DownloadListener { } public void cancel() { - downloadThread.cancle(); - + downloadThread.setStatus(DownloadStatus.cancel); } public void pause() { - downloadThread.pause(); - + downloadThread.setStatus(DownloadStatus.pause); } // check download progress diff --git a/app/src/main/java/com/gh/download/DownloadThread.java b/app/src/main/java/com/gh/download/DownloadThread.java index 8b5422f885..02c89ff86a 100644 --- a/app/src/main/java/com/gh/download/DownloadThread.java +++ b/app/src/main/java/com/gh/download/DownloadThread.java @@ -151,12 +151,8 @@ public class DownloadThread extends Thread { } } - public void pause() { - status = DownloadStatus.pause; - } - - public void cancle() { - status = DownloadStatus.cancel; + public void setStatus(DownloadStatus status) { + this.status = status; } }