Revert "BlissUpdater: Fix update check on boot"
This reverts commit f1981465d9cd73b41211641c2a744fb3c27dd4b6.
diff --git a/src/com/blissroms/updater/UpdatesActivity.java b/src/com/blissroms/updater/UpdatesActivity.java
index 11be7c8..819bc1f 100644
--- a/src/com/blissroms/updater/UpdatesActivity.java
+++ b/src/com/blissroms/updater/UpdatesActivity.java
@@ -296,7 +296,7 @@
preferences.edit().putLong(Constants.PREF_LAST_UPDATE_CHECK, millis).apply();
updateLastCheckedString();
if (json.exists() && Utils.isUpdateCheckEnabled(this) &&
- Utils.checkForNewUpdates(json, jsonNew, false)) {
+ Utils.checkForNewUpdates(json, jsonNew)) {
UpdatesCheckReceiver.updateRepeatingUpdatesCheck(this);
}
// In case we set a one-shot check because of a previous failure
diff --git a/src/com/blissroms/updater/UpdatesCheckReceiver.java b/src/com/blissroms/updater/UpdatesCheckReceiver.java
index ac3d503..4f87b55 100644
--- a/src/com/blissroms/updater/UpdatesCheckReceiver.java
+++ b/src/com/blissroms/updater/UpdatesCheckReceiver.java
@@ -93,7 +93,7 @@
@Override
public void onSuccess(File destination) {
try {
- if (Utils.checkForNewUpdates(json, jsonNew, true)) {
+ if (json.exists() && Utils.checkForNewUpdates(json, jsonNew)) {
showNotification(context);
updateRepeatingUpdatesCheck(context);
}
diff --git a/src/com/blissroms/updater/misc/Utils.java b/src/com/blissroms/updater/misc/Utils.java
index 454f976..fc0b4b7 100644
--- a/src/com/blissroms/updater/misc/Utils.java
+++ b/src/com/blissroms/updater/misc/Utils.java
@@ -196,11 +196,8 @@
* @throws IOException
* @throws JSONException
*/
- public static boolean checkForNewUpdates(File oldJson, File newJson, boolean fromBoot)
+ public static boolean checkForNewUpdates(File oldJson, File newJson)
throws IOException, JSONException {
- if (!oldJson.exists() || fromBoot){
- return parseJson(newJson, true) != null;
- }
List<UpdateInfo> oldList = parseJson(oldJson, true);
List<UpdateInfo> newList = parseJson(newJson, true);
Set<String> oldIds = new HashSet<>();