From 8cd13409ba9f3827a3800fb15c09eabd91e4dcb9 Mon Sep 17 00:00:00 2001 From: caneleex Date: Tue, 10 Aug 2021 13:55:50 +0200 Subject: [PATCH] fix submitting for other locales --- .../main/java/pl/jakubweg/requests/Requester.java | 15 ++++++++------- app/src/main/java/pl/jakubweg/requests/Route.java | 9 +++------ 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/app/src/main/java/pl/jakubweg/requests/Requester.java b/app/src/main/java/pl/jakubweg/requests/Requester.java index 7531b0a..abec7c0 100644 --- a/app/src/main/java/pl/jakubweg/requests/Requester.java +++ b/app/src/main/java/pl/jakubweg/requests/Requester.java @@ -1,5 +1,9 @@ package pl.jakubweg.requests; +import static pl.jakubweg.SponsorBlockUtils.timeWithoutSegments; +import static pl.jakubweg.SponsorBlockUtils.videoHasSegments; +import static pl.jakubweg.StringRef.str; + import android.content.Context; import android.os.Handler; import android.os.Looper; @@ -18,6 +22,7 @@ import java.net.HttpURLConnection; import java.net.URL; import java.util.ArrayList; import java.util.List; +import java.util.Locale; import pl.jakubweg.SponsorBlockSettings; import pl.jakubweg.SponsorBlockUtils; @@ -25,12 +30,8 @@ import pl.jakubweg.SponsorBlockUtils.VoteOption; import pl.jakubweg.objects.SponsorSegment; import pl.jakubweg.objects.UserStats; -import static pl.jakubweg.SponsorBlockUtils.timeWithoutSegments; -import static pl.jakubweg.SponsorBlockUtils.videoHasSegments; -import static pl.jakubweg.StringRef.str; - public class Requester { - private static final String SPONSORBLOCK_API_URL = "https://sponsor.ajay.app/api/"; + private static final String SPONSORBLOCK_API_URL = "http://10.0.2.2/api/"; private static final String TIME_TEMPLATE = "%.3f"; private Requester() {} @@ -73,8 +74,8 @@ public class Requester { public static void submitSegments(String videoId, String uuid, float startTime, float endTime, String category, Runnable toastRunnable) { try { - String start = String.format(TIME_TEMPLATE, startTime); - String end = String.format(TIME_TEMPLATE, endTime); + String start = String.format(Locale.US, TIME_TEMPLATE, startTime); + String end = String.format(Locale.US, TIME_TEMPLATE, endTime); HttpURLConnection connection = getConnectionFromRoute(Route.SUBMIT_SEGMENTS, videoId, uuid, start, end, category); int responseCode = connection.getResponseCode(); diff --git a/app/src/main/java/pl/jakubweg/requests/Route.java b/app/src/main/java/pl/jakubweg/requests/Route.java index bf326c3..ce86b95 100644 --- a/app/src/main/java/pl/jakubweg/requests/Route.java +++ b/app/src/main/java/pl/jakubweg/requests/Route.java @@ -1,8 +1,9 @@ package pl.jakubweg.requests; -import pl.jakubweg.SponsorBlockUtils; +import static pl.jakubweg.requests.Route.Method.GET; +import static pl.jakubweg.requests.Route.Method.POST; -import static pl.jakubweg.requests.Route.Method.*; +import pl.jakubweg.SponsorBlockUtils; public class Route { public static final Route GET_SEGMENTS = new Route(GET, "skipSegments?videoID={video_id}&categories={categories}"); @@ -53,10 +54,6 @@ public class Route { this.compiledRoute = compiledRoute; } - public Route getBaseRoute() { - return baseRoute; - } - public String getCompiledRoute() { return compiledRoute; }