From c43a69415925775511673a43bee857e93e8ecf0c Mon Sep 17 00:00:00 2001
From: caneleex <git@mlnr.dev>
Date: Wed, 26 Jan 2022 14:43:52 +0100
Subject: [PATCH] fix RYD voting

---
 .../java/fi/vanced/utils/requests/Requester.java     | 12 +++++++++---
 .../main/java/pl/jakubweg/requests/SBRequester.java  |  4 ++--
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/fi/vanced/utils/requests/Requester.java b/app/src/main/java/fi/vanced/utils/requests/Requester.java
index 99ddee6..b881d5c 100644
--- a/app/src/main/java/fi/vanced/utils/requests/Requester.java
+++ b/app/src/main/java/fi/vanced/utils/requests/Requester.java
@@ -21,20 +21,26 @@ public class Requester {
     }
 
     public static String parseJson(HttpURLConnection connection) throws IOException {
-        return parseJson(connection.getInputStream());
+        return parseJson(connection.getInputStream(), false);
     }
 
-    public static String parseJson(InputStream inputStream) throws IOException {
+    public static String parseJson(InputStream inputStream, boolean isError) throws IOException {
         StringBuilder jsonBuilder = new StringBuilder();
         BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream));
         String line;
         while ((line = reader.readLine()) != null) {
-            jsonBuilder.append(line).append("\n");
+            jsonBuilder.append(line);
+            if (isError)
+                jsonBuilder.append("\n");
         }
         inputStream.close();
         return jsonBuilder.toString();
     }
 
+    public static String parseErrorJson(HttpURLConnection connection) throws IOException {
+        return parseJson(connection.getErrorStream(), true);
+    }
+
     public static JSONObject getJSONObject(HttpURLConnection connection) throws Exception {
         return new JSONObject(parseJsonAndDisconnect(connection));
     }
diff --git a/app/src/main/java/pl/jakubweg/requests/SBRequester.java b/app/src/main/java/pl/jakubweg/requests/SBRequester.java
index 0356c51..9de71b7 100644
--- a/app/src/main/java/pl/jakubweg/requests/SBRequester.java
+++ b/app/src/main/java/pl/jakubweg/requests/SBRequester.java
@@ -91,7 +91,7 @@ public class SBRequester {
                     SponsorBlockUtils.messageToToast = str("submit_failed_duplicate");
                     break;
                 case 403:
-                    SponsorBlockUtils.messageToToast = str("submit_failed_forbidden", Requester.parseJson(connection.getErrorStream()));
+                    SponsorBlockUtils.messageToToast = str("submit_failed_forbidden", Requester.parseErrorJson(connection));
                     break;
                 case 429:
                     SponsorBlockUtils.messageToToast = str("submit_failed_rate_limit");
@@ -137,7 +137,7 @@ public class SBRequester {
                         SponsorBlockUtils.messageToToast = str("vote_succeeded");
                         break;
                     case 403:
-                        SponsorBlockUtils.messageToToast = str("vote_failed_forbidden", Requester.parseJson(connection.getErrorStream()));
+                        SponsorBlockUtils.messageToToast = str("vote_failed_forbidden", Requester.parseErrorJson(connection));
                         break;
                     default:
                         SponsorBlockUtils.messageToToast = str("vote_failed_unknown_error", responseCode, connection.getResponseMessage());