From e3439656e024747394210db25320d0a89b0f339b Mon Sep 17 00:00:00 2001 From: althafvly Date: Tue, 15 Aug 2023 13:27:21 +0530 Subject: [PATCH 1/2] Updater: process the json file to avoid multiple updates Change-Id: I6422593ddd1c98506f32febc4bf2f7574d983a3a --- src/org/lineageos/updater/misc/Utils.java | 68 +++++++++++++++++++++++ 1 file changed, 68 insertions(+) diff --git a/src/org/lineageos/updater/misc/Utils.java b/src/org/lineageos/updater/misc/Utils.java index 4ba50d58..8476dffc 100644 --- a/src/org/lineageos/updater/misc/Utils.java +++ b/src/org/lineageos/updater/misc/Utils.java @@ -55,12 +55,15 @@ import org.lineageos.updater.model.UpdateInfo; import java.io.BufferedReader; import java.io.File; import java.io.FileReader; +import java.io.FileWriter; import java.io.IOException; import java.text.DecimalFormat; import java.util.ArrayList; import java.util.Enumeration; +import java.util.HashMap; import java.util.List; import java.util.Locale; +import java.util.Map; import java.util.Objects; import java.util.UUID; import java.util.regex.Matcher; @@ -208,10 +211,75 @@ public class Utils { update.getTimestamp() > SystemProperties.getLong(Constants.PROP_BUILD_DATE, 0)); } + private static boolean processJsonFile(File inputJsonFile) throws IOException, JSONException { + StringBuilder jsonBuilder = new StringBuilder(); + try (BufferedReader br = new BufferedReader(new FileReader(inputJsonFile))) { + for (String line; (line = br.readLine()) != null;) { + jsonBuilder.append(line); + } + } + + JSONObject inputJsonObject = new JSONObject(jsonBuilder.toString()); + JSONArray responseArray = inputJsonObject.getJSONArray("response"); + Map entriesMap = new HashMap<>(); + int deviceAndroidVersion = Integer.parseInt(Build.VERSION.RELEASE); + + for (int i = 0; i < responseArray.length(); i++) { + JSONObject entry = responseArray.getJSONObject(i); + String androidVersion = entry.getString("android_version"); + long datetime = entry.getLong("datetime"); + + // Allow the latest update for current android. + if (Integer.parseInt(androidVersion) == deviceAndroidVersion) { + if (!entriesMap.containsKey(androidVersion) || datetime > Objects.requireNonNull( + entriesMap.get(androidVersion)).getLong("datetime")) { + entriesMap.put(androidVersion, entry); + } else { + Log.d(TAG, "Update : Skipping " + entry.getString("filename") + + " since a newer build is available"); + } + // Allow upgrade from next major release only. Allow to install initial build + // for that major release and not the latest release. + } else if (Integer.parseInt(androidVersion) == deviceAndroidVersion + 1) { + if (!entriesMap.containsKey(androidVersion) || (((Build.TIME / 1000) < datetime) + && (datetime < Objects.requireNonNull(entriesMap.get(androidVersion) + ).getLong("datetime")))) { + entriesMap.put(androidVersion, entry); + } else { + Log.d(TAG, "Update : Skipping " + entry.getString("filename") + + " since latest build is not preferred for upgrade"); + } + // Ignore if the device has an update available by skipping one major update. + // Allow it only after installing one major android. + } else { + Log.d(TAG, "Update : Skipping " + entry.getString("filename") + + " since the upgrade is unsupported from this android version"); + } + } + + JSONArray modifiedResponseArray = new JSONArray(); + for (JSONObject entry : entriesMap.values()) { + modifiedResponseArray.put(entry); + } + + inputJsonObject.put("response", modifiedResponseArray); + + // Write the modified JSON object back to the input JSON file + FileWriter writer = new FileWriter(inputJsonFile); + writer.write(inputJsonObject.toString()); + writer.close(); + + return true; + } + public static List parseJson(File file, boolean compatibleOnly) throws IOException, JSONException { List updates = new ArrayList<>(); + if (processJsonFile(file)) { + Log.d(TAG, "Ignored incompatible updates"); + } + StringBuilder json = new StringBuilder(); try (BufferedReader br = new BufferedReader(new FileReader(file))) { for (String line; (line = br.readLine()) != null;) { -- GitLab From b24df70bde9232f6501c84739a12d4afe2928961 Mon Sep 17 00:00:00 2001 From: althafvly Date: Fri, 15 Sep 2023 15:56:05 +0530 Subject: [PATCH 2/2] Updater: parse android version --- src/org/lineageos/updater/misc/Utils.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/org/lineageos/updater/misc/Utils.java b/src/org/lineageos/updater/misc/Utils.java index 8476dffc..53aa33ac 100644 --- a/src/org/lineageos/updater/misc/Utils.java +++ b/src/org/lineageos/updater/misc/Utils.java @@ -222,7 +222,7 @@ public class Utils { JSONObject inputJsonObject = new JSONObject(jsonBuilder.toString()); JSONArray responseArray = inputJsonObject.getJSONArray("response"); Map entriesMap = new HashMap<>(); - int deviceAndroidVersion = Integer.parseInt(Build.VERSION.RELEASE); + int deviceAndroidVersion = parseAndroidVersion(Build.VERSION.RELEASE); for (int i = 0; i < responseArray.length(); i++) { JSONObject entry = responseArray.getJSONObject(i); @@ -230,7 +230,7 @@ public class Utils { long datetime = entry.getLong("datetime"); // Allow the latest update for current android. - if (Integer.parseInt(androidVersion) == deviceAndroidVersion) { + if (parseAndroidVersion(androidVersion) == deviceAndroidVersion) { if (!entriesMap.containsKey(androidVersion) || datetime > Objects.requireNonNull( entriesMap.get(androidVersion)).getLong("datetime")) { entriesMap.put(androidVersion, entry); @@ -240,7 +240,7 @@ public class Utils { } // Allow upgrade from next major release only. Allow to install initial build // for that major release and not the latest release. - } else if (Integer.parseInt(androidVersion) == deviceAndroidVersion + 1) { + } else if (parseAndroidVersion(androidVersion) == deviceAndroidVersion + 1) { if (!entriesMap.containsKey(androidVersion) || (((Build.TIME / 1000) < datetime) && (datetime < Objects.requireNonNull(entriesMap.get(androidVersion) ).getLong("datetime")))) { -- GitLab