moved on to v0.11.6

bla

remove unused restart function

add allert dialog and add time to filename

.github/CONTRIBUTING.md

@@ -1,40 +1,45 @@
 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
+* 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.1
 
     # 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:
   - '.+'
-

CheckTranslations.java

@@ -0,0 +1,170 @@
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import java.util.regex.*;
+import java.util.Arrays;
+import java.util.List;
+import java.util.ArrayList;
+import java.nio.file.Files;
+import java.nio.charset.Charset;
+
+public final class CheckTranslations {
+
+    private static boolean debug = false;
+    private static boolean plurals = false;
+    private static boolean empty = false;
+    private static boolean remove = false;
+    private static int checks = 0;
+    private static int matches = 0;
+    private static int changes = 0;
+    private static Pattern p, pb, pe, e, o;
+
+    /**
+     * Search translated strings.xml files for empty item / plural tags
+     * and remove them.
+     * @param args directories which contain string.xml files (in any subdirectory)
+     *             -e option to find all empty string tags
+     *             -p option to find all empty plurals and item tags
+     *             -r option to remove all occurrences from the files
+     *             -d option to see more details
+     */
+    public static void main(String[] args) {
+        if (args.length < 1 || (args[0].equals("-d") && args.length < 2)) {  
+            System.out.println("Not enough arguments");
+            return;
+        }
+        for (int i = 0; i < args.length; i++) {
+            switch (args[i]) {
+                case "-d":
+                    debug = true;
+                    break;
+                case "-p":
+                    plurals = true;
+                    break;
+                case "-e":
+                    empty = true;
+                    break;
+                case "-r":
+                    remove = true;
+                    break;
+            }
+        }
+        
+        if (!plurals && !empty) {
+            plurals = true;
+            empty = true;
+        }
+
+        p = Pattern.compile("(<item quantity=\")(zero|one|two|three|few|many|other)(\"></item>|\"/>)");
+        pb = Pattern.compile("(<plurals[\\sa-zA-Z=\"]*>)");
+        pe = Pattern.compile("(</plurals>)");
+        e = Pattern.compile("(<string[\\sa-z_\\\"=]*)((><\\/string>|\\/>){1})");
+        o = Pattern.compile("(<item quantity=\"other\">)[^</>]*(<\\/item>)");
+
+        for (int i = 0; i < args.length; i++) {
+            if (!args[i].equals("-d") && !args[i].equals("-p") && !args[i].equals("-e") && !args[i].equals("-r")) {
+                File f = new File(args[i]);
+                if (f.exists() && !f.isDirectory()) {
+                    checkFile(f);
+                } else if (f.isDirectory()) {
+                    checkFiles(f.listFiles());
+                } else {
+                    System.out.println("'" + args[i] + "' does not exist!");
+                }
+            }
+        }
+
+        System.out.println(checks + " files were checked.");
+        System.out.println(matches + " corrupt lines detected.");
+        if (remove) {
+            System.out.println(matches + " corrupt lines removed and " + changes + " lines fixed.");
+        }
+    }
+
+
+    private static void checkFiles(File[] f) {
+        for (int i = 0; i < f.length; i++) {
+            if (f[i].exists() && !f[i].isDirectory()) {
+                if (f[i].toString().contains("strings.xml")) {
+                    checkFile(f[i]);
+                }
+            } else if (f[i].isDirectory()) {
+                checkFiles(f[i].listFiles());
+            }
+        }
+    }
+
+    private static void checkFile(File f) {
+        // Do not check our original English strings to cause no unwanted changes
+        // Btw. there should not be empty plural/item tags
+        if (f.toString().contains("values/strings.xml")) {
+            return;
+        }
+        if (debug) System.out.println("Checking " + f.toString());
+        checks++;
+
+
+        List<String> lines = new ArrayList<String>();
+        boolean checkFailed = false;
+        boolean otherDetected = false;
+        boolean inPlurals = false;
+        try (BufferedReader br = new BufferedReader(new FileReader(f))) {
+            String line;
+            int ln = 0;
+            while ((line = br.readLine()) != null) {
+                ln++;
+                if (plurals && p.matcher(line).find()) {
+                    matches++;
+                    if (debug) System.out.println("    Line " + ln + " was " + ((remove) ? "removed" : "detected") + ": '" + line + "'");
+                    checkFailed = true;
+                } else if (empty && e.matcher(line).find()) {
+                    matches++;
+                    checkFailed = true;
+                    if (debug) System.out.println("    Line " + ln + " was " + ((remove) ? "removed" : "detected") + ": '" + line + "'");
+                } else {
+                    if (remove) lines.add(line);
+                }
+            }
+            br.close();
+            int pluralsLine = 0;
+            for (int i = 0; i < lines.size(); i++) {
+                if (o.matcher(lines.get(i)).find()) {
+                    otherDetected = true;
+                }
+                if (plurals && pb.matcher(lines.get(i)).find()) {
+                    inPlurals = true;
+                    pluralsLine = i;
+                } else if (plurals && pe.matcher(lines.get(i)).find()) {
+                    inPlurals = false;
+                    if (!otherDetected) {
+                        boolean b = false;
+                        check: for(int j = pluralsLine; j < i; j++) {
+                            if (lines.get(j).contains("many")) {
+                                b = true;
+                                pluralsLine = j;
+                                break check;
+                            }
+                        }
+                        if (remove && b) {
+                            if (debug) System.out.println("    Line " + (pluralsLine + 1) + " was " + ((remove) ? "changed" : "detected") + ": '" + lines.get(pluralsLine) + "'");
+                            lines.set(pluralsLine, lines.get(pluralsLine).replace("many", "other"));
+                            changes++;
+                            checkFailed = true;
+                        } else if (debug) {
+                            if (debug) System.out.println("    WARNING: Line " + (i + 1) + " - No <item quantity=\"other\"> found!");
+                        }
+                    }
+                    otherDetected = false;
+                }
+                 
+            }
+            if (remove && checkFailed) {
+                Files.write(f.toPath(), lines, Charset.forName("UTF-8"));
+            }
+        } catch (IOException e) {
+            System.out.println(e);
+        }
+    }
+}
+

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,21 +47,23 @@ 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
 
 ### Coming Features
 
+* Multiservice support (eg. SoundCloud)
 * Bookmarks
-* View history
-* Search history
-* Subscribe to channels
-* Search/Watch Playlists
-* Queeing videos
 * Subtitles support
 * livestream support
 * ... and many more
@@ -70,11 +72,27 @@ NewPipe does not use any Google framework libraries, or the YouTube API. It only
 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 or BountySource. 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://www.bountysource.com/teams/newpipe"><img src="https://upload.wikimedia.org/wikipedia/commons/thumb/2/22/Bountysource.png/320px-Bountysource.png" alz="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,38 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion '25.0.2'
+    compileSdkVersion 27
+    buildToolsVersion '27.0.1'
 
     defaultConfig {
         applicationId "org.schabi.newpipe"
         minSdkVersion 15
-        targetSdkVersion 25
-        versionCode 37
-        versionName "0.9.10"
+        targetSdkVersion 27
+        versionCode 47
+        versionName "0.11.6"
 
         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"
+        }
+        beta {
+            minifyEnabled true
+            shrinkResources true
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+
+            applicationIdSuffix ".beta"
+        }
     }
 
     lintOptions {
@@ -27,35 +42,51 @@ 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.0.2'
+}
 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:7fd21ec08581d'
 
-    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 'com.google.code.gson:gson:2.8.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:3.0.1'
+    implementation 'com.google.android.exoplayer:exoplayer:r2.5.4'
+
+    debugImplementation 'com.facebook.stetho:stetho:1.5.0'
+    debugImplementation 'com.facebook.stetho:stetho-urlconnection:1.5.0'
+    debugImplementation 'com.android.support:multidex:1.0.2'
+
+    implementation 'io.reactivex.rxjava2:rxjava:2.1.7'
+    implementation 'io.reactivex.rxjava2:rxandroid:2.0.1'
+    implementation 'com.jakewharton.rxbinding2:rxbinding:2.0.0'
+
+    implementation 'android.arch.persistence.room:runtime:1.0.0'
+    implementation 'android.arch.persistence.room:rxjava2:1.0.0'
+    annotationProcessor 'android.arch.persistence.room:compiler:1.0.0'
+
+    implementation 'frankiesardo:icepick:3.2.0'
+    annotationProcessor 'frankiesardo:icepick-processor:3.2.0'
 }

app/proguard-rules.pro

@@ -15,3 +15,23 @@
 #-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 *;}

app/src/beta/AndroidManifest.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <application
+        android:label="NewPipe Beta"
+        tools:replace="android:label">
+    </application>
+
+</manifest>

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,45 @@
+package org.schabi.newpipe;
+
+import android.content.Context;
+import android.support.multidex.MultiDex;
+
+import com.facebook.stetho.Stetho;
+
+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();
+    }
+
+    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);
+    }
+}

app/src/main/AndroidManifest.xml

@@ -16,11 +16,12 @@
         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"/>
@@ -28,15 +29,25 @@
         </activity>
 
         <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"/>
 
+        <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"
             android:exported="false"/>
@@ -45,12 +56,20 @@
             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"/>
+
         <activity
             android:name=".PanicResponderActivity"
             android:launchMode="singleInstance"
@@ -62,6 +81,7 @@
                 <category android:name="android.intent.category.DEFAULT"/>
             </intent-filter>
         </activity>
+
         <activity
             android:name=".ExitActivity"
             android:label="@string/general_error"
@@ -72,16 +92,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"/>
@@ -99,7 +123,7 @@
         <activity
             android:name=".RouterActivity"
             android:taskAffinity=""
-            android:theme="@android:style/Theme.NoDisplay">
+            android:theme="@style/RouterActivityThemeDark">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW"/>
                 <action android:name="android.media.action.MEDIA_PLAY_FROM_SEARCH"/>
@@ -121,6 +145,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"/>
@@ -148,18 +174,21 @@
             </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>
 
+        <service
+            android:name=".RouterPlayerActivity$FetcherService"
+            android:exported="false"/>
+
         <activity
-            android:name=".RouterPopupActivity"
+            android:name=".RouterPlayerActivity"
+            android:excludeFromRecents="true"
+            android:label="@string/preferred_player_share_menu_title"
             android:taskAffinity=""
-            android:theme="@android:style/Theme.NoDisplay"
-            android:label="@string/popup_mode_share_menu_title">
+            android:theme="@style/RouterActivityThemeDark">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW"/>
                 <action android:name="android.media.action.MEDIA_PLAY_FROM_SEARCH"/>
@@ -178,6 +207,11 @@
                 <data android:pathPrefix="/embed/"/>
                 <data android:pathPrefix="/watch"/>
                 <data android:pathPrefix="/attribution_link"/>
+                <!-- 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"/>
@@ -209,11 +243,5 @@
                 <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>
+</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,7 +1,14 @@
 package org.schabi.newpipe;
 
+import android.app.AlarmManager;
 import android.app.Application;
+import android.app.NotificationChannel;
+import android.app.NotificationManager;
+import android.app.PendingIntent;
 import android.content.Context;
+import android.content.Intent;
+import android.os.Build;
+import android.util.Log;
 
 import com.nostra13.universalimageloader.core.ImageLoader;
 import com.nostra13.universalimageloader.core.ImageLoaderConfiguration;
@@ -16,12 +23,20 @@ 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 io.reactivex.annotations.NonNull;
+import io.reactivex.exceptions.CompositeException;
+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 +55,101 @@ 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 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
-        try {
-            final ACRAConfiguration acraConfig = new ConfigurationBuilder(this)
-                    .setReportSenderFactoryClasses(reportSenderFactoryClasses)
-                    .build();
-            ACRA.init(this, acraConfig);
-        } 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));
-        }
+        // Initialize settings first because others inits can use its values
+        SettingsActivity.initSettings(this);
 
-        //init NewPipe
         NewPipe.init(Downloader.getInstance());
+        NewPipeDatabase.init(this);
+        StateSaver.init(this);
+        initNotificationChannel();
 
         // 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());
+        configureRxJavaErrorHandler();
     }
 
-    /**
-     * 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);
+    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();
+                }
+
+                if (throwable instanceof CompositeException) {
+                    for (Throwable element : ((CompositeException) throwable).getExceptions()) {
+                        if (checkThrowable(element)) return;
+                    }
+                }
+
+                if (checkThrowable(throwable)) return;
+
+                // Throw uncaught exception that will trigger the report system
+                Thread.currentThread().getUncaughtExceptionHandler()
+                        .uncaughtException(Thread.currentThread(), throwable);
+            }
+
+            private boolean checkThrowable(@NonNull Throwable throwable) {
+                // Don't crash the application over a simple network problem
+                return ExtractorHelper.hasAssignableCauseThrowable(throwable,
+                        IOException.class, SocketException.class, InterruptedException.class, InterruptedIOException.class);
+            }
+        });
+    }
+
+    private void initACRA() {
+        try {
+            final ACRAConfiguration acraConfig = new ConfigurationBuilder(this)
+                    .setReportSenderFactoryClasses(reportSenderFactoryClasses)
+                    .setBuildConfigClass(BuildConfig.class)
+                    .build();
+            ACRA.init(this, acraConfig);
+        } catch (ACRAConfigurationException ace) {
+            ace.printStackTrace();
+            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;
-    }
 }

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

@@ -0,0 +1,110 @@
+package org.schabi.newpipe;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.os.Bundle;
+import android.support.annotation.AttrRes;
+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.DisplayImageOptions;
+import com.nostra13.universalimageloader.core.ImageLoader;
+import com.nostra13.universalimageloader.core.display.FadeInBitmapDisplayer;
+
+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) {
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Init
+    //////////////////////////////////////////////////////////////////////////*/
+
+    protected void initViews(View rootView, Bundle savedInstanceState) {
+    }
+
+    protected void initListeners() {
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // DisplayImageOptions default configurations
+    //////////////////////////////////////////////////////////////////////////*/
+
+    public static final DisplayImageOptions BASE_OPTIONS =
+            new DisplayImageOptions.Builder().cacheInMemory(true).build();
+
+    public static final DisplayImageOptions DISPLAY_AVATAR_OPTIONS =
+            new DisplayImageOptions.Builder()
+                    .cloneFrom(BASE_OPTIONS)
+                    .showImageOnLoading(R.drawable.buddy)
+                    .showImageForEmptyUri(R.drawable.buddy)
+                    .showImageOnFail(R.drawable.buddy)
+                    .build();
+
+    public static final DisplayImageOptions DISPLAY_THUMBNAIL_OPTIONS =
+            new DisplayImageOptions.Builder()
+                    .cloneFrom(BASE_OPTIONS)
+                    .displayer(new FadeInBitmapDisplayer(250))
+                    .showImageForEmptyUri(R.drawable.dummy_thumbnail)
+                    .showImageOnFail(R.drawable.dummy_thumbnail)
+                    .build();
+
+    public static final DisplayImageOptions DISPLAY_BANNER_OPTIONS =
+            new DisplayImageOptions.Builder()
+                    .cloneFrom(BASE_OPTIONS)
+                    .showImageOnLoading(R.drawable.channel_banner)
+                    .showImageForEmptyUri(R.drawable.channel_banner)
+                    .showImageOnFail(R.drawable.channel_banner)
+                    .build();
+}

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

@@ -1,12 +1,15 @@
 package org.schabi.newpipe;
 
+import android.util.Log;
+
 import org.schabi.newpipe.extractor.exceptions.ReCaptchaException;
+import org.schabi.newpipe.util.ExtractorHelper;
 
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
+import java.io.InterruptedIOException;
 import java.net.URL;
-import java.net.UnknownHostException;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
@@ -14,7 +17,7 @@ import java.util.Map;
 import javax.net.ssl.HttpsURLConnection;
 
 
-/**
+/*
  * Created by Christian Schabesberger on 28.01.16.
  *
  * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
@@ -35,16 +38,17 @@ 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";
+
+    public 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 = "";
 
     private static Downloader instance = null;
 
-    private Downloader() {}
+    private Downloader() {
+    }
 
     public static Downloader getInstance() {
-        if(instance == null) {
+        if (instance == null) {
             synchronized (Downloader.class) {
                 if (instance == null) {
                     instance = new Downloader();
@@ -62,41 +66,66 @@ public class Downloader implements org.schabi.newpipe.extractor.Downloader {
         return Downloader.mCookies;
     }
 
-    /**Download the text file at the supplied URL as in download(String),
+    /**
+     * 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());
+        while (it.hasNext()) {
+            Map.Entry pair = (Map.Entry) it.next();
+            con.setRequestProperty((String) pair.getKey(), (String) pair.getValue());
         }
         return dl(con);
     }
 
-    /**Common functionality between download(String url) and download(String url, String language)*/
+    /**
+     * 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
+     */
+    @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);
+    }
+
+    /**
+     * 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;
 
         try {
+            con.setReadTimeout(30 * 1000);// 30s
             con.setRequestMethod("GET");
             con.setRequestProperty("User-Agent", USER_AGENT);
 
@@ -104,17 +133,19 @@ public class Downloader implements org.schabi.newpipe.extractor.Downloader {
                 con.setRequestProperty("Cookie", getCookies());
             }
 
-            in = new BufferedReader(
-                    new InputStreamReader(con.getInputStream()));
-            String inputLine;
+            in = new BufferedReader(new InputStreamReader(con.getInputStream()));
 
-            while((inputLine = in.readLine()) != null) {
+            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) {
+        } catch (Exception e) {
+            Log.e("Downloader", "dl() ----- Exception thrown → " + e.getClass().getName());
+
+            if (ExtractorHelper.isInterruptedCaused(e)) {
+                throw new InterruptedIOException(e.getMessage());
+            }
+
             /*
              * HTTP 429 == Too Many Request
              * Receive from Youtube.com = ReCaptcha challenge request
@@ -123,24 +154,14 @@ public class Downloader implements org.schabi.newpipe.extractor.Downloader {
             if (con.getResponseCode() == 429) {
                 throw new ReCaptchaException("reCaptcha Challenge requested");
             }
-            throw new IOException(e);
+
+            throw new IOException(con.getResponseCode() + " " + con.getResponseMessage(), e);
         } finally {
-            if(in != null) {
+            if (in != null) {
                 in.close();
             }
         }
 
         return response.toString();
     }
-
-    /**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*/
-    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);
-    }
 }

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/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

@@ -23,9 +23,17 @@ package org.schabi.newpipe;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.os.Bundle;
+import android.os.Handler;
+import android.os.Looper;
 import android.preference.PreferenceManager;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+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;
@@ -34,19 +42,41 @@ import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 
-import org.schabi.newpipe.download.DownloadActivity;
+import org.schabi.newpipe.database.AppDatabase;
+import org.schabi.newpipe.database.history.dao.HistoryDAO;
+import org.schabi.newpipe.database.history.dao.SearchHistoryDAO;
+import org.schabi.newpipe.database.history.dao.WatchHistoryDAO;
+import org.schabi.newpipe.database.history.model.HistoryEntry;
+import org.schabi.newpipe.database.history.model.SearchHistoryEntry;
+import org.schabi.newpipe.database.history.model.WatchHistoryEntry;
 import org.schabi.newpipe.extractor.StreamingService;
+import org.schabi.newpipe.extractor.stream.AudioStream;
+import org.schabi.newpipe.extractor.stream.StreamInfo;
+import org.schabi.newpipe.extractor.stream.VideoStream;
+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.history.HistoryListener;
 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 {
+import java.util.Date;
+
+import io.reactivex.disposables.Disposable;
+import io.reactivex.functions.Consumer;
+import io.reactivex.schedulers.Schedulers;
+import io.reactivex.subjects.PublishSubject;
+
+public class MainActivity extends AppCompatActivity implements HistoryListener {
     private static final String TAG = "MainActivity";
-    public static final boolean DEBUG = false;
+    public static final boolean DEBUG = !BuildConfig.BUILD_TYPE.equals("release");
+
+    private SharedPreferences sharedPreferences;
+    private ActionBarDrawerToggle toggle = null;
 
     /*//////////////////////////////////////////////////////////////////////////
     // Activity's LifeCycle
@@ -55,7 +85,10 @@ public class MainActivity extends AppCompatActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         if (DEBUG) Log.d(TAG, "onCreate() called with: savedInstanceState = [" + savedInstanceState + "]");
-        ThemeHelper.setTheme(this);
+
+        sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this);
+        ThemeHelper.setTheme(this, ServiceHelper.getSelectedServiceId(this));
+
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
 
@@ -63,8 +96,61 @@ public class MainActivity extends AppCompatActivity {
             initFragments();
         }
 
-        Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
-        setSupportActionBar(toolbar);
+        setSupportActionBar(findViewById(R.id.toolbar));
+        setupDrawer();
+        initHistory();
+    }
+
+    private void setupDrawer() {
+        final Toolbar toolbar = findViewById(R.id.toolbar);
+        final DrawerLayout drawer = findViewById(R.id.drawer_layout);
+        final NavigationView drawerItems = findViewById(R.id.navigation);
+
+        //drawerItems.setItemIconTintList(null); // Set null to use the original icon
+        drawerItems.getMenu().getItem(ServiceHelper.getSelectedServiceId(this)).setChecked(true);
+
+        if (!BuildConfig.BUILD_TYPE.equals("release")) {
+            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(item -> {
+                if (item.getGroupId() == R.id.menu_services_group) {
+                    drawerItems.getMenu().getItem(ServiceHelper.getSelectedServiceId(this)).setChecked(false);
+                    ServiceHelper.setSelectedServiceId(this, item.getTitle().toString());
+                    drawerItems.getMenu().getItem(ServiceHelper.getSelectedServiceId(this)).setChecked(true);
+                }
+                drawer.closeDrawers();
+                return true;
+            });
+        } else {
+            drawer.setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_CLOSED);
+        }
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        if (!isChangingConfigurations()) {
+            StateSaver.clearStateFiles();
+        }
+
+        disposeHistory();
     }
 
     @Override
@@ -75,9 +161,16 @@ public class MainActivity extends AppCompatActivity {
         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 +193,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 +204,38 @@ public class MainActivity extends AppCompatActivity {
         } else super.onBackPressed();
     }
 
+    /**
+     * 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 +259,11 @@ public class MainActivity extends AppCompatActivity {
 
         ActionBar actionBar = getSupportActionBar();
         if (actionBar != null) {
-            actionBar.setDisplayShowTitleEnabled(false);
             actionBar.setDisplayHomeAsUpEnabled(false);
         }
+
+        updateDrawerNavigation();
+
         return true;
     }
 
@@ -143,20 +273,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: {
+            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_about:
                 NavigationHelper.openAbout(this);
                 return true;
+            case R.id.action_history:
+                NavigationHelper.openHistory(this);
+                return true;
             default:
                 return super.onOptionsItemSelected(item);
         }
@@ -167,6 +297,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 +308,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 +344,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);
@@ -201,4 +357,75 @@ public class MainActivity extends AppCompatActivity {
             NavigationHelper.gotoMainFragment(getSupportFragmentManager());
         }
     }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // History
+    //////////////////////////////////////////////////////////////////////////*/
+
+    private WatchHistoryDAO watchHistoryDAO;
+    private SearchHistoryDAO searchHistoryDAO;
+    private PublishSubject<HistoryEntry> historyEntrySubject;
+    private Disposable disposable;
+
+    private void initHistory() {
+        final AppDatabase database = NewPipeDatabase.getInstance();
+        watchHistoryDAO = database.watchHistoryDAO();
+        searchHistoryDAO = database.searchHistoryDAO();
+        historyEntrySubject = PublishSubject.create();
+        disposable = historyEntrySubject
+                .observeOn(Schedulers.io())
+                .subscribe(getHistoryEntryConsumer());
+    }
+
+    private void disposeHistory() {
+        if (disposable != null) disposable.dispose();
+        watchHistoryDAO = null;
+        searchHistoryDAO = null;
+    }
+
+    @NonNull
+    private Consumer<HistoryEntry> getHistoryEntryConsumer() {
+        return new Consumer<HistoryEntry>() {
+            @Override
+            public void accept(HistoryEntry historyEntry) throws Exception {
+                //noinspection unchecked
+                HistoryDAO<HistoryEntry> historyDAO = (HistoryDAO<HistoryEntry>)
+                        (historyEntry instanceof SearchHistoryEntry ? searchHistoryDAO : watchHistoryDAO);
+
+                HistoryEntry latestEntry = historyDAO.getLatestEntry();
+                if (historyEntry.hasEqualValues(latestEntry)) {
+                    latestEntry.setCreationDate(historyEntry.getCreationDate());
+                    historyDAO.update(latestEntry);
+                } else {
+                    historyDAO.insert(historyEntry);
+                }
+            }
+        };
+    }
+
+    private void addWatchHistoryEntry(StreamInfo streamInfo) {
+        if (sharedPreferences.getBoolean(getString(R.string.enable_watch_history_key), true)) {
+            WatchHistoryEntry entry = new WatchHistoryEntry(streamInfo);
+            historyEntrySubject.onNext(entry);
+        }
+    }
+
+    @Override
+    public void onVideoPlayed(StreamInfo streamInfo, @Nullable VideoStream videoStream) {
+        addWatchHistoryEntry(streamInfo);
+    }
+
+    @Override
+    public void onAudioPlayed(StreamInfo streamInfo, AudioStream audioStream) {
+        addWatchHistoryEntry(streamInfo);
+    }
+
+    @Override
+    public void onSearch(int serviceId, String query) {
+        // Add search history entry
+        if (sharedPreferences.getBoolean(getString(R.string.enable_search_history_key), true)) {
+            SearchHistoryEntry searchHistoryEntry = new SearchHistoryEntry(new Date(), serviceId, query);
+            historyEntrySubject.onNext(searchHistoryEntry);
+        }
+    }
 }

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

@@ -0,0 +1,31 @@
+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;
+
+public final class NewPipeDatabase {
+
+    private static AppDatabase databaseInstance;
+
+    private NewPipeDatabase() {
+        //no instance
+    }
+
+    public static void init(Context context) {
+        databaseInstance = Room.databaseBuilder(context.getApplicationContext(),
+                AppDatabase.class, DATABASE_NAME
+        ).build();
+    }
+
+    @NonNull
+    public static AppDatabase getInstance() {
+        if (databaseInstance == null) throw new RuntimeException("Database not initialized");
+
+        return databaseInstance;
+    }
+}

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();

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

@@ -1,55 +1,113 @@
 package org.schabi.newpipe;
 
-import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
+import android.text.TextUtils;
 import android.widget.Toast;
 
+import org.schabi.newpipe.extractor.exceptions.ExtractionException;
+import org.schabi.newpipe.report.UserAction;
+import org.schabi.newpipe.util.ExtractorHelper;
 import org.schabi.newpipe.util.NavigationHelper;
 
 import java.util.Collection;
 import java.util.HashSet;
 
+import icepick.Icepick;
+import icepick.State;
+import io.reactivex.Observable;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.disposables.CompositeDisposable;
+import io.reactivex.schedulers.Schedulers;
+
 /*
  * Copyright (C) Christian Schabesberger 2017 <chris.schabesberger@mailbox.org>
- * RouterActivity .java is part of NewPipe.
+ * RouterActivity.java is part of NewPipe.
  *
- * OpenHitboxStreams is free software: you can redistribute it and/or modify
+ * 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.
  *
- * OpenHitboxStreams is distributed in the hope that it will be useful,
+ * 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 OpenHitboxStreams.  If not, see <http://www.gnu.org/licenses/>.
+ * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  * 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.
  */
-public class RouterActivity extends Activity {
+public class RouterActivity extends AppCompatActivity {
+
+    @State
+    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();
+            }
+        }
+    }
+
+    @Override
+    protected void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+        Icepick.saveInstanceState(this, outState);
+    }
+
+    @Override
+    protected void onStart() {
+        super.onStart();
+        handleUrl(currentUrl);
+    }
+
+    protected void handleUrl(String url) {
+        disposables.add(Observable
+                .fromCallable(() -> NavigationHelper.getIntentByLink(this, url))
+                .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)
+        );
+    }
+
+    protected 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();
-        }
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+
+        disposables.clear();
     }
 
     /*//////////////////////////////////////////////////////////////////////////
@@ -72,7 +130,8 @@ 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;

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

@@ -0,0 +1,413 @@
+package org.schabi.newpipe;
+
+import android.app.IntentService;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.os.Bundle;
+import android.os.PersistableBundle;
+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.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.ServiceList;
+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.playlist.ChannelPlayQueue;
+import org.schabi.newpipe.playlist.PlayQueue;
+import org.schabi.newpipe.playlist.PlaylistPlayQueue;
+import org.schabi.newpipe.playlist.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.Arrays;
+
+import icepick.State;
+import io.reactivex.Observable;
+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;
+
+import static org.schabi.newpipe.util.ThemeHelper.resolveResourceIdFromAttr;
+
+/**
+ * Get the url from the intent and open it in the chosen preferred player
+ */
+public class RouterPlayerActivity extends RouterActivity {
+
+    @State
+    protected int currentServiceId = -1;
+    private StreamingService currentService;
+    @State
+    protected LinkType currentLinkType;
+    @State
+    protected int selectedRadioPosition = -1;
+    protected int selectedPreviously = -1;
+
+    @Override
+    public void onCreate(@Nullable Bundle savedInstanceState, @Nullable PersistableBundle persistentState) {
+        super.onCreate(savedInstanceState, persistentState);
+        setTheme(ThemeHelper.isLightThemeSelected(this) ? R.style.RouterActivityThemeLight : R.style.RouterActivityThemeDark);
+    }
+
+    @Override
+    protected void handleUrl(String url) {
+        disposables.add(Observable
+                .fromCallable(() -> {
+                    if (currentServiceId == -1) {
+                        currentService = NewPipe.getServiceByUrl(url);
+                        currentServiceId = currentService.getServiceId();
+                        currentLinkType = currentService.getLinkTypeByUrl(url);
+                        currentUrl = NavigationHelper.getCleanUrl(currentService, url, currentLinkType);
+                    } else {
+                        currentService = NewPipe.getService(currentServiceId);
+                    }
+
+                    return currentLinkType != LinkType.NONE;
+                })
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(result -> {
+                    if (result) {
+                        onSuccess();
+                    } else {
+                        onError();
+                    }
+                }, this::handleError));
+    }
+
+    protected 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);
+        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);
+
+        if ((isExtAudioEnabled || isExtVideoEnabled) && currentLinkType != LinkType.STREAM) {
+            Toast.makeText(this, R.string.external_player_unsupported_link_type, Toast.LENGTH_LONG).show();
+            finish();
+            return;
+        }
+
+        // TODO: Add some sort of "capabilities" field to services (audio only, video and audio, etc.)
+        if (currentService == ServiceList.SoundCloud.getService()) {
+            handleChoice(getString(R.string.background_player_key));
+            return;
+        }
+
+        final String playerChoiceKey = preferences.getString(getString(R.string.preferred_player_key), getString(R.string.preferred_player_default));
+        final String alwaysAskKey = getString(R.string.always_ask_player_key);
+
+        if (playerChoiceKey.equals(alwaysAskKey)) {
+            showDialog();
+        } else {
+            handleChoice(playerChoiceKey);
+        }
+    }
+
+    private void showDialog() {
+        SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(this);
+        final ContextThemeWrapper themeWrapper = new ContextThemeWrapper(this,
+                ThemeHelper.isLightThemeSelected(this) ? R.style.LightTheme : R.style.DarkTheme);
+
+        LayoutInflater inflater = LayoutInflater.from(themeWrapper);
+        final LinearLayout rootLayout = (LinearLayout) inflater.inflate(R.layout.preferred_player_dialog_view, null, false);
+        final RadioGroup radioGroup = rootLayout.findViewById(android.R.id.list);
+
+        final AdapterChoiceItem[] choices = {
+                new AdapterChoiceItem(getString(R.string.video_player_key), getString(R.string.video_player),
+                        resolveResourceIdFromAttr(themeWrapper, R.attr.play)),
+                new AdapterChoiceItem(getString(R.string.background_player_key), getString(R.string.background_player),
+                        resolveResourceIdFromAttr(themeWrapper, R.attr.audio)),
+                new AdapterChoiceItem(getString(R.string.popup_player_key), getString(R.string.popup_player),
+                        resolveResourceIdFromAttr(themeWrapper, R.attr.popup))
+        };
+
+        final DialogInterface.OnClickListener dialogButtonsClickListener = (dialog, which) -> {
+            final int indexOfChild = radioGroup.indexOfChild(radioGroup.findViewById(radioGroup.getCheckedRadioButtonId()));
+            final AdapterChoiceItem choice = choices[indexOfChild];
+
+            handleChoice(choice.key);
+
+            if (which == DialogInterface.BUTTON_POSITIVE) {
+                preferences.edit().putString(getString(R.string.preferred_player_key), choice.key).apply();
+            }
+        };
+
+        final AlertDialog alertDialog = new AlertDialog.Builder(themeWrapper)
+                .setTitle(R.string.preferred_player_share_menu_title)
+                .setView(radioGroup)
+                .setCancelable(true)
+                .setNegativeButton(R.string.just_once, dialogButtonsClickListener)
+                .setPositiveButton(R.string.always, dialogButtonsClickListener)
+                .setOnDismissListener((dialog) -> finish())
+                .create();
+
+        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[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_player_last_selected_key), null);
+            if (!TextUtils.isEmpty(lastSelectedPlayer)) {
+                for (int i = 0; i < choices.length; i++) {
+                    AdapterChoiceItem c = choices[i];
+                    if (lastSelectedPlayer.equals(c.key)) {
+                        selectedRadioPosition = i;
+                        break;
+                    }
+                }
+            }
+        }
+
+        selectedRadioPosition = Math.min(Math.max(-1, selectedRadioPosition), choices.length - 1);
+        if (selectedRadioPosition != -1) {
+            ((RadioButton) radioGroup.getChildAt(selectedRadioPosition)).setChecked(true);
+        }
+        selectedPreviously = selectedRadioPosition;
+
+        alertDialog.show();
+    }
+
+    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 playerChoiceKey) {
+        if (Arrays.asList(getResources().getStringArray(R.array.preferred_player_values_list)).contains(playerChoiceKey)) {
+            PreferenceManager.getDefaultSharedPreferences(this).edit()
+                    .putString(getString(R.string.preferred_player_last_selected_key), playerChoiceKey).apply();
+        }
+
+        if (playerChoiceKey.equals(getString(R.string.popup_player_key)) && !PermissionHelper.isPopupEnabled(this)) {
+            PermissionHelper.showPopupEnablementToast(this);
+            finish();
+            return;
+        }
+
+        final Intent intent = new Intent(this, FetcherService.class);
+        intent.putExtra(FetcherService.KEY_CHOICE, new Choice(currentService.getServiceId(), currentLinkType, currentUrl, playerChoiceKey));
+        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));
+        }
+    }
+}

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

@@ -36,11 +36,13 @@ public class AboutActivity extends AppCompatActivity {
             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 +67,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 +75,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 +129,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 +153,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,26 @@
+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.Converters;
+import org.schabi.newpipe.database.history.dao.SearchHistoryDAO;
+import org.schabi.newpipe.database.history.dao.WatchHistoryDAO;
+import org.schabi.newpipe.database.history.model.SearchHistoryEntry;
+import org.schabi.newpipe.database.history.model.WatchHistoryEntry;
+import org.schabi.newpipe.database.subscription.SubscriptionDAO;
+import org.schabi.newpipe.database.subscription.SubscriptionEntity;
+
+@TypeConverters({Converters.class})
+@Database(entities = {SubscriptionEntity.class, WatchHistoryEntry.class, SearchHistoryEntry.class}, version = 1, exportSchema = false)
+public abstract class AppDatabase extends RoomDatabase {
+
+    public static final String DATABASE_NAME = "newpipe.db";
+
+    public abstract SubscriptionDAO subscriptionDAO();
+
+    public abstract WatchHistoryDAO watchHistoryDAO();
+
+    public abstract SearchHistoryDAO searchHistoryDAO();
+}

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

@@ -0,0 +1,49 @@
+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);
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    long upsert(final Entity entity);
+
+    /* 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/history/Converters.java

@@ -0,0 +1,28 @@
+package org.schabi.newpipe.database.history;
+
+import android.arch.persistence.room.TypeConverter;
+
+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();
+    }
+}

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,47 @@
+package org.schabi.newpipe.database.history.dao;
+
+import android.arch.persistence.room.Dao;
+import android.arch.persistence.room.Query;
+
+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 + ")")
+    @Override
+    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/WatchHistoryDAO.java

@@ -0,0 +1,37 @@
+package org.schabi.newpipe.database.history.dao;
+
+import android.arch.persistence.room.Dao;
+import android.arch.persistence.room.Query;
+
+import org.schabi.newpipe.database.history.model.WatchHistoryEntry;
+
+import java.util.List;
+
+import io.reactivex.Flowable;
+
+import static org.schabi.newpipe.database.history.model.WatchHistoryEntry.CREATION_DATE;
+import static org.schabi.newpipe.database.history.model.WatchHistoryEntry.ID;
+import static org.schabi.newpipe.database.history.model.WatchHistoryEntry.SERVICE_ID;
+import static org.schabi.newpipe.database.history.model.WatchHistoryEntry.TABLE_NAME;
+
+@Dao
+public interface WatchHistoryDAO extends HistoryDAO<WatchHistoryEntry> {
+
+    String ORDER_BY_CREATION_DATE = " ORDER BY " + CREATION_DATE + " DESC";
+
+    @Query("SELECT * FROM " + TABLE_NAME + " WHERE " + ID + " = (SELECT MAX(" + ID + ") FROM " + TABLE_NAME + ")")
+    @Override
+    WatchHistoryEntry getLatestEntry();
+
+    @Query("DELETE FROM " + TABLE_NAME)
+    @Override
+    int deleteAll();
+
+    @Query("SELECT * FROM " + TABLE_NAME + ORDER_BY_CREATION_DATE)
+    @Override
+    Flowable<List<WatchHistoryEntry>> getAll();
+
+    @Query("SELECT * FROM " + TABLE_NAME + " WHERE " + SERVICE_ID + " = :serviceId" + ORDER_BY_CREATION_DATE)
+    @Override
+    Flowable<List<WatchHistoryEntry>> listByService(int serviceId);
+}

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

@@ -0,0 +1,60 @@
+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.PrimaryKey;
+
+import java.util.Date;
+
+@Entity
+public abstract class HistoryEntry {
+
+    public static final String ID = "id";
+    public static final String SERVICE_ID = "service_id";
+    public static final String CREATION_DATE = "creation_date";
+
+    @ColumnInfo(name = CREATION_DATE)
+    private Date creationDate;
+
+    @ColumnInfo(name = SERVICE_ID)
+    private int serviceId;
+
+    @ColumnInfo(name = ID)
+    @PrimaryKey(autoGenerate = true)
+    private long id;
+
+    public HistoryEntry(Date creationDate, int serviceId) {
+        this.serviceId = serviceId;
+        this.creationDate = creationDate;
+    }
+
+    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;
+    }
+
+    @Ignore
+    public boolean hasEqualValues(HistoryEntry otherEntry) {
+        return otherEntry != null && getServiceId() == otherEntry.getServiceId();
+    }
+}

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

@@ -0,0 +1,37 @@
+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 java.util.Date;
+
+@Entity(tableName = SearchHistoryEntry.TABLE_NAME)
+public class SearchHistoryEntry extends HistoryEntry {
+
+    public static final String TABLE_NAME = "search_history";
+    public static final String SEARCH = "search";
+
+    @ColumnInfo(name = SEARCH)
+    private String search;
+
+    public SearchHistoryEntry(Date creationDate, int serviceId, String search) {
+        super(creationDate, serviceId);
+        this.search = search;
+    }
+
+    public String getSearch() {
+        return search;
+    }
+
+    public void setSearch(String search) {
+        this.search = search;
+    }
+
+    @Ignore
+    @Override
+    public boolean hasEqualValues(HistoryEntry otherEntry) {
+        return otherEntry instanceof SearchHistoryEntry && super.hasEqualValues(otherEntry)
+                && getSearch().equals(((SearchHistoryEntry) otherEntry).getSearch());
+    }
+}

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

@@ -0,0 +1,109 @@
+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 org.schabi.newpipe.extractor.stream.StreamInfo;
+
+import java.util.Date;
+
+@Entity(tableName = WatchHistoryEntry.TABLE_NAME)
+public class WatchHistoryEntry extends HistoryEntry {
+
+    public static final String TABLE_NAME = "watch_history";
+    public static final String TITLE = "title";
+    public static final String URL = "url";
+    public static final String STREAM_ID = "stream_id";
+    public static final String THUMBNAIL_URL = "thumbnail_url";
+    public static final String UPLOADER = "uploader";
+    public static final String DURATION = "duration";
+
+    @ColumnInfo(name = TITLE)
+    private String title;
+
+    @ColumnInfo(name = URL)
+    private String url;
+
+    @ColumnInfo(name = STREAM_ID)
+    private String streamId;
+
+    @ColumnInfo(name = THUMBNAIL_URL)
+    private String thumbnailURL;
+
+    @ColumnInfo(name = UPLOADER)
+    private String uploader;
+
+    @ColumnInfo(name = DURATION)
+    private long duration;
+
+    public WatchHistoryEntry(Date creationDate, int serviceId, String title, String url, String streamId, String thumbnailURL, String uploader, long duration) {
+        super(creationDate, serviceId);
+        this.title = title;
+        this.url = url;
+        this.streamId = streamId;
+        this.thumbnailURL = thumbnailURL;
+        this.uploader = uploader;
+        this.duration = duration;
+    }
+
+    public WatchHistoryEntry(StreamInfo streamInfo) {
+        this(new Date(), streamInfo.getServiceId(), streamInfo.getName(), streamInfo.getUrl(),
+                streamInfo.id, streamInfo.thumbnail_url, streamInfo.uploader_name, streamInfo.duration);
+    }
+
+    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 String getStreamId() {
+        return streamId;
+    }
+
+    public void setStreamId(String streamId) {
+        this.streamId = streamId;
+    }
+
+    public String getThumbnailURL() {
+        return thumbnailURL;
+    }
+
+    public void setThumbnailURL(String thumbnailURL) {
+        this.thumbnailURL = thumbnailURL;
+    }
+
+    public String getUploader() {
+        return uploader;
+    }
+
+    public void setUploader(String uploader) {
+        this.uploader = uploader;
+    }
+
+    public long getDuration() {
+        return duration;
+    }
+
+    public void setDuration(int duration) {
+        this.duration = duration;
+    }
+
+    @Ignore
+    @Override
+    public boolean hasEqualValues(HistoryEntry otherEntry) {
+        return otherEntry instanceof WatchHistoryEntry && super.hasEqualValues(otherEntry)
+                && getUrl().equals(((WatchHistoryEntry) otherEntry).getUrl());
+    }
+}

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

@@ -0,0 +1,34 @@
+package org.schabi.newpipe.database.subscription;
+
+import android.arch.persistence.room.Dao;
+import android.arch.persistence.room.Query;
+
+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_URL;
+
+@Dao
+public interface SubscriptionDAO extends BasicDAO<SubscriptionEntity> {
+    @Override
+    @Query("SELECT * FROM " + SUBSCRIPTION_TABLE)
+    Flowable<List<SubscriptionEntity>> getAll();
+
+    @Override
+    @Query("DELETE FROM " + SUBSCRIPTION_TABLE)
+    int deleteAll();
+
+    @Override
+    @Query("SELECT * FROM " + SUBSCRIPTION_TABLE + " WHERE " + SUBSCRIPTION_SERVICE_ID + " = :serviceId")
+    Flowable<List<SubscriptionEntity>> listByService(int serviceId);
+
+    @Query("SELECT * FROM " + SUBSCRIPTION_TABLE + " WHERE " +
+            SUBSCRIPTION_URL + " LIKE :url AND " +
+            SUBSCRIPTION_SERVICE_ID + " = :serviceId")
+    Flowable<List<SubscriptionEntity>> getSubscription(int serviceId, String url);
+}

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

@@ -0,0 +1,125 @@
+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 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_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;
+    }
+
+    /* Keep this package-private since UID should always be auto generated by Room impl */
+    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.thumbnail_url = getAvatarUrl();
+        item.subscriber_count = getSubscriberCount();
+        item.description = getDescription();
+        return item;
+    }
+}

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

@@ -22,14 +22,15 @@ import android.widget.TextView;
 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.extractor.stream.AudioStream;
+import org.schabi.newpipe.extractor.stream.StreamInfo;
+import org.schabi.newpipe.extractor.stream.VideoStream;
 import org.schabi.newpipe.fragments.detail.SpinnerToolbarAdapter;
 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.ThemeHelper;
-import org.schabi.newpipe.util.Utils;
 
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -106,19 +107,19 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
     @Override
     public void onViewCreated(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));
+        initToolbar(view.<Toolbar>findViewById(R.id.toolbar));
         checkDownloadOptions(view);
         setupVideoSpinner(sortedStreamVideosList, streamsSpinner);
 
@@ -134,12 +135,10 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
 
             @Override
             public void onStartTrackingTouch(SeekBar p1) {
-
             }
 
             @Override
             public void onStopTrackingTouch(SeekBar p1) {
-
             }
         });
     }
@@ -184,7 +183,7 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
         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";
+            items[i] = audioStream.getFormat().getName() + " " + audioStream.getAverageBitrate() + "kbps";
         }
 
         ArrayAdapter<String> itemAdapter = new ArrayAdapter<>(getContext(), android.R.layout.simple_spinner_dropdown_item, items);
@@ -240,10 +239,10 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
     //////////////////////////////////////////////////////////////////////////*/
 
     protected void checkDownloadOptions(View view) {
-        RadioButton audioButton = (RadioButton) view.findViewById(R.id.audio_button);
-        RadioButton videoButton = (RadioButton) view.findViewById(R.id.video_button);
+        RadioButton audioButton = view.findViewById(R.id.audio_button);
+        RadioButton videoButton = view.findViewById(R.id.video_button);
 
-        if (currentInfo.audio_streams == null || currentInfo.audio_streams.size() == 0) {
+        if (currentInfo.getAudioStreams() == null || currentInfo.getAudioStreams().size() == 0) {
             audioButton.setVisibility(View.GONE);
             videoButton.setChecked(true);
         } else if (sortedStreamVideosList == null || sortedStreamVideosList.size() == 0) {
@@ -252,37 +251,23 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
         }
     }
 
-    /**
-     * #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 downloadSelected() {
         String url, 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) fileName += "." + MediaFormat.getSuffixById(currentInfo.audio_streams.get(selectedAudioIndex).format);
-        else fileName += "." + MediaFormat.getSuffixById(sortedStreamVideosList.get(selectedVideoIndex).format);
+        if (isAudio) {
+            url = currentInfo.getAudioStreams().get(selectedAudioIndex).getUrl();
+            location = NewPipeSettings.getAudioDownloadPath(getContext());
+            fileName += "." + currentInfo.getAudioStreams().get(selectedAudioIndex).getFormat().getSuffix();
+        } else {
+            url = sortedStreamVideosList.get(selectedVideoIndex).getUrl();
+            location = NewPipeSettings.getVideoDownloadPath(getContext());
+            fileName += "." + sortedStreamVideosList.get(selectedVideoIndex).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,268 @@
+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
+    //////////////////////////////////////////////////////////////////////////*/
+
+    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);
+        }
+    }
+
+    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,98 @@
 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.fragments.list.feed.FeedFragment;
+import org.schabi.newpipe.fragments.list.kiosk.KioskFragment;
+import org.schabi.newpipe.fragments.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.getId();
+    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);
+
+        if (isSubscriptionsPageOnlySelected()) {
+            tabLayout.getTabAt(0).setIcon(channelIcon);
+        } else {
+            tabLayout.getTabAt(0).setIcon(whatsHotIcon);
+            tabLayout.getTabAt(1).setIcon(channelIcon);
+        }
+    }
+
     /*//////////////////////////////////////////////////////////////////////////
     // Menu
     //////////////////////////////////////////////////////////////////////////*/
@@ -57,10 +102,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(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 +123,141 @@ 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:
+                    return new SubscriptionFragment();
+                default:
+                    return new BlankFragment();
+            }
+        }
+
+        @Override
+        public CharSequence getPageTitle(int position) {
+            //return getString(this.tabTitles[position]);
+            return "";
+        }
+
+        @Override
+        public int getCount() {
+            return isSubscriptionsPageOnlySelected() ? 1 : 2;
+        }
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // 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() {
+        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

@@ -12,12 +12,12 @@ 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 org.schabi.newpipe.extractor.stream.VideoStream;
+import org.schabi.newpipe.util.ListHelper;
 
 import java.util.List;
 
-/**
+/*
  * Created by Christian Schabesberger on 18.08.15.
  * <p>
  * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
@@ -68,7 +68,7 @@ class ActionBarHandler {
     public void setupStreamList(final List<VideoStream> videoStreams, Spinner toolbarSpinner) {
         if (activity == null) return;
 
-        selectedVideoStream = Utils.getDefaultResolution(activity, videoStreams);
+        selectedVideoStream = ListHelper.getDefaultResolutionIndex(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));

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

@@ -11,7 +11,7 @@ import android.widget.TextView;
 
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.extractor.MediaFormat;
-import org.schabi.newpipe.extractor.stream_info.VideoStream;
+import org.schabi.newpipe.extractor.stream.VideoStream;
 
 import java.util.List;
 
@@ -57,10 +57,10 @@ public class SpinnerToolbarAdapter extends BaseAdapter {
             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);
+        ImageView woSoundIcon = convertView.findViewById(R.id.wo_sound_icon);
+        TextView text = convertView.findViewById(android.R.id.text1);
         VideoStream item = (VideoStream) getItem(position);
-        text.setText(MediaFormat.getNameById(item.format) + " " + item.resolution);
+        text.setText(item.getFormat().getName() + " " + item.getResolution());
 
         int visibility = !showIconNoAudio ? View.GONE
                 : item.isVideoOnly ? View.VISIBLE

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,297 @@
+package org.schabi.newpipe.fragments.list;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.os.Build;
+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.Gravity;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.View;
+import android.widget.TextView;
+import android.widget.Toast;
+
+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.info_list.InfoItemBuilder;
+import org.schabi.newpipe.info_list.InfoItemDialog;
+import org.schabi.newpipe.info_list.InfoListAdapter;
+import org.schabi.newpipe.playlist.SinglePlayQueue;
+import org.schabi.newpipe.util.NavigationHelper;
+import org.schabi.newpipe.util.PermissionHelper;
+import org.schabi.newpipe.util.StateSaver;
+
+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 InfoItemBuilder.OnInfoItemSelectedListener<StreamInfoItem>() {
+            @Override
+            public void selected(StreamInfoItem selectedItem) {
+                onItemSelected(selectedItem);
+                NavigationHelper.openVideoDetailFragment(
+                        useAsFrontPage?getParentFragment().getFragmentManager():getFragmentManager(),
+                        selectedItem.getServiceId(), selectedItem.getUrl(), selectedItem.getName());
+            }
+
+            @Override
+            public void held(StreamInfoItem selectedItem) {
+                showStreamDialog(selectedItem);
+            }
+        });
+
+        infoListAdapter.setOnChannelSelectedListener(new InfoItemBuilder.OnInfoItemSelectedListener<ChannelInfoItem>() {
+            @Override
+            public void selected(ChannelInfoItem selectedItem) {
+                onItemSelected(selectedItem);
+                NavigationHelper.openChannelFragment(
+                        useAsFrontPage?getParentFragment().getFragmentManager():getFragmentManager(),
+                        selectedItem.getServiceId(), selectedItem.getUrl(), selectedItem.getName());
+            }
+
+            @Override
+            public void held(ChannelInfoItem selectedItem) {}
+        });
+
+        infoListAdapter.setOnPlaylistSelectedListener(new InfoItemBuilder.OnInfoItemSelectedListener<PlaylistInfoItem>() {
+            @Override
+            public void selected(PlaylistInfoItem selectedItem) {
+                onItemSelected(selectedItem);
+                NavigationHelper.openPlaylistFragment(
+                        useAsFrontPage?getParentFragment().getFragmentManager():getFragmentManager(),
+                        selectedItem.getServiceId(), selectedItem.getUrl(), selectedItem.getName());
+            }
+
+            @Override
+            public void held(PlaylistInfoItem selectedItem) {}
+        });
+
+        itemsList.clearOnScrollListeners();
+        itemsList.addOnScrollListener(new OnScrollBelowItemsListener() {
+            @Override
+            public void onScrolledDown(RecyclerView recyclerView) {
+                onScrollToBottom();
+            }
+        });
+    }
+
+    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)
+        };
+
+        final DialogInterface.OnClickListener actions = new DialogInterface.OnClickListener() {
+            @Override
+            public void onClick(DialogInterface dialogInterface, int i) {
+                switch (i) {
+                    case 0:
+                        NavigationHelper.enqueueOnBackgroundPlayer(context, new SinglePlayQueue(item));
+                        break;
+                    case 1:
+                        NavigationHelper.enqueueOnPopupPlayer(activity, new SinglePlayQueue(item));
+                        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(new Runnable() {
+            @Override
+            public void run() {
+                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,192 @@
+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.NextItemsResult> {
+
+    @State
+    protected int serviceId = Constants.NO_SERVICE_ID;
+    @State
+    protected String name;
+    @State
+    protected String url;
+
+    protected I currentInfo;
+    protected String currentNextItemsUrl;
+    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(currentNextItemsUrl);
+    }
+
+    @Override
+    @SuppressWarnings("unchecked")
+    public void readFrom(@NonNull Queue<Object> savedObjects) throws Exception {
+        super.readFrom(savedObjects);
+        currentInfo = (I) savedObjects.poll();
+        currentNextItemsUrl = (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;
+                    currentNextItemsUrl = result.next_streams_url;
+                    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.NextItemsResult> 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.NextItemsResult nextItemsResult) -> {
+                    isLoading.set(false);
+                    handleNextItems(nextItemsResult);
+                }, (@io.reactivex.annotations.NonNull Throwable throwable) -> {
+                    isLoading.set(false);
+                    onError(throwable);
+                });
+    }
+
+    @Override
+    public void handleNextItems(ListExtractor.NextItemsResult result) {
+        super.handleNextItems(result);
+        currentNextItemsUrl = result.nextItemsUrl;
+        infoListAdapter.addInfoItemList(result.nextItemsList);
+
+        showListFooter(hasMoreItems());
+    }
+
+    @Override
+    protected boolean hasMoreItems() {
+        return !TextUtils.isEmpty(currentNextItemsUrl);
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // 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.related_streams.size() > 0) {
+                infoListAdapter.addInfoItemList(result.related_streams);
+                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,508 @@
+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.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.fragments.subscription.SubscriptionService;
+import org.schabi.newpipe.info_list.InfoItemDialog;
+import org.schabi.newpipe.playlist.ChannelPlayQueue;
+import org.schabi.newpipe.playlist.PlayQueue;
+import org.schabi.newpipe.playlist.SinglePlayQueue;
+import org.schabi.newpipe.report.UserAction;
+import org.schabi.newpipe.util.AnimationUtils;
+import org.schabi.newpipe.util.ExtractorHelper;
+import org.schabi.newpipe.util.Localization;
+import org.schabi.newpipe.util.NavigationHelper;
+
+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();
+    }
+
+    @Override
+    public View onCreateView(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),
+        };
+
+        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;
+                    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.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);
+            if (currentInfo != null) {
+                menuRssButton.setVisible(!TextUtils.isEmpty(currentInfo.getFeedUrl()));
+            }
+
+        }
+    }
+
+    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.NextItemsResult> loadMoreItemsLogic() {
+        return ExtractorHelper.getMoreChannelItems(serviceId, url, currentNextItemsUrl);
+    }
+
+    @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.banner_url, headerChannelBanner, DISPLAY_BANNER_OPTIONS);
+        imageLoader.displayImage(result.avatar_url, headerAvatarView, 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.errors.isEmpty()) {
+            showSnackBarError(result.errors, 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(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                NavigationHelper.playOnMainPlayer(activity, getPlayQueue());
+            }
+        });
+        headerPopupButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                NavigationHelper.playOnPopupPlayer(activity, getPlayQueue());
+            }
+        });
+        headerBackgroundButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                NavigationHelper.playOnBackgroundPlayer(activity, getPlayQueue());
+            }
+        });
+    }
+
+    private PlayQueue getPlayQueue() {
+        return getPlayQueue(0);
+    }
+
+    private PlayQueue getPlayQueue(final int index) {
+        return new ChannelPlayQueue(
+                currentInfo.getServiceId(),
+                currentInfo.getUrl(),
+                currentInfo.getNextStreamsUrl(),
+                infoListAdapter.getItemsList(),
+                index
+        );
+    }
+
+    @Override
+    public void handleNextItems(ListExtractor.NextItemsResult 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/feed/FeedFragment.java

@@ -0,0 +1,448 @@
+package org.schabi.newpipe.fragments.list.feed;
+
+import android.os.Bundle;
+import android.os.Handler;
+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 org.reactivestreams.Subscriber;
+import org.reactivestreams.Subscription;
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.database.subscription.SubscriptionEntity;
+import org.schabi.newpipe.extractor.InfoItem;
+import org.schabi.newpipe.extractor.NewPipe;
+import org.schabi.newpipe.extractor.channel.ChannelInfo;
+import org.schabi.newpipe.extractor.exceptions.ExtractionException;
+import org.schabi.newpipe.fragments.list.BaseListFragment;
+import org.schabi.newpipe.fragments.subscription.SubscriptionService;
+import org.schabi.newpipe.report.UserAction;
+
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Queue;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import io.reactivex.Flowable;
+import io.reactivex.MaybeObserver;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.disposables.CompositeDisposable;
+import io.reactivex.disposables.Disposable;
+import io.reactivex.functions.Consumer;
+import io.reactivex.functions.Predicate;
+
+public class FeedFragment extends BaseListFragment<List<SubscriptionEntity>, Void> {
+
+    private static final int OFF_SCREEN_ITEMS_COUNT = 3;
+    private static final int MIN_ITEMS_INITIAL_LOAD = 8;
+    private int FEED_LOAD_COUNT = MIN_ITEMS_INITIAL_LOAD;
+
+    private int subscriptionPoolSize;
+
+    private SubscriptionService subscriptionService;
+
+    private AtomicBoolean allItemsLoaded = new AtomicBoolean(false);
+    private HashSet<String> itemsLoaded = new HashSet<>();
+    private final AtomicInteger requestLoadedAtomic = new AtomicInteger();
+
+    private CompositeDisposable compositeDisposable = new CompositeDisposable();
+    private Disposable subscriptionObserver;
+    private Subscription feedSubscriber;
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Fragment LifeCycle
+    //////////////////////////////////////////////////////////////////////////*/
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        subscriptionService = SubscriptionService.getInstance();
+
+        FEED_LOAD_COUNT = howManyItemsToLoad();
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, Bundle savedInstanceState) {
+        return inflater.inflate(R.layout.fragment_feed, container, false);
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        disposeEverything();
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        if (wasLoading.get()) doInitialLoadLogic();
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+
+        disposeEverything();
+        subscriptionService = null;
+        compositeDisposable = null;
+        subscriptionObserver = null;
+        feedSubscriber = null;
+    }
+
+    @Override
+    public void onDestroyView() {
+        // Do not monitor for updates when user is not viewing the feed fragment.
+        // This is a waste of bandwidth.
+        disposeEverything();
+        super.onDestroyView();
+    }
+
+    /*@Override
+    protected RecyclerView.LayoutManager getListLayoutManager() {
+        boolean isPortrait = getResources().getDisplayMetrics().heightPixels > getResources().getDisplayMetrics().widthPixels;
+        return new GridLayoutManager(activity, isPortrait ? 1 : 2);
+    }*/
+
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        super.onCreateOptionsMenu(menu, inflater);
+
+        ActionBar supportActionBar = activity.getSupportActionBar();
+        if (supportActionBar != null) {
+            supportActionBar.setTitle(R.string.fragment_whats_new);
+        }
+
+        if(useAsFrontPage) {
+            supportActionBar.setDisplayShowTitleEnabled(true);
+            //supportActionBar.setDisplayShowTitleEnabled(false);
+        }
+    }
+
+    @Override
+    public void reloadContent() {
+        resetFragment();
+        super.reloadContent();
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // StateSaving
+    //////////////////////////////////////////////////////////////////////////*/
+
+    @Override
+    public void writeTo(Queue<Object> objectsToSave) {
+        super.writeTo(objectsToSave);
+        objectsToSave.add(allItemsLoaded);
+        objectsToSave.add(itemsLoaded);
+    }
+
+    @Override
+    @SuppressWarnings("unchecked")
+    public void readFrom(@NonNull Queue<Object> savedObjects) throws Exception {
+        super.readFrom(savedObjects);
+        allItemsLoaded = (AtomicBoolean) savedObjects.poll();
+        itemsLoaded = (HashSet<String>) savedObjects.poll();
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Feed Loader
+    //////////////////////////////////////////////////////////////////////////*/
+
+    @Override
+    public void startLoading(boolean forceLoad) {
+        if (DEBUG) Log.d(TAG, "startLoading() called with: forceLoad = [" + forceLoad + "]");
+        if (subscriptionObserver != null) subscriptionObserver.dispose();
+
+        if (allItemsLoaded.get()) {
+            if (infoListAdapter.getItemsList().size() == 0) {
+                showEmptyState();
+            } else {
+                showListFooter(false);
+                hideLoading();
+            }
+
+            isLoading.set(false);
+            return;
+        }
+
+        isLoading.set(true);
+        showLoading();
+        showListFooter(true);
+        subscriptionObserver = subscriptionService.getSubscription()
+                .onErrorReturnItem(Collections.<SubscriptionEntity>emptyList())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new Consumer<List<SubscriptionEntity>>() {
+                    @Override
+                    public void accept(List<SubscriptionEntity> subscriptionEntities) throws Exception {
+                        handleResult(subscriptionEntities);
+                    }
+                }, new Consumer<Throwable>() {
+                    @Override
+                    public void accept(Throwable throwable) throws Exception {
+                        onError(throwable);
+                    }
+                });
+    }
+
+    @Override
+    public void handleResult(@android.support.annotation.NonNull List<SubscriptionEntity> result) {
+        super.handleResult(result);
+
+        if (result.isEmpty()) {
+            infoListAdapter.clearStreamItemList();
+            showEmptyState();
+            return;
+        }
+
+        subscriptionPoolSize = result.size();
+        Flowable.fromIterable(result)
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(getSubscriptionObserver());
+    }
+
+    /**
+     * Responsible for reacting to user pulling request and starting a request for new feed stream.
+     * <p>
+     * On initialization, it automatically requests the amount of feed needed to display
+     * a minimum amount required (FEED_LOAD_SIZE).
+     * <p>
+     * Upon receiving a user pull, it creates a Single Observer to fetch the ChannelInfo
+     * containing the feed streams.
+     **/
+    private Subscriber<SubscriptionEntity> getSubscriptionObserver() {
+        return new Subscriber<SubscriptionEntity>() {
+            @Override
+            public void onSubscribe(Subscription s) {
+                if (feedSubscriber != null) feedSubscriber.cancel();
+                feedSubscriber = s;
+
+                int requestSize = FEED_LOAD_COUNT - infoListAdapter.getItemsList().size();
+                if (wasLoading.getAndSet(false)) requestSize = FEED_LOAD_COUNT;
+
+                boolean hasToLoad = requestSize > 0;
+                if (hasToLoad) {
+                    requestLoadedAtomic.set(infoListAdapter.getItemsList().size());
+                    requestFeed(requestSize);
+                }
+                isLoading.set(hasToLoad);
+            }
+
+            @Override
+            public void onNext(SubscriptionEntity subscriptionEntity) {
+                if (!itemsLoaded.contains(subscriptionEntity.getServiceId() + subscriptionEntity.getUrl())) {
+                    subscriptionService.getChannelInfo(subscriptionEntity)
+                            .observeOn(AndroidSchedulers.mainThread())
+                            .onErrorComplete(new Predicate<Throwable>() {
+                                @Override
+                                public boolean test(@io.reactivex.annotations.NonNull Throwable throwable) throws Exception {
+                                    return FeedFragment.super.onError(throwable);
+                                }
+                            })
+                            .subscribe(getChannelInfoObserver(subscriptionEntity.getServiceId(), subscriptionEntity.getUrl()));
+                } else {
+                    requestFeed(1);
+                }
+            }
+
+            @Override
+            public void onError(Throwable exception) {
+                FeedFragment.this.onError(exception);
+            }
+
+            @Override
+            public void onComplete() {
+                if (DEBUG) Log.d(TAG, "getSubscriptionObserver > onComplete() called");
+            }
+        };
+    }
+
+    /**
+     * On each request, a subscription item from the updated table is transformed
+     * into a ChannelInfo, containing the latest streams from the channel.
+     * <p>
+     * Currently, the feed uses the first into from the list of streams.
+     * <p>
+     * If chosen feed already displayed, then we request another feed from another
+     * subscription, until the subscription table runs out of new items.
+     * <p>
+     * This Observer is self-contained and will dispose itself when complete. However, this
+     * does not obey the fragment lifecycle and may continue running in the background
+     * until it is complete. This is done due to RxJava2 no longer propagate errors once
+     * an observer is unsubscribed while the thread process is still running.
+     * <p>
+     * To solve the above issue, we can either set a global RxJava Error Handler, or
+     * manage exceptions case by case. This should be done if the current implementation is
+     * too costly when dealing with larger subscription sets.
+     *
+     * @param url + serviceId to put in {@link #allItemsLoaded} to signal that this specific entity has been loaded.
+     */
+    private MaybeObserver<ChannelInfo> getChannelInfoObserver(final int serviceId, final String url) {
+        return new MaybeObserver<ChannelInfo>() {
+            private Disposable observer;
+
+            @Override
+            public void onSubscribe(Disposable d) {
+                observer = d;
+                compositeDisposable.add(d);
+                isLoading.set(true);
+            }
+
+            // Called only when response is non-empty
+            @Override
+            public void onSuccess(final ChannelInfo channelInfo) {
+                if (infoListAdapter == null || channelInfo.getRelatedStreams().isEmpty()) {
+                    onDone();
+                    return;
+                }
+
+                final InfoItem item = channelInfo.getRelatedStreams().get(0);
+                // Keep requesting new items if the current one already exists
+                boolean itemExists = doesItemExist(infoListAdapter.getItemsList(), item);
+                if (!itemExists) {
+                    infoListAdapter.addInfoItem(item);
+                    //updateSubscription(channelInfo);
+                } else {
+                    requestFeed(1);
+                }
+                onDone();
+            }
+
+            @Override
+            public void onError(Throwable exception) {
+                showSnackBarError(exception, UserAction.SUBSCRIPTION, NewPipe.getNameOfService(serviceId), url, 0);
+                requestFeed(1);
+                onDone();
+            }
+
+            // Called only when response is empty
+            @Override
+            public void onComplete() {
+                onDone();
+            }
+
+            private void onDone() {
+                if (observer.isDisposed()) {
+                    return;
+                }
+
+                itemsLoaded.add(serviceId + url);
+                compositeDisposable.remove(observer);
+
+                int loaded = requestLoadedAtomic.incrementAndGet();
+                if (loaded >= Math.min(FEED_LOAD_COUNT, subscriptionPoolSize)) {
+                    requestLoadedAtomic.set(0);
+                    isLoading.set(false);
+                }
+
+                if (itemsLoaded.size() == subscriptionPoolSize) {
+                    if (DEBUG) Log.d(TAG, "getChannelInfoObserver > All Items Loaded");
+                    allItemsLoaded.set(true);
+                    showListFooter(false);
+                    isLoading.set(false);
+                    hideLoading();
+                    if (infoListAdapter.getItemsList().size() == 0) {
+                        showEmptyState();
+                    }
+                }
+            }
+        };
+    }
+
+    @Override
+    protected void loadMoreItems() {
+        isLoading.set(true);
+        delayHandler.removeCallbacksAndMessages(null);
+        // Add a little of a delay when requesting more items because the cache is so fast,
+        // that the view seems stuck to the user when he scroll to the bottom
+        delayHandler.postDelayed(new Runnable() {
+            @Override
+            public void run() {
+                requestFeed(FEED_LOAD_COUNT);
+            }
+        }, 300);
+    }
+
+    @Override
+    protected boolean hasMoreItems() {
+        return !allItemsLoaded.get();
+    }
+
+    private final Handler delayHandler = new Handler();
+
+    private void requestFeed(final int count) {
+        if (DEBUG) Log.d(TAG, "requestFeed() called with: count = [" + count + "], feedSubscriber = [" + feedSubscriber + "]");
+        if (feedSubscriber == null) return;
+
+        isLoading.set(true);
+        delayHandler.removeCallbacksAndMessages(null);
+        feedSubscriber.request(count);
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Utils
+    //////////////////////////////////////////////////////////////////////////*/
+
+    private void resetFragment() {
+        if (DEBUG) Log.d(TAG, "resetFragment() called");
+        if (subscriptionObserver != null) subscriptionObserver.dispose();
+        if (compositeDisposable != null) compositeDisposable.clear();
+        if (infoListAdapter != null) infoListAdapter.clearStreamItemList();
+
+        delayHandler.removeCallbacksAndMessages(null);
+        requestLoadedAtomic.set(0);
+        allItemsLoaded.set(false);
+        showListFooter(false);
+        itemsLoaded.clear();
+    }
+
+    private void disposeEverything() {
+        if (subscriptionObserver != null) subscriptionObserver.dispose();
+        if (compositeDisposable != null) compositeDisposable.clear();
+        if (feedSubscriber != null) feedSubscriber.cancel();
+        delayHandler.removeCallbacksAndMessages(null);
+    }
+
+    private boolean doesItemExist(final List<InfoItem> items, final InfoItem item) {
+        for (final InfoItem existingItem : items) {
+            if (existingItem.info_type == item.info_type &&
+                    existingItem.getServiceId() == item.getServiceId() &&
+                    existingItem.getName().equals(item.getName()) &&
+                    existingItem.getUrl().equals(item.getUrl())) return true;
+        }
+        return false;
+    }
+
+    private int howManyItemsToLoad() {
+        int heightPixels = getResources().getDisplayMetrics().heightPixels;
+        int itemHeightPixels = activity.getResources().getDimensionPixelSize(R.dimen.video_item_search_height);
+
+        int items = itemHeightPixels > 0 ? heightPixels / itemHeightPixels + OFF_SCREEN_ITEMS_COUNT : MIN_ITEMS_INITIAL_LOAD;
+        return Math.max(MIN_ITEMS_INITIAL_LOAD, items);
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Fragment Error Handling
+    //////////////////////////////////////////////////////////////////////////*/
+
+    @Override
+    public void showError(String message, boolean showRetryButton) {
+        resetFragment();
+        super.showError(message, showRetryButton);
+    }
+
+    @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.SOMETHING_ELSE, "none", "Requesting feed", errorId);
+        return true;
+    }
+}

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.NextItemsResult> loadMoreItemsLogic() {
+        String contentCountry = PreferenceManager
+                .getDefaultSharedPreferences(activity)
+                .getString(getString(R.string.content_country_key),
+                        getString(R.string.default_country_value));
+        return ExtractorHelper.getMoreKioskItems(serviceId, url, currentNextItemsUrl, 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_PLAYLIST,
+                    NewPipe.getNameOfService(result.getServiceId()), result.getUrl(), 0);
+        }
+    }
+
+    @Override
+    public void handleNextItems(ListExtractor.NextItemsResult 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,288 @@
+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.schabi.newpipe.R;
+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.info_list.InfoItemDialog;
+import org.schabi.newpipe.playlist.PlayQueue;
+import org.schabi.newpipe.playlist.PlaylistPlayQueue;
+import org.schabi.newpipe.playlist.SinglePlayQueue;
+import org.schabi.newpipe.report.UserAction;
+import org.schabi.newpipe.util.ExtractorHelper;
+import org.schabi.newpipe.util.NavigationHelper;
+
+import io.reactivex.Single;
+
+import static org.schabi.newpipe.util.AnimationUtils.animateView;
+
+public class PlaylistFragment extends BaseListInfoFragment<PlaylistInfo> {
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // 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;
+
+    public static PlaylistFragment getInstance(int serviceId, String url, String name) {
+        PlaylistFragment instance = new PlaylistFragment();
+        instance.setInitialData(serviceId, url, name);
+        return instance;
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // LifeCycle
+    //////////////////////////////////////////////////////////////////////////*/
+
+    @Override
+    public View onCreateView(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 = 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;
+                    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);
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Load and handle
+    //////////////////////////////////////////////////////////////////////////*/
+
+    @Override
+    protected Single<ListExtractor.NextItemsResult> loadMoreItemsLogic() {
+        return ExtractorHelper.getMorePlaylistItems(serviceId, url, currentNextItemsUrl);
+    }
+
+    @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;
+            }
+            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(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        NavigationHelper.openChannelFragment(getFragmentManager(), result.getServiceId(), result.getUploaderUrl(), result.getUploaderName());
+                    }
+                });
+            }
+        }
+
+        playlistCtrl.setVisibility(View.VISIBLE);
+
+        imageLoader.displayImage(result.getUploaderAvatarUrl(), headerUploaderAvatar, DISPLAY_AVATAR_OPTIONS);
+        headerStreamCount.setText(getResources().getQuantityString(R.plurals.videos, (int) result.stream_count, (int) result.stream_count));
+
+        if (!result.getErrors().isEmpty()) {
+            showSnackBarError(result.getErrors(), UserAction.REQUESTED_PLAYLIST, NewPipe.getNameOfService(result.getServiceId()), result.getUrl(), 0);
+        }
+
+        headerPlayAllButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                NavigationHelper.playOnMainPlayer(activity, getPlayQueue());
+            }
+        });
+        headerPopupButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                NavigationHelper.playOnPopupPlayer(activity, getPlayQueue());
+            }
+        });
+        headerBackgroundButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                NavigationHelper.playOnBackgroundPlayer(activity, getPlayQueue());
+            }
+        });
+    }
+
+    private PlayQueue getPlayQueue() {
+        return getPlayQueue(0);
+    }
+
+    private PlayQueue getPlayQueue(final int index) {
+        return new PlaylistPlayQueue(
+                currentInfo.getServiceId(),
+                currentInfo.getUrl(),
+                currentInfo.getNextStreamsUrl(),
+                infoListAdapter.getItemsList(),
+                index
+        );
+    }
+
+    @Override
+    public void handleNextItems(ListExtractor.NextItemsResult 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
+    //////////////////////////////////////////////////////////////////////////*/
+
+    @Override
+    public void setTitle(String title) {
+        super.setTitle(title);
+        headerTitleView.setText(title);
+    }
+}

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

@@ -0,0 +1,903 @@
+package org.schabi.newpipe.fragments.list.search;
+
+import android.app.Activity;
+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.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.NewPipeDatabase;
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.ReCaptchaActivity;
+import org.schabi.newpipe.database.history.dao.SearchHistoryDAO;
+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.history.HistoryListener;
+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.Notification;
+import io.reactivex.Observable;
+import io.reactivex.ObservableSource;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.disposables.CompositeDisposable;
+import io.reactivex.disposables.Disposable;
+import io.reactivex.functions.BiFunction;
+import io.reactivex.functions.Consumer;
+import io.reactivex.functions.Function;
+import io.reactivex.functions.Predicate;
+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.NextItemsResult> 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 SearchHistoryDAO searchHistoryDAO;
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // 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);
+        
+        searchHistoryDAO = NewPipeDatabase.getInstance().searchHistoryDAO();
+    }
+
+    @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) {
+        new AlertDialog.Builder(activity)
+                .setTitle(item.query)
+                .setMessage(R.string.delete_item_search_history)
+                .setCancelable(true)
+                .setNegativeButton(R.string.cancel, null)
+                .setPositiveButton(R.string.delete, new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                        disposables.add(Observable
+                                .fromCallable(new Callable<Integer>() {
+                                    @Override
+                                    public Integer call() throws Exception {
+                                        return searchHistoryDAO.deleteAllWhereQuery(item.query);
+                                    }
+                                })
+                                .subscribeOn(Schedulers.io())
+                                .observeOn(AndroidSchedulers.mainThread())
+                                .subscribe(new Consumer<Integer>() {
+                                    @Override
+                                    public void accept(Integer howManyDeleted) throws Exception {
+                                        suggestionPublisher.onNext(searchEditText.getText().toString());
+                                    }
+                                }, new Consumer<Throwable>() {
+                                    @Override
+                                    public void accept(Throwable throwable) throws Exception {
+                                        showSnackBarError(throwable, UserAction.SOMETHING_ELSE, "none", "Deleting item failed", R.string.general_error);
+                                    }
+                                }));
+                    }
+                }).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(new Predicate<String>() {
+                    @Override
+                    public boolean test(@io.reactivex.annotations.NonNull String query) throws Exception {
+                        return isSuggestionsEnabled;
+                    }
+                });
+
+        suggestionDisposable = observable
+                .switchMap(new Function<String, ObservableSource<Notification<List<SuggestionItem>>>>() {
+                    @Override
+                    public ObservableSource<Notification<List<SuggestionItem>>> apply(@io.reactivex.annotations.NonNull final String query) throws Exception {
+                        final Flowable<List<SearchHistoryEntry>> flowable = query.length() > 0
+                                ? searchHistoryDAO.getSimilarEntries(query, 3)
+                                : searchHistoryDAO.getUniqueEntries(25);
+                        final Observable<List<SuggestionItem>> local = flowable.toObservable()
+                                .map(new Function<List<SearchHistoryEntry>, List<SuggestionItem>>() {
+                                    @Override
+                                    public List<SuggestionItem> apply(@io.reactivex.annotations.NonNull List<SearchHistoryEntry> searchHistoryEntries) throws Exception {
+                                        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(new Function<List<String>, List<SuggestionItem>>() {
+                                    @Override
+                                    public List<SuggestionItem> apply(@io.reactivex.annotations.NonNull List<String> strings) throws Exception {
+                                        List<SuggestionItem> result = new ArrayList<>();
+                                        for (String entry : strings) result.add(new SuggestionItem(false, entry));
+                                        return result;
+                                    }
+                                });
+
+                        return Observable.zip(local, network, new BiFunction<List<SuggestionItem>, List<SuggestionItem>, List<SuggestionItem>>() {
+                            @Override
+                            public List<SuggestionItem> apply(@io.reactivex.annotations.NonNull List<SuggestionItem> localResult, @io.reactivex.annotations.NonNull List<SuggestionItem> networkResult) throws Exception {
+                                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(new Consumer<Notification<List<SuggestionItem>>>() {
+                    @Override
+                    public void accept(@io.reactivex.annotations.NonNull Notification<List<SuggestionItem>> listNotification) throws Exception {
+                        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();
+
+        if (activity instanceof HistoryListener) {
+            ((HistoryListener) activity).onSearch(serviceId, query);
+            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())
+                .subscribe(new Consumer<SearchResult>() {
+                    @Override
+                    public void accept(@NonNull SearchResult result) throws Exception {
+                        isLoading.set(false);
+                        handleResult(result);
+                    }
+                }, new Consumer<Throwable>() {
+                    @Override
+                    public void accept(@NonNull Throwable throwable) throws Exception {
+                        isLoading.set(false);
+                        onError(throwable);
+                    }
+                });
+    }
+
+    @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())
+                .subscribe(new Consumer<ListExtractor.NextItemsResult>() {
+                    @Override
+                    public void accept(@NonNull ListExtractor.NextItemsResult result) throws Exception {
+                        isLoading.set(false);
+                        handleNextItems(result);
+                    }
+                }, new Consumer<Throwable>() {
+                    @Override
+                    public void accept(@NonNull Throwable throwable) throws Exception {
+                        isLoading.set(false);
+                        onError(throwable);
+                    }
+                });
+    }
+
+    @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(new Runnable() {
+            @Override
+            public void run() {
+                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.NextItemsResult result) {
+        showListFooter(false);
+        currentPage = Integer.parseInt(result.getNextItemsUrl());
+        infoListAdapter.addInfoItemList(result.getNextItemsList());
+
+        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,134 @@
+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(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (listener != null) listener.onSuggestionItemSelected(currentItem);
+            }
+        });
+        holder.queryView.setOnLongClickListener(new View.OnLongClickListener() {
+            @Override
+            public boolean onLongClick(View v) {
+                if (listener != null) listener.onSuggestionItemLongClick(currentItem);
+                return true;
+            }
+        });
+        holder.insertView.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View 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/fragments/subscription/SubscriptionFragment.java

@@ -0,0 +1,259 @@
+package org.schabi.newpipe.fragments.subscription;
+
+import android.content.Context;
+import android.os.Bundle;
+import android.os.Parcelable;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.database.subscription.SubscriptionEntity;
+import org.schabi.newpipe.extractor.InfoItem;
+import org.schabi.newpipe.extractor.channel.ChannelInfoItem;
+import org.schabi.newpipe.fragments.BaseStateFragment;
+import org.schabi.newpipe.info_list.InfoItemBuilder;
+import org.schabi.newpipe.info_list.InfoListAdapter;
+import org.schabi.newpipe.report.UserAction;
+import org.schabi.newpipe.util.NavigationHelper;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+
+import icepick.State;
+import io.reactivex.Observer;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.disposables.CompositeDisposable;
+import io.reactivex.disposables.Disposable;
+import io.reactivex.schedulers.Schedulers;
+
+import static org.schabi.newpipe.util.AnimationUtils.animateView;
+
+public class SubscriptionFragment extends BaseStateFragment<List<SubscriptionEntity>> {
+    private View headerRootLayout;
+
+    private InfoListAdapter infoListAdapter;
+    private RecyclerView itemsList;
+
+    @State
+    protected Parcelable itemsListState;
+
+    /* Used for independent events */
+    private CompositeDisposable disposables = new CompositeDisposable();
+    private SubscriptionService subscriptionService;
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Fragment LifeCycle
+    ///////////////////////////////////////////////////////////////////////////
+
+
+    @Override
+    public void setUserVisibleHint(boolean isVisibleToUser) {
+        super.setUserVisibleHint(isVisibleToUser);
+        if(isVisibleToUser && activity != null) {
+            activity.getSupportActionBar()
+                    .setTitle(R.string.tab_subscriptions);
+        }
+    }
+
+
+    @Override
+    public void onAttach(Context context) {
+        super.onAttach(context);
+        infoListAdapter = new InfoListAdapter(activity);
+        subscriptionService = SubscriptionService.getInstance();
+    }
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, Bundle savedInstanceState) {
+        activity.getSupportActionBar().setDisplayShowTitleEnabled(true);
+        activity.setTitle(R.string.tab_subscriptions);
+        if(useAsFrontPage) {
+            activity.getSupportActionBar().setDisplayHomeAsUpEnabled(false);
+        }
+        return inflater.inflate(R.layout.fragment_subscription, container, false);
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        itemsListState = itemsList.getLayoutManager().onSaveInstanceState();
+    }
+
+    @Override
+    public void onDestroyView() {
+        if (disposables != null) disposables.clear();
+
+        super.onDestroyView();
+    }
+
+    @Override
+    public void onDestroy() {
+        if (disposables != null) disposables.dispose();
+        disposables = null;
+        subscriptionService = null;
+
+        super.onDestroy();
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Fragment Views
+    ///////////////////////////////////////////////////////////////////////////
+
+    @Override
+    protected void initViews(View rootView, Bundle savedInstanceState) {
+        super.initViews(rootView, savedInstanceState);
+
+        infoListAdapter = new InfoListAdapter(getActivity());
+        itemsList = rootView.findViewById(R.id.items_list);
+        itemsList.setLayoutManager(new LinearLayoutManager(activity));
+
+        infoListAdapter.setHeader(headerRootLayout = activity.getLayoutInflater().inflate(R.layout.subscription_header, itemsList, false));
+        infoListAdapter.useMiniItemVariants(true);
+
+        itemsList.setAdapter(infoListAdapter);
+    }
+
+    @Override
+    protected void initListeners() {
+        super.initListeners();
+
+        infoListAdapter.setOnChannelSelectedListener(new InfoItemBuilder.OnInfoItemSelectedListener<ChannelInfoItem>() {
+            @Override
+            public void selected(ChannelInfoItem selectedItem) {
+                // Requires the parent fragment to find holder for fragment replacement
+                NavigationHelper.openChannelFragment(getParentFragment().getFragmentManager(), selectedItem.getServiceId(), selectedItem.url, selectedItem.getName());
+
+            }
+
+            @Override
+            public void held(ChannelInfoItem selectedItem) {}
+        });
+
+        headerRootLayout.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                NavigationHelper.openWhatsNewFragment(getParentFragment().getFragmentManager());
+            }
+        });
+    }
+
+    private void resetFragment() {
+        if (disposables != null) disposables.clear();
+        if (infoListAdapter != null) infoListAdapter.clearStreamItemList();
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Subscriptions Loader
+    ///////////////////////////////////////////////////////////////////////////
+
+    @Override
+    public void startLoading(boolean forceLoad) {
+        super.startLoading(forceLoad);
+        resetFragment();
+
+        subscriptionService.getSubscription().toObservable()
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(getSubscriptionObserver());
+    }
+
+    private Observer<List<SubscriptionEntity>> getSubscriptionObserver() {
+        return new Observer<List<SubscriptionEntity>>() {
+            @Override
+            public void onSubscribe(Disposable d) {
+                showLoading();
+                disposables.add(d);
+            }
+
+            @Override
+            public void onNext(List<SubscriptionEntity> subscriptions) {
+                handleResult(subscriptions);
+            }
+
+            @Override
+            public void onError(Throwable exception) {
+                SubscriptionFragment.this.onError(exception);
+            }
+
+            @Override
+            public void onComplete() {
+            }
+        };
+    }
+
+    @Override
+    public void handleResult(@NonNull List<SubscriptionEntity> result) {
+        super.handleResult(result);
+
+        infoListAdapter.clearStreamItemList();
+
+        if (result.isEmpty()) {
+            showEmptyState();
+        } else {
+            infoListAdapter.addInfoItemList(getSubscriptionItems(result));
+            if (itemsListState != null) {
+                itemsList.getLayoutManager().onRestoreInstanceState(itemsListState);
+                itemsListState = null;
+            }
+
+            hideLoading();
+        }
+    }
+
+
+    private List<InfoItem> getSubscriptionItems(List<SubscriptionEntity> subscriptions) {
+        List<InfoItem> items = new ArrayList<>();
+        for (final SubscriptionEntity subscription : subscriptions) items.add(subscription.toChannelInfoItem());
+
+        Collections.sort(items, new Comparator<InfoItem>() {
+            @Override
+            public int compare(InfoItem o1, InfoItem o2) {
+                return o1.name.compareToIgnoreCase(o2.name);
+            }
+        });
+        return items;
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Contract
+    //////////////////////////////////////////////////////////////////////////*/
+
+    @Override
+    public void showLoading() {
+        super.showLoading();
+        animateView(itemsList, false, 100);
+    }
+
+    @Override
+    public void hideLoading() {
+        super.hideLoading();
+        animateView(itemsList, true, 200);
+    }
+
+    @Override
+    public void showEmptyState() {
+        super.showEmptyState();
+        animateView(itemsList, false, 200);
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Fragment Error Handling
+    ///////////////////////////////////////////////////////////////////////////
+
+    @Override
+    protected boolean onError(Throwable exception) {
+        resetFragment();
+        if (super.onError(exception)) return true;
+
+        onUnrecoverableError(exception, UserAction.SOMETHING_ELSE, "none", "Subscriptions", R.string.general_error);
+        return true;
+    }
+}

app/src/main/java/org/schabi/newpipe/fragments/subscription/SubscriptionService.java

@@ -0,0 +1,147 @@
+package org.schabi.newpipe.fragments.subscription;
+
+import android.util.Log;
+
+import org.schabi.newpipe.MainActivity;
+import org.schabi.newpipe.NewPipeDatabase;
+import org.schabi.newpipe.database.AppDatabase;
+import org.schabi.newpipe.database.subscription.SubscriptionDAO;
+import org.schabi.newpipe.database.subscription.SubscriptionEntity;
+import org.schabi.newpipe.extractor.channel.ChannelInfo;
+import org.schabi.newpipe.util.ExtractorHelper;
+
+import java.util.List;
+import java.util.concurrent.Executor;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+
+import io.reactivex.Completable;
+import io.reactivex.CompletableSource;
+import io.reactivex.Flowable;
+import io.reactivex.Maybe;
+import io.reactivex.Scheduler;
+import io.reactivex.annotations.NonNull;
+import io.reactivex.functions.Function;
+import io.reactivex.schedulers.Schedulers;
+
+/**
+ * Subscription Service singleton:
+ * Provides a basis for channel Subscriptions.
+ * Provides access to subscription table in database as well as
+ * up-to-date observations on the subscribed channels
+ */
+public class SubscriptionService {
+
+    private static final SubscriptionService sInstance = new SubscriptionService();
+
+    public static SubscriptionService getInstance() {
+        return sInstance;
+    }
+
+    protected final String TAG = "SubscriptionService@" + Integer.toHexString(hashCode());
+    protected static final boolean DEBUG = MainActivity.DEBUG;
+    private static final int SUBSCRIPTION_DEBOUNCE_INTERVAL = 500;
+    private static final int SUBSCRIPTION_THREAD_POOL_SIZE = 4;
+
+    private AppDatabase db;
+    private Flowable<List<SubscriptionEntity>> subscription;
+
+    private Scheduler subscriptionScheduler;
+
+    private SubscriptionService() {
+        db = NewPipeDatabase.getInstance();
+        subscription = getSubscriptionInfos();
+
+        final Executor subscriptionExecutor = Executors.newFixedThreadPool(SUBSCRIPTION_THREAD_POOL_SIZE);
+        subscriptionScheduler = Schedulers.from(subscriptionExecutor);
+    }
+
+    /**
+     * Part of subscription observation pipeline
+     *
+     * @see SubscriptionService#getSubscription()
+     */
+    private Flowable<List<SubscriptionEntity>> getSubscriptionInfos() {
+        return subscriptionTable().getAll()
+                // Wait for a period of infrequent updates and return the latest update
+                .debounce(SUBSCRIPTION_DEBOUNCE_INTERVAL, TimeUnit.MILLISECONDS)
+                .share()            // Share allows multiple subscribers on the same observable
+                .replay(1)          // Replay synchronizes subscribers to the last emitted result
+                .autoConnect();
+    }
+
+    /**
+     * Provides an observer to the latest update to the subscription table.
+     * <p>
+     * This observer may be subscribed multiple times, where each subscriber obtains
+     * the latest synchronized changes available, effectively share the same data
+     * across all subscribers.
+     * <p>
+     * This observer has a debounce cooldown, meaning if multiple updates are observed
+     * in the cooldown interval, only the latest changes are emitted to the subscribers.
+     * This reduces the amount of observations caused by frequent updates to the database.
+     */
+    @android.support.annotation.NonNull
+    public Flowable<List<SubscriptionEntity>> getSubscription() {
+        return subscription;
+    }
+
+    public Maybe<ChannelInfo> getChannelInfo(final SubscriptionEntity subscriptionEntity) {
+        if (DEBUG) Log.d(TAG, "getChannelInfo() called with: subscriptionEntity = [" + subscriptionEntity + "]");
+
+        return Maybe.fromSingle(ExtractorHelper
+                .getChannelInfo(subscriptionEntity.getServiceId(), subscriptionEntity.getUrl(), false))
+                .subscribeOn(subscriptionScheduler);
+    }
+
+    /**
+     * Returns the database access interface for subscription table.
+     */
+    public SubscriptionDAO subscriptionTable() {
+        return db.subscriptionDAO();
+    }
+
+    public Completable updateChannelInfo(final ChannelInfo info) {
+        final Function<List<SubscriptionEntity>, CompletableSource> update = new Function<List<SubscriptionEntity>, CompletableSource>() {
+            @Override
+            public CompletableSource apply(@NonNull List<SubscriptionEntity> subscriptionEntities) throws Exception {
+                if (DEBUG) Log.d(TAG, "updateChannelInfo() called with: subscriptionEntities = [" + subscriptionEntities + "]");
+                if (subscriptionEntities.size() == 1) {
+                    SubscriptionEntity subscription = subscriptionEntities.get(0);
+
+                    // Subscriber count changes very often, making this check almost unnecessary.
+                    // Consider removing it later.
+                    if (!isSubscriptionUpToDate(info, subscription)) {
+                        subscription.setData(info.getName(), info.getAvatarUrl(), info.getDescription(), info.getSubscriberCount());
+
+                        return update(subscription);
+                    }
+                }
+
+                return Completable.complete();
+            }
+        };
+
+        return subscriptionTable().getSubscription(info.getServiceId(), info.getUrl())
+                .firstOrError()
+                .flatMapCompletable(update);
+    }
+
+    private Completable update(final SubscriptionEntity updatedSubscription) {
+        return Completable.fromRunnable(new Runnable() {
+            @Override
+            public void run() {
+                subscriptionTable().update(updatedSubscription);
+            }
+        });
+    }
+
+    private boolean isSubscriptionUpToDate(final ChannelInfo info, final SubscriptionEntity entity) {
+        return info.getUrl().equals(entity.getUrl()) &&
+                info.getServiceId() == entity.getServiceId() &&
+                info.getName().equals(entity.getName()) &&
+                info.getAvatarUrl().equals(entity.getAvatarUrl()) &&
+                info.getDescription().equals(entity.getDescription()) &&
+                info.getSubscriberCount() == entity.getSubscriberCount();
+    }
+}

app/src/main/java/org/schabi/newpipe/history/HistoryActivity.java

@@ -0,0 +1,147 @@
+package org.schabi.newpipe.history;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.design.widget.FloatingActionButton;
+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.app.FragmentStatePagerAdapter;
+import android.support.v4.view.ViewPager;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.Toolbar;
+import android.util.Log;
+import android.view.Menu;
+import android.view.MenuItem;
+
+import com.jakewharton.rxbinding2.view.RxView;
+
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.settings.SettingsActivity;
+import org.schabi.newpipe.util.ThemeHelper;
+
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.functions.Consumer;
+
+public class HistoryActivity extends AppCompatActivity {
+
+    private static final String TAG = "HistoryActivity";
+    /**
+     * The {@link android.support.v4.view.PagerAdapter} that will provide
+     * fragments for each of the sections. We use a
+     * {@link FragmentPagerAdapter} derivative, which will keep every
+     * loaded fragment in memory. If this becomes too memory intensive, it
+     * may be best to switch to a
+     * {@link android.support.v4.app.FragmentStatePagerAdapter}.
+     */
+    private SectionsPagerAdapter mSectionsPagerAdapter;
+
+    /**
+     * The {@link ViewPager} that will host the section contents.
+     */
+    private ViewPager mViewPager;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        ThemeHelper.setTheme(this);
+        setContentView(R.layout.activity_history);
+
+        Toolbar toolbar = findViewById(R.id.toolbar);
+        setSupportActionBar(toolbar);
+        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+        getSupportActionBar().setTitle(R.string.title_activity_history);
+        // Create the adapter that will return a fragment for each of the three
+        // primary sections of the activity.
+        mSectionsPagerAdapter = new SectionsPagerAdapter(getSupportFragmentManager());
+
+        // Set up the ViewPager with the sections adapter.
+        mViewPager = findViewById(R.id.container);
+        mViewPager.setAdapter(mSectionsPagerAdapter);
+
+        TabLayout tabLayout = findViewById(R.id.tabs);
+        tabLayout.setupWithViewPager(mViewPager);
+
+        final FloatingActionButton fab = findViewById(R.id.fab);
+        RxView.clicks(fab)
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new Consumer<Object>() {
+                    @Override
+                    public void accept(Object o) {
+                        int currentItem = mViewPager.getCurrentItem();
+                        HistoryFragment fragment = (HistoryFragment) mSectionsPagerAdapter.instantiateItem(mViewPager, currentItem);
+                        if(fragment != null) {
+                            fragment.onHistoryCleared();
+                        } else {
+                            Log.w(TAG, "Couldn't find current fragment");
+                        }
+                    }
+                });
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        // Inflate the menu; this adds items to the action bar if it is present.
+        getMenuInflater().inflate(R.menu.menu_history, menu);
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case android.R.id.home:
+                finish();
+                return true;
+            case R.id.action_settings:
+                Intent intent = new Intent(this, SettingsActivity.class);
+                startActivity(intent);
+                return true;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
+    /**
+     * A {@link FragmentPagerAdapter} that returns a fragment corresponding to
+     * one of the sections/tabs/pages.
+     */
+    public class SectionsPagerAdapter extends FragmentStatePagerAdapter {
+
+        public SectionsPagerAdapter(FragmentManager fm) {
+            super(fm);
+        }
+
+        @Override
+        public Fragment getItem(int position) {
+            Fragment fragment;
+            switch (position) {
+                case 0:
+                    fragment = SearchHistoryFragment.newInstance();
+                    break;
+                case 1:
+                    fragment = WatchedHistoryFragment.newInstance();
+                    break;
+                default:
+                    throw new IllegalArgumentException("position: " + position);
+            }
+            return fragment;
+        }
+
+        @Override
+        public CharSequence getPageTitle(int position) {
+            switch (position) {
+                case 0:
+                    return getString(R.string.title_history_search);
+                case 1:
+                    return getString(R.string.title_history_view);
+            }
+            throw new IllegalArgumentException("position: " + position);
+        }
+
+        @Override
+        public int getCount() {
+            // Show 3 total pages.
+            return 2;
+        }
+    }
+}

app/src/main/java/org/schabi/newpipe/history/HistoryEntryAdapter.java

@@ -0,0 +1,106 @@
+package org.schabi.newpipe.history;
+
+import android.content.Context;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.v7.widget.RecyclerView;
+import android.view.View;
+
+import org.schabi.newpipe.database.history.model.HistoryEntry;
+
+import java.text.DateFormat;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Date;
+
+
+/**
+ * Adapter for history entries
+ * @param <E> the type of the entries
+ * @param <VH> the type of the view holder
+ */
+public abstract class HistoryEntryAdapter<E extends HistoryEntry, VH extends RecyclerView.ViewHolder> extends RecyclerView.Adapter<VH> {
+
+    private final ArrayList<E> mEntries;
+    private final DateFormat mDateFormat;
+    private OnHistoryItemClickListener<E> onHistoryItemClickListener = null;
+
+
+    public HistoryEntryAdapter(Context context) {
+        super();
+        mEntries = new ArrayList<>();
+        mDateFormat = android.text.format.DateFormat.getDateFormat(context.getApplicationContext());
+
+        setHasStableIds(true);
+    }
+
+    public void setEntries(@NonNull Collection<E> historyEntries) {
+        mEntries.clear();
+        mEntries.addAll(historyEntries);
+        notifyDataSetChanged();
+    }
+
+    public Collection<E> getItems() {
+        return mEntries;
+    }
+
+    public void clear() {
+        mEntries.clear();
+        notifyDataSetChanged();
+    }
+
+    protected String getFormattedDate(Date date) {
+        return mDateFormat.format(date);
+    }
+
+    @Override
+    public long getItemId(int position) {
+        return mEntries.get(position).getId();
+    }
+
+    @Override
+    public int getItemCount() {
+        return mEntries.size();
+    }
+
+    @Override
+    public void onBindViewHolder(VH holder, int position) {
+        final E entry = mEntries.get(position);
+        holder.itemView.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                final OnHistoryItemClickListener<E> historyItemClickListener = onHistoryItemClickListener;
+                if(historyItemClickListener != null) {
+                    historyItemClickListener.onHistoryItemClick(entry);
+                }
+            }
+        });
+        onBindViewHolder(holder, entry, position);
+    }
+
+    @Override
+    public void onViewRecycled(VH holder) {
+        super.onViewRecycled(holder);
+        holder.itemView.setOnClickListener(null);
+    }
+
+    abstract void onBindViewHolder(VH holder, E entry, int position);
+
+    public void setOnHistoryItemClickListener(@Nullable OnHistoryItemClickListener<E> onHistoryItemClickListener) {
+        this.onHistoryItemClickListener = onHistoryItemClickListener;
+    }
+
+    public boolean isEmpty() {
+        return mEntries.isEmpty();
+    }
+
+    public E removeItemAt(int position) {
+        E entry = mEntries.remove(position);
+        notifyItemRemoved(position);
+        return entry;
+    }
+
+    public interface OnHistoryItemClickListener<E extends HistoryEntry> {
+        void onHistoryItemClick(E historyItem);
+    }
+}

app/src/main/java/org/schabi/newpipe/history/HistoryFragment.java

@@ -0,0 +1,312 @@
+package org.schabi.newpipe.history;
+
+
+import android.content.SharedPreferences;
+import android.graphics.Color;
+import android.os.Bundle;
+import android.os.Parcelable;
+import android.preference.PreferenceManager;
+import android.support.annotation.CallSuper;
+import android.support.annotation.MainThread;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.annotation.StringRes;
+import android.support.design.widget.Snackbar;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.support.v7.widget.helper.ItemTouchHelper;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import org.schabi.newpipe.BaseFragment;
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.database.history.dao.HistoryDAO;
+import org.schabi.newpipe.database.history.model.HistoryEntry;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
+import icepick.State;
+import io.reactivex.Observer;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+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 abstract class HistoryFragment<E extends HistoryEntry> extends BaseFragment
+        implements HistoryEntryAdapter.OnHistoryItemClickListener<E> {
+
+    private SharedPreferences mSharedPreferences;
+    private String mHistoryIsEnabledKey;
+    private boolean mHistoryIsEnabled;
+    private HistoryIsEnabledChangeListener mHistoryIsEnabledChangeListener;
+
+    private View mDisabledView;
+    private View mEmptyHistoryView;
+
+    @State
+    Parcelable mRecyclerViewState;
+    private RecyclerView mRecyclerView;
+    private HistoryEntryAdapter<E, ? extends RecyclerView.ViewHolder> mHistoryAdapter;
+    private ItemTouchHelper.SimpleCallback mHistoryItemSwipeCallback;
+    // private int allowedSwipeToDeleteDirections = ItemTouchHelper.LEFT | ItemTouchHelper.RIGHT;
+
+    private HistoryDAO<E> mHistoryDataSource;
+    private PublishSubject<Collection<E>> mHistoryEntryDeleteSubject;
+    private PublishSubject<Collection<E>> mHistoryEntryInsertSubject;
+
+    @StringRes
+    abstract int getEnabledConfigKey();
+
+    @CallSuper
+    @Override
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        mHistoryIsEnabledKey = getString(getEnabledConfigKey());
+
+        mSharedPreferences = PreferenceManager.getDefaultSharedPreferences(getContext());
+        // Read history enabled from preferences
+        mHistoryIsEnabled = isHistoryEnabled();
+        // Register history enabled listener
+        mSharedPreferences.registerOnSharedPreferenceChangeListener(mHistoryIsEnabledChangeListener);
+
+        mHistoryDataSource = createHistoryDAO();
+
+        mHistoryEntryDeleteSubject = PublishSubject.create();
+        mHistoryEntryDeleteSubject
+                .observeOn(Schedulers.io())
+                .subscribe(new Consumer<Collection<E>>() {
+                    @Override
+                    public void accept(Collection<E> historyEntries) throws Exception {
+                        mHistoryDataSource.delete(historyEntries);
+                    }
+                });
+
+        mHistoryEntryInsertSubject = PublishSubject.create();
+        mHistoryEntryInsertSubject
+                .observeOn(Schedulers.io())
+                .subscribe(new Consumer<Collection<E>>() {
+                    @Override
+                    public void accept(Collection<E> historyEntries) throws Exception {
+                        mHistoryDataSource.insertAll(historyEntries);
+                    }
+                });
+
+
+    }
+
+    protected void historyItemSwipeCallback(int swipeDirection) {
+        mHistoryItemSwipeCallback = new ItemTouchHelper.SimpleCallback(0, swipeDirection) {
+            @Override
+            public boolean onMove(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder, RecyclerView.ViewHolder target) {
+                return false;
+            }
+
+            @Override
+            public void onSwiped(RecyclerView.ViewHolder viewHolder, int swipeDir) {
+                if (mHistoryAdapter != null) {
+                    final E historyEntry = mHistoryAdapter.removeItemAt(viewHolder.getAdapterPosition());
+                    mHistoryEntryDeleteSubject.onNext(Collections.singletonList(historyEntry));
+
+                    View view = getActivity().findViewById(R.id.main_content);
+                    if (view == null) view = mRecyclerView.getRootView();
+
+                    Snackbar.make(view, R.string.item_deleted, 5 * 1000)
+                            .setActionTextColor(Color.WHITE)
+                            .setAction(R.string.undo, new View.OnClickListener() {
+                                @Override
+                                public void onClick(View v) {
+                                    mHistoryEntryInsertSubject.onNext(Collections.singletonList(historyEntry));
+                                }
+                            }).show();
+                }
+            }
+        };
+    }
+
+    @NonNull
+    protected abstract HistoryEntryAdapter<E, ? extends RecyclerView.ViewHolder> createAdapter();
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        mHistoryDataSource.getAll()
+                .toObservable()
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(getHistoryListConsumer());
+        boolean newEnabled = isHistoryEnabled();
+        if (newEnabled != mHistoryIsEnabled) {
+            onHistoryIsEnabledChanged(newEnabled);
+        }
+    }
+
+    @NonNull
+    private Observer<List<E>> getHistoryListConsumer() {
+        return new Observer<List<E>>() {
+            @Override
+            public void onSubscribe(@NonNull Disposable d) {
+
+            }
+
+            @Override
+            public void onNext(@NonNull List<E> historyEntries) {
+                if (!historyEntries.isEmpty()) {
+                    mHistoryAdapter.setEntries(historyEntries);
+                    animateView(mEmptyHistoryView, false, 200);
+
+                    if (mRecyclerViewState != null) {
+                        mRecyclerView.getLayoutManager().onRestoreInstanceState(mRecyclerViewState);
+                        mRecyclerViewState = null;
+                    }
+                } else {
+                    mHistoryAdapter.clear();
+                    showEmptyHistory();
+                }
+            }
+
+            @Override
+            public void onError(@NonNull Throwable e) {
+                // TODO: error handling like in (see e.g. subscription fragment)
+            }
+
+            @Override
+            public void onComplete() {
+
+            }
+        };
+    }
+
+    private boolean isHistoryEnabled() {
+        return mSharedPreferences.getBoolean(mHistoryIsEnabledKey, false);
+    }
+
+    /**
+     * Called when the history is cleared to update the views
+     */
+    @MainThread
+    public void onHistoryCleared() {
+        final Parcelable stateBeforeClear = mRecyclerView.getLayoutManager().onSaveInstanceState();
+        final Collection<E> itemsToDelete = new ArrayList<>(mHistoryAdapter.getItems());
+        mHistoryEntryDeleteSubject.onNext(itemsToDelete);
+
+        View view = getActivity().findViewById(R.id.main_content);
+        if (view == null) view = mRecyclerView.getRootView();
+
+        if (!itemsToDelete.isEmpty()) {
+            Snackbar.make(view, R.string.history_cleared, 5 * 1000)
+                    .setActionTextColor(Color.WHITE)
+                    .setAction(R.string.undo, new View.OnClickListener() {
+                        @Override
+                        public void onClick(View v) {
+                            mRecyclerViewState = stateBeforeClear;
+                            mHistoryEntryInsertSubject.onNext(itemsToDelete);
+                        }
+                    }).show();
+        } else {
+            Snackbar.make(view, R.string.history_cleared, Snackbar.LENGTH_LONG).show();
+        }
+
+        mHistoryAdapter.clear();
+        showEmptyHistory();
+
+    }
+
+    private void showEmptyHistory() {
+        if (mHistoryIsEnabled) {
+            animateView(mEmptyHistoryView, true, 200);
+        }
+    }
+
+    @Nullable
+    @CallSuper
+    @Override
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        View rootView = inflater.inflate(R.layout.fragment_history, container, false);
+        mRecyclerView = rootView.findViewById(R.id.history_view);
+
+        RecyclerView.LayoutManager layoutManager = new LinearLayoutManager(getContext(), LinearLayoutManager.VERTICAL, false);
+        mRecyclerView.setLayoutManager(layoutManager);
+
+        mHistoryAdapter = createAdapter();
+        mHistoryAdapter.setOnHistoryItemClickListener(this);
+        mRecyclerView.setAdapter(mHistoryAdapter);
+        ItemTouchHelper itemTouchHelper = new ItemTouchHelper(mHistoryItemSwipeCallback);
+        itemTouchHelper.attachToRecyclerView(mRecyclerView);
+        mDisabledView = rootView.findViewById(R.id.history_disabled_view);
+        mEmptyHistoryView = rootView.findViewById(R.id.history_empty);
+
+        if (mHistoryIsEnabled) {
+            mRecyclerView.setVisibility(View.VISIBLE);
+        } else {
+            mRecyclerView.setVisibility(View.GONE);
+            mDisabledView.setVisibility(View.VISIBLE);
+        }
+
+        return rootView;
+    }
+
+    @CallSuper
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        mSharedPreferences.unregisterOnSharedPreferenceChangeListener(mHistoryIsEnabledChangeListener);
+        mSharedPreferences = null;
+        mHistoryIsEnabledChangeListener = null;
+        mHistoryIsEnabledKey = null;
+        mHistoryDataSource = null;
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        mRecyclerViewState = mRecyclerView.getLayoutManager().onSaveInstanceState();
+    }
+
+    /**
+     * Called when history enabled flag is changed.
+     *
+     * @param historyIsEnabled the new value
+     */
+    @CallSuper
+    public void onHistoryIsEnabledChanged(boolean historyIsEnabled) {
+        mHistoryIsEnabled = historyIsEnabled;
+        if (historyIsEnabled) {
+            animateView(mRecyclerView, true, 300);
+            animateView(mDisabledView, false, 300);
+            if (mHistoryAdapter.isEmpty()) {
+                animateView(mEmptyHistoryView, true, 300);
+            }
+        } else {
+            animateView(mRecyclerView, false, 300);
+            animateView(mDisabledView, true, 300);
+            animateView(mEmptyHistoryView, false, 300);
+        }
+    }
+
+    /**
+     * Creates a new history DAO
+     *
+     * @return the history DAO
+     */
+    @NonNull
+    protected abstract HistoryDAO<E> createHistoryDAO();
+
+    private class HistoryIsEnabledChangeListener implements SharedPreferences.OnSharedPreferenceChangeListener {
+        @Override
+        public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
+            if (key.equals(mHistoryIsEnabledKey)) {
+                boolean enabled = sharedPreferences.getBoolean(key, false);
+                if (mHistoryIsEnabled != enabled) {
+                    onHistoryIsEnabledChanged(enabled);
+                }
+            }
+        }
+    }
+}

app/src/main/java/org/schabi/newpipe/history/HistoryListener.java

@@ -0,0 +1,34 @@
+package org.schabi.newpipe.history;
+
+import android.support.annotation.Nullable;
+
+import org.schabi.newpipe.extractor.stream.AudioStream;
+import org.schabi.newpipe.extractor.stream.StreamInfo;
+import org.schabi.newpipe.extractor.stream.VideoStream;
+
+public interface HistoryListener {
+    /**
+     * Called when a video is played
+     *
+     * @param streamInfo  the stream info
+     * @param videoStream the video stream that is played. Can be null if it's not sure what
+     *                    quality was viewed (e.g. with Kodi).
+     */
+    void onVideoPlayed(StreamInfo streamInfo, @Nullable VideoStream videoStream);
+
+    /**
+     * Called when the audio is played in the background
+     *
+     * @param streamInfo  the stream info
+     * @param audioStream the audio stream that is played
+     */
+    void onAudioPlayed(StreamInfo streamInfo, AudioStream audioStream);
+
+    /**
+     * Called when the user searched for something
+     *
+     * @param serviceId which service the search was done
+     * @param query     what the user searched for
+     */
+    void onSearch(int serviceId, String query);
+}

app/src/main/java/org/schabi/newpipe/history/SearchHistoryFragment.java

@@ -0,0 +1,90 @@
+package org.schabi.newpipe.history;
+
+import android.content.Context;
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.annotation.StringRes;
+import android.support.v7.widget.RecyclerView;
+import android.support.v7.widget.helper.ItemTouchHelper;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import org.schabi.newpipe.NewPipeDatabase;
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.database.history.dao.HistoryDAO;
+import org.schabi.newpipe.database.history.model.SearchHistoryEntry;
+import org.schabi.newpipe.util.NavigationHelper;
+
+public class SearchHistoryFragment extends HistoryFragment<SearchHistoryEntry> {
+
+    private static int allowedSwipeToDeleteDirections = ItemTouchHelper.RIGHT;
+
+    @NonNull
+    public static SearchHistoryFragment newInstance() {
+        return new SearchHistoryFragment();
+    }
+
+    @Override
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        historyItemSwipeCallback(allowedSwipeToDeleteDirections);
+    }
+
+    @NonNull
+    @Override
+    protected SearchHistoryAdapter createAdapter() {
+        return new SearchHistoryAdapter(getContext());
+    }
+
+    @StringRes
+    @Override
+    int getEnabledConfigKey() {
+        return R.string.enable_search_history_key;
+    }
+
+    @NonNull
+    @Override
+    protected HistoryDAO<SearchHistoryEntry> createHistoryDAO() {
+        return NewPipeDatabase.getInstance().searchHistoryDAO();
+    }
+
+    @Override
+    public void onHistoryItemClick(SearchHistoryEntry historyItem) {
+        NavigationHelper.openSearch(getContext(), historyItem.getServiceId(), historyItem.getSearch());
+    }
+
+    private static class ViewHolder extends RecyclerView.ViewHolder {
+        private final TextView search;
+        private final TextView time;
+
+        public ViewHolder(View itemView) {
+            super(itemView);
+            search = itemView.findViewById(R.id.search);
+            time = itemView.findViewById(R.id.time);
+        }
+    }
+
+    protected class SearchHistoryAdapter extends HistoryEntryAdapter<SearchHistoryEntry, ViewHolder> {
+
+
+        public SearchHistoryAdapter(Context context) {
+            super(context);
+        }
+
+        @Override
+        public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+            LayoutInflater inflater = LayoutInflater.from(parent.getContext());
+            View rootView = inflater.inflate(R.layout.item_search_history, parent, false);
+            return new ViewHolder(rootView);
+        }
+
+        @Override
+        void onBindViewHolder(ViewHolder holder, SearchHistoryEntry entry, int position) {
+            holder.search.setText(entry.getSearch());
+            holder.time.setText(getFormattedDate(entry.getCreationDate()));
+        }
+    }
+}

app/src/main/java/org/schabi/newpipe/history/WatchedHistoryFragment.java

@@ -0,0 +1,116 @@
+package org.schabi.newpipe.history;
+
+
+import android.content.Context;
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.annotation.StringRes;
+import android.support.v7.widget.RecyclerView;
+import android.support.v7.widget.helper.ItemTouchHelper;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.nostra13.universalimageloader.core.ImageLoader;
+
+import org.schabi.newpipe.NewPipeDatabase;
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.database.history.dao.HistoryDAO;
+import org.schabi.newpipe.database.history.model.WatchHistoryEntry;
+import org.schabi.newpipe.info_list.holder.StreamInfoItemHolder;
+import org.schabi.newpipe.util.Localization;
+import org.schabi.newpipe.util.NavigationHelper;
+
+
+public class WatchedHistoryFragment extends HistoryFragment<WatchHistoryEntry> {
+
+    private static int allowedSwipeToDeleteDirections = ItemTouchHelper.LEFT;
+
+    @NonNull
+    public static WatchedHistoryFragment newInstance() {
+        return new WatchedHistoryFragment();
+    }
+
+    @Override
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        historyItemSwipeCallback(allowedSwipeToDeleteDirections);
+    }
+
+    @StringRes
+    @Override
+    int getEnabledConfigKey() {
+        return R.string.enable_watch_history_key;
+    }
+
+    @NonNull
+    @Override
+    protected WatchedHistoryAdapter createAdapter() {
+        return new WatchedHistoryAdapter(getContext());
+    }
+
+    @NonNull
+    @Override
+    protected HistoryDAO<WatchHistoryEntry> createHistoryDAO() {
+        return NewPipeDatabase.getInstance().watchHistoryDAO();
+    }
+
+    @Override
+    public void onHistoryItemClick(WatchHistoryEntry historyItem) {
+        NavigationHelper.openVideoDetail(getContext(),
+                historyItem.getServiceId(),
+                historyItem.getUrl(),
+                historyItem.getTitle());
+    }
+
+    private static class WatchedHistoryAdapter extends HistoryEntryAdapter<WatchHistoryEntry, ViewHolder> {
+
+        public WatchedHistoryAdapter(Context context) {
+            super(context);
+        }
+
+        @Override
+        public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+            LayoutInflater inflater = LayoutInflater.from(parent.getContext());
+            View itemView = inflater.inflate(R.layout.list_stream_item, parent, false);
+            return new ViewHolder(itemView);
+        }
+
+        @Override
+        public void onViewRecycled(ViewHolder holder) {
+            holder.itemView.setOnClickListener(null);
+            ImageLoader.getInstance()
+                    .cancelDisplayTask(holder.thumbnailView);
+        }
+
+        @Override
+        void onBindViewHolder(ViewHolder holder, WatchHistoryEntry entry, int position) {
+            holder.date.setText(getFormattedDate(entry.getCreationDate()));
+            holder.streamTitle.setText(entry.getTitle());
+            holder.uploader.setText(entry.getUploader());
+            holder.duration.setText(Localization.getDurationString(entry.getDuration()));
+            ImageLoader.getInstance()
+                    .displayImage(entry.getThumbnailURL(), holder.thumbnailView, StreamInfoItemHolder.DISPLAY_THUMBNAIL_OPTIONS);
+        }
+    }
+
+    private static class ViewHolder extends RecyclerView.ViewHolder {
+        private final TextView date;
+        private final TextView streamTitle;
+        private final ImageView thumbnailView;
+        private final TextView uploader;
+        private final TextView duration;
+
+        public ViewHolder(View itemView) {
+            super(itemView);
+            thumbnailView = itemView.findViewById(R.id.itemThumbnailView);
+            date = itemView.findViewById(R.id.itemAdditionalDetails);
+            streamTitle = itemView.findViewById(R.id.itemVideoTitleView);
+            uploader = itemView.findViewById(R.id.itemUploaderView);
+            duration = itemView.findViewById(R.id.itemDurationView);
+        }
+    }
+}

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,25 @@
 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.StreamInfoItemHolder;
+import org.schabi.newpipe.info_list.holder.StreamMiniInfoItemHolder;
 
-import java.util.Locale;
-
-/**
+/*
  * Created by Christian Schabesberger on 26.09.16.
  * <p>
  * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
@@ -40,251 +40,78 @@ 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);
+    public interface OnInfoItemSelectedListener<T extends InfoItem> {
+        void selected(T selectedItem);
+        void held(T selectedItem);
     }
 
+    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 OnInfoItemSelectedListener<StreamInfoItem> onStreamSelectedListener;
+    private OnInfoItemSelectedListener<ChannelInfoItem> onChannelSelectedListener;
+    private OnInfoItemSelectedListener<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.info_type, 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 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 OnInfoItemSelectedListener<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(OnInfoItemSelectedListener<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 OnInfoItemSelectedListener<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(OnInfoItemSelectedListener<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 OnInfoItemSelectedListener<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(OnInfoItemSelectedListener<PlaylistInfoItem> listener) {
+        this.onPlaylistSelectedListener = listener;
     }
+
 }

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

@@ -0,0 +1,55 @@
+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.uploader_name);
+    }
+
+    public InfoItemDialog(@NonNull final Activity activity,
+                          @NonNull final String[] commands,
+                          @NonNull final DialogInterface.OnClickListener actions,
+                          @NonNull final String title,
+                          @Nullable final String additionalDetail) {
+
+        final LayoutInflater inflater = activity.getLayoutInflater();
+        final View bannerView = inflater.inflate(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,25 @@ 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.InfoItemBuilder.OnInfoItemSelectedListener;
+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.StreamInfoItemHolder;
+import org.schabi.newpipe.info_list.holder.StreamMiniInfoItemHolder;
 
 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 +42,32 @@ 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 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 +75,71 @@ public class InfoListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
         infoItemList = new ArrayList<>();
     }
 
-    public void setOnStreamInfoItemSelectedListener
-            (InfoItemBuilder.OnInfoItemSelectedListener listener) {
-        infoItemBuilder.setOnStreamInfoItemSelectedListener(listener);
+    public void setOnStreamSelectedListener(OnInfoItemSelectedListener<StreamInfoItem> listener) {
+        infoItemBuilder.setOnStreamSelectedListener(listener);
     }
 
-    public void setOnChannelInfoItemSelectedListener
-            (InfoItemBuilder.OnInfoItemSelectedListener listener) {
-        infoItemBuilder.setOnChannelInfoItemSelectedListener(listener);
+    public void setOnChannelSelectedListener(OnInfoItemSelectedListener<ChannelInfoItem> listener) {
+        infoItemBuilder.setOnChannelSelectedListener(listener);
+    }
+
+    public void setOnPlaylistSelectedListener(OnInfoItemSelectedListener<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 +147,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()) {
+        InfoItem item = infoItemList.get(position);
+        switch (item.info_type) {
             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 PLAYLIST_HOLDER_TYPE;
             default:
                 Log.e(TAG, "Trollolo");
                 return -1;
@@ -133,20 +216,22 @@ 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 PLAYLIST_HOLDER_TYPE:
+                return new PlaylistInfoItemHolder(infoItemBuilder, parent);
             default:
                 Log.e(TAG, "Trollolo");
                 return null;
@@ -154,16 +239,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,65 @@
+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.description);
+    }
+
+    @Override
+    protected String getDetailLine(final ChannelInfoItem item) {
+        String details = super.getDetailLine(item);
+
+        if (item.stream_count >= 0) {
+            String formattedVideoAmount = Localization.localizeStreamCount(itemBuilder.getContext(), item.stream_count);
+
+            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,73 @@
+package org.schabi.newpipe.info_list.holder;
+
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import com.nostra13.universalimageloader.core.DisplayImageOptions;
+
+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;
+
+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.thumbnail_url, itemThumbnailView, ChannelInfoItemHolder.DISPLAY_THUMBNAIL_OPTIONS);
+
+        itemView.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                if (itemBuilder.getOnChannelSelectedListener() != null) {
+                    itemBuilder.getOnChannelSelectedListener().selected(item);
+                }
+            }
+        });
+    }
+
+    protected String getDetailLine(final ChannelInfoItem item) {
+        String details = "";
+        if (item.subscriber_count >= 0) {
+            details += Localization.shortSubscriberCount(itemBuilder.getContext(), item.subscriber_count);
+        }
+        return details;
+    }
+
+    /**
+     * Display options for channel thumbnails
+     */
+    public static final DisplayImageOptions DISPLAY_THUMBNAIL_OPTIONS =
+            new DisplayImageOptions.Builder()
+                    .cloneFrom(BASE_DISPLAY_IMAGE_OPTIONS)
+                    .showImageOnLoading(R.drawable.buddy_channel_item)
+                    .showImageForEmptyUri(R.drawable.buddy_channel_item)
+                    .showImageOnFail(R.drawable.buddy_channel_item)
+                    .build();
+}

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

@@ -0,0 +1,53 @@
+package org.schabi.newpipe.info_list.holder;
+
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.ViewGroup;
+
+import com.nostra13.universalimageloader.core.DisplayImageOptions;
+
+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>
+ * InfoItemHolder.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 abstract class InfoItemHolder extends RecyclerView.ViewHolder {
+    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 void updateFromItem(final InfoItem infoItem);
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // ImageLoaderOptions
+    //////////////////////////////////////////////////////////////////////////*/
+
+    /**
+     * Base display options
+     */
+    public static final DisplayImageOptions BASE_DISPLAY_IMAGE_OPTIONS =
+            new DisplayImageOptions.Builder()
+                    .cacheInMemory(true)
+                    .build();
+}

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

@@ -0,0 +1,62 @@
+package org.schabi.newpipe.info_list.holder;
+
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.nostra13.universalimageloader.core.DisplayImageOptions;
+
+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;
+
+public class PlaylistInfoItemHolder extends InfoItemHolder {
+    public final ImageView itemThumbnailView;
+    public final TextView itemStreamCountView;
+    public final TextView itemTitleView;
+    public final TextView itemUploaderView;
+
+    public PlaylistInfoItemHolder(InfoItemBuilder infoItemBuilder, ViewGroup parent) {
+        super(infoItemBuilder, R.layout.list_playlist_item, 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);
+    }
+
+    @Override
+    public void updateFromItem(final InfoItem infoItem) {
+        if (!(infoItem instanceof PlaylistInfoItem)) return;
+        final PlaylistInfoItem item = (PlaylistInfoItem) infoItem;
+
+        itemTitleView.setText(item.getName());
+        itemStreamCountView.setText(item.stream_count + "");
+        itemUploaderView.setText(item.uploader_name);
+
+        itemBuilder.getImageLoader()
+                .displayImage(item.thumbnail_url, itemThumbnailView, DISPLAY_THUMBNAIL_OPTIONS);
+
+        itemView.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                if (itemBuilder.getOnPlaylistSelectedListener() != null) {
+                    itemBuilder.getOnPlaylistSelectedListener().selected(item);
+                }
+            }
+        });
+    }
+
+    /**
+     * Display options for playlist thumbnails
+     */
+    public static final DisplayImageOptions DISPLAY_THUMBNAIL_OPTIONS =
+            new DisplayImageOptions.Builder()
+                    .cloneFrom(BASE_DISPLAY_IMAGE_OPTIONS)
+                    .showImageOnLoading(R.drawable.dummy_thumbnail_playlist)
+                    .showImageForEmptyUri(R.drawable.dummy_thumbnail_playlist)
+                    .showImageOnFail(R.drawable.dummy_thumbnail_playlist)
+                    .build();
+}

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.view_count >= 0) {
+            viewsAndDate = Localization.shortViewCount(itemBuilder.getContext(), infoItem.view_count);
+        }
+        if (!TextUtils.isEmpty(infoItem.upload_date)) {
+            if (viewsAndDate.isEmpty()) {
+                viewsAndDate = infoItem.upload_date;
+            } else {
+                viewsAndDate += " • " + infoItem.upload_date;
+            }
+        }
+        return viewsAndDate;
+    }
+}

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

@@ -0,0 +1,114 @@
+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 com.nostra13.universalimageloader.core.DisplayImageOptions;
+
+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.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.uploader_name);
+
+        if (item.duration > 0) {
+            itemDurationView.setText(Localization.getDurationString(item.duration));
+            itemDurationView.setBackgroundColor(ContextCompat.getColor(itemBuilder.getContext(), R.color.duration_background_color));
+            itemDurationView.setVisibility(View.VISIBLE);
+        } else if (item.stream_type == 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.thumbnail_url, itemThumbnailView, StreamInfoItemHolder.DISPLAY_THUMBNAIL_OPTIONS);
+
+        itemView.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                if (itemBuilder.getOnStreamSelectedListener() != null) {
+                    itemBuilder.getOnStreamSelectedListener().selected(item);
+                }
+            }
+        });
+
+        switch (item.stream_type) {
+            case AUDIO_STREAM:
+            case VIDEO_STREAM:
+            case FILE:
+                enableLongClick(item);
+                break;
+            case LIVE_STREAM:
+            case AUDIO_LIVE_STREAM:
+            case NONE:
+            default:
+                disableLongClick();
+                break;
+        }
+    }
+
+    private void enableLongClick(final StreamInfoItem item) {
+        itemView.setLongClickable(true);
+        itemView.setOnLongClickListener(new View.OnLongClickListener() {
+            @Override
+            public boolean onLongClick(View view) {
+                if (itemBuilder.getOnStreamSelectedListener() != null) {
+                    itemBuilder.getOnStreamSelectedListener().held(item);
+                }
+                return true;
+            }
+        });
+    }
+
+    private void disableLongClick() {
+        itemView.setLongClickable(false);
+        itemView.setOnLongClickListener(null);
+    }
+
+    /**
+     * Display options for stream thumbnails
+     */
+    public static final DisplayImageOptions DISPLAY_THUMBNAIL_OPTIONS =
+            new DisplayImageOptions.Builder()
+                    .cloneFrom(BASE_DISPLAY_IMAGE_OPTIONS)
+                    .showImageOnFail(R.drawable.dummy_thumbnail)
+                    .showImageForEmptyUri(R.drawable.dummy_thumbnail)
+                    .showImageOnLoading(R.drawable.dummy_thumbnail)
+                    .build();
+}

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

@@ -1,6 +1,24 @@
+/*
+ * Copyright 2017 Mauricio Colli <mauriciocolli@outlook.com>
+ * BackgroundPlayer.java is part of NewPipe
+ *
+ * License: GPL-3.0+
+ * This program 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.
+ *
+ * This program 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 this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package org.schabi.newpipe.player;
 
-import android.app.Notification;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.app.Service;
@@ -8,25 +26,32 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.graphics.Bitmap;
-import android.net.wifi.WifiManager;
 import android.os.Build;
 import android.os.IBinder;
-import android.os.PowerManager;
 import android.support.annotation.IntRange;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
 import android.support.v4.app.NotificationCompat;
 import android.util.Log;
 import android.widget.RemoteViews;
 
+import com.google.android.exoplayer2.PlaybackParameters;
+import com.google.android.exoplayer2.Player;
+import com.google.android.exoplayer2.source.MediaSource;
+
 import org.schabi.newpipe.BuildConfig;
-import org.schabi.newpipe.MainActivity;
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.extractor.MediaFormat;
-import org.schabi.newpipe.extractor.StreamingService;
-import org.schabi.newpipe.extractor.stream_info.AudioStream;
-import org.schabi.newpipe.util.Constants;
+import org.schabi.newpipe.extractor.stream.AudioStream;
+import org.schabi.newpipe.extractor.stream.StreamInfo;
+import org.schabi.newpipe.player.event.PlayerEventListener;
+import org.schabi.newpipe.player.helper.LockManager;
+import org.schabi.newpipe.playlist.PlayQueueItem;
+import org.schabi.newpipe.util.ListHelper;
+import org.schabi.newpipe.util.NavigationHelper;
 import org.schabi.newpipe.util.ThemeHelper;
 
-import java.io.Serializable;
+import static org.schabi.newpipe.player.helper.PlayerHelper.getTimeString;
 
 
 /**
@@ -34,38 +59,41 @@ import java.io.Serializable;
  *
  * @author mauriciocolli
  */
-public class BackgroundPlayer extends Service {
+public final class BackgroundPlayer extends Service {
     private static final String TAG = "BackgroundPlayer";
     private static final boolean DEBUG = BasePlayer.DEBUG;
 
     public static final String ACTION_CLOSE = "org.schabi.newpipe.player.BackgroundPlayer.CLOSE";
     public static final String ACTION_PLAY_PAUSE = "org.schabi.newpipe.player.BackgroundPlayer.PLAY_PAUSE";
-    public static final String ACTION_OPEN_DETAIL = "org.schabi.newpipe.player.BackgroundPlayer.OPEN_DETAIL";
     public static final String ACTION_REPEAT = "org.schabi.newpipe.player.BackgroundPlayer.REPEAT";
+    public static final String ACTION_PLAY_NEXT = "org.schabi.newpipe.player.BackgroundPlayer.ACTION_PLAY_NEXT";
+    public static final String ACTION_PLAY_PREVIOUS = "org.schabi.newpipe.player.BackgroundPlayer.ACTION_PLAY_PREVIOUS";
     public static final String ACTION_FAST_REWIND = "org.schabi.newpipe.player.BackgroundPlayer.ACTION_FAST_REWIND";
     public static final String ACTION_FAST_FORWARD = "org.schabi.newpipe.player.BackgroundPlayer.ACTION_FAST_FORWARD";
 
-    public static final String AUDIO_STREAM = "video_only_audio_stream";
-    private AudioStream audioStream;
+    public static final String SET_IMAGE_RESOURCE_METHOD = "setImageResource";
 
     private BasePlayerImpl basePlayerImpl;
-    private PowerManager powerManager;
-    private WifiManager wifiManager;
+    private LockManager lockManager;
+    /*//////////////////////////////////////////////////////////////////////////
+    // Service-Activity Binder
+    //////////////////////////////////////////////////////////////////////////*/
 
-    private PowerManager.WakeLock wakeLock;
-    private WifiManager.WifiLock wifiLock;
+    private PlayerEventListener activityListener;
+    private IBinder mBinder;
 
     /*//////////////////////////////////////////////////////////////////////////
     // Notification
     //////////////////////////////////////////////////////////////////////////*/
-    private static final int NOTIFICATION_ID = 123789;
 
+    private static final int NOTIFICATION_ID = 123789;
     private NotificationManager notificationManager;
     private NotificationCompat.Builder notBuilder;
     private RemoteViews notRemoteView;
     private RemoteViews bigNotRemoteView;
     private final String setAlphaMethodName = (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) ? "setImageAlpha" : "setAlpha";
 
+    private boolean shouldUpdateOnProgress;
 
     /*//////////////////////////////////////////////////////////////////////////
     // Service's LifeCycle
@@ -75,12 +103,14 @@ public class BackgroundPlayer extends Service {
     public void onCreate() {
         if (DEBUG) Log.d(TAG, "onCreate() called");
         notificationManager = ((NotificationManager) getSystemService(NOTIFICATION_SERVICE));
-        powerManager = ((PowerManager) getSystemService(POWER_SERVICE));
-        wifiManager = ((WifiManager) getApplicationContext().getSystemService(WIFI_SERVICE));
+        lockManager = new LockManager(this);
 
         ThemeHelper.setTheme(this);
         basePlayerImpl = new BasePlayerImpl(this);
         basePlayerImpl.setup();
+
+        mBinder = new PlayerServiceBinder(basePlayerImpl);
+        shouldUpdateOnProgress = true;
     }
 
     @Override
@@ -93,51 +123,50 @@ public class BackgroundPlayer extends Service {
     @Override
     public void onDestroy() {
         if (DEBUG) Log.d(TAG, "destroy() called");
-        releaseWifiAndCpu();
-        stopForeground(true);
-        if (basePlayerImpl != null) basePlayerImpl.destroy();
+        onClose();
     }
 
     @Override
     public IBinder onBind(Intent intent) {
-        return null;
+        return mBinder;
     }
 
     /*//////////////////////////////////////////////////////////////////////////
     // Actions
     //////////////////////////////////////////////////////////////////////////*/
-
-    public void onOpenDetail(Context context, String videoUrl, String videoTitle) {
-        if (DEBUG) Log.d(TAG, "onOpenDetail() called with: context = [" + context + "], videoUrl = [" + videoUrl + "]");
-        Intent i = new Intent(context, MainActivity.class);
-        i.putExtra(Constants.KEY_SERVICE_ID, 0);
-        i.putExtra(Constants.KEY_URL, videoUrl);
-        i.putExtra(Constants.KEY_TITLE, videoTitle);
-        i.putExtra(Constants.KEY_LINK_TYPE, StreamingService.LinkType.STREAM);
-        i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        context.startActivity(i);
-        context.sendBroadcast(new Intent(Intent.ACTION_CLOSE_SYSTEM_DIALOGS));
-    }
-
     private void onClose() {
-        if (basePlayerImpl != null) basePlayerImpl.destroyPlayer();
+        if (DEBUG) Log.d(TAG, "onClose() called");
+
+        if (lockManager != null) {
+            lockManager.releaseWifiAndCpu();
+        }
+        if (basePlayerImpl != null) {
+            basePlayerImpl.stopActivityBinding();
+            basePlayerImpl.destroy();
+        }
+        if (notificationManager != null) notificationManager.cancel(NOTIFICATION_ID);
+        mBinder = null;
+        basePlayerImpl = null;
+        lockManager = null;
+
         stopForeground(true);
-        releaseWifiAndCpu();
         stopSelf();
     }
 
     private void onScreenOnOff(boolean on) {
         if (DEBUG) Log.d(TAG, "onScreenOnOff() called with: on = [" + on + "]");
-        if (on) {
-            if (basePlayerImpl.isPlaying() && !basePlayerImpl.isProgressLoopRunning.get()) basePlayerImpl.startProgressLoop();
-        } else basePlayerImpl.stopProgressLoop();
-
+        shouldUpdateOnProgress = on;
+        basePlayerImpl.triggerProgressUpdate();
     }
 
     /*//////////////////////////////////////////////////////////////////////////
     // Notification
     //////////////////////////////////////////////////////////////////////////*/
 
+    private void resetNotification() {
+        notBuilder = createNotification();
+    }
+
     private NotificationCompat.Builder createNotification() {
         notRemoteView = new RemoteViews(BuildConfig.APPLICATION_ID, R.layout.player_notification);
         bigNotRemoteView = new RemoteViews(BuildConfig.APPLICATION_ID, R.layout.player_notification_expanded);
@@ -145,47 +174,51 @@ public class BackgroundPlayer extends Service {
         setupNotification(notRemoteView);
         setupNotification(bigNotRemoteView);
 
-        NotificationCompat.Builder builder = new NotificationCompat.Builder(this)
+        NotificationCompat.Builder builder = new NotificationCompat.Builder(this, getString(R.string.notification_channel_id))
                 .setOngoing(true)
-                .setSmallIcon(R.drawable.ic_play_circle_filled_white_24dp)
+                .setSmallIcon(R.drawable.ic_newpipe_triangle_white)
                 .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
                 .setCustomContentView(notRemoteView)
                 .setCustomBigContentView(bigNotRemoteView);
-        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.JELLY_BEAN) builder.setPriority(Notification.PRIORITY_MAX);
+        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.JELLY_BEAN) builder.setPriority(NotificationCompat.PRIORITY_MAX);
         return builder;
     }
 
     private void setupNotification(RemoteViews remoteViews) {
-        //if (videoThumbnail != null) remoteViews.setImageViewBitmap(R.id.notificationCover, videoThumbnail);
-        ///else remoteViews.setImageViewResource(R.id.notificationCover, R.drawable.dummy_thumbnail);
+        if (basePlayerImpl == null) return;
+
         remoteViews.setTextViewText(R.id.notificationSongName, basePlayerImpl.getVideoTitle());
-        remoteViews.setTextViewText(R.id.notificationArtist, basePlayerImpl.getChannelName());
+        remoteViews.setTextViewText(R.id.notificationArtist, basePlayerImpl.getUploaderName());
 
         remoteViews.setOnClickPendingIntent(R.id.notificationPlayPause,
                 PendingIntent.getBroadcast(this, NOTIFICATION_ID, new Intent(ACTION_PLAY_PAUSE), PendingIntent.FLAG_UPDATE_CURRENT));
         remoteViews.setOnClickPendingIntent(R.id.notificationStop,
                 PendingIntent.getBroadcast(this, NOTIFICATION_ID, new Intent(ACTION_CLOSE), PendingIntent.FLAG_UPDATE_CURRENT));
-        remoteViews.setOnClickPendingIntent(R.id.notificationContent,
-                PendingIntent.getBroadcast(this, NOTIFICATION_ID, new Intent(ACTION_OPEN_DETAIL), PendingIntent.FLAG_UPDATE_CURRENT));
         remoteViews.setOnClickPendingIntent(R.id.notificationRepeat,
                 PendingIntent.getBroadcast(this, NOTIFICATION_ID, new Intent(ACTION_REPEAT), PendingIntent.FLAG_UPDATE_CURRENT));
 
-        remoteViews.setOnClickPendingIntent(R.id.notificationFRewind,
-                PendingIntent.getBroadcast(this, NOTIFICATION_ID, new Intent(ACTION_FAST_REWIND), PendingIntent.FLAG_UPDATE_CURRENT));
-        remoteViews.setOnClickPendingIntent(R.id.notificationFForward,
-                PendingIntent.getBroadcast(this, NOTIFICATION_ID, new Intent(ACTION_FAST_FORWARD), PendingIntent.FLAG_UPDATE_CURRENT));
+        // Starts background player activity -- attempts to unlock lockscreen
+        final Intent intent = NavigationHelper.getBackgroundPlayerActivityIntent(this);
+        remoteViews.setOnClickPendingIntent(R.id.notificationContent,
+                PendingIntent.getActivity(this, NOTIFICATION_ID, intent, PendingIntent.FLAG_UPDATE_CURRENT));
 
-        switch (basePlayerImpl.getCurrentRepeatMode()) {
-            case REPEAT_DISABLED:
-                remoteViews.setInt(R.id.notificationRepeat, setAlphaMethodName, 77);
-                break;
-            case REPEAT_ONE:
-                remoteViews.setInt(R.id.notificationRepeat, setAlphaMethodName, 255);
-                break;
-            case REPEAT_ALL:
-                // Waiting :)
-                break;
+        if (basePlayerImpl.playQueue != null && basePlayerImpl.playQueue.size() > 1) {
+            remoteViews.setInt(R.id.notificationFRewind, SET_IMAGE_RESOURCE_METHOD, R.drawable.exo_controls_previous);
+            remoteViews.setInt(R.id.notificationFForward, SET_IMAGE_RESOURCE_METHOD, R.drawable.exo_controls_next);
+            remoteViews.setOnClickPendingIntent(R.id.notificationFRewind,
+                    PendingIntent.getBroadcast(this, NOTIFICATION_ID, new Intent(ACTION_PLAY_PREVIOUS), PendingIntent.FLAG_UPDATE_CURRENT));
+            remoteViews.setOnClickPendingIntent(R.id.notificationFForward,
+                    PendingIntent.getBroadcast(this, NOTIFICATION_ID, new Intent(ACTION_PLAY_NEXT), PendingIntent.FLAG_UPDATE_CURRENT));
+        } else {
+            remoteViews.setInt(R.id.notificationFRewind, SET_IMAGE_RESOURCE_METHOD, R.drawable.exo_controls_rewind);
+            remoteViews.setInt(R.id.notificationFForward, SET_IMAGE_RESOURCE_METHOD, R.drawable.exo_controls_fastforward);
+            remoteViews.setOnClickPendingIntent(R.id.notificationFRewind,
+                    PendingIntent.getBroadcast(this, NOTIFICATION_ID, new Intent(ACTION_FAST_REWIND), PendingIntent.FLAG_UPDATE_CURRENT));
+            remoteViews.setOnClickPendingIntent(R.id.notificationFForward,
+                    PendingIntent.getBroadcast(this, NOTIFICATION_ID, new Intent(ACTION_FAST_FORWARD), PendingIntent.FLAG_UPDATE_CURRENT));
         }
+
+        setRepeatModeIcon(remoteViews, basePlayerImpl.getRepeatMode());
     }
 
     /**
@@ -194,8 +227,8 @@ public class BackgroundPlayer extends Service {
      *
      * @param drawableId if != -1, sets the drawable with that id on the play/pause button
      */
-    private void updateNotification(int drawableId) {
-        if (DEBUG) Log.d(TAG, "updateNotification() called with: drawableId = [" + drawableId + "]");
+    private synchronized void updateNotification(int drawableId) {
+        //if (DEBUG) Log.d(TAG, "updateNotification() called with: drawableId = [" + drawableId + "]");
         if (notBuilder == null) return;
         if (drawableId != -1) {
             if (notRemoteView != null) notRemoteView.setImageViewResource(R.id.notificationPlayPause, drawableId);
@@ -217,131 +250,101 @@ public class BackgroundPlayer extends Service {
     // Utils
     //////////////////////////////////////////////////////////////////////////*/
 
-    private void lockWifiAndCpu() {
-        if (DEBUG) Log.d(TAG, "lockWifiAndCpu() called");
-        if (wakeLock != null && wakeLock.isHeld() && wifiLock != null && wifiLock.isHeld()) return;
-
-        wakeLock = powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, TAG);
-        wifiLock = wifiManager.createWifiLock(WifiManager.WIFI_MODE_FULL, TAG);
-
-        if (wakeLock != null) wakeLock.acquire();
-        if (wifiLock != null) wifiLock.acquire();
+    private void setRepeatModeIcon(final RemoteViews remoteViews, final int repeatMode) {
+        switch (repeatMode) {
+            case Player.REPEAT_MODE_OFF:
+                remoteViews.setInt(R.id.notificationRepeat, SET_IMAGE_RESOURCE_METHOD, R.drawable.exo_controls_repeat_off);
+                break;
+            case Player.REPEAT_MODE_ONE:
+                remoteViews.setInt(R.id.notificationRepeat, SET_IMAGE_RESOURCE_METHOD, R.drawable.exo_controls_repeat_one);
+                break;
+            case Player.REPEAT_MODE_ALL:
+                remoteViews.setInt(R.id.notificationRepeat, SET_IMAGE_RESOURCE_METHOD, R.drawable.exo_controls_repeat_all);
+                break;
+        }
     }
-
-    private void releaseWifiAndCpu() {
-        if (DEBUG) Log.d(TAG, "releaseWifiAndCpu() called");
-        if (wakeLock != null && wakeLock.isHeld()) wakeLock.release();
-        if (wifiLock != null && wifiLock.isHeld()) wifiLock.release();
-
-        wakeLock = null;
-        wifiLock = null;
-    }
-
     //////////////////////////////////////////////////////////////////////////
 
-    private class BasePlayerImpl extends BasePlayer {
+    protected class BasePlayerImpl extends BasePlayer {
 
         BasePlayerImpl(Context context) {
             super(context);
         }
 
         @Override
-        public void handleIntent(Intent intent) {
+        public void handleIntent(final Intent intent) {
             super.handleIntent(intent);
-            Serializable serializable = intent.getSerializableExtra(BackgroundPlayer.AUDIO_STREAM);
-            if (serializable instanceof AudioStream) audioStream = (AudioStream) serializable;
-            playUrl(audioStream.url, MediaFormat.getSuffixById(audioStream.format), true);
 
+            resetNotification();
             if (bigNotRemoteView != null) bigNotRemoteView.setProgressBar(R.id.notificationProgressBar, 100, 0, false);
             if (notRemoteView != null) notRemoteView.setProgressBar(R.id.notificationProgressBar, 100, 0, false);
+            startForeground(NOTIFICATION_ID, notBuilder.build());
         }
 
         @Override
-        public void initThumbnail() {
+        public void initThumbnail(final String url) {
+            resetNotification();
             if (notRemoteView != null) notRemoteView.setImageViewResource(R.id.notificationCover, R.drawable.dummy_thumbnail);
             if (bigNotRemoteView != null) bigNotRemoteView.setImageViewResource(R.id.notificationCover, R.drawable.dummy_thumbnail);
             updateNotification(-1);
-            super.initThumbnail();
+            super.initThumbnail(url);
         }
 
         @Override
         public void onThumbnailReceived(Bitmap thumbnail) {
             super.onThumbnailReceived(thumbnail);
+
             if (thumbnail != null) {
+                // rebuild notification here since remote view does not release bitmaps, causing memory leaks
+                resetNotification();
+
                 if (notRemoteView != null) notRemoteView.setImageViewBitmap(R.id.notificationCover, thumbnail);
                 if (bigNotRemoteView != null) bigNotRemoteView.setImageViewBitmap(R.id.notificationCover, thumbnail);
+
                 updateNotification(-1);
             }
         }
 
-        @Override
-        public void playUrl(String url, String format, boolean autoPlay) {
-            super.playUrl(url, format, autoPlay);
-
-            notBuilder = createNotification();
-            startForeground(NOTIFICATION_ID, notBuilder.build());
-        }
-
         @Override
         public void onPrepared(boolean playWhenReady) {
             super.onPrepared(playWhenReady);
-            if (simpleExoPlayer.getDuration() < 15000) {
-                FAST_FORWARD_REWIND_AMOUNT = 2000;
-            } else if (simpleExoPlayer.getDuration() > 60 * 60 * 1000) {
-                FAST_FORWARD_REWIND_AMOUNT = 60000;
-            } else {
-                FAST_FORWARD_REWIND_AMOUNT = 10000;
-            }
-            PROGRESS_LOOP_INTERVAL = 1000;
-            basePlayerImpl.getPlayer().setVolume(1f);
+            simpleExoPlayer.setVolume(1f);
         }
 
         @Override
-        public void onRepeatClicked() {
-            super.onRepeatClicked();
-
-            int opacity = 255;
-            switch (currentRepeatMode) {
-                case REPEAT_DISABLED:
-                    opacity = 77;
-                    break;
-                case REPEAT_ONE:
-                    opacity = 255;
-                    break;
-                case REPEAT_ALL:
-                    // Waiting :)
-                    break;
-            }
-            if (notRemoteView != null) notRemoteView.setInt(R.id.notificationRepeat, setAlphaMethodName, opacity);
-            if (bigNotRemoteView != null) bigNotRemoteView.setInt(R.id.notificationRepeat, setAlphaMethodName, opacity);
-            updateNotification(-1);
+        public void onShuffleClicked() {
+            super.onShuffleClicked();
+            updatePlayback();
         }
 
         @Override
         public void onUpdateProgress(int currentProgress, int duration, int bufferPercent) {
-            if (bigNotRemoteView != null) bigNotRemoteView.setProgressBar(R.id.notificationProgressBar, duration, currentProgress, false);
-            if (notRemoteView != null) notRemoteView.setProgressBar(R.id.notificationProgressBar, duration, currentProgress, false);
-            if (bigNotRemoteView != null) bigNotRemoteView.setTextViewText(R.id.notificationTime, getTimeString(currentProgress) + " / " + getTimeString(duration));
+            updateProgress(currentProgress, duration, bufferPercent);
+
+            if (!shouldUpdateOnProgress) return;
+            resetNotification();
+            if (bigNotRemoteView != null) {
+                bigNotRemoteView.setProgressBar(R.id.notificationProgressBar, duration, currentProgress, false);
+                bigNotRemoteView.setTextViewText(R.id.notificationTime, getTimeString(currentProgress) + " / " + getTimeString(duration));
+            }
+            if (notRemoteView != null) {
+                notRemoteView.setProgressBar(R.id.notificationProgressBar, duration, currentProgress, false);
+            }
             updateNotification(-1);
         }
 
         @Override
-        public void onFastRewind() {
-            super.onFastRewind();
+        public void onPlayPrevious() {
+            super.onPlayPrevious();
             triggerProgressUpdate();
         }
 
         @Override
-        public void onFastForward() {
-            super.onFastForward();
+        public void onPlayNext() {
+            super.onPlayNext();
             triggerProgressUpdate();
         }
 
-        @Override
-        public void onLoadingChanged(boolean isLoading) {
-            // Disable default behavior
-        }
-
         @Override
         public void destroy() {
             super.destroy();
@@ -349,10 +352,98 @@ public class BackgroundPlayer extends Service {
             if (bigNotRemoteView != null) bigNotRemoteView.setImageViewBitmap(R.id.notificationCover, null);
         }
 
+        /*//////////////////////////////////////////////////////////////////////////
+        // ExoPlayer Listener
+        //////////////////////////////////////////////////////////////////////////*/
+
         @Override
-        public void onError(Exception exception) {
-            exception.printStackTrace();
-            stopSelf();
+        public void onPlaybackParametersChanged(PlaybackParameters playbackParameters) {
+            super.onPlaybackParametersChanged(playbackParameters);
+            updatePlayback();
+        }
+
+        @Override
+        public void onLoadingChanged(boolean isLoading) {
+            // Disable default behavior
+        }
+
+        @Override
+        public void onRepeatModeChanged(int i) {
+            resetNotification();
+            updateNotification(-1);
+            updatePlayback();
+        }
+
+        /*//////////////////////////////////////////////////////////////////////////
+        // Playback Listener
+        //////////////////////////////////////////////////////////////////////////*/
+
+        @Override
+        public void sync(@NonNull final PlayQueueItem item, @Nullable final StreamInfo info) {
+            if (currentItem == item && currentInfo == info) return;
+            super.sync(item, info);
+
+            resetNotification();
+            updateNotification(-1);
+            updateMetadata();
+        }
+
+        @Override
+        @Nullable
+        public MediaSource sourceOf(final PlayQueueItem item, final StreamInfo info) {
+            final int index = ListHelper.getDefaultAudioFormat(context, info.audio_streams);
+            if (index < 0 || index >= info.audio_streams.size()) return null;
+
+            final AudioStream audio = info.audio_streams.get(index);
+            return buildMediaSource(audio.getUrl(), MediaFormat.getSuffixById(audio.getFormatId()));
+        }
+
+        @Override
+        public void shutdown() {
+            super.shutdown();
+            onClose();
+        }
+
+        /*//////////////////////////////////////////////////////////////////////////
+        // Activity Event Listener
+        //////////////////////////////////////////////////////////////////////////*/
+
+        /*package-private*/ void setActivityListener(PlayerEventListener listener) {
+            activityListener = listener;
+            updateMetadata();
+            updatePlayback();
+            triggerProgressUpdate();
+        }
+
+        /*package-private*/ void removeActivityListener(PlayerEventListener listener) {
+            if (activityListener == listener) {
+                activityListener = null;
+            }
+        }
+
+        private void updateMetadata() {
+            if (activityListener != null && currentInfo != null) {
+                activityListener.onMetadataUpdate(currentInfo);
+            }
+        }
+
+        private void updatePlayback() {
+            if (activityListener != null && simpleExoPlayer != null && playQueue != null) {
+                activityListener.onPlaybackUpdate(currentState, getRepeatMode(), playQueue.isShuffled(), getPlaybackParameters());
+            }
+        }
+
+        private void updateProgress(int currentProgress, int duration, int bufferPercent) {
+            if (activityListener != null) {
+                activityListener.onProgressUpdate(currentProgress, duration, bufferPercent);
+            }
+        }
+
+        private void stopActivityBinding() {
+            if (activityListener != null) {
+                activityListener.onServiceStopped();
+                activityListener = null;
+            }
         }
 
         /*//////////////////////////////////////////////////////////////////////////
@@ -364,10 +455,11 @@ public class BackgroundPlayer extends Service {
             super.setupBroadcastReceiver(intentFilter);
             intentFilter.addAction(ACTION_CLOSE);
             intentFilter.addAction(ACTION_PLAY_PAUSE);
-            intentFilter.addAction(ACTION_OPEN_DETAIL);
             intentFilter.addAction(ACTION_REPEAT);
-            intentFilter.addAction(ACTION_FAST_FORWARD);
+            intentFilter.addAction(ACTION_PLAY_PREVIOUS);
+            intentFilter.addAction(ACTION_PLAY_NEXT);
             intentFilter.addAction(ACTION_FAST_REWIND);
+            intentFilter.addAction(ACTION_FAST_FORWARD);
 
             intentFilter.addAction(Intent.ACTION_SCREEN_ON);
             intentFilter.addAction(Intent.ACTION_SCREEN_OFF);
@@ -378,6 +470,7 @@ public class BackgroundPlayer extends Service {
         @Override
         public void onBroadcastReceived(Intent intent) {
             super.onBroadcastReceived(intent);
+            if (intent == null || intent.getAction() == null) return;
             if (DEBUG) Log.d(TAG, "onBroadcastReceived() called with: intent = [" + intent + "]");
             switch (intent.getAction()) {
                 case ACTION_CLOSE:
@@ -386,18 +479,21 @@ public class BackgroundPlayer extends Service {
                 case ACTION_PLAY_PAUSE:
                     onVideoPlayPause();
                     break;
-                case ACTION_OPEN_DETAIL:
-                    onOpenDetail(BackgroundPlayer.this, basePlayerImpl.getVideoUrl(), basePlayerImpl.getVideoTitle());
-                    break;
                 case ACTION_REPEAT:
                     onRepeatClicked();
                     break;
-                case ACTION_FAST_REWIND:
-                    onFastRewind();
+                case ACTION_PLAY_NEXT:
+                    onPlayNext();
+                    break;
+                case ACTION_PLAY_PREVIOUS:
+                    onPlayPrevious();
                     break;
                 case ACTION_FAST_FORWARD:
                     onFastForward();
                     break;
+                case ACTION_FAST_REWIND:
+                    onFastRewind();
+                    break;
                 case Intent.ACTION_SCREEN_ON:
                     onScreenOnOff(true);
                     break;
@@ -412,8 +508,14 @@ public class BackgroundPlayer extends Service {
         //////////////////////////////////////////////////////////////////////////*/
 
         @Override
-        public void onLoading() {
-            super.onLoading();
+        public void changeState(int state) {
+            super.changeState(state);
+            updatePlayback();
+        }
+
+        @Override
+        public void onBlocked() {
+            super.onBlocked();
 
             setControlsOpacity(77);
             updateNotification(-1);
@@ -426,7 +528,7 @@ public class BackgroundPlayer extends Service {
             setControlsOpacity(255);
             updateNotification(R.drawable.ic_pause_white);
 
-            lockWifiAndCpu();
+            lockManager.acquireWifiAndCpu();
         }
 
         @Override
@@ -434,9 +536,9 @@ public class BackgroundPlayer extends Service {
             super.onPaused();
 
             updateNotification(R.drawable.ic_play_arrow_white);
-            if (isProgressLoopRunning.get()) stopProgressLoop();
+            if (isProgressLoopRunning()) stopProgressLoop();
 
-            releaseWifiAndCpu();
+            lockManager.releaseWifiAndCpu();
         }
 
         @Override
@@ -444,11 +546,13 @@ public class BackgroundPlayer extends Service {
             super.onCompleted();
 
             setControlsOpacity(255);
+
+            resetNotification();
             if (bigNotRemoteView != null) bigNotRemoteView.setProgressBar(R.id.notificationProgressBar, 100, 100, false);
             if (notRemoteView != null) notRemoteView.setProgressBar(R.id.notificationProgressBar, 100, 100, false);
             updateNotification(R.drawable.ic_replay_white);
 
-            releaseWifiAndCpu();
+            lockManager.releaseWifiAndCpu();
         }
     }
 }

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

@@ -0,0 +1,70 @@
+package org.schabi.newpipe.player;
+
+import android.content.Intent;
+import android.view.MenuItem;
+
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.util.PermissionHelper;
+
+import static org.schabi.newpipe.player.BackgroundPlayer.ACTION_CLOSE;
+
+public final class BackgroundPlayerActivity extends ServicePlayerActivity {
+
+    private static final String TAG = "BackgroundPlayerActivity";
+
+    @Override
+    public String getTag() {
+        return TAG;
+    }
+
+    @Override
+    public String getSupportActionTitle() {
+        return getResources().getString(R.string.title_activity_background_player);
+    }
+
+    @Override
+    public Intent getBindIntent() {
+        return new Intent(this, BackgroundPlayer.class);
+    }
+
+    @Override
+    public void startPlayerListener() {
+        if (player != null && player instanceof BackgroundPlayer.BasePlayerImpl) {
+            ((BackgroundPlayer.BasePlayerImpl) player).setActivityListener(this);
+        }
+    }
+
+    @Override
+    public void stopPlayerListener() {
+        if (player != null && player instanceof BackgroundPlayer.BasePlayerImpl) {
+            ((BackgroundPlayer.BasePlayerImpl) player).removeActivityListener(this);
+        }
+    }
+
+    @Override
+    public int getPlayerOptionMenuResource() {
+        return R.menu.menu_play_queue_bg;
+    }
+
+    @Override
+    public boolean onPlayerOptionSelected(MenuItem item) {
+        if (item.getItemId() == R.id.action_switch_popup) {
+
+            if (!PermissionHelper.isPopupEnabled(this)) {
+                PermissionHelper.showPopupEnablementToast(this);
+                return true;
+            }
+
+            this.player.setRecovery();
+            getApplicationContext().sendBroadcast(getPlayerShutdownIntent());
+            getApplicationContext().startService(getSwitchIntent(PopupVideoPlayer.class));
+            return true;
+        }
+        return false;
+    }
+
+    @Override
+    public Intent getPlayerShutdownIntent() {
+        return new Intent(ACTION_CLOSE);
+    }
+}

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

@@ -1,14 +1,40 @@
+/*
+ * Copyright 2017 Mauricio Colli <mauriciocolli@outlook.com>
+ * MainVideoPlayer.java is part of NewPipe
+ *
+ * License: GPL-3.0+
+ * This program 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.
+ *
+ * This program 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 this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package org.schabi.newpipe.player;
 
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
+import android.content.SharedPreferences;
 import android.content.pm.ActivityInfo;
+import android.content.res.Configuration;
 import android.graphics.Color;
 import android.media.AudioManager;
 import android.os.Build;
 import android.os.Bundle;
+import android.preference.PreferenceManager;
+import android.provider.Settings;
+import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
+import android.support.v7.widget.RecyclerView;
+import android.support.v7.widget.helper.ItemTouchHelper;
 import android.util.Log;
 import android.view.GestureDetector;
 import android.view.MotionEvent;
@@ -16,16 +42,30 @@ import android.view.View;
 import android.view.WindowManager;
 import android.widget.ImageButton;
 import android.widget.PopupMenu;
+import android.widget.RelativeLayout;
 import android.widget.SeekBar;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import com.google.android.exoplayer2.Player;
+
 import org.schabi.newpipe.R;
+import org.schabi.newpipe.extractor.stream.StreamInfo;
+import org.schabi.newpipe.extractor.stream.VideoStream;
+import org.schabi.newpipe.fragments.OnScrollBelowItemsListener;
+import org.schabi.newpipe.player.helper.PlayerHelper;
+import org.schabi.newpipe.playlist.PlayQueueItem;
+import org.schabi.newpipe.playlist.PlayQueueItemBuilder;
+import org.schabi.newpipe.playlist.PlayQueueItemHolder;
 import org.schabi.newpipe.util.AnimationUtils;
+import org.schabi.newpipe.util.ListHelper;
 import org.schabi.newpipe.util.NavigationHelper;
 import org.schabi.newpipe.util.PermissionHelper;
+import org.schabi.newpipe.util.PopupMenuIconHacker;
 import org.schabi.newpipe.util.ThemeHelper;
 
+import java.util.List;
+
 import static org.schabi.newpipe.util.AnimationUtils.animateView;
 
 /**
@@ -33,16 +73,18 @@ import static org.schabi.newpipe.util.AnimationUtils.animateView;
  *
  * @author mauriciocolli
  */
-public class MainVideoPlayer extends Activity {
+public final class MainVideoPlayer extends Activity {
     private static final String TAG = ".MainVideoPlayer";
     private static final boolean DEBUG = BasePlayer.DEBUG;
+    private static final String PLAYER_STATE_INTENT = "player_state_intent";
 
-    private AudioManager audioManager;
     private GestureDetector gestureDetector;
 
     private boolean activityPaused;
     private VideoPlayerImpl playerImpl;
 
+    private SharedPreferences defaultPreferences;
+
     /*//////////////////////////////////////////////////////////////////////////
     // Activity LifeCycle
     //////////////////////////////////////////////////////////////////////////*/
@@ -51,12 +93,19 @@ public class MainVideoPlayer extends Activity {
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         if (DEBUG) Log.d(TAG, "onCreate() called with: savedInstanceState = [" + savedInstanceState + "]");
+        defaultPreferences = PreferenceManager.getDefaultSharedPreferences(this);
         ThemeHelper.setTheme(this);
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) getWindow().setStatusBarColor(Color.BLACK);
         setVolumeControlStream(AudioManager.STREAM_MUSIC);
-        audioManager = (AudioManager) getSystemService(Context.AUDIO_SERVICE);
 
-        if (getIntent() == null) {
+        final Intent intent;
+        if (savedInstanceState != null && savedInstanceState.getParcelable(PLAYER_STATE_INTENT) != null) {
+            intent = savedInstanceState.getParcelable(PLAYER_STATE_INTENT);
+        } else {
+            intent = getIntent();
+        }
+
+        if (intent == null) {
             Toast.makeText(this, R.string.general_error, Toast.LENGTH_SHORT).show();
             finish();
             return;
@@ -64,9 +113,26 @@ public class MainVideoPlayer extends Activity {
 
         showSystemUi();
         setContentView(R.layout.activity_main_player);
-        playerImpl = new VideoPlayerImpl();
+        playerImpl = new VideoPlayerImpl(this);
         playerImpl.setup(findViewById(android.R.id.content));
-        playerImpl.handleIntent(getIntent());
+        playerImpl.handleIntent(intent);
+    }
+
+    @Override
+    protected void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+        if (this.playerImpl == null) return;
+
+        final Intent intent = NavigationHelper.getPlayerIntent(
+                getApplicationContext(),
+                this.getClass(),
+                this.playerImpl.getPlayQueue(),
+                this.playerImpl.getRepeatMode(),
+                this.playerImpl.getPlaybackSpeed(),
+                this.playerImpl.getPlaybackPitch(),
+                this.playerImpl.getPlaybackQuality()
+        );
+        outState.putParcelable(PLAYER_STATE_INTENT, intent);
     }
 
     @Override
@@ -88,8 +154,10 @@ public class MainVideoPlayer extends Activity {
         super.onStop();
         if (DEBUG) Log.d(TAG, "onStop() called");
         activityPaused = true;
+
         if (playerImpl.getPlayer() != null) {
-            playerImpl.setVideoStartPos((int) playerImpl.getPlayer().getCurrentPosition());
+            playerImpl.wasPlaying = playerImpl.getPlayer().getPlayWhenReady();
+            playerImpl.setRecovery();
             playerImpl.destroyPlayer();
         }
     }
@@ -101,9 +169,17 @@ public class MainVideoPlayer extends Activity {
         if (activityPaused) {
             playerImpl.initPlayer();
             playerImpl.getPlayPauseButton().setImageResource(R.drawable.ic_play_arrow_white);
-            playerImpl.play(false);
+
+            playerImpl.getPlayer().setPlayWhenReady(playerImpl.wasPlaying);
+            playerImpl.initPlayback(playerImpl.playQueue);
+
             activityPaused = false;
         }
+        if(globalScreenOrientationLocked()) {
+            boolean lastOrientationWasLandscape
+                    = defaultPreferences.getBoolean(getString(R.string.last_orientation_landscape_key), false);
+            setLandScape(lastOrientationWasLandscape);
+        }
     }
 
     @Override
@@ -113,12 +189,24 @@ public class MainVideoPlayer extends Activity {
         if (playerImpl != null) playerImpl.destroy();
     }
 
+    @Override
+    public void onConfigurationChanged(Configuration newConfig) {
+        super.onConfigurationChanged(newConfig);
+
+        if (playerImpl.isSomePopupMenuVisible()) {
+            playerImpl.moreOptionsPopupMenu.dismiss();
+            playerImpl.getQualityPopupMenu().dismiss();
+            playerImpl.getPlaybackSpeedPopupMenu().dismiss();
+        }
+    }
+
     /*//////////////////////////////////////////////////////////////////////////
     // Utils
     //////////////////////////////////////////////////////////////////////////*/
 
     private void showSystemUi() {
         if (DEBUG) Log.d(TAG, "showSystemUi() called");
+        if (playerImpl != null && playerImpl.queueVisible) return;
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
             getWindow().getDecorView().setSystemUiVisibility(
                     View.SYSTEM_UI_FLAG_LAYOUT_STABLE
@@ -144,11 +232,51 @@ public class MainVideoPlayer extends Activity {
     }
 
     private void toggleOrientation() {
-        setRequestedOrientation(getResources().getDisplayMetrics().heightPixels > getResources().getDisplayMetrics().widthPixels
+        setLandScape(!isLandScape());
+        defaultPreferences.edit()
+                .putBoolean(getString(R.string.last_orientation_landscape_key), !isLandScape())
+                .apply();
+    }
+
+    private boolean isLandScape() {
+        return getResources().getDisplayMetrics().heightPixels < getResources().getDisplayMetrics().widthPixels;
+    }
+
+    private void setLandScape(boolean v) {
+        setRequestedOrientation(v
                 ? ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE
                 : ActivityInfo.SCREEN_ORIENTATION_SENSOR_PORTRAIT);
     }
 
+    private boolean globalScreenOrientationLocked() {
+        // 1: Screen orientation changes using acelerometer
+        // 0: Screen orientatino is locked
+        return !(android.provider.Settings.System.getInt(getContentResolver(), Settings.System.ACCELEROMETER_ROTATION, 0) == 1);
+    }
+
+    protected void setRepeatModeButton(final ImageButton imageButton, final int repeatMode) {
+        switch (repeatMode) {
+            case Player.REPEAT_MODE_OFF:
+                imageButton.setImageResource(R.drawable.exo_controls_repeat_off);
+                break;
+            case Player.REPEAT_MODE_ONE:
+                imageButton.setImageResource(R.drawable.exo_controls_repeat_one);
+                break;
+            case Player.REPEAT_MODE_ALL:
+                imageButton.setImageResource(R.drawable.exo_controls_repeat_all);
+                break;
+        }
+    }
+
+    protected void setShuffleButton(final ImageButton shuffleButton, final boolean shuffled) {
+        final int shuffleAlpha = shuffled ? 255 : 77;
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
+            shuffleButton.setImageAlpha(shuffleAlpha);
+        } else {
+            shuffleButton.setAlpha(shuffleAlpha);
+        }
+    }
+
     ///////////////////////////////////////////////////////////////////////////
 
     @SuppressWarnings({"unused", "WeakerAccess"})
@@ -157,32 +285,49 @@ public class MainVideoPlayer extends Activity {
         private TextView channelTextView;
         private TextView volumeTextView;
         private TextView brightnessTextView;
+        private ImageButton queueButton;
         private ImageButton repeatButton;
+        private ImageButton shuffleButton;
 
-        private ImageButton screenRotationButton;
         private ImageButton playPauseButton;
+        private ImageButton playPreviousButton;
+        private ImageButton playNextButton;
 
-        VideoPlayerImpl() {
-            super("VideoPlayerImpl" + MainVideoPlayer.TAG, MainVideoPlayer.this);
+        private RelativeLayout queueLayout;
+        private ImageButton itemsListCloseButton;
+        private RecyclerView itemsList;
+        private ItemTouchHelper itemTouchHelper;
+
+        private boolean queueVisible;
+
+        private ImageButton moreOptionsButton;
+        public int moreOptionsPopupMenuGroupId = 89;
+        public PopupMenu moreOptionsPopupMenu;
+
+        VideoPlayerImpl(final Context context) {
+            super("VideoPlayerImpl" + MainVideoPlayer.TAG, context);
         }
 
         @Override
         public void initViews(View rootView) {
             super.initViews(rootView);
-            this.titleTextView = (TextView) rootView.findViewById(R.id.titleTextView);
-            this.channelTextView = (TextView) rootView.findViewById(R.id.channelTextView);
-            this.volumeTextView = (TextView) rootView.findViewById(R.id.volumeTextView);
-            this.brightnessTextView = (TextView) rootView.findViewById(R.id.brightnessTextView);
-            this.repeatButton = (ImageButton) rootView.findViewById(R.id.repeatButton);
+            this.titleTextView = rootView.findViewById(R.id.titleTextView);
+            this.channelTextView = rootView.findViewById(R.id.channelTextView);
+            this.volumeTextView = rootView.findViewById(R.id.volumeTextView);
+            this.brightnessTextView = rootView.findViewById(R.id.brightnessTextView);
+            this.queueButton = rootView.findViewById(R.id.queueButton);
+            this.repeatButton = rootView.findViewById(R.id.repeatButton);
+            this.shuffleButton = rootView.findViewById(R.id.shuffleButton);
 
-            this.screenRotationButton = (ImageButton) rootView.findViewById(R.id.screenRotationButton);
-            this.playPauseButton = (ImageButton) rootView.findViewById(R.id.playPauseButton);
+            this.playPauseButton = rootView.findViewById(R.id.playPauseButton);
+            this.playPreviousButton = rootView.findViewById(R.id.playPreviousButton);
+            this.playNextButton = rootView.findViewById(R.id.playNextButton);
+            this.moreOptionsButton = rootView.findViewById(R.id.moreOptionsButton);
+            this.moreOptionsPopupMenu = new PopupMenu(context, moreOptionsButton);
+            buildMoreOptionsMenu();
 
-            // Due to a bug on lower API, lets set the alpha instead of using a drawable
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) repeatButton.setImageAlpha(77);
-            else { //noinspection deprecation
-                repeatButton.setAlpha(77);
-            }
+            titleTextView.setSelected(true);
+            channelTextView.setSelected(true);
 
             getRootView().setKeepScreenOn(true);
         }
@@ -194,95 +339,179 @@ public class MainVideoPlayer extends Activity {
             MySimpleOnGestureListener listener = new MySimpleOnGestureListener();
             gestureDetector = new GestureDetector(context, listener);
             gestureDetector.setIsLongpressEnabled(false);
-            playerImpl.getRootView().setOnTouchListener(listener);
+            getRootView().setOnTouchListener(listener);
 
+            queueButton.setOnClickListener(this);
             repeatButton.setOnClickListener(this);
+            shuffleButton.setOnClickListener(this);
+
             playPauseButton.setOnClickListener(this);
-            screenRotationButton.setOnClickListener(this);
+            playPreviousButton.setOnClickListener(this);
+            playNextButton.setOnClickListener(this);
+            moreOptionsButton.setOnClickListener(this);
+        }
+
+        /*//////////////////////////////////////////////////////////////////////////
+        // ExoPlayer Video Listener
+        //////////////////////////////////////////////////////////////////////////*/
+
+        @Override
+        public void onRepeatModeChanged(int i) {
+            super.onRepeatModeChanged(i);
+            updatePlaybackButtons();
+        }
+
+        /*//////////////////////////////////////////////////////////////////////////
+        // Playback Listener
+        //////////////////////////////////////////////////////////////////////////*/
+
+        @Override
+        public void shutdown() {
+            super.shutdown();
+            finish();
         }
 
         @Override
-        public void handleIntent(Intent intent) {
-            super.handleIntent(intent);
+        public void sync(@NonNull final PlayQueueItem item, @Nullable final StreamInfo info) {
+            super.sync(item, info);
             titleTextView.setText(getVideoTitle());
-            channelTextView.setText(getChannelName());
+            channelTextView.setText(getUploaderName());
+
+            //playPauseButton.setImageResource(R.drawable.ic_pause_white);
         }
 
         @Override
-        public void playUrl(String url, String format, boolean autoPlay) {
-            super.playUrl(url, format, autoPlay);
-            playPauseButton.setImageResource(autoPlay ? R.drawable.ic_pause_white : R.drawable.ic_play_arrow_white);
+        public void onShuffleClicked() {
+            super.onShuffleClicked();
+            updatePlaybackButtons();
         }
 
+        /*//////////////////////////////////////////////////////////////////////////
+        // Player Overrides
+        //////////////////////////////////////////////////////////////////////////*/
+
         @Override
         public void onFullScreenButtonClicked() {
-            if (DEBUG) Log.d(TAG, "onFullScreenButtonClicked() called");
-            if (playerImpl.getPlayer() == null) return;
+            super.onFullScreenButtonClicked();
 
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M
-                    && !PermissionHelper.checkSystemAlertWindowPermission(MainVideoPlayer.this)) {
-                Toast.makeText(MainVideoPlayer.this, R.string.msg_popup_permission, Toast.LENGTH_LONG).show();
+            if (DEBUG) Log.d(TAG, "onFullScreenButtonClicked() called");
+            if (simpleExoPlayer == null) return;
+
+            if (!PermissionHelper.isPopupEnabled(context)) {
+                PermissionHelper.showPopupEnablementToast(context);
                 return;
             }
 
-            context.startService(NavigationHelper.getOpenVideoPlayerIntent(context, PopupVideoPlayer.class, playerImpl));
-            if (playerImpl != null) playerImpl.destroyPlayer();
+            setRecovery();
+            final Intent intent = NavigationHelper.getPlayerIntent(
+                    context,
+                    PopupVideoPlayer.class,
+                    this.getPlayQueue(),
+                    this.getRepeatMode(),
+                    this.getPlaybackSpeed(),
+                    this.getPlaybackPitch(),
+                    this.getPlaybackQuality()
+            );
+            context.startService(intent);
 
             ((View) getControlAnimationView().getParent()).setVisibility(View.GONE);
-            MainVideoPlayer.this.finish();
+            destroy();
+            finish();
         }
 
-        @Override
-        @SuppressWarnings("deprecation")
-        public void onRepeatClicked() {
-            super.onRepeatClicked();
-            if (DEBUG) Log.d(TAG, "onRepeatClicked() called");
-            switch (getCurrentRepeatMode()) {
-                case REPEAT_DISABLED:
-                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) repeatButton.setImageAlpha(77);
-                    else repeatButton.setAlpha(77);
+        public void onPlayBackgroundButtonClicked() {
+            if (DEBUG) Log.d(TAG, "onPlayBackgroundButtonClicked() called");
+            if (playerImpl.getPlayer() == null) return;
 
-                    break;
-                case REPEAT_ONE:
-                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) repeatButton.setImageAlpha(255);
-                    else repeatButton.setAlpha(255);
+            setRecovery();
+            final Intent intent = NavigationHelper.getPlayerIntent(
+                    context,
+                    BackgroundPlayer.class,
+                    this.getPlayQueue(),
+                    this.getRepeatMode(),
+                    this.getPlaybackSpeed(),
+                    this.getPlaybackPitch(),
+                    this.getPlaybackQuality()
+            );
+            context.startService(intent);
 
-                    break;
-                case REPEAT_ALL:
-                    // Waiting :)
-                    break;
-            }
+            ((View) getControlAnimationView().getParent()).setVisibility(View.GONE);
+            destroy();
+            finish();
         }
 
+
         @Override
         public void onClick(View v) {
             super.onClick(v);
-            if (v.getId() == repeatButton.getId()) onRepeatClicked();
-            else if (v.getId() == playPauseButton.getId()) onVideoPlayPause();
-            else if (v.getId() == screenRotationButton.getId()) onScreenRotationClicked();
+            if (v.getId() == playPauseButton.getId()) {
+                onVideoPlayPause();
+
+            } else if (v.getId() == playPreviousButton.getId()) {
+                onPlayPrevious();
+
+            } else if (v.getId() == playNextButton.getId()) {
+                onPlayNext();
+
+            } else if (v.getId() == queueButton.getId()) {
+                onQueueClicked();
+                return;
+            } else if (v.getId() == repeatButton.getId()) {
+                onRepeatClicked();
+                return;
+            } else if (v.getId() == shuffleButton.getId()) {
+                onShuffleClicked();
+                return;
+            } else if (v.getId() == moreOptionsButton.getId()) {
+                onMoreOptionsClicked();
+            }
 
             if (getCurrentState() != STATE_COMPLETED) {
                 getControlsVisibilityHandler().removeCallbacksAndMessages(null);
-                animateView(playerImpl.getControlsRoot(), true, 300, 0, new Runnable() {
-                    @Override
-                    public void run() {
-                        if (getCurrentState() == STATE_PLAYING && !playerImpl.isSomePopupMenuVisible()) {
-                            hideControls(300, DEFAULT_CONTROLS_HIDE_TIME);
-                        }
+                animateView(getControlsRoot(), true, 300, 0, () -> {
+                    if (getCurrentState() == STATE_PLAYING && !isSomePopupMenuVisible()) {
+                        hideControls(300, DEFAULT_CONTROLS_HIDE_TIME);
                     }
                 });
             }
         }
 
+        private void onQueueClicked() {
+            queueVisible = true;
+            hideSystemUi();
+
+            buildQueue();
+            updatePlaybackButtons();
+
+            getControlsRoot().setVisibility(View.INVISIBLE);
+            queueLayout.setVisibility(View.VISIBLE);
+
+            itemsList.scrollToPosition(playQueue.getIndex());
+        }
+
+        private void onQueueClosed() {
+            queueLayout.setVisibility(View.GONE);
+            queueVisible = false;
+        }
+
+        private void onMoreOptionsClicked() {
+            if (DEBUG) Log.d(TAG, "onMoreOptionsClicked() called");
+
+            moreOptionsPopupMenu.show();
+            isSomePopupMenuVisible = true;
+            showControls(300);
+        }
+
         private void onScreenRotationClicked() {
             if (DEBUG) Log.d(TAG, "onScreenRotationClicked() called");
             toggleOrientation();
+            showControlsThenHide();
         }
 
         @Override
         public void onStopTrackingTouch(SeekBar seekBar) {
             super.onStopTrackingTouch(seekBar);
-            if (playerImpl.wasPlaying()) {
+            if (wasPlaying()) {
                 hideControls(100, 0);
             }
         }
@@ -294,40 +523,47 @@ public class MainVideoPlayer extends Activity {
         }
 
         @Override
-        public void onError(Exception exception) {
-            exception.printStackTrace();
-            Toast.makeText(context, "Failed to play this video", Toast.LENGTH_SHORT).show();
-            finish();
+        protected int getDefaultResolutionIndex(final List<VideoStream> sortedVideos) {
+            return ListHelper.getDefaultResolutionIndex(context, sortedVideos);
+        }
+
+        @Override
+        protected int getOverrideResolutionIndex(final List<VideoStream> sortedVideos,
+                                                 final String playbackQuality) {
+            return ListHelper.getDefaultResolutionIndex(context, sortedVideos, playbackQuality);
         }
 
         /*//////////////////////////////////////////////////////////////////////////
         // States
         //////////////////////////////////////////////////////////////////////////*/
 
+        private void animatePlayButtons(final boolean show, final int duration) {
+            animateView(playPauseButton, AnimationUtils.Type.SCALE_AND_ALPHA, show, duration);
+            animateView(playPreviousButton, AnimationUtils.Type.SCALE_AND_ALPHA, show, duration);
+            animateView(playNextButton, AnimationUtils.Type.SCALE_AND_ALPHA, show, duration);
+        }
+
         @Override
-        public void onLoading() {
-            super.onLoading();
+        public void onBlocked() {
+            super.onBlocked();
             playPauseButton.setImageResource(R.drawable.ic_pause_white);
-            animateView(playPauseButton, AnimationUtils.Type.SCALE_AND_ALPHA, false, 100);
+            animatePlayButtons(false, 100);
             getRootView().setKeepScreenOn(true);
         }
 
         @Override
         public void onBuffering() {
             super.onBuffering();
-            animateView(playPauseButton, AnimationUtils.Type.SCALE_AND_ALPHA, false, 100);
+            animatePlayButtons(false, 100);
             getRootView().setKeepScreenOn(true);
         }
 
         @Override
         public void onPlaying() {
             super.onPlaying();
-            animateView(playPauseButton, AnimationUtils.Type.SCALE_AND_ALPHA, false, 80, 0, new Runnable() {
-                @Override
-                public void run() {
-                    playPauseButton.setImageResource(R.drawable.ic_pause_white);
-                    animateView(playPauseButton, AnimationUtils.Type.SCALE_AND_ALPHA, true, 200);
-                }
+            animateView(playPauseButton, AnimationUtils.Type.SCALE_AND_ALPHA, false, 80, 0, () -> {
+                playPauseButton.setImageResource(R.drawable.ic_pause_white);
+                animatePlayButtons(true, 200);
             });
             showSystemUi();
             getRootView().setKeepScreenOn(true);
@@ -336,12 +572,9 @@ public class MainVideoPlayer extends Activity {
         @Override
         public void onPaused() {
             super.onPaused();
-            animateView(playPauseButton, AnimationUtils.Type.SCALE_AND_ALPHA, false, 80, 0, new Runnable() {
-                @Override
-                public void run() {
-                    playPauseButton.setImageResource(R.drawable.ic_play_arrow_white);
-                    animateView(playPauseButton, AnimationUtils.Type.SCALE_AND_ALPHA, true, 200);
-                }
+            animateView(playPauseButton, AnimationUtils.Type.SCALE_AND_ALPHA, false, 80, 0, () -> {
+                playPauseButton.setImageResource(R.drawable.ic_play_arrow_white);
+                animatePlayButtons(true, 200);
             });
 
             showSystemUi();
@@ -351,25 +584,19 @@ public class MainVideoPlayer extends Activity {
         @Override
         public void onPausedSeek() {
             super.onPausedSeek();
-            animateView(playPauseButton, AnimationUtils.Type.SCALE_AND_ALPHA, false, 100);
+            animatePlayButtons(false, 100);
             getRootView().setKeepScreenOn(true);
         }
 
 
         @Override
         public void onCompleted() {
-            if (getCurrentRepeatMode() == RepeatMode.REPEAT_ONE) {
-                playPauseButton.setImageResource(R.drawable.ic_pause_white);
-            } else {
-                showSystemUi();
-                animateView(playPauseButton, AnimationUtils.Type.SCALE_AND_ALPHA, false, 0, 0, new Runnable() {
-                    @Override
-                    public void run() {
-                        playPauseButton.setImageResource(R.drawable.ic_replay_white);
-                        animateView(playPauseButton, AnimationUtils.Type.SCALE_AND_ALPHA, true, 300);
-                    }
-                });
-            }
+            showSystemUi();
+            animateView(playPauseButton, AnimationUtils.Type.SCALE_AND_ALPHA, false, 0, 0, () -> {
+                playPauseButton.setImageResource(R.drawable.ic_replay_white);
+                animatePlayButtons(true, 300);
+            });
+
             getRootView().setKeepScreenOn(false);
             super.onCompleted();
         }
@@ -378,21 +605,155 @@ public class MainVideoPlayer extends Activity {
         // Utils
         //////////////////////////////////////////////////////////////////////////*/
 
+        @Override
+        public void showControlsThenHide() {
+            if (queueVisible) return;
+
+            super.showControlsThenHide();
+        }
+
+        @Override
+        public void showControls(long duration) {
+            if (queueVisible) return;
+
+            super.showControls(duration);
+        }
+
         @Override
         public void hideControls(final long duration, long delay) {
             if (DEBUG) Log.d(TAG, "hideControls() called with: delay = [" + delay + "]");
             getControlsVisibilityHandler().removeCallbacksAndMessages(null);
-            getControlsVisibilityHandler().postDelayed(new Runnable() {
-                @Override
-                public void run() {
-                    animateView(getControlsRoot(), false, duration, 0, new Runnable() {
-                        @Override
-                        public void run() {
-                            hideSystemUi();
-                        }
-                    });
+            getControlsVisibilityHandler().postDelayed(() ->
+                    animateView(getControlsRoot(), false, duration, 0, MainVideoPlayer.this::hideSystemUi),
+                    delay
+            );
+        }
+
+        private void updatePlaybackButtons() {
+            if (repeatButton == null || shuffleButton == null ||
+                    simpleExoPlayer == null || playQueue == null) return;
+
+            setRepeatModeButton(repeatButton, getRepeatMode());
+            setShuffleButton(shuffleButton, playQueue.isShuffled());
+        }
+
+        private void buildMoreOptionsMenu() {
+            this.moreOptionsPopupMenu.getMenuInflater().inflate(R.menu.menu_videooptions,
+                    moreOptionsPopupMenu.getMenu());
+
+            moreOptionsPopupMenu.setOnMenuItemClickListener(menuItem -> {
+                switch (menuItem.getItemId()) {
+                    case R.id.toggleOrientation:
+                        onScreenRotationClicked();
+                        break;
+                    case R.id.switchPopup:
+                        onFullScreenButtonClicked();
+                        break;
+                    case R.id.switchBackground:
+                        onPlayBackgroundButtonClicked();
+                        break;
                 }
-            }, delay);
+                return false;
+            });
+
+            try {
+                PopupMenuIconHacker.setShowPopupIcon(moreOptionsPopupMenu);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+
+            // fix icon theme
+            if(ThemeHelper.isLightThemeSelected(MainVideoPlayer.this)) {
+                moreOptionsPopupMenu.getMenu()
+                        .findItem(R.id.toggleOrientation)
+                        .setIcon(R.drawable.ic_screen_rotation_black_24dp);
+                moreOptionsPopupMenu.getMenu()
+                        .findItem(R.id.switchPopup)
+                        .setIcon(R.drawable.ic_fullscreen_exit_black_24dp);
+            }
+        }
+
+        private void buildQueue() {
+            queueLayout = findViewById(R.id.playQueuePanel);
+
+            itemsListCloseButton = findViewById(R.id.playQueueClose);
+
+            itemsList = findViewById(R.id.playQueue);
+            itemsList.setAdapter(playQueueAdapter);
+            itemsList.setClickable(true);
+            itemsList.setLongClickable(true);
+
+            itemsList.clearOnScrollListeners();
+            itemsList.addOnScrollListener(getQueueScrollListener());
+
+            itemTouchHelper = new ItemTouchHelper(getItemTouchCallback());
+            itemTouchHelper.attachToRecyclerView(itemsList);
+
+            playQueueAdapter.setSelectedListener(getOnSelectedListener());
+
+            itemsListCloseButton.setOnClickListener(view -> onQueueClosed());
+        }
+
+        private OnScrollBelowItemsListener getQueueScrollListener() {
+            return new OnScrollBelowItemsListener() {
+                @Override
+                public void onScrolledDown(RecyclerView recyclerView) {
+                    if (playQueue != null && !playQueue.isComplete()) {
+                        playQueue.fetch();
+                    } else if (itemsList != null) {
+                        itemsList.clearOnScrollListeners();
+                    }
+                }
+            };
+        }
+
+        private ItemTouchHelper.SimpleCallback getItemTouchCallback() {
+            return new ItemTouchHelper.SimpleCallback(ItemTouchHelper.UP | ItemTouchHelper.DOWN, 0) {
+                @Override
+                public boolean onMove(RecyclerView recyclerView, RecyclerView.ViewHolder source, RecyclerView.ViewHolder target) {
+                    if (source.getItemViewType() != target.getItemViewType()) {
+                        return false;
+                    }
+
+                    final int sourceIndex = source.getLayoutPosition();
+                    final int targetIndex = target.getLayoutPosition();
+                    playQueue.move(sourceIndex, targetIndex);
+                    return true;
+                }
+
+                @Override
+                public boolean isLongPressDragEnabled() {
+                    return false;
+                }
+
+                @Override
+                public boolean isItemViewSwipeEnabled() {
+                    return false;
+                }
+
+                @Override
+                public void onSwiped(RecyclerView.ViewHolder viewHolder, int swipeDir) {}
+            };
+        }
+
+        private PlayQueueItemBuilder.OnSelectedListener getOnSelectedListener() {
+            return new PlayQueueItemBuilder.OnSelectedListener() {
+                @Override
+                public void selected(PlayQueueItem item, View view) {
+                    onSelected(item);
+                }
+
+                @Override
+                public void held(PlayQueueItem item, View view) {
+                    final int index = playQueue.indexOf(item);
+                    if (index != -1) playQueue.remove(index);
+                }
+
+                @Override
+                public void onStartDrag(PlayQueueItemHolder viewHolder) {
+                    if (itemTouchHelper != null) itemTouchHelper.startDrag(viewHolder);
+                }
+            };
         }
 
         ///////////////////////////////////////////////////////////////////////////
@@ -431,15 +792,20 @@ public class MainVideoPlayer extends Activity {
         public boolean onDoubleTap(MotionEvent e) {
             if (DEBUG) Log.d(TAG, "onDoubleTap() called with: e = [" + e + "]" + "rawXy = " + e.getRawX() + ", " + e.getRawY() + ", xy = " + e.getX() + ", " + e.getY());
             if (!playerImpl.isPlaying()) return false;
-            if (e.getX() > playerImpl.getRootView().getWidth() / 2) playerImpl.onFastForward();
-            else playerImpl.onFastRewind();
+
+            if (e.getX() > playerImpl.getRootView().getWidth() / 2) {
+                playerImpl.onFastForward();
+            } else {
+                playerImpl.onFastRewind();
+            }
+
             return true;
         }
 
         @Override
         public boolean onSingleTapConfirmed(MotionEvent e) {
             if (DEBUG) Log.d(TAG, "onSingleTapConfirmed() called with: e = [" + e + "]");
-            if (playerImpl.getCurrentState() != BasePlayer.STATE_PLAYING) return true;
+            if (playerImpl.getCurrentState() == BasePlayer.STATE_BLOCKED) return true;
 
             if (playerImpl.isControlsVisible()) playerImpl.hideControls(150, 0);
             else {
@@ -449,12 +815,12 @@ public class MainVideoPlayer extends Activity {
             return true;
         }
 
-        private final boolean isGestureControlsEnabled = playerImpl.getSharedPreferences().getBoolean(getString(R.string.player_gesture_controls_key), true);
+        private final boolean isPlayerGestureEnabled = PlayerHelper.isPlayerGestureEnabled(getApplicationContext());
 
         private final float stepsBrightness = 15, stepBrightness = (1f / stepsBrightness), minBrightness = .01f;
         private float currentBrightness = .5f;
 
-        private int currentVolume, maxVolume = audioManager.getStreamMaxVolume(AudioManager.STREAM_MUSIC);
+        private int currentVolume, maxVolume = playerImpl.getAudioReactor().getMaxVolume();
         private final float stepsVolume = 15, stepVolume = (float) Math.ceil(maxVolume / stepsVolume), minVolume = 0;
 
         private final String brightnessUnicode = new String(Character.toChars(0x2600));
@@ -468,7 +834,7 @@ public class MainVideoPlayer extends Activity {
         // TODO: Improve video gesture controls
         @Override
         public boolean onScroll(MotionEvent e1, MotionEvent e2, float distanceX, float distanceY) {
-            if (!isGestureControlsEnabled) return false;
+            if (!isPlayerGestureEnabled) return false;
 
             //noinspection PointlessBooleanExpression
             if (DEBUG && false) Log.d(TAG, "MainVideoPlayer.onScroll = " +
@@ -489,13 +855,15 @@ public class MainVideoPlayer extends Activity {
 
             if (e1.getX() > playerImpl.getRootView().getWidth() / 2) {
                 double floor = Math.floor(up ? stepVolume : -stepVolume);
-                currentVolume = (int) (audioManager.getStreamVolume(AudioManager.STREAM_MUSIC) + floor);
+                currentVolume = (int) (playerImpl.getAudioReactor().getVolume() + floor);
                 if (currentVolume >= maxVolume) currentVolume = maxVolume;
                 if (currentVolume <= minVolume) currentVolume = (int) minVolume;
-                audioManager.setStreamVolume(AudioManager.STREAM_MUSIC, currentVolume, 0);
+                playerImpl.getAudioReactor().setVolume(currentVolume);
 
+                currentVolume = playerImpl.getAudioReactor().getVolume();
                 if (DEBUG) Log.d(TAG, "onScroll().volumeControl, currentVolume = " + currentVolume);
-                playerImpl.getVolumeTextView().setText(volumeUnicode + " " + Math.round((((float) currentVolume) / maxVolume) * 100) + "%");
+                final String volumeText = volumeUnicode + " " + Math.round((((float) currentVolume) / maxVolume) * 100) + "%";
+                playerImpl.getVolumeTextView().setText(volumeText);
 
                 if (playerImpl.getVolumeTextView().getVisibility() != View.VISIBLE) animateView(playerImpl.getVolumeTextView(), true, 200);
                 if (playerImpl.getBrightnessTextView().getVisibility() == View.VISIBLE) playerImpl.getBrightnessTextView().setVisibility(View.GONE);
@@ -510,7 +878,8 @@ public class MainVideoPlayer extends Activity {
                 if (DEBUG) Log.d(TAG, "onScroll().brightnessControl, currentBrightness = " + currentBrightness);
                 int brightnessNormalized = Math.round(currentBrightness * 100);
 
-                playerImpl.getBrightnessTextView().setText(brightnessUnicode + " " + (brightnessNormalized == 1 ? 0 : brightnessNormalized) + "%");
+                final String brightnessText = brightnessUnicode + " " + (brightnessNormalized == 1 ? 0 : brightnessNormalized) + "%";
+                playerImpl.getBrightnessTextView().setText(brightnessText);
 
                 if (playerImpl.getBrightnessTextView().getVisibility() != View.VISIBLE) animateView(playerImpl.getBrightnessTextView(), true, 200);
                 if (playerImpl.getVolumeTextView().getVisibility() == View.VISIBLE) playerImpl.getVolumeTextView().setVisibility(View.GONE);
@@ -545,4 +914,4 @@ public class MainVideoPlayer extends Activity {
         }
 
     }
-}
+}