fix(DigestUtils): lateinit property not initialize

pull/1902/head
Xwite 3 years ago
parent 4c97e17ac4
commit 8df2fc3e72
  1. 21
      app/src/main/java/io/legado/app/utils/DigestUtils.kt

@ -1,7 +1,6 @@
package io.legado.app.utils package io.legado.app.utils
import java.security.MessageDigest import java.security.MessageDigest
import java.security.NoSuchAlgorithmException
import javax.crypto.Mac import javax.crypto.Mac
import javax.crypto.spec.SecretKeySpec import javax.crypto.spec.SecretKeySpec
@ -25,14 +24,10 @@ object DigestUtils {
algorithm: String, algorithm: String,
data: ByteArray data: ByteArray
): ByteArray { ): ByteArray {
lateinit var bytes: ByteArray return kotlin.runCatching {
try {
val messageDigest = MessageDigest.getInstance(algorithm) val messageDigest = MessageDigest.getInstance(algorithm)
bytes = messageDigest.digest(data) messageDigest.digest(data)
} catch (e: NoSuchAlgorithmException) { }.getOrThrow()
e.printOnDebug()
}
return bytes
} }
/** /**
@ -55,17 +50,13 @@ object DigestUtils {
key: ByteArray, key: ByteArray,
data: ByteArray data: ByteArray
): ByteArray { ): ByteArray {
lateinit var bytes: ByteArray return kotlin.runCatching {
try {
val mac= Mac.getInstance(algorithm) val mac= Mac.getInstance(algorithm)
val keySpec = SecretKeySpec(key, algorithm) val keySpec = SecretKeySpec(key, algorithm)
mac.init(keySpec) mac.init(keySpec)
mac.update(data) mac.update(data)
bytes = mac.doFinal() mac.doFinal()
} catch(e: NoSuchAlgorithmException) { }.getOrThrow()
e.printOnDebug()
}
return bytes
} }
} }

Loading…
Cancel
Save