Merge pull request #3704 from Stypox/keep-failed-streams

Do not remove items generating errors form queue
TeamNewPipe · Jun 15, 2020 · 5cfd8bb · 5cfd8bb
2 parents e6fe6fd + b3db8c9
commit 5cfd8bb
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 35 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
@@ -64,7 +64,6 @@
 import org.schabi.newpipe.player.helper.MediaSessionManager;
 import org.schabi.newpipe.player.helper.PlayerDataSource;
 import org.schabi.newpipe.player.helper.PlayerHelper;
-import org.schabi.newpipe.player.mediasource.FailedMediaSource;
 import org.schabi.newpipe.player.playback.BasePlayerMediaSession;
 import org.schabi.newpipe.player.playback.CustomTrackSelector;
 import org.schabi.newpipe.player.playback.MediaSourceManager;
@@ -77,7 +76,6 @@
 import org.schabi.newpipe.util.SerializedCache;
 
 import java.io.IOException;
-import java.net.UnknownHostException;
 
 import io.reactivex.Observable;
 import io.reactivex.disposables.CompositeDisposable;
@@ -835,16 +833,8 @@ private void processSourceError(final IOException error) {
         final Throwable cause = error.getCause();
         if (error instanceof BehindLiveWindowException) {
             reload();
-        } else if (cause instanceof UnknownHostException) {
-            playQueue.error(/*isNetworkProblem=*/true);
-        } else if (isCurrentWindowValid()) {
-            playQueue.error(/*isTransitioningToBadStream=*/true);
-        } else if (cause instanceof FailedMediaSource.MediaSourceResolutionException) {
-            playQueue.error(/*recoverableWithNoAvailableStream=*/false);
-        } else if (cause instanceof FailedMediaSource.StreamInfoLoadException) {
-            playQueue.error(/*recoverableIfLoadFailsWhenNetworkIsFine=*/false);
         } else {
-            playQueue.error(/*noIdeaWhatHappenedAndLetUserChooseWhatToDo=*/true);
+            playQueue.error();
         }
     }
 

diff --git a/app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueue.java b/app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueue.java
@@ -305,25 +305,16 @@ public synchronized void remove(final int index) {
     }
 
     /**
-     * Report an exception for the item at the current index in order and the course of action:
-     * if the error can be skipped or the current item should be removed.
+     * Report an exception for the item at the current index in order and skip to the next one
      * <p>
      * This is done as a separate event as the underlying manager may have
      * different implementation regarding exceptions.
      * </p>
-     *
-     * @param skippable whether the error could be skipped
      */
-    public synchronized void error(final boolean skippable) {
-        final int index = getIndex();
-
-        if (skippable) {
-            queueIndex.incrementAndGet();
-        } else {
-            removeInternal(index);
-        }
-
-        broadcast(new ErrorEvent(index, getIndex(), skippable));
+    public synchronized void error() {
+        final int oldIndex = getIndex();
+        queueIndex.incrementAndGet();
+        broadcast(new ErrorEvent(oldIndex, getIndex()));
     }
 
     private synchronized void removeInternal(final int removeIndex) {

diff --git a/app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueueAdapter.java b/app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueueAdapter.java
@@ -115,9 +115,6 @@ private void onPlayQueueChanged(final PlayQueueEvent message) {
                 break;
             case ERROR:
                 final ErrorEvent errorEvent = (ErrorEvent) message;
-                if (!errorEvent.isSkippable()) {
-                    notifyItemRemoved(errorEvent.getErrorIndex());
-                }
                 notifyItemChanged(errorEvent.getErrorIndex());
                 notifyItemChanged(errorEvent.getQueueIndex());
                 break;

diff --git a/app/src/main/java/org/schabi/newpipe/player/playqueue/events/ErrorEvent.java b/app/src/main/java/org/schabi/newpipe/player/playqueue/events/ErrorEvent.java
@@ -3,12 +3,10 @@
 public class ErrorEvent implements PlayQueueEvent {
     private final int errorIndex;
     private final int queueIndex;
-    private final boolean skippable;
 
-    public ErrorEvent(final int errorIndex, final int queueIndex, final boolean skippable) {
+    public ErrorEvent(final int errorIndex, final int queueIndex) {
         this.errorIndex = errorIndex;
         this.queueIndex = queueIndex;
-        this.skippable = skippable;
     }
 
     @Override
@@ -23,8 +21,4 @@ public int getErrorIndex() {
     public int getQueueIndex() {
         return queueIndex;
     }
-
-    public boolean isSkippable() {
-        return skippable;
-    }
 }