From 1143f9adb397d2e83252c55fa140f7e109a8218a Mon Sep 17 00:00:00 2001
From: Aayush Gupta <theimpulson@e.email>
Date: Tue, 23 Mar 2021 15:30:47 +0530
Subject: [PATCH] updater: Show update's version wherever applicable

Currently at most of the places, build version is obtained from BuildInfoUtils.getBuildVersion()
method. This method obtains build version from the current running system's property.

At /e/, we bump version number on every new OTA. This results in version mismatch in several places
in the updater app. Let's get the version from the update itself to show the proper version.

Signed-off-by: Aayush Gupta <theimpulson@e.email>
---
 src/org/lineageos/updater/UpdatesListAdapter.java        | 9 ++-------
 src/org/lineageos/updater/controller/UpdaterService.java | 2 +-
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/org/lineageos/updater/UpdatesListAdapter.java b/src/org/lineageos/updater/UpdatesListAdapter.java
index 189889be..4e9e50b1 100644
--- a/src/org/lineageos/updater/UpdatesListAdapter.java
+++ b/src/org/lineageos/updater/UpdatesListAdapter.java
@@ -250,12 +250,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.getDisplayVersion());
-
-        if (buildVersion.equals("")) {
-          buildVersion = mActivity.getString(R.string.list_build_version,
-                  update.getVersion());
-        }
+                update.getVersion());
         
         if (!update.getAndroidVersion().equals(Build.VERSION.RELEASE)){
           viewHolder.mUpgradeType.setVisibility(TextView.VISIBLE);
@@ -455,7 +450,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,
-                               BuildInfoUtils.getBuildVersion(), 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/controller/UpdaterService.java b/src/org/lineageos/updater/controller/UpdaterService.java
index ad05e310..37efdf35 100644
--- a/src/org/lineageos/updater/controller/UpdaterService.java
+++ b/src/org/lineageos/updater/controller/UpdaterService.java
@@ -426,7 +426,7 @@ public class UpdaterService extends Service {
         String buildDate = StringGenerator.getDateLocalizedUTC(this,
                 DateFormat.MEDIUM, update.getTimestamp());
         String buildInfo = getString(R.string.list_build_version_date,
-                BuildInfoUtils.getBuildVersion(), buildDate);
+                update.getVersion(), buildDate);
         mNotificationStyle.setBigContentTitle(buildInfo);
         mNotificationBuilder.setContentTitle(buildInfo);
     }
-- 
GitLab