From 95ebda4925a2bab603d285fe78f953f4129daaa1 Mon Sep 17 00:00:00 2001
From: merothh <git@merothh.com>
Date: Fri, 6 May 2022 11:12:52 +0530
Subject: [PATCH 1/2] Revert "Pie: display preversion when available"

This reverts commit 2a067ab255dc41f1b244f1a5699871585f779245.
---
 src/org/lineageos/updater/UpdatesListAdapter.java   |  4 ++--
 src/org/lineageos/updater/misc/Utils.java           |  5 -----
 src/org/lineageos/updater/model/UpdateBase.java     | 11 -----------
 src/org/lineageos/updater/model/UpdateBaseInfo.java |  2 --
 4 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/src/org/lineageos/updater/UpdatesListAdapter.java b/src/org/lineageos/updater/UpdatesListAdapter.java
index 9c1511ae..fd05a3b8 100644
--- a/src/org/lineageos/updater/UpdatesListAdapter.java
+++ b/src/org/lineageos/updater/UpdatesListAdapter.java
@@ -252,7 +252,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,
-                update.getVersion() + (!update.getPreversion().isEmpty() ? "-"+update.getPreversion() : ""));
+                update.getVersion());
         
         if (!update.getAndroidVersion().equals(Build.VERSION.RELEASE)){
           viewHolder.mUpgradeType.setVisibility(TextView.VISIBLE);
@@ -455,7 +455,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,
-                               update.getVersion() + (!update.getPreversion().isEmpty() ? "-"+update.getPreversion() : ""), buildDate);
+                               update.getVersion(), buildDate);
 
             if(update.getAndroidVersion().equals(Build.VERSION.RELEASE)){
               title = R.string.apply_update_dialog_title;
diff --git a/src/org/lineageos/updater/misc/Utils.java b/src/org/lineageos/updater/misc/Utils.java
index 93178498..1812873d 100644
--- a/src/org/lineageos/updater/misc/Utils.java
+++ b/src/org/lineageos/updater/misc/Utils.java
@@ -96,11 +96,6 @@ public class Utils {
         update.setFileSize(object.getLong("size"));
         update.setDownloadUrl(object.getString("url"));
         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.setAndroidVersion(object.getString("android_version"));
         return update;
diff --git a/src/org/lineageos/updater/model/UpdateBase.java b/src/org/lineageos/updater/model/UpdateBase.java
index 06391d21..8f9b5190 100644
--- a/src/org/lineageos/updater/model/UpdateBase.java
+++ b/src/org/lineageos/updater/model/UpdateBase.java
@@ -23,7 +23,6 @@ public class UpdateBase implements UpdateBaseInfo {
     private long mTimestamp;
     private String mType;
     private String mVersion;
-    private String mPreversion;
     private String mAndroidVersion;
     private String mDisplayVersion;
     private long mFileSize;
@@ -38,7 +37,6 @@ public class UpdateBase implements UpdateBaseInfo {
         mTimestamp = update.getTimestamp();
         mType = update.getType();
         mVersion = update.getVersion();
-        mPreversion = update.getPreversion();
         mDisplayVersion = update.getDisplayVersion();
         mAndroidVersion = update.getAndroidVersion();
         mFileSize = update.getFileSize();
@@ -89,15 +87,6 @@ public class UpdateBase implements UpdateBaseInfo {
         mVersion = version;
     }
 
-    @Override
-    public String getPreversion() {
-        return mPreversion;
-    }
-
-    public void setPreversion(String preversion) {
-        mPreversion = preversion;
-    }
-
     @Override
     public String getDisplayVersion() {
         return mDisplayVersion;
diff --git a/src/org/lineageos/updater/model/UpdateBaseInfo.java b/src/org/lineageos/updater/model/UpdateBaseInfo.java
index 6fc38c87..a1bfb022 100644
--- a/src/org/lineageos/updater/model/UpdateBaseInfo.java
+++ b/src/org/lineageos/updater/model/UpdateBaseInfo.java
@@ -26,8 +26,6 @@ public interface UpdateBaseInfo {
 
     String getVersion();
 
-    String getPreversion();
-
     String getDisplayVersion();
 
     String getAndroidVersion();
-- 
GitLab


From c79499d4f85221316ee8b07e9694dcc42d5dd473 Mon Sep 17 00:00:00 2001
From: merothh <git@merothh.com>
Date: Thu, 5 May 2022 09:52:26 +0530
Subject: [PATCH 2/2] Updater: Adapt displayVersion to show proper versioning

---
 src/org/lineageos/updater/UpdatesListAdapter.java | 4 ++--
 src/org/lineageos/updater/misc/Utils.java         | 6 +++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/org/lineageos/updater/UpdatesListAdapter.java b/src/org/lineageos/updater/UpdatesListAdapter.java
index fd05a3b8..a6cc3dd2 100644
--- a/src/org/lineageos/updater/UpdatesListAdapter.java
+++ b/src/org/lineageos/updater/UpdatesListAdapter.java
@@ -252,7 +252,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,
-                update.getVersion());
+                update.getDisplayVersion());
         
         if (!update.getAndroidVersion().equals(Build.VERSION.RELEASE)){
           viewHolder.mUpgradeType.setVisibility(TextView.VISIBLE);
@@ -455,7 +455,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,
-                               update.getVersion(), buildDate);
+                               update.getDisplayVersion(), buildDate);
 
             if(update.getAndroidVersion().equals(Build.VERSION.RELEASE)){
               title = R.string.apply_update_dialog_title;
diff --git a/src/org/lineageos/updater/misc/Utils.java b/src/org/lineageos/updater/misc/Utils.java
index 1812873d..88ba3890 100644
--- a/src/org/lineageos/updater/misc/Utils.java
+++ b/src/org/lineageos/updater/misc/Utils.java
@@ -96,7 +96,11 @@ public class Utils {
         update.setFileSize(object.getLong("size"));
         update.setDownloadUrl(object.getString("url"));
         update.setVersion(object.getString("version"));
-        update.setDisplayVersion(object.getString("display_version"));
+        if(object.has("pre_version") && !object.getString("pre_version").isEmpty()){
+          update.setDisplayVersion(object.getString("version") + "-" + object.getString("pre_version"));
+        } else {
+          update.setDisplayVersion(object.getString("version"));
+        }
         update.setAndroidVersion(object.getString("android_version"));
         return update;
     }
-- 
GitLab