Merge "Telephony Issue: Apn config mmsc should start with http but is 啊." into main

This commit is contained in:
Charlotte Lu
2023-12-08 04:31:07 +00:00
committed by Android (Google) Code Review
3 changed files with 14 additions and 1 deletions

View File

@@ -150,6 +150,7 @@ fun ApnPage(apnDataInit: ApnData, apnDataCur: MutableState<ApnData>, uriInit: Ur
SettingsOutlinedTextField(
value = apnData.mmsc,
label = stringResource(R.string.apn_mmsc),
errorMessage = validateMMSC(apnData.mmsc, context),
enabled = apnData.mmscEnabled
) { apnData = apnData.copy(mmsc = it) }
SettingsOutlinedTextField(

View File

@@ -239,7 +239,12 @@ fun validateAndSaveApnData(
if (apnData.customizedConfig.readOnlyApn) {
return true
}
val errorMsg = validateApnData(apnData, context)
var errorMsg = validateApnData(apnData, context)
if (errorMsg != null) {
//TODO: showError(this)
return false
}
errorMsg = validateMMSC(apnData.mmsc, context)
if (errorMsg != null) {
//TODO: showError(this)
return false
@@ -529,4 +534,9 @@ private fun getEditableApnType(apnData: ApnData): String {
fun deleteApn(uri: Uri, context: Context) {
val contentResolver = context.contentResolver
contentResolver.delete(uri, null, null)
}
fun validateMMSC(mmsc: String, context: Context): String? {
return if (mmsc.matches(Regex("^https?:\\/\\/.+"))) null
else context.resources.getString(R.string.error_mmsc_valid)
}