From c183dd82d62debcee99b4ab7ccdfa74df8d865fa Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Sat, 5 Sep 2020 20:40:33 +0530 Subject: SshjConfig: use runCatching to replace exception handling Signed-off-by: Harsh Shandilya --- app/src/main/java/com/zeapo/pwdstore/git/sshj/SshjConfig.kt | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/zeapo/pwdstore/git/sshj/SshjConfig.kt b/app/src/main/java/com/zeapo/pwdstore/git/sshj/SshjConfig.kt index 0cd5459b..49a587f5 100644 --- a/app/src/main/java/com/zeapo/pwdstore/git/sshj/SshjConfig.kt +++ b/app/src/main/java/com/zeapo/pwdstore/git/sshj/SshjConfig.kt @@ -6,6 +6,7 @@ package com.zeapo.pwdstore.git.sshj import com.github.ajalt.timberkt.Timber import com.github.ajalt.timberkt.d +import com.github.michaelbull.result.runCatching import com.hierynomus.sshj.key.KeyAlgorithms import com.hierynomus.sshj.transport.cipher.BlockCiphers import com.hierynomus.sshj.transport.kex.ExtInfoClientFactory @@ -46,10 +47,7 @@ fun setUpBouncyCastleForSshj() { // Replace Android BC with Java BC, inserted at the same position. Security.removeProvider(BouncyCastleProvider.PROVIDER_NAME) // May be needed on Android Pie+ as per https://stackoverflow.com/a/57897224/297261 - try { - Class.forName("sun.security.jca.Providers") - } catch (e: ClassNotFoundException) { - } + runCatching { Class.forName("sun.security.jca.Providers") } Security.insertProviderAt(BouncyCastleProvider(), bcIndex + 1) } d { "JCE providers: ${Security.getProviders().joinToString { "${it.name} (${it.version})" }}" } -- cgit v1.2.3