blallo
/
fenix
1
0
Fork 0
Code Releases Activity

Fixes #7881: Send telemetry event when custom search engine is deleted

master
ValentinTimisica 2020-01-23 13:56:52 +02:00
parent 18244cef51
commit 154e11841a
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/metrics.yaml
View File

@ -1648,7 +1648,8 @@ user_specified_search_engines:
description: > description: >
A user deleted a custom search engine A user deleted a custom search engine
bugs: bugs:
- https://github.com/mozilla-mobile/fenix/issues/5586 - https://github.com/mozilla-mobile/fenix/issues/5884
- https://github.com/mozilla-mobile/fenix/issues/7881
data_reviews: data_reviews:
- https://github.com/mozilla-mobile/fenix/pull/6918 - https://github.com/mozilla-mobile/fenix/pull/6918
notification_emails: notification_emails:

6
app/src/main/java/org/mozilla/fenix/settings/search/SearchEngineListPreference.kt
View File

@ -129,7 +129,7 @@ abstract class SearchEngineListPreference @JvmOverloads constructor(
onItemTapped = { onItemTapped = {
when (it) { when (it) {
is SearchEngineMenu.Item.Edit -> editCustomSearchEngine(engine) is SearchEngineMenu.Item.Edit -> editCustomSearchEngine(engine)
is SearchEngineMenu.Item.Delete -> deleteSearchEngine(context, engine) is SearchEngineMenu.Item.Delete -> deleteSearchEngine(context, engine, isCustomSearchEngine)
} }
} }
).menuBuilder.build(context).show(wrapper.overflow_menu) ).menuBuilder.build(context).show(wrapper.overflow_menu)
@ -162,7 +162,7 @@ abstract class SearchEngineListPreference @JvmOverloads constructor(
Navigation.findNavController(searchEngineGroup!!).navigate(directions) Navigation.findNavController(searchEngineGroup!!).navigate(directions)
} }
private fun deleteSearchEngine(context: Context, engine: SearchEngine) { private fun deleteSearchEngine(context: Context, engine: SearchEngine, isCustomSearchEngine: Boolean) {
val isDefaultEngine = engine == context.components.search.provider.getDefaultEngine(context) val isDefaultEngine = engine == context.components.search.provider.getDefaultEngine(context)
val initialEngineList = searchEngineList.copy() val initialEngineList = searchEngineList.copy()
val initialDefaultEngine = searchEngineList.default val initialDefaultEngine = searchEngineList.default
@ -192,7 +192,7 @@ abstract class SearchEngineListPreference @JvmOverloads constructor(
.getDefaultEngine(context) .getDefaultEngine(context)
.name .name
} }
if (CustomSearchEngineStore.isCustomSearchEngine(context, engine.identifier)) { if (isCustomSearchEngine) {
context.components.analytics.metrics.track(Event.CustomEngineDeleted) context.components.analytics.metrics.track(Event.CustomEngineDeleted)
} }
refreshSearchEngineViews(context) refreshSearchEngineViews(context)