From c35dc98e27f0fc61f21531886cbd33f240fdf30d Mon Sep 17 00:00:00 2001
From: polymorphicshade <polymorphicshade@gmail.com>
Date: Sun, 25 Oct 2020 13:01:22 -0600
Subject: [PATCH] SponsorBlock: Fixed (?) rewinding over skippable segments

---
 .../org/schabi/newpipe/player/BasePlayer.java  | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/player/BasePlayer.java b/app/src/main/java/org/schabi/newpipe/player/BasePlayer.java
index 824690b1d..786e0d70d 100644
--- a/app/src/main/java/org/schabi/newpipe/player/BasePlayer.java
+++ b/app/src/main/java/org/schabi/newpipe/player/BasePlayer.java
@@ -745,6 +745,10 @@ public abstract class BasePlayer implements
     }
 
     public void triggerProgressUpdate() {
+        triggerProgressUpdate(false);
+    }
+
+    public void triggerProgressUpdate(final boolean isRewind) {
         if (simpleExoPlayer == null) {
             return;
         }
@@ -761,13 +765,19 @@ public abstract class BasePlayer implements
                 return;
             }
 
-            final int skipTo = (int) Math.ceil((segment.endTime));
+            int skipTarget = isRewind
+                    ? (int) Math.ceil((segment.startTime)) - 1
+                    : (int) Math.ceil((segment.endTime));
+
+            if (skipTarget < 0) {
+                skipTarget = 0;
+            }
 
             // temporarily force EXACT seek parameters to prevent infinite skip looping
             final SeekParameters seekParams = simpleExoPlayer.getSeekParameters();
             simpleExoPlayer.setSeekParameters(SeekParameters.EXACT);
 
-            seekTo(skipTo);
+            seekTo(skipTarget);
 
             simpleExoPlayer.setSeekParameters(seekParams);
 
@@ -807,7 +817,7 @@ public abstract class BasePlayer implements
 
             if (DEBUG) {
                 Log.d("SPONSOR_BLOCK", "Skipped segment: currentProgress = ["
-                        + currentProgress + "], skipped to = [" + skipTo + "]");
+                        + currentProgress + "], skipped to = [" + skipTarget + "]");
             }
         }
     }
@@ -1357,7 +1367,7 @@ public abstract class BasePlayer implements
             Log.d(TAG, "onFastRewind() called");
         }
         seekBy(-getSeekDuration());
-        triggerProgressUpdate();
+        triggerProgressUpdate(true);
     }
 
     public void onFastForward() {