mir/Android-Password-Store
2
0
Fork 0
mirror of https://github.com/android-password-store/Android-Password-Store synced 2025-09-01 23:05:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(ssh): make SSHKeyManager.keyExists infallible

Browse Source
This commit is contained in:
Harsh Shandilya
2023-05-19 18:42:01 +05:30
parent 648a450050
commit 65509eaa54
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ssh/src/main/kotlin/app/passwordstore/ssh/SSHKeyManager.kt
View File

@@ -25,6 +25,7 @@ import app.passwordstore.ssh.writer.ED25519KeyWriter
import app.passwordstore.ssh.writer.ImportedKeyWriter import app.passwordstore.ssh.writer.ImportedKeyWriter
import app.passwordstore.ssh.writer.KeystoreNativeKeyWriter import app.passwordstore.ssh.writer.KeystoreNativeKeyWriter
import com.github.michaelbull.result.getOrElse import com.github.michaelbull.result.getOrElse
import com.github.michaelbull.result.mapBoth
import com.github.michaelbull.result.runCatching import com.github.michaelbull.result.runCatching
import java.io.File import java.io.File
import java.io.IOException import java.io.IOException
@@ -65,12 +66,7 @@ public class SSHKeyManager(private val applicationContext: Context) {
} }
public fun keyExists(): Boolean { public fun keyExists(): Boolean {
return try { return runCatching { keyType() }.mapBoth(success = { true }, failure = { false })
keyType()
true
} catch (e: IllegalStateException) {
false
}
} }
public fun canShowPublicKey(): Boolean = public fun canShowPublicKey(): Boolean =