From 35c060effc2541d5390cc1f1e4dd1592a2bb2df9 Mon Sep 17 00:00:00 2001 From: althafvly Date: Thu, 27 Jul 2023 18:14:57 +0530 Subject: [PATCH] Updater: Simplify the update url checks --- src/org/lineageos/updater/misc/Utils.java | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/src/org/lineageos/updater/misc/Utils.java b/src/org/lineageos/updater/misc/Utils.java index a68901be..ef071a8a 100644 --- a/src/org/lineageos/updater/misc/Utils.java +++ b/src/org/lineageos/updater/misc/Utils.java @@ -223,18 +223,10 @@ public class Utils { String eLicenseID = Settings.Secure.getString(context.getContentResolver(), Settings.Secure.E_LICENSE_ID); - String serverUrl = ""; - if (retrieveStatus(context) != null) { - if (retrieveStatus(context).equals("true") && isDevModeOn(context)) { - serverUrl = context.getString(R.string.ota_staging_server_url); - return serverUrl.replace("{device}", device) - .replace("{type}", type) - .replace("{incr}", incrementalVersion); - } else { - serverUrl = SystemProperties.get(Constants.PROP_UPDATER_URI); - } - } else { - serverUrl = SystemProperties.get(Constants.PROP_UPDATER_URI); + String serverUrl = SystemProperties.get(Constants.PROP_UPDATER_URI); + if (retrieveStatus(context) != null && retrieveStatus(context).equals("true") + && isDevModeOn(context)) { + serverUrl = context.getString(R.string.ota_staging_server_url); } if (serverUrl.trim().isEmpty()) { -- GitLab