From a89e2c2e081668e967bc966b497e463265efc3c4 Mon Sep 17 00:00:00 2001
From: kohlerpop1 <kohlerpop1@gmail.com>
Date: Thu, 11 Jan 2024 11:35:34 -0500
Subject: [PATCH] Push for proxy test pt 2!

---
 .../github/jwdeveloper/tiktok/TikTokLiveHttpClient.java  | 2 +-
 .../io/github/jwdeveloper/tiktok/http/HttpClient.java    | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Client/src/main/java/io/github/jwdeveloper/tiktok/TikTokLiveHttpClient.java b/Client/src/main/java/io/github/jwdeveloper/tiktok/TikTokLiveHttpClient.java
index 3874ae6..40a41c5 100644
--- a/Client/src/main/java/io/github/jwdeveloper/tiktok/TikTokLiveHttpClient.java
+++ b/Client/src/main/java/io/github/jwdeveloper/tiktok/TikTokLiveHttpClient.java
@@ -182,7 +182,7 @@ public class TikTokLiveHttpClient implements LiveHttpClient {
         var optionalResponse = httpFactory
                 .clientEmpty(signedUrl)
                 .build()
-                .toResponse(HttpResponse.BodyHandlers.ofByteArray());
+                .toResponse();
         if (optionalResponse.isEmpty()) {
             throw new TikTokSignServerException("Unable to get websocket connection credentials");
         }
diff --git a/Client/src/main/java/io/github/jwdeveloper/tiktok/http/HttpClient.java b/Client/src/main/java/io/github/jwdeveloper/tiktok/http/HttpClient.java
index 723caa0..a6a675f 100644
--- a/Client/src/main/java/io/github/jwdeveloper/tiktok/http/HttpClient.java
+++ b/Client/src/main/java/io/github/jwdeveloper/tiktok/http/HttpClient.java
@@ -39,7 +39,7 @@ public class HttpClient {
     protected final String url;
     private final Pattern pattern = Pattern.compile("charset=(.*?)(?=&|$)");
 
-    public <T> Optional<HttpResponse<T>> toResponse(HttpResponse.BodyHandler<T> bodyHandler) {
+    public  Optional<HttpResponse<byte[]>> toResponse() {
         var client = prepareClient();
         var request = prepareGetRequest();
         try {
@@ -55,14 +55,15 @@ public class HttpClient {
     }
 
     public Optional<String> toJsonResponse() {
-        var optional = toResponse(HttpResponse.BodyHandlers.ofString());
+        var optional = toResponse();
         if (optional.isEmpty()) {
             return Optional.empty();
         }
 
         var response = optional.get();
         var body = response.body();
-        return Optional.of(body);
+        var charset = charsetFrom(response.headers());
+        return Optional.of(new String(body,charset));
     }
 
     private Charset charsetFrom(HttpHeaders headers) {
@@ -80,7 +81,7 @@ public class HttpClient {
     }
 
     public Optional<byte[]> toBinaryResponse() {
-        var optional = toResponse(HttpResponse.BodyHandlers.ofByteArray());
+        var optional = toResponse();
         if (optional.isEmpty()) {
             return Optional.empty();
         }