PawletOS/lineageos_updater
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Simplify handling of intentional download failures

Browse Source
This commit is contained in:
Gabriele M
2017-07-05 23:35:14 +02:00
parent 1795bd8b11
commit 217f84b57e
1 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/org/lineageos/updater/controller/UpdaterController.java
View File

@@ -178,8 +178,6 @@ public class UpdaterController implements UpdaterControllerInt {
@Override @Override
public void onFailure(boolean cancelled) { public void onFailure(boolean cancelled) {
// The client is null if we intentionally stopped the download
cancelled = mDownloads.get(downloadId).mDownloadClient == null;
UpdateDownload update = mDownloads.get(downloadId).mUpdate; UpdateDownload update = mDownloads.get(downloadId).mUpdate;
if (cancelled) { if (cancelled) {
Log.d(TAG, "Download cancelled"); Log.d(TAG, "Download cancelled");
@@ -366,13 +364,10 @@ public class UpdaterController implements UpdaterControllerInt {
return false; return false;
} }
// First remove the client and then cancel the download so that when the download DownloadEntry entry = mDownloads.get(downloadId);
// fails, we know it was intentional entry.mDownloadClient.cancel();
DownloadClient downloadClient = mDownloads.get(downloadId).mDownloadClient; removeDownloadClient(entry);
removeDownloadClient(mDownloads.get(downloadId)); entry.mUpdate.setStatus(UpdateStatus.PAUSED);
downloadClient.cancel();
UpdateDownload update = mDownloads.get(downloadId).mUpdate;
update.setStatus(UpdateStatus.PAUSED);
notifyUpdateChange(downloadId); notifyUpdateChange(downloadId);
return true; return true;
} }