diff --git a/app/src/main/java/com/idormy/sms/forwarder/fragment/senders/BarkFragment.kt b/app/src/main/java/com/idormy/sms/forwarder/fragment/senders/BarkFragment.kt index 64fda4ce..e28200dc 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/fragment/senders/BarkFragment.kt +++ b/app/src/main/java/com/idormy/sms/forwarder/fragment/senders/BarkFragment.kt @@ -280,13 +280,16 @@ class BarkFragment : BaseFragment(), View.OnClickLi val title = binding!!.etTitleTemplate.text.toString().trim() val key = binding!!.etEncryptionKey.text.toString().trim() val iv = binding!!.etEncryptionIv.text.toString().trim() - if (transformation.startsWith("AES128") && (key.length != 16 || iv.length != 16)) { + if (transformation.startsWith("AES128") && key.length != 16) { throw Exception(getString(R.string.bark_encryption_key_error1)) - } else if (transformation.startsWith("AES192") && (key.length != 24 || iv.length != 24)) { + } else if (transformation.startsWith("AES192") && key.length != 24) { throw Exception(getString(R.string.bark_encryption_key_error2)) - } else if (transformation.startsWith("AES256") && (key.length != 32 || iv.length != 32)) { + } else if (transformation.startsWith("AES256") && key.length != 32) { throw Exception(getString(R.string.bark_encryption_key_error3)) } + if (transformation.contains("CBC") && iv.length != 16) { + throw Exception(getString(R.string.bark_encryption_key_error4)) + } return BarkSetting(server, group, icon, sound, badge, url, barkLevel, title, transformation, key, iv) } diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml index ace6c6cd..d9c93259 100644 --- a/app/src/main/res/values-en/strings.xml +++ b/app/src/main/res/values-en/strings.xml @@ -735,9 +735,10 @@ AES iv corresponding iv on bark - AES Key and iv must be 16 characters - AES Key and iv must be 24 characters - AES Key and iv must be 32 characters + AES Key must be 16 characters + AES Key must be 24 characters + AES Key must be 32 characters + AES iv must be 16 characters Fill in the username before @ Fill in the format: AAA@BBB.CCC diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index bc968ade..af90aa9a 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -736,9 +736,10 @@ 偏移向量 对应bark上的iv - 加密密钥和偏移向量都必须是16位 - 加密密钥和偏移向量都必须是24位 - 加密密钥和偏移向量都必须是32位 + 加密密钥必须是16位 + 加密密钥必须是24位 + 加密密钥必须是32位 + 偏移向量必须是16位 填写 @ 前面的用户名 填写格式: AAA@BBB.CCC