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

Commit edfcb984 authored by Romain Hunault's avatar Romain Hunault Committed by Nishith Khanna
Browse files

Change displayed version value 

Change-Id: I28123e3108e795150f1c038de62e379ee2ae0e69

Update database schema

Updater: Adapt displayVersion to show proper versioning

Change-Id: I9f936bde0a380f0b80fe4382776641082a2b2a12
parent f3494ca9

app/src/main/java/org/lineageos/updater/UpdatesActivity.java

+1 −1
Original line number Diff line number Diff line
@@ -185,7 +185,7 @@ public class UpdatesActivity extends UpdatesListActivity implements UpdateImport 


        TextView headerTitle = findViewById(R.id.header_title);

        headerTitle.setText(getString(R.string.header_title_text,

                BuildInfoUtils.getBuildVersion()));

                BuildInfoUtils.getDisplayVersion()));



        updateLastCheckedString();

app/src/main/java/org/lineageos/updater/UpdatesDbHelper.java

+7 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ import java.util.List; 


public class UpdatesDbHelper extends SQLiteOpenHelper {



    public static final int DATABASE_VERSION = 1;

    public static final int DATABASE_VERSION = 2;

    public static final String DATABASE_NAME = "updates.db";



    public static class UpdateEntry implements BaseColumns {
@@ -41,6 +41,7 @@ public class UpdatesDbHelper extends SQLiteOpenHelper { 
        public static final String COLUMN_NAME_TIMESTAMP = "timestamp";

        public static final String COLUMN_NAME_TYPE = "type";

        public static final String COLUMN_NAME_VERSION = "version";

        public static final String COLUMN_NAME_DISPLAY_VERSION = "display_version";

        public static final String COLUMN_NAME_SIZE = "size";

    }
@@ -53,6 +54,7 @@ public class UpdatesDbHelper extends SQLiteOpenHelper { 
                    UpdateEntry.COLUMN_NAME_TIMESTAMP + " INTEGER," +

                    UpdateEntry.COLUMN_NAME_TYPE + " TEXT," +

                    UpdateEntry.COLUMN_NAME_VERSION + " TEXT," +

                    UpdateEntry.COLUMN_NAME_DISPLAY_VERSION + " TEXT," +

                    UpdateEntry.COLUMN_NAME_SIZE + " INTEGER)";



    private static final String SQL_DELETE_ENTRIES =
@@ -89,6 +91,7 @@ public class UpdatesDbHelper extends SQLiteOpenHelper { 
        values.put(UpdateEntry.COLUMN_NAME_TIMESTAMP, update.getTimestamp());

        values.put(UpdateEntry.COLUMN_NAME_TYPE, update.getType());

        values.put(UpdateEntry.COLUMN_NAME_VERSION, update.getVersion());

        values.put(UpdateEntry.COLUMN_NAME_DISPLAY_VERSION, update.getDisplayVersion());

        values.put(UpdateEntry.COLUMN_NAME_SIZE, update.getFileSize());

    }
@@ -125,6 +128,7 @@ public class UpdatesDbHelper extends SQLiteOpenHelper { 
                UpdateEntry.COLUMN_NAME_TIMESTAMP,

                UpdateEntry.COLUMN_NAME_TYPE,

                UpdateEntry.COLUMN_NAME_VERSION,

                UpdateEntry.COLUMN_NAME_DISPLAY_VERSION,

                UpdateEntry.COLUMN_NAME_STATUS,

                UpdateEntry.COLUMN_NAME_SIZE,

        };
@@ -146,6 +150,8 @@ public class UpdatesDbHelper extends SQLiteOpenHelper { 
                update.setType(cursor.getString(index));

                index = cursor.getColumnIndex(UpdateEntry.COLUMN_NAME_VERSION);

                update.setVersion(cursor.getString(index));

                index = cursor.getColumnIndex(UpdateEntry.COLUMN_NAME_DISPLAY_VERSION);

                update.setDisplayVersion(cursor.getString(index));

                index = cursor.getColumnIndex(UpdateEntry.COLUMN_NAME_STATUS);

                update.setPersistentStatus(cursor.getInt(index));

                index = cursor.getColumnIndex(UpdateEntry.COLUMN_NAME_SIZE);

app/src/main/java/org/lineageos/updater/UpdatesListAdapter.java

+2 −2
Original line number Diff line number Diff line
@@ -275,7 +275,7 @@ public class UpdatesListAdapter extends RecyclerView.Adapter<UpdatesListAdapter. 
        String buildDate = StringGenerator.getDateLocalizedUTC(mActivity,

                DateFormat.LONG, update.getTimestamp());

        String buildVersion = mActivity.getString(R.string.list_build_version_e,

                update.getVersion());

                update.getDisplayVersion());

        viewHolder.mBuildDate.setText(buildDate);

        viewHolder.mBuildVersion.setText(buildVersion);

        viewHolder.mBuildVersion.setCompoundDrawables(null, null, null, null);
@@ -495,7 +495,7 @@ public class UpdatesListAdapter extends RecyclerView.Adapter<UpdatesListAdapter. 
        String buildDate = StringGenerator.getDateLocalizedUTC(mActivity,

                DateFormat.MEDIUM, update.getTimestamp());

        String buildInfoText = mActivity.getString(R.string.list_build_version_date_e,

                update.getVersion(), buildDate);

                update.getDisplayVersion(), buildDate);

        return new AlertDialog.Builder(mActivity)

                .setTitle(R.string.apply_update_dialog_title)

                .setMessage(mActivity.getString(resId, buildInfoText,

app/src/main/java/org/lineageos/updater/misc/BuildInfoUtils.java

+4 −0
Original line number Diff line number Diff line
@@ -29,4 +29,8 @@ public final class BuildInfoUtils { 
    public static String getBuildVersion() {

        return SystemProperties.get(Constants.PROP_BUILD_VERSION);

    }



    public static String getDisplayVersion() {

        return SystemProperties.get(Constants.PROP_BUILD_DISPLAY_VERSION);

    }

}

app/src/main/java/org/lineageos/updater/misc/Constants.java

+1 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ public final class Constants { 
    public static final String PROP_ALLOW_MAJOR_UPGRADES = "lineage.updater.allow_major_upgrades";

    public static final String PROP_BUILD_DATE = "ro.build.date.utc";

    public static final String PROP_BUILD_VERSION = "ro.lineage.build.version";

    public static final String PROP_BUILD_DISPLAY_VERSION = "ro.lineage.display.version";

    public static final String PROP_BUILD_VERSION_INCREMENTAL = "ro.build.version.incremental";

    public static final String PROP_DEVICE = "ro.lineage.device";

    public static final String PROP_NEXT_DEVICE = "ro.updater.next_device";