Remove misleading first "Non" from getNonUrlAndNonTorrentStreams

Author: Stypox

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

@@ -123,7 +123,7 @@
 import static org.schabi.newpipe.player.helper.PlayerHelper.isClearingQueueConfirmationRequired;
 import static org.schabi.newpipe.player.playqueue.PlayQueueItem.RECOVERY_UNSET;
 import static org.schabi.newpipe.util.ExtractorHelper.showMetaInfoInTextView;
-import static org.schabi.newpipe.util.ListHelper.getNonUrlAndNonTorrentStreams;
+import static org.schabi.newpipe.util.ListHelper.getUrlAndNonTorrentStreams;
 
 public final class VideoDetailFragment
         extends BaseStateFragment<StreamInfo>
@@ -1107,7 +1107,7 @@ private void openBackgroundPlayer(final boolean append) {
         if (!useExternalAudioPlayer) {
             openNormalBackgroundPlayer(append);
         } else {
-            final List<AudioStream> audioStreams = getNonUrlAndNonTorrentStreams(
+            final List<AudioStream> audioStreams = getUrlAndNonTorrentStreams(
                     currentInfo.getAudioStreams());
             final int index = ListHelper.getDefaultAudioFormat(activity, audioStreams);
 
@@ -2157,8 +2157,8 @@ private void showExternalPlaybackDialog() {
         final List<VideoStream> videoStreamsForExternalPlayers =
                 ListHelper.getSortedStreamVideosList(
                         activity,
-                        getNonUrlAndNonTorrentStreams(currentInfo.getVideoStreams()),
-                        getNonUrlAndNonTorrentStreams(currentInfo.getVideoOnlyStreams()),
+                        getUrlAndNonTorrentStreams(currentInfo.getVideoStreams()),
+                        getUrlAndNonTorrentStreams(currentInfo.getVideoOnlyStreams()),
                         false,
                         false
                 );

app/src/main/java/org/schabi/newpipe/player/resolver/VideoPlaybackResolver.java

@@ -28,7 +28,7 @@
 import java.util.Optional;
 
 import static com.google.android.exoplayer2.C.TIME_UNSET;
-import static org.schabi.newpipe.util.ListHelper.getNonUrlAndNonTorrentStreams;
+import static org.schabi.newpipe.util.ListHelper.getUrlAndNonTorrentStreams;
 import static org.schabi.newpipe.util.ListHelper.getNonTorrentStreams;
 
 public class VideoPlaybackResolver implements PlaybackResolver {
@@ -131,7 +131,7 @@ public MediaSource resolve(@NonNull final StreamInfo info) {
         final List<SubtitlesStream> subtitlesStreams = info.getSubtitles();
         if (subtitlesStreams != null) {
             // Torrent and non URL subtitles are not supported by ExoPlayer
-            final List<SubtitlesStream> nonTorrentAndUrlStreams = getNonUrlAndNonTorrentStreams(
+            final List<SubtitlesStream> nonTorrentAndUrlStreams = getUrlAndNonTorrentStreams(
                     subtitlesStreams);
             for (final SubtitlesStream subtitle : nonTorrentAndUrlStreams) {
                 final MediaFormat mediaFormat = subtitle.getFormat();

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

@@ -137,7 +137,7 @@ public static <S extends Stream> List<S> getStreamsOfSpecifiedDelivery(
      * @return a stream list which only contains URL streams and non-torrent streams
      */
     @NonNull
-    public static <S extends Stream> List<S> getNonUrlAndNonTorrentStreams(
+    public static <S extends Stream> List<S> getUrlAndNonTorrentStreams(
             final List<S> streamList) {
         return getFilteredStreamList(streamList,
                 stream -> stream.isUrl() && stream.getDeliveryMethod() != DeliveryMethod.TORRENT);

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

@@ -63,7 +63,7 @@
 
 import java.util.List;
 
-import static org.schabi.newpipe.util.ListHelper.getNonUrlAndNonTorrentStreams;
+import static org.schabi.newpipe.util.ListHelper.getUrlAndNonTorrentStreams;
 
 public final class NavigationHelper {
     public static final String MAIN_FRAGMENT_TAG = "main_fragment_tag";
@@ -227,7 +227,7 @@ public static void playOnExternalAudioPlayer(@NonNull final Context context,
         }
 
         final List<AudioStream> audioStreamsForExternalPlayers =
-                getNonUrlAndNonTorrentStreams(audioStreams);
+                getUrlAndNonTorrentStreams(audioStreams);
         if (audioStreamsForExternalPlayers.isEmpty()) {
             Toast.makeText(context, R.string.no_audio_streams_available_for_external_players,
                     Toast.LENGTH_SHORT).show();
@@ -250,7 +250,7 @@ public static void playOnExternalVideoPlayer(final Context context,
 
         final List<VideoStream> videoStreamsForExternalPlayers =
                 ListHelper.getSortedStreamVideosList(context,
-                        getNonUrlAndNonTorrentStreams(videoStreams), null, false, false);
+                        getUrlAndNonTorrentStreams(videoStreams), null, false, false);
         if (videoStreamsForExternalPlayers.isEmpty()) {
             Toast.makeText(context, R.string.no_video_streams_available_for_external_players,
                     Toast.LENGTH_SHORT).show();