Compare commits

..

1 commit

Author SHA1 Message Date
81d1fb2b70
feat: stricted imei checking 2025-03-07 06:58:04 +08:00
2 changed files with 7 additions and 15 deletions

View file

@ -79,19 +79,13 @@ class DownloadWizardDetailsFragment : DownloadWizardActivity.DownloadWizardStepF
private fun validate() {
smdp.error = smdp.editText!!.text?.let {
when {
it.isEmpty() -> getString(R.string.download_wizard_error_address_required)
it.contains("://") -> getString(R.string.download_wizard_error_cannot_url)
Patterns.DOMAIN_NAME.matcher(it).matches() -> null
else -> getString(R.string.download_wizard_error_address_invalid_format)
}
if (Patterns.DOMAIN_NAME.matcher(smdp.editText!!.text).matches()) return@let null
getString(R.string.download_wizard_error_invalid_address_format)
}
imei.error = imei.editText!!.text?.let {
when {
it.isEmpty() -> null
it.length == 15 && luhnValid(it) -> null
else -> getString(R.string.download_wizard_error_imei_invalid_format)
}
if (it.isEmpty()) return@let null
if (it.length == 15 && luhnValid(it)) return@let null
getString(R.string.download_wizard_error_invalid_imei_format)
}
}
}

View file

@ -98,10 +98,8 @@
<string name="download_wizard_diagnostics_last_apdu_exception">Last APDU exception:</string>
<string name="download_wizard_diagnostics_save">Save</string>
<string name="download_wizard_diagnostics_file_template">Diagnostics at %s</string>
<string name="download_wizard_error_address_required">Server address is required</string>
<string name="download_wizard_error_cannot_url">Server address not is URL</string>
<string name="download_wizard_error_address_invalid_format">Invalid Server address</string>
<string name="download_wizard_error_imei_invalid_format">Invalid IMEI format</string>
<string name="download_wizard_error_invalid_address_format">Invalid SM-DP+ address</string>
<string name="download_wizard_error_invalid_imei_format">Invalid IMEI format</string>
<string name="logs_saved_message">Logs have been saved to the selected path. Would you like to share the log through another app?</string>