Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Extract common code to isQueued and isActive.

Browse Source
This commit is contained in:
Peter Serwylo 2016-04-21 15:30:04 +10:00
parent 7f1155816e
commit bbf7cd81a6
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/org/fdroid/fdroid/net/DownloaderService.java
View File

@ -134,11 +134,9 @@ public class DownloaderService extends Service {
if (ACTION_CANCEL.equals(intent.getAction())) { if (ACTION_CANCEL.equals(intent.getAction())) {
Log.i(TAG, "Removed " + intent); Log.i(TAG, "Removed " + intent);
Integer what = QUEUE_WHATS.remove(uriString); Integer what = QUEUE_WHATS.remove(uriString);
if (what != null && serviceHandler.hasMessages(what)) { if (isQueued(uriString)) {
// the URL is in the queue, remove it
serviceHandler.removeMessages(what); serviceHandler.removeMessages(what);
} else if (downloader != null && TextUtils.equals(uriString, downloader.sourceUrl.toString())) { } else if (isActive(uriString)) {
// the URL is being downloaded, cancel it
downloader.cancelDownload(); downloader.cancelDownload();
} else { } else {
Log.e(TAG, "CANCEL called on something not queued or running: " + startId + " " + intent); Log.e(TAG, "CANCEL called on something not queued or running: " + startId + " " + intent);