mirror/fdroidclient
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidclient.git synced 2026-02-08 14:13:16 -05:00
Code Issues Packages Projects Releases Wiki Activity

Take signer into account when finding installed version in app details

Browse Source 
and multiple candidates with the same version code exist
This commit is contained in:
Torsten Grote
2026-01-15 10:40:27 -03:00
parent 189c697e5f
commit e337cf031e
1 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -126,14 +126,14 @@ fun DetailsPresenter(
)
}
}
val possibleUpdate = remember(versions, appPrefs) {
if (versions == null || appPrefs == null) {
val possibleUpdate = remember(versions, appPrefs, packageInfo) {
if (versions == null || appPrefs == null || packageInfo == null) {
null
} else {
updateChecker.getUpdate(
versions = versions,
allowedSignersGetter = app.metadata.preferredSigner?.let { { setOf(it) } },
allowedReleaseChannels = appPrefs.releaseChannels,
packageInfo = packageInfo,
releaseChannels = appPrefs.releaseChannels,
// ignoring existing preferences to include ignored versions
preferencesGetter = null,
)
@@ -143,7 +143,22 @@ fun DetailsPresenter(
getLongVersionCode(packageInfo)
}
val installedVersion = packageInfo?.let {
versions?.find { it.versionCode == installedVersionCode }
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 else {