Xwite 3 年之前
父節點
當前提交
4811a5e38a
共有 1 個文件被更改,包括 16 次插入 和 16 次删除
  1. 16 16
      app/src/main/java/io/legado/app/help/crypto/AsymmetricCrypto.kt

+ 16 - 16
app/src/main/java/io/legado/app/help/crypto/AsymmetricCrypto.kt

@@ -27,39 +27,39 @@ class AsymmetricCrypto(algorithm: String) : HutoolAsymmetricCrypto(algorithm) {
         return when {
         return when {
             keyType == 1 -> KeyType.PublicKey
             keyType == 1 -> KeyType.PublicKey
             keyType == 2 -> KeyType.PrivateKey
             keyType == 2 -> KeyType.PrivateKey
-            else -> KeyType.SecretKey
+            else -> throw IllegalArgumentException("Unexpected keyType:\n 1 -> use publicKey\n 2 -> use PrivateKey")
         }
         }
     }
     }
 
 
     fun decrypt(data: Any, keyType: Int): ByteArray = when {
     fun decrypt(data: Any, keyType: Int): ByteArray = when {
-        data is ByteArray -> decrypt(data, getKeyType(keyType))
-        data is String -> decrypt(data, getKeyType(keyType))
-        data is InputStream -> decrypt(data, getKeyType(keyType))
+        data is ByteArray -> decrypt(data as ByteArray, getKeyType(keyType))
+        data is String -> decrypt(data as String, getKeyType(keyType))
+        data is InputStream -> decrypt(data as InputStream, getKeyType(keyType))
         else -> throw IllegalArgumentException("Unexpected data input")
         else -> throw IllegalArgumentException("Unexpected data input")
     }
     }
     fun decryptStr(data: Any, keyType: Int): String = when {
     fun decryptStr(data: Any, keyType: Int): String = when {
-        data is ByteArray -> decryptStr(data, getKeyType(keyType))
-        data is String -> decryptStr(data, getKeyType(keyType))
-        data is InputStream -> decryptStr(data, getKeyType(keyType))
+        data is ByteArray -> decryptStr(data as ByteArray, getKeyType(keyType))
+        data is String -> decryptStr(data as String, getKeyType(keyType))
+        data is InputStream -> decryptStr(data as InputStream, getKeyType(keyType))
         else -> throw IllegalArgumentException("Unexpected data input")
         else -> throw IllegalArgumentException("Unexpected data input")
     }
     }
 
 
     fun encrypt(data: Any, keyType: Int): ByteArray = when {
     fun encrypt(data: Any, keyType: Int): ByteArray = when {
-        data is ByteArray -> encrypt(data, getKeyType(keyType))
-        data is String -> encrypt(data, getKeyType(keyType))
-        data is InputStream -> encrypt(data, getKeyType(keyType))
+        data is ByteArray -> encrypt(data as ByteArray, getKeyType(keyType))
+        data is String -> encrypt(data as String, getKeyType(keyType))
+        data is InputStream -> encrypt(data as InputStream, getKeyType(keyType))
         else -> throw IllegalArgumentException("Unexpected data input")
         else -> throw IllegalArgumentException("Unexpected data input")
     }
     }
     fun encryptHex(data: Any, keyType: Int): String = when {
     fun encryptHex(data: Any, keyType: Int): String = when {
-        data is ByteArray -> encryptHex(data, getKeyType(keyType))
-        data is String -> encryptHex(data, getKeyType(keyType))
-        data is InputStream -> encryptHex(data, getKeyType(keyType))
+        data is ByteArray -> encryptHex(data as ByteArray, getKeyType(keyType))
+        data is String -> encryptHex(data as String, getKeyType(keyType))
+        data is InputStream -> encryptHex(data as InputStream, getKeyType(keyType))
         else -> throw IllegalArgumentException("Unexpected data input")
         else -> throw IllegalArgumentException("Unexpected data input")
     }
     }
     fun encryptBase64(data: Any, keyType: Int): String = when {
     fun encryptBase64(data: Any, keyType: Int): String = when {
-        data is ByteArray -> encryptBase64(data, getKeyType(keyType))
-        data is String -> encryptBase64(data, getKeyType(keyType))
-        data is InputStream -> encryptBase64(data, getKeyType(keyType))
+        data is ByteArray -> encryptBase64(data as ByteArray, getKeyType(keyType))
+        data is String -> encryptBase64(data as String, getKeyType(keyType))
+        data is InputStream -> encryptBase64(data as InputStream, getKeyType(keyType))
         else -> throw IllegalArgumentException("Unexpected data input")
         else -> throw IllegalArgumentException("Unexpected data input")
     }
     }