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

Commit 186a5a19 authored by Alexandre Roux's avatar Alexandre Roux
Browse files

Revert "Revert "S dont crash when receiving maintenance number"" 

This reverts commit f6818ee6.
parent 6b3b1ee7

src/org/lineageos/updater/download/HttpURLConnectionClient.java

+5 −1
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 
package org.lineageos.updater.download;



import android.os.SystemClock;

import android.os.SystemProperties;



import android.util.Log;



import java.io.File;
@@ -32,6 +34,8 @@ import java.util.PriorityQueue; 
import java.util.regex.Matcher;

import java.util.regex.Pattern;



import org.lineageos.updater.misc.Constants;



public class HttpURLConnectionClient implements DownloadClient {



    private final static String TAG = "HttpURLConnectionClient";
@@ -60,7 +64,7 @@ public class HttpURLConnectionClient implements DownloadClient { 
        mClient = (HttpURLConnection) new URL(url).openConnection();



        String defaultUserAgent = mClient.getRequestProperty("User-Agent");

        String newUserAgent = defaultUserAgent + " ota_007_eels";

        String newUserAgent = defaultUserAgent + " eOS v" + SystemProperties.get(Constants.PROP_BUILD_VERSION);

        mClient.setRequestProperty("User-Agent", newUserAgent);



        mDestination = destination;

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

+5 −13
Original line number Diff line number Diff line
@@ -274,23 +274,15 @@ public class Utils { 
    public static boolean checkForNewUpdates(File newJson, Context context)

            throws IOException, JSONException {

        List<UpdateInfo> newList = parseJson(newJson, true);

        final float currentVersion = Float.parseFloat(BuildInfoUtils.getBuildVersion());

        float highestAvailableVersion = currentVersion;

        for (UpdateInfo update : newList) {

            float availableversion = Float.parseFloat(update.getVersion());

            if (availableversion > highestAvailableVersion) {

                highestAvailableVersion = availableversion;

            }

        }



        if (highestAvailableVersion > currentVersion) {

            if (isCompatible(update)) {

                Log.d(TAG, "New compatible update available");

                updateSystemUpdaterService(context, STATUS_WAITING_DOWNLOAD, highestAvailableVersion);

                return true;

        } else {

            updateSystemUpdaterService(context, STATUS_IDLE, highestAvailableVersion);

            return false;

            }

        }

        updateSystemUpdaterService(context, STATUS_IDLE, highestAvailableVersion);

    }



    /**

     * Get the offset to the compressed data of a file inside the given zip