littlebalalafairy/SmsForwarder
1
0
Fork 0
mirror of https://github.com/pppscn/SmsForwarder synced 2025-08-02 17:07:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

修复：bark加密推送，解密失败 #307 #314

Browse Source
This commit is contained in:
pppscn 2023-06-28 16:58:30 +08:00
parent ec57b0228a
commit 65c3246ed3
3 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/java/com/idormy/sms/forwarder/fragment/senders/BarkFragment.kt
View File

@ -280,13 +280,16 @@ class BarkFragment : BaseFragment<FragmentSendersBarkBinding?>(), 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)
}

7
app/src/main/res/values-en/strings.xml
View File

@ -735,9 +735,10 @@
<string name="bark_encryption_iv">AES iv</string>
<string name="bark_encryption_iv_tips">corresponding iv on bark</string>
<string name="bark_encryption_key_regex" formatted="false" tools:ignore="TypographyDashes"><![CDATA[^[a-zA-Z0-9]{16}]]></string>
<string name="bark_encryption_key_error1">AES Key and iv must be 16 characters</string>
<string name="bark_encryption_key_error2">AES Key and iv must be 24 characters</string>
<string name="bark_encryption_key_error3">AES Key and iv must be 32 characters</string>
<string name="bark_encryption_key_error1">AES Key must be 16 characters</string>
<string name="bark_encryption_key_error2">AES Key must be 24 characters</string>
<string name="bark_encryption_key_error3">AES Key must be 32 characters</string>
<string name="bark_encryption_key_error4">AES iv must be 16 characters</string>
<string name="from_email_hint">Fill in the username before @</string>
<string name="from_email_full_hint">Fill in the format: AAA@BBB.CCC</string>

7
app/src/main/res/values/strings.xml
View File

@ -736,9 +736,10 @@
<string name="bark_encryption_iv">偏移向量</string>
<string name="bark_encryption_iv_tips">对应bark上的iv</string>
<string name="bark_encryption_key_regex" formatted="false" tools:ignore="TypographyDashes"><![CDATA[^([a-zA-Z0-9]{16})? $]]></string>
<string name="bark_encryption_key_error1">加密密钥和偏移向量都必须是16位</string>
<string name="bark_encryption_key_error2">加密密钥和偏移向量都必须是24位</string>
<string name="bark_encryption_key_error3">加密密钥和偏移向量都必须是32位</string>
<string name="bark_encryption_key_error1">加密密钥必须是16位</string>
<string name="bark_encryption_key_error2">加密密钥必须是24位</string>
<string name="bark_encryption_key_error3">加密密钥必须是32位</string>
<string name="bark_encryption_key_error4">偏移向量必须是16位</string>
<string name="from_email_hint">填写 @ 前面的用户名</string>
<string name="from_email_full_hint">填写格式: AAA@BBB.CCC</string>