From f972ac01d3a238260159418f8b9f8f4e6895b9d3 Mon Sep 17 00:00:00 2001
From: Aayush Gupta <aayushgupta219@gmail.com>
Date: Thu, 29 Jun 2023 19:08:22 +0530
Subject: [PATCH] Drop dependency upon Fuel library

Current version is outdated and it was mainly here for Android 4.4 support.
Move to Okhttpclient instead.

Signed-off-by: Aayush Gupta <aayushgupta219@gmail.com>
---
 app/build.gradle                              |  1 -
 .../java/com/aurora/store/util/AC2DMTask.kt   | 24 ++++++++++---------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 2e077aab0..bef00a1bf 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -157,7 +157,6 @@ dependencies {
     implementation "com.novoda:merlin:1.2.1"
 
     //HTTP Clients
-    implementation "com.github.kittinunf.fuel:fuel:2.3.1"
     implementation "com.squareup.okhttp3:okhttp:4.11.0"
 
     //Fetch - Downloader
diff --git a/app/src/main/java/com/aurora/store/util/AC2DMTask.kt b/app/src/main/java/com/aurora/store/util/AC2DMTask.kt
index c49723c95..0c950d40d 100644
--- a/app/src/main/java/com/aurora/store/util/AC2DMTask.kt
+++ b/app/src/main/java/com/aurora/store/util/AC2DMTask.kt
@@ -19,8 +19,9 @@
 
 package com.aurora.store.util
 
-import com.github.kittinunf.fuel.Fuel
+import com.aurora.store.data.network.OkHttpClient
 import java.util.*
+import okhttp3.RequestBody.Companion.toRequestBody
 
 class AC2DMTask {
     @Throws(Exception::class)
@@ -44,18 +45,19 @@ class AC2DMTask {
 
         val body = params.map { "${it.key}=${it.value}" }.joinToString(separator = "&")
 
-        val response = Fuel.post(TOKEN_AUTH_URL)
-            .body(body)
-            .header("app" to "com.google.android.gms")
-            .header("User-Agent" to "")
-            .header("Content-Type" to "application/x-www-form-urlencoded")
-            .response()
+        val header = mapOf(
+            "app" to "com.google.android.gms",
+            "User-Agent" to "",
+            "Content-Type" to "application/x-www-form-urlencoded"
+        )
 
-        return response.third.fold(success = {
-            AC2DMUtil.parseResponse(String(it))
-        }, failure = {
+        val response = OkHttpClient.post(TOKEN_AUTH_URL, header, body.toRequestBody())
+
+        return if (response.isSuccessful) {
+            AC2DMUtil.parseResponse(String(response.responseBytes))
+        } else {
             mapOf()
-        })
+        }
     }
 
     companion object {