Merge branch 'v1-q-186-display-preversion-when-available' into 'v1-q' (ed9b55bf) · Commits · e / os / android_packages_apps_Updater

AndroidManifest.xml

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -28,7 +28,7 @@ to be updated. This will be fixed later
	android:requestLegacyExternalStorage="true"		android:requestLegacyExternalStorage="true"
	android:supportsRtl="true"		android:supportsRtl="true"
	android:theme="@style/AppTheme"		android:theme="@style/AppTheme"
	android:usesCleartextTraffic="false">		android:usesCleartextTraffic="true">

	<activity		<activity
	android:name=".UpdatesActivity"		android:name=".UpdatesActivity"

src/org/lineageos/updater/UpdatesListAdapter.java

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -269,7 +269,7 @@ 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.getVersion() + (!update.getPreversion().isEmpty() ? "-"+update.getPreversion() : ""));

	if (!update.getAndroidVersion().equals(Build.VERSION.RELEASE)){		if (!update.getAndroidVersion().equals(Build.VERSION.RELEASE)){
	viewHolder.mUpgradeType.setVisibility(TextView.VISIBLE);		viewHolder.mUpgradeType.setVisibility(TextView.VISIBLE);
	@@ -472,7 +472,7 @@ public class UpdatesListAdapter extends RecyclerView.Adapter<UpdatesListAdapter.
	String buildDate = StringGenerator.getDateLocalizedUTC(mActivity,		String buildDate = StringGenerator.getDateLocalizedUTC(mActivity,
	DateFormat.MEDIUM, update.getTimestamp());		DateFormat.MEDIUM, update.getTimestamp());
	String buildInfoText = mActivity.getString(R.string.list_build_version_date,		String buildInfoText = mActivity.getString(R.string.list_build_version_date,
	update.getVersion(), buildDate);		update.getVersion() + (!update.getPreversion().isEmpty() ? "-"+update.getPreversion() : ""), buildDate);

	if(update.getAndroidVersion().equals(Build.VERSION.RELEASE)){		if(update.getAndroidVersion().equals(Build.VERSION.RELEASE)){
	title = R.string.apply_update_dialog_title;		title = R.string.apply_update_dialog_title;

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

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -97,6 +97,11 @@ 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"));
			if (object.has("pre_version")) {
			update.setPreversion(object.getString("pre_version"));
			} else {
			update.setPreversion("");
			}
	update.setDisplayVersion(object.getString("display_version"));		update.setDisplayVersion(object.getString("display_version"));
	update.setAndroidVersion(object.getString("android_version"));		update.setAndroidVersion(object.getString("android_version"));
	return update;		return update;

src/org/lineageos/updater/model/UpdateBase.java

+11 −0

Original line number	Original line	Diff line number	Diff line
	@@ -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 mPreversion;
	private String mAndroidVersion;		private String mAndroidVersion;
	private String mDisplayVersion;		private String mDisplayVersion;
	private long mFileSize;		private long mFileSize;
	@@ -37,6 +38,7 @@ public class UpdateBase implements UpdateBaseInfo {
	mTimestamp = update.getTimestamp();		mTimestamp = update.getTimestamp();
	mType = update.getType();		mType = update.getType();
	mVersion = update.getVersion();		mVersion = update.getVersion();
			mPreversion = update.getPreversion();
	mDisplayVersion = update.getDisplayVersion();		mDisplayVersion = update.getDisplayVersion();
	mAndroidVersion = update.getAndroidVersion();		mAndroidVersion = update.getAndroidVersion();
	mFileSize = update.getFileSize();		mFileSize = update.getFileSize();
	@@ -87,6 +89,15 @@ public class UpdateBase implements UpdateBaseInfo {
	mVersion = version;		mVersion = version;
	}		}

			@Override
			public String getPreversion() {
			return mPreversion;
			}

			public void setPreversion(String preversion) {
			mPreversion = preversion;
			}

	@Override		@Override
	public String getDisplayVersion() {		public String getDisplayVersion() {
	return mDisplayVersion;		return mDisplayVersion;

src/org/lineageos/updater/model/UpdateBaseInfo.java

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -26,6 +26,8 @@ public interface UpdateBaseInfo {

	String getVersion();		String getVersion();

			String getPreversion();

	String getDisplayVersion();		String getDisplayVersion();

	String getAndroidVersion();		String getAndroidVersion();