diff --git a/src/org/lineageos/updater/DownloadController.java b/src/org/lineageos/updater/DownloadController.java index 4324b464..b5e9afb8 100644 --- a/src/org/lineageos/updater/DownloadController.java +++ b/src/org/lineageos/updater/DownloadController.java @@ -69,6 +69,10 @@ public class DownloadController implements DownloadControllerInt { PowerManager powerManager = (PowerManager) context.getSystemService(Context.POWER_SERVICE); mWakeLock = powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "Updater"); mWakeLock.setReferenceCounted(false); + + for (UpdateDownload update : mUpdatesDbHelper.getUpdates()) { + addUpdate(update, true); + } } private class DownloadEntry { @@ -220,7 +224,11 @@ public class DownloadController implements DownloadControllerInt { } @Override - public boolean addUpdate(UpdateDownload update, boolean local) { + public boolean addUpdate(UpdateDownload update) { + return addUpdate(update, false); + } + + private boolean addUpdate(UpdateDownload update, boolean local) { Log.d(TAG, "Adding download: " + update.getDownloadId()); if (mDownloads.containsKey(update.getDownloadId())) { Log.e(TAG, "Download (" + update.getDownloadId() + ") already added"); diff --git a/src/org/lineageos/updater/DownloadControllerInt.java b/src/org/lineageos/updater/DownloadControllerInt.java index 29b61739..389857ed 100644 --- a/src/org/lineageos/updater/DownloadControllerInt.java +++ b/src/org/lineageos/updater/DownloadControllerInt.java @@ -20,7 +20,7 @@ import java.util.Set; public interface DownloadControllerInt { - boolean addUpdate(UpdateDownload update, boolean local); + boolean addUpdate(UpdateDownload update); List getUpdates(); diff --git a/src/org/lineageos/updater/UpdatesActivity.java b/src/org/lineageos/updater/UpdatesActivity.java index 5deb3e40..3d3482a3 100644 --- a/src/org/lineageos/updater/UpdatesActivity.java +++ b/src/org/lineageos/updater/UpdatesActivity.java @@ -117,22 +117,11 @@ public class UpdatesActivity extends AppCompatActivity { }; private void loadUpdatesList() throws IOException, JSONException { - // Process local files first. If they aren't valid, the controller will delete - // them from the database. If they are valid, they should be prioritized. - - Log.d(TAG, "Getting updates from internal database"); - - DownloadControllerInt controller = mDownloadService.getDownloadController(); - UpdatesDbHelper dbHelper = new UpdatesDbHelper(this); - for (UpdateDownload update : dbHelper.getUpdates()) { - controller.addUpdate(update, true); - } - Log.d(TAG, "Adding remote updates"); - + DownloadControllerInt controller = mDownloadService.getDownloadController(); File jsonFile = Utils.getCachedUpdateList(this); for (UpdateDownload update : Utils.parseJson(jsonFile, true)) { - controller.addUpdate(update, true); + controller.addUpdate(update); } List updateIds = new ArrayList<>();