Merge pull request #3689 from wb9688/next-stream

Remove calls to getNextStream()

app/build.gradle

@@ -163,7 +163,7 @@ dependencies {
         exclude module: 'support-annotations'
     }
 
-    implementation 'com.github.TeamNewPipe:NewPipeExtractor:a70cb0283ffc3bba2709815673a5a7940aab0a3a'
+    implementation 'com.github.wb9688:NewPipeExtractor:fc3a63fec56c110d7f434ef4377b3eeb2b8bbefe'
 
     implementation "com.github.TeamNewPipe:nanojson:1d9e1aea9049fc9f85e68b43ba39fe7be1c1f751"
     implementation "org.jsoup:jsoup:1.13.1"

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

@@ -365,10 +365,6 @@ public class VideoDetailFragment extends BaseStateFragment<StreamInfo>
     public void onSaveInstanceState(final Bundle outState) {
         super.onSaveInstanceState(outState);
 
-        // Check if the next video label and video is visible,
-        // if it is, include the two elements in the next check
-        int nextCount = currentInfo != null && currentInfo.getNextVideo() != null ? 2 : 0;
-
         if (!isLoading.get() && currentInfo != null && isVisible()) {
             outState.putSerializable(INFO_KEY, currentInfo);
         }

app/src/main/java/org/schabi/newpipe/fragments/list/videos/RelatedVideosFragment.java

@@ -9,7 +9,6 @@ import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.CompoundButton;
 import android.widget.Switch;
 
 import androidx.annotation.NonNull;
@@ -40,9 +39,7 @@ public class RelatedVideosFragment extends BaseListInfoFragment<RelatedStreamInf
     //////////////////////////////////////////////////////////////////////////*/
 
     private View headerRootLayout;
-    private Switch aSwitch;
+    private Switch autoplaySwitch;
-
-    private boolean mIsVisibleToUser = false;
 
     public static RelatedVideosFragment getInstance(final StreamInfo info) {
         RelatedVideosFragment instance = new RelatedVideosFragment();
@@ -50,12 +47,6 @@ public class RelatedVideosFragment extends BaseListInfoFragment<RelatedStreamInf
         return instance;
     }
 
-    @Override
-    public void setUserVisibleHint(final boolean isVisibleToUser) {
-        super.setUserVisibleHint(isVisibleToUser);
-        mIsVisibleToUser = isVisibleToUser;
-    }
-
     /*//////////////////////////////////////////////////////////////////////////
     // LifeCycle
     //////////////////////////////////////////////////////////////////////////*/
@@ -81,22 +72,18 @@ public class RelatedVideosFragment extends BaseListInfoFragment<RelatedStreamInf
     }
 
     protected View getListHeader() {
-        if (relatedStreamInfo != null && relatedStreamInfo.getNextStream() != null) {
+        if (relatedStreamInfo != null && relatedStreamInfo.getRelatedItems() != null) {
             headerRootLayout = activity.getLayoutInflater()
                     .inflate(R.layout.related_streams_header, itemsList, false);
-            aSwitch = headerRootLayout.findViewById(R.id.autoplay_switch);
+            autoplaySwitch = headerRootLayout.findViewById(R.id.autoplay_switch);
 
-            SharedPreferences pref = PreferenceManager.getDefaultSharedPreferences(getContext());
+            final SharedPreferences pref = PreferenceManager
-            Boolean autoplay = pref.getBoolean(getString(R.string.auto_queue_key), false);
+                    .getDefaultSharedPreferences(getContext());
-            aSwitch.setChecked(autoplay);
+            final boolean autoplay = pref.getBoolean(getString(R.string.auto_queue_key), false);
-            aSwitch.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+            autoplaySwitch.setChecked(autoplay);
-                @Override
+            autoplaySwitch.setOnCheckedChangeListener((compoundButton, b) ->
-                public void onCheckedChanged(final CompoundButton compoundButton,
-                                             final boolean b) {
                     PreferenceManager.getDefaultSharedPreferences(getContext()).edit()
-                            .putBoolean(getString(R.string.auto_queue_key), b).apply();
+                            .putBoolean(getString(R.string.auto_queue_key), b).apply());
-                }
-            });
             return headerRootLayout;
         } else {
             return null;
@@ -105,7 +92,7 @@ public class RelatedVideosFragment extends BaseListInfoFragment<RelatedStreamInf
 
     @Override
     protected Single<ListExtractor.InfoItemsPage> loadMoreItemsLogic() {
-        return Single.fromCallable(() -> ListExtractor.InfoItemsPage.emptyPage());
+        return Single.fromCallable(ListExtractor.InfoItemsPage::emptyPage);
     }
 
     /*//////////////////////////////////////////////////////////////////////////
@@ -216,8 +203,8 @@ public class RelatedVideosFragment extends BaseListInfoFragment<RelatedStreamInf
                                           final String s) {
         SharedPreferences pref = PreferenceManager.getDefaultSharedPreferences(getContext());
         boolean autoplay = pref.getBoolean(getString(R.string.auto_queue_key), false);
-        if (null != aSwitch) {
+        if (autoplaySwitch != null) {
-            aSwitch.setChecked(autoplay);
+            autoplaySwitch.setChecked(autoplay);
         }
     }
 

app/src/main/java/org/schabi/newpipe/player/helper/PlayerHelper.java

@@ -132,17 +132,17 @@ public final class PlayerHelper {
     }
 
     /**
-     * Given a {@link StreamInfo} and the existing queue items, provide the
+     * Given a {@link StreamInfo} and the existing queue items,
-     * {@link SinglePlayQueue} consisting of the next video for auto queuing.
+     * provide the {@link SinglePlayQueue} consisting of the next video for auto queueing.
      * <p>
-     * This method detects and prevents cycle by naively checking if a
+     * This method detects and prevents cycles by naively checking
-     * candidate next video's url already exists in the existing items.
+     * if a candidate next video's url already exists in the existing items.
      * </p>
      * <p>
-     * To select the next video, {@link StreamInfo#getNextVideo()} is first
+     * The first item in {@link StreamInfo#getRelatedStreams()} is checked first.
-     * checked. If it is nonnull and is not part of the existing items, then
+     * If it is non-null and is not part of the existing items, it will be used as the next stream.
-     * it will be used as the next video. Otherwise, an random item with
+     * Otherwise, a random item with non-repeating url will be selected
-     * non-repeating url will be selected from the {@link StreamInfo#getRelatedStreams()}.
+     * from the {@link StreamInfo#getRelatedStreams()}.
      * </p>
      *
      * @param info          currently playing stream
@@ -152,27 +152,28 @@ public final class PlayerHelper {
     @Nullable
     public static PlayQueue autoQueueOf(@NonNull final StreamInfo info,
                                         @NonNull final List<PlayQueueItem> existingItems) {
-        Set<String> urls = new HashSet<>(existingItems.size());
+        final Set<String> urls = new HashSet<>(existingItems.size());
         for (final PlayQueueItem item : existingItems) {
             urls.add(item.getUrl());
         }
 
-        final StreamInfoItem nextVideo = info.getNextVideo();
-        if (nextVideo != null && !urls.contains(nextVideo.getUrl())) {
-            return getAutoQueuedSinglePlayQueue(nextVideo);
-        }
-
         final List<InfoItem> relatedItems = info.getRelatedStreams();
         if (relatedItems == null) {
             return null;
         }
 
-        List<StreamInfoItem> autoQueueItems = new ArrayList<>();
+        if (relatedItems.get(0) != null && relatedItems.get(0) instanceof StreamInfoItem
-        for (final InfoItem item : info.getRelatedStreams()) {
+                && !urls.contains(relatedItems.get(0).getUrl())) {
+            return getAutoQueuedSinglePlayQueue((StreamInfoItem) relatedItems.get(0));
+        }
+
+        final List<StreamInfoItem> autoQueueItems = new ArrayList<>();
+        for (final InfoItem item : relatedItems) {
             if (item instanceof StreamInfoItem && !urls.contains(item.getUrl())) {
                 autoQueueItems.add((StreamInfoItem) item);
             }
         }
+
         Collections.shuffle(autoQueueItems);
         return autoQueueItems.isEmpty()
                 ? null : getAutoQueuedSinglePlayQueue(autoQueueItems.get(0));

app/src/main/java/org/schabi/newpipe/util/RelatedStreamInfo.java

@@ -4,16 +4,12 @@ import org.schabi.newpipe.extractor.InfoItem;
 import org.schabi.newpipe.extractor.ListInfo;
 import org.schabi.newpipe.extractor.linkhandler.ListLinkHandler;
 import org.schabi.newpipe.extractor.stream.StreamInfo;
-import org.schabi.newpipe.extractor.stream.StreamInfoItem;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
 public class RelatedStreamInfo extends ListInfo<InfoItem> {
-
-    private StreamInfoItem nextStream;
-
     public RelatedStreamInfo(final int serviceId, final ListLinkHandler listUrlIdHandler,
                              final String name) {
         super(serviceId, listUrlIdHandler, name);
@@ -25,20 +21,8 @@ public class RelatedStreamInfo extends ListInfo<InfoItem> {
         RelatedStreamInfo relatedStreamInfo = new RelatedStreamInfo(
                 info.getServiceId(), handler, info.getName());
         List<InfoItem> streams = new ArrayList<>();
-        if (info.getNextVideo() != null) {
-            streams.add(info.getNextVideo());
-        }
         streams.addAll(info.getRelatedStreams());
         relatedStreamInfo.setRelatedItems(streams);
-        relatedStreamInfo.setNextStream(info.getNextVideo());
         return relatedStreamInfo;
     }
-
-    public StreamInfoItem getNextStream() {
-        return nextStream;
-    }
-
-    public void setNextStream(final StreamInfoItem nextStream) {
-        this.nextStream = nextStream;
-    }
 }