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

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

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

Updater: Generate license ID for ota requests

See merge request !133
parents 41422f74 b4f9a5c2

AndroidManifest.xml

+2 −0
Original line number Diff line number Diff line
@@ -20,6 +20,8 @@ to be updated. This will be fixed later 
    <uses-permission android:name="android.permission.RECOVERY" />

    <uses-permission android:name="android.permission.WAKE_LOCK" />

    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />

    <uses-permission android:name="android.permission.WRITE_SETTINGS" />

    <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS" />



    <application

        android:allowBackup="false"

privapp_whitelist_org.lineageos.updater.xml

+1 −0
Original line number Diff line number Diff line
@@ -19,5 +19,6 @@ 
        <permission name="android.permission.ACCESS_CACHE_FILESYSTEM"/>

        <permission name="android.permission.REBOOT"/>

        <permission name="android.permission.RECOVERY"/>

        <permission name="android.permission.WRITE_SECURE_SETTINGS"/>

    </privapp-permissions>

</permissions>

src/org/lineageos/updater/UpdatesCheckReceiver.java

+9 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import android.content.Context; 
import android.content.Intent;

import android.content.SharedPreferences;

import android.os.SystemClock;

import android.provider.Settings;

import android.util.Log;



import androidx.core.app.NotificationCompat;
@@ -52,6 +53,14 @@ public class UpdatesCheckReceiver extends BroadcastReceiver { 
    @Override

    public void onReceive(final Context context, Intent intent) {

        if (Intent.ACTION_BOOT_COMPLETED.equals(intent.getAction())) {

            // Check if the current value is empty or null and set license id.

            String eLicenseID = Settings.Secure.getString(context.getContentResolver(),

                    Settings.Secure.E_LICENSE_ID);

            if (eLicenseID == null || eLicenseID.isEmpty()) {

                Settings.Secure.putString(context.getContentResolver(),

                        Settings.Secure.E_LICENSE_ID, Utils.generateRandomID());

            }



            Utils.cleanupDownloadsDir(context);

        }

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

+13 −0
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ import java.util.ArrayList; 
import java.util.Enumeration;

import java.util.List;

import java.util.Locale;

import java.util.UUID;

import java.util.regex.Pattern;

import java.util.zip.ZipEntry;

import java.util.zip.ZipFile;
@@ -94,6 +95,11 @@ public class Utils { 
        return new File(context.getCacheDir(), "updates.json");

    }



    public static String generateRandomID() {

        String uuid = UUID.randomUUID().toString().replace("-", "");

        return "anon" + uuid;

    }



    // This should really return an UpdateBaseInfo object, but currently this only

    // used to initialize UpdateInfo objects

    private static UpdateInfo parseJsonUpdate(JSONObject object) throws JSONException {
@@ -214,6 +220,8 @@ public class Utils { 
        String device = SystemProperties.get(Constants.PROP_NEXT_DEVICE,

                SystemProperties.get(Constants.PROP_DEVICE));

        String type = SystemProperties.get(Constants.PROP_RELEASE_TYPE).toLowerCase(Locale.ROOT);

        String eLicenseID = Settings.Secure.getString(context.getContentResolver(),

                Settings.Secure.E_LICENSE_ID);



        String serverUrl = "";

        if (retrieveStatus(context) != null) {
@@ -232,6 +240,11 @@ public class Utils { 
        if (serverUrl.trim().isEmpty()) {

            serverUrl = context.getString(R.string.updater_server_url);

        }



        if (eLicenseID != null && !eLicenseID.isEmpty()) {

            serverUrl += "?license_id=" + eLicenseID;

        }



        return serverUrl.replace("{device}", device)

                .replace("{type}", type)

                .replace("{incr}", incrementalVersion);