From 4107eed2d9d653384158367ed9f55b924c284751 Mon Sep 17 00:00:00 2001
From: Aayush Gupta <aayushgupta219@gmail.com>
Date: Thu, 29 Aug 2024 12:12:29 +0530
Subject: [PATCH] search: Use our custom httpClient with web helpers too

Signed-off-by: Aayush Gupta <aayushgupta219@gmail.com>
---
 .../viewmodel/search/SearchResultViewModel.kt | 22 ++++++-------------
 .../search/SearchSuggestionViewModel.kt       | 20 +++++------------
 2 files changed, 13 insertions(+), 29 deletions(-)

diff --git a/app/src/main/java/com/aurora/store/viewmodel/search/SearchResultViewModel.kt b/app/src/main/java/com/aurora/store/viewmodel/search/SearchResultViewModel.kt
index 79e091802..b7a210a1d 100644
--- a/app/src/main/java/com/aurora/store/viewmodel/search/SearchResultViewModel.kt
+++ b/app/src/main/java/com/aurora/store/viewmodel/search/SearchResultViewModel.kt
@@ -51,20 +51,14 @@ class SearchResultViewModel @Inject constructor(
 
     private val TAG = SearchResultViewModel::class.java.simpleName
 
-    private val webSearchHelper: WebSearchHelper = WebSearchHelper()
-    private val searchHelper: SearchHelper = SearchHelper(authProvider.authData!!)
-        .using(httpClient)
-
     val liveData: MutableLiveData<SearchBundle> = MutableLiveData()
 
     private var searchBundle: SearchBundle = SearchBundle()
 
-    fun helper(): SearchContract {
-        return if (authProvider.isAnonymous) {
-            webSearchHelper
-        } else {
-            searchHelper
-        }
+    private val helper: SearchContract = if (authProvider.isAnonymous) {
+        WebSearchHelper().using(httpClient)
+    } else {
+        SearchHelper(authProvider.authData!!).using(httpClient)
     }
 
     fun observeSearchResults(query: String) {
@@ -84,10 +78,8 @@ class SearchResultViewModel @Inject constructor(
         }
     }
 
-    private fun search(
-        query: String
-    ): SearchBundle {
-        return helper().searchResults(query)
+    private fun search(query: String): SearchBundle {
+        return helper.searchResults(query)
     }
 
     @Synchronized
@@ -96,7 +88,7 @@ class SearchResultViewModel @Inject constructor(
             supervisorScope {
                 try {
                     if (nextSubBundleSet.isNotEmpty()) {
-                        val newSearchBundle = helper().next(nextSubBundleSet)
+                        val newSearchBundle = helper.next(nextSubBundleSet)
                         if (newSearchBundle.appList.isNotEmpty()) {
                             searchBundle.apply {
                                 subBundles.flushAndAdd(newSearchBundle.subBundles)
diff --git a/app/src/main/java/com/aurora/store/viewmodel/search/SearchSuggestionViewModel.kt b/app/src/main/java/com/aurora/store/viewmodel/search/SearchSuggestionViewModel.kt
index bafc13eba..2163f9d07 100644
--- a/app/src/main/java/com/aurora/store/viewmodel/search/SearchSuggestionViewModel.kt
+++ b/app/src/main/java/com/aurora/store/viewmodel/search/SearchSuggestionViewModel.kt
@@ -44,18 +44,12 @@ class SearchSuggestionViewModel @Inject constructor(
     private val httpClient: IProxyHttpClient
 ) : ViewModel() {
 
-    private val webSearchHelper: WebSearchHelper = WebSearchHelper()
-    private val searchHelper: SearchHelper = SearchHelper(authProvider.authData!!)
-        .using(httpClient)
-
     val liveSearchSuggestions: MutableLiveData<List<SearchSuggestEntry>> = MutableLiveData()
 
-    fun helper(): SearchContract {
-        return if (authProvider.isAnonymous) {
-            webSearchHelper
-        } else {
-            searchHelper
-        }
+    private val helper: SearchContract = if (authProvider.isAnonymous) {
+        WebSearchHelper().using(httpClient)
+    } else {
+        SearchHelper(authProvider.authData!!).using(httpClient)
     }
 
     fun observeStreamBundles(query: String) {
@@ -64,9 +58,7 @@ class SearchSuggestionViewModel @Inject constructor(
         }
     }
 
-    private fun getSearchSuggestions(
-        query: String
-    ): List<SearchSuggestEntry> {
-        return helper().searchSuggestions(query)
+    private fun getSearchSuggestions(query: String): List<SearchSuggestEntry> {
+        return helper.searchSuggestions(query)
     }
 }