mirror/fdroidclient
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidclient.git synced 2026-06-16 03:39:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix suggested and installable versions in app details

Browse Source 
For both we weren't considering the actual version code of the already installed app in case the repository did not have that version
This commit is contained in:
Torsten Grote
2026-04-29 11:00:23 -03:00
parent 76934c8ae3
commit fdd5dd65bf
1 changed files with 27 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
app/src/main/kotlin/org/fdroid/ui/details/DetailsPresenter.kt
View File

@@ -100,15 +100,21 @@ fun DetailsPresenter(
@Suppress("DEPRECATION") // so far we had issues with the new way of getting sigs
packageInfo?.signatures?.get(0)?.let { sha256(it.toByteArray()) }
}
val installedVersionCode = packageInfo?.let { getLongVersionCode(packageInfo) }
val suggestedVersion =
remember(versions, appPrefs, installedSigner) {
if (versions == null || appPrefs == null) {
null
} else {
updateChecker.getSuggestedVersion(
// Use getUpdate() instead of getSuggestedVersion() to consider `installedVersionCode`.
// Otherwise, we would default to `installedVersionCode = 0` and get a suggested version
// that can have a smaller version code than the installed one.
updateChecker.getUpdate(
versions = versions,
preferredSigner = installedSigner ?: app.metadata.preferredSigner,
releaseChannels = appPrefs.releaseChannels,
installedVersionCode = installedVersionCode ?: 0,
allowedSignersGetter =
(installedSigner ?: app.metadata.preferredSigner)?.let { { setOf(it) } },
allowedReleaseChannels = appPrefs.releaseChannels,
preferencesGetter = { appPrefs },
)
}
@@ -151,27 +157,25 @@ fun DetailsPresenter(
)
}
}
val installedVersionCode = packageInfo?.let { getLongVersionCode(packageInfo) }
val installedVersion =
packageInfo?.let {
val installedVersions = versions?.filter { it.versionCode == installedVersionCode }
when (installedVersions?.size) {
null -> null
0 -> null
1 -> installedVersions.first()
// more than version with the same version code, find a matching signer
else ->
installedVersions.find {
val versionSigners = it.signer?.sha256?.toSet()
// F-Droid allows versions without a signer entry, allow those
if (versionSigners != null && installedSigner != null) {
versionSigners.intersect(setOf(installedSigner)).isNotEmpty()
} else {
true
}
val installedVersion = packageInfo?.let {
val installedVersions = versions?.filter { it.versionCode == installedVersionCode }
when (installedVersions?.size) {
null -> null
0 -> null
1 -> installedVersions.first()
// more than version with the same version code, find a matching signer
else ->
installedVersions.find {
val versionSigners = it.signer?.sha256?.toSet()
// F-Droid allows versions without a signer entry, allow those
if (versionSigners != null && installedSigner != null) {
versionSigners.intersect(setOf(installedSigner)).isNotEmpty()
} else {
true
}
}
}
}
}
val authorName = app.authorName
val authorHasMoreThanOneApp =
if (authorName == null) false
@@ -257,7 +261,7 @@ fun DetailsPresenter(
if (!signerCompatible || installState.showProgress) {
false
} else {
(installedVersion?.versionCode ?: 0) < version.versionCode
(installedVersionCode ?: 0) < version.versionCode
},
)
},