Skip to content

Colota - Android GPS Location tracker

refactor: dedupe DynamicKeyManager keystore-alias check (#393)

Max Dietrichd23e021df88d
diff --git a/apps/mobile/android/app/src/main/java/com/colota/sync/tls/DynamicKeyManager.kt b/apps/mobile/android/app/src/main/java/com/colota/sync/tls/DynamicKeyManager.kt
index fe7372b0..c818fae0 100644
--- a/apps/mobile/android/app/src/main/java/com/colota/sync/tls/DynamicKeyManager.kt
+++ b/apps/mobile/android/app/src/main/java/com/colota/sync/tls/DynamicKeyManager.kt
@@ -49,7 +49,9 @@ class DynamicKeyManager(private val context: Context) : X509KeyManager {
private fun resolveAlias(): String? {
secureStorage.getKeyChainAlias()?.let { return KEYCHAIN_PREFIX + it }
- if (hasAndroidKeyStoreEntry()) return ClientCertSslContextProvider.CLIENT_CERT_ALIAS
+ if (ClientCertSslContextProvider.hasAndroidKeyStoreClientCert()) {
+ return ClientCertSslContextProvider.CLIENT_CERT_ALIAS
+ }
return null
}
@@ -117,13 +119,6 @@ class DynamicKeyManager(private val context: Context) : X509KeyManager {
}
}
- private fun hasAndroidKeyStoreEntry(): Boolean = try {
- KeyStore.getInstance(ANDROID_KEYSTORE).apply { load(null) }
- .containsAlias(ClientCertSslContextProvider.CLIENT_CERT_ALIAS)
- } catch (_: Exception) {
- false
- }
-
companion object {
private const val TAG = "DynamicKeyManager"
private const val ANDROID_KEYSTORE = "AndroidKeyStore"