From 9e0e2148a50ffe8d1117432450dc984381a45636 Mon Sep 17 00:00:00 2001
From: Lina Butler <lina@yakshaving.ninja>
Date: Thu, 12 Oct 2023 22:16:12 -0700
Subject: [PATCH] No bug - Update uses of `SuggestionQuery` in Firefox Suggest.

This commit fixes the breaking change introduced in
mozilla/application-services#5867.
---
 .../feature/fxsuggest/FxSuggestSuggestionProvider.kt | 12 ++++++++++--
 .../fxsuggest/FxSuggestSuggestionProviderTest.kt     | 10 ++++------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/android-components/components/feature/fxsuggest/src/main/java/mozilla/components/feature/fxsuggest/FxSuggestSuggestionProvider.kt b/android-components/components/feature/fxsuggest/src/main/java/mozilla/components/feature/fxsuggest/FxSuggestSuggestionProvider.kt
index ef835d42ae61..b860afc9b794 100644
--- a/android-components/components/feature/fxsuggest/src/main/java/mozilla/components/feature/fxsuggest/FxSuggestSuggestionProvider.kt
+++ b/android-components/components/feature/fxsuggest/src/main/java/mozilla/components/feature/fxsuggest/FxSuggestSuggestionProvider.kt
@@ -6,6 +6,7 @@ package mozilla.components.feature.fxsuggest
 
 import android.content.res.Resources
 import mozilla.appservices.suggest.Suggestion
+import mozilla.appservices.suggest.SuggestionProvider
 import mozilla.appservices.suggest.SuggestionQuery
 import mozilla.components.concept.awesomebar.AwesomeBar
 import mozilla.components.feature.session.SessionUseCases
@@ -36,11 +37,18 @@ class FxSuggestSuggestionProvider(
         if (text.isEmpty()) {
             emptyList()
         } else {
+            val providers = buildList() {
+                if (includeSponsoredSuggestions) {
+                    add(SuggestionProvider.AMP)
+                }
+                if (includeNonSponsoredSuggestions) {
+                    add(SuggestionProvider.WIKIPEDIA)
+                }
+            }
             GlobalFxSuggestDependencyProvider.requireStorage().query(
                 SuggestionQuery(
                     keyword = text,
-                    includeSponsored = includeSponsoredSuggestions,
-                    includeNonSponsored = includeNonSponsoredSuggestions,
+                    providers = providers,
                 ),
             ).into()
         }
diff --git a/android-components/components/feature/fxsuggest/src/test/java/mozilla/components/feature/fxsuggest/FxSuggestSuggestionProviderTest.kt b/android-components/components/feature/fxsuggest/src/test/java/mozilla/components/feature/fxsuggest/FxSuggestSuggestionProviderTest.kt
index 0068d0e76bae..1be56be79d8b 100644
--- a/android-components/components/feature/fxsuggest/src/test/java/mozilla/components/feature/fxsuggest/FxSuggestSuggestionProviderTest.kt
+++ b/android-components/components/feature/fxsuggest/src/test/java/mozilla/components/feature/fxsuggest/FxSuggestSuggestionProviderTest.kt
@@ -7,6 +7,7 @@ package mozilla.components.feature.fxsuggest
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import kotlinx.coroutines.test.runTest
 import mozilla.appservices.suggest.Suggestion
+import mozilla.appservices.suggest.SuggestionProvider
 import mozilla.appservices.suggest.SuggestionQuery
 import mozilla.components.support.test.any
 import mozilla.components.support.test.eq
@@ -112,8 +113,7 @@ class FxSuggestSuggestionProviderTest {
             eq(
                 SuggestionQuery(
                     keyword = "la",
-                    includeSponsored = true,
-                    includeNonSponsored = true,
+                    providers = listOf(SuggestionProvider.AMP, SuggestionProvider.WIKIPEDIA),
                 ),
             ),
         )
@@ -168,8 +168,7 @@ class FxSuggestSuggestionProviderTest {
             eq(
                 SuggestionQuery(
                     keyword = "la",
-                    includeSponsored = false,
-                    includeNonSponsored = true,
+                    providers = listOf(SuggestionProvider.WIKIPEDIA),
                 ),
             ),
         )
@@ -212,8 +211,7 @@ class FxSuggestSuggestionProviderTest {
             eq(
                 SuggestionQuery(
                     keyword = "la",
-                    includeSponsored = true,
-                    includeNonSponsored = false,
+                    providers = listOf(SuggestionProvider.AMP),
                 ),
             ),
         )