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

Keep track of the number of active downloads

Browse Source
This commit is contained in:
Gabriele M
2017-07-04 19:05:04 +02:00
parent f0940dafca
commit e7923a3d56
1 changed files with 26 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -54,6 +54,8 @@ public class UpdaterController implements UpdaterControllerInt {
private final File mDownloadRoot; private final File mDownloadRoot;
private int mActiveDownloads = 0;
public static synchronized UpdaterController getInstance() { public static synchronized UpdaterController getInstance() {
return sUpdaterController; return sUpdaterController;
} }
@@ -108,6 +110,22 @@ public class UpdaterController implements UpdaterControllerInt {
} }
} }
private void addDownloadClient(DownloadEntry entry, DownloadClient downloadClient) {
if (entry.mDownloadClient != null) {
return;
}
entry.mDownloadClient = downloadClient;
mActiveDownloads++;
}
private void removeDownloadClient(DownloadEntry entry) {
if (entry.mDownloadClient == null) {
return;
}
entry.mDownloadClient = null;
mActiveDownloads--;
}
private DownloadClient.DownloadCallback getDownloadCallback(final String downloadId) { private DownloadClient.DownloadCallback getDownloadCallback(final String downloadId) {
return new DownloadClient.DownloadCallback() { return new DownloadClient.DownloadCallback() {
@@ -139,7 +157,7 @@ public class UpdaterController implements UpdaterControllerInt {
Log.d(TAG, "Download complete"); Log.d(TAG, "Download complete");
UpdateDownload update = mDownloads.get(downloadId).mUpdate; UpdateDownload update = mDownloads.get(downloadId).mUpdate;
update.setStatus(UpdateStatus.VERIFYING); update.setStatus(UpdateStatus.VERIFYING);
mDownloads.get(downloadId).mDownloadClient = null; removeDownloadClient(mDownloads.get(downloadId));
verifyUpdateAsync(downloadId); verifyUpdateAsync(downloadId);
notifyUpdateChange(downloadId); notifyUpdateChange(downloadId);
tryReleaseWakelock(); tryReleaseWakelock();
@@ -156,7 +174,7 @@ public class UpdaterController implements UpdaterControllerInt {
// Already notified // Already notified
} else { } else {
Log.e(TAG, "Download failed"); Log.e(TAG, "Download failed");
mDownloads.get(downloadId).mDownloadClient = null; removeDownloadClient(mDownloads.get(downloadId));
update.setStatus(UpdateStatus.PAUSED_ERROR); update.setStatus(UpdateStatus.PAUSED_ERROR);
notifyUpdateChange(downloadId); notifyUpdateChange(downloadId);
} }
@@ -277,11 +295,12 @@ public class UpdaterController implements UpdaterControllerInt {
UpdateDownload update = mDownloads.get(downloadId).mUpdate; UpdateDownload update = mDownloads.get(downloadId).mUpdate;
File destination = new File(mDownloadRoot, update.getName()); File destination = new File(mDownloadRoot, update.getName());
update.setFile(destination); update.setFile(destination);
mDownloads.get(downloadId).mDownloadClient = DownloadClient downloadClient =
DownloadClient.downloadFile(update.getDownloadUrl(), DownloadClient.downloadFile(update.getDownloadUrl(),
update.getFile(), update.getFile(),
getDownloadCallback(downloadId), getDownloadCallback(downloadId),
getProgressListener(downloadId)); getProgressListener(downloadId));
addDownloadClient(mDownloads.get(downloadId), downloadClient);
update.setStatus(UpdateStatus.STARTING); update.setStatus(UpdateStatus.STARTING);
notifyUpdateChange(downloadId); notifyUpdateChange(downloadId);
mWakeLock.acquire(); mWakeLock.acquire();
@@ -302,11 +321,12 @@ public class UpdaterController implements UpdaterControllerInt {
verifyUpdateAsync(downloadId); verifyUpdateAsync(downloadId);
notifyUpdateChange(downloadId); notifyUpdateChange(downloadId);
} else { } else {
mDownloads.get(downloadId).mDownloadClient = DownloadClient downloadClient =
DownloadClient.downloadFileResume(update.getDownloadUrl(), DownloadClient.downloadFileResume(update.getDownloadUrl(),
update.getFile(), update.getFile(),
getDownloadCallback(downloadId), getDownloadCallback(downloadId),
getProgressListener(downloadId)); getProgressListener(downloadId));
addDownloadClient(mDownloads.get(downloadId), downloadClient);
update.setStatus(UpdateStatus.STARTING); update.setStatus(UpdateStatus.STARTING);
notifyUpdateChange(downloadId); notifyUpdateChange(downloadId);
mWakeLock.acquire(); mWakeLock.acquire();
@@ -324,7 +344,7 @@ public class UpdaterController implements UpdaterControllerInt {
// First remove the client and then cancel the download so that when the download // First remove the client and then cancel the download so that when the download
// fails, we know it was intentional // fails, we know it was intentional
DownloadClient downloadClient = mDownloads.get(downloadId).mDownloadClient; DownloadClient downloadClient = mDownloads.get(downloadId).mDownloadClient;
mDownloads.get(downloadId).mDownloadClient = null; removeDownloadClient(mDownloads.get(downloadId));
downloadClient.cancel(); downloadClient.cancel();
UpdateDownload update = mDownloads.get(downloadId).mUpdate; UpdateDownload update = mDownloads.get(downloadId).mUpdate;
update.setStatus(UpdateStatus.PAUSED); update.setStatus(UpdateStatus.PAUSED);
@@ -389,11 +409,6 @@ public class UpdaterController implements UpdaterControllerInt {
@Override @Override
public boolean hasActiveDownloads() { public boolean hasActiveDownloads() {
for (DownloadEntry entry : mDownloads.values()) { return mActiveDownloads > 0;
if (entry.mDownloadClient != null) {
return true;
}
}
return false;
} }
} }