diff options
Diffstat (limited to 'app/src/main/java')
4 files changed, 8 insertions, 6 deletions
diff --git a/app/src/main/java/dev/msfjarvis/aps/ui/main/LaunchActivity.kt b/app/src/main/java/dev/msfjarvis/aps/ui/main/LaunchActivity.kt index a918a076..17005b6a 100644 --- a/app/src/main/java/dev/msfjarvis/aps/ui/main/LaunchActivity.kt +++ b/app/src/main/java/dev/msfjarvis/aps/ui/main/LaunchActivity.kt @@ -41,7 +41,8 @@ class LaunchActivity : AppCompatActivity() { prefs.edit { remove(PreferenceKeys.BIOMETRIC_AUTH) } startTargetActivity(false) } - is Result.Failure, Result.Cancelled -> { + is Result.Failure, + Result.Cancelled -> { finish() } is Result.Retry -> {} diff --git a/app/src/main/java/dev/msfjarvis/aps/util/git/sshj/OpenKeychainKeyProvider.kt b/app/src/main/java/dev/msfjarvis/aps/util/git/sshj/OpenKeychainKeyProvider.kt index 90d0ecc1..349e70e5 100644 --- a/app/src/main/java/dev/msfjarvis/aps/util/git/sshj/OpenKeychainKeyProvider.kt +++ b/app/src/main/java/dev/msfjarvis/aps/util/git/sshj/OpenKeychainKeyProvider.kt @@ -183,8 +183,8 @@ class OpenKeychainKeyProvider private constructor(val activity: ContinuationCont "Request ${request::class.simpleName} failed: ${error?.message}" ) when (error?.error) { - SshAuthenticationApiError.NO_AUTH_KEY, SshAuthenticationApiError.NO_SUCH_KEY -> - ApiResponse.NoSuchKey(exception) + SshAuthenticationApiError.NO_AUTH_KEY, + SshAuthenticationApiError.NO_SUCH_KEY -> ApiResponse.NoSuchKey(exception) else -> ApiResponse.GeneralError(exception) } } diff --git a/app/src/main/java/dev/msfjarvis/aps/util/git/sshj/OpenKeychainWrappedKeyAlgorithmFactory.kt b/app/src/main/java/dev/msfjarvis/aps/util/git/sshj/OpenKeychainWrappedKeyAlgorithmFactory.kt index 56831b1d..c5cb6eaa 100644 --- a/app/src/main/java/dev/msfjarvis/aps/util/git/sshj/OpenKeychainWrappedKeyAlgorithmFactory.kt +++ b/app/src/main/java/dev/msfjarvis/aps/util/git/sshj/OpenKeychainWrappedKeyAlgorithmFactory.kt @@ -35,7 +35,8 @@ class OpenKeychainWrappedKeyAlgorithm(private val keyAlgorithm: KeyAlgorithm) : when (keyAlgorithm.keyAlgorithm) { "rsa-sha2-512" -> SshAuthenticationApi.SHA512 "rsa-sha2-256" -> SshAuthenticationApi.SHA256 - "ssh-rsa", "ssh-rsa-cert-v01@openssh.com" -> SshAuthenticationApi.SHA1 + "ssh-rsa", + "ssh-rsa-cert-v01@openssh.com" -> SshAuthenticationApi.SHA1 // Other algorithms don't use this value, but it has to be valid. else -> SshAuthenticationApi.SHA512 } diff --git a/app/src/main/java/dev/msfjarvis/aps/util/git/sshj/SshKey.kt b/app/src/main/java/dev/msfjarvis/aps/util/git/sshj/SshKey.kt index d5aaff33..d2dda45f 100644 --- a/app/src/main/java/dev/msfjarvis/aps/util/git/sshj/SshKey.kt +++ b/app/src/main/java/dev/msfjarvis/aps/util/git/sshj/SshKey.kt @@ -306,8 +306,8 @@ object SshKey { fun provide(client: SSHClient, passphraseFinder: InteractivePasswordFinder): KeyProvider? = when (type) { - Type.LegacyGenerated, Type.Imported -> - client.loadKeys(privateKeyFile.absolutePath, passphraseFinder) + Type.LegacyGenerated, + Type.Imported -> client.loadKeys(privateKeyFile.absolutePath, passphraseFinder) Type.KeystoreNative -> KeystoreNativeKeyProvider Type.KeystoreWrappedEd25519 -> KeystoreWrappedEd25519KeyProvider null -> null |