From aa3401a77f1616988f3a3bec5e6c76e01a3c9bd8 Mon Sep 17 00:00:00 2001 From: Saalim Quadri Date: Tue, 30 Sep 2025 18:33:21 +0530 Subject: [PATCH 1/3] feat: adapt to updated gplayapi SearchBundle API changes - Remove SearchBundle import and usage - Update PlayStoreSearchHelper to extract clusterAppList from StreamClusters - Fix return type from setOf() to Boolean Signed-off-by: Saalim Quadri --- .../e/apps/data/application/search/SearchRepositoryImpl.kt | 3 +-- .../foundation/e/apps/data/playstore/PlayStoreSearchHelper.kt | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/foundation/e/apps/data/application/search/SearchRepositoryImpl.kt b/app/src/main/java/foundation/e/apps/data/application/search/SearchRepositoryImpl.kt index 164cc68c7..09f72fcba 100644 --- a/app/src/main/java/foundation/e/apps/data/application/search/SearchRepositoryImpl.kt +++ b/app/src/main/java/foundation/e/apps/data/application/search/SearchRepositoryImpl.kt @@ -20,7 +20,6 @@ package foundation.e.apps.data.application.search import android.content.Context -import com.aurora.gplayapi.data.models.SearchBundle import dagger.hilt.android.qualifiers.ApplicationContext import foundation.e.apps.data.ResultSupreme import foundation.e.apps.data.Stores @@ -248,7 +247,7 @@ class SearchRepositoryImpl @Inject constructor( if (!stores.isStoreEnabled(source)) { return@handleNetworkResult Pair( listOf(), - setOf() + false ) } diff --git a/app/src/main/java/foundation/e/apps/data/playstore/PlayStoreSearchHelper.kt b/app/src/main/java/foundation/e/apps/data/playstore/PlayStoreSearchHelper.kt index 3163e55b9..f87b636f9 100644 --- a/app/src/main/java/foundation/e/apps/data/playstore/PlayStoreSearchHelper.kt +++ b/app/src/main/java/foundation/e/apps/data/playstore/PlayStoreSearchHelper.kt @@ -34,7 +34,7 @@ class PlayStoreSearchHelper @Inject constructor( suspend fun getSearchResults(keyword: String) = withContext(Dispatchers.IO) { WebSearchHelper() .using(gPlayHttpClient) - .searchResults(keyword).appList + .searchResults(keyword).streamClusters.values.firstOrNull()?.clusterAppList ?: emptyList() } suspend fun getSearchSuggestions(keyword: String) = withContext(Dispatchers.IO) { -- GitLab From 8ead722842642972f016296dcefaeeeea9434d30 Mon Sep 17 00:00:00 2001 From: Saalim Quadri Date: Tue, 30 Sep 2025 18:37:29 +0530 Subject: [PATCH 2/3] test: Fix in favor of removed SearchBundle Signed-off-by: Saalim Quadri --- .../java/foundation/e/apps/fused/SearchRepositoryImplTest.kt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/app/src/test/java/foundation/e/apps/fused/SearchRepositoryImplTest.kt b/app/src/test/java/foundation/e/apps/fused/SearchRepositoryImplTest.kt index d44f47bdb..13cc3ce50 100644 --- a/app/src/test/java/foundation/e/apps/fused/SearchRepositoryImplTest.kt +++ b/app/src/test/java/foundation/e/apps/fused/SearchRepositoryImplTest.kt @@ -21,7 +21,6 @@ import android.content.Context import android.text.format.Formatter import androidx.arch.core.executor.testing.InstantTaskExecutorRule import com.aurora.gplayapi.data.models.App -import com.aurora.gplayapi.data.models.SearchBundle import foundation.e.apps.FakeAppLoungePreference import foundation.e.apps.data.AppSourcesContainer import foundation.e.apps.data.Stores @@ -177,8 +176,8 @@ class SearchRepositoryImplTest { preferenceManagerModule.isPWASelectedFake = true preferenceManagerModule.isOpenSourceelectedFake = true preferenceManagerModule.isGplaySelectedFake = true - val gplayFlow: Pair, MutableSet> = Pair( - listOf(App("a.b.c"), App("c.d.e"), App("d.e.f"), App("d.e.g")), mutableSetOf() + val gplayFlow: Pair, Boolean> = Pair( + listOf(App("a.b.c"), App("c.d.e"), App("d.e.f"), App("d.e.g")), false ) val playStoreApps = listOf( -- GitLab From 852fa8a87725248dadf76cf79ee9426707ef9c00 Mon Sep 17 00:00:00 2001 From: Saalim Quadri Date: Wed, 1 Oct 2025 17:31:38 +0530 Subject: [PATCH 3/3] app: Upgrade gplayapi to 3.5.6 * Contains our e/OS changes on top of master gplayapi-upstream master Commit ba9097a21d72ef0c50c09daa9f0c5eb3100eaf62 Signed-off-by: Saalim Quadri --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index e64952dc9..35047dd77 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -15,7 +15,7 @@ hiltCompiler = "1.2.0" hiltWork = "1.2.0" lifecycleExtensions = "1.1.1" fragmentKtx = "1.8.5" -gplayapi = "3bfc73bc" +gplayapi = "95ec4f28" gson = "2.11.0" jacksonDataformatYaml = "2.17.0" jsoup = "1.17.2" -- GitLab