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

Don't assume we always know the final size of the files

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

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

@@ -192,6 +192,16 @@ public class UpdaterController implements UpdaterControllerInt {
@Override @Override
public void update(long bytesRead, long contentLength, long speed, long eta, public void update(long bytesRead, long contentLength, long speed, long eta,
boolean done) { boolean done) {
if (contentLength <= 0) {
if (getUpdate(downloadId).getFileSize() <= 0) {
return;
} else {
contentLength = getUpdate(downloadId).getFileSize();
}
}
if (contentLength <= 0) {
return;
}
final long now = SystemClock.elapsedRealtime(); final long now = SystemClock.elapsedRealtime();
int progress = Math.round(bytesRead * 100 / contentLength); int progress = Math.round(bytesRead * 100 / contentLength);
if (progress != mProgress || mLastUpdate - now > MAX_REPORT_INTERVAL_MS) { if (progress != mProgress || mLastUpdate - now > MAX_REPORT_INTERVAL_MS) {
@@ -253,7 +263,7 @@ public class UpdaterController implements UpdaterControllerInt {
if (update.getFile() == null || !update.getFile().exists()) { if (update.getFile() == null || !update.getFile().exists()) {
update.setStatus(UpdateStatus.UNKNOWN); update.setStatus(UpdateStatus.UNKNOWN);
return false; return false;
} else { } else if (update.getFileSize() > 0) {
int progress = Math.round( int progress = Math.round(
update.getFile().length() * 100 / update.getFileSize()); update.getFile().length() * 100 / update.getFileSize());
update.setProgress(progress); update.setProgress(progress);
@@ -318,7 +328,7 @@ public class UpdaterController implements UpdaterControllerInt {
} }
UpdateDownload update = mDownloads.get(downloadId).mUpdate; UpdateDownload update = mDownloads.get(downloadId).mUpdate;
File file = update.getFile(); File file = update.getFile();
if (file.exists() && file.length() == update.getFileSize()) { if (file.exists() && update.getFileSize() > 0 && file.length() >= update.getFileSize()) {
Log.d(TAG, "File already downloaded, starting verification"); Log.d(TAG, "File already downloaded, starting verification");
update.setStatus(UpdateStatus.VERIFYING); update.setStatus(UpdateStatus.VERIFYING);
verifyUpdateAsync(downloadId); verifyUpdateAsync(downloadId);