Merge pull request #2022 from TeamNewPipe/dev

release_v0.15.0
Merge pull request #2021 from TeamNewPipe/release_v0.15.0
2026-01-14 02:32:40 +00:00 · 2019-01-18 21:18:10 +01:00 · 2019-01-18 21:16:38 +01:00 · 2019-01-18 21:13:04 +01:00 · 2019-01-18 20:54:52 +01:00 · 2019-01-18 20:50:46 +01:00
359 changed files with 22231 additions and 6524 deletions
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -5,42 +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 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.
-* 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!
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,2 +1,3 @@
 - [ ] I carefully read the [contribution guidelines](https://github.com/TeamNewPipe/NewPipe/blob/HEAD/.github/CONTRIBUTING.md) and agree to them.
 - [ ] I checked if the issue/feature exists in the latest version.
+- [ ] I did use the [incredible bugreport to markdown converter](https://teamnewpipe.github.io/CrashReportToMarkdown/) to paste bug reports.
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,13 +5,13 @@ android:
  components:
    # The BuildTools version used by NewPipe
    - tools
-    - build-tools-27.0.3
+    - build-tools-28.0.3

    # The SDK version used to compile NewPipe
-    - android-27
+    - android-28

 before_install: 
-  - yes | sdkmanager "platforms;android-27"
+  - yes | sdkmanager "platforms;android-28"
 script: ./gradlew -Dorg.gradle.jvmargs=-Xmx1536m assembleDebug lintDebug testDebugUnitTest

 licenses:
--- a/README.md
+++ b/README.md
@@ -1,74 +1,77 @@
-<p align="center"><a href="https://newpipe.schabi.org"><img src="assets/new_pipe_icon_5.png" width="150"/></a></p> 
+<p align="center"><a href="https://newpipe.schabi.org"><img src="assets/new_pipe_icon_5.png" width="150"></a></p> 
 <h2 align="center"><b>NewPipe</b></h2>
-<h4 align="center">A free lightweight YouTube frontend for Android.</h4>
-<p align="center"><a href="https://f-droid.org/packages/org.schabi.newpipe/"><img src="https://f-droid.org/wiki/images/0/06/F-Droid-button_get-it-on.png"/></a></p> 
+<h4 align="center">A libre lightweight streaming frontend for Android.</h4>
+<p align="center"><a href="https://f-droid.org/packages/org.schabi.newpipe/"><img src="https://f-droid.org/wiki/images/0/06/F-Droid-button_get-it-on.png"></a></p> 

 <p align="center">
-<a href="https://github.com/TeamNewPipe/NewPipe" alt="GitHub release"><img src="https://img.shields.io/github/release/TeamNewPipe/NewPipe.svg" /></a>
-<a href="https://www.gnu.org/licenses/gpl-3.0" alt="License: GPL v3"><img src="https://img.shields.io/badge/License-GPL%20v3-blue.svg" /></a>
-<a href="https://travis-ci.org/TeamNewPipe/NewPipe" alt="Build Status"><img src="https://travis-ci.org/TeamNewPipe/NewPipe.svg" /></a>
-<a href="https://hosted.weblate.org/engage/NewPipe/" alt="Translation Status"><img src="https://hosted.weblate.org/widgets/NewPipe/-/svg-badge.svg" /></a>
-<a href="http://webchat.freenode.net/?channels=%23newpipe" alt="IRC channel: #newpipe"><img src="https://img.shields.io/badge/IRC%20chat-%23newpipe-brightgreen.svg" /></a>
-<a href="https://www.bountysource.com/teams/newpipe" alt="Bountysource bounties"><img src="https://img.shields.io/bountysource/team/newpipe/activity.svg?colorB=cd201f"/></a>
+<a href="https://github.com/TeamNewPipe/NewPipe" alt="GitHub release"><img src="https://img.shields.io/github/release/TeamNewPipe/NewPipe.svg" ></a>
+<a href="https://www.gnu.org/licenses/gpl-3.0" alt="License: GPLv3"><img src="https://img.shields.io/badge/License-GPL%20v3-blue.svg"></a>
+<a href="https://travis-ci.org/TeamNewPipe/NewPipe" alt="Build Status"><img src="https://travis-ci.org/TeamNewPipe/NewPipe.svg"></a>
+<a href="https://hosted.weblate.org/engage/NewPipe/" alt="Translation Status"><img src="https://hosted.weblate.org/widgets/NewPipe/-/svg-badge.svg"></a>
+<a href="http://webchat.freenode.net/?channels=%23newpipe" alt="IRC channel: #newpipe"><img src="https://img.shields.io/badge/IRC%20chat-%23newpipe-brightgreen.svg"></a>
+<a href="https://www.bountysource.com/teams/newpipe" alt="Bountysource bounties"><img src="https://img.shields.io/bountysource/team/newpipe/activity.svg?colorB=cd201f"></a>
 </p>
-<hr />
+<hr>
 <p align="center"><a href="#screenshots">Screenshots</a> &bull; <a href="#description">Description</a> &bull; <a href="#features">Features</a> &bull; <a href="#contribution">Contribution</a> &bull; <a href="#donate">Donate</a> &bull; <a href="#license">License</a></p>
 <p align="center"><a href="https://newpipe.schabi.org">Website</a> &bull; <a href="https://newpipe.schabi.org/blog/">Blog</a>  &bull; <a href="https://newpipe.schabi.org/press/">Press</a></p>
-<hr />
-WARNING: PUTTING NEWPIPE OR ANY FORK OF IT INTO GOOGLE PLAYSTORE VIOLATES THEIR TERMS OF CONDITIONS.
+<hr>
+
+<b>WARNING: PUTTING NEWPIPE OR ANY FORK OF IT INTO GOOGLE PLAYSTORE VIOLATES THEIR TERMS OF CONDITIONS.</b>

 ## 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)

 ## Description

-NewPipe does not use any Google framework libraries, or the YouTube API. It only parses the website in order to gain the information it needs. Therefore this app can be used on devices without Google Services installed. Also, you don't need a YouTube account to use NewPipe, and it's FLOSS.
+NewPipe does not use any Google framework libraries, nor the YouTube API. Websites are only parsed to fetch required info, so this app can be used on devices without Google services installed. Also, you don't need a YouTube account to use NewPipe, which is copylefted libre software.

 ### Features

 * Search videos
-* Display general information about a video
+* Display general info about videos
 * Watch YouTube videos
 * Listen to YouTube videos
 * Popup mode (floating player)
-* Select the streaming player to watch the video with
-* Download videos 
+* Select streaming player to watch video with
+* Download videos
 * Download audio only
 * Open a video in Kodi
-* Show Next/Related videos
+* Show next/related videos
 * Search YouTube in a specific language
 * Watch/Block age restricted material
-* Display general information about channels
+* Display general info about channels
 * Search channels
 * Watch videos from a channel
 * Orbot/Tor support (not yet directly)
-* 1080p/2k/4k support
+* 1080p/2K/4K support
 * View history
 * Subscribe to channels
 * Search history
-* Search/Watch Playlists
-* Watch as queues Playlists
-* Queuing videos
+* Search/watch playlists
+* Watch as enqueued playlists
+* Enqueue videos
 * Local playlists
 * Subtitles
-* Multi-service support (eg. SoundCloud in NewPipe Beta)
+* Multi-service support (e.g. SoundCloud \[beta\])
+* Livestream support

 ### Coming Features

-* Livestream support
 * Cast to UPnP and Cast
 * Show comments
-* ... and many more
+* … and many more

 ## Contribution
 Whether you have ideas, translations, design changes, code cleaning, or real heavy code changes, help is always welcome.
@@ -77,26 +80,31 @@ The more is done the better it gets!
 If you'd like to get involved, check our [contribution notes](.github/CONTRIBUTING.md).

 ## Donate
-If you like NewPipe we'd be happy about a donation. You can either donate via Bitcoin, Bountysource or Liberapay. For further information about donating to NewPipe, please visit our [website](https://newpipe.schabi.org/donate).
+If you like NewPipe we'd be happy about a donation. You can either send bitcoin or donate via Bountysource or Liberapay. For further info on donating to NewPipe, please visit our [website](https://newpipe.schabi.org/donate).

 <table>
  <tr>
-    <td><img src="https://bitcoin.org/img/icons/logotop.svg" alt="Bitcoin" /></td>
-    <td><img src="assets/bitcoin_qr_code.png" alt="Bitcoin QR Code" width="100px"/></td>
+    <td><img src="https://bitcoin.org/img/icons/logotop.svg" alt="Bitcoin"></td>
+    <td><img src="assets/bitcoin_qr_code.png" alt="Bitcoin QR code" width="100px"></td>
    <td><samp>16A9J59ahMRqkLSZjhYj33n9j3fMztFxnh</samp></td>
  </tr>
  <tr>
-    <td><a href="https://liberapay.com/TeamNewPipe/"><img src="https://upload.wikimedia.org/wikipedia/commons/2/27/Liberapay_logo_v2_white-on-yellow.svg" alt="Liberapay" width="80px" /></a></td>
-    <td><a href="https://liberapay.com/TeamNewPipe/"><img src="assets/liberapay_qr_code.png" alt="Visit NewPipe at liberapay.com" width="100px"/></a></td>
-    <td><a href="https://liberapay.com/TeamNewPipe/donate"><img src="assets/liberapay_donate_button.svg" alt="Donate via Liberapay" height="35px" /></a></td>
+    <td><a href="https://liberapay.com/TeamNewPipe/"><img src="https://upload.wikimedia.org/wikipedia/commons/2/27/Liberapay_logo_v2_white-on-yellow.svg" alt="Liberapay" width="80px" ></a></td>
+    <td><a href="https://liberapay.com/TeamNewPipe/"><img src="assets/liberapay_qr_code.png" alt="Visit NewPipe at liberapay.com" width="100px"></a></td>
+    <td><a href="https://liberapay.com/TeamNewPipe/donate"><img src="assets/liberapay_donate_button.svg" alt="Donate via Liberapay" height="35px"></a></td>
  </tr>
  <tr>
-    <td><a href="https://www.bountysource.com/teams/newpipe"><img src="https://upload.wikimedia.org/wikipedia/commons/thumb/2/22/Bountysource.png/320px-Bountysource.png" alt="Bountysource" width="190px" /></a></td>
-    <td><a href="https://www.bountysource.com/teams/newpipe"><img src="assets/bountysource_qr_code.png" alt="Visit NewPipe at bountysource.com" width="100px"/></a></td>
-    <td><a href="https://www.bountysource.com/teams/newpipe/issues"><img src="https://img.shields.io/bountysource/team/newpipe/activity.svg?colorB=cd201f" height="30px" alt="Check out how many bounties you can earn." /></a></td>
+    <td><a href="https://www.bountysource.com/teams/newpipe"><img src="https://upload.wikimedia.org/wikipedia/commons/thumb/2/22/Bountysource.png/320px-Bountysource.png" alt="Bountysource" width="190px"></a></td>
+    <td><a href="https://www.bountysource.com/teams/newpipe"><img src="assets/bountysource_qr_code.png" alt="Visit NewPipe at bountysource.com" width="100px"></a></td>
+    <td><a href="https://www.bountysource.com/teams/newpipe/issues"><img src="https://img.shields.io/bountysource/team/newpipe/activity.svg?colorB=cd201f" height="30px" alt="Check out how many bounties you can earn."></a></td>
  </tr>
 </table>

+## Privacy Policy
+
+The NewPipe project aims to provide a private, anonymous experience for using media web services.
+Therefore, the app does not collect any data without your consent. NewPipe's privacy policy explains in detail what data is sent and stored when you send a crash report, or comment in our blog. You can find the document [here](https://newpipe.schabi.org/legal/privacy/).
+
 ## License
 [![GNU GPLv3 Image](https://www.gnu.org/graphics/gplv3-127x51.png)](http://www.gnu.org/licenses/gpl-3.0.en.html)  

--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,15 +1,15 @@
 apply plugin: 'com.android.application'

 android {
-    compileSdkVersion 27
-    buildToolsVersion '27.0.3'
+    compileSdkVersion 28
+    buildToolsVersion '28.0.3'

    defaultConfig {
        applicationId "org.schabi.newpipe"
-        minSdkVersion 15
-        targetSdkVersion 27
-        versionCode 62
-        versionName "0.13.3"
+        minSdkVersion 19
+        targetSdkVersion 28
+        versionCode 70
+        versionName "0.15.0"

        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
        vectorDrawables.useSupportLibrary = true
@@ -22,7 +22,6 @@ android {
        }
        debug {
            multiDexEnabled true
-
            debuggable true
            applicationIdSuffix ".debug"
        }
@@ -41,58 +40,61 @@ android {
 }

 ext {
-    supportLibVersion = '27.1.1'
-    exoPlayerLibVersion = '2.7.3'
-    roomDbLibVersion = '1.0.0'
-    leakCanaryLibVersion = '1.5.4'
-    okHttpLibVersion = '1.5.0'
+    supportLibVersion = '28.0.0'
+    exoPlayerLibVersion = '2.8.4' //2.9.0
+    roomDbLibVersion = '1.1.1'
+    leakCanaryLibVersion = '1.5.4' //1.6.1
+    okHttpLibVersion = '3.11.0'
    icepickLibVersion = '3.2.0'
    stethoLibVersion = '1.5.0'
 }
-dependencies {
-    androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2') {
-        exclude module: 'support-annotations'
-    }

-    implementation 'com.github.TeamNewPipe:NewPipeExtractor:bf1c771'
+dependencies {
+    androidTestImplementation('com.android.support.test.espresso:espresso-core:3.0.2', {
+        exclude module: 'support-annotations'
+    })
+
+    implementation 'com.github.TeamNewPipe:NewPipeExtractor:99915e4527c0'

    testImplementation 'junit:junit:4.12'
-    testImplementation 'org.mockito:mockito-core:1.10.19'
+    testImplementation 'org.mockito:mockito-core:2.23.0'

-    implementation "com.android.support:appcompat-v7:$supportLibVersion"
-    implementation "com.android.support:support-v4:$supportLibVersion"
-    implementation "com.android.support:design:$supportLibVersion"
-    implementation "com.android.support:recyclerview-v7:$supportLibVersion"
-    implementation "com.android.support:preference-v14:$supportLibVersion"
+    implementation "com.android.support:appcompat-v7:${supportLibVersion}"
+    implementation "com.android.support:support-v4:${supportLibVersion}"
+    implementation "com.android.support:design:${supportLibVersion}"
+    implementation "com.android.support:recyclerview-v7:${supportLibVersion}"
+    implementation "com.android.support:preference-v14:${supportLibVersion}"
+    implementation "com.android.support:cardview-v7:${supportLibVersion}"
+    implementation 'com.android.support.constraint:constraint-layout:1.1.3'

-    implementation 'ch.acra:acra:4.9.2'
+    implementation 'ch.acra:acra:4.9.2' //4.11

    implementation 'com.nostra13.universalimageloader:universal-image-loader:1.9.5'
    implementation 'de.hdodenhof:circleimageview:2.2.0'
    implementation 'com.github.nirhart:ParallaxScroll:dd53d1f9d1'
    implementation 'com.nononsenseapps:filepicker:4.2.1'

-    implementation "com.google.android.exoplayer:exoplayer:$exoPlayerLibVersion"
-    implementation "com.google.android.exoplayer:extension-mediasession:$exoPlayerLibVersion"
+    implementation "com.google.android.exoplayer:exoplayer:${exoPlayerLibVersion}"
+    implementation "com.google.android.exoplayer:extension-mediasession:${exoPlayerLibVersion}"

-    debugImplementation "com.facebook.stetho:stetho:$stethoLibVersion"
-    debugImplementation "com.facebook.stetho:stetho-urlconnection:$stethoLibVersion"
+    debugImplementation "com.facebook.stetho:stetho:${stethoLibVersion}"
+    debugImplementation "com.facebook.stetho:stetho-urlconnection:${stethoLibVersion}"
    debugImplementation 'com.android.support:multidex:1.0.3'

-    implementation 'io.reactivex.rxjava2:rxjava:2.1.10'
-    implementation 'io.reactivex.rxjava2:rxandroid:2.0.2'
+    implementation 'io.reactivex.rxjava2:rxjava:2.2.2'
+    implementation 'io.reactivex.rxjava2:rxandroid:2.1.0'
    implementation 'com.jakewharton.rxbinding2:rxbinding:2.1.1'

-    implementation "android.arch.persistence.room:runtime:$roomDbLibVersion"
-    implementation "android.arch.persistence.room:rxjava2:$roomDbLibVersion"
-    annotationProcessor "android.arch.persistence.room:compiler:$roomDbLibVersion"
+    implementation "android.arch.persistence.room:runtime:${roomDbLibVersion}"
+    implementation "android.arch.persistence.room:rxjava2:${roomDbLibVersion}"
+    annotationProcessor "android.arch.persistence.room:compiler:${roomDbLibVersion}"

-    implementation "frankiesardo:icepick:$icepickLibVersion"
-    annotationProcessor "frankiesardo:icepick-processor:$icepickLibVersion"
+    implementation "frankiesardo:icepick:${icepickLibVersion}"
+    annotationProcessor "frankiesardo:icepick-processor:${icepickLibVersion}"

-    debugImplementation "com.squareup.leakcanary:leakcanary-android:$leakCanaryLibVersion"
-    releaseImplementation "com.squareup.leakcanary:leakcanary-android-no-op:$leakCanaryLibVersion"
+    debugImplementation "com.squareup.leakcanary:leakcanary-android:${leakCanaryLibVersion}"
+    releaseImplementation "com.squareup.leakcanary:leakcanary-android-no-op:${leakCanaryLibVersion}"

-    implementation 'com.squareup.okhttp3:okhttp:3.9.1'
-    debugImplementation "com.facebook.stetho:stetho-okhttp3:$okHttpLibVersion"
+    implementation "com.squareup.okhttp3:okhttp:${okHttpLibVersion}"
+    debugImplementation "com.facebook.stetho:stetho-okhttp3:${stethoLibVersion}"
 }
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -42,3 +42,9 @@
 -dontwarn javax.annotation.**
 # A resource is loaded with a relative path so the package of this class must be preserved.
 -keepnames class okhttp3.internal.publicsuffix.PublicSuffixDatabase
+-keepclassmembers class * implements java.io.Serializable {
+    static final long serialVersionUID;
+    !static !transient <fields>;
+    private void writeObject(java.io.ObjectOutputStream);
+    private void readObject(java.io.ObjectInputStream);
+}
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -9,6 +9,7 @@
    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>

    <application
        android:name=".App"
@@ -76,10 +77,6 @@
            android:name=".about.AboutActivity"
            android:label="@string/title_activity_about"/>

-        <activity
-            android:name=".history.HistoryActivity"
-            android:label="@string/title_activity_history"/>
-
        <service android:name=".local.subscription.services.SubscriptionsImportService"/>
        <service android:name=".local.subscription.services.SubscriptionsExportService"/>

@@ -122,6 +119,7 @@
        <activity
            android:name=".ReCaptchaActivity"
            android:label="@string/reCaptchaActivity"/>
+        <activity android:name=".download.ExtSDDownloadFailedActivity" />

        <provider
            android:name="android.support.v4.content.FileProvider"
@@ -241,4 +239,4 @@
            android:name=".RouterActivity$FetcherService"
            android:exported="false"/>
    </application>
-</manifest>
+</manifest>
--- a/app/src/main/java/org/schabi/newpipe/App.java
+++ b/app/src/main/java/org/schabi/newpipe/App.java
@@ -5,6 +5,7 @@ import android.app.NotificationChannel;
 import android.app.NotificationManager;
 import android.content.Context;
 import android.os.Build;
+import android.preference.PreferenceManager;
 import android.support.annotation.Nullable;
 import android.util.Log;

@@ -21,6 +22,7 @@ import org.acra.config.ConfigurationBuilder;
 import org.acra.sender.ReportSenderFactory;
 import org.schabi.newpipe.extractor.Downloader;
 import org.schabi.newpipe.extractor.NewPipe;
+import org.schabi.newpipe.extractor.utils.Localization;
 import org.schabi.newpipe.report.AcraReportSenderFactory;
 import org.schabi.newpipe.report.ErrorActivity;
 import org.schabi.newpipe.report.UserAction;
@@ -65,7 +67,8 @@ public class App extends Application {
    private RefWatcher refWatcher;

    @SuppressWarnings("unchecked")
-    private static final Class<? extends ReportSenderFactory>[] reportSenderFactoryClasses = new Class[]{AcraReportSenderFactory.class};
+    private static final Class<? extends ReportSenderFactory>[]
+            reportSenderFactoryClasses = new Class[]{AcraReportSenderFactory.class};

    @Override
    protected void attachBaseContext(Context base) {
@@ -88,7 +91,8 @@ public class App extends Application {
        // Initialize settings first because others inits can use its values
        SettingsActivity.initSettings(this);

-        NewPipe.init(getDownloader());
+        NewPipe.init(getDownloader(),
+                org.schabi.newpipe.util.Localization.getPreferredExtractorLocal(this));
        StateSaver.init(this);
        initNotificationChannel();

@@ -106,7 +110,7 @@ public class App extends Application {
        // https://github.com/ReactiveX/RxJava/wiki/What's-different-in-2.0#error-handling
        RxJavaPlugins.setErrorHandler(new Consumer<Throwable>() {
            @Override
-            public void accept(@NonNull Throwable throwable) throws Exception {
+            public void accept(@NonNull Throwable throwable) {
                Log.e(TAG, "RxJavaPlugins.ErrorHandler called with -> : " +
                        "throwable = [" + throwable.getClass().getName() + "]");

@@ -180,7 +184,11 @@ public class App extends Application {
            ACRA.init(this, acraConfig);
        } catch (ACRAConfigurationException ace) {
            ace.printStackTrace();
-            ErrorActivity.reportError(this, ace, null, null, ErrorActivity.ErrorInfo.make(UserAction.SOMETHING_ELSE, "none",
+            ErrorActivity.reportError(this,
+                    ace,
+                    null,
+                    null,
+                    ErrorActivity.ErrorInfo.make(UserAction.SOMETHING_ELSE, "none",
                    "Could not initialize ACRA crash report", R.string.app_ui_crash));
        }
    }
@@ -200,7 +208,8 @@ public class App extends Application {
        NotificationChannel mChannel = new NotificationChannel(id, name, importance);
        mChannel.setDescription(description);

-        NotificationManager mNotificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
+        NotificationManager mNotificationManager =
+                (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
        mNotificationManager.createNotificationChannel(mChannel);
    }

--- a/app/src/main/java/org/schabi/newpipe/BaseFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/BaseFragment.java
@@ -4,6 +4,7 @@ import android.content.Context;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentManager;
 import android.support.v7.app.AppCompatActivity;
 import android.util.Log;
 import android.view.View;
@@ -12,14 +13,24 @@ import com.nostra13.universalimageloader.core.ImageLoader;
 import com.squareup.leakcanary.RefWatcher;

 import icepick.Icepick;
+import icepick.State;

 public abstract class BaseFragment extends Fragment {
    protected final String TAG = getClass().getSimpleName() + "@" + Integer.toHexString(hashCode());
-    protected boolean DEBUG = MainActivity.DEBUG;
+    protected final boolean DEBUG = MainActivity.DEBUG;

    protected AppCompatActivity activity;
    public static final ImageLoader imageLoader = ImageLoader.getInstance();

+    //These values are used for controlling framgents when they are part of the frontpage
+    @State
+    protected boolean useAsFrontPage = false;
+    protected boolean mIsVisibleToUser = false;
+
+    public void useAsFrontPage(boolean value) {
+        useAsFrontPage = value;
+    }
+
    /*//////////////////////////////////////////////////////////////////////////
    // Fragment's Lifecycle
    //////////////////////////////////////////////////////////////////////////*/
@@ -72,6 +83,12 @@ public abstract class BaseFragment extends Fragment {
        if (refWatcher != null) refWatcher.watch(this);
    }

+    @Override
+    public void setUserVisibleHint(boolean isVisibleToUser) {
+        super.setUserVisibleHint(isVisibleToUser);
+        mIsVisibleToUser = isVisibleToUser;
+    }
+
    /*//////////////////////////////////////////////////////////////////////////
    // Init
    //////////////////////////////////////////////////////////////////////////*/
@@ -88,8 +105,15 @@ public abstract class BaseFragment extends Fragment {

    public void setTitle(String title) {
        if (DEBUG) Log.d(TAG, "setTitle() called with: title = [" + title + "]");
-        if (activity != null && activity.getSupportActionBar() != null) {
+        if((!useAsFrontPage || mIsVisibleToUser)
+            && (activity != null && activity.getSupportActionBar() != null)) {
            activity.getSupportActionBar().setTitle(title);
        }
    }
+
+    protected FragmentManager getFM() {
+        return getParentFragment() == null
+                ? getFragmentManager()
+                : getParentFragment().getFragmentManager();
+    }
 }
--- a/app/src/main/java/org/schabi/newpipe/Downloader.java
+++ b/app/src/main/java/org/schabi/newpipe/Downloader.java
@@ -4,6 +4,7 @@ import android.support.annotation.Nullable;
 import android.text.TextUtils;

 import org.schabi.newpipe.extractor.exceptions.ReCaptchaException;
+import org.schabi.newpipe.extractor.utils.Localization;

 import java.io.IOException;
 import java.io.InputStream;
@@ -43,7 +44,7 @@ public class Downloader implements org.schabi.newpipe.extractor.Downloader {

    private static Downloader instance;
    private String mCookies;
-    private OkHttpClient client;
+    private final OkHttpClient client;

    private Downloader(OkHttpClient.Builder builder) {
        this.client = builder
@@ -88,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 {
@@ -103,13 +105,13 @@ public class Downloader implements org.schabi.newpipe.extractor.Downloader {
     * but set the HTTP header field "Accept-Language" to the supplied string.
     *
     * @param siteUrl  the URL of the text file to return the contents of
-     * @param language the language (usually a 2-character code) to set as the preferred language
+     * @param localization the language and country (usually a 2-character code) to set
     * @return the contents of the specified text file
     */
    @Override
-    public String download(String siteUrl, String language) throws IOException, ReCaptchaException {
+    public String download(String siteUrl, Localization localization) throws IOException, ReCaptchaException {
        Map<String, String> requestProperties = new HashMap<>();
-        requestProperties.put("Accept-Language", language);
+        requestProperties.put("Accept-Language", localization.getLanguage());
        return download(siteUrl, requestProperties);
    }

--- a/app/src/main/java/org/schabi/newpipe/MainActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/MainActivity.java
@@ -23,7 +23,7 @@ package org.schabi.newpipe;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
-import android.net.Uri;
+import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
@@ -43,18 +43,22 @@ import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
+import android.view.Window;
+import android.view.WindowManager;
 import android.widget.Button;
-import android.widget.ImageButton;
+import android.widget.ImageView;
 import android.widget.TextView;

 import org.schabi.newpipe.extractor.NewPipe;
 import org.schabi.newpipe.extractor.StreamingService;
+import org.schabi.newpipe.extractor.exceptions.ExtractionException;
 import org.schabi.newpipe.fragments.BackPressable;
 import org.schabi.newpipe.fragments.MainFragment;
 import org.schabi.newpipe.fragments.detail.VideoDetailFragment;
 import org.schabi.newpipe.fragments.list.search.SearchFragment;
 import org.schabi.newpipe.report.ErrorActivity;
 import org.schabi.newpipe.util.Constants;
+import org.schabi.newpipe.util.KioskTranslator;
 import org.schabi.newpipe.util.NavigationHelper;
 import org.schabi.newpipe.util.PermissionHelper;
 import org.schabi.newpipe.util.ServiceHelper;
@@ -70,6 +74,19 @@ public class MainActivity extends AppCompatActivity {
    private NavigationView drawerItems = null;
    private TextView headerServiceView = null;

+    private boolean servicesShown = false;
+    private ImageView serviceArrow;
+
+    private static final int ITEM_ID_SUBSCRIPTIONS = - 1;
+    private static final int ITEM_ID_FEED = - 2;
+    private static final int ITEM_ID_BOOKMARKS = - 3;
+    private static final int ITEM_ID_DOWNLOADS = - 4;
+    private static final int ITEM_ID_HISTORY = - 5;
+    private static final int ITEM_ID_SETTINGS = 0;
+    private static final int ITEM_ID_ABOUT = 1;
+
+    private static final int ORDER = 0;
+
    /*//////////////////////////////////////////////////////////////////////////
    // Activity's LifeCycle
    //////////////////////////////////////////////////////////////////////////*/
@@ -83,28 +100,64 @@ public class MainActivity extends AppCompatActivity {
        super.onCreate(savedInstanceState);
        setContentView(R.layout.activity_main);

+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            Window w = getWindow();
+            w.setFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS, WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
+        }
+
        if (getSupportFragmentManager() != null && getSupportFragmentManager().getBackStackEntryCount() == 0) {
            initFragments();
        }

        setSupportActionBar(findViewById(R.id.toolbar));
-        setupDrawer();
+        try {
+            setupDrawer();
+        } catch (Exception e) {
+            ErrorActivity.reportUiError(this, e);
+        }
    }

-    private void setupDrawer() {
+    private void setupDrawer() throws Exception {
        final Toolbar toolbar = findViewById(R.id.toolbar);
        drawer = findViewById(R.id.drawer_layout);
        drawerItems = findViewById(R.id.navigation);

-        for(StreamingService s : NewPipe.getServices()) {
-            final String title = s.getServiceInfo().getName() +
-                    (ServiceHelper.isBeta(s) ? " (beta)" : "");
-            final MenuItem item = drawerItems.getMenu()
-                    .add(R.id.menu_services_group, s.getServiceId(), 0, title);
-            item.setIcon(ServiceHelper.getIcon(s.getServiceId()));
+        //Tabs
+        int currentServiceId = ServiceHelper.getSelectedServiceId(this);
+        StreamingService service = NewPipe.getService(currentServiceId);
+
+        int kioskId = 0;
+
+        for (final String ks : service.getKioskList().getAvailableKiosks()) {
+            drawerItems.getMenu()
+                    .add(R.id.menu_tabs_group, kioskId, 0, KioskTranslator.getTranslatedKioskName(ks, this))
+                    .setIcon(KioskTranslator.getKioskIcons(ks, this));
+            kioskId ++;
        }

-        drawerItems.getMenu().getItem(ServiceHelper.getSelectedServiceId(this)).setChecked(true);
+        drawerItems.getMenu()
+                .add(R.id.menu_tabs_group, ITEM_ID_SUBSCRIPTIONS, ORDER, R.string.tab_subscriptions)
+                .setIcon(ThemeHelper.resolveResourceIdFromAttr(this, R.attr.ic_channel));
+        drawerItems.getMenu()
+                .add(R.id.menu_tabs_group, ITEM_ID_FEED, ORDER, R.string.fragment_whats_new)
+                .setIcon(ThemeHelper.resolveResourceIdFromAttr(this, R.attr.rss));
+        drawerItems.getMenu()
+                .add(R.id.menu_tabs_group, ITEM_ID_BOOKMARKS, ORDER, R.string.tab_bookmarks)
+                .setIcon(ThemeHelper.resolveResourceIdFromAttr(this, R.attr.ic_bookmark));
+        drawerItems.getMenu()
+                .add(R.id.menu_tabs_group, ITEM_ID_DOWNLOADS, ORDER, R.string.downloads)
+                .setIcon(ThemeHelper.resolveResourceIdFromAttr(this, R.attr.download));
+        drawerItems.getMenu()
+                .add(R.id.menu_tabs_group, ITEM_ID_HISTORY, ORDER, R.string.action_history)
+                .setIcon(ThemeHelper.resolveResourceIdFromAttr(this, R.attr.history));
+
+        //Settings and About
+        drawerItems.getMenu()
+                .add(R.id.menu_options_about_group, ITEM_ID_SETTINGS, ORDER, R.string.settings)
+                .setIcon(ThemeHelper.resolveResourceIdFromAttr(this, R.attr.settings));
+        drawerItems.getMenu()
+                .add(R.id.menu_options_about_group, ITEM_ID_ABOUT, ORDER, R.string.tab_about)
+                .setIcon(ThemeHelper.resolveResourceIdFromAttr(this, R.attr.info));

        toggle = new ActionBarDrawerToggle(this, drawer, toolbar, R.string.drawer_open, R.string.drawer_close);
        toggle.syncState();
@@ -119,53 +172,179 @@ public class MainActivity extends AppCompatActivity {

            @Override
            public void onDrawerClosed(View drawerView) {
+                if(servicesShown) {
+                    toggleServices();
+                }
                if (lastService != ServiceHelper.getSelectedServiceId(MainActivity.this)) {
                    new Handler(Looper.getMainLooper()).post(MainActivity.this::recreate);
                }
            }
        });

-        drawerItems.setNavigationItemSelectedListener(this::changeService);
-
-        setupDrawerFooter();
+        drawerItems.setNavigationItemSelectedListener(this::drawerItemSelected);
        setupDrawerHeader();
    }

-
-    private boolean changeService(MenuItem item) {
-        if (item.getGroupId() == R.id.menu_services_group) {
-            drawerItems.getMenu().getItem(ServiceHelper.getSelectedServiceId(this)).setChecked(false);
-            ServiceHelper.setSelectedServiceId(this, item.getItemId());
-            drawerItems.getMenu().getItem(ServiceHelper.getSelectedServiceId(this)).setChecked(true);
-        } else {
-            return false;
+    private boolean drawerItemSelected(MenuItem item) {
+        switch (item.getGroupId()) {
+            case R.id.menu_services_group:
+                changeService(item);
+                break;
+            case R.id.menu_tabs_group:
+                try {
+                    tabSelected(item);
+                } catch (Exception e) {
+                    ErrorActivity.reportUiError(this, e);
+                }
+                break;
+            case R.id.menu_options_about_group:
+                optionsAboutSelected(item);
+                break;
+            default:
+                return false;
        }
+
        drawer.closeDrawers();
        return true;
    }

-    private void setupDrawerFooter() {
-        ImageButton settings = findViewById(R.id.drawer_settings);
-        ImageButton downloads = findViewById(R.id.drawer_downloads);
-        ImageButton history = findViewById(R.id.drawer_history);
+    private  void changeService(MenuItem item) {
+        drawerItems.getMenu().getItem(ServiceHelper.getSelectedServiceId(this)).setChecked(false);
+        ServiceHelper.setSelectedServiceId(this, item.getItemId());
+        drawerItems.getMenu().getItem(ServiceHelper.getSelectedServiceId(this)).setChecked(true);
+    }

-        settings.setOnClickListener(view -> NavigationHelper.openSettings(this));
-        downloads.setOnClickListener(view ->NavigationHelper.openDownloads(this));
-        history.setOnClickListener(view ->
-                NavigationHelper.openStatisticFragment(getSupportFragmentManager()));
+    private void tabSelected(MenuItem item) throws ExtractionException {
+        switch(item.getItemId()) {
+            case ITEM_ID_SUBSCRIPTIONS:
+                NavigationHelper.openSubscriptionFragment(getSupportFragmentManager());
+                break;
+            case ITEM_ID_FEED:
+                NavigationHelper.openWhatsNewFragment(getSupportFragmentManager());
+                break;
+            case ITEM_ID_BOOKMARKS:
+                NavigationHelper.openBookmarksFragment(getSupportFragmentManager());
+                break;
+            case ITEM_ID_DOWNLOADS:
+                NavigationHelper.openDownloads(this);
+                break;
+            case ITEM_ID_HISTORY:
+                NavigationHelper.openStatisticFragment(getSupportFragmentManager());
+                break;
+            default:
+                int currentServiceId = ServiceHelper.getSelectedServiceId(this);
+                StreamingService service = NewPipe.getService(currentServiceId);
+                String serviceName = "";
+
+                int kioskId = 0;
+                for (final String ks : service.getKioskList().getAvailableKiosks()) {
+                    if(kioskId == item.getItemId()) {
+                        serviceName = ks;
+                    }
+                    kioskId ++;
+                }
+
+                NavigationHelper.openKioskFragment(getSupportFragmentManager(), currentServiceId, serviceName);
+                break;
+        }
+    }
+
+    private void optionsAboutSelected(MenuItem item) {
+        switch(item.getItemId()) {
+            case ITEM_ID_SETTINGS:
+                NavigationHelper.openSettings(this);
+                break;
+            case ITEM_ID_ABOUT:
+                NavigationHelper.openAbout(this);
+                break;
+        }
    }

    private void setupDrawerHeader() {
-        headerServiceView = findViewById(R.id.drawer_header_service_view);
-        Button action = findViewById(R.id.drawer_header_action_button);
+        NavigationView navigationView = findViewById(R.id.navigation);
+        View hView =  navigationView.getHeaderView(0);
+
+        serviceArrow = hView.findViewById(R.id.drawer_arrow);
+        headerServiceView = hView.findViewById(R.id.drawer_header_service_view);
+        Button action = hView.findViewById(R.id.drawer_header_action_button);
        action.setOnClickListener(view -> {
-            Intent intent = new Intent(Intent.ACTION_VIEW);
-            intent.setData(Uri.parse("https://newpipe.schabi.org/blog/"));
-            startActivity(intent);
-            drawer.closeDrawers();
+            toggleServices();
        });
    }

+    private void toggleServices() {
+        servicesShown = !servicesShown;
+
+        drawerItems.getMenu().removeGroup(R.id.menu_services_group);
+        drawerItems.getMenu().removeGroup(R.id.menu_tabs_group);
+        drawerItems.getMenu().removeGroup(R.id.menu_options_about_group);
+
+        if(servicesShown) {
+            showServices();
+        } else {
+            try {
+                showTabs();
+            } catch (Exception e) {
+                ErrorActivity.reportUiError(this, e);
+            }
+        }
+    }
+
+    private void showServices() {
+        serviceArrow.setImageResource(R.drawable.ic_arrow_up_white);
+
+        for(StreamingService s : NewPipe.getServices()) {
+            final String title = s.getServiceInfo().getName() +
+                    (ServiceHelper.isBeta(s) ? " (beta)" : "");
+
+            drawerItems.getMenu()
+                    .add(R.id.menu_services_group, s.getServiceId(), ORDER, title)
+                    .setIcon(ServiceHelper.getIcon(s.getServiceId()));
+        }
+        drawerItems.getMenu().getItem(ServiceHelper.getSelectedServiceId(this)).setChecked(true);
+    }
+
+    private void showTabs() throws ExtractionException {
+        serviceArrow.setImageResource(R.drawable.ic_arrow_down_white);
+
+        //Tabs
+        int currentServiceId = ServiceHelper.getSelectedServiceId(this);
+        StreamingService service = NewPipe.getService(currentServiceId);
+
+        int kioskId = 0;
+
+        for (final String ks : service.getKioskList().getAvailableKiosks()) {
+            drawerItems.getMenu()
+                    .add(R.id.menu_tabs_group, kioskId, ORDER, KioskTranslator.getTranslatedKioskName(ks, this))
+                    .setIcon(KioskTranslator.getKioskIcons(ks, this));
+            kioskId ++;
+        }
+
+        drawerItems.getMenu()
+                .add(R.id.menu_tabs_group, ITEM_ID_SUBSCRIPTIONS, ORDER, R.string.tab_subscriptions)
+                .setIcon(ThemeHelper.resolveResourceIdFromAttr(this, R.attr.ic_channel));
+        drawerItems.getMenu()
+                .add(R.id.menu_tabs_group, ITEM_ID_FEED, ORDER, R.string.fragment_whats_new)
+                .setIcon(ThemeHelper.resolveResourceIdFromAttr(this, R.attr.rss));
+        drawerItems.getMenu()
+                .add(R.id.menu_tabs_group, ITEM_ID_BOOKMARKS, ORDER, R.string.tab_bookmarks)
+                .setIcon(ThemeHelper.resolveResourceIdFromAttr(this, R.attr.ic_bookmark));
+        drawerItems.getMenu()
+                .add(R.id.menu_tabs_group, ITEM_ID_DOWNLOADS, ORDER, R.string.downloads)
+                .setIcon(ThemeHelper.resolveResourceIdFromAttr(this, R.attr.download));
+        drawerItems.getMenu()
+                .add(R.id.menu_tabs_group, ITEM_ID_HISTORY, ORDER, R.string.action_history)
+                .setIcon(ThemeHelper.resolveResourceIdFromAttr(this, R.attr.history));
+
+        //Settings and About
+        drawerItems.getMenu()
+                .add(R.id.menu_options_about_group, ITEM_ID_SETTINGS, ORDER, R.string.settings)
+                .setIcon(ThemeHelper.resolveResourceIdFromAttr(this, R.attr.settings));
+        drawerItems.getMenu()
+                .add(R.id.menu_options_about_group, ITEM_ID_ABOUT, ORDER, R.string.tab_about)
+                .setIcon(ThemeHelper.resolveResourceIdFromAttr(this, R.attr.info));
+    }
+
    @Override
    protected void onDestroy() {
        super.onDestroy();
@@ -329,16 +508,13 @@ public class MainActivity extends AppCompatActivity {
                onHomeButtonPressed();
                return true;
            case R.id.action_show_downloads:
-                return NavigationHelper.openDownloads(this);
+                    return NavigationHelper.openDownloads(this);
            case R.id.action_history:
-                NavigationHelper.openStatisticFragment(getSupportFragmentManager());
-                return true;
-            case R.id.action_about:
-                NavigationHelper.openAbout(this);
-                return true;
+                    NavigationHelper.openStatisticFragment(getSupportFragmentManager());
+                    return true;
            case R.id.action_settings:
-                NavigationHelper.openSettings(this);
-                return true;
+                    NavigationHelper.openSettings(this);
+                    return true;
            default:
                return super.onOptionsItemSelected(item);
        }
@@ -382,31 +558,45 @@ public class MainActivity extends AppCompatActivity {
    }

    private void handleIntent(Intent intent) {
-        if (DEBUG) Log.d(TAG, "handleIntent() called with: intent = [" + intent + "]");
+        try {
+            if (DEBUG) Log.d(TAG, "handleIntent() called with: intent = [" + intent + "]");

-        if (intent.hasExtra(Constants.KEY_LINK_TYPE)) {
-            String url = intent.getStringExtra(Constants.KEY_URL);
-            int serviceId = intent.getIntExtra(Constants.KEY_SERVICE_ID, 0);
-            String title = intent.getStringExtra(Constants.KEY_TITLE);
-            switch (((StreamingService.LinkType) intent.getSerializableExtra(Constants.KEY_LINK_TYPE))) {
-                case STREAM:
-                    boolean autoPlay = intent.getBooleanExtra(VideoDetailFragment.AUTO_PLAY, false);
-                    NavigationHelper.openVideoDetailFragment(getSupportFragmentManager(), serviceId, url, title, autoPlay);
-                    break;
-                case CHANNEL:
-                    NavigationHelper.openChannelFragment(getSupportFragmentManager(), serviceId, url, title);
-                    break;
-                case PLAYLIST:
-                    NavigationHelper.openPlaylistFragment(getSupportFragmentManager(), serviceId, url, title);
-                    break;
+            if (intent.hasExtra(Constants.KEY_LINK_TYPE)) {
+                String url = intent.getStringExtra(Constants.KEY_URL);
+                int serviceId = intent.getIntExtra(Constants.KEY_SERVICE_ID, 0);
+                String title = intent.getStringExtra(Constants.KEY_TITLE);
+                switch (((StreamingService.LinkType) intent.getSerializableExtra(Constants.KEY_LINK_TYPE))) {
+                    case STREAM:
+                        boolean autoPlay = intent.getBooleanExtra(VideoDetailFragment.AUTO_PLAY, false);
+                        NavigationHelper.openVideoDetailFragment(getSupportFragmentManager(), serviceId, url, title, autoPlay);
+                        break;
+                    case CHANNEL:
+                        NavigationHelper.openChannelFragment(getSupportFragmentManager(),
+                                serviceId,
+                                url,
+                                title);
+                        break;
+                    case PLAYLIST:
+                        NavigationHelper.openPlaylistFragment(getSupportFragmentManager(),
+                                serviceId,
+                                url,
+                                title);
+                        break;
+                }
+            } else if (intent.hasExtra(Constants.KEY_OPEN_SEARCH)) {
+                String searchString = intent.getStringExtra(Constants.KEY_SEARCH_STRING);
+                if (searchString == null) searchString = "";
+                int serviceId = intent.getIntExtra(Constants.KEY_SERVICE_ID, 0);
+                NavigationHelper.openSearchFragment(
+                        getSupportFragmentManager(),
+                        serviceId,
+                        searchString);
+
+            } else {
+                NavigationHelper.gotoMainFragment(getSupportFragmentManager());
            }
-        } else if (intent.hasExtra(Constants.KEY_OPEN_SEARCH)) {
-            String searchQuery = intent.getStringExtra(Constants.KEY_QUERY);
-            if (searchQuery == null) searchQuery = "";
-            int serviceId = intent.getIntExtra(Constants.KEY_SERVICE_ID, 0);
-            NavigationHelper.openSearchFragment(getSupportFragmentManager(), serviceId, searchQuery);
-        } else {
-            NavigationHelper.gotoMainFragment(getSupportFragmentManager());
+        } catch (Exception e) {
+            ErrorActivity.reportUiError(this, e);
        }
    }
 }
--- a/app/src/main/java/org/schabi/newpipe/ReCaptchaActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/ReCaptchaActivity.java
@@ -85,7 +85,7 @@ public class ReCaptchaActivity extends AppCompatActivity {
    }

    private class ReCaptchaWebViewClient extends WebViewClient {
-        private Activity context;
+        private final Activity context;
        private String mCookies;

        ReCaptchaWebViewClient(Activity ctx) {
--- a/app/src/main/java/org/schabi/newpipe/RouterActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/RouterActivity.java
@@ -1,13 +1,16 @@
 package org.schabi.newpipe;

+import android.annotation.SuppressLint;
 import android.app.IntentService;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.SharedPreferences;
+import android.content.pm.PackageManager;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
 import android.support.annotation.DrawableRes;
+import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v4.app.NotificationCompat;
 import android.support.v7.app.AlertDialog;
@@ -23,6 +26,7 @@ import android.widget.RadioButton;
 import android.widget.RadioGroup;
 import android.widget.Toast;

+import org.schabi.newpipe.download.DownloadDialog;
 import org.schabi.newpipe.extractor.Info;
 import org.schabi.newpipe.extractor.NewPipe;
 import org.schabi.newpipe.extractor.StreamingService;
@@ -31,6 +35,7 @@ import org.schabi.newpipe.extractor.channel.ChannelInfo;
 import org.schabi.newpipe.extractor.exceptions.ExtractionException;
 import org.schabi.newpipe.extractor.playlist.PlaylistInfo;
 import org.schabi.newpipe.extractor.stream.StreamInfo;
+import org.schabi.newpipe.extractor.stream.VideoStream;
 import org.schabi.newpipe.player.helper.PlayerHelper;
 import org.schabi.newpipe.player.playqueue.ChannelPlayQueue;
 import org.schabi.newpipe.player.playqueue.PlayQueue;
@@ -38,6 +43,7 @@ import org.schabi.newpipe.player.playqueue.PlaylistPlayQueue;
 import org.schabi.newpipe.player.playqueue.SinglePlayQueue;
 import org.schabi.newpipe.report.UserAction;
 import org.schabi.newpipe.util.ExtractorHelper;
+import org.schabi.newpipe.util.ListHelper;
 import org.schabi.newpipe.util.NavigationHelper;
 import org.schabi.newpipe.util.PermissionHelper;
 import org.schabi.newpipe.util.ThemeHelper;
@@ -75,7 +81,9 @@ public class RouterActivity extends AppCompatActivity {
    protected int selectedPreviously = -1;

    protected String currentUrl;
-    protected CompositeDisposable disposables = new CompositeDisposable();
+    protected final CompositeDisposable disposables = new CompositeDisposable();
+
+    private boolean selectionIsDownload = false;

    @Override
    protected void onCreate(Bundle savedInstanceState) {
@@ -104,7 +112,7 @@ public class RouterActivity extends AppCompatActivity {
    @Override
    protected void onStart() {
        super.onStart();
-
+        
        handleUrl(currentUrl);
    }

@@ -165,20 +173,27 @@ public class RouterActivity extends AppCompatActivity {
        final String videoPlayerKey = getString(R.string.video_player_key);
        final String backgroundPlayerKey = getString(R.string.background_player_key);
        final String popupPlayerKey = getString(R.string.popup_player_key);
+        final String downloadKey = getString(R.string.download_key);
        final String alwaysAskKey = getString(R.string.always_ask_open_action_key);

        if (selectedChoiceKey.equals(alwaysAskKey)) {
            final List<AdapterChoiceItem> choices = getChoicesForService(currentService, currentLinkType);

-            if (choices.size() == 1) {
-                handleChoice(choices.get(0).key);
-            } else if (choices.size() == 0) {
-                handleChoice(showInfoKey);
-            } else {
-                showDialog(choices);
+            switch (choices.size()) {
+                case 1:
+                    handleChoice(choices.get(0).key);
+                    break;
+                case 0:
+                    handleChoice(showInfoKey);
+                    break;
+                default:
+                    showDialog(choices);
+                    break;
            }
        } else if (selectedChoiceKey.equals(showInfoKey)) {
            handleChoice(showInfoKey);
+        } else if (selectedChoiceKey.equals(downloadKey)) {
+            handleChoice(downloadKey);
        } else {
            final boolean isExtVideoEnabled = preferences.getBoolean(getString(R.string.use_external_video_player_key), false);
            final boolean isExtAudioEnabled = preferences.getBoolean(getString(R.string.use_external_audio_player_key), false);
@@ -236,7 +251,9 @@ public class RouterActivity extends AppCompatActivity {
                .setCancelable(true)
                .setNegativeButton(R.string.just_once, dialogButtonsClickListener)
                .setPositiveButton(R.string.always, dialogButtonsClickListener)
-                .setOnDismissListener((dialog) -> finish())
+                .setOnDismissListener((dialog) -> {
+                    if(!selectionIsDownload) finish();
+                })
                .create();

        //noinspection CodeBlock2Expr
@@ -316,6 +333,9 @@ public class RouterActivity extends AppCompatActivity {
                    resolveResourceIdFromAttr(context, R.attr.audio)));
        }

+        returnList.add(new AdapterChoiceItem(getString(R.string.download_key), getString(R.string.download),
+                resolveResourceIdFromAttr(context, R.attr.download)));
+
        return returnList;
    }

@@ -347,6 +367,14 @@ public class RouterActivity extends AppCompatActivity {
            return;
        }

+        if (selectedChoiceKey.equals(getString(R.string.download_key))) {
+            if (PermissionHelper.checkStoragePermissions(this, PermissionHelper.DOWNLOAD_DIALOG_REQUEST_CODE)) {
+                selectionIsDownload = true;
+                openDownloadDialog();
+            }
+            return;
+        }
+
        // stop and bypass FetcherService if InfoScreen was selected since
        // StreamDetailFragment can fetch data itself
        if (selectedChoiceKey.equals(getString(R.string.show_info_key))) {
@@ -373,6 +401,47 @@ public class RouterActivity extends AppCompatActivity {
        finish();
    }

+    @SuppressLint("CheckResult")
+    private void openDownloadDialog() {
+        ExtractorHelper.getStreamInfo(currentServiceId, currentUrl, true)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe((@NonNull StreamInfo result) -> {
+                    List<VideoStream> sortedVideoStreams = ListHelper.getSortedStreamVideosList(this,
+                            result.getVideoStreams(),
+                            result.getVideoOnlyStreams(),
+                            false);
+                    int selectedVideoStreamIndex = ListHelper.getDefaultResolutionIndex(this,
+                            sortedVideoStreams);
+
+                    android.support.v4.app.FragmentManager fm = getSupportFragmentManager();
+                    DownloadDialog downloadDialog = DownloadDialog.newInstance(result);
+                    downloadDialog.setVideoStreams(sortedVideoStreams);
+                    downloadDialog.setAudioStreams(result.getAudioStreams());
+                    downloadDialog.setSelectedVideoStream(selectedVideoStreamIndex);
+                    downloadDialog.show(fm, "downloadDialog");
+                    fm.executePendingTransactions();
+                    downloadDialog.getDialog().setOnDismissListener(dialog -> {
+                        finish();
+                    });
+                }, (@NonNull Throwable throwable) -> {
+                    onError();
+                });
+    }
+
+    @Override
+    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+        for (int i: grantResults){
+            if (i == PackageManager.PERMISSION_DENIED){
+                finish();
+                return;
+            }
+        }
+        if (requestCode == PermissionHelper.DOWNLOAD_DIALOG_REQUEST_CODE) {
+            openDownloadDialog();
+        }
+    }
+
    private static class AdapterChoiceItem {
        final String description, key;
        @DrawableRes final int icon;
@@ -473,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;
@@ -486,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);

--- a/app/src/main/java/org/schabi/newpipe/about/AboutActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/about/AboutActivity.java
@@ -128,47 +128,31 @@ public class AboutActivity extends AppCompatActivity {
        public View onCreateView(LayoutInflater inflater, ViewGroup container,
                                 Bundle savedInstanceState) {
            View rootView = inflater.inflate(R.layout.fragment_about, container, false);
+            Context context = this.getContext();
+
            TextView version = rootView.findViewById(R.id.app_version);
            version.setText(BuildConfig.VERSION_NAME);

            View githubLink = rootView.findViewById(R.id.github_link);
-            githubLink.setOnClickListener(new OnGithubLinkClickListener());
+            githubLink.setOnClickListener(nv -> openWebsite(context.getString(R.string.github_url), context));

            View donationLink = rootView.findViewById(R.id.donation_link);
-            donationLink.setOnClickListener(new OnDonationLinkClickListener());
+            donationLink.setOnClickListener(v -> openWebsite(context.getString(R.string.donation_url), context));

            View websiteLink = rootView.findViewById(R.id.website_link);
-            websiteLink.setOnClickListener(new OnWebsiteLinkClickListener());
+            websiteLink.setOnClickListener(nv -> openWebsite(context.getString(R.string.website_url), context));
+
+            View privacyPolicyLink = rootView.findViewById(R.id.privacy_policy_link);
+            privacyPolicyLink.setOnClickListener(v -> openWebsite(context.getString(R.string.privacy_policy_url), context));

            return rootView;
        }

-        private static class OnGithubLinkClickListener implements View.OnClickListener {
-            @Override
-            public void onClick(final View view) {
-                final Context context = view.getContext();
-                Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(context.getString(R.string.github_url)));
-                context.startActivity(intent);
-            }
+        private void openWebsite(String url, Context context) {
+            Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(url));
+            context.startActivity(intent);
        }

-        private static class OnDonationLinkClickListener implements View.OnClickListener {
-            @Override
-            public void onClick(final View view) {
-                final Context context = view.getContext();
-                Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(context.getString(R.string.donation_url)));
-                context.startActivity(intent);
-            }
-        }
-
-        private static class OnWebsiteLinkClickListener implements View.OnClickListener {
-            @Override
-            public void onClick(final View view) {
-                final Context context = view.getContext();
-                Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(context.getString(R.string.website_url)));
-                context.startActivity(intent);
-            }
-        }
    }


--- a/app/src/main/java/org/schabi/newpipe/about/LicenseFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/about/LicenseFragment.java
@@ -1,5 +1,6 @@
 package org.schabi.newpipe.about;

+import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
@@ -39,7 +40,7 @@ public class LicenseFragment extends Fragment {
     * @param license the license to show
     */
    public static void showLicense(Context context, License license) {
-        new LicenseFragmentHelper().execute(context, license);
+        new LicenseFragmentHelper((Activity) context).execute(license);
    }

    @Override
--- a/app/src/main/java/org/schabi/newpipe/about/LicenseFragmentHelper.java
+++ b/app/src/main/java/org/schabi/newpipe/about/LicenseFragmentHelper.java
@@ -1,8 +1,10 @@
 package org.schabi.newpipe.about;

+import android.app.Activity;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.os.AsyncTask;
+import android.support.annotation.Nullable;
 import android.support.v7.app.AlertDialog;
 import android.webkit.WebView;
 import org.schabi.newpipe.R;
@@ -10,26 +12,46 @@ import org.schabi.newpipe.util.ThemeHelper;

 import java.io.BufferedReader;
 import java.io.InputStreamReader;
+import java.lang.ref.WeakReference;

 public class LicenseFragmentHelper extends AsyncTask<Object, Void, Integer> {

-    private Context context;
+    final WeakReference<Activity> weakReference;
    private License license;

+    public LicenseFragmentHelper(@Nullable Activity activity) {
+        weakReference = new WeakReference<>(activity);
+    }
+
+    @Nullable
+    private Activity getActivity() {
+        Activity activity = weakReference.get();
+
+        if (activity != null && activity.isFinishing()) {
+            return null;
+        } else {
+            return activity;
+        }
+    }
+
    @Override
    protected Integer doInBackground(Object... objects) {
-        context = (Context) objects[0];
-        license = (License) objects[1];
+        license = (License) objects[0];
        return 1;
    }

    @Override
-    protected void onPostExecute(Integer result){
-        String webViewData = getFormattedLicense(context, license);
-        AlertDialog.Builder alert = new AlertDialog.Builder(context);
+    protected void onPostExecute(Integer result) {
+        Activity activity = getActivity();
+        if (activity == null) {
+            return;
+        }
+
+        String webViewData = getFormattedLicense(activity, license);
+        AlertDialog.Builder alert = new AlertDialog.Builder(activity);
        alert.setTitle(license.getName());

-        WebView wv = new WebView(context);
+        WebView wv = new WebView(activity);
        wv.loadData(webViewData, "text/html; charset=UTF-8", null);

        alert.setView(wv);
@@ -55,18 +77,18 @@ public class LicenseFragmentHelper extends AsyncTask<Object, Void, Integer> {
            throw new NullPointerException("license is null");
        }

-        String licenseContent = "";
+        StringBuilder licenseContent = new StringBuilder();
        String webViewData;
        try {
            BufferedReader in = new BufferedReader(new InputStreamReader(context.getAssets().open(license.getFilename()), "UTF-8"));
            String str;
            while ((str = in.readLine()) != null) {
-                licenseContent += str;
+                licenseContent.append(str);
            }
            in.close();

            // split the HTML file and insert the stylesheet into the HEAD of the file
-            String[] insert = licenseContent.split("</head>");
+            String[] insert = licenseContent.toString().split("</head>");
            webViewData = insert[0] + "<style type=\"text/css\">"
                    + getLicenseStylesheet(context) + "</style></head>"
                    + insert[1];
--- a/app/src/main/java/org/schabi/newpipe/database/BasicDAO.java
+++ b/app/src/main/java/org/schabi/newpipe/database/BasicDAO.java
@@ -30,7 +30,7 @@ public interface BasicDAO<Entity> {

    /* Deletes */
    @Delete
-    int delete(final Entity entity);
+    void delete(final Entity entity);

    @Delete
    int delete(final Collection<Entity> entities);
@@ -42,5 +42,5 @@ public interface BasicDAO<Entity> {
    int update(final Entity entity);

    @Update
-    int update(final Collection<Entity> entities);
+    void update(final Collection<Entity> entities);
 }
--- a/app/src/main/java/org/schabi/newpipe/database/history/dao/SearchHistoryDAO.java
+++ b/app/src/main/java/org/schabi/newpipe/database/history/dao/SearchHistoryDAO.java
@@ -4,7 +4,6 @@ import android.arch.persistence.room.Dao;
 import android.arch.persistence.room.Query;
 import android.support.annotation.Nullable;

-import org.schabi.newpipe.database.BasicDAO;
 import org.schabi.newpipe.database.history.model.SearchHistoryEntry;

 import java.util.List;
--- a/app/src/main/java/org/schabi/newpipe/database/history/dao/StreamHistoryDAO.java
+++ b/app/src/main/java/org/schabi/newpipe/database/history/dao/StreamHistoryDAO.java
@@ -5,7 +5,6 @@ import android.arch.persistence.room.Dao;
 import android.arch.persistence.room.Query;
 import android.support.annotation.Nullable;

-import org.schabi.newpipe.database.BasicDAO;
 import org.schabi.newpipe.database.history.model.StreamHistoryEntry;
 import org.schabi.newpipe.database.stream.StreamStatisticsEntry;
 import org.schabi.newpipe.database.history.model.StreamHistoryEntity;
--- a/app/src/main/java/org/schabi/newpipe/database/playlist/dao/PlaylistDAO.java
+++ b/app/src/main/java/org/schabi/newpipe/database/playlist/dao/PlaylistDAO.java
@@ -2,7 +2,6 @@ package org.schabi.newpipe.database.playlist.dao;

 import android.arch.persistence.room.Dao;
 import android.arch.persistence.room.Query;
-import android.arch.persistence.room.Transaction;

 import org.schabi.newpipe.database.BasicDAO;
 import org.schabi.newpipe.database.playlist.model.PlaylistEntity;
@@ -12,7 +11,6 @@ import java.util.List;
 import io.reactivex.Flowable;

 import static org.schabi.newpipe.database.playlist.model.PlaylistEntity.PLAYLIST_ID;
-import static org.schabi.newpipe.database.playlist.model.PlaylistEntity.PLAYLIST_NAME;
 import static org.schabi.newpipe.database.playlist.model.PlaylistEntity.PLAYLIST_TABLE;

@Dao
--- a/app/src/main/java/org/schabi/newpipe/database/playlist/dao/PlaylistStreamDAO.java
+++ b/app/src/main/java/org/schabi/newpipe/database/playlist/dao/PlaylistStreamDAO.java
@@ -8,7 +8,6 @@ import org.schabi.newpipe.database.BasicDAO;
 import org.schabi.newpipe.database.playlist.PlaylistMetadataEntry;
 import org.schabi.newpipe.database.playlist.PlaylistStreamEntry;
 import org.schabi.newpipe.database.playlist.model.PlaylistStreamEntity;
-import org.schabi.newpipe.database.stream.model.StreamEntity;

 import java.util.List;

--- a/app/src/main/java/org/schabi/newpipe/database/playlist/model/PlaylistEntity.java
+++ b/app/src/main/java/org/schabi/newpipe/database/playlist/model/PlaylistEntity.java
@@ -5,8 +5,6 @@ import android.arch.persistence.room.Entity;
 import android.arch.persistence.room.Index;
 import android.arch.persistence.room.PrimaryKey;

-import java.util.Date;
-
 import static org.schabi.newpipe.database.playlist.model.PlaylistEntity.PLAYLIST_NAME;
 import static org.schabi.newpipe.database.playlist.model.PlaylistEntity.PLAYLIST_TABLE;

--- a/app/src/main/java/org/schabi/newpipe/database/playlist/model/PlaylistRemoteEntity.java
+++ b/app/src/main/java/org/schabi/newpipe/database/playlist/model/PlaylistRemoteEntity.java
@@ -6,7 +6,6 @@ import android.arch.persistence.room.Ignore;
 import android.arch.persistence.room.Index;
 import android.arch.persistence.room.PrimaryKey;

-import org.schabi.newpipe.database.LocalItem;
 import org.schabi.newpipe.database.playlist.PlaylistLocalItem;
 import org.schabi.newpipe.extractor.playlist.PlaylistInfo;
 import org.schabi.newpipe.util.Constants;
@@ -71,6 +70,14 @@ public class PlaylistRemoteEntity implements PlaylistLocalItem {
                info.getUploaderName(), info.getStreamCount());
    }

+    @Ignore
+    public boolean isIdenticalTo(final PlaylistInfo info) {
+        return getServiceId() == info.getServiceId() && getName().equals(info.getName()) &&
+                getStreamCount() == info.getStreamCount() && getUrl().equals(info.getUrl()) &&
+                getThumbnailUrl().equals(info.getThumbnailUrl()) &&
+                getUploader().equals(info.getUploaderName());
+    }
+
    public long getUid() {
        return uid;
    }
--- a/app/src/main/java/org/schabi/newpipe/database/stream/dao/StreamDAO.java
+++ b/app/src/main/java/org/schabi/newpipe/database/stream/dao/StreamDAO.java
@@ -10,7 +10,6 @@ import org.schabi.newpipe.database.BasicDAO;
 import org.schabi.newpipe.database.playlist.model.PlaylistStreamEntity;
 import org.schabi.newpipe.database.stream.model.StreamEntity;
 import org.schabi.newpipe.database.history.model.StreamHistoryEntity;
-import org.schabi.newpipe.database.stream.model.StreamStateEntity;

 import java.util.ArrayList;
 import java.util.List;
@@ -23,7 +22,6 @@ import static org.schabi.newpipe.database.stream.model.StreamEntity.STREAM_SERVI
 import static org.schabi.newpipe.database.stream.model.StreamEntity.STREAM_TABLE;
 import static org.schabi.newpipe.database.stream.model.StreamEntity.STREAM_URL;
 import static org.schabi.newpipe.database.history.model.StreamHistoryEntity.STREAM_HISTORY_TABLE;
-import static org.schabi.newpipe.database.stream.model.StreamStateEntity.STREAM_STATE_TABLE;

@Dao
 public abstract class StreamDAO implements BasicDAO<StreamEntity> {
--- a/app/src/main/java/org/schabi/newpipe/download/DownloadActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/download/DownloadActivity.java
@@ -16,11 +16,12 @@ import org.schabi.newpipe.settings.SettingsActivity;
 import org.schabi.newpipe.util.ThemeHelper;

 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";
+
    @Override
    protected void onCreate(Bundle savedInstanceState) {
        // Service
@@ -42,7 +43,6 @@ public class DownloadActivity extends AppCompatActivity {
            actionBar.setDisplayShowTitleEnabled(true);
        }

-        // Fragment
        getWindow().getDecorView().getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
            @Override
            public void onGlobalLayout() {
@@ -53,10 +53,10 @@ public class DownloadActivity extends AppCompatActivity {
    }

    private void updateFragments() {
+        MissionsFragment fragment = new MissionsFragment();

-        MissionsFragment fragment = new AllMissionsFragment();
        getFragmentManager().beginTransaction()
-                .replace(R.id.frame, fragment)
+                .replace(R.id.frame, fragment, MISSIONS_FRAGMENT_TAG)
                .setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE)
                .commit();
    }
@@ -87,4 +87,8 @@ public class DownloadActivity extends AppCompatActivity {
        }
    }

+    @Override
+    public void onRestoreInstanceState(Bundle inState){
+        super.onRestoreInstanceState(inState);
+    }
 }
--- a/app/src/main/java/org/schabi/newpipe/download/DownloadDialog.java
+++ b/app/src/main/java/org/schabi/newpipe/download/DownloadDialog.java
@@ -1,13 +1,17 @@
 package org.schabi.newpipe.download;

 import android.content.Context;
+import android.content.SharedPreferences;
 import android.os.Bundle;
+import android.preference.PreferenceManager;
 import android.support.annotation.IdRes;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v4.app.DialogFragment;
+import android.support.v7.app.AlertDialog;
 import android.support.v7.widget.Toolbar;
 import android.util.Log;
+import android.util.SparseArray;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -22,40 +26,57 @@ import android.widget.Toast;

 import org.schabi.newpipe.MainActivity;
 import org.schabi.newpipe.R;
+import org.schabi.newpipe.extractor.MediaFormat;
+import org.schabi.newpipe.extractor.NewPipe;
 import org.schabi.newpipe.extractor.stream.AudioStream;
 import org.schabi.newpipe.extractor.stream.Stream;
 import org.schabi.newpipe.extractor.stream.StreamInfo;
+import org.schabi.newpipe.extractor.stream.SubtitlesStream;
 import org.schabi.newpipe.extractor.stream.VideoStream;
+import org.schabi.newpipe.extractor.utils.Localization;
 import org.schabi.newpipe.settings.NewPipeSettings;
 import org.schabi.newpipe.util.FilenameUtils;
 import org.schabi.newpipe.util.ListHelper;
 import org.schabi.newpipe.util.PermissionHelper;
+import org.schabi.newpipe.util.SecondaryStreamHelper;
 import org.schabi.newpipe.util.StreamItemAdapter;
 import org.schabi.newpipe.util.StreamItemAdapter.StreamSizeWrapper;
 import org.schabi.newpipe.util.ThemeHelper;

 import java.util.ArrayList;
 import java.util.List;
+import java.util.Locale;

 import icepick.Icepick;
 import icepick.State;
 import io.reactivex.disposables.CompositeDisposable;
+import us.shandian.giga.postprocessing.Postprocessing;
 import us.shandian.giga.service.DownloadManagerService;

 public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheckedChangeListener, AdapterView.OnItemSelectedListener {
    private static final String TAG = "DialogFragment";
    private static final boolean DEBUG = MainActivity.DEBUG;

-    @State protected StreamInfo currentInfo;
-    @State protected StreamSizeWrapper<AudioStream> wrappedAudioStreams = StreamSizeWrapper.empty();
-    @State protected StreamSizeWrapper<VideoStream> wrappedVideoStreams = StreamSizeWrapper.empty();
-    @State protected int selectedVideoIndex = 0;
-    @State protected int selectedAudioIndex = 0;
+    @State
+    protected StreamInfo currentInfo;
+    @State
+    protected StreamSizeWrapper<AudioStream> wrappedAudioStreams = StreamSizeWrapper.empty();
+    @State
+    protected StreamSizeWrapper<VideoStream> wrappedVideoStreams = StreamSizeWrapper.empty();
+    @State
+    protected StreamSizeWrapper<SubtitlesStream> wrappedSubtitleStreams = StreamSizeWrapper.empty();
+    @State
+    protected int selectedVideoIndex = 0;
+    @State
+    protected int selectedAudioIndex = 0;
+    @State
+    protected int selectedSubtitleIndex = 0;

-    private StreamItemAdapter<AudioStream> audioStreamsAdapter;
-    private StreamItemAdapter<VideoStream> videoStreamsAdapter;
+    private StreamItemAdapter<AudioStream, Stream> audioStreamsAdapter;
+    private StreamItemAdapter<VideoStream, AudioStream> videoStreamsAdapter;
+    private StreamItemAdapter<SubtitlesStream, Stream> subtitleStreamsAdapter;

-    private CompositeDisposable disposables = new CompositeDisposable();
+    private final CompositeDisposable disposables = new CompositeDisposable();

    private EditText nameEditText;
    private Spinner streamsSpinner;
@@ -63,6 +84,8 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
    private TextView threadsCountTextView;
    private SeekBar threadsSeekBar;

+    private SharedPreferences prefs;
+
    public static DownloadDialog newInstance(StreamInfo info) {
        DownloadDialog dialog = new DownloadDialog();
        dialog.setInfo(info);
@@ -78,6 +101,8 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
        instance.setVideoStreams(streamsList);
        instance.setSelectedVideoStream(selectedStreamIndex);
        instance.setAudioStreams(info.getAudioStreams());
+        instance.setSubtitleStreams(info.getSubtitles());
+
        return instance;
    }

@@ -86,7 +111,7 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
    }

    public void setAudioStreams(List<AudioStream> audioStreams) {
-        setAudioStreams(new StreamSizeWrapper<>(audioStreams));
+        setAudioStreams(new StreamSizeWrapper<>(audioStreams, getContext()));
    }

    public void setAudioStreams(StreamSizeWrapper<AudioStream> wrappedAudioStreams) {
@@ -94,13 +119,21 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
    }

    public void setVideoStreams(List<VideoStream> videoStreams) {
-        setVideoStreams(new StreamSizeWrapper<>(videoStreams));
+        setVideoStreams(new StreamSizeWrapper<>(videoStreams, getContext()));
    }

    public void setVideoStreams(StreamSizeWrapper<VideoStream> wrappedVideoStreams) {
        this.wrappedVideoStreams = wrappedVideoStreams;
    }

+    public void setSubtitleStreams(List<SubtitlesStream> subtitleStreams) {
+        setSubtitleStreams(new StreamSizeWrapper<>(subtitleStreams, getContext()));
+    }
+
+    public void setSubtitleStreams(StreamSizeWrapper<SubtitlesStream> wrappedSubtitleStreams) {
+        this.wrappedSubtitleStreams = wrappedSubtitleStreams;
+    }
+
    public void setSelectedVideoStream(int selectedVideoIndex) {
        this.selectedVideoIndex = selectedVideoIndex;
    }
@@ -109,6 +142,10 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
        this.selectedAudioIndex = selectedAudioIndex;
    }

+    public void setSelectedSubtitleStream(int selectedSubtitleIndex) {
+        this.selectedSubtitleIndex = selectedSubtitleIndex;
+    }
+
    /*//////////////////////////////////////////////////////////////////////////
    // LifeCycle
    //////////////////////////////////////////////////////////////////////////*/
@@ -116,7 +153,8 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
    @Override
    public void onCreate(@Nullable Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
-        if (DEBUG) Log.d(TAG, "onCreate() called with: savedInstanceState = [" + savedInstanceState + "]");
+        if (DEBUG)
+            Log.d(TAG, "onCreate() called with: savedInstanceState = [" + savedInstanceState + "]");
        if (!PermissionHelper.checkStoragePermissions(getActivity(), PermissionHelper.DOWNLOAD_DIALOG_REQUEST_CODE)) {
            getDialog().dismiss();
            return;
@@ -125,13 +163,29 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
        setStyle(STYLE_NO_TITLE, ThemeHelper.getDialogTheme(getContext()));
        Icepick.restoreInstanceState(this, savedInstanceState);

-        this.videoStreamsAdapter = new StreamItemAdapter<>(getContext(), wrappedVideoStreams, true);
+        SparseArray<SecondaryStreamHelper<AudioStream>> secondaryStreams = new SparseArray<>(4);
+        List<VideoStream> videoStreams = wrappedVideoStreams.getStreamsList();
+
+        for (int i = 0; i < videoStreams.size(); i++) {
+            if (!videoStreams.get(i).isVideoOnly()) continue;
+            AudioStream audioStream = SecondaryStreamHelper.getAudioStreamFor(wrappedAudioStreams.getStreamsList(), videoStreams.get(i));
+
+            if (audioStream != null) {
+                secondaryStreams.append(i, new SecondaryStreamHelper<>(wrappedAudioStreams, audioStream));
+            } else if (DEBUG) {
+                Log.w(TAG, "No audio stream candidates for video format " + videoStreams.get(i).getFormat().name());
+            }
+        }
+
+        this.videoStreamsAdapter = new StreamItemAdapter<>(getContext(), wrappedVideoStreams, secondaryStreams);
        this.audioStreamsAdapter = new StreamItemAdapter<>(getContext(), wrappedAudioStreams);
+        this.subtitleStreamsAdapter = new StreamItemAdapter<>(getContext(), wrappedSubtitleStreams);
    }

    @Override
    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        if (DEBUG) Log.d(TAG, "onCreateView() called with: inflater = [" + inflater + "], container = [" + container + "], savedInstanceState = [" + savedInstanceState + "]");
+        if (DEBUG)
+            Log.d(TAG, "onCreateView() called with: inflater = [" + inflater + "], container = [" + container + "], savedInstanceState = [" + savedInstanceState + "]");
        return inflater.inflate(R.layout.download_dialog, container);
    }

@@ -142,6 +196,8 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
        nameEditText.setText(FilenameUtils.createFilename(getContext(), currentInfo.getName()));
        selectedAudioIndex = ListHelper.getDefaultAudioFormat(getContext(), currentInfo.getAudioStreams());

+        selectedSubtitleIndex = getSubtitleIndexBy(subtitleStreamsAdapter.getAll());
+
        streamsSpinner = view.findViewById(R.id.quality_spinner);
        streamsSpinner.setOnItemSelectedListener(this);

@@ -154,14 +210,18 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
        initToolbar(view.findViewById(R.id.toolbar));
        setupDownloadOptions();

-        int def = 3;
-        threadsCountTextView.setText(String.valueOf(def));
-        threadsSeekBar.setProgress(def - 1);
+        prefs = PreferenceManager.getDefaultSharedPreferences(getContext());
+
+        int threads = prefs.getInt(getString(R.string.default_download_threads), 3);
+        threadsCountTextView.setText(String.valueOf(threads));
+        threadsSeekBar.setProgress(threads - 1);
        threadsSeekBar.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {

            @Override
            public void onProgressChanged(SeekBar seekbar, int progress, boolean fromUser) {
-                threadsCountTextView.setText(String.valueOf(progress + 1));
+                progress++;
+                prefs.edit().putInt(getString(R.string.default_download_threads), progress).apply();
+                threadsCountTextView.setText(String.valueOf(progress));
            }

            @Override
@@ -189,6 +249,11 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
                setupAudioSpinner();
            }
        }));
+        disposables.add(StreamSizeWrapper.fetchSizeForWrapper(wrappedSubtitleStreams).subscribe(result -> {
+            if (radioVideoAudioGroup.getCheckedRadioButtonId() == R.id.subtitle_button) {
+                setupSubtitleSpinner();
+            }
+        }));
    }

    @Override
@@ -216,7 +281,7 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck

        toolbar.setOnMenuItemClickListener(item -> {
            if (item.getItemId() == R.id.okay) {
-                downloadSelected();
+                prepareSelectedDownload();
                return true;
            }
            return false;
@@ -239,13 +304,24 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
        setRadioButtonsState(true);
    }

+    private void setupSubtitleSpinner() {
+        if (getContext() == null) return;
+
+        streamsSpinner.setAdapter(subtitleStreamsAdapter);
+        streamsSpinner.setSelection(selectedSubtitleIndex);
+        setRadioButtonsState(true);
+    }
+
    /*//////////////////////////////////////////////////////////////////////////
    // Radio group Video&Audio options - Listener
    //////////////////////////////////////////////////////////////////////////*/

    @Override
    public void onCheckedChanged(RadioGroup group, @IdRes int checkedId) {
-        if (DEBUG) Log.d(TAG, "onCheckedChanged() called with: group = [" + group + "], checkedId = [" + checkedId + "]");
+        if (DEBUG)
+            Log.d(TAG, "onCheckedChanged() called with: group = [" + group + "], checkedId = [" + checkedId + "]");
+        boolean flag = true;
+
        switch (checkedId) {
            case R.id.audio_button:
                setupAudioSpinner();
@@ -253,7 +329,13 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
            case R.id.video_button:
                setupVideoSpinner();
                break;
+            case R.id.subtitle_button:
+                setupSubtitleSpinner();
+                flag = false;
+                break;
        }
+
+        threadsSeekBar.setEnabled(flag);
    }

    /*//////////////////////////////////////////////////////////////////////////
@@ -262,7 +344,8 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck

    @Override
    public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
-        if (DEBUG) Log.d(TAG, "onItemSelected() called with: parent = [" + parent + "], view = [" + view + "], position = [" + position + "], id = [" + id + "]");
+        if (DEBUG)
+            Log.d(TAG, "onItemSelected() called with: parent = [" + parent + "], view = [" + view + "], position = [" + position + "], id = [" + id + "]");
        switch (radioVideoAudioGroup.getCheckedRadioButtonId()) {
            case R.id.audio_button:
                selectedAudioIndex = position;
@@ -270,6 +353,9 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
            case R.id.video_button:
                selectedVideoIndex = position;
                break;
+            case R.id.subtitle_button:
+                selectedSubtitleIndex = position;
+                break;
        }
    }

@@ -286,11 +372,14 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck

        final RadioButton audioButton = radioVideoAudioGroup.findViewById(R.id.audio_button);
        final RadioButton videoButton = radioVideoAudioGroup.findViewById(R.id.video_button);
+        final RadioButton subtitleButton = radioVideoAudioGroup.findViewById(R.id.subtitle_button);
        final boolean isVideoStreamsAvailable = videoStreamsAdapter.getCount() > 0;
        final boolean isAudioStreamsAvailable = audioStreamsAdapter.getCount() > 0;
+        final boolean isSubtitleStreamsAvailable = subtitleStreamsAdapter.getCount() > 0;

        audioButton.setVisibility(isAudioStreamsAvailable ? View.VISIBLE : View.GONE);
        videoButton.setVisibility(isVideoStreamsAvailable ? View.VISIBLE : View.GONE);
+        subtitleButton.setVisibility(isSubtitleStreamsAvailable ? View.VISIBLE : View.GONE);

        if (isVideoStreamsAvailable) {
            videoButton.setChecked(true);
@@ -298,6 +387,9 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
        } else if (isAudioStreamsAvailable) {
            audioButton.setChecked(true);
            setupAudioSpinner();
+        } else if (isSubtitleStreamsAvailable) {
+            subtitleButton.setChecked(true);
+            setupSubtitleSpinner();
        } else {
            Toast.makeText(getContext(), R.string.no_streams_available_download, Toast.LENGTH_SHORT).show();
            getDialog().dismiss();
@@ -307,28 +399,144 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
    private void setRadioButtonsState(boolean enabled) {
        radioVideoAudioGroup.findViewById(R.id.audio_button).setEnabled(enabled);
        radioVideoAudioGroup.findViewById(R.id.video_button).setEnabled(enabled);
+        radioVideoAudioGroup.findViewById(R.id.subtitle_button).setEnabled(enabled);
    }

-    private void downloadSelected() {
-        Stream stream;
-        String location;
+    private int getSubtitleIndexBy(List<SubtitlesStream> streams) {
+        Localization loc = NewPipe.getPreferredLocalization();

-        String fileName = nameEditText.getText().toString().trim();
-        if (fileName.isEmpty()) fileName = FilenameUtils.createFilename(getContext(), currentInfo.getName());
-
-        boolean isAudio = radioVideoAudioGroup.getCheckedRadioButtonId() == R.id.audio_button;
-        if (isAudio) {
-            stream = audioStreamsAdapter.getItem(selectedAudioIndex);
-            location = NewPipeSettings.getAudioDownloadPath(getContext());
-        } else {
-            stream = videoStreamsAdapter.getItem(selectedVideoIndex);
-            location = NewPipeSettings.getVideoDownloadPath(getContext());
+        for (int i = 0; i < streams.size(); i++) {
+            Locale streamLocale = streams.get(i).getLocale();
+            String tag = streamLocale.getLanguage().concat("-").concat(streamLocale.getCountry());
+            if (tag.equalsIgnoreCase(loc.getLanguage())) {
+                return i;
+            }
        }

-        String url = stream.getUrl();
-        fileName += "." + stream.getFormat().getSuffix();
+        // fallback
+        // 1st loop match country & language
+        // 2nd loop match language only
+        int index = loc.getLanguage().indexOf("-");
+        String lang = index > 0 ? loc.getLanguage().substring(0, index) : loc.getLanguage();
+
+        for (int j = 0; j < 2; j++) {
+            for (int i = 0; i < streams.size(); i++) {
+                Locale streamLocale = streams.get(i).getLocale();
+
+                if (streamLocale.getLanguage().equalsIgnoreCase(lang)) {
+                    if (j > 0 || streamLocale.getCountry().equalsIgnoreCase(loc.getCountry())) {
+                        return i;
+                    }
+                }
+            }
+        }
+
+        return 0;
+    }
+
+    private void prepareSelectedDownload() {
+        final Context context = getContext();
+        Stream stream;
+        String location;
+        char kind;
+
+        String fileName = nameEditText.getText().toString().trim();
+        if (fileName.isEmpty())
+            fileName = FilenameUtils.createFilename(context, currentInfo.getName());
+
+        switch (radioVideoAudioGroup.getCheckedRadioButtonId()) {
+            case R.id.audio_button:
+                stream = audioStreamsAdapter.getItem(selectedAudioIndex);
+                location = NewPipeSettings.getAudioDownloadPath(context);
+                kind = 'a';
+                break;
+            case R.id.video_button:
+                stream = videoStreamsAdapter.getItem(selectedVideoIndex);
+                location = NewPipeSettings.getVideoDownloadPath(context);
+                kind = 'v';
+                break;
+            case R.id.subtitle_button:
+                stream = subtitleStreamsAdapter.getItem(selectedSubtitleIndex);
+                location = NewPipeSettings.getVideoDownloadPath(context);// assume that subtitle & video go together
+                kind = 's';
+                break;
+            default:
+                return;
+        }
+
+        int threads;
+
+        if (radioVideoAudioGroup.getCheckedRadioButtonId() == R.id.subtitle_button) {
+            threads = 1;// use unique thread for subtitles due small file size
+            fileName += ".srt";// final subtitle format
+        } else {
+            threads = threadsSeekBar.getProgress() + 1;
+            fileName += "." + stream.getFormat().getSuffix();
+        }
+
+        final String finalFileName = fileName;
+
+        DownloadManagerService.checkForRunningMission(context, location, fileName, (listed, finished) -> {
+            // should be safe run the following code without "getActivity().runOnUiThread()"
+            if (listed) {
+                AlertDialog.Builder builder = new AlertDialog.Builder(context);
+                builder.setTitle(R.string.download_dialog_title)
+                        .setMessage(finished ? R.string.overwrite_warning : R.string.download_already_running)
+                        .setPositiveButton(
+                                finished ? R.string.overwrite : R.string.generate_unique_name,
+                                (dialog, which) -> downloadSelected(context, stream, location, finalFileName, kind, threads)
+                        )
+                        .setNegativeButton(android.R.string.cancel, (dialog, which) -> {
+                            dialog.cancel();
+                        })
+                        .create()
+                        .show();
+            } else {
+                downloadSelected(context, stream, location, finalFileName, kind, threads);
+            }
+        });
+    }
+
+    private void downloadSelected(Context context, Stream selectedStream, String location, String fileName, char kind, int threads) {
+        String[] urls;
+        String psName = null;
+        String[] psArgs = null;
+        String secondaryStreamUrl = null;
+        long nearLength = 0;
+
+        if (selectedStream instanceof VideoStream) {
+            SecondaryStreamHelper<AudioStream> secondaryStream = videoStreamsAdapter
+                    .getAllSecondary()
+                    .get(wrappedVideoStreams.getStreamsList().indexOf(selectedStream));
+
+            if (secondaryStream != null) {
+                secondaryStreamUrl = secondaryStream.getStream().getUrl();
+                psName = selectedStream.getFormat() == MediaFormat.MPEG_4 ? Postprocessing.ALGORITHM_MP4_DASH_MUXER : Postprocessing.ALGORITHM_WEBM_MUXER;
+                psArgs = null;
+                long videoSize = wrappedVideoStreams.getSizeInBytes((VideoStream) selectedStream);
+
+                // set nearLength, only, if both sizes are fetched or known. this probably does not work on weak internet connections
+                if (secondaryStream.getSizeInBytes() > 0 && videoSize > 0) {
+                    nearLength = secondaryStream.getSizeInBytes() + videoSize;
+                }
+            }
+        } else if ((selectedStream instanceof SubtitlesStream) && selectedStream.getFormat() == MediaFormat.TTML) {
+            psName = Postprocessing.ALGORITHM_TTML_CONVERTER;
+            psArgs = new String[]{
+                    selectedStream.getFormat().getSuffix(),
+                    "false",// ignore empty frames
+                    "false",// detect youtube duplicate lines
+            };
+        }
+
+        if (secondaryStreamUrl == null) {
+            urls = new String[]{selectedStream.getUrl()};
+        } else {
+            urls = new String[]{selectedStream.getUrl(), secondaryStreamUrl};
+        }
+
+        DownloadManagerService.startMission(context, urls, location, fileName, kind, threads, currentInfo.getUrl(), psName, psArgs, nearLength);

-        DownloadManagerService.startMission(getContext(), url, location, fileName, isAudio, threadsSeekBar.getProgress() + 1);
        getDialog().dismiss();
    }
 }
--- a/app/src/main/java/org/schabi/newpipe/download/ExtSDDownloadFailedActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/download/ExtSDDownloadFailedActivity.java
@@ -0,0 +1,38 @@
+package org.schabi.newpipe.download;
+
+import android.app.AlertDialog;
+import android.content.DialogInterface;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v7.app.AppCompatActivity;
+
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.settings.NewPipeSettings;
+import org.schabi.newpipe.util.ServiceHelper;
+import org.schabi.newpipe.util.ThemeHelper;
+
+public class ExtSDDownloadFailedActivity extends AppCompatActivity {
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        ThemeHelper.setTheme(this, ServiceHelper.getSelectedServiceId(this));
+    }
+
+    @Override
+    protected void onStart() {
+        super.onStart();
+        new AlertDialog.Builder(this)
+                .setTitle(R.string.download_to_sdcard_error_title)
+                .setMessage(R.string.download_to_sdcard_error_message)
+                .setPositiveButton(R.string.yes, (DialogInterface dialogInterface, int i) -> {
+                    NewPipeSettings.resetDownloadFolders(this);
+                    finish();
+                })
+                .setNegativeButton(R.string.cancel, (DialogInterface dialogInterface, int i) -> {
+                    dialogInterface.dismiss();
+                    finish();
+                })
+                .create()
+                .show();
+    }
+}
--- a/app/src/main/java/org/schabi/newpipe/fragments/BaseStateFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/BaseStateFragment.java
@@ -32,7 +32,6 @@ import java.util.concurrent.atomic.AtomicBoolean;

 import icepick.State;
 import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.functions.Consumer;

 import static org.schabi.newpipe.util.AnimationUtils.animateView;

@@ -51,9 +50,6 @@ public abstract class BaseStateFragment<I> extends BaseFragment implements ViewC
    protected Button errorButtonRetry;
    protected TextView errorTextView;

-    @State
-    protected boolean useAsFrontPage = false;
-
    @Override
    public void onViewCreated(View rootView, Bundle savedInstanceState) {
        super.onViewCreated(rootView, savedInstanceState);
@@ -66,9 +62,6 @@ public abstract class BaseStateFragment<I> extends BaseFragment implements ViewC
        wasLoading.set(isLoading.get());
    }

-    public void useAsFrontPage(boolean value) {
-        useAsFrontPage = value;
-    }

    /*//////////////////////////////////////////////////////////////////////////
    // Init
@@ -93,12 +86,7 @@ public abstract class BaseStateFragment<I> extends BaseFragment implements ViewC
        RxView.clicks(errorButtonRetry)
                .debounce(300, TimeUnit.MILLISECONDS)
                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new Consumer<Object>() {
-                    @Override
-                    public void accept(Object o) throws Exception {
-                        onRetryButtonClicked();
-                    }
-                });
+                .subscribe(o -> onRetryButtonClicked());
    }

    protected void onRetryButtonClicked() {
--- a/app/src/main/java/org/schabi/newpipe/fragments/BlankFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/BlankFragment.java
@@ -2,7 +2,6 @@ package org.schabi.newpipe.fragments;

 import android.os.Bundle;
 import android.support.annotation.Nullable;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -14,24 +13,16 @@ public class BlankFragment extends BaseFragment {
    @Nullable
    @Override
    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, Bundle savedInstanceState) {
-        if(activity != null && activity.getSupportActionBar() != null) {
-            activity.getSupportActionBar()
-                    .setTitle("NewPipe");
-        }
+        setTitle("NewPipe");
        return inflater.inflate(R.layout.fragment_blank, container, false);
    }

    @Override
    public void setUserVisibleHint(boolean isVisibleToUser) {
        super.setUserVisibleHint(isVisibleToUser);
-        if(isVisibleToUser) {
-            if(activity != null && activity.getSupportActionBar() != null) {
-                activity.getSupportActionBar()
-                        .setTitle("NewPipe");
-            }
-            // leave this inline. Will make it harder for copy cats.
-            // If you are a Copy cat FUCK YOU.
-            // I WILL FIND YOU, AND I WILL ...
-        }
+        setTitle("NewPipe");
+        // leave this inline. Will make it harder for copy cats.
+        // If you are a Copy cat FUCK YOU.
+        // I WILL FIND YOU, AND I WILL ...
    }
 }
--- a/app/src/main/java/org/schabi/newpipe/fragments/MainFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/MainFragment.java
@@ -1,6 +1,5 @@
 package org.schabi.newpipe.fragments;

-import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
@@ -10,48 +9,37 @@ import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentPagerAdapter;
 import android.support.v4.view.ViewPager;
 import android.support.v7.app.ActionBar;
-import android.support.v7.preference.PreferenceManager;
+import android.support.v7.app.AppCompatActivity;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
-import android.view.SubMenu;
 import android.view.View;
 import android.view.ViewGroup;

 import org.schabi.newpipe.BaseFragment;
 import org.schabi.newpipe.R;
-import org.schabi.newpipe.extractor.NewPipe;
-import org.schabi.newpipe.extractor.ServiceList;
-import org.schabi.newpipe.extractor.StreamingService;
-import org.schabi.newpipe.extractor.kiosk.KioskList;
-import org.schabi.newpipe.fragments.list.channel.ChannelFragment;
-import org.schabi.newpipe.local.feed.FeedFragment;
-import org.schabi.newpipe.fragments.list.kiosk.KioskFragment;
-import org.schabi.newpipe.local.bookmark.BookmarkFragment;
-import org.schabi.newpipe.local.subscription.SubscriptionFragment;
+import org.schabi.newpipe.extractor.exceptions.ExtractionException;
 import org.schabi.newpipe.report.ErrorActivity;
 import org.schabi.newpipe.report.UserAction;
-import org.schabi.newpipe.util.KioskTranslator;
+import org.schabi.newpipe.settings.tabs.Tab;
+import org.schabi.newpipe.settings.tabs.TabsManager;
 import org.schabi.newpipe.util.NavigationHelper;
 import org.schabi.newpipe.util.ServiceHelper;
-import org.schabi.newpipe.util.ThemeHelper;
+
+import java.util.ArrayList;
+import java.util.List;

 public class MainFragment extends BaseFragment implements TabLayout.OnTabSelectedListener {
-
-    public int currentServiceId = -1;
    private ViewPager viewPager;
+    private SelectedTabsPagerAdapter pagerAdapter;
+    private TabLayout tabLayout;

-    /*//////////////////////////////////////////////////////////////////////////
-    // Constants
-    //////////////////////////////////////////////////////////////////////////*/
+    private List<Tab> tabsList = new ArrayList<>();
+    private TabsManager tabsManager;

-    private static final int FALLBACK_SERVICE_ID = ServiceList.YouTube.getServiceId();
-    private static final String FALLBACK_CHANNEL_URL = "https://www.youtube.com/channel/UC-9-kyTW8ZkZNDHQJ6FgpwQ";
-    private static final String FALLBACK_CHANNEL_NAME = "Music";
-    private static final String FALLBACK_KIOSK_ID = "Trending";
-    private static final int KIOSK_MENU_OFFSET = 2000;
+    private boolean hasTabsChanged = false;

    /*//////////////////////////////////////////////////////////////////////////
    // Fragment's LifeCycle
@@ -61,11 +49,22 @@ public class MainFragment extends BaseFragment implements TabLayout.OnTabSelecte
    public void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
        setHasOptionsMenu(true);
+
+        tabsManager = TabsManager.getManager(activity);
+        tabsManager.setSavedTabsListener(() -> {
+            if (DEBUG) {
+                Log.d(TAG, "TabsManager.SavedTabsChangeListener: onTabsChanged called, isResumed = " + isResumed());
+            }
+            if (isResumed()) {
+                updateTabs();
+            } else {
+                hasTabsChanged = true;
+            }
+        });
    }

    @Override
    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        currentServiceId = ServiceHelper.getSelectedServiceId(activity);
        return inflater.inflate(R.layout.fragment_main, container, false);
    }

@@ -73,30 +72,34 @@ public class MainFragment extends BaseFragment implements TabLayout.OnTabSelecte
    protected void initViews(View rootView, Bundle savedInstanceState) {
        super.initViews(rootView, savedInstanceState);

-        TabLayout tabLayout = rootView.findViewById(R.id.main_tab_layout);
+        tabLayout = rootView.findViewById(R.id.main_tab_layout);
        viewPager = rootView.findViewById(R.id.pager);

        /*  Nested fragment, use child fragment here to maintain backstack in view pager. */
-        PagerAdapter adapter = new PagerAdapter(getChildFragmentManager());
-        viewPager.setAdapter(adapter);
-        viewPager.setOffscreenPageLimit(adapter.getCount());
+        pagerAdapter = new SelectedTabsPagerAdapter(getChildFragmentManager());
+        viewPager.setAdapter(pagerAdapter);

        tabLayout.setupWithViewPager(viewPager);
+        tabLayout.addOnTabSelectedListener(this);
+        updateTabs();
+    }

-        int channelIcon = ThemeHelper.resolveResourceIdFromAttr(activity, R.attr.ic_channel);
-        int whatsHotIcon = ThemeHelper.resolveResourceIdFromAttr(activity, R.attr.ic_hot);
-        int bookmarkIcon = ThemeHelper.resolveResourceIdFromAttr(activity, R.attr.ic_bookmark);
+    @Override
+    public void onResume() {
+        super.onResume();

-        if (isSubscriptionsPageOnlySelected()) {
-            tabLayout.getTabAt(0).setIcon(channelIcon);
-            tabLayout.getTabAt(1).setIcon(bookmarkIcon);
-        } else {
-            tabLayout.getTabAt(0).setIcon(whatsHotIcon);
-            tabLayout.getTabAt(1).setIcon(channelIcon);
-            tabLayout.getTabAt(2).setIcon(bookmarkIcon);
+        if (hasTabsChanged) {
+            hasTabsChanged = false;
+            updateTabs();
        }
    }

+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        tabsManager.unsetSavedTabsListener();
+    }
+
    /*//////////////////////////////////////////////////////////////////////////
    // Menu
    //////////////////////////////////////////////////////////////////////////*/
@@ -106,16 +109,6 @@ public class MainFragment extends BaseFragment implements TabLayout.OnTabSelecte
        super.onCreateOptionsMenu(menu, inflater);
        if (DEBUG) Log.d(TAG, "onCreateOptionsMenu() called with: menu = [" + menu + "], inflater = [" + inflater + "]");
        inflater.inflate(R.menu.main_fragment_menu, menu);
-        SubMenu kioskMenu = menu.addSubMenu(Menu.NONE, Menu.NONE, 200, getString(R.string.kiosk));
-        try {
-            createKioskMenu(kioskMenu, inflater);
-        } catch (Exception e) {
-            ErrorActivity.reportError(activity, e,
-                    activity.getClass(),
-                    null,
-                    ErrorActivity.ErrorInfo.make(UserAction.UI_ERROR,
-                            "none", "", R.string.app_ui_crash));
-        }

        ActionBar supportActionBar = activity.getSupportActionBar();
        if (supportActionBar != null) {
@@ -127,7 +120,14 @@ public class MainFragment extends BaseFragment implements TabLayout.OnTabSelecte
    public boolean onOptionsItemSelected(MenuItem item) {
        switch (item.getItemId()) {
            case R.id.action_search:
-                NavigationHelper.openSearchFragment(getFragmentManager(), ServiceHelper.getSelectedServiceId(activity), "");
+                try {
+                    NavigationHelper.openSearchFragment(
+                            getFragmentManager(),
+                            ServiceHelper.getSelectedServiceId(activity),
+                            "");
+                } catch (Exception e) {
+                    ErrorActivity.reportUiError((AppCompatActivity) getActivity(), e);
+                }
                return true;
        }
        return super.onOptionsItemSelected(item);
@@ -137,9 +137,33 @@ public class MainFragment extends BaseFragment implements TabLayout.OnTabSelecte
    // Tabs
    //////////////////////////////////////////////////////////////////////////*/

+    public void updateTabs() {
+        tabsList.clear();
+        tabsList.addAll(tabsManager.getTabs());
+        pagerAdapter.notifyDataSetChanged();
+
+        viewPager.setOffscreenPageLimit(pagerAdapter.getCount());
+        updateTabsIcon();
+        updateCurrentTitle();
+    }
+
+    private void updateTabsIcon() {
+        for (int i = 0; i < tabsList.size(); i++) {
+            final TabLayout.Tab tabToSet = tabLayout.getTabAt(i);
+            if (tabToSet != null) {
+                tabToSet.setIcon(tabsList.get(i).getTabIconRes(activity));
+            }
+        }
+    }
+
+    private void updateCurrentTitle() {
+        setTitle(tabsList.get(viewPager.getCurrentItem()).getTabName(requireContext()));
+    }
+
    @Override
-    public void onTabSelected(TabLayout.Tab tab) {
-        viewPager.setCurrentItem(tab.getPosition());
+    public void onTabSelected(TabLayout.Tab selectedTab) {
+        if (DEBUG) Log.d(TAG, "onTabSelected() called with: selectedTab = [" + selectedTab + "]");
+        updateCurrentTitle();
    }

    @Override
@@ -148,129 +172,58 @@ public class MainFragment extends BaseFragment implements TabLayout.OnTabSelecte

    @Override
    public void onTabReselected(TabLayout.Tab tab) {
+        if (DEBUG) Log.d(TAG, "onTabReselected() called with: tab = [" + tab + "]");
+        updateCurrentTitle();
    }

-    private class PagerAdapter extends FragmentPagerAdapter {
-        PagerAdapter(FragmentManager fm) {
-            super(fm);
+    private class SelectedTabsPagerAdapter extends FragmentPagerAdapter {
+        private SelectedTabsPagerAdapter(FragmentManager fragmentManager) {
+            super(fragmentManager);
        }

        @Override
        public Fragment getItem(int position) {
-            switch (position) {
-                case 0:
-                    return isSubscriptionsPageOnlySelected() ? new SubscriptionFragment() : getMainPageFragment();
-                case 1:
-                    if(PreferenceManager.getDefaultSharedPreferences(getActivity())
-                            .getString(getString(R.string.main_page_content_key), getString(R.string.blank_page_key))
-                            .equals(getString(R.string.subscription_page_key))) {
-                        return new BookmarkFragment();
-                    } else {
-                        return new SubscriptionFragment();
-                    }
-                case 2:
-                    return new BookmarkFragment();
-                default:
-                    return new BlankFragment();
+            final Tab tab = tabsList.get(position);
+
+            Throwable throwable = null;
+            Fragment fragment = null;
+            try {
+                fragment = tab.getFragment();
+            } catch (ExtractionException e) {
+                throwable = e;
            }
+
+            if (throwable != null) {
+                ErrorActivity.reportError(activity, throwable, activity.getClass(), null,
+                        ErrorActivity.ErrorInfo.make(UserAction.UI_ERROR, "none", "", R.string.app_ui_crash));
+                return new BlankFragment();
+            }
+
+            if (fragment instanceof BaseFragment) {
+                ((BaseFragment) fragment).useAsFrontPage(true);
+            }
+
+            return fragment;
        }

        @Override
-        public CharSequence getPageTitle(int position) {
-            //return getString(this.tabTitles[position]);
-            return "";
+        public int getItemPosition(Object object) {
+            // Causes adapter to reload all Fragments when
+            // notifyDataSetChanged is called
+            return POSITION_NONE;
        }

        @Override
        public int getCount() {
-            return isSubscriptionsPageOnlySelected() ? 2 : 3;
+            return tabsList.size();
        }
-    }

-    /*//////////////////////////////////////////////////////////////////////////
-    // Main page content
-    //////////////////////////////////////////////////////////////////////////*/
-
-    private boolean isSubscriptionsPageOnlySelected() {
-        return PreferenceManager.getDefaultSharedPreferences(activity)
-                .getString(getString(R.string.main_page_content_key), getString(R.string.blank_page_key))
-                .equals(getString(R.string.subscription_page_key));
-    }
-
-    private Fragment getMainPageFragment() {
-        if (getActivity() == null) return new BlankFragment();
-
-        try {
-            SharedPreferences preferences =
-                    PreferenceManager.getDefaultSharedPreferences(getActivity());
-            final String setMainPage = preferences.getString(getString(R.string.main_page_content_key),
-                    getString(R.string.main_page_selectd_kiosk_id));
-            if (setMainPage.equals(getString(R.string.blank_page_key))) {
-                return new BlankFragment();
-            } else if (setMainPage.equals(getString(R.string.kiosk_page_key))) {
-                int serviceId = preferences.getInt(getString(R.string.main_page_selected_service),
-                        FALLBACK_SERVICE_ID);
-                String kioskId = preferences.getString(getString(R.string.main_page_selectd_kiosk_id),
-                        FALLBACK_KIOSK_ID);
-                KioskFragment fragment = KioskFragment.getInstance(serviceId, kioskId);
-                fragment.useAsFrontPage(true);
-                return fragment;
-            } else if (setMainPage.equals(getString(R.string.feed_page_key))) {
-                FeedFragment fragment = new FeedFragment();
-                fragment.useAsFrontPage(true);
-                return fragment;
-            } else if (setMainPage.equals(getString(R.string.channel_page_key))) {
-                int serviceId = preferences.getInt(getString(R.string.main_page_selected_service),
-                        FALLBACK_SERVICE_ID);
-                String url = preferences.getString(getString(R.string.main_page_selected_channel_url),
-                        FALLBACK_CHANNEL_URL);
-                String name = preferences.getString(getString(R.string.main_page_selected_channel_name),
-                        FALLBACK_CHANNEL_NAME);
-                ChannelFragment fragment = ChannelFragment.getInstance(serviceId, url, name);
-                fragment.useAsFrontPage(true);
-                return fragment;
-            } else {
-                return new BlankFragment();
-            }
-
-        } catch (Exception e) {
-            ErrorActivity.reportError(activity, e,
-                    activity.getClass(),
-                    null,
-                    ErrorActivity.ErrorInfo.make(UserAction.UI_ERROR,
-                            "none", "", R.string.app_ui_crash));
-            return new BlankFragment();
-        }
-    }
-
-    /*//////////////////////////////////////////////////////////////////////////
-    // Select Kiosk
-    //////////////////////////////////////////////////////////////////////////*/
-
-    private void createKioskMenu(Menu menu, MenuInflater menuInflater)
-            throws Exception {
-        StreamingService service = NewPipe.getService(currentServiceId);
-        KioskList kl = service.getKioskList();
-        int i = 0;
-        for (final String ks : kl.getAvailableKiosks()) {
-            menu.add(0, KIOSK_MENU_OFFSET + i, Menu.NONE,
-                    KioskTranslator.getTranslatedKioskName(ks, getContext()))
-                    .setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
-                        @Override
-                        public boolean onMenuItemClick(MenuItem menuItem) {
-                            try {
-                                NavigationHelper.openKioskFragment(getFragmentManager(), currentServiceId, ks);
-                            } catch (Exception e) {
-                                ErrorActivity.reportError(activity, e,
-                                        activity.getClass(),
-                                        null,
-                                        ErrorActivity.ErrorInfo.make(UserAction.UI_ERROR,
-                                                "none", "", R.string.app_ui_crash));
-                            }
-                            return true;
-                        }
-                    });
-            i++;
+        @Override
+        public void destroyItem(ViewGroup container, int position, Object object) {
+            getChildFragmentManager()
+                    .beginTransaction()
+                    .remove((Fragment) object)
+                    .commitNowAllowingStateLoss();
        }
    }
 }
--- a/app/src/main/java/org/schabi/newpipe/fragments/detail/StackItem.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/detail/StackItem.java
@@ -3,9 +3,9 @@ package org.schabi.newpipe.fragments.detail;
 import java.io.Serializable;

 class StackItem implements Serializable {
-    private int serviceId;
+    private final int serviceId;
    private String title;
-    private String url;
+    private final String url;

    StackItem(int serviceId, String url, String title) {
        this.serviceId = serviceId;
--- a/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
@@ -17,6 +17,7 @@ import android.support.v4.content.ContextCompat;
 import android.support.v4.view.animation.FastOutSlowInInterpolator;
 import android.support.v7.app.ActionBar;
 import android.support.v7.app.AlertDialog;
+import android.support.v7.app.AppCompatActivity;
 import android.text.Html;
 import android.text.Spanned;
 import android.text.TextUtils;
@@ -32,12 +33,14 @@ import android.view.MenuItem;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.ViewParent;
 import android.widget.AdapterView;
 import android.widget.FrameLayout;
 import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
+import android.widget.ScrollView;
 import android.widget.Spinner;
 import android.widget.TextView;
 import android.widget.Toast;
@@ -54,25 +57,26 @@ import org.schabi.newpipe.extractor.InfoItem;
 import org.schabi.newpipe.extractor.NewPipe;
 import org.schabi.newpipe.extractor.exceptions.ContentNotAvailableException;
 import org.schabi.newpipe.extractor.exceptions.ParsingException;
-import org.schabi.newpipe.extractor.services.youtube.YoutubeStreamExtractor;
+import org.schabi.newpipe.extractor.services.youtube.extractors.YoutubeStreamExtractor;
 import org.schabi.newpipe.extractor.stream.AudioStream;
+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;
-import org.schabi.newpipe.util.StreamItemAdapter;
-import org.schabi.newpipe.util.StreamItemAdapter.StreamSizeWrapper;
-import org.schabi.newpipe.local.dialog.PlaylistAppendDialog;
 import org.schabi.newpipe.info_list.InfoItemBuilder;
 import org.schabi.newpipe.info_list.InfoItemDialog;
+import org.schabi.newpipe.local.dialog.PlaylistAppendDialog;
+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;
 import org.schabi.newpipe.report.UserAction;
 import org.schabi.newpipe.util.Constants;
 import org.schabi.newpipe.util.ExtractorHelper;
@@ -83,6 +87,8 @@ import org.schabi.newpipe.util.Localization;
 import org.schabi.newpipe.util.NavigationHelper;
 import org.schabi.newpipe.util.OnClickGesture;
 import org.schabi.newpipe.util.PermissionHelper;
+import org.schabi.newpipe.util.StreamItemAdapter;
+import org.schabi.newpipe.util.StreamItemAdapter.StreamSizeWrapper;
 import org.schabi.newpipe.util.ThemeHelper;

 import java.io.Serializable;
@@ -128,7 +134,7 @@ public class VideoDetailFragment

    private StreamInfo currentInfo;
    private Disposable currentWorker;
-    private CompositeDisposable disposables = new CompositeDisposable();
+    @NonNull private CompositeDisposable disposables = new CompositeDisposable();

    private List<VideoStream> sortedVideoStreams;
    private int selectedVideoStreamIndex = -1;
@@ -150,6 +156,7 @@ public class VideoDetailFragment

    private View videoTitleRoot;
    private TextView videoTitleTextView;
+    @Nullable
    private ImageView videoTitleToggleArrow;
    private TextView videoCountView;

@@ -363,11 +370,15 @@ public class VideoDetailFragment
                if (TextUtils.isEmpty(currentInfo.getUploaderUrl())) {
                    Log.w(TAG, "Can't open channel because we got no channel URL");
                } else {
+                    try {
                    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:
@@ -407,14 +418,16 @@ public class VideoDetailFragment
    }

    private void toggleTitleAndDescription() {
-        if (videoDescriptionRootLayout.getVisibility() == View.VISIBLE) {
-            videoTitleTextView.setMaxLines(1);
-            videoDescriptionRootLayout.setVisibility(View.GONE);
-            videoTitleToggleArrow.setImageResource(R.drawable.arrow_down);
-        } else {
-            videoTitleTextView.setMaxLines(10);
-            videoDescriptionRootLayout.setVisibility(View.VISIBLE);
-            videoTitleToggleArrow.setImageResource(R.drawable.arrow_up);
+        if (videoTitleToggleArrow != null) {    //it is null for tablets
+            if (videoDescriptionRootLayout.getVisibility() == View.VISIBLE) {
+                videoTitleTextView.setMaxLines(1);
+                videoDescriptionRootLayout.setVisibility(View.GONE);
+                videoTitleToggleArrow.setImageResource(R.drawable.arrow_down);
+            } else {
+                videoTitleTextView.setMaxLines(10);
+                videoDescriptionRootLayout.setVisibility(View.VISIBLE);
+                videoTitleToggleArrow.setImageResource(R.drawable.arrow_up);
+            }
        }
    }

@@ -540,7 +553,8 @@ public class VideoDetailFragment
        final String[] commands = new String[]{
                context.getResources().getString(R.string.enqueue_on_background),
                context.getResources().getString(R.string.enqueue_on_popup),
-                context.getResources().getString(R.string.append_playlist)
+                context.getResources().getString(R.string.append_playlist),
+                context.getResources().getString(R.string.share)
        };

        final DialogInterface.OnClickListener actions = (DialogInterface dialogInterface, int i) -> {
@@ -557,6 +571,9 @@ public class VideoDetailFragment
                                .show(getFragmentManager(), TAG);
                    }
                    break;
+                case 3:
+                    shareUrl(item.getName(), item.getUrl());
+                    break;
                default:
                    break;
            }
@@ -610,8 +627,11 @@ public class VideoDetailFragment
            relatedStreamsView.addView(
                    infoItemBuilder.buildView(relatedStreamsView, info.getNextVideo()));
            relatedStreamsView.addView(getSeparatorView());
-            relatedStreamRootLayout.setVisibility(View.VISIBLE);
-        } else nextStreamTitle.setVisibility(View.GONE);
+            setRelatedStreamsVisibility(View.VISIBLE);
+        } else {
+            nextStreamTitle.setVisibility(View.GONE);
+            setRelatedStreamsVisibility(View.GONE);
+        }

        if (info.getRelatedStreams() != null
                && !info.getRelatedStreams().isEmpty() && showRelatedStreams) {
@@ -627,13 +647,13 @@ public class VideoDetailFragment
            }
            //if (DEBUG) Log.d(TAG, "Total time " + ((System.nanoTime() - first) / 1000000L) + "ms");

-            relatedStreamRootLayout.setVisibility(View.VISIBLE);
+            setRelatedStreamsVisibility(View.VISIBLE);
            relatedStreamExpandButton.setVisibility(View.VISIBLE);

            relatedStreamExpandButton.setImageDrawable(ContextCompat.getDrawable(
                    activity, ThemeHelper.resolveResourceIdFromAttr(activity, R.attr.expand)));
        } else {
-            if (info.getNextVideo() == null) relatedStreamRootLayout.setVisibility(View.GONE);
+            if (info.getNextVideo() == null) setRelatedStreamsVisibility(View.GONE);
            relatedStreamExpandButton.setVisibility(View.GONE);
        }
    }
@@ -725,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() {
@@ -748,7 +768,7 @@ public class VideoDetailFragment
     * Stack that contains the "navigation history".<br>
     * The peek is the current video.
     */
-    protected LinkedList<StackItem> stack = new LinkedList<>();
+    protected final LinkedList<StackItem> stack = new LinkedList<>();

    public void clearHistory() {
        stack.clear();
@@ -872,10 +892,7 @@ public class VideoDetailFragment
        if (!useExternalAudioPlayer && android.os.Build.VERSION.SDK_INT >= 16) {
            openNormalBackgroundPlayer(append);
        } else {
-            NavigationHelper.playOnExternalPlayer(activity,
-                    currentInfo.getName(),
-                    currentInfo.getUploaderName(),
-                    audioStream);
+            startOnExternalPlayer(activity, currentInfo, audioStream);
        }
    }

@@ -902,12 +919,9 @@ public class VideoDetailFragment

        if (PreferenceManager.getDefaultSharedPreferences(activity)
                .getBoolean(this.getString(R.string.use_external_video_player_key), false)) {
-            NavigationHelper.playOnExternalPlayer(activity,
-                    currentInfo.getName(),
-                    currentInfo.getUploaderName(),
-                    selectedVideoStream);
+            startOnExternalPlayer(activity, currentInfo, selectedVideoStream);
        } else {
-            openNormalPlayer(selectedVideoStream);
+            openNormalPlayer();
        }
    }

@@ -920,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);
    }

@@ -949,6 +952,20 @@ public class VideoDetailFragment
        this.autoPlayEnabled = autoplay;
    }

+    private void startOnExternalPlayer(@NonNull final Context context,
+                                       @NonNull final StreamInfo info,
+                                       @NonNull final Stream selectedStream) {
+        NavigationHelper.playOnExternalPlayer(context, currentInfo.getName(),
+                currentInfo.getUploaderName(), selectedStream);
+
+        final HistoryRecordManager recordManager = new HistoryRecordManager(requireContext());
+        disposables.add(recordManager.onViewed(info).onErrorComplete()
+                .subscribe(
+                        ignored -> {/* successful */},
+                        error -> Log.e(TAG, "Register view failure: ", error)
+                ));
+    }
+
    @Nullable
    private VideoStream getSelectedVideoStream() {
        return sortedVideoStreams != null ? sortedVideoStreams.get(selectedVideoStreamIndex) : null;
@@ -1094,8 +1111,16 @@ public class VideoDetailFragment
        animateView(videoTitleTextView, true, 0);

        videoDescriptionRootLayout.setVisibility(View.GONE);
-        videoTitleToggleArrow.setImageResource(R.drawable.arrow_down);
-        videoTitleToggleArrow.setVisibility(View.GONE);
+        if (videoTitleToggleArrow != null) {    //phone
+            videoTitleToggleArrow.setImageResource(R.drawable.arrow_down);
+            videoTitleToggleArrow.setVisibility(View.GONE);
+        } else {    //tablet
+            final View related = (View) relatedStreamRootLayout.getParent();
+            //don`t need to hide it if related streams are disabled
+            if (related.getVisibility() == View.VISIBLE) {
+                related.setVisibility(View.INVISIBLE);
+            }
+        }
        videoTitleRoot.setClickable(false);

        imageLoader.cancelDisplayTask(thumbnailImageView);
@@ -1170,11 +1195,15 @@ public class VideoDetailFragment
            detailDurationView.setVisibility(View.GONE);
        }

-        videoTitleRoot.setClickable(true);
-        videoTitleToggleArrow.setVisibility(View.VISIBLE);
-        videoTitleToggleArrow.setImageResource(R.drawable.arrow_down);
        videoDescriptionView.setVisibility(View.GONE);
-        videoDescriptionRootLayout.setVisibility(View.GONE);
+        if (videoTitleToggleArrow != null) {
+            videoTitleRoot.setClickable(true);
+            videoTitleToggleArrow.setVisibility(View.VISIBLE);
+            videoTitleToggleArrow.setImageResource(R.drawable.arrow_down);
+            videoDescriptionRootLayout.setVisibility(View.GONE);
+        } else {
+            videoDescriptionRootLayout.setVisibility(View.VISIBLE);
+        }
        if (!TextUtils.isEmpty(info.getUploadDate())) {
            videoUploadDateView.setText(Localization.localizeDate(activity, info.getUploadDate()));
        }
@@ -1207,10 +1236,10 @@ public class VideoDetailFragment
                spinnerToolbar.setVisibility(View.GONE);
                break;
            default:
+                if(info.getAudioStreams().isEmpty()) detailControlsBackground.setVisibility(View.GONE);
                if (!info.getVideoStreams().isEmpty()
                        || !info.getVideoOnlyStreams().isEmpty()) break;

-                detailControlsBackground.setVisibility(View.GONE);
                detailControlsPopup.setVisibility(View.GONE);
                spinnerToolbar.setVisibility(View.GONE);
                thumbnailPlayButton.setImageResource(R.drawable.ic_headset_white_24dp);
@@ -1222,6 +1251,11 @@ public class VideoDetailFragment
            // Only auto play in the first open
            autoPlayEnabled = false;
        }
+
+        final ViewParent related = relatedStreamRootLayout.getParent();
+        if (related instanceof ScrollView) {
+            ((ScrollView) related).scrollTo(0, 0);
+        }
    }


@@ -1231,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) {
@@ -1279,4 +1314,13 @@ public class VideoDetailFragment

        showError(getString(R.string.blocked_by_gema), false, R.drawable.gruese_die_gema);
    }
-}
+
+    private void setRelatedStreamsVisibility(int visibility) {
+        final ViewParent parent = relatedStreamRootLayout.getParent();
+        if (parent instanceof ScrollView) {
+            ((ScrollView) parent).setVisibility(visibility);
+        } else {
+            relatedStreamRootLayout.setVisibility(visibility);
+        }
+    }
+}
--- a/app/src/main/java/org/schabi/newpipe/fragments/list/BaseListFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/list/BaseListFragment.java
@@ -3,9 +3,15 @@ package org.schabi.newpipe.fragments.list;
 import android.app.Activity;
 import android.content.Context;
 import android.content.DialogInterface;
+import android.content.SharedPreferences;
+import android.content.res.Configuration;
+import android.content.res.Resources;
 import android.os.Bundle;
+import android.preference.PreferenceManager;
 import android.support.annotation.NonNull;
 import android.support.v7.app.ActionBar;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.GridLayoutManager;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.util.Log;
@@ -20,10 +26,11 @@ import org.schabi.newpipe.extractor.playlist.PlaylistInfoItem;
 import org.schabi.newpipe.extractor.stream.StreamInfoItem;
 import org.schabi.newpipe.fragments.BaseStateFragment;
 import org.schabi.newpipe.fragments.OnScrollBelowItemsListener;
-import org.schabi.newpipe.local.dialog.PlaylistAppendDialog;
 import org.schabi.newpipe.info_list.InfoItemDialog;
 import org.schabi.newpipe.info_list.InfoListAdapter;
+import org.schabi.newpipe.local.dialog.PlaylistAppendDialog;
 import org.schabi.newpipe.player.playqueue.SinglePlayQueue;
+import org.schabi.newpipe.report.ErrorActivity;
 import org.schabi.newpipe.util.NavigationHelper;
 import org.schabi.newpipe.util.OnClickGesture;
 import org.schabi.newpipe.util.StateSaver;
@@ -34,7 +41,7 @@ import java.util.Queue;

 import static org.schabi.newpipe.util.AnimationUtils.animateView;

-public abstract class BaseListFragment<I, N> extends BaseStateFragment<I> implements ListViewContract<I, N>, StateSaver.WriteRead {
+public abstract class BaseListFragment<I, N> extends BaseStateFragment<I> implements ListViewContract<I, N>, StateSaver.WriteRead, SharedPreferences.OnSharedPreferenceChangeListener {

    /*//////////////////////////////////////////////////////////////////////////
    // Views
@@ -42,6 +49,9 @@ public abstract class BaseListFragment<I, N> extends BaseStateFragment<I> implem

    protected InfoListAdapter infoListAdapter;
    protected RecyclerView itemsList;
+    private int updateFlags = 0;
+
+    private static final int LIST_MODE_UPDATE_FLAG = 0x32;

    /*//////////////////////////////////////////////////////////////////////////
    // LifeCycle
@@ -57,12 +67,31 @@ public abstract class BaseListFragment<I, N> extends BaseStateFragment<I> implem
    public void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
        setHasOptionsMenu(true);
+        PreferenceManager.getDefaultSharedPreferences(activity)
+                .registerOnSharedPreferenceChangeListener(this);
    }

    @Override
    public void onDestroy() {
        super.onDestroy();
        StateSaver.onDestroy(savedState);
+        PreferenceManager.getDefaultSharedPreferences(activity)
+                .unregisterOnSharedPreferenceChangeListener(this);
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+
+        if (updateFlags != 0) {
+            if ((updateFlags & LIST_MODE_UPDATE_FLAG) != 0) {
+                final boolean useGrid = isGridLayout();
+                itemsList.setLayoutManager(useGrid ? getGridLayoutManager() : getListLayoutManager());
+                infoListAdapter.setGridItemVariants(useGrid);
+                infoListAdapter.notifyDataSetChanged();
+            }
+            updateFlags = 0;
+        }
    }

    /*//////////////////////////////////////////////////////////////////////////
@@ -117,13 +146,25 @@ public abstract class BaseListFragment<I, N> extends BaseStateFragment<I> implem
        return new LinearLayoutManager(activity);
    }

+    protected RecyclerView.LayoutManager getGridLayoutManager() {
+        final Resources resources = activity.getResources();
+        int width = resources.getDimensionPixelSize(R.dimen.video_item_grid_thumbnail_image_width);
+        width += (24 * resources.getDisplayMetrics().density);
+        final int spanCount = (int) Math.floor(resources.getDisplayMetrics().widthPixels / (double)width);
+        final GridLayoutManager lm = new GridLayoutManager(activity, spanCount);
+        lm.setSpanSizeLookup(infoListAdapter.getSpanSizeLookup(spanCount));
+        return lm;
+    }
+
    @Override
    protected void initViews(View rootView, Bundle savedInstanceState) {
        super.initViews(rootView, savedInstanceState);

+        final boolean useGrid = isGridLayout();
        itemsList = rootView.findViewById(R.id.items_list);
-        itemsList.setLayoutManager(getListLayoutManager());
+        itemsList.setLayoutManager(useGrid ? getGridLayoutManager() : getListLayoutManager());

+        infoListAdapter.setGridItemVariants(useGrid);
        infoListAdapter.setFooter(getListFooter());
        infoListAdapter.setHeader(getListHeader());

@@ -152,18 +193,30 @@ public abstract class BaseListFragment<I, N> extends BaseStateFragment<I> implem
        infoListAdapter.setOnChannelSelectedListener(new OnClickGesture<ChannelInfoItem>() {
            @Override
            public void selected(ChannelInfoItem selectedItem) {
-                onItemSelected(selectedItem);
-                NavigationHelper.openChannelFragment(useAsFrontPage ? getParentFragment().getFragmentManager() : getFragmentManager(),
-                        selectedItem.getServiceId(), selectedItem.getUrl(), selectedItem.getName());
+                try {
+                    onItemSelected(selectedItem);
+                    NavigationHelper.openChannelFragment(getFM(),
+                            selectedItem.getServiceId(),
+                            selectedItem.getUrl(),
+                            selectedItem.getName());
+                } catch (Exception e) {
+                    ErrorActivity.reportUiError((AppCompatActivity) getActivity(), e);
+                }
            }
        });

        infoListAdapter.setOnPlaylistSelectedListener(new OnClickGesture<PlaylistInfoItem>() {
            @Override
            public void selected(PlaylistInfoItem selectedItem) {
-                onItemSelected(selectedItem);
-                NavigationHelper.openPlaylistFragment(useAsFrontPage ? getParentFragment().getFragmentManager() : getFragmentManager(),
-                        selectedItem.getServiceId(), selectedItem.getUrl(), selectedItem.getName());
+                try {
+                    onItemSelected(selectedItem);
+                    NavigationHelper.openPlaylistFragment(getFM(),
+                            selectedItem.getServiceId(),
+                            selectedItem.getUrl(),
+                            selectedItem.getName());
+                } catch (Exception e) {
+                    ErrorActivity.reportUiError((AppCompatActivity) getActivity(), e);
+                }
            }
        });

@@ -178,7 +231,7 @@ public abstract class BaseListFragment<I, N> extends BaseStateFragment<I> implem

    private void onStreamSelected(StreamInfoItem selectedItem) {
        onItemSelected(selectedItem);
-        NavigationHelper.openVideoDetailFragment(useAsFrontPage ? getParentFragment().getFragmentManager() : getFragmentManager(),
+        NavigationHelper.openVideoDetailFragment(getFM(),
                selectedItem.getServiceId(), selectedItem.getUrl(), selectedItem.getName());
    }

@@ -196,7 +249,8 @@ public abstract class BaseListFragment<I, N> extends BaseStateFragment<I> implem
        final String[] commands = new String[]{
                context.getResources().getString(R.string.enqueue_on_background),
                context.getResources().getString(R.string.enqueue_on_popup),
-                context.getResources().getString(R.string.append_playlist)
+                context.getResources().getString(R.string.append_playlist),
+                context.getResources().getString(R.string.share)
        };

        final DialogInterface.OnClickListener actions = (dialogInterface, i) -> {
@@ -213,6 +267,9 @@ public abstract class BaseListFragment<I, N> extends BaseStateFragment<I> implem
                                .show(getFragmentManager(), TAG);
                    }
                    break;
+                case 3:
+                    shareUrl(item.getName(), item.getUrl());
+                    break;
                default:
                    break;
            }
@@ -290,4 +347,22 @@ public abstract class BaseListFragment<I, N> extends BaseStateFragment<I> implem
    public void handleNextItems(N result) {
        isLoading.set(false);
    }
+
+    @Override
+    public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
+        if (key.equals(getString(R.string.list_view_mode_key))) {
+            updateFlags |= LIST_MODE_UPDATE_FLAG;
+        }
+    }
+
+    protected boolean isGridLayout() {
+        final String list_mode = PreferenceManager.getDefaultSharedPreferences(activity).getString(getString(R.string.list_view_mode_key), getString(R.string.list_view_mode_value));
+        if ("auto".equals(list_mode)) {
+            final Configuration configuration = getResources().getConfiguration();
+            return configuration.orientation == Configuration.ORIENTATION_LANDSCAPE
+                    && configuration.isLayoutSizeAtLeast(Configuration.SCREENLAYOUT_SIZE_LARGE);
+        } else {
+            return "grid".equals(list_mode);
+        }
+    }
 }
--- a/app/src/main/java/org/schabi/newpipe/fragments/list/BaseListInfoFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/list/BaseListInfoFragment.java
@@ -16,7 +16,6 @@ import icepick.State;
 import io.reactivex.Single;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.disposables.Disposable;
-import io.reactivex.functions.Consumer;
 import io.reactivex.schedulers.Schedulers;

 public abstract class BaseListInfoFragment<I extends ListInfo>
@@ -166,7 +165,6 @@ public abstract class BaseListInfoFragment<I extends ListInfo>
    public void handleResult(@NonNull I result) {
        super.handleResult(result);

-        url = result.getUrl();
        name = result.getName();
        setTitle(name);

--- a/app/src/main/java/org/schabi/newpipe/fragments/list/channel/ChannelFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/list/channel/ChannelFragment.java
@@ -36,11 +36,11 @@ import org.schabi.newpipe.extractor.stream.StreamInfoItem;
 import org.schabi.newpipe.fragments.list.BaseListInfoFragment;
 import org.schabi.newpipe.info_list.InfoItemDialog;
 import org.schabi.newpipe.local.dialog.PlaylistAppendDialog;
+import org.schabi.newpipe.local.subscription.SubscriptionService;
 import org.schabi.newpipe.player.playqueue.ChannelPlayQueue;
 import org.schabi.newpipe.player.playqueue.PlayQueue;
 import org.schabi.newpipe.player.playqueue.SinglePlayQueue;
 import org.schabi.newpipe.report.UserAction;
-import org.schabi.newpipe.local.subscription.SubscriptionService;
 import org.schabi.newpipe.util.AnimationUtils;
 import org.schabi.newpipe.util.ExtractorHelper;
 import org.schabi.newpipe.util.ImageDisplayConstants;
@@ -68,7 +68,7 @@ import static org.schabi.newpipe.util.AnimationUtils.animateView;

 public class ChannelFragment extends BaseListInfoFragment<ChannelInfo> {

-    private CompositeDisposable disposables = new CompositeDisposable();
+    private final CompositeDisposable disposables = new CompositeDisposable();
    private Disposable subscribeButtonMonitor;
    private SubscriptionService subscriptionService;

@@ -161,38 +161,39 @@ public class ChannelFragment extends BaseListInfoFragment<ChannelInfo> {
                context.getResources().getString(R.string.start_here_on_main),
                context.getResources().getString(R.string.start_here_on_background),
                context.getResources().getString(R.string.start_here_on_popup),
-                context.getResources().getString(R.string.append_playlist)
+                context.getResources().getString(R.string.append_playlist),
+                context.getResources().getString(R.string.share)
        };

-        final DialogInterface.OnClickListener actions = new DialogInterface.OnClickListener() {
-            @Override
-            public void onClick(DialogInterface dialogInterface, int i) {
-                final int index = Math.max(infoListAdapter.getItemsList().indexOf(item), 0);
-                switch (i) {
-                    case 0:
-                        NavigationHelper.enqueueOnBackgroundPlayer(context, new SinglePlayQueue(item));
-                        break;
-                    case 1:
-                        NavigationHelper.enqueueOnPopupPlayer(activity, new SinglePlayQueue(item));
-                        break;
-                    case 2:
-                        NavigationHelper.playOnMainPlayer(context, getPlayQueue(index));
-                        break;
-                    case 3:
-                        NavigationHelper.playOnBackgroundPlayer(context, getPlayQueue(index));
-                        break;
-                    case 4:
-                        NavigationHelper.playOnPopupPlayer(activity, getPlayQueue(index));
-                        break;
-                    case 5:
-                        if (getFragmentManager() != null) {
-                            PlaylistAppendDialog.fromStreamInfoItems(Collections.singletonList(item))
-                                    .show(getFragmentManager(), TAG);
-                        }
-                        break;
-                    default:
-                        break;
-                }
+        final DialogInterface.OnClickListener actions = (DialogInterface dialogInterface, int i) -> {
+            final int index = Math.max(infoListAdapter.getItemsList().indexOf(item), 0);
+            switch (i) {
+                case 0:
+                    NavigationHelper.enqueueOnBackgroundPlayer(context, new SinglePlayQueue(item));
+                    break;
+                case 1:
+                    NavigationHelper.enqueueOnPopupPlayer(activity, new SinglePlayQueue(item));
+                    break;
+                case 2:
+                    NavigationHelper.playOnMainPlayer(context, getPlayQueue(index));
+                    break;
+                case 3:
+                    NavigationHelper.playOnBackgroundPlayer(context, getPlayQueue(index));
+                    break;
+                case 4:
+                    NavigationHelper.playOnPopupPlayer(activity, getPlayQueue(index));
+                    break;
+                case 5:
+                    if (getFragmentManager() != null) {
+                        PlaylistAppendDialog.fromStreamInfoItems(Collections.singletonList(item))
+                                .show(getFragmentManager(), TAG);
+                    }
+                    break;
+                case 6:
+                    shareUrl(item.getName(), item.getUrl());
+                    break;
+                default:
+                    break;
            }
        };

@@ -250,12 +251,12 @@ public class ChannelFragment extends BaseListInfoFragment<ChannelInfo> {
    private static final int BUTTON_DEBOUNCE_INTERVAL = 100;

    private void monitorSubscription(final ChannelInfo info) {
-        final Consumer<Throwable> onError = new Consumer<Throwable>() {
-            @Override
-            public void accept(Throwable throwable) throws Exception {
+        final Consumer<Throwable> onError = (Throwable throwable) -> {
                animateView(headerSubscribeButton, false, 100);
-                showSnackBarError(throwable, UserAction.SUBSCRIPTION, NewPipe.getNameOfService(currentInfo.getServiceId()), "Get subscription status", 0);
-            }
+                showSnackBarError(throwable, UserAction.SUBSCRIPTION,
+                        NewPipe.getNameOfService(currentInfo.getServiceId()),
+                        "Get subscription status",
+                        0);
        };

        final Observable<List<SubscriptionEntity>> observable = subscriptionService.subscriptionTable()
@@ -271,50 +272,38 @@ public class ChannelFragment extends BaseListInfoFragment<ChannelInfo> {
                // so only update the UI for the latest emission ("sync" the subscribe button's state)
                .debounce(100, TimeUnit.MILLISECONDS)
                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new Consumer<List<SubscriptionEntity>>() {
-                    @Override
-                    public void accept(List<SubscriptionEntity> subscriptionEntities) throws Exception {
-                        updateSubscribeButton(!subscriptionEntities.isEmpty());
-                    }
-                }, onError));
+                .subscribe((List<SubscriptionEntity> subscriptionEntities) ->
+                        updateSubscribeButton(!subscriptionEntities.isEmpty())
+                        , onError));

    }

    private Function<Object, Object> mapOnSubscribe(final SubscriptionEntity subscription) {
-        return new Function<Object, Object>() {
-            @Override
-            public Object apply(@NonNull Object o) throws Exception {
-                subscriptionService.subscriptionTable().insert(subscription);
-                return o;
-            }
+        return (@NonNull Object o) -> {
+            subscriptionService.subscriptionTable().insert(subscription);
+            return o;
        };
    }

    private Function<Object, Object> mapOnUnsubscribe(final SubscriptionEntity subscription) {
-        return new Function<Object, Object>() {
-            @Override
-            public Object apply(@NonNull Object o) throws Exception {
-                subscriptionService.subscriptionTable().delete(subscription);
-                return o;
-            }
+        return (@NonNull Object o) -> {
+            subscriptionService.subscriptionTable().delete(subscription);
+            return o;
        };
    }

    private void updateSubscription(final ChannelInfo info) {
        if (DEBUG) Log.d(TAG, "updateSubscription() called with: info = [" + info + "]");
-        final Action onComplete = new Action() {
-            @Override
-            public void run() throws Exception {
+        final Action onComplete = () -> {
                if (DEBUG) Log.d(TAG, "Updated subscription: " + info.getUrl());
-            }
        };

-        final Consumer<Throwable> onError = new Consumer<Throwable>() {
-            @Override
-            public void accept(@NonNull Throwable throwable) throws Exception {
-                onUnrecoverableError(throwable, UserAction.SUBSCRIPTION, NewPipe.getNameOfService(info.getServiceId()), "Updating Subscription for " + info.getUrl(), R.string.subscription_update_failed);
-            }
-        };
+        final Consumer<Throwable> onError = (@NonNull Throwable throwable) ->
+                onUnrecoverableError(throwable,
+                        UserAction.SUBSCRIPTION,
+                        NewPipe.getNameOfService(info.getServiceId()),
+                        "Updating Subscription for " + info.getUrl(),
+                        R.string.subscription_update_failed);

        disposables.add(subscriptionService.updateChannelInfo(info)
                .subscribeOn(Schedulers.io())
@@ -323,19 +312,16 @@ public class ChannelFragment extends BaseListInfoFragment<ChannelInfo> {
    }

    private Disposable monitorSubscribeButton(final Button subscribeButton, final Function<Object, Object> action) {
-        final Consumer<Object> onNext = new Consumer<Object>() {
-            @Override
-            public void accept(@NonNull Object o) throws Exception {
+        final Consumer<Object> onNext = (@NonNull Object o) -> {
                if (DEBUG) Log.d(TAG, "Changed subscription status to this channel!");
-            }
        };

-        final Consumer<Throwable> onError = new Consumer<Throwable>() {
-            @Override
-            public void accept(@NonNull Throwable throwable) throws Exception {
-                onUnrecoverableError(throwable, UserAction.SUBSCRIPTION, NewPipe.getNameOfService(currentInfo.getServiceId()), "Subscription Change", R.string.subscription_change_failed);
-            }
-        };
+        final Consumer<Throwable> onError = (@NonNull Throwable throwable) ->
+                onUnrecoverableError(throwable,
+                        UserAction.SUBSCRIPTION,
+                        NewPipe.getNameOfService(currentInfo.getServiceId()),
+                        "Subscription Change",
+                        R.string.subscription_change_failed);

        /* Emit clicks from main thread unto io thread */
        return RxView.clicks(subscribeButton)
@@ -347,25 +333,25 @@ public class ChannelFragment extends BaseListInfoFragment<ChannelInfo> {
    }

    private Consumer<List<SubscriptionEntity>> getSubscribeUpdateMonitor(final ChannelInfo info) {
-        return new Consumer<List<SubscriptionEntity>>() {
-            @Override
-            public void accept(List<SubscriptionEntity> subscriptionEntities) throws Exception {
-                if (DEBUG)
-                    Log.d(TAG, "subscriptionService.subscriptionTable.doOnNext() called with: subscriptionEntities = [" + subscriptionEntities + "]");
-                if (subscribeButtonMonitor != null) subscribeButtonMonitor.dispose();
+        return (List<SubscriptionEntity> subscriptionEntities) -> {
+            if (DEBUG)
+                Log.d(TAG, "subscriptionService.subscriptionTable.doOnNext() called with: subscriptionEntities = [" + subscriptionEntities + "]");
+            if (subscribeButtonMonitor != null) subscribeButtonMonitor.dispose();

-                if (subscriptionEntities.isEmpty()) {
-                    if (DEBUG) Log.d(TAG, "No subscription to this channel!");
-                    SubscriptionEntity channel = new SubscriptionEntity();
-                    channel.setServiceId(info.getServiceId());
-                    channel.setUrl(info.getUrl());
-                    channel.setData(info.getName(), info.getAvatarUrl(), info.getDescription(), info.getSubscriberCount());
-                    subscribeButtonMonitor = monitorSubscribeButton(headerSubscribeButton, mapOnSubscribe(channel));
-                } else {
-                    if (DEBUG) Log.d(TAG, "Found subscription to this channel!");
-                    final SubscriptionEntity subscription = subscriptionEntities.get(0);
-                    subscribeButtonMonitor = monitorSubscribeButton(headerSubscribeButton, mapOnUnsubscribe(subscription));
-                }
+            if (subscriptionEntities.isEmpty()) {
+                if (DEBUG) Log.d(TAG, "No subscription to this channel!");
+                SubscriptionEntity channel = new SubscriptionEntity();
+                channel.setServiceId(info.getServiceId());
+                channel.setUrl(info.getUrl());
+                channel.setData(info.getName(),
+                        info.getAvatarUrl(),
+                        info.getDescription(),
+                        info.getSubscriberCount());
+                subscribeButtonMonitor = monitorSubscribeButton(headerSubscribeButton, mapOnSubscribe(channel));
+            } else {
+                if (DEBUG) Log.d(TAG, "Found subscription to this channel!");
+                final SubscriptionEntity subscription = subscriptionEntities.get(0);
+                subscribeButtonMonitor = monitorSubscribeButton(headerSubscribeButton, mapOnUnsubscribe(subscription));
            }
        };
    }
@@ -432,10 +418,12 @@ public class ChannelFragment extends BaseListInfoFragment<ChannelInfo> {
        imageLoader.displayImage(result.getAvatarUrl(), headerAvatarView,
        		ImageDisplayConstants.DISPLAY_AVATAR_OPTIONS);

-        if (result.getSubscriberCount() != -1) {
+        headerSubscribersTextView.setVisibility(View.VISIBLE);
+        if (result.getSubscriberCount() >= 0) {
            headerSubscribersTextView.setText(Localization.localizeSubscribersCount(activity, result.getSubscriberCount()));
-            headerSubscribersTextView.setVisibility(View.VISIBLE);
-        } else headerSubscribersTextView.setVisibility(View.GONE);
+        } else {
+            headerSubscribersTextView.setText(R.string.subscribers_count_not_available);
+        }

        if (menuRssButton != null) menuRssButton.setVisible(!TextUtils.isEmpty(result.getFeedUrl()));

@@ -483,8 +471,11 @@ public class ChannelFragment extends BaseListInfoFragment<ChannelInfo> {
        super.handleNextItems(result);

        if (!result.getErrors().isEmpty()) {
-            showSnackBarError(result.getErrors(), UserAction.REQUESTED_CHANNEL, NewPipe.getNameOfService(serviceId),
-                    "Get next page of: " + url, R.string.general_error);
+            showSnackBarError(result.getErrors(),
+                    UserAction.REQUESTED_CHANNEL,
+                    NewPipe.getNameOfService(serviceId),
+                    "Get next page of: " + url,
+                    R.string.general_error);
        }
    }

@@ -497,7 +488,11 @@ public class ChannelFragment extends BaseListInfoFragment<ChannelInfo> {
        if (super.onError(exception)) return true;

        int errorId = exception instanceof ExtractionException ? R.string.parsing_error : R.string.general_error;
-        onUnrecoverableError(exception, UserAction.REQUESTED_CHANNEL, NewPipe.getNameOfService(serviceId), url, errorId);
+        onUnrecoverableError(exception,
+                UserAction.REQUESTED_CHANNEL,
+                NewPipe.getNameOfService(serviceId),
+                url,
+                errorId);
        return true;
    }

@@ -508,6 +503,6 @@ public class ChannelFragment extends BaseListInfoFragment<ChannelInfo> {
    @Override
    public void setTitle(String title) {
        super.setTitle(title);
-        headerTitleView.setText(title);
+        if (!useAsFrontPage) headerTitleView.setText(title);
    }
 }
--- a/app/src/main/java/org/schabi/newpipe/fragments/list/kiosk/KioskFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/list/kiosk/KioskFragment.java
@@ -5,28 +5,23 @@ import android.preference.PreferenceManager;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v7.app.ActionBar;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.TextView;

 import org.schabi.newpipe.R;
 import org.schabi.newpipe.extractor.ListExtractor;
 import org.schabi.newpipe.extractor.NewPipe;
 import org.schabi.newpipe.extractor.StreamingService;
-import org.schabi.newpipe.extractor.UrlIdHandler;
 import org.schabi.newpipe.extractor.exceptions.ExtractionException;
 import org.schabi.newpipe.extractor.kiosk.KioskInfo;
-import org.schabi.newpipe.extractor.stream.StreamInfoItem;
+import org.schabi.newpipe.extractor.linkhandler.ListLinkHandlerFactory;
 import org.schabi.newpipe.fragments.list.BaseListInfoFragment;
-import org.schabi.newpipe.info_list.InfoItemBuilder;
 import org.schabi.newpipe.report.UserAction;
 import org.schabi.newpipe.util.ExtractorHelper;
 import org.schabi.newpipe.util.KioskTranslator;
-import org.schabi.newpipe.util.NavigationHelper;

 import icepick.State;
 import io.reactivex.Single;
@@ -59,6 +54,7 @@ public class KioskFragment extends BaseListInfoFragment<KioskInfo> {
    protected String kioskId = "";
    protected String kioskTranslatedName;

+
    /*//////////////////////////////////////////////////////////////////////////
    // Views
    //////////////////////////////////////////////////////////////////////////*/
@@ -74,11 +70,10 @@ public class KioskFragment extends BaseListInfoFragment<KioskInfo> {
            throws ExtractionException {
        KioskFragment instance = new KioskFragment();
        StreamingService service = NewPipe.getService(serviceId);
-        UrlIdHandler kioskTypeUrlIdHandler = service.getKioskList()
-                .getUrlIdHandlerByType(kioskId);
+        ListLinkHandlerFactory kioskLinkHandlerFactory = service.getKioskList()
+                .getListLinkHandlerFactoryByType(kioskId);
        instance.setInitialData(serviceId,
-                kioskTypeUrlIdHandler.getUrl(kioskId),
-                kioskId);
+                kioskLinkHandlerFactory.fromId(kioskId).getUrl(), kioskId);
        instance.kioskId = kioskId;
        return instance;
    }
@@ -133,20 +128,16 @@ public class KioskFragment extends BaseListInfoFragment<KioskInfo> {

    @Override
    public Single<KioskInfo> loadResult(boolean forceReload) {
-        String contentCountry = PreferenceManager
-                .getDefaultSharedPreferences(activity)
-                .getString(getString(R.string.content_country_key),
-                        getString(R.string.default_country_value));
-        return ExtractorHelper.getKioskInfo(serviceId, url, contentCountry, forceReload);
+        return ExtractorHelper.getKioskInfo(serviceId,
+                url,
+                forceReload);
    }

    @Override
    public Single<ListExtractor.InfoItemsPage> loadMoreItemsLogic() {
-        String contentCountry = PreferenceManager
-                .getDefaultSharedPreferences(activity)
-                .getString(getString(R.string.content_country_key),
-                        getString(R.string.default_country_value));
-        return ExtractorHelper.getMoreKioskItems(serviceId, url, currentNextPageUrl, contentCountry);
+        return ExtractorHelper.getMoreKioskItems(serviceId,
+                url,
+                currentNextPageUrl);
    }

    /*//////////////////////////////////////////////////////////////////////////
@@ -164,7 +155,9 @@ public class KioskFragment extends BaseListInfoFragment<KioskInfo> {
        super.handleResult(result);

        name = kioskTranslatedName;
-        setTitle(kioskTranslatedName);
+        if(!useAsFrontPage) {
+            setTitle(kioskTranslatedName);
+        }

        if (!result.getErrors().isEmpty()) {
            showSnackBarError(result.getErrors(),
--- a/app/src/main/java/org/schabi/newpipe/fragments/list/playlist/PlaylistFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/list/playlist/PlaylistFragment.java
@@ -6,6 +6,7 @@ import android.content.DialogInterface;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
+import android.support.v7.app.AppCompatActivity;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -29,11 +30,12 @@ import org.schabi.newpipe.extractor.exceptions.ExtractionException;
 import org.schabi.newpipe.extractor.playlist.PlaylistInfo;
 import org.schabi.newpipe.extractor.stream.StreamInfoItem;
 import org.schabi.newpipe.fragments.list.BaseListInfoFragment;
-import org.schabi.newpipe.local.playlist.RemotePlaylistManager;
 import org.schabi.newpipe.info_list.InfoItemDialog;
+import org.schabi.newpipe.local.playlist.RemotePlaylistManager;
 import org.schabi.newpipe.player.playqueue.PlayQueue;
 import org.schabi.newpipe.player.playqueue.PlaylistPlayQueue;
 import org.schabi.newpipe.player.playqueue.SinglePlayQueue;
+import org.schabi.newpipe.report.ErrorActivity;
 import org.schabi.newpipe.report.UserAction;
 import org.schabi.newpipe.util.ExtractorHelper;
 import org.schabi.newpipe.util.ImageDisplayConstants;
@@ -44,6 +46,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicBoolean;

+import io.reactivex.Flowable;
 import io.reactivex.Single;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.disposables.CompositeDisposable;
@@ -93,7 +96,8 @@ public class PlaylistFragment extends BaseListInfoFragment<PlaylistInfo> {
        super.onCreate(savedInstanceState);
        disposables = new CompositeDisposable();
        isBookmarkButtonReady = new AtomicBoolean(false);
-        remotePlaylistManager = new RemotePlaylistManager(NewPipeDatabase.getInstance(getContext()));
+        remotePlaylistManager = new RemotePlaylistManager(NewPipeDatabase.getInstance(
+                requireContext()));
    }

    @Override
@@ -142,6 +146,7 @@ public class PlaylistFragment extends BaseListInfoFragment<PlaylistInfo> {
                context.getResources().getString(R.string.start_here_on_main),
                context.getResources().getString(R.string.start_here_on_background),
                context.getResources().getString(R.string.start_here_on_popup),
+                context.getResources().getString(R.string.share)
        };

        final DialogInterface.OnClickListener actions = (dialogInterface, i) -> {
@@ -162,6 +167,9 @@ public class PlaylistFragment extends BaseListInfoFragment<PlaylistInfo> {
                case 4:
                    NavigationHelper.playOnPopupPlayer(activity, getPlayQueue(index));
                    break;
+                case 5:
+                    shareUrl(item.getName(), item.getUrl());
+                    break;
                default:
                    break;
            }
@@ -261,11 +269,16 @@ public class PlaylistFragment extends BaseListInfoFragment<PlaylistInfo> {
        if (!TextUtils.isEmpty(result.getUploaderName())) {
            headerUploaderName.setText(result.getUploaderName());
            if (!TextUtils.isEmpty(result.getUploaderUrl())) {
-                headerUploaderLayout.setOnClickListener(v ->
+                headerUploaderLayout.setOnClickListener(v -> {
+                    try {
                        NavigationHelper.openChannelFragment(getFragmentManager(),
-                                result.getServiceId(), result.getUploaderUrl(),
-                                result.getUploaderName())
-                );
+                                result.getServiceId(),
+                                result.getUploaderUrl(),
+                                result.getUploaderName());
+                    } catch (Exception e) {
+                        ErrorActivity.reportUiError((AppCompatActivity) getActivity(), e);
+                    }
+                });
            }
        }

@@ -281,14 +294,11 @@ public class PlaylistFragment extends BaseListInfoFragment<PlaylistInfo> {
        }

        remotePlaylistManager.getPlaylist(result)
+                .flatMap(lists -> getUpdateProcessor(lists, result), (lists, id) -> lists)
                .onBackpressureLatest()
                .observeOn(AndroidSchedulers.mainThread())
                .subscribe(getPlaylistBookmarkSubscriber());

-        remotePlaylistManager.onUpdate(result)
-                .subscribeOn(AndroidSchedulers.mainThread())
-                .subscribe(integer -> {/* Do nothing*/}, this::onError);
-
        headerPlayAllButton.setOnClickListener(view ->
                NavigationHelper.playOnMainPlayer(activity, getPlayQueue()));
        headerPopupButton.setOnClickListener(view ->
@@ -336,7 +346,11 @@ public class PlaylistFragment extends BaseListInfoFragment<PlaylistInfo> {
        if (super.onError(exception)) return true;

        int errorId = exception instanceof ExtractionException ? R.string.parsing_error : R.string.general_error;
-        onUnrecoverableError(exception, UserAction.REQUESTED_PLAYLIST, NewPipe.getNameOfService(serviceId), url, errorId);
+        onUnrecoverableError(exception,
+                UserAction.REQUESTED_PLAYLIST,
+                NewPipe.getNameOfService(serviceId),
+                url,
+                errorId);
        return true;
    }

@@ -344,6 +358,17 @@ public class PlaylistFragment extends BaseListInfoFragment<PlaylistInfo> {
    // Utils
    //////////////////////////////////////////////////////////////////////////*/

+    private Flowable<Integer> getUpdateProcessor(@NonNull List<PlaylistRemoteEntity> playlists,
+                                                 @NonNull PlaylistInfo result) {
+        final Flowable<Integer> noItemToUpdate = Flowable.just(/*noItemToUpdate=*/-1);
+        if (playlists.isEmpty()) return noItemToUpdate;
+
+        final PlaylistRemoteEntity playlistEntity = playlists.get(0);
+        if (playlistEntity.isIdenticalTo(result)) return noItemToUpdate;
+
+        return remotePlaylistManager.onUpdate(playlists.get(0).getUid(), result).toFlowable();
+    }
+
    private Subscriber<List<PlaylistRemoteEntity>> getPlaylistBookmarkSubscriber() {
        return new Subscriber<List<PlaylistRemoteEntity>>() {
            @Override
@@ -416,4 +441,4 @@ public class PlaylistFragment extends BaseListInfoFragment<PlaylistInfo> {
        playlistBookmarkButton.setIcon(ThemeHelper.resolveResourceIdFromAttr(activity, iconAttr));
        playlistBookmarkButton.setTitle(titleRes);
    }
-}
+}
--- a/app/src/main/java/org/schabi/newpipe/fragments/list/search/SearchFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/list/search/SearchFragment.java
@@ -37,26 +37,30 @@ import org.schabi.newpipe.extractor.ListExtractor;
 import org.schabi.newpipe.extractor.NewPipe;
 import org.schabi.newpipe.extractor.StreamingService;
 import org.schabi.newpipe.extractor.exceptions.ParsingException;
-import org.schabi.newpipe.extractor.search.SearchEngine;
-import org.schabi.newpipe.extractor.search.SearchResult;
+import org.schabi.newpipe.extractor.search.SearchExtractor;
+import org.schabi.newpipe.extractor.search.SearchInfo;
 import org.schabi.newpipe.fragments.BackPressable;
 import org.schabi.newpipe.fragments.list.BaseListFragment;
 import org.schabi.newpipe.local.history.HistoryRecordManager;
+import org.schabi.newpipe.report.ErrorActivity;
 import org.schabi.newpipe.report.UserAction;
 import org.schabi.newpipe.util.Constants;
 import org.schabi.newpipe.util.AnimationUtils;
 import org.schabi.newpipe.util.ExtractorHelper;
 import org.schabi.newpipe.util.LayoutManagerSmoothScroller;
 import org.schabi.newpipe.util.NavigationHelper;
+import org.schabi.newpipe.util.ServiceHelper;

 import java.io.IOException;
 import java.io.InterruptedIOException;
 import java.net.SocketException;
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 import java.util.Queue;
-import java.util.concurrent.Callable;
 import java.util.concurrent.TimeUnit;

 import icepick.State;
@@ -65,14 +69,15 @@ import io.reactivex.Observable;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.disposables.CompositeDisposable;
 import io.reactivex.disposables.Disposable;
-import io.reactivex.functions.Consumer;
 import io.reactivex.schedulers.Schedulers;
 import io.reactivex.subjects.PublishSubject;

+import static java.util.Arrays.asList;
+
 import static org.schabi.newpipe.util.AnimationUtils.animateView;

 public class SearchFragment
-        extends BaseListFragment<SearchResult, ListExtractor.InfoItemsPage>
+        extends BaseListFragment<SearchInfo, ListExtractor.InfoItemsPage>
        implements BackPressable {

    /*//////////////////////////////////////////////////////////////////////////
@@ -92,27 +97,36 @@ public class SearchFragment

    @State
    protected int filterItemCheckedId = -1;
-    private SearchEngine.Filter filter = SearchEngine.Filter.ANY;

    @State
    protected int serviceId = Constants.NO_SERVICE_ID;
+    
+    // this three represet the current search query
    @State
-    protected String searchQuery;
+    protected String searchString;
    @State
-    protected String lastSearchedQuery;
+    protected String[] contentFilter;
+    @State
+    protected String sortFilter;
+    
+    // these represtent the last search
+    @State
+    protected String lastSearchedString;
+    
    @State
    protected boolean wasSearchFocused = false;

-    private int currentPage = 0;
-    private int currentNextPage = 0;
+    private Map<Integer, String> menuItemToFilterName;
+    private StreamingService service;
+    private String currentPageUrl;
+    private String nextPageUrl;
    private String contentCountry;
    private boolean isSuggestionsEnabled = true;
-    private boolean isSearchHistoryEnabled = true;

-    private PublishSubject<String> suggestionPublisher = PublishSubject.create();
+    private final PublishSubject<String> suggestionPublisher = PublishSubject.create();
    private Disposable searchDisposable;
    private Disposable suggestionDisposable;
-    private CompositeDisposable disposables = new CompositeDisposable();
+    private final CompositeDisposable disposables = new CompositeDisposable();

    private SuggestionListAdapter suggestionListAdapter;
    private HistoryRecordManager historyRecordManager;
@@ -130,11 +144,11 @@ public class SearchFragment

    /*////////////////////////////////////////////////////////////////////////*/

-    public static SearchFragment getInstance(int serviceId, String query) {
+    public static SearchFragment getInstance(int serviceId, String searchString) {
        SearchFragment searchFragment = new SearchFragment();
-        searchFragment.setQuery(serviceId, query);
+        searchFragment.setQuery(serviceId, searchString, new String[0], "");

-        if (!TextUtils.isEmpty(query)) {
+        if (!TextUtils.isEmpty(searchString)) {
            searchFragment.setSearchOnResume();
        }

@@ -158,7 +172,7 @@ public class SearchFragment

        suggestionListAdapter = new SuggestionListAdapter(activity);
        SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(activity);
-        isSearchHistoryEnabled = preferences.getBoolean(getString(R.string.enable_search_history_key), true);
+        boolean isSearchHistoryEnabled = preferences.getBoolean(getString(R.string.enable_search_history_key), true);
        suggestionListAdapter.setShowSuggestionHistory(isSearchHistoryEnabled);

        historyRecordManager = new HistoryRecordManager(context);
@@ -202,13 +216,22 @@ public class SearchFragment
        if (DEBUG) Log.d(TAG, "onResume() called");
        super.onResume();

-        if (!TextUtils.isEmpty(searchQuery)) {
+        try {
+            service = NewPipe.getService(serviceId);
+        } catch (Exception e) {
+            ErrorActivity.reportError(getActivity(), e, getActivity().getClass(),
+                    getActivity().findViewById(android.R.id.content),
+                    ErrorActivity.ErrorInfo.make(UserAction.UI_ERROR,
+                            "",
+                            "", R.string.general_error));
+        }
+
+        if (!TextUtils.isEmpty(searchString)) {
            if (wasLoading.getAndSet(false)) {
-                if (currentNextPage > currentPage) loadMoreItems();
-                else search(searchQuery);
+                search(searchString, contentFilter, sortFilter);
            } else if (infoListAdapter.getItemsList().size() == 0) {
                if (savedState == null) {
-                    search(searchQuery);
+                    search(searchString, contentFilter, sortFilter);
                } else if (!isLoading.get() && !wasSearchFocused) {
                    infoListAdapter.clearStreamItemList();
                    showEmptyState();
@@ -218,7 +241,7 @@ public class SearchFragment

        if (suggestionDisposable == null || suggestionDisposable.isDisposed()) initSuggestionObserver();

-        if (TextUtils.isEmpty(searchQuery) || wasSearchFocused) {
+        if (TextUtils.isEmpty(searchString) || wasSearchFocused) {
            showKeyboardSearch();
            showSuggestionsPanel();
        } else {
@@ -247,8 +270,9 @@ public class SearchFragment
    public void onActivityResult(int requestCode, int resultCode, Intent data) {
        switch (requestCode) {
            case ReCaptchaActivity.RECAPTCHA_REQUEST:
-                if (resultCode == Activity.RESULT_OK && !TextUtils.isEmpty(searchQuery)) {
-                    search(searchQuery);
+                if (resultCode == Activity.RESULT_OK
+                        && !TextUtils.isEmpty(searchString)) {
+                    search(searchString, contentFilter, sortFilter);
                } else Log.e(TAG, "ReCaptcha failed");
                break;

@@ -282,20 +306,22 @@ public class SearchFragment
    @Override
    public void writeTo(Queue<Object> objectsToSave) {
        super.writeTo(objectsToSave);
-        objectsToSave.add(currentPage);
-        objectsToSave.add(currentNextPage);
+        objectsToSave.add(currentPageUrl);
+        objectsToSave.add(nextPageUrl);
    }

    @Override
    public void readFrom(@NonNull Queue<Object> savedObjects) throws Exception {
        super.readFrom(savedObjects);
-        currentPage = (int) savedObjects.poll();
-        currentNextPage = (int) savedObjects.poll();
+        currentPageUrl = (String) savedObjects.poll();
+        nextPageUrl = (String) savedObjects.poll();
    }

    @Override
    public void onSaveInstanceState(Bundle bundle) {
-        searchQuery = searchEditText != null ? searchEditText.getText().toString() : searchQuery;
+        searchString = searchEditText != null
+                ? searchEditText.getText().toString()
+                : searchString;
        super.onSaveInstanceState(bundle);
    }

@@ -305,8 +331,11 @@ public class SearchFragment

    @Override
    public void reloadContent() {
-        if (!TextUtils.isEmpty(searchQuery) || (searchEditText != null && !TextUtils.isEmpty(searchEditText.getText()))) {
-            search(!TextUtils.isEmpty(searchQuery) ? searchQuery : searchEditText.getText().toString());
+        if (!TextUtils.isEmpty(searchString)
+                || (searchEditText != null && !TextUtils.isEmpty(searchEditText.getText()))) {
+            search(!TextUtils.isEmpty(searchString)
+                    ? searchString
+                    : searchEditText.getText().toString(), new String[0], "");
        } else {
            if (searchEditText != null) {
                searchEditText.setText("");
@@ -330,22 +359,35 @@ public class SearchFragment
            supportActionBar.setDisplayHomeAsUpEnabled(true);
        }

-        inflater.inflate(R.menu.menu_search, menu);
+        menuItemToFilterName = new HashMap<>();
+
+        int itemId = 0;
+        boolean isFirstItem = true;
+        final Context c = getContext();
+        for(String filter : service.getSearchQHFactory().getAvailableContentFilter()) {
+            menuItemToFilterName.put(itemId, filter);
+            MenuItem item = menu.add(1,
+                    itemId++,
+                    0,
+                    ServiceHelper.getTranslatedFilterString(filter, c));
+            if(isFirstItem) {
+                item.setChecked(true);
+                isFirstItem = false;
+            }
+        }
+        menu.setGroupCheckable(1, true, true);
+
        restoreFilterChecked(menu, filterItemCheckedId);
    }

    @Override
    public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-            case R.id.menu_filter_all:
-            case R.id.menu_filter_video:
-            case R.id.menu_filter_channel:
-            case R.id.menu_filter_playlist:
-                changeFilter(item, getFilterFromMenuId(item.getItemId()));
-                return true;
-            default:
-                return super.onOptionsItemSelected(item);
-        }
+
+        List<String> contentFilter = new ArrayList<>(1);
+        contentFilter.add(menuItemToFilterName.get(item.getItemId()));
+        changeContentFilter(item, contentFilter);
+
+        return true;
    }

    private void restoreFilterChecked(Menu menu, int itemId) {
@@ -354,21 +396,6 @@ public class SearchFragment
            if (item == null) return;

            item.setChecked(true);
-            filter = getFilterFromMenuId(itemId);
-        }
-    }
-
-    private SearchEngine.Filter getFilterFromMenuId(int itemId) {
-        switch (itemId) {
-            case R.id.menu_filter_video:
-                return SearchEngine.Filter.STREAM;
-            case R.id.menu_filter_channel:
-                return SearchEngine.Filter.CHANNEL;
-            case R.id.menu_filter_playlist:
-                return SearchEngine.Filter.PLAYLIST;
-            case R.id.menu_filter_all:
-            default:
-                return SearchEngine.Filter.ANY;
        }
    }

@@ -379,14 +406,21 @@ public class SearchFragment
    private TextWatcher textWatcher;

    private void showSearchOnStart() {
-        if (DEBUG) Log.d(TAG, "showSearchOnStart() called, searchQuery → " + searchQuery+", lastSearchedQuery → " + lastSearchedQuery);
-        searchEditText.setText(searchQuery);
+        if (DEBUG) Log.d(TAG, "showSearchOnStart() called, searchQuery → "
+                + searchString
+                + ", lastSearchedQuery → "
+                + lastSearchedString);
+        searchEditText.setText(searchString);

-        if (TextUtils.isEmpty(searchQuery) || TextUtils.isEmpty(searchEditText.getText())) {
+        if (TextUtils.isEmpty(searchString) || TextUtils.isEmpty(searchEditText.getText())) {
            searchToolbarContainer.setTranslationX(100);
            searchToolbarContainer.setAlpha(0f);
            searchToolbarContainer.setVisibility(View.VISIBLE);
-            searchToolbarContainer.animate().translationX(0).alpha(1f).setDuration(200).setInterpolator(new DecelerateInterpolator()).start();
+            searchToolbarContainer.animate()
+                    .translationX(0)
+                    .alpha(1f)
+                    .setDuration(200)
+                    .setInterpolator(new DecelerateInterpolator()).start();
        } else {
            searchToolbarContainer.setTranslationX(0);
            searchToolbarContainer.setAlpha(1f);
@@ -396,47 +430,38 @@ public class SearchFragment

    private void initSearchListeners() {
        if (DEBUG) Log.d(TAG, "initSearchListeners() called");
-        searchClear.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                if (DEBUG) Log.d(TAG, "onClick() called with: v = [" + v + "]");
-                if (TextUtils.isEmpty(searchEditText.getText())) {
-                    NavigationHelper.gotoMainFragment(getFragmentManager());
-                    return;
-                }
-
-                searchEditText.setText("");
-                suggestionListAdapter.setItems(new ArrayList<SuggestionItem>());
-                showKeyboardSearch();
+        searchClear.setOnClickListener(v -> {
+            if (DEBUG) Log.d(TAG, "onClick() called with: v = [" + v + "]");
+            if (TextUtils.isEmpty(searchEditText.getText())) {
+                NavigationHelper.gotoMainFragment(getFragmentManager());
+                return;
            }
+
+            searchEditText.setText("");
+            suggestionListAdapter.setItems(new ArrayList<>());
+            showKeyboardSearch();
        });

        TooltipCompat.setTooltipText(searchClear, getString(R.string.clear));

-        searchEditText.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                if (DEBUG) Log.d(TAG, "onClick() called with: v = [" + v + "]");
-                if (isSuggestionsEnabled && errorPanelRoot.getVisibility() != View.VISIBLE) {
-                    showSuggestionsPanel();
-                }
+        searchEditText.setOnClickListener(v -> {
+            if (DEBUG) Log.d(TAG, "onClick() called with: v = [" + v + "]");
+            if (isSuggestionsEnabled && errorPanelRoot.getVisibility() != View.VISIBLE) {
+                showSuggestionsPanel();
            }
        });

-        searchEditText.setOnFocusChangeListener(new View.OnFocusChangeListener() {
-            @Override
-            public void onFocusChange(View v, boolean hasFocus) {
-                if (DEBUG) Log.d(TAG, "onFocusChange() called with: v = [" + v + "], hasFocus = [" + hasFocus + "]");
-                if (isSuggestionsEnabled && hasFocus && errorPanelRoot.getVisibility() != View.VISIBLE) {
-                    showSuggestionsPanel();
-                }
+        searchEditText.setOnFocusChangeListener((View v, boolean hasFocus) -> {
+            if (DEBUG) Log.d(TAG, "onFocusChange() called with: v = [" + v + "], hasFocus = [" + hasFocus + "]");
+            if (isSuggestionsEnabled && hasFocus && errorPanelRoot.getVisibility() != View.VISIBLE) {
+                showSuggestionsPanel();
            }
        });

        suggestionListAdapter.setListener(new SuggestionListAdapter.OnSuggestionItemSelected() {
            @Override
            public void onSuggestionItemSelected(SuggestionItem item) {
-                search(item.query);
+                search(item.query, new String[0], "");
                searchEditText.setText(item.query);
            }

@@ -469,21 +494,22 @@ public class SearchFragment
            }
        };
        searchEditText.addTextChangedListener(textWatcher);
-        searchEditText.setOnEditorActionListener(new TextView.OnEditorActionListener() {
-            @Override
-            public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-                if (DEBUG) {
-                    Log.d(TAG, "onEditorAction() called with: v = [" + v + "], actionId = [" + actionId + "], event = [" + event + "]");
-                }
-                if (event != null && (event.getKeyCode() == KeyEvent.KEYCODE_ENTER || event.getAction() == EditorInfo.IME_ACTION_SEARCH)) {
-                    search(searchEditText.getText().toString());
-                    return true;
-                }
-                return false;
-            }
-        });
+        searchEditText.setOnEditorActionListener(
+                (TextView v, int actionId, KeyEvent event) -> {
+                    if (DEBUG) {
+                        Log.d(TAG, "onEditorAction() called with: v = [" + v + "], actionId = [" + actionId + "], event = [" + event + "]");
+                    }
+                    if (event != null
+                            && (event.getKeyCode() == KeyEvent.KEYCODE_ENTER
+                                || event.getAction() == EditorInfo.IME_ACTION_SEARCH)) {
+                        search(searchEditText.getText().toString(), new String[0], "");
+                        return true;
+                    }
+                    return false;
+                });

-        if (suggestionDisposable == null || suggestionDisposable.isDisposed()) initSuggestionObserver();
+        if (suggestionDisposable == null || suggestionDisposable.isDisposed())
+            initSuggestionObserver();
    }

    private void unsetSearchListeners() {
@@ -513,7 +539,8 @@ public class SearchFragment
        if (searchEditText == null) return;

        if (searchEditText.requestFocus()) {
-            InputMethodManager imm = (InputMethodManager) activity.getSystemService(Context.INPUT_METHOD_SERVICE);
+            InputMethodManager imm = (InputMethodManager) activity.getSystemService(
+                    Context.INPUT_METHOD_SERVICE);
            imm.showSoftInput(searchEditText, InputMethodManager.SHOW_IMPLICIT);
        }
    }
@@ -522,8 +549,10 @@ public class SearchFragment
        if (DEBUG) Log.d(TAG, "hideKeyboardSearch() called");
        if (searchEditText == null) return;

-        InputMethodManager imm = (InputMethodManager) activity.getSystemService(Context.INPUT_METHOD_SERVICE);
-        imm.hideSoftInputFromWindow(searchEditText.getWindowToken(), InputMethodManager.HIDE_NOT_ALWAYS);
+        InputMethodManager imm = (InputMethodManager) activity.getSystemService(
+                Context.INPUT_METHOD_SERVICE);
+        imm.hideSoftInputFromWindow(searchEditText.getWindowToken(),
+                InputMethodManager.HIDE_NOT_ALWAYS);

        searchEditText.clearFocus();
    }
@@ -545,8 +574,7 @@ public class SearchFragment
                                            .onNext(searchEditText.getText().toString()),
                                    throwable -> showSnackBarError(throwable,
                                            UserAction.DELETE_FROM_HISTORY, "none",
-                                            "Deleting item failed", R.string.general_error)
-                            );
+                                            "Deleting item failed", R.string.general_error));
                    disposables.add(onDelete);
                })
                .show();
@@ -554,10 +582,12 @@ public class SearchFragment

    @Override
    public boolean onBackPressed() {
-        if (suggestionsPanel.getVisibility() == View.VISIBLE && infoListAdapter.getItemsList().size() > 0 && !isLoading.get()) {
+        if (suggestionsPanel.getVisibility() == View.VISIBLE
+                && infoListAdapter.getItemsList().size() > 0
+                && !isLoading.get()) {
            hideSuggestionsPanel();
            hideKeyboardSearch();
-            searchEditText.setText(lastSearchedQuery);
+            searchEditText.setText(lastSearchedString);
            return true;
        }
        return false;
@@ -573,8 +603,10 @@ public class SearchFragment

        final Observable<String> observable = suggestionPublisher
                .debounce(SUGGESTIONS_DEBOUNCE, TimeUnit.MILLISECONDS)
-                .startWith(searchQuery != null ? searchQuery : "")
-                .filter(query -> isSuggestionsEnabled);
+                .startWith(searchString != null
+                        ? searchString
+                        : "")
+                .filter(searchString -> isSuggestionsEnabled);

        suggestionDisposable = observable
                .switchMap(query -> {
@@ -594,7 +626,7 @@ public class SearchFragment
                    }

                    final Observable<List<SuggestionItem>> network = ExtractorHelper
-                            .suggestionsFor(serviceId, query, contentCountry)
+                            .suggestionsFor(serviceId, query)
                            .toObservable()
                            .map(strings -> {
                                List<SuggestionItem> result = new ArrayList<>();
@@ -645,56 +677,44 @@ public class SearchFragment
        // no-op
    }

-    private void search(final String query) {
-        if (DEBUG) Log.d(TAG, "search() called with: query = [" + query + "]");
-        if (query.isEmpty()) return;
+    private void search(final String searchString, String[] contentFilter, String sortFilter) {
+        if (DEBUG) Log.d(TAG, "search() called with: query = [" + searchString + "]");
+        if (searchString.isEmpty()) return;

        try {
-            final StreamingService service = NewPipe.getServiceByUrl(query);
+            final StreamingService service = NewPipe.getServiceByUrl(searchString);
            if (service != null) {
                showLoading();
                disposables.add(Observable
-                        .fromCallable(new Callable<Intent>() {
-                            @Override
-                            public Intent call() throws Exception {
-                                return NavigationHelper.getIntentByLink(activity, service, query);
-                            }
-                        })
+                        .fromCallable(() ->
+                                NavigationHelper.getIntentByLink(activity, service, searchString))
                        .subscribeOn(Schedulers.io())
                        .observeOn(AndroidSchedulers.mainThread())
-                        .subscribe(new Consumer<Intent>() {
-                            @Override
-                            public void accept(Intent intent) throws Exception {
-                                getFragmentManager().popBackStackImmediate();
-                                activity.startActivity(intent);
-                            }
-                        }, new Consumer<Throwable>() {
-                            @Override
-                            public void accept(Throwable throwable) throws Exception {
-                                showError(getString(R.string.url_not_supported_toast), false);
-                            }
-                        }));
+                        .subscribe(intent -> {
+                            getFragmentManager().popBackStackImmediate();
+                            activity.startActivity(intent);
+                        }, throwable ->
+                                showError(getString(R.string.url_not_supported_toast), false)));
                return;
            }
        } catch (Exception e) {
            // Exception occurred, it's not a url
        }

-        lastSearchedQuery = query;
-        searchQuery = query;
-        currentPage = 0;
+        lastSearchedString = this.searchString;
+        this.searchString = searchString;
        infoListAdapter.clearStreamItemList();
        hideSuggestionsPanel();
        hideKeyboardSearch();

-        historyRecordManager.onSearched(serviceId, query)
+        historyRecordManager.onSearched(serviceId, searchString)
                .observeOn(AndroidSchedulers.mainThread())
                .subscribe(
                        ignored -> {},
                        error -> showSnackBarError(error, UserAction.SEARCHED,
-                                NewPipe.getNameOfService(serviceId), query, 0)
+                                NewPipe.getNameOfService(serviceId), searchString, 0)
                );
-        suggestionPublisher.onNext(query);
+        suggestionPublisher.onNext(searchString);
        startLoading(false);
    }

@@ -703,11 +723,15 @@ public class SearchFragment
        super.startLoading(forceLoad);
        if (disposables != null) disposables.clear();
        if (searchDisposable != null) searchDisposable.dispose();
-        searchDisposable = ExtractorHelper.searchFor(serviceId, searchQuery, currentPage, contentCountry, filter)
+        searchDisposable = ExtractorHelper.searchFor(serviceId,
+                    searchString,
+                    Arrays.asList(contentFilter),
+                    sortFilter)
                .subscribeOn(Schedulers.io())
                .observeOn(AndroidSchedulers.mainThread())
                .doOnEvent((searchResult, throwable) -> isLoading.set(false))
                .subscribe(this::handleResult, this::onError);
+
    }

    @Override
@@ -715,8 +739,12 @@ public class SearchFragment
        isLoading.set(true);
        showListFooter(true);
        if (searchDisposable != null) searchDisposable.dispose();
-        currentNextPage = currentPage + 1;
-        searchDisposable = ExtractorHelper.getMoreSearchItems(serviceId, searchQuery, currentNextPage, contentCountry, filter)
+        searchDisposable = ExtractorHelper.getMoreSearchItems(
+                    serviceId,
+                    searchString,
+                    asList(contentFilter),
+                    sortFilter,
+                    nextPageUrl)
                .subscribeOn(Schedulers.io())
                .observeOn(AndroidSchedulers.mainThread())
                .doOnEvent((nextItemsResult, throwable) -> isLoading.set(false))
@@ -739,19 +767,22 @@ public class SearchFragment
    // Utils
    //////////////////////////////////////////////////////////////////////////*/

-    private void changeFilter(MenuItem item, SearchEngine.Filter filter) {
-        this.filter = filter;
+    private void changeContentFilter(MenuItem item, List<String> contentFilter) {
        this.filterItemCheckedId = item.getItemId();
        item.setChecked(true);

-        if (!TextUtils.isEmpty(searchQuery)) {
-            search(searchQuery);
+        this.contentFilter = new String[] {contentFilter.get(0)};
+
+        if (!TextUtils.isEmpty(searchString)) {
+            search(searchString, this.contentFilter, sortFilter);
        }
    }

-    private void setQuery(int serviceId, String searchQuery) {
+    private void setQuery(int serviceId, String searchString, String[] contentfilter, String sortFilter) {
        this.serviceId = serviceId;
-        this.searchQuery = searchQuery;
+        this.searchString = searchString;
+        this.contentFilter = contentfilter;
+        this.sortFilter = sortFilter;
    }

    /*//////////////////////////////////////////////////////////////////////////
@@ -772,8 +803,11 @@ public class SearchFragment
        if (DEBUG) Log.d(TAG, "onSuggestionError() called with: exception = [" + exception + "]");
        if (super.onError(exception)) return;

-        int errorId = exception instanceof ParsingException ? R.string.parsing_error : R.string.general_error;
-        onUnrecoverableError(exception, UserAction.GET_SUGGESTIONS, NewPipe.getNameOfService(serviceId), searchQuery, errorId);
+        int errorId = exception instanceof ParsingException
+                ? R.string.parsing_error
+                : R.string.general_error;
+        onUnrecoverableError(exception, UserAction.GET_SUGGESTIONS,
+                NewPipe.getNameOfService(serviceId), searchString, errorId);
    }

    /*//////////////////////////////////////////////////////////////////////////
@@ -798,16 +832,22 @@ public class SearchFragment
    //////////////////////////////////////////////////////////////////////////*/

    @Override
-    public void handleResult(@NonNull SearchResult result) {
-        if (!result.errors.isEmpty()) {
-            showSnackBarError(result.errors, UserAction.SEARCHED, NewPipe.getNameOfService(serviceId), searchQuery, 0);
+    public void handleResult(@NonNull SearchInfo result) {
+        final List<Throwable> exceptions = result.getErrors();
+        if (!exceptions.isEmpty()
+            && !(exceptions.size() == 1
+                && exceptions.get(0) instanceof SearchExtractor.NothingFoundException)){
+            showSnackBarError(result.getErrors(), UserAction.SEARCHED,
+                    NewPipe.getNameOfService(serviceId), searchString, 0);
        }

-        lastSearchedQuery = searchQuery;
+        lastSearchedString = searchString;
+        nextPageUrl = result.getNextPageUrl();
+        currentPageUrl = result.getUrl();

        if (infoListAdapter.getItemsList().size() == 0) {
-            if (!result.getResults().isEmpty()) {
-                infoListAdapter.addInfoItemList(result.getResults());
+            if (!result.getRelatedItems().isEmpty()) {
+                infoListAdapter.addInfoItemList(result.getRelatedItems());
            } else {
                infoListAdapter.clearStreamItemList();
                showEmptyState();
@@ -821,12 +861,14 @@ public class SearchFragment
    @Override
    public void handleNextItems(ListExtractor.InfoItemsPage result) {
        showListFooter(false);
-        currentPage = Integer.parseInt(result.getNextPageUrl());
+        currentPageUrl = result.getNextPageUrl();
        infoListAdapter.addInfoItemList(result.getItems());
+        nextPageUrl = result.getNextPageUrl();

        if (!result.getErrors().isEmpty()) {
-            showSnackBarError(result.getErrors(), UserAction.SEARCHED, NewPipe.getNameOfService(serviceId)
-                    , "\"" + searchQuery + "\" → page " + currentPage, 0);
+            showSnackBarError(result.getErrors(), UserAction.SEARCHED,
+                    NewPipe.getNameOfService(serviceId)
+                    , "\"" + searchString + "\" → page: " + nextPageUrl, 0);
        }
        super.handleNextItems(result);
    }
@@ -835,12 +877,15 @@ public class SearchFragment
    protected boolean onError(Throwable exception) {
        if (super.onError(exception)) return true;

-        if (exception instanceof SearchEngine.NothingFoundException) {
+        if (exception instanceof SearchExtractor.NothingFoundException) {
            infoListAdapter.clearStreamItemList();
            showEmptyState();
        } else {
-            int errorId = exception instanceof ParsingException ? R.string.parsing_error : R.string.general_error;
-            onUnrecoverableError(exception, UserAction.SEARCHED, NewPipe.getNameOfService(serviceId), searchQuery, errorId);
+            int errorId = exception instanceof ParsingException
+                    ? R.string.parsing_error
+                    : R.string.general_error;
+            onUnrecoverableError(exception, UserAction.SEARCHED,
+                    NewPipe.getNameOfService(serviceId), searchString, errorId);
        }

        return true;
--- a/app/src/main/java/org/schabi/newpipe/info_list/InfoItemBuilder.java
+++ b/app/src/main/java/org/schabi/newpipe/info_list/InfoItemBuilder.java
@@ -45,7 +45,7 @@ public class InfoItemBuilder {
    private static final String TAG = InfoItemBuilder.class.toString();

    private final Context context;
-    private ImageLoader imageLoader = ImageLoader.getInstance();
+    private final ImageLoader imageLoader = ImageLoader.getInstance();

    private OnClickGesture<StreamInfoItem> onStreamSelectedListener;
    private OnClickGesture<ChannelInfoItem> onChannelSelectedListener;
--- a/app/src/main/java/org/schabi/newpipe/info_list/InfoItemDialog.java
+++ b/app/src/main/java/org/schabi/newpipe/info_list/InfoItemDialog.java
@@ -5,7 +5,6 @@ import android.app.AlertDialog;
 import android.content.DialogInterface;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
-import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.TextView;

--- a/app/src/main/java/org/schabi/newpipe/info_list/InfoListAdapter.java
+++ b/app/src/main/java/org/schabi/newpipe/info_list/InfoListAdapter.java
@@ -1,6 +1,7 @@
 package org.schabi.newpipe.info_list;

 import android.app.Activity;
+import android.support.v7.widget.GridLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.util.Log;
 import android.view.View;
@@ -12,11 +13,15 @@ import org.schabi.newpipe.extractor.playlist.PlaylistInfoItem;
 import org.schabi.newpipe.extractor.stream.StreamInfoItem;
 import org.schabi.newpipe.info_list.holder.ChannelInfoItemHolder;
 import org.schabi.newpipe.info_list.holder.ChannelMiniInfoItemHolder;
+import org.schabi.newpipe.info_list.holder.ChannelGridInfoItemHolder;
 import org.schabi.newpipe.info_list.holder.InfoItemHolder;
+import org.schabi.newpipe.info_list.holder.PlaylistGridInfoItemHolder;
 import org.schabi.newpipe.info_list.holder.PlaylistInfoItemHolder;
 import org.schabi.newpipe.info_list.holder.PlaylistMiniInfoItemHolder;
+import org.schabi.newpipe.info_list.holder.StreamGridInfoItemHolder;
 import org.schabi.newpipe.info_list.holder.StreamInfoItemHolder;
 import org.schabi.newpipe.info_list.holder.StreamMiniInfoItemHolder;
+import org.schabi.newpipe.util.FallbackViewHolder;
 import org.schabi.newpipe.util.OnClickGesture;

 import java.util.ArrayList;
@@ -51,14 +56,18 @@ public class InfoListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde

    private static final int MINI_STREAM_HOLDER_TYPE = 0x100;
    private static final int STREAM_HOLDER_TYPE = 0x101;
+    private static final int GRID_STREAM_HOLDER_TYPE = 0x102;
    private static final int MINI_CHANNEL_HOLDER_TYPE = 0x200;
    private static final int CHANNEL_HOLDER_TYPE = 0x201;
+    private static final int GRID_CHANNEL_HOLDER_TYPE = 0x202;
    private static final int MINI_PLAYLIST_HOLDER_TYPE = 0x300;
    private static final int PLAYLIST_HOLDER_TYPE = 0x301;
+    private static final int GRID_PLAYLIST_HOLDER_TYPE = 0x302;

    private final InfoItemBuilder infoItemBuilder;
    private final ArrayList<InfoItem> infoItemList;
    private boolean useMiniVariant = false;
+    private boolean useGridVariant = false;
    private boolean showFooter = false;
    private View header = null;
    private View footer = null;
@@ -93,6 +102,10 @@ public class InfoListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
        this.useMiniVariant = useMiniVariant;
    }

+    public void setGridItemVariants(boolean useGridVariant) {
+        this.useGridVariant = useGridVariant;
+    }
+
    public void addInfoItemList(List<InfoItem> data) {
        if (data != null) {
            if (DEBUG) {
@@ -205,11 +218,11 @@ public class InfoListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
        final InfoItem item = infoItemList.get(position);
        switch (item.getInfoType()) {
            case STREAM:
-                return useMiniVariant ? MINI_STREAM_HOLDER_TYPE : STREAM_HOLDER_TYPE;
+                return useGridVariant ? GRID_STREAM_HOLDER_TYPE : useMiniVariant ? MINI_STREAM_HOLDER_TYPE : STREAM_HOLDER_TYPE;
            case CHANNEL:
-                return useMiniVariant ? MINI_CHANNEL_HOLDER_TYPE : CHANNEL_HOLDER_TYPE;
+                return useGridVariant ? GRID_CHANNEL_HOLDER_TYPE : useMiniVariant ? MINI_CHANNEL_HOLDER_TYPE : CHANNEL_HOLDER_TYPE;
            case PLAYLIST:
-                return useMiniVariant ? MINI_PLAYLIST_HOLDER_TYPE : PLAYLIST_HOLDER_TYPE;
+                return useGridVariant ? GRID_PLAYLIST_HOLDER_TYPE : useMiniVariant ? MINI_PLAYLIST_HOLDER_TYPE : PLAYLIST_HOLDER_TYPE;
            default:
                Log.e(TAG, "Trollolo");
                return -1;
@@ -228,17 +241,23 @@ public class InfoListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
                return new StreamMiniInfoItemHolder(infoItemBuilder, parent);
            case STREAM_HOLDER_TYPE:
                return new StreamInfoItemHolder(infoItemBuilder, parent);
+            case GRID_STREAM_HOLDER_TYPE:
+                return new StreamGridInfoItemHolder(infoItemBuilder, parent);
            case MINI_CHANNEL_HOLDER_TYPE:
                return new ChannelMiniInfoItemHolder(infoItemBuilder, parent);
            case CHANNEL_HOLDER_TYPE:
                return new ChannelInfoItemHolder(infoItemBuilder, parent);
+            case GRID_CHANNEL_HOLDER_TYPE:
+                return new ChannelGridInfoItemHolder(infoItemBuilder, parent);
            case MINI_PLAYLIST_HOLDER_TYPE:
                return new PlaylistMiniInfoItemHolder(infoItemBuilder, parent);
            case PLAYLIST_HOLDER_TYPE:
                return new PlaylistInfoItemHolder(infoItemBuilder, parent);
+            case GRID_PLAYLIST_HOLDER_TYPE:
+                return new PlaylistGridInfoItemHolder(infoItemBuilder, parent);
            default:
                Log.e(TAG, "Trollolo");
-                return null;
+                return new FallbackViewHolder(new View(parent.getContext()));
        }
    }

@@ -256,4 +275,14 @@ public class InfoListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
            ((HFHolder) holder).view = footer;
        }
    }
+
+    public GridLayoutManager.SpanSizeLookup getSpanSizeLookup(final int spanCount) {
+        return new GridLayoutManager.SpanSizeLookup() {
+            @Override
+            public int getSpanSize(int position) {
+                final int type = getItemViewType(position);
+                return type == HEADER_TYPE || type == FOOTER_TYPE ? spanCount : 1;
+            }
+        };
+    }
 }
--- a/app/src/main/java/org/schabi/newpipe/info_list/holder/ChannelGridInfoItemHolder.java
+++ b/app/src/main/java/org/schabi/newpipe/info_list/holder/ChannelGridInfoItemHolder.java
@@ -0,0 +1,13 @@
+package org.schabi.newpipe.info_list.holder;
+
+import android.view.ViewGroup;
+
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.info_list.InfoItemBuilder;
+
+public class ChannelGridInfoItemHolder extends ChannelMiniInfoItemHolder {
+
+	public ChannelGridInfoItemHolder(InfoItemBuilder infoItemBuilder, ViewGroup parent) {
+		super(infoItemBuilder, R.layout.list_channel_grid_item, parent);
+	}
+}
--- a/app/src/main/java/org/schabi/newpipe/info_list/holder/ChannelMiniInfoItemHolder.java
+++ b/app/src/main/java/org/schabi/newpipe/info_list/holder/ChannelMiniInfoItemHolder.java
@@ -47,6 +47,13 @@ public class ChannelMiniInfoItemHolder extends InfoItemHolder {
                itemBuilder.getOnChannelSelectedListener().selected(item);
            }
        });
+
+        itemView.setOnLongClickListener(view -> {
+            if (itemBuilder.getOnChannelSelectedListener() != null) {
+                itemBuilder.getOnChannelSelectedListener().held(item);
+            }
+            return true;
+        });
    }

    protected String getDetailLine(final ChannelInfoItem item) {
--- a/app/src/main/java/org/schabi/newpipe/info_list/holder/PlaylistGridInfoItemHolder.java
+++ b/app/src/main/java/org/schabi/newpipe/info_list/holder/PlaylistGridInfoItemHolder.java
@@ -0,0 +1,13 @@
+package org.schabi.newpipe.info_list.holder;
+
+import android.view.ViewGroup;
+
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.info_list.InfoItemBuilder;
+
+public class PlaylistGridInfoItemHolder extends PlaylistMiniInfoItemHolder {
+
+	public PlaylistGridInfoItemHolder(InfoItemBuilder infoItemBuilder, ViewGroup parent) {
+		super(infoItemBuilder, R.layout.list_playlist_grid_item, parent);
+	}
+}
--- a/app/src/main/java/org/schabi/newpipe/info_list/holder/StreamGridInfoItemHolder.java
+++ b/app/src/main/java/org/schabi/newpipe/info_list/holder/StreamGridInfoItemHolder.java
@@ -0,0 +1,13 @@
+package org.schabi.newpipe.info_list.holder;
+
+import android.view.ViewGroup;
+
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.info_list.InfoItemBuilder;
+
+public class StreamGridInfoItemHolder extends StreamMiniInfoItemHolder {
+
+	public StreamGridInfoItemHolder(InfoItemBuilder infoItemBuilder, ViewGroup parent) {
+		super(infoItemBuilder, R.layout.list_stream_grid_item, parent);
+	}
+}
--- a/app/src/main/java/org/schabi/newpipe/local/BaseLocalListFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/local/BaseLocalListFragment.java
@@ -1,8 +1,13 @@
 package org.schabi.newpipe.local;

+import android.content.SharedPreferences;
+import android.content.res.Configuration;
+import android.content.res.Resources;
 import android.os.Bundle;
+import android.preference.PreferenceManager;
 import android.support.v4.app.Fragment;
 import android.support.v7.app.ActionBar;
+import android.support.v7.widget.GridLayoutManager;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.util.Log;
@@ -25,7 +30,7 @@ import static org.schabi.newpipe.util.AnimationUtils.animateView;
 * called and is memory efficient when in backstack.
 * */
 public abstract class BaseLocalListFragment<I, N> extends BaseStateFragment<I>
-        implements ListViewContract<I, N> {
+        implements ListViewContract<I, N>, SharedPreferences.OnSharedPreferenceChangeListener {

    /*//////////////////////////////////////////////////////////////////////////
    // Views
@@ -36,6 +41,9 @@ public abstract class BaseLocalListFragment<I, N> extends BaseStateFragment<I>

    protected LocalItemListAdapter itemListAdapter;
    protected RecyclerView itemsList;
+    private int updateFlags = 0;
+
+    private static final int LIST_MODE_UPDATE_FLAG = 0x32;

    /*//////////////////////////////////////////////////////////////////////////
    // Lifecycle - Creation
@@ -45,6 +53,29 @@ public abstract class BaseLocalListFragment<I, N> extends BaseStateFragment<I>
    public void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
        setHasOptionsMenu(true);
+        PreferenceManager.getDefaultSharedPreferences(activity)
+                .registerOnSharedPreferenceChangeListener(this);
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        PreferenceManager.getDefaultSharedPreferences(activity)
+                .unregisterOnSharedPreferenceChangeListener(this);
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        if (updateFlags != 0) {
+            if ((updateFlags & LIST_MODE_UPDATE_FLAG) != 0) {
+                final boolean useGrid = isGridLayout();
+                itemsList.setLayoutManager(useGrid ? getGridLayoutManager() : getListLayoutManager());
+                itemListAdapter.setGridItemVariants(useGrid);
+                itemListAdapter.notifyDataSetChanged();
+            }
+            updateFlags = 0;
+        }
    }

    /*//////////////////////////////////////////////////////////////////////////
@@ -59,6 +90,16 @@ public abstract class BaseLocalListFragment<I, N> extends BaseStateFragment<I>
        return activity.getLayoutInflater().inflate(R.layout.pignate_footer, itemsList, false);
    }

+    protected RecyclerView.LayoutManager getGridLayoutManager() {
+        final Resources resources = activity.getResources();
+        int width = resources.getDimensionPixelSize(R.dimen.video_item_grid_thumbnail_image_width);
+        width += (24 * resources.getDisplayMetrics().density);
+        final int spanCount = (int) Math.floor(resources.getDisplayMetrics().widthPixels / (double)width);
+        final GridLayoutManager lm = new GridLayoutManager(activity, spanCount);
+        lm.setSpanSizeLookup(itemListAdapter.getSpanSizeLookup(spanCount));
+        return lm;
+    }
+
    protected RecyclerView.LayoutManager getListLayoutManager() {
        return new LinearLayoutManager(activity);
    }
@@ -67,10 +108,13 @@ public abstract class BaseLocalListFragment<I, N> extends BaseStateFragment<I>
    protected void initViews(View rootView, Bundle savedInstanceState) {
        super.initViews(rootView, savedInstanceState);

-        itemsList = rootView.findViewById(R.id.items_list);
-        itemsList.setLayoutManager(getListLayoutManager());
-
        itemListAdapter = new LocalItemListAdapter(activity);
+
+        final boolean useGrid = isGridLayout();
+        itemsList = rootView.findViewById(R.id.items_list);
+        itemsList.setLayoutManager(useGrid ? getGridLayoutManager() : getListLayoutManager());
+
+        itemListAdapter.setGridItemVariants(useGrid);
        itemListAdapter.setHeader(headerRootView = getListHeader());
        itemListAdapter.setFooter(footerRootView = getListFooter());

@@ -174,4 +218,22 @@ public abstract class BaseLocalListFragment<I, N> extends BaseStateFragment<I>
        resetFragment();
        return super.onError(exception);
    }
+
+    @Override
+    public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
+        if (key.equals(getString(R.string.list_view_mode_key))) {
+            updateFlags |= LIST_MODE_UPDATE_FLAG;
+        }
+    }
+
+    protected boolean isGridLayout() {
+        final String list_mode = PreferenceManager.getDefaultSharedPreferences(activity).getString(getString(R.string.list_view_mode_key), getString(R.string.list_view_mode_value));
+        if ("auto".equals(list_mode)) {
+            final Configuration configuration = getResources().getConfiguration();
+            return configuration.orientation == Configuration.ORIENTATION_LANDSCAPE
+                    && configuration.isLayoutSizeAtLeast(Configuration.SCREENLAYOUT_SIZE_LARGE);
+        } else {
+            return "grid".equals(list_mode);
+        }
+    }
 }
--- a/app/src/main/java/org/schabi/newpipe/local/LocalItemBuilder.java
+++ b/app/src/main/java/org/schabi/newpipe/local/LocalItemBuilder.java
@@ -33,7 +33,7 @@ public class LocalItemBuilder {
    private static final String TAG = LocalItemBuilder.class.toString();

    private final Context context;
-    private ImageLoader imageLoader = ImageLoader.getInstance();
+    private final ImageLoader imageLoader = ImageLoader.getInstance();

    private OnClickGesture<LocalItem> onSelectedListener;

--- a/app/src/main/java/org/schabi/newpipe/local/LocalItemListAdapter.java
+++ b/app/src/main/java/org/schabi/newpipe/local/LocalItemListAdapter.java
@@ -1,19 +1,23 @@
 package org.schabi.newpipe.local;

 import android.app.Activity;
+import android.support.v7.widget.GridLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;

 import org.schabi.newpipe.database.LocalItem;
-import org.schabi.newpipe.local.HeaderFooterHolder;
-import org.schabi.newpipe.local.LocalItemBuilder;
 import org.schabi.newpipe.local.holder.LocalItemHolder;
+import org.schabi.newpipe.local.holder.LocalPlaylistGridItemHolder;
 import org.schabi.newpipe.local.holder.LocalPlaylistItemHolder;
+import org.schabi.newpipe.local.holder.LocalPlaylistStreamGridItemHolder;
 import org.schabi.newpipe.local.holder.LocalPlaylistStreamItemHolder;
+import org.schabi.newpipe.local.holder.LocalStatisticStreamGridItemHolder;
 import org.schabi.newpipe.local.holder.LocalStatisticStreamItemHolder;
+import org.schabi.newpipe.local.holder.RemotePlaylistGridItemHolder;
 import org.schabi.newpipe.local.holder.RemotePlaylistItemHolder;
+import org.schabi.newpipe.util.FallbackViewHolder;
 import org.schabi.newpipe.util.Localization;
 import org.schabi.newpipe.util.OnClickGesture;

@@ -51,14 +55,19 @@ public class LocalItemListAdapter extends RecyclerView.Adapter<RecyclerView.View

    private static final int STREAM_STATISTICS_HOLDER_TYPE = 0x1000;
    private static final int STREAM_PLAYLIST_HOLDER_TYPE = 0x1001;
+    private static final int STREAM_STATISTICS_GRID_HOLDER_TYPE = 0x1002;
+    private static final int STREAM_PLAYLIST_GRID_HOLDER_TYPE = 0x1004;
    private static final int LOCAL_PLAYLIST_HOLDER_TYPE = 0x2000;
    private static final int REMOTE_PLAYLIST_HOLDER_TYPE = 0x2001;
+	private static final int LOCAL_PLAYLIST_GRID_HOLDER_TYPE = 0x2002;
+	private static final int REMOTE_PLAYLIST_GRID_HOLDER_TYPE = 0x2004;

    private final LocalItemBuilder localItemBuilder;
    private final ArrayList<LocalItem> localItems;
    private final DateFormat dateFormat;

    private boolean showFooter = false;
+    private boolean useGridVariant = false;
    private View header = null;
    private View footer = null;

@@ -133,6 +142,10 @@ public class LocalItemListAdapter extends RecyclerView.Adapter<RecyclerView.View
        notifyDataSetChanged();
    }

+    public void setGridItemVariants(boolean useGridVariant) {
+        this.useGridVariant = useGridVariant;
+    }
+
    public void setHeader(View header) {
        boolean changed = header != this.header;
        this.header = header;
@@ -194,11 +207,11 @@ public class LocalItemListAdapter extends RecyclerView.Adapter<RecyclerView.View
        final LocalItem item = localItems.get(position);

        switch (item.getLocalItemType()) {
-            case PLAYLIST_LOCAL_ITEM: return LOCAL_PLAYLIST_HOLDER_TYPE;
-            case PLAYLIST_REMOTE_ITEM: return REMOTE_PLAYLIST_HOLDER_TYPE;
+            case PLAYLIST_LOCAL_ITEM: return useGridVariant ? LOCAL_PLAYLIST_GRID_HOLDER_TYPE : LOCAL_PLAYLIST_HOLDER_TYPE;
+            case PLAYLIST_REMOTE_ITEM: return useGridVariant ? REMOTE_PLAYLIST_GRID_HOLDER_TYPE : REMOTE_PLAYLIST_HOLDER_TYPE;

-            case PLAYLIST_STREAM_ITEM: return STREAM_PLAYLIST_HOLDER_TYPE;
-            case STATISTIC_STREAM_ITEM: return STREAM_STATISTICS_HOLDER_TYPE;
+            case PLAYLIST_STREAM_ITEM: return useGridVariant ? STREAM_PLAYLIST_GRID_HOLDER_TYPE : STREAM_PLAYLIST_HOLDER_TYPE;
+            case STATISTIC_STREAM_ITEM: return useGridVariant ? STREAM_STATISTICS_GRID_HOLDER_TYPE : STREAM_STATISTICS_HOLDER_TYPE;
            default:
                Log.e(TAG, "No holder type has been considered for item: [" +
                        item.getLocalItemType() + "]");
@@ -217,15 +230,23 @@ public class LocalItemListAdapter extends RecyclerView.Adapter<RecyclerView.View
                return new HeaderFooterHolder(footer);
            case LOCAL_PLAYLIST_HOLDER_TYPE:
                return new LocalPlaylistItemHolder(localItemBuilder, parent);
+            case LOCAL_PLAYLIST_GRID_HOLDER_TYPE:
+                return new LocalPlaylistGridItemHolder(localItemBuilder, parent);
            case REMOTE_PLAYLIST_HOLDER_TYPE:
                return new RemotePlaylistItemHolder(localItemBuilder, parent);
+            case REMOTE_PLAYLIST_GRID_HOLDER_TYPE:
+                return new RemotePlaylistGridItemHolder(localItemBuilder, parent);
            case STREAM_PLAYLIST_HOLDER_TYPE:
                return new LocalPlaylistStreamItemHolder(localItemBuilder, parent);
+            case STREAM_PLAYLIST_GRID_HOLDER_TYPE:
+                return new LocalPlaylistStreamGridItemHolder(localItemBuilder, parent);
            case STREAM_STATISTICS_HOLDER_TYPE:
                return new LocalStatisticStreamItemHolder(localItemBuilder, parent);
+            case STREAM_STATISTICS_GRID_HOLDER_TYPE:
+                return new LocalStatisticStreamGridItemHolder(localItemBuilder, parent);
            default:
                Log.e(TAG, "No view type has been considered for holder: [" + type + "]");
-                return null;
+                return new FallbackViewHolder(new View(parent.getContext()));
        }
    }

@@ -246,4 +267,14 @@ public class LocalItemListAdapter extends RecyclerView.Adapter<RecyclerView.View
            ((HeaderFooterHolder) holder).view = footer;
        }
    }
+
+    public GridLayoutManager.SpanSizeLookup getSpanSizeLookup(final int spanCount) {
+        return new GridLayoutManager.SpanSizeLookup() {
+            @Override
+            public int getSpanSize(int position) {
+                final int type = getItemViewType(position);
+                return type == HEADER_TYPE || type == FOOTER_TYPE ? spanCount : 1;
+            }
+        };
+    }
 }
--- a/app/src/main/java/org/schabi/newpipe/local/bookmark/BookmarkFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/local/bookmark/BookmarkFragment.java
@@ -66,11 +66,10 @@ public final class BookmarkFragment
    public View onCreateView(@NonNull LayoutInflater inflater,
                             @Nullable ViewGroup container,
                             Bundle savedInstanceState) {
-        if (activity != null && activity.getSupportActionBar() != null) {
-            activity.getSupportActionBar().setDisplayShowTitleEnabled(true);
-            activity.setTitle(R.string.tab_subscriptions);
-        }

+        if(!useAsFrontPage) {
+            setTitle(activity.getString(R.string.tab_bookmarks));
+        }
        return inflater.inflate(R.layout.fragment_bookmarks, container, false);
    }

@@ -99,9 +98,7 @@ public final class BookmarkFragment
        itemListAdapter.setSelectedListener(new OnClickGesture<LocalItem>() {
            @Override
            public void selected(LocalItem selectedItem) {
-                // Requires the parent fragment to find holder for fragment replacement
-                if (getParentFragment() == null) return;
-                final FragmentManager fragmentManager = getParentFragment().getFragmentManager();
+                final FragmentManager fragmentManager = getFM();

                if (selectedItem instanceof PlaylistMetadataEntry) {
                    final PlaylistMetadataEntry entry = ((PlaylistMetadataEntry) selectedItem);
@@ -110,8 +107,11 @@ public final class BookmarkFragment

                } else if (selectedItem instanceof PlaylistRemoteEntity) {
                    final PlaylistRemoteEntity entry = ((PlaylistRemoteEntity) selectedItem);
-                    NavigationHelper.openPlaylistFragment(fragmentManager, entry.getServiceId(),
-                            entry.getUrl(), entry.getName());
+                    NavigationHelper.openPlaylistFragment(
+                            fragmentManager,
+                            entry.getServiceId(),
+                            entry.getUrl(),
+                            entry.getName());
                }
            }

--- a/app/src/main/java/org/schabi/newpipe/local/dialog/PlaylistDialog.java
+++ b/app/src/main/java/org/schabi/newpipe/local/dialog/PlaylistDialog.java
@@ -1,9 +1,11 @@
 package org.schabi.newpipe.local.dialog;

+import android.app.Dialog;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v4.app.DialogFragment;
+import android.view.Window;

 import org.schabi.newpipe.database.stream.model.StreamEntity;
 import org.schabi.newpipe.util.StateSaver;
@@ -41,6 +43,18 @@ public abstract class PlaylistDialog extends DialogFragment implements StateSave
        StateSaver.onDestroy(savedState);
    }

+    @NonNull
+    @Override
+    public Dialog onCreateDialog(Bundle savedInstanceState) {
+        final Dialog dialog = super.onCreateDialog(savedInstanceState);
+        //remove title
+        final Window window = dialog.getWindow();
+        if (window != null) {
+            window.requestFeature(Window.FEATURE_NO_TITLE);
+        }
+        return dialog;
+    }
+
    /*//////////////////////////////////////////////////////////////////////////
    // State Saving
    //////////////////////////////////////////////////////////////////////////*/
@@ -58,7 +72,7 @@ public abstract class PlaylistDialog extends DialogFragment implements StateSave

    @Override
    @SuppressWarnings("unchecked")
-    public void readFrom(@NonNull Queue<Object> savedObjects) throws Exception {
+    public void readFrom(@NonNull Queue<Object> savedObjects) {
        streamEntities = (List<StreamEntity>) savedObjects.poll();
    }

--- a/app/src/main/java/org/schabi/newpipe/local/feed/FeedFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/local/feed/FeedFragment.java
@@ -36,8 +36,6 @@ import io.reactivex.MaybeObserver;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.disposables.CompositeDisposable;
 import io.reactivex.disposables.Disposable;
-import io.reactivex.functions.Consumer;
-import io.reactivex.functions.Predicate;

 public class FeedFragment extends BaseListFragment<List<SubscriptionEntity>, Void> {

@@ -71,6 +69,10 @@ public class FeedFragment extends BaseListFragment<List<SubscriptionEntity>, Voi

    @Override
    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, Bundle savedInstanceState) {
+
+        if(!useAsFrontPage) {
+            setTitle(activity.getString(R.string.fragment_whats_new));
+        }
        return inflater.inflate(R.layout.fragment_feed, container, false);
    }

@@ -105,20 +107,19 @@ public class FeedFragment extends BaseListFragment<List<SubscriptionEntity>, Voi
        super.onDestroyView();
    }

-    /*@Override
-    protected RecyclerView.LayoutManager getListLayoutManager() {
-        boolean isPortrait = getResources().getDisplayMetrics().heightPixels > getResources().getDisplayMetrics().widthPixels;
-        return new GridLayoutManager(activity, isPortrait ? 1 : 2);
-    }*/
+    @Override
+    public void setUserVisibleHint(boolean isVisibleToUser) {
+        super.setUserVisibleHint(isVisibleToUser);
+        if (activity != null && isVisibleToUser) {
+            setTitle(activity.getString(R.string.fragment_whats_new));
+        }
+    }

    @Override
    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
        super.onCreateOptionsMenu(menu, inflater);

        ActionBar supportActionBar = activity.getSupportActionBar();
-        if (supportActionBar != null) {
-            supportActionBar.setTitle(R.string.fragment_whats_new);
-        }

        if(useAsFrontPage) {
            supportActionBar.setDisplayShowTitleEnabled(true);
@@ -176,19 +177,9 @@ public class FeedFragment extends BaseListFragment<List<SubscriptionEntity>, Voi
        showLoading();
        showListFooter(true);
        subscriptionObserver = subscriptionService.getSubscription()
-                .onErrorReturnItem(Collections.<SubscriptionEntity>emptyList())
+                .onErrorReturnItem(Collections.emptyList())
                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new Consumer<List<SubscriptionEntity>>() {
-                    @Override
-                    public void accept(List<SubscriptionEntity> subscriptionEntities) throws Exception {
-                        handleResult(subscriptionEntities);
-                    }
-                }, new Consumer<Throwable>() {
-                    @Override
-                    public void accept(Throwable throwable) throws Exception {
-                        onError(throwable);
-                    }
-                });
+                .subscribe(this::handleResult, this::onError);
    }

    @Override
@@ -239,13 +230,12 @@ public class FeedFragment extends BaseListFragment<List<SubscriptionEntity>, Voi
                if (!itemsLoaded.contains(subscriptionEntity.getServiceId() + subscriptionEntity.getUrl())) {
                    subscriptionService.getChannelInfo(subscriptionEntity)
                            .observeOn(AndroidSchedulers.mainThread())
-                            .onErrorComplete(new Predicate<Throwable>() {
-                                @Override
-                                public boolean test(@io.reactivex.annotations.NonNull Throwable throwable) throws Exception {
-                                    return FeedFragment.super.onError(throwable);
-                                }
-                            })
-                            .subscribe(getChannelInfoObserver(subscriptionEntity.getServiceId(), subscriptionEntity.getUrl()));
+                            .onErrorComplete(
+                                    (@io.reactivex.annotations.NonNull Throwable throwable) ->
+                                            FeedFragment.super.onError(throwable))
+                            .subscribe(
+                                    getChannelInfoObserver(subscriptionEntity.getServiceId(),
+                                            subscriptionEntity.getUrl()));
                } else {
                    requestFeed(1);
                }
@@ -316,7 +306,10 @@ public class FeedFragment extends BaseListFragment<List<SubscriptionEntity>, Voi

            @Override
            public void onError(Throwable exception) {
-                showSnackBarError(exception, UserAction.SUBSCRIPTION, NewPipe.getNameOfService(serviceId), url, 0);
+                showSnackBarError(exception,
+                        UserAction.SUBSCRIPTION,
+                        NewPipe.getNameOfService(serviceId),
+                        url, 0);
                requestFeed(1);
                onDone();
            }
@@ -361,12 +354,7 @@ public class FeedFragment extends BaseListFragment<List<SubscriptionEntity>, Voi
        delayHandler.removeCallbacksAndMessages(null);
        // Add a little of a delay when requesting more items because the cache is so fast,
        // that the view seems stuck to the user when he scroll to the bottom
-        delayHandler.postDelayed(new Runnable() {
-            @Override
-            public void run() {
-                requestFeed(FEED_LOAD_COUNT);
-            }
-        }, 300);
+        delayHandler.postDelayed(() -> requestFeed(FEED_LOAD_COUNT), 300);
    }

    @Override
@@ -423,7 +411,9 @@ public class FeedFragment extends BaseListFragment<List<SubscriptionEntity>, Voi
        int heightPixels = getResources().getDisplayMetrics().heightPixels;
        int itemHeightPixels = activity.getResources().getDimensionPixelSize(R.dimen.video_item_search_height);

-        int items = itemHeightPixels > 0 ? heightPixels / itemHeightPixels + OFF_SCREEN_ITEMS_COUNT : MIN_ITEMS_INITIAL_LOAD;
+        int items = itemHeightPixels > 0
+                ? heightPixels / itemHeightPixels + OFF_SCREEN_ITEMS_COUNT
+                : MIN_ITEMS_INITIAL_LOAD;
        return Math.max(MIN_ITEMS_INITIAL_LOAD, items);
    }

@@ -441,8 +431,14 @@ public class FeedFragment extends BaseListFragment<List<SubscriptionEntity>, Voi
    protected boolean onError(Throwable exception) {
        if (super.onError(exception)) return true;

-        int errorId = exception instanceof ExtractionException ? R.string.parsing_error : R.string.general_error;
-        onUnrecoverableError(exception, UserAction.SOMETHING_ELSE, "none", "Requesting feed", errorId);
+        int errorId = exception instanceof ExtractionException
+                ? R.string.parsing_error
+                : R.string.general_error;
+        onUnrecoverableError(exception,
+                UserAction.SOMETHING_ELSE,
+                "none",
+                "Requesting feed",
+                errorId);
        return true;
    }
 }
--- a/app/src/main/java/org/schabi/newpipe/local/history/HistoryEntryAdapter.java
+++ b/app/src/main/java/org/schabi/newpipe/local/history/HistoryEntryAdapter.java
@@ -1,7 +1,6 @@
 package org.schabi.newpipe.local.history;

 import android.content.Context;
-import android.content.res.Resources;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v7.widget.RecyclerView;
--- a/app/src/main/java/org/schabi/newpipe/local/history/HistoryRecordManager.java
+++ b/app/src/main/java/org/schabi/newpipe/local/history/HistoryRecordManager.java
@@ -45,7 +45,6 @@ import java.util.List;

 import io.reactivex.Flowable;
 import io.reactivex.Maybe;
-import io.reactivex.Scheduler;
 import io.reactivex.Single;
 import io.reactivex.schedulers.Schedulers;

--- a/app/src/main/java/org/schabi/newpipe/local/history/StatisticsPlaylistFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/local/history/StatisticsPlaylistFragment.java
@@ -56,7 +56,7 @@ public class StatisticsPlaylistFragment
    /* Used for independent events */
    private Subscription databaseSubscription;
    private HistoryRecordManager recordManager;
-    private CompositeDisposable disposables = new CompositeDisposable();
+    private final CompositeDisposable disposables = new CompositeDisposable();

    private enum StatisticSortMode {
        LAST_PLAYED,
@@ -73,7 +73,7 @@ public class StatisticsPlaylistFragment
                return results;
            case MOST_PLAYED:
                Collections.sort(results, (left, right) ->
-                        ((Long) right.watchCount).compareTo(left.watchCount));
+                        Long.compare(right.watchCount, left.watchCount));
                return results;
            default: return null;
        }
@@ -96,6 +96,14 @@ public class StatisticsPlaylistFragment
        return inflater.inflate(R.layout.fragment_playlist, container, false);
    }

+    @Override
+    public void setUserVisibleHint(boolean isVisibleToUser) {
+        super.setUserVisibleHint(isVisibleToUser);
+        if (activity != null && isVisibleToUser) {
+            setTitle(activity.getString(R.string.title_activity_history));
+        }
+    }
+
    ///////////////////////////////////////////////////////////////////////////
    // Fragment LifeCycle - Views
    ///////////////////////////////////////////////////////////////////////////
@@ -103,7 +111,9 @@ public class StatisticsPlaylistFragment
    @Override
    protected void initViews(View rootView, Bundle savedInstanceState) {
        super.initViews(rootView, savedInstanceState);
-        setTitle(getString(R.string.title_last_played));
+        if(!useAsFrontPage) {
+            setTitle(getString(R.string.title_last_played));
+        }
    }

    @Override
@@ -129,8 +139,10 @@ public class StatisticsPlaylistFragment
            public void selected(LocalItem selectedItem) {
                if (selectedItem instanceof StreamStatisticsEntry) {
                    final StreamStatisticsEntry item = (StreamStatisticsEntry) selectedItem;
-                    NavigationHelper.openVideoDetailFragment(getFragmentManager(),
-                            item.serviceId, item.url, item.title);
+                    NavigationHelper.openVideoDetailFragment(getFM(),
+                            item.serviceId,
+                            item.url,
+                            item.title);
                }
            }

@@ -298,6 +310,7 @@ public class StatisticsPlaylistFragment
                context.getResources().getString(R.string.start_here_on_background),
                context.getResources().getString(R.string.start_here_on_popup),
                context.getResources().getString(R.string.delete),
+                context.getResources().getString(R.string.share)
        };

        final DialogInterface.OnClickListener actions = (dialogInterface, i) -> {
@@ -321,6 +334,9 @@ public class StatisticsPlaylistFragment
                case 5:
                    deleteEntry(index);
                    break;
+                case 6:
+                    shareUrl(item.toStreamInfoItem().getName(), item.toStreamInfoItem().getUrl());
+                    break;
                default:
                    break;
            }
@@ -337,7 +353,7 @@ public class StatisticsPlaylistFragment
            final Disposable onDelete = recordManager.deleteStreamHistory(entry.streamId)
                    .observeOn(AndroidSchedulers.mainThread())
                    .subscribe(
-                            howManyDelted -> {
+                            howManyDeleted -> {
                                if(getView() != null) {
                                    Snackbar.make(getView(), R.string.one_item_deleted,
                                            Snackbar.LENGTH_SHORT).show();
--- a/app/src/main/java/org/schabi/newpipe/local/holder/LocalPlaylistGridItemHolder.java
+++ b/app/src/main/java/org/schabi/newpipe/local/holder/LocalPlaylistGridItemHolder.java
@@ -0,0 +1,13 @@
+package org.schabi.newpipe.local.holder;
+
+import android.view.ViewGroup;
+
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.local.LocalItemBuilder;
+
+public class LocalPlaylistGridItemHolder extends LocalPlaylistItemHolder {
+
+	public LocalPlaylistGridItemHolder(LocalItemBuilder infoItemBuilder, ViewGroup parent) {
+		super(infoItemBuilder, R.layout.list_playlist_grid_item, parent);
+	}
+}
--- a/app/src/main/java/org/schabi/newpipe/local/holder/LocalPlaylistItemHolder.java
+++ b/app/src/main/java/org/schabi/newpipe/local/holder/LocalPlaylistItemHolder.java
@@ -16,6 +16,10 @@ public class LocalPlaylistItemHolder extends PlaylistItemHolder {
        super(infoItemBuilder, parent);
    }

+    LocalPlaylistItemHolder(LocalItemBuilder infoItemBuilder, int layoutId, ViewGroup parent) {
+        super(infoItemBuilder, layoutId, parent);
+    }
+
    @Override
    public void updateFromItem(final LocalItem localItem, final DateFormat dateFormat) {
        if (!(localItem instanceof PlaylistMetadataEntry)) return;
--- a/app/src/main/java/org/schabi/newpipe/local/holder/LocalPlaylistStreamGridItemHolder.java
+++ b/app/src/main/java/org/schabi/newpipe/local/holder/LocalPlaylistStreamGridItemHolder.java
@@ -0,0 +1,13 @@
+package org.schabi.newpipe.local.holder;
+
+import android.view.ViewGroup;
+
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.local.LocalItemBuilder;
+
+public class LocalPlaylistStreamGridItemHolder extends LocalPlaylistStreamItemHolder {
+
+	public LocalPlaylistStreamGridItemHolder(LocalItemBuilder infoItemBuilder, ViewGroup parent) {
+		super(infoItemBuilder, R.layout.list_stream_playlist_grid_item, parent); //TODO
+	}
+}
--- a/app/src/main/java/org/schabi/newpipe/local/holder/LocalStatisticStreamGridItemHolder.java
+++ b/app/src/main/java/org/schabi/newpipe/local/holder/LocalStatisticStreamGridItemHolder.java
@@ -0,0 +1,13 @@
+package org.schabi.newpipe.local.holder;
+
+import android.view.ViewGroup;
+
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.local.LocalItemBuilder;
+
+public class LocalStatisticStreamGridItemHolder extends LocalStatisticStreamItemHolder {
+
+	public LocalStatisticStreamGridItemHolder(LocalItemBuilder infoItemBuilder, ViewGroup parent) {
+		super(infoItemBuilder, R.layout.list_stream_grid_item, parent);
+	}
+}
--- a/app/src/main/java/org/schabi/newpipe/local/holder/LocalStatisticStreamItemHolder.java
+++ b/app/src/main/java/org/schabi/newpipe/local/holder/LocalStatisticStreamItemHolder.java
@@ -1,5 +1,6 @@
 package org.schabi.newpipe.local.holder;

+import android.support.annotation.Nullable;
 import android.support.v4.content.ContextCompat;
 import android.view.View;
 import android.view.ViewGroup;
@@ -42,10 +43,15 @@ public class LocalStatisticStreamItemHolder extends LocalItemHolder {
    public final TextView itemVideoTitleView;
    public final TextView itemUploaderView;
    public final TextView itemDurationView;
+    @Nullable
    public final TextView itemAdditionalDetails;

-    public LocalStatisticStreamItemHolder(LocalItemBuilder infoItemBuilder, ViewGroup parent) {
-        super(infoItemBuilder, R.layout.list_stream_item, parent);
+    public LocalStatisticStreamItemHolder(LocalItemBuilder itemBuilder, ViewGroup parent) {
+        this(itemBuilder, R.layout.list_stream_item, parent);
+    }
+
+    LocalStatisticStreamItemHolder(LocalItemBuilder infoItemBuilder, int layoutId, ViewGroup parent) {
+        super(infoItemBuilder, layoutId, parent);

        itemThumbnailView = itemView.findViewById(R.id.itemThumbnailView);
        itemVideoTitleView = itemView.findViewById(R.id.itemVideoTitleView);
@@ -80,7 +86,9 @@ public class LocalStatisticStreamItemHolder extends LocalItemHolder {
            itemDurationView.setVisibility(View.GONE);
        }

-        itemAdditionalDetails.setText(getStreamInfoDetailLine(item, dateFormat));
+        if (itemAdditionalDetails != null) {
+            itemAdditionalDetails.setText(getStreamInfoDetailLine(item, dateFormat));
+        }

        // Default thumbnail is shown on error, while loading and if the url is empty
        itemBuilder.displayImage(item.thumbnailUrl, itemThumbnailView,
--- a/app/src/main/java/org/schabi/newpipe/local/holder/RemotePlaylistGridItemHolder.java
+++ b/app/src/main/java/org/schabi/newpipe/local/holder/RemotePlaylistGridItemHolder.java
@@ -0,0 +1,13 @@
+package org.schabi.newpipe.local.holder;
+
+import android.view.ViewGroup;
+
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.local.LocalItemBuilder;
+
+public class RemotePlaylistGridItemHolder extends RemotePlaylistItemHolder {
+
+	public RemotePlaylistGridItemHolder(LocalItemBuilder infoItemBuilder, ViewGroup parent) {
+		super(infoItemBuilder, R.layout.list_playlist_grid_item, parent);
+	}
+}
--- a/app/src/main/java/org/schabi/newpipe/local/holder/RemotePlaylistItemHolder.java
+++ b/app/src/main/java/org/schabi/newpipe/local/holder/RemotePlaylistItemHolder.java
@@ -16,6 +16,10 @@ public class RemotePlaylistItemHolder extends PlaylistItemHolder {
        super(infoItemBuilder, parent);
    }

+    RemotePlaylistItemHolder(LocalItemBuilder infoItemBuilder, int layoutId, ViewGroup parent) {
+        super(infoItemBuilder, layoutId, parent);
+    }
+
    @Override
    public void updateFromItem(final LocalItem localItem, final DateFormat dateFormat) {
        if (!(localItem instanceof PlaylistRemoteEntity)) return;
--- a/app/src/main/java/org/schabi/newpipe/local/playlist/LocalPlaylistFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/local/playlist/LocalPlaylistFragment.java
@@ -459,7 +459,11 @@ public class LocalPlaylistFragment extends BaseLocalListFragment<List<PlaylistSt


    private ItemTouchHelper.SimpleCallback getItemTouchCallback() {
-        return new ItemTouchHelper.SimpleCallback(ItemTouchHelper.UP | ItemTouchHelper.DOWN,
+        int directions = ItemTouchHelper.UP | ItemTouchHelper.DOWN;
+        if (isGridLayout()) {
+            directions |= ItemTouchHelper.LEFT | ItemTouchHelper.RIGHT;
+        }
+        return new ItemTouchHelper.SimpleCallback(directions,
                ItemTouchHelper.ACTION_STATE_IDLE) {
            @Override
            public int interpolateOutOfBoundsScroll(RecyclerView recyclerView, int viewSize,
@@ -520,7 +524,8 @@ public class LocalPlaylistFragment extends BaseLocalListFragment<List<PlaylistSt
                context.getResources().getString(R.string.start_here_on_background),
                context.getResources().getString(R.string.start_here_on_popup),
                context.getResources().getString(R.string.set_as_playlist_thumbnail),
-                context.getResources().getString(R.string.delete)
+                context.getResources().getString(R.string.delete),
+                context.getResources().getString(R.string.share)
        };

        final DialogInterface.OnClickListener actions = (dialogInterface, i) -> {
@@ -549,6 +554,9 @@ public class LocalPlaylistFragment extends BaseLocalListFragment<List<PlaylistSt
                case 6:
                    deleteItem(item);
                    break;
+                case 7:
+                    shareUrl(item.toStreamInfoItem().getName(), item.toStreamInfoItem().getUrl());
+                    break;
                default:
                    break;
            }
--- a/app/src/main/java/org/schabi/newpipe/local/playlist/RemotePlaylistManager.java
+++ b/app/src/main/java/org/schabi/newpipe/local/playlist/RemotePlaylistManager.java
@@ -40,8 +40,11 @@ public class RemotePlaylistManager {
        }).subscribeOn(Schedulers.io());
    }

-    public Single<Integer> onUpdate(final PlaylistInfo playlistInfo) {
-        return Single.fromCallable(() -> playlistRemoteTable.update(new PlaylistRemoteEntity(playlistInfo)))
-                .subscribeOn(Schedulers.io());
+    public Single<Integer> onUpdate(final long playlistId, final PlaylistInfo playlistInfo) {
+        return Single.fromCallable(() -> {
+            PlaylistRemoteEntity playlist = new PlaylistRemoteEntity(playlistInfo);
+            playlist.setUid(playlistId);
+            return playlistRemoteTable.update(playlist);
+        }).subscribeOn(Schedulers.io());
    }
 }
--- a/app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionFragment.java
@@ -1,20 +1,30 @@
 package org.schabi.newpipe.local.subscription;

+import android.annotation.SuppressLint;
 import android.app.Activity;
+import android.app.AlertDialog;
 import android.content.BroadcastReceiver;
 import android.content.Context;
+import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.IntentFilter;
+import android.content.SharedPreferences;
+import android.content.res.Configuration;
+import android.content.res.Resources;
 import android.graphics.Color;
 import android.graphics.PorterDuff;
 import android.os.Bundle;
 import android.os.Environment;
 import android.os.Parcelable;
+import android.preference.PreferenceManager;
 import android.support.annotation.DrawableRes;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
+import android.support.v4.app.FragmentManager;
 import android.support.v4.content.LocalBroadcastManager;
 import android.support.v7.app.ActionBar;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.GridLayoutManager;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
@@ -41,6 +51,8 @@ import org.schabi.newpipe.info_list.InfoListAdapter;
 import org.schabi.newpipe.report.UserAction;
 import org.schabi.newpipe.local.subscription.services.SubscriptionsExportService;
 import org.schabi.newpipe.local.subscription.services.SubscriptionsImportService;
+import org.schabi.newpipe.report.ErrorActivity;
+import org.schabi.newpipe.report.UserAction;
 import org.schabi.newpipe.util.FilePickerActivityHelper;
 import org.schabi.newpipe.util.NavigationHelper;
 import org.schabi.newpipe.util.OnClickGesture;
@@ -69,7 +81,7 @@ import static org.schabi.newpipe.local.subscription.services.SubscriptionsImport
 import static org.schabi.newpipe.util.AnimationUtils.animateRotation;
 import static org.schabi.newpipe.util.AnimationUtils.animateView;

-public class SubscriptionFragment extends BaseStateFragment<List<SubscriptionEntity>> {
+public class SubscriptionFragment extends BaseStateFragment<List<SubscriptionEntity>> implements SharedPreferences.OnSharedPreferenceChangeListener {
    private static final int REQUEST_EXPORT_CODE = 666;
    private static final int REQUEST_IMPORT_CODE = 667;

@@ -77,8 +89,10 @@ public class SubscriptionFragment extends BaseStateFragment<List<SubscriptionEnt
    @State
    protected Parcelable itemsListState;
    private InfoListAdapter infoListAdapter;
+    private int updateFlags = 0;
+
+    private static final int LIST_MODE_UPDATE_FLAG = 0x32;

-    private View headerRootLayout;
    private View whatsNewItemListHeader;
    private View importExportListHeader;

@@ -97,6 +111,8 @@ public class SubscriptionFragment extends BaseStateFragment<List<SubscriptionEnt
    public void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
        setHasOptionsMenu(true);
+        PreferenceManager.getDefaultSharedPreferences(activity)
+                .registerOnSharedPreferenceChangeListener(this);
    }

    @Override
@@ -124,6 +140,15 @@ public class SubscriptionFragment extends BaseStateFragment<List<SubscriptionEnt
    public void onResume() {
        super.onResume();
        setupBroadcastReceiver();
+        if (updateFlags != 0) {
+            if ((updateFlags & LIST_MODE_UPDATE_FLAG) != 0) {
+                final boolean useGrid = isGridLayout();
+                itemsList.setLayoutManager(useGrid ? getGridLayoutManager() : getListLayoutManager());
+                infoListAdapter.setGridItemVariants(useGrid);
+                infoListAdapter.notifyDataSetChanged();
+            }
+            updateFlags = 0;
+        }
    }

    @Override
@@ -150,9 +175,25 @@ public class SubscriptionFragment extends BaseStateFragment<List<SubscriptionEnt
        disposables = null;
        subscriptionService = null;

+        PreferenceManager.getDefaultSharedPreferences(activity)
+                .unregisterOnSharedPreferenceChangeListener(this);
        super.onDestroy();
    }

+    protected RecyclerView.LayoutManager getListLayoutManager() {
+        return new LinearLayoutManager(activity);
+    }
+
+    protected RecyclerView.LayoutManager getGridLayoutManager() {
+        final Resources resources = activity.getResources();
+        int width = resources.getDimensionPixelSize(R.dimen.video_item_grid_thumbnail_image_width);
+        width += (24 * resources.getDisplayMetrics().density);
+        final int spanCount = (int) Math.floor(resources.getDisplayMetrics().widthPixels / (double)width);
+        final GridLayoutManager lm = new GridLayoutManager(activity, spanCount);
+        lm.setSpanSizeLookup(infoListAdapter.getSpanSizeLookup(spanCount));
+        return lm;
+    }
+
    /*/////////////////////////////////////////////////////////////////////////
    // Menu
    /////////////////////////////////////////////////////////////////////////*/
@@ -207,7 +248,8 @@ public class SubscriptionFragment extends BaseStateFragment<List<SubscriptionEnt
    }

    private void setupImportFromItems(final ViewGroup listHolder) {
-        final View previousBackupItem = addItemView(getString(R.string.previous_export), ThemeHelper.resolveResourceIdFromAttr(getContext(), R.attr.ic_backup), listHolder);
+        final View previousBackupItem = addItemView(getString(R.string.previous_export),
+                ThemeHelper.resolveResourceIdFromAttr(getContext(), R.attr.ic_backup), listHolder);
        previousBackupItem.setOnClickListener(item -> onImportPreviousSelected());

        final int iconColor = ThemeHelper.isLightThemeSelected(getContext()) ? Color.BLACK : Color.WHITE;
@@ -239,8 +281,8 @@ public class SubscriptionFragment extends BaseStateFragment<List<SubscriptionEnt
    }

    private void onImportFromServiceSelected(int serviceId) {
-        if (getParentFragment() == null) return;
-        NavigationHelper.openSubscriptionsImportFragment(getParentFragment().getFragmentManager(), serviceId);
+        FragmentManager fragmentManager = getFM();
+        NavigationHelper.openSubscriptionsImportFragment(fragmentManager, serviceId);
    }

    private void onImportPreviousSelected() {
@@ -283,16 +325,19 @@ public class SubscriptionFragment extends BaseStateFragment<List<SubscriptionEnt
    protected void initViews(View rootView, Bundle savedInstanceState) {
        super.initViews(rootView, savedInstanceState);

+        final boolean useGrid = isGridLayout();
        infoListAdapter = new InfoListAdapter(getActivity());
        itemsList = rootView.findViewById(R.id.items_list);
-        itemsList.setLayoutManager(new LinearLayoutManager(activity));
+        itemsList.setLayoutManager(useGrid ? getGridLayoutManager() : getListLayoutManager());

+        View headerRootLayout;
        infoListAdapter.setHeader(headerRootLayout = activity.getLayoutInflater().inflate(R.layout.subscription_header, itemsList, false));
        whatsNewItemListHeader = headerRootLayout.findViewById(R.id.whats_new);
        importExportListHeader = headerRootLayout.findViewById(R.id.import_export);
        importExportOptions = headerRootLayout.findViewById(R.id.import_export_options);

        infoListAdapter.useMiniItemVariants(true);
+        infoListAdapter.setGridItemVariants(useGrid);
        itemsList.setAdapter(infoListAdapter);

        setupImportFromItems(headerRootLayout.findViewById(R.id.import_from_options));
@@ -316,20 +361,108 @@ public class SubscriptionFragment extends BaseStateFragment<List<SubscriptionEnt
        super.initListeners();

        infoListAdapter.setOnChannelSelectedListener(new OnClickGesture<ChannelInfoItem>() {
-            @Override
+
            public void selected(ChannelInfoItem selectedItem) {
-                // Requires the parent fragment to find holder for fragment replacement
-                NavigationHelper.openChannelFragment(getParentFragment().getFragmentManager(),
-                        selectedItem.getServiceId(), selectedItem.getUrl(), selectedItem.getName());
+                final FragmentManager fragmentManager = getFM();
+                NavigationHelper.openChannelFragment(fragmentManager,
+                        selectedItem.getServiceId(),
+                        selectedItem.getUrl(),
+                        selectedItem.getName());
            }
+
+            public void held(ChannelInfoItem selectedItem) {
+                showLongTapDialog(selectedItem);
+            }
+
        });

        //noinspection ConstantConditions
-        whatsNewItemListHeader.setOnClickListener(v ->
-                NavigationHelper.openWhatsNewFragment(getParentFragment().getFragmentManager()));
+        whatsNewItemListHeader.setOnClickListener(v -> {
+            FragmentManager fragmentManager = getFM();
+            NavigationHelper.openWhatsNewFragment(fragmentManager);
+        });
        importExportListHeader.setOnClickListener(v -> importExportOptions.switchState());
    }

+    private void showLongTapDialog(ChannelInfoItem selectedItem) {
+        final Context context = getContext();
+        final Activity activity = getActivity();
+        if (context == null || context.getResources() == null || getActivity() == null) return;
+
+        final String[] commands = new String[]{
+                context.getResources().getString(R.string.share),
+                context.getResources().getString(R.string.unsubscribe)
+        };
+
+        final DialogInterface.OnClickListener actions = (dialogInterface, i) -> {
+            switch (i) {
+                case 0:
+                    shareChannel(selectedItem);
+                    break;
+                case 1:
+                    deleteChannel(selectedItem);
+                    break;
+                default:
+                    break;
+            }
+        };
+
+        final View bannerView = View.inflate(activity, R.layout.dialog_title, null);
+        bannerView.setSelected(true);
+
+        TextView titleView = bannerView.findViewById(R.id.itemTitleView);
+        titleView.setText(selectedItem.getName());
+
+        TextView detailsView = bannerView.findViewById(R.id.itemAdditionalDetails);
+        detailsView.setVisibility(View.GONE);
+
+        new AlertDialog.Builder(activity)
+                .setCustomTitle(bannerView)
+                .setItems(commands, actions)
+                .create()
+                .show();
+
+    }
+
+    private void shareChannel (ChannelInfoItem selectedItem) {
+        shareUrl(selectedItem.getName(), selectedItem.getUrl());
+    }
+
+    @SuppressLint("CheckResult")
+    private void deleteChannel (ChannelInfoItem selectedItem) {
+        subscriptionService.subscriptionTable()
+                .getSubscription(selectedItem.getServiceId(), selectedItem.getUrl())
+                .toObservable()
+                .observeOn(Schedulers.io())
+                .subscribe(getDeleteObserver());
+
+        Toast.makeText(activity, getString(R.string.channel_unsubscribed), Toast.LENGTH_SHORT).show();
+    }
+
+
+
+    private Observer<List<SubscriptionEntity>> getDeleteObserver(){
+        return new Observer<List<SubscriptionEntity>>() {
+            @Override
+            public void onSubscribe(Disposable d) {
+                disposables.add(d);
+            }
+
+            @Override
+            public void onNext(List<SubscriptionEntity> subscriptionEntities) {
+                subscriptionService.subscriptionTable().delete(subscriptionEntities);
+            }
+
+            @Override
+            public void onError(Throwable exception) {
+                SubscriptionFragment.this.onError(exception);
+            }
+
+            @Override
+            public void onComplete() {  }
+        };
+    }
+
    private void resetFragment() {
        if (disposables != null) disposables.clear();
        if (infoListAdapter != null) infoListAdapter.clearStreamItemList();
@@ -397,10 +530,13 @@ public class SubscriptionFragment extends BaseStateFragment<List<SubscriptionEnt

    private List<InfoItem> getSubscriptionItems(List<SubscriptionEntity> subscriptions) {
        List<InfoItem> items = new ArrayList<>();
-        for (final SubscriptionEntity subscription : subscriptions) items.add(subscription.toChannelInfoItem());
+        for (final SubscriptionEntity subscription : subscriptions) {
+            items.add(subscription.toChannelInfoItem());
+        }

        Collections.sort(items,
-                (InfoItem o1, InfoItem o2) -> o1.getName().compareToIgnoreCase(o2.getName()));
+                (InfoItem o1, InfoItem o2) ->
+                        o1.getName().compareToIgnoreCase(o2.getName()));
        return items;
    }

@@ -429,7 +565,29 @@ public class SubscriptionFragment extends BaseStateFragment<List<SubscriptionEnt
        resetFragment();
        if (super.onError(exception)) return true;

-        onUnrecoverableError(exception, UserAction.SOMETHING_ELSE, "none", "Subscriptions", R.string.general_error);
+        onUnrecoverableError(exception,
+                UserAction.SOMETHING_ELSE,
+                "none",
+                "Subscriptions",
+                R.string.general_error);
        return true;
    }
+
+    @Override
+    public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
+        if (key.equals(getString(R.string.list_view_mode_key))) {
+            updateFlags |= LIST_MODE_UPDATE_FLAG;
+        }
+    }
+
+    protected boolean isGridLayout() {
+        final String list_mode = PreferenceManager.getDefaultSharedPreferences(activity).getString(getString(R.string.list_view_mode_key), getString(R.string.list_view_mode_value));
+        if ("auto".equals(list_mode)) {
+            final Configuration configuration = getResources().getConfiguration();
+            return configuration.orientation == Configuration.ORIENTATION_LANDSCAPE
+                    && configuration.isLayoutSizeAtLeast(Configuration.SCREENLAYOUT_SIZE_LARGE);
+        } else {
+            return "grid".equals(list_mode);
+        }
+    }
 }
--- a/app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionService.java
+++ b/app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionService.java
@@ -55,10 +55,10 @@ public class SubscriptionService {
    private static final int SUBSCRIPTION_DEBOUNCE_INTERVAL = 500;
    private static final int SUBSCRIPTION_THREAD_POOL_SIZE = 4;

-    private AppDatabase db;
-    private Flowable<List<SubscriptionEntity>> subscription;
+    private final AppDatabase db;
+    private final Flowable<List<SubscriptionEntity>> subscription;

-    private Scheduler subscriptionScheduler;
+    private final Scheduler subscriptionScheduler;

    private SubscriptionService(Context context) {
        db = NewPipeDatabase.getInstance(context.getApplicationContext());
@@ -116,7 +116,7 @@ public class SubscriptionService {
    public Completable updateChannelInfo(final ChannelInfo info) {
        final Function<List<SubscriptionEntity>, CompletableSource> update = new Function<List<SubscriptionEntity>, CompletableSource>() {
            @Override
-            public CompletableSource apply(@NonNull List<SubscriptionEntity> subscriptionEntities) throws Exception {
+            public CompletableSource apply(@NonNull List<SubscriptionEntity> subscriptionEntities) {
                if (DEBUG) Log.d(TAG, "updateChannelInfo() called with: subscriptionEntities = [" + subscriptionEntities + "]");
                if (subscriptionEntities.size() == 1) {
                    SubscriptionEntity subscription = subscriptionEntities.get(0);
--- a/app/src/main/java/org/schabi/newpipe/local/subscription/services/BaseImportExportService.java
+++ b/app/src/main/java/org/schabi/newpipe/local/subscription/services/BaseImportExportService.java
@@ -58,8 +58,8 @@ public abstract class BaseImportExportService extends Service {
    protected NotificationCompat.Builder notificationBuilder;

    protected SubscriptionService subscriptionService;
-    protected CompositeDisposable disposables = new CompositeDisposable();
-    protected PublishProcessor<String> notificationUpdater = PublishProcessor.create();
+    protected final CompositeDisposable disposables = new CompositeDisposable();
+    protected final PublishProcessor<String> notificationUpdater = PublishProcessor.create();

    @Nullable
    @Override
@@ -90,9 +90,9 @@ public abstract class BaseImportExportService extends Service {

    private static final int NOTIFICATION_SAMPLING_PERIOD = 2500;

-    protected AtomicInteger currentProgress = new AtomicInteger(-1);
-    protected AtomicInteger maxProgress = new AtomicInteger(-1);
-    protected ImportExportEventListener eventListener = new ImportExportEventListener() {
+    protected final AtomicInteger currentProgress = new AtomicInteger(-1);
+    protected final AtomicInteger maxProgress = new AtomicInteger(-1);
+    protected final ImportExportEventListener eventListener = new ImportExportEventListener() {
        @Override
        public void onSizeReceived(int size) {
            maxProgress.set(size);
@@ -187,13 +187,13 @@ public abstract class BaseImportExportService extends Service {
    protected Toast toast;

    protected void showToast(@StringRes int message) {
-        showToast(getString(message), Toast.LENGTH_SHORT);
+        showToast(getString(message));
    }

-    protected void showToast(String message, int duration) {
+    protected void showToast(String message) {
        if (toast != null) toast.cancel();

-        toast = Toast.makeText(this, message, duration);
+        toast = Toast.makeText(this, message, Toast.LENGTH_SHORT);
        toast.show();
    }

--- a/app/src/main/java/org/schabi/newpipe/local/subscription/services/SubscriptionsImportService.java
+++ b/app/src/main/java/org/schabi/newpipe/local/subscription/services/SubscriptionsImportService.java
@@ -144,12 +144,16 @@ public class SubscriptionsImportService extends BaseImportExportService {
        showToast(R.string.import_ongoing);

        Flowable<List<SubscriptionItem>> flowable = null;
-        if (currentMode == CHANNEL_URL_MODE) {
-            flowable = importFromChannelUrl();
-        } else if (currentMode == INPUT_STREAM_MODE) {
-            flowable = importFromInputStream();
-        } else if (currentMode == PREVIOUS_EXPORT_MODE) {
-            flowable = importFromPreviousExport();
+        switch (currentMode) {
+            case CHANNEL_URL_MODE:
+                flowable = importFromChannelUrl();
+                break;
+            case INPUT_STREAM_MODE:
+                flowable = importFromInputStream();
+                break;
+            case PREVIOUS_EXPORT_MODE:
+                flowable = importFromPreviousExport();
+                break;
        }

        if (flowable == null) {
--- a/app/src/main/java/org/schabi/newpipe/player/BackgroundPlayer.java
+++ b/app/src/main/java/org/schabi/newpipe/player/BackgroundPlayer.java
@@ -28,7 +28,6 @@ import android.content.IntentFilter;
 import android.graphics.Bitmap;
 import android.os.Build;
 import android.os.IBinder;
-import android.support.annotation.IntRange;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v4.app.NotificationCompat;
@@ -39,17 +38,16 @@ import android.widget.RemoteViews;
 import com.google.android.exoplayer2.PlaybackParameters;
 import com.google.android.exoplayer2.Player;
 import com.google.android.exoplayer2.source.MediaSource;
+import com.nostra13.universalimageloader.core.assist.FailReason;

 import org.schabi.newpipe.BuildConfig;
 import org.schabi.newpipe.R;
-import org.schabi.newpipe.extractor.MediaFormat;
-import org.schabi.newpipe.extractor.stream.AudioStream;
 import org.schabi.newpipe.extractor.stream.StreamInfo;
 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.playqueue.PlayQueueItem;
-import org.schabi.newpipe.util.ListHelper;
+import org.schabi.newpipe.player.resolver.AudioPlaybackResolver;
+import org.schabi.newpipe.player.resolver.MediaSourceTag;
 import org.schabi.newpipe.util.NavigationHelper;
 import org.schabi.newpipe.util.ThemeHelper;

@@ -94,7 +92,6 @@ public final class BackgroundPlayer extends Service {
    private NotificationCompat.Builder notBuilder;
    private RemoteViews notRemoteView;
    private RemoteViews bigNotRemoteView;
-    private final String setAlphaMethodName = (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) ? "setImageAlpha" : "setAlpha";

    private boolean shouldUpdateOnProgress;

@@ -192,7 +189,9 @@ public final class BackgroundPlayer extends Service {
                .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
                .setCustomContentView(notRemoteView)
                .setCustomBigContentView(bigNotRemoteView);
-        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.JELLY_BEAN) builder.setPriority(NotificationCompat.PRIORITY_MAX);
+        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.JELLY_BEAN) {
+            builder.setPriority(NotificationCompat.PRIORITY_MAX);
+        }
        return builder;
    }

@@ -249,15 +248,6 @@ public final class BackgroundPlayer extends Service {
        notificationManager.notify(NOTIFICATION_ID, notBuilder.build());
    }

-    private void setControlsOpacity(@IntRange(from = 0, to = 255) int opacity) {
-        if (notRemoteView != null) notRemoteView.setInt(R.id.notificationPlayPause, setAlphaMethodName, opacity);
-        if (bigNotRemoteView != null) bigNotRemoteView.setInt(R.id.notificationPlayPause, setAlphaMethodName, opacity);
-        if (notRemoteView != null) notRemoteView.setInt(R.id.notificationFForward, setAlphaMethodName, opacity);
-        if (bigNotRemoteView != null) bigNotRemoteView.setInt(R.id.notificationFForward, setAlphaMethodName, opacity);
-        if (notRemoteView != null) notRemoteView.setInt(R.id.notificationFRewind, setAlphaMethodName, opacity);
-        if (bigNotRemoteView != null) bigNotRemoteView.setInt(R.id.notificationFRewind, setAlphaMethodName, opacity);
-    }
-
    /*//////////////////////////////////////////////////////////////////////////
    // Utils
    //////////////////////////////////////////////////////////////////////////*/
@@ -279,8 +269,16 @@ public final class BackgroundPlayer extends Service {

    protected class BasePlayerImpl extends BasePlayer {

+        @NonNull final private AudioPlaybackResolver resolver;
+
        BasePlayerImpl(Context context) {
            super(context);
+            this.resolver = new AudioPlaybackResolver(context, dataSource);
+        }
+
+        @Override
+        public void initPlayer(boolean playOnReady) {
+            super.initPlayer(playOnReady);
        }

        @Override
@@ -293,30 +291,41 @@ public final class BackgroundPlayer extends Service {
            startForeground(NOTIFICATION_ID, notBuilder.build());
        }

-        @Override
-        public void initThumbnail(final String url) {
-            resetNotification();
-            if (notRemoteView != null) notRemoteView.setImageViewResource(R.id.notificationCover, R.drawable.dummy_thumbnail);
-            if (bigNotRemoteView != null) bigNotRemoteView.setImageViewResource(R.id.notificationCover, R.drawable.dummy_thumbnail);
-            updateNotification(-1);
-            super.initThumbnail(url);
+        /*//////////////////////////////////////////////////////////////////////////
+        // Thumbnail Loading
+        //////////////////////////////////////////////////////////////////////////*/
+
+        private void updateNotificationThumbnail() {
+            if (basePlayerImpl == null) return;
+            if (notRemoteView != null) {
+                notRemoteView.setImageViewBitmap(R.id.notificationCover,
+                        basePlayerImpl.getThumbnail());
+            }
+            if (bigNotRemoteView != null) {
+                bigNotRemoteView.setImageViewBitmap(R.id.notificationCover,
+                        basePlayerImpl.getThumbnail());
+            }
        }

        @Override
        public void onLoadingComplete(String imageUri, View view, Bitmap loadedImage) {
            super.onLoadingComplete(imageUri, view, loadedImage);
-
-            if (loadedImage != null) {
-                // rebuild notification here since remote view does not release bitmaps, causing memory leaks
-                resetNotification();
-
-                if (notRemoteView != null) notRemoteView.setImageViewBitmap(R.id.notificationCover, loadedImage);
-                if (bigNotRemoteView != null) bigNotRemoteView.setImageViewBitmap(R.id.notificationCover, loadedImage);
-
-                updateNotification(-1);
-            }
+            resetNotification();
+            updateNotificationThumbnail();
+            updateNotification(-1);
        }

+        @Override
+        public void onLoadingFailed(String imageUri, View view, FailReason failReason) {
+            super.onLoadingFailed(imageUri, view, failReason);
+            resetNotification();
+            updateNotificationThumbnail();
+            updateNotification(-1);
+        }
+        /*//////////////////////////////////////////////////////////////////////////
+        // States Implementation
+        //////////////////////////////////////////////////////////////////////////*/
+
        @Override
        public void onPrepared(boolean playWhenReady) {
            super.onPrepared(playWhenReady);
@@ -335,6 +344,7 @@ public final class BackgroundPlayer extends Service {

            if (!shouldUpdateOnProgress) return;
            resetNotification();
+            if(Build.VERSION.SDK_INT >= 26 /*Oreo*/) updateNotificationThumbnail();
            if (bigNotRemoteView != null) {
                bigNotRemoteView.setProgressBar(R.id.notificationProgressBar, duration, currentProgress, false);
                bigNotRemoteView.setTextViewText(R.id.notificationTime, getTimeString(currentProgress) + " / " + getTimeString(duration));
@@ -390,29 +400,18 @@ public final class BackgroundPlayer extends Service {
        // Playback Listener
        //////////////////////////////////////////////////////////////////////////*/

-        protected void onMetadataChanged(@NonNull final PlayQueueItem item,
-                                         @Nullable final StreamInfo info,
-                                         final int newPlayQueueIndex,
-                                         final boolean hasPlayQueueItemChanged) {
-            if (shouldUpdateOnProgress || hasPlayQueueItemChanged) {
-                resetNotification();
-                updateNotification(-1);
-                updateMetadata();
-            }
+        protected void onMetadataChanged(@NonNull final MediaSourceTag tag) {
+            super.onMetadataChanged(tag);
+            resetNotification();
+            updateNotificationThumbnail();
+            updateNotification(-1);
+            updateMetadata();
        }

        @Override
        @Nullable
        public MediaSource sourceOf(final PlayQueueItem item, final StreamInfo info) {
-            final MediaSource liveSource = super.sourceOf(item, info);
-            if (liveSource != null) return liveSource;
-
-            final int index = ListHelper.getDefaultAudioFormat(context, info.getAudioStreams());
-            if (index < 0 || index >= info.getAudioStreams().size()) return null;
-
-            final AudioStream audio = info.getAudioStreams().get(index);
-            return buildMediaSource(audio.getUrl(), PlayerHelper.cacheKeyOf(info, audio),
-                    MediaFormat.getSuffixById(audio.getFormatId()));
+            return resolver.resolve(info);
        }

        @Override
@@ -439,8 +438,8 @@ public final class BackgroundPlayer extends Service {
        }

        private void updateMetadata() {
-            if (activityListener != null && currentInfo != null) {
-                activityListener.onMetadataUpdate(currentInfo);
+            if (activityListener != null && getCurrentMetadata() != null) {
+                activityListener.onMetadataUpdate(getCurrentMetadata().getMetadata());
            }
        }

@@ -531,44 +530,36 @@ public final class BackgroundPlayer extends Service {
            updatePlayback();
        }

-        @Override
-        public void onBlocked() {
-            super.onBlocked();
-
-            setControlsOpacity(77);
-            updateNotification(-1);
-        }
-
        @Override
        public void onPlaying() {
            super.onPlaying();
-
-            setControlsOpacity(255);
+            resetNotification();
+            updateNotificationThumbnail();
            updateNotification(R.drawable.ic_pause_white);
-
            lockManager.acquireWifiAndCpu();
        }

        @Override
        public void onPaused() {
            super.onPaused();
-
+            resetNotification();
+            updateNotificationThumbnail();
            updateNotification(R.drawable.ic_play_arrow_white);
-
            lockManager.releaseWifiAndCpu();
        }

        @Override
        public void onCompleted() {
            super.onCompleted();
-
-            setControlsOpacity(255);
-
            resetNotification();
-            if (bigNotRemoteView != null) bigNotRemoteView.setProgressBar(R.id.notificationProgressBar, 100, 100, false);
-            if (notRemoteView != null) notRemoteView.setProgressBar(R.id.notificationProgressBar, 100, 100, false);
+            if (bigNotRemoteView != null) {
+                bigNotRemoteView.setProgressBar(R.id.notificationProgressBar, 100, 100, false);
+            }
+            if (notRemoteView != null) {
+                notRemoteView.setProgressBar(R.id.notificationProgressBar, 100, 100, false);
+            }
+            updateNotificationThumbnail();
            updateNotification(R.drawable.ic_replay_white);
-
            lockManager.releaseWifiAndCpu();
        }
    }
--- a/app/src/main/java/org/schabi/newpipe/player/BasePlayer.java
+++ b/app/src/main/java/org/schabi/newpipe/player/BasePlayer.java
@@ -24,16 +24,14 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
 import android.media.AudioManager;
-import android.net.Uri;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
-import android.text.TextUtils;
 import android.util.Log;
 import android.view.View;
 import android.widget.Toast;

-import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.DefaultRenderersFactory;
 import com.google.android.exoplayer2.ExoPlaybackException;
 import com.google.android.exoplayer2.ExoPlayerFactory;
@@ -49,15 +47,14 @@ import com.google.android.exoplayer2.source.TrackGroupArray;
 import com.google.android.exoplayer2.trackselection.TrackSelection;
 import com.google.android.exoplayer2.trackselection.TrackSelectionArray;
 import com.google.android.exoplayer2.upstream.DefaultBandwidthMeter;
-import com.google.android.exoplayer2.util.Util;
 import com.nostra13.universalimageloader.core.ImageLoader;
 import com.nostra13.universalimageloader.core.assist.FailReason;
 import com.nostra13.universalimageloader.core.listener.ImageLoadingListener;

+import org.schabi.newpipe.BuildConfig;
 import org.schabi.newpipe.Downloader;
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.extractor.stream.StreamInfo;
-import org.schabi.newpipe.extractor.stream.StreamType;
 import org.schabi.newpipe.local.history.HistoryRecordManager;
 import org.schabi.newpipe.player.helper.AudioReactor;
 import org.schabi.newpipe.player.helper.LoadController;
@@ -72,6 +69,8 @@ import org.schabi.newpipe.player.playback.PlaybackListener;
 import org.schabi.newpipe.player.playqueue.PlayQueue;
 import org.schabi.newpipe.player.playqueue.PlayQueueAdapter;
 import org.schabi.newpipe.player.playqueue.PlayQueueItem;
+import org.schabi.newpipe.player.resolver.MediaSourceTag;
+import org.schabi.newpipe.util.ImageDisplayConstants;
 import org.schabi.newpipe.util.SerializedCache;

 import java.io.IOException;
@@ -82,12 +81,12 @@ import io.reactivex.Observable;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.disposables.CompositeDisposable;
 import io.reactivex.disposables.Disposable;
+import io.reactivex.disposables.SerialDisposable;

 import static com.google.android.exoplayer2.Player.DISCONTINUITY_REASON_INTERNAL;
 import static com.google.android.exoplayer2.Player.DISCONTINUITY_REASON_PERIOD_TRANSITION;
 import static com.google.android.exoplayer2.Player.DISCONTINUITY_REASON_SEEK;
 import static com.google.android.exoplayer2.Player.DISCONTINUITY_REASON_SEEK_ADJUSTMENT;
-import static org.schabi.newpipe.player.helper.PlayerHelper.getTimeString;

 /**
 * Base for the players, joining the common properties
@@ -98,26 +97,54 @@ import static org.schabi.newpipe.player.helper.PlayerHelper.getTimeString;
 public abstract class BasePlayer implements
        Player.EventListener, PlaybackListener, ImageLoadingListener {

-    public static final boolean DEBUG = true;
-    @NonNull public static final String TAG = "BasePlayer";
+    public static final boolean DEBUG = !BuildConfig.BUILD_TYPE.equals("release");
+    @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 private LoadControl loadControl;
+    @NonNull
+    final private RenderersFactory renderFactory;
+
+    @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";

    /*//////////////////////////////////////////////////////////////////////////
@@ -129,11 +156,17 @@ public abstract class BasePlayer implements
    protected PlayQueue playQueue;
    protected PlayQueueAdapter playQueueAdapter;

+    @Nullable
    protected MediaSourceManager playbackManager;

-    protected StreamInfo currentInfo;
-    protected PlayQueueItem currentItem;
+    @Nullable
+    private PlayQueueItem currentItem;
+    @Nullable
+    private MediaSourceTag currentMetadata;
+    @Nullable
+    private Bitmap currentThumbnail;

+    @Nullable
    protected Toast errorToast;

    /*//////////////////////////////////////////////////////////////////////////
@@ -145,18 +178,11 @@ public abstract class BasePlayer implements
    protected final static int PROGRESS_LOOP_INTERVAL_MILLIS = 500;
    protected final static int RECOVERY_SKIP_THRESHOLD_MILLIS = 3000; // 3 seconds

-    protected CustomTrackSelector trackSelector;
-    protected PlayerDataSource dataSource;
-
    protected SimpleExoPlayer simpleExoPlayer;
    protected AudioReactor audioReactor;
    protected MediaSessionManager mediaSessionManager;

    private boolean isPrepared = false;
-    private boolean isSynchronizing = false;
-
-    protected Disposable progressUpdateReactor;
-    protected CompositeDisposable databaseUpdateReactor;

    //////////////////////////////////////////////////////////////////////////*/

@@ -171,32 +197,34 @@ public abstract class BasePlayer implements
        };
        this.intentFilter = new IntentFilter();
        setupBroadcastReceiver(intentFilter);
-        context.registerReceiver(broadcastReceiver, intentFilter);

        this.recordManager = new HistoryRecordManager(context);
+
+        this.progressUpdateReactor = new SerialDisposable();
+        this.databaseUpdateReactor = new CompositeDisposable();
+
+        final String userAgent = Downloader.USER_AGENT;
+        final DefaultBandwidthMeter bandwidthMeter = new DefaultBandwidthMeter();
+        this.dataSource = new PlayerDataSource(context, userAgent, bandwidthMeter);
+
+        final TrackSelection.Factory trackSelectionFactory =
+                PlayerHelper.getQualitySelector(context, bandwidthMeter);
+        this.trackSelector = new CustomTrackSelector(trackSelectionFactory);
+
+        this.loadControl = new LoadController(context);
+        this.renderFactory = new DefaultRenderersFactory(context);
    }

    public void setup() {
-        if (simpleExoPlayer == null) initPlayer(/*playOnInit=*/true);
+        if (simpleExoPlayer == null) {
+            initPlayer(/*playOnInit=*/true);
+        }
        initListeners();
    }

    public void initPlayer(final boolean playOnReady) {
        if (DEBUG) Log.d(TAG, "initPlayer() called with: context = [" + context + "]");

-        if (databaseUpdateReactor != null) databaseUpdateReactor.dispose();
-        databaseUpdateReactor = new CompositeDisposable();
-
-        final String userAgent = Downloader.USER_AGENT;
-        final DefaultBandwidthMeter bandwidthMeter = new DefaultBandwidthMeter();
-        dataSource = new PlayerDataSource(context, userAgent, bandwidthMeter);
-
-        final TrackSelection.Factory trackSelectionFactory =
-                PlayerHelper.getQualitySelector(context, bandwidthMeter);
-        trackSelector = new CustomTrackSelector(trackSelectionFactory);
-
-        final LoadControl loadControl = new LoadController(context);
-        final RenderersFactory renderFactory = new DefaultRenderersFactory(context);
        simpleExoPlayer = ExoPlayerFactory.newSimpleInstance(renderFactory, trackSelector, loadControl);
        simpleExoPlayer.addListener(this);
        simpleExoPlayer.setPlayWhenReady(playOnReady);
@@ -205,9 +233,12 @@ public abstract class BasePlayer implements
        audioReactor = new AudioReactor(context, simpleExoPlayer);
        mediaSessionManager = new MediaSessionManager(context, simpleExoPlayer,
                new BasePlayerMediaSession(this));
+
+        registerBroadcastReceiver();
    }

-    public void initListeners() {}
+    public void initListeners() {
+    }

    public void handleIntent(Intent intent) {
        if (DEBUG) Log.d(TAG, "handleIntent() called with: intent = [" + intent + "]");
@@ -224,7 +255,8 @@ public abstract class BasePlayer implements
            int sizeBeforeAppend = playQueue.size();
            playQueue.append(queue.getStreams());

-            if (intent.getBooleanExtra(SELECT_ON_APPEND, false) &&
+            if ((intent.getBooleanExtra(SELECT_ON_APPEND, false) ||
+                    getCurrentState() == STATE_COMPLETED) &&
                    queue.getStreams().size() > 0) {
                playQueue.setIndex(sizeBeforeAppend);
            }
@@ -235,20 +267,24 @@ public abstract class BasePlayer implements
        final int repeatMode = intent.getIntExtra(REPEAT_MODE, getRepeatMode());
        final float playbackSpeed = intent.getFloatExtra(PLAYBACK_SPEED, getPlaybackSpeed());
        final float playbackPitch = intent.getFloatExtra(PLAYBACK_PITCH, getPlaybackPitch());
+        final boolean playbackSkipSilence = intent.getBooleanExtra(PLAYBACK_SKIP_SILENCE,
+                getPlaybackSkipSilence());

        // Good to go...
-        initPlayback(queue, repeatMode, playbackSpeed, playbackPitch, /*playOnInit=*/true);
+        initPlayback(queue, repeatMode, playbackSpeed, playbackPitch, playbackSkipSilence,
+                /*playOnInit=*/true);
    }

    protected void initPlayback(@NonNull final PlayQueue queue,
                                @Player.RepeatMode final int repeatMode,
                                final float playbackSpeed,
                                final float playbackPitch,
+                                final boolean playbackSkipSilence,
                                final boolean playOnReady) {
        destroyPlayer();
        initPlayer(playOnReady);
        setRepeatMode(repeatMode);
-        setPlaybackParameters(playbackSpeed, playbackPitch);
+        setPlaybackParameters(playbackSpeed, playbackPitch, playbackSkipSilence);

        playQueue = queue;
        playQueue.init();
@@ -270,7 +306,7 @@ public abstract class BasePlayer implements
        if (playQueue != null) playQueue.dispose();
        if (audioReactor != null) audioReactor.dispose();
        if (playbackManager != null) playbackManager.dispose();
-        if (databaseUpdateReactor != null) databaseUpdateReactor.dispose();
+        if (mediaSessionManager != null) mediaSessionManager.dispose();

        if (playQueueAdapter != null) {
            playQueueAdapter.unsetSelectedListener();
@@ -283,20 +319,21 @@ public abstract class BasePlayer implements
        destroyPlayer();
        unregisterBroadcastReceiver();

-        trackSelector = null;
-        simpleExoPlayer = null;
-        mediaSessionManager = null;
+        databaseUpdateReactor.clear();
+        progressUpdateReactor.set(null);
+
    }

    /*//////////////////////////////////////////////////////////////////////////
    // Thumbnail Loading
    //////////////////////////////////////////////////////////////////////////*/

-    public void initThumbnail(final String url) {
+    private void initThumbnail(final String url) {
        if (DEBUG) Log.d(TAG, "Thumbnail - initThumbnail() called");
        if (url == null || url.isEmpty()) return;
        ImageLoader.getInstance().resume();
-        ImageLoader.getInstance().loadImage(url, this);
+        ImageLoader.getInstance().loadImage(url, ImageDisplayConstants.DISPLAY_THUMBNAIL_OPTIONS,
+                this);
    }

    @Override
@@ -309,6 +346,7 @@ public abstract class BasePlayer implements
    public void onLoadingFailed(String imageUri, View view, FailReason failReason) {
        Log.e(TAG, "Thumbnail - onLoadingFailed() called on imageUri = [" + imageUri + "]",
                failReason.getCause());
+        currentThumbnail = null;
    }

    @Override
@@ -316,64 +354,14 @@ public abstract class BasePlayer implements
        if (DEBUG) Log.d(TAG, "Thumbnail - onLoadingComplete() called with: " +
                "imageUri = [" + imageUri + "], view = [" + view + "], " +
                "loadedImage = [" + loadedImage + "]");
+        currentThumbnail = loadedImage;
    }

    @Override
    public void onLoadingCancelled(String imageUri, View view) {
        if (DEBUG) Log.d(TAG, "Thumbnail - onLoadingCancelled() called with: " +
                "imageUri = [" + imageUri + "], view = [" + view + "]");
-    }
-    /*//////////////////////////////////////////////////////////////////////////
-    // MediaSource Building
-    //////////////////////////////////////////////////////////////////////////*/
-
-    public MediaSource buildLiveMediaSource(@NonNull final String sourceUrl,
-                                            @C.ContentType final int type) {
-        if (DEBUG) {
-            Log.d(TAG, "buildLiveMediaSource() called with: url = [" + sourceUrl +
-                    "], content type = [" + type + "]");
-        }
-        if (dataSource == null) return null;
-
-        final Uri uri = Uri.parse(sourceUrl);
-        switch (type) {
-            case C.TYPE_SS:
-                return dataSource.getLiveSsMediaSourceFactory().createMediaSource(uri);
-            case C.TYPE_DASH:
-                return dataSource.getLiveDashMediaSourceFactory().createMediaSource(uri);
-            case C.TYPE_HLS:
-                return dataSource.getLiveHlsMediaSourceFactory().createMediaSource(uri);
-            default:
-                throw new IllegalStateException("Unsupported type: " + type);
-        }
-    }
-
-    public MediaSource buildMediaSource(@NonNull final String sourceUrl,
-                                        @NonNull final String cacheKey,
-                                        @NonNull final String overrideExtension) {
-        if (DEBUG) {
-            Log.d(TAG, "buildMediaSource() called with: url = [" + sourceUrl +
-                    "], cacheKey = [" + cacheKey + "]" +
-                    "], overrideExtension = [" + overrideExtension + "]");
-        }
-        if (dataSource == null) return null;
-
-        final Uri uri = Uri.parse(sourceUrl);
-        @C.ContentType final int type = TextUtils.isEmpty(overrideExtension) ?
-                Util.inferContentType(uri) : Util.inferContentType("." + overrideExtension);
-
-        switch (type) {
-            case C.TYPE_SS:
-                return dataSource.getLiveSsMediaSourceFactory().createMediaSource(uri);
-            case C.TYPE_DASH:
-                return dataSource.getDashMediaSourceFactory().createMediaSource(uri);
-            case C.TYPE_HLS:
-                return dataSource.getHlsMediaSourceFactory().createMediaSource(uri);
-            case C.TYPE_OTHER:
-                return dataSource.getExtractorMediaSourceFactory(cacheKey).createMediaSource(uri);
-            default:
-                throw new IllegalStateException("Unsupported type: " + type);
-        }
+        currentThumbnail = null;
    }

    /*//////////////////////////////////////////////////////////////////////////
@@ -398,11 +386,17 @@ public abstract class BasePlayer implements
        }
    }

-    public void unregisterBroadcastReceiver() {
+    protected void registerBroadcastReceiver() {
+        // Try to unregister current first
+        unregisterBroadcastReceiver();
+        context.registerReceiver(broadcastReceiver, intentFilter);
+    }
+
+    protected void unregisterBroadcastReceiver() {
        try {
            context.unregisterReceiver(broadcastReceiver);
        } catch (final IllegalArgumentException unregisteredException) {
-            Log.e(TAG, "Broadcast receiver already unregistered.", unregisteredException);
+            Log.w(TAG, "Broadcast receiver already unregistered (" + unregisteredException.getMessage() + ")");
        }
    }

@@ -455,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");
@@ -509,13 +505,11 @@ public abstract class BasePlayer implements
    public abstract void onUpdateProgress(int currentProgress, int duration, int bufferPercent);

    protected void startProgressLoop() {
-        if (progressUpdateReactor != null) progressUpdateReactor.dispose();
-        progressUpdateReactor = getProgressReactor();
+        progressUpdateReactor.set(getProgressReactor());
    }

    protected void stopProgressLoop() {
-        if (progressUpdateReactor != null) progressUpdateReactor.dispose();
-        progressUpdateReactor = null;
+        progressUpdateReactor.set(null);
    }

    public void triggerProgressUpdate() {
@@ -530,7 +524,8 @@ public abstract class BasePlayer implements
    private Disposable getProgressReactor() {
        return Observable.interval(PROGRESS_LOOP_INTERVAL_MILLIS, TimeUnit.MILLISECONDS)
                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(ignored -> triggerProgressUpdate());
+                .subscribe(ignored -> triggerProgressUpdate(),
+                        error -> Log.e(TAG, "Progress update failure: ", error));
    }

    /*//////////////////////////////////////////////////////////////////////////
@@ -544,28 +539,16 @@ public abstract class BasePlayer implements
                (manifest == null ? "no manifest" : "available manifest") + ", " +
                "timeline size = [" + timeline.getWindowCount() + "], " +
                "reason = [" + reason + "]");
-        if (playQueue == null) return;

-        switch (reason) {
-            case Player.TIMELINE_CHANGE_REASON_RESET: // called after #block
-            case Player.TIMELINE_CHANGE_REASON_PREPARED: // called after #unblock
-            case Player.TIMELINE_CHANGE_REASON_DYNAMIC: // called after playlist changes
-                // Ensures MediaSourceManager#update is complete
-                final boolean isPlaylistStable = timeline.getWindowCount() == playQueue.size();
-                // Ensure dynamic/livestream timeline changes does not cause negative position
-                if (isPlaylistStable && !isCurrentWindowValid() && !isSynchronizing) {
-                    if (DEBUG) Log.d(TAG, "Playback - negative time position reached, " +
-                            "clamping to default position.");
-                    seekToDefault();
-                }
-                break;
-        }
+        maybeUpdateCurrentMetadata();
    }

    @Override
    public void onTracksChanged(TrackGroupArray trackGroups, TrackSelectionArray trackSelections) {
        if (DEBUG) Log.d(TAG, "ExoPlayer - onTracksChanged(), " +
                "track group size = " + trackGroups.length);
+
+        maybeUpdateCurrentMetadata();
    }

    @Override
@@ -585,6 +568,8 @@ public abstract class BasePlayer implements
        } else if (isLoading && !isProgressLoopRunning()) {
            startProgressLoop();
        }
+
+        maybeUpdateCurrentMetadata();
    }

    @Override
@@ -608,6 +593,7 @@ public abstract class BasePlayer implements
                }
                break;
            case Player.STATE_READY: //3
+                maybeUpdateCurrentMetadata();
                maybeCorrectSeekPosition();
                if (!isPrepared) {
                    isPrepared = true;
@@ -624,56 +610,37 @@ public abstract class BasePlayer implements
    }

    private void maybeCorrectSeekPosition() {
-        if (playQueue == null || simpleExoPlayer == null || currentInfo == null) return;
+        if (playQueue == null || simpleExoPlayer == null || currentMetadata == null) return;

-        final int currentSourceIndex = playQueue.getIndex();
        final PlayQueueItem currentSourceItem = playQueue.getItem();
        if (currentSourceItem == null) return;

-        final long recoveryPositionMillis = currentSourceItem.getRecoveryPosition();
-        final boolean isCurrentWindowCorrect =
-                simpleExoPlayer.getCurrentPeriodIndex() == currentSourceIndex;
+        final StreamInfo currentInfo = currentMetadata.getMetadata();
        final long presetStartPositionMillis = currentInfo.getStartPosition() * 1000;
-
-        if (recoveryPositionMillis != PlayQueueItem.RECOVERY_UNSET && isCurrentWindowCorrect) {
-            // Is recovering previous playback?
-            if (DEBUG) Log.d(TAG, "Playback - Rewinding to recovery time=" +
-                    "[" + getTimeString((int)recoveryPositionMillis) + "]");
-            seekTo(recoveryPositionMillis);
-            playQueue.unsetRecovery(currentSourceIndex);
-
-        } else if (isSynchronizing && isLive()) {
-            if (DEBUG) Log.d(TAG, "Playback - Synchronizing livestream to default time");
-            // Is still synchronizing?
-            seekToDefault();
-
-        } else if (isSynchronizing && presetStartPositionMillis > 0L) {
+        if (presetStartPositionMillis > 0L) {
+            // Has another start position?
            if (DEBUG) Log.d(TAG, "Playback - Seeking to preset start " +
                    "position=[" + presetStartPositionMillis + "]");
-            // Has another start position?
            seekTo(presetStartPositionMillis);
-            currentInfo.setStartPosition(0);
        }
-
-        isSynchronizing = false;
    }

    /**
     * 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: " +
@@ -707,7 +674,7 @@ public abstract class BasePlayer implements
        setRecovery();

        final Throwable cause = error.getCause();
-        if (cause instanceof BehindLiveWindowException) {
+        if (error instanceof BehindLiveWindowException) {
            reload();
        } else if (cause instanceof UnknownHostException) {
            playQueue.error(/*isNetworkProblem=*/true);
@@ -726,22 +693,29 @@ public abstract class BasePlayer implements
    public void onPositionDiscontinuity(@Player.DiscontinuityReason final int reason) {
        if (DEBUG) Log.d(TAG, "ExoPlayer - onPositionDiscontinuity() called with " +
                "reason = [" + reason + "]");
-        // Refresh the playback if there is a transition to the next video
-        final int newPeriodIndex = simpleExoPlayer.getCurrentPeriodIndex();
+        if (playQueue == null) return;

-        /* Discontinuity reasons!! Thank you ExoPlayer lords */
+        // Refresh the playback if there is a transition to the next video
+        final int newWindowIndex = simpleExoPlayer.getCurrentWindowIndex();
        switch (reason) {
            case DISCONTINUITY_REASON_PERIOD_TRANSITION:
-                if (newPeriodIndex == playQueue.getIndex()) {
+                // When player is in single repeat mode and a period transition occurs,
+                // we need to register a view count here since no metadata has changed
+                if (getRepeatMode() == Player.REPEAT_MODE_ONE &&
+                        newWindowIndex == playQueue.getIndex()) {
                    registerView();
-                } else {
-                    playQueue.offsetIndex(+1);
+                    break;
                }
            case DISCONTINUITY_REASON_SEEK:
            case DISCONTINUITY_REASON_SEEK_ADJUSTMENT:
            case DISCONTINUITY_REASON_INTERNAL:
+                if (playQueue.getIndex() != newWindowIndex) {
+                    playQueue.setIndex(newWindowIndex);
+                }
                break;
        }
+
+        maybeUpdateCurrentMetadata();
    }

    @Override
@@ -787,7 +761,7 @@ public abstract class BasePlayer implements
        if (DEBUG) Log.d(TAG, "Playback - onPlaybackBlock() called");

        currentItem = null;
-        currentInfo = null;
+        currentMetadata = null;
        simpleExoPlayer.stop();
        isPrepared = false;

@@ -804,42 +778,21 @@ public abstract class BasePlayer implements
        simpleExoPlayer.prepare(mediaSource);
    }

-    @Override
-    public void onPlaybackSynchronize(@NonNull final PlayQueueItem item,
-                                      @Nullable final StreamInfo info) {
+    public void onPlaybackSynchronize(@NonNull final PlayQueueItem item) {
        if (DEBUG) Log.d(TAG, "Playback - onPlaybackSynchronize() called with " +
-                (info != null ? "available" : "null") + " info, " +
                "item=[" + item.getTitle() + "], url=[" + item.getUrl() + "]");
        if (simpleExoPlayer == null || playQueue == null) return;

        final boolean onPlaybackInitial = currentItem == null;
        final boolean hasPlayQueueItemChanged = currentItem != item;
-        final boolean hasStreamInfoChanged = currentInfo != info;

        final int currentPlayQueueIndex = playQueue.indexOf(item);
        final int currentPlaylistIndex = simpleExoPlayer.getCurrentWindowIndex();
        final int currentPlaylistSize = simpleExoPlayer.getCurrentTimeline().getWindowCount();

-        // when starting playback on the last item when not repeating, maybe auto queue
-        if (info != null && currentPlayQueueIndex == playQueue.size() - 1 &&
-                getRepeatMode() == Player.REPEAT_MODE_OFF &&
-                PlayerHelper.isAutoQueueEnabled(context)) {
-            final PlayQueue autoQueue = PlayerHelper.autoQueueOf(info, playQueue.getStreams());
-            if (autoQueue != null) playQueue.append(autoQueue.getStreams());
-        }
        // If nothing to synchronize
-        if (!hasPlayQueueItemChanged && !hasStreamInfoChanged) {
-            return;
-        }
-
+        if (!hasPlayQueueItemChanged) return;
        currentItem = item;
-        currentInfo = info;
-        if (hasPlayQueueItemChanged) {
-            // updates only to the stream info should not trigger another view count
-            registerView();
-            initThumbnail(info == null ? item.getThumbnailUrl() : info.getThumbnailUrl());
-        }
-        onMetadataChanged(item, info, currentPlayQueueIndex, hasPlayQueueItemChanged);

        // Check if on wrong window
        if (currentPlayQueueIndex != playQueue.getIndex()) {
@@ -854,39 +807,29 @@ public abstract class BasePlayer implements
                    "index=[" + currentPlayQueueIndex + "] with " +
                    "playlist length=[" + currentPlaylistSize + "]");

-            // If not playing correct stream, change window position and sets flag
-            // for synchronizing once window position is corrected
-            // @see maybeCorrectSeekPosition()
        } else if (currentPlaylistIndex != currentPlayQueueIndex || onPlaybackInitial ||
                !isPlaying()) {
            if (DEBUG) Log.d(TAG, "Playback - Rewinding to correct" +
                    " index=[" + currentPlayQueueIndex + "]," +
                    " from=[" + currentPlaylistIndex + "], size=[" + currentPlaylistSize + "].");
-            isSynchronizing = true;
-            simpleExoPlayer.seekToDefaultPosition(currentPlayQueueIndex);
+
+            if (item.getRecoveryPosition() != PlayQueueItem.RECOVERY_UNSET) {
+                simpleExoPlayer.seekTo(currentPlayQueueIndex, item.getRecoveryPosition());
+                playQueue.unsetRecovery(currentPlayQueueIndex);
+            } else {
+                simpleExoPlayer.seekToDefaultPosition(currentPlayQueueIndex);
+            }
        }
    }

-    abstract protected void onMetadataChanged(@NonNull final PlayQueueItem item,
-                                              @Nullable final StreamInfo info,
-                                              final int newPlayQueueIndex,
-                                              final boolean hasPlayQueueItemChanged);
-
-    @Nullable
-    @Override
-    public MediaSource sourceOf(PlayQueueItem item, StreamInfo info) {
-        final StreamType streamType = info.getStreamType();
-        if (!(streamType == StreamType.AUDIO_LIVE_STREAM || streamType == StreamType.LIVE_STREAM)) {
-            return null;
+    protected void onMetadataChanged(@NonNull final MediaSourceTag tag) {
+        final StreamInfo info = tag.getMetadata();
+        if (DEBUG) {
+            Log.d(TAG, "Playback - onMetadataChanged() called, playing: " + info.getName());
        }

-        if (!info.getHlsUrl().isEmpty()) {
-            return buildLiveMediaSource(info.getHlsUrl(), C.TYPE_HLS);
-        } else if (!info.getDashMpdUrl().isEmpty()) {
-            return buildLiveMediaSource(info.getDashMpdUrl(), C.TYPE_DASH);
-        }
-
-        return null;
+        initThumbnail(info.getThumbnailUrl());
+        registerView();
    }

    @Override
@@ -983,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();
@@ -1019,9 +962,7 @@ public abstract class BasePlayer implements

    public void seekTo(long positionMillis) {
        if (DEBUG) Log.d(TAG, "seekBy() called with: position = [" + positionMillis + "]");
-        if (simpleExoPlayer == null || positionMillis < 0 ||
-                positionMillis > simpleExoPlayer.getDuration()) return;
-        simpleExoPlayer.seekTo(positionMillis);
+        if (simpleExoPlayer != null) simpleExoPlayer.seekTo(positionMillis);
    }

    public void seekBy(long offsetMillis) {
@@ -1045,12 +986,14 @@ public abstract class BasePlayer implements
    //////////////////////////////////////////////////////////////////////////*/

    private void registerView() {
-        if (databaseUpdateReactor == null || currentInfo == null) return;
-        databaseUpdateReactor.add(recordManager.onViewed(currentInfo).onErrorComplete()
+        if (currentMetadata == null) return;
+        final StreamInfo currentInfo = currentMetadata.getMetadata();
+        final Disposable viewRegister = recordManager.onViewed(currentInfo).onErrorComplete()
                .subscribe(
                        ignored -> {/* successful */},
                        error -> Log.e(TAG, "Player onViewed() failure: ", error)
-                ));
+                );
+        databaseUpdateReactor.add(viewRegister);
    }

    protected void reload() {
@@ -1064,7 +1007,7 @@ public abstract class BasePlayer implements
    }

    protected void savePlaybackState(final StreamInfo info, final long progress) {
-        if (info == null || databaseUpdateReactor == null) return;
+        if (info == null) return;
        final Disposable stateSaver = recordManager.saveStreamState(info, progress)
                .observeOn(AndroidSchedulers.mainThread())
                .onErrorComplete()
@@ -1076,7 +1019,8 @@ public abstract class BasePlayer implements
    }

    private void savePlaybackState() {
-        if (simpleExoPlayer == null || currentInfo == null) return;
+        if (simpleExoPlayer == null || currentMetadata == null) return;
+        final StreamInfo currentInfo = currentMetadata.getMetadata();

        if (simpleExoPlayer.getCurrentPosition() > RECOVERY_SKIP_THRESHOLD_MILLIS &&
                simpleExoPlayer.getCurrentPosition() <
@@ -1084,6 +1028,36 @@ public abstract class BasePlayer implements
            savePlaybackState(currentInfo, simpleExoPlayer.getCurrentPosition());
        }
    }
+
+    private void maybeUpdateCurrentMetadata() {
+        if (simpleExoPlayer == null) return;
+
+        final MediaSourceTag metadata;
+        try {
+            metadata = (MediaSourceTag) simpleExoPlayer.getCurrentTag();
+        } catch (IndexOutOfBoundsException | ClassCastException error) {
+            if (DEBUG) Log.d(TAG, "Could not update metadata: " + error.getMessage());
+            if (DEBUG) error.printStackTrace();
+            return;
+        }
+
+        if (metadata == null) return;
+        maybeAutoQueueNextStream(metadata);
+
+        if (currentMetadata == metadata) return;
+        currentMetadata = metadata;
+        onMetadataChanged(metadata);
+    }
+
+    private void maybeAutoQueueNextStream(@NonNull final MediaSourceTag currentMetadata) {
+        if (playQueue == null || playQueue.getIndex() != playQueue.size() - 1 ||
+                getRepeatMode() != Player.REPEAT_MODE_OFF ||
+                !PlayerHelper.isAutoQueueEnabled(context)) return;
+        // auto queue when starting playback on the last item when not repeating
+        final PlayQueue autoQueue = PlayerHelper.autoQueueOf(currentMetadata.getMetadata(),
+                playQueue.getStreams());
+        if (autoQueue != null) playQueue.append(autoQueue.getStreams());
+    }
    /*//////////////////////////////////////////////////////////////////////////
    // Getters and Setters
    //////////////////////////////////////////////////////////////////////////*/
@@ -1100,19 +1074,37 @@ public abstract class BasePlayer implements
        return currentState;
    }

+    @Nullable
+    public MediaSourceTag getCurrentMetadata() {
+        return currentMetadata;
+    }
+
+    @NonNull
    public String getVideoUrl() {
-        return currentItem == null ? context.getString(R.string.unknown_content) : currentItem.getUrl();
+        return currentMetadata == null ? context.getString(R.string.unknown_content) : currentMetadata.getMetadata().getUrl();
    }

+    @NonNull
    public String getVideoTitle() {
-        return currentItem == null ? context.getString(R.string.unknown_content) : currentItem.getTitle();
+        return currentMetadata == null ? context.getString(R.string.unknown_content) : currentMetadata.getMetadata().getName();
    }

+    @NonNull
    public String getUploaderName() {
-        return currentItem == null ? context.getString(R.string.unknown_content) : currentItem.getUploader();
+        return currentMetadata == null ? context.getString(R.string.unknown_content) : currentMetadata.getMetadata().getUploaderName();
    }

-    /** Checks if the current playback is a livestream AND is playing at or beyond the live edge */
+    @Nullable
+    public Bitmap getThumbnail() {
+        return currentThumbnail == null ?
+                BitmapFactory.decodeResource(context.getResources(), R.drawable.dummy_thumbnail) :
+                currentThumbnail;
+    }
+
+    /**
+     * 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;

@@ -1134,11 +1126,15 @@ public abstract class BasePlayer implements
            return simpleExoPlayer.isCurrentWindowDynamic();
        } 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();
            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();
@@ -1146,11 +1142,13 @@ public abstract class BasePlayer implements

    @Player.RepeatMode
    public int getRepeatMode() {
-        return simpleExoPlayer.getRepeatMode();
+        return simpleExoPlayer == null
+                ? Player.REPEAT_MODE_OFF
+                : simpleExoPlayer.getRepeatMode();
    }

    public void setRepeatMode(@Player.RepeatMode final int repeatMode) {
-        simpleExoPlayer.setRepeatMode(repeatMode);
+        if (simpleExoPlayer != null) simpleExoPlayer.setRepeatMode(repeatMode);
    }

    public float getPlaybackSpeed() {
@@ -1161,19 +1159,22 @@ public abstract class BasePlayer implements
        return getPlaybackParameters().pitch;
    }

+    public boolean getPlaybackSkipSilence() {
+        return getPlaybackParameters().skipSilence;
+    }
+
    public void setPlaybackSpeed(float speed) {
-        setPlaybackParameters(speed, getPlaybackPitch());
+        setPlaybackParameters(speed, getPlaybackPitch(), getPlaybackSkipSilence());
    }

    public PlaybackParameters getPlaybackParameters() {
-        final PlaybackParameters defaultParameters = new PlaybackParameters(1f, 1f);
-        if (simpleExoPlayer == null) return defaultParameters;
+        if (simpleExoPlayer == null) return PlaybackParameters.DEFAULT;
        final PlaybackParameters parameters = simpleExoPlayer.getPlaybackParameters();
-        return parameters == null ? defaultParameters : parameters;
+        return parameters == null ? PlaybackParameters.DEFAULT : parameters;
    }

-    public void setPlaybackParameters(float speed, float pitch) {
-        simpleExoPlayer.setPlaybackParameters(new PlaybackParameters(speed, pitch));
+    public void setPlaybackParameters(float speed, float pitch, boolean skipSilence) {
+        simpleExoPlayer.setPlaybackParameters(new PlaybackParameters(speed, pitch, skipSilence));
    }

    public PlayQueue getPlayQueue() {
@@ -1189,7 +1190,7 @@ public abstract class BasePlayer implements
    }

    public boolean isProgressLoopRunning() {
-        return progressUpdateReactor != null && !progressUpdateReactor.isDisposed();
+        return progressUpdateReactor.get() != null;
    }

    public void setRecovery() {
@@ -1209,4 +1210,8 @@ public abstract class BasePlayer implements
        if (DEBUG) Log.d(TAG, "Setting recovery, queue: " + queuePos + ", pos: " + windowPos);
        playQueue.setRecovery(queuePos, windowPos);
    }
+
+    public boolean gotDestroyed() {
+        return simpleExoPlayer == null;
+    }
 }
--- a/app/src/main/java/org/schabi/newpipe/player/MainVideoPlayer.java
+++ b/app/src/main/java/org/schabi/newpipe/player/MainVideoPlayer.java
@@ -25,6 +25,7 @@ import android.content.SharedPreferences;
 import android.content.pm.ActivityInfo;
 import android.content.res.Configuration;
 import android.graphics.Color;
+import android.graphics.drawable.ColorDrawable;
 import android.media.AudioManager;
 import android.os.Build;
 import android.os.Bundle;
@@ -35,6 +36,7 @@ import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v4.app.ActivityCompat;
 import android.support.v7.app.AppCompatActivity;
+import android.support.v7.content.res.AppCompatResources;
 import android.support.v7.widget.RecyclerView;
 import android.support.v7.widget.helper.ItemTouchHelper;
 import android.util.DisplayMetrics;
@@ -45,7 +47,9 @@ import android.view.MotionEvent;
 import android.view.View;
 import android.view.WindowManager;
 import android.widget.ImageButton;
+import android.widget.ImageView;
 import android.widget.PopupMenu;
+import android.widget.ProgressBar;
 import android.widget.RelativeLayout;
 import android.widget.SeekBar;
 import android.widget.TextView;
@@ -57,7 +61,6 @@ import com.google.android.exoplayer2.ui.AspectRatioFrameLayout;
 import com.google.android.exoplayer2.ui.SubtitleView;

 import org.schabi.newpipe.R;
-import org.schabi.newpipe.extractor.stream.StreamInfo;
 import org.schabi.newpipe.extractor.stream.VideoStream;
 import org.schabi.newpipe.fragments.OnScrollBelowItemsListener;
 import org.schabi.newpipe.player.helper.PlaybackParameterDialog;
@@ -66,6 +69,8 @@ import org.schabi.newpipe.player.playqueue.PlayQueueItem;
 import org.schabi.newpipe.player.playqueue.PlayQueueItemBuilder;
 import org.schabi.newpipe.player.playqueue.PlayQueueItemHolder;
 import org.schabi.newpipe.player.playqueue.PlayQueueItemTouchCallback;
+import org.schabi.newpipe.player.resolver.MediaSourceTag;
+import org.schabi.newpipe.player.resolver.VideoPlaybackResolver;
 import org.schabi.newpipe.util.AnimationUtils;
 import org.schabi.newpipe.util.ListHelper;
 import org.schabi.newpipe.util.NavigationHelper;
@@ -80,6 +85,7 @@ import java.util.UUID;
 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.util.AnimationUtils.Type.SCALE_AND_ALPHA;
 import static org.schabi.newpipe.util.AnimationUtils.Type.SLIDE_AND_ALPHA;
 import static org.schabi.newpipe.util.AnimationUtils.animateRotation;
 import static org.schabi.newpipe.util.AnimationUtils.animateView;
@@ -103,6 +109,7 @@ public final class MainVideoPlayer extends AppCompatActivity

    @Nullable private PlayerState playerState;
    private boolean isInMultiWindow;
+    private boolean isBackPressed;

    /*//////////////////////////////////////////////////////////////////////////
    // Activity LifeCycle
@@ -114,12 +121,17 @@ public final class MainVideoPlayer extends AppCompatActivity
        if (DEBUG) Log.d(TAG, "onCreate() called with: savedInstanceState = [" + savedInstanceState + "]");
        defaultPreferences = PreferenceManager.getDefaultSharedPreferences(this);
        ThemeHelper.setTheme(this);
+        getWindow().setBackgroundDrawable(new ColorDrawable(Color.BLACK));
        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) getWindow().setStatusBarColor(Color.BLACK);
        setVolumeControlStream(AudioManager.STREAM_MUSIC);

+        WindowManager.LayoutParams lp = getWindow().getAttributes();
+        lp.screenBrightness = PlayerHelper.getScreenBrightness(getApplicationContext());
+        getWindow().setAttributes(lp);
+
        hideSystemUi();
        setContentView(R.layout.activity_main_player);
-        playerImpl = new VideoPlayerImpl(this);
+        playerImpl = new  VideoPlayerImpl(this);
        playerImpl.setup(findViewById(android.R.id.content));

        if (savedInstanceState != null && savedInstanceState.get(KEY_SAVED_STATE) != null) {
@@ -146,7 +158,10 @@ public final class MainVideoPlayer extends AppCompatActivity
    protected void onNewIntent(Intent intent) {
        if (DEBUG) Log.d(TAG, "onNewIntent() called with: intent = [" + intent + "]");
        super.onNewIntent(intent);
-        playerImpl.handleIntent(intent);
+        if (intent != null) {
+            playerState = null;
+            playerImpl.handleIntent(intent);
+        }
    }

    @Override
@@ -160,6 +175,10 @@ public final class MainVideoPlayer extends AppCompatActivity
            setLandscape(lastOrientationWasLandscape);
        }

+        final int lastResizeMode = defaultPreferences.getInt(
+                getString(R.string.last_resize_mode), AspectRatioFrameLayout.RESIZE_MODE_FIT);
+        playerImpl.setResizeMode(lastResizeMode);
+
        // Upon going in or out of multiwindow mode, isInMultiWindow will always be false,
        // since the first onResume needs to restore the player.
        // Subsequent onResume calls while multiwindow mode remains the same and the player is
@@ -171,7 +190,7 @@ public final class MainVideoPlayer extends AppCompatActivity
            playerImpl.setPlaybackQuality(playerState.getPlaybackQuality());
            playerImpl.initPlayback(playerState.getPlayQueue(), playerState.getRepeatMode(),
                    playerState.getPlaybackSpeed(), playerState.getPlaybackPitch(),
-                    playerState.wasPlaying());
+                    playerState.isPlaybackSkipSilence(), playerState.wasPlaying());
        }
    }

@@ -185,6 +204,12 @@ public final class MainVideoPlayer extends AppCompatActivity
        }
    }

+    @Override
+    public void onBackPressed() {
+        super.onBackPressed();
+        isBackPressed = true;
+    }
+
    @Override
    protected void onSaveInstanceState(Bundle outState) {
        if (DEBUG) Log.d(TAG, "onSaveInstanceState() called");
@@ -192,9 +217,9 @@ public final class MainVideoPlayer extends AppCompatActivity
        if (playerImpl == null) return;

        playerImpl.setRecovery();
-        playerState = new PlayerState(playerImpl.getPlayQueue(), playerImpl.getRepeatMode(),
-                playerImpl.getPlaybackSpeed(), playerImpl.getPlaybackPitch(),
-                playerImpl.getPlaybackQuality(), playerImpl.isPlaying());
+        if(!playerImpl.gotDestroyed()) {
+            playerState = createPlayerState();
+        }
        StateSaver.tryToSave(isChangingConfigurations(), null, outState, this);
    }

@@ -202,13 +227,31 @@ public final class MainVideoPlayer extends AppCompatActivity
    protected void onStop() {
        if (DEBUG) Log.d(TAG, "onStop() called");
        super.onStop();
+        PlayerHelper.setScreenBrightness(getApplicationContext(),
+                getWindow().getAttributes().screenBrightness);
+
+        if (playerImpl == null) return;
+        if (!isBackPressed) {
+            playerImpl.minimize();
+        }
+        playerState = createPlayerState();
        playerImpl.destroy();
+
+        isInMultiWindow = false;
+        isBackPressed = false;
    }

    /*//////////////////////////////////////////////////////////////////////////
    // State Saving
    //////////////////////////////////////////////////////////////////////////*/

+    private PlayerState createPlayerState() {
+        return new PlayerState(playerImpl.getPlayQueue(), playerImpl.getRepeatMode(),
+                playerImpl.getPlaybackSpeed(), playerImpl.getPlaybackPitch(),
+                playerImpl.getPlaybackQuality(), playerImpl.getPlaybackSkipSilence(),
+                playerImpl.isPlaying());
+    }
+
    @Override
    public String generateSuffix() {
        return "." + UUID.randomUUID().toString() + ".player";
@@ -326,18 +369,27 @@ public final class MainVideoPlayer extends AppCompatActivity
    ////////////////////////////////////////////////////////////////////////////

    @Override
-    public void onPlaybackParameterChanged(float playbackTempo, float playbackPitch) {
-        if (playerImpl != null) playerImpl.setPlaybackParameters(playbackTempo, playbackPitch);
+    public void onPlaybackParameterChanged(float playbackTempo, float playbackPitch,
+                                           boolean playbackSkipSilence) {
+        if (playerImpl != null) {
+            playerImpl.setPlaybackParameters(playbackTempo, playbackPitch, playbackSkipSilence);
+        }
    }

    ///////////////////////////////////////////////////////////////////////////

    @SuppressWarnings({"unused", "WeakerAccess"})
    private class VideoPlayerImpl extends VideoPlayer {
+        private final float MAX_GESTURE_LENGTH = 0.75f;
+
        private TextView titleTextView;
        private TextView channelTextView;
-        private TextView volumeTextView;
-        private TextView brightnessTextView;
+        private RelativeLayout volumeRelativeLayout;
+        private ProgressBar volumeProgressBar;
+        private ImageView volumeImageView;
+        private RelativeLayout brightnessRelativeLayout;
+        private ProgressBar brightnessProgressBar;
+        private ImageView brightnessImageView;
        private ImageButton queueButton;
        private ImageButton repeatButton;
        private ImageButton shuffleButton;
@@ -361,6 +413,8 @@ public final class MainVideoPlayer extends AppCompatActivity
        private RelativeLayout windowRootLayout;
        private View secondaryControls;

+        private int maxGestureLength;
+
        VideoPlayerImpl(final Context context) {
            super("VideoPlayerImpl" + MainVideoPlayer.TAG, context);
        }
@@ -370,8 +424,12 @@ public final class MainVideoPlayer extends AppCompatActivity
            super.initViews(rootView);
            this.titleTextView = rootView.findViewById(R.id.titleTextView);
            this.channelTextView = rootView.findViewById(R.id.channelTextView);
-            this.volumeTextView = rootView.findViewById(R.id.volumeTextView);
-            this.brightnessTextView = rootView.findViewById(R.id.brightnessTextView);
+            this.volumeRelativeLayout = rootView.findViewById(R.id.volumeRelativeLayout);
+            this.volumeProgressBar = rootView.findViewById(R.id.volumeProgressBar);
+            this.volumeImageView = rootView.findViewById(R.id.volumeImageView);
+            this.brightnessRelativeLayout = rootView.findViewById(R.id.brightnessRelativeLayout);
+            this.brightnessProgressBar = rootView.findViewById(R.id.brightnessProgressBar);
+            this.brightnessImageView = rootView.findViewById(R.id.brightnessImageView);
            this.queueButton = rootView.findViewById(R.id.queueButton);
            this.repeatButton = rootView.findViewById(R.id.repeatButton);
            this.shuffleButton = rootView.findViewById(R.id.shuffleButton);
@@ -413,7 +471,7 @@ public final class MainVideoPlayer extends AppCompatActivity
        public void initListeners() {
            super.initListeners();

-            MySimpleOnGestureListener listener = new MySimpleOnGestureListener();
+            PlayerGestureListener listener = new PlayerGestureListener();
            gestureDetector = new GestureDetector(context, listener);
            gestureDetector.setIsLongpressEnabled(false);
            getRootView().setOnTouchListener(listener);
@@ -430,6 +488,37 @@ public final class MainVideoPlayer extends AppCompatActivity
            toggleOrientationButton.setOnClickListener(this);
            switchBackgroundButton.setOnClickListener(this);
            switchPopupButton.setOnClickListener(this);
+
+            getRootView().addOnLayoutChangeListener((view, l, t, r, b, ol, ot, or, ob) -> {
+                if (l != ol || t != ot || r != or || b != ob) {
+                    // Use smaller value to be consistent between screen orientations
+                    // (and to make usage easier)
+                    int width = r - l, height = b - t;
+                    maxGestureLength = (int) (Math.min(width, height) * MAX_GESTURE_LENGTH);
+
+                    if (DEBUG) Log.d(TAG, "maxGestureLength = " + maxGestureLength);
+
+                    volumeProgressBar.setMax(maxGestureLength);
+                    brightnessProgressBar.setMax(maxGestureLength);
+
+                    setInitialGestureValues();
+                }
+            });
+        }
+
+        public void minimize() {
+            switch (PlayerHelper.getMinimizeOnExitAction(context)) {
+                case PlayerHelper.MinimizeMode.MINIMIZE_ON_EXIT_MODE_BACKGROUND:
+                    onPlayBackgroundButtonClicked();
+                    break;
+                case PlayerHelper.MinimizeMode.MINIMIZE_ON_EXIT_MODE_POPUP:
+                    onFullScreenButtonClicked();
+                    break;
+                case PlayerHelper.MinimizeMode.MINIMIZE_ON_EXIT_MODE_NONE:
+                default:
+                    // No action
+                    break;
+            }
        }

        /*//////////////////////////////////////////////////////////////////////////
@@ -452,14 +541,11 @@ public final class MainVideoPlayer extends AppCompatActivity
        // Playback Listener
        //////////////////////////////////////////////////////////////////////////*/

-        protected void onMetadataChanged(@NonNull final PlayQueueItem item,
-                                         @Nullable final StreamInfo info,
-                                         final int newPlayQueueIndex,
-                                         final boolean hasPlayQueueItemChanged) {
-            super.onMetadataChanged(item, info, newPlayQueueIndex, false);
+        protected void onMetadataChanged(@NonNull final MediaSourceTag tag) {
+            super.onMetadataChanged(tag);

-            titleTextView.setText(getVideoTitle());
-            channelTextView.setText(getUploaderName());
+            titleTextView.setText(tag.getMetadata().getName());
+            channelTextView.setText(tag.getMetadata().getUploaderName());
        }

        @Override
@@ -492,6 +578,7 @@ public final class MainVideoPlayer extends AppCompatActivity
                    this.getRepeatMode(),
                    this.getPlaybackSpeed(),
                    this.getPlaybackPitch(),
+                    this.getPlaybackSkipSilence(),
                    this.getPlaybackQuality()
            );
            context.startService(intent);
@@ -513,6 +600,7 @@ public final class MainVideoPlayer extends AppCompatActivity
                    this.getRepeatMode(),
                    this.getPlaybackSpeed(),
                    this.getPlaybackPitch(),
+                    this.getPlaybackSkipSilence(),
                    this.getPlaybackQuality()
            );
            context.startService(intent);
@@ -608,7 +696,8 @@ public final class MainVideoPlayer extends AppCompatActivity

        @Override
        public void onPlaybackSpeedClicked() {
-            PlaybackParameterDialog.newInstance(getPlaybackSpeed(), getPlaybackPitch())
+            PlaybackParameterDialog
+                    .newInstance(getPlaybackSpeed(), getPlaybackPitch(), getPlaybackSkipSilence())
                    .show(getSupportFragmentManager(), TAG);
        }

@@ -627,25 +716,43 @@ public final class MainVideoPlayer extends AppCompatActivity

        @Override
        protected int nextResizeMode(int currentResizeMode) {
+            final int newResizeMode;
            switch (currentResizeMode) {
                case AspectRatioFrameLayout.RESIZE_MODE_FIT:
-                    return AspectRatioFrameLayout.RESIZE_MODE_FILL;
+                    newResizeMode = AspectRatioFrameLayout.RESIZE_MODE_FILL;
+                    break;
                case AspectRatioFrameLayout.RESIZE_MODE_FILL:
-                    return AspectRatioFrameLayout.RESIZE_MODE_ZOOM;
+                    newResizeMode = AspectRatioFrameLayout.RESIZE_MODE_ZOOM;
+                    break;
                default:
-                    return AspectRatioFrameLayout.RESIZE_MODE_FIT;
+                    newResizeMode = AspectRatioFrameLayout.RESIZE_MODE_FIT;
+                    break;
            }
+
+            storeResizeMode(newResizeMode);
+            return newResizeMode;
+        }
+
+        private void storeResizeMode(@AspectRatioFrameLayout.ResizeMode int resizeMode) {
+            defaultPreferences.edit()
+                    .putInt(getString(R.string.last_resize_mode), resizeMode)
+                    .apply();
        }

        @Override
-        protected int getDefaultResolutionIndex(final List<VideoStream> sortedVideos) {
-            return ListHelper.getDefaultResolutionIndex(context, sortedVideos);
-        }
+        protected VideoPlaybackResolver.QualityResolver getQualityResolver() {
+            return new VideoPlaybackResolver.QualityResolver() {
+                @Override
+                public int getDefaultResolutionIndex(List<VideoStream> sortedVideos) {
+                    return ListHelper.getDefaultResolutionIndex(context, sortedVideos);
+                }

-        @Override
-        protected int getOverrideResolutionIndex(final List<VideoStream> sortedVideos,
-                                                 final String playbackQuality) {
-            return ListHelper.getDefaultResolutionIndex(context, sortedVideos, playbackQuality);
+                @Override
+                public int getOverrideResolutionIndex(List<VideoStream> sortedVideos,
+                                                      String playbackQuality) {
+                    return ListHelper.getResolutionIndex(context, sortedVideos, playbackQuality);
+                }
+            };
        }

        /*//////////////////////////////////////////////////////////////////////////
@@ -669,7 +776,6 @@ public final class MainVideoPlayer extends AppCompatActivity
        @Override
        public void onBuffering() {
            super.onBuffering();
-            animatePlayButtons(false, 100);
            getRootView().setKeepScreenOn(true);
        }

@@ -719,6 +825,13 @@ public final class MainVideoPlayer extends AppCompatActivity
        // Utils
        //////////////////////////////////////////////////////////////////////////*/

+        private void setInitialGestureValues() {
+            if (getAudioReactor() != null) {
+                final float currentVolumeNormalized = (float) getAudioReactor().getVolume() / getAudioReactor().getMaxVolume();
+                volumeProgressBar.setProgress((int) (volumeProgressBar.getMax() * currentVolumeNormalized));
+            }
+        }
+
        @Override
        public void showControlsThenHide() {
            if (queueVisible) return;
@@ -787,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);
+                }
            };
        }

@@ -822,12 +940,28 @@ public final class MainVideoPlayer extends AppCompatActivity
            return channelTextView;
        }

-        public TextView getVolumeTextView() {
-            return volumeTextView;
+        public RelativeLayout getVolumeRelativeLayout() {
+            return volumeRelativeLayout;
        }

-        public TextView getBrightnessTextView() {
-            return brightnessTextView;
+        public ProgressBar getVolumeProgressBar() {
+            return volumeProgressBar;
+        }
+
+        public ImageView getVolumeImageView() {
+            return volumeImageView;
+        }
+
+        public RelativeLayout getBrightnessRelativeLayout() {
+            return brightnessRelativeLayout;
+        }
+
+        public ProgressBar getBrightnessProgressBar() {
+            return brightnessProgressBar;
+        }
+
+        public ImageView getBrightnessImageView() {
+            return brightnessImageView;
        }

        public ImageButton getRepeatButton() {
@@ -837,15 +971,18 @@ public final class MainVideoPlayer extends AppCompatActivity
        public ImageButton getPlayPauseButton() {
            return playPauseButton;
        }
+
+        public int getMaxGestureLength() {
+            return maxGestureLength;
+        }
    }

-    private class MySimpleOnGestureListener extends GestureDetector.SimpleOnGestureListener implements View.OnTouchListener {
+    private class PlayerGestureListener extends GestureDetector.SimpleOnGestureListener implements View.OnTouchListener {
        private boolean isMoving;

        @Override
        public boolean onDoubleTap(MotionEvent e) {
            if (DEBUG) Log.d(TAG, "onDoubleTap() called with: e = [" + e + "]" + "rawXy = " + e.getRawX() + ", " + e.getRawY() + ", xy = " + e.getX() + ", " + e.getY());
-            if (!playerImpl.isPlaying()) return false;

            if (e.getX() > playerImpl.getRootView().getWidth() * 2 / 3) {
                playerImpl.onFastForward();
@@ -879,89 +1016,97 @@ public final class MainVideoPlayer extends AppCompatActivity
            return super.onDown(e);
        }

-        private final boolean isPlayerGestureEnabled = PlayerHelper.isPlayerGestureEnabled(getApplicationContext());
+        private static final int MOVEMENT_THRESHOLD = 40;

-        private final float stepsBrightness = 15, stepBrightness = (1f / stepsBrightness), minBrightness = .01f;
-        private float currentBrightness = .5f;
+        private final boolean isVolumeGestureEnabled = PlayerHelper.isVolumeGestureEnabled(getApplicationContext());
+        private final boolean isBrightnessGestureEnabled = PlayerHelper.isBrightnessGestureEnabled(getApplicationContext());

-        private int currentVolume, maxVolume = playerImpl.getAudioReactor().getMaxVolume();
-        private final float stepsVolume = 15, stepVolume = (float) Math.ceil(maxVolume / stepsVolume), minVolume = 0;
+        private final int maxVolume = playerImpl.getAudioReactor().getMaxVolume();

-        private final String brightnessUnicode = new String(Character.toChars(0x2600));
-        private final String volumeUnicode = new String(Character.toChars(0x1F508));
-
-        private final int MOVEMENT_THRESHOLD = 40;
-        private final int eventsThreshold = 8;
-        private boolean triggered = false;
-        private int eventsNum;
-
-        // TODO: Improve video gesture controls
        @Override
-        public boolean onScroll(MotionEvent e1, MotionEvent e2, float distanceX, float distanceY) {
-            if (!isPlayerGestureEnabled) return false;
+        public boolean onScroll(MotionEvent initialEvent, MotionEvent movingEvent, float distanceX, float distanceY) {
+            if (!isVolumeGestureEnabled && !isBrightnessGestureEnabled) return false;

            //noinspection PointlessBooleanExpression
            if (DEBUG && false) Log.d(TAG, "MainVideoPlayer.onScroll = " +
-                    ", e1.getRaw = [" + e1.getRawX() + ", " + e1.getRawY() + "]" +
-                    ", e2.getRaw = [" + e2.getRawX() + ", " + e2.getRawY() + "]" +
+                    ", e1.getRaw = [" + initialEvent.getRawX() + ", " + initialEvent.getRawY() + "]" +
+                    ", e2.getRaw = [" + movingEvent.getRawX() + ", " + movingEvent.getRawY() + "]" +
                    ", distanceXy = [" + distanceX + ", " + distanceY + "]");
-            float abs = Math.abs(e2.getY() - e1.getY());
-            if (!triggered) {
-                triggered = abs > MOVEMENT_THRESHOLD;
+
+            final boolean insideThreshold = Math.abs(movingEvent.getY() - initialEvent.getY()) <= MOVEMENT_THRESHOLD;
+            if (!isMoving && (insideThreshold || Math.abs(distanceX) > Math.abs(distanceY))
+                    || playerImpl.getCurrentState() == BasePlayer.STATE_COMPLETED) {
                return false;
            }

-            if (eventsNum++ % eventsThreshold != 0 || playerImpl.getCurrentState() == BasePlayer.STATE_COMPLETED) return false;
            isMoving = true;
-//            boolean up = !((e2.getY() - e1.getY()) > 0) && distanceY > 0; // Android's origin point is on top
-            boolean up = distanceY > 0;

+            boolean acceptAnyArea = isVolumeGestureEnabled != isBrightnessGestureEnabled;
+            boolean acceptVolumeArea = acceptAnyArea || initialEvent.getX() > playerImpl.getRootView().getWidth() / 2;
+            boolean acceptBrightnessArea = acceptAnyArea || !acceptVolumeArea;

-            if (e1.getX() > playerImpl.getRootView().getWidth() / 2) {
-                double floor = Math.floor(up ? stepVolume : -stepVolume);
-                currentVolume = (int) (playerImpl.getAudioReactor().getVolume() + floor);
-                if (currentVolume >= maxVolume) currentVolume = maxVolume;
-                if (currentVolume <= minVolume) currentVolume = (int) minVolume;
+            if (isVolumeGestureEnabled && acceptVolumeArea) {
+                playerImpl.getVolumeProgressBar().incrementProgressBy((int) distanceY);
+                float currentProgressPercent =
+                        (float) playerImpl.getVolumeProgressBar().getProgress() / playerImpl.getMaxGestureLength();
+                int currentVolume = (int) (maxVolume * currentProgressPercent);
                playerImpl.getAudioReactor().setVolume(currentVolume);

-                currentVolume = playerImpl.getAudioReactor().getVolume();
                if (DEBUG) Log.d(TAG, "onScroll().volumeControl, currentVolume = " + currentVolume);
-                final String volumeText = volumeUnicode + " " + Math.round((((float) currentVolume) / maxVolume) * 100) + "%";
-                playerImpl.getVolumeTextView().setText(volumeText);

-                if (playerImpl.getVolumeTextView().getVisibility() != View.VISIBLE) animateView(playerImpl.getVolumeTextView(), true, 200);
-                if (playerImpl.getBrightnessTextView().getVisibility() == View.VISIBLE) playerImpl.getBrightnessTextView().setVisibility(View.GONE);
-            } else {
-                WindowManager.LayoutParams lp = getWindow().getAttributes();
-                currentBrightness += up ? stepBrightness : -stepBrightness;
-                if (currentBrightness >= 1f) currentBrightness = 1f;
-                if (currentBrightness <= minBrightness) currentBrightness = minBrightness;
+                final int resId =
+                        currentProgressPercent <= 0 ? R.drawable.ic_volume_off_white_72dp
+                        : currentProgressPercent < 0.25 ? R.drawable.ic_volume_mute_white_72dp
+                        : currentProgressPercent < 0.75 ? R.drawable.ic_volume_down_white_72dp
+                        : R.drawable.ic_volume_up_white_72dp;

-                lp.screenBrightness = currentBrightness;
-                getWindow().setAttributes(lp);
-                if (DEBUG) Log.d(TAG, "onScroll().brightnessControl, currentBrightness = " + currentBrightness);
-                int brightnessNormalized = Math.round(currentBrightness * 100);
+                playerImpl.getVolumeImageView().setImageDrawable(
+                        AppCompatResources.getDrawable(getApplicationContext(), resId)
+                );

-                final String brightnessText = brightnessUnicode + " " + (brightnessNormalized == 1 ? 0 : brightnessNormalized) + "%";
-                playerImpl.getBrightnessTextView().setText(brightnessText);
+                if (playerImpl.getVolumeRelativeLayout().getVisibility() != View.VISIBLE) {
+                    animateView(playerImpl.getVolumeRelativeLayout(), SCALE_AND_ALPHA, true, 200);
+                }
+                if (playerImpl.getBrightnessRelativeLayout().getVisibility() == View.VISIBLE) {
+                    playerImpl.getBrightnessRelativeLayout().setVisibility(View.GONE);
+                }
+            } else if (isBrightnessGestureEnabled && acceptBrightnessArea) {
+                playerImpl.getBrightnessProgressBar().incrementProgressBy((int) distanceY);
+                float currentProgressPercent =
+                        (float) playerImpl.getBrightnessProgressBar().getProgress() / playerImpl.getMaxGestureLength();
+                WindowManager.LayoutParams layoutParams = getWindow().getAttributes();
+                layoutParams.screenBrightness = currentProgressPercent;
+                getWindow().setAttributes(layoutParams);

-                if (playerImpl.getBrightnessTextView().getVisibility() != View.VISIBLE) animateView(playerImpl.getBrightnessTextView(), true, 200);
-                if (playerImpl.getVolumeTextView().getVisibility() == View.VISIBLE) playerImpl.getVolumeTextView().setVisibility(View.GONE);
+                if (DEBUG) Log.d(TAG, "onScroll().brightnessControl, currentBrightness = " + currentProgressPercent);
+
+                final int resId =
+                        currentProgressPercent < 0.25 ? R.drawable.ic_brightness_low_white_72dp
+                        : currentProgressPercent < 0.75 ? R.drawable.ic_brightness_medium_white_72dp
+                        : R.drawable.ic_brightness_high_white_72dp;
+
+                playerImpl.getBrightnessImageView().setImageDrawable(
+                        AppCompatResources.getDrawable(getApplicationContext(), resId)
+                );
+
+                if (playerImpl.getBrightnessRelativeLayout().getVisibility() != View.VISIBLE) {
+                    animateView(playerImpl.getBrightnessRelativeLayout(), SCALE_AND_ALPHA, true, 200);
+                }
+                if (playerImpl.getVolumeRelativeLayout().getVisibility() == View.VISIBLE) {
+                    playerImpl.getVolumeRelativeLayout().setVisibility(View.GONE);
+                }
            }
            return true;
        }

        private void onScrollEnd() {
            if (DEBUG) Log.d(TAG, "onScrollEnd() called");
-            triggered = false;
-            eventsNum = 0;
-            /* if (playerImpl.getVolumeTextView().getVisibility() == View.VISIBLE) playerImpl.getVolumeTextView().setVisibility(View.GONE);
-            if (playerImpl.getBrightnessTextView().getVisibility() == View.VISIBLE) playerImpl.getBrightnessTextView().setVisibility(View.GONE);*/
-            if (playerImpl.getVolumeTextView().getVisibility() == View.VISIBLE) {
-                animateView(playerImpl.getVolumeTextView(), false, 200, 200);
+
+            if (playerImpl.getVolumeRelativeLayout().getVisibility() == View.VISIBLE) {
+                animateView(playerImpl.getVolumeRelativeLayout(), SCALE_AND_ALPHA, false, 200, 200);
            }
-            if (playerImpl.getBrightnessTextView().getVisibility() == View.VISIBLE) {
-                animateView(playerImpl.getBrightnessTextView(), false, 200, 200);
+            if (playerImpl.getBrightnessRelativeLayout().getVisibility() == View.VISIBLE) {
+                animateView(playerImpl.getBrightnessRelativeLayout(), SCALE_AND_ALPHA, false, 200, 200);
            }

            if (playerImpl.isControlsVisible() && playerImpl.getCurrentState() == STATE_PLAYING) {
--- a/app/src/main/java/org/schabi/newpipe/player/PlayerState.java
+++ b/app/src/main/java/org/schabi/newpipe/player/PlayerState.java
@@ -14,21 +14,26 @@ public class PlayerState implements Serializable {
    private final float playbackSpeed;
    private final float playbackPitch;
    @Nullable private final String playbackQuality;
+    private final boolean playbackSkipSilence;
    private final boolean wasPlaying;

    PlayerState(@NonNull final PlayQueue playQueue, final int repeatMode,
-                 final float playbackSpeed, final float playbackPitch, final boolean wasPlaying) {
-        this(playQueue, repeatMode, playbackSpeed, playbackPitch, null, wasPlaying);
+                final float playbackSpeed, final float playbackPitch,
+                final boolean playbackSkipSilence, final boolean wasPlaying) {
+        this(playQueue, repeatMode, playbackSpeed, playbackPitch, null,
+                playbackSkipSilence, wasPlaying);
    }

    PlayerState(@NonNull final PlayQueue playQueue, final int repeatMode,
                final float playbackSpeed, final float playbackPitch,
-                @Nullable final String playbackQuality, final boolean wasPlaying) {
+                @Nullable final String playbackQuality, final boolean playbackSkipSilence,
+                final boolean wasPlaying) {
        this.playQueue = playQueue;
        this.repeatMode = repeatMode;
        this.playbackSpeed = playbackSpeed;
        this.playbackPitch = playbackPitch;
        this.playbackQuality = playbackQuality;
+        this.playbackSkipSilence = playbackSkipSilence;
        this.wasPlaying = wasPlaying;
    }

@@ -62,6 +67,10 @@ public class PlayerState implements Serializable {
        return playbackQuality;
    }

+    public boolean isPlaybackSkipSilence() {
+        return playbackSkipSilence;
+    }
+
    public boolean wasPlaying() {
        return wasPlaying;
    }
--- a/app/src/main/java/org/schabi/newpipe/player/PopupVideoPlayer.java
+++ b/app/src/main/java/org/schabi/newpipe/player/PopupVideoPlayer.java
@@ -19,6 +19,8 @@

 package org.schabi.newpipe.player;

+import android.animation.Animator;
+import android.animation.AnimatorListenerAdapter;
 import android.annotation.SuppressLint;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
@@ -34,7 +36,7 @@ import android.os.Build;
 import android.os.IBinder;
 import android.preference.PreferenceManager;
 import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import android.support.design.widget.FloatingActionButton;
 import android.support.v4.app.NotificationCompat;
 import android.util.DisplayMetrics;
 import android.util.Log;
@@ -42,7 +44,9 @@ import android.view.GestureDetector;
 import android.view.Gravity;
 import android.view.MotionEvent;
 import android.view.View;
+import android.view.ViewGroup;
 import android.view.WindowManager;
+import android.view.animation.AnticipateInterpolator;
 import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.PopupMenu;
@@ -56,16 +60,16 @@ import com.google.android.exoplayer2.Player;
 import com.google.android.exoplayer2.text.CaptionStyleCompat;
 import com.google.android.exoplayer2.ui.AspectRatioFrameLayout;
 import com.google.android.exoplayer2.ui.SubtitleView;
+import com.nostra13.universalimageloader.core.assist.FailReason;

 import org.schabi.newpipe.BuildConfig;
 import org.schabi.newpipe.R;
-import org.schabi.newpipe.extractor.stream.StreamInfo;
 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.playqueue.PlayQueueItem;
+import org.schabi.newpipe.player.resolver.MediaSourceTag;
+import org.schabi.newpipe.player.resolver.VideoPlaybackResolver;
 import org.schabi.newpipe.util.ListHelper;
 import org.schabi.newpipe.util.NavigationHelper;
 import org.schabi.newpipe.util.ThemeHelper;
@@ -75,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;

 /**
@@ -98,11 +101,18 @@ public final class PopupVideoPlayer extends Service {

    private static final int MINIMUM_SHOW_EXTRA_WIDTH_DP = 300;

-    private WindowManager windowManager;
-    private WindowManager.LayoutParams windowLayoutParams;
-    private GestureDetector gestureDetector;
+    private static final int IDLE_WINDOW_FLAGS = WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE |
+            WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM;
+    private static final int ONGOING_PLAYBACK_WINDOW_FLAGS = IDLE_WINDOW_FLAGS |
+            WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON;
+
+    private WindowManager windowManager;
+    private WindowManager.LayoutParams popupLayoutParams;
+    private GestureDetector popupGestureDetector;
+
+    private View closeOverlayView;
+    private FloatingActionButton closeOverlayButton;

-    private int shutdownFlingVelocity;
    private int tossFlingVelocity;

    private float screenWidth, screenHeight;
@@ -117,6 +127,7 @@ public final class PopupVideoPlayer extends Service {

    private VideoPlayerImpl playerImpl;
    private LockManager lockManager;
+    private boolean isPopupClosing = false;

    /*//////////////////////////////////////////////////////////////////////////
    // Service-Activity Binder
@@ -145,7 +156,10 @@ public final class PopupVideoPlayer extends Service {
    public int onStartCommand(final Intent intent, int flags, int startId) {
        if (DEBUG)
            Log.d(TAG, "onStartCommand() called with: intent = [" + intent + "], flags = [" + flags + "], startId = [" + startId + "]");
-        if (playerImpl.getPlayer() == null) initPopup();
+        if (playerImpl.getPlayer() == null) {
+            initPopup();
+            initPopupCloseOverlay();
+        }
        if (!playerImpl.isPlaying()) playerImpl.getPlayer().setPlayWhenReady(true);

        playerImpl.handleIntent(intent);
@@ -155,15 +169,16 @@ public final class PopupVideoPlayer extends Service {

    @Override
    public void onConfigurationChanged(Configuration newConfig) {
+        if (DEBUG) Log.d(TAG, "onConfigurationChanged() called with: newConfig = [" + newConfig + "]");
        updateScreenSize();
-        updatePopupSize(windowLayoutParams.width, -1);
-        checkPositionBounds();
+        updatePopupSize(popupLayoutParams.width, -1);
+        checkPopupPositionBounds();
    }

    @Override
    public void onDestroy() {
        if (DEBUG) Log.d(TAG, "onDestroy() called");
-        onClose();
+        closePopup();
    }

    @Override
@@ -181,7 +196,6 @@ public final class PopupVideoPlayer extends Service {
        View rootView = View.inflate(this, R.layout.player_popup, null);
        playerImpl.setup(rootView);

-        shutdownFlingVelocity = PlayerHelper.getShutdownFlingVelocity(this);
        tossFlingVelocity = PlayerHelper.getTossFlingVelocity(this);

        updateScreenSize();
@@ -191,28 +205,56 @@ public final class PopupVideoPlayer extends Service {
        SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this);
        popupWidth = popupRememberSizeAndPos ? sharedPreferences.getFloat(POPUP_SAVED_WIDTH, defaultSize) : defaultSize;

-        final int layoutParamType = Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.O ? WindowManager.LayoutParams.TYPE_PHONE : WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY;
+        final int layoutParamType = Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.O ?
+                WindowManager.LayoutParams.TYPE_PHONE :
+                WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY;

-        windowLayoutParams = new WindowManager.LayoutParams(
+        popupLayoutParams = new WindowManager.LayoutParams(
                (int) popupWidth, (int) getMinimumVideoHeight(popupWidth),
                layoutParamType,
-                WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE,
+                IDLE_WINDOW_FLAGS,
                PixelFormat.TRANSLUCENT);
-        windowLayoutParams.gravity = Gravity.LEFT | Gravity.TOP;
+        popupLayoutParams.gravity = Gravity.LEFT | Gravity.TOP;
+        popupLayoutParams.softInputMode = WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE;

        int centerX = (int) (screenWidth / 2f - popupWidth / 2f);
        int centerY = (int) (screenHeight / 2f - popupHeight / 2f);
-        windowLayoutParams.x = popupRememberSizeAndPos ? sharedPreferences.getInt(POPUP_SAVED_X, centerX) : centerX;
-        windowLayoutParams.y = popupRememberSizeAndPos ? sharedPreferences.getInt(POPUP_SAVED_Y, centerY) : centerY;
+        popupLayoutParams.x = popupRememberSizeAndPos ? sharedPreferences.getInt(POPUP_SAVED_X, centerX) : centerX;
+        popupLayoutParams.y = popupRememberSizeAndPos ? sharedPreferences.getInt(POPUP_SAVED_Y, centerY) : centerY;

-        checkPositionBounds();
+        checkPopupPositionBounds();

-        MySimpleOnGestureListener listener = new MySimpleOnGestureListener();
-        gestureDetector = new GestureDetector(this, listener);
+        PopupWindowGestureListener listener = new PopupWindowGestureListener();
+        popupGestureDetector = new GestureDetector(this, listener);
        rootView.setOnTouchListener(listener);
-        playerImpl.getLoadingPanel().setMinimumWidth(windowLayoutParams.width);
-        playerImpl.getLoadingPanel().setMinimumHeight(windowLayoutParams.height);
-        windowManager.addView(rootView, windowLayoutParams);
+
+        playerImpl.getLoadingPanel().setMinimumWidth(popupLayoutParams.width);
+        playerImpl.getLoadingPanel().setMinimumHeight(popupLayoutParams.height);
+        windowManager.addView(rootView, popupLayoutParams);
+    }
+
+    @SuppressLint("RtlHardcoded")
+    private void initPopupCloseOverlay() {
+        if (DEBUG) Log.d(TAG, "initPopupCloseOverlay() called");
+        closeOverlayView = View.inflate(this, R.layout.player_popup_close_overlay, null);
+        closeOverlayButton = closeOverlayView.findViewById(R.id.closeButton);
+
+        final int layoutParamType = Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.O ?
+                WindowManager.LayoutParams.TYPE_PHONE :
+                WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY;
+        final int flags = WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE | WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE
+                | WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM;
+
+        WindowManager.LayoutParams closeOverlayLayoutParams = new WindowManager.LayoutParams(
+                ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT,
+                layoutParamType,
+                flags,
+                PixelFormat.TRANSLUCENT);
+        closeOverlayLayoutParams.gravity = Gravity.LEFT | Gravity.TOP;
+        closeOverlayLayoutParams.softInputMode = WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE;
+
+        closeOverlayButton.setVisibility(View.GONE);
+        windowManager.addView(closeOverlayView, closeOverlayLayoutParams);
    }

    /*//////////////////////////////////////////////////////////////////////////
@@ -228,6 +270,7 @@ public final class PopupVideoPlayer extends Service {

        notRemoteView.setTextViewText(R.id.notificationSongName, playerImpl.getVideoTitle());
        notRemoteView.setTextViewText(R.id.notificationArtist, playerImpl.getUploaderName());
+        notRemoteView.setImageViewBitmap(R.id.notificationCover, playerImpl.getThumbnail());

        notRemoteView.setOnClickPendingIntent(R.id.notificationPlayPause,
                PendingIntent.getBroadcast(this, NOTIFICATION_ID, new Intent(ACTION_PLAY_PAUSE), PendingIntent.FLAG_UPDATE_CURRENT));
@@ -243,11 +286,15 @@ public final class PopupVideoPlayer extends Service {

        setRepeatModeRemote(notRemoteView, playerImpl.getRepeatMode());

-        return new NotificationCompat.Builder(this, getString(R.string.notification_channel_id))
+        NotificationCompat.Builder builder = new NotificationCompat.Builder(this, getString(R.string.notification_channel_id))
                .setOngoing(true)
                .setSmallIcon(R.drawable.ic_newpipe_triangle_white)
                .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
                .setContent(notRemoteView);
+        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.JELLY_BEAN) {
+            builder.setPriority(NotificationCompat.PRIORITY_MAX);
+        }
+        return builder;
    }

    /**
@@ -267,44 +314,105 @@ public final class PopupVideoPlayer extends Service {
    // Misc
    //////////////////////////////////////////////////////////////////////////*/

-    public void onClose() {
-        if (DEBUG) Log.d(TAG, "onClose() called");
+    public void closePopup() {
+        if (DEBUG) Log.d(TAG, "closePopup() called, isPopupClosing = " + isPopupClosing);
+        if (isPopupClosing) return;
+        isPopupClosing = true;

        if (playerImpl != null) {
            if (playerImpl.getRootView() != null) {
                windowManager.removeView(playerImpl.getRootView());
-                playerImpl.setRootView(null);
            }
+            playerImpl.setRootView(null);
            playerImpl.stopActivityBinding();
            playerImpl.destroy();
+            playerImpl = null;
        }
+
+        mBinder = null;
        if (lockManager != null) lockManager.releaseWifiAndCpu();
        if (notificationManager != null) notificationManager.cancel(NOTIFICATION_ID);
-        mBinder = null;
-        playerImpl = null;

-        stopForeground(true);
-        stopSelf();
+        animateOverlayAndFinishService();
+    }
+
+    private void animateOverlayAndFinishService() {
+        final int targetTranslationY = (int) (closeOverlayButton.getRootView().getHeight() - closeOverlayButton.getY());
+
+        closeOverlayButton.animate().setListener(null).cancel();
+        closeOverlayButton.animate()
+                .setInterpolator(new AnticipateInterpolator())
+                .translationY(targetTranslationY)
+                .setDuration(400)
+                .setListener(new AnimatorListenerAdapter() {
+                    @Override
+                    public void onAnimationCancel(Animator animation) {
+                        end();
+                    }
+
+                    @Override
+                    public void onAnimationEnd(Animator animation) {
+                        end();
+                    }
+
+                    private void end() {
+                        windowManager.removeView(closeOverlayView);
+
+                        stopForeground(true);
+                        stopSelf();
+                    }
+                }).start();
    }

    /*//////////////////////////////////////////////////////////////////////////
    // Utils
    //////////////////////////////////////////////////////////////////////////*/

-    private void checkPositionBounds() {
-        if (windowLayoutParams.x > screenWidth - windowLayoutParams.width)
-            windowLayoutParams.x = (int) (screenWidth - windowLayoutParams.width);
-        if (windowLayoutParams.x < 0) windowLayoutParams.x = 0;
-        if (windowLayoutParams.y > screenHeight - windowLayoutParams.height)
-            windowLayoutParams.y = (int) (screenHeight - windowLayoutParams.height);
-        if (windowLayoutParams.y < 0) windowLayoutParams.y = 0;
+    /**
+     * @see #checkPopupPositionBounds(float, float)
+     */
+    @SuppressWarnings("UnusedReturnValue")
+    private boolean checkPopupPositionBounds() {
+        return checkPopupPositionBounds(screenWidth, screenHeight);
+    }
+
+    /**
+     * Check if {@link #popupLayoutParams}' position is within a arbitrary boundary that goes from (0,0) to (boundaryWidth,boundaryHeight).
+     * <p>
+     * If it's out of these boundaries, {@link #popupLayoutParams}' position is changed and {@code true} is returned
+     * to represent this change.
+     *
+     * @return if the popup was out of bounds and have been moved back to it
+     */
+    private boolean checkPopupPositionBounds(final float boundaryWidth, final float boundaryHeight) {
+        if (DEBUG) {
+            Log.d(TAG, "checkPopupPositionBounds() called with: boundaryWidth = [" + boundaryWidth + "], boundaryHeight = [" + boundaryHeight + "]");
+        }
+
+        if (popupLayoutParams.x < 0) {
+            popupLayoutParams.x = 0;
+            return true;
+        } else if (popupLayoutParams.x > boundaryWidth - popupLayoutParams.width) {
+            popupLayoutParams.x = (int) (boundaryWidth - popupLayoutParams.width);
+            return true;
+        }
+
+        if (popupLayoutParams.y < 0) {
+            popupLayoutParams.y = 0;
+            return true;
+        } else if (popupLayoutParams.y > boundaryHeight - popupLayoutParams.height) {
+            popupLayoutParams.y = (int) (boundaryHeight - popupLayoutParams.height);
+            return true;
+        }
+
+        return false;
    }

    private void savePositionAndSize() {
        SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(PopupVideoPlayer.this);
-        sharedPreferences.edit().putInt(POPUP_SAVED_X, windowLayoutParams.x).apply();
-        sharedPreferences.edit().putInt(POPUP_SAVED_Y, windowLayoutParams.y).apply();
-        sharedPreferences.edit().putFloat(POPUP_SAVED_WIDTH, windowLayoutParams.width).apply();
+        sharedPreferences.edit().putInt(POPUP_SAVED_X, popupLayoutParams.x).apply();
+        sharedPreferences.edit().putInt(POPUP_SAVED_Y, popupLayoutParams.y).apply();
+        sharedPreferences.edit().putFloat(POPUP_SAVED_WIDTH, popupLayoutParams.width).apply();
    }

    private float getMinimumVideoHeight(float width) {
@@ -339,13 +447,13 @@ public final class PopupVideoPlayer extends Service {
        if (height == -1) height = (int) getMinimumVideoHeight(width);
        else height = (int) (height > maximumHeight ? maximumHeight : height < minimumHeight ? minimumHeight : height);

-        windowLayoutParams.width = width;
-        windowLayoutParams.height = height;
+        popupLayoutParams.width = width;
+        popupLayoutParams.height = height;
        popupWidth = width;
        popupHeight = height;

        if (DEBUG) Log.d(TAG, "updatePopupSize() updated values:  width = [" + width + "], height = [" + height + "]");
-        windowManager.updateViewLayout(playerImpl.getRootView(), windowLayoutParams);
+        windowManager.updateViewLayout(playerImpl.getRootView(), popupLayoutParams);
    }

    protected void setRepeatModeRemote(final RemoteViews remoteViews, final int repeatMode) {
@@ -366,6 +474,12 @@ public final class PopupVideoPlayer extends Service {
        }
    }

+    private void updateWindowFlags(final int flags) {
+        if (popupLayoutParams == null || windowManager == null || playerImpl == null) return;
+
+        popupLayoutParams.flags = flags;
+        windowManager.updateViewLayout(playerImpl.getRootView(), popupLayoutParams);
+    }
    ///////////////////////////////////////////////////////////////////////////

    protected class VideoPlayerImpl extends VideoPlayer implements View.OnLayoutChangeListener {
@@ -374,6 +488,7 @@ public final class PopupVideoPlayer extends Service {
        private ImageView videoPlayPause;

        private View extraOptionsView;
+        private View closingOverlayView;

        @Override
        public void handleIntent(Intent intent) {
@@ -394,12 +509,18 @@ public final class PopupVideoPlayer extends Service {
            fullScreenButton = rootView.findViewById(R.id.fullScreenButton);
            fullScreenButton.setOnClickListener(v -> onFullScreenButtonClicked());
            videoPlayPause = rootView.findViewById(R.id.videoPlayPause);
-            videoPlayPause.setOnClickListener(this::onPlayPauseButtonPressed);

            extraOptionsView = rootView.findViewById(R.id.extraOptionsView);
+            closingOverlayView = rootView.findViewById(R.id.closingOverlay);
            rootView.addOnLayoutChangeListener(this);
        }

+        @Override
+        public void initListeners() {
+            super.initListeners();
+            videoPlayPause.setOnClickListener(v -> onPlayPause());
+        }
+
        @Override
        protected void setupSubtitleView(@NonNull SubtitleView view,
                                         final float captionScale,
@@ -410,10 +531,6 @@ public final class PopupVideoPlayer extends Service {
            view.setStyle(captionStyle);
        }

-        private void onPlayPauseButtonPressed(View ib) {
-            onPlayPause();
-        }
-
        @Override
        public void onLayoutChange(final View view, int left, int top, int right, int bottom,
                                   int oldLeft, int oldTop, int oldRight, int oldBottom) {
@@ -428,21 +545,6 @@ public final class PopupVideoPlayer extends Service {
            super.destroy();
        }

-        @Override
-        public void onLoadingComplete(String imageUri, View view, Bitmap loadedImage) {
-            super.onLoadingComplete(imageUri, view, loadedImage);
-            if (loadedImage != null) {
-                // rebuild notification here since remote view does not release bitmaps, causing memory leaks
-                notBuilder = createNotification();
-
-                if (notRemoteView != null) {
-                    notRemoteView.setImageViewBitmap(R.id.notificationCover, loadedImage);
-                }
-
-                updateNotification(-1);
-            }
-        }
-
        @Override
        public void onFullScreenButtonClicked() {
            super.onFullScreenButtonClicked();
@@ -450,28 +552,19 @@ 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.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);
-            onClose();
+            closePopup();
        }

        @Override
@@ -510,14 +603,47 @@ public final class PopupVideoPlayer extends Service {
        }

        @Override
-        protected int getDefaultResolutionIndex(final List<VideoStream> sortedVideos) {
-            return ListHelper.getPopupDefaultResolutionIndex(context, sortedVideos);
+        protected VideoPlaybackResolver.QualityResolver getQualityResolver() {
+            return new VideoPlaybackResolver.QualityResolver() {
+                @Override
+                public int getDefaultResolutionIndex(List<VideoStream> sortedVideos) {
+                    return ListHelper.getPopupDefaultResolutionIndex(context, sortedVideos);
+                }
+
+                @Override
+                public int getOverrideResolutionIndex(List<VideoStream> sortedVideos,
+                                                      String playbackQuality) {
+                    return ListHelper.getPopupResolutionIndex(context, sortedVideos,
+                            playbackQuality);
+                }
+            };
+        }
+
+        /*//////////////////////////////////////////////////////////////////////////
+        // Thumbnail Loading
+        //////////////////////////////////////////////////////////////////////////*/
+
+        @Override
+        public void onLoadingComplete(String imageUri, View view, Bitmap loadedImage) {
+            super.onLoadingComplete(imageUri, view, loadedImage);
+            // rebuild notification here since remote view does not release bitmaps,
+            // causing memory leaks
+            resetNotification();
+            updateNotification(-1);
        }

        @Override
-        protected int getOverrideResolutionIndex(final List<VideoStream> sortedVideos,
-                                                 final String playbackQuality) {
-            return ListHelper.getPopupDefaultResolutionIndex(context, sortedVideos, playbackQuality);
+        public void onLoadingFailed(String imageUri, View view, FailReason failReason) {
+            super.onLoadingFailed(imageUri, view, failReason);
+            resetNotification();
+            updateNotification(-1);
+        }
+
+        @Override
+        public void onLoadingCancelled(String imageUri, View view) {
+            super.onLoadingCancelled(imageUri, view);
+            resetNotification();
+            updateNotification(-1);
        }

        /*//////////////////////////////////////////////////////////////////////////
@@ -538,8 +664,8 @@ public final class PopupVideoPlayer extends Service {
        }

        private void updateMetadata() {
-            if (activityListener != null && currentInfo != null) {
-                activityListener.onMetadataUpdate(currentInfo);
+            if (activityListener != null && getCurrentMetadata() != null) {
+                activityListener.onMetadataUpdate(getCurrentMetadata().getMetadata());
            }
        }

@@ -571,8 +697,9 @@ public final class PopupVideoPlayer extends Service {
        public void onRepeatModeChanged(int i) {
            super.onRepeatModeChanged(i);
            setRepeatModeRemote(notRemoteView, i);
-            updateNotification(-1);
            updatePlayback();
+            resetNotification();
+            updateNotification(-1);
        }

        @Override
@@ -585,18 +712,17 @@ public final class PopupVideoPlayer extends Service {
        // Playback Listener
        //////////////////////////////////////////////////////////////////////////*/

-        protected void onMetadataChanged(@NonNull final PlayQueueItem item,
-                                         @Nullable final StreamInfo info,
-                                         final int newPlayQueueIndex,
-                                         final boolean hasPlayQueueItemChanged) {
-            super.onMetadataChanged(item, info, newPlayQueueIndex, false);
+        protected void onMetadataChanged(@NonNull final MediaSourceTag tag) {
+            super.onMetadataChanged(tag);
+            resetNotification();
+            updateNotification(-1);
            updateMetadata();
        }

        @Override
        public void onPlaybackShutdown() {
            super.onPlaybackShutdown();
-            onClose();
+            closePopup();
        }

        /*//////////////////////////////////////////////////////////////////////////
@@ -622,7 +748,7 @@ public final class PopupVideoPlayer extends Service {
            if (DEBUG) Log.d(TAG, "onBroadcastReceived() called with: intent = [" + intent + "]");
            switch (intent.getAction()) {
                case ACTION_CLOSE:
-                    onClose();
+                    closePopup();
                    break;
                case ACTION_PLAY_PAUSE:
                    onPlayPause();
@@ -652,46 +778,70 @@ public final class PopupVideoPlayer extends Service {
        @Override
        public void onBlocked() {
            super.onBlocked();
+            resetNotification();
            updateNotification(R.drawable.ic_play_arrow_white);
        }

        @Override
        public void onPlaying() {
            super.onPlaying();
-            updateNotification(R.drawable.ic_pause_white);
-            videoPlayPause.setBackgroundResource(R.drawable.ic_pause_white);
-            lockManager.acquireWifiAndCpu();

+            updateWindowFlags(ONGOING_PLAYBACK_WINDOW_FLAGS);
+
+            resetNotification();
+            updateNotification(R.drawable.ic_pause_white);
+
+            videoPlayPause.setBackgroundResource(R.drawable.ic_pause_white);
            hideControls(DEFAULT_CONTROLS_DURATION, DEFAULT_CONTROLS_HIDE_TIME);
+
+            startForeground(NOTIFICATION_ID, notBuilder.build());
+            lockManager.acquireWifiAndCpu();
        }

        @Override
        public void onBuffering() {
            super.onBuffering();
+            resetNotification();
            updateNotification(R.drawable.ic_play_arrow_white);
        }

        @Override
        public void onPaused() {
            super.onPaused();
+
+            updateWindowFlags(IDLE_WINDOW_FLAGS);
+
+            resetNotification();
            updateNotification(R.drawable.ic_play_arrow_white);
+
            videoPlayPause.setBackgroundResource(R.drawable.ic_play_arrow_white);
            lockManager.releaseWifiAndCpu();
+
+            stopForeground(false);
        }

        @Override
        public void onPausedSeek() {
            super.onPausedSeek();
-            videoPlayPause.setBackgroundResource(R.drawable.ic_pause_white);
+            resetNotification();
            updateNotification(R.drawable.ic_play_arrow_white);
+
+            videoPlayPause.setBackgroundResource(R.drawable.ic_pause_white);
        }

        @Override
        public void onCompleted() {
            super.onCompleted();
+
+            updateWindowFlags(IDLE_WINDOW_FLAGS);
+
+            resetNotification();
            updateNotification(R.drawable.ic_replay_white);
+
            videoPlayPause.setBackgroundResource(R.drawable.ic_replay_white);
            lockManager.releaseWifiAndCpu();
+
+            stopForeground(false);
        }

        @Override
@@ -709,16 +859,15 @@ public final class PopupVideoPlayer extends Service {
            super.hideControlsAndButton(duration, delay, videoPlayPause);
        }

-
-
        /*//////////////////////////////////////////////////////////////////////////
        // Utils
        //////////////////////////////////////////////////////////////////////////*/

        /*package-private*/ void enableVideoRenderer(final boolean enable) {
            final int videoRendererIndex = getRendererIndex(C.TRACK_TYPE_VIDEO);
-            if (trackSelector != null && videoRendererIndex != RENDERER_UNAVAILABLE) {
-                trackSelector.setRendererDisabled(videoRendererIndex, !enable);
+            if (videoRendererIndex != RENDERER_UNAVAILABLE) {
+                trackSelector.setParameters(trackSelector.buildUponParameters()
+                        .setRendererDisabled(videoRendererIndex, !enable));
            }
        }

@@ -730,12 +879,15 @@ public final class PopupVideoPlayer extends Service {
        public TextView getResizingIndicator() {
            return resizingIndicator;
        }
+
+        public View getClosingOverlayView() {
+            return closingOverlayView;
+        }
    }

-    private class MySimpleOnGestureListener extends GestureDetector.SimpleOnGestureListener implements View.OnTouchListener {
+    private class PopupWindowGestureListener extends GestureDetector.SimpleOnGestureListener implements View.OnTouchListener {
        private int initialPopupX, initialPopupY;
        private boolean isMoving;
-
        private boolean isResizing;

        @Override
@@ -771,10 +923,15 @@ public final class PopupVideoPlayer extends Service {
        @Override
        public boolean onDown(MotionEvent e) {
            if (DEBUG) Log.d(TAG, "onDown() called with: e = [" + e + "]");
-            initialPopupX = windowLayoutParams.x;
-            initialPopupY = windowLayoutParams.y;
-            popupWidth = windowLayoutParams.width;
-            popupHeight = windowLayoutParams.height;
+
+            // Fix popup position when the user touch it, it may have the wrong one
+            // because the soft input is visible (the draggable area is currently resized).
+            checkPopupPositionBounds(closeOverlayView.getWidth(), closeOverlayView.getHeight());
+
+            initialPopupX = popupLayoutParams.x;
+            initialPopupY = popupLayoutParams.y;
+            popupWidth = popupLayoutParams.width;
+            popupHeight = popupLayoutParams.height;
            return super.onDown(e);
        }

@@ -782,20 +939,22 @@ public final class PopupVideoPlayer extends Service {
        public void onLongPress(MotionEvent e) {
            if (DEBUG) Log.d(TAG, "onLongPress() called with: e = [" + e + "]");
            updateScreenSize();
-            checkPositionBounds();
+            checkPopupPositionBounds();
            updatePopupSize((int) screenWidth, -1);
        }

        @Override
-        public boolean onScroll(MotionEvent e1, MotionEvent e2, float distanceX, float distanceY) {
-            if (isResizing || playerImpl == null) return super.onScroll(e1, e2, distanceX, distanceY);
+        public boolean onScroll(MotionEvent initialEvent, MotionEvent movingEvent, float distanceX, float distanceY) {
+            if (isResizing || playerImpl == null) return super.onScroll(initialEvent, movingEvent, distanceX, distanceY);
+
+            if (!isMoving) {
+                animateView(closeOverlayButton, true, 200);
+            }

-            if (playerImpl.getCurrentState() != BasePlayer.STATE_BUFFERING
-                    && (!isMoving || playerImpl.getControlsRoot().getAlpha() != 1f)) playerImpl.showControls(0);
            isMoving = true;

-            float diffX = (int) (e2.getRawX() - e1.getRawX()), posX = (int) (initialPopupX + diffX);
-            float diffY = (int) (e2.getRawY() - e1.getRawY()), posY = (int) (initialPopupY + diffY);
+            float diffX = (int) (movingEvent.getRawX() - initialEvent.getRawX()), posX = (int) (initialPopupX + diffX);
+            float diffY = (int) (movingEvent.getRawY() - initialEvent.getRawY()), posY = (int) (initialPopupY + diffY);

            if (posX > (screenWidth - popupWidth)) posX = (int) (screenWidth - popupWidth);
            else if (posX < 0) posX = 0;
@@ -803,26 +962,49 @@ public final class PopupVideoPlayer extends Service {
            if (posY > (screenHeight - popupHeight)) posY = (int) (screenHeight - popupHeight);
            else if (posY < 0) posY = 0;

-            windowLayoutParams.x = (int) posX;
-            windowLayoutParams.y = (int) posY;
+            popupLayoutParams.x = (int) posX;
+            popupLayoutParams.y = (int) posY;
+
+            final View closingOverlayView = playerImpl.getClosingOverlayView();
+            if (isInsideClosingRadius(movingEvent)) {
+                if (closingOverlayView.getVisibility() == View.GONE) {
+                    animateView(closingOverlayView, true, 250);
+                }
+            } else {
+                if (closingOverlayView.getVisibility() == View.VISIBLE) {
+                    animateView(closingOverlayView, false, 0);
+                }
+            }

            //noinspection PointlessBooleanExpression
-            if (DEBUG && false) Log.d(TAG, "PopupVideoPlayer.onScroll = " +
-                    ", e1.getRaw = [" + e1.getRawX() + ", " + e1.getRawY() + "]" +
-                    ", e2.getRaw = [" + e2.getRawX() + ", " + e2.getRawY() + "]" +
-                    ", distanceXy = [" + distanceX + ", " + distanceY + "]" +
-                    ", posXy = [" + posX + ", " + posY + "]" +
-                    ", popupWh = [" + popupWidth + " x " + popupHeight + "]");
-            windowManager.updateViewLayout(playerImpl.getRootView(), windowLayoutParams);
+            if (DEBUG && false) {
+                Log.d(TAG, "PopupVideoPlayer.onScroll = " +
+                        ", e1.getRaw = [" + initialEvent.getRawX() + ", " + initialEvent.getRawY() + "]" + ", e1.getX,Y = [" + initialEvent.getX() + ", " + initialEvent.getY() + "]" +
+                        ", e2.getRaw = [" + movingEvent.getRawX() + ", " + movingEvent.getRawY() + "]" + ", e2.getX,Y = [" + movingEvent.getX() + ", " + movingEvent.getY() + "]" +
+                        ", distanceX,Y = [" + distanceX + ", " + distanceY + "]" +
+                        ", posX,Y = [" + posX + ", " + posY + "]" +
+                        ", popupW,H = [" + popupWidth + " x " + popupHeight + "]");
+            }
+            windowManager.updateViewLayout(playerImpl.getRootView(), popupLayoutParams);
            return true;
        }

-        private void onScrollEnd() {
+        private void onScrollEnd(MotionEvent event) {
            if (DEBUG) Log.d(TAG, "onScrollEnd() called");
            if (playerImpl == null) return;
            if (playerImpl.isControlsVisible() && playerImpl.getCurrentState() == STATE_PLAYING) {
                playerImpl.hideControls(DEFAULT_CONTROLS_DURATION, DEFAULT_CONTROLS_HIDE_TIME);
            }
+
+            if (isInsideClosingRadius(event)) {
+                closePopup();
+            } else {
+                animateView(playerImpl.getClosingOverlayView(), false, 0);
+
+                if (!isPopupClosing) {
+                    animateView(closeOverlayButton, false, 200);
+                }
+            }
        }

        @Override
@@ -832,14 +1014,11 @@ public final class PopupVideoPlayer extends Service {

            final float absVelocityX = Math.abs(velocityX);
            final float absVelocityY = Math.abs(velocityY);
-            if (absVelocityX > shutdownFlingVelocity) {
-                onClose();
-                return true;
-            } else if (Math.max(absVelocityX, absVelocityY) > tossFlingVelocity) {
-                if (absVelocityX > tossFlingVelocity) windowLayoutParams.x = (int) velocityX;
-                if (absVelocityY > tossFlingVelocity) windowLayoutParams.y = (int) velocityY;
-                checkPositionBounds();
-                windowManager.updateViewLayout(playerImpl.getRootView(), windowLayoutParams);
+            if (Math.max(absVelocityX, absVelocityY) > tossFlingVelocity) {
+                if (absVelocityX > tossFlingVelocity) popupLayoutParams.x = (int) velocityX;
+                if (absVelocityY > tossFlingVelocity) popupLayoutParams.y = (int) velocityY;
+                checkPopupPositionBounds();
+                windowManager.updateViewLayout(playerImpl.getRootView(), popupLayoutParams);
                return true;
            }
            return false;
@@ -847,7 +1026,7 @@ public final class PopupVideoPlayer extends Service {

        @Override
        public boolean onTouch(View v, MotionEvent event) {
-            gestureDetector.onTouchEvent(event);
+            popupGestureDetector.onTouchEvent(event);
            if (playerImpl == null) return false;
            if (event.getPointerCount() == 2 && !isResizing) {
                if (DEBUG) Log.d(TAG, "onTouch() 2 finger pointer detected, enabling resizing.");
@@ -870,7 +1049,7 @@ public final class PopupVideoPlayer extends Service {
                    Log.d(TAG, "onTouch() ACTION_UP > v = [" + v + "],  e1.getRaw = [" + event.getRawX() + ", " + event.getRawY() + "]");
                if (isMoving) {
                    isMoving = false;
-                    onScrollEnd();
+                    onScrollEnd(event);
                }

                if (isResizing) {
@@ -878,7 +1057,10 @@ public final class PopupVideoPlayer extends Service {
                    animateView(playerImpl.getResizingIndicator(), false, 100, 0);
                    playerImpl.changeState(playerImpl.getCurrentState());
                }
-                savePositionAndSize();
+
+                if (!isPopupClosing) {
+                    savePositionAndSize();
+                }
            }

            v.performClick();
@@ -894,13 +1076,13 @@ public final class PopupVideoPlayer extends Service {
            final float diff = Math.abs(firstPointerX - secondPointerX);
            if (firstPointerX > secondPointerX) {
                // second pointer is the anchor (the leftmost pointer)
-                windowLayoutParams.x = (int) (event.getRawX() - diff);
+                popupLayoutParams.x = (int) (event.getRawX() - diff);
            } else {
                // first pointer is the anchor
-                windowLayoutParams.x = (int) event.getRawX();
+                popupLayoutParams.x = (int) event.getRawX();
            }

-            checkPositionBounds();
+            checkPopupPositionBounds();
            updateScreenSize();

            final int width = (int) Math.min(screenWidth, diff);
@@ -908,5 +1090,29 @@ public final class PopupVideoPlayer extends Service {

            return true;
        }
+
+        /*//////////////////////////////////////////////////////////////////////////
+        // Utils
+        //////////////////////////////////////////////////////////////////////////*/
+
+        private int distanceFromCloseButton(MotionEvent popupMotionEvent) {
+            final int closeOverlayButtonX = closeOverlayButton.getLeft() + closeOverlayButton.getWidth() / 2;
+            final int closeOverlayButtonY = closeOverlayButton.getTop() + closeOverlayButton.getHeight() / 2;
+
+            float fingerX = popupLayoutParams.x + popupMotionEvent.getX();
+            float fingerY = popupLayoutParams.y + popupMotionEvent.getY();
+
+            return (int) Math.sqrt(Math.pow(closeOverlayButtonX - fingerX, 2) + Math.pow(closeOverlayButtonY - fingerY, 2));
+        }
+
+        private float getClosingRadius() {
+            final int buttonRadius = closeOverlayButton.getWidth() / 2;
+            // 20% wider than the button itself
+            return buttonRadius * 1.2f;
+        }
+
+        private boolean isInsideClosingRadius(MotionEvent popupMotionEvent) {
+            return distanceFromCloseButton(popupMotionEvent) <= getClosingRadius();
+        }
    }
 }
--- a/app/src/main/java/org/schabi/newpipe/player/ServicePlayerActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/player/ServicePlayerActivity.java
@@ -16,6 +16,7 @@ import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
+import android.view.ViewGroup;
 import android.widget.ImageButton;
 import android.widget.LinearLayout;
 import android.widget.PopupMenu;
@@ -187,6 +188,7 @@ public abstract class ServicePlayerActivity extends AppCompatActivity
                this.player.getRepeatMode(),
                this.player.getPlaybackSpeed(),
                this.player.getPlaybackPitch(),
+                this.player.getPlaybackSkipSilence(),
                null
        ).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
    }
@@ -340,6 +342,13 @@ public abstract class ServicePlayerActivity extends AppCompatActivity
            return true;
        });

+        final MenuItem share = menu.getMenu().add(RECYCLER_ITEM_POPUP_MENU_GROUP_ID, /*pos=*/3,
+                Menu.NONE, R.string.share);
+        share.setOnMenuItemClickListener(menuItem -> {
+            shareUrl(item.getTitle(), item.getUrl());
+            return true;
+        });
+
        menu.show();
    }

@@ -366,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);
+            }
        };
    }

@@ -459,13 +473,16 @@ public abstract class ServicePlayerActivity extends AppCompatActivity

    private void openPlaybackParameterDialog() {
        if (player == null) return;
-        PlaybackParameterDialog.newInstance(player.getPlaybackSpeed(),
-                player.getPlaybackPitch()).show(getSupportFragmentManager(), getTag());
+        PlaybackParameterDialog.newInstance(player.getPlaybackSpeed(), player.getPlaybackPitch(),
+                player.getPlaybackSkipSilence()).show(getSupportFragmentManager(), getTag());
    }

    @Override
-    public void onPlaybackParameterChanged(float playbackTempo, float playbackPitch) {
-        if (player != null) player.setPlaybackParameters(playbackTempo, playbackPitch);
+    public void onPlaybackParameterChanged(float playbackTempo, float playbackPitch,
+                                           boolean playbackSkipSilence) {
+        if (player != null) {
+            player.setPlaybackParameters(playbackTempo, playbackPitch, playbackSkipSilence);
+        }
    }

    ////////////////////////////////////////////////////////////////////////////
@@ -509,6 +526,18 @@ public abstract class ServicePlayerActivity extends AppCompatActivity
                .show(getSupportFragmentManager(), getTag());
    }

+    ////////////////////////////////////////////////////////////////////////////
+    // Share
+    ////////////////////////////////////////////////////////////////////////////
+
+    private void shareUrl(String subject, String url) {
+        Intent intent = new Intent(Intent.ACTION_SEND);
+        intent.setType("text/plain");
+        intent.putExtra(Intent.EXTRA_SUBJECT, subject);
+        intent.putExtra(Intent.EXTRA_TEXT, url);
+        startActivity(Intent.createChooser(intent, getString(R.string.share_dialog_title)));
+    }
+
    ////////////////////////////////////////////////////////////////////////////
    // Binding Service Listener
    ////////////////////////////////////////////////////////////////////////////
@@ -539,6 +568,12 @@ public abstract class ServicePlayerActivity extends AppCompatActivity
        if (player != null) {
            progressLiveSync.setClickable(!player.isLiveEdge());
        }
+
+        // this will make shure progressCurrentTime has the same width as progressEndTime
+        final ViewGroup.LayoutParams endTimeParams = progressEndTime.getLayoutParams();
+        final ViewGroup.LayoutParams currentTimeParams = progressCurrentTime.getLayoutParams();
+        currentTimeParams.width = progressEndTime.getWidth();
+        progressCurrentTime.setLayoutParams(currentTimeParams);
    }

    @Override
--- a/app/src/main/java/org/schabi/newpipe/player/VideoPlayer.java
+++ b/app/src/main/java/org/schabi/newpipe/player/VideoPlayer.java
@@ -29,7 +29,6 @@ import android.content.Intent;
 import android.graphics.Bitmap;
 import android.graphics.Color;
 import android.graphics.PorterDuff;
-import android.net.Uri;
 import android.os.Build;
 import android.os.Handler;
 import android.support.annotation.NonNull;
@@ -47,11 +46,9 @@ import android.widget.SeekBar;
 import android.widget.TextView;

 import com.google.android.exoplayer2.C;
-import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.PlaybackParameters;
 import com.google.android.exoplayer2.Player;
 import com.google.android.exoplayer2.source.MediaSource;
-import com.google.android.exoplayer2.source.MergingMediaSource;
 import com.google.android.exoplayer2.source.TrackGroup;
 import com.google.android.exoplayer2.source.TrackGroupArray;
 import com.google.android.exoplayer2.text.CaptionStyleCompat;
@@ -62,21 +59,17 @@ import com.google.android.exoplayer2.video.VideoListener;

 import org.schabi.newpipe.R;
 import org.schabi.newpipe.extractor.MediaFormat;
-import org.schabi.newpipe.extractor.Subtitles;
-import org.schabi.newpipe.extractor.stream.AudioStream;
 import org.schabi.newpipe.extractor.stream.StreamInfo;
-import org.schabi.newpipe.extractor.stream.StreamType;
 import org.schabi.newpipe.extractor.stream.VideoStream;
 import org.schabi.newpipe.player.helper.PlayerHelper;
 import org.schabi.newpipe.player.playqueue.PlayQueueItem;
+import org.schabi.newpipe.player.resolver.MediaSourceTag;
+import org.schabi.newpipe.player.resolver.VideoPlaybackResolver;
 import org.schabi.newpipe.util.AnimationUtils;
-import org.schabi.newpipe.util.ListHelper;

 import java.util.ArrayList;
 import java.util.List;

-import static com.google.android.exoplayer2.C.SELECTION_FLAG_AUTOSELECT;
-import static com.google.android.exoplayer2.C.TIME_UNSET;
 import static org.schabi.newpipe.player.helper.PlayerHelper.formatSpeed;
 import static org.schabi.newpipe.player.helper.PlayerHelper.getTimeString;
 import static org.schabi.newpipe.util.AnimationUtils.animateView;
@@ -105,13 +98,12 @@ public abstract class VideoPlayer extends BasePlayer
    public static final int DEFAULT_CONTROLS_DURATION = 300; // 300 millis
    public static final int DEFAULT_CONTROLS_HIDE_TIME = 2000;  // 2 Seconds

-    private ArrayList<VideoStream> availableStreams;
+    private List<VideoStream> availableStreams;
    private int selectedStreamIndex;

-    protected String playbackQuality;
-
    protected boolean wasPlaying = false;

+    @NonNull final private VideoPlaybackResolver resolver;
    /*//////////////////////////////////////////////////////////////////////////
    // Views
    //////////////////////////////////////////////////////////////////////////*/
@@ -145,16 +137,16 @@ public abstract class VideoPlayer extends BasePlayer
    private TextView captionTextView;

    private ValueAnimator controlViewAnimator;
-    private Handler controlsVisibilityHandler = new Handler();
+    private final Handler controlsVisibilityHandler = new Handler();

    boolean isSomePopupMenuVisible = false;
-    private int qualityPopupMenuGroupId = 69;
+    private final int qualityPopupMenuGroupId = 69;
    private PopupMenu qualityPopupMenu;

-    private int playbackSpeedPopupMenuGroupId = 79;
+    private final int playbackSpeedPopupMenuGroupId = 79;
    private PopupMenu playbackSpeedPopupMenu;

-    private int captionPopupMenuGroupId = 89;
+    private final int captionPopupMenuGroupId = 89;
    private PopupMenu captionPopupMenu;

    ///////////////////////////////////////////////////////////////////////////
@@ -162,6 +154,7 @@ public abstract class VideoPlayer extends BasePlayer
    public VideoPlayer(String debugTag, Context context) {
        super(context);
        this.TAG = debugTag;
+        this.resolver = new VideoPlaybackResolver(context, dataSource, getQualityResolver());
    }

    public void setup(View rootView) {
@@ -241,7 +234,8 @@ public abstract class VideoPlayer extends BasePlayer

        // Setup audio session with onboard equalizer
        if (Build.VERSION.SDK_INT >= 21) {
-            trackSelector.setTunnelingAudioSessionId(C.generateAudioSessionIdV21(context));
+            trackSelector.setParameters(trackSelector.buildUponParameters()
+                    .setTunnelingAudioSessionId(C.generateAudioSessionIdV21(context)));
        }
    }

@@ -297,8 +291,9 @@ public abstract class VideoPlayer extends BasePlayer
                0, Menu.NONE, R.string.caption_none);
        captionOffItem.setOnMenuItemClickListener(menuItem -> {
            final int textRendererIndex = getRendererIndex(C.TRACK_TYPE_TEXT);
-            if (trackSelector != null && textRendererIndex != RENDERER_UNAVAILABLE) {
-                trackSelector.setRendererDisabled(textRendererIndex, true);
+            if (textRendererIndex != RENDERER_UNAVAILABLE) {
+                trackSelector.setParameters(trackSelector.buildUponParameters()
+                        .setRendererDisabled(textRendererIndex, true));
            }
            return true;
        });
@@ -310,68 +305,61 @@ public abstract class VideoPlayer extends BasePlayer
                    i + 1, Menu.NONE, captionLanguage);
            captionItem.setOnMenuItemClickListener(menuItem -> {
                final int textRendererIndex = getRendererIndex(C.TRACK_TYPE_TEXT);
-                if (trackSelector != null && textRendererIndex != RENDERER_UNAVAILABLE) {
+                if (textRendererIndex != RENDERER_UNAVAILABLE) {
                    trackSelector.setPreferredTextLanguage(captionLanguage);
-                    trackSelector.setRendererDisabled(textRendererIndex, false);
+                    trackSelector.setParameters(trackSelector.buildUponParameters()
+                            .setRendererDisabled(textRendererIndex, false));
                }
                return true;
            });
        }
        captionPopupMenu.setOnDismissListener(this);
    }
-    /*//////////////////////////////////////////////////////////////////////////
-    // Playback Listener
-    //////////////////////////////////////////////////////////////////////////*/

-    protected abstract int getDefaultResolutionIndex(final List<VideoStream> sortedVideos);

-    protected abstract int getOverrideResolutionIndex(final List<VideoStream> sortedVideos, final String playbackQuality);
+    private void updateStreamRelatedViews() {
+        if (getCurrentMetadata() == null) return;
+
+        final MediaSourceTag tag = getCurrentMetadata();
+        final StreamInfo metadata = tag.getMetadata();

-    protected void onMetadataChanged(@NonNull final PlayQueueItem item,
-                                     @Nullable final StreamInfo info,
-                                     final int newPlayQueueIndex,
-                                     final boolean hasPlayQueueItemChanged) {
        qualityTextView.setVisibility(View.GONE);
        playbackSpeedTextView.setVisibility(View.GONE);

        playbackEndTime.setVisibility(View.GONE);
        playbackLiveSync.setVisibility(View.GONE);

-        final StreamType streamType = info == null ? StreamType.NONE : info.getStreamType();
-
-        switch (streamType) {
+        switch (metadata.getStreamType()) {
            case AUDIO_STREAM:
                surfaceView.setVisibility(View.GONE);
+                endScreen.setVisibility(View.VISIBLE);
                playbackEndTime.setVisibility(View.VISIBLE);
                break;

            case AUDIO_LIVE_STREAM:
                surfaceView.setVisibility(View.GONE);
+                endScreen.setVisibility(View.VISIBLE);
                playbackLiveSync.setVisibility(View.VISIBLE);
                break;

            case LIVE_STREAM:
                surfaceView.setVisibility(View.VISIBLE);
+                endScreen.setVisibility(View.GONE);
                playbackLiveSync.setVisibility(View.VISIBLE);
                break;

            case VIDEO_STREAM:
-                if (info.getVideoStreams().size() + info.getVideoOnlyStreams().size() == 0) break;
-
-                final List<VideoStream> videos = ListHelper.getSortedStreamVideosList(context,
-                        info.getVideoStreams(), info.getVideoOnlyStreams(), false);
-                availableStreams = new ArrayList<>(videos);
-                if (playbackQuality == null) {
-                    selectedStreamIndex = getDefaultResolutionIndex(videos);
-                } else {
-                    selectedStreamIndex = getOverrideResolutionIndex(videos, getPlaybackQuality());
-                }
+                if (metadata.getVideoStreams().size() + metadata.getVideoOnlyStreams().size() == 0)
+                    break;

+                availableStreams = tag.getSortedAvailableVideoStreams();
+                selectedStreamIndex = tag.getSelectedVideoStreamIndex();
                buildQualityMenu();
-                qualityTextView.setVisibility(View.VISIBLE);

+                qualityTextView.setVisibility(View.VISIBLE);
                surfaceView.setVisibility(View.VISIBLE);
            default:
+                endScreen.setVisibility(View.GONE);
                playbackEndTime.setVisibility(View.VISIBLE);
                break;
        }
@@ -379,69 +367,21 @@ public abstract class VideoPlayer extends BasePlayer
        buildPlaybackSpeedMenu();
        playbackSpeedTextView.setVisibility(View.VISIBLE);
    }
+    /*//////////////////////////////////////////////////////////////////////////
+    // Playback Listener
+    //////////////////////////////////////////////////////////////////////////*/
+
+    protected abstract VideoPlaybackResolver.QualityResolver getQualityResolver();
+
+    protected void onMetadataChanged(@NonNull final MediaSourceTag tag) {
+        super.onMetadataChanged(tag);
+        updateStreamRelatedViews();
+    }

    @Override
    @Nullable
    public MediaSource sourceOf(final PlayQueueItem item, final StreamInfo info) {
-        final MediaSource liveSource = super.sourceOf(item, info);
-        if (liveSource != null) return liveSource;
-
-        List<MediaSource> mediaSources = new ArrayList<>();
-
-        // Create video stream source
-        final List<VideoStream> videos = ListHelper.getSortedStreamVideosList(context,
-                info.getVideoStreams(), info.getVideoOnlyStreams(), false);
-        final int index;
-        if (videos.isEmpty()) {
-            index = -1;
-        } else if (playbackQuality == null) {
-            index = getDefaultResolutionIndex(videos);
-        } else {
-            index = getOverrideResolutionIndex(videos, getPlaybackQuality());
-        }
-        final VideoStream video = index >= 0 && index < videos.size() ? videos.get(index) : null;
-        if (video != null) {
-            final MediaSource streamSource = buildMediaSource(video.getUrl(),
-                    PlayerHelper.cacheKeyOf(info, video),
-                    MediaFormat.getSuffixById(video.getFormatId()));
-            mediaSources.add(streamSource);
-        }
-
-        // Create optional audio stream source
-        final List<AudioStream> audioStreams = info.getAudioStreams();
-        final AudioStream audio = audioStreams.isEmpty() ? null : audioStreams.get(
-                ListHelper.getDefaultAudioFormat(context, audioStreams));
-        // Use the audio stream if there is no video stream, or
-        // Merge with audio stream in case if video does not contain audio
-        if (audio != null && ((video != null && video.isVideoOnly) || video == null)) {
-            final MediaSource audioSource = buildMediaSource(audio.getUrl(),
-                    PlayerHelper.cacheKeyOf(info, audio),
-                    MediaFormat.getSuffixById(audio.getFormatId()));
-            mediaSources.add(audioSource);
-        }
-
-        // If there is no audio or video sources, then this media source cannot be played back
-        if (mediaSources.isEmpty()) return null;
-        // Below are auxiliary media sources
-
-        // Create subtitle sources
-        for (final Subtitles subtitle : info.getSubtitles()) {
-            final String mimeType = PlayerHelper.mimeTypesOf(subtitle.getFileType());
-            if (mimeType == null) continue;
-
-            final Format textFormat = Format.createTextSampleFormat(null, mimeType,
-                    SELECTION_FLAG_AUTOSELECT, PlayerHelper.captionLanguageOf(context, subtitle));
-            final MediaSource textSource = dataSource.getSampleMediaSourceFactory()
-                    .createMediaSource(Uri.parse(subtitle.getURL()), textFormat, TIME_UNSET);
-            mediaSources.add(textSource);
-        }
-
-        if (mediaSources.size() == 1) {
-            return mediaSources.get(0);
-        } else {
-            return new MergingMediaSource(mediaSources.toArray(
-                    new MediaSource[mediaSources.size()]));
-        }
+        return resolver.resolve(info);
    }

    /*//////////////////////////////////////////////////////////////////////////
@@ -460,7 +400,6 @@ public abstract class VideoPlayer extends BasePlayer
        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN)
            playbackSeekBar.getThumb().setColorFilter(Color.RED, PorterDuff.Mode.SRC_IN);

-        animateView(endScreen, false, 0);
        loadingPanel.setBackgroundColor(Color.BLACK);
        animateView(loadingPanel, true, 0);
        animateView(surfaceForeground, true, 100);
@@ -470,6 +409,8 @@ public abstract class VideoPlayer extends BasePlayer
    public void onPlaying() {
        super.onPlaying();

+        updateStreamRelatedViews();
+
        showAndAnimateControl(-1, true);

        playbackSeekBar.setEnabled(true);
@@ -480,14 +421,12 @@ public abstract class VideoPlayer extends BasePlayer
        loadingPanel.setVisibility(View.GONE);

        animateView(currentDisplaySeek, AnimationUtils.Type.SCALE_AND_ALPHA, false, 200);
-        animateView(endScreen, false, 0);
    }

    @Override
    public void onBuffering() {
        if (DEBUG) Log.d(TAG, "onBuffering() called");
        loadingPanel.setBackgroundColor(Color.TRANSPARENT);
-        animateView(loadingPanel, true, 500);
    }

    @Override
@@ -552,8 +491,7 @@ public abstract class VideoPlayer extends BasePlayer
        final int textRenderer = getRendererIndex(C.TRACK_TYPE_TEXT);

        if (captionTextView == null) return;
-        if (trackSelector == null || trackSelector.getCurrentMappedTrackInfo() == null ||
-                textRenderer == RENDERER_UNAVAILABLE) {
+        if (trackSelector.getCurrentMappedTrackInfo() == null || textRenderer == RENDERER_UNAVAILABLE) {
            captionTextView.setVisibility(View.GONE);
            return;
        }
@@ -575,8 +513,8 @@ public abstract class VideoPlayer extends BasePlayer

        // Build UI
        buildCaptionMenu(availableLanguages);
-        if (trackSelector.getRendererDisabled(textRenderer) || preferredLanguage == null ||
-                !availableLanguages.contains(preferredLanguage)) {
+        if (trackSelector.getParameters().getRendererDisabled(textRenderer) ||
+                preferredLanguage == null || !availableLanguages.contains(preferredLanguage)) {
            captionTextView.setText(R.string.caption_none);
        } else {
            captionTextView.setText(preferredLanguage);
@@ -745,12 +683,17 @@ public abstract class VideoPlayer extends BasePlayer
        if (getAspectRatioFrameLayout() != null) {
            final int currentResizeMode = getAspectRatioFrameLayout().getResizeMode();
            final int newResizeMode = nextResizeMode(currentResizeMode);
-            getAspectRatioFrameLayout().setResizeMode(newResizeMode);
-            getResizeView().setText(PlayerHelper.resizeTypeOf(context, newResizeMode));
+            setResizeMode(newResizeMode);
        }
    }

+    protected void setResizeMode(@AspectRatioFrameLayout.ResizeMode final int resizeMode) {
+        getAspectRatioFrameLayout().setResizeMode(resizeMode);
+        getResizeView().setText(PlayerHelper.resizeTypeOf(context, resizeMode));
+    }
+
    protected abstract int nextResizeMode(@AspectRatioFrameLayout.ResizeMode final int resizeMode);
+
    /*//////////////////////////////////////////////////////////////////////////
    // SeekBar Listener
    //////////////////////////////////////////////////////////////////////////*/
@@ -905,11 +848,12 @@ public abstract class VideoPlayer extends BasePlayer
    //////////////////////////////////////////////////////////////////////////*/

    public void setPlaybackQuality(final String quality) {
-        this.playbackQuality = quality;
+        this.resolver.setPlaybackQuality(quality);
    }

+    @Nullable
    public String getPlaybackQuality() {
-        return playbackQuality;
+        return resolver.getPlaybackQuality();
    }

    public AspectRatioFrameLayout getAspectRatioFrameLayout() {
--- a/app/src/main/java/org/schabi/newpipe/player/helper/AudioReactor.java
+++ b/app/src/main/java/org/schabi/newpipe/player/helper/AudioReactor.java
@@ -116,7 +116,7 @@ public class AudioReactor implements AudioManager.OnAudioFocusChangeListener,
    private void onAudioFocusGain() {
        Log.d(TAG, "onAudioFocusGain() called");
        player.setVolume(DUCK_AUDIO_TO);
-        animateAudio(DUCK_AUDIO_TO, 1f, DUCK_DURATION);
+        animateAudio(DUCK_AUDIO_TO, 1f);

        if (PlayerHelper.isResumeAfterAudioFocusGain(context)) {
            player.setPlayWhenReady(true);
@@ -131,13 +131,13 @@ public class AudioReactor implements AudioManager.OnAudioFocusChangeListener,
    private void onAudioFocusLossCanDuck() {
        Log.d(TAG, "onAudioFocusLossCanDuck() called");
        // Set the volume to 1/10 on ducking
-        animateAudio(player.getVolume(), DUCK_AUDIO_TO, DUCK_DURATION);
+        animateAudio(player.getVolume(), DUCK_AUDIO_TO);
    }

-    private void animateAudio(final float from, final float to, int duration) {
+    private void animateAudio(final float from, final float to) {
        ValueAnimator valueAnimator = new ValueAnimator();
        valueAnimator.setFloatValues(from, to);
-        valueAnimator.setDuration(duration);
+        valueAnimator.setDuration(AudioReactor.DUCK_DURATION);
        valueAnimator.addListener(new AnimatorListenerAdapter() {
            @Override
            public void onAnimationStart(Animator animation) {
--- a/app/src/main/java/org/schabi/newpipe/player/helper/CacheFactory.java
+++ b/app/src/main/java/org/schabi/newpipe/player/helper/CacheFactory.java
@@ -4,12 +4,9 @@ import android.content.Context;
 import android.support.annotation.NonNull;
 import android.util.Log;

-import com.google.android.exoplayer2.upstream.BandwidthMeter;
 import com.google.android.exoplayer2.upstream.DataSource;
-import com.google.android.exoplayer2.upstream.DefaultBandwidthMeter;
 import com.google.android.exoplayer2.upstream.DefaultDataSource;
 import com.google.android.exoplayer2.upstream.DefaultDataSourceFactory;
-import com.google.android.exoplayer2.upstream.DefaultHttpDataSource;
 import com.google.android.exoplayer2.upstream.FileDataSource;
 import com.google.android.exoplayer2.upstream.TransferListener;
 import com.google.android.exoplayer2.upstream.cache.CacheDataSink;
@@ -17,8 +14,6 @@ import com.google.android.exoplayer2.upstream.cache.CacheDataSource;
 import com.google.android.exoplayer2.upstream.cache.LeastRecentlyUsedCacheEvictor;
 import com.google.android.exoplayer2.upstream.cache.SimpleCache;

-import org.schabi.newpipe.Downloader;
-
 import java.io.File;

 /* package-private */ class CacheFactory implements DataSource.Factory {
--- a/app/src/main/java/org/schabi/newpipe/player/helper/MediaSessionManager.java
+++ b/app/src/main/java/org/schabi/newpipe/player/helper/MediaSessionManager.java
@@ -11,7 +11,6 @@ import android.view.KeyEvent;
 import com.google.android.exoplayer2.Player;
 import com.google.android.exoplayer2.ext.mediasession.MediaSessionConnector;

-import org.schabi.newpipe.player.mediasession.DummyPlaybackPreparer;
 import org.schabi.newpipe.player.mediasession.MediaSessionCallback;
 import org.schabi.newpipe.player.mediasession.PlayQueueNavigator;
 import org.schabi.newpipe.player.mediasession.PlayQueuePlaybackController;
@@ -26,10 +25,12 @@ public class MediaSessionManager {
                               @NonNull final Player player,
                               @NonNull final MediaSessionCallback callback) {
        this.mediaSession = new MediaSessionCompat(context, TAG);
+        this.mediaSession.setActive(true);
+
        this.sessionConnector = new MediaSessionConnector(mediaSession,
                new PlayQueuePlaybackController(callback));
        this.sessionConnector.setQueueNavigator(new PlayQueueNavigator(mediaSession, callback));
-        this.sessionConnector.setPlayer(player, new DummyPlaybackPreparer());
+        this.sessionConnector.setPlayer(player, null);
    }

    @Nullable
@@ -37,4 +38,14 @@ public class MediaSessionManager {
    public KeyEvent handleMediaButtonIntent(final Intent intent) {
        return MediaButtonReceiver.handleIntent(mediaSession, intent);
    }
+
+    /**
+     * Should be called on player destruction to prevent leakage.
+     * */
+    public void dispose() {
+        this.sessionConnector.setPlayer(null, null);
+        this.sessionConnector.setQueueNavigator(null);
+        this.mediaSession.setActive(false);
+        this.mediaSession.release();
+	}
 }
--- a/app/src/main/java/org/schabi/newpipe/player/helper/PlaybackParameterDialog.java
+++ b/app/src/main/java/org/schabi/newpipe/player/helper/PlaybackParameterDialog.java
@@ -21,25 +21,34 @@ import static org.schabi.newpipe.player.BasePlayer.DEBUG;
 public class PlaybackParameterDialog extends DialogFragment {
    @NonNull private static final String TAG = "PlaybackParameterDialog";

-    public static final double MINIMUM_PLAYBACK_VALUE = 0.25f;
+    // Minimum allowable range in ExoPlayer
+    public static final double MINIMUM_PLAYBACK_VALUE = 0.10f;
    public static final double MAXIMUM_PLAYBACK_VALUE = 3.00f;

    public static final char STEP_UP_SIGN = '+';
    public static final char STEP_DOWN_SIGN = '-';
-    public static final double PLAYBACK_STEP_VALUE = 0.05f;

-    public static final double NIGHTCORE_TEMPO = 1.20f;
-    public static final double NIGHTCORE_PITCH_LOWER = 1.15f;
-    public static final double NIGHTCORE_PITCH_UPPER = 1.25f;
+    public static final double STEP_ONE_PERCENT_VALUE = 0.01f;
+    public static final double STEP_FIVE_PERCENT_VALUE = 0.05f;
+    public static final double STEP_TEN_PERCENT_VALUE = 0.10f;
+    public static final double STEP_TWENTY_FIVE_PERCENT_VALUE = 0.25f;
+    public static final double STEP_ONE_HUNDRED_PERCENT_VALUE = 1.00f;

    public static final double DEFAULT_TEMPO = 1.00f;
    public static final double DEFAULT_PITCH = 1.00f;
+    public static final double DEFAULT_STEP = STEP_TWENTY_FIVE_PERCENT_VALUE;
+    public static final boolean DEFAULT_SKIP_SILENCE = false;

    @NonNull private static final String INITIAL_TEMPO_KEY = "initial_tempo_key";
    @NonNull private static final String INITIAL_PITCH_KEY = "initial_pitch_key";

+    @NonNull private static final String TEMPO_KEY = "tempo_key";
+    @NonNull private static final String PITCH_KEY = "pitch_key";
+    @NonNull private static final String STEP_SIZE_KEY = "step_size_key";
+
    public interface Callback {
-        void onPlaybackParameterChanged(final float playbackTempo, final float playbackPitch);
+        void onPlaybackParameterChanged(final float playbackTempo, final float playbackPitch,
+                                        final boolean playbackSkipSilence);
    }

    @Nullable private Callback callback;
@@ -50,31 +59,36 @@ public class PlaybackParameterDialog extends DialogFragment {

    private double initialTempo = DEFAULT_TEMPO;
    private double initialPitch = DEFAULT_PITCH;
+    private boolean initialSkipSilence = DEFAULT_SKIP_SILENCE;
+
+    private double tempo = DEFAULT_TEMPO;
+    private double pitch = DEFAULT_PITCH;
+    private double stepSize = DEFAULT_STEP;

    @Nullable private SeekBar tempoSlider;
-    @Nullable private TextView tempoMinimumText;
-    @Nullable private TextView tempoMaximumText;
    @Nullable private TextView tempoCurrentText;
    @Nullable private TextView tempoStepDownText;
    @Nullable private TextView tempoStepUpText;

    @Nullable private SeekBar pitchSlider;
-    @Nullable private TextView pitchMinimumText;
-    @Nullable private TextView pitchMaximumText;
    @Nullable private TextView pitchCurrentText;
    @Nullable private TextView pitchStepDownText;
    @Nullable private TextView pitchStepUpText;

    @Nullable private CheckBox unhookingCheckbox;
-
-    @Nullable private TextView nightCorePresetText;
-    @Nullable private TextView resetPresetText;
+    @Nullable private CheckBox skipSilenceCheckbox;

    public static PlaybackParameterDialog newInstance(final double playbackTempo,
-                                                      final double playbackPitch) {
+                                                      final double playbackPitch,
+                                                      final boolean playbackSkipSilence) {
        PlaybackParameterDialog dialog = new PlaybackParameterDialog();
        dialog.initialTempo = playbackTempo;
        dialog.initialPitch = playbackPitch;
+
+        dialog.tempo = playbackTempo;
+        dialog.pitch = playbackPitch;
+
+        dialog.initialSkipSilence = playbackSkipSilence;
        return dialog;
    }

@@ -98,6 +112,10 @@ public class PlaybackParameterDialog extends DialogFragment {
        if (savedInstanceState != null) {
            initialTempo = savedInstanceState.getDouble(INITIAL_TEMPO_KEY, DEFAULT_TEMPO);
            initialPitch = savedInstanceState.getDouble(INITIAL_PITCH_KEY, DEFAULT_PITCH);
+
+            tempo = savedInstanceState.getDouble(TEMPO_KEY, DEFAULT_TEMPO);
+            pitch = savedInstanceState.getDouble(PITCH_KEY, DEFAULT_PITCH);
+            stepSize = savedInstanceState.getDouble(STEP_SIZE_KEY, DEFAULT_STEP);
        }
    }

@@ -106,6 +124,10 @@ public class PlaybackParameterDialog extends DialogFragment {
        super.onSaveInstanceState(outState);
        outState.putDouble(INITIAL_TEMPO_KEY, initialTempo);
        outState.putDouble(INITIAL_PITCH_KEY, initialPitch);
+
+        outState.putDouble(TEMPO_KEY, getCurrentTempo());
+        outState.putDouble(PITCH_KEY, getCurrentPitch());
+        outState.putDouble(STEP_SIZE_KEY, getCurrentStepSize());
    }

    /*//////////////////////////////////////////////////////////////////////////
@@ -123,7 +145,9 @@ public class PlaybackParameterDialog extends DialogFragment {
                .setView(view)
                .setCancelable(true)
                .setNegativeButton(R.string.cancel, (dialogInterface, i) ->
-                        setPlaybackParameters(initialTempo, initialPitch))
+                        setPlaybackParameters(initialTempo, initialPitch, initialSkipSilence))
+                .setNeutralButton(R.string.playback_reset, (dialogInterface, i) ->
+                        setPlaybackParameters(DEFAULT_TEMPO, DEFAULT_PITCH, DEFAULT_SKIP_SILENCE))
                .setPositiveButton(R.string.finish, (dialogInterface, i) ->
                        setCurrentPlaybackParameters());

@@ -136,83 +160,55 @@ public class PlaybackParameterDialog extends DialogFragment {

    private void setupControlViews(@NonNull View rootView) {
        setupHookingControl(rootView);
+        setupSkipSilenceControl(rootView);
+
        setupTempoControl(rootView);
        setupPitchControl(rootView);
-        setupPresetControl(rootView);
+
+        changeStepSize(stepSize);
+        setupStepSizeSelector(rootView);
    }

    private void setupTempoControl(@NonNull View rootView) {
        tempoSlider = rootView.findViewById(R.id.tempoSeekbar);
-        tempoMinimumText = rootView.findViewById(R.id.tempoMinimumText);
-        tempoMaximumText = rootView.findViewById(R.id.tempoMaximumText);
+        TextView tempoMinimumText = rootView.findViewById(R.id.tempoMinimumText);
+        TextView tempoMaximumText = rootView.findViewById(R.id.tempoMaximumText);
        tempoCurrentText = rootView.findViewById(R.id.tempoCurrentText);
        tempoStepUpText = rootView.findViewById(R.id.tempoStepUp);
        tempoStepDownText = rootView.findViewById(R.id.tempoStepDown);

        if (tempoCurrentText != null)
-            tempoCurrentText.setText(PlayerHelper.formatSpeed(initialTempo));
+            tempoCurrentText.setText(PlayerHelper.formatSpeed(tempo));
        if (tempoMaximumText != null)
            tempoMaximumText.setText(PlayerHelper.formatSpeed(MAXIMUM_PLAYBACK_VALUE));
        if (tempoMinimumText != null)
            tempoMinimumText.setText(PlayerHelper.formatSpeed(MINIMUM_PLAYBACK_VALUE));

-        if (tempoStepUpText != null) {
-            tempoStepUpText.setText(getStepUpPercentString(PLAYBACK_STEP_VALUE));
-            tempoStepUpText.setOnClickListener(view -> {
-                onTempoSliderUpdated(getCurrentTempo() + PLAYBACK_STEP_VALUE);
-                setCurrentPlaybackParameters();
-            });
-        }
-
-        if (tempoStepDownText != null) {
-            tempoStepDownText.setText(getStepDownPercentString(PLAYBACK_STEP_VALUE));
-            tempoStepDownText.setOnClickListener(view -> {
-                onTempoSliderUpdated(getCurrentTempo() - PLAYBACK_STEP_VALUE);
-                setCurrentPlaybackParameters();
-            });
-        }
-
        if (tempoSlider != null) {
            tempoSlider.setMax(strategy.progressOf(MAXIMUM_PLAYBACK_VALUE));
-            tempoSlider.setProgress(strategy.progressOf(initialTempo));
+            tempoSlider.setProgress(strategy.progressOf(tempo));
            tempoSlider.setOnSeekBarChangeListener(getOnTempoChangedListener());
        }
    }

    private void setupPitchControl(@NonNull View rootView) {
        pitchSlider = rootView.findViewById(R.id.pitchSeekbar);
-        pitchMinimumText = rootView.findViewById(R.id.pitchMinimumText);
-        pitchMaximumText = rootView.findViewById(R.id.pitchMaximumText);
+        TextView pitchMinimumText = rootView.findViewById(R.id.pitchMinimumText);
+        TextView pitchMaximumText = rootView.findViewById(R.id.pitchMaximumText);
        pitchCurrentText = rootView.findViewById(R.id.pitchCurrentText);
        pitchStepDownText = rootView.findViewById(R.id.pitchStepDown);
        pitchStepUpText = rootView.findViewById(R.id.pitchStepUp);

        if (pitchCurrentText != null)
-            pitchCurrentText.setText(PlayerHelper.formatPitch(initialPitch));
+            pitchCurrentText.setText(PlayerHelper.formatPitch(pitch));
        if (pitchMaximumText != null)
            pitchMaximumText.setText(PlayerHelper.formatPitch(MAXIMUM_PLAYBACK_VALUE));
        if (pitchMinimumText != null)
            pitchMinimumText.setText(PlayerHelper.formatPitch(MINIMUM_PLAYBACK_VALUE));

-        if (pitchStepUpText != null) {
-            pitchStepUpText.setText(getStepUpPercentString(PLAYBACK_STEP_VALUE));
-            pitchStepUpText.setOnClickListener(view -> {
-                onPitchSliderUpdated(getCurrentPitch() + PLAYBACK_STEP_VALUE);
-                setCurrentPlaybackParameters();
-            });
-        }
-
-        if (pitchStepDownText != null) {
-            pitchStepDownText.setText(getStepDownPercentString(PLAYBACK_STEP_VALUE));
-            pitchStepDownText.setOnClickListener(view -> {
-                onPitchSliderUpdated(getCurrentPitch() - PLAYBACK_STEP_VALUE);
-                setCurrentPlaybackParameters();
-            });
-        }
-
        if (pitchSlider != null) {
            pitchSlider.setMax(strategy.progressOf(MAXIMUM_PLAYBACK_VALUE));
-            pitchSlider.setProgress(strategy.progressOf(initialPitch));
+            pitchSlider.setProgress(strategy.progressOf(pitch));
            pitchSlider.setOnSeekBarChangeListener(getOnPitchChangedListener());
        }
    }
@@ -220,7 +216,7 @@ public class PlaybackParameterDialog extends DialogFragment {
    private void setupHookingControl(@NonNull View rootView) {
        unhookingCheckbox = rootView.findViewById(R.id.unhookCheckbox);
        if (unhookingCheckbox != null) {
-            unhookingCheckbox.setChecked(initialPitch != initialTempo);
+            unhookingCheckbox.setChecked(pitch != tempo);
            unhookingCheckbox.setOnCheckedChangeListener((compoundButton, isChecked) -> {
                if (isChecked) return;
                // When unchecked, slide back to the minimum of current tempo or pitch
@@ -231,24 +227,84 @@ public class PlaybackParameterDialog extends DialogFragment {
        }
    }

-    private void setupPresetControl(@NonNull View rootView) {
-        nightCorePresetText = rootView.findViewById(R.id.presetNightcore);
-        if (nightCorePresetText != null) {
-            nightCorePresetText.setOnClickListener(view -> {
-                final double randomPitch = NIGHTCORE_PITCH_LOWER +
-                        Math.random() * (NIGHTCORE_PITCH_UPPER - NIGHTCORE_PITCH_LOWER);
+    private void setupSkipSilenceControl(@NonNull View rootView) {
+        skipSilenceCheckbox = rootView.findViewById(R.id.skipSilenceCheckbox);
+        if (skipSilenceCheckbox != null) {
+            skipSilenceCheckbox.setChecked(initialSkipSilence);
+            skipSilenceCheckbox.setOnCheckedChangeListener((compoundButton, isChecked) ->
+                    setCurrentPlaybackParameters());
+        }
+    }

-                setTempoSlider(NIGHTCORE_TEMPO);
-                setPitchSlider(randomPitch);
+    private void setupStepSizeSelector(@NonNull final View rootView) {
+        TextView stepSizeOnePercentText = rootView.findViewById(R.id.stepSizeOnePercent);
+        TextView stepSizeFivePercentText = rootView.findViewById(R.id.stepSizeFivePercent);
+        TextView stepSizeTenPercentText = rootView.findViewById(R.id.stepSizeTenPercent);
+        TextView stepSizeTwentyFivePercentText = rootView.findViewById(R.id.stepSizeTwentyFivePercent);
+        TextView stepSizeOneHundredPercentText = rootView.findViewById(R.id.stepSizeOneHundredPercent);
+
+        if (stepSizeOnePercentText != null) {
+            stepSizeOnePercentText.setText(getPercentString(STEP_ONE_PERCENT_VALUE));
+            stepSizeOnePercentText.setOnClickListener(view ->
+                    changeStepSize(STEP_ONE_PERCENT_VALUE));
+        }
+
+        if (stepSizeFivePercentText != null) {
+            stepSizeFivePercentText.setText(getPercentString(STEP_FIVE_PERCENT_VALUE));
+            stepSizeFivePercentText.setOnClickListener(view ->
+                    changeStepSize(STEP_FIVE_PERCENT_VALUE));
+        }
+
+        if (stepSizeTenPercentText != null) {
+            stepSizeTenPercentText.setText(getPercentString(STEP_TEN_PERCENT_VALUE));
+            stepSizeTenPercentText.setOnClickListener(view ->
+                    changeStepSize(STEP_TEN_PERCENT_VALUE));
+        }
+
+        if (stepSizeTwentyFivePercentText != null) {
+            stepSizeTwentyFivePercentText.setText(getPercentString(STEP_TWENTY_FIVE_PERCENT_VALUE));
+            stepSizeTwentyFivePercentText.setOnClickListener(view ->
+                    changeStepSize(STEP_TWENTY_FIVE_PERCENT_VALUE));
+        }
+
+        if (stepSizeOneHundredPercentText != null) {
+            stepSizeOneHundredPercentText.setText(getPercentString(STEP_ONE_HUNDRED_PERCENT_VALUE));
+            stepSizeOneHundredPercentText.setOnClickListener(view ->
+                    changeStepSize(STEP_ONE_HUNDRED_PERCENT_VALUE));
+        }
+    }
+
+    private void changeStepSize(final double stepSize) {
+        this.stepSize = stepSize;
+
+        if (tempoStepUpText != null) {
+            tempoStepUpText.setText(getStepUpPercentString(stepSize));
+            tempoStepUpText.setOnClickListener(view -> {
+                onTempoSliderUpdated(getCurrentTempo() + stepSize);
                setCurrentPlaybackParameters();
            });
        }

-        resetPresetText = rootView.findViewById(R.id.presetReset);
-        if (resetPresetText != null) {
-            resetPresetText.setOnClickListener(view -> {
-                setTempoSlider(DEFAULT_TEMPO);
-                setPitchSlider(DEFAULT_PITCH);
+        if (tempoStepDownText != null) {
+            tempoStepDownText.setText(getStepDownPercentString(stepSize));
+            tempoStepDownText.setOnClickListener(view -> {
+                onTempoSliderUpdated(getCurrentTempo() - stepSize);
+                setCurrentPlaybackParameters();
+            });
+        }
+
+        if (pitchStepUpText != null) {
+            pitchStepUpText.setText(getStepUpPercentString(stepSize));
+            pitchStepUpText.setOnClickListener(view -> {
+                onPitchSliderUpdated(getCurrentPitch() + stepSize);
+                setCurrentPlaybackParameters();
+            });
+        }
+
+        if (pitchStepDownText != null) {
+            pitchStepDownText.setText(getStepDownPercentString(stepSize));
+            pitchStepDownText.setOnClickListener(view -> {
+                onPitchSliderUpdated(getCurrentPitch() - stepSize);
                setCurrentPlaybackParameters();
            });
        }
@@ -342,10 +398,11 @@ public class PlaybackParameterDialog extends DialogFragment {
    //////////////////////////////////////////////////////////////////////////*/

    private void setCurrentPlaybackParameters() {
-        setPlaybackParameters(getCurrentTempo(), getCurrentPitch());
+        setPlaybackParameters(getCurrentTempo(), getCurrentPitch(), getCurrentSkipSilence());
    }

-    private void setPlaybackParameters(final double tempo, final double pitch) {
+    private void setPlaybackParameters(final double tempo, final double pitch,
+                                       final boolean skipSilence) {
        if (callback != null && tempoCurrentText != null && pitchCurrentText != null) {
            if (DEBUG) Log.d(TAG, "Setting playback parameters to " +
                    "tempo=[" + tempo + "], " +
@@ -353,27 +410,40 @@ public class PlaybackParameterDialog extends DialogFragment {

            tempoCurrentText.setText(PlayerHelper.formatSpeed(tempo));
            pitchCurrentText.setText(PlayerHelper.formatPitch(pitch));
-            callback.onPlaybackParameterChanged((float) tempo, (float) pitch);
+            callback.onPlaybackParameterChanged((float) tempo, (float) pitch, skipSilence);
        }
    }

    private double getCurrentTempo() {
-        return tempoSlider == null ? initialTempo : strategy.valueOf(
+        return tempoSlider == null ? tempo : strategy.valueOf(
                tempoSlider.getProgress());
    }

    private double getCurrentPitch() {
-        return pitchSlider == null ? initialPitch : strategy.valueOf(
+        return pitchSlider == null ? pitch : strategy.valueOf(
                pitchSlider.getProgress());
    }

+    private double getCurrentStepSize() {
+        return stepSize;
+    }
+
+    private boolean getCurrentSkipSilence() {
+        return skipSilenceCheckbox != null && skipSilenceCheckbox.isChecked();
+    }
+
    @NonNull
    private static String getStepUpPercentString(final double percent) {
-        return STEP_UP_SIGN + PlayerHelper.formatPitch(percent);
+        return STEP_UP_SIGN + getPercentString(percent);
    }

    @NonNull
    private static String getStepDownPercentString(final double percent) {
-        return STEP_DOWN_SIGN + PlayerHelper.formatPitch(percent);
+        return STEP_DOWN_SIGN + getPercentString(percent);
+    }
+
+    @NonNull
+    private static String getPercentString(final double percent) {
+        return PlayerHelper.formatPitch(percent);
    }
 }
--- a/app/src/main/java/org/schabi/newpipe/player/helper/PlayerHelper.java
+++ b/app/src/main/java/org/schabi/newpipe/player/helper/PlayerHelper.java
@@ -4,30 +4,32 @@ import android.content.Context;
 import android.content.SharedPreferences;
 import android.os.Build;
 import android.preference.PreferenceManager;
+import android.support.annotation.IntDef;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.view.accessibility.CaptioningManager;

 import com.google.android.exoplayer2.SeekParameters;
+import com.google.android.exoplayer2.text.CaptionStyleCompat;
 import com.google.android.exoplayer2.trackselection.AdaptiveTrackSelection;
 import com.google.android.exoplayer2.trackselection.TrackSelection;
-import com.google.android.exoplayer2.text.CaptionStyleCompat;
 import com.google.android.exoplayer2.ui.AspectRatioFrameLayout;
 import com.google.android.exoplayer2.upstream.BandwidthMeter;
 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;
 import org.schabi.newpipe.player.playqueue.SinglePlayQueue;

+import java.lang.annotation.Retention;
 import java.text.DecimalFormat;
 import java.text.NumberFormat;
 import java.util.ArrayList;
@@ -37,10 +39,13 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Locale;
 import java.util.Set;
+import java.util.concurrent.TimeUnit;

 import static com.google.android.exoplayer2.ui.AspectRatioFrameLayout.RESIZE_MODE_FILL;
 import static com.google.android.exoplayer2.ui.AspectRatioFrameLayout.RESIZE_MODE_FIT;
 import static com.google.android.exoplayer2.ui.AspectRatioFrameLayout.RESIZE_MODE_ZOOM;
+import static java.lang.annotation.RetentionPolicy.SOURCE;
+import static org.schabi.newpipe.player.helper.PlayerHelper.MinimizeMode.*;

 public class PlayerHelper {
    private PlayerHelper() {}
@@ -50,6 +55,14 @@ public class PlayerHelper {
    private static final NumberFormat speedFormatter = new DecimalFormat("0.##x");
    private static final NumberFormat pitchFormatter = new DecimalFormat("##%");

+    @Retention(SOURCE)
+    @IntDef({MINIMIZE_ON_EXIT_MODE_NONE, MINIMIZE_ON_EXIT_MODE_BACKGROUND,
+            MINIMIZE_ON_EXIT_MODE_POPUP})
+    public @interface MinimizeMode {
+        int MINIMIZE_ON_EXIT_MODE_NONE = 0;
+        int MINIMIZE_ON_EXIT_MODE_BACKGROUND = 1;
+        int MINIMIZE_ON_EXIT_MODE_POPUP = 2;
+    }
    ////////////////////////////////////////////////////////////////////////////
    // Exposed helpers
    ////////////////////////////////////////////////////////////////////////////
@@ -74,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;
@@ -84,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)+ ")" : "");
    }

@@ -132,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();
@@ -145,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));
    }

    ////////////////////////////////////////////////////////////////////////////
@@ -156,12 +169,12 @@ public class PlayerHelper {
        return isResumeAfterAudioFocusGain(context, false);
    }

-    public static boolean isPlayerGestureEnabled(@NonNull final Context context) {
-        return isPlayerGestureEnabled(context, true);
+    public static boolean isVolumeGestureEnabled(@NonNull final Context context) {
+        return isVolumeGestureEnabled(context, true);
    }

-    public static boolean isUsingOldPlayer(@NonNull final Context context) {
-        return isUsingOldPlayer(context, false);
+    public static boolean isBrightnessGestureEnabled(@NonNull final Context context) {
+        return isBrightnessGestureEnabled(context, true);
    }

    public static boolean isRememberingPopupDimensions(@NonNull final Context context) {
@@ -172,9 +185,25 @@ public class PlayerHelper {
        return isAutoQueueEnabled(context, false);
    }

+    @MinimizeMode
+    public static int getMinimizeOnExitAction(@NonNull final Context context) {
+        final String defaultAction = context.getString(R.string.minimize_on_exit_none_key);
+        final String popupAction = context.getString(R.string.minimize_on_exit_popup_key);
+        final String backgroundAction = context.getString(R.string.minimize_on_exit_background_key);
+
+        final String action = getMinimizeOnExitAction(context, defaultAction);
+        if (action.equals(popupAction)) {
+            return MINIMIZE_ON_EXIT_MODE_POPUP;
+        } else if (action.equals(backgroundAction)) {
+            return MINIMIZE_ON_EXIT_MODE_BACKGROUND;
+        } else {
+            return MINIMIZE_ON_EXIT_MODE_NONE;
+        }
+    }
+
    @NonNull
    public static SeekParameters getSeekParameters(@NonNull final Context context) {
-        return isUsingInexactSeek(context, false) ?
+        return isUsingInexactSeek(context) ?
                SeekParameters.CLOSEST_SYNC : SeekParameters.EXACT;
    }

@@ -212,7 +241,6 @@ public class PlayerHelper {
    public static TrackSelection.Factory getQualitySelector(@NonNull final Context context,
                                                            @NonNull final BandwidthMeter meter) {
        return new AdaptiveTrackSelection.Factory(meter,
-                AdaptiveTrackSelection.DEFAULT_MAX_INITIAL_BITRATE,
                /*bufferDurationRequiredForQualityIncrease=*/1000,
                AdaptiveTrackSelection.DEFAULT_MAX_DURATION_FOR_QUALITY_DECREASE_MS,
                AdaptiveTrackSelection.DEFAULT_MIN_DURATION_TO_RETAIN_AFTER_DISCARD_MS,
@@ -223,10 +251,6 @@ public class PlayerHelper {
        return true;
    }

-    public static int getShutdownFlingVelocity(@NonNull final Context context) {
-        return 10000;
-    }
-
    public static int getTossFlingVelocity(@NonNull final Context context) {
        return 2500;
    }
@@ -248,7 +272,6 @@ public class PlayerHelper {
     * System font scaling:
     * Very small - 0.25f, Small - 0.5f, Normal - 1.0f, Large - 1.5f, Very Large - 2.0f
     * */
-    @NonNull
    public static float getCaptionScale(@NonNull final Context context) {
        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.KITKAT) return 1f;

@@ -260,6 +283,16 @@ public class PlayerHelper {

        return captioningManager.getFontScale();
    }
+
+    public static float getScreenBrightness(@NonNull final Context context) {
+        //a value of less than 0, the default, means to use the preferred screen brightness
+        return getScreenBrightness(context, -1);
+    }
+
+    public static void setScreenBrightness(@NonNull final Context context, final float setScreenBrightness) {
+        setScreenBrightness(context, setScreenBrightness, System.currentTimeMillis());
+    }
+
    ////////////////////////////////////////////////////////////////////////////
    // Private helpers
    ////////////////////////////////////////////////////////////////////////////
@@ -273,23 +306,54 @@ public class PlayerHelper {
        return getPreferences(context).getBoolean(context.getString(R.string.resume_on_audio_focus_gain_key), b);
    }

-    private static boolean isPlayerGestureEnabled(@NonNull final Context context, final boolean b) {
-        return getPreferences(context).getBoolean(context.getString(R.string.player_gesture_controls_key), b);
+    private static boolean isVolumeGestureEnabled(@NonNull final Context context, final boolean b) {
+        return getPreferences(context).getBoolean(context.getString(R.string.volume_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 isBrightnessGestureEnabled(@NonNull final Context context, final boolean b) {
+        return getPreferences(context).getBoolean(context.getString(R.string.brightness_gesture_control_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);
    }

-    private static boolean isUsingInexactSeek(@NonNull final Context context, final boolean b) {
-        return getPreferences(context).getBoolean(context.getString(R.string.use_inexact_seek_key), b);
+    private static boolean isUsingInexactSeek(@NonNull final Context context) {
+        return getPreferences(context).getBoolean(context.getString(R.string.use_inexact_seek_key), false);
    }

    private static boolean isAutoQueueEnabled(@NonNull final Context context, final boolean b) {
        return getPreferences(context).getBoolean(context.getString(R.string.auto_queue_key), b);
    }
+
+    private static void setScreenBrightness(@NonNull final Context context, final float screenBrightness, final long timestamp) {
+        SharedPreferences.Editor editor = getPreferences(context).edit();
+        editor.putFloat(context.getString(R.string.screen_brightness_key), screenBrightness);
+        editor.putLong(context.getString(R.string.screen_brightness_timestamp_key), timestamp);
+        editor.apply();
+    }
+
+    private static float getScreenBrightness(@NonNull final Context context, final float screenBrightness) {
+        SharedPreferences sp = getPreferences(context);
+        long timestamp = sp.getLong(context.getString(R.string.screen_brightness_timestamp_key), 0);
+        // hypothesis: 4h covers a viewing block, eg evening. External lightning conditions will change in the next
+        // viewing block so we fall back to the default brightness
+        if ((System.currentTimeMillis() - timestamp) > TimeUnit.HOURS.toMillis(4)) {
+            return screenBrightness;
+        } else {
+            return sp.getFloat(context.getString(R.string.screen_brightness_key), screenBrightness);
+        }
+    }
+
+    private static String getMinimizeOnExitAction(@NonNull final Context context,
+                                                  final String key) {
+        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;
+    }
 }
--- a/app/src/main/java/org/schabi/newpipe/player/mediasession/DummyPlaybackPreparer.java
+++ b/app/src/main/java/org/schabi/newpipe/player/mediasession/DummyPlaybackPreparer.java
@@ -1,45 +0,0 @@
-package org.schabi.newpipe.player.mediasession;
-
-import android.net.Uri;
-import android.os.Bundle;
-import android.os.ResultReceiver;
-
-import com.google.android.exoplayer2.Player;
-import com.google.android.exoplayer2.ext.mediasession.MediaSessionConnector;
-
-public class DummyPlaybackPreparer implements MediaSessionConnector.PlaybackPreparer {
-    @Override
-    public long getSupportedPrepareActions() {
-        return 0;
-    }
-
-    @Override
-    public void onPrepare() {
-
-    }
-
-    @Override
-    public void onPrepareFromMediaId(String mediaId, Bundle extras) {
-
-    }
-
-    @Override
-    public void onPrepareFromSearch(String query, Bundle extras) {
-
-    }
-
-    @Override
-    public void onPrepareFromUri(Uri uri, Bundle extras) {
-
-    }
-
-    @Override
-    public String[] getCommands() {
-        return new String[0];
-    }
-
-    @Override
-    public void onCommand(Player player, String command, Bundle extras, ResultReceiver cb) {
-
-    }
-}
--- a/app/src/main/java/org/schabi/newpipe/player/mediasession/MediaSessionCallback.java
+++ b/app/src/main/java/org/schabi/newpipe/player/mediasession/MediaSessionCallback.java
@@ -13,5 +13,4 @@ public interface MediaSessionCallback {

    void onPlay();
    void onPause();
-    void onSetShuffle(final boolean isShuffled);
 }
--- a/app/src/main/java/org/schabi/newpipe/player/mediasession/PlayQueueNavigator.java
+++ b/app/src/main/java/org/schabi/newpipe/player/mediasession/PlayQueueNavigator.java
@@ -79,7 +79,7 @@ public class PlayQueueNavigator implements MediaSessionConnector.QueueNavigator

    private void publishFloatingQueueWindow() {
        if (callback.getQueueSize() == 0) {
-            mediaSession.setQueue(Collections.<MediaSessionCompat.QueueItem>emptyList());
+            mediaSession.setQueue(Collections.emptyList());
            activeQueueItemId = MediaSessionCompat.QueueItem.UNKNOWN_ID;
            return;
        }
--- a/app/src/main/java/org/schabi/newpipe/player/mediasession/PlayQueuePlaybackController.java
+++ b/app/src/main/java/org/schabi/newpipe/player/mediasession/PlayQueuePlaybackController.java
@@ -1,7 +1,5 @@
 package org.schabi.newpipe.player.mediasession;

-import android.support.v4.media.session.PlaybackStateCompat;
-
 import com.google.android.exoplayer2.Player;
 import com.google.android.exoplayer2.ext.mediasession.DefaultPlaybackController;

@@ -22,10 +20,4 @@ public class PlayQueuePlaybackController extends DefaultPlaybackController {
    public void onPause(Player player) {
        callback.onPause();
    }
-
-    @Override
-    public void onSetShuffleMode(Player player, int shuffleMode) {
-        callback.onSetShuffle(shuffleMode == PlaybackStateCompat.SHUFFLE_MODE_ALL
-                || shuffleMode == PlaybackStateCompat.SHUFFLE_MODE_GROUP);
-    }
 }
--- a/app/src/main/java/org/schabi/newpipe/player/mediasource/FailedMediaSource.java
+++ b/app/src/main/java/org/schabi/newpipe/player/mediasource/FailedMediaSource.java
@@ -4,6 +4,7 @@ import android.support.annotation.NonNull;
 import android.util.Log;

 import com.google.android.exoplayer2.ExoPlayer;
+import com.google.android.exoplayer2.source.BaseMediaSource;
 import com.google.android.exoplayer2.source.MediaPeriod;
 import com.google.android.exoplayer2.upstream.Allocator;

@@ -11,7 +12,7 @@ import org.schabi.newpipe.player.playqueue.PlayQueueItem;

 import java.io.IOException;

-public class FailedMediaSource implements ManagedMediaSource {
+public class FailedMediaSource extends BaseMediaSource implements ManagedMediaSource {
    private final String TAG = "FailedMediaSource@" + Integer.toHexString(hashCode());

    public static class FailedMediaSourceException extends Exception {
@@ -72,11 +73,6 @@ public class FailedMediaSource implements ManagedMediaSource {
        return System.currentTimeMillis() >= retryTimestamp;
    }

-    @Override
-    public void prepareSource(ExoPlayer player, boolean isTopLevelSource, Listener listener) {
-        Log.e(TAG, "Loading failed source: ", error);
-    }
-
    @Override
    public void maybeThrowSourceInfoRefreshError() throws IOException {
        throw new IOException(error);
@@ -90,8 +86,14 @@ public class FailedMediaSource implements ManagedMediaSource {
    @Override
    public void releasePeriod(MediaPeriod mediaPeriod) {}

+
    @Override
-    public void releaseSource() {}
+    protected void prepareSourceInternal(ExoPlayer player, boolean isTopLevelSource) {
+        Log.e(TAG, "Loading failed source: ", error);
+    }
+
+    @Override
+    protected void releaseSourceInternal() {}

    @Override
    public boolean shouldBeReplacedWith(@NonNull final PlayQueueItem newIdentity,
--- a/app/src/main/java/org/schabi/newpipe/player/mediasource/LoadedMediaSource.java
+++ b/app/src/main/java/org/schabi/newpipe/player/mediasource/LoadedMediaSource.java
@@ -1,10 +1,12 @@
 package org.schabi.newpipe.player.mediasource;

+import android.os.Handler;
 import android.support.annotation.NonNull;

 import com.google.android.exoplayer2.ExoPlayer;
 import com.google.android.exoplayer2.source.MediaPeriod;
 import com.google.android.exoplayer2.source.MediaSource;
+import com.google.android.exoplayer2.source.MediaSourceEventListener;
 import com.google.android.exoplayer2.upstream.Allocator;

 import org.schabi.newpipe.player.playqueue.PlayQueueItem;
@@ -34,7 +36,8 @@ public class LoadedMediaSource implements ManagedMediaSource {
    }

    @Override
-    public void prepareSource(ExoPlayer player, boolean isTopLevelSource, Listener listener) {
+    public void prepareSource(ExoPlayer player, boolean isTopLevelSource,
+                              SourceInfoRefreshListener listener) {
        source.prepareSource(player, isTopLevelSource, listener);
    }

@@ -54,8 +57,18 @@ public class LoadedMediaSource implements ManagedMediaSource {
    }

    @Override
-    public void releaseSource() {
-        source.releaseSource();
+    public void releaseSource(SourceInfoRefreshListener listener) {
+        source.releaseSource(listener);
+    }
+
+    @Override
+    public void addEventListener(Handler handler, MediaSourceEventListener eventListener) {
+        source.addEventListener(handler, eventListener);
+    }
+
+    @Override
+    public void removeEventListener(MediaSourceEventListener eventListener) {
+        source.removeEventListener(eventListener);
    }

    @Override
--- a/app/src/main/java/org/schabi/newpipe/player/mediasource/ManagedMediaSourcePlaylist.java
+++ b/app/src/main/java/org/schabi/newpipe/player/mediasource/ManagedMediaSourcePlaylist.java
@@ -3,14 +3,14 @@ package org.schabi.newpipe.player.mediasource;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;

-import com.google.android.exoplayer2.source.DynamicConcatenatingMediaSource;
+import com.google.android.exoplayer2.source.ConcatenatingMediaSource;
 import com.google.android.exoplayer2.source.ShuffleOrder;

 public class ManagedMediaSourcePlaylist {
-    @NonNull private final DynamicConcatenatingMediaSource internalSource;
+    @NonNull private final ConcatenatingMediaSource internalSource;

    public ManagedMediaSourcePlaylist() {
-        internalSource = new DynamicConcatenatingMediaSource(/*isPlaylistAtomic=*/false,
+        internalSource = new ConcatenatingMediaSource(/*isPlaylistAtomic=*/false,
                new ShuffleOrder.UnshuffledShuffleOrder(0));
    }

@@ -32,12 +32,8 @@ public class ManagedMediaSourcePlaylist {
                null : (ManagedMediaSource) internalSource.getMediaSource(index);
    }

-    public void dispose() {
-        internalSource.releaseSource();
-    }
-
    @NonNull
-    public DynamicConcatenatingMediaSource getParentMediaSource() {
+    public ConcatenatingMediaSource getParentMediaSource() {
        return internalSource;
    }

@@ -46,7 +42,7 @@ public class ManagedMediaSourcePlaylist {
    //////////////////////////////////////////////////////////////////////////*/

    /**
-     * Expands the {@link DynamicConcatenatingMediaSource} by appending it with a
+     * Expands the {@link ConcatenatingMediaSource} by appending it with a
     * {@link PlaceholderMediaSource}.
     *
     * @see #append(ManagedMediaSource)
@@ -56,17 +52,17 @@ public class ManagedMediaSourcePlaylist {
    }

    /**
-     * Appends a {@link ManagedMediaSource} to the end of {@link DynamicConcatenatingMediaSource}.
-     * @see DynamicConcatenatingMediaSource#addMediaSource
+     * Appends a {@link ManagedMediaSource} to the end of {@link ConcatenatingMediaSource}.
+     * @see ConcatenatingMediaSource#addMediaSource
     * */
    public synchronized void append(@NonNull final ManagedMediaSource source) {
        internalSource.addMediaSource(source);
    }

    /**
-     * Removes a {@link ManagedMediaSource} from {@link DynamicConcatenatingMediaSource}
+     * Removes a {@link ManagedMediaSource} from {@link ConcatenatingMediaSource}
     * at the given index. If this index is out of bound, then the removal is ignored.
-     * @see DynamicConcatenatingMediaSource#removeMediaSource(int)
+     * @see ConcatenatingMediaSource#removeMediaSource(int)
     * */
    public synchronized void remove(final int index) {
        if (index < 0 || index > internalSource.getSize()) return;
@@ -75,10 +71,10 @@ public class ManagedMediaSourcePlaylist {
    }

    /**
-     * Moves a {@link ManagedMediaSource} in {@link DynamicConcatenatingMediaSource}
+     * Moves a {@link ManagedMediaSource} in {@link ConcatenatingMediaSource}
     * from the given source index to the target index. If either index is out of bound,
     * then the call is ignored.
-     * @see DynamicConcatenatingMediaSource#moveMediaSource(int, int)
+     * @see ConcatenatingMediaSource#moveMediaSource(int, int)
     * */
    public synchronized void move(final int source, final int target) {
        if (source < 0 || target < 0) return;
@@ -99,7 +95,7 @@ public class ManagedMediaSourcePlaylist {
    }

    /**
-     * Updates the {@link ManagedMediaSource} in {@link DynamicConcatenatingMediaSource}
+     * Updates the {@link ManagedMediaSource} in {@link ConcatenatingMediaSource}
     * at the given index with a given {@link ManagedMediaSource}.
     * @see #update(int, ManagedMediaSource, Runnable)
     * */
@@ -108,11 +104,11 @@ public class ManagedMediaSourcePlaylist {
    }

    /**
-     * Updates the {@link ManagedMediaSource} in {@link DynamicConcatenatingMediaSource}
+     * Updates the {@link ManagedMediaSource} in {@link ConcatenatingMediaSource}
     * at the given index with a given {@link ManagedMediaSource}. If the index is out of bound,
     * then the replacement is ignored.
-     * @see DynamicConcatenatingMediaSource#addMediaSource
-     * @see DynamicConcatenatingMediaSource#removeMediaSource(int, Runnable)
+     * @see ConcatenatingMediaSource#addMediaSource
+     * @see ConcatenatingMediaSource#removeMediaSource(int, Runnable)
     * */
    public synchronized void update(final int index, @NonNull final ManagedMediaSource source,
                                    @Nullable final Runnable finalizingAction) {
--- a/app/src/main/java/org/schabi/newpipe/player/mediasource/PlaceholderMediaSource.java
+++ b/app/src/main/java/org/schabi/newpipe/player/mediasource/PlaceholderMediaSource.java
@@ -3,20 +3,19 @@ package org.schabi.newpipe.player.mediasource;
 import android.support.annotation.NonNull;

 import com.google.android.exoplayer2.ExoPlayer;
+import com.google.android.exoplayer2.source.BaseMediaSource;
 import com.google.android.exoplayer2.source.MediaPeriod;
 import com.google.android.exoplayer2.upstream.Allocator;

 import org.schabi.newpipe.player.playqueue.PlayQueueItem;

-import java.io.IOException;
-
-public class PlaceholderMediaSource implements ManagedMediaSource {
+public class PlaceholderMediaSource extends BaseMediaSource implements ManagedMediaSource {
    // Do nothing, so this will stall the playback
-    @Override public void prepareSource(ExoPlayer player, boolean isTopLevelSource, Listener listener) {}
-    @Override public void maybeThrowSourceInfoRefreshError() throws IOException {}
+    @Override public void maybeThrowSourceInfoRefreshError() {}
    @Override public MediaPeriod createPeriod(MediaPeriodId id, Allocator allocator) { return null; }
    @Override public void releasePeriod(MediaPeriod mediaPeriod) {}
-    @Override public void releaseSource() {}
+    @Override protected void prepareSourceInternal(ExoPlayer player, boolean isTopLevelSource) {}
+    @Override protected void releaseSourceInternal() {}

    @Override
    public boolean shouldBeReplacedWith(@NonNull PlayQueueItem newIdentity,
--- a/app/src/main/java/org/schabi/newpipe/player/old/PlayVideoActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/player/old/PlayVideoActivity.java
@@ -1,369 +0,0 @@
-package org.schabi.newpipe.player.old;
-
-import android.content.Context;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.content.pm.ActivityInfo;
-import android.content.res.Configuration;
-import android.media.AudioManager;
-import android.media.MediaPlayer;
-import android.net.Uri;
-import android.os.Build;
-import android.os.Bundle;
-import android.os.Handler;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.AppCompatActivity;
-import android.util.DisplayMetrics;
-import android.util.Log;
-import android.view.Display;
-import android.view.KeyEvent;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.WindowManager;
-import android.widget.Button;
-import android.widget.MediaController;
-import android.widget.ProgressBar;
-import android.widget.VideoView;
-
-import org.schabi.newpipe.R;
-
-/*
- * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
- * PlayVideoActivity.java is part of NewPipe.
- *
- * NewPipe is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * NewPipe is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-public class PlayVideoActivity extends AppCompatActivity {
-
-    //// TODO: 11.09.15 add "choose stream" menu 
-    
-    private static final String TAG = PlayVideoActivity.class.toString();
-    public static final String VIDEO_URL = "video_url";
-    public static final String STREAM_URL = "stream_url";
-    public static final String VIDEO_TITLE = "video_title";
-    private static final String POSITION = "position";
-    public static final String START_POSITION = "start_position";
-
-    private static final long HIDING_DELAY = 3000;
-
-    private String videoUrl = "";
-
-    private ActionBar actionBar;
-    private VideoView videoView;
-    private int position;
-    private MediaController mediaController;
-    private ProgressBar progressBar;
-    private View decorView;
-    private boolean uiIsHidden;
-    private static long lastUiShowTime;
-    private boolean isLandscape = true;
-    private boolean hasSoftKeys;
-
-    private SharedPreferences prefs;
-    private static final String PREF_IS_LANDSCAPE = "is_landscape";
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        setContentView(R.layout.activity_play_video);
-        setVolumeControlStream(AudioManager.STREAM_MUSIC);
-
-        //set background arrow style
-        getSupportActionBar().setHomeAsUpIndicator(R.drawable.ic_arrow_back_white_24dp);
-
-        isLandscape = checkIfLandscape();
-        hasSoftKeys = checkIfHasSoftKeys();
-
-        actionBar = getSupportActionBar();
-        assert actionBar != null;
-        actionBar.setDisplayHomeAsUpEnabled(true);
-        Intent intent = getIntent();
-        if(mediaController == null) {
-            //prevents back button hiding media controller controls (after showing them)
-            //instead of exiting video
-            //see http://stackoverflow.com/questions/6051825
-            //also solves https://github.com/theScrabi/NewPipe/issues/99
-            mediaController = new MediaController(this) {
-                @Override
-                public boolean dispatchKeyEvent(KeyEvent event) {
-                    int keyCode = event.getKeyCode();
-                    final boolean uniqueDown = event.getRepeatCount() == 0
-                            && event.getAction() == KeyEvent.ACTION_DOWN;
-                    if (keyCode == KeyEvent.KEYCODE_BACK) {
-                        if (uniqueDown)
-                        {
-                            if (isShowing()) {
-                                finish();
-                            } else {
-                                hide();
-                            }
-                        }
-                        return true;
-                    }
-                    return super.dispatchKeyEvent(event);
-                }
-            };
-        }
-
-        position = intent.getIntExtra(START_POSITION, 0)*1000;//convert from seconds to milliseconds
-
-        videoView = findViewById(R.id.video_view);
-        progressBar = findViewById(R.id.play_video_progress_bar);
-        try {
-            videoView.setMediaController(mediaController);
-            videoView.setVideoURI(Uri.parse(intent.getStringExtra(STREAM_URL)));
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        videoView.requestFocus();
-        videoView.setOnPreparedListener(new MediaPlayer.OnPreparedListener() {
-            @Override
-            public void onPrepared(MediaPlayer mp) {
-                progressBar.setVisibility(View.GONE);
-                videoView.seekTo(position);
-                if (position <= 0) {
-                    videoView.start();
-                    showUi();
-                } else {
-                    videoView.pause();
-                }
-            }
-        });
-        videoUrl = intent.getStringExtra(VIDEO_URL);
-
-        Button button = findViewById(R.id.content_button);
-        button.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                if(uiIsHidden) {
-                    showUi();
-                } else {
-                    hideUi();
-                }
-            }
-        });
-        decorView = getWindow().getDecorView();
-        decorView.setOnSystemUiVisibilityChangeListener(new View.OnSystemUiVisibilityChangeListener() {
-            @Override
-            public void onSystemUiVisibilityChange(int visibility) {
-                if (visibility == View.VISIBLE && uiIsHidden) {
-                    showUi();
-                }
-            }
-        });
-
-        if (android.os.Build.VERSION.SDK_INT >= 17) {
-            decorView.setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
-                    | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
-                    | View.SYSTEM_UI_FLAG_LAYOUT_STABLE);
-        }
-
-        prefs = getPreferences(Context.MODE_PRIVATE);
-        if(prefs.getBoolean(PREF_IS_LANDSCAPE, false) && !isLandscape) {
-            toggleOrientation();
-        }
-    }
-
-    @Override
-    public boolean onCreatePanelMenu(int featured, Menu menu) {
-        super.onCreatePanelMenu(featured, menu);
-        MenuInflater inflater = getMenuInflater();
-        inflater.inflate(R.menu.video_player, menu);
-
-        return true;
-    }
-
-    @Override
-    public void onPause() {
-        super.onPause();
-        videoView.pause();
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-    }
-
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-        prefs = getPreferences(Context.MODE_PRIVATE);
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        int id = item.getItemId();
-        switch(id) {
-            case android.R.id.home:
-                finish();
-                break;
-            case R.id.menu_item_share:
-                Intent intent = new Intent();
-                intent.setAction(Intent.ACTION_SEND);
-                intent.putExtra(Intent.EXTRA_TEXT, videoUrl);
-                intent.setType("text/plain");
-                startActivity(Intent.createChooser(intent, getString(R.string.share_dialog_title)));
-                break;
-            case R.id.menu_item_screen_rotation:
-                toggleOrientation();
-                break;
-            default:
-                Log.e(TAG, "Error: MenuItem not known");
-                return false;
-        }
-        return true;
-    }
-
-    @Override
-    public void onConfigurationChanged(Configuration config) {
-        super.onConfigurationChanged(config);
-
-        if (config.orientation == Configuration.ORIENTATION_LANDSCAPE) {
-            isLandscape = true;
-            adjustMediaControlMetrics();
-        } else if (config.orientation == Configuration.ORIENTATION_PORTRAIT){
-            isLandscape = false;
-            adjustMediaControlMetrics();
-        }
-    }
-
-    @Override
-    public void onSaveInstanceState(Bundle savedInstanceState) {
-        super.onSaveInstanceState(savedInstanceState);
-        //savedInstanceState.putInt(POSITION, videoView.getCurrentPosition());
-        //videoView.pause();
-    }
-
-    @Override
-    public void onRestoreInstanceState(Bundle savedInstanceState) {
-        super.onRestoreInstanceState(savedInstanceState);
-        position = savedInstanceState.getInt(POSITION);
-        //videoView.seekTo(position);
-    }
-
-    private void showUi() {
-        try {
-            uiIsHidden = false;
-            mediaController.show(100000);
-            actionBar.show();
-            adjustMediaControlMetrics();
-            getWindow().clearFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
-            Handler handler = new Handler();
-            handler.postDelayed(new Runnable() {
-                @Override
-                public void run() {
-                    if ((System.currentTimeMillis() - lastUiShowTime) >= HIDING_DELAY) {
-                        hideUi();
-                    }
-                }
-            }, HIDING_DELAY);
-            lastUiShowTime = System.currentTimeMillis();
-        }catch(Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    private void hideUi() {
-        uiIsHidden = true;
-        actionBar.hide();
-        mediaController.hide();
-        if (android.os.Build.VERSION.SDK_INT >= 17) {
-            decorView.setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
-                    | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
-                    | View.SYSTEM_UI_FLAG_FULLSCREEN
-                    | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
-                    | View.SYSTEM_UI_FLAG_LAYOUT_STABLE);
-        }
-        getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,
-                WindowManager.LayoutParams.FLAG_FULLSCREEN);
-    }
-
-    private void adjustMediaControlMetrics() {
-        MediaController.LayoutParams mediaControllerLayout
-                = new MediaController.LayoutParams(MediaController.LayoutParams.MATCH_PARENT,
-                MediaController.LayoutParams.WRAP_CONTENT);
-
-        if(!hasSoftKeys) {
-            mediaControllerLayout.setMargins(20, 0, 20, 20);
-        } else {
-            int width = getNavigationBarWidth();
-            int height = getNavigationBarHeight();
-            mediaControllerLayout.setMargins(width + 20, 0, width + 20, height + 20);
-        }
-        mediaController.setLayoutParams(mediaControllerLayout);
-    }
-
-    private boolean checkIfHasSoftKeys(){
-        return Build.VERSION.SDK_INT >= 17 ||
-                getNavigationBarHeight() != 0 ||
-                getNavigationBarWidth() != 0;
-    }
-
-    private int getNavigationBarHeight() {
-        if(Build.VERSION.SDK_INT >= 17) {
-            Display d = getWindowManager().getDefaultDisplay();
-
-            DisplayMetrics realDisplayMetrics = new DisplayMetrics();
-            d.getRealMetrics(realDisplayMetrics);
-            DisplayMetrics displayMetrics = new DisplayMetrics();
-            d.getMetrics(displayMetrics);
-
-            int realHeight = realDisplayMetrics.heightPixels;
-            int displayHeight = displayMetrics.heightPixels;
-            return realHeight - displayHeight;
-        } else {
-            return 50;
-        }
-    }
-
-    private int getNavigationBarWidth() {
-        if(Build.VERSION.SDK_INT >= 17) {
-            Display d = getWindowManager().getDefaultDisplay();
-
-            DisplayMetrics realDisplayMetrics = new DisplayMetrics();
-            d.getRealMetrics(realDisplayMetrics);
-            DisplayMetrics displayMetrics = new DisplayMetrics();
-            d.getMetrics(displayMetrics);
-
-            int realWidth = realDisplayMetrics.widthPixels;
-            int displayWidth = displayMetrics.widthPixels;
-            return realWidth - displayWidth;
-        } else {
-            return 50;
-        }
-    }
-
-    private boolean checkIfLandscape() {
-        DisplayMetrics displayMetrics = new DisplayMetrics();
-        getWindowManager().getDefaultDisplay().getMetrics(displayMetrics);
-        return displayMetrics.heightPixels < displayMetrics.widthPixels;
-    }
-
-    private void toggleOrientation() {
-        if(isLandscape)  {
-            isLandscape = false;
-            setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
-        } else {
-            isLandscape = true;
-            setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE);
-        }
-        SharedPreferences.Editor editor = prefs.edit();
-        editor.putBoolean(PREF_IS_LANDSCAPE, isLandscape);
-        editor.apply();
-    }
-}
--- a/app/src/main/java/org/schabi/newpipe/player/playback/BasePlayerMediaSession.java
+++ b/app/src/main/java/org/schabi/newpipe/player/playback/BasePlayerMediaSession.java
@@ -8,7 +8,7 @@ import org.schabi.newpipe.player.mediasession.MediaSessionCallback;
 import org.schabi.newpipe.player.playqueue.PlayQueueItem;

 public class BasePlayerMediaSession implements MediaSessionCallback {
-    private BasePlayer player;
+    private final BasePlayer player;

    public BasePlayerMediaSession(final BasePlayer player) {
        this.player = player;
@@ -69,9 +69,4 @@ public class BasePlayerMediaSession implements MediaSessionCallback {
    public void onPause() {
        player.onPause();
    }
-
-    @Override
-    public void onSetShuffle(boolean isShuffled) {
-        player.onShuffleModeEnabledChanged(isShuffled);
-    }
 }
--- a/app/src/main/java/org/schabi/newpipe/player/playback/CustomTrackSelector.java
+++ b/app/src/main/java/org/schabi/newpipe/player/playback/CustomTrackSelector.java
@@ -4,7 +4,6 @@ import android.support.annotation.NonNull;
 import android.text.TextUtils;

 import com.google.android.exoplayer2.C;
-import com.google.android.exoplayer2.ExoPlaybackException;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.source.TrackGroup;
 import com.google.android.exoplayer2.source.TrackGroupArray;
@@ -12,7 +11,6 @@ import com.google.android.exoplayer2.trackselection.DefaultTrackSelector;
 import com.google.android.exoplayer2.trackselection.FixedTrackSelection;
 import com.google.android.exoplayer2.trackselection.TrackSelection;
 import com.google.android.exoplayer2.util.Assertions;
-import com.google.android.exoplayer2.util.Util;

 /**
 * This class allows irregular text language labels for use when selecting text captions and
@@ -55,7 +53,7 @@ public class CustomTrackSelector extends DefaultTrackSelector {
    /** @see DefaultTrackSelector#selectTextTrack(TrackGroupArray, int[][], Parameters) */
    @Override
    protected TrackSelection selectTextTrack(TrackGroupArray groups, int[][] formatSupport,
-                                             Parameters params) throws ExoPlaybackException {
+                                             Parameters params) {
        TrackGroup selectedGroup = null;
        int selectedTrackIndex = 0;
        int selectedTrackScore = 0;
--- a/app/src/main/java/org/schabi/newpipe/player/playback/MediaSourceManager.java
+++ b/app/src/main/java/org/schabi/newpipe/player/playback/MediaSourceManager.java
@@ -5,12 +5,10 @@ import android.support.annotation.Nullable;
 import android.support.v4.util.ArraySet;
 import android.util.Log;

-import com.google.android.exoplayer2.source.DynamicConcatenatingMediaSource;
 import com.google.android.exoplayer2.source.MediaSource;

 import org.reactivestreams.Subscriber;
 import org.reactivestreams.Subscription;
-import org.schabi.newpipe.extractor.stream.StreamInfo;
 import org.schabi.newpipe.player.mediasource.FailedMediaSource;
 import org.schabi.newpipe.player.mediasource.LoadedMediaSource;
 import org.schabi.newpipe.player.mediasource.ManagedMediaSource;
@@ -24,10 +22,8 @@ import org.schabi.newpipe.player.playqueue.events.RemoveEvent;
 import org.schabi.newpipe.player.playqueue.events.ReorderEvent;
 import org.schabi.newpipe.util.ServiceHelper;

-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.List;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -37,8 +33,6 @@ import io.reactivex.Single;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.disposables.CompositeDisposable;
 import io.reactivex.disposables.Disposable;
-import io.reactivex.disposables.SerialDisposable;
-import io.reactivex.functions.Consumer;
 import io.reactivex.internal.subscriptions.EmptySubscription;
 import io.reactivex.schedulers.Schedulers;
 import io.reactivex.subjects.PublishSubject;
@@ -104,7 +98,6 @@ public class MediaSourceManager {
    private final static int MAXIMUM_LOADER_SIZE = WINDOW_SIZE * 2 + 1;
    @NonNull private final CompositeDisposable loaderReactor;
    @NonNull private final Set<PlayQueueItem> loadingItems;
-    @NonNull private final SerialDisposable syncReactor;

    @NonNull private final AtomicBoolean isBlocked;

@@ -144,7 +137,6 @@ public class MediaSourceManager {

        this.playQueueReactor = EmptySubscription.INSTANCE;
        this.loaderReactor = new CompositeDisposable();
-        this.syncReactor = new SerialDisposable();

        this.isBlocked = new AtomicBoolean(false);

@@ -171,8 +163,6 @@ public class MediaSourceManager {

        playQueueReactor.cancel();
        loaderReactor.dispose();
-        syncReactor.dispose();
-        playlist.dispose();
    }

    /*//////////////////////////////////////////////////////////////////////////
@@ -311,21 +301,7 @@ public class MediaSourceManager {
        final PlayQueueItem currentItem = playQueue.getItem();
        if (isBlocked.get() || currentItem == null) return;

-        final Consumer<StreamInfo> onSuccess = info -> syncInternal(currentItem, info);
-        final Consumer<Throwable> onError = throwable -> syncInternal(currentItem, null);
-
-        final Disposable sync = currentItem.getStream()
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(onSuccess, onError);
-        syncReactor.set(sync);
-    }
-
-    private void syncInternal(@NonNull final PlayQueueItem item,
-                              @Nullable final StreamInfo info) {
-        // Ensure the current item is up to date with the play queue
-        if (playQueue.getItem() == item) {
-            playbackListener.onPlaybackSynchronize(item, info);
-        }
+        playbackListener.onPlaybackSynchronize(currentItem);
    }

    private synchronized void maybeSynchronizePlayer() {
@@ -359,7 +335,7 @@ public class MediaSourceManager {

    private void loadImmediate() {
        if (DEBUG) Log.d(TAG, "MediaSource - loadImmediate() called");
-        final ItemsToLoad itemsToLoad = getItemsToLoad(playQueue, WINDOW_SIZE);
+        final ItemsToLoad itemsToLoad = getItemsToLoad(playQueue);
        if (itemsToLoad == null) return;

        // Evict the previous items being loaded to free up memory, before start loading new ones
@@ -424,7 +400,8 @@ public class MediaSourceManager {
    }

    /**
-     * Checks if the corresponding MediaSource in {@link DynamicConcatenatingMediaSource}
+     * Checks if the corresponding MediaSource in
+     * {@link com.google.android.exoplayer2.source.ConcatenatingMediaSource}
     * for a given {@link PlayQueueItem} needs replacement, either due to gapless playback
     * readiness or playlist desynchronization.
     * <br><br>
@@ -481,8 +458,6 @@ public class MediaSourceManager {

    private void resetSources() {
        if (DEBUG) Log.d(TAG, "resetSources() called.");
-
-        playlist.dispose();
        playlist = new ManagedMediaSourcePlaylist();
    }

@@ -497,8 +472,7 @@ public class MediaSourceManager {
    // Manager Helpers
    //////////////////////////////////////////////////////////////////////////*/
    @Nullable
-    private static ItemsToLoad getItemsToLoad(@NonNull final PlayQueue playQueue,
-                                              final int windowSize) {
+    private static ItemsToLoad getItemsToLoad(@NonNull final PlayQueue playQueue) {
        // The current item has higher priority
        final int currentIndex = playQueue.getIndex();
        final PlayQueueItem currentItem = playQueue.getItem(currentIndex);
@@ -507,8 +481,8 @@ public class MediaSourceManager {
        // The rest are just for seamless playback
        // Although timeline is not updated prior to the current index, these sources are still
        // loaded into the cache for faster retrieval at a potentially later time.
-        final int leftBound = Math.max(0, currentIndex - windowSize);
-        final int rightLimit = currentIndex + windowSize + 1;
+        final int leftBound = Math.max(0, currentIndex - MediaSourceManager.WINDOW_SIZE);
+        final int rightLimit = currentIndex + MediaSourceManager.WINDOW_SIZE + 1;
        final int rightBound = Math.min(playQueue.size(), rightLimit);
        final Set<PlayQueueItem> neighbors = new ArraySet<>(
                playQueue.getStreams().subList(leftBound,rightBound));
--- a/app/src/main/java/org/schabi/newpipe/player/playback/PlaybackListener.java
+++ b/app/src/main/java/org/schabi/newpipe/player/playback/PlaybackListener.java
@@ -8,8 +8,6 @@ import com.google.android.exoplayer2.source.MediaSource;
 import org.schabi.newpipe.extractor.stream.StreamInfo;
 import org.schabi.newpipe.player.playqueue.PlayQueueItem;

-import java.util.List;
-
 public interface PlaybackListener {

    /**
@@ -45,7 +43,7 @@ public interface PlaybackListener {
     *
     * May be called anytime at any amount once unblock is called.
     * */
-    void onPlaybackSynchronize(@NonNull final PlayQueueItem item, @Nullable final StreamInfo info);
+    void onPlaybackSynchronize(@NonNull final PlayQueueItem item);

    /**
     * Requests the listener to resolve a stream info into a media source
--- a/app/src/main/java/org/schabi/newpipe/player/playqueue/AbstractInfoPlayQueue.java
+++ b/app/src/main/java/org/schabi/newpipe/player/playqueue/AbstractInfoPlayQueue.java
@@ -19,14 +19,14 @@ abstract class AbstractInfoPlayQueue<T extends ListInfo, U extends InfoItem> ext
    boolean isInitial;
    boolean isComplete;

-    int serviceId;
-    String baseUrl;
+    final int serviceId;
+    final String baseUrl;
    String nextUrl;

    transient Disposable fetchReactor;

    AbstractInfoPlayQueue(final U item) {
-        this(item.getServiceId(), item.getUrl(), null, Collections.<StreamInfoItem>emptyList(), 0);
+        this(item.getServiceId(), item.getUrl(), null, Collections.emptyList(), 0);
    }

    AbstractInfoPlayQueue(final int serviceId,
--- a/app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueue.java
+++ b/app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueue.java
@@ -6,6 +6,7 @@ import android.util.Log;

 import org.reactivestreams.Subscriber;
 import org.reactivestreams.Subscription;
+import org.schabi.newpipe.BuildConfig;
 import org.schabi.newpipe.player.playqueue.events.AppendEvent;
 import org.schabi.newpipe.player.playqueue.events.ErrorEvent;
 import org.schabi.newpipe.player.playqueue.events.InitEvent;
@@ -41,7 +42,7 @@ import io.reactivex.subjects.BehaviorSubject;
 public abstract class PlayQueue implements Serializable {
    private final String TAG = "PlayQueue@" + Integer.toHexString(hashCode());

-    public static final boolean DEBUG = true;
+    public static final boolean DEBUG = !BuildConfig.BUILD_TYPE.equals("release");

    private ArrayList<PlayQueueItem> backup;
    private ArrayList<PlayQueueItem> streams;
@@ -232,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()));
@@ -313,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));
    }

--- a/app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueueAdapter.java
+++ b/app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueueAdapter.java
@@ -14,6 +14,7 @@ import org.schabi.newpipe.player.playqueue.events.MoveEvent;
 import org.schabi.newpipe.player.playqueue.events.PlayQueueEvent;
 import org.schabi.newpipe.player.playqueue.events.RemoveEvent;
 import org.schabi.newpipe.player.playqueue.events.SelectEvent;
+import org.schabi.newpipe.util.FallbackViewHolder;

 import java.util.List;

@@ -188,7 +189,7 @@ public class PlayQueueAdapter extends RecyclerView.Adapter<RecyclerView.ViewHold
                return new PlayQueueItemHolder(LayoutInflater.from(parent.getContext()).inflate(R.layout.play_queue_item, parent, false));
            default:
                Log.e(TAG, "Attempting to create view holder with undefined type: " + type);
-                return null;
+                return new FallbackViewHolder(new View(parent.getContext()));
        }
    }

--- a/app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueueItem.java
+++ b/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
    ////////////////////////////////////////////////////////////////////////////
--- a/app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueueItemBuilder.java
+++ b/app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueueItemBuilder.java
@@ -5,10 +5,8 @@ import android.text.TextUtils;
 import android.view.MotionEvent;
 import android.view.View;

-import com.nostra13.universalimageloader.core.DisplayImageOptions;
 import com.nostra13.universalimageloader.core.ImageLoader;

-import org.schabi.newpipe.R;
 import org.schabi.newpipe.extractor.NewPipe;
 import org.schabi.newpipe.util.ImageDisplayConstants;
 import org.schabi.newpipe.util.Localization;
--- a/app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueueItemHolder.java
+++ b/app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueueItemHolder.java
@@ -6,8 +6,6 @@ import android.widget.ImageView;
 import android.widget.TextView;

 import org.schabi.newpipe.R;
-import org.schabi.newpipe.extractor.InfoItem;
-import org.schabi.newpipe.info_list.holder.InfoItemHolder;

 /**
 * Created by Christian Schabesberger on 01.08.16.
--- a/app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueueItemTouchCallback.java
+++ b/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());
+    }
 }
--- a/app/src/main/java/org/schabi/newpipe/player/resolver/AudioPlaybackResolver.java
+++ b/app/src/main/java/org/schabi/newpipe/player/resolver/AudioPlaybackResolver.java
@@ -0,0 +1,41 @@
+package org.schabi.newpipe.player.resolver;
+
+import android.content.Context;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+
+import com.google.android.exoplayer2.source.MediaSource;
+
+import org.schabi.newpipe.extractor.MediaFormat;
+import org.schabi.newpipe.extractor.stream.AudioStream;
+import org.schabi.newpipe.extractor.stream.StreamInfo;
+import org.schabi.newpipe.player.helper.PlayerDataSource;
+import org.schabi.newpipe.player.helper.PlayerHelper;
+import org.schabi.newpipe.util.ListHelper;
+
+public class AudioPlaybackResolver implements PlaybackResolver {
+
+    @NonNull private final Context context;
+    @NonNull private final PlayerDataSource dataSource;
+
+    public AudioPlaybackResolver(@NonNull final Context context,
+                                 @NonNull final PlayerDataSource dataSource) {
+        this.context = context;
+        this.dataSource = dataSource;
+    }
+
+    @Override
+    @Nullable
+    public MediaSource resolve(@NonNull StreamInfo info) {
+        final MediaSource liveSource = maybeBuildLiveMediaSource(dataSource, info);
+        if (liveSource != null) return liveSource;
+
+        final int index = ListHelper.getDefaultAudioFormat(context, info.getAudioStreams());
+        if (index < 0 || index >= info.getAudioStreams().size()) return null;
+
+        final AudioStream audio = info.getAudioStreams().get(index);
+        final MediaSourceTag tag = new MediaSourceTag(info);
+        return buildMediaSource(dataSource, audio.getUrl(), PlayerHelper.cacheKeyOf(info, audio),
+                MediaFormat.getSuffixById(audio.getFormatId()), tag);
+    }
+}
--- a/Show More
+++ b/Show More