From 5eec511bcedd61b729140f7124a1ee7ff1012a42 Mon Sep 17 00:00:00 2001
From: Romain Hunault <romain.hunault@eelo.io>
Date: Thu, 16 Aug 2018 11:29:48 +0200
Subject: [PATCH] Change displayed version value

---
 src/org/lineageos/updater/UpdatesActivity.java      |  2 +-
 src/org/lineageos/updater/UpdatesDbHelper.java      |  7 +++++++
 src/org/lineageos/updater/UpdatesListAdapter.java   |  8 +++++++-
 src/org/lineageos/updater/misc/BuildInfoUtils.java  |  4 ++++
 src/org/lineageos/updater/misc/Constants.java       |  1 +
 src/org/lineageos/updater/misc/Utils.java           |  1 +
 src/org/lineageos/updater/model/UpdateBase.java     | 11 +++++++++++
 src/org/lineageos/updater/model/UpdateBaseInfo.java |  2 ++
 8 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/src/org/lineageos/updater/UpdatesActivity.java b/src/org/lineageos/updater/UpdatesActivity.java
index efea9698..b9161d09 100644
--- a/src/org/lineageos/updater/UpdatesActivity.java
+++ b/src/org/lineageos/updater/UpdatesActivity.java
@@ -116,7 +116,7 @@ public class UpdatesActivity extends UpdatesListActivity {
 
         TextView headerTitle = (TextView) findViewById(R.id.header_title);
         headerTitle.setText(getString(R.string.header_title_text,
-                BuildInfoUtils.getBuildVersion()));
+                    BuildInfoUtils.getDisplayVersion()));
 
         updateLastCheckedString();
 
diff --git a/src/org/lineageos/updater/UpdatesDbHelper.java b/src/org/lineageos/updater/UpdatesDbHelper.java
index 7ec5736f..01e6fc26 100644
--- a/src/org/lineageos/updater/UpdatesDbHelper.java
+++ b/src/org/lineageos/updater/UpdatesDbHelper.java
@@ -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 =
@@ -84,6 +86,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());
         return db.insert(UpdateEntry.TABLE_NAME, null, values);
     }
@@ -97,6 +100,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());
         return db.insertWithOnConflict(UpdateEntry.TABLE_NAME, null, values, conflictAlgorithm);
     }
@@ -161,6 +165,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,
         };
@@ -182,6 +187,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);
diff --git a/src/org/lineageos/updater/UpdatesListAdapter.java b/src/org/lineageos/updater/UpdatesListAdapter.java
index a1aa9442..0df51d98 100644
--- a/src/org/lineageos/updater/UpdatesListAdapter.java
+++ b/src/org/lineageos/updater/UpdatesListAdapter.java
@@ -249,7 +249,13 @@ 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,
-                update.getVersion());
+                update.getDisplayVersion());
+
+        if (buildVersion.equals("")) {
+          buildVersion = mActivity.getString(R.string.list_build_version,
+                  update.getVersion());
+        }
+        
         viewHolder.mBuildDate.setText(buildDate);
         viewHolder.mBuildVersion.setText(buildVersion);
         viewHolder.mBuildVersion.setCompoundDrawables(null, null, null, null);
diff --git a/src/org/lineageos/updater/misc/BuildInfoUtils.java b/src/org/lineageos/updater/misc/BuildInfoUtils.java
index 4b90a45e..6a647faf 100644
--- a/src/org/lineageos/updater/misc/BuildInfoUtils.java
+++ b/src/org/lineageos/updater/misc/BuildInfoUtils.java
@@ -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);
+    }
 }
diff --git a/src/org/lineageos/updater/misc/Constants.java b/src/org/lineageos/updater/misc/Constants.java
index 81e7c1a3..98b5b02a 100644
--- a/src/org/lineageos/updater/misc/Constants.java
+++ b/src/org/lineageos/updater/misc/Constants.java
@@ -40,6 +40,7 @@ public final class Constants {
     public static final String PROP_AB_DEVICE = "ro.build.ab_update";
     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";
diff --git a/src/org/lineageos/updater/misc/Utils.java b/src/org/lineageos/updater/misc/Utils.java
index eed4d56d..a71479dc 100644
--- a/src/org/lineageos/updater/misc/Utils.java
+++ b/src/org/lineageos/updater/misc/Utils.java
@@ -91,6 +91,7 @@ public class Utils {
         update.setFileSize(object.getLong("size"));
         update.setDownloadUrl(object.getString("url"));
         update.setVersion(object.getString("version"));
+        update.setDisplayVersion(object.getString("display_version"));
         return update;
     }
 
diff --git a/src/org/lineageos/updater/model/UpdateBase.java b/src/org/lineageos/updater/model/UpdateBase.java
index 8fcf09c8..cfa2027e 100644
--- a/src/org/lineageos/updater/model/UpdateBase.java
+++ b/src/org/lineageos/updater/model/UpdateBase.java
@@ -23,6 +23,7 @@ public class UpdateBase implements UpdateBaseInfo {
     private long mTimestamp;
     private String mType;
     private String mVersion;
+    private String mDisplayVersion;
     private long mFileSize;
 
     public UpdateBase() {
@@ -35,6 +36,7 @@ public class UpdateBase implements UpdateBaseInfo {
         mTimestamp = update.getTimestamp();
         mType = update.getType();
         mVersion = update.getVersion();
+        mDisplayVersion = update.getDisplayVersion();
         mFileSize = update.getFileSize();
     }
 
@@ -83,6 +85,15 @@ public class UpdateBase implements UpdateBaseInfo {
         mVersion = version;
     }
 
+    @Override
+    public String getDisplayVersion() {
+        return mDisplayVersion;
+    }
+
+    public void setDisplayVersion(String displayVersion) {
+        mDisplayVersion = displayVersion;
+    }
+
     @Override
     public String getDownloadUrl() {
         return mDownloadUrl;
diff --git a/src/org/lineageos/updater/model/UpdateBaseInfo.java b/src/org/lineageos/updater/model/UpdateBaseInfo.java
index 2041582a..2921e96f 100644
--- a/src/org/lineageos/updater/model/UpdateBaseInfo.java
+++ b/src/org/lineageos/updater/model/UpdateBaseInfo.java
@@ -26,6 +26,8 @@ public interface UpdateBaseInfo {
 
     String getVersion();
 
+    String getDisplayVersion();
+
     String getDownloadUrl();
 
     long getFileSize();
-- 
GitLab