Merge pull request #9706 from Jared234/9131_bug_background_player

Fixed a bug that caused the background player to stop working

Author: Stypox

app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java

@@ -865,7 +865,8 @@ private void runWorker(final boolean forceLoad, final boolean addToBackStack) {
                             if (playQueue == null) {
                                 playQueue = new SinglePlayQueue(result);
                             }
-                            if (stack.isEmpty() || !stack.peek().getPlayQueue().equals(playQueue)) {
+                            if (stack.isEmpty() || !stack.peek().getPlayQueue()
+                                    .equalStreams(playQueue)) {
                                 stack.push(new StackItem(serviceId, url, title, playQueue));
                             }
                         }
@@ -1779,7 +1780,7 @@ public void onQueueUpdate(final PlayQueue queue) {
         // deleted/added items inside Channel/Playlist queue and makes possible to have
         // a history of played items
         @Nullable final StackItem stackPeek = stack.peek();
-        if (stackPeek != null && !stackPeek.getPlayQueue().equals(queue)) {
+        if (stackPeek != null && !stackPeek.getPlayQueue().equalStreams(queue)) {
             @Nullable final PlayQueueItem playQueueItem = queue.getItem();
             if (playQueueItem != null) {
                 stack.push(new StackItem(playQueueItem.getServiceId(), playQueueItem.getUrl(),
@@ -1845,7 +1846,7 @@ public void onMetadataUpdate(final StreamInfo info, final PlayQueue queue) {
         // They are not equal when user watches something in popup while browsing in fragment and
         // then changes screen orientation. In that case the fragment will set itself as
         // a service listener and will receive initial call to onMetadataUpdate()
-        if (!queue.equals(playQueue)) {
+        if (!queue.equalStreams(playQueue)) {
             return;
         }
 
@@ -2102,7 +2103,7 @@ private StackItem findQueueInStack(final PlayQueue queue) {
         final Iterator<StackItem> iterator = stack.descendingIterator();
         while (iterator.hasNext()) {
             final StackItem next = iterator.next();
-            if (next.getPlayQueue().equals(queue)) {
+            if (next.getPlayQueue().equalStreams(queue)) {
                 item = next;
                 break;
             }
@@ -2117,7 +2118,7 @@ private void replaceQueueIfUserConfirms(final Runnable onAllow) {
         if (isClearingQueueConfirmationRequired(activity)
                 && playerIsNotStopped()
                 && activeQueue != null
-                && !activeQueue.equals(playQueue)) {
+                && !activeQueue.equalStreams(playQueue)) {
             showClearingQueueConfirmation(onAllow);
         } else {
             onAllow.run();

app/src/main/java/org/schabi/newpipe/player/Player.java

@@ -348,7 +348,7 @@ public void handleIntent(@NonNull final Intent intent) {
         final boolean playbackSkipSilence = getPrefs().getBoolean(getContext().getString(
                 R.string.playback_skip_silence_key), getPlaybackSkipSilence());
 
-        final boolean samePlayQueue = playQueue != null && playQueue.equals(newQueue);
+        final boolean samePlayQueue = playQueue != null && playQueue.equalStreamsAndIndex(newQueue);
         final int repeatMode = intent.getIntExtra(REPEAT_MODE, getRepeatMode());
         final boolean playWhenReady = intent.getBooleanExtra(PLAY_WHEN_READY, true);
         final boolean isMuted = intent.getBooleanExtra(IS_MUTED, isMuted());

app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueue.java

@@ -518,12 +518,10 @@ public synchronized boolean previous() {
      * This method also gives a chance to track history of items in a queue in
      * VideoDetailFragment without duplicating items from two identical queues
      */
-    @Override
-    public boolean equals(@Nullable final Object obj) {
-        if (!(obj instanceof PlayQueue)) {
+    public boolean equalStreams(@Nullable final PlayQueue other) {
+        if (other == null) {
             return false;
         }
-        final PlayQueue other = (PlayQueue) obj;
         if (size() != other.size()) {
             return false;
         }
@@ -539,9 +537,11 @@ public boolean equals(@Nullable final Object obj) {
         return true;
     }
 
-    @Override
-    public int hashCode() {
-        return streams.hashCode();
+    public boolean equalStreamsAndIndex(@Nullable final PlayQueue other) {
+        if (equalStreams(other)) {
+            return other.getIndex() == getIndex();
+        }
+        return false;
     }
 
     public boolean isDisposed() {

app/src/test/java/org/schabi/newpipe/player/playqueue/PlayQueueTest.java

@@ -13,7 +13,6 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
@@ -169,15 +168,17 @@ public void sameStreams() {
             final List<PlayQueueItem> streams = Collections.nCopies(5, item1);
             final PlayQueue queue1 = makePlayQueue(0, streams);
             final PlayQueue queue2 = makePlayQueue(0, streams);
-            assertEquals(queue1, queue2);
+            assertTrue(queue1.equalStreams(queue2));
+            assertTrue(queue1.equalStreamsAndIndex(queue2));
         }
 
         @Test
         public void sameStreamsDifferentIndex() {
             final List<PlayQueueItem> streams = Collections.nCopies(5, item1);
             final PlayQueue queue1 = makePlayQueue(1, streams);
             final PlayQueue queue2 = makePlayQueue(4, streams);
-            assertEquals(queue1, queue2);
+            assertTrue(queue1.equalStreams(queue2));
+            assertFalse(queue1.equalStreamsAndIndex(queue2));
         }
 
         @Test
@@ -186,7 +187,7 @@ public void sameSizeDifferentItems() {
             final List<PlayQueueItem> streams2 = Collections.nCopies(5, item2);
             final PlayQueue queue1 = makePlayQueue(0, streams1);
             final PlayQueue queue2 = makePlayQueue(0, streams2);
-            assertNotEquals(queue1, queue2);
+            assertFalse(queue1.equalStreams(queue2));
         }
 
         @Test
@@ -195,7 +196,7 @@ public void differentSizeStreams() {
             final List<PlayQueueItem> streams2 = Collections.nCopies(6, item2);
             final PlayQueue queue1 = makePlayQueue(0, streams1);
             final PlayQueue queue2 = makePlayQueue(0, streams2);
-            assertNotEquals(queue1, queue2);
+            assertFalse(queue1.equalStreams(queue2));
         }
     }
 }