mobile/home-assistant-android
mobile/home-assistant-android
1
0
Fork 0
mirror of https://github.com/home-assistant/android synced 2024-09-30 05:14:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Catch AssertionError when loading certificates/private key (mTLS) (#4456)

Browse source
This commit is contained in:
Joris Pelgröm 2024-06-14 19:05:14 +02:00 committed by GitHub
parent d516018dc4
commit 4e9c958232
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
common/src/main/java/io/homeassistant/companion/android/common/data/keychain/KeyChainRepositoryImpl.kt
View file

@ -63,16 +63,24 @@ class KeyChainRepositoryImpl @Inject constructor(
if (chain == null) {
chain = try {
KeyChain.getCertificateChain(context, alias!!)
} catch (e: Exception) {
Log.e(TAG, "Exception getting certificate chain", e)
} catch (t: Throwable) {
when (t) {
is AssertionError,
is Exception -> Log.e(TAG, "Issue getting certificate chain", t)
else -> throw t
}
null
}
}
if (key == null) {
key = try {
KeyChain.getPrivateKey(context, alias!!)
} catch (e: Exception) {
Log.e(TAG, "Exception getting private key", e)
} catch (t: Throwable) {
when (t) {
is AssertionError,
is Exception -> Log.e(TAG, "Issue getting private key", t)
else -> throw t
}
null
}
}