Commit 97cb9227 authored by Rohit's avatar Rohit
Browse files

Revert "display preversion when available"

This reverts commit f3a79b80.
parent ed9b55bf
...@@ -28,7 +28,7 @@ to be updated. This will be fixed later ...@@ -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="true"> android:usesCleartextTraffic="false">
<activity <activity
android:name=".UpdatesActivity" android:name=".UpdatesActivity"
......
...@@ -269,7 +269,7 @@ public class UpdatesListAdapter extends RecyclerView.Adapter<UpdatesListAdapter. ...@@ -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.getPreversion().isEmpty() ? "-"+update.getPreversion() : "")); update.getVersion());
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. ...@@ -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() + (!update.getPreversion().isEmpty() ? "-"+update.getPreversion() : ""), buildDate); update.getVersion(), 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;
......
...@@ -97,11 +97,6 @@ public class Utils { ...@@ -97,11 +97,6 @@ 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;
......
...@@ -23,7 +23,6 @@ public class UpdateBase implements UpdateBaseInfo { ...@@ -23,7 +23,6 @@ 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;
...@@ -38,7 +37,6 @@ public class UpdateBase implements UpdateBaseInfo { ...@@ -38,7 +37,6 @@ 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();
...@@ -89,15 +87,6 @@ public class UpdateBase implements UpdateBaseInfo { ...@@ -89,15 +87,6 @@ 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;
......
...@@ -26,8 +26,6 @@ public interface UpdateBaseInfo { ...@@ -26,8 +26,6 @@ public interface UpdateBaseInfo {
String getVersion(); String getVersion();
String getPreversion();
String getDisplayVersion(); String getDisplayVersion();
String getAndroidVersion(); String getAndroidVersion();
......
Supports Markdown
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