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

Commit f6818ee6 authored by Nishith  Khanna's avatar Nishith Khanna
Browse files

Revert "S dont crash when receiving maintenance number"

This reverts commit 8f3ba502.
parent ab5871e7
Loading
Loading
Loading
Loading
+1 −5
Original line number Diff line number Diff line
@@ -16,8 +16,6 @@
package org.lineageos.updater.download;

import android.os.SystemClock;
import android.os.SystemProperties;

import android.util.Log;

import java.io.File;
@@ -34,8 +32,6 @@ 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";
@@ -64,7 +60,7 @@ public class HttpURLConnectionClient implements DownloadClient {
        mClient = (HttpURLConnection) new URL(url).openConnection();

        String defaultUserAgent = mClient.getRequestProperty("User-Agent");
        String newUserAgent = defaultUserAgent + " eOS v" + SystemProperties.get(Constants.PROP_BUILD_VERSION);
        String newUserAgent = defaultUserAgent + " ota_007_eels";
        mClient.setRequestProperty("User-Agent", newUserAgent);

        mDestination = destination;
+13 −5
Original line number Diff line number Diff line
@@ -274,14 +274,22 @@ 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) {
            if (isCompatible(update)) {
                Log.d(TAG, "New compatible update available");
                updateSystemUpdaterService(context, STATUS_WAITING_DOWNLOAD, highestAvailableVersion);
                return true;
            float availableversion = Float.parseFloat(update.getVersion());
            if (availableversion > highestAvailableVersion) {
                highestAvailableVersion = availableversion;
            }
        }

        if (highestAvailableVersion > currentVersion) {
            updateSystemUpdaterService(context, STATUS_WAITING_DOWNLOAD, highestAvailableVersion);
            return true;
        } else {
            updateSystemUpdaterService(context, STATUS_IDLE, highestAvailableVersion);
            return false;
        }
    }

    /**