From 8df2fc3e72385ea2103a8d33c4ca6989ad78ea7e Mon Sep 17 00:00:00 2001 From: Xwite <1797350009@qq.com> Date: Tue, 24 May 2022 10:29:04 +0800 Subject: [PATCH] fix(DigestUtils): lateinit property not initialize --- .../java/io/legado/app/utils/DigestUtils.kt | 21 ++++++------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/app/src/main/java/io/legado/app/utils/DigestUtils.kt b/app/src/main/java/io/legado/app/utils/DigestUtils.kt index f179d3a86..b708b770c 100644 --- a/app/src/main/java/io/legado/app/utils/DigestUtils.kt +++ b/app/src/main/java/io/legado/app/utils/DigestUtils.kt @@ -1,7 +1,6 @@ package io.legado.app.utils import java.security.MessageDigest -import java.security.NoSuchAlgorithmException import javax.crypto.Mac import javax.crypto.spec.SecretKeySpec @@ -25,14 +24,10 @@ object DigestUtils { algorithm: String, data: ByteArray ): ByteArray { - lateinit var bytes: ByteArray - try { + return kotlin.runCatching { val messageDigest = MessageDigest.getInstance(algorithm) - bytes = messageDigest.digest(data) - } catch (e: NoSuchAlgorithmException) { - e.printOnDebug() - } - return bytes + messageDigest.digest(data) + }.getOrThrow() } /** @@ -55,17 +50,13 @@ object DigestUtils { key: ByteArray, data: ByteArray ): ByteArray { - lateinit var bytes: ByteArray - try { + return kotlin.runCatching { val mac= Mac.getInstance(algorithm) val keySpec = SecretKeySpec(key, algorithm) mac.init(keySpec) mac.update(data) - bytes = mac.doFinal() - } catch(e: NoSuchAlgorithmException) { - e.printOnDebug() - } - return bytes + mac.doFinal() + }.getOrThrow() } }