Commit 5eec511b authored by Romain Hunault's avatar Romain Hunault Committed by Romain Hunault

Change displayed version value

parent 82cad2cd
...@@ -116,7 +116,7 @@ public class UpdatesActivity extends UpdatesListActivity { ...@@ -116,7 +116,7 @@ public class UpdatesActivity extends UpdatesListActivity {
TextView headerTitle = (TextView) findViewById(R.id.header_title); TextView headerTitle = (TextView) findViewById(R.id.header_title);
headerTitle.setText(getString(R.string.header_title_text, headerTitle.setText(getString(R.string.header_title_text,
BuildInfoUtils.getBuildVersion())); BuildInfoUtils.getDisplayVersion()));
updateLastCheckedString(); updateLastCheckedString();
......
...@@ -41,6 +41,7 @@ public class UpdatesDbHelper extends SQLiteOpenHelper { ...@@ -41,6 +41,7 @@ public class UpdatesDbHelper extends SQLiteOpenHelper {
public static final String COLUMN_NAME_TIMESTAMP = "timestamp"; public static final String COLUMN_NAME_TIMESTAMP = "timestamp";
public static final String COLUMN_NAME_TYPE = "type"; public static final String COLUMN_NAME_TYPE = "type";
public static final String COLUMN_NAME_VERSION = "version"; 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"; public static final String COLUMN_NAME_SIZE = "size";
} }
...@@ -53,6 +54,7 @@ public class UpdatesDbHelper extends SQLiteOpenHelper { ...@@ -53,6 +54,7 @@ public class UpdatesDbHelper extends SQLiteOpenHelper {
UpdateEntry.COLUMN_NAME_TIMESTAMP + " INTEGER," + UpdateEntry.COLUMN_NAME_TIMESTAMP + " INTEGER," +
UpdateEntry.COLUMN_NAME_TYPE + " TEXT," + UpdateEntry.COLUMN_NAME_TYPE + " TEXT," +
UpdateEntry.COLUMN_NAME_VERSION + " TEXT," + UpdateEntry.COLUMN_NAME_VERSION + " TEXT," +
UpdateEntry.COLUMN_NAME_DISPLAY_VERSION + " TEXT," +
UpdateEntry.COLUMN_NAME_SIZE + " INTEGER)"; UpdateEntry.COLUMN_NAME_SIZE + " INTEGER)";
private static final String SQL_DELETE_ENTRIES = private static final String SQL_DELETE_ENTRIES =
...@@ -84,6 +86,7 @@ public class UpdatesDbHelper extends SQLiteOpenHelper { ...@@ -84,6 +86,7 @@ public class UpdatesDbHelper extends SQLiteOpenHelper {
values.put(UpdateEntry.COLUMN_NAME_TIMESTAMP, update.getTimestamp()); values.put(UpdateEntry.COLUMN_NAME_TIMESTAMP, update.getTimestamp());
values.put(UpdateEntry.COLUMN_NAME_TYPE, update.getType()); values.put(UpdateEntry.COLUMN_NAME_TYPE, update.getType());
values.put(UpdateEntry.COLUMN_NAME_VERSION, update.getVersion()); 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()); values.put(UpdateEntry.COLUMN_NAME_SIZE, update.getFileSize());
return db.insert(UpdateEntry.TABLE_NAME, null, values); return db.insert(UpdateEntry.TABLE_NAME, null, values);
} }
...@@ -97,6 +100,7 @@ public class UpdatesDbHelper extends SQLiteOpenHelper { ...@@ -97,6 +100,7 @@ public class UpdatesDbHelper extends SQLiteOpenHelper {
values.put(UpdateEntry.COLUMN_NAME_TIMESTAMP, update.getTimestamp()); values.put(UpdateEntry.COLUMN_NAME_TIMESTAMP, update.getTimestamp());
values.put(UpdateEntry.COLUMN_NAME_TYPE, update.getType()); values.put(UpdateEntry.COLUMN_NAME_TYPE, update.getType());
values.put(UpdateEntry.COLUMN_NAME_VERSION, update.getVersion()); 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()); values.put(UpdateEntry.COLUMN_NAME_SIZE, update.getFileSize());
return db.insertWithOnConflict(UpdateEntry.TABLE_NAME, null, values, conflictAlgorithm); return db.insertWithOnConflict(UpdateEntry.TABLE_NAME, null, values, conflictAlgorithm);
} }
...@@ -161,6 +165,7 @@ public class UpdatesDbHelper extends SQLiteOpenHelper { ...@@ -161,6 +165,7 @@ public class UpdatesDbHelper extends SQLiteOpenHelper {
UpdateEntry.COLUMN_NAME_TIMESTAMP, UpdateEntry.COLUMN_NAME_TIMESTAMP,
UpdateEntry.COLUMN_NAME_TYPE, UpdateEntry.COLUMN_NAME_TYPE,
UpdateEntry.COLUMN_NAME_VERSION, UpdateEntry.COLUMN_NAME_VERSION,
UpdateEntry.COLUMN_NAME_DISPLAY_VERSION,
UpdateEntry.COLUMN_NAME_STATUS, UpdateEntry.COLUMN_NAME_STATUS,
UpdateEntry.COLUMN_NAME_SIZE, UpdateEntry.COLUMN_NAME_SIZE,
}; };
...@@ -182,6 +187,8 @@ public class UpdatesDbHelper extends SQLiteOpenHelper { ...@@ -182,6 +187,8 @@ public class UpdatesDbHelper extends SQLiteOpenHelper {
update.setType(cursor.getString(index)); update.setType(cursor.getString(index));
index = cursor.getColumnIndex(UpdateEntry.COLUMN_NAME_VERSION); index = cursor.getColumnIndex(UpdateEntry.COLUMN_NAME_VERSION);
update.setVersion(cursor.getString(index)); 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); index = cursor.getColumnIndex(UpdateEntry.COLUMN_NAME_STATUS);
update.setPersistentStatus(cursor.getInt(index)); update.setPersistentStatus(cursor.getInt(index));
index = cursor.getColumnIndex(UpdateEntry.COLUMN_NAME_SIZE); index = cursor.getColumnIndex(UpdateEntry.COLUMN_NAME_SIZE);
......
...@@ -249,7 +249,13 @@ public class UpdatesListAdapter extends RecyclerView.Adapter<UpdatesListAdapter. ...@@ -249,7 +249,13 @@ public class UpdatesListAdapter extends RecyclerView.Adapter<UpdatesListAdapter.
String buildDate = StringGenerator.getDateLocalizedUTC(mActivity, String buildDate = StringGenerator.getDateLocalizedUTC(mActivity,
DateFormat.LONG, update.getTimestamp()); DateFormat.LONG, update.getTimestamp());
String buildVersion = mActivity.getString(R.string.list_build_version, 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.mBuildDate.setText(buildDate);
viewHolder.mBuildVersion.setText(buildVersion); viewHolder.mBuildVersion.setText(buildVersion);
viewHolder.mBuildVersion.setCompoundDrawables(null, null, null, null); viewHolder.mBuildVersion.setCompoundDrawables(null, null, null, null);
......
...@@ -29,4 +29,8 @@ public final class BuildInfoUtils { ...@@ -29,4 +29,8 @@ public final class BuildInfoUtils {
public static String getBuildVersion() { public static String getBuildVersion() {
return SystemProperties.get(Constants.PROP_BUILD_VERSION); return SystemProperties.get(Constants.PROP_BUILD_VERSION);
} }
public static String getDisplayVersion() {
return SystemProperties.get(Constants.PROP_BUILD_DISPLAY_VERSION);
}
} }
...@@ -40,6 +40,7 @@ public final class Constants { ...@@ -40,6 +40,7 @@ public final class Constants {
public static final String PROP_AB_DEVICE = "ro.build.ab_update"; 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_DATE = "ro.build.date.utc";
public static final String PROP_BUILD_VERSION = "ro.lineage.build.version"; 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_BUILD_VERSION_INCREMENTAL = "ro.build.version.incremental";
public static final String PROP_DEVICE = "ro.lineage.device"; public static final String PROP_DEVICE = "ro.lineage.device";
public static final String PROP_NEXT_DEVICE = "ro.updater.next_device"; public static final String PROP_NEXT_DEVICE = "ro.updater.next_device";
......
...@@ -91,6 +91,7 @@ public class Utils { ...@@ -91,6 +91,7 @@ public class Utils {
update.setFileSize(object.getLong("size")); update.setFileSize(object.getLong("size"));
update.setDownloadUrl(object.getString("url")); update.setDownloadUrl(object.getString("url"));
update.setVersion(object.getString("version")); update.setVersion(object.getString("version"));
update.setDisplayVersion(object.getString("display_version"));
return update; return update;
} }
......
...@@ -23,6 +23,7 @@ public class UpdateBase implements UpdateBaseInfo { ...@@ -23,6 +23,7 @@ public class UpdateBase implements UpdateBaseInfo {
private long mTimestamp; private long mTimestamp;
private String mType; private String mType;
private String mVersion; private String mVersion;
private String mDisplayVersion;
private long mFileSize; private long mFileSize;
public UpdateBase() { public UpdateBase() {
...@@ -35,6 +36,7 @@ public class UpdateBase implements UpdateBaseInfo { ...@@ -35,6 +36,7 @@ public class UpdateBase implements UpdateBaseInfo {
mTimestamp = update.getTimestamp(); mTimestamp = update.getTimestamp();
mType = update.getType(); mType = update.getType();
mVersion = update.getVersion(); mVersion = update.getVersion();
mDisplayVersion = update.getDisplayVersion();
mFileSize = update.getFileSize(); mFileSize = update.getFileSize();
} }
...@@ -83,6 +85,15 @@ public class UpdateBase implements UpdateBaseInfo { ...@@ -83,6 +85,15 @@ public class UpdateBase implements UpdateBaseInfo {
mVersion = version; mVersion = version;
} }
@Override
public String getDisplayVersion() {
return mDisplayVersion;
}
public void setDisplayVersion(String displayVersion) {
mDisplayVersion = displayVersion;
}
@Override @Override
public String getDownloadUrl() { public String getDownloadUrl() {
return mDownloadUrl; return mDownloadUrl;
......
...@@ -26,6 +26,8 @@ public interface UpdateBaseInfo { ...@@ -26,6 +26,8 @@ public interface UpdateBaseInfo {
String getVersion(); String getVersion();
String getDisplayVersion();
String getDownloadUrl(); String getDownloadUrl();
long getFileSize(); long getFileSize();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment