Merge pull request #2022 from TeamNewPipe/dev

release_v0.15.0

.github/CONTRIBUTING.md

@@ -5,44 +5,64 @@ PLEASE READ THESE GUIDELINES CAREFULLY BEFORE ANY CONTRIBUTION!
 
 ## Crash reporting
 
-Do not report crashes in the GitHub issue tracker. NewPipe has an automated crash report system that will ask you to send a report via e-mail when a crash occurs. This contains all the data we need for debugging, and allows you to even add a comment to it. You'll see exactly what is sent, the system is 100% transparent.
+Do not report crashes in the GitHub issue tracker. NewPipe has an automated crash report system that will ask you to
+send a report via e-mail when a crash occurs. This contains all the data we need for debugging, and allows you to even
+add a comment to it. You'll see exactly what is sent, the system is 100% transparent.
 
 ## Issue reporting/feature requests
 
-* Search the [existing issues](https://github.com/TeamNewPipe/NewPipe/issues) first to make sure your issue/feature hasn't been reported/requested before
+* Search the [existing issues](https://github.com/TeamNewPipe/NewPipe/issues) first to make sure your issue/feature
+hasn't been reported/requested before
 * Check whether your issue/feature is already fixed/implemented
 * Check if the issue still exists in the latest release/beta version
 * If you are an Android/Java developer, you are always welcome to fix/implement an issue/a feature yourself. PRs welcome!
 * We use English for development. Issues in other languages will be closed and ignored.
 * Please only add *one* issue at a time. Do not put multiple issues into one thread.
 * When reporting a bug please give us a context, and a description how to reproduce it.
-* Issues that only contain a generated bug report, but no describtion might be closed.
+* Issues that only contain a generated bug report, but no description might be closed.
 
 ## Bug Fixing
-* If you want to help NewPipe to become free of bugs (this is our utopic goal for NewPipe), you can send us an email to tnp@newpipe.schabi.org to let me know that you intend to help. We'll send you further instructions. You may, on request, register at our [Sentry](https://sentry.schabi.org) instance (see section "Crash reporting" for more information.
+* If you want to help NewPipe to become free of bugs (this is our utopic goal for NewPipe), you can send us an email to
+tnp@newpipe.schabi.org to let me know that you intend to help. We'll send you further instructions. You may, on request,
+register at our [Sentry](https://sentry.schabi.org) instance (see section "Crash reporting" for more information.
 
 ## Translation
 
-* NewPipe can be translated via [Weblate](https://hosted.weblate.org/projects/newpipe/strings/). You can log in there with your GitHub account.
+* NewPipe can be translated via [Weblate](https://hosted.weblate.org/projects/newpipe/strings/). You can log in there
+with your GitHub account.
 
 ## Code contribution
 
 * Stick to NewPipe's style conventions (well, just look the other code and then do it the same way :))
-* Do not bring non-free software (e.g., binary blobs) into the project. Also, make sure you do not introduce Google libraries.
+* Do not bring non-free software (e.g., binary blobs) into the project. Also, make sure you do not introduce Google
+  libraries.
 * Stick to [F-Droid contribution guidelines](https://f-droid.org/wiki/page/Inclusion_Policy)
-* Make changes on a separate branch, not on the master branch. This is commonly known as *feature branch workflow*. You may then send your changes as a pull request on GitHub. Patches to the email address mentioned in this document might not be considered, GitHub is the primary platform. (This only affects you if you are a member of TeamNewPipe)
-* When submitting changes, you confirm that your code is licensed under the terms of the [GNU General Public License v3](https://www.gnu.org/licenses/gpl-3.0.html).
-* Please test (compile and run) your code before you submit changes! Ideally, provide test feedback in the PR description. Untested code will **not** be merged!
+* Make changes on a separate branch, not on the master branch. This is commonly known as *feature branch workflow*. You
+  may then send your changes as a pull request on GitHub. Patches to the email address mentioned in this document might
+  not be considered, GitHub is the primary platform. (This only affects you if you are a member of TeamNewPipe)
+* When submitting changes, you confirm that your code is licensed under the terms of the
+  [GNU General Public License v3](https://www.gnu.org/licenses/gpl-3.0.html).
+* Please test (compile and run) your code before you submit changes! Ideally, provide test feedback in the PR
+  description. Untested code will **not** be merged!
 * Try to figure out yourself why builds on our CI fail.
-* Make sure your PR is up-to-date with the rest of the code. Often, a simple click on "Update branch" will do the job, but if not, you are asked to merge the master branch manually and resolve the problems on your own. That will make the maintainers' jobs way easier.
-* Please show intention to maintain your features and code after you contributed it. Unmaintained code is a hassle for the core developers, and just adds work. If you do not intend to maintain features you contributed, please think again about submission, or clearly state that in the description of your PR.
+* Make sure your PR is up-to-date with the rest of the code. Often, a simple click on "Update branch" will do the job,
+  but if not, you are asked to merge the master branch manually and resolve the problems on your own. That will make the
+  maintainers' jobs way easier.
+* Please show intention to maintain your features and code after you contributed it. Unmaintained code is a hassle for
+  the core developers, and just adds work. If you do not intend to maintain features you contributed, please think again
+  about submission, or clearly state that in the description of your PR.
 * Respond yourselves if someone requests changes or otherwise raises issues about your PRs.
 * Check if your contributions align with the [fdroid inclusion guidelines](https://f-droid.org/en/docs/Inclusion_Policy/).
 * Check if your submission can be build with the current fdroid build server setup.
+* Send PR that only cover one specific issue/solution/bug. Do not send PRs that are huge and consists of multiple
+  independent solutions.
 
 ## Communication
 
 * WE DO NOW HAVE A MAILING LIST: [newpipe@list.schabi.org](https://list.schabi.org/cgi-bin/mailman/listinfo/newpipe).
-* There is an IRC channel on Freenode which is regularly visited by the core team and other developers: [#newpipe](irc:irc.freenode.net/newpipe). [Click here for Webchat](https://webchat.freenode.net/?channels=newpipe)!
-* If you want to get in touch with the core team or one of our other contributors you can send an email to tnp(at)schabi.org. Please do not send issue reports, they will be ignored and remain unanswered! Use the GitHub issue tracker described above!
+* There is an IRC channel on Freenode which is regularly visited by the core team and other developers:
+  [#newpipe](irc:irc.freenode.net/newpipe). [Click here for Webchat](https://webchat.freenode.net/?channels=newpipe)!
+* If you want to get in touch with the core team or one of our other contributors you can send an email to
+  tnp(at)schabi.org. Please do not send issue reports, they will be ignored and remain unanswered! Use the GitHub issue
+  tracker described above!
 * Feel free to post suggestions, changes, ideas etc. on GitHub, IRC or the mailing list!

README.md

@@ -20,15 +20,15 @@
 
 ## Screenshots
 
-[<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/shot_1.png" width=160>](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_1.png)
-[<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/shot_2.png" width=160>](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_2.png)
-[<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/shot_3.png" width=160>](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_3.png)
-[<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/shot_4.png" width=160>](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_4.png)
-[<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/shot_5.png" width=160>](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_5.png)
-[<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/shot_6.png" width=160>](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_6.png)
-[<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/shot_7.png" width=160>](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_7.png)
-[<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/shot_8.png" width=160>](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_8.png)
-[<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/shot_9.png" width=160>](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_9.png)
+[<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/shot_01.png" width=160>](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_01.png)
+[<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/shot_02.png" width=160>](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_02.png)
+[<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/shot_03.png" width=160>](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_03.png)
+[<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/shot_04.png" width=160>](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_04.png)
+[<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/shot_05.png" width=160>](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_05.png)
+[<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/shot_06.png" width=160>](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_06.png)
+[<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/shot_07.png" width=160>](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_07.png)
+[<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/shot_08.png" width=160>](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_08.png)
+[<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/shot_09.png" width=160>](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_09.png)
 [<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/shot_10.png" width=160>](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_10.png)
 [<img src="fastlane/metadata/android/en-US/images/tenInchScreenshots/shot_11.png" width=405>](fastlane/metadata/android/en-US/images/tenInchScreenshots/shot_11.png)
 [<img src="fastlane/metadata/android/en-US/images/tenInchScreenshots/shot_12.png" width=405>](fastlane/metadata/android/en-US/images/tenInchScreenshots/shot_12.png)

app/build.gradle

@@ -6,10 +6,10 @@ android {
 
     defaultConfig {
         applicationId "org.schabi.newpipe"
-        minSdkVersion 15
+        minSdkVersion 19
         targetSdkVersion 28
-        versionCode 69
-        versionName "0.14.2"
+        versionCode 70
+        versionName "0.15.0"
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
@@ -54,7 +54,7 @@ dependencies {
         exclude module: 'support-annotations'
     })
 
-    implementation 'com.github.TeamNewPipe:NewPipeExtractor:32d316330c26'
+    implementation 'com.github.TeamNewPipe:NewPipeExtractor:99915e4527c0'
 
     testImplementation 'junit:junit:4.12'
     testImplementation 'org.mockito:mockito-core:2.23.0'

app/src/main/java/org/schabi/newpipe/Downloader.java

@@ -89,7 +89,8 @@ public class Downloader implements org.schabi.newpipe.extractor.Downloader {
                     .build();
             response = client.newCall(request).execute();
 
-            return Long.parseLong(response.header("Content-Length"));
+            String contentLength = response.header("Content-Length");
+            return contentLength == null ? -1 : Long.parseLong(contentLength);
         } catch (NumberFormatException e) {
             throw new IOException("Invalid content length", e);
         } finally {

app/src/main/java/org/schabi/newpipe/RouterActivity.java

@@ -542,8 +542,7 @@ public class RouterActivity extends AppCompatActivity {
 
                 final SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(this);
                 boolean isExtVideoEnabled = preferences.getBoolean(getString(R.string.use_external_video_player_key), false);
-                boolean isExtAudioEnabled = preferences.getBoolean(getString(R.string.use_external_audio_player_key), false);
-                boolean useOldVideoPlayer = PlayerHelper.isUsingOldPlayer(this);
+                boolean isExtAudioEnabled = preferences.getBoolean(getString(R.string.use_external_audio_player_key), false);;
 
                 PlayQueue playQueue;
                 String playerChoice = choice.playerChoice;
@@ -555,9 +554,6 @@ public class RouterActivity extends AppCompatActivity {
                     } else if (playerChoice.equals(videoPlayerKey) && isExtVideoEnabled) {
                         NavigationHelper.playOnExternalVideoPlayer(this, (StreamInfo) info);
 
-                    } else if (playerChoice.equals(videoPlayerKey) && useOldVideoPlayer) {
-                        NavigationHelper.playOnOldVideoPlayer(this, (StreamInfo) info);
-
                     } else {
                         playQueue = new SinglePlayQueue((StreamInfo) info);
 

app/src/main/java/org/schabi/newpipe/download/DeleteDownloadManager.java

@@ -1,158 +0,0 @@
-package org.schabi.newpipe.download;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.design.widget.BaseTransientBottomBar;
-import android.support.design.widget.Snackbar;
-import android.view.View;
-
-import org.schabi.newpipe.R;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-
-import io.reactivex.Completable;
-import io.reactivex.Observable;
-import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.subjects.PublishSubject;
-import us.shandian.giga.get.DownloadManager;
-import us.shandian.giga.get.DownloadMission;
-
-public class DeleteDownloadManager {
-
-    private static final String KEY_STATE = "delete_manager_state";
-
-    private final View mView;
-    private final HashSet<String> mPendingMap;
-    private final List<Disposable> mDisposableList;
-    private DownloadManager mDownloadManager;
-    private final PublishSubject<DownloadMission> publishSubject = PublishSubject.create();
-
-    DeleteDownloadManager(Activity activity) {
-        mPendingMap = new HashSet<>();
-        mDisposableList = new ArrayList<>();
-        mView = activity.findViewById(android.R.id.content);
-    }
-
-    public Observable<DownloadMission> getUndoObservable() {
-        return publishSubject;
-    }
-
-    public boolean contains(@NonNull DownloadMission mission) {
-        return mPendingMap.contains(mission.url);
-    }
-
-    public void add(@NonNull DownloadMission mission) {
-        mPendingMap.add(mission.url);
-
-        if (mPendingMap.size() == 1) {
-            showUndoDeleteSnackbar(mission);
-        }
-    }
-
-    public void setDownloadManager(@NonNull DownloadManager downloadManager) {
-        mDownloadManager = downloadManager;
-
-        if (mPendingMap.size() < 1) return;
-
-        showUndoDeleteSnackbar();
-    }
-
-    public void restoreState(@Nullable Bundle savedInstanceState) {
-        if (savedInstanceState == null) return;
-
-        List<String> list = savedInstanceState.getStringArrayList(KEY_STATE);
-        if (list != null) {
-            mPendingMap.addAll(list);
-        }
-    }
-
-    public void saveState(@Nullable Bundle outState) {
-        if (outState == null) return;
-
-        for (Disposable disposable : mDisposableList) {
-            disposable.dispose();
-        }
-
-        outState.putStringArrayList(KEY_STATE, new ArrayList<>(mPendingMap));
-    }
-
-    private void showUndoDeleteSnackbar() {
-        if (mPendingMap.size() < 1) return;
-
-        String url = mPendingMap.iterator().next();
-
-        for (int i = 0; i < mDownloadManager.getCount(); i++) {
-            DownloadMission mission = mDownloadManager.getMission(i);
-            if (url.equals(mission.url)) {
-                showUndoDeleteSnackbar(mission);
-                break;
-            }
-        }
-    }
-
-    private void showUndoDeleteSnackbar(@NonNull DownloadMission mission) {
-        final Snackbar snackbar = Snackbar.make(mView, mission.name, Snackbar.LENGTH_INDEFINITE);
-        final Disposable disposable = Observable.timer(3, TimeUnit.SECONDS)
-                .subscribeOn(AndroidSchedulers.mainThread())
-                .subscribe(l -> snackbar.dismiss());
-
-        mDisposableList.add(disposable);
-
-        snackbar.setAction(R.string.undo, v -> {
-            mPendingMap.remove(mission.url);
-            publishSubject.onNext(mission);
-            disposable.dispose();
-            snackbar.dismiss();
-        });
-
-        snackbar.addCallback(new BaseTransientBottomBar.BaseCallback<Snackbar>() {
-            @Override
-            public void onDismissed(Snackbar transientBottomBar, int event) {
-                if (!disposable.isDisposed()) {
-                    Completable.fromAction(() -> deletePending(mission))
-                            .subscribeOn(Schedulers.io())
-                            .subscribe();
-                }
-                mPendingMap.remove(mission.url);
-                snackbar.removeCallback(this);
-                mDisposableList.remove(disposable);
-                showUndoDeleteSnackbar();
-            }
-        });
-
-        snackbar.show();
-    }
-
-    public void deletePending() {
-        if (mPendingMap.size() < 1) return;
-
-        HashSet<Integer> idSet = new HashSet<>();
-        for (int i = 0; i < mDownloadManager.getCount(); i++) {
-            if (contains(mDownloadManager.getMission(i))) {
-                idSet.add(i);
-            }
-        }
-
-        for (Integer id : idSet) {
-            mDownloadManager.deleteMission(id);
-        }
-
-        mPendingMap.clear();
-    }
-
-    private void deletePending(@NonNull DownloadMission mission) {
-        for (int i = 0; i < mDownloadManager.getCount(); i++) {
-            if (mission.url.equals(mDownloadManager.getMission(i).url)) {
-                mDownloadManager.deleteMission(i);
-                break;
-            }
-        }
-    }
-}

app/src/main/java/org/schabi/newpipe/download/DownloadActivity.java

@@ -15,16 +15,12 @@ import org.schabi.newpipe.R;
 import org.schabi.newpipe.settings.SettingsActivity;
 import org.schabi.newpipe.util.ThemeHelper;
 
-import io.reactivex.Completable;
-import io.reactivex.schedulers.Schedulers;
 import us.shandian.giga.service.DownloadManagerService;
-import us.shandian.giga.ui.fragment.AllMissionsFragment;
 import us.shandian.giga.ui.fragment.MissionsFragment;
 
 public class DownloadActivity extends AppCompatActivity {
 
     private static final String MISSIONS_FRAGMENT_TAG = "fragment_tag";
-    private DeleteDownloadManager mDeleteDownloadManager;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -47,32 +43,17 @@ public class DownloadActivity extends AppCompatActivity {
             actionBar.setDisplayShowTitleEnabled(true);
         }
 
-        mDeleteDownloadManager = new DeleteDownloadManager(this);
-        mDeleteDownloadManager.restoreState(savedInstanceState);
-
-        MissionsFragment fragment = (MissionsFragment) getFragmentManager().findFragmentByTag(MISSIONS_FRAGMENT_TAG);
-        if (fragment != null) {
-            fragment.setDeleteManager(mDeleteDownloadManager);
-        } else {
-            getWindow().getDecorView().getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
-                @Override
-                public void onGlobalLayout() {
-                    updateFragments();
-                    getWindow().getDecorView().getViewTreeObserver().removeGlobalOnLayoutListener(this);
-                }
-            });
-        }
-    }
-
-    @Override
-    protected void onSaveInstanceState(Bundle outState) {
-        mDeleteDownloadManager.saveState(outState);
-        super.onSaveInstanceState(outState);
+        getWindow().getDecorView().getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
+            @Override
+            public void onGlobalLayout() {
+                updateFragments();
+                getWindow().getDecorView().getViewTreeObserver().removeGlobalOnLayoutListener(this);
+            }
+        });
     }
 
     private void updateFragments() {
-        MissionsFragment fragment = new AllMissionsFragment();
-        fragment.setDeleteManager(mDeleteDownloadManager);
+        MissionsFragment fragment = new MissionsFragment();
 
         getFragmentManager().beginTransaction()
                 .replace(R.id.frame, fragment, MISSIONS_FRAGMENT_TAG)
@@ -99,7 +80,6 @@ public class DownloadActivity extends AppCompatActivity {
             case R.id.action_settings: {
                 Intent intent = new Intent(this, SettingsActivity.class);
                 startActivity(intent);
-                deletePending();
                 return true;
             }
             default:
@@ -108,14 +88,7 @@ public class DownloadActivity extends AppCompatActivity {
     }
 
     @Override
-    public void onBackPressed() {
-        super.onBackPressed();
-        deletePending();
-    }
-
-    private void deletePending() {
-        Completable.fromAction(mDeleteDownloadManager::deletePending)
-                .subscribeOn(Schedulers.io())
-                .subscribe();
+    public void onRestoreInstanceState(Bundle inState){
+        super.onRestoreInstanceState(inState);
     }
 }

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

@@ -63,6 +63,7 @@ import org.schabi.newpipe.extractor.stream.Stream;
 import org.schabi.newpipe.extractor.stream.StreamInfo;
 import org.schabi.newpipe.extractor.stream.StreamInfoItem;
 import org.schabi.newpipe.extractor.stream.StreamType;
+import org.schabi.newpipe.extractor.stream.SubtitlesStream;
 import org.schabi.newpipe.extractor.stream.VideoStream;
 import org.schabi.newpipe.fragments.BackPressable;
 import org.schabi.newpipe.fragments.BaseStateFragment;
@@ -73,7 +74,6 @@ import org.schabi.newpipe.local.history.HistoryRecordManager;
 import org.schabi.newpipe.player.MainVideoPlayer;
 import org.schabi.newpipe.player.PopupVideoPlayer;
 import org.schabi.newpipe.player.helper.PlayerHelper;
-import org.schabi.newpipe.player.old.PlayVideoActivity;
 import org.schabi.newpipe.player.playqueue.PlayQueue;
 import org.schabi.newpipe.player.playqueue.SinglePlayQueue;
 import org.schabi.newpipe.report.ErrorActivity;
@@ -371,14 +371,14 @@ public class VideoDetailFragment
                     Log.w(TAG, "Can't open channel because we got no channel URL");
                 } else {
                     try {
-                        NavigationHelper.openChannelFragment(
-                                getFragmentManager(),
-                                currentInfo.getServiceId(),
-                                currentInfo.getUploaderUrl(),
-                                currentInfo.getUploaderName());
+                    NavigationHelper.openChannelFragment(
+                            getFragmentManager(),
+                            currentInfo.getServiceId(),
+                            currentInfo.getUploaderUrl(),
+                            currentInfo.getUploaderName());
                     } catch (Exception e) {
                         ErrorActivity.reportUiError((AppCompatActivity) getActivity(), e);
-                    }
+                }
                 }
                 break;
             case R.id.detail_thumbnail_root_layout:
@@ -745,7 +745,7 @@ public class VideoDetailFragment
         sortedVideoStreams = ListHelper.getSortedStreamVideosList(activity, info.getVideoStreams(), info.getVideoOnlyStreams(), false);
         selectedVideoStreamIndex = ListHelper.getDefaultResolutionIndex(activity, sortedVideoStreams);
 
-        final StreamItemAdapter<VideoStream> streamsAdapter = new StreamItemAdapter<>(activity, new StreamSizeWrapper<>(sortedVideoStreams), isExternalPlayerEnabled);
+        final StreamItemAdapter<VideoStream, Stream> streamsAdapter = new StreamItemAdapter<>(activity, new StreamSizeWrapper<>(sortedVideoStreams, activity), isExternalPlayerEnabled);
         spinnerToolbar.setAdapter(streamsAdapter);
         spinnerToolbar.setSelection(selectedVideoStreamIndex);
         spinnerToolbar.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
@@ -921,7 +921,7 @@ public class VideoDetailFragment
                 .getBoolean(this.getString(R.string.use_external_video_player_key), false)) {
             startOnExternalPlayer(activity, currentInfo, selectedVideoStream);
         } else {
-            openNormalPlayer(selectedVideoStream);
+            openNormalPlayer();
         }
     }
 
@@ -934,24 +934,13 @@ public class VideoDetailFragment
         }
     }
 
-    private void openNormalPlayer(VideoStream selectedVideoStream) {
+    private void openNormalPlayer() {
         Intent mIntent;
-        boolean useOldPlayer = PlayerHelper.isUsingOldPlayer(activity) || (Build.VERSION.SDK_INT < 16);
-        if (!useOldPlayer) {
-            // ExoPlayer
-            final PlayQueue playQueue = new SinglePlayQueue(currentInfo);
-            mIntent = NavigationHelper.getPlayerIntent(activity,
-                    MainVideoPlayer.class,
-                    playQueue,
-                    getSelectedVideoStream().getResolution());
-        } else {
-            // Internal Player
-            mIntent = new Intent(activity, PlayVideoActivity.class)
-                    .putExtra(PlayVideoActivity.VIDEO_TITLE, currentInfo.getName())
-                    .putExtra(PlayVideoActivity.STREAM_URL, selectedVideoStream.getUrl())
-                    .putExtra(PlayVideoActivity.VIDEO_URL, currentInfo.getUrl())
-                    .putExtra(PlayVideoActivity.START_POSITION, currentInfo.getStartPosition());
-        }
+        final PlayQueue playQueue = new SinglePlayQueue(currentInfo);
+        mIntent = NavigationHelper.getPlayerIntent(activity,
+                MainVideoPlayer.class,
+                playQueue,
+                getSelectedVideoStream().getResolution());
         startActivity(mIntent);
     }
 
@@ -1276,6 +1265,7 @@ public class VideoDetailFragment
                 downloadDialog.setVideoStreams(sortedVideoStreams);
                 downloadDialog.setAudioStreams(currentInfo.getAudioStreams());
                 downloadDialog.setSelectedVideoStream(selectedVideoStreamIndex);
+                downloadDialog.setSubtitleStreams(currentInfo.getSubtitles());
 
                 downloadDialog.show(activity.getSupportFragmentManager(), "downloadDialog");
             } catch (Exception e) {
@@ -1333,4 +1323,4 @@ public class VideoDetailFragment
             relatedStreamRootLayout.setVisibility(visibility);
         }
     }
-}
+}

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

@@ -98,35 +98,54 @@ public abstract class BasePlayer implements
         Player.EventListener, PlaybackListener, ImageLoadingListener {
 
     public static final boolean DEBUG = !BuildConfig.BUILD_TYPE.equals("release");
-    @NonNull public static final String TAG = "BasePlayer";
+    @NonNull
+    public static final String TAG = "BasePlayer";
 
-    @NonNull final protected Context context;
+    @NonNull
+    final protected Context context;
 
-    @NonNull final protected BroadcastReceiver broadcastReceiver;
-    @NonNull final protected IntentFilter intentFilter;
+    @NonNull
+    final protected BroadcastReceiver broadcastReceiver;
+    @NonNull
+    final protected IntentFilter intentFilter;
 
-    @NonNull final protected HistoryRecordManager recordManager;
+    @NonNull
+    final protected HistoryRecordManager recordManager;
 
-    @NonNull final protected CustomTrackSelector trackSelector;
-    @NonNull final protected PlayerDataSource dataSource;
+    @NonNull
+    final protected CustomTrackSelector trackSelector;
+    @NonNull
+    final protected PlayerDataSource dataSource;
 
-    @NonNull final private LoadControl loadControl;
-    @NonNull final private RenderersFactory renderFactory;
+    @NonNull
+    final private LoadControl loadControl;
+    @NonNull
+    final private RenderersFactory renderFactory;
 
-    @NonNull final private SerialDisposable progressUpdateReactor;
-    @NonNull final private CompositeDisposable databaseUpdateReactor;
+    @NonNull
+    final private SerialDisposable progressUpdateReactor;
+    @NonNull
+    final private CompositeDisposable databaseUpdateReactor;
     /*//////////////////////////////////////////////////////////////////////////
     // Intent
     //////////////////////////////////////////////////////////////////////////*/
 
-    @NonNull public static final String REPEAT_MODE = "repeat_mode";
-    @NonNull public static final String PLAYBACK_PITCH = "playback_pitch";
-    @NonNull public static final String PLAYBACK_SPEED = "playback_speed";
-    @NonNull public static final String PLAYBACK_SKIP_SILENCE = "playback_skip_silence";
-    @NonNull public static final String PLAYBACK_QUALITY = "playback_quality";
-    @NonNull public static final String PLAY_QUEUE_KEY = "play_queue_key";
-    @NonNull public static final String APPEND_ONLY = "append_only";
-    @NonNull public static final String SELECT_ON_APPEND = "select_on_append";
+    @NonNull
+    public static final String REPEAT_MODE = "repeat_mode";
+    @NonNull
+    public static final String PLAYBACK_PITCH = "playback_pitch";
+    @NonNull
+    public static final String PLAYBACK_SPEED = "playback_speed";
+    @NonNull
+    public static final String PLAYBACK_SKIP_SILENCE = "playback_skip_silence";
+    @NonNull
+    public static final String PLAYBACK_QUALITY = "playback_quality";
+    @NonNull
+    public static final String PLAY_QUEUE_KEY = "play_queue_key";
+    @NonNull
+    public static final String APPEND_ONLY = "append_only";
+    @NonNull
+    public static final String SELECT_ON_APPEND = "select_on_append";
 
     /*//////////////////////////////////////////////////////////////////////////
     // Playback
@@ -137,13 +156,18 @@ public abstract class BasePlayer implements
     protected PlayQueue playQueue;
     protected PlayQueueAdapter playQueueAdapter;
 
-    @Nullable protected MediaSourceManager playbackManager;
+    @Nullable
+    protected MediaSourceManager playbackManager;
 
-    @Nullable private PlayQueueItem currentItem;
-    @Nullable private MediaSourceTag currentMetadata;
-    @Nullable private Bitmap currentThumbnail;
+    @Nullable
+    private PlayQueueItem currentItem;
+    @Nullable
+    private MediaSourceTag currentMetadata;
+    @Nullable
+    private Bitmap currentThumbnail;
 
-    @Nullable protected Toast errorToast;
+    @Nullable
+    protected Toast errorToast;
 
     /*//////////////////////////////////////////////////////////////////////////
     // Player
@@ -213,7 +237,8 @@ public abstract class BasePlayer implements
         registerBroadcastReceiver();
     }
 
-    public void initListeners() {}
+    public void initListeners() {
+    }
 
     public void handleIntent(Intent intent) {
         if (DEBUG) Log.d(TAG, "handleIntent() called with: intent = [" + intent + "]");
@@ -297,7 +322,6 @@ public abstract class BasePlayer implements
         databaseUpdateReactor.clear();
         progressUpdateReactor.set(null);
 
-        simpleExoPlayer = null;
     }
 
     /*//////////////////////////////////////////////////////////////////////////
@@ -425,13 +449,15 @@ public abstract class BasePlayer implements
         if (!isProgressLoopRunning()) startProgressLoop();
     }
 
-    public void onBuffering() {}
+    public void onBuffering() {
+    }
 
     public void onPaused() {
         if (isProgressLoopRunning()) stopProgressLoop();
     }
 
-    public void onPausedSeek() {}
+    public void onPausedSeek() {
+    }
 
     public void onCompleted() {
         if (DEBUG) Log.d(TAG, "onCompleted() called");
@@ -602,19 +628,19 @@ public abstract class BasePlayer implements
     /**
      * Processes the exceptions produced by {@link com.google.android.exoplayer2.ExoPlayer ExoPlayer}.
      * There are multiple types of errors: <br><br>
-     *
+     * <p>
      * {@link ExoPlaybackException#TYPE_SOURCE TYPE_SOURCE}: <br><br>
-     *
+     * <p>
      * {@link ExoPlaybackException#TYPE_UNEXPECTED TYPE_UNEXPECTED}: <br><br>
      * If a runtime error occurred, then we can try to recover it by restarting the playback
      * after setting the timestamp recovery. <br><br>
-     *
+     * <p>
      * {@link ExoPlaybackException#TYPE_RENDERER TYPE_RENDERER}: <br><br>
      * If the renderer failed, treat the error as unrecoverable.
      *
      * @see #processSourceError(IOException)
      * @see Player.EventListener#onPlayerError(ExoPlaybackException)
-     *  */
+     */
     @Override
     public void onPlayerError(ExoPlaybackException error) {
         if (DEBUG) Log.d(TAG, "ExoPlayer - onPlayerError() called with: " +
@@ -900,8 +926,8 @@ public abstract class BasePlayer implements
         if (DEBUG) Log.d(TAG, "onPlayPrevious() called");
 
         /* If current playback has run for PLAY_PREV_ACTIVATION_LIMIT_MILLIS milliseconds,
-        * restart current track. Also restart the track if the current track
-        * is the first in a queue.*/
+         * restart current track. Also restart the track if the current track
+         * is the first in a queue.*/
         if (simpleExoPlayer.getCurrentPosition() > PLAY_PREV_ACTIVATION_LIMIT_MILLIS ||
                 playQueue.getIndex() == 0) {
             seekToDefault();
@@ -1010,8 +1036,8 @@ public abstract class BasePlayer implements
         try {
             metadata = (MediaSourceTag) simpleExoPlayer.getCurrentTag();
         } catch (IndexOutOfBoundsException | ClassCastException error) {
-            if(DEBUG) Log.d(TAG, "Could not update metadata: " + error.getMessage());
-            if(DEBUG) error.printStackTrace();
+            if (DEBUG) Log.d(TAG, "Could not update metadata: " + error.getMessage());
+            if (DEBUG) error.printStackTrace();
             return;
         }
 
@@ -1075,7 +1101,9 @@ public abstract class BasePlayer implements
                 currentThumbnail;
     }
 
-    /** Checks if the current playback is a livestream AND is playing at or beyond the live edge */
+    /**
+     * Checks if the current playback is a livestream AND is playing at or beyond the live edge
+     */
     @SuppressWarnings("BooleanMethodIsAlwaysInverted")
     public boolean isLiveEdge() {
         if (simpleExoPlayer == null || !isLive()) return false;
@@ -1099,13 +1127,14 @@ public abstract class BasePlayer implements
         } catch (@NonNull IndexOutOfBoundsException ignored) {
             // Why would this even happen =(
             // But lets log it anyway. Save is save
-            if(DEBUG) Log.d(TAG, "Could not update metadata: " + ignored.getMessage());
-            if(DEBUG) ignored.printStackTrace();
+            if (DEBUG) Log.d(TAG, "Could not update metadata: " + ignored.getMessage());
+            if (DEBUG) ignored.printStackTrace();
             return false;
         }
     }
 
     public boolean isPlaying() {
+        if (simpleExoPlayer == null) return false;
         final int state = simpleExoPlayer.getPlaybackState();
         return (state == Player.STATE_READY || state == Player.STATE_BUFFERING)
                 && simpleExoPlayer.getPlayWhenReady();

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

@@ -900,6 +900,11 @@ public final class MainVideoPlayer extends AppCompatActivity
                 public void onMove(int sourceIndex, int targetIndex) {
                     if (playQueue != null) playQueue.move(sourceIndex, targetIndex);
                 }
+
+                @Override
+                public void onSwiped(int index) {
+                    if(index != -1) playQueue.remove(index);
+                }
             };
         }
 

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

@@ -68,7 +68,6 @@ import org.schabi.newpipe.extractor.stream.VideoStream;
 import org.schabi.newpipe.player.event.PlayerEventListener;
 import org.schabi.newpipe.player.helper.LockManager;
 import org.schabi.newpipe.player.helper.PlayerHelper;
-import org.schabi.newpipe.player.old.PlayVideoActivity;
 import org.schabi.newpipe.player.resolver.MediaSourceTag;
 import org.schabi.newpipe.player.resolver.VideoPlaybackResolver;
 import org.schabi.newpipe.util.ListHelper;
@@ -80,7 +79,6 @@ import java.util.List;
 import static org.schabi.newpipe.player.BasePlayer.STATE_PLAYING;
 import static org.schabi.newpipe.player.VideoPlayer.DEFAULT_CONTROLS_DURATION;
 import static org.schabi.newpipe.player.VideoPlayer.DEFAULT_CONTROLS_HIDE_TIME;
-import static org.schabi.newpipe.player.helper.PlayerHelper.isUsingOldPlayer;
 import static org.schabi.newpipe.util.AnimationUtils.animateView;
 
 /**
@@ -554,27 +552,17 @@ public final class PopupVideoPlayer extends Service {
             if (DEBUG) Log.d(TAG, "onFullScreenButtonClicked() called");
 
             setRecovery();
-            Intent intent;
-            if (!isUsingOldPlayer(getApplicationContext())) {
-                intent = NavigationHelper.getPlayerIntent(
-                        context,
-                        MainVideoPlayer.class,
-                        this.getPlayQueue(),
-                        this.getRepeatMode(),
-                        this.getPlaybackSpeed(),
-                        this.getPlaybackPitch(),
-                        this.getPlaybackSkipSilence(),
-                        this.getPlaybackQuality()
-                );
-                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-            } else {
-                intent = new Intent(PopupVideoPlayer.this, PlayVideoActivity.class)
-                        .putExtra(PlayVideoActivity.VIDEO_TITLE, getVideoTitle())
-                        .putExtra(PlayVideoActivity.STREAM_URL, getSelectedVideoStream().getUrl())
-                        .putExtra(PlayVideoActivity.VIDEO_URL, getVideoUrl())
-                        .putExtra(PlayVideoActivity.START_POSITION, Math.round(getPlayer().getCurrentPosition() / 1000f));
-                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-            }
+            final Intent intent = NavigationHelper.getPlayerIntent(
+                    context,
+                    MainVideoPlayer.class,
+                    this.getPlayQueue(),
+                    this.getRepeatMode(),
+                    this.getPlaybackSpeed(),
+                    this.getPlaybackPitch(),
+                    this.getPlaybackSkipSilence(),
+                    this.getPlaybackQuality()
+            );
+            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
             context.startActivity(intent);
             closePopup();
         }

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

@@ -375,6 +375,11 @@ public abstract class ServicePlayerActivity extends AppCompatActivity
             public void onMove(int sourceIndex, int targetIndex) {
                 if (player != null) player.getPlayQueue().move(sourceIndex, targetIndex);
             }
+
+            @Override
+            public void onSwiped(int index) {
+                if (index != -1) player.getPlayQueue().remove(index);
+            }
         };
     }
 

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

@@ -19,11 +19,11 @@ import com.google.android.exoplayer2.util.MimeTypes;
 
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.extractor.InfoItem;
-import org.schabi.newpipe.extractor.Subtitles;
+import org.schabi.newpipe.extractor.MediaFormat;
 import org.schabi.newpipe.extractor.stream.AudioStream;
 import org.schabi.newpipe.extractor.stream.StreamInfo;
 import org.schabi.newpipe.extractor.stream.StreamInfoItem;
-import org.schabi.newpipe.extractor.stream.SubtitlesFormat;
+import org.schabi.newpipe.extractor.stream.SubtitlesStream;
 import org.schabi.newpipe.extractor.stream.VideoStream;
 import org.schabi.newpipe.player.playqueue.PlayQueue;
 import org.schabi.newpipe.player.playqueue.PlayQueueItem;
@@ -87,7 +87,7 @@ public class PlayerHelper {
         return pitchFormatter.format(pitch);
     }
 
-    public static String mimeTypesOf(final SubtitlesFormat format) {
+    public static String subtitleMimeTypesOf(final MediaFormat format) {
         switch (format) {
             case VTT: return MimeTypes.TEXT_VTT;
             case TTML: return MimeTypes.APPLICATION_TTML;
@@ -97,8 +97,8 @@ public class PlayerHelper {
 
     @NonNull
     public static String captionLanguageOf(@NonNull final Context context,
-                                           @NonNull final Subtitles subtitles) {
-        final String displayName = subtitles.getLocale().getDisplayName(subtitles.getLocale());
+                                           @NonNull final SubtitlesStream subtitles) {
+        final String displayName = subtitles.getDisplayLanguageName();
         return displayName + (subtitles.isAutoGenerated() ? " (" + context.getString(R.string.caption_auto_generated)+ ")" : "");
     }
 
@@ -145,7 +145,7 @@ public class PlayerHelper {
 
         final StreamInfoItem nextVideo = info.getNextVideo();
         if (nextVideo != null && !urls.contains(nextVideo.getUrl())) {
-            return new SinglePlayQueue(nextVideo);
+            return getAutoQueuedSinglePlayQueue(nextVideo);
         }
 
         final List<InfoItem> relatedItems = info.getRelatedStreams();
@@ -158,7 +158,7 @@ public class PlayerHelper {
             }
         }
         Collections.shuffle(autoQueueItems);
-        return autoQueueItems.isEmpty() ? null : new SinglePlayQueue(autoQueueItems.get(0));
+        return autoQueueItems.isEmpty() ? null : getAutoQueuedSinglePlayQueue(autoQueueItems.get(0));
     }
 
     ////////////////////////////////////////////////////////////////////////////
@@ -177,10 +177,6 @@ public class PlayerHelper {
         return isBrightnessGestureEnabled(context, true);
     }
 
-    public static boolean isUsingOldPlayer(@NonNull final Context context) {
-        return isUsingOldPlayer(context, false);
-    }
-
     public static boolean isRememberingPopupDimensions(@NonNull final Context context) {
         return isRememberingPopupDimensions(context, true);
     }
@@ -318,10 +314,6 @@ public class PlayerHelper {
         return getPreferences(context).getBoolean(context.getString(R.string.brightness_gesture_control_key), b);
     }
 
-    private static boolean isUsingOldPlayer(@NonNull final Context context, final boolean b) {
-        return getPreferences(context).getBoolean(context.getString(R.string.use_old_player_key), b);
-    }
-
     private static boolean isRememberingPopupDimensions(@NonNull final Context context, final boolean b) {
         return getPreferences(context).getBoolean(context.getString(R.string.popup_remember_size_pos_key), b);
     }
@@ -358,4 +350,10 @@ public class PlayerHelper {
         return getPreferences(context).getString(context.getString(R.string.minimize_on_exit_key),
                 key);
     }
+
+    private static SinglePlayQueue getAutoQueuedSinglePlayQueue(StreamInfoItem streamInfoItem) {
+        SinglePlayQueue singlePlayQueue = new SinglePlayQueue(streamInfoItem);
+        singlePlayQueue.getItem().setAutoQueued(true);
+        return singlePlayQueue;
+    }
 }

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

@@ -233,6 +233,9 @@ public abstract class PlayQueue implements Serializable {
             backup.addAll(itemList);
             Collections.shuffle(itemList);
         }
+        if (!streams.isEmpty() && streams.get(streams.size() - 1).isAutoQueued() && !itemList.get(0).isAutoQueued()) {
+            streams.remove(streams.size() - 1);
+        }
         streams.addAll(itemList);
 
         broadcast(new AppendEvent(itemList.size()));
@@ -314,7 +317,9 @@ public abstract class PlayQueue implements Serializable {
             queueIndex.incrementAndGet();
         }
 
-        streams.add(target, streams.remove(source));
+        PlayQueueItem playQueueItem = streams.remove(source);
+        playQueueItem.setAutoQueued(false);
+        streams.add(target, playQueueItem);
         broadcast(new MoveEvent(source, target));
     }
 

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

@@ -25,9 +25,10 @@ public class PlayQueueItem implements Serializable {
     @NonNull final private String uploader;
     @NonNull final private StreamType streamType;
 
+    private boolean isAutoQueued;
+
     private long recoveryPosition;
     private Throwable error;
-
     PlayQueueItem(@NonNull final StreamInfo info) {
         this(info.getName(), info.getUrl(), info.getServiceId(), info.getDuration(),
                 info.getThumbnailUrl(), info.getUploaderName(), info.getStreamType());
@@ -105,6 +106,14 @@ public class PlayQueueItem implements Serializable {
                 .doOnError(throwable -> error = throwable);
     }
 
+    public boolean isAutoQueued() {
+        return isAutoQueued;
+    }
+
+    public void setAutoQueued(boolean autoQueued) {
+        isAutoQueued = autoQueued;
+    }
+
     ////////////////////////////////////////////////////////////////////////////
     // Item States, keep external access out
     ////////////////////////////////////////////////////////////////////////////

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

@@ -8,11 +8,13 @@ public abstract class PlayQueueItemTouchCallback extends ItemTouchHelper.SimpleC
     private static final int MAXIMUM_INITIAL_DRAG_VELOCITY = 25;
 
     public PlayQueueItemTouchCallback() {
-        super(ItemTouchHelper.UP | ItemTouchHelper.DOWN, 0);
+        super(ItemTouchHelper.UP | ItemTouchHelper.DOWN, ItemTouchHelper.RIGHT);
     }
 
     public abstract void onMove(final int sourceIndex, final int targetIndex);
 
+    public abstract void onSwiped(int index);
+
     @Override
     public int interpolateOutOfBoundsScroll(RecyclerView recyclerView, int viewSize,
                                             int viewSizeOutOfBounds, int totalSize,
@@ -44,9 +46,11 @@ public abstract class PlayQueueItemTouchCallback extends ItemTouchHelper.SimpleC
 
     @Override
     public boolean isItemViewSwipeEnabled() {
-        return false;
+        return true;
     }
 
     @Override
-    public void onSwiped(RecyclerView.ViewHolder viewHolder, int swipeDir) {}
+    public void onSwiped(RecyclerView.ViewHolder viewHolder, int swipeDir) {
+        onSwiped(viewHolder.getAdapterPosition());
+    }
 }

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

@@ -10,7 +10,7 @@ import com.google.android.exoplayer2.source.MediaSource;
 import com.google.android.exoplayer2.source.MergingMediaSource;
 
 import org.schabi.newpipe.extractor.MediaFormat;
-import org.schabi.newpipe.extractor.Subtitles;
+import org.schabi.newpipe.extractor.stream.SubtitlesStream;
 import org.schabi.newpipe.extractor.stream.AudioStream;
 import org.schabi.newpipe.extractor.stream.StreamInfo;
 import org.schabi.newpipe.extractor.stream.VideoStream;
@@ -93,8 +93,8 @@ public class VideoPlaybackResolver implements PlaybackResolver {
         // Below are auxiliary media sources
 
         // Create subtitle sources
-        for (final Subtitles subtitle : info.getSubtitles()) {
-            final String mimeType = PlayerHelper.mimeTypesOf(subtitle.getFileType());
+        for (final SubtitlesStream subtitle : info.getSubtitles()) {
+            final String mimeType = PlayerHelper.subtitleMimeTypesOf(subtitle.getFormat());
             if (mimeType == null) continue;
 
             final Format textFormat = Format.createTextSampleFormat(null, mimeType,

app/src/main/java/org/schabi/newpipe/streams/DataReader.java

@@ -0,0 +1,103 @@
+package org.schabi.newpipe.streams;
+
+import java.io.EOFException;
+import java.io.IOException;
+
+import org.schabi.newpipe.streams.io.SharpStream;
+
+/**
+ * @author kapodamy
+ */
+public class DataReader {
+
+    public final static int SHORT_SIZE = 2;
+    public final static int LONG_SIZE = 8;
+    public final static int INTEGER_SIZE = 4;
+    public final static int FLOAT_SIZE = 4;
+
+    private long pos;
+    public final SharpStream stream;
+    private final boolean rewind;
+
+    public DataReader(SharpStream stream) {
+        this.rewind = stream.canRewind();
+        this.stream = stream;
+        this.pos = 0L;
+    }
+
+    public long position() {
+        return pos;
+    }
+
+    public final int readInt() throws IOException {
+        primitiveRead(INTEGER_SIZE);
+        return primitive[0] << 24 | primitive[1] << 16 | primitive[2] << 8 | primitive[3];
+    }
+
+    public final int read() throws IOException {
+        int value = stream.read();
+        if (value == -1) {
+            throw new EOFException();
+        }
+
+        pos++;
+        return value;
+    }
+
+    public final long skipBytes(long amount) throws IOException {
+        amount = stream.skip(amount);
+        pos += amount;
+        return amount;
+    }
+
+    public final long readLong() throws IOException {
+        primitiveRead(LONG_SIZE);
+        long high = primitive[0] << 24 | primitive[1] << 16 | primitive[2] << 8 | primitive[3];
+        long low = primitive[4] << 24 | primitive[5] << 16 | primitive[6] << 8 | primitive[7];
+        return high << 32 | low;
+    }
+
+    public final short readShort() throws IOException {
+        primitiveRead(SHORT_SIZE);
+        return (short) (primitive[0] << 8 | primitive[1]);
+    }
+
+    public final int read(byte[] buffer) throws IOException {
+        return read(buffer, 0, buffer.length);
+    }
+
+    public final int read(byte[] buffer, int offset, int count) throws IOException {
+        int res = stream.read(buffer, offset, count);
+        pos += res;
+
+        return res;
+    }
+
+    public final boolean available() {
+        return stream.available() > 0;
+    }
+
+    public void rewind() throws IOException {
+        stream.rewind();
+        pos = 0;
+    }
+
+    public boolean canRewind() {
+        return rewind;
+    }
+
+    private short[] primitive = new short[LONG_SIZE];
+
+    private void primitiveRead(int amount) throws IOException {
+        byte[] buffer = new byte[amount];
+        int read = stream.read(buffer, 0, amount);
+        pos += read;
+        if (read != amount) {
+            throw new EOFException("Truncated data, missing " + String.valueOf(amount - read) + " bytes");
+        }
+
+        for (int i = 0; i < buffer.length; i++) {
+            primitive[i] = (short) (buffer[i] & 0xFF);// the "byte" datatype is signed and is very annoying
+        }
+    }
+}

app/src/main/java/org/schabi/newpipe/streams/TrackDataChunk.java

@@ -0,0 +1,65 @@
+package org.schabi.newpipe.streams;
+
+import java.io.InputStream;
+import java.io.IOException;
+
+public class TrackDataChunk extends InputStream {
+
+    private final DataReader base;
+    private int size;
+
+    public TrackDataChunk(DataReader base, int size) {
+        this.base = base;
+        this.size = size;
+    }
+
+    @Override
+    public int read() throws IOException {
+        if (size < 1) {
+            return -1;
+        }
+
+        int res = base.read();
+
+        if (res >= 0) {
+            size--;
+        }
+
+        return res;
+    }
+
+    @Override
+    public int read(byte[] buffer) throws IOException {
+        return read(buffer, 0, buffer.length);
+    }
+
+    @Override
+    public int read(byte[] buffer, int offset, int count) throws IOException {
+        count = Math.min(size, count);
+        int read = base.read(buffer, offset, count);
+        size -= count;
+        return read;
+    }
+
+    @Override
+    public long skip(long amount) throws IOException {
+        long res = base.skipBytes(Math.min(amount, size));
+        size -= res;
+        return res;
+    }
+
+    @Override
+    public int available() {
+        return size;
+    }
+
+    @Override
+    public void close() {
+        size = 0;
+    }
+
+    @Override
+    public boolean markSupported() {
+        return false;
+    }
+}

app/src/main/java/org/schabi/newpipe/streams/io/SharpStream.java

@@ -0,0 +1,47 @@
+package org.schabi.newpipe.streams.io;
+
+import java.io.IOException;
+
+/**
+ * based c#
+ */
+public abstract class SharpStream {
+
+    public abstract int read() throws IOException;
+
+    public abstract int read(byte buffer[]) throws IOException;
+
+    public abstract int read(byte buffer[], int offset, int count) throws IOException;
+
+    public abstract long skip(long amount) throws IOException;
+
+
+    public abstract int available();
+
+    public abstract void rewind() throws IOException;
+
+
+    public abstract void dispose();
+
+    public abstract boolean isDisposed();
+
+
+    public abstract boolean canRewind();
+
+    public abstract boolean canRead();
+
+    public abstract boolean canWrite();
+
+
+    public abstract void write(byte value) throws IOException;
+
+    public abstract void write(byte[] buffer) throws IOException;
+
+    public abstract void write(byte[] buffer, int offset, int count) throws IOException;
+
+    public abstract void flush() throws IOException;
+
+    public void setLength(long length) throws IOException {
+        throw new IOException("Not implemented");
+    }
+}

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

@@ -110,7 +110,8 @@ public final class ListHelper {
                 : context.getString(R.string.best_resolution_key);
 
         String maxResolution = getResolutionLimit(context);
-        if (maxResolution != null && compareVideoStreamResolution(maxResolution, resolution) < 1){
+        if (maxResolution != null && (resolution.equals(context.getString(R.string.best_resolution_key))
+                || compareVideoStreamResolution(maxResolution, resolution) < 1)) {
             resolution = maxResolution;
         }
         return resolution;

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

@@ -49,7 +49,6 @@ import org.schabi.newpipe.player.MainVideoPlayer;
 import org.schabi.newpipe.player.PopupVideoPlayer;
 import org.schabi.newpipe.player.PopupVideoPlayerActivity;
 import org.schabi.newpipe.player.VideoPlayer;
-import org.schabi.newpipe.player.old.PlayVideoActivity;
 import org.schabi.newpipe.player.playqueue.PlayQueue;
 import org.schabi.newpipe.settings.SettingsActivity;
 
@@ -117,26 +116,6 @@ public class NavigationHelper {
         context.startActivity(playerIntent);
     }
 
-    public static void playOnOldVideoPlayer(Context context, StreamInfo info) {
-        ArrayList<VideoStream> videoStreamsList = new ArrayList<>(ListHelper.getSortedStreamVideosList(context, info.getVideoStreams(), null, false));
-        int index = ListHelper.getDefaultResolutionIndex(context, videoStreamsList);
-
-        if (index == -1) {
-            Toast.makeText(context, R.string.video_streams_empty, Toast.LENGTH_SHORT).show();
-            return;
-        }
-
-        VideoStream videoStream = videoStreamsList.get(index);
-        Intent intent = new Intent(context, PlayVideoActivity.class)
-                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-                .putExtra(PlayVideoActivity.VIDEO_TITLE, info.getName())
-                .putExtra(PlayVideoActivity.STREAM_URL, videoStream.getUrl())
-                .putExtra(PlayVideoActivity.VIDEO_URL, info.getUrl())
-                .putExtra(PlayVideoActivity.START_POSITION, info.getStartPosition());
-
-        context.startActivity(intent);
-    }
-
     public static void playOnPopupPlayer(final Context context, final PlayQueue queue) {
         if (!PermissionHelper.isPopupEnabled(context)) {
             PermissionHelper.showPopupEnablementToast(context);

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

@@ -0,0 +1,66 @@
+package org.schabi.newpipe.util;
+
+import android.support.annotation.NonNull;
+
+import org.schabi.newpipe.extractor.MediaFormat;
+import org.schabi.newpipe.extractor.stream.AudioStream;
+import org.schabi.newpipe.extractor.stream.Stream;
+import org.schabi.newpipe.extractor.stream.VideoStream;
+import org.schabi.newpipe.util.StreamItemAdapter.StreamSizeWrapper;
+
+import java.util.List;
+
+public class SecondaryStreamHelper<T extends Stream> {
+    private final int position;
+    private final StreamSizeWrapper<T> streams;
+
+    public SecondaryStreamHelper(StreamSizeWrapper<T> streams, T selectedStream) {
+        this.streams = streams;
+        this.position = streams.getStreamsList().indexOf(selectedStream);
+        if (this.position < 0) throw new RuntimeException("selected stream not found");
+    }
+
+    public T getStream() {
+        return streams.getStreamsList().get(position);
+    }
+
+    public long getSizeInBytes() {
+        return streams.getSizeInBytes(position);
+    }
+
+    /**
+     * find the correct audio stream for the desired video stream
+     *
+     * @param audioStreams list of audio streams
+     * @param videoStream  desired video ONLY stream
+     * @return selected audio stream or null if a candidate was not found
+     */
+    public static AudioStream getAudioStreamFor(@NonNull List<AudioStream> audioStreams, @NonNull VideoStream videoStream) {
+        // TODO: check if m4v and m4a selected streams are DASH compliant
+        switch (videoStream.getFormat()) {
+            case WEBM:
+            case MPEG_4:
+                break;
+            default:
+                return null;
+        }
+
+        boolean m4v = videoStream.getFormat() == MediaFormat.MPEG_4;
+
+        for (AudioStream audio : audioStreams) {
+            if (audio.getFormat() == (m4v ? MediaFormat.M4A : MediaFormat.WEBMA)) {
+                return audio;
+            }
+        }
+
+        // retry, but this time in reverse order
+        for (int i = audioStreams.size() - 1; i >= 0; i--) {
+            AudioStream audio = audioStreams.get(i);
+            if (audio.getFormat() == (m4v ? MediaFormat.MP3 : MediaFormat.OPUS)) {
+                return audio;
+            }
+        }
+
+        return null;
+    }
+}

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

@@ -1,6 +1,7 @@
 package org.schabi.newpipe.util;
 
 import android.content.Context;
+import android.util.SparseArray;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -13,6 +14,7 @@ import org.schabi.newpipe.Downloader;
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.extractor.stream.AudioStream;
 import org.schabi.newpipe.extractor.stream.Stream;
+import org.schabi.newpipe.extractor.stream.SubtitlesStream;
 import org.schabi.newpipe.extractor.stream.VideoStream;
 
 import java.io.Serializable;
@@ -28,26 +30,34 @@ import us.shandian.giga.util.Utility;
 /**
  * A list adapter for a list of {@link Stream streams}, currently supporting {@link VideoStream} and {@link AudioStream}.
  */
-public class StreamItemAdapter<T extends Stream> extends BaseAdapter {
+public class StreamItemAdapter<T extends Stream, U extends Stream> extends BaseAdapter {
     private final Context context;
 
     private final StreamSizeWrapper<T> streamsWrapper;
-    private final boolean showIconNoAudio;
+    private final SparseArray<SecondaryStreamHelper<U>> secondaryStreams;
 
-    public StreamItemAdapter(Context context, StreamSizeWrapper<T> streamsWrapper, boolean showIconNoAudio) {
+    public StreamItemAdapter(Context context, StreamSizeWrapper<T> streamsWrapper, SparseArray<SecondaryStreamHelper<U>> secondaryStreams) {
         this.context = context;
         this.streamsWrapper = streamsWrapper;
-        this.showIconNoAudio = showIconNoAudio;
+        this.secondaryStreams = secondaryStreams;
+    }
+
+    public StreamItemAdapter(Context context, StreamSizeWrapper<T> streamsWrapper, boolean showIconNoAudio) {
+        this(context, streamsWrapper, showIconNoAudio ? new SparseArray<>() : null);
     }
 
     public StreamItemAdapter(Context context, StreamSizeWrapper<T> streamsWrapper) {
-        this(context, streamsWrapper, false);
+        this(context, streamsWrapper, null);
     }
 
     public List<T> getAll() {
         return streamsWrapper.getStreamsList();
     }
 
+    public SparseArray<SecondaryStreamHelper<U>> getAllSecondary() {
+        return secondaryStreams;
+    }
+
     @Override
     public int getCount() {
         return streamsWrapper.getStreamsList().size();
@@ -89,29 +99,46 @@ public class StreamItemAdapter<T extends Stream> extends BaseAdapter {
         String qualityString;
 
         if (stream instanceof VideoStream) {
-            qualityString = ((VideoStream) stream).getResolution();
+            VideoStream videoStream = ((VideoStream) stream);
+            qualityString = videoStream.getResolution();
 
-            if (!showIconNoAudio) {
-                woSoundIconVisibility = View.GONE;
-            } else if (((VideoStream) stream).isVideoOnly()) {
-                woSoundIconVisibility = View.VISIBLE;
-            } else if (isDropdownItem) {
-                woSoundIconVisibility = View.INVISIBLE;
+            if (secondaryStreams != null) {
+                if (videoStream.isVideoOnly()) {
+                    woSoundIconVisibility = secondaryStreams.get(position) == null ? View.VISIBLE : View.INVISIBLE;
+                } else if (isDropdownItem) {
+                    woSoundIconVisibility = View.INVISIBLE;
+                }
             }
         } else if (stream instanceof AudioStream) {
             qualityString = ((AudioStream) stream).getAverageBitrate() + "kbps";
+        } else if (stream instanceof SubtitlesStream) {
+            qualityString = ((SubtitlesStream) stream).getDisplayLanguageName();
+            if (((SubtitlesStream) stream).isAutoGenerated()) {
+                qualityString += " (" + context.getString(R.string.caption_auto_generated) + ")";
+            }
         } else {
             qualityString = stream.getFormat().getSuffix();
         }
 
         if (streamsWrapper.getSizeInBytes(position) > 0) {
-            sizeView.setText(streamsWrapper.getFormattedSize(position));
+            SecondaryStreamHelper secondary = secondaryStreams == null ? null : secondaryStreams.get(position);
+            if (secondary != null) {
+                long size = secondary.getSizeInBytes() + streamsWrapper.getSizeInBytes(position);
+                sizeView.setText(Utility.formatBytes(size));
+            } else {
+                sizeView.setText(streamsWrapper.getFormattedSize(position));
+            }
             sizeView.setVisibility(View.VISIBLE);
         } else {
             sizeView.setVisibility(View.GONE);
         }
 
-        formatNameView.setText(stream.getFormat().getName());
+        if (stream instanceof SubtitlesStream) {
+            formatNameView.setText(((SubtitlesStream) stream).getLanguageTag());
+        } else {
+            formatNameView.setText(stream.getFormat().getName());
+        }
+
         qualityView.setText(qualityString);
         woSoundIconView.setVisibility(woSoundIconVisibility);
 
@@ -122,15 +149,17 @@ public class StreamItemAdapter<T extends Stream> extends BaseAdapter {
      * A wrapper class that includes a way of storing the stream sizes.
      */
     public static class StreamSizeWrapper<T extends Stream> implements Serializable {
-        private static final StreamSizeWrapper<Stream> EMPTY = new StreamSizeWrapper<>(Collections.emptyList());
+        private static final StreamSizeWrapper<Stream> EMPTY = new StreamSizeWrapper<>(Collections.emptyList(), null);
         private final List<T> streamsList;
         private final long[] streamSizes;
+        private final String unknownSize;
 
-        public StreamSizeWrapper(List<T> streamsList) {
+        public StreamSizeWrapper(List<T> streamsList, Context context) {
             this.streamsList = streamsList;
             this.streamSizes = new long[streamsList.size()];
+            this.unknownSize = context == null ? "--.-" : context.getString(R.string.unknown_content);
 
-            for (int i = 0; i < streamSizes.length; i++) streamSizes[i] = -1;
+            for (int i = 0; i < streamSizes.length; i++) streamSizes[i] = -2;
         }
 
         /**
@@ -143,7 +172,7 @@ public class StreamItemAdapter<T extends Stream> extends BaseAdapter {
             final Callable<Boolean> fetchAndSet = () -> {
                 boolean hasChanged = false;
                 for (X stream : streamsWrapper.getStreamsList()) {
-                    if (streamsWrapper.getSizeInBytes(stream) > 0) {
+                    if (streamsWrapper.getSizeInBytes(stream) > -2) {
                         continue;
                     }
 
@@ -173,11 +202,18 @@ public class StreamItemAdapter<T extends Stream> extends BaseAdapter {
         }
 
         public String getFormattedSize(int streamIndex) {
-            return Utility.formatBytes(getSizeInBytes(streamIndex));
+            return formatSize(getSizeInBytes(streamIndex));
         }
 
         public String getFormattedSize(T stream) {
-            return Utility.formatBytes(getSizeInBytes(stream));
+            return formatSize(getSizeInBytes(stream));
+        }
+
+        private String formatSize(long size) {
+            if (size > -1) {
+                return Utility.formatBytes(size);
+            }
+            return unknownSize;
         }
 
         public void setSize(int streamIndex, long sizeInBytes) {
@@ -193,4 +229,4 @@ public class StreamItemAdapter<T extends Stream> extends BaseAdapter {
             return (StreamSizeWrapper<X>) EMPTY;
         }
     }
-}
+}

app/src/main/java/us/shandian/giga/get/DownloadDataSource.java

@@ -1,40 +0,0 @@
-package us.shandian.giga.get;
-
-import java.util.List;
-
-/**
- * Provides access to the storage of {@link DownloadMission}s
- */
-public interface DownloadDataSource {
-
-    /**
-     * Load all missions
-     *
-     * @return a list of download missions
-     */
-    List<DownloadMission> loadMissions();
-
-    /**
-     * Add a download mission to the storage
-     *
-     * @param downloadMission the download mission to add
-     * @return the identifier of the mission
-     */
-    void addMission(DownloadMission downloadMission);
-
-    /**
-     * Update a download mission which exists in the storage
-     *
-     * @param downloadMission the download mission to update
-     * @throws IllegalArgumentException if the mission was not added to storage
-     */
-    void updateMission(DownloadMission downloadMission);
-
-
-    /**
-     * Delete a download mission
-     *
-     * @param downloadMission the mission to delete
-     */
-    void deleteMission(DownloadMission downloadMission);
-}