From 1ec0b8d1de561a398f566a898e20a01173868fea Mon Sep 17 00:00:00 2001
From: Michael W <baddaemon87@gmail.com>
Date: Mon, 5 Jun 2023 19:19:37 +0200
Subject: [PATCH] Updater: 20 and up are integers!

Not 20.0 but 20!

Change-Id: Iccbcd765ce2be60cef413a73461563569bc7cdc6
---
 src/org/lineageos/updater/UpdaterReceiver.java    | 3 ++-
 src/org/lineageos/updater/UpdatesActivity.java    | 2 +-
 src/org/lineageos/updater/UpdatesListAdapter.java | 2 +-
 src/org/lineageos/updater/misc/Utils.java         | 6 ++++++
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/org/lineageos/updater/UpdaterReceiver.java b/src/org/lineageos/updater/UpdaterReceiver.java
index 1fb2c5a0..4b7cb7e4 100644
--- a/src/org/lineageos/updater/UpdaterReceiver.java
+++ b/src/org/lineageos/updater/UpdaterReceiver.java
@@ -31,6 +31,7 @@ import androidx.preference.PreferenceManager;
 import org.lineageos.updater.misc.BuildInfoUtils;
 import org.lineageos.updater.misc.Constants;
 import org.lineageos.updater.misc.StringGenerator;
+import org.lineageos.updater.misc.Utils;
 
 import java.text.DateFormat;
 
@@ -61,7 +62,7 @@ public class UpdaterReceiver extends BroadcastReceiver {
         String buildDate = StringGenerator.getDateLocalizedUTC(context,
                 DateFormat.MEDIUM, preferences.getLong(Constants.PREF_INSTALL_NEW_TIMESTAMP, 0));
         String buildInfo = context.getString(R.string.list_build_version_date,
-                BuildInfoUtils.getBuildVersion(), buildDate);
+                Utils.getDisplayVersion(BuildInfoUtils.getBuildVersion()), buildDate);
 
         Intent notificationIntent = new Intent(context, UpdatesActivity.class);
         PendingIntent intent = PendingIntent.getActivity(context, 0, notificationIntent,
diff --git a/src/org/lineageos/updater/UpdatesActivity.java b/src/org/lineageos/updater/UpdatesActivity.java
index b1365cc1..12254c7b 100644
--- a/src/org/lineageos/updater/UpdatesActivity.java
+++ b/src/org/lineageos/updater/UpdatesActivity.java
@@ -151,7 +151,7 @@ public class UpdatesActivity extends UpdatesListActivity {
 
         TextView headerTitle = findViewById(R.id.header_title);
         headerTitle.setText(getString(R.string.header_title_text,
-                BuildInfoUtils.getBuildVersion()));
+                Utils.getDisplayVersion(BuildInfoUtils.getBuildVersion())));
 
         updateLastCheckedString();
 
diff --git a/src/org/lineageos/updater/UpdatesListAdapter.java b/src/org/lineageos/updater/UpdatesListAdapter.java
index a107470b..e01825d4 100644
--- a/src/org/lineageos/updater/UpdatesListAdapter.java
+++ b/src/org/lineageos/updater/UpdatesListAdapter.java
@@ -276,7 +276,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());
+                Utils.getDisplayVersion(update.getVersion()));
         viewHolder.mBuildDate.setText(buildDate);
         viewHolder.mBuildVersion.setText(buildVersion);
         viewHolder.mBuildVersion.setCompoundDrawables(null, null, null, null);
diff --git a/src/org/lineageos/updater/misc/Utils.java b/src/org/lineageos/updater/misc/Utils.java
index d768f62f..f0e390a1 100644
--- a/src/org/lineageos/updater/misc/Utils.java
+++ b/src/org/lineageos/updater/misc/Utils.java
@@ -413,4 +413,10 @@ public class Utils {
     public static boolean isRecoveryUpdateExecPresent() {
         return new File(Constants.UPDATE_RECOVERY_EXEC).exists();
     }
+
+    public static String getDisplayVersion(String version) {
+        float floatVersion = Float.parseFloat(version);
+        // Lineage 20 and up should only be integer values (we don't have minor versions anymore)
+        return (floatVersion >= 20) ? String.valueOf((int)floatVersion) : version;
+    }
 }