From bc7d639c481a1afbfbcf720d3255cd26b3394e7b Mon Sep 17 00:00:00 2001
From: Sayantan Roychowdhury <sayantan.rc@e.email>
Date: Wed, 27 Sep 2023 15:26:22 +0530
Subject: [PATCH 1/3] FIX! don't attempt to load gplay data for open source
 exclusive searches.

---
 .../foundation/e/apps/ui/search/SearchFragment.kt   |  3 +++
 .../foundation/e/apps/ui/search/SearchViewModel.kt  | 13 +++++++++----
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/foundation/e/apps/ui/search/SearchFragment.kt b/app/src/main/java/foundation/e/apps/ui/search/SearchFragment.kt
index a0b02883a..a89acd64c 100644
--- a/app/src/main/java/foundation/e/apps/ui/search/SearchFragment.kt
+++ b/app/src/main/java/foundation/e/apps/ui/search/SearchFragment.kt
@@ -140,6 +140,9 @@ class SearchFragment :
                     if (!requireContext().isNetworkAvailable()) {
                         return
                     }
+                    if (authObjects.value?.none { it is AuthObject.GPlayAuth } == true) {
+                        return
+                    }
                     searchViewModel.loadMore(searchText)
                 }
             }
diff --git a/app/src/main/java/foundation/e/apps/ui/search/SearchViewModel.kt b/app/src/main/java/foundation/e/apps/ui/search/SearchViewModel.kt
index a2bc71080..b751ef2c5 100644
--- a/app/src/main/java/foundation/e/apps/ui/search/SearchViewModel.kt
+++ b/app/src/main/java/foundation/e/apps/ui/search/SearchViewModel.kt
@@ -91,7 +91,7 @@ class SearchViewModel @Inject constructor(
             }
 
             successAuthList.find { it is AuthObject.CleanApk }?.run {
-                getSearchResults(query, AuthData("", ""), lifecycleOwner)
+                getSearchResults(query, null, lifecycleOwner)
                 return@onLoadData
             }
         }, retryBlock)
@@ -105,17 +105,20 @@ class SearchViewModel @Inject constructor(
      */
     private fun getSearchResults(
         query: String,
-        authData: AuthData,
+        authData: AuthData?,
         lifecycleOwner: LifecycleOwner
     ) {
         viewModelScope.launch(Dispatchers.IO) {
-            val searchResultSupreme = fusedAPIRepository.getCleanApkSearchResults(query, authData)
+            val searchResultSupreme = fusedAPIRepository.getCleanApkSearchResults(
+                query,
+                authData ?: AuthData("", "")
+            )
 
             searchResult.postValue(searchResultSupreme)
 
             if (!searchResultSupreme.isSuccess()) {
                 val exception =
-                    if (authData.aasToken.isNotBlank() || authData.authToken.isNotBlank()) {
+                    if (authData != null) {
                         GPlayException(
                             searchResultSupreme.isTimeout(),
                             searchResultSupreme.message.ifBlank { DATA_LOAD_ERROR }
@@ -130,6 +133,8 @@ class SearchViewModel @Inject constructor(
                 handleException(exception)
             }
 
+            if (authData == null) return@launch
+
             nextSubBundle = null
             fetchGplayData(query)
         }
-- 
GitLab


From 33b9d8365a2caa8db34909b7e044561cf8babb91 Mon Sep 17 00:00:00 2001
From: Sayantan Roychowdhury <sayantan.rc@e.email>
Date: Tue, 3 Oct 2023 18:07:49 +0530
Subject: [PATCH 2/3] add some line breaks

---
 app/src/main/java/foundation/e/apps/ui/search/SearchFragment.kt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/src/main/java/foundation/e/apps/ui/search/SearchFragment.kt b/app/src/main/java/foundation/e/apps/ui/search/SearchFragment.kt
index a89acd64c..5e2a519ab 100644
--- a/app/src/main/java/foundation/e/apps/ui/search/SearchFragment.kt
+++ b/app/src/main/java/foundation/e/apps/ui/search/SearchFragment.kt
@@ -140,9 +140,11 @@ class SearchFragment :
                     if (!requireContext().isNetworkAvailable()) {
                         return
                     }
+
                     if (authObjects.value?.none { it is AuthObject.GPlayAuth } == true) {
                         return
                     }
+
                     searchViewModel.loadMore(searchText)
                 }
             }
-- 
GitLab


From 2b4051a6e36407e84d6adef5caa7b730c8b53781 Mon Sep 17 00:00:00 2001
From: Sayantan Roychowdhury <sayantan.rc@e.email>
Date: Tue, 3 Oct 2023 21:15:07 +0530
Subject: [PATCH 3/3] suggestion

---
 .../main/java/foundation/e/apps/ui/search/SearchViewModel.kt  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/foundation/e/apps/ui/search/SearchViewModel.kt b/app/src/main/java/foundation/e/apps/ui/search/SearchViewModel.kt
index b751ef2c5..dbf0b1ba9 100644
--- a/app/src/main/java/foundation/e/apps/ui/search/SearchViewModel.kt
+++ b/app/src/main/java/foundation/e/apps/ui/search/SearchViewModel.kt
@@ -133,7 +133,9 @@ class SearchViewModel @Inject constructor(
                 handleException(exception)
             }
 
-            if (authData == null) return@launch
+            if (authData == null) {
+                return@launch
+            }
 
             nextSubBundle = null
             fetchGplayData(query)
-- 
GitLab