From a2aa560e0019692d1c028bb1e88a65fcf468cfa2 Mon Sep 17 00:00:00 2001
From: Alexandre Roux <alexandre.roux.danzi@lostpod.me>
Date: Wed, 13 Apr 2022 10:11:33 +0000
Subject: [PATCH 1/4] Disaply preversion when available

---
 src/org/lineageos/updater/UpdatesListAdapter.java   |  4 ++--
 src/org/lineageos/updater/model/UpdateBase.java     | 11 +++++++++++
 src/org/lineageos/updater/model/UpdateBaseInfo.java |  2 ++
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/org/lineageos/updater/UpdatesListAdapter.java b/src/org/lineageos/updater/UpdatesListAdapter.java
index fd05a3b8..17301068 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.getVersion()+(!update.getPreversion().isEmpty()?"-"+update.getPreversion():""));
         
         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.getVersion()+(!update.getPreversion().isEmpty()?"-"+update.getPreversion():""), buildDate);
 
             if(update.getAndroidVersion().equals(Build.VERSION.RELEASE)){
               title = R.string.apply_update_dialog_title;
diff --git a/src/org/lineageos/updater/model/UpdateBase.java b/src/org/lineageos/updater/model/UpdateBase.java
index 8f9b5190..06391d21 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 mPreversion;
     private String mAndroidVersion;
     private String mDisplayVersion;
     private long mFileSize;
@@ -37,6 +38,7 @@ 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();
@@ -87,6 +89,15 @@ 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 a1bfb022..6fc38c87 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 getPreversion();
+
     String getDisplayVersion();
 
     String getAndroidVersion();
-- 
GitLab


From e4cd78e5358a3dd439ec38261ef1a7db81bb9bb8 Mon Sep 17 00:00:00 2001
From: Alexandre Roux <alexandre.roux.danzi@lostpod.me>
Date: Wed, 13 Apr 2022 10:17:31 +0000
Subject: [PATCH 2/4] set preversion from json

---
 src/org/lineageos/updater/misc/Utils.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/org/lineageos/updater/misc/Utils.java b/src/org/lineageos/updater/misc/Utils.java
index 1812873d..4d39cf79 100644
--- a/src/org/lineageos/updater/misc/Utils.java
+++ b/src/org/lineageos/updater/misc/Utils.java
@@ -96,6 +96,10 @@ 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;
-- 
GitLab


From 49d6a0fb09231215f41efb06b58f9654d1ac8039 Mon Sep 17 00:00:00 2001
From: Alexandre Roux <alexandre.roux.danzi@lostpod.me>
Date: Wed, 13 Apr 2022 13:23:04 +0000
Subject: [PATCH 3/4] coding style

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

diff --git a/src/org/lineageos/updater/UpdatesListAdapter.java b/src/org/lineageos/updater/UpdatesListAdapter.java
index 17301068..9c1511ae 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() + (!update.getPreversion().isEmpty() ? "-"+update.getPreversion() : ""));
         
         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() + (!update.getPreversion().isEmpty() ? "-"+update.getPreversion() : ""), 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 4d39cf79..148b3e90 100644
--- a/src/org/lineageos/updater/misc/Utils.java
+++ b/src/org/lineageos/updater/misc/Utils.java
@@ -96,10 +96,11 @@ public class Utils {
         update.setFileSize(object.getLong("size"));
         update.setDownloadUrl(object.getString("url"));
         update.setVersion(object.getString("version"));
-        if(object.has("pre_version"))
+        if(object.has("pre_version")) {
             update.setPreversion(object.getString("pre_version"));
-        else
+        } else {
             update.setPreversion("");
+        }
         update.setDisplayVersion(object.getString("display_version"));
         update.setAndroidVersion(object.getString("android_version"));
         return update;
-- 
GitLab


From 2a1d8fd1518a72e02aa6bb055aab5338c40efd9c Mon Sep 17 00:00:00 2001
From: Alexandre Roux <alexandre.roux.danzi@lostpod.me>
Date: Wed, 13 Apr 2022 14:36:59 +0000
Subject: [PATCH 4/4] another coding style error

---
 src/org/lineageos/updater/misc/Utils.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/org/lineageos/updater/misc/Utils.java b/src/org/lineageos/updater/misc/Utils.java
index 148b3e90..93178498 100644
--- a/src/org/lineageos/updater/misc/Utils.java
+++ b/src/org/lineageos/updater/misc/Utils.java
@@ -96,7 +96,7 @@ public class Utils {
         update.setFileSize(object.getLong("size"));
         update.setDownloadUrl(object.getString("url"));
         update.setVersion(object.getString("version"));
-        if(object.has("pre_version")) {
+        if (object.has("pre_version")) {
             update.setPreversion(object.getString("pre_version"));
         } else {
             update.setPreversion("");
-- 
GitLab