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

Verify downloads in a separate thread

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

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

@@ -131,21 +131,11 @@ public class UpdaterController implements UpdaterControllerInt {
@Override @Override
public void onSuccess(String body) { public void onSuccess(String body) {
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);
notifyUpdateChange(downloadId);
Log.d(TAG, "Download complete");
if (!verifyDownload(update.getFile())) {
update.setPersistentStatus(UpdateStatus.Persistent.UNKNOWN);
mUpdatesDbHelper.removeUpdate(downloadId);
update.setProgress(0);
update.setStatus(UpdateStatus.VERIFICATION_FAILED);
} else {
update.setPersistentStatus(UpdateStatus.Persistent.VERIFIED);
mUpdatesDbHelper.changeUpdateStatus(update);
update.setStatus(UpdateStatus.VERIFIED);
}
mDownloads.get(downloadId).mDownloadClient = null; mDownloads.get(downloadId).mDownloadClient = null;
verifyUpdateAsync(downloadId);
notifyUpdateChange(downloadId); notifyUpdateChange(downloadId);
tryReleaseWakelock(); tryReleaseWakelock();
} }
@@ -192,7 +182,28 @@ public class UpdaterController implements UpdaterControllerInt {
}; };
} }
private boolean verifyDownload(File file) { private void verifyUpdateAsync(final String downloadId) {
new Thread(new Runnable() {
@Override
public void run() {
UpdateDownload update = mDownloads.get(downloadId).mUpdate;
File file = update.getFile();
if (file.exists() && verifyPackage(file)) {
update.setPersistentStatus(UpdateStatus.Persistent.VERIFIED);
mUpdatesDbHelper.changeUpdateStatus(update);
update.setStatus(UpdateStatus.VERIFIED);
} else {
update.setPersistentStatus(UpdateStatus.Persistent.UNKNOWN);
mUpdatesDbHelper.removeUpdate(downloadId);
update.setProgress(0);
update.setStatus(UpdateStatus.VERIFICATION_FAILED);
}
notifyUpdateChange(downloadId);
}
}).start();
}
private boolean verifyPackage(File file) {
try { try {
android.os.RecoverySystem.verifyPackage(file, null, null); android.os.RecoverySystem.verifyPackage(file, null, null);
Log.e(TAG, "Verification successful"); Log.e(TAG, "Verification successful");