From a3d8d18017d9e72c67077fe504aefba09c2e6080 Mon Sep 17 00:00:00 2001
From: merothh <git@merothh.com>
Date: Wed, 4 May 2022 10:01:37 +0530
Subject: [PATCH 1/2] Revert "R:  display preversion when available"

This reverts commit 830182dc6e1566cff6043651044231f4e1846f06.
---
 AndroidManifest.xml                                 |  2 +-
 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 --
 5 files changed, 3 insertions(+), 21 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 909cfcf1..693ded46 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -19,7 +19,7 @@
         android:requestLegacyExternalStorage="true"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
-        android:usesCleartextTraffic="true">
+        android:usesCleartextTraffic="false">
 
         <activity
             android:name=".UpdatesActivity"
diff --git a/src/org/lineageos/updater/UpdatesListAdapter.java b/src/org/lineageos/updater/UpdatesListAdapter.java
index 28b0ea3f..6e7cafeb 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());
         }
 
         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()+(!update.getPreversion().isEmpty() ? "-" + update.getPreversion() : ""), buildDate);
+                update.getVersion(), 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/misc/Utils.java b/src/org/lineageos/updater/misc/Utils.java
index 3d523b2b..52d4987a 100644
--- a/src/org/lineageos/updater/misc/Utils.java
+++ b/src/org/lineageos/updater/misc/Utils.java
@@ -98,11 +98,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"));
         return update;
     }
diff --git a/src/org/lineageos/updater/model/UpdateBase.java b/src/org/lineageos/updater/model/UpdateBase.java
index 6e328495..cfa2027e 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 mDisplayVersion;
     private long mFileSize;
 
@@ -37,7 +36,6 @@ public class UpdateBase implements UpdateBaseInfo {
         mTimestamp = update.getTimestamp();
         mType = update.getType();
         mVersion = update.getVersion();
-        mPreversion = update.getPreversion();
         mDisplayVersion = update.getDisplayVersion();
         mFileSize = update.getFileSize();
     }
@@ -87,15 +85,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 d015c480..2921e96f 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 getDownloadUrl();
-- 
GitLab


From d610316518abd32434985d8f22cbbedec346b8aa 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 | 6 +-----
 src/org/lineageos/updater/misc/Utils.java         | 6 +++++-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/org/lineageos/updater/UpdatesListAdapter.java b/src/org/lineageos/updater/UpdatesListAdapter.java
index 6e7cafeb..dd1a503c 100644
--- a/src/org/lineageos/updater/UpdatesListAdapter.java
+++ b/src/org/lineageos/updater/UpdatesListAdapter.java
@@ -278,10 +278,6 @@ public class UpdatesListAdapter extends RecyclerView.Adapter<UpdatesListAdapter.
         String buildVersion = mActivity.getString(R.string.list_build_version,
                 update.getDisplayVersion());
 
-        if (buildVersion.equals("")) {
-            buildVersion = mActivity.getString(R.string.list_build_version, update.getVersion());
-        }
-
         viewHolder.mBuildDate.setText(buildDate);
         viewHolder.mBuildVersion.setText(buildVersion);
         viewHolder.mBuildVersion.setCompoundDrawables(null, null, null, null);
@@ -487,7 +483,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);
         return new AlertDialog.Builder(mActivity)
                 .setTitle(R.string.apply_update_dialog_title)
                 .setMessage(mActivity.getString(resId, buildInfoText,
diff --git a/src/org/lineageos/updater/misc/Utils.java b/src/org/lineageos/updater/misc/Utils.java
index 52d4987a..050fcd7b 100644
--- a/src/org/lineageos/updater/misc/Utils.java
+++ b/src/org/lineageos/updater/misc/Utils.java
@@ -98,7 +98,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"));
+        }
         return update;
     }
 
-- 
GitLab