Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dde1696b authored by Mohammed Althaf T's avatar Mohammed Althaf T 😊
Browse files

Merge branch '1214-q-license_id' into 'v1-q' 

Updater: Simplify the update url checks

See merge request !140
parents ac6c1f5d 35c060ef

src/org/lineageos/updater/misc/Utils.java

+4 −12
Original line number Diff line number Diff line
@@ -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)) {

        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);

                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);

        }



        if (serverUrl.trim().isEmpty()) {