Merge pull request #12347 from Isira-Seneviratne/PlayQueueItem-equals

Add PlayQueueItem equals and hashCode

Author: Isira-Seneviratne

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

@@ -852,8 +852,7 @@ private void runWorker(final boolean forceLoad, final boolean addToBackStack) {
                             if (playQueue == null) {
                                 playQueue = new SinglePlayQueue(result);
                             }
-                            if (stack.isEmpty() || !stack.peek().getPlayQueue()
-                                    .equalStreams(playQueue)) {
+                            if (stack.isEmpty() || !stack.peek().getPlayQueue().equals(playQueue)) {
                                 stack.push(new StackItem(serviceId, url, title, playQueue));
                             }
                         }
@@ -1739,7 +1738,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().equalStreams(queue)) {
+        if (stackPeek != null && !stackPeek.getPlayQueue().equals(queue)) {
             @Nullable final PlayQueueItem playQueueItem = queue.getItem();
             if (playQueueItem != null) {
                 stack.push(new StackItem(playQueueItem.getServiceId(), playQueueItem.getUrl(),
@@ -1803,7 +1802,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.equalStreams(playQueue)) {
+        if (!queue.equals(playQueue)) {
             return;
         }
 
@@ -2075,7 +2074,7 @@ private StackItem findQueueInStack(final PlayQueue queue) {
         final Iterator<StackItem> iterator = stack.descendingIterator();
         while (iterator.hasNext()) {
             final StackItem next = iterator.next();
-            if (next.getPlayQueue().equalStreams(queue)) {
+            if (next.getPlayQueue().equals(queue)) {
                 item = next;
                 break;
             }
@@ -2089,8 +2088,7 @@ private void replaceQueueIfUserConfirms(final Runnable onAllow) {
         // Player will have STATE_IDLE when a user pressed back button
         if (isClearingQueueConfirmationRequired(activity)
                 && playerIsNotStopped()
-                && activeQueue != null
-                && !activeQueue.equalStreams(playQueue)) {
+                && !Objects.equals(activeQueue, playQueue)) {
             showClearingQueueConfirmation(onAllow);
         } else {
             onAllow.run();

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

@@ -397,7 +397,7 @@ public void handleIntent(@NonNull final Intent intent) {
                 && newQueue.size() == 1 && newQueue.getItem() != null
                 && playQueue != null && playQueue.size() == 1 && playQueue.getItem() != null
                 && newQueue.getItem().getUrl().equals(playQueue.getItem().getUrl())
-                && newQueue.getItem().getRecoveryPosition() != PlayQueueItem.RECOVERY_UNSET) {
+                && newQueue.getItem().getRecoveryPosition() != Long.MIN_VALUE) {
             // Player can have state = IDLE when playback is stopped or failed
             // and we should retry in this case
             if (simpleExoPlayer.getPlaybackState()
@@ -425,7 +425,7 @@ public void handleIntent(@NonNull final Intent intent) {
                 && !samePlayQueue
                 && !newQueue.isEmpty()
                 && newQueue.getItem() != null
-                && newQueue.getItem().getRecoveryPosition() == PlayQueueItem.RECOVERY_UNSET) {
+                && newQueue.getItem().getRecoveryPosition() == Long.MIN_VALUE) {
             databaseUpdateDisposable.add(recordManager.loadStreamState(newQueue.getItem())
                     .observeOn(AndroidSchedulers.mainThread())
                     // Do not place initPlayback() in doFinally() because
@@ -1588,7 +1588,7 @@ public void onPlaybackSynchronize(@NonNull final PlayQueueItem item, final boole
             }
 
             // sync the player index with the queue index, and seek to the correct position
-            if (item.getRecoveryPosition() != PlayQueueItem.RECOVERY_UNSET) {
+            if (item.getRecoveryPosition() != Long.MIN_VALUE) {
                 simpleExoPlayer.seekTo(playQueueIndex, item.getRecoveryPosition());
                 playQueue.unsetRecovery(playQueueIndex);
             } else {

app/src/main/java/org/schabi/newpipe/player/playback/MediaSourceManager.java

@@ -38,9 +38,9 @@
 import io.reactivex.rxjava3.schedulers.Schedulers;
 import io.reactivex.rxjava3.subjects.PublishSubject;
 
+import static org.schabi.newpipe.BuildConfig.DEBUG;
 import static org.schabi.newpipe.player.mediasource.FailedMediaSource.MediaSourceResolutionException;
 import static org.schabi.newpipe.player.mediasource.FailedMediaSource.StreamInfoLoadException;
-import static org.schabi.newpipe.player.playqueue.PlayQueue.DEBUG;
 import static org.schabi.newpipe.util.ServiceHelper.getCacheExpirationMillis;
 
 public class MediaSourceManager {