From 3e6a4a390c80f61d9d2aac59c987e5ee6b53c323 Mon Sep 17 00:00:00 2001 From: inotia00 <108592928+inotia00@users.noreply.github.com> Date: Fri, 3 Jan 2025 22:18:54 +0900 Subject: [PATCH] fix(YouTube - SponsorBlock): Show a toast and not a dialog if segment submitted successfully (Close https://github.com/inotia00/ReVanced_Extended/issues/2598) --- .../youtube/sponsorblock/requests/SBRequester.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/sponsorblock/requests/SBRequester.java b/extensions/shared/src/main/java/app/revanced/extension/youtube/sponsorblock/requests/SBRequester.java index f2e31a014..b0679a902 100644 --- a/extensions/shared/src/main/java/app/revanced/extension/youtube/sponsorblock/requests/SBRequester.java +++ b/extensions/shared/src/main/java/app/revanced/extension/youtube/sponsorblock/requests/SBRequester.java @@ -126,8 +126,12 @@ public class SBRequester { HttpURLConnection connection = getConnectionFromRoute(SBRoutes.SUBMIT_SEGMENTS, privateUserId, videoId, category, start, end, duration); final int responseCode = connection.getResponseCode(); - String userMessage = switch (responseCode) { - case HTTP_STATUS_CODE_SUCCESS -> str("revanced_sb_submit_succeeded"); + if (responseCode == HTTP_STATUS_CODE_SUCCESS) { + Utils.showToastLong(str("revanced_sb_submit_succeeded")); + return; + } + + String userErrorMessage = switch (responseCode) { case 409 -> str("revanced_sb_submit_failed_duplicate"); case 403 -> str("revanced_sb_submit_failed_forbidden", Requester.parseErrorStringAndDisconnect(connection)); @@ -137,9 +141,10 @@ public class SBRequester { default -> str("revanced_sb_submit_failed_unknown_error", responseCode, connection.getResponseMessage()); }; + // Message might be about the users account or an error too large to show in a toast. // Use a dialog instead. - SponsorBlockUtils.showErrorDialog(userMessage); + SponsorBlockUtils.showErrorDialog(userErrorMessage); } catch (SocketTimeoutException ex) { Logger.printDebug(() -> "Timeout", ex); Utils.showToastLong(str("revanced_sb_submit_failed_timeout"));