blallo
/
fenix
1
0
Fork 0
Code Releases Activity

For #6997 Avoid overwriting empty_search_string error (#6998) 

Setting error twice also clips error message
master
Mihai Adrian 2019-12-10 04:10:24 +02:00 committed by Tiger Oakes
parent 76e9200304
commit 45ae8cb35a
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/src/main/java/org/mozilla/fenix/settings/search/AddSearchEngineFragment.kt
View File

@ -141,6 +141,7 @@ class AddSearchEngineFragment : Fragment(), CompoundButton.OnCheckedChangeListen
}
}
@Suppress("ComplexMethod")
private fun createCustomEngine() {
custom_search_engine_name_field.error = ""
custom_search_engine_search_string_field.error = ""
@ -167,15 +168,15 @@ class AddSearchEngineFragment : Fragment(), CompoundButton.OnCheckedChangeListen
hasError = true
}
if (searchString.isEmpty()) {
custom_search_engine_search_string_field
.error = resources.getString(R.string.search_add_custom_engine_error_empty_search_string)
hasError = true
custom_search_engine_search_string_field.error = when {
searchString.isEmpty() ->
resources.getString(R.string.search_add_custom_engine_error_empty_search_string)
!searchString.contains("%s") ->
resources.getString(R.string.search_add_custom_engine_error_missing_template)
else -> null
}
if (!searchString.contains("%s")) {
custom_search_engine_search_string_field
.error = resources.getString(R.string.search_add_custom_engine_error_missing_template)
if (custom_search_engine_search_string_field.error != null) {
hasError = true
}