From d6f0bbcea9ca2a7b361a8201f5a40e9c2a0dffa9 Mon Sep 17 00:00:00 2001 From: x-JOC Date: Wed, 21 Oct 2026 11:58:07 +0300 Subject: [PATCH] fix(search): stop double-encoding web suggestion queries (#7389) Retrofit already percent-encodes @Query parameters, so encoding the query with Uri.encode first sent the literal "%D8%A7..." text to the suggestion APIs. Non-ASCII queries (Arabic, Cyrillic, accented Latin, ...) got suggestions for that escaped text, shown as hex bytes. Pass the raw query instead. The search URLs built by hand in getSearchUrl still encode, as they should. Co-authored-by: Claude Opus 5.5 --- .../provider/web/BuiltInWebSearchProviders.kt | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/lawnchair/src/app/lawnchair/search/algorithms/engine/provider/web/BuiltInWebSearchProviders.kt b/lawnchair/src/app/lawnchair/search/algorithms/engine/provider/web/BuiltInWebSearchProviders.kt index 1049a9ba0e..4782665096 100644 --- a/lawnchair/src/app/lawnchair/search/algorithms/engine/provider/web/BuiltInWebSearchProviders.kt +++ b/lawnchair/src/app/lawnchair/search/algorithms/engine/provider/web/BuiltInWebSearchProviders.kt @@ -64,8 +64,8 @@ object GoogleWebSearchProvider : WebSearchProvider { } try { - val encodedQuery = Uri.encode(query) - val response = service.getSuggestions(query = encodedQuery) + // Retrofit percent-encodes @Query values itself; encoding here too sends "%D8%A7…" as text. + val response = service.getSuggestions(query = query) if (response.isSuccessful) { val responseBody = response.body() ?: "" @@ -149,8 +149,7 @@ object DuckDuckGoWebSearchProvider : WebSearchProvider { try { // 2. Call the Retrofit service. - val encodedQuery = Uri.encode(query) - val response = service.getSuggestions(query = encodedQuery) + val response = service.getSuggestions(query = query) if (response.isSuccessful) { val responseBody = response.body()?.string() ?: "" @@ -231,8 +230,7 @@ object StartPageWebSearchProvider : WebSearchProvider { } try { - val encodedQuery = Uri.encode(query) - val response = service.getSuggestions(query = encodedQuery) + val response = service.getSuggestions(query = query) if (response.isSuccessful) { val responseBody = response.body() ?: "" @@ -311,8 +309,7 @@ object StartPageEUWebSearchProvider : WebSearchProvider { } try { - val encodedQuery = Uri.encode(query) - val response = service.getSuggestions(query = encodedQuery) + val response = service.getSuggestions(query = query) if (response.isSuccessful) { val responseBody = response.body() ?: "" @@ -378,8 +375,7 @@ object KagiWebSearchProvider : WebSearchProvider { } try { - val encodedQuery = Uri.encode(query) - val response = service.getSuggestions(query = encodedQuery) + val response = service.getSuggestions(query = query) if (response.isSuccessful) { val responseBody = response.body() ?: ""