From d4975303cef6e2ca2c6ae07acd0907c1e67e1883 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/6] 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 6e7cafeb..a5200932 100644
--- a/src/org/lineageos/updater/UpdatesListAdapter.java
+++ b/src/org/lineageos/updater/UpdatesListAdapter.java
@@ -279,7 +279,7 @@ public class UpdatesListAdapter extends RecyclerView.Adapter<UpdatesListAdapter.
                 update.getDisplayVersion());
 
         if (buildVersion.equals("")) {
-            buildVersion = mActivity.getString(R.string.list_build_version, update.getVersion());
+            buildVersion = mActivity.getString(R.string.list_build_version, update.getVersion()+(!update.getPreversion().isEmpty()?"-"+update.getPreversion():""));
         }
 
         viewHolder.mBuildDate.setText(buildDate);
@@ -487,7 +487,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);
         return new AlertDialog.Builder(mActivity)
                 .setTitle(R.string.apply_update_dialog_title)
                 .setMessage(mActivity.getString(resId, buildInfoText,
diff --git a/src/org/lineageos/updater/model/UpdateBase.java b/src/org/lineageos/updater/model/UpdateBase.java
index cfa2027e..6e328495 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 mDisplayVersion;
     private long mFileSize;
 
@@ -36,6 +37,7 @@ public class UpdateBase implements UpdateBaseInfo {
         mTimestamp = update.getTimestamp();
         mType = update.getType();
         mVersion = update.getVersion();
+        mPreversion = update.getPreversion();
         mDisplayVersion = update.getDisplayVersion();
         mFileSize = update.getFileSize();
     }
@@ -85,6 +87,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 2921e96f..d015c480 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 getDownloadUrl();
-- 
GitLab


From 3cf2dd34a7ca03bf61490ade7e3cb9899eedce1d 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/6] 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 52d4987a..abe9dd6a 100644
--- a/src/org/lineageos/updater/misc/Utils.java
+++ b/src/org/lineageos/updater/misc/Utils.java
@@ -98,6 +98,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"));
         return update;
     }
-- 
GitLab


From 87f35a09d4a78a6b79e22142c5501be5f54aaf63 Mon Sep 17 00:00:00 2001
From: Alexandre Roux <alexandre.roux.danzi@lostpod.me>
Date: Wed, 13 Apr 2022 10:18:01 +0000
Subject: [PATCH 3/6] tmp allow clear traffic for personnal tests

---
 AndroidManifest.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 693ded46..909cfcf1 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -19,7 +19,7 @@
         android:requestLegacyExternalStorage="true"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
-        android:usesCleartextTraffic="false">
+        android:usesCleartextTraffic="true">
 
         <activity
             android:name=".UpdatesActivity"
-- 
GitLab


From b989a97d19c2f970057691617e8366fe9fa79ca7 Mon Sep 17 00:00:00 2001
From: Jonathan Klee <jonathan.klee@e.email>
Date: Wed, 13 Apr 2022 13:19:53 +0000
Subject: [PATCH 4/6] Apply 1 suggestion(s) to 1 file(s)

---
 src/org/lineageos/updater/misc/Utils.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/org/lineageos/updater/misc/Utils.java b/src/org/lineageos/updater/misc/Utils.java
index abe9dd6a..3d523b2b 100644
--- a/src/org/lineageos/updater/misc/Utils.java
+++ b/src/org/lineageos/updater/misc/Utils.java
@@ -98,10 +98,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"));
         return update;
     }
-- 
GitLab


From 3fac54772604c83359f6ddb392bd009627f03e68 Mon Sep 17 00:00:00 2001
From: Jonathan Klee <jonathan.klee@e.email>
Date: Wed, 13 Apr 2022 13:19:57 +0000
Subject: [PATCH 5/6] Apply 1 suggestion(s) to 1 file(s)

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

diff --git a/src/org/lineageos/updater/UpdatesListAdapter.java b/src/org/lineageos/updater/UpdatesListAdapter.java
index a5200932..f7d42913 100644
--- a/src/org/lineageos/updater/UpdatesListAdapter.java
+++ b/src/org/lineageos/updater/UpdatesListAdapter.java
@@ -279,7 +279,7 @@ public class UpdatesListAdapter extends RecyclerView.Adapter<UpdatesListAdapter.
                 update.getDisplayVersion());
 
         if (buildVersion.equals("")) {
-            buildVersion = mActivity.getString(R.string.list_build_version, update.getVersion()+(!update.getPreversion().isEmpty()?"-"+update.getPreversion():""));
+            buildVersion = mActivity.getString(R.string.list_build_version, update.getVersion() + (!update.getPreversion().isEmpty() ? "-" + update.getPreversion() : ""));
         }
 
         viewHolder.mBuildDate.setText(buildDate);
-- 
GitLab


From 1725744a6423d52628b0da9f90357e9124975fac Mon Sep 17 00:00:00 2001
From: Jonathan Klee <jonathan.klee@e.email>
Date: Wed, 13 Apr 2022 13:20:11 +0000
Subject: [PATCH 6/6] Apply 1 suggestion(s) to 1 file(s)

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

diff --git a/src/org/lineageos/updater/UpdatesListAdapter.java b/src/org/lineageos/updater/UpdatesListAdapter.java
index f7d42913..28b0ea3f 100644
--- a/src/org/lineageos/updater/UpdatesListAdapter.java
+++ b/src/org/lineageos/updater/UpdatesListAdapter.java
@@ -487,7 +487,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);
         return new AlertDialog.Builder(mActivity)
                 .setTitle(R.string.apply_update_dialog_title)
                 .setMessage(mActivity.getString(resId, buildInfoText,
-- 
GitLab