From 7c490a2903cb1104f8b236bc2a892f1af27e5113 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Thu, 17 Jul 2025 17:43:20 -0300
Subject: [PATCH] [db] expose installedVersionName for UpdatableApp

so that we can show to what version the update version would get applied to
---
 libs/database/src/main/java/org/fdroid/database/App.kt         | 1 +
 .../src/main/java/org/fdroid/database/DbUpdateChecker.kt       | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/libs/database/src/main/java/org/fdroid/database/App.kt b/libs/database/src/main/java/org/fdroid/database/App.kt
index e5dfbf6cc..54a40d004 100644
--- a/libs/database/src/main/java/org/fdroid/database/App.kt
+++ b/libs/database/src/main/java/org/fdroid/database/App.kt
@@ -379,6 +379,7 @@ public data class UpdatableApp internal constructor(
     public override val repoId: Long,
     public override val packageName: String,
     public val installedVersionCode: Long,
+    public val installedVersionName: String,
     public val update: AppVersion,
     public val isFromPreferredRepo: Boolean,
     /**
diff --git a/libs/database/src/main/java/org/fdroid/database/DbUpdateChecker.kt b/libs/database/src/main/java/org/fdroid/database/DbUpdateChecker.kt
index 887a9226b..100878b09 100644
--- a/libs/database/src/main/java/org/fdroid/database/DbUpdateChecker.kt
+++ b/libs/database/src/main/java/org/fdroid/database/DbUpdateChecker.kt
@@ -69,6 +69,7 @@ public class DbUpdateChecker @JvmOverloads constructor(
                 val app = getUpdatableApp(
                     version = version,
                     installedVersionCode = getLongVersionCode(packageInfo),
+                    installedVersionName = packageInfo.versionName ?: "???", // should never be null
                     isFromPreferredRepo = preferredRepoId == version.repoId,
                 )
                 if (app != null) updatableApps.add(app)
@@ -158,6 +159,7 @@ public class DbUpdateChecker @JvmOverloads constructor(
     private fun getUpdatableApp(
         version: Version,
         installedVersionCode: Long,
+        installedVersionName: String,
         isFromPreferredRepo: Boolean,
     ): UpdatableApp? {
         val versionedStrings = versionDao.getVersionedStrings(
@@ -171,6 +173,7 @@ public class DbUpdateChecker @JvmOverloads constructor(
             repoId = version.repoId,
             packageName = version.packageName,
             installedVersionCode = installedVersionCode,
+            installedVersionName = installedVersionName,
             update = version.toAppVersion(versionedStrings),
             isFromPreferredRepo = isFromPreferredRepo,
             hasKnownVulnerability = version.hasKnownVulnerability,