move on to v0.13.3

also:
- reduce snack bar error visibility time
- fix metadata error

.github/CONTRIBUTING.md

@@ -1,40 +1,46 @@
 NewPipe contribution guidelines
 ===============================
 
-READ THIS GUIDELINES CAREFULLY BEFORE CONTRIBUTING.
+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 if a crash occurs.
+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 request
+## Issue reporting/feature requests
 
-* Search the [existing issues](https://github.com/theScrabi/NewPipe/issues) first to make sure your issue/feature hasn't been reported/requested before
-* Check if this issue/feature is already fixed/implemented in the repository
-* If you are an android/java developer you are always welcome to fix/implement an issue/a feature yourself
-* Use english
+* 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.
 
-## Bugfixing
-* If you want to help NewPipe getting bug free, you can send me a mail to tnp@newpipe.schabi.org to let me know that you intent to help, and than register at our [sentry](https://support.schabi.org) setup. 
+## 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.
 
 ## Translation
 
-* NewPipe can be translated on [weblate](https://hosted.weblate.org/projects/newpipe/strings/)
+* 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 style guidelines (just look the other code and than do it the same way :) )
-* Do not bring nonfree software/binary blobs into the project (keep it google free)
-* 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 (Feature-branching)
-* When submitting changes, you agree that your code will be licensed under GPLv3
-* Please test (compile and run) your code before you submit changes!!!
-* Try to figure out you selves why CI fails, or why a merge request collides
-* Please maintain your code after you contributed it.
-* Respond yourselves if someone request changes or notifies issues
+* 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.
+* 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!
+* 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.
+* 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.
 
 ## Communication
 
 * WE DO NOW HAVE A MAILING LIST: [newpipe@list.schabi.org](https://list.schabi.org/cgi-bin/mailman/listinfo/newpipe).
-* If you want to get in contact with me or one of our other contributors you can send me an email at tnp(at)schabi.org
-* Feel free to post suggestions, changes, ideas etc!
+* 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!

.github/PULL_REQUEST_TEAMPLATE.md

@@ -1 +0,0 @@
-[ ] I carefully reed the [contribution guidelines](https://github.com/TeamNewPipe/NewPipe/blob/HEAD/.github/CONTRIBUTING.md) and agree to them.

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1 @@
+- [ ] I carefully read the [contribution guidelines](https://github.com/TeamNewPipe/NewPipe/blob/HEAD/.github/CONTRIBUTING.md) and agree to them.

.gitignore

@@ -10,3 +10,4 @@
 gradle.properties
 *~
 .weblate
+*.class

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "app/src/main/java/org/schabi/newpipe/extractor"]
-	path = app/src/main/java/org/schabi/newpipe/extractor
-	url = https://github.com/TeamNewPipe/NewPipeExtractor.git

.travis.yml

@@ -5,16 +5,14 @@ android:
   components:
     # The BuildTools version used by NewPipe
     - tools
-    - build-tools-25.0.2
+    - build-tools-27.0.3
 
     # The SDK version used to compile NewPipe
-    - android-25
-
-    # Additional components
-    - extra-android-m2repository
+    - android-27
 
+before_install: 
+  - yes | sdkmanager "platforms;android-27"
 script: ./gradlew -Dorg.gradle.jvmargs=-Xmx1536m assembleDebug lintDebug testDebugUnitTest
 
 licenses:
   - '.+'
-

README.md

@@ -1,34 +1,34 @@
+<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> 
+
+<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>
+</p>
+<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.
 
-# NewPipe
-NewPipe: A free lightweight Youtube frontend for Android.  
-
-[![NewPipe](app/src/main/res/mipmap-xhdpi/ic_launcher.png)](https://newpipe.schabi.org)
-[![F-Droid](https://f-droid.org/wiki/images/0/06/F-Droid-button_get-it-on.png)](https://f-droid.org/packages/org.schabi.newpipe/)
-
-
-Project status:
-[![Translation Status](https://hosted.weblate.org/widgets/NewPipe/-/svg-badge.svg)](https://hosted.weblate.org/engage/NewPipe/)
-[![Build Status](https://travis-ci.org/TeamNewPipe/NewPipe.svg)](https://travis-ci.org/TeamNewPipe/NewPipe)
-
-## Donate
-![Bitcoin](https://bitcoin.org/img/icons/logotop.svg)
-![BitcoinQR](assets/16A9J59ahMRqkLSZjhYj33n9j3fMztFxnh.png)
-
-`16A9J59ahMRqkLSZjhYj33n9j3fMztFxnh`
-
 ## Screenshots
 
-[<img src="screenshots/screenshot_1.png" width=160>](screenshots/screenshot_1.png)
-[<img src="screenshots/screenshot_2.png" width=160>](screenshots/screenshot_2.png)
-[<img src="screenshots/screenshot_3.png" width=160>](screenshots/screenshot_3.png)
-[<img src="screenshots/screenshot_4.png" width=160>](screenshots/screenshot_4.png)
-[<img src="screenshots/screenshot_5.png" width=160>](screenshots/screenshot_5.png)
-[<img src="screenshots/screenshot_6.png" width=160>](screenshots/screenshot_6.png)
-[<img src="screenshots/screenshot_7.png" width=160>](screenshots/screenshot_7.png)
-[<img src="screenshots/screenshot_8.png" width=160>](screenshots/screenshot_8.png)
-[<img src="screenshots/screenshot_9.png" width=160>](screenshots/screenshot_9.png)
-
+[<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_10.png" width=160>](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_10.png)
 
 ## Description
 
@@ -39,7 +39,7 @@ NewPipe does not use any Google framework libraries, or the YouTube API. It only
 * Search videos
 * Display general information about a video
 * Watch YouTube videos
-* Listen to YouTube videos (experimental)
+* Listen to YouTube videos
 * Popup mode (floating player)
 * Select the streaming player to watch the video with
 * Download videos 
@@ -47,34 +47,56 @@ NewPipe does not use any Google framework libraries, or the YouTube API. It only
 * Open a video in Kodi
 * Show Next/Related videos
 * Search YouTube in a specific language
-* Watch age restricted material
+* Watch/Block age restricted material
 * Display general information about channels
 * Search channels
 * Watch videos from a channel
 * Orbot/Tor support (not yet directly)
 * 1080p/2k/4k support
+* View history
+* Subscribe to channels
+* Search history
+* Search/Watch Playlists
+* Watch as queues Playlists
+* Queuing videos
+* Local playlists
+* Subtitles
+* Multi-service support (eg. SoundCloud in NewPipe Beta)
 
 ### Coming Features
 
-* Bookmarks
-* View history
-* Search history
-* Subscribe to channels
-* Search/Watch Playlists
-* Queeing videos
-* Subtitles support
-* livestream support
+* Livestream support
+* Cast to UPnP and Cast
+* Show comments
 * ... and many more
 
-### Multiservice support
-Although NewPipe only supports YouTube at the moment, it's designed to support many more streaming services. The plan is, that NewPipe will get such support by the version 2.0.
-
 ## Contribution
-Whether you have ideas, translation, design changes, code cleaning, or real heavy code changes, help is always welcome.
+Whether you have ideas, translations, design changes, code cleaning, or real heavy code changes, help is always welcome.
 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).
+
+<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><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>
+  </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>
+  </tr>
+</table>
+
 ## License
 [![GNU GPLv3 Image](https://www.gnu.org/graphics/gplv3-127x51.png)](http://www.gnu.org/licenses/gpl-3.0.en.html)  
 

app/build.gradle

@@ -1,23 +1,31 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion '25.0.2'
+    compileSdkVersion 27
+    buildToolsVersion '27.0.3'
 
     defaultConfig {
         applicationId "org.schabi.newpipe"
         minSdkVersion 15
-        targetSdkVersion 25
-        versionCode 37
-        versionName "0.9.10"
+        targetSdkVersion 27
+        versionCode 62
+        versionName "0.13.3"
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        vectorDrawables.useSupportLibrary = true
     }
     buildTypes {
         release {
-            minifyEnabled false
+            minifyEnabled true
+            shrinkResources true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
+        debug {
+            multiDexEnabled true
+
+            debuggable true
+            applicationIdSuffix ".debug"
+        }
     }
 
     lintOptions {
@@ -27,35 +35,64 @@ android {
         abortOnError false
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_7
-        targetCompatibility JavaVersion.VERSION_1_7
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
     }
 }
 
+ext {
+    supportLibVersion = '27.1.1'
+    exoPlayerLibVersion = '2.7.3'
+    roomDbLibVersion = '1.0.0'
+    leakCanaryLibVersion = '1.5.4'
+    okHttpLibVersion = '1.5.0'
+    icepickLibVersion = '3.2.0'
+    stethoLibVersion = '1.5.0'
+}
 dependencies {
-    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2') {
+    androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2') {
         exclude module: 'support-annotations'
     }
 
+    implementation 'com.github.TeamNewPipe:NewPipeExtractor:bf1c771'
 
-    testCompile 'junit:junit:4.12'
-    testCompile 'org.mockito:mockito-core:1.10.19'
-    testCompile 'org.json:json:20160810'
+    testImplementation 'junit:junit:4.12'
+    testImplementation 'org.mockito:mockito-core:1.10.19'
 
-    compile 'com.android.support:appcompat-v7:25.3.1'
-    compile 'com.android.support:support-v4:25.3.1'
-    compile 'com.android.support:design:25.3.1'
-    compile 'com.android.support:recyclerview-v7:25.3.1'
+    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"
 
-    compile 'com.google.code.gson:gson:2.7'
-    compile 'org.jsoup:jsoup:1.8.3'
-    compile 'org.mozilla:rhino:1.7.7'
-    compile 'ch.acra:acra:4.9.0'
-    compile 'info.guardianproject.netcipher:netcipher:1.2'
+    implementation 'ch.acra:acra:4.9.2'
 
-    compile 'com.nostra13.universalimageloader:universal-image-loader:1.9.5'
-    compile 'de.hdodenhof:circleimageview:2.0.0'
-    compile 'com.github.nirhart:parallaxscroll:1.0'
-    compile 'com.nononsenseapps:filepicker:3.0.0'
-    compile 'com.google.android.exoplayer:exoplayer:r2.4.2'
+    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"
+
+    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 '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 "frankiesardo:icepick:$icepickLibVersion"
+    annotationProcessor "frankiesardo:icepick-processor:$icepickLibVersion"
+
+    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"
 }

app/proguard-rules.pro

@@ -15,3 +15,30 @@
 #-keepclassmembers class fqcn.of.javascript.interface.for.webview {
 #   public *;
 #}
+
+-dontobfuscate
+-keep class org.mozilla.javascript.** { *; }
+
+-keep class org.mozilla.classfile.ClassFileWriter
+-keep class com.google.android.exoplayer2.** { *; }
+
+-dontwarn org.mozilla.javascript.tools.**
+-dontwarn android.arch.util.paging.CountedDataSource
+-dontwarn android.arch.persistence.room.paging.LimitOffsetDataSource
+
+
+# Rules for icepick. Copy paste from https://github.com/frankiesardo/icepick
+-dontwarn icepick.**
+-keep class icepick.** { *; }
+-keep class **$$Icepick { *; }
+-keepclasseswithmembernames class * {
+    @icepick.* <fields>;
+}
+-keepnames class * { @icepick.State *;}
+
+# Rules for OkHttp. Copy paste from https://github.com/square/okhttp
+-dontwarn okhttp3.**
+-dontwarn okio.**
+-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

app/src/debug/AndroidManifest.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    package="org.schabi.newpipe">
+
+    <application
+        android:name=".DebugApp"
+        android:label="NewPipe Debug"
+        tools:replace="android:name, android:label">
+        <activity
+            android:name=".MainActivity"
+            android:label="NewPipe Debug"
+            tools:replace="android:label"/>
+    </application>
+
+</manifest>

app/src/debug/java/org/schabi/newpipe/DebugApp.java

@@ -0,0 +1,104 @@
+package org.schabi.newpipe;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.preference.PreferenceManager;
+import android.support.annotation.NonNull;
+import android.support.multidex.MultiDex;
+
+import com.facebook.stetho.Stetho;
+import com.facebook.stetho.okhttp3.StethoInterceptor;
+import com.squareup.leakcanary.AndroidHeapDumper;
+import com.squareup.leakcanary.DefaultLeakDirectoryProvider;
+import com.squareup.leakcanary.HeapDumper;
+import com.squareup.leakcanary.LeakCanary;
+import com.squareup.leakcanary.LeakDirectoryProvider;
+import com.squareup.leakcanary.RefWatcher;
+
+import org.schabi.newpipe.extractor.Downloader;
+
+import java.io.File;
+import java.util.concurrent.TimeUnit;
+
+import okhttp3.OkHttpClient;
+
+public class DebugApp extends App {
+    private static final String TAG = DebugApp.class.toString();
+
+    @Override
+    protected void attachBaseContext(Context base) {
+        super.attachBaseContext(base);
+        MultiDex.install(this);
+    }
+
+    @Override
+    public void onCreate() {
+        super.onCreate();
+        initStetho();
+    }
+
+    @Override
+    protected Downloader getDownloader() {
+        return org.schabi.newpipe.Downloader.init(new OkHttpClient.Builder()
+                .addNetworkInterceptor(new StethoInterceptor()));
+    }
+
+    private void initStetho() {
+        // Create an InitializerBuilder
+        Stetho.InitializerBuilder initializerBuilder =
+                Stetho.newInitializerBuilder(this);
+
+        // Enable Chrome DevTools
+        initializerBuilder.enableWebKitInspector(
+                Stetho.defaultInspectorModulesProvider(this)
+        );
+
+        // Enable command line interface
+        initializerBuilder.enableDumpapp(
+                Stetho.defaultDumperPluginsProvider(getApplicationContext())
+        );
+
+        // Use the InitializerBuilder to generate an Initializer
+        Stetho.Initializer initializer = initializerBuilder.build();
+
+        // Initialize Stetho with the Initializer
+        Stetho.initialize(initializer);
+    }
+
+    @Override
+    protected boolean isDisposedRxExceptionsReported() {
+        return PreferenceManager.getDefaultSharedPreferences(this)
+                .getBoolean(getString(R.string.allow_disposed_exceptions_key), false);
+    }
+
+    @Override
+    protected RefWatcher installLeakCanary() {
+        return LeakCanary.refWatcher(this)
+                .heapDumper(new ToggleableHeapDumper(this))
+                // give each object 10 seconds to be gc'ed, before leak canary gets nosy on it
+                .watchDelay(10, TimeUnit.SECONDS)
+                .buildAndInstall();
+    }
+
+    public static class ToggleableHeapDumper implements HeapDumper {
+        private final HeapDumper dumper;
+        private final SharedPreferences preferences;
+        private final String dumpingAllowanceKey;
+
+        ToggleableHeapDumper(@NonNull final Context context) {
+            LeakDirectoryProvider leakDirectoryProvider = new DefaultLeakDirectoryProvider(context);
+            this.dumper = new AndroidHeapDumper(context, leakDirectoryProvider);
+            this.preferences = PreferenceManager.getDefaultSharedPreferences(context);
+            this.dumpingAllowanceKey = context.getString(R.string.allow_heap_dumping_key);
+        }
+
+        private boolean isDumpingAllowed() {
+            return preferences.getBoolean(dumpingAllowanceKey, false);
+        }
+
+        @Override
+        public File dumpHeap() {
+            return isDumpingAllowed() ? dumper.dumpHeap() : HeapDumper.RETRY_LATER;
+        }
+    }
+}

app/src/main/AndroidManifest.xml

@@ -16,26 +16,47 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:logo="@mipmap/ic_launcher"
-        android:theme="@style/AppTheme"
+        android:theme="@style/OpeningTheme"
         tools:ignore="AllowBackup">
         <activity
             android:name=".MainActivity"
-            android:label="@string/app_name">
+            android:label="@string/app_name"
+            android:launchMode="singleTask">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
 
+        <receiver android:name="android.support.v4.media.session.MediaButtonReceiver" >
+            <intent-filter>
+                <action android:name="android.intent.action.MEDIA_BUTTON" />
+            </intent-filter>
+        </receiver>
+
         <activity
-            android:name=".player.PlayVideoActivity"
+            android:name=".player.old.PlayVideoActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
-            android:theme="@style/VideoPlayerTheme"
+            android:theme="@style/OldVideoPlayerTheme"
             tools:ignore="UnusedAttribute"/>
 
         <service
             android:name=".player.BackgroundPlayer"
-            android:exported="false"/>
+            android:exported="false">
+            <intent-filter>
+                <action android:name="android.intent.action.MEDIA_BUTTON" />
+            </intent-filter>
+        </service>
+
+        <activity
+            android:name=".player.BackgroundPlayerActivity"
+            android:launchMode="singleTask"
+            android:label="@string/title_activity_background_player"/>
+
+        <activity
+            android:name=".player.PopupVideoPlayerActivity"
+            android:launchMode="singleTask"
+            android:label="@string/title_activity_popup_player"/>
 
         <service
             android:name=".player.PopupVideoPlayer"
@@ -45,12 +66,23 @@
             android:name=".player.MainVideoPlayer"
             android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
             android:label="@string/app_name"
-            android:launchMode="singleTask"
-            android:theme="@style/PlayerTheme"/>
+            android:launchMode="singleTask"/>
 
         <activity
             android:name=".settings.SettingsActivity"
             android:label="@string/settings"/>
+
+        <activity
+            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"/>
+
         <activity
             android:name=".PanicResponderActivity"
             android:launchMode="singleInstance"
@@ -62,6 +94,7 @@
                 <category android:name="android.intent.category.DEFAULT"/>
             </intent-filter>
         </activity>
+
         <activity
             android:name=".ExitActivity"
             android:label="@string/general_error"
@@ -72,16 +105,20 @@
         <activity
             android:name=".download.DownloadActivity"
             android:label="@string/app_name"
-            android:launchMode="singleTask"
-            android:theme="@style/AppTheme"/>
+            android:launchMode="singleTask"/>
 
         <service android:name="us.shandian.giga.service.DownloadManagerService"/>
 
         <activity
-            android:name="com.nononsenseapps.filepicker.FilePickerActivity"
+            android:name=".util.FilePickerActivityHelper"
             android:label="@string/app_name"
-            android:launchMode="singleTop"
-            android:theme="@style/FilePickerTheme"/>
+            android:theme="@style/FilePickerThemeDark">
+            <intent-filter>
+                <action android:name="android.intent.action.GET_CONTENT" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+
         <activity
             android:name=".ReCaptchaActivity"
             android:label="@string/reCaptchaActivity"/>
@@ -93,13 +130,17 @@
             android:grantUriPermissions="true">
             <meta-data
                 android:name="android.support.FILE_PROVIDER_PATHS"
-                android:resource="@xml/provider_paths"/>
+                android:resource="@xml/nnf_provider_paths"/>
         </provider>
 
         <activity
             android:name=".RouterActivity"
+            android:excludeFromRecents="true"
+            android:label="@string/preferred_open_action_share_menu_title"
             android:taskAffinity=""
-            android:theme="@android:style/Theme.NoDisplay">
+            android:theme="@style/RouterActivityThemeDark">
+
+            <!-- Youtube filter -->
             <intent-filter>
                 <action android:name="android.intent.action.VIEW"/>
                 <action android:name="android.media.action.MEDIA_PLAY_FROM_SEARCH"/>
@@ -121,6 +162,8 @@
                 <!-- channel prefix -->
                 <data android:pathPrefix="/channel/"/>
                 <data android:pathPrefix="/user/"/>
+                <!-- playlist prefix -->
+                <data android:pathPrefix="/playlist"/>
             </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.VIEW"/>
@@ -146,20 +189,8 @@
                 <data android:scheme="vnd.youtube"/>
                 <data android:scheme="vnd.youtube.launch"/>
             </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.SEND"/>
 
-                <category android:name="android.intent.category.DEFAULT"/>
-
-                <data android:mimeType="text/plain"/>
-            </intent-filter>
-        </activity>
-
-        <activity
-            android:name=".RouterPopupActivity"
-            android:taskAffinity=""
-            android:theme="@android:style/Theme.NoDisplay"
-            android:label="@string/popup_mode_share_menu_title">
+            <!-- Hooktube filter -->
             <intent-filter>
                 <action android:name="android.intent.action.VIEW"/>
                 <action android:name="android.media.action.MEDIA_PLAY_FROM_SEARCH"/>
@@ -170,15 +201,18 @@
 
                 <data android:scheme="http"/>
                 <data android:scheme="https"/>
-                <data android:host="youtube.com"/>
-                <data android:host="m.youtube.com"/>
-                <data android:host="www.youtube.com"/>
+                <data android:host="hooktube.com"/>
+                <data android:host="*.hooktube.com"/>
                 <!-- video prefix -->
                 <data android:pathPrefix="/v/"/>
                 <data android:pathPrefix="/embed/"/>
                 <data android:pathPrefix="/watch"/>
-                <data android:pathPrefix="/attribution_link"/>
+                <!-- channel prefix -->
+                <data android:pathPrefix="/channel/"/>
+                <data android:pathPrefix="/user/"/>
             </intent-filter>
+
+            <!-- Soundcloud filter -->
             <intent-filter>
                 <action android:name="android.intent.action.VIEW"/>
                 <action android:name="android.media.action.MEDIA_PLAY_FROM_SEARCH"/>
@@ -189,31 +223,22 @@
 
                 <data android:scheme="http"/>
                 <data android:scheme="https"/>
-                <data android:host="youtu.be"/>
+                <data android:host="soundcloud.com"/>
+                <data android:host="m.soundcloud.com"/>
+                <data android:host="www.soundcloud.com"/>
                 <data android:pathPrefix="/"/>
             </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW"/>
-                <action android:name="android.media.action.MEDIA_PLAY_FROM_SEARCH"/>
-                <action android:name="android.nfc.action.NDEF_DISCOVERED"/>
 
-                <category android:name="android.intent.category.DEFAULT"/>
-                <category android:name="android.intent.category.BROWSABLE"/>
-
-                <data android:scheme="vnd.youtube"/>
-                <data android:scheme="vnd.youtube.launch"/>
-            </intent-filter>
+            <!-- Share filter -->
             <intent-filter>
                 <action android:name="android.intent.action.SEND"/>
                 <category android:name="android.intent.category.DEFAULT"/>
                 <data android:mimeType="text/plain"/>
             </intent-filter>
         </activity>
-        <activity
-            android:name=".about.AboutActivity"
-            android:label="@string/title_activity_about"
-            android:theme="@style/AppTheme">
-        </activity>
-    </application>
 
-</manifest>
+        <service
+            android:name=".RouterActivity$FetcherService"
+            android:exported="false"/>
+    </application>
+</manifest>

app/src/main/assets/gpl_2.html

@@ -15,9 +15,9 @@ Version 2, June 1991
 </p>
 
 <pre>
-Copyright (C) 1989, 1991 Free Software Foundation, Inc.  
-51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
-
+Copyright (C) 1989, 1991 Free Software Foundation, Inc.<br/>
+51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA<br/>
+<br/>
 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.
 </pre>

app/src/main/assets/mpl2.html

@@ -4,6 +4,7 @@
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     <title>Mozilla Public License, version 2.0</title>
+</head>
 <body>
 <h1 id="mozilla-public-license-version-2.0">Mozilla Public License<br>Version 2.0</h1>
 <h2 id="definitions">1. Definitions</h2>

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

@@ -1,6 +1,6 @@
 package org.schabi.newpipe;
 
-/**
+/*
  * Created by Christian Schabesberger on 24.12.15.
  *
  * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>

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

@@ -1,27 +1,48 @@
 package org.schabi.newpipe;
 
 import android.app.Application;
+import android.app.NotificationChannel;
+import android.app.NotificationManager;
 import android.content.Context;
+import android.os.Build;
+import android.support.annotation.Nullable;
+import android.util.Log;
 
+import com.nostra13.universalimageloader.cache.memory.impl.LRULimitedMemoryCache;
 import com.nostra13.universalimageloader.core.ImageLoader;
 import com.nostra13.universalimageloader.core.ImageLoaderConfiguration;
+import com.squareup.leakcanary.LeakCanary;
+import com.squareup.leakcanary.RefWatcher;
 
 import org.acra.ACRA;
 import org.acra.config.ACRAConfiguration;
 import org.acra.config.ACRAConfigurationException;
 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.report.AcraReportSenderFactory;
 import org.schabi.newpipe.report.ErrorActivity;
 import org.schabi.newpipe.report.UserAction;
 import org.schabi.newpipe.settings.SettingsActivity;
-import org.schabi.newpipe.util.ThemeHelper;
+import org.schabi.newpipe.util.ExtractorHelper;
+import org.schabi.newpipe.util.StateSaver;
 
-import info.guardianproject.netcipher.NetCipher;
-import info.guardianproject.netcipher.proxy.OrbotHelper;
+import java.io.IOException;
+import java.io.InterruptedIOException;
+import java.net.SocketException;
+import java.util.Collections;
+import java.util.List;
 
-/**
+import io.reactivex.annotations.NonNull;
+import io.reactivex.exceptions.CompositeException;
+import io.reactivex.exceptions.MissingBackpressureException;
+import io.reactivex.exceptions.OnErrorNotImplementedException;
+import io.reactivex.exceptions.UndeliverableException;
+import io.reactivex.functions.Consumer;
+import io.reactivex.plugins.RxJavaPlugins;
+
+/*
  * Copyright (C) Hans-Christoph Steiner 2016 <hans@eds.org>
  * App.java is part of NewPipe.
  *
@@ -40,73 +61,160 @@ import info.guardianproject.netcipher.proxy.OrbotHelper;
  */
 
 public class App extends Application {
-    private static final String TAG = App.class.toString();
+    protected static final String TAG = App.class.toString();
+    private RefWatcher refWatcher;
 
-    private static boolean useTor;
+    @SuppressWarnings("unchecked")
+    private static final Class<? extends ReportSenderFactory>[] reportSenderFactoryClasses = new Class[]{AcraReportSenderFactory.class};
 
-    final Class<? extends ReportSenderFactory>[] reportSenderFactoryClasses
-            = new Class[]{AcraReportSenderFactory.class};
+    @Override
+    protected void attachBaseContext(Context base) {
+        super.attachBaseContext(base);
+
+        initACRA();
+    }
 
     @Override
     public void onCreate() {
         super.onCreate();
 
-        // init crashreport
+        if (LeakCanary.isInAnalyzerProcess(this)) {
+            // This process is dedicated to LeakCanary for heap analysis.
+            // You should not init your app in this process.
+            return;
+        }
+        refWatcher = installLeakCanary();
+
+        // Initialize settings first because others inits can use its values
+        SettingsActivity.initSettings(this);
+
+        NewPipe.init(getDownloader());
+        StateSaver.init(this);
+        initNotificationChannel();
+
+        // Initialize image loader
+        ImageLoader.getInstance().init(getImageLoaderConfigurations(10, 50));
+
+        configureRxJavaErrorHandler();
+    }
+
+    protected Downloader getDownloader() {
+        return org.schabi.newpipe.Downloader.init(null);
+    }
+
+    private void configureRxJavaErrorHandler() {
+        // 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 {
+                Log.e(TAG, "RxJavaPlugins.ErrorHandler called with -> : " +
+                        "throwable = [" + throwable.getClass().getName() + "]");
+
+                if (throwable instanceof UndeliverableException) {
+                    // As UndeliverableException is a wrapper, get the cause of it to get the "real" exception
+                    throwable = throwable.getCause();
+                }
+
+                final List<Throwable> errors;
+                if (throwable instanceof CompositeException) {
+                    errors = ((CompositeException) throwable).getExceptions();
+                } else {
+                    errors = Collections.singletonList(throwable);
+                }
+
+                for (final Throwable error : errors) {
+                    if (isThrowableIgnored(error)) return;
+                    if (isThrowableCritical(error)) {
+                        reportException(error);
+                        return;
+                    }
+                }
+
+                // Out-of-lifecycle exceptions should only be reported if a debug user wishes so,
+                // When exception is not reported, log it
+                if (isDisposedRxExceptionsReported()) {
+                    reportException(throwable);
+                } else {
+                    Log.e(TAG, "RxJavaPlugin: Undeliverable Exception received: ", throwable);
+                }
+            }
+
+            private boolean isThrowableIgnored(@NonNull final Throwable throwable) {
+                // Don't crash the application over a simple network problem
+                return ExtractorHelper.hasAssignableCauseThrowable(throwable,
+                        IOException.class, SocketException.class, // network api cancellation
+                        InterruptedException.class, InterruptedIOException.class); // blocking code disposed
+            }
+
+            private boolean isThrowableCritical(@NonNull final Throwable throwable) {
+                // Though these exceptions cannot be ignored
+                return ExtractorHelper.hasAssignableCauseThrowable(throwable,
+                        NullPointerException.class, IllegalArgumentException.class, // bug in app
+                        OnErrorNotImplementedException.class, MissingBackpressureException.class,
+                        IllegalStateException.class); // bug in operator
+            }
+
+            private void reportException(@NonNull final Throwable throwable) {
+                // Throw uncaught exception that will trigger the report system
+                Thread.currentThread().getUncaughtExceptionHandler()
+                        .uncaughtException(Thread.currentThread(), throwable);
+            }
+        });
+    }
+
+    private ImageLoaderConfiguration getImageLoaderConfigurations(final int memoryCacheSizeMb,
+                                                                  final int diskCacheSizeMb) {
+        return new ImageLoaderConfiguration.Builder(this)
+                .memoryCache(new LRULimitedMemoryCache(memoryCacheSizeMb * 1024 * 1024))
+                .diskCacheSize(diskCacheSizeMb * 1024 * 1024)
+                .imageDownloader(new ImageDownloader(getApplicationContext()))
+                .build();
+    }
+
+    private void initACRA() {
         try {
             final ACRAConfiguration acraConfig = new ConfigurationBuilder(this)
                     .setReportSenderFactoryClasses(reportSenderFactoryClasses)
+                    .setBuildConfigClass(BuildConfig.class)
                     .build();
             ACRA.init(this, acraConfig);
-        } catch(ACRAConfigurationException ace) {
+        } catch (ACRAConfigurationException ace) {
             ace.printStackTrace();
-            ErrorActivity.reportError(this, ace, null, null,
-                    ErrorActivity.ErrorInfo.make(UserAction.SEARCHED,"none",
-                            "Could not initialize ACRA crash report", R.string.app_ui_crash));
-        }
-
-        //init NewPipe
-        NewPipe.init(Downloader.getInstance());
-
-        // Initialize image loader
-        ImageLoaderConfiguration config = new ImageLoaderConfiguration.Builder(this).build();
-        ImageLoader.getInstance().init(config);
-
-        /*
-        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
-        if(prefs.getBoolean(getString(R.string.use_tor_key), false)) {
-            OrbotHelper.requestStartTor(this);
-            configureTor(true);
-        } else {
-            configureTor(false);
-        }*/
-        configureTor(false);
-
-        // DO NOT REMOVE THIS FUNCTION!!!
-        // Otherwise downloadPathPreference has invalid value.
-        SettingsActivity.initSettings(this);
-
-        ThemeHelper.setTheme(getApplicationContext());
-    }
-
-    /**
-     * Set the proxy settings based on whether Tor should be enabled or not.
-     */
-    public static void configureTor(boolean enabled) {
-        useTor = enabled;
-        if (useTor) {
-            NetCipher.useTor();
-        } else {
-            NetCipher.setProxy(null);
+            ErrorActivity.reportError(this, ace, null, null, ErrorActivity.ErrorInfo.make(UserAction.SOMETHING_ELSE, "none",
+                    "Could not initialize ACRA crash report", R.string.app_ui_crash));
         }
     }
 
-    public static void checkStartTor(Context context) {
-        if (useTor) {
-            OrbotHelper.requestStartTor(context);
+    public void initNotificationChannel() {
+        if (Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.O) {
+            return;
         }
+
+        final String id = getString(R.string.notification_channel_id);
+        final CharSequence name = getString(R.string.notification_channel_name);
+        final String description = getString(R.string.notification_channel_description);
+
+        // Keep this below DEFAULT to avoid making noise on every notification update
+        final int importance = NotificationManager.IMPORTANCE_LOW;
+
+        NotificationChannel mChannel = new NotificationChannel(id, name, importance);
+        mChannel.setDescription(description);
+
+        NotificationManager mNotificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
+        mNotificationManager.createNotificationChannel(mChannel);
     }
 
-    public static boolean isUsingTor() {
-        return useTor;
+    @Nullable
+    public static RefWatcher getRefWatcher(Context context) {
+        final App application = (App) context.getApplicationContext();
+        return application.refWatcher;
+    }
+
+    protected RefWatcher installLeakCanary() {
+        return RefWatcher.DISABLED;
+    }
+
+    protected boolean isDisposedRxExceptionsReported() {
+        return false;
     }
 }

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

@@ -0,0 +1,95 @@
+package org.schabi.newpipe;
+
+import android.content.Context;
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.v4.app.Fragment;
+import android.support.v7.app.AppCompatActivity;
+import android.util.Log;
+import android.view.View;
+
+import com.nostra13.universalimageloader.core.ImageLoader;
+import com.squareup.leakcanary.RefWatcher;
+
+import icepick.Icepick;
+
+public abstract class BaseFragment extends Fragment {
+    protected final String TAG = getClass().getSimpleName() + "@" + Integer.toHexString(hashCode());
+    protected boolean DEBUG = MainActivity.DEBUG;
+
+    protected AppCompatActivity activity;
+    public static final ImageLoader imageLoader = ImageLoader.getInstance();
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Fragment's Lifecycle
+    //////////////////////////////////////////////////////////////////////////*/
+
+    @Override
+    public void onAttach(Context context) {
+        super.onAttach(context);
+        activity = (AppCompatActivity) context;
+    }
+
+    @Override
+    public void onDetach() {
+        super.onDetach();
+        activity = null;
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        if (DEBUG) Log.d(TAG, "onCreate() called with: savedInstanceState = [" + savedInstanceState + "]");
+        super.onCreate(savedInstanceState);
+        Icepick.restoreInstanceState(this, savedInstanceState);
+        if (savedInstanceState != null) onRestoreInstanceState(savedInstanceState);
+    }
+
+
+    @Override
+    public void onViewCreated(View rootView, Bundle savedInstanceState) {
+        super.onViewCreated(rootView, savedInstanceState);
+        if (DEBUG) {
+            Log.d(TAG, "onViewCreated() called with: rootView = [" + rootView + "], savedInstanceState = [" + savedInstanceState + "]");
+        }
+        initViews(rootView, savedInstanceState);
+        initListeners();
+    }
+
+    @Override
+    public void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+        Icepick.saveInstanceState(this, outState);
+    }
+
+    protected void onRestoreInstanceState(@NonNull Bundle savedInstanceState) {
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+
+        RefWatcher refWatcher = App.getRefWatcher(getActivity());
+        if (refWatcher != null) refWatcher.watch(this);
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Init
+    //////////////////////////////////////////////////////////////////////////*/
+
+    protected void initViews(View rootView, Bundle savedInstanceState) {
+    }
+
+    protected void initListeners() {
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Utils
+    //////////////////////////////////////////////////////////////////////////*/
+
+    public void setTitle(String title) {
+        if (DEBUG) Log.d(TAG, "setTitle() called with: title = [" + title + "]");
+        if (activity != null && activity.getSupportActionBar() != null) {
+            activity.getSupportActionBar().setTitle(title);
+        }
+    }
+}

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

@@ -1,20 +1,24 @@
 package org.schabi.newpipe;
 
+import android.support.annotation.Nullable;
+import android.text.TextUtils;
+
 import org.schabi.newpipe.extractor.exceptions.ReCaptchaException;
 
-import java.io.BufferedReader;
 import java.io.IOException;
-import java.io.InputStreamReader;
-import java.net.URL;
-import java.net.UnknownHostException;
+import java.io.InputStream;
+import java.util.Collections;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.Map;
+import java.util.concurrent.TimeUnit;
 
-import javax.net.ssl.HttpsURLConnection;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Response;
+import okhttp3.ResponseBody;
 
 
-/**
+/*
  * Created by Christian Schabesberger on 28.01.16.
  *
  * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
@@ -35,112 +39,140 @@ import javax.net.ssl.HttpsURLConnection;
  */
 
 public class Downloader implements org.schabi.newpipe.extractor.Downloader {
-    
-    private static final String USER_AGENT = "Mozilla/5.0 (Windows NT 6.1; WOW64; rv:43.0) Gecko/20100101 Firefox/43.0";
-    private static String mCookies = "";
+    public static final String USER_AGENT = "Mozilla/5.0 (Windows NT 6.1; WOW64; rv:43.0) Gecko/20100101 Firefox/43.0";
 
-    private static Downloader instance = null;
+    private static Downloader instance;
+    private String mCookies;
+    private OkHttpClient client;
 
-    private Downloader() {}
+    private Downloader(OkHttpClient.Builder builder) {
+        this.client = builder
+                .readTimeout(30, TimeUnit.SECONDS)
+                //.cache(new Cache(new File(context.getExternalCacheDir(), "okhttp"), 16 * 1024 * 1024))
+                .build();
+    }
+
+    /**
+     * It's recommended to call exactly once in the entire lifetime of the application.
+     *
+     * @param builder if null, default builder will be used
+     */
+    public static Downloader init(@Nullable OkHttpClient.Builder builder) {
+        return instance = new Downloader(builder != null ? builder : new OkHttpClient.Builder());
+    }
 
     public static Downloader getInstance() {
-        if(instance == null) {
-            synchronized (Downloader.class) {
-                if (instance == null) {
-                    instance = new Downloader();
-                }
-            }
-        }
         return instance;
     }
 
-    public static synchronized void setCookies(String cookies) {
-        Downloader.mCookies = cookies;
+    public String getCookies() {
+        return mCookies;
     }
 
-    public static synchronized String getCookies() {
-        return Downloader.mCookies;
+    public void setCookies(String cookies) {
+        mCookies = cookies;
     }
 
-    /**Download the text file at the supplied URL as in download(String),
+    /**
+     * Get the size of the content that the url is pointing by firing a HEAD request.
+     *
+     * @param url an url pointing to the content
+     * @return the size of the content, in bytes
+     */
+    public long getContentLength(String url) throws IOException {
+        Response response = null;
+        try {
+            final Request request = new Request.Builder()
+                    .head().url(url)
+                    .addHeader("User-Agent", USER_AGENT)
+                    .build();
+            response = client.newCall(request).execute();
+
+            return Long.parseLong(response.header("Content-Length"));
+        } catch (NumberFormatException e) {
+            throw new IOException("Invalid content length", e);
+        } finally {
+            if (response != null) {
+                response.close();
+            }
+        }
+    }
+
+    /**
+     * Download the text file at the supplied URL as in download(String),
      * 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 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
-     * @return the contents of the specified text file*/
+     * @return the contents of the specified text file
+     */
+    @Override
     public String download(String siteUrl, String language) throws IOException, ReCaptchaException {
         Map<String, String> requestProperties = new HashMap<>();
         requestProperties.put("Accept-Language", language);
         return download(siteUrl, requestProperties);
     }
 
-
-    /**Download the text file at the supplied URL as in download(String),
-     * 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
+    /**
+     * Download the text file at the supplied URL as in download(String),
+     * but set the HTTP headers included in the customProperties map.
+     *
+     * @param siteUrl          the URL of the text file to return the contents of
      * @param customProperties set request header properties
      * @return the contents of the specified text file
-     * @throws IOException*/
+     * @throws IOException
+     */
+    @Override
     public String download(String siteUrl, Map<String, String> customProperties) throws IOException, ReCaptchaException {
-        URL url = new URL(siteUrl);
-        HttpsURLConnection con = (HttpsURLConnection) url.openConnection();
-        Iterator it = customProperties.entrySet().iterator();
-        while(it.hasNext()) {
-            Map.Entry pair = (Map.Entry)it.next();
-            con.setRequestProperty((String)pair.getKey(), (String)pair.getValue());
-        }
-        return dl(con);
+        return getBody(siteUrl, customProperties).string();
     }
 
-    /**Common functionality between download(String url) and download(String url, String language)*/
-    private static String dl(HttpsURLConnection con) throws IOException, ReCaptchaException {
-        StringBuilder response = new StringBuilder();
-        BufferedReader in = null;
-
+    public InputStream stream(String siteUrl) throws IOException {
         try {
-            con.setRequestMethod("GET");
-            con.setRequestProperty("User-Agent", USER_AGENT);
-
-            if (getCookies().length() > 0) {
-                con.setRequestProperty("Cookie", getCookies());
-            }
-
-            in = new BufferedReader(
-                    new InputStreamReader(con.getInputStream()));
-            String inputLine;
-
-            while((inputLine = in.readLine()) != null) {
-                response.append(inputLine);
-            }
-        } catch(UnknownHostException uhe) {//thrown when there's no internet connection
-            throw new IOException("unknown host or no network", uhe);
-            //Toast.makeText(getActivity(), uhe.getMessage(), Toast.LENGTH_LONG).show();
-        } catch(Exception e) {
-            /*
-             * HTTP 429 == Too Many Request
-             * Receive from Youtube.com = ReCaptcha challenge request
-             * See : https://github.com/rg3/youtube-dl/issues/5138
-             */
-            if (con.getResponseCode() == 429) {
-                throw new ReCaptchaException("reCaptcha Challenge requested");
-            }
-            throw new IOException(e);
-        } finally {
-            if(in != null) {
-                in.close();
-            }
+            return getBody(siteUrl, Collections.emptyMap()).byteStream();
+        } catch (ReCaptchaException e) {
+            throw new IOException(e.getMessage(), e.getCause());
         }
-
-        return response.toString();
     }
 
-    /**Download (via HTTP) the text file located at the supplied URL, and return its contents.
+    private ResponseBody getBody(String siteUrl, Map<String, String> customProperties) throws IOException, ReCaptchaException {
+        final Request.Builder requestBuilder = new Request.Builder()
+                .method("GET", null).url(siteUrl)
+                .addHeader("User-Agent", USER_AGENT);
+
+        for (Map.Entry<String, String> header : customProperties.entrySet()) {
+            requestBuilder.addHeader(header.getKey(), header.getValue());
+        }
+
+        if (!TextUtils.isEmpty(mCookies)) {
+            requestBuilder.addHeader("Cookie", mCookies);
+        }
+
+        final Request request = requestBuilder.build();
+        final Response response = client.newCall(request).execute();
+        final ResponseBody body = response.body();
+
+        if (response.code() == 429) {
+            throw new ReCaptchaException("reCaptcha Challenge requested");
+        }
+
+        if (body == null) {
+            response.close();
+            return null;
+        }
+
+        return body;
+    }
+
+    /**
+     * Download (via HTTP) the text file located at the supplied URL, and return its contents.
      * Primarily intended for downloading web pages.
+     *
      * @param siteUrl the URL of the text file to download
-     * @return the contents of the specified text file*/
+     * @return the contents of the specified text file
+     */
+    @Override
     public String download(String siteUrl) throws IOException, ReCaptchaException {
-        URL url = new URL(siteUrl);
-        HttpsURLConnection con = (HttpsURLConnection) url.openConnection();
-        //HttpsURLConnection con = NetCipher.getHttpsURLConnection(url);
-        return dl(con);
+        return download(siteUrl, Collections.emptyMap());
     }
 }

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

@@ -7,7 +7,7 @@ import android.content.Intent;
 import android.os.Build;
 import android.os.Bundle;
 
-/**
+/*
  * Copyright (C) Hans-Christoph Steiner 2016 <hans@eds.org>
  * ExitActivity.java is part of NewPipe.
  *

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

@@ -0,0 +1,46 @@
+package org.schabi.newpipe;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.content.res.Resources;
+import android.preference.PreferenceManager;
+
+import com.nostra13.universalimageloader.core.download.BaseImageDownloader;
+
+import org.schabi.newpipe.extractor.NewPipe;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+public class ImageDownloader extends BaseImageDownloader {
+    private final Resources resources;
+    private final SharedPreferences preferences;
+    private final String downloadThumbnailKey;
+
+    public ImageDownloader(Context context) {
+        super(context);
+        this.resources = context.getResources();
+        this.preferences = PreferenceManager.getDefaultSharedPreferences(context);
+        this.downloadThumbnailKey = context.getString(R.string.download_thumbnail_key);
+    }
+
+    private boolean isDownloadingThumbnail() {
+        return preferences.getBoolean(downloadThumbnailKey, true);
+    }
+
+    @SuppressLint("ResourceType")
+    @Override
+    public InputStream getStream(String imageUri, Object extra) throws IOException {
+        if (isDownloadingThumbnail()) {
+            return super.getStream(imageUri, extra);
+        } else {
+            return resources.openRawResource(R.drawable.dummy_thumbnail_dark);
+        }
+    }
+
+    protected InputStream getStreamFromNetwork(String imageUri, Object extra) throws IOException {
+        final Downloader downloader = (Downloader) NewPipe.getDownloader();
+        return downloader.stream(imageUri);
+    }
+}

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

@@ -1,65 +0,0 @@
-package org.schabi.newpipe;
-
-import android.content.Context;
-import android.graphics.Bitmap;
-import android.view.View;
-
-import com.nostra13.universalimageloader.core.assist.FailReason;
-import com.nostra13.universalimageloader.core.listener.ImageLoadingListener;
-
-import org.schabi.newpipe.extractor.NewPipe;
-import org.schabi.newpipe.report.ErrorActivity;
-import org.schabi.newpipe.report.UserAction;
-
-/**
- * Created by Christian Schabesberger on 01.08.16.
- *
- * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
- * StreamInfoItemViewCreator.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 ImageErrorLoadingListener implements ImageLoadingListener {
-
-    private int serviceId = -1;
-    private Context context = null;
-    private View rootView = null;
-
-    public ImageErrorLoadingListener(Context context, View rootView, int serviceId) {
-        this.context = context;
-        this.serviceId= serviceId;
-        this.rootView = rootView;
-    }
-
-    @Override
-    public void onLoadingStarted(String imageUri, View view) {}
-
-    @Override
-    public void onLoadingFailed(String imageUri, View view, FailReason failReason) {
-        ErrorActivity.reportError(context,
-                failReason.getCause(), null, rootView,
-                ErrorActivity.ErrorInfo.make(UserAction.LOAD_IMAGE,
-                        NewPipe.getNameOfService(serviceId), imageUri,
-                        R.string.could_not_load_image));
-    }
-
-    @Override
-    public void onLoadingComplete(String imageUri, View view, Bitmap loadedImage) {
-
-    }
-
-    @Override
-    public void onLoadingCancelled(String imageUri, View view) {}
-}

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

@@ -22,31 +22,53 @@ package org.schabi.newpipe;
 
 import android.content.Intent;
 import android.content.SharedPreferences;
+import android.content.pm.PackageManager;
+import android.net.Uri;
 import android.os.Bundle;
+import android.os.Handler;
+import android.os.Looper;
 import android.preference.PreferenceManager;
+import android.support.annotation.NonNull;
+import android.support.design.widget.NavigationView;
 import android.support.v4.app.Fragment;
+import android.support.v4.view.GravityCompat;
+import android.support.v4.widget.DrawerLayout;
 import android.support.v7.app.ActionBar;
+import android.support.v7.app.ActionBarDrawerToggle;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
 import android.util.Log;
+import android.view.Gravity;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
+import android.widget.Button;
+import android.widget.ImageButton;
+import android.widget.TextView;
 
-import org.schabi.newpipe.download.DownloadActivity;
+import org.schabi.newpipe.extractor.NewPipe;
 import org.schabi.newpipe.extractor.StreamingService;
+import org.schabi.newpipe.fragments.BackPressable;
+import org.schabi.newpipe.fragments.MainFragment;
 import org.schabi.newpipe.fragments.detail.VideoDetailFragment;
-import org.schabi.newpipe.fragments.search.SearchFragment;
-import org.schabi.newpipe.settings.SettingsActivity;
+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.NavigationHelper;
 import org.schabi.newpipe.util.PermissionHelper;
+import org.schabi.newpipe.util.ServiceHelper;
+import org.schabi.newpipe.util.StateSaver;
 import org.schabi.newpipe.util.ThemeHelper;
 
 public class MainActivity extends AppCompatActivity {
     private static final String TAG = "MainActivity";
-    public static final boolean DEBUG = false;
+    public static final boolean DEBUG = !BuildConfig.BUILD_TYPE.equals("release");
+
+    private ActionBarDrawerToggle toggle = null;
+    private DrawerLayout drawer = null;
+    private NavigationView drawerItems = null;
+    private TextView headerServiceView = null;
 
     /*//////////////////////////////////////////////////////////////////////////
     // Activity's LifeCycle
@@ -55,7 +77,9 @@ public class MainActivity extends AppCompatActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         if (DEBUG) Log.d(TAG, "onCreate() called with: savedInstanceState = [" + savedInstanceState + "]");
-        ThemeHelper.setTheme(this);
+
+        ThemeHelper.setTheme(this, ServiceHelper.getSelectedServiceId(this));
+
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
 
@@ -63,21 +87,122 @@ public class MainActivity extends AppCompatActivity {
             initFragments();
         }
 
-        Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
-        setSupportActionBar(toolbar);
+        setSupportActionBar(findViewById(R.id.toolbar));
+        setupDrawer();
+    }
+
+    private void setupDrawer() {
+        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()));
+        }
+
+        drawerItems.getMenu().getItem(ServiceHelper.getSelectedServiceId(this)).setChecked(true);
+
+        toggle = new ActionBarDrawerToggle(this, drawer, toolbar, R.string.drawer_open, R.string.drawer_close);
+        toggle.syncState();
+        drawer.addDrawerListener(toggle);
+        drawer.addDrawerListener(new DrawerLayout.SimpleDrawerListener() {
+            private int lastService;
+
+            @Override
+            public void onDrawerOpened(View drawerView) {
+                lastService = ServiceHelper.getSelectedServiceId(MainActivity.this);
+            }
+
+            @Override
+            public void onDrawerClosed(View drawerView) {
+                if (lastService != ServiceHelper.getSelectedServiceId(MainActivity.this)) {
+                    new Handler(Looper.getMainLooper()).post(MainActivity.this::recreate);
+                }
+            }
+        });
+
+        drawerItems.setNavigationItemSelectedListener(this::changeService);
+
+        setupDrawerFooter();
+        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;
+        }
+        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);
+
+        settings.setOnClickListener(view -> NavigationHelper.openSettings(this));
+        downloads.setOnClickListener(view ->NavigationHelper.openDownloads(this));
+        history.setOnClickListener(view ->
+                NavigationHelper.openStatisticFragment(getSupportFragmentManager()));
+    }
+
+    private void setupDrawerHeader() {
+        headerServiceView = findViewById(R.id.drawer_header_service_view);
+        Button action = 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();
+        });
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        if (!isChangingConfigurations()) {
+            StateSaver.clearStateFiles();
+        }
     }
 
     @Override
     protected void onResume() {
         super.onResume();
 
+        // close drawer on return, and don't show animation, so its looks like the drawer isn't open
+        // when the user returns to MainActivity
+        drawer.closeDrawer(Gravity.START, false);
+        try {
+            String selectedServiceName = NewPipe.getService(
+                    ServiceHelper.getSelectedServiceId(this)).getServiceInfo().getName();
+            headerServiceView.setText(selectedServiceName);
+        } catch (Exception e) {
+            ErrorActivity.reportUiError(this, e);
+        }
+
         SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this);
         if (sharedPreferences.getBoolean(Constants.KEY_THEME_CHANGE, false)) {
             if (DEBUG) Log.d(TAG, "Theme has changed, recreating activity...");
             sharedPreferences.edit().putBoolean(Constants.KEY_THEME_CHANGE, false).apply();
-            this.recreate();
+            // https://stackoverflow.com/questions/10844112/runtimeexception-performing-pause-of-activity-that-is-not-resumed
+            // Briefly, let the activity resume properly posting the recreate call to end of the message queue
+            new Handler(Looper.getMainLooper()).post(MainActivity.this::recreate);
         }
 
+        if (sharedPreferences.getBoolean(Constants.KEY_MAIN_PAGE_CHANGE, false)) {
+            if (DEBUG) Log.d(TAG, "main page has changed, recreating main fragment...");
+            sharedPreferences.edit().putBoolean(Constants.KEY_MAIN_PAGE_CHANGE, false).apply();
+            NavigationHelper.openMainActivity(this);
+        }
     }
 
     @Override
@@ -100,7 +225,10 @@ public class MainActivity extends AppCompatActivity {
         if (DEBUG) Log.d(TAG, "onBackPressed() called");
 
         Fragment fragment = getSupportFragmentManager().findFragmentById(R.id.fragment_holder);
-        if (fragment instanceof VideoDetailFragment) if (((VideoDetailFragment) fragment).onActivityBackPressed()) return;
+        // If current fragment implements BackPressable (i.e. can/wanna handle back press) delegate the back press to it
+        if (fragment instanceof BackPressable) {
+            if (((BackPressable) fragment).onBackPressed()) return;
+        }
 
 
         if (getSupportFragmentManager().getBackStackEntryCount() == 1) {
@@ -108,6 +236,58 @@ public class MainActivity extends AppCompatActivity {
         } else super.onBackPressed();
     }
 
+    @Override
+    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+        for (int i: grantResults){
+            if (i == PackageManager.PERMISSION_DENIED){
+                return;
+            }
+        }
+        switch (requestCode) {
+            case PermissionHelper.DOWNLOADS_REQUEST_CODE:
+                NavigationHelper.openDownloads(this);
+                break;
+            case PermissionHelper.DOWNLOAD_DIALOG_REQUEST_CODE:
+                Fragment fragment = getSupportFragmentManager().findFragmentById(R.id.fragment_holder);
+                if (fragment instanceof VideoDetailFragment) {
+                    ((VideoDetailFragment) fragment).openDownloadDialog();
+                }
+                break;
+        }
+    }
+
+    /**
+     * Implement the following diagram behavior for the up button:
+     * <pre>
+     *              +---------------+
+     *              |  Main Screen  +----+
+     *              +-------+-------+    |
+     *                      |            |
+     *                      ▲ Up         | Search Button
+     *                      |            |
+     *                 +----+-----+      |
+     *    +------------+  Search  |◄-----+
+     *    |            +----+-----+
+     *    |   Open          |
+     *    |  something      ▲ Up
+     *    |                 |
+     *    |    +------------+-------------+
+     *    |    |                          |
+     *    |    |  Video    <->  Channel   |
+     *    +---►|  Channel  <->  Playlist  |
+     *         |  Video    <->  ....      |
+     *         |                          |
+     *         +--------------------------+
+     * </pre>
+     */
+    private void onHomeButtonPressed() {
+        // If search fragment wasn't found in the backstack...
+        if (!NavigationHelper.tryGotoSearchFragment(getSupportFragmentManager())) {
+            // ...go to the main fragment
+            NavigationHelper.gotoMainFragment(getSupportFragmentManager());
+        }
+    }
+
     /*//////////////////////////////////////////////////////////////////////////
     // Menu
     //////////////////////////////////////////////////////////////////////////*/
@@ -131,9 +311,11 @@ public class MainActivity extends AppCompatActivity {
 
         ActionBar actionBar = getSupportActionBar();
         if (actionBar != null) {
-            actionBar.setDisplayShowTitleEnabled(false);
             actionBar.setDisplayHomeAsUpEnabled(false);
         }
+
+        updateDrawerNavigation();
+
         return true;
     }
 
@@ -143,20 +325,20 @@ public class MainActivity extends AppCompatActivity {
         int id = item.getItemId();
 
         switch (id) {
-            case android.R.id.home: {
-                NavigationHelper.gotoMainFragment(getSupportFragmentManager());
+            case android.R.id.home:
+                onHomeButtonPressed();
                 return true;
-            }
-            case R.id.action_settings: {
-                NavigationHelper.openSettings(this);
-                return true;
-            }
-            case R.id.action_show_downloads: {
+            case R.id.action_show_downloads:
                 return NavigationHelper.openDownloads(this);
-            }
+            case R.id.action_history:
+                NavigationHelper.openStatisticFragment(getSupportFragmentManager());
+                return true;
             case R.id.action_about:
                 NavigationHelper.openAbout(this);
                 return true;
+            case R.id.action_settings:
+                NavigationHelper.openSettings(this);
+                return true;
             default:
                 return super.onOptionsItemSelected(item);
         }
@@ -167,6 +349,8 @@ public class MainActivity extends AppCompatActivity {
     //////////////////////////////////////////////////////////////////////////*/
 
     private void initFragments() {
+        if (DEBUG) Log.d(TAG, "initFragments() called");
+        StateSaver.clearStateFiles();
         if (getIntent() != null && getIntent().hasExtra(Constants.KEY_LINK_TYPE)) {
             handleIntent(getIntent());
         } else NavigationHelper.gotoMainFragment(getSupportFragmentManager());
@@ -176,6 +360,27 @@ public class MainActivity extends AppCompatActivity {
     // Utils
     //////////////////////////////////////////////////////////////////////////*/
 
+    private void updateDrawerNavigation() {
+        if (getSupportActionBar() == null) return;
+
+        final Toolbar toolbar = findViewById(R.id.toolbar);
+        final DrawerLayout drawer = findViewById(R.id.drawer_layout);
+
+        final Fragment fragment = getSupportFragmentManager().findFragmentById(R.id.fragment_holder);
+        if (fragment instanceof MainFragment) {
+            getSupportActionBar().setDisplayHomeAsUpEnabled(false);
+            if (toggle != null) {
+                toggle.syncState();
+                toolbar.setNavigationOnClickListener(v -> drawer.openDrawer(GravityCompat.START));
+                drawer.setDrawerLockMode(DrawerLayout.LOCK_MODE_UNDEFINED);
+            }
+        } else {
+            drawer.setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_CLOSED);
+            getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+            toolbar.setNavigationOnClickListener(v -> onHomeButtonPressed());
+        }
+    }
+
     private void handleIntent(Intent intent) {
         if (DEBUG) Log.d(TAG, "handleIntent() called with: intent = [" + intent + "]");
 
@@ -191,6 +396,9 @@ public class MainActivity extends AppCompatActivity {
                 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 searchQuery = intent.getStringExtra(Constants.KEY_QUERY);

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

@@ -0,0 +1,42 @@
+package org.schabi.newpipe;
+
+import android.arch.persistence.room.Room;
+import android.content.Context;
+import android.support.annotation.NonNull;
+
+import org.schabi.newpipe.database.AppDatabase;
+
+import static org.schabi.newpipe.database.AppDatabase.DATABASE_NAME;
+import static org.schabi.newpipe.database.Migrations.MIGRATION_11_12;
+
+public final class NewPipeDatabase {
+
+    private static volatile AppDatabase databaseInstance;
+
+    private NewPipeDatabase() {
+        //no instance
+    }
+
+    private static AppDatabase getDatabase(Context context) {
+        return Room
+                .databaseBuilder(context.getApplicationContext(), AppDatabase.class, DATABASE_NAME)
+                .addMigrations(MIGRATION_11_12)
+                .fallbackToDestructiveMigration()
+                .build();
+    }
+
+    @NonNull
+    public static AppDatabase getInstance(@NonNull Context context) {
+        AppDatabase result = databaseInstance;
+        if (result == null) {
+            synchronized (NewPipeDatabase.class) {
+                result = databaseInstance;
+                if (result == null) {
+                    databaseInstance = (result = getDatabase(context));
+                }
+            }
+        }
+
+        return result;
+    }
+}

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

@@ -6,9 +6,8 @@ import android.app.Activity;
 import android.content.Intent;
 import android.os.Build;
 import android.os.Bundle;
-import android.media.AudioManager;
 
-/**
+/*
  * Copyright (C) Hans-Christoph Steiner 2016 <hans@eds.org>
  * PanicResponderActivity.java is part of NewPipe.
  *

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

@@ -16,7 +16,7 @@ import android.webkit.WebSettings;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
 
-/**
+/*
  * Created by beneth <bmauduit@beneth.fr> on 06.12.16.
  *
  * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
@@ -49,7 +49,7 @@ public class ReCaptchaActivity extends AppCompatActivity {
         // Set return to Cancel by default
         setResult(RESULT_CANCELED);
 
-        Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
+        Toolbar toolbar = findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
 
         ActionBar actionBar = getSupportActionBar();
@@ -59,7 +59,7 @@ public class ReCaptchaActivity extends AppCompatActivity {
             actionBar.setDisplayShowTitleEnabled(true);
         }
 
-        WebView myWebView = (WebView) findViewById(R.id.reCaptchaWebView);
+        WebView myWebView = findViewById(R.id.reCaptchaWebView);
 
         // Enable Javascript
         WebSettings webSettings = myWebView.getSettings();
@@ -107,7 +107,7 @@ public class ReCaptchaActivity extends AppCompatActivity {
             // find cookies : s_gl & goojf and Add cookies to Downloader
             if (find_access_cookies(cookies)) {
                 // Give cookies to Downloader class
-                Downloader.setCookies(mCookies);
+                Downloader.getInstance().setCookies(mCookies);
 
                 // Closing activity and return to parent
                 setResult(RESULT_OK);

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

@@ -1,54 +1,535 @@
 package org.schabi.newpipe;
 
-import android.app.Activity;
+import android.app.IntentService;
+import android.content.Context;
+import android.content.DialogInterface;
 import android.content.Intent;
+import android.content.SharedPreferences;
 import android.os.Bundle;
+import android.preference.PreferenceManager;
+import android.support.annotation.DrawableRes;
+import android.support.annotation.Nullable;
+import android.support.v4.app.NotificationCompat;
+import android.support.v7.app.AlertDialog;
+import android.support.v7.app.AppCompatActivity;
+import android.text.TextUtils;
+import android.view.ContextThemeWrapper;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.LinearLayout;
+import android.widget.RadioButton;
+import android.widget.RadioGroup;
 import android.widget.Toast;
 
+import org.schabi.newpipe.extractor.Info;
+import org.schabi.newpipe.extractor.NewPipe;
+import org.schabi.newpipe.extractor.StreamingService;
+import org.schabi.newpipe.extractor.StreamingService.LinkType;
+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.player.helper.PlayerHelper;
+import org.schabi.newpipe.player.playqueue.ChannelPlayQueue;
+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.UserAction;
+import org.schabi.newpipe.util.ExtractorHelper;
 import org.schabi.newpipe.util.NavigationHelper;
+import org.schabi.newpipe.util.PermissionHelper;
+import org.schabi.newpipe.util.ThemeHelper;
 
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashSet;
+import java.util.List;
 
-/*
- * Copyright (C) Christian Schabesberger 2017 <chris.schabesberger@mailbox.org>
- * RouterActivity .java is part of NewPipe.
- *
- * OpenHitboxStreams 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.
- *
- * OpenHitboxStreams 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 OpenHitboxStreams.  If not, see <http://www.gnu.org/licenses/>.
- */
+import icepick.Icepick;
+import icepick.State;
+import io.reactivex.Observable;
+import io.reactivex.Single;
+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 static org.schabi.newpipe.extractor.StreamingService.ServiceInfo.MediaCapability.AUDIO;
+import static org.schabi.newpipe.extractor.StreamingService.ServiceInfo.MediaCapability.VIDEO;
+import static org.schabi.newpipe.util.ThemeHelper.resolveResourceIdFromAttr;
 
 /**
- * This Acitivty is designed to route share/open intents to the specified service, and
- * to the part of the service which can handle the url.
+ * Get the url from the intent and open it in the chosen preferred player
  */
-public class RouterActivity extends Activity {
+public class RouterActivity extends AppCompatActivity {
+
+    @State protected int currentServiceId = -1;
+    private StreamingService currentService;
+    @State protected LinkType currentLinkType;
+    @State protected int selectedRadioPosition = -1;
+    protected int selectedPreviously = -1;
+
+    protected String currentUrl;
+    protected CompositeDisposable disposables = new CompositeDisposable();
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        Icepick.restoreInstanceState(this, savedInstanceState);
 
-        String videoUrl = getUrl(getIntent());
-        handleUrl(videoUrl);
+        if (TextUtils.isEmpty(currentUrl)) {
+            currentUrl = getUrl(getIntent());
+
+            if (TextUtils.isEmpty(currentUrl)) {
+                Toast.makeText(this, R.string.invalid_url_toast, Toast.LENGTH_LONG).show();
+                finish();
+            }
+        }
+
+        setTheme(ThemeHelper.isLightThemeSelected(this)
+                ? R.style.RouterActivityThemeLight : R.style.RouterActivityThemeDark);
+    }
+
+    @Override
+    protected void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+        Icepick.saveInstanceState(this, outState);
+    }
+
+    @Override
+    protected void onStart() {
+        super.onStart();
+
+        handleUrl(currentUrl);
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+
+        disposables.clear();
+    }
+
+    private void handleUrl(String url) {
+        disposables.add(Observable
+                .fromCallable(() -> {
+                    if (currentServiceId == -1) {
+                        currentService = NewPipe.getServiceByUrl(url);
+                        currentServiceId = currentService.getServiceId();
+                        currentLinkType = currentService.getLinkTypeByUrl(url);
+                        currentUrl = url;
+                    } else {
+                        currentService = NewPipe.getService(currentServiceId);
+                    }
+
+                    return currentLinkType != LinkType.NONE;
+                })
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(result -> {
+                    if (result) {
+                        onSuccess();
+                    } else {
+                        onError();
+                    }
+                }, this::handleError));
+    }
+
+    private void handleError(Throwable error) {
+        error.printStackTrace();
+
+        if (error instanceof ExtractionException) {
+            Toast.makeText(this, R.string.url_not_supported_toast, Toast.LENGTH_LONG).show();
+        } else {
+            ExtractorHelper.handleGeneralException(this, -1, null, error, UserAction.SOMETHING_ELSE, null);
+        }
 
         finish();
     }
 
-    protected void handleUrl(String url) {
-        try {
-            NavigationHelper.openByLink(this, url);
-        } catch (Exception e) {
-            Toast.makeText(this, R.string.url_not_supported_toast, Toast.LENGTH_LONG).show();
+    private void onError() {
+        Toast.makeText(this, R.string.url_not_supported_toast, Toast.LENGTH_LONG).show();
+        finish();
+    }
+
+    protected void onSuccess() {
+        final SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(this);
+        final String selectedChoiceKey = preferences.getString(getString(R.string.preferred_open_action_key), getString(R.string.preferred_open_action_default));
+
+        final String showInfoKey = getString(R.string.show_info_key);
+        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 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);
+            }
+        } else if (selectedChoiceKey.equals(showInfoKey)) {
+            handleChoice(showInfoKey);
+        } 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);
+            final boolean isVideoPlayerSelected = selectedChoiceKey.equals(videoPlayerKey) || selectedChoiceKey.equals(popupPlayerKey);
+            final boolean isAudioPlayerSelected = selectedChoiceKey.equals(backgroundPlayerKey);
+
+            if (currentLinkType != LinkType.STREAM) {
+                if (isExtAudioEnabled && isAudioPlayerSelected || isExtVideoEnabled && isVideoPlayerSelected) {
+                    Toast.makeText(this, R.string.external_player_unsupported_link_type, Toast.LENGTH_LONG).show();
+                    handleChoice(showInfoKey);
+                    return;
+                }
+            }
+
+            final List<StreamingService.ServiceInfo.MediaCapability> capabilities = currentService.getServiceInfo().getMediaCapabilities();
+
+            boolean serviceSupportsChoice = false;
+            if (isVideoPlayerSelected) {
+                serviceSupportsChoice = capabilities.contains(VIDEO);
+            } else if (selectedChoiceKey.equals(backgroundPlayerKey)) {
+                serviceSupportsChoice = capabilities.contains(AUDIO);
+            }
+
+            if (serviceSupportsChoice) {
+                handleChoice(selectedChoiceKey);
+            } else {
+                handleChoice(showInfoKey);
+            }
+        }
+    }
+
+    private void showDialog(final List<AdapterChoiceItem> choices) {
+        final SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(this);
+        final Context themeWrapperContext = getThemeWrapperContext();
+
+        final LayoutInflater inflater = LayoutInflater.from(themeWrapperContext);
+        final LinearLayout rootLayout = (LinearLayout) inflater.inflate(R.layout.preferred_player_dialog_view, null, false);
+        final RadioGroup radioGroup = rootLayout.findViewById(android.R.id.list);
+
+        final DialogInterface.OnClickListener dialogButtonsClickListener = (dialog, which) -> {
+            final int indexOfChild = radioGroup.indexOfChild(
+                    radioGroup.findViewById(radioGroup.getCheckedRadioButtonId()));
+            final AdapterChoiceItem choice = choices.get(indexOfChild);
+
+            handleChoice(choice.key);
+
+            if (which == DialogInterface.BUTTON_POSITIVE) {
+                preferences.edit().putString(getString(R.string.preferred_open_action_key), choice.key).apply();
+            }
+        };
+
+        final AlertDialog alertDialog = new AlertDialog.Builder(themeWrapperContext)
+                .setTitle(R.string.preferred_open_action_share_menu_title)
+                .setView(radioGroup)
+                .setCancelable(true)
+                .setNegativeButton(R.string.just_once, dialogButtonsClickListener)
+                .setPositiveButton(R.string.always, dialogButtonsClickListener)
+                .setOnDismissListener((dialog) -> finish())
+                .create();
+
+        //noinspection CodeBlock2Expr
+        alertDialog.setOnShowListener(dialog -> {
+            setDialogButtonsState(alertDialog, radioGroup.getCheckedRadioButtonId() != -1);
+        });
+
+        radioGroup.setOnCheckedChangeListener((group, checkedId) -> setDialogButtonsState(alertDialog, true));
+        final View.OnClickListener radioButtonsClickListener = v -> {
+            final int indexOfChild = radioGroup.indexOfChild(v);
+            if (indexOfChild == -1) return;
+
+            selectedPreviously = selectedRadioPosition;
+            selectedRadioPosition = indexOfChild;
+
+            if (selectedPreviously == selectedRadioPosition) {
+                handleChoice(choices.get(selectedRadioPosition).key);
+            }
+        };
+
+        int id = 12345;
+        for (AdapterChoiceItem item : choices) {
+            final RadioButton radioButton = (RadioButton) inflater.inflate(R.layout.list_radio_icon_item, null);
+            radioButton.setText(item.description);
+            radioButton.setCompoundDrawablesWithIntrinsicBounds(item.icon, 0, 0, 0);
+            radioButton.setChecked(false);
+            radioButton.setId(id++);
+            radioButton.setLayoutParams(new RadioGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT));
+            radioButton.setOnClickListener(radioButtonsClickListener);
+            radioGroup.addView(radioButton);
+        }
+
+        if (selectedRadioPosition == -1) {
+            final String lastSelectedPlayer = preferences.getString(getString(R.string.preferred_open_action_last_selected_key), null);
+            if (!TextUtils.isEmpty(lastSelectedPlayer)) {
+                for (int i = 0; i < choices.size(); i++) {
+                    AdapterChoiceItem c = choices.get(i);
+                    if (lastSelectedPlayer.equals(c.key)) {
+                        selectedRadioPosition = i;
+                        break;
+                    }
+                }
+            }
+        }
+
+        selectedRadioPosition = Math.min(Math.max(-1, selectedRadioPosition), choices.size() - 1);
+        if (selectedRadioPosition != -1) {
+            ((RadioButton) radioGroup.getChildAt(selectedRadioPosition)).setChecked(true);
+        }
+        selectedPreviously = selectedRadioPosition;
+
+        alertDialog.show();
+    }
+
+    private List<AdapterChoiceItem> getChoicesForService(StreamingService service, LinkType linkType) {
+        final Context context = getThemeWrapperContext();
+
+        final List<AdapterChoiceItem> returnList = new ArrayList<>();
+        final List<StreamingService.ServiceInfo.MediaCapability> capabilities = service.getServiceInfo().getMediaCapabilities();
+
+        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);
+
+        returnList.add(new AdapterChoiceItem(getString(R.string.show_info_key), getString(R.string.show_info),
+                resolveResourceIdFromAttr(context, R.attr.info)));
+
+        if (capabilities.contains(VIDEO) && !(isExtVideoEnabled && linkType != LinkType.STREAM)) {
+            returnList.add(new AdapterChoiceItem(getString(R.string.video_player_key), getString(R.string.video_player),
+                    resolveResourceIdFromAttr(context, R.attr.play)));
+            returnList.add(new AdapterChoiceItem(getString(R.string.popup_player_key), getString(R.string.popup_player),
+                    resolveResourceIdFromAttr(context, R.attr.popup)));
+        }
+
+        if (capabilities.contains(AUDIO) && !(isExtAudioEnabled && linkType != LinkType.STREAM)) {
+            returnList.add(new AdapterChoiceItem(getString(R.string.background_player_key), getString(R.string.background_player),
+                    resolveResourceIdFromAttr(context, R.attr.audio)));
+        }
+
+        return returnList;
+    }
+
+    private Context getThemeWrapperContext() {
+        return new ContextThemeWrapper(this,
+                ThemeHelper.isLightThemeSelected(this) ? R.style.LightTheme : R.style.DarkTheme);
+    }
+
+    private void setDialogButtonsState(AlertDialog dialog, boolean state) {
+        final Button negativeButton = dialog.getButton(DialogInterface.BUTTON_NEGATIVE);
+        final Button positiveButton = dialog.getButton(DialogInterface.BUTTON_POSITIVE);
+        if (negativeButton == null || positiveButton == null) return;
+
+        negativeButton.setEnabled(state);
+        positiveButton.setEnabled(state);
+    }
+
+    private void handleChoice(final String selectedChoiceKey) {
+        final List<String> validChoicesList = Arrays.asList(getResources().getStringArray(R.array.preferred_open_action_values_list));
+        if (validChoicesList.contains(selectedChoiceKey)) {
+            PreferenceManager.getDefaultSharedPreferences(this).edit()
+                    .putString(getString(R.string.preferred_open_action_last_selected_key), selectedChoiceKey)
+                    .apply();
+        }
+
+        if (selectedChoiceKey.equals(getString(R.string.popup_player_key)) && !PermissionHelper.isPopupEnabled(this)) {
+            PermissionHelper.showPopupEnablementToast(this);
+            finish();
+            return;
+        }
+
+        // stop and bypass FetcherService if InfoScreen was selected since
+        // StreamDetailFragment can fetch data itself
+        if (selectedChoiceKey.equals(getString(R.string.show_info_key))) {
+            disposables.add(Observable
+                    .fromCallable(() -> NavigationHelper.getIntentByLink(this, currentUrl))
+                    .subscribeOn(Schedulers.io())
+                    .observeOn(AndroidSchedulers.mainThread())
+                    .subscribe(intent -> {
+                        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
+                        startActivity(intent);
+
+                        finish();
+                    }, this::handleError)
+            );
+            return;
+        }
+
+        final Intent intent = new Intent(this, FetcherService.class);
+        final Choice choice = new Choice(currentService.getServiceId(), currentLinkType, currentUrl, selectedChoiceKey);
+        intent.putExtra(FetcherService.KEY_CHOICE, choice);
+        startService(intent);
+
+        finish();
+    }
+
+    private static class AdapterChoiceItem {
+        final String description, key;
+        @DrawableRes final int icon;
+
+        AdapterChoiceItem(String key, String description, int icon) {
+            this.description = description;
+            this.key = key;
+            this.icon = icon;
+        }
+    }
+
+    private static class Choice implements Serializable {
+        final int serviceId;
+        final String url, playerChoice;
+        final LinkType linkType;
+
+        Choice(int serviceId, LinkType linkType, String url, String playerChoice) {
+            this.serviceId = serviceId;
+            this.linkType = linkType;
+            this.url = url;
+            this.playerChoice = playerChoice;
+        }
+
+        @Override
+        public String toString() {
+            return serviceId + ":" + url + " > " + linkType + " ::: " + playerChoice;
+        }
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Service Fetcher
+    //////////////////////////////////////////////////////////////////////////*/
+
+    public static class FetcherService extends IntentService {
+
+        private static final int ID = 456;
+        public static final String KEY_CHOICE = "key_choice";
+        private Disposable fetcher;
+
+        public FetcherService() {
+            super(FetcherService.class.getSimpleName());
+        }
+
+        @Override
+        public void onCreate() {
+            super.onCreate();
+            startForeground(ID, createNotification().build());
+        }
+
+        @Override
+        protected void onHandleIntent(@Nullable Intent intent) {
+            if (intent == null) return;
+
+            final Serializable serializable = intent.getSerializableExtra(KEY_CHOICE);
+            if (!(serializable instanceof Choice)) return;
+            Choice playerChoice = (Choice) serializable;
+            handleChoice(playerChoice);
+        }
+
+        public void handleChoice(Choice choice) {
+            Single<? extends Info> single = null;
+            UserAction userAction = UserAction.SOMETHING_ELSE;
+
+            switch (choice.linkType) {
+                case STREAM:
+                    single = ExtractorHelper.getStreamInfo(choice.serviceId, choice.url, false);
+                    userAction = UserAction.REQUESTED_STREAM;
+                    break;
+                case CHANNEL:
+                    single = ExtractorHelper.getChannelInfo(choice.serviceId, choice.url, false);
+                    userAction = UserAction.REQUESTED_CHANNEL;
+                    break;
+                case PLAYLIST:
+                    single = ExtractorHelper.getPlaylistInfo(choice.serviceId, choice.url, false);
+                    userAction = UserAction.REQUESTED_PLAYLIST;
+                    break;
+            }
+
+
+            if (single != null) {
+                final UserAction finalUserAction = userAction;
+                final Consumer<Info> resultHandler = getResultHandler(choice);
+                fetcher = single
+                        .observeOn(AndroidSchedulers.mainThread())
+                        .subscribe(info -> {
+                            resultHandler.accept(info);
+                            if (fetcher != null) fetcher.dispose();
+                        }, throwable -> ExtractorHelper.handleGeneralException(this,
+                                choice.serviceId, choice.url, throwable, finalUserAction, ", opened with " + choice.playerChoice));
+            }
+        }
+
+        public Consumer<Info> getResultHandler(Choice choice) {
+            return info -> {
+                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 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);
+
+                PlayQueue playQueue;
+                String playerChoice = choice.playerChoice;
+
+                if (info instanceof StreamInfo) {
+                    if (playerChoice.equals(backgroundPlayerKey) && isExtAudioEnabled) {
+                        NavigationHelper.playOnExternalAudioPlayer(this, (StreamInfo) info);
+
+                    } 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);
+
+                        if (playerChoice.equals(videoPlayerKey)) {
+                            NavigationHelper.playOnMainPlayer(this, playQueue);
+                        } else if (playerChoice.equals(backgroundPlayerKey)) {
+                            NavigationHelper.enqueueOnBackgroundPlayer(this, playQueue, true);
+                        } else if (playerChoice.equals(popupPlayerKey)) {
+                            NavigationHelper.enqueueOnPopupPlayer(this, playQueue, true);
+                        }
+                    }
+                }
+
+                if (info instanceof ChannelInfo || info instanceof PlaylistInfo) {
+                    playQueue = info instanceof ChannelInfo ? new ChannelPlayQueue((ChannelInfo) info) : new PlaylistPlayQueue((PlaylistInfo) info);
+
+                    if (playerChoice.equals(videoPlayerKey)) {
+                        NavigationHelper.playOnMainPlayer(this, playQueue);
+                    } else if (playerChoice.equals(backgroundPlayerKey)) {
+                        NavigationHelper.playOnBackgroundPlayer(this, playQueue);
+                    } else if (playerChoice.equals(popupPlayerKey)) {
+                        NavigationHelper.playOnPopupPlayer(this, playQueue);
+                    }
+                }
+            };
+        }
+
+        @Override
+        public void onDestroy() {
+            super.onDestroy();
+            stopForeground(true);
+            if (fetcher != null) fetcher.dispose();
+        }
+
+        private NotificationCompat.Builder createNotification() {
+            return new NotificationCompat.Builder(this, getString(R.string.notification_channel_id))
+                    .setOngoing(true)
+                    .setSmallIcon(R.drawable.ic_newpipe_triangle_white)
+                    .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
+                    .setContentTitle(getString(R.string.preferred_player_fetcher_notification_title))
+                    .setContentText(getString(R.string.preferred_player_fetcher_notification_message));
         }
     }
 
@@ -61,9 +542,9 @@ public class RouterActivity extends Activity {
      * brackets (\p{P}). See http://www.regular-expressions.info/unicode.html for
      * more details.
      */
-    protected final static String REGEX_REMOVE_FROM_URL = "[\\p{Z}\\p{P}]";
+    private final static String REGEX_REMOVE_FROM_URL = "[\\p{Z}\\p{P}]";
 
-    protected String getUrl(Intent intent) {
+    private String getUrl(Intent intent) {
         // first gather data and find service
         String videoUrl = null;
         if (intent.getData() != null) {
@@ -72,13 +553,14 @@ public class RouterActivity extends Activity {
         } else if (intent.getStringExtra(Intent.EXTRA_TEXT) != null) {
             //this means that vidoe was called through share menu
             String extraText = intent.getStringExtra(Intent.EXTRA_TEXT);
-            videoUrl = getUris(extraText)[0];
+            final String[] uris = getUris(extraText);
+            videoUrl = uris.length > 0 ? uris[0] : null;
         }
 
         return videoUrl;
     }
 
-    protected String removeHeadingGibberish(final String input) {
+    private String removeHeadingGibberish(final String input) {
         int start = 0;
         for (int i = input.indexOf("://") - 1; i >= 0; i--) {
             if (!input.substring(i, i + 1).matches("\\p{L}")) {
@@ -89,7 +571,7 @@ public class RouterActivity extends Activity {
         return input.substring(start, input.length());
     }
 
-    protected String trim(final String input) {
+    private String trim(final String input) {
         if (input == null || input.length() < 1) {
             return input;
         } else {
@@ -112,7 +594,7 @@ public class RouterActivity extends Activity {
      * @param sharedText text to scan for URLs.
      * @return potential URLs
      */
-    protected String[] getUris(final String sharedText)  {
+    protected String[] getUris(final String sharedText) {
         final Collection<String> result = new HashSet<>();
         if (sharedText != null) {
             final String[] array = sharedText.split("\\p{Space}");
@@ -129,5 +611,4 @@ public class RouterActivity extends Activity {
         }
         return result.toArray(new String[result.size()]);
     }
-
 }

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

@@ -1,44 +0,0 @@
-package org.schabi.newpipe;
-
-import android.content.Intent;
-import android.os.Build;
-import android.widget.Toast;
-
-import org.schabi.newpipe.extractor.NewPipe;
-import org.schabi.newpipe.extractor.StreamingService;
-import org.schabi.newpipe.player.PopupVideoPlayer;
-import org.schabi.newpipe.util.Constants;
-import org.schabi.newpipe.util.PermissionHelper;
-
-/**
- * Get the url from the intent and open a popup player
- */
-public class RouterPopupActivity extends RouterActivity {
-
-    @Override
-    protected void handleUrl(String url) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M
-                && !PermissionHelper.checkSystemAlertWindowPermission(this)) {
-            Toast.makeText(this, R.string.msg_popup_permission, Toast.LENGTH_LONG).show();
-            return;
-        }
-        StreamingService service = NewPipe.getServiceByUrl(url);
-        if (service == null) {
-            Toast.makeText(this, R.string.url_not_supported_toast, Toast.LENGTH_LONG).show();
-            return;
-        }
-
-        Intent callIntent = new Intent(this, PopupVideoPlayer.class);
-        switch (service.getLinkTypeByUrl(url)) {
-            case STREAM:
-                break;
-            default:
-                Toast.makeText(this, R.string.url_not_supported_toast, Toast.LENGTH_LONG).show();
-                return;
-        }
-
-        callIntent.putExtra(Constants.KEY_URL, url);
-        callIntent.putExtra(Constants.KEY_SERVICE_ID, service.getServiceId());
-        startService(callIntent);
-    }
-}

app/src/main/java/org/schabi/newpipe/about/AboutActivity.java

@@ -32,15 +32,16 @@ public class AboutActivity extends AppCompatActivity {
             new SoftwareComponent("Giga Get", "2014", "Peter Cai", "https://github.com/PaperAirplane-Dev-Team/GigaGet", StandardLicenses.GPL2),
             new SoftwareComponent("NewPipe Extractor", "2017", "Christian Schabesberger", "https://github.com/TeamNewPipe/NewPipeExtractor", StandardLicenses.GPL3),
             new SoftwareComponent("Jsoup", "2017", "Jonathan Hedley", "https://github.com/jhy/jsoup", StandardLicenses.MIT),
-            new SoftwareComponent("Google Gson", "2008", "Google Inc", "https://github.com/google/gson", StandardLicenses.APACHE2),
             new SoftwareComponent("Rhino", "2015", "Mozilla", "https://www.mozilla.org/rhino/", StandardLicenses.MPL2),
             new SoftwareComponent("ACRA", "2013", "Kevin Gaudin", "http://www.acra.ch", StandardLicenses.APACHE2),
             new SoftwareComponent("Universal Image Loader", "2011 - 2015", "Sergey Tarasevich", "https://github.com/nostra13/Android-Universal-Image-Loader", StandardLicenses.APACHE2),
-            new SoftwareComponent("Netcipher", "2015", "The Guardian Project", "https://guardianproject.info/code/netcipher/", StandardLicenses.APACHE2),
             new SoftwareComponent("CircleImageView", "2014 - 2017", "Henning Dodenhof", "https://github.com/hdodenhof/CircleImageView", StandardLicenses.APACHE2),
             new SoftwareComponent("ParalaxScrollView", "2014", "Nir Hartmann", "https://github.com/nirhart/ParallaxScroll", StandardLicenses.MIT),
             new SoftwareComponent("NoNonsense-FilePicker", "2016", "Jonas Kalderstam", "https://github.com/spacecowboy/NoNonsense-FilePicker", StandardLicenses.MPL2),
-            new SoftwareComponent("ExoPlayer", "2014-2017", "Google Inc", "https://github.com/google/ExoPlayer", StandardLicenses.APACHE2)
+            new SoftwareComponent("ExoPlayer", "2014-2017", "Google Inc", "https://github.com/google/ExoPlayer", StandardLicenses.APACHE2),
+            new SoftwareComponent("RxAndroid", "2015", "The RxAndroid authors", "https://github.com/ReactiveX/RxAndroid", StandardLicenses.APACHE2),
+            new SoftwareComponent("RxJava", "2016-present", "RxJava Contributors", "https://github.com/ReactiveX/RxJava", StandardLicenses.APACHE2),
+            new SoftwareComponent("RxBinding", "2015", "Jake Wharton", "https://github.com/JakeWharton/RxBinding", StandardLicenses.APACHE2)
     };
 
     /**
@@ -65,7 +66,7 @@ public class AboutActivity extends AppCompatActivity {
 
         setContentView(R.layout.activity_about);
 
-        Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
+        Toolbar toolbar = findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
         // Create the adapter that will return a fragment for each of the three
@@ -73,10 +74,10 @@ public class AboutActivity extends AppCompatActivity {
         mSectionsPagerAdapter = new SectionsPagerAdapter(getSupportFragmentManager());
 
         // Set up the ViewPager with the sections adapter.
-        mViewPager = (ViewPager) findViewById(R.id.container);
+        mViewPager = findViewById(R.id.container);
         mViewPager.setAdapter(mSectionsPagerAdapter);
 
-        TabLayout tabLayout = (TabLayout) findViewById(R.id.tabs);
+        TabLayout tabLayout = findViewById(R.id.tabs);
         tabLayout.setupWithViewPager(mViewPager);
     }
 
@@ -127,14 +128,18 @@ public class AboutActivity extends AppCompatActivity {
         public View onCreateView(LayoutInflater inflater, ViewGroup container,
                                  Bundle savedInstanceState) {
             View rootView = inflater.inflate(R.layout.fragment_about, container, false);
-            TextView version = (TextView) rootView.findViewById(R.id.app_version);
+            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());
 
-            View licenseLink = rootView.findViewById(R.id.app_read_license);
-            licenseLink.setOnClickListener(new OnReadFullLicenseClickListener());
+            View donationLink = rootView.findViewById(R.id.donation_link);
+            donationLink.setOnClickListener(new OnDonationLinkClickListener());
+
+            View websiteLink = rootView.findViewById(R.id.website_link);
+            websiteLink.setOnClickListener(new OnWebsiteLinkClickListener());
+
             return rootView;
         }
 
@@ -147,10 +152,21 @@ public class AboutActivity extends AppCompatActivity {
             }
         }
 
-        private static class OnReadFullLicenseClickListener implements View.OnClickListener {
+        private static class OnDonationLinkClickListener implements View.OnClickListener {
             @Override
-            public void onClick(View v) {
-                LicenseFragment.showLicense(v.getContext(), StandardLicenses.GPL3);
+            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);
             }
         }
     }

app/src/main/java/org/schabi/newpipe/about/License.java

@@ -3,9 +3,6 @@ package org.schabi.newpipe.about;
 import android.net.Uri;
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.text.TextUtils;
-
-import java.net.URLEncoder;
 
 /**
  * A software license
@@ -53,6 +50,10 @@ public class License implements Parcelable {
     public String getAbbreviation() {
         return abbreviation;
     }
+    
+    public String getFilename() {
+        return filename;
+    }
 
     @Override
     public int describeContents() {

app/src/main/java/org/schabi/newpipe/about/LicenseFragment.java

@@ -1,22 +1,13 @@
 package org.schabi.newpipe.about;
 
 import android.content.Context;
-import android.content.DialogInterface;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.v4.app.Fragment;
-import android.support.v7.app.AlertDialog;
-import android.view.ContextMenu;
-import android.view.LayoutInflater;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.ViewGroup;
-import android.webkit.WebView;
+import android.view.*;
 import android.widget.TextView;
-
 import org.schabi.newpipe.R;
 
 import java.util.Arrays;
@@ -48,25 +39,7 @@ public class LicenseFragment extends Fragment {
      * @param license the license to show
      */
     public static void showLicense(Context context, License license) {
-        if(context == null) {
-            throw new NullPointerException("context is null");
-        }
-        if(license == null) {
-            throw new NullPointerException("license is null");
-        }
-        AlertDialog.Builder alert = new AlertDialog.Builder(context);
-        alert.setTitle(license.getName());
-
-        WebView wv = new WebView(context);
-        wv.loadUrl(license.getContentUri().toString());
-        alert.setView(wv);
-        alert.setNegativeButton(android.R.string.ok, new DialogInterface.OnClickListener() {
-            @Override
-            public void onClick(DialogInterface dialog, int which) {
-                dialog.dismiss();
-            }
-        });
-        alert.show();
+        new LicenseFragmentHelper().execute(context, license);
     }
 
     @Override
@@ -87,12 +60,15 @@ public class LicenseFragment extends Fragment {
     @Override
     public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
         View rootView = inflater.inflate(R.layout.fragment_licenses, container, false);
-        ViewGroup softwareComponentsView = (ViewGroup) rootView.findViewById(R.id.software_components);
+        ViewGroup softwareComponentsView = rootView.findViewById(R.id.software_components);
+
+        View licenseLink = rootView.findViewById(R.id.app_read_license);
+        licenseLink.setOnClickListener(new OnReadFullLicenseClickListener());
 
         for (final SoftwareComponent component : softwareComponents) {
             View componentView = inflater.inflate(R.layout.item_software_component, container, false);
-            TextView softwareName = (TextView) componentView.findViewById(R.id.name);
-            TextView copyright = (TextView) componentView.findViewById(R.id.copyright);
+            TextView softwareName = componentView.findViewById(R.id.name);
+            TextView copyright = componentView.findViewById(R.id.copyright);
             softwareName.setText(component.getName());
             copyright.setText(getContext().getString(R.string.copyright,
                     component.getYears(),
@@ -111,7 +87,6 @@ public class LicenseFragment extends Fragment {
             });
             softwareComponentsView.addView(componentView);
             registerForContextMenu(componentView);
-
         }
         return rootView;
     }
@@ -147,4 +122,11 @@ public class LicenseFragment extends Fragment {
         Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(componentLink));
         startActivity(browserIntent);
     }
+
+    private static class OnReadFullLicenseClickListener implements View.OnClickListener {
+        @Override
+        public void onClick(View v) {
+            LicenseFragment.showLicense(v.getContext(), StandardLicenses.GPL3);
+        }
+    }
 }

app/src/main/java/org/schabi/newpipe/about/LicenseFragmentHelper.java

@@ -0,0 +1,111 @@
+package org.schabi.newpipe.about;
+
+import android.content.Context;
+import android.content.DialogInterface;
+import android.os.AsyncTask;
+import android.support.v7.app.AlertDialog;
+import android.webkit.WebView;
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.util.ThemeHelper;
+
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+
+public class LicenseFragmentHelper extends AsyncTask<Object, Void, Integer> {
+
+    private Context context;
+    private License license;
+
+    @Override
+    protected Integer doInBackground(Object... objects) {
+        context = (Context) objects[0];
+        license = (License) objects[1];
+        return 1;
+    }
+
+    @Override
+    protected void onPostExecute(Integer result){
+        String webViewData = getFormattedLicense(context, license);
+        AlertDialog.Builder alert = new AlertDialog.Builder(context);
+        alert.setTitle(license.getName());
+
+        WebView wv = new WebView(context);
+        wv.loadData(webViewData, "text/html; charset=UTF-8", null);
+
+        alert.setView(wv);
+        alert.setNegativeButton(android.R.string.ok, new DialogInterface.OnClickListener() {
+            @Override
+            public void onClick(DialogInterface dialog, int which) {
+                dialog.dismiss();
+            }
+        });
+        alert.show();
+    }
+
+    /**
+     * @param context the context to use
+     * @param license the license
+     * @return String which contains a HTML formatted license page styled according to the context's theme
+     */
+    public static String getFormattedLicense(Context context, License license) {
+        if(context == null) {
+            throw new NullPointerException("context is null");
+        }
+        if(license == null) {
+            throw new NullPointerException("license is null");
+        }
+
+        String licenseContent = "";
+        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;
+            }
+            in.close();
+
+            // split the HTML file and insert the stylesheet into the HEAD of the file
+            String[] insert = licenseContent.split("</head>");
+            webViewData = insert[0] + "<style type=\"text/css\">"
+                    + getLicenseStylesheet(context) + "</style></head>"
+                    + insert[1];
+        } catch (Exception e) {
+            throw new NullPointerException("could not get license file:" + getLicenseStylesheet(context));
+        }
+        return webViewData;
+    }
+
+    /**
+     *
+     * @param context
+     * @return String which is a CSS stylesheet according to the context's theme
+     */
+    public static String getLicenseStylesheet(Context context) {
+        boolean isLightTheme = ThemeHelper.isLightThemeSelected(context);
+        return "body{padding:12px 15px;margin:0;background:#"
+                + getHexRGBColor(context, isLightTheme
+                    ? R.color.light_license_background_color
+                    : R.color.dark_license_background_color)
+                + ";color:#"
+                + getHexRGBColor(context, isLightTheme
+                    ? R.color.light_license_text_color
+                    : R.color.dark_license_text_color) + ";}"
+                + "a[href]{color:#"
+                + getHexRGBColor(context, isLightTheme
+                    ? R.color.light_youtube_primary_color
+                    : R.color.dark_youtube_primary_color) + ";}"
+                + "pre{white-space: pre-wrap;}";
+    }
+
+    /**
+     * Cast R.color to a hexadecimal color value
+     * @param context the context to use
+     * @param color the color number from R.color
+     * @return a six characters long String with hexadecimal RGB values
+     */
+    public static String getHexRGBColor(Context context, int color) {
+        return context.getResources().getString(color).substring(3);
+    }
+
+}

app/src/main/java/org/schabi/newpipe/database/AppDatabase.java

@@ -0,0 +1,55 @@
+package org.schabi.newpipe.database;
+
+import android.arch.persistence.room.Database;
+import android.arch.persistence.room.RoomDatabase;
+import android.arch.persistence.room.TypeConverters;
+
+import org.schabi.newpipe.database.history.dao.SearchHistoryDAO;
+import org.schabi.newpipe.database.history.dao.StreamHistoryDAO;
+import org.schabi.newpipe.database.history.model.SearchHistoryEntry;
+import org.schabi.newpipe.database.history.model.StreamHistoryEntity;
+import org.schabi.newpipe.database.playlist.dao.PlaylistDAO;
+import org.schabi.newpipe.database.playlist.dao.PlaylistRemoteDAO;
+import org.schabi.newpipe.database.playlist.dao.PlaylistStreamDAO;
+import org.schabi.newpipe.database.playlist.model.PlaylistEntity;
+import org.schabi.newpipe.database.playlist.model.PlaylistRemoteEntity;
+import org.schabi.newpipe.database.playlist.model.PlaylistStreamEntity;
+import org.schabi.newpipe.database.stream.dao.StreamDAO;
+import org.schabi.newpipe.database.stream.dao.StreamStateDAO;
+import org.schabi.newpipe.database.stream.model.StreamEntity;
+import org.schabi.newpipe.database.stream.model.StreamStateEntity;
+import org.schabi.newpipe.database.subscription.SubscriptionDAO;
+import org.schabi.newpipe.database.subscription.SubscriptionEntity;
+
+import static org.schabi.newpipe.database.Migrations.DB_VER_12_0;
+
+@TypeConverters({Converters.class})
+@Database(
+        entities = {
+                SubscriptionEntity.class, SearchHistoryEntry.class,
+                StreamEntity.class, StreamHistoryEntity.class, StreamStateEntity.class,
+                PlaylistEntity.class, PlaylistStreamEntity.class, PlaylistRemoteEntity.class
+        },
+        version = DB_VER_12_0,
+        exportSchema = false
+)
+public abstract class AppDatabase extends RoomDatabase {
+
+    public static final String DATABASE_NAME = "newpipe.db";
+
+    public abstract SubscriptionDAO subscriptionDAO();
+
+    public abstract SearchHistoryDAO searchHistoryDAO();
+
+    public abstract StreamDAO streamDAO();
+
+    public abstract StreamHistoryDAO streamHistoryDAO();
+
+    public abstract StreamStateDAO streamStateDAO();
+
+    public abstract PlaylistDAO playlistDAO();
+
+    public abstract PlaylistStreamDAO playlistStreamDAO();
+
+    public abstract PlaylistRemoteDAO playlistRemoteDAO();
+}

app/src/main/java/org/schabi/newpipe/database/BasicDAO.java

@@ -0,0 +1,46 @@
+package org.schabi.newpipe.database;
+
+import android.arch.persistence.room.Dao;
+import android.arch.persistence.room.Delete;
+import android.arch.persistence.room.Insert;
+import android.arch.persistence.room.OnConflictStrategy;
+import android.arch.persistence.room.Update;
+
+import java.util.Collection;
+import java.util.List;
+
+import io.reactivex.Flowable;
+
+@Dao
+public interface BasicDAO<Entity> {
+    /* Inserts */
+    @Insert(onConflict = OnConflictStrategy.FAIL)
+    long insert(final Entity entity);
+
+    @Insert(onConflict = OnConflictStrategy.FAIL)
+    List<Long> insertAll(final Entity... entities);
+
+    @Insert(onConflict = OnConflictStrategy.FAIL)
+    List<Long> insertAll(final Collection<Entity> entities);
+
+    /* Searches */
+    Flowable<List<Entity>> getAll();
+
+    Flowable<List<Entity>> listByService(int serviceId);
+
+    /* Deletes */
+    @Delete
+    int delete(final Entity entity);
+
+    @Delete
+    int delete(final Collection<Entity> entities);
+
+    int deleteAll();
+
+    /* Updates */
+    @Update
+    int update(final Entity entity);
+
+    @Update
+    int update(final Collection<Entity> entities);
+}

app/src/main/java/org/schabi/newpipe/database/Converters.java

@@ -0,0 +1,40 @@
+package org.schabi.newpipe.database;
+
+import android.arch.persistence.room.TypeConverter;
+
+import org.schabi.newpipe.extractor.stream.StreamType;
+
+import java.util.Date;
+
+public class Converters {
+
+    /**
+     * Convert a long value to a date
+     * @param value the long value
+     * @return the date
+     */
+    @TypeConverter
+    public static Date fromTimestamp(Long value) {
+        return value == null ? null : new Date(value);
+    }
+
+    /**
+     * Convert a date to a long value
+     * @param date the date
+     * @return the long value
+     */
+    @TypeConverter
+    public static Long dateToTimestamp(Date date) {
+        return date == null ? null : date.getTime();
+    }
+
+    @TypeConverter
+    public static StreamType streamTypeOf(String value) {
+        return StreamType.valueOf(value);
+    }
+
+    @TypeConverter
+    public static String stringOf(StreamType streamType) {
+        return streamType.name();
+    }
+}

app/src/main/java/org/schabi/newpipe/database/LocalItem.java

@@ -0,0 +1,13 @@
+package org.schabi.newpipe.database;
+
+public interface LocalItem {
+    enum LocalItemType {
+        PLAYLIST_LOCAL_ITEM,
+        PLAYLIST_REMOTE_ITEM,
+
+        PLAYLIST_STREAM_ITEM,
+        STATISTIC_STREAM_ITEM,
+    }
+
+    LocalItemType getLocalItemType();
+}

app/src/main/java/org/schabi/newpipe/database/Migrations.java

@@ -0,0 +1,61 @@
+package org.schabi.newpipe.database;
+
+import android.arch.persistence.db.SupportSQLiteDatabase;
+import android.arch.persistence.room.migration.Migration;
+import android.support.annotation.NonNull;
+
+public class Migrations {
+
+    public static final int DB_VER_11_0 = 1;
+    public static final int DB_VER_12_0 = 2;
+
+    public static final Migration MIGRATION_11_12 = new Migration(DB_VER_11_0, DB_VER_12_0) {
+        @Override
+        public void migrate(@NonNull SupportSQLiteDatabase database) {
+            /*
+            * Unfortunately these queries must be hardcoded due to the possibility of
+            * schema and names changing at a later date, thus invalidating the older migration
+            * scripts if they are not hardcoded.
+            * */
+
+            // Not much we can do about this, since room doesn't create tables before migration.
+            // It's either this or blasting the entire database anew.
+            database.execSQL("CREATE  INDEX `index_search_history_search` ON `search_history` (`search`)");
+            database.execSQL("CREATE TABLE IF NOT EXISTS `streams` (`uid` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `service_id` INTEGER NOT NULL, `url` TEXT, `title` TEXT, `stream_type` TEXT, `duration` INTEGER, `uploader` TEXT, `thumbnail_url` TEXT)");
+            database.execSQL("CREATE UNIQUE INDEX `index_streams_service_id_url` ON `streams` (`service_id`, `url`)");
+            database.execSQL("CREATE TABLE IF NOT EXISTS `stream_history` (`stream_id` INTEGER NOT NULL, `access_date` INTEGER NOT NULL, `repeat_count` INTEGER NOT NULL, PRIMARY KEY(`stream_id`, `access_date`), FOREIGN KEY(`stream_id`) REFERENCES `streams`(`uid`) ON UPDATE CASCADE ON DELETE CASCADE )");
+            database.execSQL("CREATE  INDEX `index_stream_history_stream_id` ON `stream_history` (`stream_id`)");
+            database.execSQL("CREATE TABLE IF NOT EXISTS `stream_state` (`stream_id` INTEGER NOT NULL, `progress_time` INTEGER NOT NULL, PRIMARY KEY(`stream_id`), FOREIGN KEY(`stream_id`) REFERENCES `streams`(`uid`) ON UPDATE CASCADE ON DELETE CASCADE )");
+            database.execSQL("CREATE TABLE IF NOT EXISTS `playlists` (`uid` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `name` TEXT, `thumbnail_url` TEXT)");
+            database.execSQL("CREATE  INDEX `index_playlists_name` ON `playlists` (`name`)");
+            database.execSQL("CREATE TABLE IF NOT EXISTS `playlist_stream_join` (`playlist_id` INTEGER NOT NULL, `stream_id` INTEGER NOT NULL, `join_index` INTEGER NOT NULL, PRIMARY KEY(`playlist_id`, `join_index`), FOREIGN KEY(`playlist_id`) REFERENCES `playlists`(`uid`) ON UPDATE CASCADE ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED, FOREIGN KEY(`stream_id`) REFERENCES `streams`(`uid`) ON UPDATE CASCADE ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED)");
+            database.execSQL("CREATE UNIQUE INDEX `index_playlist_stream_join_playlist_id_join_index` ON `playlist_stream_join` (`playlist_id`, `join_index`)");
+            database.execSQL("CREATE  INDEX `index_playlist_stream_join_stream_id` ON `playlist_stream_join` (`stream_id`)");
+            database.execSQL("CREATE TABLE IF NOT EXISTS `remote_playlists` (`uid` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `service_id` INTEGER NOT NULL, `name` TEXT, `url` TEXT, `thumbnail_url` TEXT, `uploader` TEXT, `stream_count` INTEGER)");
+            database.execSQL("CREATE  INDEX `index_remote_playlists_name` ON `remote_playlists` (`name`)");
+            database.execSQL("CREATE UNIQUE INDEX `index_remote_playlists_service_id_url` ON `remote_playlists` (`service_id`, `url`)");
+
+            // Populate streams table with existing entries in watch history
+            // Latest data first, thus ignoring older entries with the same indices
+            database.execSQL("INSERT OR IGNORE INTO streams (service_id, url, title, " +
+                    "stream_type, duration, uploader, thumbnail_url) " +
+
+                    "SELECT service_id, url, title, 'VIDEO_STREAM', duration, " +
+                    "uploader, thumbnail_url " +
+
+                    "FROM watch_history " +
+                    "ORDER BY creation_date DESC");
+
+            // Once the streams have PKs, join them with the normalized history table
+            // and populate it with the remaining data from watch history
+            database.execSQL("INSERT INTO stream_history (stream_id, access_date, repeat_count)" +
+                    "SELECT uid, creation_date, 1 " +
+                    "FROM watch_history INNER JOIN streams " +
+                    "ON watch_history.service_id == streams.service_id " +
+                    "AND watch_history.url == streams.url " +
+                    "ORDER BY creation_date DESC");
+
+            database.execSQL("DROP TABLE IF EXISTS watch_history");
+        }
+    };
+}

app/src/main/java/org/schabi/newpipe/database/history/dao/HistoryDAO.java

@@ -0,0 +1,7 @@
+package org.schabi.newpipe.database.history.dao;
+
+import org.schabi.newpipe.database.BasicDAO;
+
+public interface HistoryDAO<T> extends BasicDAO<T> {
+    T getLatestEntry();
+}

app/src/main/java/org/schabi/newpipe/database/history/dao/SearchHistoryDAO.java

@@ -0,0 +1,50 @@
+package org.schabi.newpipe.database.history.dao;
+
+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;
+
+import io.reactivex.Flowable;
+
+import static org.schabi.newpipe.database.history.model.SearchHistoryEntry.CREATION_DATE;
+import static org.schabi.newpipe.database.history.model.SearchHistoryEntry.ID;
+import static org.schabi.newpipe.database.history.model.SearchHistoryEntry.SEARCH;
+import static org.schabi.newpipe.database.history.model.SearchHistoryEntry.SERVICE_ID;
+import static org.schabi.newpipe.database.history.model.SearchHistoryEntry.TABLE_NAME;
+
+@Dao
+public interface SearchHistoryDAO extends HistoryDAO<SearchHistoryEntry> {
+
+    String ORDER_BY_CREATION_DATE = " ORDER BY " + CREATION_DATE + " DESC";
+
+    @Query("SELECT * FROM " + TABLE_NAME +
+            " WHERE " + ID + " = (SELECT MAX(" + ID + ") FROM " + TABLE_NAME + ")")
+    @Nullable
+    SearchHistoryEntry getLatestEntry();
+
+    @Query("DELETE FROM " + TABLE_NAME)
+    @Override
+    int deleteAll();
+
+    @Query("DELETE FROM " + TABLE_NAME + " WHERE " + SEARCH + " = :query")
+    int deleteAllWhereQuery(String query);
+
+    @Query("SELECT * FROM " + TABLE_NAME + ORDER_BY_CREATION_DATE)
+    @Override
+    Flowable<List<SearchHistoryEntry>> getAll();
+
+    @Query("SELECT * FROM " + TABLE_NAME + " GROUP BY " + SEARCH + ORDER_BY_CREATION_DATE + " LIMIT :limit")
+    Flowable<List<SearchHistoryEntry>> getUniqueEntries(int limit);
+
+    @Query("SELECT * FROM " + TABLE_NAME + " WHERE " + SERVICE_ID + " = :serviceId" + ORDER_BY_CREATION_DATE)
+    @Override
+    Flowable<List<SearchHistoryEntry>> listByService(int serviceId);
+
+    @Query("SELECT * FROM " + TABLE_NAME + " WHERE " + SEARCH + " LIKE :query || '%' GROUP BY " + SEARCH + " LIMIT :limit")
+    Flowable<List<SearchHistoryEntry>> getSimilarEntries(String query, int limit);
+}

app/src/main/java/org/schabi/newpipe/database/history/dao/StreamHistoryDAO.java

@@ -0,0 +1,68 @@
+package org.schabi.newpipe.database.history.dao;
+
+
+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;
+
+import java.util.List;
+
+import io.reactivex.Flowable;
+
+import static org.schabi.newpipe.database.history.model.StreamHistoryEntity.STREAM_REPEAT_COUNT;
+import static org.schabi.newpipe.database.stream.StreamStatisticsEntry.STREAM_LATEST_DATE;
+import static org.schabi.newpipe.database.stream.StreamStatisticsEntry.STREAM_WATCH_COUNT;
+import static org.schabi.newpipe.database.stream.model.StreamEntity.STREAM_ID;
+import static org.schabi.newpipe.database.stream.model.StreamEntity.STREAM_TABLE;
+import static org.schabi.newpipe.database.history.model.StreamHistoryEntity.JOIN_STREAM_ID;
+import static org.schabi.newpipe.database.history.model.StreamHistoryEntity.STREAM_ACCESS_DATE;
+import static org.schabi.newpipe.database.history.model.StreamHistoryEntity.STREAM_HISTORY_TABLE;
+
+@Dao
+public abstract class StreamHistoryDAO implements HistoryDAO<StreamHistoryEntity> {
+    @Query("SELECT * FROM " + STREAM_HISTORY_TABLE +
+            " WHERE " + STREAM_ACCESS_DATE + " = " +
+            "(SELECT MAX(" + STREAM_ACCESS_DATE + ") FROM " + STREAM_HISTORY_TABLE + ")")
+    @Override
+    @Nullable
+    public abstract StreamHistoryEntity getLatestEntry();
+
+    @Override
+    @Query("SELECT * FROM " + STREAM_HISTORY_TABLE)
+    public abstract Flowable<List<StreamHistoryEntity>> getAll();
+
+    @Override
+    @Query("DELETE FROM " + STREAM_HISTORY_TABLE)
+    public abstract int deleteAll();
+
+    @Override
+    public Flowable<List<StreamHistoryEntity>> listByService(int serviceId) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Query("SELECT * FROM " + STREAM_TABLE +
+            " INNER JOIN " + STREAM_HISTORY_TABLE +
+            " ON " + STREAM_ID + " = " + JOIN_STREAM_ID +
+            " ORDER BY " + STREAM_ACCESS_DATE + " DESC")
+    public abstract Flowable<List<StreamHistoryEntry>> getHistory();
+
+    @Query("DELETE FROM " + STREAM_HISTORY_TABLE + " WHERE " + JOIN_STREAM_ID + " = :streamId")
+    public abstract int deleteStreamHistory(final long streamId);
+
+    @Query("SELECT * FROM " + STREAM_TABLE +
+
+            // Select the latest entry and watch count for each stream id on history table
+            " INNER JOIN " +
+            "(SELECT " + JOIN_STREAM_ID + ", " +
+            "  MAX(" + STREAM_ACCESS_DATE + ") AS " + STREAM_LATEST_DATE + ", " +
+            "  SUM(" + STREAM_REPEAT_COUNT + ") AS " + STREAM_WATCH_COUNT +
+            " FROM " + STREAM_HISTORY_TABLE + " GROUP BY " + JOIN_STREAM_ID + ")" +
+
+            " ON " + STREAM_ID + " = " + JOIN_STREAM_ID)
+    public abstract Flowable<List<StreamStatisticsEntry>> getStatistics();
+}

app/src/main/java/org/schabi/newpipe/database/history/model/SearchHistoryEntry.java

@@ -0,0 +1,79 @@
+package org.schabi.newpipe.database.history.model;
+
+import android.arch.persistence.room.ColumnInfo;
+import android.arch.persistence.room.Entity;
+import android.arch.persistence.room.Ignore;
+import android.arch.persistence.room.Index;
+import android.arch.persistence.room.PrimaryKey;
+
+import java.util.Date;
+
+import static org.schabi.newpipe.database.history.model.SearchHistoryEntry.SEARCH;
+
+@Entity(tableName = SearchHistoryEntry.TABLE_NAME,
+        indices = {@Index(value = SEARCH)})
+public class SearchHistoryEntry {
+
+    public static final String ID = "id";
+    public static final String TABLE_NAME = "search_history";
+    public static final String SERVICE_ID = "service_id";
+    public static final String CREATION_DATE = "creation_date";
+    public static final String SEARCH = "search";
+
+    @ColumnInfo(name = ID)
+    @PrimaryKey(autoGenerate = true)
+    private long id;
+
+    @ColumnInfo(name = CREATION_DATE)
+    private Date creationDate;
+
+    @ColumnInfo(name = SERVICE_ID)
+    private int serviceId;
+
+    @ColumnInfo(name = SEARCH)
+    private String search;
+
+    public SearchHistoryEntry(Date creationDate, int serviceId, String search) {
+        this.serviceId = serviceId;
+        this.creationDate = creationDate;
+        this.search = search;
+    }
+
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    public Date getCreationDate() {
+        return creationDate;
+    }
+
+    public void setCreationDate(Date creationDate) {
+        this.creationDate = creationDate;
+    }
+
+    public int getServiceId() {
+        return serviceId;
+    }
+
+    public void setServiceId(int serviceId) {
+        this.serviceId = serviceId;
+    }
+
+    public String getSearch() {
+        return search;
+    }
+
+    public void setSearch(String search) {
+        this.search = search;
+    }
+
+    @Ignore
+    public boolean hasEqualValues(SearchHistoryEntry otherEntry) {
+        return getServiceId() == otherEntry.getServiceId() &&
+                getSearch().equals(otherEntry.getSearch());
+    }
+}

app/src/main/java/org/schabi/newpipe/database/history/model/StreamHistoryEntity.java

@@ -0,0 +1,79 @@
+package org.schabi.newpipe.database.history.model;
+
+import android.arch.persistence.room.ColumnInfo;
+import android.arch.persistence.room.Entity;
+import android.arch.persistence.room.ForeignKey;
+import android.arch.persistence.room.Ignore;
+import android.arch.persistence.room.Index;
+import android.support.annotation.NonNull;
+
+import org.schabi.newpipe.database.stream.model.StreamEntity;
+
+import java.util.Date;
+
+import static android.arch.persistence.room.ForeignKey.CASCADE;
+import static org.schabi.newpipe.database.history.model.StreamHistoryEntity.STREAM_HISTORY_TABLE;
+import static org.schabi.newpipe.database.history.model.StreamHistoryEntity.JOIN_STREAM_ID;
+import static org.schabi.newpipe.database.history.model.StreamHistoryEntity.STREAM_ACCESS_DATE;
+
+@Entity(tableName = STREAM_HISTORY_TABLE,
+        primaryKeys = {JOIN_STREAM_ID, STREAM_ACCESS_DATE},
+        // No need to index for timestamp as they will almost always be unique
+        indices = {@Index(value = {JOIN_STREAM_ID})},
+        foreignKeys = {
+                @ForeignKey(entity = StreamEntity.class,
+                        parentColumns = StreamEntity.STREAM_ID,
+                        childColumns = JOIN_STREAM_ID,
+                        onDelete = CASCADE, onUpdate = CASCADE)
+        })
+public class StreamHistoryEntity {
+    final public static String STREAM_HISTORY_TABLE = "stream_history";
+    final public static String JOIN_STREAM_ID       = "stream_id";
+    final public static String STREAM_ACCESS_DATE   = "access_date";
+    final public static String STREAM_REPEAT_COUNT  = "repeat_count";
+
+    @ColumnInfo(name = JOIN_STREAM_ID)
+    private long streamUid;
+
+    @NonNull
+    @ColumnInfo(name = STREAM_ACCESS_DATE)
+    private Date accessDate;
+
+    @ColumnInfo(name = STREAM_REPEAT_COUNT)
+    private long repeatCount;
+
+    public StreamHistoryEntity(long streamUid, @NonNull Date accessDate, long repeatCount) {
+        this.streamUid = streamUid;
+        this.accessDate = accessDate;
+        this.repeatCount = repeatCount;
+    }
+
+    @Ignore
+    public StreamHistoryEntity(long streamUid, @NonNull Date accessDate) {
+        this(streamUid, accessDate, 1);
+    }
+
+    public long getStreamUid() {
+        return streamUid;
+    }
+
+    public void setStreamUid(long streamUid) {
+        this.streamUid = streamUid;
+    }
+
+    public Date getAccessDate() {
+        return accessDate;
+    }
+
+    public void setAccessDate(@NonNull Date accessDate) {
+        this.accessDate = accessDate;
+    }
+
+    public long getRepeatCount() {
+        return repeatCount;
+    }
+
+    public void setRepeatCount(long repeatCount) {
+        this.repeatCount = repeatCount;
+    }
+}

app/src/main/java/org/schabi/newpipe/database/history/model/StreamHistoryEntry.java

@@ -0,0 +1,59 @@
+package org.schabi.newpipe.database.history.model;
+
+import android.arch.persistence.room.ColumnInfo;
+
+import org.schabi.newpipe.database.stream.model.StreamEntity;
+import org.schabi.newpipe.extractor.stream.StreamType;
+
+import java.util.Date;
+
+public class StreamHistoryEntry {
+    @ColumnInfo(name = StreamEntity.STREAM_ID)
+    final public long uid;
+    @ColumnInfo(name = StreamEntity.STREAM_SERVICE_ID)
+    final public int serviceId;
+    @ColumnInfo(name = StreamEntity.STREAM_URL)
+    final public String url;
+    @ColumnInfo(name = StreamEntity.STREAM_TITLE)
+    final public String title;
+    @ColumnInfo(name = StreamEntity.STREAM_TYPE)
+    final public StreamType streamType;
+    @ColumnInfo(name = StreamEntity.STREAM_DURATION)
+    final public long duration;
+    @ColumnInfo(name = StreamEntity.STREAM_UPLOADER)
+    final public String uploader;
+    @ColumnInfo(name = StreamEntity.STREAM_THUMBNAIL_URL)
+    final public String thumbnailUrl;
+    @ColumnInfo(name = StreamHistoryEntity.JOIN_STREAM_ID)
+    final public long streamId;
+    @ColumnInfo(name = StreamHistoryEntity.STREAM_ACCESS_DATE)
+    final public Date accessDate;
+    @ColumnInfo(name = StreamHistoryEntity.STREAM_REPEAT_COUNT)
+    final public long repeatCount;
+
+    public StreamHistoryEntry(long uid, int serviceId, String url, String title,
+                              StreamType streamType, long duration, String uploader,
+                              String thumbnailUrl, long streamId, Date accessDate,
+                              long repeatCount) {
+        this.uid = uid;
+        this.serviceId = serviceId;
+        this.url = url;
+        this.title = title;
+        this.streamType = streamType;
+        this.duration = duration;
+        this.uploader = uploader;
+        this.thumbnailUrl = thumbnailUrl;
+        this.streamId = streamId;
+        this.accessDate = accessDate;
+        this.repeatCount = repeatCount;
+    }
+
+    public StreamHistoryEntity toStreamHistoryEntity() {
+        return new StreamHistoryEntity(streamId, accessDate, repeatCount);
+    }
+
+    public boolean hasEqualValues(StreamHistoryEntry other) {
+        return this.uid == other.uid && streamId == other.streamId &&
+                accessDate.compareTo(other.accessDate) == 0;
+    }
+}

app/src/main/java/org/schabi/newpipe/database/playlist/PlaylistLocalItem.java

@@ -0,0 +1,7 @@
+package org.schabi.newpipe.database.playlist;
+
+import org.schabi.newpipe.database.LocalItem;
+
+public interface PlaylistLocalItem extends LocalItem {
+    String getOrderingName();
+}

app/src/main/java/org/schabi/newpipe/database/playlist/PlaylistMetadataEntry.java

@@ -0,0 +1,37 @@
+package org.schabi.newpipe.database.playlist;
+
+import android.arch.persistence.room.ColumnInfo;
+
+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_THUMBNAIL_URL;
+
+public class PlaylistMetadataEntry implements PlaylistLocalItem {
+    final public static String PLAYLIST_STREAM_COUNT = "streamCount";
+
+    @ColumnInfo(name = PLAYLIST_ID)
+    final public long uid;
+    @ColumnInfo(name = PLAYLIST_NAME)
+    final public String name;
+    @ColumnInfo(name = PLAYLIST_THUMBNAIL_URL)
+    final public String thumbnailUrl;
+    @ColumnInfo(name = PLAYLIST_STREAM_COUNT)
+    final public long streamCount;
+
+    public PlaylistMetadataEntry(long uid, String name, String thumbnailUrl, long streamCount) {
+        this.uid = uid;
+        this.name = name;
+        this.thumbnailUrl = thumbnailUrl;
+        this.streamCount = streamCount;
+    }
+
+    @Override
+    public LocalItemType getLocalItemType() {
+        return LocalItemType.PLAYLIST_LOCAL_ITEM;
+    }
+
+    @Override
+    public String getOrderingName() {
+        return name;
+    }
+}

app/src/main/java/org/schabi/newpipe/database/playlist/PlaylistStreamEntry.java

@@ -0,0 +1,60 @@
+package org.schabi.newpipe.database.playlist;
+
+import android.arch.persistence.room.ColumnInfo;
+
+import org.schabi.newpipe.database.LocalItem;
+import org.schabi.newpipe.database.playlist.model.PlaylistStreamEntity;
+import org.schabi.newpipe.database.stream.model.StreamEntity;
+import org.schabi.newpipe.extractor.stream.StreamInfoItem;
+import org.schabi.newpipe.extractor.stream.StreamType;
+
+public class PlaylistStreamEntry implements LocalItem {
+    @ColumnInfo(name = StreamEntity.STREAM_ID)
+    final public long uid;
+    @ColumnInfo(name = StreamEntity.STREAM_SERVICE_ID)
+    final public int serviceId;
+    @ColumnInfo(name = StreamEntity.STREAM_URL)
+    final public String url;
+    @ColumnInfo(name = StreamEntity.STREAM_TITLE)
+    final public String title;
+    @ColumnInfo(name = StreamEntity.STREAM_TYPE)
+    final public StreamType streamType;
+    @ColumnInfo(name = StreamEntity.STREAM_DURATION)
+    final public long duration;
+    @ColumnInfo(name = StreamEntity.STREAM_UPLOADER)
+    final public String uploader;
+    @ColumnInfo(name = StreamEntity.STREAM_THUMBNAIL_URL)
+    final public String thumbnailUrl;
+    @ColumnInfo(name = PlaylistStreamEntity.JOIN_STREAM_ID)
+    final public long streamId;
+    @ColumnInfo(name = PlaylistStreamEntity.JOIN_INDEX)
+    final public int joinIndex;
+
+    public PlaylistStreamEntry(long uid, int serviceId, String url, String title,
+                               StreamType streamType, long duration, String uploader,
+                               String thumbnailUrl, long streamId, int joinIndex) {
+        this.uid = uid;
+        this.serviceId = serviceId;
+        this.url = url;
+        this.title = title;
+        this.streamType = streamType;
+        this.duration = duration;
+        this.uploader = uploader;
+        this.thumbnailUrl = thumbnailUrl;
+        this.streamId = streamId;
+        this.joinIndex = joinIndex;
+    }
+
+    public StreamInfoItem toStreamInfoItem() throws IllegalArgumentException {
+        StreamInfoItem item = new StreamInfoItem(serviceId, url, title, streamType);
+        item.setThumbnailUrl(thumbnailUrl);
+        item.setUploaderName(uploader);
+        item.setDuration(duration);
+        return item;
+    }
+
+    @Override
+    public LocalItemType getLocalItemType() {
+        return LocalItemType.PLAYLIST_STREAM_ITEM;
+    }
+}

app/src/main/java/org/schabi/newpipe/database/playlist/dao/PlaylistDAO.java

@@ -0,0 +1,38 @@
+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;
+
+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
+public abstract class PlaylistDAO implements BasicDAO<PlaylistEntity> {
+    @Override
+    @Query("SELECT * FROM " + PLAYLIST_TABLE)
+    public abstract Flowable<List<PlaylistEntity>> getAll();
+
+    @Override
+    @Query("DELETE FROM " + PLAYLIST_TABLE)
+    public abstract int deleteAll();
+
+    @Override
+    public Flowable<List<PlaylistEntity>> listByService(int serviceId) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Query("SELECT * FROM " + PLAYLIST_TABLE + " WHERE " + PLAYLIST_ID + " = :playlistId")
+    public abstract Flowable<List<PlaylistEntity>> getPlaylist(final long playlistId);
+
+    @Query("DELETE FROM " + PLAYLIST_TABLE + " WHERE " + PLAYLIST_ID + " = :playlistId")
+    public abstract int deletePlaylist(final long playlistId);
+}

app/src/main/java/org/schabi/newpipe/database/playlist/dao/PlaylistRemoteDAO.java

@@ -0,0 +1,60 @@
+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.PlaylistRemoteEntity;
+
+import java.util.List;
+
+import io.reactivex.Flowable;
+
+import static org.schabi.newpipe.database.playlist.model.PlaylistRemoteEntity.REMOTE_PLAYLIST_ID;
+import static org.schabi.newpipe.database.playlist.model.PlaylistRemoteEntity.REMOTE_PLAYLIST_SERVICE_ID;
+import static org.schabi.newpipe.database.playlist.model.PlaylistRemoteEntity.REMOTE_PLAYLIST_TABLE;
+import static org.schabi.newpipe.database.playlist.model.PlaylistRemoteEntity.REMOTE_PLAYLIST_URL;
+
+@Dao
+public abstract class PlaylistRemoteDAO implements BasicDAO<PlaylistRemoteEntity> {
+    @Override
+    @Query("SELECT * FROM " + REMOTE_PLAYLIST_TABLE)
+    public abstract Flowable<List<PlaylistRemoteEntity>> getAll();
+
+    @Override
+    @Query("DELETE FROM " + REMOTE_PLAYLIST_TABLE)
+    public abstract int deleteAll();
+
+    @Override
+    @Query("SELECT * FROM " + REMOTE_PLAYLIST_TABLE +
+            " WHERE " + REMOTE_PLAYLIST_SERVICE_ID + " = :serviceId")
+    public abstract Flowable<List<PlaylistRemoteEntity>> listByService(int serviceId);
+
+    @Query("SELECT * FROM " + REMOTE_PLAYLIST_TABLE + " WHERE " +
+            REMOTE_PLAYLIST_URL + " = :url AND " +
+            REMOTE_PLAYLIST_SERVICE_ID + " = :serviceId")
+    public abstract Flowable<List<PlaylistRemoteEntity>> getPlaylist(long serviceId, String url);
+
+    @Query("SELECT " + REMOTE_PLAYLIST_ID + " FROM " + REMOTE_PLAYLIST_TABLE +
+            " WHERE " +
+            REMOTE_PLAYLIST_URL + " = :url AND " + REMOTE_PLAYLIST_SERVICE_ID + " = :serviceId")
+    abstract Long getPlaylistIdInternal(long serviceId, String url);
+
+    @Transaction
+    public long upsert(PlaylistRemoteEntity playlist) {
+        final Long playlistId = getPlaylistIdInternal(playlist.getServiceId(), playlist.getUrl());
+
+        if (playlistId == null) {
+            return insert(playlist);
+        } else {
+            playlist.setUid(playlistId);
+            update(playlist);
+            return playlistId;
+        }
+    }
+
+    @Query("DELETE FROM " + REMOTE_PLAYLIST_TABLE +
+            " WHERE " + REMOTE_PLAYLIST_ID + " = :playlistId")
+    public abstract int deletePlaylist(final long playlistId);
+}

app/src/main/java/org/schabi/newpipe/database/playlist/dao/PlaylistStreamDAO.java

@@ -0,0 +1,69 @@
+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.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;
+
+import io.reactivex.Flowable;
+
+import static org.schabi.newpipe.database.playlist.PlaylistMetadataEntry.PLAYLIST_STREAM_COUNT;
+import static org.schabi.newpipe.database.playlist.model.PlaylistEntity.*;
+import static org.schabi.newpipe.database.playlist.model.PlaylistStreamEntity.*;
+import static org.schabi.newpipe.database.stream.model.StreamEntity.*;
+
+@Dao
+public abstract class PlaylistStreamDAO implements BasicDAO<PlaylistStreamEntity> {
+    @Override
+    @Query("SELECT * FROM " + PLAYLIST_STREAM_JOIN_TABLE)
+    public abstract Flowable<List<PlaylistStreamEntity>> getAll();
+
+    @Override
+    @Query("DELETE FROM " + PLAYLIST_STREAM_JOIN_TABLE)
+    public abstract int deleteAll();
+
+    @Override
+    public Flowable<List<PlaylistStreamEntity>> listByService(int serviceId) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Query("DELETE FROM " + PLAYLIST_STREAM_JOIN_TABLE +
+            " WHERE " + JOIN_PLAYLIST_ID + " = :playlistId")
+    public abstract void deleteBatch(final long playlistId);
+
+    @Query("SELECT COALESCE(MAX(" + JOIN_INDEX + "), -1)" +
+            " FROM " + PLAYLIST_STREAM_JOIN_TABLE +
+            " WHERE " + JOIN_PLAYLIST_ID + " = :playlistId")
+    public abstract Flowable<Integer> getMaximumIndexOf(final long playlistId);
+
+    @Transaction
+    @Query("SELECT * FROM " + STREAM_TABLE + " INNER JOIN " +
+            // get ids of streams of the given playlist
+            "(SELECT " + JOIN_STREAM_ID + "," + JOIN_INDEX +
+            " FROM " + PLAYLIST_STREAM_JOIN_TABLE +
+            " WHERE " + JOIN_PLAYLIST_ID + " = :playlistId)" +
+
+            // then merge with the stream metadata
+            " ON " + STREAM_ID + " = " + JOIN_STREAM_ID +
+            " ORDER BY " + JOIN_INDEX + " ASC")
+    public abstract Flowable<List<PlaylistStreamEntry>> getOrderedStreamsOf(long playlistId);
+
+    @Transaction
+    @Query("SELECT " + PLAYLIST_ID + ", " + PLAYLIST_NAME + ", " +
+            PLAYLIST_THUMBNAIL_URL + ", " +
+            "COALESCE(COUNT(" + JOIN_PLAYLIST_ID + "), 0) AS " + PLAYLIST_STREAM_COUNT +
+
+            " FROM " + PLAYLIST_TABLE +
+            " LEFT JOIN " + PLAYLIST_STREAM_JOIN_TABLE +
+            " ON " + PLAYLIST_ID + " = " + JOIN_PLAYLIST_ID +
+            " GROUP BY " + JOIN_PLAYLIST_ID +
+            " ORDER BY " + PLAYLIST_NAME + " COLLATE NOCASE ASC")
+    public abstract Flowable<List<PlaylistMetadataEntry>> getPlaylistMetadata();
+}

app/src/main/java/org/schabi/newpipe/database/playlist/model/PlaylistEntity.java

@@ -0,0 +1,59 @@
+package org.schabi.newpipe.database.playlist.model;
+
+import android.arch.persistence.room.ColumnInfo;
+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;
+
+@Entity(tableName = PLAYLIST_TABLE,
+        indices = {@Index(value = {PLAYLIST_NAME})})
+public class PlaylistEntity {
+    final public static String PLAYLIST_TABLE           = "playlists";
+    final public static String PLAYLIST_ID              = "uid";
+    final public static String PLAYLIST_NAME            = "name";
+    final public static String PLAYLIST_THUMBNAIL_URL   = "thumbnail_url";
+
+    @PrimaryKey(autoGenerate = true)
+    @ColumnInfo(name = PLAYLIST_ID)
+    private long uid = 0;
+
+    @ColumnInfo(name = PLAYLIST_NAME)
+    private String name;
+
+    @ColumnInfo(name = PLAYLIST_THUMBNAIL_URL)
+    private String thumbnailUrl;
+
+    public PlaylistEntity(String name, String thumbnailUrl) {
+        this.name = name;
+        this.thumbnailUrl = thumbnailUrl;
+    }
+
+    public long getUid() {
+        return uid;
+    }
+
+    public void setUid(long uid) {
+        this.uid = uid;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getThumbnailUrl() {
+        return thumbnailUrl;
+    }
+
+    public void setThumbnailUrl(String thumbnailUrl) {
+        this.thumbnailUrl = thumbnailUrl;
+    }
+}

app/src/main/java/org/schabi/newpipe/database/playlist/model/PlaylistRemoteEntity.java

@@ -0,0 +1,139 @@
+package org.schabi.newpipe.database.playlist.model;
+
+import android.arch.persistence.room.ColumnInfo;
+import android.arch.persistence.room.Entity;
+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;
+
+import static org.schabi.newpipe.database.LocalItem.LocalItemType.PLAYLIST_REMOTE_ITEM;
+import static org.schabi.newpipe.database.playlist.model.PlaylistRemoteEntity.REMOTE_PLAYLIST_NAME;
+import static org.schabi.newpipe.database.playlist.model.PlaylistRemoteEntity.REMOTE_PLAYLIST_SERVICE_ID;
+import static org.schabi.newpipe.database.playlist.model.PlaylistRemoteEntity.REMOTE_PLAYLIST_TABLE;
+import static org.schabi.newpipe.database.playlist.model.PlaylistRemoteEntity.REMOTE_PLAYLIST_URL;
+
+@Entity(tableName = REMOTE_PLAYLIST_TABLE,
+        indices = {
+                @Index(value = {REMOTE_PLAYLIST_NAME}),
+                @Index(value = {REMOTE_PLAYLIST_SERVICE_ID, REMOTE_PLAYLIST_URL}, unique = true)
+        })
+public class PlaylistRemoteEntity implements PlaylistLocalItem {
+    final public static String REMOTE_PLAYLIST_TABLE         = "remote_playlists";
+    final public static String REMOTE_PLAYLIST_ID            = "uid";
+    final public static String REMOTE_PLAYLIST_SERVICE_ID    = "service_id";
+    final public static String REMOTE_PLAYLIST_NAME          = "name";
+    final public static String REMOTE_PLAYLIST_URL           = "url";
+    final public static String REMOTE_PLAYLIST_THUMBNAIL_URL = "thumbnail_url";
+    final public static String REMOTE_PLAYLIST_UPLOADER_NAME = "uploader";
+    final public static String REMOTE_PLAYLIST_STREAM_COUNT  = "stream_count";
+
+    @PrimaryKey(autoGenerate = true)
+    @ColumnInfo(name = REMOTE_PLAYLIST_ID)
+    private long uid = 0;
+
+    @ColumnInfo(name = REMOTE_PLAYLIST_SERVICE_ID)
+    private int serviceId = Constants.NO_SERVICE_ID;
+
+    @ColumnInfo(name = REMOTE_PLAYLIST_NAME)
+    private String name;
+
+    @ColumnInfo(name = REMOTE_PLAYLIST_URL)
+    private String url;
+
+    @ColumnInfo(name = REMOTE_PLAYLIST_THUMBNAIL_URL)
+    private String thumbnailUrl;
+
+    @ColumnInfo(name = REMOTE_PLAYLIST_UPLOADER_NAME)
+    private String uploader;
+
+    @ColumnInfo(name = REMOTE_PLAYLIST_STREAM_COUNT)
+    private Long streamCount;
+
+    public PlaylistRemoteEntity(int serviceId, String name, String url, String thumbnailUrl,
+                                String uploader, Long streamCount) {
+        this.serviceId = serviceId;
+        this.name = name;
+        this.url = url;
+        this.thumbnailUrl = thumbnailUrl;
+        this.uploader = uploader;
+        this.streamCount = streamCount;
+    }
+
+    @Ignore
+    public PlaylistRemoteEntity(final PlaylistInfo info) {
+        this(info.getServiceId(), info.getName(), info.getUrl(),
+                info.getThumbnailUrl() == null ? info.getUploaderAvatarUrl() : info.getThumbnailUrl(),
+                info.getUploaderName(), info.getStreamCount());
+    }
+
+    public long getUid() {
+        return uid;
+    }
+
+    public void setUid(long uid) {
+        this.uid = uid;
+    }
+
+    public int getServiceId() {
+        return serviceId;
+    }
+
+    public void setServiceId(int serviceId) {
+        this.serviceId = serviceId;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getThumbnailUrl() {
+        return thumbnailUrl;
+    }
+
+    public void setThumbnailUrl(String thumbnailUrl) {
+        this.thumbnailUrl = thumbnailUrl;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+
+    public String getUploader() {
+        return uploader;
+    }
+
+    public void setUploader(String uploader) {
+        this.uploader = uploader;
+    }
+
+    public Long getStreamCount() {
+        return streamCount;
+    }
+
+    public void setStreamCount(Long streamCount) {
+        this.streamCount = streamCount;
+    }
+
+    @Override
+    public LocalItemType getLocalItemType() {
+        return PLAYLIST_REMOTE_ITEM;
+    }
+
+    @Override
+    public String getOrderingName() {
+        return name;
+    }
+}

app/src/main/java/org/schabi/newpipe/database/playlist/model/PlaylistStreamEntity.java

@@ -0,0 +1,77 @@
+package org.schabi.newpipe.database.playlist.model;
+
+import android.arch.persistence.room.ColumnInfo;
+import android.arch.persistence.room.Entity;
+import android.arch.persistence.room.ForeignKey;
+import android.arch.persistence.room.Index;
+
+import org.schabi.newpipe.database.stream.model.StreamEntity;
+
+import static android.arch.persistence.room.ForeignKey.CASCADE;
+import static org.schabi.newpipe.database.playlist.model.PlaylistStreamEntity.JOIN_INDEX;
+import static org.schabi.newpipe.database.playlist.model.PlaylistStreamEntity.JOIN_PLAYLIST_ID;
+import static org.schabi.newpipe.database.playlist.model.PlaylistStreamEntity.JOIN_STREAM_ID;
+import static org.schabi.newpipe.database.playlist.model.PlaylistStreamEntity.PLAYLIST_STREAM_JOIN_TABLE;
+
+@Entity(tableName = PLAYLIST_STREAM_JOIN_TABLE,
+        primaryKeys = {JOIN_PLAYLIST_ID, JOIN_INDEX},
+        indices = {
+                @Index(value = {JOIN_PLAYLIST_ID, JOIN_INDEX}, unique = true),
+                @Index(value = {JOIN_STREAM_ID})
+        },
+        foreignKeys = {
+                @ForeignKey(entity = PlaylistEntity.class,
+                        parentColumns = PlaylistEntity.PLAYLIST_ID,
+                        childColumns = JOIN_PLAYLIST_ID,
+                        onDelete = CASCADE, onUpdate = CASCADE, deferred = true),
+                @ForeignKey(entity = StreamEntity.class,
+                        parentColumns = StreamEntity.STREAM_ID,
+                        childColumns = JOIN_STREAM_ID,
+                        onDelete = CASCADE, onUpdate = CASCADE, deferred = true)
+        })
+public class PlaylistStreamEntity {
+
+    final public static String PLAYLIST_STREAM_JOIN_TABLE   = "playlist_stream_join";
+    final public static String JOIN_PLAYLIST_ID             = "playlist_id";
+    final public static String JOIN_STREAM_ID               = "stream_id";
+    final public static String JOIN_INDEX                   = "join_index";
+
+    @ColumnInfo(name = JOIN_PLAYLIST_ID)
+    private long playlistUid;
+
+    @ColumnInfo(name = JOIN_STREAM_ID)
+    private long streamUid;
+
+    @ColumnInfo(name = JOIN_INDEX)
+    private int index;
+
+    public PlaylistStreamEntity(final long playlistUid, final long streamUid, final int index) {
+        this.playlistUid = playlistUid;
+        this.streamUid = streamUid;
+        this.index = index;
+    }
+
+    public long getPlaylistUid() {
+        return playlistUid;
+    }
+
+    public long getStreamUid() {
+        return streamUid;
+    }
+
+    public int getIndex() {
+        return index;
+    }
+
+    public void setPlaylistUid(long playlistUid) {
+        this.playlistUid = playlistUid;
+    }
+
+    public void setStreamUid(long streamUid) {
+        this.streamUid = streamUid;
+    }
+
+    public void setIndex(int index) {
+        this.index = index;
+    }
+}

app/src/main/java/org/schabi/newpipe/database/stream/StreamStatisticsEntry.java

@@ -0,0 +1,69 @@
+package org.schabi.newpipe.database.stream;
+
+import android.arch.persistence.room.ColumnInfo;
+
+import org.schabi.newpipe.database.LocalItem;
+import org.schabi.newpipe.database.history.model.StreamHistoryEntity;
+import org.schabi.newpipe.database.stream.model.StreamEntity;
+import org.schabi.newpipe.extractor.stream.StreamInfoItem;
+import org.schabi.newpipe.extractor.stream.StreamType;
+
+import java.util.Date;
+
+public class StreamStatisticsEntry implements LocalItem {
+    final public static String STREAM_LATEST_DATE = "latestAccess";
+    final public static String STREAM_WATCH_COUNT = "watchCount";
+
+    @ColumnInfo(name = StreamEntity.STREAM_ID)
+    final public long uid;
+    @ColumnInfo(name = StreamEntity.STREAM_SERVICE_ID)
+    final public int serviceId;
+    @ColumnInfo(name = StreamEntity.STREAM_URL)
+    final public String url;
+    @ColumnInfo(name = StreamEntity.STREAM_TITLE)
+    final public String title;
+    @ColumnInfo(name = StreamEntity.STREAM_TYPE)
+    final public StreamType streamType;
+    @ColumnInfo(name = StreamEntity.STREAM_DURATION)
+    final public long duration;
+    @ColumnInfo(name = StreamEntity.STREAM_UPLOADER)
+    final public String uploader;
+    @ColumnInfo(name = StreamEntity.STREAM_THUMBNAIL_URL)
+    final public String thumbnailUrl;
+    @ColumnInfo(name = StreamHistoryEntity.JOIN_STREAM_ID)
+    final public long streamId;
+    @ColumnInfo(name = StreamStatisticsEntry.STREAM_LATEST_DATE)
+    final public Date latestAccessDate;
+    @ColumnInfo(name = StreamStatisticsEntry.STREAM_WATCH_COUNT)
+    final public long watchCount;
+
+    public StreamStatisticsEntry(long uid, int serviceId, String url, String title,
+                                 StreamType streamType, long duration, String uploader,
+                                 String thumbnailUrl, long streamId, Date latestAccessDate,
+                                 long watchCount) {
+        this.uid = uid;
+        this.serviceId = serviceId;
+        this.url = url;
+        this.title = title;
+        this.streamType = streamType;
+        this.duration = duration;
+        this.uploader = uploader;
+        this.thumbnailUrl = thumbnailUrl;
+        this.streamId = streamId;
+        this.latestAccessDate = latestAccessDate;
+        this.watchCount = watchCount;
+    }
+
+    public StreamInfoItem toStreamInfoItem() {
+        StreamInfoItem item = new StreamInfoItem(serviceId, url, title, streamType);
+        item.setDuration(duration);
+        item.setUploaderName(uploader);
+        item.setThumbnailUrl(thumbnailUrl);
+        return item;
+    }
+
+    @Override
+    public LocalItemType getLocalItemType() {
+        return LocalItemType.STATISTIC_STREAM_ITEM;
+    }
+}

app/src/main/java/org/schabi/newpipe/database/stream/dao/StreamDAO.java

@@ -0,0 +1,100 @@
+package org.schabi.newpipe.database.stream.dao;
+
+import android.arch.persistence.room.Dao;
+import android.arch.persistence.room.Insert;
+import android.arch.persistence.room.OnConflictStrategy;
+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.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;
+
+import io.reactivex.Flowable;
+
+import static org.schabi.newpipe.database.playlist.model.PlaylistStreamEntity.PLAYLIST_STREAM_JOIN_TABLE;
+import static org.schabi.newpipe.database.stream.model.StreamEntity.STREAM_ID;
+import static org.schabi.newpipe.database.stream.model.StreamEntity.STREAM_SERVICE_ID;
+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> {
+    @Override
+    @Query("SELECT * FROM " + STREAM_TABLE)
+    public abstract Flowable<List<StreamEntity>> getAll();
+
+    @Override
+    @Query("DELETE FROM " + STREAM_TABLE)
+    public abstract int deleteAll();
+
+    @Override
+    @Query("SELECT * FROM " + STREAM_TABLE + " WHERE " + STREAM_SERVICE_ID + " = :serviceId")
+    public abstract Flowable<List<StreamEntity>> listByService(int serviceId);
+
+    @Query("SELECT * FROM " + STREAM_TABLE + " WHERE " +
+            STREAM_URL + " = :url AND " +
+            STREAM_SERVICE_ID + " = :serviceId")
+    public abstract Flowable<List<StreamEntity>> getStream(long serviceId, String url);
+
+    @Insert(onConflict = OnConflictStrategy.IGNORE)
+    abstract void silentInsertAllInternal(final List<StreamEntity> streams);
+
+    @Query("SELECT " + STREAM_ID + " FROM " + STREAM_TABLE + " WHERE " +
+            STREAM_URL + " = :url AND " +
+            STREAM_SERVICE_ID + " = :serviceId")
+    abstract Long getStreamIdInternal(long serviceId, String url);
+
+    @Transaction
+    public long upsert(StreamEntity stream) {
+        final Long streamIdCandidate = getStreamIdInternal(stream.getServiceId(), stream.getUrl());
+
+        if (streamIdCandidate == null) {
+            return insert(stream);
+        } else {
+            stream.setUid(streamIdCandidate);
+            update(stream);
+            return streamIdCandidate;
+        }
+    }
+
+    @Transaction
+    public List<Long> upsertAll(List<StreamEntity> streams) {
+        silentInsertAllInternal(streams);
+
+        final List<Long> streamIds = new ArrayList<>(streams.size());
+        for (StreamEntity stream : streams) {
+            final Long streamId = getStreamIdInternal(stream.getServiceId(), stream.getUrl());
+            if (streamId == null) {
+                throw new IllegalStateException("StreamID cannot be null just after insertion.");
+            }
+
+            streamIds.add(streamId);
+            stream.setUid(streamId);
+        }
+
+        update(streams);
+        return streamIds;
+    }
+
+    @Query("DELETE FROM " + STREAM_TABLE + " WHERE " + STREAM_ID +
+            " NOT IN " +
+            "(SELECT DISTINCT " + STREAM_ID + " FROM " + STREAM_TABLE +
+
+            " LEFT JOIN " + STREAM_HISTORY_TABLE +
+            " ON " + STREAM_ID + " = " +
+            StreamHistoryEntity.STREAM_HISTORY_TABLE + "." + StreamHistoryEntity.JOIN_STREAM_ID +
+
+            " LEFT JOIN " + PLAYLIST_STREAM_JOIN_TABLE +
+            " ON " + STREAM_ID + " = " +
+            PlaylistStreamEntity.PLAYLIST_STREAM_JOIN_TABLE + "." + PlaylistStreamEntity.JOIN_STREAM_ID +
+            ")")
+    public abstract int deleteOrphans();
+}

app/src/main/java/org/schabi/newpipe/database/stream/dao/StreamStateDAO.java

@@ -0,0 +1,48 @@
+package org.schabi.newpipe.database.stream.dao;
+
+import android.arch.persistence.room.Dao;
+import android.arch.persistence.room.Insert;
+import android.arch.persistence.room.OnConflictStrategy;
+import android.arch.persistence.room.Query;
+import android.arch.persistence.room.Transaction;
+
+import org.schabi.newpipe.database.BasicDAO;
+import org.schabi.newpipe.database.stream.model.StreamStateEntity;
+
+import java.util.List;
+
+import io.reactivex.Flowable;
+
+import static org.schabi.newpipe.database.stream.model.StreamStateEntity.JOIN_STREAM_ID;
+import static org.schabi.newpipe.database.stream.model.StreamStateEntity.STREAM_STATE_TABLE;
+
+@Dao
+public abstract class StreamStateDAO implements BasicDAO<StreamStateEntity> {
+    @Override
+    @Query("SELECT * FROM " + STREAM_STATE_TABLE)
+    public abstract Flowable<List<StreamStateEntity>> getAll();
+
+    @Override
+    @Query("DELETE FROM " + STREAM_STATE_TABLE)
+    public abstract int deleteAll();
+
+    @Override
+    public Flowable<List<StreamStateEntity>> listByService(int serviceId) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Query("SELECT * FROM " + STREAM_STATE_TABLE + " WHERE " + JOIN_STREAM_ID + " = :streamId")
+    public abstract Flowable<List<StreamStateEntity>> getState(final long streamId);
+
+    @Query("DELETE FROM " + STREAM_STATE_TABLE + " WHERE " + JOIN_STREAM_ID + " = :streamId")
+    public abstract int deleteState(final long streamId);
+
+    @Insert(onConflict = OnConflictStrategy.IGNORE)
+    abstract void silentInsertInternal(final StreamStateEntity streamState);
+
+    @Transaction
+    public long upsert(StreamStateEntity stream) {
+        silentInsertInternal(stream);
+        return update(stream);
+    }
+}

app/src/main/java/org/schabi/newpipe/database/stream/model/StreamEntity.java

@@ -0,0 +1,153 @@
+package org.schabi.newpipe.database.stream.model;
+
+import android.arch.persistence.room.ColumnInfo;
+import android.arch.persistence.room.Entity;
+import android.arch.persistence.room.Ignore;
+import android.arch.persistence.room.Index;
+import android.arch.persistence.room.PrimaryKey;
+
+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.player.playqueue.PlayQueueItem;
+import org.schabi.newpipe.util.Constants;
+
+import java.io.Serializable;
+
+import static org.schabi.newpipe.database.stream.model.StreamEntity.STREAM_SERVICE_ID;
+import static org.schabi.newpipe.database.stream.model.StreamEntity.STREAM_TABLE;
+import static org.schabi.newpipe.database.stream.model.StreamEntity.STREAM_URL;
+
+@Entity(tableName = STREAM_TABLE,
+        indices = {@Index(value = {STREAM_SERVICE_ID, STREAM_URL}, unique = true)})
+public class StreamEntity implements Serializable {
+
+    final public static String STREAM_TABLE             = "streams";
+    final public static String STREAM_ID                = "uid";
+    final public static String STREAM_SERVICE_ID        = "service_id";
+    final public static String STREAM_URL               = "url";
+    final public static String STREAM_TITLE             = "title";
+    final public static String STREAM_TYPE              = "stream_type";
+    final public static String STREAM_DURATION          = "duration";
+    final public static String STREAM_UPLOADER          = "uploader";
+    final public static String STREAM_THUMBNAIL_URL     = "thumbnail_url";
+
+    @PrimaryKey(autoGenerate = true)
+    @ColumnInfo(name = STREAM_ID)
+    private long uid = 0;
+
+    @ColumnInfo(name = STREAM_SERVICE_ID)
+    private int serviceId = Constants.NO_SERVICE_ID;
+
+    @ColumnInfo(name = STREAM_URL)
+    private String url;
+
+    @ColumnInfo(name = STREAM_TITLE)
+    private String title;
+
+    @ColumnInfo(name = STREAM_TYPE)
+    private StreamType streamType;
+
+    @ColumnInfo(name = STREAM_DURATION)
+    private Long duration;
+
+    @ColumnInfo(name = STREAM_UPLOADER)
+    private String uploader;
+
+    @ColumnInfo(name = STREAM_THUMBNAIL_URL)
+    private String thumbnailUrl;
+
+    public StreamEntity(final int serviceId, final String title, final String url,
+                        final StreamType streamType, final String thumbnailUrl, final String uploader,
+                        final long duration) {
+        this.serviceId = serviceId;
+        this.title = title;
+        this.url = url;
+        this.streamType = streamType;
+        this.thumbnailUrl = thumbnailUrl;
+        this.uploader = uploader;
+        this.duration = duration;
+    }
+
+    @Ignore
+    public StreamEntity(final StreamInfoItem item) {
+        this(item.getServiceId(), item.getName(), item.getUrl(), item.getStreamType(), item.getThumbnailUrl(),
+                item.getUploaderName(), item.getDuration());
+    }
+
+    @Ignore
+    public StreamEntity(final StreamInfo info) {
+        this(info.getServiceId(), info.getName(), info.getUrl(), info.getStreamType(), info.getThumbnailUrl(),
+                info.getUploaderName(), info.getDuration());
+    }
+
+    @Ignore
+    public StreamEntity(final PlayQueueItem item) {
+        this(item.getServiceId(), item.getTitle(), item.getUrl(), item.getStreamType(),
+                item.getThumbnailUrl(), item.getUploader(), item.getDuration());
+    }
+
+    public long getUid() {
+        return uid;
+    }
+
+    public void setUid(long uid) {
+        this.uid = uid;
+    }
+
+    public int getServiceId() {
+        return serviceId;
+    }
+
+    public void setServiceId(int serviceId) {
+        this.serviceId = serviceId;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public StreamType getStreamType() {
+        return streamType;
+    }
+
+    public void setStreamType(StreamType type) {
+        this.streamType = type;
+    }
+
+    public Long getDuration() {
+        return duration;
+    }
+
+    public void setDuration(Long duration) {
+        this.duration = duration;
+    }
+
+    public String getUploader() {
+        return uploader;
+    }
+
+    public void setUploader(String uploader) {
+        this.uploader = uploader;
+    }
+
+    public String getThumbnailUrl() {
+        return thumbnailUrl;
+    }
+
+    public void setThumbnailUrl(String thumbnailUrl) {
+        this.thumbnailUrl = thumbnailUrl;
+    }
+}

app/src/main/java/org/schabi/newpipe/database/stream/model/StreamStateEntity.java

@@ -0,0 +1,51 @@
+package org.schabi.newpipe.database.stream.model;
+
+
+import android.arch.persistence.room.ColumnInfo;
+import android.arch.persistence.room.Entity;
+import android.arch.persistence.room.ForeignKey;
+
+import static android.arch.persistence.room.ForeignKey.CASCADE;
+import static org.schabi.newpipe.database.stream.model.StreamStateEntity.JOIN_STREAM_ID;
+import static org.schabi.newpipe.database.stream.model.StreamStateEntity.STREAM_STATE_TABLE;
+
+@Entity(tableName = STREAM_STATE_TABLE,
+        primaryKeys = {JOIN_STREAM_ID},
+        foreignKeys = {
+                @ForeignKey(entity = StreamEntity.class,
+                        parentColumns = StreamEntity.STREAM_ID,
+                        childColumns = JOIN_STREAM_ID,
+                        onDelete = CASCADE, onUpdate = CASCADE)
+        })
+public class StreamStateEntity {
+    final public static String STREAM_STATE_TABLE   = "stream_state";
+    final public static String JOIN_STREAM_ID       = "stream_id";
+    final public static String STREAM_PROGRESS_TIME = "progress_time";
+
+    @ColumnInfo(name = JOIN_STREAM_ID)
+    private long streamUid;
+
+    @ColumnInfo(name = STREAM_PROGRESS_TIME)
+    private long progressTime;
+
+    public StreamStateEntity(long streamUid, long progressTime) {
+        this.streamUid = streamUid;
+        this.progressTime = progressTime;
+    }
+
+    public long getStreamUid() {
+        return streamUid;
+    }
+
+    public void setStreamUid(long streamUid) {
+        this.streamUid = streamUid;
+    }
+
+    public long getProgressTime() {
+        return progressTime;
+    }
+
+    public void setProgressTime(long progressTime) {
+        this.progressTime = progressTime;
+    }
+}

app/src/main/java/org/schabi/newpipe/database/subscription/SubscriptionDAO.java

@@ -0,0 +1,69 @@
+package org.schabi.newpipe.database.subscription;
+
+import android.arch.persistence.room.Dao;
+import android.arch.persistence.room.Insert;
+import android.arch.persistence.room.OnConflictStrategy;
+import android.arch.persistence.room.Query;
+import android.arch.persistence.room.Transaction;
+
+import org.schabi.newpipe.database.BasicDAO;
+
+import java.util.List;
+
+import io.reactivex.Flowable;
+
+import static org.schabi.newpipe.database.subscription.SubscriptionEntity.SUBSCRIPTION_SERVICE_ID;
+import static org.schabi.newpipe.database.subscription.SubscriptionEntity.SUBSCRIPTION_TABLE;
+import static org.schabi.newpipe.database.subscription.SubscriptionEntity.SUBSCRIPTION_UID;
+import static org.schabi.newpipe.database.subscription.SubscriptionEntity.SUBSCRIPTION_URL;
+
+@Dao
+public abstract class SubscriptionDAO implements BasicDAO<SubscriptionEntity> {
+    @Override
+    @Query("SELECT * FROM " + SUBSCRIPTION_TABLE)
+    public abstract Flowable<List<SubscriptionEntity>> getAll();
+
+    @Override
+    @Query("DELETE FROM " + SUBSCRIPTION_TABLE)
+    public abstract int deleteAll();
+
+    @Override
+    @Query("SELECT * FROM " + SUBSCRIPTION_TABLE + " WHERE " + SUBSCRIPTION_SERVICE_ID + " = :serviceId")
+    public abstract Flowable<List<SubscriptionEntity>> listByService(int serviceId);
+
+    @Query("SELECT * FROM " + SUBSCRIPTION_TABLE + " WHERE " +
+            SUBSCRIPTION_URL + " LIKE :url AND " +
+            SUBSCRIPTION_SERVICE_ID + " = :serviceId")
+    public abstract Flowable<List<SubscriptionEntity>> getSubscription(int serviceId, String url);
+
+    @Query("SELECT " + SUBSCRIPTION_UID + " FROM " + SUBSCRIPTION_TABLE + " WHERE " +
+            SUBSCRIPTION_URL + " LIKE :url AND " +
+            SUBSCRIPTION_SERVICE_ID + " = :serviceId")
+    abstract Long getSubscriptionIdInternal(int serviceId, String url);
+
+    @Insert(onConflict = OnConflictStrategy.IGNORE)
+    abstract Long insertInternal(final SubscriptionEntity entities);
+
+    @Transaction
+    public List<SubscriptionEntity> upsertAll(List<SubscriptionEntity> entities) {
+        for (SubscriptionEntity entity : entities) {
+            Long uid = insertInternal(entity);
+
+            if (uid != -1) {
+                entity.setUid(uid);
+                continue;
+            }
+
+            uid = getSubscriptionIdInternal(entity.getServiceId(), entity.getUrl());
+            entity.setUid(uid);
+
+            if (uid == -1) {
+                throw new IllegalStateException("Invalid subscription id (-1)");
+            }
+
+            update(entity);
+        }
+
+        return entities;
+    }
+}

app/src/main/java/org/schabi/newpipe/database/subscription/SubscriptionEntity.java

@@ -0,0 +1,136 @@
+package org.schabi.newpipe.database.subscription;
+
+import android.arch.persistence.room.ColumnInfo;
+import android.arch.persistence.room.Entity;
+import android.arch.persistence.room.Ignore;
+import android.arch.persistence.room.Index;
+import android.arch.persistence.room.PrimaryKey;
+import android.support.annotation.NonNull;
+
+import org.schabi.newpipe.extractor.channel.ChannelInfo;
+import org.schabi.newpipe.extractor.channel.ChannelInfoItem;
+import org.schabi.newpipe.util.Constants;
+
+import static org.schabi.newpipe.database.subscription.SubscriptionEntity.SUBSCRIPTION_SERVICE_ID;
+import static org.schabi.newpipe.database.subscription.SubscriptionEntity.SUBSCRIPTION_TABLE;
+import static org.schabi.newpipe.database.subscription.SubscriptionEntity.SUBSCRIPTION_URL;
+
+@Entity(tableName = SUBSCRIPTION_TABLE,
+        indices = {@Index(value = {SUBSCRIPTION_SERVICE_ID, SUBSCRIPTION_URL}, unique = true)})
+public class SubscriptionEntity {
+
+    final static String SUBSCRIPTION_UID                = "uid";
+    final static String SUBSCRIPTION_TABLE              = "subscriptions";
+    final static String SUBSCRIPTION_SERVICE_ID         = "service_id";
+    final static String SUBSCRIPTION_URL                = "url";
+    final static String SUBSCRIPTION_NAME               = "name";
+    final static String SUBSCRIPTION_AVATAR_URL         = "avatar_url";
+    final static String SUBSCRIPTION_SUBSCRIBER_COUNT   = "subscriber_count";
+    final static String SUBSCRIPTION_DESCRIPTION        = "description";
+
+    @PrimaryKey(autoGenerate = true)
+    private long uid = 0;
+
+    @ColumnInfo(name = SUBSCRIPTION_SERVICE_ID)
+    private int serviceId = Constants.NO_SERVICE_ID;
+
+    @ColumnInfo(name = SUBSCRIPTION_URL)
+    private String url;
+
+    @ColumnInfo(name = SUBSCRIPTION_NAME)
+    private String name;
+
+    @ColumnInfo(name = SUBSCRIPTION_AVATAR_URL)
+    private String avatarUrl;
+
+    @ColumnInfo(name = SUBSCRIPTION_SUBSCRIBER_COUNT)
+    private Long subscriberCount;
+
+    @ColumnInfo(name = SUBSCRIPTION_DESCRIPTION)
+    private String description;
+
+    public long getUid() {
+        return uid;
+    }
+
+    public void setUid(long uid) {
+        this.uid = uid;
+    }
+
+    public int getServiceId() {
+        return serviceId;
+    }
+
+    public void setServiceId(int serviceId) {
+        this.serviceId = serviceId;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getAvatarUrl() {
+        return avatarUrl;
+    }
+
+    public void setAvatarUrl(String avatarUrl) {
+        this.avatarUrl = avatarUrl;
+    }
+
+    public Long getSubscriberCount() {
+        return subscriberCount;
+    }
+
+    public void setSubscriberCount(Long subscriberCount) {
+        this.subscriberCount = subscriberCount;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    @Ignore
+    public void setData(final String name,
+                        final String avatarUrl,
+                        final String description,
+                        final Long subscriberCount) {
+        this.setName(name);
+        this.setAvatarUrl(avatarUrl);
+        this.setDescription(description);
+        this.setSubscriberCount(subscriberCount);
+    }
+
+    @Ignore
+    public ChannelInfoItem toChannelInfoItem() {
+        ChannelInfoItem item = new ChannelInfoItem(getServiceId(), getUrl(), getName());
+        item.setThumbnailUrl(getAvatarUrl());
+        item.setSubscriberCount(getSubscriberCount());
+        item.setDescription(getDescription());
+        return item;
+    }
+
+    @Ignore
+    public static SubscriptionEntity from(@NonNull ChannelInfo info) {
+        SubscriptionEntity result = new SubscriptionEntity();
+        result.setServiceId(info.getServiceId());
+        result.setUrl(info.getUrl());
+        result.setData(info.getName(), info.getAvatarUrl(), info.getDescription(), info.getSubscriberCount());
+        return result;
+    }
+}

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

@@ -32,7 +32,7 @@ public class DownloadActivity extends AppCompatActivity {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_downloader);
 
-        Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
+        Toolbar toolbar = findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
 
         ActionBar actionBar = getSupportActionBar();

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

@@ -1,55 +1,61 @@
 package org.schabi.newpipe.download;
 
+import android.content.Context;
 import android.os.Bundle;
 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.widget.Toolbar;
 import android.util.Log;
 import android.view.LayoutInflater;
-import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
-import android.widget.ArrayAdapter;
 import android.widget.EditText;
 import android.widget.RadioButton;
 import android.widget.RadioGroup;
 import android.widget.SeekBar;
 import android.widget.Spinner;
 import android.widget.TextView;
+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.stream_info.AudioStream;
-import org.schabi.newpipe.extractor.stream_info.StreamInfo;
-import org.schabi.newpipe.extractor.stream_info.VideoStream;
-import org.schabi.newpipe.fragments.detail.SpinnerToolbarAdapter;
+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.VideoStream;
 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.StreamItemAdapter;
+import org.schabi.newpipe.util.StreamItemAdapter.StreamSizeWrapper;
 import org.schabi.newpipe.util.ThemeHelper;
-import org.schabi.newpipe.util.Utils;
 
-import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 
+import icepick.Icepick;
+import icepick.State;
+import io.reactivex.disposables.CompositeDisposable;
 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;
 
-    private static final String INFO_KEY = "info_key";
-    private static final String SORTED_VIDEOS_LIST_KEY = "sorted_videos_list_key";
-    private static final String SELECTED_VIDEO_KEY = "selected_video_key";
-    private static final String SELECTED_AUDIO_KEY = "selected_audio_key";
+    @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;
 
-    private StreamInfo currentInfo;
-    private ArrayList<VideoStream> sortedStreamVideosList;
-    private int selectedVideoIndex;
-    private int selectedAudioIndex;
+    private StreamItemAdapter<AudioStream> audioStreamsAdapter;
+    private StreamItemAdapter<VideoStream> videoStreamsAdapter;
+
+    private CompositeDisposable disposables = new CompositeDisposable();
 
     private EditText nameEditText;
     private Spinner streamsSpinner;
@@ -57,17 +63,50 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
     private TextView threadsCountTextView;
     private SeekBar threadsSeekBar;
 
-    public static DownloadDialog newInstance(StreamInfo info, ArrayList<VideoStream> sortedStreamVideosList, int selectedVideoIndex) {
+    public static DownloadDialog newInstance(StreamInfo info) {
         DownloadDialog dialog = new DownloadDialog();
-        dialog.setInfo(info, sortedStreamVideosList, selectedVideoIndex);
-        dialog.setStyle(DialogFragment.STYLE_NO_TITLE, 0);
+        dialog.setInfo(info);
         return dialog;
     }
 
-    private void setInfo(StreamInfo info, ArrayList<VideoStream> sortedStreamVideosList, int selectedVideoIndex) {
+    public static DownloadDialog newInstance(Context context, StreamInfo info) {
+        final ArrayList<VideoStream> streamsList = new ArrayList<>(ListHelper.getSortedStreamVideosList(context,
+                info.getVideoStreams(), info.getVideoOnlyStreams(), false));
+        final int selectedStreamIndex = ListHelper.getDefaultResolutionIndex(context, streamsList);
+
+        final DownloadDialog instance = newInstance(info);
+        instance.setVideoStreams(streamsList);
+        instance.setSelectedVideoStream(selectedStreamIndex);
+        instance.setAudioStreams(info.getAudioStreams());
+        return instance;
+    }
+
+    private void setInfo(StreamInfo info) {
         this.currentInfo = info;
+    }
+
+    public void setAudioStreams(List<AudioStream> audioStreams) {
+        setAudioStreams(new StreamSizeWrapper<>(audioStreams));
+    }
+
+    public void setAudioStreams(StreamSizeWrapper<AudioStream> wrappedAudioStreams) {
+        this.wrappedAudioStreams = wrappedAudioStreams;
+    }
+
+    public void setVideoStreams(List<VideoStream> videoStreams) {
+        setVideoStreams(new StreamSizeWrapper<>(videoStreams));
+    }
+
+    public void setVideoStreams(StreamSizeWrapper<VideoStream> wrappedVideoStreams) {
+        this.wrappedVideoStreams = wrappedVideoStreams;
+    }
+
+    public void setSelectedVideoStream(int selectedVideoIndex) {
         this.selectedVideoIndex = selectedVideoIndex;
-        this.sortedStreamVideosList = sortedStreamVideosList;
+    }
+
+    public void setSelectedAudioStream(int selectedAudioIndex) {
+        this.selectedAudioIndex = selectedAudioIndex;
     }
 
     /*//////////////////////////////////////////////////////////////////////////
@@ -78,49 +117,42 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         if (DEBUG) Log.d(TAG, "onCreate() called with: savedInstanceState = [" + savedInstanceState + "]");
-        if (!PermissionHelper.checkStoragePermissions(getActivity())) {
+        if (!PermissionHelper.checkStoragePermissions(getActivity(), PermissionHelper.DOWNLOAD_DIALOG_REQUEST_CODE)) {
             getDialog().dismiss();
             return;
         }
 
-        if (savedInstanceState != null) {
-            Serializable serial = savedInstanceState.getSerializable(INFO_KEY);
-            if (serial instanceof StreamInfo) currentInfo = (StreamInfo) serial;
+        setStyle(STYLE_NO_TITLE, ThemeHelper.getDialogTheme(getContext()));
+        Icepick.restoreInstanceState(this, savedInstanceState);
 
-            serial = savedInstanceState.getSerializable(SORTED_VIDEOS_LIST_KEY);
-            if (serial instanceof ArrayList) { //noinspection unchecked
-                sortedStreamVideosList = (ArrayList<VideoStream>) serial;
-            }
-
-            selectedVideoIndex = savedInstanceState.getInt(SELECTED_VIDEO_KEY, 0);
-            selectedAudioIndex = savedInstanceState.getInt(SELECTED_AUDIO_KEY, 0);
-        }
+        this.videoStreamsAdapter = new StreamItemAdapter<>(getContext(), wrappedVideoStreams, true);
+        this.audioStreamsAdapter = new StreamItemAdapter<>(getContext(), wrappedAudioStreams);
     }
 
     @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         if (DEBUG) Log.d(TAG, "onCreateView() called with: inflater = [" + inflater + "], container = [" + container + "], savedInstanceState = [" + savedInstanceState + "]");
-        return inflater.inflate(R.layout.dialog_url, container);
+        return inflater.inflate(R.layout.download_dialog, container);
     }
 
     @Override
-    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
-        nameEditText = ((EditText) view.findViewById(R.id.file_name));
-        nameEditText.setText(createFileName(currentInfo.title));
-        selectedAudioIndex = Utils.getPreferredAudioFormat(getContext(), currentInfo.audio_streams);
+        nameEditText = view.findViewById(R.id.file_name);
+        nameEditText.setText(FilenameUtils.createFilename(getContext(), currentInfo.getName()));
+        selectedAudioIndex = ListHelper.getDefaultAudioFormat(getContext(), currentInfo.getAudioStreams());
 
-        streamsSpinner = (Spinner) view.findViewById(R.id.quality_spinner);
+        streamsSpinner = view.findViewById(R.id.quality_spinner);
         streamsSpinner.setOnItemSelectedListener(this);
 
-        threadsCountTextView = (TextView) view.findViewById(R.id.threads_count);
-        threadsSeekBar = (SeekBar) view.findViewById(R.id.threads);
-        radioVideoAudioGroup = (RadioGroup) view.findViewById(R.id.video_audio_group);
+        threadsCountTextView = view.findViewById(R.id.threads_count);
+        threadsSeekBar = view.findViewById(R.id.threads);
+
+        radioVideoAudioGroup = view.findViewById(R.id.video_audio_group);
         radioVideoAudioGroup.setOnCheckedChangeListener(this);
 
-        initToolbar((Toolbar) view.findViewById(R.id.toolbar));
-        checkDownloadOptions(view);
-        setupVideoSpinner(sortedStreamVideosList, streamsSpinner);
+        initToolbar(view.findViewById(R.id.toolbar));
+        setupDownloadOptions();
 
         int def = 3;
         threadsCountTextView.setText(String.valueOf(def));
@@ -134,23 +166,41 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
 
             @Override
             public void onStartTrackingTouch(SeekBar p1) {
-
             }
 
             @Override
             public void onStopTrackingTouch(SeekBar p1) {
-
             }
         });
+
+        fetchStreamsSize();
+    }
+
+    private void fetchStreamsSize() {
+        disposables.clear();
+
+        disposables.add(StreamSizeWrapper.fetchSizeForWrapper(wrappedVideoStreams).subscribe(result -> {
+            if (radioVideoAudioGroup.getCheckedRadioButtonId() == R.id.video_button) {
+                setupVideoSpinner();
+            }
+        }));
+        disposables.add(StreamSizeWrapper.fetchSizeForWrapper(wrappedAudioStreams).subscribe(result -> {
+            if (radioVideoAudioGroup.getCheckedRadioButtonId() == R.id.audio_button) {
+                setupAudioSpinner();
+            }
+        }));
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        disposables.clear();
     }
 
     @Override
     public void onSaveInstanceState(Bundle outState) {
         super.onSaveInstanceState(outState);
-        outState.putSerializable(INFO_KEY, currentInfo);
-        outState.putSerializable(SORTED_VIDEOS_LIST_KEY, sortedStreamVideosList);
-        outState.putInt(SELECTED_VIDEO_KEY, selectedVideoIndex);
-        outState.putInt(SELECTED_AUDIO_KEY, selectedAudioIndex);
+        Icepick.saveInstanceState(this, outState);
     }
 
     /*//////////////////////////////////////////////////////////////////////////
@@ -162,39 +212,31 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
         toolbar.setTitle(R.string.download_dialog_title);
         toolbar.setNavigationIcon(ThemeHelper.isLightThemeSelected(getActivity()) ? R.drawable.ic_arrow_back_black_24dp : R.drawable.ic_arrow_back_white_24dp);
         toolbar.inflateMenu(R.menu.dialog_url);
-        toolbar.setNavigationOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                getDialog().dismiss();
-            }
-        });
+        toolbar.setNavigationOnClickListener(v -> getDialog().dismiss());
 
-        toolbar.setOnMenuItemClickListener(new Toolbar.OnMenuItemClickListener() {
-            @Override
-            public boolean onMenuItemClick(MenuItem item) {
-                if (item.getItemId() == R.id.okay) {
-                    downloadSelected();
-                    return true;
-                } else return false;
+        toolbar.setOnMenuItemClickListener(item -> {
+            if (item.getItemId() == R.id.okay) {
+                downloadSelected();
+                return true;
             }
+            return false;
         });
     }
 
-    public void setupAudioSpinner(final List<AudioStream> audioStreams, Spinner spinner) {
-        String[] items = new String[audioStreams.size()];
-        for (int i = 0; i < audioStreams.size(); i++) {
-            AudioStream audioStream = audioStreams.get(i);
-            items[i] = MediaFormat.getNameById(audioStream.format) + " " + audioStream.avgBitrate + "kbps";
-        }
+    private void setupAudioSpinner() {
+        if (getContext() == null) return;
 
-        ArrayAdapter<String> itemAdapter = new ArrayAdapter<>(getContext(), android.R.layout.simple_spinner_dropdown_item, items);
-        spinner.setAdapter(itemAdapter);
-        spinner.setSelection(selectedAudioIndex);
+        streamsSpinner.setAdapter(audioStreamsAdapter);
+        streamsSpinner.setSelection(selectedAudioIndex);
+        setRadioButtonsState(true);
     }
 
-    public void setupVideoSpinner(final List<VideoStream> videoStreams, Spinner spinner) {
-        spinner.setAdapter(new SpinnerToolbarAdapter(getContext(), videoStreams, true));
-        spinner.setSelection(selectedVideoIndex);
+    private void setupVideoSpinner() {
+        if (getContext() == null) return;
+
+        streamsSpinner.setAdapter(videoStreamsAdapter);
+        streamsSpinner.setSelection(selectedVideoIndex);
+        setRadioButtonsState(true);
     }
 
     /*//////////////////////////////////////////////////////////////////////////
@@ -206,10 +248,10 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
         if (DEBUG) Log.d(TAG, "onCheckedChanged() called with: group = [" + group + "], checkedId = [" + checkedId + "]");
         switch (checkedId) {
             case R.id.audio_button:
-                setupAudioSpinner(currentInfo.audio_streams, streamsSpinner);
+                setupAudioSpinner();
                 break;
             case R.id.video_button:
-                setupVideoSpinner(sortedStreamVideosList, streamsSpinner);
+                setupVideoSpinner();
                 break;
         }
     }
@@ -239,50 +281,52 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
     // Utils
     //////////////////////////////////////////////////////////////////////////*/
 
-    protected void checkDownloadOptions(View view) {
-        RadioButton audioButton = (RadioButton) view.findViewById(R.id.audio_button);
-        RadioButton videoButton = (RadioButton) view.findViewById(R.id.video_button);
+    protected void setupDownloadOptions() {
+        setRadioButtonsState(false);
 
-        if (currentInfo.audio_streams == null || currentInfo.audio_streams.size() == 0) {
-            audioButton.setVisibility(View.GONE);
+        final RadioButton audioButton = radioVideoAudioGroup.findViewById(R.id.audio_button);
+        final RadioButton videoButton = radioVideoAudioGroup.findViewById(R.id.video_button);
+        final boolean isVideoStreamsAvailable = videoStreamsAdapter.getCount() > 0;
+        final boolean isAudioStreamsAvailable = audioStreamsAdapter.getCount() > 0;
+
+        audioButton.setVisibility(isAudioStreamsAvailable ? View.VISIBLE : View.GONE);
+        videoButton.setVisibility(isVideoStreamsAvailable ? View.VISIBLE : View.GONE);
+
+        if (isVideoStreamsAvailable) {
             videoButton.setChecked(true);
-        } else if (sortedStreamVideosList == null || sortedStreamVideosList.size() == 0) {
-            videoButton.setVisibility(View.GONE);
+            setupVideoSpinner();
+        } else if (isAudioStreamsAvailable) {
             audioButton.setChecked(true);
+            setupAudioSpinner();
+        } else {
+            Toast.makeText(getContext(), R.string.no_streams_available_download, Toast.LENGTH_SHORT).show();
+            getDialog().dismiss();
         }
     }
 
-    /**
-     * #143 #44 #42 #22: make sure that the filename does not contain illegal chars.
-     * This should fix some of the "cannot download" problems.
-     */
-    private String createFileName(String fileName) {
-        // from http://eng-przemelek.blogspot.de/2009/07/how-to-create-valid-file-name.html
-
-        List<String> forbiddenCharsPatterns = new ArrayList<>();
-        forbiddenCharsPatterns.add("[:]+"); // Mac OS, but it looks that also Windows XP
-        forbiddenCharsPatterns.add("[\\*\"/\\\\\\[\\]\\:\\;\\|\\=\\,]+");  // Windows
-        forbiddenCharsPatterns.add("[^\\w\\d\\.]+");  // last chance... only latin letters and digits
-        String nameToTest = fileName;
-        for (String pattern : forbiddenCharsPatterns) {
-            nameToTest = nameToTest.replaceAll(pattern, "_");
-        }
-        return nameToTest;
+    private void setRadioButtonsState(boolean enabled) {
+        radioVideoAudioGroup.findViewById(R.id.audio_button).setEnabled(enabled);
+        radioVideoAudioGroup.findViewById(R.id.video_button).setEnabled(enabled);
     }
 
-
     private void downloadSelected() {
-        String url, location;
+        Stream stream;
+        String location;
 
         String fileName = nameEditText.getText().toString().trim();
-        if (fileName.isEmpty()) fileName = createFileName(currentInfo.title);
+        if (fileName.isEmpty()) fileName = FilenameUtils.createFilename(getContext(), currentInfo.getName());
 
         boolean isAudio = radioVideoAudioGroup.getCheckedRadioButtonId() == R.id.audio_button;
-        url = isAudio ? currentInfo.audio_streams.get(selectedAudioIndex).url : sortedStreamVideosList.get(selectedVideoIndex).url;
-        location = isAudio ? NewPipeSettings.getAudioDownloadPath(getContext()) : NewPipeSettings.getVideoDownloadPath(getContext());
+        if (isAudio) {
+            stream = audioStreamsAdapter.getItem(selectedAudioIndex);
+            location = NewPipeSettings.getAudioDownloadPath(getContext());
+        } else {
+            stream = videoStreamsAdapter.getItem(selectedVideoIndex);
+            location = NewPipeSettings.getVideoDownloadPath(getContext());
+        }
 
-        if (isAudio) fileName += "." + MediaFormat.getSuffixById(currentInfo.audio_streams.get(selectedAudioIndex).format);
-        else fileName += "." + MediaFormat.getSuffixById(sortedStreamVideosList.get(selectedVideoIndex).format);
+        String url = stream.getUrl();
+        fileName += "." + stream.getFormat().getSuffix();
 
         DownloadManagerService.startMission(getContext(), url, location, fileName, isAudio, threadsSeekBar.getProgress() + 1);
         getDialog().dismiss();

app/src/main/java/org/schabi/newpipe/fragments/BackPressable.java

@@ -0,0 +1,13 @@
+package org.schabi.newpipe.fragments;
+
+/**
+ * Indicates that the current fragment can handle back presses
+ */
+public interface BackPressable {
+    /**
+     * A back press was delegated to this fragment
+     *
+     * @return if the back press was handled
+     */
+    boolean onBackPressed();
+}

app/src/main/java/org/schabi/newpipe/fragments/BaseFragment.java

@@ -1,177 +0,0 @@
-package org.schabi.newpipe.fragments;
-
-import android.content.Context;
-import android.content.res.TypedArray;
-import android.graphics.Rect;
-import android.os.Bundle;
-import android.support.annotation.AttrRes;
-import android.support.v4.app.Fragment;
-import android.support.v4.view.ViewCompat;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
-import android.util.Log;
-import android.view.Gravity;
-import android.view.View;
-import android.widget.Button;
-import android.widget.ProgressBar;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import com.nostra13.universalimageloader.core.DisplayImageOptions;
-import com.nostra13.universalimageloader.core.ImageLoader;
-import com.nostra13.universalimageloader.core.display.FadeInBitmapDisplayer;
-
-import org.schabi.newpipe.MainActivity;
-import org.schabi.newpipe.R;
-
-import java.util.concurrent.atomic.AtomicBoolean;
-
-import static org.schabi.newpipe.util.AnimationUtils.animateView;
-
-public abstract class BaseFragment extends Fragment {
-    protected final String TAG = "BaseFragment@" + Integer.toHexString(hashCode());
-    protected static final boolean DEBUG = MainActivity.DEBUG;
-
-    protected AppCompatActivity activity;
-
-    protected AtomicBoolean isLoading = new AtomicBoolean(false);
-    protected AtomicBoolean wasLoading = new AtomicBoolean(false);
-
-    protected static final ImageLoader imageLoader = ImageLoader.getInstance();
-    protected static final DisplayImageOptions displayImageOptions =
-            new DisplayImageOptions.Builder().displayer(new FadeInBitmapDisplayer(400)).cacheInMemory(false).build();
-
-    /*//////////////////////////////////////////////////////////////////////////
-    // Views
-    //////////////////////////////////////////////////////////////////////////*/
-
-    protected Toolbar toolbar;
-
-    protected View errorPanel;
-    protected Button errorButtonRetry;
-    protected TextView errorTextView;
-    protected ProgressBar loadingProgressBar;
-    //protected SwipeRefreshLayout swipeRefreshLayout;
-
-    /*//////////////////////////////////////////////////////////////////////////
-    // Fragment's Lifecycle
-    //////////////////////////////////////////////////////////////////////////*/
-
-    @Override
-    public void onAttach(Context context) {
-        super.onAttach(context);
-        if (DEBUG) Log.d(TAG, "onAttach() called with: context = [" + context + "]");
-
-        activity = (AppCompatActivity) context;
-    }
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        if (DEBUG) Log.d(TAG, "onCreate() called with: savedInstanceState = [" + savedInstanceState + "]");
-
-        isLoading.set(false);
-        setHasOptionsMenu(true);
-    }
-
-    @Override
-    public void onViewCreated(View rootView, Bundle savedInstanceState) {
-        if (DEBUG) Log.d(TAG, "onViewCreated() called with: rootView = [" + rootView + "], savedInstanceState = [" + savedInstanceState + "]");
-        initViews(rootView, savedInstanceState);
-        initListeners();
-        wasLoading.set(false);
-    }
-
-    @Override
-    public void onDestroyView() {
-        super.onDestroyView();
-        if (DEBUG) Log.d(TAG, "onDestroyView() called");
-        toolbar = null;
-
-        errorPanel = null;
-        errorButtonRetry = null;
-        errorTextView = null;
-    }
-
-    /*//////////////////////////////////////////////////////////////////////////
-    // Init
-    //////////////////////////////////////////////////////////////////////////*/
-
-    protected void initViews(View rootView, Bundle savedInstanceState) {
-        toolbar = (Toolbar) activity.findViewById(R.id.toolbar);
-
-        loadingProgressBar = (ProgressBar) rootView.findViewById(R.id.loading_progress_bar);
-        //swipeRefreshLayout = (SwipeRefreshLayout) rootView.findViewById(R.id.swipe_refresh);
-
-        errorPanel = rootView.findViewById(R.id.error_panel);
-        errorButtonRetry = (Button) rootView.findViewById(R.id.error_button_retry);
-        errorTextView = (TextView) rootView.findViewById(R.id.error_message_view);
-    }
-
-    protected void initListeners() {
-        errorButtonRetry.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                onRetryButtonClicked();
-            }
-        });
-    }
-
-    protected abstract void reloadContent();
-
-    protected void onRetryButtonClicked() {
-        if (DEBUG) Log.d(TAG, "onRetryButtonClicked() called");
-        reloadContent();
-    }
-
-    /*//////////////////////////////////////////////////////////////////////////
-    // Utils
-    //////////////////////////////////////////////////////////////////////////*/
-
-    protected void setErrorMessage(String message, boolean showRetryButton) {
-        if (errorTextView == null || activity == null) return;
-
-        errorTextView.setText(message);
-        if (showRetryButton) animateView(errorButtonRetry, true, 300);
-        else animateView(errorButtonRetry, false, 0);
-
-        animateView(errorPanel, true, 300);
-        isLoading.set(false);
-
-        animateView(loadingProgressBar, false, 200);
-    }
-
-    protected int getResourceIdFromAttr(@AttrRes int attr) {
-        TypedArray a = activity.getTheme().obtainStyledAttributes(new int[]{attr});
-        int attributeResourceId = a.getResourceId(0, 0);
-        a.recycle();
-        return attributeResourceId;
-    }
-
-    public static void showMenuTooltip(View v, String message) {
-        final int[] screenPos = new int[2];
-        final Rect displayFrame = new Rect();
-        v.getLocationOnScreen(screenPos);
-        v.getWindowVisibleDisplayFrame(displayFrame);
-
-        final Context context = v.getContext();
-        final int width = v.getWidth();
-        final int height = v.getHeight();
-        final int midy = screenPos[1] + height / 2;
-        int referenceX = screenPos[0] + width / 2;
-        if (ViewCompat.getLayoutDirection(v) == View.LAYOUT_DIRECTION_LTR) {
-            final int screenWidth = context.getResources().getDisplayMetrics().widthPixels;
-            referenceX = screenWidth - referenceX; // mirror
-        }
-        Toast cheatSheet = Toast.makeText(context, message, Toast.LENGTH_SHORT);
-        if (midy < displayFrame.height()) {
-            // Show along the top; follow action buttons
-            cheatSheet.setGravity(Gravity.TOP | Gravity.END, referenceX,
-                    screenPos[1] + height - displayFrame.top);
-        } else {
-            // Show along the bottom center
-            cheatSheet.setGravity(Gravity.BOTTOM | Gravity.CENTER_HORIZONTAL, 0, height);
-        }
-        cheatSheet.show();
-    }
-}

app/src/main/java/org/schabi/newpipe/fragments/BaseStateFragment.java

@@ -0,0 +1,262 @@
+package org.schabi.newpipe.fragments;
+
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.annotation.StringRes;
+import android.util.Log;
+import android.view.View;
+import android.widget.Button;
+import android.widget.ProgressBar;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import com.jakewharton.rxbinding2.view.RxView;
+
+import org.schabi.newpipe.BaseFragment;
+import org.schabi.newpipe.MainActivity;
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.ReCaptchaActivity;
+import org.schabi.newpipe.extractor.exceptions.ReCaptchaException;
+import org.schabi.newpipe.report.ErrorActivity;
+import org.schabi.newpipe.report.UserAction;
+import org.schabi.newpipe.util.ExtractorHelper;
+import org.schabi.newpipe.util.InfoCache;
+
+import java.io.IOException;
+import java.util.Collections;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+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;
+
+public abstract class BaseStateFragment<I> extends BaseFragment implements ViewContract<I> {
+
+    @State
+    protected AtomicBoolean wasLoading = new AtomicBoolean();
+    protected AtomicBoolean isLoading = new AtomicBoolean();
+
+    @Nullable
+    protected View emptyStateView;
+    @Nullable
+    protected ProgressBar loadingProgressBar;
+
+    protected View errorPanelRoot;
+    protected Button errorButtonRetry;
+    protected TextView errorTextView;
+
+    @State
+    protected boolean useAsFrontPage = false;
+
+    @Override
+    public void onViewCreated(View rootView, Bundle savedInstanceState) {
+        super.onViewCreated(rootView, savedInstanceState);
+        doInitialLoadLogic();
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        wasLoading.set(isLoading.get());
+    }
+
+    public void useAsFrontPage(boolean value) {
+        useAsFrontPage = value;
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Init
+    //////////////////////////////////////////////////////////////////////////*/
+
+
+    @Override
+    protected void initViews(View rootView, Bundle savedInstanceState) {
+        super.initViews(rootView, savedInstanceState);
+
+        emptyStateView = rootView.findViewById(R.id.empty_state_view);
+        loadingProgressBar = rootView.findViewById(R.id.loading_progress_bar);
+
+        errorPanelRoot = rootView.findViewById(R.id.error_panel);
+        errorButtonRetry = rootView.findViewById(R.id.error_button_retry);
+        errorTextView = rootView.findViewById(R.id.error_message_view);
+    }
+
+    @Override
+    protected void initListeners() {
+        super.initListeners();
+        RxView.clicks(errorButtonRetry)
+                .debounce(300, TimeUnit.MILLISECONDS)
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new Consumer<Object>() {
+                    @Override
+                    public void accept(Object o) throws Exception {
+                        onRetryButtonClicked();
+                    }
+                });
+    }
+
+    protected void onRetryButtonClicked() {
+        reloadContent();
+    }
+
+    public void reloadContent() {
+        startLoading(true);
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Load
+    //////////////////////////////////////////////////////////////////////////*/
+
+    protected void doInitialLoadLogic() {
+        startLoading(true);
+    }
+
+    protected void startLoading(boolean forceLoad) {
+        if (DEBUG) Log.d(TAG, "startLoading() called with: forceLoad = [" + forceLoad + "]");
+        showLoading();
+        isLoading.set(true);
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Contract
+    //////////////////////////////////////////////////////////////////////////*/
+
+    @Override
+    public void showLoading() {
+        if (emptyStateView != null) animateView(emptyStateView, false, 150);
+        if (loadingProgressBar != null) animateView(loadingProgressBar, true, 400);
+        animateView(errorPanelRoot, false, 150);
+    }
+
+    @Override
+    public void hideLoading() {
+        if (emptyStateView != null) animateView(emptyStateView, false, 150);
+        if (loadingProgressBar != null) animateView(loadingProgressBar, false, 0);
+        animateView(errorPanelRoot, false, 150);
+    }
+
+    @Override
+    public void showEmptyState() {
+        isLoading.set(false);
+        if (emptyStateView != null) animateView(emptyStateView, true, 200);
+        if (loadingProgressBar != null) animateView(loadingProgressBar, false, 0);
+        animateView(errorPanelRoot, false, 150);
+    }
+
+    @Override
+    public void showError(String message, boolean showRetryButton) {
+        if (DEBUG) Log.d(TAG, "showError() called with: message = [" + message + "], showRetryButton = [" + showRetryButton + "]");
+        isLoading.set(false);
+        InfoCache.getInstance().clearCache();
+        hideLoading();
+
+        errorTextView.setText(message);
+        if (showRetryButton) animateView(errorButtonRetry, true, 600);
+        else animateView(errorButtonRetry, false, 0);
+        animateView(errorPanelRoot, true, 300);
+    }
+
+    @Override
+    public void handleResult(I result) {
+        if (DEBUG) Log.d(TAG, "handleResult() called with: result = [" + result + "]");
+        hideLoading();
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Error handling
+    //////////////////////////////////////////////////////////////////////////*/
+
+    /**
+     * Default implementation handles some general exceptions
+     *
+     * @return if the exception was handled
+     */
+    protected boolean onError(Throwable exception) {
+        if (DEBUG) Log.d(TAG, "onError() called with: exception = [" + exception + "]");
+        isLoading.set(false);
+
+        if (isDetached() || isRemoving()) {
+            if (DEBUG) Log.w(TAG, "onError() is detached or removing = [" + exception + "]");
+            return true;
+        }
+
+        if (ExtractorHelper.isInterruptedCaused(exception)) {
+            if (DEBUG) Log.w(TAG, "onError() isInterruptedCaused! = [" + exception + "]");
+            return true;
+        }
+
+        if (exception instanceof ReCaptchaException) {
+            onReCaptchaException();
+            return true;
+        } else if (exception instanceof IOException) {
+            showError(getString(R.string.network_error), true);
+            return true;
+        }
+
+        return false;
+    }
+
+    public void onReCaptchaException() {
+        if (DEBUG) Log.d(TAG, "onReCaptchaException() called");
+        Toast.makeText(activity, R.string.recaptcha_request_toast, Toast.LENGTH_LONG).show();
+        // Starting ReCaptcha Challenge Activity
+        startActivityForResult(new Intent(activity, ReCaptchaActivity.class), ReCaptchaActivity.RECAPTCHA_REQUEST);
+
+        showError(getString(R.string.recaptcha_request_toast), false);
+    }
+
+    public void onUnrecoverableError(Throwable exception, UserAction userAction, String serviceName, String request, @StringRes int errorId) {
+        onUnrecoverableError(Collections.singletonList(exception), userAction, serviceName, request, errorId);
+    }
+
+    public void onUnrecoverableError(List<Throwable> exception, UserAction userAction, String serviceName, String request, @StringRes int errorId) {
+        if (DEBUG) Log.d(TAG, "onUnrecoverableError() called with: exception = [" + exception + "]");
+
+        if (serviceName == null) serviceName = "none";
+        if (request == null) request = "none";
+
+        ErrorActivity.reportError(getContext(), exception, MainActivity.class, null, ErrorActivity.ErrorInfo.make(userAction, serviceName, request, errorId));
+    }
+
+    public void showSnackBarError(Throwable exception, UserAction userAction, String serviceName, String request, @StringRes int errorId) {
+        showSnackBarError(Collections.singletonList(exception), userAction, serviceName, request, errorId);
+    }
+
+    /**
+     * Show a SnackBar and only call ErrorActivity#reportError IF we a find a valid view (otherwise the error screen appears)
+     */
+    public void showSnackBarError(List<Throwable> exception, UserAction userAction, String serviceName, String request, @StringRes int errorId) {
+        if (DEBUG) {
+            Log.d(TAG, "showSnackBarError() called with: exception = [" + exception + "], userAction = [" + userAction + "], request = [" + request + "], errorId = [" + errorId + "]");
+        }
+        View rootView = activity != null ? activity.findViewById(android.R.id.content) : null;
+        if (rootView == null && getView() != null) rootView = getView();
+        if (rootView == null) return;
+
+        ErrorActivity.reportError(getContext(), exception, MainActivity.class, rootView,
+                ErrorActivity.ErrorInfo.make(userAction, serviceName, request, errorId));
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Utils
+    //////////////////////////////////////////////////////////////////////////*/
+
+    protected void openUrlInBrowser(String url) {
+        Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(url));
+        startActivity(Intent.createChooser(intent, activity.getString(R.string.share_dialog_title)));
+    }
+
+    protected 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)));
+    }
+}

app/src/main/java/org/schabi/newpipe/fragments/BlankFragment.java

@@ -0,0 +1,37 @@
+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;
+
+import org.schabi.newpipe.BaseFragment;
+import org.schabi.newpipe.R;
+
+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");
+        }
+        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 ...
+        }
+    }
+}

app/src/main/java/org/schabi/newpipe/fragments/MainFragment.java

@@ -1,53 +1,102 @@
 package org.schabi.newpipe.fragments;
 
-import android.content.Context;
+import android.content.SharedPreferences;
 import android.os.Bundle;
+import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
+import android.support.design.widget.TabLayout;
 import android.support.v4.app.Fragment;
+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.app.AppCompatActivity;
+import android.support.v7.preference.PreferenceManager;
 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.MainActivity;
+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.report.ErrorActivity;
+import org.schabi.newpipe.report.UserAction;
+import org.schabi.newpipe.util.KioskTranslator;
 import org.schabi.newpipe.util.NavigationHelper;
+import org.schabi.newpipe.util.ServiceHelper;
+import org.schabi.newpipe.util.ThemeHelper;
 
-public class MainFragment extends Fragment {
-    private final String TAG = "MainFragment@" + Integer.toHexString(hashCode());
-    private static final boolean DEBUG = MainActivity.DEBUG;
+public class MainFragment extends BaseFragment implements TabLayout.OnTabSelectedListener {
 
-    private AppCompatActivity activity;
+    public int currentServiceId = -1;
+    private ViewPager viewPager;
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Constants
+    //////////////////////////////////////////////////////////////////////////*/
+
+    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;
 
     /*//////////////////////////////////////////////////////////////////////////
     // Fragment's LifeCycle
     //////////////////////////////////////////////////////////////////////////*/
 
-    @Override
-    public void onAttach(Context context) {
-        super.onAttach(context);
-        if (DEBUG) Log.d(TAG, "onAttach() called with: context = [" + context + "]");
-        activity = ((AppCompatActivity) context);
-    }
-
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        if (DEBUG) Log.d(TAG, "onCreate() called with: savedInstanceState = [" + savedInstanceState + "]");
         setHasOptionsMenu(true);
     }
 
     @Override
-    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        if (DEBUG) Log.d(TAG, "onCreateView() called with: inflater = [" + inflater + "], container = [" + container + "], savedInstanceState = [" + savedInstanceState + "]");
+    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);
     }
 
+    @Override
+    protected void initViews(View rootView, Bundle savedInstanceState) {
+        super.initViews(rootView, savedInstanceState);
+
+        TabLayout 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());
+
+        tabLayout.setupWithViewPager(viewPager);
+
+        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);
+
+        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);
+        }
+    }
+
     /*//////////////////////////////////////////////////////////////////////////
     // Menu
     //////////////////////////////////////////////////////////////////////////*/
@@ -57,10 +106,19 @@ public class MainFragment extends Fragment {
         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) {
-            supportActionBar.setDisplayShowTitleEnabled(false);
             supportActionBar.setDisplayHomeAsUpEnabled(false);
         }
     }
@@ -69,9 +127,150 @@ public class MainFragment extends Fragment {
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
             case R.id.action_search:
-                NavigationHelper.openSearchFragment(getFragmentManager(), 0, "");
+                NavigationHelper.openSearchFragment(getFragmentManager(), ServiceHelper.getSelectedServiceId(activity), "");
                 return true;
         }
         return super.onOptionsItemSelected(item);
     }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Tabs
+    //////////////////////////////////////////////////////////////////////////*/
+
+    @Override
+    public void onTabSelected(TabLayout.Tab tab) {
+        viewPager.setCurrentItem(tab.getPosition());
+    }
+
+    @Override
+    public void onTabUnselected(TabLayout.Tab tab) {
+    }
+
+    @Override
+    public void onTabReselected(TabLayout.Tab tab) {
+    }
+
+    private class PagerAdapter extends FragmentPagerAdapter {
+        PagerAdapter(FragmentManager fm) {
+            super(fm);
+        }
+
+        @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();
+            }
+        }
+
+        @Override
+        public CharSequence getPageTitle(int position) {
+            //return getString(this.tabTitles[position]);
+            return "";
+        }
+
+        @Override
+        public int getCount() {
+            return isSubscriptionsPageOnlySelected() ? 2 : 3;
+        }
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // 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++;
+        }
+    }
 }

app/src/main/java/org/schabi/newpipe/fragments/OnScrollBelowItemsListener.java

@@ -0,0 +1,43 @@
+package org.schabi.newpipe.fragments;
+
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.support.v7.widget.StaggeredGridLayoutManager;
+
+/**
+ * Recycler view scroll listener which calls the method {@link #onScrolledDown(RecyclerView)}
+ * if the view is scrolled below the last item.
+ */
+public abstract class OnScrollBelowItemsListener extends RecyclerView.OnScrollListener {
+
+    @Override
+    public void onScrolled(RecyclerView recyclerView, int dx, int dy) {
+        super.onScrolled(recyclerView, dx, dy);
+        if (dy > 0) {
+            int pastVisibleItems = 0, visibleItemCount, totalItemCount;
+            RecyclerView.LayoutManager layoutManager = recyclerView.getLayoutManager();
+
+            visibleItemCount = layoutManager.getChildCount();
+            totalItemCount = layoutManager.getItemCount();
+
+            // Already covers the GridLayoutManager case
+            if (layoutManager instanceof LinearLayoutManager) {
+                pastVisibleItems = ((LinearLayoutManager) layoutManager).findFirstVisibleItemPosition();
+            } else if (layoutManager instanceof StaggeredGridLayoutManager) {
+                int[] positions = ((StaggeredGridLayoutManager) layoutManager).findFirstVisibleItemPositions(null);
+                if (positions != null && positions.length > 0) pastVisibleItems = positions[0];
+            }
+
+            if ((visibleItemCount + pastVisibleItems) >= totalItemCount) {
+                onScrolledDown(recyclerView);
+            }
+        }
+    }
+
+    /**
+     * Called when the recycler view is scrolled below the last item.
+     *
+     * @param recyclerView the recycler view
+     */
+    public abstract void onScrolledDown(RecyclerView recyclerView);
+}

app/src/main/java/org/schabi/newpipe/fragments/ViewContract.java

@@ -0,0 +1,10 @@
+package org.schabi.newpipe.fragments;
+
+public interface ViewContract<I> {
+    void showLoading();
+    void hideLoading();
+    void showEmptyState();
+    void showError(String message, boolean showRetryButton);
+
+    void handleResult(I result);
+}

app/src/main/java/org/schabi/newpipe/fragments/channel/ChannelFragment.java

@@ -1,403 +0,0 @@
-package org.schabi.newpipe.fragments.channel;
-
-import android.content.Intent;
-import android.net.Uri;
-import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.app.ActionBar;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.text.TextUtils;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import org.schabi.newpipe.ImageErrorLoadingListener;
-import org.schabi.newpipe.R;
-import org.schabi.newpipe.extractor.InfoItem;
-import org.schabi.newpipe.extractor.channel.ChannelInfo;
-import org.schabi.newpipe.fragments.BaseFragment;
-import org.schabi.newpipe.fragments.search.OnScrollBelowItemsListener;
-import org.schabi.newpipe.info_list.InfoItemBuilder;
-import org.schabi.newpipe.info_list.InfoListAdapter;
-import org.schabi.newpipe.util.Constants;
-import org.schabi.newpipe.util.NavigationHelper;
-import org.schabi.newpipe.workers.ChannelExtractorWorker;
-
-import java.io.Serializable;
-import java.text.NumberFormat;
-import java.util.ArrayList;
-
-import static org.schabi.newpipe.util.AnimationUtils.animateView;
-
-public class ChannelFragment extends BaseFragment implements ChannelExtractorWorker.OnChannelInfoReceive {
-    private final String TAG = "ChannelFragment@" + Integer.toHexString(hashCode());
-
-    private static final String INFO_LIST_KEY = "info_list_key";
-    private static final String CHANNEL_INFO_KEY = "channel_info_key";
-    private static final String PAGE_NUMBER_KEY = "page_number_key";
-
-    private InfoListAdapter infoListAdapter;
-
-    private ChannelExtractorWorker currentChannelWorker;
-    private ChannelInfo currentChannelInfo;
-    private int serviceId = -1;
-    private String channelName = "";
-    private String channelUrl = "";
-    private int pageNumber = 0;
-    private boolean hasNextPage = true;
-
-    /*//////////////////////////////////////////////////////////////////////////
-    // Views
-    //////////////////////////////////////////////////////////////////////////*/
-
-    private RecyclerView channelVideosList;
-
-    private View headerRootLayout;
-    private ImageView headerChannelBanner;
-    private ImageView headerAvatarView;
-    private TextView headerTitleView;
-    private TextView headerSubscribersTextView;
-    private Button headerRssButton;
-
-    /*////////////////////////////////////////////////////////////////////////*/
-
-    public ChannelFragment() {
-    }
-
-    public static Fragment getInstance(int serviceId, String channelUrl, String name) {
-        ChannelFragment instance = new ChannelFragment();
-        instance.setChannel(serviceId, channelUrl, name);
-        return instance;
-    }
-
-    /*//////////////////////////////////////////////////////////////////////////
-    // Fragment's LifeCycle
-    //////////////////////////////////////////////////////////////////////////*/
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        if (DEBUG) Log.d(TAG, "onCreate() called with: savedInstanceState = [" + savedInstanceState + "]");
-        super.onCreate(savedInstanceState);
-        setHasOptionsMenu(true);
-        if (savedInstanceState != null) {
-            channelUrl = savedInstanceState.getString(Constants.KEY_URL);
-            channelName = savedInstanceState.getString(Constants.KEY_TITLE);
-            serviceId = savedInstanceState.getInt(Constants.KEY_SERVICE_ID, -1);
-
-            pageNumber = savedInstanceState.getInt(PAGE_NUMBER_KEY, 0);
-            Serializable serializable = savedInstanceState.getSerializable(CHANNEL_INFO_KEY);
-            if (serializable instanceof ChannelInfo) currentChannelInfo = (ChannelInfo) serializable;
-        }
-    }
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        if (DEBUG) Log.d(TAG, "onCreateView() called with: inflater = [" + inflater + "], container = [" + container + "], savedInstanceState = [" + savedInstanceState + "]");
-        return inflater.inflate(R.layout.fragment_channel, container, false);
-    }
-
-    @Override
-    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
-        super.onViewCreated(view, savedInstanceState);
-
-        if (currentChannelInfo == null) loadPage(0);
-        else handleChannelInfo(currentChannelInfo, false, false);
-    }
-
-    @Override
-    public void onDestroyView() {
-        if (DEBUG) Log.d(TAG, "onDestroyView() called");
-        headerAvatarView.setImageBitmap(null);
-        headerChannelBanner.setImageBitmap(null);
-        channelVideosList.removeAllViews();
-
-        channelVideosList = null;
-        headerRootLayout = null;
-        headerChannelBanner = null;
-        headerAvatarView = null;
-        headerTitleView = null;
-        headerSubscribersTextView = null;
-        headerRssButton = null;
-
-        super.onDestroyView();
-    }
-
-    @Override
-    public void onResume() {
-        if (DEBUG) Log.d(TAG, "onResume() called");
-        super.onResume();
-        if (wasLoading.getAndSet(false) && (currentChannelWorker == null || !currentChannelWorker.isRunning())) {
-            loadPage(pageNumber);
-        }
-    }
-
-    @Override
-    public void onStop() {
-        if (DEBUG) Log.d(TAG, "onStop() called");
-        super.onStop();
-        wasLoading.set(currentChannelWorker != null && currentChannelWorker.isRunning());
-        if (currentChannelWorker != null && currentChannelWorker.isRunning()) currentChannelWorker.cancel();
-    }
-
-    @Override
-    public void onSaveInstanceState(Bundle outState) {
-        if (DEBUG) Log.d(TAG, "onSaveInstanceState() called with: outState = [" + outState + "]");
-        super.onSaveInstanceState(outState);
-        outState.putString(Constants.KEY_URL, channelUrl);
-        outState.putString(Constants.KEY_TITLE, channelName);
-        outState.putInt(Constants.KEY_SERVICE_ID, serviceId);
-
-        outState.putSerializable(INFO_LIST_KEY, ((ArrayList<InfoItem>) infoListAdapter.getItemsList()));
-        outState.putSerializable(CHANNEL_INFO_KEY, currentChannelInfo);
-        outState.putInt(PAGE_NUMBER_KEY, pageNumber);
-    }
-
-    /*//////////////////////////////////////////////////////////////////////////
-    // Menu
-    //////////////////////////////////////////////////////////////////////////*/
-    @Override
-    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-        if (DEBUG) Log.d(TAG, "onCreateOptionsMenu() called with: menu = [" + menu + "], inflater = [" + inflater + "]");
-        super.onCreateOptionsMenu(menu, inflater);
-        inflater.inflate(R.menu.menu_channel, menu);
-
-        ActionBar supportActionBar = activity.getSupportActionBar();
-        if (supportActionBar != null) {
-            supportActionBar.setDisplayShowTitleEnabled(true);
-            supportActionBar.setDisplayHomeAsUpEnabled(true);
-        }
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        if (DEBUG) Log.d(TAG, "onOptionsItemSelected() called with: item = [" + item + "]");
-        super.onOptionsItemSelected(item);
-        switch (item.getItemId()) {
-            case R.id.menu_item_openInBrowser: {
-                Intent intent = new Intent();
-                intent.setAction(Intent.ACTION_VIEW);
-                intent.setData(Uri.parse(channelUrl));
-                startActivity(Intent.createChooser(intent, getString(R.string.choose_browser)));
-                return true;
-            }
-            case R.id.menu_item_share:
-                Intent intent = new Intent();
-                intent.setAction(Intent.ACTION_SEND);
-                intent.putExtra(Intent.EXTRA_TEXT, channelUrl);
-                intent.setType("text/plain");
-                startActivity(Intent.createChooser(intent, getString(R.string.share_dialog_title)));
-                return true;
-            default:
-                return super.onOptionsItemSelected(item);
-        }
-    }
-
-    /*//////////////////////////////////////////////////////////////////////////
-    // Init's
-    //////////////////////////////////////////////////////////////////////////*/
-
-    @Override
-    protected void initViews(View rootView, Bundle savedInstanceState) {
-        super.initViews(rootView, savedInstanceState);
-
-        channelVideosList = (RecyclerView) rootView.findViewById(R.id.channel_streams_view);
-
-        channelVideosList.setLayoutManager(new LinearLayoutManager(activity));
-        if (infoListAdapter == null) {
-            infoListAdapter = new InfoListAdapter(activity);
-            if (savedInstanceState != null) {
-                //noinspection unchecked
-                ArrayList<InfoItem> serializable = (ArrayList<InfoItem>) savedInstanceState.getSerializable(INFO_LIST_KEY);
-                infoListAdapter.addInfoItemList(serializable);
-            }
-        }
-
-        channelVideosList.setAdapter(infoListAdapter);
-        headerRootLayout = activity.getLayoutInflater().inflate(R.layout.channel_header, channelVideosList, false);
-        infoListAdapter.setHeader(headerRootLayout);
-        infoListAdapter.setFooter(activity.getLayoutInflater().inflate(R.layout.pignate_footer, channelVideosList, false));
-
-        headerChannelBanner = (ImageView) headerRootLayout.findViewById(R.id.channel_banner_image);
-        headerAvatarView = (ImageView) headerRootLayout.findViewById(R.id.channel_avatar_view);
-        headerTitleView = (TextView) headerRootLayout.findViewById(R.id.channel_title_view);
-        headerSubscribersTextView = (TextView) headerRootLayout.findViewById(R.id.channel_subscriber_view);
-        headerRssButton = (Button) headerRootLayout.findViewById(R.id.channel_rss_button);
-    }
-
-    protected void initListeners() {
-        super.initListeners();
-
-        infoListAdapter.setOnStreamInfoItemSelectedListener(new InfoItemBuilder.OnInfoItemSelectedListener() {
-            @Override
-            public void selected(int serviceId, String url, String title) {
-                if (DEBUG) Log.d(TAG, "selected() called with: serviceId = [" + serviceId + "], url = [" + url + "], title = [" + title + "]");
-                NavigationHelper.openVideoDetailFragment(getFragmentManager(), serviceId, url, title);
-            }
-        });
-
-        channelVideosList.clearOnScrollListeners();
-        channelVideosList.addOnScrollListener(new OnScrollBelowItemsListener() {
-            @Override
-            public void onScrolledDown(RecyclerView recyclerView) {
-                if ((currentChannelWorker == null || !currentChannelWorker.isRunning()) && hasNextPage && !isLoading.get()) {
-                    pageNumber++;
-                    loadMoreVideos();
-                }
-            }
-        });
-
-        headerRssButton.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                if (DEBUG) Log.d(TAG, "onClick() called with: view = [" + view + "] feed url > " + currentChannelInfo.feed_url);
-                Intent i = new Intent(Intent.ACTION_VIEW, Uri.parse(currentChannelInfo.feed_url));
-                startActivity(i);
-            }
-        });
-    }
-
-    @Override
-    protected void reloadContent() {
-        if (DEBUG) Log.d(TAG, "reloadContent() called");
-        currentChannelInfo = null;
-        infoListAdapter.clearStreamItemList();
-        loadPage(0);
-    }
-
-    /*//////////////////////////////////////////////////////////////////////////
-    // Utils
-    //////////////////////////////////////////////////////////////////////////*/
-
-    private String buildSubscriberString(long count) {
-        String out = NumberFormat.getNumberInstance().format(count);
-        out += " " + getString(count > 1 ? R.string.subscriber_plural : R.string.subscriber);
-        return out;
-    }
-
-    private void loadPage(int page) {
-        if (DEBUG) Log.d(TAG, "loadPage() called with: page = [" + page + "]");
-        if (currentChannelWorker != null && currentChannelWorker.isRunning()) currentChannelWorker.cancel();
-        isLoading.set(true);
-        pageNumber = page;
-        infoListAdapter.showFooter(false);
-
-        animateView(loadingProgressBar, true, 200);
-        animateView(errorPanel, false, 200);
-
-        imageLoader.cancelDisplayTask(headerChannelBanner);
-        imageLoader.cancelDisplayTask(headerAvatarView);
-
-        headerRssButton.setVisibility(View.GONE);
-        headerSubscribersTextView.setVisibility(View.GONE);
-
-        headerTitleView.setText(channelName != null ? channelName : "");
-        headerChannelBanner.setImageDrawable(ContextCompat.getDrawable(activity, R.drawable.channel_banner));
-        headerAvatarView.setImageDrawable(ContextCompat.getDrawable(activity, R.drawable.buddy));
-        if (activity.getSupportActionBar() != null) activity.getSupportActionBar().setTitle(channelName != null ? channelName : "");
-
-        currentChannelWorker = new ChannelExtractorWorker(activity, serviceId, channelUrl, page, false, this);
-        currentChannelWorker.start();
-    }
-
-    private void loadMoreVideos() {
-        if (DEBUG) Log.d(TAG, "loadMoreVideos() called");
-        if (currentChannelWorker != null && currentChannelWorker.isRunning()) currentChannelWorker.cancel();
-        isLoading.set(true);
-        currentChannelWorker = new ChannelExtractorWorker(activity, serviceId, channelUrl, pageNumber, true, this);
-        currentChannelWorker.start();
-    }
-
-    private void setChannel(int serviceId, String channelUrl, String name) {
-        this.serviceId = serviceId;
-        this.channelUrl = channelUrl;
-        this.channelName = name;
-    }
-
-    private void handleChannelInfo(ChannelInfo info, boolean onlyVideos, boolean addVideos) {
-        currentChannelInfo = info;
-
-        animateView(errorPanel, false, 300);
-        animateView(channelVideosList, true, 200);
-        animateView(loadingProgressBar, false, 200);
-
-        if (!onlyVideos) {
-            headerRootLayout.setVisibility(View.VISIBLE);
-            //animateView(loadingProgressBar, false, 200, null);
-
-            if (!TextUtils.isEmpty(info.channel_name)) {
-                if (activity.getSupportActionBar() != null) activity.getSupportActionBar().setTitle(info.channel_name);
-                headerTitleView.setText(info.channel_name);
-                channelName = info.channel_name;
-            } else channelName = "";
-
-            if (!TextUtils.isEmpty(info.banner_url)) {
-                imageLoader.displayImage(info.banner_url, headerChannelBanner, displayImageOptions,  new ImageErrorLoadingListener(activity, getView(), info.service_id));
-            }
-
-            if (!TextUtils.isEmpty(info.avatar_url)) {
-                headerAvatarView.setVisibility(View.VISIBLE);
-                imageLoader.displayImage(info.avatar_url, headerAvatarView, displayImageOptions, new ImageErrorLoadingListener(activity, getView(), info.service_id));
-            }
-
-            if (info.subscriberCount != -1) {
-                headerSubscribersTextView.setText(buildSubscriberString(info.subscriberCount));
-                headerSubscribersTextView.setVisibility(View.VISIBLE);
-            } else headerSubscribersTextView.setVisibility(View.GONE);
-
-            if (!TextUtils.isEmpty(info.feed_url)) headerRssButton.setVisibility(View.VISIBLE);
-            else headerRssButton.setVisibility(View.INVISIBLE);
-
-            infoListAdapter.showFooter(true);
-        }
-
-        hasNextPage = info.hasNextPage;
-        if (!hasNextPage) infoListAdapter.showFooter(false);
-
-        //if (!listRestored) {
-        if (addVideos) infoListAdapter.addInfoItemList(info.related_streams);
-        //}
-    }
-
-    @Override
-    protected void setErrorMessage(String message, boolean showRetryButton) {
-        super.setErrorMessage(message, showRetryButton);
-
-        animateView(channelVideosList, false, 200);
-        currentChannelInfo = null;
-    }
-
-    /*//////////////////////////////////////////////////////////////////////////
-    // OnChannelInfoReceiveListener
-    //////////////////////////////////////////////////////////////////////////*/
-
-    @Override
-    public void onReceive(ChannelInfo info, boolean onlyVideos) {
-        if (DEBUG) Log.d(TAG, "onReceive() called with: info = [" + info + "]");
-        if (info == null || isRemoving() || !isVisible()) return;
-
-        handleChannelInfo(info, onlyVideos, true);
-        isLoading.set(false);
-    }
-
-    @Override
-    public void onError(int messageId) {
-        if (DEBUG) Log.d(TAG, "onError() called with: messageId = [" + messageId + "]");
-        setErrorMessage(getString(messageId), true);
-    }
-
-    @Override
-    public void onUnrecoverableError(Exception exception) {
-        if (DEBUG) Log.d(TAG, "onUnrecoverableError() called with: exception = [" + exception + "]");
-        activity.finish();
-    }
-}

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

@@ -1,163 +0,0 @@
-package org.schabi.newpipe.fragments.detail;
-
-import android.content.SharedPreferences;
-import android.preference.PreferenceManager;
-import android.support.v7.app.AppCompatActivity;
-import android.util.Log;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-import android.view.View;
-import android.widget.AdapterView;
-import android.widget.Spinner;
-
-import org.schabi.newpipe.R;
-import org.schabi.newpipe.extractor.stream_info.VideoStream;
-import org.schabi.newpipe.util.Utils;
-
-import java.util.List;
-
-/**
- * Created by Christian Schabesberger on 18.08.15.
- * <p>
- * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
- * DetailsMenuHandler.java is part of NewPipe.
- * <p>
- * 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.
- * <p>
- * 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.
- * <p>
- * You should have received a copy of the GNU General Public License
- * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-@SuppressWarnings("WeakerAccess")
-class ActionBarHandler {
-    private static final String TAG = "ActionBarHandler";
-
-    private AppCompatActivity activity;
-    private int selectedVideoStream = -1;
-
-    private SharedPreferences defaultPreferences;
-
-    private Menu menu;
-
-    // Only callbacks are listed here, there are more actions which don't need a callback.
-    // those are edited directly. Typically VideoDetailFragment will implement those callbacks.
-    private OnActionListener onShareListener;
-    private OnActionListener onOpenInBrowserListener;
-    private OnActionListener onDownloadListener;
-    private OnActionListener onPlayWithKodiListener;
-
-    // Triggered when a stream related action is triggered.
-    public interface OnActionListener {
-        void onActionSelected(int selectedStreamId);
-    }
-
-    public ActionBarHandler(AppCompatActivity activity) {
-        this.activity = activity;
-    }
-
-    public void setupStreamList(final List<VideoStream> videoStreams, Spinner toolbarSpinner) {
-        if (activity == null) return;
-
-        selectedVideoStream = Utils.getDefaultResolution(activity, videoStreams);
-
-        boolean isExternalPlayerEnabled = PreferenceManager.getDefaultSharedPreferences(activity).getBoolean(activity.getString(R.string.use_external_video_player_key), false);
-        toolbarSpinner.setAdapter(new SpinnerToolbarAdapter(activity, videoStreams, isExternalPlayerEnabled));
-        toolbarSpinner.setSelection(selectedVideoStream);
-        toolbarSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
-            @Override
-            public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
-                selectedVideoStream = position;
-            }
-
-            @Override
-            public void onNothingSelected(AdapterView<?> parent) {
-            }
-        });
-
-    }
-
-    public void setupMenu(Menu menu, MenuInflater inflater) {
-        this.menu = menu;
-
-        // CAUTION set item properties programmatically otherwise it would not be accepted by
-        // appcompat itemsinflater.inflate(R.menu.videoitem_detail, menu);
-
-        defaultPreferences = PreferenceManager.getDefaultSharedPreferences(activity);
-        inflater.inflate(R.menu.video_detail_menu, menu);
-
-        updateItemsVisibility();
-    }
-
-    public void updateItemsVisibility(){
-        showPlayWithKodiAction(defaultPreferences.getBoolean(activity.getString(R.string.show_play_with_kodi_key), false));
-    }
-
-    public boolean onItemSelected(MenuItem item) {
-        int id = item.getItemId();
-        switch (id) {
-            case R.id.menu_item_share: {
-                if (onShareListener != null) {
-                    onShareListener.onActionSelected(selectedVideoStream);
-                }
-                return true;
-            }
-            case R.id.menu_item_openInBrowser: {
-                if (onOpenInBrowserListener != null) {
-                    onOpenInBrowserListener.onActionSelected(selectedVideoStream);
-                }
-                return true;
-            }
-            case R.id.menu_item_download:
-                if (onDownloadListener != null) {
-                    onDownloadListener.onActionSelected(selectedVideoStream);
-                }
-                return true;
-            case R.id.action_play_with_kodi:
-                if (onPlayWithKodiListener != null) {
-                    onPlayWithKodiListener.onActionSelected(selectedVideoStream);
-                }
-                return true;
-            default:
-                Log.e(TAG, "Menu Item not known");
-        }
-        return false;
-    }
-
-    public int getSelectedVideoStream() {
-        return selectedVideoStream;
-    }
-
-    public void setOnShareListener(OnActionListener listener) {
-        onShareListener = listener;
-    }
-
-    public void setOnOpenInBrowserListener(OnActionListener listener) {
-        onOpenInBrowserListener = listener;
-    }
-
-    public void setOnDownloadListener(OnActionListener listener) {
-        onDownloadListener = listener;
-    }
-
-    public void setOnPlayWithKodiListener(OnActionListener listener) {
-        onPlayWithKodiListener = listener;
-    }
-
-    public void showDownloadAction(boolean visible) {
-        menu.findItem(R.id.menu_item_download).setVisible(visible);
-    }
-
-    public void showPlayWithKodiAction(boolean visible) {
-        menu.findItem(R.id.action_play_with_kodi).setVisible(visible);
-    }
-}

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

@@ -1,74 +0,0 @@
-package org.schabi.newpipe.fragments.detail;
-
-import android.content.Context;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.BaseAdapter;
-import android.widget.ImageView;
-import android.widget.Spinner;
-import android.widget.TextView;
-
-import org.schabi.newpipe.R;
-import org.schabi.newpipe.extractor.MediaFormat;
-import org.schabi.newpipe.extractor.stream_info.VideoStream;
-
-import java.util.List;
-
-public class SpinnerToolbarAdapter extends BaseAdapter {
-    private final List<VideoStream> videoStreams;
-    private final boolean showIconNoAudio;
-
-    private final Context context;
-
-    public SpinnerToolbarAdapter(Context context, List<VideoStream> videoStreams, boolean showIconNoAudio) {
-        this.context = context;
-        this.videoStreams = videoStreams;
-        this.showIconNoAudio = showIconNoAudio;
-    }
-
-    @Override
-    public int getCount() {
-        return videoStreams.size();
-    }
-
-    @Override
-    public Object getItem(int position) {
-        return videoStreams.get(position);
-    }
-
-    @Override
-    public long getItemId(int position) {
-        return position;
-    }
-
-    @Override
-    public View getDropDownView(int position, View convertView, ViewGroup parent) {
-        return getCustomView(position, convertView, parent, true);
-    }
-
-    @Override
-    public View getView(int position, View convertView, ViewGroup parent) {
-        return getCustomView(((Spinner) parent).getSelectedItemPosition(), convertView, parent, false);
-    }
-
-    private View getCustomView(int position, View convertView, ViewGroup parent, boolean isDropdownItem) {
-        if (convertView == null) {
-            convertView = LayoutInflater.from(context).inflate(R.layout.resolutions_spinner_item, parent, false);
-        }
-
-        ImageView woSoundIcon = (ImageView) convertView.findViewById(R.id.wo_sound_icon);
-        TextView text = (TextView) convertView.findViewById(android.R.id.text1);
-        VideoStream item = (VideoStream) getItem(position);
-        text.setText(MediaFormat.getNameById(item.format) + " " + item.resolution);
-
-        int visibility = !showIconNoAudio ? View.GONE
-                : item.isVideoOnly ? View.VISIBLE
-                : isDropdownItem ? View.INVISIBLE
-                : View.GONE;
-        woSoundIcon.setVisibility(visibility);
-
-        return convertView;
-    }
-
-}

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

@@ -1,24 +1,26 @@
 package org.schabi.newpipe.fragments.detail;
 
-import org.schabi.newpipe.extractor.stream_info.StreamInfo;
-
 import java.io.Serializable;
 
+class StackItem implements Serializable {
+    private int serviceId;
+    private String title;
+    private String url;
 
-@SuppressWarnings("WeakerAccess")
-public class StackItem implements Serializable {
-    private String title, url;
-    private StreamInfo info;
-
-    public StackItem(String url, String title) {
-        this.title = title;
+    StackItem(int serviceId, String url, String title) {
+        this.serviceId = serviceId;
         this.url = url;
+        this.title = title;
     }
 
     public void setTitle(String title) {
         this.title = title;
     }
 
+    public int getServiceId() {
+        return serviceId;
+    }
+
     public String getTitle() {
         return title;
     }
@@ -27,16 +29,8 @@ public class StackItem implements Serializable {
         return url;
     }
 
-    public void setInfo(StreamInfo info) {
-        this.info = info;
-    }
-
-    public StreamInfo getInfo() {
-        return info;
-    }
-
     @Override
     public String toString() {
-        return getUrl() + " > " + getTitle();
+        return getServiceId() + ":" + getUrl() + " > " + getTitle();
     }
 }

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

@@ -1,85 +0,0 @@
-package org.schabi.newpipe.fragments.detail;
-
-import android.support.annotation.NonNull;
-import android.text.TextUtils;
-import android.util.Log;
-
-import org.schabi.newpipe.MainActivity;
-import org.schabi.newpipe.extractor.stream_info.StreamInfo;
-
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-
-
-@SuppressWarnings("WeakerAccess")
-public class StreamInfoCache {
-    private static String TAG = "StreamInfoCache@";
-    private static final boolean DEBUG = MainActivity.DEBUG;
-    private static final StreamInfoCache instance = new StreamInfoCache();
-    private static final int MAX_ITEMS_ON_CACHE = 20;
-
-    private final LinkedHashMap<String, StreamInfo> myCache = new LinkedHashMap<>();
-
-    private StreamInfoCache() {
-        TAG += "" + Integer.toHexString(hashCode());
-    }
-
-    public static StreamInfoCache getInstance() {
-        if (DEBUG) Log.d(TAG, "getInstance() called");
-        return instance;
-    }
-
-    public boolean hasKey(@NonNull String url) {
-        if (DEBUG) Log.d(TAG, "hasKey() called with: url = [" + url + "]");
-        return !TextUtils.isEmpty(url) && myCache.containsKey(url) && myCache.get(url) != null;
-    }
-
-    public StreamInfo getFromKey(@NonNull String url) {
-        if (DEBUG) Log.d(TAG, "getFromKey() called with: url = [" + url + "]");
-        return myCache.get(url);
-    }
-
-    public void putInfo(@NonNull StreamInfo info) {
-        if (DEBUG) Log.d(TAG, "putInfo() called with: info = [" + info + "]");
-        putInfo(info.webpage_url, info);
-    }
-
-    public void putInfo(@NonNull String url, @NonNull StreamInfo info) {
-        if (DEBUG) Log.d(TAG, "putInfo() called with: url = [" + url + "], info = [" + info + "]");
-        myCache.put(url, info);
-    }
-
-    public void removeInfo(@NonNull StreamInfo info) {
-        if (DEBUG) Log.d(TAG, "removeInfo() called with: info = [" + info + "]");
-        myCache.remove(info.webpage_url);
-    }
-
-    public void removeInfo(@NonNull String url) {
-        if (DEBUG) Log.d(TAG, "removeInfo() called with: url = [" + url + "]");
-        myCache.remove(url);
-    }
-
-    @SuppressWarnings("unused")
-    public void clearCache() {
-        if (DEBUG) Log.d(TAG, "clearCache() called");
-        myCache.clear();
-    }
-
-    public void removeOldEntries() {
-        if (DEBUG) Log.d(TAG, "removeOldEntries() called , size = " + getSize());
-        if (getSize() > MAX_ITEMS_ON_CACHE) {
-            Iterator<String> iterator = myCache.keySet().iterator();
-            while (iterator.hasNext()) {
-                iterator.next();
-                iterator.remove();
-                if (DEBUG) Log.d(TAG, "getSize() = " + getSize());
-                if (getSize() <= MAX_ITEMS_ON_CACHE) break;
-            }
-        }
-    }
-
-    public int getSize() {
-        return myCache.size();
-    }
-
-}

app/src/main/java/org/schabi/newpipe/fragments/list/BaseListFragment.java

@@ -0,0 +1,293 @@
+package org.schabi.newpipe.fragments.list;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.v7.app.ActionBar;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.util.Log;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.View;
+
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.extractor.InfoItem;
+import org.schabi.newpipe.extractor.channel.ChannelInfoItem;
+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.player.playqueue.SinglePlayQueue;
+import org.schabi.newpipe.util.NavigationHelper;
+import org.schabi.newpipe.util.OnClickGesture;
+import org.schabi.newpipe.util.StateSaver;
+
+import java.util.Collections;
+import java.util.List;
+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 {
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Views
+    //////////////////////////////////////////////////////////////////////////*/
+
+    protected InfoListAdapter infoListAdapter;
+    protected RecyclerView itemsList;
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // LifeCycle
+    //////////////////////////////////////////////////////////////////////////*/
+
+    @Override
+    public void onAttach(Context context) {
+        super.onAttach(context);
+        infoListAdapter = new InfoListAdapter(activity);
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setHasOptionsMenu(true);
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        StateSaver.onDestroy(savedState);
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // State Saving
+    //////////////////////////////////////////////////////////////////////////*/
+
+    protected StateSaver.SavedState savedState;
+
+    @Override
+    public String generateSuffix() {
+        // Naive solution, but it's good for now (the items don't change)
+        return "." + infoListAdapter.getItemsList().size() + ".list";
+    }
+
+    @Override
+    public void writeTo(Queue<Object> objectsToSave) {
+        objectsToSave.add(infoListAdapter.getItemsList());
+    }
+
+    @Override
+    @SuppressWarnings("unchecked")
+    public void readFrom(@NonNull Queue<Object> savedObjects) throws Exception {
+        infoListAdapter.getItemsList().clear();
+        infoListAdapter.getItemsList().addAll((List<InfoItem>) savedObjects.poll());
+    }
+
+    @Override
+    public void onSaveInstanceState(Bundle bundle) {
+        super.onSaveInstanceState(bundle);
+        savedState = StateSaver.tryToSave(activity.isChangingConfigurations(), savedState, bundle, this);
+    }
+
+    @Override
+    protected void onRestoreInstanceState(@NonNull Bundle bundle) {
+        super.onRestoreInstanceState(bundle);
+        savedState = StateSaver.tryToRestore(bundle, this);
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Init
+    //////////////////////////////////////////////////////////////////////////*/
+
+    protected View getListHeader() {
+        return null;
+    }
+
+    protected View getListFooter() {
+        return activity.getLayoutInflater().inflate(R.layout.pignate_footer, itemsList, false);
+    }
+
+    protected RecyclerView.LayoutManager getListLayoutManager() {
+        return new LinearLayoutManager(activity);
+    }
+
+    @Override
+    protected void initViews(View rootView, Bundle savedInstanceState) {
+        super.initViews(rootView, savedInstanceState);
+
+        itemsList = rootView.findViewById(R.id.items_list);
+        itemsList.setLayoutManager(getListLayoutManager());
+
+        infoListAdapter.setFooter(getListFooter());
+        infoListAdapter.setHeader(getListHeader());
+
+        itemsList.setAdapter(infoListAdapter);
+    }
+
+    protected void onItemSelected(InfoItem selectedItem) {
+        if (DEBUG) Log.d(TAG, "onItemSelected() called with: selectedItem = [" + selectedItem + "]");
+    }
+
+    @Override
+    protected void initListeners() {
+        super.initListeners();
+        infoListAdapter.setOnStreamSelectedListener(new OnClickGesture<StreamInfoItem>() {
+            @Override
+            public void selected(StreamInfoItem selectedItem) {
+                onStreamSelected(selectedItem);
+            }
+
+            @Override
+            public void held(StreamInfoItem selectedItem) {
+                showStreamDialog(selectedItem);
+            }
+        });
+
+        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());
+            }
+        });
+
+        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());
+            }
+        });
+
+        itemsList.clearOnScrollListeners();
+        itemsList.addOnScrollListener(new OnScrollBelowItemsListener() {
+            @Override
+            public void onScrolledDown(RecyclerView recyclerView) {
+                onScrollToBottom();
+            }
+        });
+    }
+
+    private void onStreamSelected(StreamInfoItem selectedItem) {
+        onItemSelected(selectedItem);
+        NavigationHelper.openVideoDetailFragment(useAsFrontPage ? getParentFragment().getFragmentManager() : getFragmentManager(),
+                selectedItem.getServiceId(), selectedItem.getUrl(), selectedItem.getName());
+    }
+
+    protected void onScrollToBottom() {
+        if (hasMoreItems() && !isLoading.get()) {
+            loadMoreItems();
+        }
+    }
+
+    protected void showStreamDialog(final StreamInfoItem item) {
+        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.enqueue_on_background),
+                context.getResources().getString(R.string.enqueue_on_popup),
+                context.getResources().getString(R.string.append_playlist)
+        };
+
+        final DialogInterface.OnClickListener actions = (dialogInterface, i) -> {
+            switch (i) {
+                case 0:
+                    NavigationHelper.enqueueOnBackgroundPlayer(context, new SinglePlayQueue(item));
+                    break;
+                case 1:
+                    NavigationHelper.enqueueOnPopupPlayer(activity, new SinglePlayQueue(item));
+                    break;
+                case 2:
+                    if (getFragmentManager() != null) {
+                        PlaylistAppendDialog.fromStreamInfoItems(Collections.singletonList(item))
+                                .show(getFragmentManager(), TAG);
+                    }
+                    break;
+                default:
+                    break;
+            }
+        };
+
+        new InfoItemDialog(getActivity(), item, commands, actions).show();
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Menu
+    //////////////////////////////////////////////////////////////////////////*/
+
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        if (DEBUG) Log.d(TAG, "onCreateOptionsMenu() called with: menu = [" + menu + "], inflater = [" + inflater + "]");
+        super.onCreateOptionsMenu(menu, inflater);
+        ActionBar supportActionBar = activity.getSupportActionBar();
+        if (supportActionBar != null) {
+            supportActionBar.setDisplayShowTitleEnabled(true);
+            if (useAsFrontPage) {
+                supportActionBar.setDisplayHomeAsUpEnabled(false);
+            } else {
+                supportActionBar.setDisplayHomeAsUpEnabled(true);
+            }
+        }
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Load and handle
+    //////////////////////////////////////////////////////////////////////////*/
+
+    protected abstract void loadMoreItems();
+
+    protected abstract boolean hasMoreItems();
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Contract
+    //////////////////////////////////////////////////////////////////////////*/
+
+    @Override
+    public void showLoading() {
+        super.showLoading();
+        // animateView(itemsList, false, 400);
+    }
+
+    @Override
+    public void hideLoading() {
+        super.hideLoading();
+        animateView(itemsList, true, 300);
+    }
+
+    @Override
+    public void showError(String message, boolean showRetryButton) {
+        super.showError(message, showRetryButton);
+        showListFooter(false);
+        animateView(itemsList, false, 200);
+    }
+
+    @Override
+    public void showEmptyState() {
+        super.showEmptyState();
+        showListFooter(false);
+    }
+
+    @Override
+    public void showListFooter(final boolean show) {
+        itemsList.post(() -> {
+            if (infoListAdapter != null && itemsList != null) {
+                infoListAdapter.showFooter(show);
+            }
+        });
+    }
+
+    @Override
+    public void handleNextItems(N result) {
+        isLoading.set(false);
+    }
+}

app/src/main/java/org/schabi/newpipe/fragments/list/BaseListInfoFragment.java

@@ -0,0 +1,193 @@
+package org.schabi.newpipe.fragments.list;
+
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.text.TextUtils;
+import android.util.Log;
+import android.view.View;
+
+import org.schabi.newpipe.extractor.ListExtractor;
+import org.schabi.newpipe.extractor.ListInfo;
+import org.schabi.newpipe.util.Constants;
+
+import java.util.Queue;
+
+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>
+        extends BaseListFragment<I, ListExtractor.InfoItemsPage> {
+
+    @State
+    protected int serviceId = Constants.NO_SERVICE_ID;
+    @State
+    protected String name;
+    @State
+    protected String url;
+
+    protected I currentInfo;
+    protected String currentNextPageUrl;
+    protected Disposable currentWorker;
+
+    @Override
+    protected void initViews(View rootView, Bundle savedInstanceState) {
+        super.initViews(rootView, savedInstanceState);
+        setTitle(name);
+        showListFooter(hasMoreItems());
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        if (currentWorker != null) currentWorker.dispose();
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        // Check if it was loading when the fragment was stopped/paused,
+        if (wasLoading.getAndSet(false)) {
+            if (hasMoreItems() && infoListAdapter.getItemsList().size() > 0) {
+                loadMoreItems();
+            } else {
+                doInitialLoadLogic();
+            }
+        }
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        if (currentWorker != null) currentWorker.dispose();
+        currentWorker = null;
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // State Saving
+    //////////////////////////////////////////////////////////////////////////*/
+
+    @Override
+    public void writeTo(Queue<Object> objectsToSave) {
+        super.writeTo(objectsToSave);
+        objectsToSave.add(currentInfo);
+        objectsToSave.add(currentNextPageUrl);
+    }
+
+    @Override
+    @SuppressWarnings("unchecked")
+    public void readFrom(@NonNull Queue<Object> savedObjects) throws Exception {
+        super.readFrom(savedObjects);
+        currentInfo = (I) savedObjects.poll();
+        currentNextPageUrl = (String) savedObjects.poll();
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Load and handle
+    //////////////////////////////////////////////////////////////////////////*/
+
+    protected void doInitialLoadLogic() {
+        if (DEBUG) Log.d(TAG, "doInitialLoadLogic() called");
+        if (currentInfo == null) {
+            startLoading(false);
+        } else handleResult(currentInfo);
+    }
+
+    /**
+     * Implement the logic to load the info from the network.<br/>
+     * You can use the default implementations from {@link org.schabi.newpipe.util.ExtractorHelper}.
+     *
+     * @param forceLoad allow or disallow the result to come from the cache
+     */
+    protected abstract Single<I> loadResult(boolean forceLoad);
+
+    @Override
+    public void startLoading(boolean forceLoad) {
+        super.startLoading(forceLoad);
+
+        showListFooter(false);
+        currentInfo = null;
+        if (currentWorker != null) currentWorker.dispose();
+        currentWorker = loadResult(forceLoad)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe((@NonNull I result) -> {
+                    isLoading.set(false);
+                    currentInfo = result;
+                    currentNextPageUrl = result.getNextPageUrl();
+                    handleResult(result);
+                }, (@NonNull Throwable throwable) -> onError(throwable));
+    }
+
+    /**
+     * Implement the logic to load more items<br/>
+     * You can use the default implementations from {@link org.schabi.newpipe.util.ExtractorHelper}
+     */
+    protected abstract Single<ListExtractor.InfoItemsPage> loadMoreItemsLogic();
+
+    protected void loadMoreItems() {
+        isLoading.set(true);
+
+        if (currentWorker != null) currentWorker.dispose();
+        currentWorker = loadMoreItemsLogic()
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe((@io.reactivex.annotations.NonNull ListExtractor.InfoItemsPage InfoItemsPage) -> {
+                    isLoading.set(false);
+                    handleNextItems(InfoItemsPage);
+                }, (@io.reactivex.annotations.NonNull Throwable throwable) -> {
+                    isLoading.set(false);
+                    onError(throwable);
+                });
+    }
+
+    @Override
+    public void handleNextItems(ListExtractor.InfoItemsPage result) {
+        super.handleNextItems(result);
+        currentNextPageUrl = result.getNextPageUrl();
+        infoListAdapter.addInfoItemList(result.getItems());
+
+        showListFooter(hasMoreItems());
+    }
+
+    @Override
+    protected boolean hasMoreItems() {
+        return !TextUtils.isEmpty(currentNextPageUrl);
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Contract
+    //////////////////////////////////////////////////////////////////////////*/
+
+    @Override
+    public void handleResult(@NonNull I result) {
+        super.handleResult(result);
+
+        url = result.getUrl();
+        name = result.getName();
+        setTitle(name);
+
+        if (infoListAdapter.getItemsList().size() == 0) {
+            if (result.getRelatedItems().size() > 0) {
+                infoListAdapter.addInfoItemList(result.getRelatedItems());
+                showListFooter(hasMoreItems());
+            } else {
+                infoListAdapter.clearStreamItemList();
+                showEmptyState();
+            }
+        }
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Utils
+    //////////////////////////////////////////////////////////////////////////*/
+
+    protected void setInitialData(int serviceId, String url, String name) {
+        this.serviceId = serviceId;
+        this.url = url;
+        this.name = !TextUtils.isEmpty(name) ? name : "";
+    }
+}

app/src/main/java/org/schabi/newpipe/fragments/list/ListViewContract.java

@@ -0,0 +1,9 @@
+package org.schabi.newpipe.fragments.list;
+
+import org.schabi.newpipe.fragments.ViewContract;
+
+public interface ListViewContract<I, N> extends ViewContract<I> {
+    void showListFooter(boolean show);
+
+    void handleNextItems(N result);
+}

app/src/main/java/org/schabi/newpipe/fragments/list/channel/ChannelFragment.java

@@ -0,0 +1,513 @@
+package org.schabi.newpipe.fragments.list.channel;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.v4.content.ContextCompat;
+import android.support.v7.app.ActionBar;
+import android.text.TextUtils;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import com.jakewharton.rxbinding2.view.RxView;
+
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.database.subscription.SubscriptionEntity;
+import org.schabi.newpipe.extractor.InfoItem;
+import org.schabi.newpipe.extractor.ListExtractor;
+import org.schabi.newpipe.extractor.NewPipe;
+import org.schabi.newpipe.extractor.channel.ChannelInfo;
+import org.schabi.newpipe.extractor.exceptions.ExtractionException;
+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.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;
+import org.schabi.newpipe.util.Localization;
+import org.schabi.newpipe.util.NavigationHelper;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+import io.reactivex.Observable;
+import io.reactivex.Single;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.disposables.CompositeDisposable;
+import io.reactivex.disposables.Disposable;
+import io.reactivex.functions.Action;
+import io.reactivex.functions.Consumer;
+import io.reactivex.functions.Function;
+import io.reactivex.schedulers.Schedulers;
+
+import static org.schabi.newpipe.util.AnimationUtils.animateBackgroundColor;
+import static org.schabi.newpipe.util.AnimationUtils.animateTextColor;
+import static org.schabi.newpipe.util.AnimationUtils.animateView;
+
+public class ChannelFragment extends BaseListInfoFragment<ChannelInfo> {
+
+    private CompositeDisposable disposables = new CompositeDisposable();
+    private Disposable subscribeButtonMonitor;
+    private SubscriptionService subscriptionService;
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Views
+    //////////////////////////////////////////////////////////////////////////*/
+
+    private View headerRootLayout;
+    private ImageView headerChannelBanner;
+    private ImageView headerAvatarView;
+    private TextView headerTitleView;
+    private TextView headerSubscribersTextView;
+    private Button headerSubscribeButton;
+    private View playlistCtrl;
+
+    private LinearLayout headerPlayAllButton;
+    private LinearLayout headerPopupButton;
+    private LinearLayout headerBackgroundButton;
+
+    private MenuItem menuRssButton;
+
+    public static ChannelFragment getInstance(int serviceId, String url, String name) {
+        ChannelFragment instance = new ChannelFragment();
+        instance.setInitialData(serviceId, url, name);
+        return instance;
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // LifeCycle
+    //////////////////////////////////////////////////////////////////////////*/
+
+    @Override
+    public void setUserVisibleHint(boolean isVisibleToUser) {
+        super.setUserVisibleHint(isVisibleToUser);
+        if(activity != null
+                && useAsFrontPage
+                && isVisibleToUser) {
+            setTitle(currentInfo != null ? currentInfo.getName() : name);
+        }
+    }
+
+    @Override
+    public void onAttach(Context context) {
+        super.onAttach(context);
+        subscriptionService = SubscriptionService.getInstance(activity);
+    }
+
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        return inflater.inflate(R.layout.fragment_channel, container, false);
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        if (disposables != null) disposables.clear();
+        if (subscribeButtonMonitor != null) subscribeButtonMonitor.dispose();
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Init
+    //////////////////////////////////////////////////////////////////////////*/
+
+    protected View getListHeader() {
+        headerRootLayout = activity.getLayoutInflater().inflate(R.layout.channel_header, itemsList, false);
+        headerChannelBanner = headerRootLayout.findViewById(R.id.channel_banner_image);
+        headerAvatarView = headerRootLayout.findViewById(R.id.channel_avatar_view);
+        headerTitleView = headerRootLayout.findViewById(R.id.channel_title_view);
+        headerSubscribersTextView = headerRootLayout.findViewById(R.id.channel_subscriber_view);
+        headerSubscribeButton = headerRootLayout.findViewById(R.id.channel_subscribe_button);
+        playlistCtrl = headerRootLayout.findViewById(R.id.playlist_control);
+
+
+        headerPlayAllButton = headerRootLayout.findViewById(R.id.playlist_ctrl_play_all_button);
+        headerPopupButton = headerRootLayout.findViewById(R.id.playlist_ctrl_play_popup_button);
+        headerBackgroundButton = headerRootLayout.findViewById(R.id.playlist_ctrl_play_bg_button);
+
+        return headerRootLayout;
+    }
+
+    @Override
+    protected void showStreamDialog(final StreamInfoItem item) {
+        final Activity activity = getActivity();
+        final Context context = getContext();
+        if (context == null || context.getResources() == null || getActivity() == null) return;
+
+        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.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)
+        };
+
+        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;
+                }
+            }
+        };
+
+        new InfoItemDialog(getActivity(), item, commands, actions).show();
+    }
+    /*//////////////////////////////////////////////////////////////////////////
+    // Menu
+    //////////////////////////////////////////////////////////////////////////*/
+
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        super.onCreateOptionsMenu(menu, inflater);
+        ActionBar supportActionBar = activity.getSupportActionBar();
+        if(useAsFrontPage && supportActionBar != null) {
+            supportActionBar.setDisplayHomeAsUpEnabled(false);
+        } else {
+            inflater.inflate(R.menu.menu_channel, menu);
+
+            if (DEBUG) Log.d(TAG, "onCreateOptionsMenu() called with: menu = [" + menu +
+                    "], inflater = [" + inflater + "]");
+            menuRssButton = menu.findItem(R.id.menu_item_rss);
+        }
+    }
+
+    private void openRssFeed() {
+        final ChannelInfo info = currentInfo;
+        if(info != null) {
+            Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(info.getFeedUrl()));
+            startActivity(intent);
+        }
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.menu_item_rss:
+                openRssFeed();
+                break;
+            case R.id.menu_item_openInBrowser:
+                openUrlInBrowser(url);
+                break;
+            case R.id.menu_item_share:
+                shareUrl(name, url);
+                break;
+            default:
+                return super.onOptionsItemSelected(item);
+        }
+        return true;
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Channel Subscription
+    //////////////////////////////////////////////////////////////////////////*/
+
+    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 {
+                animateView(headerSubscribeButton, false, 100);
+                showSnackBarError(throwable, UserAction.SUBSCRIPTION, NewPipe.getNameOfService(currentInfo.getServiceId()), "Get subscription status", 0);
+            }
+        };
+
+        final Observable<List<SubscriptionEntity>> observable = subscriptionService.subscriptionTable()
+                .getSubscription(info.getServiceId(), info.getUrl())
+                .toObservable();
+
+        disposables.add(observable
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(getSubscribeUpdateMonitor(info), onError));
+
+        disposables.add(observable
+                // Some updates are very rapid (when calling the updateSubscription(info), for example)
+                // 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));
+
+    }
+
+    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;
+            }
+        };
+    }
+
+    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;
+            }
+        };
+    }
+
+    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 {
+                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);
+            }
+        };
+
+        disposables.add(subscriptionService.updateChannelInfo(info)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(onComplete, onError));
+    }
+
+    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 {
+                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);
+            }
+        };
+
+        /* Emit clicks from main thread unto io thread */
+        return RxView.clicks(subscribeButton)
+                .subscribeOn(AndroidSchedulers.mainThread())
+                .observeOn(Schedulers.io())
+                .debounce(BUTTON_DEBOUNCE_INTERVAL, TimeUnit.MILLISECONDS) // Ignore rapid clicks
+                .map(action)
+                .subscribe(onNext, onError);
+    }
+
+    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();
+
+                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));
+                }
+            }
+        };
+    }
+
+    private void updateSubscribeButton(boolean isSubscribed) {
+        if (DEBUG) Log.d(TAG, "updateSubscribeButton() called with: isSubscribed = [" + isSubscribed + "]");
+
+        boolean isButtonVisible = headerSubscribeButton.getVisibility() == View.VISIBLE;
+        int backgroundDuration = isButtonVisible ? 300 : 0;
+        int textDuration = isButtonVisible ? 200 : 0;
+
+        int subscribeBackground = ContextCompat.getColor(activity, R.color.subscribe_background_color);
+        int subscribeText = ContextCompat.getColor(activity, R.color.subscribe_text_color);
+        int subscribedBackground = ContextCompat.getColor(activity, R.color.subscribed_background_color);
+        int subscribedText = ContextCompat.getColor(activity, R.color.subscribed_text_color);
+
+        if (!isSubscribed) {
+            headerSubscribeButton.setText(R.string.subscribe_button_title);
+            animateBackgroundColor(headerSubscribeButton, backgroundDuration, subscribedBackground, subscribeBackground);
+            animateTextColor(headerSubscribeButton, textDuration, subscribedText, subscribeText);
+        } else {
+            headerSubscribeButton.setText(R.string.subscribed_button_title);
+            animateBackgroundColor(headerSubscribeButton, backgroundDuration, subscribeBackground, subscribedBackground);
+            animateTextColor(headerSubscribeButton, textDuration, subscribeText, subscribedText);
+        }
+
+        animateView(headerSubscribeButton, AnimationUtils.Type.LIGHT_SCALE_AND_ALPHA, true, 100);
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Load and handle
+    //////////////////////////////////////////////////////////////////////////*/
+
+    @Override
+    protected Single<ListExtractor.InfoItemsPage> loadMoreItemsLogic() {
+        return ExtractorHelper.getMoreChannelItems(serviceId, url, currentNextPageUrl);
+    }
+
+    @Override
+    protected Single<ChannelInfo> loadResult(boolean forceLoad) {
+        return ExtractorHelper.getChannelInfo(serviceId, url, forceLoad);
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Contract
+    //////////////////////////////////////////////////////////////////////////*/
+
+    @Override
+    public void showLoading() {
+        super.showLoading();
+
+        imageLoader.cancelDisplayTask(headerChannelBanner);
+        imageLoader.cancelDisplayTask(headerAvatarView);
+        animateView(headerSubscribeButton, false, 100);
+    }
+
+    @Override
+    public void handleResult(@NonNull ChannelInfo result) {
+        super.handleResult(result);
+
+        headerRootLayout.setVisibility(View.VISIBLE);
+        imageLoader.displayImage(result.getBannerUrl(), headerChannelBanner,
+        		ImageDisplayConstants.DISPLAY_BANNER_OPTIONS);
+        imageLoader.displayImage(result.getAvatarUrl(), headerAvatarView,
+        		ImageDisplayConstants.DISPLAY_AVATAR_OPTIONS);
+
+        if (result.getSubscriberCount() != -1) {
+            headerSubscribersTextView.setText(Localization.localizeSubscribersCount(activity, result.getSubscriberCount()));
+            headerSubscribersTextView.setVisibility(View.VISIBLE);
+        } else headerSubscribersTextView.setVisibility(View.GONE);
+
+        if (menuRssButton != null) menuRssButton.setVisible(!TextUtils.isEmpty(result.getFeedUrl()));
+
+        playlistCtrl.setVisibility(View.VISIBLE);
+
+        if (!result.getErrors().isEmpty()) {
+            showSnackBarError(result.getErrors(), UserAction.REQUESTED_CHANNEL, NewPipe.getNameOfService(result.getServiceId()), result.getUrl(), 0);
+        }
+
+        if (disposables != null) disposables.clear();
+        if (subscribeButtonMonitor != null) subscribeButtonMonitor.dispose();
+        updateSubscription(result);
+        monitorSubscription(result);
+
+        headerPlayAllButton.setOnClickListener(
+                view -> NavigationHelper.playOnMainPlayer(activity, getPlayQueue()));
+        headerPopupButton.setOnClickListener(
+                view -> NavigationHelper.playOnPopupPlayer(activity, getPlayQueue()));
+        headerBackgroundButton.setOnClickListener(
+                view -> NavigationHelper.playOnBackgroundPlayer(activity, getPlayQueue()));
+    }
+
+    private PlayQueue getPlayQueue() {
+        return getPlayQueue(0);
+    }
+
+    private PlayQueue getPlayQueue(final int index) {
+        final List<StreamInfoItem> streamItems = new ArrayList<>();
+        for(InfoItem i : infoListAdapter.getItemsList()) {
+            if(i instanceof StreamInfoItem) {
+                streamItems.add((StreamInfoItem) i);
+            }
+        }
+        return new ChannelPlayQueue(
+                currentInfo.getServiceId(),
+                currentInfo.getUrl(),
+                currentInfo.getNextPageUrl(),
+                streamItems,
+                index
+        );
+    }
+
+    @Override
+    public void handleNextItems(ListExtractor.InfoItemsPage result) {
+        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);
+        }
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // OnError
+    //////////////////////////////////////////////////////////////////////////*/
+
+    @Override
+    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.REQUESTED_CHANNEL, NewPipe.getNameOfService(serviceId), url, errorId);
+        return true;
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Utils
+    //////////////////////////////////////////////////////////////////////////*/
+
+    @Override
+    public void setTitle(String title) {
+        super.setTitle(title);
+        headerTitleView.setText(title);
+    }
+}

app/src/main/java/org/schabi/newpipe/fragments/list/kiosk/KioskFragment.java

@@ -0,0 +1,186 @@
+package org.schabi.newpipe.fragments.list.kiosk;
+
+import android.os.Bundle;
+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.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;
+
+import static org.schabi.newpipe.util.AnimationUtils.animateView;
+
+/**
+ * Created by Christian Schabesberger on 23.09.17.
+ *
+ * Copyright (C) Christian Schabesberger 2017 <chris.schabesberger@mailbox.org>
+ * KioskFragment.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 KioskFragment extends BaseListInfoFragment<KioskInfo> {
+
+    @State
+    protected String kioskId = "";
+    protected String kioskTranslatedName;
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Views
+    //////////////////////////////////////////////////////////////////////////*/
+
+    public static KioskFragment getInstance(int serviceId)
+            throws ExtractionException {
+        return getInstance(serviceId, NewPipe.getService(serviceId)
+                .getKioskList()
+                .getDefaultKioskId());
+    }
+
+    public static KioskFragment getInstance(int serviceId, String kioskId)
+            throws ExtractionException {
+        KioskFragment instance = new KioskFragment();
+        StreamingService service = NewPipe.getService(serviceId);
+        UrlIdHandler kioskTypeUrlIdHandler = service.getKioskList()
+                .getUrlIdHandlerByType(kioskId);
+        instance.setInitialData(serviceId,
+                kioskTypeUrlIdHandler.getUrl(kioskId),
+                kioskId);
+        instance.kioskId = kioskId;
+        return instance;
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // LifeCycle
+    //////////////////////////////////////////////////////////////////////////*/
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        kioskTranslatedName = KioskTranslator.getTranslatedKioskName(kioskId, activity);
+        name = kioskTranslatedName;
+    }
+
+    @Override
+    public void setUserVisibleHint(boolean isVisibleToUser) {
+        super.setUserVisibleHint(isVisibleToUser);
+        if(useAsFrontPage && isVisibleToUser && activity != null) {
+            try {
+                setTitle(kioskTranslatedName);
+            } catch (Exception e) {
+                onUnrecoverableError(e, UserAction.UI_ERROR,
+                        "none",
+                        "none", R.string.app_ui_crash);
+            }
+        }
+    }
+
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        return inflater.inflate(R.layout.fragment_kiosk, container, false);
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Menu
+    //////////////////////////////////////////////////////////////////////////*/
+
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        super.onCreateOptionsMenu(menu, inflater);
+        ActionBar supportActionBar = activity.getSupportActionBar();
+        if (supportActionBar != null && useAsFrontPage) {
+            supportActionBar.setDisplayHomeAsUpEnabled(false);
+        }
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Load and handle
+    //////////////////////////////////////////////////////////////////////////*/
+
+    @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);
+    }
+
+    @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);
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Contract
+    //////////////////////////////////////////////////////////////////////////*/
+
+    @Override
+    public void showLoading() {
+        super.showLoading();
+        animateView(itemsList, false, 100);
+    }
+
+    @Override
+    public void handleResult(@NonNull final KioskInfo result) {
+        super.handleResult(result);
+
+        name = kioskTranslatedName;
+        setTitle(kioskTranslatedName);
+
+        if (!result.getErrors().isEmpty()) {
+            showSnackBarError(result.getErrors(),
+                    UserAction.REQUESTED_KIOSK,
+                    NewPipe.getNameOfService(result.getServiceId()), result.getUrl(), 0);
+        }
+    }
+
+    @Override
+    public void handleNextItems(ListExtractor.InfoItemsPage result) {
+        super.handleNextItems(result);
+
+        if (!result.getErrors().isEmpty()) {
+            showSnackBarError(result.getErrors(),
+                    UserAction.REQUESTED_PLAYLIST, NewPipe.getNameOfService(serviceId)
+                    , "Get next page of: " + url, 0);
+        }
+    }
+}

app/src/main/java/org/schabi/newpipe/fragments/list/playlist/PlaylistFragment.java

@@ -0,0 +1,419 @@
+package org.schabi.newpipe.fragments.list.playlist;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.text.TextUtils;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import org.reactivestreams.Subscriber;
+import org.reactivestreams.Subscription;
+import org.schabi.newpipe.NewPipeDatabase;
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.database.playlist.model.PlaylistRemoteEntity;
+import org.schabi.newpipe.extractor.InfoItem;
+import org.schabi.newpipe.extractor.ListExtractor;
+import org.schabi.newpipe.extractor.NewPipe;
+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.player.playqueue.PlayQueue;
+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.ImageDisplayConstants;
+import org.schabi.newpipe.util.NavigationHelper;
+import org.schabi.newpipe.util.ThemeHelper;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import io.reactivex.Single;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.disposables.CompositeDisposable;
+import io.reactivex.disposables.Disposable;
+import io.reactivex.disposables.Disposables;
+
+import static org.schabi.newpipe.util.AnimationUtils.animateView;
+
+public class PlaylistFragment extends BaseListInfoFragment<PlaylistInfo> {
+
+    private CompositeDisposable disposables;
+    private Subscription bookmarkReactor;
+    private AtomicBoolean isBookmarkButtonReady;
+
+    private RemotePlaylistManager remotePlaylistManager;
+    private PlaylistRemoteEntity playlistEntity;
+    /*//////////////////////////////////////////////////////////////////////////
+    // Views
+    //////////////////////////////////////////////////////////////////////////*/
+
+    private View headerRootLayout;
+    private TextView headerTitleView;
+    private View headerUploaderLayout;
+    private TextView headerUploaderName;
+    private ImageView headerUploaderAvatar;
+    private TextView headerStreamCount;
+    private View playlistCtrl;
+
+    private View headerPlayAllButton;
+    private View headerPopupButton;
+    private View headerBackgroundButton;
+
+    private MenuItem playlistBookmarkButton;
+
+    public static PlaylistFragment getInstance(int serviceId, String url, String name) {
+        PlaylistFragment instance = new PlaylistFragment();
+        instance.setInitialData(serviceId, url, name);
+        return instance;
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // LifeCycle
+    //////////////////////////////////////////////////////////////////////////*/
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        disposables = new CompositeDisposable();
+        isBookmarkButtonReady = new AtomicBoolean(false);
+        remotePlaylistManager = new RemotePlaylistManager(NewPipeDatabase.getInstance(getContext()));
+    }
+
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container,
+                             @Nullable Bundle savedInstanceState) {
+        return inflater.inflate(R.layout.fragment_playlist, container, false);
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Init
+    //////////////////////////////////////////////////////////////////////////*/
+
+    protected View getListHeader() {
+        headerRootLayout = activity.getLayoutInflater().inflate(R.layout.playlist_header, itemsList, false);
+        headerTitleView = headerRootLayout.findViewById(R.id.playlist_title_view);
+        headerUploaderLayout = headerRootLayout.findViewById(R.id.uploader_layout);
+        headerUploaderName = headerRootLayout.findViewById(R.id.uploader_name);
+        headerUploaderAvatar = headerRootLayout.findViewById(R.id.uploader_avatar_view);
+        headerStreamCount = headerRootLayout.findViewById(R.id.playlist_stream_count);
+        playlistCtrl = headerRootLayout.findViewById(R.id.playlist_control);
+
+        headerPlayAllButton = headerRootLayout.findViewById(R.id.playlist_ctrl_play_all_button);
+        headerPopupButton = headerRootLayout.findViewById(R.id.playlist_ctrl_play_popup_button);
+        headerBackgroundButton = headerRootLayout.findViewById(R.id.playlist_ctrl_play_bg_button);
+
+
+        return headerRootLayout;
+    }
+
+    @Override
+    protected void initViews(View rootView, Bundle savedInstanceState) {
+        super.initViews(rootView, savedInstanceState);
+
+        infoListAdapter.useMiniItemVariants(true);
+    }
+
+    @Override
+    protected void showStreamDialog(final StreamInfoItem item) {
+        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.enqueue_on_background),
+                context.getResources().getString(R.string.enqueue_on_popup),
+                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),
+        };
+
+        final DialogInterface.OnClickListener actions = (dialogInterface, 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;
+                default:
+                    break;
+            }
+        };
+
+        new InfoItemDialog(getActivity(), item, commands, actions).show();
+    }
+
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        if (DEBUG) Log.d(TAG, "onCreateOptionsMenu() called with: menu = [" + menu +
+                "], inflater = [" + inflater + "]");
+        super.onCreateOptionsMenu(menu, inflater);
+        inflater.inflate(R.menu.menu_playlist, menu);
+
+        playlistBookmarkButton = menu.findItem(R.id.menu_item_bookmark);
+        updateBookmarkButtons();
+    }
+
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        if (isBookmarkButtonReady != null) isBookmarkButtonReady.set(false);
+
+        if (disposables != null) disposables.clear();
+        if (bookmarkReactor != null) bookmarkReactor.cancel();
+
+        bookmarkReactor = null;
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+
+        if (disposables != null) disposables.dispose();
+
+        disposables = null;
+        remotePlaylistManager = null;
+        playlistEntity = null;
+        isBookmarkButtonReady = null;
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Load and handle
+    //////////////////////////////////////////////////////////////////////////*/
+
+    @Override
+    protected Single<ListExtractor.InfoItemsPage> loadMoreItemsLogic() {
+        return ExtractorHelper.getMorePlaylistItems(serviceId, url, currentNextPageUrl);
+    }
+
+    @Override
+    protected Single<PlaylistInfo> loadResult(boolean forceLoad) {
+        return ExtractorHelper.getPlaylistInfo(serviceId, url, forceLoad);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.menu_item_openInBrowser:
+                openUrlInBrowser(url);
+                break;
+            case R.id.menu_item_share:
+                shareUrl(name, url);
+                break;
+            case R.id.menu_item_bookmark:
+                onBookmarkClicked();
+                break;
+            default:
+                return super.onOptionsItemSelected(item);
+        }
+        return true;
+    }
+
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Contract
+    //////////////////////////////////////////////////////////////////////////*/
+
+    @Override
+    public void showLoading() {
+        super.showLoading();
+        animateView(headerRootLayout, false, 200);
+        animateView(itemsList, false, 100);
+
+        imageLoader.cancelDisplayTask(headerUploaderAvatar);
+        animateView(headerUploaderLayout, false, 200);
+    }
+
+    @Override
+    public void handleResult(@NonNull final PlaylistInfo result) {
+        super.handleResult(result);
+
+        animateView(headerRootLayout, true, 100);
+        animateView(headerUploaderLayout, true, 300);
+        headerUploaderLayout.setOnClickListener(null);
+        if (!TextUtils.isEmpty(result.getUploaderName())) {
+            headerUploaderName.setText(result.getUploaderName());
+            if (!TextUtils.isEmpty(result.getUploaderUrl())) {
+                headerUploaderLayout.setOnClickListener(v ->
+                        NavigationHelper.openChannelFragment(getFragmentManager(),
+                                result.getServiceId(), result.getUploaderUrl(),
+                                result.getUploaderName())
+                );
+            }
+        }
+
+        playlistCtrl.setVisibility(View.VISIBLE);
+
+        imageLoader.displayImage(result.getUploaderAvatarUrl(), headerUploaderAvatar,
+                ImageDisplayConstants.DISPLAY_AVATAR_OPTIONS);
+        headerStreamCount.setText(getResources().getQuantityString(R.plurals.videos,
+                (int) result.getStreamCount(), (int) result.getStreamCount()));
+
+        if (!result.getErrors().isEmpty()) {
+            showSnackBarError(result.getErrors(), UserAction.REQUESTED_PLAYLIST, NewPipe.getNameOfService(result.getServiceId()), result.getUrl(), 0);
+        }
+
+        remotePlaylistManager.getPlaylist(result)
+                .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 ->
+                NavigationHelper.playOnPopupPlayer(activity, getPlayQueue()));
+        headerBackgroundButton.setOnClickListener(view ->
+                NavigationHelper.playOnBackgroundPlayer(activity, getPlayQueue()));
+    }
+
+    private PlayQueue getPlayQueue() {
+        return getPlayQueue(0);
+    }
+
+    private PlayQueue getPlayQueue(final int index) {
+        final List<StreamInfoItem> infoItems = new ArrayList<>();
+        for(InfoItem i : infoListAdapter.getItemsList()) {
+            if(i instanceof StreamInfoItem) {
+                infoItems.add((StreamInfoItem) i);
+            }
+        }
+        return new PlaylistPlayQueue(
+                currentInfo.getServiceId(),
+                currentInfo.getUrl(),
+                currentInfo.getNextPageUrl(),
+                infoItems,
+                index
+        );
+    }
+
+    @Override
+    public void handleNextItems(ListExtractor.InfoItemsPage result) {
+        super.handleNextItems(result);
+
+        if (!result.getErrors().isEmpty()) {
+            showSnackBarError(result.getErrors(), UserAction.REQUESTED_PLAYLIST, NewPipe.getNameOfService(serviceId)
+                    , "Get next page of: " + url, 0);
+        }
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // OnError
+    //////////////////////////////////////////////////////////////////////////*/
+
+    @Override
+    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.REQUESTED_PLAYLIST, NewPipe.getNameOfService(serviceId), url, errorId);
+        return true;
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Utils
+    //////////////////////////////////////////////////////////////////////////*/
+
+    private Subscriber<List<PlaylistRemoteEntity>> getPlaylistBookmarkSubscriber() {
+        return new Subscriber<List<PlaylistRemoteEntity>>() {
+            @Override
+            public void onSubscribe(Subscription s) {
+                if (bookmarkReactor != null) bookmarkReactor.cancel();
+                bookmarkReactor = s;
+                bookmarkReactor.request(1);
+            }
+
+            @Override
+            public void onNext(List<PlaylistRemoteEntity> playlist) {
+                playlistEntity = playlist.isEmpty() ? null : playlist.get(0);
+
+                updateBookmarkButtons();
+                isBookmarkButtonReady.set(true);
+
+                if (bookmarkReactor != null) bookmarkReactor.request(1);
+            }
+
+            @Override
+            public void onError(Throwable t) {
+                PlaylistFragment.this.onError(t);
+            }
+
+            @Override
+            public void onComplete() {
+
+            }
+        };
+    }
+
+    @Override
+    public void setTitle(String title) {
+        super.setTitle(title);
+        headerTitleView.setText(title);
+    }
+
+    private void onBookmarkClicked() {
+        if (isBookmarkButtonReady == null || !isBookmarkButtonReady.get() ||
+                remotePlaylistManager == null)
+            return;
+
+        final Disposable action;
+
+        if (currentInfo != null && playlistEntity == null) {
+            action = remotePlaylistManager.onBookmark(currentInfo)
+                    .observeOn(AndroidSchedulers.mainThread())
+                    .subscribe(ignored -> {/* Do nothing */}, this::onError);
+        } else if (playlistEntity != null) {
+            action = remotePlaylistManager.deletePlaylist(playlistEntity.getUid())
+                    .observeOn(AndroidSchedulers.mainThread())
+                    .doFinally(() -> playlistEntity = null)
+                    .subscribe(ignored -> {/* Do nothing */}, this::onError);
+        } else {
+            action = Disposables.empty();
+        }
+
+        disposables.add(action);
+    }
+
+    private void updateBookmarkButtons() {
+        if (playlistBookmarkButton == null || activity == null) return;
+
+        final int iconAttr = playlistEntity == null ?
+                R.attr.ic_playlist_add : R.attr.ic_playlist_check;
+
+        final int titleRes = playlistEntity == null ?
+                R.string.bookmark_playlist : R.string.unbookmark_playlist;
+
+        playlistBookmarkButton.setIcon(ThemeHelper.resolveResourceIdFromAttr(activity, iconAttr));
+        playlistBookmarkButton.setTitle(titleRes);
+    }
+}

app/src/main/java/org/schabi/newpipe/fragments/list/search/SearchFragment.java

@@ -0,0 +1,848 @@
+package org.schabi.newpipe.fragments.list.search;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.os.Bundle;
+import android.preference.PreferenceManager;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.v7.app.ActionBar;
+import android.support.v7.app.AlertDialog;
+import android.support.v7.widget.RecyclerView;
+import android.support.v7.widget.TooltipCompat;
+import android.text.Editable;
+import android.text.TextUtils;
+import android.text.TextWatcher;
+import android.util.Log;
+import android.view.KeyEvent;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.animation.DecelerateInterpolator;
+import android.view.inputmethod.EditorInfo;
+import android.view.inputmethod.InputMethodManager;
+import android.widget.EditText;
+import android.widget.TextView;
+
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.ReCaptchaActivity;
+import org.schabi.newpipe.database.history.model.SearchHistoryEntry;
+import org.schabi.newpipe.extractor.InfoItem;
+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.fragments.BackPressable;
+import org.schabi.newpipe.fragments.list.BaseListFragment;
+import org.schabi.newpipe.local.history.HistoryRecordManager;
+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 java.io.IOException;
+import java.io.InterruptedIOException;
+import java.net.SocketException;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Queue;
+import java.util.concurrent.Callable;
+import java.util.concurrent.TimeUnit;
+
+import icepick.State;
+import io.reactivex.Flowable;
+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 org.schabi.newpipe.util.AnimationUtils.animateView;
+
+public class SearchFragment
+        extends BaseListFragment<SearchResult, ListExtractor.InfoItemsPage>
+        implements BackPressable {
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Search
+    //////////////////////////////////////////////////////////////////////////*/
+
+    /**
+     * The suggestions will only be fetched from network if the query meet this threshold (>=).
+     * (local ones will be fetched regardless of the length)
+     */
+    private static final int THRESHOLD_NETWORK_SUGGESTION = 1;
+
+    /**
+     * How much time have to pass without emitting a item (i.e. the user stop typing) to fetch/show the suggestions, in milliseconds.
+     */
+    private static final int SUGGESTIONS_DEBOUNCE = 120; //ms
+
+    @State
+    protected int filterItemCheckedId = -1;
+    private SearchEngine.Filter filter = SearchEngine.Filter.ANY;
+
+    @State
+    protected int serviceId = Constants.NO_SERVICE_ID;
+    @State
+    protected String searchQuery;
+    @State
+    protected String lastSearchedQuery;
+    @State
+    protected boolean wasSearchFocused = false;
+
+    private int currentPage = 0;
+    private int currentNextPage = 0;
+    private String contentCountry;
+    private boolean isSuggestionsEnabled = true;
+    private boolean isSearchHistoryEnabled = true;
+
+    private PublishSubject<String> suggestionPublisher = PublishSubject.create();
+    private Disposable searchDisposable;
+    private Disposable suggestionDisposable;
+    private CompositeDisposable disposables = new CompositeDisposable();
+
+    private SuggestionListAdapter suggestionListAdapter;
+    private HistoryRecordManager historyRecordManager;
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Views
+    //////////////////////////////////////////////////////////////////////////*/
+
+    private View searchToolbarContainer;
+    private EditText searchEditText;
+    private View searchClear;
+
+    private View suggestionsPanel;
+    private RecyclerView suggestionsRecyclerView;
+
+    /*////////////////////////////////////////////////////////////////////////*/
+
+    public static SearchFragment getInstance(int serviceId, String query) {
+        SearchFragment searchFragment = new SearchFragment();
+        searchFragment.setQuery(serviceId, query);
+
+        if (!TextUtils.isEmpty(query)) {
+            searchFragment.setSearchOnResume();
+        }
+
+        return searchFragment;
+    }
+
+    /**
+     * Set wasLoading to true so when the fragment onResume is called, the initial search is done.
+     */
+    private void setSearchOnResume() {
+        wasLoading.set(true);
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Fragment's LifeCycle
+    //////////////////////////////////////////////////////////////////////////*/
+
+    @Override
+    public void onAttach(Context context) {
+        super.onAttach(context);
+
+        suggestionListAdapter = new SuggestionListAdapter(activity);
+        SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(activity);
+        isSearchHistoryEnabled = preferences.getBoolean(getString(R.string.enable_search_history_key), true);
+        suggestionListAdapter.setShowSuggestionHistory(isSearchHistoryEnabled);
+
+        historyRecordManager = new HistoryRecordManager(context);
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(activity);
+        isSuggestionsEnabled = preferences.getBoolean(getString(R.string.show_search_suggestions_key), true);
+        contentCountry = preferences.getString(getString(R.string.content_country_key), getString(R.string.default_country_value));
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        return inflater.inflate(R.layout.fragment_search, container, false);
+    }
+
+    @Override
+    public void onViewCreated(View rootView, Bundle savedInstanceState) {
+        super.onViewCreated(rootView, savedInstanceState);
+        showSearchOnStart();
+        initSearchListeners();
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+
+        wasSearchFocused = searchEditText.hasFocus();
+
+        if (searchDisposable != null) searchDisposable.dispose();
+        if (suggestionDisposable != null) suggestionDisposable.dispose();
+        if (disposables != null) disposables.clear();
+        hideKeyboardSearch();
+    }
+
+    @Override
+    public void onResume() {
+        if (DEBUG) Log.d(TAG, "onResume() called");
+        super.onResume();
+
+        if (!TextUtils.isEmpty(searchQuery)) {
+            if (wasLoading.getAndSet(false)) {
+                if (currentNextPage > currentPage) loadMoreItems();
+                else search(searchQuery);
+            } else if (infoListAdapter.getItemsList().size() == 0) {
+                if (savedState == null) {
+                    search(searchQuery);
+                } else if (!isLoading.get() && !wasSearchFocused) {
+                    infoListAdapter.clearStreamItemList();
+                    showEmptyState();
+                }
+            }
+        }
+
+        if (suggestionDisposable == null || suggestionDisposable.isDisposed()) initSuggestionObserver();
+
+        if (TextUtils.isEmpty(searchQuery) || wasSearchFocused) {
+            showKeyboardSearch();
+            showSuggestionsPanel();
+        } else {
+            hideKeyboardSearch();
+            hideSuggestionsPanel();
+        }
+        wasSearchFocused = false;
+    }
+
+    @Override
+    public void onDestroyView() {
+        if (DEBUG) Log.d(TAG, "onDestroyView() called");
+        unsetSearchListeners();
+        super.onDestroyView();
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        if (searchDisposable != null) searchDisposable.dispose();
+        if (suggestionDisposable != null) suggestionDisposable.dispose();
+        if (disposables != null) disposables.clear();
+    }
+
+    @Override
+    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);
+                } else Log.e(TAG, "ReCaptcha failed");
+                break;
+
+            default:
+                Log.e(TAG, "Request code from activity not supported [" + requestCode + "]");
+                break;
+        }
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Init
+    //////////////////////////////////////////////////////////////////////////*/
+
+    @Override
+    protected void initViews(View rootView, Bundle savedInstanceState) {
+        super.initViews(rootView, savedInstanceState);
+        suggestionsPanel = rootView.findViewById(R.id.suggestions_panel);
+        suggestionsRecyclerView = rootView.findViewById(R.id.suggestions_list);
+        suggestionsRecyclerView.setAdapter(suggestionListAdapter);
+        suggestionsRecyclerView.setLayoutManager(new LayoutManagerSmoothScroller(activity));
+
+        searchToolbarContainer = activity.findViewById(R.id.toolbar_search_container);
+        searchEditText = searchToolbarContainer.findViewById(R.id.toolbar_search_edit_text);
+        searchClear = searchToolbarContainer.findViewById(R.id.toolbar_search_clear);
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // State Saving
+    //////////////////////////////////////////////////////////////////////////*/
+
+    @Override
+    public void writeTo(Queue<Object> objectsToSave) {
+        super.writeTo(objectsToSave);
+        objectsToSave.add(currentPage);
+        objectsToSave.add(currentNextPage);
+    }
+
+    @Override
+    public void readFrom(@NonNull Queue<Object> savedObjects) throws Exception {
+        super.readFrom(savedObjects);
+        currentPage = (int) savedObjects.poll();
+        currentNextPage = (int) savedObjects.poll();
+    }
+
+    @Override
+    public void onSaveInstanceState(Bundle bundle) {
+        searchQuery = searchEditText != null ? searchEditText.getText().toString() : searchQuery;
+        super.onSaveInstanceState(bundle);
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Init's
+    //////////////////////////////////////////////////////////////////////////*/
+
+    @Override
+    public void reloadContent() {
+        if (!TextUtils.isEmpty(searchQuery) || (searchEditText != null && !TextUtils.isEmpty(searchEditText.getText()))) {
+            search(!TextUtils.isEmpty(searchQuery) ? searchQuery : searchEditText.getText().toString());
+        } else {
+            if (searchEditText != null) {
+                searchEditText.setText("");
+                showKeyboardSearch();
+            }
+            animateView(errorPanelRoot, false, 200);
+        }
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Menu
+    //////////////////////////////////////////////////////////////////////////*/
+
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        super.onCreateOptionsMenu(menu, inflater);
+
+        ActionBar supportActionBar = activity.getSupportActionBar();
+        if (supportActionBar != null) {
+            supportActionBar.setDisplayShowTitleEnabled(false);
+            supportActionBar.setDisplayHomeAsUpEnabled(true);
+        }
+
+        inflater.inflate(R.menu.menu_search, menu);
+        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);
+        }
+    }
+
+    private void restoreFilterChecked(Menu menu, int itemId) {
+        if (itemId != -1) {
+            MenuItem item = menu.findItem(itemId);
+            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;
+        }
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Search
+    //////////////////////////////////////////////////////////////////////////*/
+
+    private TextWatcher textWatcher;
+
+    private void showSearchOnStart() {
+        if (DEBUG) Log.d(TAG, "showSearchOnStart() called, searchQuery → " + searchQuery+", lastSearchedQuery → " + lastSearchedQuery);
+        searchEditText.setText(searchQuery);
+
+        if (TextUtils.isEmpty(searchQuery) || 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();
+        } else {
+            searchToolbarContainer.setTranslationX(0);
+            searchToolbarContainer.setAlpha(1f);
+            searchToolbarContainer.setVisibility(View.VISIBLE);
+        }
+    }
+
+    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();
+            }
+        });
+
+        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.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();
+                }
+            }
+        });
+
+        suggestionListAdapter.setListener(new SuggestionListAdapter.OnSuggestionItemSelected() {
+            @Override
+            public void onSuggestionItemSelected(SuggestionItem item) {
+                search(item.query);
+                searchEditText.setText(item.query);
+            }
+
+            @Override
+            public void onSuggestionItemInserted(SuggestionItem item) {
+                searchEditText.setText(item.query);
+                searchEditText.setSelection(searchEditText.getText().length());
+            }
+
+            @Override
+            public void onSuggestionItemLongClick(SuggestionItem item) {
+                if (item.fromHistory) showDeleteSuggestionDialog(item);
+            }
+        });
+
+        if (textWatcher != null) searchEditText.removeTextChangedListener(textWatcher);
+        textWatcher = new TextWatcher() {
+            @Override
+            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+            }
+
+            @Override
+            public void onTextChanged(CharSequence s, int start, int before, int count) {
+            }
+
+            @Override
+            public void afterTextChanged(Editable s) {
+                String newText = searchEditText.getText().toString();
+                suggestionPublisher.onNext(newText);
+            }
+        };
+        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;
+            }
+        });
+
+        if (suggestionDisposable == null || suggestionDisposable.isDisposed()) initSuggestionObserver();
+    }
+
+    private void unsetSearchListeners() {
+        if (DEBUG) Log.d(TAG, "unsetSearchListeners() called");
+        searchClear.setOnClickListener(null);
+        searchClear.setOnLongClickListener(null);
+        searchEditText.setOnClickListener(null);
+        searchEditText.setOnFocusChangeListener(null);
+        searchEditText.setOnEditorActionListener(null);
+
+        if (textWatcher != null) searchEditText.removeTextChangedListener(textWatcher);
+        textWatcher = null;
+    }
+
+    private void showSuggestionsPanel() {
+        if (DEBUG) Log.d(TAG, "showSuggestionsPanel() called");
+        animateView(suggestionsPanel, AnimationUtils.Type.LIGHT_SLIDE_AND_ALPHA, true, 200);
+    }
+
+    private void hideSuggestionsPanel() {
+        if (DEBUG) Log.d(TAG, "hideSuggestionsPanel() called");
+        animateView(suggestionsPanel, AnimationUtils.Type.LIGHT_SLIDE_AND_ALPHA, false, 200);
+    }
+
+    private void showKeyboardSearch() {
+        if (DEBUG) Log.d(TAG, "showKeyboardSearch() called");
+        if (searchEditText == null) return;
+
+        if (searchEditText.requestFocus()) {
+            InputMethodManager imm = (InputMethodManager) activity.getSystemService(Context.INPUT_METHOD_SERVICE);
+            imm.showSoftInput(searchEditText, InputMethodManager.SHOW_IMPLICIT);
+        }
+    }
+
+    private void hideKeyboardSearch() {
+        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);
+
+        searchEditText.clearFocus();
+    }
+
+    private void showDeleteSuggestionDialog(final SuggestionItem item) {
+        if (activity == null || historyRecordManager == null || suggestionPublisher == null ||
+                searchEditText == null || disposables == null) return;
+        final String query = item.query;
+        new AlertDialog.Builder(activity)
+                .setTitle(query)
+                .setMessage(R.string.delete_item_search_history)
+                .setCancelable(true)
+                .setNegativeButton(R.string.cancel, null)
+                .setPositiveButton(R.string.delete, (dialog, which) -> {
+                    final Disposable onDelete = historyRecordManager.deleteSearchHistory(query)
+                            .observeOn(AndroidSchedulers.mainThread())
+                            .subscribe(
+                                    howManyDeleted -> suggestionPublisher
+                                            .onNext(searchEditText.getText().toString()),
+                                    throwable -> showSnackBarError(throwable,
+                                            UserAction.DELETE_FROM_HISTORY, "none",
+                                            "Deleting item failed", R.string.general_error)
+                            );
+                    disposables.add(onDelete);
+                })
+                .show();
+    }
+
+    @Override
+    public boolean onBackPressed() {
+        if (suggestionsPanel.getVisibility() == View.VISIBLE && infoListAdapter.getItemsList().size() > 0 && !isLoading.get()) {
+            hideSuggestionsPanel();
+            hideKeyboardSearch();
+            searchEditText.setText(lastSearchedQuery);
+            return true;
+        }
+        return false;
+    }
+
+    public void giveSearchEditTextFocus() {
+        showKeyboardSearch();
+    }
+
+    private void initSuggestionObserver() {
+        if (DEBUG) Log.d(TAG, "initSuggestionObserver() called");
+        if (suggestionDisposable != null) suggestionDisposable.dispose();
+
+        final Observable<String> observable = suggestionPublisher
+                .debounce(SUGGESTIONS_DEBOUNCE, TimeUnit.MILLISECONDS)
+                .startWith(searchQuery != null ? searchQuery : "")
+                .filter(query -> isSuggestionsEnabled);
+
+        suggestionDisposable = observable
+                .switchMap(query -> {
+                    final Flowable<List<SearchHistoryEntry>> flowable = historyRecordManager
+                            .getRelatedSearches(query, 3, 25);
+                    final Observable<List<SuggestionItem>> local = flowable.toObservable()
+                            .map(searchHistoryEntries -> {
+                                List<SuggestionItem> result = new ArrayList<>();
+                                for (SearchHistoryEntry entry : searchHistoryEntries)
+                                    result.add(new SuggestionItem(true, entry.getSearch()));
+                                return result;
+                            });
+
+                    if (query.length() < THRESHOLD_NETWORK_SUGGESTION) {
+                        // Only pass through if the query length is equal or greater than THRESHOLD_NETWORK_SUGGESTION
+                        return local.materialize();
+                    }
+
+                    final Observable<List<SuggestionItem>> network = ExtractorHelper
+                            .suggestionsFor(serviceId, query, contentCountry)
+                            .toObservable()
+                            .map(strings -> {
+                                List<SuggestionItem> result = new ArrayList<>();
+                                for (String entry : strings) {
+                                    result.add(new SuggestionItem(false, entry));
+                                }
+                                return result;
+                            });
+
+                    return Observable.zip(local, network, (localResult, networkResult) -> {
+                        List<SuggestionItem> result = new ArrayList<>();
+                        if (localResult.size() > 0) result.addAll(localResult);
+
+                        // Remove duplicates
+                        final Iterator<SuggestionItem> iterator = networkResult.iterator();
+                        while (iterator.hasNext() && localResult.size() > 0) {
+                            final SuggestionItem next = iterator.next();
+                            for (SuggestionItem item : localResult) {
+                                if (item.query.equals(next.query)) {
+                                    iterator.remove();
+                                    break;
+                                }
+                            }
+                        }
+
+                        if (networkResult.size() > 0) result.addAll(networkResult);
+                        return result;
+                    }).materialize();
+                })
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(listNotification -> {
+                    if (listNotification.isOnNext()) {
+                        handleSuggestions(listNotification.getValue());
+                    } else if (listNotification.isOnError()) {
+                        Throwable error = listNotification.getError();
+                        if (!ExtractorHelper.hasAssignableCauseThrowable(error,
+                                IOException.class, SocketException.class,
+                                InterruptedException.class, InterruptedIOException.class)) {
+                            onSuggestionError(error);
+                        }
+                    }
+                });
+    }
+
+    @Override
+    protected void doInitialLoadLogic() {
+        // no-op
+    }
+
+    private void search(final String query) {
+        if (DEBUG) Log.d(TAG, "search() called with: query = [" + query + "]");
+        if (query.isEmpty()) return;
+
+        try {
+            final StreamingService service = NewPipe.getServiceByUrl(query);
+            if (service != null) {
+                showLoading();
+                disposables.add(Observable
+                        .fromCallable(new Callable<Intent>() {
+                            @Override
+                            public Intent call() throws Exception {
+                                return NavigationHelper.getIntentByLink(activity, service, query);
+                            }
+                        })
+                        .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);
+                            }
+                        }));
+                return;
+            }
+        } catch (Exception e) {
+            // Exception occurred, it's not a url
+        }
+
+        lastSearchedQuery = query;
+        searchQuery = query;
+        currentPage = 0;
+        infoListAdapter.clearStreamItemList();
+        hideSuggestionsPanel();
+        hideKeyboardSearch();
+
+        historyRecordManager.onSearched(serviceId, query)
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(
+                        ignored -> {},
+                        error -> showSnackBarError(error, UserAction.SEARCHED,
+                                NewPipe.getNameOfService(serviceId), query, 0)
+                );
+        suggestionPublisher.onNext(query);
+        startLoading(false);
+    }
+
+    @Override
+    public void startLoading(boolean forceLoad) {
+        super.startLoading(forceLoad);
+        if (disposables != null) disposables.clear();
+        if (searchDisposable != null) searchDisposable.dispose();
+        searchDisposable = ExtractorHelper.searchFor(serviceId, searchQuery, currentPage, contentCountry, filter)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .doOnEvent((searchResult, throwable) -> isLoading.set(false))
+                .subscribe(this::handleResult, this::onError);
+    }
+
+    @Override
+    protected void loadMoreItems() {
+        isLoading.set(true);
+        showListFooter(true);
+        if (searchDisposable != null) searchDisposable.dispose();
+        currentNextPage = currentPage + 1;
+        searchDisposable = ExtractorHelper.getMoreSearchItems(serviceId, searchQuery, currentNextPage, contentCountry, filter)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .doOnEvent((nextItemsResult, throwable) -> isLoading.set(false))
+                .subscribe(this::handleNextItems, this::onError);
+    }
+
+    @Override
+    protected boolean hasMoreItems() {
+        // TODO: No way to tell if search has more items in the moment
+        return true;
+    }
+
+    @Override
+    protected void onItemSelected(InfoItem selectedItem) {
+        super.onItemSelected(selectedItem);
+        hideKeyboardSearch();
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Utils
+    //////////////////////////////////////////////////////////////////////////*/
+
+    private void changeFilter(MenuItem item, SearchEngine.Filter filter) {
+        this.filter = filter;
+        this.filterItemCheckedId = item.getItemId();
+        item.setChecked(true);
+
+        if (!TextUtils.isEmpty(searchQuery)) {
+            search(searchQuery);
+        }
+    }
+
+    private void setQuery(int serviceId, String searchQuery) {
+        this.serviceId = serviceId;
+        this.searchQuery = searchQuery;
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Suggestion Results
+    //////////////////////////////////////////////////////////////////////////*/
+
+    public void handleSuggestions(@NonNull final List<SuggestionItem> suggestions) {
+        if (DEBUG) Log.d(TAG, "handleSuggestions() called with: suggestions = [" + suggestions + "]");
+        suggestionsRecyclerView.smoothScrollToPosition(0);
+        suggestionsRecyclerView.post(() -> suggestionListAdapter.setItems(suggestions));
+
+        if (errorPanelRoot.getVisibility() == View.VISIBLE) {
+            hideLoading();
+        }
+    }
+
+    public void onSuggestionError(Throwable exception) {
+        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);
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Contract
+    //////////////////////////////////////////////////////////////////////////*/
+
+    @Override
+    public void hideLoading() {
+        super.hideLoading();
+        showListFooter(false);
+    }
+
+    @Override
+    public void showError(String message, boolean showRetryButton) {
+        super.showError(message, showRetryButton);
+        hideSuggestionsPanel();
+        hideKeyboardSearch();
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Search Results
+    //////////////////////////////////////////////////////////////////////////*/
+
+    @Override
+    public void handleResult(@NonNull SearchResult result) {
+        if (!result.errors.isEmpty()) {
+            showSnackBarError(result.errors, UserAction.SEARCHED, NewPipe.getNameOfService(serviceId), searchQuery, 0);
+        }
+
+        lastSearchedQuery = searchQuery;
+
+        if (infoListAdapter.getItemsList().size() == 0) {
+            if (!result.getResults().isEmpty()) {
+                infoListAdapter.addInfoItemList(result.getResults());
+            } else {
+                infoListAdapter.clearStreamItemList();
+                showEmptyState();
+                return;
+            }
+        }
+
+        super.handleResult(result);
+    }
+
+    @Override
+    public void handleNextItems(ListExtractor.InfoItemsPage result) {
+        showListFooter(false);
+        currentPage = Integer.parseInt(result.getNextPageUrl());
+        infoListAdapter.addInfoItemList(result.getItems());
+
+        if (!result.getErrors().isEmpty()) {
+            showSnackBarError(result.getErrors(), UserAction.SEARCHED, NewPipe.getNameOfService(serviceId)
+                    , "\"" + searchQuery + "\" → page " + currentPage, 0);
+        }
+        super.handleNextItems(result);
+    }
+
+    @Override
+    protected boolean onError(Throwable exception) {
+        if (super.onError(exception)) return true;
+
+        if (exception instanceof SearchEngine.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);
+        }
+
+        return true;
+    }
+}

app/src/main/java/org/schabi/newpipe/fragments/list/search/SuggestionItem.java

@@ -0,0 +1,16 @@
+package org.schabi.newpipe.fragments.list.search;
+
+public class SuggestionItem {
+    public final boolean fromHistory;
+    public final String query;
+
+    public SuggestionItem(boolean fromHistory, String query) {
+        this.fromHistory = fromHistory;
+        this.query = query;
+    }
+
+    @Override
+    public String toString() {
+        return "[" + fromHistory + "→" + query + "]";
+    }
+}

app/src/main/java/org/schabi/newpipe/fragments/list/search/SuggestionListAdapter.java

@@ -0,0 +1,125 @@
+package org.schabi.newpipe.fragments.list.search;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.support.annotation.AttrRes;
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import org.schabi.newpipe.R;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class SuggestionListAdapter extends RecyclerView.Adapter<SuggestionListAdapter.SuggestionItemHolder> {
+    private final ArrayList<SuggestionItem> items = new ArrayList<>();
+    private final Context context;
+    private OnSuggestionItemSelected listener;
+    private boolean showSuggestionHistory = true;
+
+    public interface OnSuggestionItemSelected {
+        void onSuggestionItemSelected(SuggestionItem item);
+        void onSuggestionItemInserted(SuggestionItem item);
+        void onSuggestionItemLongClick(SuggestionItem item);
+    }
+
+    public SuggestionListAdapter(Context context) {
+        this.context = context;
+    }
+
+    public void setItems(List<SuggestionItem> items) {
+        this.items.clear();
+        if (showSuggestionHistory) {
+            this.items.addAll(items);
+        } else {
+            // remove history items if history is disabled
+            for (SuggestionItem item : items) {
+                if (!item.fromHistory) {
+                    this.items.add(item);
+                }
+            }
+        }
+        notifyDataSetChanged();
+    }
+
+    public void setListener(OnSuggestionItemSelected listener) {
+        this.listener = listener;
+    }
+
+    public void setShowSuggestionHistory(boolean v) {
+        showSuggestionHistory = v;
+    }
+
+    @Override
+    public SuggestionItemHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+        return new SuggestionItemHolder(LayoutInflater.from(context).inflate(R.layout.item_search_suggestion, parent, false));
+    }
+
+    @Override
+    public void onBindViewHolder(SuggestionItemHolder holder, int position) {
+        final SuggestionItem currentItem = getItem(position);
+        holder.updateFrom(currentItem);
+        holder.queryView.setOnClickListener(v -> {
+            if (listener != null) listener.onSuggestionItemSelected(currentItem);
+        });
+        holder.queryView.setOnLongClickListener(v -> {
+                if (listener != null) listener.onSuggestionItemLongClick(currentItem);
+                return true;
+        });
+        holder.insertView.setOnClickListener(v -> {
+            if (listener != null) listener.onSuggestionItemInserted(currentItem);
+        });
+    }
+
+    private SuggestionItem getItem(int position) {
+        return items.get(position);
+    }
+
+    @Override
+    public int getItemCount() {
+        return items.size();
+    }
+
+    public boolean isEmpty() {
+        return getItemCount() == 0;
+    }
+
+    public static class SuggestionItemHolder extends RecyclerView.ViewHolder {
+        private final TextView itemSuggestionQuery;
+        private final ImageView suggestionIcon;
+        private final View queryView;
+        private final View insertView;
+
+        // Cache some ids, as they can potentially be constantly updated/recycled
+        private final int historyResId;
+        private final int searchResId;
+
+        private SuggestionItemHolder(View rootView) {
+            super(rootView);
+            suggestionIcon = rootView.findViewById(R.id.item_suggestion_icon);
+            itemSuggestionQuery = rootView.findViewById(R.id.item_suggestion_query);
+
+            queryView = rootView.findViewById(R.id.suggestion_search);
+            insertView = rootView.findViewById(R.id.suggestion_insert);
+
+            historyResId = resolveResourceIdFromAttr(rootView.getContext(), R.attr.history);
+            searchResId = resolveResourceIdFromAttr(rootView.getContext(), R.attr.search);
+        }
+
+        private void updateFrom(SuggestionItem item) {
+            suggestionIcon.setImageResource(item.fromHistory ? historyResId : searchResId);
+            itemSuggestionQuery.setText(item.query);
+        }
+
+        private static int resolveResourceIdFromAttr(Context context, @AttrRes int attr) {
+            TypedArray a = context.getTheme().obtainStyledAttributes(new int[]{attr});
+            int attributeResourceId = a.getResourceId(0, 0);
+            a.recycle();
+            return attributeResourceId;
+        }
+    }
+}

app/src/main/java/org/schabi/newpipe/fragments/search/OnScrollBelowItemsListener.java

@@ -1,33 +0,0 @@
-package org.schabi.newpipe.fragments.search;
-
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-
-/**
- * Recycler view scroll listener which calls the method {@link #onScrolledDown(RecyclerView)}
- * if the view is scrolled below the last item.
- */
-public abstract class OnScrollBelowItemsListener extends RecyclerView.OnScrollListener {
-
-    @Override
-    public void onScrolled(RecyclerView recyclerView, int dx, int dy) {
-        super.onScrolled(recyclerView, dx, dy);
-        //check for scroll down
-        if (dy > 0) {
-            int pastVisibleItems, visibleItemCount, totalItemCount;
-            LinearLayoutManager layoutManager = (LinearLayoutManager) recyclerView.getLayoutManager();
-            visibleItemCount = recyclerView.getLayoutManager().getChildCount();
-            totalItemCount = recyclerView.getLayoutManager().getItemCount();
-            pastVisibleItems = layoutManager.findFirstVisibleItemPosition();
-            if ((visibleItemCount + pastVisibleItems) >= totalItemCount) {
-                onScrolledDown(recyclerView);
-            }
-        }
-    }
-
-    /**
-     * Called when the recycler view is scrolled below the last item.
-     * @param recyclerView the recycler view
-     */
-    public abstract void onScrolledDown(RecyclerView recyclerView);
-}

app/src/main/java/org/schabi/newpipe/fragments/search/SearchFragment.java

@@ -1,615 +0,0 @@
-package org.schabi.newpipe.fragments.search;
-
-import android.app.Activity;
-import android.content.Context;
-import android.content.Intent;
-import android.os.Build;
-import android.os.Bundle;
-import android.preference.PreferenceManager;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.app.ActionBar;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.text.Editable;
-import android.text.TextUtils;
-import android.text.TextWatcher;
-import android.util.Log;
-import android.view.KeyEvent;
-import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.animation.DecelerateInterpolator;
-import android.view.inputmethod.EditorInfo;
-import android.view.inputmethod.InputMethodManager;
-import android.widget.AdapterView;
-import android.widget.AutoCompleteTextView;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import org.schabi.newpipe.R;
-import org.schabi.newpipe.ReCaptchaActivity;
-import org.schabi.newpipe.extractor.InfoItem;
-import org.schabi.newpipe.extractor.search.SearchEngine;
-import org.schabi.newpipe.extractor.search.SearchResult;
-import org.schabi.newpipe.fragments.BaseFragment;
-import org.schabi.newpipe.info_list.InfoItemBuilder;
-import org.schabi.newpipe.info_list.InfoListAdapter;
-import org.schabi.newpipe.util.Constants;
-import org.schabi.newpipe.util.NavigationHelper;
-import org.schabi.newpipe.workers.SearchWorker;
-import org.schabi.newpipe.workers.SuggestionWorker;
-
-import java.util.ArrayList;
-import java.util.EnumSet;
-import java.util.List;
-
-import static org.schabi.newpipe.util.AnimationUtils.animateView;
-
-public class SearchFragment extends BaseFragment implements SuggestionWorker.OnSuggestionResult, SearchWorker.OnSearchResult {
-    private final String TAG = "SearchFragment@" + Integer.toHexString(hashCode());
-    // savedInstanceBundle arguments
-    private static final String QUERY_KEY = "query_key";
-    private static final String PAGE_NUMBER_KEY = "page_number_key";
-    private static final String INFO_LIST_KEY = "info_list_key";
-    private static final String WAS_LOADING_KEY = "was_loading_key";
-    private static final String ERROR_KEY = "error_key";
-    private static final String FILTER_CHECKED_ID_KEY = "filter_checked_id_key";
-
-    /*//////////////////////////////////////////////////////////////////////////
-    // Search
-    //////////////////////////////////////////////////////////////////////////*/
-
-    private int filterItemCheckedId = -1;
-    private EnumSet<SearchEngine.Filter> filter = EnumSet.of(SearchEngine.Filter.CHANNEL, SearchEngine.Filter.STREAM);
-
-    private int serviceId = -1;
-    private String searchQuery = "";
-    private int pageNumber = 0;
-    private boolean showSuggestions = true;
-
-    private SearchWorker curSearchWorker;
-    private SuggestionWorker curSuggestionWorker;
-    private SuggestionListAdapter suggestionListAdapter;
-    private InfoListAdapter infoListAdapter;
-
-    /*//////////////////////////////////////////////////////////////////////////
-    // Views
-    //////////////////////////////////////////////////////////////////////////*/
-
-    private View searchToolbarContainer;
-    private AutoCompleteTextView searchEditText;
-    private View searchClear;
-
-    private RecyclerView resultRecyclerView;
-
-    /*////////////////////////////////////////////////////////////////////////*/
-
-    public static SearchFragment getInstance(int serviceId, String query) {
-        SearchFragment searchFragment = new SearchFragment();
-        searchFragment.setQuery(serviceId, query);
-        return searchFragment;
-    }
-
-    /*//////////////////////////////////////////////////////////////////////////
-    // Fragment's LifeCycle
-    //////////////////////////////////////////////////////////////////////////*/
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        if (DEBUG) Log.d(TAG, "onCreate() called with: savedInstanceState = [" + savedInstanceState + "]");
-        setHasOptionsMenu(true);
-        if (savedInstanceState != null) {
-            searchQuery = savedInstanceState.getString(QUERY_KEY);
-            serviceId = savedInstanceState.getInt(Constants.KEY_SERVICE_ID, 0);
-            pageNumber = savedInstanceState.getInt(PAGE_NUMBER_KEY, 0);
-            wasLoading.set(savedInstanceState.getBoolean(WAS_LOADING_KEY, false));
-            filterItemCheckedId = savedInstanceState.getInt(FILTER_CHECKED_ID_KEY, 0);
-        }
-    }
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        if (DEBUG) Log.d(TAG, "onCreateView() called with: inflater = [" + inflater + "], container = [" + container + "], savedInstanceState = [" + savedInstanceState + "]");
-        return inflater.inflate(R.layout.fragment_search, container, false);
-    }
-
-    @Override
-    public void onViewCreated(View rootView, @Nullable Bundle savedInstanceState) {
-        super.onViewCreated(rootView, savedInstanceState);
-        if (DEBUG) Log.d(TAG, "onViewCreated() called with: rootView = [" + rootView + "], savedInstanceState = [" + savedInstanceState + "]");
-
-        if (savedInstanceState != null && savedInstanceState.getBoolean(ERROR_KEY, false)) {
-            search(searchQuery, 0, true);
-        }
-
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        if (DEBUG) Log.d(TAG, "onResume() called");
-        if (wasLoading.getAndSet(false) && !TextUtils.isEmpty(searchQuery)) {
-            if (pageNumber > 0) search(searchQuery, pageNumber);
-            else search(searchQuery, 0, true);
-        }
-
-        showSuggestions = PreferenceManager.getDefaultSharedPreferences(activity).getBoolean(getString(R.string.show_search_suggestions_key), true);
-    }
-
-    @Override
-    public void onStop() {
-        super.onStop();
-        if (DEBUG) Log.d(TAG, "onStop() called");
-
-        hideSoftKeyboard(searchEditText);
-
-        wasLoading.set(curSearchWorker != null && curSearchWorker.isRunning());
-        if (curSearchWorker != null && curSearchWorker.isRunning()) curSearchWorker.cancel();
-        if (curSuggestionWorker != null && curSuggestionWorker.isRunning()) curSuggestionWorker.cancel();
-    }
-
-    @Override
-    public void onDestroyView() {
-        if (DEBUG) Log.d(TAG, "onDestroyView() called");
-        unsetSearchListeners();
-
-        resultRecyclerView.removeAllViews();
-
-        searchToolbarContainer = null;
-        searchEditText = null;
-        searchClear = null;
-
-        resultRecyclerView = null;
-
-        super.onDestroyView();
-    }
-
-    @Override
-    public void onSaveInstanceState(Bundle outState) {
-        super.onSaveInstanceState(outState);
-        if (DEBUG) Log.d(TAG, "onSaveInstanceState() called with: outState = [" + outState + "]");
-
-        String query = searchEditText != null && !TextUtils.isEmpty(searchEditText.getText().toString())
-                ? searchEditText.getText().toString() : searchQuery;
-        outState.putString(QUERY_KEY, query);
-        outState.putInt(Constants.KEY_SERVICE_ID, serviceId);
-        outState.putInt(PAGE_NUMBER_KEY, pageNumber);
-        outState.putSerializable(INFO_LIST_KEY, ((ArrayList<InfoItem>) infoListAdapter.getItemsList()));
-        outState.putBoolean(WAS_LOADING_KEY, curSearchWorker != null && curSearchWorker.isRunning());
-
-        if (errorPanel != null && errorPanel.getVisibility() == View.VISIBLE) outState.putBoolean(ERROR_KEY, true);
-        if (filterItemCheckedId != -1) outState.putInt(FILTER_CHECKED_ID_KEY, filterItemCheckedId);
-    }
-
-    @Override
-    public void onActivityResult(int requestCode, int resultCode, Intent data) {
-        switch (requestCode) {
-            case ReCaptchaActivity.RECAPTCHA_REQUEST:
-                if (resultCode == Activity.RESULT_OK && searchQuery.length() != 0) {
-                    search(searchQuery, pageNumber, true);
-                } else Log.e(TAG, "ReCaptcha failed");
-                break;
-
-            default:
-                Log.e(TAG, "Request code from activity not supported [" + requestCode + "]");
-                break;
-        }
-    }
-
-    /*//////////////////////////////////////////////////////////////////////////
-    // Init's
-    //////////////////////////////////////////////////////////////////////////*/
-
-    @Override
-    protected void initViews(View rootView, Bundle savedInstanceState) {
-        super.initViews(rootView, savedInstanceState);
-        resultRecyclerView = ((RecyclerView) rootView.findViewById(R.id.result_list_view));
-        resultRecyclerView.setLayoutManager(new LinearLayoutManager(activity));
-
-        if (infoListAdapter == null) {
-            infoListAdapter = new InfoListAdapter(getActivity());
-            if (savedInstanceState != null) {
-                //noinspection unchecked
-                ArrayList<InfoItem> serializable = (ArrayList<InfoItem>) savedInstanceState.getSerializable(INFO_LIST_KEY);
-                infoListAdapter.addInfoItemList(serializable);
-            }
-
-            infoListAdapter.setFooter(activity.getLayoutInflater().inflate(R.layout.pignate_footer, resultRecyclerView, false));
-            infoListAdapter.showFooter(false);
-            infoListAdapter.setOnStreamInfoItemSelectedListener(new InfoItemBuilder.OnInfoItemSelectedListener() {
-                @Override
-                public void selected(int serviceId, String url, String title) {
-                    NavigationHelper.openVideoDetailFragment(getFragmentManager(), serviceId, url, title);
-                }
-            });
-            infoListAdapter.setOnChannelInfoItemSelectedListener(new InfoItemBuilder.OnInfoItemSelectedListener() {
-                @Override
-                public void selected(int serviceId, String url, String title) {
-                    NavigationHelper.openChannelFragment(getFragmentManager(), serviceId, url, title);
-                }
-            });
-        }
-
-        resultRecyclerView.setAdapter(infoListAdapter);
-    }
-
-    @Override
-    protected void initListeners() {
-        super.initListeners();
-        resultRecyclerView.clearOnScrollListeners();
-        resultRecyclerView.addOnScrollListener(new OnScrollBelowItemsListener() {
-            @Override
-            public void onScrolledDown(RecyclerView recyclerView) {
-                if(!isLoading.get()) {
-                    pageNumber++;
-                    recyclerView.post(new Runnable() {
-                        @Override
-                        public void run() {
-                            infoListAdapter.showFooter(true);
-                        }
-                    });
-                    search(searchQuery, pageNumber);
-                }
-            }
-        });
-    }
-
-
-    @Override
-    protected void reloadContent() {
-        if (DEBUG) Log.d(TAG, "reloadContent() called");
-        if (!TextUtils.isEmpty(searchQuery) || (searchEditText != null && !TextUtils.isEmpty(searchEditText.getText()))) {
-            search(!TextUtils.isEmpty(searchQuery) ? searchQuery : searchEditText.getText().toString(), 0, true);
-        } else {
-            if (searchEditText != null) {
-                searchEditText.setText("");
-                showSoftKeyboard(searchEditText);
-            }
-            animateView(errorPanel, false, 200);
-        }
-    }
-
-    /*//////////////////////////////////////////////////////////////////////////
-    // Menu
-    //////////////////////////////////////////////////////////////////////////*/
-
-    @Override
-    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-        super.onCreateOptionsMenu(menu, inflater);
-        if (DEBUG) Log.d(TAG, "onCreateOptionsMenu() called with: menu = [" + menu + "], inflater = [" + inflater + "]");
-        inflater.inflate(R.menu.search_menu, menu);
-
-        ActionBar supportActionBar = activity.getSupportActionBar();
-        if (supportActionBar != null) {
-            supportActionBar.setDisplayShowTitleEnabled(false);
-            supportActionBar.setDisplayHomeAsUpEnabled(true);
-        }
-
-        searchToolbarContainer = activity.findViewById(R.id.toolbar_search_container);
-        searchEditText = (AutoCompleteTextView) searchToolbarContainer.findViewById(R.id.toolbar_search_edit_text);
-        searchClear = searchToolbarContainer.findViewById(R.id.toolbar_search_clear);
-        setupSearchView();
-
-        restoreFilterChecked(menu, filterItemCheckedId);
-    }
-
-    private void restoreFilterChecked(Menu menu, int itemId) {
-        if (itemId != -1) {
-            MenuItem item = menu.findItem(itemId);
-            if (item == null) return;
-
-            item.setChecked(true);
-            switch (itemId) {
-                case R.id.menu_filter_all:
-                    filter = EnumSet.of(SearchEngine.Filter.STREAM, SearchEngine.Filter.CHANNEL);
-                    break;
-                case R.id.menu_filter_video:
-                    filter = EnumSet.of(SearchEngine.Filter.STREAM);
-                    break;
-                case R.id.menu_filter_channel:
-                    filter = EnumSet.of(SearchEngine.Filter.CHANNEL);
-                    break;
-            }
-        }
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        if (DEBUG) Log.d(TAG, "onOptionsItemSelected() called with: item = [" + item + "]");
-
-        switch (item.getItemId()) {
-            case R.id.menu_filter_all:
-                changeFilter(item, EnumSet.of(SearchEngine.Filter.STREAM, SearchEngine.Filter.CHANNEL));
-                return true;
-            case R.id.menu_filter_video:
-                changeFilter(item, EnumSet.of(SearchEngine.Filter.STREAM));
-                return true;
-            case R.id.menu_filter_channel:
-                changeFilter(item, EnumSet.of(SearchEngine.Filter.CHANNEL));
-                return true;
-            default:
-                return false;
-        }
-    }
-
-    /*//////////////////////////////////////////////////////////////////////////
-    // Search
-    //////////////////////////////////////////////////////////////////////////*/
-
-    private TextWatcher textWatcher;
-
-    private void setupSearchView() {
-        searchEditText.setText(searchQuery != null ? searchQuery : "");
-        searchEditText.setHint(getString(R.string.search) + "...");
-        ////searchEditText.setCursorVisible(true);
-
-        suggestionListAdapter = new SuggestionListAdapter(activity);
-        searchEditText.setAdapter(suggestionListAdapter);
-
-
-        if (TextUtils.isEmpty(searchQuery) || TextUtils.isEmpty(searchEditText.getText())) {
-            searchToolbarContainer.setTranslationX(100);
-            searchToolbarContainer.setAlpha(0f);
-            searchToolbarContainer.setVisibility(View.VISIBLE);
-            searchToolbarContainer.animate().translationX(0).alpha(1f).setDuration(400).setInterpolator(new DecelerateInterpolator()).start();
-        } else {
-            searchToolbarContainer.setTranslationX(0);
-            searchToolbarContainer.setAlpha(1f);
-            searchToolbarContainer.setVisibility(View.VISIBLE);
-        }
-
-        //
-        initSearchListeners();
-
-        if (TextUtils.isEmpty(searchQuery)) showSoftKeyboard(searchEditText);
-        else hideSoftKeyboard(searchEditText);
-
-        if (!TextUtils.isEmpty(searchQuery) && searchQuery.length() > 2 && suggestionListAdapter != null && suggestionListAdapter.isEmpty()) {
-            searchSuggestions(searchQuery);
-        }
-    }
-
-    private void initSearchListeners() {
-        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;
-                }
-
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
-                    searchEditText.setText("", false);
-                } else searchEditText.setText("");
-                suggestionListAdapter.updateAdapter(new ArrayList<String>());
-                showSoftKeyboard(searchEditText);
-            }
-        });
-
-        searchClear.setOnLongClickListener(new View.OnLongClickListener() {
-            @Override
-            public boolean onLongClick(View v) {
-                if (DEBUG) Log.d(TAG, "onLongClick() called with: v = [" + v + "]");
-                showMenuTooltip(v, getString(R.string.clear));
-                return true;
-            }
-        });
-
-        searchEditText.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                searchEditText.showDropDown();
-            }
-        });
-
-        searchEditText.setOnFocusChangeListener(new View.OnFocusChangeListener() {
-            @Override
-            public void onFocusChange(View v, boolean hasFocus) {
-                if (hasFocus) searchEditText.showDropDown();
-            }
-        });
-
-        searchEditText.setOnItemClickListener(new AdapterView.OnItemClickListener() {
-            @Override
-            public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-                if (DEBUG) Log.d(TAG, "onItemClick() called with: parent = [" + parent + "], view = [" + view + "], position = [" + position + "], id = [" + id + "]");
-                String s = suggestionListAdapter.getSuggestion(position);
-                if (DEBUG) Log.d(TAG, "onItemClick text = " + s);
-                submitQuery(s);
-            }
-        });
-
-
-        if (textWatcher != null) searchEditText.removeTextChangedListener(textWatcher);
-        textWatcher = new TextWatcher() {
-            @Override
-            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-            }
-
-            @Override
-            public void onTextChanged(CharSequence s, int start, int before, int count) {
-            }
-
-            @Override
-            public void afterTextChanged(Editable s) {
-                String newText = searchEditText.getText().toString();
-                if (!TextUtils.isEmpty(newText) && newText.length() > 1) onQueryTextChange(newText);
-            }
-        };
-        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)) {
-                    submitQuery(searchEditText.getText().toString());
-                    return true;
-                }
-                return false;
-            }
-        });
-    }
-
-    private void unsetSearchListeners() {
-        searchClear.setOnClickListener(null);
-        searchClear.setOnLongClickListener(null);
-        if (textWatcher != null) searchEditText.removeTextChangedListener(textWatcher);
-        searchEditText.setOnClickListener(null);
-        searchEditText.setOnItemClickListener(null);
-        searchEditText.setOnFocusChangeListener(null);
-        searchEditText.setOnEditorActionListener(null);
-
-        textWatcher = null;
-    }
-
-    public void showSoftKeyboard(View view) {
-        if (DEBUG) Log.d(TAG, "showSoftKeyboard() called with: view = [" + view + "]");
-        if (view == null) return;
-
-        if (view.requestFocus()) {
-            InputMethodManager imm = (InputMethodManager) activity.getSystemService(Context.INPUT_METHOD_SERVICE);
-            imm.showSoftInput(view, InputMethodManager.SHOW_IMPLICIT);
-        }
-    }
-
-    public void hideSoftKeyboard(View view) {
-        if (DEBUG) Log.d(TAG, "hideSoftKeyboard() called with: view = [" + view + "]");
-        if (view == null) return;
-
-        InputMethodManager imm = (InputMethodManager) activity.getSystemService(Context.INPUT_METHOD_SERVICE);
-        imm.hideSoftInputFromWindow(view.getWindowToken(), InputMethodManager.HIDE_NOT_ALWAYS);
-
-        view.clearFocus();
-    }
-
-    /*//////////////////////////////////////////////////////////////////////////
-    // Utils
-    //////////////////////////////////////////////////////////////////////////*/
-
-    private void changeFilter(MenuItem item, EnumSet<SearchEngine.Filter> filter) {
-        this.filter = filter;
-        this.filterItemCheckedId = item.getItemId();
-        item.setChecked(true);
-        if (searchQuery != null && !searchQuery.isEmpty()) search(searchQuery, 0, true);
-    }
-
-    public void submitQuery(String query) {
-        if (DEBUG) Log.d(TAG, "submitQuery() called with: query = [" + query + "]");
-        if (query.isEmpty()) return;
-        search(query, 0, true);
-        searchQuery = query;
-    }
-
-    public void onQueryTextChange(String newText) {
-        if (DEBUG) Log.d(TAG, "onQueryTextChange() called with: newText = [" + newText + "]");
-        if (!newText.isEmpty()) searchSuggestions(newText);
-    }
-
-    private void setQuery(int serviceId, String searchQuery) {
-        this.serviceId = serviceId;
-        this.searchQuery = searchQuery;
-    }
-
-    private void searchSuggestions(String query) {
-        if (!showSuggestions) {
-            if (DEBUG) Log.d(TAG, "searchSuggestions() showSuggestions is disabled");
-            return;
-        }
-
-        if (DEBUG) Log.d(TAG, "searchSuggestions() called with: query = [" + query + "]");
-        if (curSuggestionWorker != null && curSuggestionWorker.isRunning()) curSuggestionWorker.cancel();
-        curSuggestionWorker = SuggestionWorker.startForQuery(activity, serviceId, query, this);
-    }
-
-    private void search(String query, int pageNumber) {
-        if (DEBUG) Log.d(TAG, "search() called with: query = [" + query + "], pageNumber = [" + pageNumber + "]");
-        search(query, pageNumber, false);
-    }
-
-    private void search(String query, int pageNumber, boolean clearList) {
-        if (DEBUG) Log.d(TAG, "search() called with: query = [" + query + "], pageNumber = [" + pageNumber + "], clearList = [" + clearList + "]");
-        isLoading.set(true);
-        hideSoftKeyboard(searchEditText);
-
-        searchQuery = query;
-        this.pageNumber = pageNumber;
-
-        if (clearList) {
-            animateView(resultRecyclerView, false, 50);
-            infoListAdapter.clearStreamItemList();
-            infoListAdapter.showFooter(false);
-            animateView(loadingProgressBar, true, 200);
-        }
-        animateView(errorPanel, false, 200);
-
-        if (curSearchWorker != null && curSearchWorker.isRunning()) curSearchWorker.cancel();
-        curSearchWorker = SearchWorker.startForQuery(activity, serviceId, query, pageNumber, filter, this);
-    }
-
-    protected void setErrorMessage(String message, boolean showRetryButton) {
-        super.setErrorMessage(message, showRetryButton);
-
-        animateView(resultRecyclerView, false, 400);
-        hideSoftKeyboard(searchEditText);
-    }
-
-    /*//////////////////////////////////////////////////////////////////////////
-    // OnSuggestionResult
-    //////////////////////////////////////////////////////////////////////////*/
-
-    @Override
-    public void onSuggestionResult(@NonNull List<String> suggestions) {
-        if (DEBUG) Log.d(TAG, "onSuggestionResult() called with: suggestions = [" + suggestions + "]");
-        suggestionListAdapter.updateAdapter(suggestions);
-    }
-
-    @Override
-    public void onSuggestionError(int messageId) {
-        if (DEBUG) Log.d(TAG, "onSuggestionError() called with: messageId = [" + messageId + "]");
-        setErrorMessage(getString(messageId), true);
-    }
-
-    /*//////////////////////////////////////////////////////////////////////////
-    // SearchWorkerResultListener
-    //////////////////////////////////////////////////////////////////////////*/
-
-    @Override
-    public void onSearchResult(SearchResult result) {
-        if (DEBUG) Log.d(TAG, "onSearchResult() called with: result = [" + result + "]");
-        infoListAdapter.addInfoItemList(result.resultList);
-        animateView(resultRecyclerView, true, 400);
-        animateView(loadingProgressBar, false, 200);
-        isLoading.set(false);
-    }
-
-    @Override
-    public void onNothingFound(String message) {
-        if (DEBUG) Log.d(TAG, "onNothingFound() called with: messageId = [" + message + "]");
-        setErrorMessage(message, false);
-    }
-
-    @Override
-    public void onSearchError(int messageId) {
-        if (DEBUG) Log.d(TAG, "onSearchError() called with: messageId = [" + messageId + "]");
-        //Toast.makeText(getActivity(), messageId, Toast.LENGTH_LONG).show();
-        setErrorMessage(getString(messageId), true);
-    }
-
-    @Override
-    public void onReCaptchaChallenge() {
-        if (DEBUG) Log.d(TAG, "onReCaptchaChallenge() called");
-        Toast.makeText(getActivity(), R.string.recaptcha_request_toast, Toast.LENGTH_LONG).show();
-        setErrorMessage(getString(R.string.recaptcha_request_toast), false);
-
-        // Starting ReCaptcha Challenge Activity
-        startActivityForResult(new Intent(getActivity(), ReCaptchaActivity.class), ReCaptchaActivity.RECAPTCHA_REQUEST);
-    }
-
-}

app/src/main/java/org/schabi/newpipe/fragments/search/SuggestionListAdapter.java

@@ -1,89 +0,0 @@
-package org.schabi.newpipe.fragments.search;
-
-import android.content.Context;
-import android.database.Cursor;
-import android.database.MatrixCursor;
-import android.support.v4.widget.ResourceCursorAdapter;
-import android.view.View;
-import android.widget.TextView;
-
-import java.util.List;
-
-/**
- * Created by Christian Schabesberger on 02.08.16.
- *
- * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
- * SuggestionListAdapter.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/>.
- */
-
-/**
- * {@link ResourceCursorAdapter} to display suggestions.
- */
-public class SuggestionListAdapter extends ResourceCursorAdapter {
-
-    private static final String[] columns = new String[]{"_id", "title"};
-    private static final int INDEX_ID = 0;
-    private static final int INDEX_TITLE = 1;
-
-
-    public SuggestionListAdapter(Context context) {
-        super(context, android.R.layout.simple_list_item_1, null, 0);
-    }
-
-    @Override
-    public void bindView(View view, Context context, Cursor cursor) {
-        ViewHolder viewHolder = new ViewHolder(view);
-        viewHolder.suggestionTitle.setText(cursor.getString(INDEX_TITLE));
-    }
-
-    /**
-     * Update the suggestion list
-     * @param suggestions the list of suggestions
-     */
-    public void updateAdapter(List<String> suggestions) {
-        MatrixCursor cursor = new MatrixCursor(columns, suggestions.size());
-        int i = 0;
-        for (String suggestion : suggestions) {
-            String[] columnValues = new String[columns.length];
-            columnValues[INDEX_TITLE] = suggestion;
-            columnValues[INDEX_ID] = Integer.toString(i);
-            cursor.addRow(columnValues);
-            i++;
-        }
-        changeCursor(cursor);
-    }
-
-    /**
-     * Get the suggestion for a position
-     * @param position the position of the suggestion
-     * @return the suggestion
-     */
-    public String getSuggestion(int position) {
-        return ((Cursor) getItem(position)).getString(INDEX_TITLE);
-    }
-
-    @Override
-    public CharSequence convertToString(Cursor cursor) {
-        return cursor.getString(INDEX_TITLE);
-    }
-
-    private class ViewHolder {
-        private final TextView suggestionTitle;
-        private ViewHolder(View view) {
-            this.suggestionTitle = (TextView) view.findViewById(android.R.id.text1);
-        }
-    }
-}

app/src/main/java/org/schabi/newpipe/info_list/ChannelInfoItemHolder.java

@@ -1,52 +0,0 @@
-package org.schabi.newpipe.info_list;
-
-import android.view.View;
-import android.widget.TextView;
-
-import org.schabi.newpipe.R;
-import org.schabi.newpipe.extractor.InfoItem;
-
-import de.hdodenhof.circleimageview.CircleImageView;
-
-/**
- * Created by Christian Schabesberger on 12.02.17.
- *
- * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
- * ChannelInfoItemHolder .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 ChannelInfoItemHolder extends InfoItemHolder {
-    public final CircleImageView itemThumbnailView;
-    public final TextView itemChannelTitleView;
-    public final TextView itemAdditionalDetailView;
-    public final TextView itemChannelDescriptionView;
-
-    public final View itemRoot;
-
-    ChannelInfoItemHolder(View v) {
-        super(v);
-        itemRoot = v.findViewById(R.id.itemRoot);
-        itemThumbnailView = (CircleImageView) v.findViewById(R.id.itemThumbnailView);
-        itemChannelTitleView = (TextView) v.findViewById(R.id.itemChannelTitleView);
-        itemAdditionalDetailView = (TextView) v.findViewById(R.id.itemAdditionalDetails);
-        itemChannelDescriptionView = (TextView) v.findViewById(R.id.itemChannelDescriptionView);
-    }
-
-    @Override
-    public InfoItem.InfoType infoType() {
-        return InfoItem.InfoType.CHANNEL;
-    }
-}

app/src/main/java/org/schabi/newpipe/info_list/InfoItemBuilder.java

@@ -1,25 +1,27 @@
 package org.schabi.newpipe.info_list;
 
 import android.content.Context;
-import android.text.TextUtils;
+import android.support.annotation.NonNull;
 import android.util.Log;
-import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
-import com.nostra13.universalimageloader.core.DisplayImageOptions;
 import com.nostra13.universalimageloader.core.ImageLoader;
 
-import org.schabi.newpipe.ImageErrorLoadingListener;
-import org.schabi.newpipe.R;
-import org.schabi.newpipe.extractor.AbstractStreamInfo;
 import org.schabi.newpipe.extractor.InfoItem;
 import org.schabi.newpipe.extractor.channel.ChannelInfoItem;
-import org.schabi.newpipe.extractor.stream_info.StreamInfoItem;
+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.InfoItemHolder;
+import org.schabi.newpipe.info_list.holder.PlaylistInfoItemHolder;
+import org.schabi.newpipe.info_list.holder.PlaylistMiniInfoItemHolder;
+import org.schabi.newpipe.info_list.holder.StreamInfoItemHolder;
+import org.schabi.newpipe.info_list.holder.StreamMiniInfoItemHolder;
+import org.schabi.newpipe.util.OnClickGesture;
 
-import java.util.Locale;
-
-/**
+/*
  * Created by Christian Schabesberger on 26.09.16.
  * <p>
  * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
@@ -40,251 +42,73 @@ import java.util.Locale;
  */
 
 public class InfoItemBuilder {
-
-    private final String viewsS;
-    private final String videosS;
-    private final String subsS;
-    private final String subsPluralS;
-
-    private final String thousand;
-    private final String million;
-    private final String billion;
-
     private static final String TAG = InfoItemBuilder.class.toString();
 
-    public interface OnInfoItemSelectedListener {
-        void selected(int serviceId, String url, String title);
-    }
-
+    private final Context context;
     private ImageLoader imageLoader = ImageLoader.getInstance();
 
-    /** Base display options */
-    private static final DisplayImageOptions DISPLAY_IMAGE_OPTIONS =
-            new DisplayImageOptions.Builder()
-                    .cacheInMemory(true)
-                    .build();
-
-    /** Display options for stream thumbnails */
-    private static final DisplayImageOptions DISPLAY_STREAM_THUMBNAIL_OPTIONS =
-            new DisplayImageOptions.Builder()
-            .cloneFrom(DISPLAY_IMAGE_OPTIONS)
-            .showImageOnFail(R.drawable.dummy_thumbnail)
-            .showImageForEmptyUri(R.drawable.dummy_thumbnail)
-            .showImageOnLoading(R.drawable.dummy_thumbnail)
-            .build();
-
-    /** Display options for channel thumbnails */
-    private static final DisplayImageOptions DISPLAY_CHANNEL_THUMBNAIL_OPTIONS =
-            new DisplayImageOptions.Builder()
-            .cloneFrom(DISPLAY_IMAGE_OPTIONS)
-            .showImageOnLoading(R.drawable.buddy_channel_item)
-            .showImageForEmptyUri(R.drawable.buddy_channel_item)
-            .showImageOnFail(R.drawable.buddy_channel_item)
-            .build();
-    private OnInfoItemSelectedListener onStreamInfoItemSelectedListener;
-    private OnInfoItemSelectedListener onChannelInfoItemSelectedListener;
+    private OnClickGesture<StreamInfoItem> onStreamSelectedListener;
+    private OnClickGesture<ChannelInfoItem> onChannelSelectedListener;
+    private OnClickGesture<PlaylistInfoItem> onPlaylistSelectedListener;
 
     public InfoItemBuilder(Context context) {
-        viewsS = context.getString(R.string.views);
-        videosS = context.getString(R.string.videos);
-        subsS = context.getString(R.string.subscriber);
-        subsPluralS = context.getString(R.string.subscriber_plural);
-        thousand = context.getString(R.string.short_thousand);
-        million = context.getString(R.string.short_million);
-        billion = context.getString(R.string.short_billion);
+        this.context = context;
     }
 
-    public void setOnStreamInfoItemSelectedListener(
-            OnInfoItemSelectedListener listener) {
-        this.onStreamInfoItemSelectedListener = listener;
+    public View buildView(@NonNull ViewGroup parent, @NonNull final InfoItem infoItem) {
+        return buildView(parent, infoItem, false);
     }
 
-    public void setOnChannelInfoItemSelectedListener(
-            OnInfoItemSelectedListener listener) {
-        this.onChannelInfoItemSelectedListener = listener;
+    public View buildView(@NonNull ViewGroup parent, @NonNull final InfoItem infoItem, boolean useMiniVariant) {
+        InfoItemHolder holder = holderFromInfoType(parent, infoItem.getInfoType(), useMiniVariant);
+        holder.updateFromItem(infoItem);
+        return holder.itemView;
     }
 
-    public void buildByHolder(InfoItemHolder holder, final InfoItem i) {
-        if (i.infoType() != holder.infoType())
-            return;
-        switch (i.infoType()) {
+    private InfoItemHolder holderFromInfoType(@NonNull ViewGroup parent, @NonNull InfoItem.InfoType infoType, boolean useMiniVariant) {
+        switch (infoType) {
             case STREAM:
-                buildStreamInfoItem((StreamInfoItemHolder) holder, (StreamInfoItem) i);
-                break;
+                return useMiniVariant ? new StreamMiniInfoItemHolder(this, parent) : new StreamInfoItemHolder(this, parent);
             case CHANNEL:
-                buildChannelInfoItem((ChannelInfoItemHolder) holder, (ChannelInfoItem) i);
-                break;
+                return useMiniVariant ? new ChannelMiniInfoItemHolder(this, parent) : new ChannelInfoItemHolder(this, parent);
             case PLAYLIST:
-                Log.e(TAG, "Not yet implemented");
-                break;
+                return useMiniVariant ? new PlaylistMiniInfoItemHolder(this, parent) : new PlaylistInfoItemHolder(this, parent);
             default:
                 Log.e(TAG, "Trollolo");
+                throw new RuntimeException("InfoType not expected = " + infoType.name());
         }
     }
 
-    public View buildView(ViewGroup parent, final InfoItem info) {
-        View itemView = null;
-        InfoItemHolder holder = null;
-        LayoutInflater inflater = LayoutInflater.from(parent.getContext());
-        switch (info.infoType()) {
-            case STREAM:
-                //long start = System.nanoTime();
-                itemView = inflater.inflate(R.layout.stream_item, parent, false);
-                //Log.d(TAG, "time to inflate: " + ((System.nanoTime() - start) / 1000000L) + "ms");
-                holder = new StreamInfoItemHolder(itemView);
-                break;
-            case CHANNEL:
-                itemView = inflater.inflate(R.layout.channel_item, parent, false);
-                holder = new ChannelInfoItemHolder(itemView);
-                break;
-            case PLAYLIST:
-                Log.e(TAG, "Not yet implemented");
-            default:
-                Log.e(TAG, "Trollolo");
-        }
-        buildByHolder(holder, info);
-        return itemView;
+    public Context getContext() {
+        return context;
     }
 
-
-    private String getStreamInfoDetailLine(final StreamInfoItem info) {
-        String viewsAndDate = "";
-        if(info.view_count >= 0) {
-            viewsAndDate = shortViewCount(info.view_count);
-        }
-        if(!TextUtils.isEmpty(info.upload_date)) {
-            if(viewsAndDate.isEmpty()) {
-                viewsAndDate = info.upload_date;
-            } else {
-                viewsAndDate += " • " + info.upload_date;
-            }
-        }
-        return viewsAndDate;
+    public ImageLoader getImageLoader() {
+        return imageLoader;
     }
 
-    private void buildStreamInfoItem(StreamInfoItemHolder holder, final StreamInfoItem info) {
-        if (info.infoType() != InfoItem.InfoType.STREAM) {
-            Log.e("InfoItemBuilder", "Info type not yet supported");
-        }
-        // fill holder with information
-        if (!TextUtils.isEmpty(info.title)) holder.itemVideoTitleView.setText(info.title);
-
-        if (!TextUtils.isEmpty(info.uploader)) holder.itemUploaderView.setText(info.uploader);
-        else holder.itemUploaderView.setVisibility(View.INVISIBLE);
-
-        if (info.duration > 0) {
-            holder.itemDurationView.setText(getDurationString(info.duration));
-        } else {
-            if (info.stream_type == AbstractStreamInfo.StreamType.LIVE_STREAM) {
-                holder.itemDurationView.setText(R.string.duration_live);
-            } else {
-                holder.itemDurationView.setVisibility(View.GONE);
-            }
-        }
-
-        holder.itemAdditionalDetails.setText(getStreamInfoDetailLine(info));
-
-        // Default thumbnail is shown on error, while loading and if the url is empty
-        imageLoader.displayImage(info.thumbnail_url,
-                holder.itemThumbnailView,
-                DISPLAY_STREAM_THUMBNAIL_OPTIONS,
-                new ImageErrorLoadingListener(holder.itemRoot.getContext(), holder.itemRoot.getRootView(), info.service_id));
-
-
-        holder.itemRoot.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                if(onStreamInfoItemSelectedListener != null) {
-                    onStreamInfoItemSelectedListener.selected(info.service_id, info.webpage_url, info.getTitle());
-                }
-            }
-        });
+    public OnClickGesture<StreamInfoItem> getOnStreamSelectedListener() {
+        return onStreamSelectedListener;
     }
 
-    private String getChannelInfoDetailLine(final ChannelInfoItem info) {
-        String details = "";
-        if(info.subscriberCount >= 0) {
-            details = shortSubscriber(info.subscriberCount);
-        }
-        if(info.videoAmount >= 0) {
-            String formattedVideoAmount = info.videoAmount + " " + videosS;
-            if(!details.isEmpty()) {
-                details += " • " + formattedVideoAmount;
-            } else {
-                details = formattedVideoAmount;
-            }
-        }
-        return details;
+    public void setOnStreamSelectedListener(OnClickGesture<StreamInfoItem> listener) {
+        this.onStreamSelectedListener = listener;
     }
 
-    private void buildChannelInfoItem(ChannelInfoItemHolder holder, final ChannelInfoItem info) {
-        if (!TextUtils.isEmpty(info.getTitle())) holder.itemChannelTitleView.setText(info.getTitle());
-        holder.itemAdditionalDetailView.setText(getChannelInfoDetailLine(info));
-        if (!TextUtils.isEmpty(info.description)) holder.itemChannelDescriptionView.setText(info.description);
-
-        imageLoader.displayImage(info.thumbnailUrl,
-                holder.itemThumbnailView,
-                DISPLAY_CHANNEL_THUMBNAIL_OPTIONS,
-                new ImageErrorLoadingListener(holder.itemRoot.getContext(), holder.itemRoot.getRootView(), info.serviceId));
-
-
-        holder.itemRoot.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                if(onStreamInfoItemSelectedListener != null) {
-                    onChannelInfoItemSelectedListener.selected(info.serviceId, info.getLink(), info.channelName);
-                }
-            }
-        });
+    public OnClickGesture<ChannelInfoItem> getOnChannelSelectedListener() {
+        return onChannelSelectedListener;
     }
 
-
-    public String shortViewCount(Long viewCount) {
-        if (viewCount >= 1000000000) {
-            return Long.toString(viewCount / 1000000000) + billion + " " + viewsS;
-        } else if (viewCount >= 1000000) {
-            return Long.toString(viewCount / 1000000) + million + " " + viewsS;
-        } else if (viewCount >= 1000) {
-            return Long.toString(viewCount / 1000) + thousand + " " + viewsS;
-        } else {
-            return Long.toString(viewCount) + " " + viewsS;
-        }
+    public void setOnChannelSelectedListener(OnClickGesture<ChannelInfoItem> listener) {
+        this.onChannelSelectedListener = listener;
     }
 
-    public String shortSubscriber(Long count) {
-        String curSubString = count > 1 ? subsPluralS : subsS;
-
-        if (count >= 1000000000) {
-            return Long.toString(count / 1000000000) + billion + " " + curSubString;
-        } else if (count >= 1000000) {
-            return Long.toString(count / 1000000) + million + " " + curSubString;
-        } else if (count >= 1000) {
-            return Long.toString(count / 1000) + thousand + " " + curSubString;
-        } else {
-            return Long.toString(count) + " " + curSubString;
-        }
+    public OnClickGesture<PlaylistInfoItem> getOnPlaylistSelectedListener() {
+        return onPlaylistSelectedListener;
     }
 
-    public static String getDurationString(int duration) {
-        if(duration < 0) {
-            duration = 0;
-        }
-        String output;
-        int days = duration / (24 * 60 * 60); /* greater than a day */
-        duration %= (24 * 60 * 60);
-        int hours = duration / (60 * 60); /* greater than an hour */
-        duration %= (60 * 60);
-        int minutes = duration / 60;
-        int seconds = duration % 60;
-
-        //handle days
-        if (days > 0) {
-            output = String.format(Locale.US, "%d:%02d:%02d:%02d", days, hours, minutes, seconds);
-        } else if(hours > 0) {
-            output = String.format(Locale.US, "%d:%02d:%02d", hours, minutes, seconds);
-        } else {
-            output = String.format(Locale.US, "%d:%02d", minutes, seconds);
-        }
-        return output;
+    public void setOnPlaylistSelectedListener(OnClickGesture<PlaylistInfoItem> listener) {
+        this.onPlaylistSelectedListener = listener;
     }
+
 }

app/src/main/java/org/schabi/newpipe/info_list/InfoItemDialog.java

@@ -0,0 +1,54 @@
+package org.schabi.newpipe.info_list;
+
+import android.app.Activity;
+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;
+
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.extractor.stream.StreamInfoItem;
+
+public class InfoItemDialog {
+    private final AlertDialog dialog;
+
+    public InfoItemDialog(@NonNull final Activity activity,
+                          @NonNull final StreamInfoItem info,
+                          @NonNull final String[] commands,
+                          @NonNull final DialogInterface.OnClickListener actions) {
+        this(activity, commands, actions, info.getName(), info.getUploaderName());
+    }
+
+    public InfoItemDialog(@NonNull final Activity activity,
+                          @NonNull final String[] commands,
+                          @NonNull final DialogInterface.OnClickListener actions,
+                          @NonNull final String title,
+                          @Nullable final String additionalDetail) {
+
+        final View bannerView = View.inflate(activity, R.layout.dialog_title, null);
+        bannerView.setSelected(true);
+
+        TextView titleView = bannerView.findViewById(R.id.itemTitleView);
+        titleView.setText(title);
+
+        TextView detailsView = bannerView.findViewById(R.id.itemAdditionalDetails);
+        if (additionalDetail != null) {
+            detailsView.setText(additionalDetail);
+            detailsView.setVisibility(View.VISIBLE);
+        } else {
+            detailsView.setVisibility(View.GONE);
+        }
+
+        dialog = new AlertDialog.Builder(activity)
+                .setCustomTitle(bannerView)
+                .setItems(commands, actions)
+                .create();
+    }
+
+    public void show() {
+        dialog.show();
+    }
+}

app/src/main/java/org/schabi/newpipe/info_list/InfoListAdapter.java

@@ -3,17 +3,26 @@ package org.schabi.newpipe.info_list;
 import android.app.Activity;
 import android.support.v7.widget.RecyclerView;
 import android.util.Log;
-import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
-import org.schabi.newpipe.R;
 import org.schabi.newpipe.extractor.InfoItem;
+import org.schabi.newpipe.extractor.channel.ChannelInfoItem;
+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.InfoItemHolder;
+import org.schabi.newpipe.info_list.holder.PlaylistInfoItemHolder;
+import org.schabi.newpipe.info_list.holder.PlaylistMiniInfoItemHolder;
+import org.schabi.newpipe.info_list.holder.StreamInfoItemHolder;
+import org.schabi.newpipe.info_list.holder.StreamMiniInfoItemHolder;
+import org.schabi.newpipe.util.OnClickGesture;
 
 import java.util.ArrayList;
 import java.util.List;
 
-/**
+/*
  * Created by Christian Schabesberger on 01.08.16.
  *
  * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
@@ -34,25 +43,33 @@ import java.util.List;
  */
 
 public class InfoListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
-    private static final String TAG = InfoListAdapter.class.toString();
+    private static final String TAG = InfoListAdapter.class.getSimpleName();
+    private static final boolean DEBUG = false;
+
+    private static final int HEADER_TYPE = 0;
+    private static final int FOOTER_TYPE = 1;
+
+    private static final int MINI_STREAM_HOLDER_TYPE = 0x100;
+    private static final int STREAM_HOLDER_TYPE = 0x101;
+    private static final int MINI_CHANNEL_HOLDER_TYPE = 0x200;
+    private static final int CHANNEL_HOLDER_TYPE = 0x201;
+    private static final int MINI_PLAYLIST_HOLDER_TYPE = 0x300;
+    private static final int PLAYLIST_HOLDER_TYPE = 0x301;
 
     private final InfoItemBuilder infoItemBuilder;
-    private final List<InfoItem> infoItemList;
+    private final ArrayList<InfoItem> infoItemList;
+    private boolean useMiniVariant = false;
     private boolean showFooter = false;
     private View header = null;
     private View footer = null;
 
     public class HFHolder extends RecyclerView.ViewHolder {
+        public View view;
+
         public HFHolder(View v) {
             super(v);
             view = v;
         }
-        public View view;
-    }
-
-    public void showFooter(boolean show) {
-        showFooter = show;
-        notifyDataSetChanged();
     }
 
     public InfoListAdapter(Activity a) {
@@ -60,25 +77,71 @@ public class InfoListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
         infoItemList = new ArrayList<>();
     }
 
-    public void setOnStreamInfoItemSelectedListener
-            (InfoItemBuilder.OnInfoItemSelectedListener listener) {
-        infoItemBuilder.setOnStreamInfoItemSelectedListener(listener);
+    public void setOnStreamSelectedListener(OnClickGesture<StreamInfoItem> listener) {
+        infoItemBuilder.setOnStreamSelectedListener(listener);
     }
 
-    public void setOnChannelInfoItemSelectedListener
-            (InfoItemBuilder.OnInfoItemSelectedListener listener) {
-        infoItemBuilder.setOnChannelInfoItemSelectedListener(listener);
+    public void setOnChannelSelectedListener(OnClickGesture<ChannelInfoItem> listener) {
+        infoItemBuilder.setOnChannelSelectedListener(listener);
+    }
+
+    public void setOnPlaylistSelectedListener(OnClickGesture<PlaylistInfoItem> listener) {
+        infoItemBuilder.setOnPlaylistSelectedListener(listener);
+    }
+
+    public void useMiniItemVariants(boolean useMiniVariant) {
+        this.useMiniVariant = useMiniVariant;
     }
 
     public void addInfoItemList(List<InfoItem> data) {
-        if(data != null) {
+        if (data != null) {
+            if (DEBUG) {
+                Log.d(TAG, "addInfoItemList() before > infoItemList.size() = " + infoItemList.size() + ", data.size() = " + data.size());
+            }
+
+            int offsetStart = sizeConsideringHeaderOffset();
             infoItemList.addAll(data);
-            notifyDataSetChanged();
+
+            if (DEBUG) {
+                Log.d(TAG, "addInfoItemList() after > offsetStart = " + offsetStart + ", infoItemList.size() = " + infoItemList.size() + ", header = " + header + ", footer = " + footer + ", showFooter = " + showFooter);
+            }
+
+            notifyItemRangeInserted(offsetStart, data.size());
+
+            if (footer != null && showFooter) {
+                int footerNow = sizeConsideringHeaderOffset();
+                notifyItemMoved(offsetStart, footerNow);
+
+                if (DEBUG) Log.d(TAG, "addInfoItemList() footer from " + offsetStart + " to " + footerNow);
+            }
+        }
+    }
+
+    public void addInfoItem(InfoItem data) {
+        if (data != null) {
+            if (DEBUG) {
+                Log.d(TAG, "addInfoItem() before > infoItemList.size() = " + infoItemList.size() + ", thread = " + Thread.currentThread());
+            }
+
+            int positionInserted = sizeConsideringHeaderOffset();
+            infoItemList.add(data);
+
+            if (DEBUG) {
+                Log.d(TAG, "addInfoItem() after > position = " + positionInserted + ", infoItemList.size() = " + infoItemList.size() + ", header = " + header + ", footer = " + footer + ", showFooter = " + showFooter);
+            }
+            notifyItemInserted(positionInserted);
+
+            if (footer != null && showFooter) {
+                int footerNow = sizeConsideringHeaderOffset();
+                notifyItemMoved(positionInserted, footerNow);
+
+                if (DEBUG) Log.d(TAG, "addInfoItem() footer from " + positionInserted + " to " + footerNow);
+            }
         }
     }
 
     public void clearStreamItemList() {
-        if(infoItemList.isEmpty()) {
+        if (infoItemList.isEmpty()) {
             return;
         }
         infoItemList.clear();
@@ -86,45 +149,67 @@ public class InfoListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
     }
 
     public void setHeader(View header) {
+        boolean changed = header != this.header;
         this.header = header;
-        notifyDataSetChanged();
+        if (changed) notifyDataSetChanged();
     }
 
     public void setFooter(View view) {
         this.footer = view;
-        notifyDataSetChanged();
     }
 
-    public List<InfoItem> getItemsList() {
+    public void showFooter(boolean show) {
+        if (DEBUG) Log.d(TAG, "showFooter() called with: show = [" + show + "]");
+        if (show == showFooter) return;
+
+        showFooter = show;
+        if (show) notifyItemInserted(sizeConsideringHeaderOffset());
+        else notifyItemRemoved(sizeConsideringHeaderOffset());
+    }
+
+
+    private int sizeConsideringHeaderOffset() {
+        int i = infoItemList.size() + (header != null ? 1 : 0);
+        if (DEBUG) Log.d(TAG, "sizeConsideringHeaderOffset() called → " + i);
+        return i;
+    }
+
+    public ArrayList<InfoItem> getItemsList() {
         return infoItemList;
     }
 
     @Override
     public int getItemCount() {
         int count = infoItemList.size();
-        if(header != null) count++;
-        if(footer != null && showFooter) count++;
+        if (header != null) count++;
+        if (footer != null && showFooter) count++;
+
+        if (DEBUG) {
+            Log.d(TAG, "getItemCount() called, count = " + count + ", infoItemList.size() = " + infoItemList.size() + ", header = " + header + ", footer = " + footer + ", showFooter = " + showFooter);
+        }
         return count;
     }
 
-    // don't ask why we have to do that this way... it's android accept it -.-
     @Override
     public int getItemViewType(int position) {
-        if(header != null && position == 0) {
-            return 0;
-        } else if(header != null) {
+        if (DEBUG) Log.d(TAG, "getItemViewType() called with: position = [" + position + "]");
+
+        if (header != null && position == 0) {
+            return HEADER_TYPE;
+        } else if (header != null) {
             position--;
         }
-        if(footer != null && position == infoItemList.size() && showFooter) {
-            return 1;
+        if (footer != null && position == infoItemList.size() && showFooter) {
+            return FOOTER_TYPE;
         }
-        switch(infoItemList.get(position).infoType()) {
+        final InfoItem item = infoItemList.get(position);
+        switch (item.getInfoType()) {
             case STREAM:
-                return 2;
+                return useMiniVariant ? MINI_STREAM_HOLDER_TYPE : STREAM_HOLDER_TYPE;
             case CHANNEL:
-                return 3;
+                return useMiniVariant ? MINI_CHANNEL_HOLDER_TYPE : CHANNEL_HOLDER_TYPE;
             case PLAYLIST:
-                return 4;
+                return useMiniVariant ? MINI_PLAYLIST_HOLDER_TYPE : PLAYLIST_HOLDER_TYPE;
             default:
                 Log.e(TAG, "Trollolo");
                 return -1;
@@ -133,20 +218,24 @@ public class InfoListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
 
     @Override
     public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int type) {
-        switch(type) {
-            case 0:
+        if (DEBUG) Log.d(TAG, "onCreateViewHolder() called with: parent = [" + parent + "], type = [" + type + "]");
+        switch (type) {
+            case HEADER_TYPE:
                 return new HFHolder(header);
-            case 1:
+            case FOOTER_TYPE:
                 return new HFHolder(footer);
-            case 2:
-                return new StreamInfoItemHolder(LayoutInflater.from(parent.getContext())
-                        .inflate(R.layout.stream_item, parent, false));
-            case 3:
-                return new ChannelInfoItemHolder(LayoutInflater.from(parent.getContext())
-                        .inflate(R.layout.channel_item, parent, false));
-            case 4:
-                Log.e(TAG, "Playlist is not yet implemented");
-                return null;
+            case MINI_STREAM_HOLDER_TYPE:
+                return new StreamMiniInfoItemHolder(infoItemBuilder, parent);
+            case STREAM_HOLDER_TYPE:
+                return new StreamInfoItemHolder(infoItemBuilder, parent);
+            case MINI_CHANNEL_HOLDER_TYPE:
+                return new ChannelMiniInfoItemHolder(infoItemBuilder, parent);
+            case CHANNEL_HOLDER_TYPE:
+                return new ChannelInfoItemHolder(infoItemBuilder, parent);
+            case MINI_PLAYLIST_HOLDER_TYPE:
+                return new PlaylistMiniInfoItemHolder(infoItemBuilder, parent);
+            case PLAYLIST_HOLDER_TYPE:
+                return new PlaylistInfoItemHolder(infoItemBuilder, parent);
             default:
                 Log.e(TAG, "Trollolo");
                 return null;
@@ -154,16 +243,16 @@ public class InfoListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
     }
 
     @Override
-    public void onBindViewHolder(RecyclerView.ViewHolder holder, int i) {
-        //god damn f*** ANDROID SH**
-        if(holder instanceof InfoItemHolder) {
-            if(header != null) {
-                i--;
-            }
-            infoItemBuilder.buildByHolder((InfoItemHolder) holder, infoItemList.get(i));
-        } else if(holder instanceof HFHolder && i == 0 && header != null) {
+    public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) {
+        if (DEBUG) Log.d(TAG, "onBindViewHolder() called with: holder = [" + holder.getClass().getSimpleName() + "], position = [" + position + "]");
+        if (holder instanceof InfoItemHolder) {
+            // If header isn't null, offset the items by -1
+            if (header != null) position--;
+
+            ((InfoItemHolder) holder).updateFromItem(infoItemList.get(position));
+        } else if (holder instanceof HFHolder && position == 0 && header != null) {
             ((HFHolder) holder).view = header;
-        } else if(holder instanceof HFHolder && i == infoItemList.size() && footer != null && showFooter) {
+        } else if (holder instanceof HFHolder && position == sizeConsideringHeaderOffset() && footer != null && showFooter) {
             ((HFHolder) holder).view = footer;
         }
     }

app/src/main/java/org/schabi/newpipe/info_list/holder/ChannelInfoItemHolder.java

@@ -0,0 +1,66 @@
+package org.schabi.newpipe.info_list.holder;
+
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.extractor.InfoItem;
+import org.schabi.newpipe.extractor.channel.ChannelInfoItem;
+import org.schabi.newpipe.info_list.InfoItemBuilder;
+import org.schabi.newpipe.util.Localization;
+
+/*
+ * Created by Christian Schabesberger on 12.02.17.
+ *
+ * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
+ * ChannelInfoItemHolder .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 ChannelInfoItemHolder extends ChannelMiniInfoItemHolder {
+    public final TextView itemChannelDescriptionView;
+
+    public ChannelInfoItemHolder(InfoItemBuilder infoItemBuilder, ViewGroup parent) {
+        super(infoItemBuilder, R.layout.list_channel_item, parent);
+        itemChannelDescriptionView = itemView.findViewById(R.id.itemChannelDescriptionView);
+    }
+
+    @Override
+    public void updateFromItem(final InfoItem infoItem) {
+        super.updateFromItem(infoItem);
+
+        if (!(infoItem instanceof ChannelInfoItem)) return;
+        final ChannelInfoItem item = (ChannelInfoItem) infoItem;
+
+        itemChannelDescriptionView.setText(item.getDescription());
+    }
+
+    @Override
+    protected String getDetailLine(final ChannelInfoItem item) {
+        String details = super.getDetailLine(item);
+
+        if (item.getStreamCount() >= 0) {
+            String formattedVideoAmount = Localization.localizeStreamCount(itemBuilder.getContext(),
+                    item.getStreamCount());
+
+            if (!details.isEmpty()) {
+                details += " • " + formattedVideoAmount;
+            } else {
+                details = formattedVideoAmount;
+            }
+        }
+        return details;
+    }
+}

app/src/main/java/org/schabi/newpipe/info_list/holder/ChannelMiniInfoItemHolder.java

@@ -0,0 +1,60 @@
+package org.schabi.newpipe.info_list.holder;
+
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.extractor.InfoItem;
+import org.schabi.newpipe.extractor.channel.ChannelInfoItem;
+import org.schabi.newpipe.info_list.InfoItemBuilder;
+import org.schabi.newpipe.util.ImageDisplayConstants;
+import org.schabi.newpipe.util.Localization;
+
+import de.hdodenhof.circleimageview.CircleImageView;
+
+public class ChannelMiniInfoItemHolder extends InfoItemHolder {
+    public final CircleImageView itemThumbnailView;
+    public final TextView itemTitleView;
+    public final TextView itemAdditionalDetailView;
+
+    ChannelMiniInfoItemHolder(InfoItemBuilder infoItemBuilder, int layoutId, ViewGroup parent) {
+        super(infoItemBuilder, layoutId, parent);
+
+        itemThumbnailView = itemView.findViewById(R.id.itemThumbnailView);
+        itemTitleView = itemView.findViewById(R.id.itemTitleView);
+        itemAdditionalDetailView = itemView.findViewById(R.id.itemAdditionalDetails);
+    }
+
+    public ChannelMiniInfoItemHolder(InfoItemBuilder infoItemBuilder, ViewGroup parent) {
+        this(infoItemBuilder, R.layout.list_channel_mini_item, parent);
+    }
+
+    @Override
+    public void updateFromItem(final InfoItem infoItem) {
+        if (!(infoItem instanceof ChannelInfoItem)) return;
+        final ChannelInfoItem item = (ChannelInfoItem) infoItem;
+
+        itemTitleView.setText(item.getName());
+        itemAdditionalDetailView.setText(getDetailLine(item));
+
+        itemBuilder.getImageLoader()
+                .displayImage(item.getThumbnailUrl(),
+                        itemThumbnailView,
+                        ImageDisplayConstants.DISPLAY_THUMBNAIL_OPTIONS);
+
+        itemView.setOnClickListener(view -> {
+            if (itemBuilder.getOnChannelSelectedListener() != null) {
+                itemBuilder.getOnChannelSelectedListener().selected(item);
+            }
+        });
+    }
+
+    protected String getDetailLine(final ChannelInfoItem item) {
+        String details = "";
+        if (item.getSubscriberCount() >= 0) {
+            details += Localization.shortSubscriberCount(itemBuilder.getContext(),
+                    item.getSubscriberCount());
+        }
+        return details;
+    }
+}

app/src/main/java/org/schabi/newpipe/info_list/holder/InfoItemHolder.java

@@ -1,11 +1,13 @@
-package org.schabi.newpipe.info_list;
+package org.schabi.newpipe.info_list.holder;
 
 import android.support.v7.widget.RecyclerView;
-import android.view.View;
+import android.view.LayoutInflater;
+import android.view.ViewGroup;
 
 import org.schabi.newpipe.extractor.InfoItem;
+import org.schabi.newpipe.info_list.InfoItemBuilder;
 
-/**
+/*
  * Created by Christian Schabesberger on 12.02.17.
  *
  * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
@@ -26,8 +28,12 @@ import org.schabi.newpipe.extractor.InfoItem;
  */
 
 public abstract class InfoItemHolder extends RecyclerView.ViewHolder {
-    public InfoItemHolder(View v) {
-        super(v);
+    protected final InfoItemBuilder itemBuilder;
+
+    public InfoItemHolder(InfoItemBuilder infoItemBuilder, int layoutId, ViewGroup parent) {
+        super(LayoutInflater.from(infoItemBuilder.getContext()).inflate(layoutId, parent, false));
+        this.itemBuilder = infoItemBuilder;
     }
-    public abstract InfoItem.InfoType infoType();
+
+    public abstract void updateFromItem(final InfoItem infoItem);
 }

app/src/main/java/org/schabi/newpipe/info_list/holder/PlaylistInfoItemHolder.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 PlaylistInfoItemHolder extends PlaylistMiniInfoItemHolder {
+
+    public PlaylistInfoItemHolder(InfoItemBuilder infoItemBuilder, ViewGroup parent) {
+        super(infoItemBuilder, R.layout.list_playlist_item, parent);
+    }
+}

app/src/main/java/org/schabi/newpipe/info_list/holder/PlaylistMiniInfoItemHolder.java

@@ -0,0 +1,59 @@
+package org.schabi.newpipe.info_list.holder;
+
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.extractor.InfoItem;
+import org.schabi.newpipe.extractor.playlist.PlaylistInfoItem;
+import org.schabi.newpipe.info_list.InfoItemBuilder;
+import org.schabi.newpipe.util.ImageDisplayConstants;
+
+public class PlaylistMiniInfoItemHolder extends InfoItemHolder {
+    public final ImageView itemThumbnailView;
+    public final TextView itemStreamCountView;
+    public final TextView itemTitleView;
+    public final TextView itemUploaderView;
+
+    public PlaylistMiniInfoItemHolder(InfoItemBuilder infoItemBuilder, int layoutId, ViewGroup parent) {
+        super(infoItemBuilder, layoutId, parent);
+
+        itemThumbnailView = itemView.findViewById(R.id.itemThumbnailView);
+        itemTitleView = itemView.findViewById(R.id.itemTitleView);
+        itemStreamCountView = itemView.findViewById(R.id.itemStreamCountView);
+        itemUploaderView = itemView.findViewById(R.id.itemUploaderView);
+    }
+
+    public PlaylistMiniInfoItemHolder(InfoItemBuilder infoItemBuilder, ViewGroup parent) {
+        this(infoItemBuilder, R.layout.list_playlist_mini_item, parent);
+    }
+
+    @Override
+    public void updateFromItem(final InfoItem infoItem) {
+        if (!(infoItem instanceof PlaylistInfoItem)) return;
+        final PlaylistInfoItem item = (PlaylistInfoItem) infoItem;
+
+        itemTitleView.setText(item.getName());
+        itemStreamCountView.setText(String.valueOf(item.getStreamCount()));
+        itemUploaderView.setText(item.getUploaderName());
+
+        itemBuilder.getImageLoader()
+                .displayImage(item.getThumbnailUrl(), itemThumbnailView,
+                		ImageDisplayConstants.DISPLAY_THUMBNAIL_OPTIONS);
+
+        itemView.setOnClickListener(view -> {
+            if (itemBuilder.getOnPlaylistSelectedListener() != null) {
+                itemBuilder.getOnPlaylistSelectedListener().selected(item);
+            }
+        });
+
+        itemView.setLongClickable(true);
+        itemView.setOnLongClickListener(view -> {
+            if (itemBuilder.getOnPlaylistSelectedListener() != null) {
+                itemBuilder.getOnPlaylistSelectedListener().held(item);
+            }
+            return true;
+        });
+    }
+}

app/src/main/java/org/schabi/newpipe/info_list/holder/StreamInfoItemHolder.java

@@ -0,0 +1,66 @@
+package org.schabi.newpipe.info_list.holder;
+
+import android.text.TextUtils;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.extractor.InfoItem;
+import org.schabi.newpipe.extractor.stream.StreamInfoItem;
+import org.schabi.newpipe.info_list.InfoItemBuilder;
+import org.schabi.newpipe.util.Localization;
+
+/*
+ * Created by Christian Schabesberger on 01.08.16.
+ * <p>
+ * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
+ * StreamInfoItemHolder.java is part of NewPipe.
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * 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 StreamInfoItemHolder extends StreamMiniInfoItemHolder {
+
+    public final TextView itemAdditionalDetails;
+
+    public StreamInfoItemHolder(InfoItemBuilder infoItemBuilder, ViewGroup parent) {
+        super(infoItemBuilder, R.layout.list_stream_item, parent);
+        itemAdditionalDetails = itemView.findViewById(R.id.itemAdditionalDetails);
+    }
+
+    @Override
+    public void updateFromItem(final InfoItem infoItem) {
+        super.updateFromItem(infoItem);
+
+        if (!(infoItem instanceof StreamInfoItem)) return;
+        final StreamInfoItem item = (StreamInfoItem) infoItem;
+
+        itemAdditionalDetails.setText(getStreamInfoDetailLine(item));
+    }
+
+    private String getStreamInfoDetailLine(final StreamInfoItem infoItem) {
+        String viewsAndDate = "";
+        if (infoItem.getViewCount() >= 0) {
+            viewsAndDate = Localization.shortViewCount(itemBuilder.getContext(), infoItem.getViewCount());
+        }
+        if (!TextUtils.isEmpty(infoItem.getUploadDate())) {
+            if (viewsAndDate.isEmpty()) {
+                viewsAndDate = infoItem.getUploadDate();
+            } else {
+                viewsAndDate += " • " + infoItem.getUploadDate();
+            }
+        }
+        return viewsAndDate;
+    }
+}

app/src/main/java/org/schabi/newpipe/info_list/holder/StreamMiniInfoItemHolder.java

@@ -0,0 +1,100 @@
+package org.schabi.newpipe.info_list.holder;
+
+import android.support.v4.content.ContextCompat;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.extractor.InfoItem;
+import org.schabi.newpipe.extractor.stream.StreamInfoItem;
+import org.schabi.newpipe.extractor.stream.StreamType;
+import org.schabi.newpipe.info_list.InfoItemBuilder;
+import org.schabi.newpipe.util.ImageDisplayConstants;
+import org.schabi.newpipe.util.Localization;
+
+public class StreamMiniInfoItemHolder extends InfoItemHolder {
+
+    public final ImageView itemThumbnailView;
+    public final TextView itemVideoTitleView;
+    public final TextView itemUploaderView;
+    public final TextView itemDurationView;
+
+    StreamMiniInfoItemHolder(InfoItemBuilder infoItemBuilder, int layoutId, ViewGroup parent) {
+        super(infoItemBuilder, layoutId, parent);
+
+        itemThumbnailView = itemView.findViewById(R.id.itemThumbnailView);
+        itemVideoTitleView = itemView.findViewById(R.id.itemVideoTitleView);
+        itemUploaderView = itemView.findViewById(R.id.itemUploaderView);
+        itemDurationView = itemView.findViewById(R.id.itemDurationView);
+    }
+
+    public StreamMiniInfoItemHolder(InfoItemBuilder infoItemBuilder, ViewGroup parent) {
+        this(infoItemBuilder, R.layout.list_stream_mini_item, parent);
+    }
+
+    @Override
+    public void updateFromItem(final InfoItem infoItem) {
+        if (!(infoItem instanceof StreamInfoItem)) return;
+        final StreamInfoItem item = (StreamInfoItem) infoItem;
+
+        itemVideoTitleView.setText(item.getName());
+        itemUploaderView.setText(item.getUploaderName());
+
+        if (item.getDuration() > 0) {
+            itemDurationView.setText(Localization.getDurationString(item.getDuration()));
+            itemDurationView.setBackgroundColor(ContextCompat.getColor(itemBuilder.getContext(),
+                    R.color.duration_background_color));
+            itemDurationView.setVisibility(View.VISIBLE);
+        } else if (item.getStreamType() == StreamType.LIVE_STREAM) {
+            itemDurationView.setText(R.string.duration_live);
+            itemDurationView.setBackgroundColor(ContextCompat.getColor(itemBuilder.getContext(),
+                    R.color.live_duration_background_color));
+            itemDurationView.setVisibility(View.VISIBLE);
+        } else {
+            itemDurationView.setVisibility(View.GONE);
+        }
+
+        // Default thumbnail is shown on error, while loading and if the url is empty
+        itemBuilder.getImageLoader()
+                .displayImage(item.getThumbnailUrl(),
+                        itemThumbnailView,
+                        ImageDisplayConstants.DISPLAY_THUMBNAIL_OPTIONS);
+
+        itemView.setOnClickListener(view -> {
+            if (itemBuilder.getOnStreamSelectedListener() != null) {
+                itemBuilder.getOnStreamSelectedListener().selected(item);
+            }
+        });
+
+        switch (item.getStreamType()) {
+            case AUDIO_STREAM:
+            case VIDEO_STREAM:
+            case LIVE_STREAM:
+            case AUDIO_LIVE_STREAM:
+                enableLongClick(item);
+                break;
+            case FILE:
+            case NONE:
+            default:
+                disableLongClick();
+                break;
+        }
+    }
+
+    private void enableLongClick(final StreamInfoItem item) {
+        itemView.setLongClickable(true);
+        itemView.setOnLongClickListener(view -> {
+            if (itemBuilder.getOnStreamSelectedListener() != null) {
+                itemBuilder.getOnStreamSelectedListener().held(item);
+            }
+            return true;
+        });
+    }
+
+    private void disableLongClick() {
+        itemView.setLongClickable(false);
+        itemView.setOnLongClickListener(null);
+    }
+}

app/src/main/java/org/schabi/newpipe/local/BaseLocalListFragment.java

@@ -0,0 +1,177 @@
+package org.schabi.newpipe.local;
+
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.support.v7.app.ActionBar;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.util.Log;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.View;
+
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.fragments.BaseStateFragment;
+import org.schabi.newpipe.fragments.list.ListViewContract;
+
+import static org.schabi.newpipe.util.AnimationUtils.animateView;
+
+/**
+ * This fragment is design to be used with persistent data such as
+ * {@link org.schabi.newpipe.database.LocalItem}, and does not cache the data contained
+ * in the list adapter to avoid extra writes when the it exits or re-enters its lifecycle.
+ *
+ * This fragment destroys its adapter and views when {@link Fragment#onDestroyView()} is
+ * called and is memory efficient when in backstack.
+ * */
+public abstract class BaseLocalListFragment<I, N> extends BaseStateFragment<I>
+        implements ListViewContract<I, N> {
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Views
+    //////////////////////////////////////////////////////////////////////////*/
+
+    protected View headerRootView;
+    protected View footerRootView;
+
+    protected LocalItemListAdapter itemListAdapter;
+    protected RecyclerView itemsList;
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Lifecycle - Creation
+    //////////////////////////////////////////////////////////////////////////*/
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setHasOptionsMenu(true);
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Lifecycle - View
+    //////////////////////////////////////////////////////////////////////////*/
+
+    protected View getListHeader() {
+        return null;
+    }
+
+    protected View getListFooter() {
+        return activity.getLayoutInflater().inflate(R.layout.pignate_footer, itemsList, false);
+    }
+
+    protected RecyclerView.LayoutManager getListLayoutManager() {
+        return new LinearLayoutManager(activity);
+    }
+
+    @Override
+    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);
+        itemListAdapter.setHeader(headerRootView = getListHeader());
+        itemListAdapter.setFooter(footerRootView = getListFooter());
+
+        itemsList.setAdapter(itemListAdapter);
+    }
+
+    @Override
+    protected void initListeners() {
+        super.initListeners();
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Lifecycle - Menu
+    //////////////////////////////////////////////////////////////////////////*/
+
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        super.onCreateOptionsMenu(menu, inflater);
+        if (DEBUG) Log.d(TAG, "onCreateOptionsMenu() called with: menu = [" + menu +
+                "], inflater = [" + inflater + "]");
+
+        final ActionBar supportActionBar = activity.getSupportActionBar();
+        if (supportActionBar == null) return;
+
+        supportActionBar.setDisplayShowTitleEnabled(true);
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Lifecycle - Destruction
+    //////////////////////////////////////////////////////////////////////////*/
+
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        itemsList = null;
+        itemListAdapter = null;
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Contract
+    //////////////////////////////////////////////////////////////////////////*/
+
+    @Override
+    public void startLoading(boolean forceLoad) {
+        super.startLoading(forceLoad);
+        resetFragment();
+    }
+
+    @Override
+    public void showLoading() {
+        super.showLoading();
+        if (itemsList != null) animateView(itemsList, false, 200);
+        if (headerRootView != null) animateView(headerRootView, false, 200);
+    }
+
+    @Override
+    public void hideLoading() {
+        super.hideLoading();
+        if (itemsList != null) animateView(itemsList, true, 200);
+        if (headerRootView != null) animateView(headerRootView, true, 200);
+    }
+
+    @Override
+    public void showError(String message, boolean showRetryButton) {
+        super.showError(message, showRetryButton);
+        showListFooter(false);
+
+        if (itemsList != null) animateView(itemsList, false, 200);
+        if (headerRootView != null) animateView(headerRootView, false, 200);
+    }
+
+    @Override
+    public void showEmptyState() {
+        super.showEmptyState();
+        showListFooter(false);
+    }
+
+    @Override
+    public void showListFooter(final boolean show) {
+        if (itemsList == null) return;
+        itemsList.post(() -> {
+            if (itemListAdapter != null) itemListAdapter.showFooter(show);
+        });
+    }
+
+    @Override
+    public void handleNextItems(N result) {
+        isLoading.set(false);
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Error handling
+    //////////////////////////////////////////////////////////////////////////*/
+
+    protected void resetFragment() {
+        if (itemListAdapter != null) itemListAdapter.clearStreamItemList();
+    }
+
+    @Override
+    protected boolean onError(Throwable exception) {
+        resetFragment();
+        return super.onError(exception);
+    }
+}

app/src/main/java/org/schabi/newpipe/local/HeaderFooterHolder.java

@@ -0,0 +1,13 @@
+package org.schabi.newpipe.local;
+
+import android.support.v7.widget.RecyclerView;
+import android.view.View;
+
+public class HeaderFooterHolder extends RecyclerView.ViewHolder {
+    public View view;
+
+    public HeaderFooterHolder(View v) {
+        super(v);
+        view = v;
+    }
+}