From e71955d5bbe58c1c634e82262d0e67dc65eca078 Mon Sep 17 00:00:00 2001
From: LisoUseInAIKyrios <118716522+LisoUseInAIKyrios@users.noreply.github.com>
Date: Fri, 26 Jul 2024 10:36:27 -0400
Subject: [PATCH] fix(YouTube - SponsorBlock): Correctly show minute timestamp
 when creating a new segment

---
 .../youtube/sponsorblock/SponsorBlockUtils.java            | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/app/revanced/integrations/youtube/sponsorblock/SponsorBlockUtils.java b/app/src/main/java/app/revanced/integrations/youtube/sponsorblock/SponsorBlockUtils.java
index 9c36d25e..63569c37 100644
--- a/app/src/main/java/app/revanced/integrations/youtube/sponsorblock/SponsorBlockUtils.java
+++ b/app/src/main/java/app/revanced/integrations/youtube/sponsorblock/SponsorBlockUtils.java
@@ -234,9 +234,7 @@ public class SponsorBlockUtils {
             new AlertDialog.Builder(SponsorBlockViewController.getOverLaysViewGroupContext())
                     .setTitle(str("revanced_sb_new_segment_title"))
                     .setMessage(str("revanced_sb_new_segment_mark_time_as_question",
-                            newSponsorSegmentDialogShownMillis / 3600000,
-                            newSponsorSegmentDialogShownMillis / 1000 % 60,
-                            newSponsorSegmentDialogShownMillis % 1000))
+                            formatSegmentTime(newSponsorSegmentDialogShownMillis)))
                     .setNeutralButton(android.R.string.cancel, null)
                     .setNegativeButton(str("revanced_sb_new_segment_mark_start"), newSponsorSegmentDialogListener)
                     .setPositiveButton(str("revanced_sb_new_segment_mark_end"), newSponsorSegmentDialogListener)
@@ -448,17 +446,20 @@ public class SponsorBlockUtils {
             Duration duration = Duration.ofSeconds(totalSecondsSaved);
             final long hours = duration.toHours();
             final long minutes = duration.toMinutes() % 60;
+
             // Format all numbers so non-western numbers use a consistent appearance.
             String minutesFormatted = statsNumberFormatter.format(minutes);
             if (hours > 0) {
                 String hoursFormatted = statsNumberFormatter.format(hours);
                 return str("revanced_sb_stats_saved_hour_format", hoursFormatted, minutesFormatted);
             }
+
             final long seconds = duration.getSeconds() % 60;
             String secondsFormatted = statsNumberFormatter.format(seconds);
             if (minutes > 0) {
                 return str("revanced_sb_stats_saved_minute_format", minutesFormatted, secondsFormatted);
             }
+
             return str("revanced_sb_stats_saved_second_format", secondsFormatted);
         }
         return "error"; // will never be reached.  YouTube requires Android O or greater