From ec5a08ddf170747571cc78d9b1f2e87823da01f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Resul=20=C3=96v=C3=BCr?= <92828257+ovurrsl@users.noreply.github.com> Date: Thu, 22 Oct 2026 06:18:02 +0300 Subject: [PATCH] fix: in-app update works on Android 9 and 10 (#1066) --- .../launcher/update/SelfInstaller.kt | 24 +++++++------ .../update/SelfInstallerSignerTest.kt | 35 +++++++++++++++++++ 2 files changed, 49 insertions(+), 10 deletions(-) create mode 100644 app/src/test/java/com/droiddeck/launcher/update/SelfInstallerSignerTest.kt diff --git a/app/src/main/java/com/droiddeck/launcher/update/SelfInstaller.kt b/app/src/main/java/com/droiddeck/launcher/update/SelfInstaller.kt index 581606f7cf..4ba3a20cc4 100644 --- a/app/src/main/java/com/droiddeck/launcher/update/SelfInstaller.kt +++ b/app/src/main/java/com/droiddeck/launcher/update/SelfInstaller.kt @@ -57,7 +57,8 @@ object SelfInstaller { } @Suppress("DEPRECATION") val flags = if (Build.VERSION.SDK_INT >= 28) { - PackageManager.GET_SIGNING_CERTIFICATES + // Android 9 and 10 only collect an archive's certificates when GET_SIGNATURES is set. + PackageManager.GET_SIGNING_CERTIFICATES or PackageManager.GET_SIGNATURES } else { PackageManager.GET_SIGNATURES } @@ -75,15 +76,18 @@ object SelfInstaller { throw IOException(context.getString(R.string.selfinst_downgrade, code, BuildConfig.VERSION_CODE)) } - if (Build.VERSION.SDK_INT >= 28) { - val signing = info.signingInfo ?: throw IOException(context.getString(R.string.selfinst_no_signing)) - val digests = signing.apkContentsSigners.orEmpty().map { cert -> - MessageDigest.getInstance("SHA-256").digest(cert.toByteArray()) - .joinToString("") { "%02x".format(it) } - } - if (digests.none { it.equals(BuildConfig.RELEASE_SIGNER, ignoreCase = true) }) { - throw IOException(context.getString(R.string.selfinst_wrong_signer)) - } + val digests = archiveSignerDigests(info) + if (digests.isEmpty()) throw IOException(context.getString(R.string.selfinst_no_signing)) + if (digests.none { it.equals(BuildConfig.RELEASE_SIGNER, ignoreCase = true) }) { + throw IOException(context.getString(R.string.selfinst_wrong_signer)) + } + } + + @Suppress("DEPRECATION") + internal fun archiveSignerDigests(info: android.content.pm.PackageInfo): List { + val certs = (if (Build.VERSION.SDK_INT >= 28) info.signingInfo?.apkContentsSigners else null) ?: info.signatures + return certs.orEmpty().map { cert -> + MessageDigest.getInstance("SHA-256").digest(cert.toByteArray()).joinToString("") { "%02x".format(it) } } } diff --git a/app/src/test/java/com/droiddeck/launcher/update/SelfInstallerSignerTest.kt b/app/src/test/java/com/droiddeck/launcher/update/SelfInstallerSignerTest.kt new file mode 100644 index 0000000000..15c09f8b30 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/update/SelfInstallerSignerTest.kt @@ -0,0 +1,35 @@ +package com.droiddeck.launcher.update + +import android.content.pm.PackageInfo +import android.content.pm.Signature +import java.security.MessageDigest +import org.junit.Assert.assertEquals +import org.junit.Assert.assertTrue +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.annotation.Config + +@RunWith(RobolectricTestRunner::class) +class SelfInstallerSignerTest { + private val cert = byteArrayOf(1, 2, 3, 4, 5) + private val expected = MessageDigest.getInstance("SHA-256").digest(cert).joinToString("") { "%02x".format(it) } + + @Suppress("DEPRECATION") + private fun archive() = PackageInfo().apply { signatures = arrayOf(Signature(cert)) } + + @Config(sdk = [28, 29]) + @Test fun androidNineAndTenUseTheSignaturesWhenSigningInfoIsMissing() { + assertEquals(listOf(expected), SelfInstaller.archiveSignerDigests(archive())) + } + + @Config(sdk = [26]) + @Test fun androidEightIsCheckedToo() { + assertEquals(listOf(expected), SelfInstaller.archiveSignerDigests(archive())) + } + + @Config(sdk = [33]) + @Test fun anArchiveWithNoCertificatesHasNoDigests() { + assertTrue(SelfInstaller.archiveSignerDigests(PackageInfo()).isEmpty()) + } +}