From 45ae8cb35a23dece99fbe51c9fb82c364a5ca46a Mon Sep 17 00:00:00 2001 From: Mihai Adrian <48995920+mcarare@users.noreply.github.com> Date: Tue, 10 Dec 2019 04:10:24 +0200 Subject: [PATCH] For #6997 Avoid overwriting empty_search_string error (#6998) Setting error twice also clips error message --- .../settings/search/AddSearchEngineFragment.kt | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/org/mozilla/fenix/settings/search/AddSearchEngineFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/search/AddSearchEngineFragment.kt index d9d3cf927..8ffb8c700 100644 --- a/app/src/main/java/org/mozilla/fenix/settings/search/AddSearchEngineFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/settings/search/AddSearchEngineFragment.kt @@ -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 }