Fix search issue

app/build.gradle.kts

@@ -164,7 +164,7 @@ dependencies {
     implementation("com.github.topjohnwu.libsu:core:5.0.5")
 
     //Love <3
-    implementation("com.gitlab.AuroraOSS:gplayapi:3.2.0")
+    implementation("com.gitlab.AuroraOSS:gplayapi:3.2.1")
 
     //Browser
     implementation("androidx.browser:browser:1.6.0")

app/src/main/java/com/aurora/store/viewmodel/search/SearchResultViewModel.kt

@@ -20,15 +20,12 @@
 package com.aurora.store.viewmodel.search
 
 import android.app.Application
-import android.content.Context
 import android.util.Log
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.viewModelScope
 import com.aurora.extensions.flushAndAdd
-import com.aurora.extensions.shouldUseWebAPI
 import com.aurora.gplayapi.data.models.AuthData
 import com.aurora.gplayapi.data.models.SearchBundle
-import com.aurora.gplayapi.helpers.SearchHelper
 import com.aurora.gplayapi.helpers.WebSearchHelper
 import com.aurora.store.data.RequestState
 import com.aurora.store.data.network.HttpClient
@@ -45,11 +42,9 @@ class SearchResultViewModel(application: Application) : BaseAndroidViewModel(app
         .with(application)
         .getAuthData()
 
-    private val searchHelper: SearchHelper = SearchHelper(authData)
+    private val searchHelper = WebSearchHelper(authData)
         .using(HttpClient.getPreferredClient())
 
-    private val webSearchHelper = WebSearchHelper()
-
     val liveData: MutableLiveData<SearchBundle> = MutableLiveData()
 
     private var searchBundle: SearchBundle = SearchBundle()
@@ -74,17 +69,7 @@ class SearchResultViewModel(application: Application) : BaseAndroidViewModel(app
     private fun search(
         query: String
     ): SearchBundle {
-        return if ((getApplication() as Context).shouldUseWebAPI()) {
+        return searchHelper.searchResults(query)
-            val result = webSearchHelper.searchResults(query)
-            val searchBundle = SearchBundle().apply {
-                this.id = 100
-                this.query = query
-                appList = result.values.flatten().toSet().toMutableList()
-            }
-            return searchBundle
-        } else {
-            searchHelper.searchResults(query)
-        }
     }
 
     @Synchronized

app/src/main/java/com/aurora/store/viewmodel/search/SearchSuggestionViewModel.kt

@@ -20,15 +20,12 @@
 package com.aurora.store.viewmodel.search
 
 import android.app.Application
-import android.content.Context
 import androidx.lifecycle.AndroidViewModel
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.viewModelScope
-import com.aurora.extensions.shouldUseWebAPI
 import com.aurora.gplayapi.SearchSuggestEntry
 import com.aurora.gplayapi.data.models.AuthData
-import com.aurora.gplayapi.helpers.SearchHelper
+import com.aurora.gplayapi.helpers.WebSearchHelper
-import com.aurora.gplayapi.helpers.WebSearchSuggestionHelper
 import com.aurora.store.data.network.HttpClient
 import com.aurora.store.data.providers.AuthProvider
 import kotlinx.coroutines.Dispatchers
@@ -40,11 +37,9 @@ class SearchSuggestionViewModel(application: Application) : AndroidViewModel(app
         .with(application)
         .getAuthData()
 
-    private val searchHelper: SearchHelper = SearchHelper(authData)
+    private val searchHelper = WebSearchHelper(authData)
         .using(HttpClient.getPreferredClient())
 
-    private val webSearchSuggestionHelper = WebSearchSuggestionHelper()
-
     val liveSearchSuggestions: MutableLiveData<List<SearchSuggestEntry>> = MutableLiveData()
 
     fun observeStreamBundles(query: String) {
@@ -56,10 +51,6 @@ class SearchSuggestionViewModel(application: Application) : AndroidViewModel(app
     private fun getSearchSuggestions(
         query: String
     ): List<SearchSuggestEntry> {
-        return if ((getApplication() as Context).shouldUseWebAPI()) {
+        return searchHelper.searchSuggestions(query)
-            webSearchSuggestionHelper.searchSuggestions(query)
-        } else {
-            searchHelper.searchSuggestions(query)
-        }
     }
 }