Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dc6e9ca8 authored by Saalim Quadri's avatar Saalim Quadri
Browse files

Merge branch '3714-gplayapi-upstream' into 'main' 

feat: Migrate gplayapi to master upstream

See merge request !597
parents e925b86d 852fa8a8

app/src/main/java/foundation/e/apps/data/application/search/SearchRepositoryImpl.kt

+1 −2
Original line number Diff line number Diff line
@@ -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<Application>(),

                    setOf<SearchBundle.SubBundle>()

                    false

                )

            }

app/src/main/java/foundation/e/apps/data/playstore/PlayStoreSearchHelper.kt

+1 −1
Original line number Diff line number Diff line
@@ -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) {

app/src/test/java/foundation/e/apps/fused/SearchRepositoryImplTest.kt

+2 −3
Original line number Diff line number Diff line
@@ -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<List<App>, MutableSet<SearchBundle.SubBundle>> = Pair(

            listOf(App("a.b.c"), App("c.d.e"), App("d.e.f"), App("d.e.g")), mutableSetOf()

        val gplayFlow: Pair<List<App>, Boolean> = Pair(

            listOf(App("a.b.c"), App("c.d.e"), App("d.e.f"), App("d.e.g")), false

        )



        val playStoreApps = listOf(

gradle/libs.versions.toml

+1 −1
Original line number Diff line number Diff line
@@ -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"