From 7ab49e0352f9bd7b19e45eb3c17b610bbb242ec2 Mon Sep 17 00:00:00 2001
From: Hasib Prince <hasibprince@e.email>
Date: Fri, 3 May 2024 16:13:23 +0000
Subject: [PATCH] Revert "Merge remote-tracking branch 'upstream/3.2.11'"

This reverts commit 561f6d41b74101cc3e8ab55b760fc57ca8947789
---
 .../com/aurora/gplayapi/helpers/WebClient.kt  | 23 +++++++++++--------
 .../gplayapi/helpers/WebSearchHelper.kt       | 14 +++--------
 .../gplayapi/network/DefaultHttpClient.kt     |  2 +-
 3 files changed, 17 insertions(+), 22 deletions(-)

diff --git a/lib/src/main/java/com/aurora/gplayapi/helpers/WebClient.kt b/lib/src/main/java/com/aurora/gplayapi/helpers/WebClient.kt
index e6a5810..87c5303 100644
--- a/lib/src/main/java/com/aurora/gplayapi/helpers/WebClient.kt
+++ b/lib/src/main/java/com/aurora/gplayapi/helpers/WebClient.kt
@@ -16,20 +16,17 @@
 package com.aurora.gplayapi.helpers
 
 import android.util.Log
-import com.aurora.gplayapi.network.DefaultHttpClient
-import com.aurora.gplayapi.network.IHttpClient
+import com.aurora.gplayapi.network.DefaultHttpClient.POST
+import com.aurora.gplayapi.network.DefaultHttpClient.okHttpClient
 import java.net.URLEncoder
+import okhttp3.Headers.Companion.toHeaders
+import okhttp3.Request
+import okhttp3.RequestBody.Companion.toRequestBody
 
 class WebClient {
 
     private val TAG = WebClient::class.java.simpleName
 
-    private var httpClient: IHttpClient = DefaultHttpClient
-
-    fun using(httpClient: IHttpClient) = apply {
-        this.httpClient = httpClient
-    }
-
     fun fetch(rpcRequests: Array<String>): String {
         val url = "https://play.google.com/_/PlayStoreUi/data/batchexecute"
         val headersList = mapOf(
@@ -37,9 +34,15 @@ class WebClient {
             "Origin" to "https://play.google.com"
         )
 
+        val request = Request.Builder()
+            .url(url)
+            .headers(headersList.toHeaders())
+            .method(POST, buildFRequest(rpcRequests).toRequestBody())
+            .build()
+
         return try {
-            val res = httpClient.post(url, headersList, buildFRequest(rpcRequests).toByteArray())
-            res.responseBytes.decodeToString()
+            val response = okHttpClient.newCall(request).execute()
+            response.body!!.string()
         } catch (exception: Exception) {
             Log.e(TAG, "Failed to fetch request", exception)
             String()
diff --git a/lib/src/main/java/com/aurora/gplayapi/helpers/WebSearchHelper.kt b/lib/src/main/java/com/aurora/gplayapi/helpers/WebSearchHelper.kt
index 42911f2..85b5c40 100644
--- a/lib/src/main/java/com/aurora/gplayapi/helpers/WebSearchHelper.kt
+++ b/lib/src/main/java/com/aurora/gplayapi/helpers/WebSearchHelper.kt
@@ -6,21 +6,15 @@ import com.aurora.gplayapi.data.builders.rpc.SearchQueryBuilder
 import com.aurora.gplayapi.data.builders.rpc.SearchSuggestionQueryBuilder
 import com.aurora.gplayapi.data.models.AuthData
 import com.aurora.gplayapi.data.models.SearchBundle
-import com.aurora.gplayapi.network.IHttpClient
 import com.aurora.gplayapi.utils.dig
 
 class WebSearchHelper(authData: AuthData) : SearchHelper(authData) {
 
     private var query: String = String()
 
-    override fun using(httpClient: IHttpClient) = apply {
-        this.httpClient = httpClient
-    }
-
     @Throws(Exception::class)
     override fun searchSuggestions(query: String): List<SearchSuggestEntry> {
-        val searchResponse = WebClient().using(httpClient)
-            .fetch(arrayOf(SearchSuggestionQueryBuilder.build(query)))
+        val searchResponse = WebClient().fetch(arrayOf(SearchSuggestionQueryBuilder.build(query)))
             .let { RpcBuilder.wrapResponse(it) }
 
         val payload = searchResponse.dig<Collection<Any>>(
@@ -48,8 +42,7 @@ class WebSearchHelper(authData: AuthData) : SearchHelper(authData) {
 
         val searchBundle = SearchBundle()
         val searchQuery = SearchQueryBuilder.build(query, nextPageUrl)
-        val searchResponse = WebClient().using(httpClient)
-            .fetch(arrayOf(searchQuery))
+        val searchResponse = WebClient().fetch(arrayOf(searchQuery))
             .let { RpcBuilder.wrapResponse(it) }
 
         var payload = searchResponse.dig<Collection<Any>>(
@@ -81,8 +74,7 @@ class WebSearchHelper(authData: AuthData) : SearchHelper(authData) {
         val nextPageToken: String = payload?.dig<String>(0, 7, 1) ?: ""
 
         searchBundle.apply {
-            this.appList = AppDetailsHelper(authData).using(httpClient)
-                .getAppByPackageName(packageNames)
+            this.appList = AppDetailsHelper(authData).getAppByPackageName(packageNames)
                 .toMutableList()
             this.query = query
             this.subBundles = hashSetOf()
diff --git a/lib/src/main/java/com/aurora/gplayapi/network/DefaultHttpClient.kt b/lib/src/main/java/com/aurora/gplayapi/network/DefaultHttpClient.kt
index 305547b..a20d4b7 100644
--- a/lib/src/main/java/com/aurora/gplayapi/network/DefaultHttpClient.kt
+++ b/lib/src/main/java/com/aurora/gplayapi/network/DefaultHttpClient.kt
@@ -43,7 +43,7 @@ internal object DefaultHttpClient : IHttpClient {
     override val responseCode: StateFlow<Int>
         get() = _responseCode.asStateFlow()
 
-    private val okHttpClient = OkHttpClient().newBuilder()
+    val okHttpClient = OkHttpClient().newBuilder()
         .connectTimeout(25, TimeUnit.SECONDS)
         .readTimeout(25, TimeUnit.SECONDS)
         .writeTimeout(25, TimeUnit.SECONDS)
-- 
GitLab