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 a39b28a..99ddee6 100644 --- a/app/src/main/java/fi/vanced/utils/requests/Requester.java +++ b/app/src/main/java/fi/vanced/utils/requests/Requester.java @@ -21,12 +21,15 @@ public class Requester { } public static String parseJson(HttpURLConnection connection) throws IOException { + return parseJson(connection.getInputStream()); + } + + public static String parseJson(InputStream inputStream) throws IOException { StringBuilder jsonBuilder = new StringBuilder(); - InputStream inputStream = connection.getInputStream(); BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream)); String line; while ((line = reader.readLine()) != null) { - jsonBuilder.append(line); + jsonBuilder.append(line).append("\n"); } inputStream.close(); return jsonBuilder.toString(); diff --git a/app/src/main/java/pl/jakubweg/requests/SBRequester.java b/app/src/main/java/pl/jakubweg/requests/SBRequester.java index 822295a..d18954f 100644 --- a/app/src/main/java/pl/jakubweg/requests/SBRequester.java +++ b/app/src/main/java/pl/jakubweg/requests/SBRequester.java @@ -84,7 +84,7 @@ public class SBRequester { SponsorBlockUtils.messageToToast = str("submit_failed_duplicate"); break; case 403: - SponsorBlockUtils.messageToToast = str("submit_failed_forbidden"); + SponsorBlockUtils.messageToToast = str("submit_failed_forbidden", Requester.parseJson(connection.getErrorStream())); break; case 429: SponsorBlockUtils.messageToToast = str("submit_failed_rate_limit"); @@ -130,7 +130,7 @@ public class SBRequester { SponsorBlockUtils.messageToToast = str("vote_succeeded"); break; case 403: - SponsorBlockUtils.messageToToast = str("vote_failed_forbidden"); + SponsorBlockUtils.messageToToast = str("vote_failed_forbidden", Requester.parseJson(connection.getErrorStream())); break; default: SponsorBlockUtils.messageToToast = str("vote_failed_unknown_error", responseCode, connection.getResponseMessage()); @@ -189,6 +189,8 @@ public class SBRequester { }).start(); } + // helpers + private static HttpURLConnection getConnectionFromRoute(Route route, String... params) throws IOException { return Requester.getConnectionFromRoute(SPONSORBLOCK_API_URL, route, params); } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index aa8b082..2f2e0fa 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -193,14 +193,14 @@ Unable to submit segments: Status: %d %s Can\'t submit the segment.\nRate Limited (Too many from the same user or IP) - Can\'t submit the segment.\nRejected by auto moderator + Can\'t submit the segment.\n\n%s Can\'t submit the segment.\nAlready exists Segment submitted successfully Submitting segment… Unable to vote for segment: Status: %d %s Can\'t vote for segment.\nRate Limited (Too many from the same user or IP) - Can\'t vote for segment.\nA moderator has decided that this segment is correct + Can\'t vote for segment.\n\n%s Voted successfully Voting for segment… Upvote