From c7d9ccd13cbc89cc76f755daf4f90efd046dd961 Mon Sep 17 00:00:00 2001 From: LisoUseInAIKyrios <118716522+LisoUseInAIKyrios@users.noreply.github.com> Date: Sun, 3 Nov 2024 14:59:03 -0400 Subject: [PATCH] chore: Remove obsolete error toast custom message. All patches that can encounter network errors now manage their own error toasts. --- .../app/revanced/extension/shared/Logger.java | 18 +++--------------- .../requests/ReturnYouTubeDislikeApi.java | 2 +- 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/extensions/shared/src/main/java/app/revanced/extension/shared/Logger.java b/extensions/shared/src/main/java/app/revanced/extension/shared/Logger.java index 3ac7438b9..9df38ac99 100644 --- a/extensions/shared/src/main/java/app/revanced/extension/shared/Logger.java +++ b/extensions/shared/src/main/java/app/revanced/extension/shared/Logger.java @@ -110,14 +110,7 @@ public class Logger { * Logs exceptions under the outer class name of the code calling this method. */ public static void printException(@NonNull LogMessage message) { - printException(message, null, null); - } - - /** - * Logs exceptions under the outer class name of the code calling this method. - */ - public static void printException(@NonNull LogMessage message, @Nullable Throwable ex) { - printException(message, ex, null); + printException(message, null); } /** @@ -128,10 +121,8 @@ public class Logger { * * @param message log message * @param ex exception (optional) - * @param userToastMessage user specific toast message to show instead of the log message (optional) */ - public static void printException(@NonNull LogMessage message, @Nullable Throwable ex, - @Nullable String userToastMessage) { + public static void printException(@NonNull LogMessage message, @Nullable Throwable ex) { String messageString = message.buildMessageString(); String outerClassSimpleName = message.findOuterClassSimpleName(); String logMessage = REVANCED_LOG_PREFIX + outerClassSimpleName; @@ -141,10 +132,7 @@ public class Logger { Log.e(logMessage, messageString, ex); } if (DEBUG_TOAST_ON_ERROR.get()) { - String toastMessageToDisplay = (userToastMessage != null) - ? userToastMessage - : outerClassSimpleName + ": " + messageString; - Utils.showToastLong(toastMessageToDisplay); + Utils.showToastLong(outerClassSimpleName + ": " + messageString); } } diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/returnyoutubedislike/requests/ReturnYouTubeDislikeApi.java b/extensions/shared/src/main/java/app/revanced/extension/youtube/returnyoutubedislike/requests/ReturnYouTubeDislikeApi.java index 07c8f3c55..a933f0828 100644 --- a/extensions/shared/src/main/java/app/revanced/extension/youtube/returnyoutubedislike/requests/ReturnYouTubeDislikeApi.java +++ b/extensions/shared/src/main/java/app/revanced/extension/youtube/returnyoutubedislike/requests/ReturnYouTubeDislikeApi.java @@ -302,7 +302,7 @@ public class ReturnYouTubeDislikeApi { handleConnectionError((str("revanced_ryd_failure_generic", ex.getMessage())), ex, true); } catch (Exception ex) { // should never happen - Logger.printException(() -> "Failed to fetch votes", ex, str("revanced_ryd_failure_generic", ex.getMessage())); + Logger.printException(() -> "fetchVotes failure", ex); } updateRateLimitAndStats(timeNetworkCallStarted, true, false);