From 9593912884ed2d1abd513c5a476ba0f918bd2764 Mon Sep 17 00:00:00 2001 From: David Gonzalez Date: Tue, 30 Jun 2020 20:18:25 +0200 Subject: [PATCH 1/4] this pixel should only be fired in the serp header removal variant --- .../duckduckgo/app/browser/BrowserTabViewModel.kt | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/com/duckduckgo/app/browser/BrowserTabViewModel.kt b/app/src/main/java/com/duckduckgo/app/browser/BrowserTabViewModel.kt index 53b745c19786..a2ef8c8b630c 100644 --- a/app/src/main/java/com/duckduckgo/app/browser/BrowserTabViewModel.kt +++ b/app/src/main/java/com/duckduckgo/app/browser/BrowserTabViewModel.kt @@ -454,22 +454,16 @@ class BrowserTabViewModel( val oldUri = currentOmnibarViewState().omnibarText.toUri() val newUri = omnibarText.toUri() - val oldParameter = try { - oldUri.getQueryParameter(AppUrl.ParamKey.QUERY) - } catch (e: UnsupportedOperationException) { - null - } - val newParameter = try { - newUri.getQueryParameter(AppUrl.ParamKey.QUERY) - } catch (e: UnsupportedOperationException) { - null + if (!variantManager.getVariant().hasFeature(VariantManager.VariantFeature.SerpHeaderRemoval)){ + return } - if (oldParameter == newParameter) { + if (oldUri == newUri) { pixel.fire(String.format(Locale.US, PixelName.SERP_REQUERY.pixelName, PixelParameter.SERP_QUERY_NOT_CHANGED)) } else { pixel.fire(String.format(Locale.US, PixelName.SERP_REQUERY.pixelName, PixelParameter.SERP_QUERY_CHANGED)) } + } private fun shouldClearHistoryOnNewQuery(): Boolean { From f73d81aec1c40c7317a364bea97c519294e97c1d Mon Sep 17 00:00:00 2001 From: David Gonzalez Date: Tue, 30 Jun 2020 20:32:21 +0200 Subject: [PATCH 2/4] renaming these to match the actual content of the variable --- .../java/com/duckduckgo/app/browser/BrowserTabViewModel.kt | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/duckduckgo/app/browser/BrowserTabViewModel.kt b/app/src/main/java/com/duckduckgo/app/browser/BrowserTabViewModel.kt index a2ef8c8b630c..d0635d89a30f 100644 --- a/app/src/main/java/com/duckduckgo/app/browser/BrowserTabViewModel.kt +++ b/app/src/main/java/com/duckduckgo/app/browser/BrowserTabViewModel.kt @@ -92,7 +92,6 @@ import kotlinx.coroutines.Job import kotlinx.coroutines.launch import kotlinx.coroutines.withContext import timber.log.Timber -import java.lang.UnsupportedOperationException import java.util.Locale import java.util.concurrent.TimeUnit @@ -451,14 +450,14 @@ class BrowserTabViewModel( } private fun fireQueryChangedPixel(omnibarText: String) { - val oldUri = currentOmnibarViewState().omnibarText.toUri() - val newUri = omnibarText.toUri() + val oldQuery = currentOmnibarViewState().omnibarText.toUri() + val newQuery = omnibarText.toUri() if (!variantManager.getVariant().hasFeature(VariantManager.VariantFeature.SerpHeaderRemoval)){ return } - if (oldUri == newUri) { + if (oldQuery == newQuery) { pixel.fire(String.format(Locale.US, PixelName.SERP_REQUERY.pixelName, PixelParameter.SERP_QUERY_NOT_CHANGED)) } else { pixel.fire(String.format(Locale.US, PixelName.SERP_REQUERY.pixelName, PixelParameter.SERP_QUERY_CHANGED)) From 176d1653493fef4143cbdee4922f8ff2b8269d07 Mon Sep 17 00:00:00 2001 From: David Gonzalez Date: Tue, 30 Jun 2020 20:49:54 +0200 Subject: [PATCH 3/4] formatting is your friend --- .../main/java/com/duckduckgo/app/browser/BrowserTabViewModel.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/com/duckduckgo/app/browser/BrowserTabViewModel.kt b/app/src/main/java/com/duckduckgo/app/browser/BrowserTabViewModel.kt index d0635d89a30f..41be9b26a934 100644 --- a/app/src/main/java/com/duckduckgo/app/browser/BrowserTabViewModel.kt +++ b/app/src/main/java/com/duckduckgo/app/browser/BrowserTabViewModel.kt @@ -453,7 +453,7 @@ class BrowserTabViewModel( val oldQuery = currentOmnibarViewState().omnibarText.toUri() val newQuery = omnibarText.toUri() - if (!variantManager.getVariant().hasFeature(VariantManager.VariantFeature.SerpHeaderRemoval)){ + if (!variantManager.getVariant().hasFeature(VariantManager.VariantFeature.SerpHeaderRemoval)) { return } From 928f155a030ac49fb84995842253036173feaa66 Mon Sep 17 00:00:00 2001 From: David Gonzalez Date: Tue, 30 Jun 2020 20:51:31 +0200 Subject: [PATCH 4/4] exit sooner rather than later --- .../java/com/duckduckgo/app/browser/BrowserTabViewModel.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/duckduckgo/app/browser/BrowserTabViewModel.kt b/app/src/main/java/com/duckduckgo/app/browser/BrowserTabViewModel.kt index 41be9b26a934..7ebae5877891 100644 --- a/app/src/main/java/com/duckduckgo/app/browser/BrowserTabViewModel.kt +++ b/app/src/main/java/com/duckduckgo/app/browser/BrowserTabViewModel.kt @@ -450,13 +450,13 @@ class BrowserTabViewModel( } private fun fireQueryChangedPixel(omnibarText: String) { - val oldQuery = currentOmnibarViewState().omnibarText.toUri() - val newQuery = omnibarText.toUri() - if (!variantManager.getVariant().hasFeature(VariantManager.VariantFeature.SerpHeaderRemoval)) { return } + val oldQuery = currentOmnibarViewState().omnibarText.toUri() + val newQuery = omnibarText.toUri() + if (oldQuery == newQuery) { pixel.fire(String.format(Locale.US, PixelName.SERP_REQUERY.pixelName, PixelParameter.SERP_QUERY_NOT_CHANGED)) } else {