Merge pull request #2067 from TeamNewPipe/release_v0.15.1

release v0.15.1

.github/CONTRIBUTING.md

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

.github/ISSUE_TEMPLATE.md

@@ -1,2 +1,3 @@
 - [ ] I carefully read the [contribution guidelines](https://github.com/TeamNewPipe/NewPipe/blob/HEAD/.github/CONTRIBUTING.md) and agree to them.
 - [ ] I checked if the issue/feature exists in the latest version.
+- [ ] I did use the [incredible bugreport to markdown converter](https://teamnewpipe.github.io/CrashReportToMarkdown/) to paste bug reports.

.travis.yml

@@ -5,13 +5,13 @@ android:
   components:
     # The BuildTools version used by NewPipe
     - tools
-    - build-tools-27.0.1
+    - build-tools-28.0.3
 
     # The SDK version used to compile NewPipe
-    - android-27
+    - android-28
 
 before_install: 
-  - yes | sdkmanager "platforms;android-27"
+  - yes | sdkmanager "platforms;android-28"
 script: ./gradlew -Dorg.gradle.jvmargs=-Xmx1536m assembleDebug lintDebug testDebugUnitTest
 
 licenses:

CheckTranslations.java

@@ -1,170 +0,0 @@
-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,75 +1,91 @@
-<p align="center"><a href="https://newpipe.schabi.org"><img src="assets/new_pipe_icon_5.png" width="150"/></a></p> 
+<p align="center"><a href="https://newpipe.schabi.org"><img src="assets/new_pipe_icon_5.png" width="150"></a></p> 
 <h2 align="center"><b>NewPipe</b></h2>
-<h4 align="center">A free lightweight YouTube frontend for Android.</h4>
-<p align="center"><a href="https://f-droid.org/packages/org.schabi.newpipe/"><img src="https://f-droid.org/wiki/images/0/06/F-Droid-button_get-it-on.png"/></a></p> 
+<h4 align="center">A libre lightweight streaming frontend for Android.</h4>
+<p align="center"><a href="https://f-droid.org/packages/org.schabi.newpipe/"><img src="https://f-droid.org/wiki/images/0/06/F-Droid-button_get-it-on.png"></a></p> 
 
 <p align="center">
-<a href="https://github.com/TeamNewPipe/NewPipe" alt="GitHub release"><img src="https://img.shields.io/github/release/TeamNewPipe/NewPipe.svg" /></a>
-<a href="https://www.gnu.org/licenses/gpl-3.0" alt="License: GPL v3"><img src="https://img.shields.io/badge/License-GPL%20v3-blue.svg" /></a>
-<a href="https://travis-ci.org/TeamNewPipe/NewPipe" alt="Build Status"><img src="https://travis-ci.org/TeamNewPipe/NewPipe.svg" /></a>
-<a href="https://hosted.weblate.org/engage/NewPipe/" alt="Translation Status"><img src="https://hosted.weblate.org/widgets/NewPipe/-/svg-badge.svg" /></a>
-<a href="http://webchat.freenode.net/?channels=%23newpipe" alt="IRC channel: #newpipe"><img src="https://img.shields.io/badge/IRC%20chat-%23newpipe-brightgreen.svg" /></a>
-<a href="https://www.bountysource.com/teams/newpipe" alt="Bountysource bounties"><img src="https://img.shields.io/bountysource/team/newpipe/activity.svg?colorB=cd201f"/></a>
+<a href="https://github.com/TeamNewPipe/NewPipe" alt="GitHub release"><img src="https://img.shields.io/github/release/TeamNewPipe/NewPipe.svg" ></a>
+<a href="https://www.gnu.org/licenses/gpl-3.0" alt="License: GPLv3"><img src="https://img.shields.io/badge/License-GPL%20v3-blue.svg"></a>
+<a href="https://travis-ci.org/TeamNewPipe/NewPipe" alt="Build Status"><img src="https://travis-ci.org/TeamNewPipe/NewPipe.svg"></a>
+<a href="https://hosted.weblate.org/engage/NewPipe/" alt="Translation Status"><img src="https://hosted.weblate.org/widgets/NewPipe/-/svg-badge.svg"></a>
+<a href="http://webchat.freenode.net/?channels=%23newpipe" alt="IRC channel: #newpipe"><img src="https://img.shields.io/badge/IRC%20chat-%23newpipe-brightgreen.svg"></a>
+<a href="https://www.bountysource.com/teams/newpipe" alt="Bountysource bounties"><img src="https://img.shields.io/bountysource/team/newpipe/activity.svg?colorB=cd201f"></a>
 </p>
-<hr />
-<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>
+<hr>
+<p align="center"><a href="#screenshots">Screenshots</a> &bull; <a href="#description">Description</a> &bull; <a href="#features">Features</a> &bull; <a href="#updates">Updates</a> &bull; <a href="#contribution">Contribution</a> &bull; <a href="#donate">Donate</a> &bull; <a href="#license">License</a></p>
 <p align="center"><a href="https://newpipe.schabi.org">Website</a> &bull; <a href="https://newpipe.schabi.org/blog/">Blog</a>  &bull; <a href="https://newpipe.schabi.org/press/">Press</a></p>
-<hr />
-WARNING: PUTTING NEWPIPE OR ANY FORK OF IT INTO GOOGLE PLAYSTORE VIOLATES THEIR TERMS OF CONDITIONS.
+<hr>
+
+<b>WARNING: PUTTING NEWPIPE OR ANY FORK OF IT INTO GOOGLE PLAYSTORE VIOLATES THEIR TERMS OF CONDITIONS.</b>
 
 ## Screenshots
 
-[<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/shot_1.png" width=160>](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_1.png)
-[<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/shot_2.png" width=160>](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_2.png)
-[<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/shot_3.png" width=160>](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_3.png)
-[<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/shot_4.png" width=160>](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_4.png)
-[<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/shot_5.png" width=160>](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_5.png)
-[<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/shot_6.png" width=160>](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_6.png)
-[<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/shot_7.png" width=160>](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_7.png)
-[<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/shot_8.png" width=160>](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_8.png)
-[<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/shot_9.png" width=160>](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_9.png)
+[<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/shot_01.png" width=160>](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_01.png)
+[<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/shot_02.png" width=160>](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_02.png)
+[<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/shot_03.png" width=160>](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_03.png)
+[<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/shot_04.png" width=160>](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_04.png)
+[<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/shot_05.png" width=160>](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_05.png)
+[<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/shot_06.png" width=160>](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_06.png)
+[<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/shot_07.png" width=160>](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_07.png)
+[<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/shot_08.png" width=160>](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_08.png)
+[<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/shot_09.png" width=160>](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_09.png)
 [<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/shot_10.png" width=160>](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_10.png)
+[<img src="fastlane/metadata/android/en-US/images/tenInchScreenshots/shot_11.png" width=405>](fastlane/metadata/android/en-US/images/tenInchScreenshots/shot_11.png)
+[<img src="fastlane/metadata/android/en-US/images/tenInchScreenshots/shot_12.png" width=405>](fastlane/metadata/android/en-US/images/tenInchScreenshots/shot_12.png)
 
 ## Description
 
-NewPipe does not use any Google framework libraries, or the YouTube API. It only parses the website in order to gain the information it needs. Therefore this app can be used on devices without Google Services installed. Also, you don't need a YouTube account to use NewPipe, and it's FLOSS.
+NewPipe does not use any Google framework libraries, nor the YouTube API. Websites are only parsed to fetch required info, so this app can be used on devices without Google services installed. Also, you don't need a YouTube account to use NewPipe, which is copylefted libre software.
 
 ### Features
 
 * Search videos
-* Display general information about a video
+* Display general info about videos
 * Watch YouTube videos
 * Listen to YouTube videos
 * Popup mode (floating player)
-* Select the streaming player to watch the video with
-* Download videos 
+* Select streaming player to watch video with
+* Download videos
 * Download audio only
 * Open a video in Kodi
-* Show Next/Related videos
+* Show next/related videos
 * Search YouTube in a specific language
 * Watch/Block age restricted material
-* Display general information about channels
+* Display general info about channels
 * Search channels
 * Watch videos from a channel
 * Orbot/Tor support (not yet directly)
-* 1080p/2k/4k support
+* 1080p/2K/4K support
 * View history
 * Subscribe to channels
 * Search history
-* Search/Watch Playlists
-* Watch as queues Playlists
-* Queuing videos
+* Search/watch playlists
+* Watch as enqueued playlists
+* Enqueue videos
+* Local playlists
+* Subtitles
+* Multi-service support (e.g. SoundCloud \[beta\])
+* Livestream support
 
 ### Coming Features
 
-* Multiservice support (eg. SoundCloud)
-* Bookmarks
-* Subtitles support
-* livestream support
-* ... and many more
+* Cast to UPnP and Cast
+* Show comments
+* … and many more
 
-### Multiservice support
-Although NewPipe only supports YouTube at the moment, it's designed to support many more streaming services. The plan is, that NewPipe will get such support by the version 2.0.
+## Updates
+When a change to the NewPipe code occurs (due to either adding features or bug fixing), eventually a release will occur. These are in the format x.xx.x . In order to get this new version, you can:
+ * Build a debug APK yourself. This is the fastest way to get new features on your device, but is much more complicated, so we recommend using one of the other methods.
+ * Download the APK from [releases](https://github.com/TeamNewPipe/NewPipe/releases) and install it.
+ * Update via F-droid. This is the slowest method of getting updates, as F-Droid must recognize changes, build the APK itself, sign it, then push the update to users.
+
+When you install an APK from one of these options, it will be incompatible with an APK from one of the other options. This is due to different signing keys being used. Signing keys help ensure that a user isn't tricked into installing a malicious update to an app, and are independent. F-Droid and GitHub use different signing keys, and building an APK debug excludes a key. The signing key issue is being discussed in issue [#1981](https://github.com/TeamNewPipe/NewPipe/issues/1981), and may be fixed by setting up our own repository on F-Droid.
+
+In the meanwhile, if you want to switch sources for some reason (e.g. NewPipe's core functionality was broken and F-Droid doesn't have the update yet), we recommend following this procedure:
+1. Back up your data via "Settings>Content>Export Database" so you keep your history, subscriptions, and playlists
+2. Uninstall NewPipe
+3. Download the APK from the new source and install it
+4. Import the data from step 1 via "Settings>Content>Import Database"
 
 ## Contribution
 Whether you have ideas, translations, design changes, code cleaning, or real heavy code changes, help is always welcome.
@@ -78,21 +94,31 @@ The more is done the better it gets!
 If you'd like to get involved, check our [contribution notes](.github/CONTRIBUTING.md).
 
 ## Donate
-If you like NewPipe we'd be happy about a donation. You can either donate via Bitcoin or BountySource. For further information about donating to NewPipe, please visit our [website](https://newpipe.schabi.org/donate/).
+If you like NewPipe we'd be happy about a donation. You can either send bitcoin or donate via Bountysource or Liberapay. For further info on donating to NewPipe, please visit our [website](https://newpipe.schabi.org/donate).
 
 <table>
-<tr>
-<td><img src="https://bitcoin.org/img/icons/logotop.svg" alt="Bitcoin" /></td>
-<td><img src="assets/bitcoin_qr_code.png" alt="Bitcoin QR Code" width="100px"/></td>
-<td><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>
+  <tr>
+    <td><img src="https://bitcoin.org/img/icons/logotop.svg" alt="Bitcoin"></td>
+    <td><img src="assets/bitcoin_qr_code.png" alt="Bitcoin QR code" width="100px"></td>
+    <td><samp>16A9J59ahMRqkLSZjhYj33n9j3fMztFxnh</samp></td>
+  </tr>
+  <tr>
+    <td><a href="https://liberapay.com/TeamNewPipe/"><img src="https://upload.wikimedia.org/wikipedia/commons/2/27/Liberapay_logo_v2_white-on-yellow.svg" alt="Liberapay" width="80px" ></a></td>
+    <td><a href="https://liberapay.com/TeamNewPipe/"><img src="assets/liberapay_qr_code.png" alt="Visit NewPipe at liberapay.com" width="100px"></a></td>
+    <td><a href="https://liberapay.com/TeamNewPipe/donate"><img src="assets/liberapay_donate_button.svg" alt="Donate via Liberapay" height="35px"></a></td>
+  </tr>
+  <tr>
+    <td><a href="https://www.bountysource.com/teams/newpipe"><img src="https://upload.wikimedia.org/wikipedia/commons/thumb/2/22/Bountysource.png/320px-Bountysource.png" alt="Bountysource" width="190px"></a></td>
+    <td><a href="https://www.bountysource.com/teams/newpipe"><img src="assets/bountysource_qr_code.png" alt="Visit NewPipe at bountysource.com" width="100px"></a></td>
+    <td><a href="https://www.bountysource.com/teams/newpipe/issues"><img src="https://img.shields.io/bountysource/team/newpipe/activity.svg?colorB=cd201f" height="30px" alt="Check out how many bounties you can earn."></a></td>
+  </tr>
 </table>
 
+## Privacy Policy
+
+The NewPipe project aims to provide a private, anonymous experience for using media web services.
+Therefore, the app does not collect any data without your consent. NewPipe's privacy policy explains in detail what data is sent and stored when you send a crash report, or comment in our blog. You can find the document [here](https://newpipe.schabi.org/legal/privacy/).
+
 ## License
 [![GNU GPLv3 Image](https://www.gnu.org/graphics/gplv3-127x51.png)](http://www.gnu.org/licenses/gpl-3.0.en.html)  
 

app/build.gradle

@@ -1,38 +1,32 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 27
-    buildToolsVersion '27.0.1'
+    compileSdkVersion 28
+    buildToolsVersion '28.0.3'
 
     defaultConfig {
         applicationId "org.schabi.newpipe"
-        minSdkVersion 15
-        targetSdkVersion 27
-        versionCode 47
-        versionName "0.11.6"
+        minSdkVersion 19
+        targetSdkVersion 28
+        versionCode 71
+        versionName "0.15.1"
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
     }
+
     buildTypes {
         release {
             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 {
@@ -41,6 +35,7 @@ android {
         // but continue the build even when errors are found:
         abortOnError false
     }
+
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
@@ -48,45 +43,61 @@ android {
 }
 
 ext {
-    supportLibVersion = '27.0.2'
+    supportLibVersion = '28.0.0'
+    exoPlayerLibVersion = '2.8.4' //2.9.0
+    roomDbLibVersion = '1.1.1'
+    leakCanaryLibVersion = '1.5.4' //1.6.1
+    okHttpLibVersion = '3.11.0'
+    icepickLibVersion = '3.2.0'
+    stethoLibVersion = '1.5.0'
 }
-dependencies {
-    androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2') {
-        exclude module: 'support-annotations'
-    }
 
-    implementation 'com.github.TeamNewPipe:NewPipeExtractor:7fd21ec08581d'
+dependencies {
+    androidTestImplementation('com.android.support.test.espresso:espresso-core:3.0.2', {
+        exclude module: 'support-annotations'
+    })
+
+    implementation 'com.github.TeamNewPipe:NewPipeExtractor:f7c7b9df1a'
 
     testImplementation 'junit:junit:4.12'
-    testImplementation 'org.mockito:mockito-core:1.10.19'
+    testImplementation 'org.mockito:mockito-core:2.23.0'
 
-    implementation "com.android.support:appcompat-v7:$supportLibVersion"
-    implementation "com.android.support:support-v4:$supportLibVersion"
-    implementation "com.android.support:design:$supportLibVersion"
-    implementation "com.android.support:recyclerview-v7:$supportLibVersion"
-    implementation "com.android.support:preference-v14:$supportLibVersion"
+    implementation "com.android.support:appcompat-v7:${supportLibVersion}"
+    implementation "com.android.support:support-v4:${supportLibVersion}"
+    implementation "com.android.support:design:${supportLibVersion}"
+    implementation "com.android.support:recyclerview-v7:${supportLibVersion}"
+    implementation "com.android.support:preference-v14:${supportLibVersion}"
+    implementation "com.android.support:cardview-v7:${supportLibVersion}"
+    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
 
-    implementation 'com.google.code.gson:gson:2.8.2'
-    implementation 'ch.acra:acra:4.9.2'
+    implementation 'ch.acra:acra:4.9.2' //4.11
 
     implementation 'com.nostra13.universalimageloader:universal-image-loader:1.9.5'
     implementation 'de.hdodenhof:circleimageview:2.2.0'
     implementation 'com.github.nirhart:ParallaxScroll:dd53d1f9d1'
-    implementation 'com.nononsenseapps:filepicker:3.0.1'
-    implementation 'com.google.android.exoplayer:exoplayer:r2.5.4'
+    implementation 'com.nononsenseapps:filepicker:4.2.1'
 
-    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 "com.google.android.exoplayer:exoplayer:${exoPlayerLibVersion}"
+    implementation "com.google.android.exoplayer:extension-mediasession:${exoPlayerLibVersion}"
 
-    implementation 'io.reactivex.rxjava2:rxjava:2.1.7'
-    implementation 'io.reactivex.rxjava2:rxandroid:2.0.1'
-    implementation 'com.jakewharton.rxbinding2:rxbinding:2.0.0'
+    debugImplementation "com.facebook.stetho:stetho:${stethoLibVersion}"
+    debugImplementation "com.facebook.stetho:stetho-urlconnection:${stethoLibVersion}"
+    debugImplementation 'com.android.support:multidex:1.0.3'
 
-    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 'io.reactivex.rxjava2:rxjava:2.2.2'
+    implementation 'io.reactivex.rxjava2:rxandroid:2.1.0'
+    implementation 'com.jakewharton.rxbinding2:rxbinding:2.1.1'
 
-    implementation 'frankiesardo:icepick:3.2.0'
-    annotationProcessor 'frankiesardo:icepick-processor:3.2.0'
+    implementation "android.arch.persistence.room:runtime:${roomDbLibVersion}"
+    implementation "android.arch.persistence.room:rxjava2:${roomDbLibVersion}"
+    annotationProcessor "android.arch.persistence.room:compiler:${roomDbLibVersion}"
+
+    implementation "frankiesardo:icepick:${icepickLibVersion}"
+    annotationProcessor "frankiesardo:icepick-processor:${icepickLibVersion}"
+
+    debugImplementation "com.squareup.leakcanary:leakcanary-android:${leakCanaryLibVersion}"
+    releaseImplementation "com.squareup.leakcanary:leakcanary-android-no-op:${leakCanaryLibVersion}"
+
+    implementation "com.squareup.okhttp3:okhttp:${okHttpLibVersion}"
+    debugImplementation "com.facebook.stetho:stetho-okhttp3:${stethoLibVersion}"
 }

app/proguard-rules.pro

@@ -35,3 +35,16 @@
     @icepick.* <fields>;
 }
 -keepnames class * { @icepick.State *;}
+
+# Rules for OkHttp. Copy paste from https://github.com/square/okhttp
+-dontwarn okhttp3.**
+-dontwarn okio.**
+-dontwarn javax.annotation.**
+# A resource is loaded with a relative path so the package of this class must be preserved.
+-keepnames class okhttp3.internal.publicsuffix.PublicSuffixDatabase
+-keepclassmembers class * implements java.io.Serializable {
+    static final long serialVersionUID;
+    !static !transient <fields>;
+    private void writeObject(java.io.ObjectOutputStream);
+    private void readObject(java.io.ObjectInputStream);
+}

app/src/androidTest/java/org/schabi/newpipe/ApplicationTest.java

@@ -1,13 +0,0 @@
-package org.schabi.newpipe;
-
-import android.app.Application;
-import android.test.ApplicationTestCase;
-
-/**
- * <a href="http://d.android.com/tools/testing/testing_android.html">Testing Fundamentals</a>
- */
-public class ApplicationTest extends ApplicationTestCase<Application> {
-    public ApplicationTest() {
-        super(Application.class);
-    }
-}

app/src/beta/AndroidManifest.xml

@@ -1,10 +0,0 @@
-<?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/java/org/schabi/newpipe/DebugApp.java

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

app/src/main/AndroidManifest.xml

@@ -9,6 +9,7 @@
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
 
     <application
         android:name=".App"
@@ -28,6 +29,12 @@
             </intent-filter>
         </activity>
 
+        <receiver android:name="android.support.v4.media.session.MediaButtonReceiver" >
+            <intent-filter>
+                <action android:name="android.intent.action.MEDIA_BUTTON" />
+            </intent-filter>
+        </receiver>
+
         <activity
             android:name=".player.old.PlayVideoActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
@@ -36,7 +43,11 @@
 
         <service
             android:name=".player.BackgroundPlayer"
-            android:exported="false"/>
+            android:exported="false">
+            <intent-filter>
+                <action android:name="android.intent.action.MEDIA_BUTTON" />
+            </intent-filter>
+        </service>
 
         <activity
             android:name=".player.BackgroundPlayerActivity"
@@ -66,9 +77,8 @@
             android:name=".about.AboutActivity"
             android:label="@string/title_activity_about"/>
 
-        <activity
-            android:name=".history.HistoryActivity"
-            android:label="@string/title_activity_history"/>
+        <service android:name=".local.subscription.services.SubscriptionsImportService"/>
+        <service android:name=".local.subscription.services.SubscriptionsExportService"/>
 
         <activity
             android:name=".PanicResponderActivity"
@@ -117,13 +127,17 @@
             android:grantUriPermissions="true">
             <meta-data
                 android:name="android.support.FILE_PROVIDER_PATHS"
-                android:resource="@xml/provider_paths"/>
+                android:resource="@xml/nnf_provider_paths"/>
         </provider>
 
         <activity
             android:name=".RouterActivity"
+            android:excludeFromRecents="true"
+            android:label="@string/preferred_open_action_share_menu_title"
             android:taskAffinity=""
             android:theme="@style/RouterActivityThemeDark">
+
+            <!-- Youtube filter -->
             <intent-filter>
                 <action android:name="android.intent.action.VIEW"/>
                 <action android:name="android.media.action.MEDIA_PLAY_FROM_SEARCH"/>
@@ -172,6 +186,47 @@
                 <data android:scheme="vnd.youtube"/>
                 <data android:scheme="vnd.youtube.launch"/>
             </intent-filter>
+
+            <!-- Hooktube filter -->
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW"/>
+                <action android:name="android.media.action.MEDIA_PLAY_FROM_SEARCH"/>
+                <action android:name="android.nfc.action.NDEF_DISCOVERED"/>
+
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.BROWSABLE"/>
+
+                <data android:scheme="http"/>
+                <data android:scheme="https"/>
+                <data android:host="hooktube.com"/>
+                <data android:host="*.hooktube.com"/>
+                <!-- video prefix -->
+                <data android:pathPrefix="/v/"/>
+                <data android:pathPrefix="/embed/"/>
+                <data android:pathPrefix="/watch"/>
+                <!-- channel prefix -->
+                <data android:pathPrefix="/channel/"/>
+                <data android:pathPrefix="/user/"/>
+            </intent-filter>
+
+            <!-- Soundcloud filter -->
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW"/>
+                <action android:name="android.media.action.MEDIA_PLAY_FROM_SEARCH"/>
+                <action android:name="android.nfc.action.NDEF_DISCOVERED"/>
+
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.BROWSABLE"/>
+
+                <data android:scheme="http"/>
+                <data android:scheme="https"/>
+                <data android:host="soundcloud.com"/>
+                <data android:host="m.soundcloud.com"/>
+                <data android:host="www.soundcloud.com"/>
+                <data android:pathPrefix="/"/>
+            </intent-filter>
+
+            <!-- Share filter -->
             <intent-filter>
                 <action android:name="android.intent.action.SEND"/>
                 <category android:name="android.intent.category.DEFAULT"/>
@@ -180,68 +235,7 @@
         </activity>
 
         <service
-            android:name=".RouterPlayerActivity$FetcherService"
+            android:name=".RouterActivity$FetcherService"
             android:exported="false"/>
-
-        <activity
-            android:name=".RouterPlayerActivity"
-            android:excludeFromRecents="true"
-            android:label="@string/preferred_player_share_menu_title"
-            android:taskAffinity=""
-            android:theme="@style/RouterActivityThemeDark">
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW"/>
-                <action android:name="android.media.action.MEDIA_PLAY_FROM_SEARCH"/>
-                <action android:name="android.nfc.action.NDEF_DISCOVERED"/>
-
-                <category android:name="android.intent.category.DEFAULT"/>
-                <category android:name="android.intent.category.BROWSABLE"/>
-
-                <data android:scheme="http"/>
-                <data android:scheme="https"/>
-                <data android:host="youtube.com"/>
-                <data android:host="m.youtube.com"/>
-                <data android:host="www.youtube.com"/>
-                <!-- video prefix -->
-                <data android:pathPrefix="/v/"/>
-                <data android:pathPrefix="/embed/"/>
-                <data android:pathPrefix="/watch"/>
-                <data android:pathPrefix="/attribution_link"/>
-                <!-- channel prefix -->
-                <data android:pathPrefix="/channel/"/>
-                <data android:pathPrefix="/user/"/>
-                <!-- playlist prefix -->
-                <data android:pathPrefix="/playlist"/>
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW"/>
-                <action android:name="android.media.action.MEDIA_PLAY_FROM_SEARCH"/>
-                <action android:name="android.nfc.action.NDEF_DISCOVERED"/>
-
-                <category android:name="android.intent.category.DEFAULT"/>
-                <category android:name="android.intent.category.BROWSABLE"/>
-
-                <data android:scheme="http"/>
-                <data android:scheme="https"/>
-                <data android:host="youtu.be"/>
-                <data android:pathPrefix="/"/>
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW"/>
-                <action android:name="android.media.action.MEDIA_PLAY_FROM_SEARCH"/>
-                <action android:name="android.nfc.action.NDEF_DISCOVERED"/>
-
-                <category android:name="android.intent.category.DEFAULT"/>
-                <category android:name="android.intent.category.BROWSABLE"/>
-
-                <data android:scheme="vnd.youtube"/>
-                <data android:scheme="vnd.youtube.launch"/>
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.SEND"/>
-                <category android:name="android.intent.category.DEFAULT"/>
-                <data android:mimeType="text/plain"/>
-            </intent-filter>
-        </activity>
     </application>
-</manifest>
+</manifest>

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

@@ -1,24 +1,29 @@
 package org.schabi.newpipe;
 
-import android.app.AlarmManager;
+import android.annotation.TargetApi;
 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.preference.PreferenceManager;
+import android.support.annotation.Nullable;
 import android.util.Log;
 
+import com.nostra13.universalimageloader.cache.memory.impl.LRULimitedMemoryCache;
 import com.nostra13.universalimageloader.core.ImageLoader;
 import com.nostra13.universalimageloader.core.ImageLoaderConfiguration;
+import com.squareup.leakcanary.LeakCanary;
+import com.squareup.leakcanary.RefWatcher;
 
 import org.acra.ACRA;
 import org.acra.config.ACRAConfiguration;
 import org.acra.config.ACRAConfigurationException;
 import org.acra.config.ConfigurationBuilder;
 import org.acra.sender.ReportSenderFactory;
+import org.schabi.newpipe.extractor.Downloader;
 import org.schabi.newpipe.extractor.NewPipe;
+import org.schabi.newpipe.extractor.utils.Localization;
 import org.schabi.newpipe.report.AcraReportSenderFactory;
 import org.schabi.newpipe.report.ErrorActivity;
 import org.schabi.newpipe.report.UserAction;
@@ -29,9 +34,13 @@ import org.schabi.newpipe.util.StateSaver;
 import java.io.IOException;
 import java.io.InterruptedIOException;
 import java.net.SocketException;
+import java.util.Collections;
+import java.util.List;
 
 import io.reactivex.annotations.NonNull;
 import io.reactivex.exceptions.CompositeException;
+import io.reactivex.exceptions.MissingBackpressureException;
+import io.reactivex.exceptions.OnErrorNotImplementedException;
 import io.reactivex.exceptions.UndeliverableException;
 import io.reactivex.functions.Consumer;
 import io.reactivex.plugins.RxJavaPlugins;
@@ -56,9 +65,12 @@ import io.reactivex.plugins.RxJavaPlugins;
 
 public class App extends Application {
     protected static final String TAG = App.class.toString();
+    private RefWatcher refWatcher;
+    private static App app;
 
     @SuppressWarnings("unchecked")
-    private static final Class<? extends ReportSenderFactory>[] reportSenderFactoryClasses = new Class[]{AcraReportSenderFactory.class};
+    private static final Class<? extends ReportSenderFactory>[]
+            reportSenderFactoryClasses = new Class[]{AcraReportSenderFactory.class};
 
     @Override
     protected void attachBaseContext(Context base) {
@@ -71,54 +83,105 @@ public class App extends Application {
     public void onCreate() {
         super.onCreate();
 
+        if (LeakCanary.isInAnalyzerProcess(this)) {
+            // This process is dedicated to LeakCanary for heap analysis.
+            // You should not init your app in this process.
+            return;
+        }
+        refWatcher = installLeakCanary();
+
+        app = this;
+
         // Initialize settings first because others inits can use its values
         SettingsActivity.initSettings(this);
 
-        NewPipe.init(Downloader.getInstance());
-        NewPipeDatabase.init(this);
+        NewPipe.init(getDownloader(),
+                org.schabi.newpipe.util.Localization.getPreferredExtractorLocal(this));
         StateSaver.init(this);
         initNotificationChannel();
 
         // Initialize image loader
-        ImageLoaderConfiguration config = new ImageLoaderConfiguration.Builder(this).build();
-        ImageLoader.getInstance().init(config);
+        ImageLoader.getInstance().init(getImageLoaderConfigurations(10, 50));
 
         configureRxJavaErrorHandler();
+
+        // Check for new version
+        new CheckForNewAppVersionTask().execute();
+    }
+
+    protected Downloader getDownloader() {
+        return org.schabi.newpipe.Downloader.init(null);
     }
 
     private void configureRxJavaErrorHandler() {
         // https://github.com/ReactiveX/RxJava/wiki/What's-different-in-2.0#error-handling
         RxJavaPlugins.setErrorHandler(new Consumer<Throwable>() {
             @Override
-            public void accept(@NonNull Throwable throwable) throws Exception {
-                Log.e(TAG, "RxJavaPlugins.ErrorHandler called with -> : throwable = [" + throwable.getClass().getName() + "]");
+            public void accept(@NonNull Throwable throwable) {
+                Log.e(TAG, "RxJavaPlugins.ErrorHandler called with -> : " +
+                        "throwable = [" + throwable.getClass().getName() + "]");
 
                 if (throwable instanceof UndeliverableException) {
                     // As UndeliverableException is a wrapper, get the cause of it to get the "real" exception
                     throwable = throwable.getCause();
                 }
 
+                final List<Throwable> errors;
                 if (throwable instanceof CompositeException) {
-                    for (Throwable element : ((CompositeException) throwable).getExceptions()) {
-                        if (checkThrowable(element)) return;
+                    errors = ((CompositeException) throwable).getExceptions();
+                } else {
+                    errors = Collections.singletonList(throwable);
+                }
+
+                for (final Throwable error : errors) {
+                    if (isThrowableIgnored(error)) return;
+                    if (isThrowableCritical(error)) {
+                        reportException(error);
+                        return;
                     }
                 }
 
-                if (checkThrowable(throwable)) return;
+                // Out-of-lifecycle exceptions should only be reported if a debug user wishes so,
+                // When exception is not reported, log it
+                if (isDisposedRxExceptionsReported()) {
+                    reportException(throwable);
+                } else {
+                    Log.e(TAG, "RxJavaPlugin: Undeliverable Exception received: ", throwable);
+                }
+            }
 
+            private boolean isThrowableIgnored(@NonNull final Throwable throwable) {
+                // Don't crash the application over a simple network problem
+                return ExtractorHelper.hasAssignableCauseThrowable(throwable,
+                        IOException.class, SocketException.class, // network api cancellation
+                        InterruptedException.class, InterruptedIOException.class); // blocking code disposed
+            }
+
+            private boolean isThrowableCritical(@NonNull final Throwable throwable) {
+                // Though these exceptions cannot be ignored
+                return ExtractorHelper.hasAssignableCauseThrowable(throwable,
+                        NullPointerException.class, IllegalArgumentException.class, // bug in app
+                        OnErrorNotImplementedException.class, MissingBackpressureException.class,
+                        IllegalStateException.class); // bug in operator
+            }
+
+            private void reportException(@NonNull final Throwable throwable) {
                 // Throw uncaught exception that will trigger the report system
                 Thread.currentThread().getUncaughtExceptionHandler()
                         .uncaughtException(Thread.currentThread(), throwable);
             }
-
-            private 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 ImageLoaderConfiguration getImageLoaderConfigurations(final int memoryCacheSizeMb,
+                                                                  final int diskCacheSizeMb) {
+        return new ImageLoaderConfiguration.Builder(this)
+                .memoryCache(new LRULimitedMemoryCache(memoryCacheSizeMb * 1024 * 1024))
+                .diskCacheSize(diskCacheSizeMb * 1024 * 1024)
+                .imageDownloader(new ImageDownloader(getApplicationContext()))
+                .build();
+    }
+
     private void initACRA() {
         try {
             final ACRAConfiguration acraConfig = new ConfigurationBuilder(this)
@@ -128,7 +191,11 @@ public class App extends Application {
             ACRA.init(this, acraConfig);
         } catch (ACRAConfigurationException ace) {
             ace.printStackTrace();
-            ErrorActivity.reportError(this, ace, null, null, ErrorActivity.ErrorInfo.make(UserAction.SOMETHING_ELSE, "none",
+            ErrorActivity.reportError(this,
+                    ace,
+                    null,
+                    null,
+                    ErrorActivity.ErrorInfo.make(UserAction.SOMETHING_ELSE, "none",
                     "Could not initialize ACRA crash report", R.string.app_ui_crash));
         }
     }
@@ -148,8 +215,51 @@ public class App extends Application {
         NotificationChannel mChannel = new NotificationChannel(id, name, importance);
         mChannel.setDescription(description);
 
-        NotificationManager mNotificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
+        NotificationManager mNotificationManager =
+                (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
         mNotificationManager.createNotificationChannel(mChannel);
+
+        setUpUpdateNotificationChannel(importance);
     }
 
+    /**
+     * Set up notification channel for app update.
+     * @param importance
+     */
+    @TargetApi(Build.VERSION_CODES.O)
+    private void setUpUpdateNotificationChannel(int importance) {
+
+        final String appUpdateId
+                = getString(R.string.app_update_notification_channel_id);
+        final CharSequence appUpdateName
+                = getString(R.string.app_update_notification_channel_name);
+        final String appUpdateDescription
+                = getString(R.string.app_update_notification_channel_description);
+
+        NotificationChannel appUpdateChannel
+                = new NotificationChannel(appUpdateId, appUpdateName, importance);
+        appUpdateChannel.setDescription(appUpdateDescription);
+
+        NotificationManager appUpdateNotificationManager
+                = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
+        appUpdateNotificationManager.createNotificationChannel(appUpdateChannel);
+    }
+
+    @Nullable
+    public static RefWatcher getRefWatcher(Context context) {
+        final App application = (App) context.getApplicationContext();
+        return application.refWatcher;
+    }
+
+    protected RefWatcher installLeakCanary() {
+        return RefWatcher.DISABLED;
+    }
+
+    protected boolean isDisposedRxExceptionsReported() {
+        return false;
+    }
+
+    public static App getApp() {
+        return app;
+    }
 }

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

@@ -1,28 +1,36 @@
 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.v4.app.FragmentManager;
 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 com.squareup.leakcanary.RefWatcher;
 
 import icepick.Icepick;
+import icepick.State;
 
 public abstract class BaseFragment extends Fragment {
     protected final String TAG = getClass().getSimpleName() + "@" + Integer.toHexString(hashCode());
-    protected boolean DEBUG = MainActivity.DEBUG;
+    protected final boolean DEBUG = MainActivity.DEBUG;
 
     protected AppCompatActivity activity;
     public static final ImageLoader imageLoader = ImageLoader.getInstance();
 
+    //These values are used for controlling framgents when they are part of the frontpage
+    @State
+    protected boolean useAsFrontPage = false;
+    protected boolean mIsVisibleToUser = false;
+
+    public void useAsFrontPage(boolean value) {
+        useAsFrontPage = value;
+    }
+
     /*//////////////////////////////////////////////////////////////////////////
     // Fragment's Lifecycle
     //////////////////////////////////////////////////////////////////////////*/
@@ -67,6 +75,20 @@ public abstract class BaseFragment extends Fragment {
     protected void onRestoreInstanceState(@NonNull Bundle savedInstanceState) {
     }
 
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+
+        RefWatcher refWatcher = App.getRefWatcher(getActivity());
+        if (refWatcher != null) refWatcher.watch(this);
+    }
+
+    @Override
+    public void setUserVisibleHint(boolean isVisibleToUser) {
+        super.setUserVisibleHint(isVisibleToUser);
+        mIsVisibleToUser = isVisibleToUser;
+    }
+
     /*//////////////////////////////////////////////////////////////////////////
     // Init
     //////////////////////////////////////////////////////////////////////////*/
@@ -78,33 +100,20 @@ public abstract class BaseFragment extends Fragment {
     }
 
     /*//////////////////////////////////////////////////////////////////////////
-    // DisplayImageOptions default configurations
+    // Utils
     //////////////////////////////////////////////////////////////////////////*/
 
-    public static final DisplayImageOptions BASE_OPTIONS =
-            new DisplayImageOptions.Builder().cacheInMemory(true).build();
+    public void setTitle(String title) {
+        if (DEBUG) Log.d(TAG, "setTitle() called with: title = [" + title + "]");
+        if((!useAsFrontPage || mIsVisibleToUser)
+            && (activity != null && activity.getSupportActionBar() != null)) {
+            activity.getSupportActionBar().setTitle(title);
+        }
+    }
 
-    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();
+    protected FragmentManager getFM() {
+        return getParentFragment() == null
+                ? getFragmentManager()
+                : getParentFragment().getFragmentManager();
+    }
 }

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

@@ -0,0 +1,230 @@
+package org.schabi.newpipe;
+
+import android.app.Application;
+import android.app.PendingIntent;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.Signature;
+import android.net.Uri;
+import android.os.AsyncTask;
+import android.preference.PreferenceManager;
+import android.support.v4.app.NotificationCompat;
+import android.support.v4.app.NotificationManagerCompat;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.schabi.newpipe.report.ErrorActivity;
+import org.schabi.newpipe.report.UserAction;
+
+import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.security.cert.CertificateEncodingException;
+import java.security.cert.CertificateException;
+import java.security.cert.CertificateFactory;
+import java.security.cert.X509Certificate;
+import java.util.concurrent.TimeUnit;
+
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.RequestBody;
+import okhttp3.Response;
+
+/**
+ * AsyncTask to check if there is a newer version of the NewPipe github apk available or not.
+ * If there is a newer version we show a notification, informing the user. On tapping
+ * the notification, the user will be directed to the download link.
+ */
+public class CheckForNewAppVersionTask extends AsyncTask<Void, Void, String> {
+
+    private static final Application app = App.getApp();
+    private static final String GITHUB_APK_SHA1 = "B0:2E:90:7C:1C:D6:FC:57:C3:35:F0:88:D0:8F:50:5F:94:E4:D2:15";
+    private static final String newPipeApiUrl = "https://newpipe.schabi.org/api/data.json";
+    private static final int timeoutPeriod = 30;
+
+    private SharedPreferences mPrefs;
+    private OkHttpClient client;
+
+    @Override
+    protected void onPreExecute() {
+
+        mPrefs = PreferenceManager.getDefaultSharedPreferences(app);
+
+        // Check if user has enabled/ disabled update checking
+        // and if the current apk is a github one or not.
+        if (!mPrefs.getBoolean(app.getString(R.string.update_app_key), true)
+                || !isGithubApk()) {
+            this.cancel(true);
+        }
+    }
+
+    @Override
+    protected String doInBackground(Void... voids) {
+
+        // Make a network request to get latest NewPipe data.
+        if (client == null) {
+
+            client = new OkHttpClient
+                    .Builder()
+                    .readTimeout(timeoutPeriod, TimeUnit.SECONDS)
+                    .build();
+        }
+
+        Request request = new Request.Builder()
+                .url(newPipeApiUrl)
+                .build();
+
+        try {
+            Response response = client.newCall(request).execute();
+            return response.body().string();
+        } catch (IOException ex) {
+            ErrorActivity.reportError(app, ex, null, null,
+                    ErrorActivity.ErrorInfo.make(UserAction.SOMETHING_ELSE, "none",
+                            "app update API fail", R.string.app_ui_crash));
+        }
+
+        return null;
+    }
+
+    @Override
+    protected void onPostExecute(String response) {
+
+        // Parse the json from the response.
+        if (response != null) {
+
+            try {
+                JSONObject mainObject = new JSONObject(response);
+                JSONObject flavoursObject = mainObject.getJSONObject("flavors");
+                JSONObject githubObject = flavoursObject.getJSONObject("github");
+                JSONObject githubStableObject = githubObject.getJSONObject("stable");
+
+                String versionName = githubStableObject.getString("version");
+                String versionCode = githubStableObject.getString("version_code");
+                String apkLocationUrl = githubStableObject.getString("apk");
+
+                compareAppVersionAndShowNotification(versionName, apkLocationUrl, versionCode);
+
+            } catch (JSONException ex) {
+                ErrorActivity.reportError(app, ex, null, null,
+                        ErrorActivity.ErrorInfo.make(UserAction.SOMETHING_ELSE, "none",
+                        "could not parse app update JSON data", R.string.app_ui_crash));
+            }
+        }
+    }
+
+    /**
+     * Method to compare the current and latest available app version.
+     * If a newer version is available, we show the update notification.
+     * @param versionName
+     * @param apkLocationUrl
+     */
+    private void compareAppVersionAndShowNotification(String versionName,
+                                                      String apkLocationUrl,
+                                                      String versionCode) {
+
+        int NOTIFICATION_ID = 2000;
+
+        if (BuildConfig.VERSION_CODE < Integer.valueOf(versionCode)) {
+
+            // A pending intent to open the apk location url in the browser.
+            Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(apkLocationUrl));
+            PendingIntent pendingIntent
+                    = PendingIntent.getActivity(app, 0, intent, 0);
+
+            NotificationCompat.Builder notificationBuilder = new NotificationCompat
+                    .Builder(app, app.getString(R.string.app_update_notification_channel_id))
+                    .setSmallIcon(R.drawable.ic_newpipe_update)
+                    .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
+                    .setContentIntent(pendingIntent)
+                    .setAutoCancel(true)
+                    .setContentTitle(app.getString(R.string.app_update_notification_content_title))
+                    .setContentText(app.getString(R.string.app_update_notification_content_text)
+                            + " " + versionName);
+
+            NotificationManagerCompat notificationManager = NotificationManagerCompat.from(app);
+            notificationManager.notify(NOTIFICATION_ID, notificationBuilder.build());
+        }
+    }
+
+    /**
+     * Method to get the apk's SHA1 key.
+     * https://stackoverflow.com/questions/9293019/get-certificate-fingerprint-from-android-app#22506133
+     */
+    private static String getCertificateSHA1Fingerprint() {
+
+        PackageManager pm = app.getPackageManager();
+        String packageName = app.getPackageName();
+        int flags = PackageManager.GET_SIGNATURES;
+        PackageInfo packageInfo = null;
+
+        try {
+            packageInfo = pm.getPackageInfo(packageName, flags);
+        } catch (PackageManager.NameNotFoundException ex) {
+            ErrorActivity.reportError(app, ex, null, null,
+                    ErrorActivity.ErrorInfo.make(UserAction.SOMETHING_ELSE, "none",
+                            "Could not find package info", R.string.app_ui_crash));
+        }
+
+        Signature[] signatures = packageInfo.signatures;
+        byte[] cert = signatures[0].toByteArray();
+        InputStream input = new ByteArrayInputStream(cert);
+
+        CertificateFactory cf = null;
+        X509Certificate c = null;
+
+        try {
+            cf = CertificateFactory.getInstance("X509");
+            c = (X509Certificate) cf.generateCertificate(input);
+        } catch (CertificateException ex) {
+            ErrorActivity.reportError(app, ex, null, null,
+                    ErrorActivity.ErrorInfo.make(UserAction.SOMETHING_ELSE, "none",
+                            "Certificate error", R.string.app_ui_crash));
+        }
+
+        String hexString = null;
+
+        try {
+            MessageDigest md = MessageDigest.getInstance("SHA1");
+            byte[] publicKey = md.digest(c.getEncoded());
+            hexString = byte2HexFormatted(publicKey);
+        } catch (NoSuchAlgorithmException ex1) {
+            ErrorActivity.reportError(app, ex1, null, null,
+                    ErrorActivity.ErrorInfo.make(UserAction.SOMETHING_ELSE, "none",
+                            "Could not retrieve SHA1 key", R.string.app_ui_crash));
+        } catch (CertificateEncodingException ex2) {
+            ErrorActivity.reportError(app, ex2, null, null,
+                    ErrorActivity.ErrorInfo.make(UserAction.SOMETHING_ELSE, "none",
+                            "Could not retrieve SHA1 key", R.string.app_ui_crash));
+        }
+
+        return hexString;
+    }
+
+    private static String byte2HexFormatted(byte[] arr) {
+
+        StringBuilder str = new StringBuilder(arr.length * 2);
+
+        for (int i = 0; i < arr.length; i++) {
+            String h = Integer.toHexString(arr[i]);
+            int l = h.length();
+            if (l == 1) h = "0" + h;
+            if (l > 2) h = h.substring(l - 2, l);
+            str.append(h.toUpperCase());
+            if (i < (arr.length - 1)) str.append(':');
+        }
+        return str.toString();
+    }
+
+    public static boolean isGithubApk() {
+
+        return getCertificateSHA1Fingerprint().equals(GITHUB_APK_SHA1);
+    }
+}

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

@@ -1,20 +1,22 @@
 package org.schabi.newpipe;
 
-import android.util.Log;
+import android.support.annotation.Nullable;
+import android.text.TextUtils;
 
 import org.schabi.newpipe.extractor.exceptions.ReCaptchaException;
-import org.schabi.newpipe.util.ExtractorHelper;
+import org.schabi.newpipe.extractor.utils.Localization;
 
-import java.io.BufferedReader;
 import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.InterruptedIOException;
-import java.net.URL;
+import java.io.InputStream;
+import java.util.Collections;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.Map;
+import java.util.concurrent.TimeUnit;
 
-import javax.net.ssl.HttpsURLConnection;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Response;
+import okhttp3.ResponseBody;
 
 
 /*
@@ -38,32 +40,64 @@ import javax.net.ssl.HttpsURLConnection;
  */
 
 public class Downloader implements org.schabi.newpipe.extractor.Downloader {
-
     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 static Downloader instance;
+    private String mCookies;
+    private final OkHttpClient client;
 
-    private Downloader() {
+    private Downloader(OkHttpClient.Builder builder) {
+        this.client = builder
+                .readTimeout(30, TimeUnit.SECONDS)
+                //.cache(new Cache(new File(context.getExternalCacheDir(), "okhttp"), 16 * 1024 * 1024))
+                .build();
+    }
+
+    /**
+     * It's recommended to call exactly once in the entire lifetime of the application.
+     *
+     * @param builder if null, default builder will be used
+     */
+    public static Downloader init(@Nullable OkHttpClient.Builder builder) {
+        return instance = new Downloader(builder != null ? builder : new OkHttpClient.Builder());
     }
 
     public static Downloader getInstance() {
-        if (instance == null) {
-            synchronized (Downloader.class) {
-                if (instance == null) {
-                    instance = new Downloader();
-                }
-            }
-        }
         return instance;
     }
 
-    public static synchronized void setCookies(String cookies) {
-        Downloader.mCookies = cookies;
+    public String getCookies() {
+        return mCookies;
     }
 
-    public static synchronized String getCookies() {
-        return Downloader.mCookies;
+    public void setCookies(String cookies) {
+        mCookies = cookies;
+    }
+
+    /**
+     * Get the size of the content that the url is pointing by firing a HEAD request.
+     *
+     * @param url an url pointing to the content
+     * @return the size of the content, in bytes
+     */
+    public long getContentLength(String url) throws IOException {
+        Response response = null;
+        try {
+            final Request request = new Request.Builder()
+                    .head().url(url)
+                    .addHeader("User-Agent", USER_AGENT)
+                    .build();
+            response = client.newCall(request).execute();
+
+            String contentLength = response.header("Content-Length");
+            return contentLength == null ? -1 : Long.parseLong(contentLength);
+        } catch (NumberFormatException e) {
+            throw new IOException("Invalid content length", e);
+        } finally {
+            if (response != null) {
+                response.close();
+            }
+        }
     }
 
     /**
@@ -71,13 +105,13 @@ public class Downloader implements org.schabi.newpipe.extractor.Downloader {
      * but set the HTTP header field "Accept-Language" to the supplied string.
      *
      * @param siteUrl  the URL of the text file to return the contents of
-     * @param language the language (usually a 2-character code) to set as the preferred language
+     * @param localization the language and country (usually a 2-character code) to set
      * @return the contents of the specified text file
      */
     @Override
-    public String download(String siteUrl, String language) throws IOException, ReCaptchaException {
+    public String download(String siteUrl, Localization localization) throws IOException, ReCaptchaException {
         Map<String, String> requestProperties = new HashMap<>();
-        requestProperties.put("Accept-Language", language);
+        requestProperties.put("Accept-Language", localization.getLanguage());
         return download(siteUrl, requestProperties);
     }
 
@@ -92,14 +126,44 @@ public class Downloader implements org.schabi.newpipe.extractor.Downloader {
      */
     @Override
     public String download(String siteUrl, Map<String, String> customProperties) throws IOException, ReCaptchaException {
-        URL url = new URL(siteUrl);
-        HttpsURLConnection con = (HttpsURLConnection) url.openConnection();
-        Iterator it = customProperties.entrySet().iterator();
-        while (it.hasNext()) {
-            Map.Entry pair = (Map.Entry) it.next();
-            con.setRequestProperty((String) pair.getKey(), (String) pair.getValue());
+        return getBody(siteUrl, customProperties).string();
+    }
+
+    public InputStream stream(String siteUrl) throws IOException {
+        try {
+            return getBody(siteUrl, Collections.emptyMap()).byteStream();
+        } catch (ReCaptchaException e) {
+            throw new IOException(e.getMessage(), e.getCause());
         }
-        return dl(con);
+    }
+
+    private ResponseBody getBody(String siteUrl, Map<String, String> customProperties) throws IOException, ReCaptchaException {
+        final Request.Builder requestBuilder = new Request.Builder()
+                .method("GET", null).url(siteUrl)
+                .addHeader("User-Agent", USER_AGENT);
+
+        for (Map.Entry<String, String> header : customProperties.entrySet()) {
+            requestBuilder.addHeader(header.getKey(), header.getValue());
+        }
+
+        if (!TextUtils.isEmpty(mCookies)) {
+            requestBuilder.addHeader("Cookie", mCookies);
+        }
+
+        final Request request = requestBuilder.build();
+        final Response response = client.newCall(request).execute();
+        final ResponseBody body = response.body();
+
+        if (response.code() == 429) {
+            throw new ReCaptchaException("reCaptcha Challenge requested");
+        }
+
+        if (body == null) {
+            response.close();
+            return null;
+        }
+
+        return body;
     }
 
     /**
@@ -111,57 +175,6 @@ public class Downloader implements org.schabi.newpipe.extractor.Downloader {
      */
     @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);
-
-            if (getCookies().length() > 0) {
-                con.setRequestProperty("Cookie", getCookies());
-            }
-
-            in = new BufferedReader(new InputStreamReader(con.getInputStream()));
-
-            String inputLine;
-            while ((inputLine = in.readLine()) != null) {
-                response.append(inputLine);
-            }
-        } catch (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
-             * See : https://github.com/rg3/youtube-dl/issues/5138
-             */
-            if (con.getResponseCode() == 429) {
-                throw new ReCaptchaException("reCaptcha Challenge requested");
-            }
-
-            throw new IOException(con.getResponseCode() + " " + con.getResponseMessage(), e);
-        } finally {
-            if (in != null) {
-                in.close();
-            }
-        }
-
-        return response.toString();
+        return download(siteUrl, Collections.emptyMap());
     }
 }

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

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

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

@@ -22,12 +22,13 @@ package org.schabi.newpipe;
 
 import android.content.Intent;
 import android.content.SharedPreferences;
+import android.content.pm.PackageManager;
+import android.os.Build;
 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;
@@ -37,46 +38,54 @@ import android.support.v7.app.ActionBarDrawerToggle;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
 import android.util.Log;
+import android.view.Gravity;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
+import android.view.Window;
+import android.view.WindowManager;
+import android.widget.Button;
+import android.widget.ImageView;
+import android.widget.TextView;
 
-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.NewPipe;
 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.extractor.exceptions.ExtractionException;
 import org.schabi.newpipe.fragments.BackPressable;
 import org.schabi.newpipe.fragments.MainFragment;
 import org.schabi.newpipe.fragments.detail.VideoDetailFragment;
 import org.schabi.newpipe.fragments.list.search.SearchFragment;
-import org.schabi.newpipe.history.HistoryListener;
+import org.schabi.newpipe.report.ErrorActivity;
 import org.schabi.newpipe.util.Constants;
+import org.schabi.newpipe.util.KioskTranslator;
 import org.schabi.newpipe.util.NavigationHelper;
+import org.schabi.newpipe.util.PermissionHelper;
 import org.schabi.newpipe.util.ServiceHelper;
 import org.schabi.newpipe.util.StateSaver;
 import org.schabi.newpipe.util.ThemeHelper;
 
-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 {
+public class MainActivity extends AppCompatActivity {
     private static final String TAG = "MainActivity";
     public static final boolean DEBUG = !BuildConfig.BUILD_TYPE.equals("release");
 
-    private SharedPreferences sharedPreferences;
     private ActionBarDrawerToggle toggle = null;
+    private DrawerLayout drawer = null;
+    private NavigationView drawerItems = null;
+    private TextView headerServiceView = null;
+
+    private boolean servicesShown = false;
+    private ImageView serviceArrow;
+
+    private static final int ITEM_ID_SUBSCRIPTIONS = - 1;
+    private static final int ITEM_ID_FEED = - 2;
+    private static final int ITEM_ID_BOOKMARKS = - 3;
+    private static final int ITEM_ID_DOWNLOADS = - 4;
+    private static final int ITEM_ID_HISTORY = - 5;
+    private static final int ITEM_ID_SETTINGS = 0;
+    private static final int ITEM_ID_ABOUT = 1;
+
+    private static final int ORDER = 0;
 
     /*//////////////////////////////////////////////////////////////////////////
     // Activity's LifeCycle
@@ -86,61 +95,254 @@ public class MainActivity extends AppCompatActivity implements HistoryListener {
     protected void onCreate(Bundle savedInstanceState) {
         if (DEBUG) Log.d(TAG, "onCreate() called with: savedInstanceState = [" + savedInstanceState + "]");
 
-        sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this);
         ThemeHelper.setTheme(this, ServiceHelper.getSelectedServiceId(this));
 
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
 
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            Window w = getWindow();
+            w.setFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS, WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
+        }
+
         if (getSupportFragmentManager() != null && getSupportFragmentManager().getBackStackEntryCount() == 0) {
             initFragments();
         }
 
         setSupportActionBar(findViewById(R.id.toolbar));
-        setupDrawer();
-        initHistory();
+        try {
+            setupDrawer();
+        } catch (Exception e) {
+            ErrorActivity.reportUiError(this, e);
+        }
     }
 
-    private void setupDrawer() {
+    private void setupDrawer() throws Exception {
         final Toolbar toolbar = findViewById(R.id.toolbar);
-        final DrawerLayout drawer = findViewById(R.id.drawer_layout);
-        final NavigationView drawerItems = findViewById(R.id.navigation);
+        drawer = findViewById(R.id.drawer_layout);
+        drawerItems = findViewById(R.id.navigation);
 
-        //drawerItems.setItemIconTintList(null); // Set null to use the original icon
-        drawerItems.getMenu().getItem(ServiceHelper.getSelectedServiceId(this)).setChecked(true);
+        //Tabs
+        int currentServiceId = ServiceHelper.getSelectedServiceId(this);
+        StreamingService service = NewPipe.getService(currentServiceId);
 
-        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;
+        int kioskId = 0;
 
-                @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);
+        for (final String ks : service.getKioskList().getAvailableKiosks()) {
+            drawerItems.getMenu()
+                    .add(R.id.menu_tabs_group, kioskId, 0, KioskTranslator.getTranslatedKioskName(ks, this))
+                    .setIcon(KioskTranslator.getKioskIcons(ks, this));
+            kioskId ++;
         }
+
+        drawerItems.getMenu()
+                .add(R.id.menu_tabs_group, ITEM_ID_SUBSCRIPTIONS, ORDER, R.string.tab_subscriptions)
+                .setIcon(ThemeHelper.resolveResourceIdFromAttr(this, R.attr.ic_channel));
+        drawerItems.getMenu()
+                .add(R.id.menu_tabs_group, ITEM_ID_FEED, ORDER, R.string.fragment_whats_new)
+                .setIcon(ThemeHelper.resolveResourceIdFromAttr(this, R.attr.rss));
+        drawerItems.getMenu()
+                .add(R.id.menu_tabs_group, ITEM_ID_BOOKMARKS, ORDER, R.string.tab_bookmarks)
+                .setIcon(ThemeHelper.resolveResourceIdFromAttr(this, R.attr.ic_bookmark));
+        drawerItems.getMenu()
+                .add(R.id.menu_tabs_group, ITEM_ID_DOWNLOADS, ORDER, R.string.downloads)
+                .setIcon(ThemeHelper.resolveResourceIdFromAttr(this, R.attr.download));
+        drawerItems.getMenu()
+                .add(R.id.menu_tabs_group, ITEM_ID_HISTORY, ORDER, R.string.action_history)
+                .setIcon(ThemeHelper.resolveResourceIdFromAttr(this, R.attr.history));
+
+        //Settings and About
+        drawerItems.getMenu()
+                .add(R.id.menu_options_about_group, ITEM_ID_SETTINGS, ORDER, R.string.settings)
+                .setIcon(ThemeHelper.resolveResourceIdFromAttr(this, R.attr.settings));
+        drawerItems.getMenu()
+                .add(R.id.menu_options_about_group, ITEM_ID_ABOUT, ORDER, R.string.tab_about)
+                .setIcon(ThemeHelper.resolveResourceIdFromAttr(this, R.attr.info));
+
+        toggle = new ActionBarDrawerToggle(this, drawer, toolbar, R.string.drawer_open, R.string.drawer_close);
+        toggle.syncState();
+        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(servicesShown) {
+                    toggleServices();
+                }
+                if (lastService != ServiceHelper.getSelectedServiceId(MainActivity.this)) {
+                    new Handler(Looper.getMainLooper()).post(MainActivity.this::recreate);
+                }
+            }
+        });
+
+        drawerItems.setNavigationItemSelectedListener(this::drawerItemSelected);
+        setupDrawerHeader();
+    }
+
+    private boolean drawerItemSelected(MenuItem item) {
+        switch (item.getGroupId()) {
+            case R.id.menu_services_group:
+                changeService(item);
+                break;
+            case R.id.menu_tabs_group:
+                try {
+                    tabSelected(item);
+                } catch (Exception e) {
+                    ErrorActivity.reportUiError(this, e);
+                }
+                break;
+            case R.id.menu_options_about_group:
+                optionsAboutSelected(item);
+                break;
+            default:
+                return false;
+        }
+
+        drawer.closeDrawers();
+        return true;
+    }
+
+    private  void changeService(MenuItem item) {
+        drawerItems.getMenu().getItem(ServiceHelper.getSelectedServiceId(this)).setChecked(false);
+        ServiceHelper.setSelectedServiceId(this, item.getItemId());
+        drawerItems.getMenu().getItem(ServiceHelper.getSelectedServiceId(this)).setChecked(true);
+    }
+
+    private void tabSelected(MenuItem item) throws ExtractionException {
+        switch(item.getItemId()) {
+            case ITEM_ID_SUBSCRIPTIONS:
+                NavigationHelper.openSubscriptionFragment(getSupportFragmentManager());
+                break;
+            case ITEM_ID_FEED:
+                NavigationHelper.openWhatsNewFragment(getSupportFragmentManager());
+                break;
+            case ITEM_ID_BOOKMARKS:
+                NavigationHelper.openBookmarksFragment(getSupportFragmentManager());
+                break;
+            case ITEM_ID_DOWNLOADS:
+                NavigationHelper.openDownloads(this);
+                break;
+            case ITEM_ID_HISTORY:
+                NavigationHelper.openStatisticFragment(getSupportFragmentManager());
+                break;
+            default:
+                int currentServiceId = ServiceHelper.getSelectedServiceId(this);
+                StreamingService service = NewPipe.getService(currentServiceId);
+                String serviceName = "";
+
+                int kioskId = 0;
+                for (final String ks : service.getKioskList().getAvailableKiosks()) {
+                    if(kioskId == item.getItemId()) {
+                        serviceName = ks;
+                    }
+                    kioskId ++;
+                }
+
+                NavigationHelper.openKioskFragment(getSupportFragmentManager(), currentServiceId, serviceName);
+                break;
+        }
+    }
+
+    private void optionsAboutSelected(MenuItem item) {
+        switch(item.getItemId()) {
+            case ITEM_ID_SETTINGS:
+                NavigationHelper.openSettings(this);
+                break;
+            case ITEM_ID_ABOUT:
+                NavigationHelper.openAbout(this);
+                break;
+        }
+    }
+
+    private void setupDrawerHeader() {
+        NavigationView navigationView = findViewById(R.id.navigation);
+        View hView =  navigationView.getHeaderView(0);
+
+        serviceArrow = hView.findViewById(R.id.drawer_arrow);
+        headerServiceView = hView.findViewById(R.id.drawer_header_service_view);
+        Button action = hView.findViewById(R.id.drawer_header_action_button);
+        action.setOnClickListener(view -> {
+            toggleServices();
+        });
+    }
+
+    private void toggleServices() {
+        servicesShown = !servicesShown;
+
+        drawerItems.getMenu().removeGroup(R.id.menu_services_group);
+        drawerItems.getMenu().removeGroup(R.id.menu_tabs_group);
+        drawerItems.getMenu().removeGroup(R.id.menu_options_about_group);
+
+        if(servicesShown) {
+            showServices();
+        } else {
+            try {
+                showTabs();
+            } catch (Exception e) {
+                ErrorActivity.reportUiError(this, e);
+            }
+        }
+    }
+
+    private void showServices() {
+        serviceArrow.setImageResource(R.drawable.ic_arrow_up_white);
+
+        for(StreamingService s : NewPipe.getServices()) {
+            final String title = s.getServiceInfo().getName() +
+                    (ServiceHelper.isBeta(s) ? " (beta)" : "");
+
+            drawerItems.getMenu()
+                    .add(R.id.menu_services_group, s.getServiceId(), ORDER, title)
+                    .setIcon(ServiceHelper.getIcon(s.getServiceId()));
+        }
+        drawerItems.getMenu().getItem(ServiceHelper.getSelectedServiceId(this)).setChecked(true);
+    }
+
+    private void showTabs() throws ExtractionException {
+        serviceArrow.setImageResource(R.drawable.ic_arrow_down_white);
+
+        //Tabs
+        int currentServiceId = ServiceHelper.getSelectedServiceId(this);
+        StreamingService service = NewPipe.getService(currentServiceId);
+
+        int kioskId = 0;
+
+        for (final String ks : service.getKioskList().getAvailableKiosks()) {
+            drawerItems.getMenu()
+                    .add(R.id.menu_tabs_group, kioskId, ORDER, KioskTranslator.getTranslatedKioskName(ks, this))
+                    .setIcon(KioskTranslator.getKioskIcons(ks, this));
+            kioskId ++;
+        }
+
+        drawerItems.getMenu()
+                .add(R.id.menu_tabs_group, ITEM_ID_SUBSCRIPTIONS, ORDER, R.string.tab_subscriptions)
+                .setIcon(ThemeHelper.resolveResourceIdFromAttr(this, R.attr.ic_channel));
+        drawerItems.getMenu()
+                .add(R.id.menu_tabs_group, ITEM_ID_FEED, ORDER, R.string.fragment_whats_new)
+                .setIcon(ThemeHelper.resolveResourceIdFromAttr(this, R.attr.rss));
+        drawerItems.getMenu()
+                .add(R.id.menu_tabs_group, ITEM_ID_BOOKMARKS, ORDER, R.string.tab_bookmarks)
+                .setIcon(ThemeHelper.resolveResourceIdFromAttr(this, R.attr.ic_bookmark));
+        drawerItems.getMenu()
+                .add(R.id.menu_tabs_group, ITEM_ID_DOWNLOADS, ORDER, R.string.downloads)
+                .setIcon(ThemeHelper.resolveResourceIdFromAttr(this, R.attr.download));
+        drawerItems.getMenu()
+                .add(R.id.menu_tabs_group, ITEM_ID_HISTORY, ORDER, R.string.action_history)
+                .setIcon(ThemeHelper.resolveResourceIdFromAttr(this, R.attr.history));
+
+        //Settings and About
+        drawerItems.getMenu()
+                .add(R.id.menu_options_about_group, ITEM_ID_SETTINGS, ORDER, R.string.settings)
+                .setIcon(ThemeHelper.resolveResourceIdFromAttr(this, R.attr.settings));
+        drawerItems.getMenu()
+                .add(R.id.menu_options_about_group, ITEM_ID_ABOUT, ORDER, R.string.tab_about)
+                .setIcon(ThemeHelper.resolveResourceIdFromAttr(this, R.attr.info));
     }
 
     @Override
@@ -149,14 +351,23 @@ public class MainActivity extends AppCompatActivity implements HistoryListener {
         if (!isChangingConfigurations()) {
             StateSaver.clearStateFiles();
         }
-
-        disposeHistory();
     }
 
     @Override
     protected void onResume() {
         super.onResume();
 
+        // close drawer on return, and don't show animation, so its looks like the drawer isn't open
+        // when the user returns to MainActivity
+        drawer.closeDrawer(Gravity.START, false);
+        try {
+            String selectedServiceName = NewPipe.getService(
+                    ServiceHelper.getSelectedServiceId(this)).getServiceInfo().getName();
+            headerServiceView.setText(selectedServiceName);
+        } catch (Exception e) {
+            ErrorActivity.reportUiError(this, e);
+        }
+
         SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this);
         if (sharedPreferences.getBoolean(Constants.KEY_THEME_CHANGE, false)) {
             if (DEBUG) Log.d(TAG, "Theme has changed, recreating activity...");
@@ -204,6 +415,26 @@ public class MainActivity extends AppCompatActivity implements HistoryListener {
         } else super.onBackPressed();
     }
 
+    @Override
+    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+        for (int i: grantResults){
+            if (i == PackageManager.PERMISSION_DENIED){
+                return;
+            }
+        }
+        switch (requestCode) {
+            case PermissionHelper.DOWNLOADS_REQUEST_CODE:
+                NavigationHelper.openDownloads(this);
+                break;
+            case PermissionHelper.DOWNLOAD_DIALOG_REQUEST_CODE:
+                Fragment fragment = getSupportFragmentManager().findFragmentById(R.id.fragment_holder);
+                if (fragment instanceof VideoDetailFragment) {
+                    ((VideoDetailFragment) fragment).openDownloadDialog();
+                }
+                break;
+        }
+    }
+
     /**
      * Implement the following diagram behavior for the up button:
      * <pre>
@@ -276,17 +507,14 @@ public class MainActivity extends AppCompatActivity implements HistoryListener {
             case android.R.id.home:
                 onHomeButtonPressed();
                 return true;
-            case R.id.action_settings:
-                NavigationHelper.openSettings(this);
-                return true;
             case R.id.action_show_downloads:
-                return NavigationHelper.openDownloads(this);
-            case R.id.action_about:
-                NavigationHelper.openAbout(this);
-                return true;
+                    return NavigationHelper.openDownloads(this);
             case R.id.action_history:
-                NavigationHelper.openHistory(this);
-                return true;
+                    NavigationHelper.openStatisticFragment(getSupportFragmentManager());
+                    return true;
+            case R.id.action_settings:
+                    NavigationHelper.openSettings(this);
+                    return true;
             default:
                 return super.onOptionsItemSelected(item);
         }
@@ -330,102 +558,45 @@ public class MainActivity extends AppCompatActivity implements HistoryListener {
     }
 
     private void handleIntent(Intent intent) {
-        if (DEBUG) Log.d(TAG, "handleIntent() called with: intent = [" + intent + "]");
+        try {
+            if (DEBUG) Log.d(TAG, "handleIntent() called with: intent = [" + intent + "]");
 
-        if (intent.hasExtra(Constants.KEY_LINK_TYPE)) {
-            String url = intent.getStringExtra(Constants.KEY_URL);
-            int serviceId = intent.getIntExtra(Constants.KEY_SERVICE_ID, 0);
-            String title = intent.getStringExtra(Constants.KEY_TITLE);
-            switch (((StreamingService.LinkType) intent.getSerializableExtra(Constants.KEY_LINK_TYPE))) {
-                case STREAM:
-                    boolean autoPlay = intent.getBooleanExtra(VideoDetailFragment.AUTO_PLAY, false);
-                    NavigationHelper.openVideoDetailFragment(getSupportFragmentManager(), serviceId, url, title, autoPlay);
-                    break;
-                case CHANNEL:
-                    NavigationHelper.openChannelFragment(getSupportFragmentManager(), serviceId, url, title);
-                    break;
-                case PLAYLIST:
-                    NavigationHelper.openPlaylistFragment(getSupportFragmentManager(), serviceId, url, title);
-                    break;
-            }
-        } else if (intent.hasExtra(Constants.KEY_OPEN_SEARCH)) {
-            String searchQuery = intent.getStringExtra(Constants.KEY_QUERY);
-            if (searchQuery == null) searchQuery = "";
-            int serviceId = intent.getIntExtra(Constants.KEY_SERVICE_ID, 0);
-            NavigationHelper.openSearchFragment(getSupportFragmentManager(), serviceId, searchQuery);
-        } else {
-            NavigationHelper.gotoMainFragment(getSupportFragmentManager());
-        }
-    }
-
-    /*//////////////////////////////////////////////////////////////////////////
-    // 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);
+            if (intent.hasExtra(Constants.KEY_LINK_TYPE)) {
+                String url = intent.getStringExtra(Constants.KEY_URL);
+                int serviceId = intent.getIntExtra(Constants.KEY_SERVICE_ID, 0);
+                String title = intent.getStringExtra(Constants.KEY_TITLE);
+                switch (((StreamingService.LinkType) intent.getSerializableExtra(Constants.KEY_LINK_TYPE))) {
+                    case STREAM:
+                        boolean autoPlay = intent.getBooleanExtra(VideoDetailFragment.AUTO_PLAY, false);
+                        NavigationHelper.openVideoDetailFragment(getSupportFragmentManager(), serviceId, url, title, autoPlay);
+                        break;
+                    case CHANNEL:
+                        NavigationHelper.openChannelFragment(getSupportFragmentManager(),
+                                serviceId,
+                                url,
+                                title);
+                        break;
+                    case PLAYLIST:
+                        NavigationHelper.openPlaylistFragment(getSupportFragmentManager(),
+                                serviceId,
+                                url,
+                                title);
+                        break;
                 }
+            } else if (intent.hasExtra(Constants.KEY_OPEN_SEARCH)) {
+                String searchString = intent.getStringExtra(Constants.KEY_SEARCH_STRING);
+                if (searchString == null) searchString = "";
+                int serviceId = intent.getIntExtra(Constants.KEY_SERVICE_ID, 0);
+                NavigationHelper.openSearchFragment(
+                        getSupportFragmentManager(),
+                        serviceId,
+                        searchString);
+
+            } else {
+                NavigationHelper.gotoMainFragment(getSupportFragmentManager());
             }
-        };
-    }
-
-    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);
+        } catch (Exception e) {
+            ErrorActivity.reportUiError(this, e);
         }
     }
 }

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

@@ -7,25 +7,36 @@ import android.support.annotation.NonNull;
 import org.schabi.newpipe.database.AppDatabase;
 
 import static org.schabi.newpipe.database.AppDatabase.DATABASE_NAME;
+import static org.schabi.newpipe.database.Migrations.MIGRATION_11_12;
 
 public final class NewPipeDatabase {
 
-    private static AppDatabase databaseInstance;
+    private static volatile AppDatabase databaseInstance;
 
     private NewPipeDatabase() {
         //no instance
     }
 
-    public static void init(Context context) {
-        databaseInstance = Room.databaseBuilder(context.getApplicationContext(),
-                AppDatabase.class, DATABASE_NAME
-        ).build();
+    private static AppDatabase getDatabase(Context context) {
+        return Room
+                .databaseBuilder(context.getApplicationContext(), AppDatabase.class, DATABASE_NAME)
+                .addMigrations(MIGRATION_11_12)
+                .fallbackToDestructiveMigration()
+                .build();
     }
 
     @NonNull
-    public static AppDatabase getInstance() {
-        if (databaseInstance == null) throw new RuntimeException("Database not initialized");
+    public static AppDatabase getInstance(@NonNull Context context) {
+        AppDatabase result = databaseInstance;
+        if (result == null) {
+            synchronized (NewPipeDatabase.class) {
+                result = databaseInstance;
+                if (result == null) {
+                    databaseInstance = (result = getDatabase(context));
+                }
+            }
+        }
 
-        return databaseInstance;
+        return result;
     }
 }

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

@@ -85,7 +85,7 @@ public class ReCaptchaActivity extends AppCompatActivity {
     }
 
     private class ReCaptchaWebViewClient extends WebViewClient {
-        private Activity context;
+        private final Activity context;
         private String mCookies;
 
         ReCaptchaWebViewClient(Activity ctx) {
@@ -107,7 +107,7 @@ public class ReCaptchaActivity extends AppCompatActivity {
             // find cookies : s_gl & goojf and Add cookies to Downloader
             if (find_access_cookies(cookies)) {
                 // Give cookies to Downloader class
-                Downloader.setCookies(mCookies);
+                Downloader.getInstance().setCookies(mCookies);
 
                 // Closing activity and return to parent
                 setResult(RESULT_OK);

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

@@ -1,53 +1,89 @@
 package org.schabi.newpipe;
 
+import android.annotation.SuppressLint;
+import android.app.IntentService;
+import android.content.Context;
+import android.content.DialogInterface;
 import android.content.Intent;
+import android.content.SharedPreferences;
+import android.content.pm.PackageManager;
 import android.os.Bundle;
+import android.preference.PreferenceManager;
+import android.support.annotation.DrawableRes;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.v4.app.NotificationCompat;
+import android.support.v7.app.AlertDialog;
 import android.support.v7.app.AppCompatActivity;
 import android.text.TextUtils;
+import android.view.ContextThemeWrapper;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.LinearLayout;
+import android.widget.RadioButton;
+import android.widget.RadioGroup;
 import android.widget.Toast;
 
+import org.schabi.newpipe.download.DownloadDialog;
+import org.schabi.newpipe.extractor.Info;
+import org.schabi.newpipe.extractor.NewPipe;
+import org.schabi.newpipe.extractor.StreamingService;
+import org.schabi.newpipe.extractor.StreamingService.LinkType;
+import org.schabi.newpipe.extractor.channel.ChannelInfo;
 import org.schabi.newpipe.extractor.exceptions.ExtractionException;
+import org.schabi.newpipe.extractor.playlist.PlaylistInfo;
+import org.schabi.newpipe.extractor.stream.StreamInfo;
+import org.schabi.newpipe.extractor.stream.VideoStream;
+import org.schabi.newpipe.player.helper.PlayerHelper;
+import org.schabi.newpipe.player.playqueue.ChannelPlayQueue;
+import org.schabi.newpipe.player.playqueue.PlayQueue;
+import org.schabi.newpipe.player.playqueue.PlaylistPlayQueue;
+import org.schabi.newpipe.player.playqueue.SinglePlayQueue;
 import org.schabi.newpipe.report.UserAction;
 import org.schabi.newpipe.util.ExtractorHelper;
+import org.schabi.newpipe.util.ListHelper;
 import org.schabi.newpipe.util.NavigationHelper;
+import org.schabi.newpipe.util.PermissionHelper;
+import org.schabi.newpipe.util.ThemeHelper;
 
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashSet;
+import java.util.List;
 
 import icepick.Icepick;
 import icepick.State;
 import io.reactivex.Observable;
+import io.reactivex.Single;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.disposables.CompositeDisposable;
+import io.reactivex.disposables.Disposable;
+import io.reactivex.functions.Consumer;
 import io.reactivex.schedulers.Schedulers;
 
-/*
- * Copyright (C) Christian Schabesberger 2017 <chris.schabesberger@mailbox.org>
- * RouterActivity.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/>.
- */
+import static org.schabi.newpipe.extractor.StreamingService.ServiceInfo.MediaCapability.AUDIO;
+import static org.schabi.newpipe.extractor.StreamingService.ServiceInfo.MediaCapability.VIDEO;
+import static org.schabi.newpipe.util.ThemeHelper.resolveResourceIdFromAttr;
 
 /**
- * This Acitivty is designed to route share/open intents to the specified service, and
- * to the part of the service which can handle the url.
+ * Get the url from the intent and open it in the chosen preferred player
  */
 public class RouterActivity extends AppCompatActivity {
 
-    @State
+    @State protected int currentServiceId = -1;
+    private StreamingService currentService;
+    @State protected LinkType currentLinkType;
+    @State protected int selectedRadioPosition = -1;
+    protected int selectedPreviously = -1;
+
     protected String currentUrl;
-    protected CompositeDisposable disposables = new CompositeDisposable();
+    protected final CompositeDisposable disposables = new CompositeDisposable();
+
+    private boolean selectionIsDownload = false;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -62,6 +98,9 @@ public class RouterActivity extends AppCompatActivity {
                 finish();
             }
         }
+
+        setTheme(ThemeHelper.isLightThemeSelected(this)
+                ? R.style.RouterActivityThemeLight : R.style.RouterActivityThemeDark);
     }
 
     @Override
@@ -73,25 +112,43 @@ public class RouterActivity extends AppCompatActivity {
     @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);
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
 
-                    finish();
-                }, this::handleError)
-        );
+        disposables.clear();
     }
 
-    protected void handleError(Throwable error) {
+    private void handleUrl(String url) {
+        disposables.add(Observable
+                .fromCallable(() -> {
+                    if (currentServiceId == -1) {
+                        currentService = NewPipe.getServiceByUrl(url);
+                        currentServiceId = currentService.getServiceId();
+                        currentLinkType = currentService.getLinkTypeByUrl(url);
+                        currentUrl = url;
+                    } else {
+                        currentService = NewPipe.getService(currentServiceId);
+                    }
+
+                    return currentLinkType != LinkType.NONE;
+                })
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(result -> {
+                    if (result) {
+                        onSuccess();
+                    } else {
+                        onError();
+                    }
+                }, this::handleError));
+    }
+
+    private void handleError(Throwable error) {
         error.printStackTrace();
 
         if (error instanceof ExtractionException) {
@@ -103,11 +160,442 @@ public class RouterActivity extends AppCompatActivity {
         finish();
     }
 
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
+    private void onError() {
+        Toast.makeText(this, R.string.url_not_supported_toast, Toast.LENGTH_LONG).show();
+        finish();
+    }
 
-        disposables.clear();
+    protected void onSuccess() {
+        final SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(this);
+        final String selectedChoiceKey = preferences.getString(getString(R.string.preferred_open_action_key), getString(R.string.preferred_open_action_default));
+
+        final String showInfoKey = getString(R.string.show_info_key);
+        final String videoPlayerKey = getString(R.string.video_player_key);
+        final String backgroundPlayerKey = getString(R.string.background_player_key);
+        final String popupPlayerKey = getString(R.string.popup_player_key);
+        final String downloadKey = getString(R.string.download_key);
+        final String alwaysAskKey = getString(R.string.always_ask_open_action_key);
+
+        if (selectedChoiceKey.equals(alwaysAskKey)) {
+            final List<AdapterChoiceItem> choices = getChoicesForService(currentService, currentLinkType);
+
+            switch (choices.size()) {
+                case 1:
+                    handleChoice(choices.get(0).key);
+                    break;
+                case 0:
+                    handleChoice(showInfoKey);
+                    break;
+                default:
+                    showDialog(choices);
+                    break;
+            }
+        } else if (selectedChoiceKey.equals(showInfoKey)) {
+            handleChoice(showInfoKey);
+        } else if (selectedChoiceKey.equals(downloadKey)) {
+            handleChoice(downloadKey);
+        } else {
+            final boolean isExtVideoEnabled = preferences.getBoolean(getString(R.string.use_external_video_player_key), false);
+            final boolean isExtAudioEnabled = preferences.getBoolean(getString(R.string.use_external_audio_player_key), false);
+            final boolean isVideoPlayerSelected = selectedChoiceKey.equals(videoPlayerKey) || selectedChoiceKey.equals(popupPlayerKey);
+            final boolean isAudioPlayerSelected = selectedChoiceKey.equals(backgroundPlayerKey);
+
+            if (currentLinkType != LinkType.STREAM) {
+                if (isExtAudioEnabled && isAudioPlayerSelected || isExtVideoEnabled && isVideoPlayerSelected) {
+                    Toast.makeText(this, R.string.external_player_unsupported_link_type, Toast.LENGTH_LONG).show();
+                    handleChoice(showInfoKey);
+                    return;
+                }
+            }
+
+            final List<StreamingService.ServiceInfo.MediaCapability> capabilities = currentService.getServiceInfo().getMediaCapabilities();
+
+            boolean serviceSupportsChoice = false;
+            if (isVideoPlayerSelected) {
+                serviceSupportsChoice = capabilities.contains(VIDEO);
+            } else if (selectedChoiceKey.equals(backgroundPlayerKey)) {
+                serviceSupportsChoice = capabilities.contains(AUDIO);
+            }
+
+            if (serviceSupportsChoice) {
+                handleChoice(selectedChoiceKey);
+            } else {
+                handleChoice(showInfoKey);
+            }
+        }
+    }
+
+    private void showDialog(final List<AdapterChoiceItem> choices) {
+        final SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(this);
+        final Context themeWrapperContext = getThemeWrapperContext();
+
+        final LayoutInflater inflater = LayoutInflater.from(themeWrapperContext);
+        final LinearLayout rootLayout = (LinearLayout) inflater.inflate(R.layout.preferred_player_dialog_view, null, false);
+        final RadioGroup radioGroup = rootLayout.findViewById(android.R.id.list);
+
+        final DialogInterface.OnClickListener dialogButtonsClickListener = (dialog, which) -> {
+            final int indexOfChild = radioGroup.indexOfChild(
+                    radioGroup.findViewById(radioGroup.getCheckedRadioButtonId()));
+            final AdapterChoiceItem choice = choices.get(indexOfChild);
+
+            handleChoice(choice.key);
+
+            if (which == DialogInterface.BUTTON_POSITIVE) {
+                preferences.edit().putString(getString(R.string.preferred_open_action_key), choice.key).apply();
+            }
+        };
+
+        final AlertDialog alertDialog = new AlertDialog.Builder(themeWrapperContext)
+                .setTitle(R.string.preferred_open_action_share_menu_title)
+                .setView(radioGroup)
+                .setCancelable(true)
+                .setNegativeButton(R.string.just_once, dialogButtonsClickListener)
+                .setPositiveButton(R.string.always, dialogButtonsClickListener)
+                .setOnDismissListener((dialog) -> {
+                    if(!selectionIsDownload) finish();
+                })
+                .create();
+
+        //noinspection CodeBlock2Expr
+        alertDialog.setOnShowListener(dialog -> {
+            setDialogButtonsState(alertDialog, radioGroup.getCheckedRadioButtonId() != -1);
+        });
+
+        radioGroup.setOnCheckedChangeListener((group, checkedId) -> setDialogButtonsState(alertDialog, true));
+        final View.OnClickListener radioButtonsClickListener = v -> {
+            final int indexOfChild = radioGroup.indexOfChild(v);
+            if (indexOfChild == -1) return;
+
+            selectedPreviously = selectedRadioPosition;
+            selectedRadioPosition = indexOfChild;
+
+            if (selectedPreviously == selectedRadioPosition) {
+                handleChoice(choices.get(selectedRadioPosition).key);
+            }
+        };
+
+        int id = 12345;
+        for (AdapterChoiceItem item : choices) {
+            final RadioButton radioButton = (RadioButton) inflater.inflate(R.layout.list_radio_icon_item, null);
+            radioButton.setText(item.description);
+            radioButton.setCompoundDrawablesWithIntrinsicBounds(item.icon, 0, 0, 0);
+            radioButton.setChecked(false);
+            radioButton.setId(id++);
+            radioButton.setLayoutParams(new RadioGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT));
+            radioButton.setOnClickListener(radioButtonsClickListener);
+            radioGroup.addView(radioButton);
+        }
+
+        if (selectedRadioPosition == -1) {
+            final String lastSelectedPlayer = preferences.getString(getString(R.string.preferred_open_action_last_selected_key), null);
+            if (!TextUtils.isEmpty(lastSelectedPlayer)) {
+                for (int i = 0; i < choices.size(); i++) {
+                    AdapterChoiceItem c = choices.get(i);
+                    if (lastSelectedPlayer.equals(c.key)) {
+                        selectedRadioPosition = i;
+                        break;
+                    }
+                }
+            }
+        }
+
+        selectedRadioPosition = Math.min(Math.max(-1, selectedRadioPosition), choices.size() - 1);
+        if (selectedRadioPosition != -1) {
+            ((RadioButton) radioGroup.getChildAt(selectedRadioPosition)).setChecked(true);
+        }
+        selectedPreviously = selectedRadioPosition;
+
+        alertDialog.show();
+    }
+
+    private List<AdapterChoiceItem> getChoicesForService(StreamingService service, LinkType linkType) {
+        final Context context = getThemeWrapperContext();
+
+        final List<AdapterChoiceItem> returnList = new ArrayList<>();
+        final List<StreamingService.ServiceInfo.MediaCapability> capabilities = service.getServiceInfo().getMediaCapabilities();
+
+        final SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(this);
+        boolean isExtVideoEnabled = preferences.getBoolean(getString(R.string.use_external_video_player_key), false);
+        boolean isExtAudioEnabled = preferences.getBoolean(getString(R.string.use_external_audio_player_key), false);
+
+        returnList.add(new AdapterChoiceItem(getString(R.string.show_info_key), getString(R.string.show_info),
+                resolveResourceIdFromAttr(context, R.attr.info)));
+
+        if (capabilities.contains(VIDEO) && !(isExtVideoEnabled && linkType != LinkType.STREAM)) {
+            returnList.add(new AdapterChoiceItem(getString(R.string.video_player_key), getString(R.string.video_player),
+                    resolveResourceIdFromAttr(context, R.attr.play)));
+            returnList.add(new AdapterChoiceItem(getString(R.string.popup_player_key), getString(R.string.popup_player),
+                    resolveResourceIdFromAttr(context, R.attr.popup)));
+        }
+
+        if (capabilities.contains(AUDIO) && !(isExtAudioEnabled && linkType != LinkType.STREAM)) {
+            returnList.add(new AdapterChoiceItem(getString(R.string.background_player_key), getString(R.string.background_player),
+                    resolveResourceIdFromAttr(context, R.attr.audio)));
+        }
+
+        returnList.add(new AdapterChoiceItem(getString(R.string.download_key), getString(R.string.download),
+                resolveResourceIdFromAttr(context, R.attr.download)));
+
+        return returnList;
+    }
+
+    private Context getThemeWrapperContext() {
+        return new ContextThemeWrapper(this,
+                ThemeHelper.isLightThemeSelected(this) ? R.style.LightTheme : R.style.DarkTheme);
+    }
+
+    private void setDialogButtonsState(AlertDialog dialog, boolean state) {
+        final Button negativeButton = dialog.getButton(DialogInterface.BUTTON_NEGATIVE);
+        final Button positiveButton = dialog.getButton(DialogInterface.BUTTON_POSITIVE);
+        if (negativeButton == null || positiveButton == null) return;
+
+        negativeButton.setEnabled(state);
+        positiveButton.setEnabled(state);
+    }
+
+    private void handleChoice(final String selectedChoiceKey) {
+        final List<String> validChoicesList = Arrays.asList(getResources().getStringArray(R.array.preferred_open_action_values_list));
+        if (validChoicesList.contains(selectedChoiceKey)) {
+            PreferenceManager.getDefaultSharedPreferences(this).edit()
+                    .putString(getString(R.string.preferred_open_action_last_selected_key), selectedChoiceKey)
+                    .apply();
+        }
+
+        if (selectedChoiceKey.equals(getString(R.string.popup_player_key)) && !PermissionHelper.isPopupEnabled(this)) {
+            PermissionHelper.showPopupEnablementToast(this);
+            finish();
+            return;
+        }
+
+        if (selectedChoiceKey.equals(getString(R.string.download_key))) {
+            if (PermissionHelper.checkStoragePermissions(this, PermissionHelper.DOWNLOAD_DIALOG_REQUEST_CODE)) {
+                selectionIsDownload = true;
+                openDownloadDialog();
+            }
+            return;
+        }
+
+        // stop and bypass FetcherService if InfoScreen was selected since
+        // StreamDetailFragment can fetch data itself
+        if (selectedChoiceKey.equals(getString(R.string.show_info_key))) {
+            disposables.add(Observable
+                    .fromCallable(() -> NavigationHelper.getIntentByLink(this, currentUrl))
+                    .subscribeOn(Schedulers.io())
+                    .observeOn(AndroidSchedulers.mainThread())
+                    .subscribe(intent -> {
+                        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
+                        startActivity(intent);
+
+                        finish();
+                    }, this::handleError)
+            );
+            return;
+        }
+
+        final Intent intent = new Intent(this, FetcherService.class);
+        final Choice choice = new Choice(currentService.getServiceId(), currentLinkType, currentUrl, selectedChoiceKey);
+        intent.putExtra(FetcherService.KEY_CHOICE, choice);
+        startService(intent);
+
+        finish();
+    }
+
+    @SuppressLint("CheckResult")
+    private void openDownloadDialog() {
+        ExtractorHelper.getStreamInfo(currentServiceId, currentUrl, true)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe((@NonNull StreamInfo result) -> {
+                    List<VideoStream> sortedVideoStreams = ListHelper.getSortedStreamVideosList(this,
+                            result.getVideoStreams(),
+                            result.getVideoOnlyStreams(),
+                            false);
+                    int selectedVideoStreamIndex = ListHelper.getDefaultResolutionIndex(this,
+                            sortedVideoStreams);
+
+                    android.support.v4.app.FragmentManager fm = getSupportFragmentManager();
+                    DownloadDialog downloadDialog = DownloadDialog.newInstance(result);
+                    downloadDialog.setVideoStreams(sortedVideoStreams);
+                    downloadDialog.setAudioStreams(result.getAudioStreams());
+                    downloadDialog.setSelectedVideoStream(selectedVideoStreamIndex);
+                    downloadDialog.show(fm, "downloadDialog");
+                    fm.executePendingTransactions();
+                    downloadDialog.getDialog().setOnDismissListener(dialog -> {
+                        finish();
+                    });
+                }, (@NonNull Throwable throwable) -> {
+                    onError();
+                });
+    }
+
+    @Override
+    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+        for (int i: grantResults){
+            if (i == PackageManager.PERMISSION_DENIED){
+                finish();
+                return;
+            }
+        }
+        if (requestCode == PermissionHelper.DOWNLOAD_DIALOG_REQUEST_CODE) {
+            openDownloadDialog();
+        }
+    }
+
+    private static class AdapterChoiceItem {
+        final String description, key;
+        @DrawableRes final int icon;
+
+        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);;
+
+                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 {
+                        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));
+        }
     }
 
     /*//////////////////////////////////////////////////////////////////////////
@@ -119,9 +607,9 @@ public class RouterActivity extends AppCompatActivity {
      * brackets (\p{P}). See http://www.regular-expressions.info/unicode.html for
      * more details.
      */
-    protected final static String REGEX_REMOVE_FROM_URL = "[\\p{Z}\\p{P}]";
+    private final static String REGEX_REMOVE_FROM_URL = "[\\p{Z}\\p{P}]";
 
-    protected String getUrl(Intent intent) {
+    private String getUrl(Intent intent) {
         // first gather data and find service
         String videoUrl = null;
         if (intent.getData() != null) {
@@ -137,7 +625,7 @@ public class RouterActivity extends AppCompatActivity {
         return videoUrl;
     }
 
-    protected String removeHeadingGibberish(final String input) {
+    private String removeHeadingGibberish(final String input) {
         int start = 0;
         for (int i = input.indexOf("://") - 1; i >= 0; i--) {
             if (!input.substring(i, i + 1).matches("\\p{L}")) {
@@ -148,7 +636,7 @@ public class RouterActivity extends AppCompatActivity {
         return input.substring(start, input.length());
     }
 
-    protected String trim(final String input) {
+    private String trim(final String input) {
         if (input == null || input.length() < 1) {
             return input;
         } else {
@@ -171,7 +659,7 @@ public class RouterActivity extends AppCompatActivity {
      * @param sharedText text to scan for URLs.
      * @return potential URLs
      */
-    protected String[] getUris(final String sharedText)  {
+    protected String[] getUris(final String sharedText) {
         final Collection<String> result = new HashSet<>();
         if (sharedText != null) {
             final String[] array = sharedText.split("\\p{Space}");
@@ -188,5 +676,4 @@ public class RouterActivity extends AppCompatActivity {
         }
         return result.toArray(new String[result.size()]);
     }
-
 }

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

@@ -1,413 +0,0 @@
-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/about/AboutActivity.java

@@ -32,7 +32,6 @@ public class AboutActivity extends AppCompatActivity {
             new SoftwareComponent("Giga Get", "2014", "Peter Cai", "https://github.com/PaperAirplane-Dev-Team/GigaGet", StandardLicenses.GPL2),
             new SoftwareComponent("NewPipe Extractor", "2017", "Christian Schabesberger", "https://github.com/TeamNewPipe/NewPipeExtractor", StandardLicenses.GPL3),
             new SoftwareComponent("Jsoup", "2017", "Jonathan Hedley", "https://github.com/jhy/jsoup", StandardLicenses.MIT),
-            new SoftwareComponent("Google Gson", "2008", "Google Inc", "https://github.com/google/gson", StandardLicenses.APACHE2),
             new SoftwareComponent("Rhino", "2015", "Mozilla", "https://www.mozilla.org/rhino/", StandardLicenses.MPL2),
             new SoftwareComponent("ACRA", "2013", "Kevin Gaudin", "http://www.acra.ch", StandardLicenses.APACHE2),
             new SoftwareComponent("Universal Image Loader", "2011 - 2015", "Sergey Tarasevich", "https://github.com/nostra13/Android-Universal-Image-Loader", StandardLicenses.APACHE2),
@@ -129,47 +128,31 @@ public class AboutActivity extends AppCompatActivity {
         public View onCreateView(LayoutInflater inflater, ViewGroup container,
                                  Bundle savedInstanceState) {
             View rootView = inflater.inflate(R.layout.fragment_about, container, false);
+            Context context = this.getContext();
+
             TextView version = rootView.findViewById(R.id.app_version);
             version.setText(BuildConfig.VERSION_NAME);
 
             View githubLink = rootView.findViewById(R.id.github_link);
-            githubLink.setOnClickListener(new OnGithubLinkClickListener());
+            githubLink.setOnClickListener(nv -> openWebsite(context.getString(R.string.github_url), context));
 
             View donationLink = rootView.findViewById(R.id.donation_link);
-            donationLink.setOnClickListener(new OnDonationLinkClickListener());
+            donationLink.setOnClickListener(v -> openWebsite(context.getString(R.string.donation_url), context));
 
             View websiteLink = rootView.findViewById(R.id.website_link);
-            websiteLink.setOnClickListener(new OnWebsiteLinkClickListener());
+            websiteLink.setOnClickListener(nv -> openWebsite(context.getString(R.string.website_url), context));
+
+            View privacyPolicyLink = rootView.findViewById(R.id.privacy_policy_link);
+            privacyPolicyLink.setOnClickListener(v -> openWebsite(context.getString(R.string.privacy_policy_url), context));
 
             return rootView;
         }
 
-        private static class OnGithubLinkClickListener implements View.OnClickListener {
-            @Override
-            public void onClick(final View view) {
-                final Context context = view.getContext();
-                Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(context.getString(R.string.github_url)));
-                context.startActivity(intent);
-            }
+        private void openWebsite(String url, Context context) {
+            Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(url));
+            context.startActivity(intent);
         }
 
-        private static class OnDonationLinkClickListener implements View.OnClickListener {
-            @Override
-            public void onClick(final View view) {
-                final Context context = view.getContext();
-                Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(context.getString(R.string.donation_url)));
-                context.startActivity(intent);
-            }
-        }
-
-        private static class OnWebsiteLinkClickListener implements View.OnClickListener {
-            @Override
-            public void onClick(final View view) {
-                final Context context = view.getContext();
-                Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(context.getString(R.string.website_url)));
-                context.startActivity(intent);
-            }
-        }
     }
 
 

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

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

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

@@ -1,8 +1,10 @@
 package org.schabi.newpipe.about;
 
+import android.app.Activity;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.os.AsyncTask;
+import android.support.annotation.Nullable;
 import android.support.v7.app.AlertDialog;
 import android.webkit.WebView;
 import org.schabi.newpipe.R;
@@ -10,26 +12,46 @@ import org.schabi.newpipe.util.ThemeHelper;
 
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
+import java.lang.ref.WeakReference;
 
 public class LicenseFragmentHelper extends AsyncTask<Object, Void, Integer> {
 
-    private Context context;
+    final WeakReference<Activity> weakReference;
     private License license;
 
+    public LicenseFragmentHelper(@Nullable Activity activity) {
+        weakReference = new WeakReference<>(activity);
+    }
+
+    @Nullable
+    private Activity getActivity() {
+        Activity activity = weakReference.get();
+
+        if (activity != null && activity.isFinishing()) {
+            return null;
+        } else {
+            return activity;
+        }
+    }
+
     @Override
     protected Integer doInBackground(Object... objects) {
-        context = (Context) objects[0];
-        license = (License) objects[1];
+        license = (License) objects[0];
         return 1;
     }
 
     @Override
-    protected void onPostExecute(Integer result){
-        String webViewData = getFormattedLicense(context, license);
-        AlertDialog.Builder alert = new AlertDialog.Builder(context);
+    protected void onPostExecute(Integer result) {
+        Activity activity = getActivity();
+        if (activity == null) {
+            return;
+        }
+
+        String webViewData = getFormattedLicense(activity, license);
+        AlertDialog.Builder alert = new AlertDialog.Builder(activity);
         alert.setTitle(license.getName());
 
-        WebView wv = new WebView(context);
+        WebView wv = new WebView(activity);
         wv.loadData(webViewData, "text/html; charset=UTF-8", null);
 
         alert.setView(wv);
@@ -55,18 +77,18 @@ public class LicenseFragmentHelper extends AsyncTask<Object, Void, Integer> {
             throw new NullPointerException("license is null");
         }
 
-        String licenseContent = "";
+        StringBuilder licenseContent = new StringBuilder();
         String webViewData;
         try {
             BufferedReader in = new BufferedReader(new InputStreamReader(context.getAssets().open(license.getFilename()), "UTF-8"));
             String str;
             while ((str = in.readLine()) != null) {
-                licenseContent += str;
+                licenseContent.append(str);
             }
             in.close();
 
             // split the HTML file and insert the stylesheet into the HEAD of the file
-            String[] insert = licenseContent.split("</head>");
+            String[] insert = licenseContent.toString().split("</head>");
             webViewData = insert[0] + "<style type=\"text/css\">"
                     + getLicenseStylesheet(context) + "</style></head>"
                     + insert[1];

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

@@ -4,23 +4,52 @@ 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.dao.StreamHistoryDAO;
 import org.schabi.newpipe.database.history.model.SearchHistoryEntry;
-import org.schabi.newpipe.database.history.model.WatchHistoryEntry;
+import org.schabi.newpipe.database.history.model.StreamHistoryEntity;
+import org.schabi.newpipe.database.playlist.dao.PlaylistDAO;
+import org.schabi.newpipe.database.playlist.dao.PlaylistRemoteDAO;
+import org.schabi.newpipe.database.playlist.dao.PlaylistStreamDAO;
+import org.schabi.newpipe.database.playlist.model.PlaylistEntity;
+import org.schabi.newpipe.database.playlist.model.PlaylistRemoteEntity;
+import org.schabi.newpipe.database.playlist.model.PlaylistStreamEntity;
+import org.schabi.newpipe.database.stream.dao.StreamDAO;
+import org.schabi.newpipe.database.stream.dao.StreamStateDAO;
+import org.schabi.newpipe.database.stream.model.StreamEntity;
+import org.schabi.newpipe.database.stream.model.StreamStateEntity;
 import org.schabi.newpipe.database.subscription.SubscriptionDAO;
 import org.schabi.newpipe.database.subscription.SubscriptionEntity;
 
+import static org.schabi.newpipe.database.Migrations.DB_VER_12_0;
+
 @TypeConverters({Converters.class})
-@Database(entities = {SubscriptionEntity.class, WatchHistoryEntry.class, SearchHistoryEntry.class}, version = 1, exportSchema = false)
+@Database(
+        entities = {
+                SubscriptionEntity.class, SearchHistoryEntry.class,
+                StreamEntity.class, StreamHistoryEntity.class, StreamStateEntity.class,
+                PlaylistEntity.class, PlaylistStreamEntity.class, PlaylistRemoteEntity.class
+        },
+        version = DB_VER_12_0,
+        exportSchema = false
+)
 public abstract class AppDatabase extends RoomDatabase {
 
     public static final String DATABASE_NAME = "newpipe.db";
 
     public abstract SubscriptionDAO subscriptionDAO();
 
-    public abstract WatchHistoryDAO watchHistoryDAO();
-
     public abstract SearchHistoryDAO searchHistoryDAO();
+
+    public abstract StreamDAO streamDAO();
+
+    public abstract StreamHistoryDAO streamHistoryDAO();
+
+    public abstract StreamStateDAO streamStateDAO();
+
+    public abstract PlaylistDAO playlistDAO();
+
+    public abstract PlaylistStreamDAO playlistStreamDAO();
+
+    public abstract PlaylistRemoteDAO playlistRemoteDAO();
 }

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

@@ -23,9 +23,6 @@ public interface BasicDAO<Entity> {
     @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();
 
@@ -33,7 +30,7 @@ public interface BasicDAO<Entity> {
 
     /* Deletes */
     @Delete
-    int delete(final Entity entity);
+    void delete(final Entity entity);
 
     @Delete
     int delete(final Collection<Entity> entities);
@@ -45,5 +42,5 @@ public interface BasicDAO<Entity> {
     int update(final Entity entity);
 
     @Update
-    int update(final Collection<Entity> entities);
+    void update(final Collection<Entity> entities);
 }

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

@@ -1,7 +1,9 @@
-package org.schabi.newpipe.database.history;
+package org.schabi.newpipe.database;
 
 import android.arch.persistence.room.TypeConverter;
 
+import org.schabi.newpipe.extractor.stream.StreamType;
+
 import java.util.Date;
 
 public class Converters {
@@ -25,4 +27,14 @@ public class Converters {
     public static Long dateToTimestamp(Date date) {
         return date == null ? null : date.getTime();
     }
+
+    @TypeConverter
+    public static StreamType streamTypeOf(String value) {
+        return StreamType.valueOf(value);
+    }
+
+    @TypeConverter
+    public static String stringOf(StreamType streamType) {
+        return streamType.name();
+    }
 }

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

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

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

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

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

@@ -2,6 +2,7 @@ package org.schabi.newpipe.database.history.dao;
 
 import android.arch.persistence.room.Dao;
 import android.arch.persistence.room.Query;
+import android.support.annotation.Nullable;
 
 import org.schabi.newpipe.database.history.model.SearchHistoryEntry;
 
@@ -20,8 +21,9 @@ 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
+    @Query("SELECT * FROM " + TABLE_NAME +
+            " WHERE " + ID + " = (SELECT MAX(" + ID + ") FROM " + TABLE_NAME + ")")
+    @Nullable
     SearchHistoryEntry getLatestEntry();
 
     @Query("DELETE FROM " + TABLE_NAME)

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

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

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

@@ -1,37 +0,0 @@
-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

@@ -1,60 +0,0 @@
-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

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

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

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

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

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

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

@@ -1,109 +0,0 @@
-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/playlist/PlaylistLocalItem.java

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

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

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

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

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

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

@@ -0,0 +1,36 @@
+package org.schabi.newpipe.database.playlist.dao;
+
+import android.arch.persistence.room.Dao;
+import android.arch.persistence.room.Query;
+
+import org.schabi.newpipe.database.BasicDAO;
+import org.schabi.newpipe.database.playlist.model.PlaylistEntity;
+
+import java.util.List;
+
+import io.reactivex.Flowable;
+
+import static org.schabi.newpipe.database.playlist.model.PlaylistEntity.PLAYLIST_ID;
+import static org.schabi.newpipe.database.playlist.model.PlaylistEntity.PLAYLIST_TABLE;
+
+@Dao
+public abstract class PlaylistDAO implements BasicDAO<PlaylistEntity> {
+    @Override
+    @Query("SELECT * FROM " + PLAYLIST_TABLE)
+    public abstract Flowable<List<PlaylistEntity>> getAll();
+
+    @Override
+    @Query("DELETE FROM " + PLAYLIST_TABLE)
+    public abstract int deleteAll();
+
+    @Override
+    public Flowable<List<PlaylistEntity>> listByService(int serviceId) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Query("SELECT * FROM " + PLAYLIST_TABLE + " WHERE " + PLAYLIST_ID + " = :playlistId")
+    public abstract Flowable<List<PlaylistEntity>> getPlaylist(final long playlistId);
+
+    @Query("DELETE FROM " + PLAYLIST_TABLE + " WHERE " + PLAYLIST_ID + " = :playlistId")
+    public abstract int deletePlaylist(final long playlistId);
+}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -5,7 +5,9 @@ import android.arch.persistence.room.Entity;
 import android.arch.persistence.room.Ignore;
 import android.arch.persistence.room.Index;
 import android.arch.persistence.room.PrimaryKey;
+import android.support.annotation.NonNull;
 
+import org.schabi.newpipe.extractor.channel.ChannelInfo;
 import org.schabi.newpipe.extractor.channel.ChannelInfoItem;
 import org.schabi.newpipe.util.Constants;
 
@@ -17,6 +19,7 @@ import static org.schabi.newpipe.database.subscription.SubscriptionEntity.SUBSCR
         indices = {@Index(value = {SUBSCRIPTION_SERVICE_ID, SUBSCRIPTION_URL}, unique = true)})
 public class SubscriptionEntity {
 
+    final static String SUBSCRIPTION_UID                = "uid";
     final static String SUBSCRIPTION_TABLE              = "subscriptions";
     final static String SUBSCRIPTION_SERVICE_ID         = "service_id";
     final static String SUBSCRIPTION_URL                = "url";
@@ -50,8 +53,7 @@ public class SubscriptionEntity {
         return uid;
     }
 
-    /* Keep this package-private since UID should always be auto generated by Room impl */
-    void setUid(long uid) {
+    public void setUid(long uid) {
         this.uid = uid;
     }
 
@@ -117,9 +119,18 @@ public class SubscriptionEntity {
     @Ignore
     public ChannelInfoItem toChannelInfoItem() {
         ChannelInfoItem item = new ChannelInfoItem(getServiceId(), getUrl(), getName());
-        item.thumbnail_url = getAvatarUrl();
-        item.subscriber_count = getSubscriberCount();
-        item.description = getDescription();
+        item.setThumbnailUrl(getAvatarUrl());
+        item.setSubscriberCount(getSubscriberCount());
+        item.setDescription(getDescription());
         return item;
     }
+
+    @Ignore
+    public static SubscriptionEntity from(@NonNull ChannelInfo info) {
+        SubscriptionEntity result = new SubscriptionEntity();
+        result.setServiceId(info.getServiceId());
+        result.setUrl(info.getUrl());
+        result.setData(info.getName(), info.getAvatarUrl(), info.getDescription(), info.getSubscriberCount());
+        return result;
+    }
 }

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

@@ -16,11 +16,12 @@ import org.schabi.newpipe.settings.SettingsActivity;
 import org.schabi.newpipe.util.ThemeHelper;
 
 import us.shandian.giga.service.DownloadManagerService;
-import us.shandian.giga.ui.fragment.AllMissionsFragment;
 import us.shandian.giga.ui.fragment.MissionsFragment;
 
 public class DownloadActivity extends AppCompatActivity {
 
+    private static final String MISSIONS_FRAGMENT_TAG = "fragment_tag";
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         // Service
@@ -42,7 +43,6 @@ public class DownloadActivity extends AppCompatActivity {
             actionBar.setDisplayShowTitleEnabled(true);
         }
 
-        // Fragment
         getWindow().getDecorView().getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
             @Override
             public void onGlobalLayout() {
@@ -53,10 +53,10 @@ public class DownloadActivity extends AppCompatActivity {
     }
 
     private void updateFragments() {
+        MissionsFragment fragment = new MissionsFragment();
 
-        MissionsFragment fragment = new AllMissionsFragment();
         getFragmentManager().beginTransaction()
-                .replace(R.id.frame, fragment)
+                .replace(R.id.frame, fragment, MISSIONS_FRAGMENT_TAG)
                 .setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE)
                 .commit();
     }
@@ -87,4 +87,8 @@ public class DownloadActivity extends AppCompatActivity {
         }
     }
 
+    @Override
+    public void onRestoreInstanceState(Bundle inState){
+        super.onRestoreInstanceState(inState);
+    }
 }

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

@@ -1,56 +1,82 @@
 package org.schabi.newpipe.download;
 
+import android.content.Context;
+import android.content.SharedPreferences;
 import android.os.Bundle;
+import android.preference.PreferenceManager;
 import android.support.annotation.IdRes;
+import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v4.app.DialogFragment;
+import android.support.v7.app.AlertDialog;
 import android.support.v7.widget.Toolbar;
 import android.util.Log;
+import android.util.SparseArray;
 import android.view.LayoutInflater;
-import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
-import android.widget.ArrayAdapter;
 import android.widget.EditText;
 import android.widget.RadioButton;
 import android.widget.RadioGroup;
 import android.widget.SeekBar;
 import android.widget.Spinner;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import org.schabi.newpipe.MainActivity;
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.extractor.MediaFormat;
+import org.schabi.newpipe.extractor.NewPipe;
 import org.schabi.newpipe.extractor.stream.AudioStream;
+import org.schabi.newpipe.extractor.stream.Stream;
 import org.schabi.newpipe.extractor.stream.StreamInfo;
+import org.schabi.newpipe.extractor.stream.SubtitlesStream;
 import org.schabi.newpipe.extractor.stream.VideoStream;
-import org.schabi.newpipe.fragments.detail.SpinnerToolbarAdapter;
+import org.schabi.newpipe.extractor.utils.Localization;
 import org.schabi.newpipe.settings.NewPipeSettings;
 import org.schabi.newpipe.util.FilenameUtils;
 import org.schabi.newpipe.util.ListHelper;
 import org.schabi.newpipe.util.PermissionHelper;
+import org.schabi.newpipe.util.SecondaryStreamHelper;
+import org.schabi.newpipe.util.StreamItemAdapter;
+import org.schabi.newpipe.util.StreamItemAdapter.StreamSizeWrapper;
 import org.schabi.newpipe.util.ThemeHelper;
 
-import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Locale;
 
+import icepick.Icepick;
+import icepick.State;
+import io.reactivex.disposables.CompositeDisposable;
+import us.shandian.giga.postprocessing.Postprocessing;
 import us.shandian.giga.service.DownloadManagerService;
 
 public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheckedChangeListener, AdapterView.OnItemSelectedListener {
     private static final String TAG = "DialogFragment";
     private static final boolean DEBUG = MainActivity.DEBUG;
 
-    private static final String INFO_KEY = "info_key";
-    private static final String SORTED_VIDEOS_LIST_KEY = "sorted_videos_list_key";
-    private static final String SELECTED_VIDEO_KEY = "selected_video_key";
-    private static final String SELECTED_AUDIO_KEY = "selected_audio_key";
+    @State
+    protected StreamInfo currentInfo;
+    @State
+    protected StreamSizeWrapper<AudioStream> wrappedAudioStreams = StreamSizeWrapper.empty();
+    @State
+    protected StreamSizeWrapper<VideoStream> wrappedVideoStreams = StreamSizeWrapper.empty();
+    @State
+    protected StreamSizeWrapper<SubtitlesStream> wrappedSubtitleStreams = StreamSizeWrapper.empty();
+    @State
+    protected int selectedVideoIndex = 0;
+    @State
+    protected int selectedAudioIndex = 0;
+    @State
+    protected int selectedSubtitleIndex = 0;
 
-    private StreamInfo currentInfo;
-    private ArrayList<VideoStream> sortedStreamVideosList;
-    private int selectedVideoIndex;
-    private int selectedAudioIndex;
+    private StreamItemAdapter<AudioStream, Stream> audioStreamsAdapter;
+    private StreamItemAdapter<VideoStream, AudioStream> videoStreamsAdapter;
+    private StreamItemAdapter<SubtitlesStream, Stream> subtitleStreamsAdapter;
+
+    private final CompositeDisposable disposables = new CompositeDisposable();
 
     private EditText nameEditText;
     private Spinner streamsSpinner;
@@ -58,17 +84,66 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
     private TextView threadsCountTextView;
     private SeekBar threadsSeekBar;
 
-    public static DownloadDialog newInstance(StreamInfo info, ArrayList<VideoStream> sortedStreamVideosList, int selectedVideoIndex) {
+    private SharedPreferences prefs;
+
+    public static DownloadDialog newInstance(StreamInfo info) {
         DownloadDialog dialog = new DownloadDialog();
-        dialog.setInfo(info, sortedStreamVideosList, selectedVideoIndex);
-        dialog.setStyle(DialogFragment.STYLE_NO_TITLE, 0);
+        dialog.setInfo(info);
         return dialog;
     }
 
-    private void setInfo(StreamInfo info, ArrayList<VideoStream> sortedStreamVideosList, int selectedVideoIndex) {
+    public static DownloadDialog newInstance(Context context, StreamInfo info) {
+        final ArrayList<VideoStream> streamsList = new ArrayList<>(ListHelper.getSortedStreamVideosList(context,
+                info.getVideoStreams(), info.getVideoOnlyStreams(), false));
+        final int selectedStreamIndex = ListHelper.getDefaultResolutionIndex(context, streamsList);
+
+        final DownloadDialog instance = newInstance(info);
+        instance.setVideoStreams(streamsList);
+        instance.setSelectedVideoStream(selectedStreamIndex);
+        instance.setAudioStreams(info.getAudioStreams());
+        instance.setSubtitleStreams(info.getSubtitles());
+
+        return instance;
+    }
+
+    private void setInfo(StreamInfo info) {
         this.currentInfo = info;
+    }
+
+    public void setAudioStreams(List<AudioStream> audioStreams) {
+        setAudioStreams(new StreamSizeWrapper<>(audioStreams, getContext()));
+    }
+
+    public void setAudioStreams(StreamSizeWrapper<AudioStream> wrappedAudioStreams) {
+        this.wrappedAudioStreams = wrappedAudioStreams;
+    }
+
+    public void setVideoStreams(List<VideoStream> videoStreams) {
+        setVideoStreams(new StreamSizeWrapper<>(videoStreams, getContext()));
+    }
+
+    public void setVideoStreams(StreamSizeWrapper<VideoStream> wrappedVideoStreams) {
+        this.wrappedVideoStreams = wrappedVideoStreams;
+    }
+
+    public void setSubtitleStreams(List<SubtitlesStream> subtitleStreams) {
+        setSubtitleStreams(new StreamSizeWrapper<>(subtitleStreams, getContext()));
+    }
+
+    public void setSubtitleStreams(StreamSizeWrapper<SubtitlesStream> wrappedSubtitleStreams) {
+        this.wrappedSubtitleStreams = wrappedSubtitleStreams;
+    }
+
+    public void setSelectedVideoStream(int selectedVideoIndex) {
         this.selectedVideoIndex = selectedVideoIndex;
-        this.sortedStreamVideosList = sortedStreamVideosList;
+    }
+
+    public void setSelectedAudioStream(int selectedAudioIndex) {
+        this.selectedAudioIndex = selectedAudioIndex;
+    }
+
+    public void setSelectedSubtitleStream(int selectedSubtitleIndex) {
+        this.selectedSubtitleIndex = selectedSubtitleIndex;
     }
 
     /*//////////////////////////////////////////////////////////////////////////
@@ -78,59 +153,75 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        if (DEBUG) Log.d(TAG, "onCreate() called with: savedInstanceState = [" + savedInstanceState + "]");
-        if (!PermissionHelper.checkStoragePermissions(getActivity())) {
+        if (DEBUG)
+            Log.d(TAG, "onCreate() called with: savedInstanceState = [" + savedInstanceState + "]");
+        if (!PermissionHelper.checkStoragePermissions(getActivity(), PermissionHelper.DOWNLOAD_DIALOG_REQUEST_CODE)) {
             getDialog().dismiss();
             return;
         }
 
-        if (savedInstanceState != null) {
-            Serializable serial = savedInstanceState.getSerializable(INFO_KEY);
-            if (serial instanceof StreamInfo) currentInfo = (StreamInfo) serial;
+        setStyle(STYLE_NO_TITLE, ThemeHelper.getDialogTheme(getContext()));
+        Icepick.restoreInstanceState(this, savedInstanceState);
 
-            serial = savedInstanceState.getSerializable(SORTED_VIDEOS_LIST_KEY);
-            if (serial instanceof ArrayList) { //noinspection unchecked
-                sortedStreamVideosList = (ArrayList<VideoStream>) serial;
+        SparseArray<SecondaryStreamHelper<AudioStream>> secondaryStreams = new SparseArray<>(4);
+        List<VideoStream> videoStreams = wrappedVideoStreams.getStreamsList();
+
+        for (int i = 0; i < videoStreams.size(); i++) {
+            if (!videoStreams.get(i).isVideoOnly()) continue;
+            AudioStream audioStream = SecondaryStreamHelper.getAudioStreamFor(wrappedAudioStreams.getStreamsList(), videoStreams.get(i));
+
+            if (audioStream != null) {
+                secondaryStreams.append(i, new SecondaryStreamHelper<>(wrappedAudioStreams, audioStream));
+            } else if (DEBUG) {
+                Log.w(TAG, "No audio stream candidates for video format " + videoStreams.get(i).getFormat().name());
             }
-
-            selectedVideoIndex = savedInstanceState.getInt(SELECTED_VIDEO_KEY, 0);
-            selectedAudioIndex = savedInstanceState.getInt(SELECTED_AUDIO_KEY, 0);
         }
+
+        this.videoStreamsAdapter = new StreamItemAdapter<>(getContext(), wrappedVideoStreams, secondaryStreams);
+        this.audioStreamsAdapter = new StreamItemAdapter<>(getContext(), wrappedAudioStreams);
+        this.subtitleStreamsAdapter = new StreamItemAdapter<>(getContext(), wrappedSubtitleStreams);
     }
 
     @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        if (DEBUG) Log.d(TAG, "onCreateView() called with: inflater = [" + inflater + "], container = [" + container + "], savedInstanceState = [" + savedInstanceState + "]");
-        return inflater.inflate(R.layout.dialog_url, container);
+    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        if (DEBUG)
+            Log.d(TAG, "onCreateView() called with: inflater = [" + inflater + "], container = [" + container + "], savedInstanceState = [" + savedInstanceState + "]");
+        return inflater.inflate(R.layout.download_dialog, container);
     }
 
     @Override
-    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
         nameEditText = view.findViewById(R.id.file_name);
         nameEditText.setText(FilenameUtils.createFilename(getContext(), currentInfo.getName()));
         selectedAudioIndex = ListHelper.getDefaultAudioFormat(getContext(), currentInfo.getAudioStreams());
 
+        selectedSubtitleIndex = getSubtitleIndexBy(subtitleStreamsAdapter.getAll());
+
         streamsSpinner = view.findViewById(R.id.quality_spinner);
         streamsSpinner.setOnItemSelectedListener(this);
 
         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(view.<Toolbar>findViewById(R.id.toolbar));
-        checkDownloadOptions(view);
-        setupVideoSpinner(sortedStreamVideosList, streamsSpinner);
+        initToolbar(view.findViewById(R.id.toolbar));
+        setupDownloadOptions();
 
-        int def = 3;
-        threadsCountTextView.setText(String.valueOf(def));
-        threadsSeekBar.setProgress(def - 1);
+        prefs = PreferenceManager.getDefaultSharedPreferences(getContext());
+
+        int threads = prefs.getInt(getString(R.string.default_download_threads), 3);
+        threadsCountTextView.setText(String.valueOf(threads));
+        threadsSeekBar.setProgress(threads - 1);
         threadsSeekBar.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
 
             @Override
             public void onProgressChanged(SeekBar seekbar, int progress, boolean fromUser) {
-                threadsCountTextView.setText(String.valueOf(progress + 1));
+                progress++;
+                prefs.edit().putInt(getString(R.string.default_download_threads), progress).apply();
+                threadsCountTextView.setText(String.valueOf(progress));
             }
 
             @Override
@@ -141,15 +232,40 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
             public void onStopTrackingTouch(SeekBar p1) {
             }
         });
+
+        fetchStreamsSize();
+    }
+
+    private void fetchStreamsSize() {
+        disposables.clear();
+
+        disposables.add(StreamSizeWrapper.fetchSizeForWrapper(wrappedVideoStreams).subscribe(result -> {
+            if (radioVideoAudioGroup.getCheckedRadioButtonId() == R.id.video_button) {
+                setupVideoSpinner();
+            }
+        }));
+        disposables.add(StreamSizeWrapper.fetchSizeForWrapper(wrappedAudioStreams).subscribe(result -> {
+            if (radioVideoAudioGroup.getCheckedRadioButtonId() == R.id.audio_button) {
+                setupAudioSpinner();
+            }
+        }));
+        disposables.add(StreamSizeWrapper.fetchSizeForWrapper(wrappedSubtitleStreams).subscribe(result -> {
+            if (radioVideoAudioGroup.getCheckedRadioButtonId() == R.id.subtitle_button) {
+                setupSubtitleSpinner();
+            }
+        }));
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        disposables.clear();
     }
 
     @Override
     public void onSaveInstanceState(Bundle outState) {
         super.onSaveInstanceState(outState);
-        outState.putSerializable(INFO_KEY, currentInfo);
-        outState.putSerializable(SORTED_VIDEOS_LIST_KEY, sortedStreamVideosList);
-        outState.putInt(SELECTED_VIDEO_KEY, selectedVideoIndex);
-        outState.putInt(SELECTED_AUDIO_KEY, selectedAudioIndex);
+        Icepick.saveInstanceState(this, outState);
     }
 
     /*//////////////////////////////////////////////////////////////////////////
@@ -161,39 +277,39 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
         toolbar.setTitle(R.string.download_dialog_title);
         toolbar.setNavigationIcon(ThemeHelper.isLightThemeSelected(getActivity()) ? R.drawable.ic_arrow_back_black_24dp : R.drawable.ic_arrow_back_white_24dp);
         toolbar.inflateMenu(R.menu.dialog_url);
-        toolbar.setNavigationOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                getDialog().dismiss();
-            }
-        });
+        toolbar.setNavigationOnClickListener(v -> getDialog().dismiss());
 
-        toolbar.setOnMenuItemClickListener(new Toolbar.OnMenuItemClickListener() {
-            @Override
-            public boolean onMenuItemClick(MenuItem item) {
-                if (item.getItemId() == R.id.okay) {
-                    downloadSelected();
-                    return true;
-                } else return false;
+        toolbar.setOnMenuItemClickListener(item -> {
+            if (item.getItemId() == R.id.okay) {
+                prepareSelectedDownload();
+                return true;
             }
+            return false;
         });
     }
 
-    public void setupAudioSpinner(final List<AudioStream> audioStreams, Spinner spinner) {
-        String[] items = new String[audioStreams.size()];
-        for (int i = 0; i < audioStreams.size(); i++) {
-            AudioStream audioStream = audioStreams.get(i);
-            items[i] = audioStream.getFormat().getName() + " " + audioStream.getAverageBitrate() + "kbps";
-        }
+    private void setupAudioSpinner() {
+        if (getContext() == null) return;
 
-        ArrayAdapter<String> itemAdapter = new ArrayAdapter<>(getContext(), android.R.layout.simple_spinner_dropdown_item, items);
-        spinner.setAdapter(itemAdapter);
-        spinner.setSelection(selectedAudioIndex);
+        streamsSpinner.setAdapter(audioStreamsAdapter);
+        streamsSpinner.setSelection(selectedAudioIndex);
+        setRadioButtonsState(true);
     }
 
-    public void setupVideoSpinner(final List<VideoStream> videoStreams, Spinner spinner) {
-        spinner.setAdapter(new SpinnerToolbarAdapter(getContext(), videoStreams, true));
-        spinner.setSelection(selectedVideoIndex);
+    private void setupVideoSpinner() {
+        if (getContext() == null) return;
+
+        streamsSpinner.setAdapter(videoStreamsAdapter);
+        streamsSpinner.setSelection(selectedVideoIndex);
+        setRadioButtonsState(true);
+    }
+
+    private void setupSubtitleSpinner() {
+        if (getContext() == null) return;
+
+        streamsSpinner.setAdapter(subtitleStreamsAdapter);
+        streamsSpinner.setSelection(selectedSubtitleIndex);
+        setRadioButtonsState(true);
     }
 
     /*//////////////////////////////////////////////////////////////////////////
@@ -202,15 +318,24 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
 
     @Override
     public void onCheckedChanged(RadioGroup group, @IdRes int checkedId) {
-        if (DEBUG) Log.d(TAG, "onCheckedChanged() called with: group = [" + group + "], checkedId = [" + checkedId + "]");
+        if (DEBUG)
+            Log.d(TAG, "onCheckedChanged() called with: group = [" + group + "], checkedId = [" + checkedId + "]");
+        boolean flag = true;
+
         switch (checkedId) {
             case R.id.audio_button:
-                setupAudioSpinner(currentInfo.audio_streams, streamsSpinner);
+                setupAudioSpinner();
                 break;
             case R.id.video_button:
-                setupVideoSpinner(sortedStreamVideosList, streamsSpinner);
+                setupVideoSpinner();
+                break;
+            case R.id.subtitle_button:
+                setupSubtitleSpinner();
+                flag = false;
                 break;
         }
+
+        threadsSeekBar.setEnabled(flag);
     }
 
     /*//////////////////////////////////////////////////////////////////////////
@@ -219,7 +344,8 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
 
     @Override
     public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
-        if (DEBUG) Log.d(TAG, "onItemSelected() called with: parent = [" + parent + "], view = [" + view + "], position = [" + position + "], id = [" + id + "]");
+        if (DEBUG)
+            Log.d(TAG, "onItemSelected() called with: parent = [" + parent + "], view = [" + view + "], position = [" + position + "], id = [" + id + "]");
         switch (radioVideoAudioGroup.getCheckedRadioButtonId()) {
             case R.id.audio_button:
                 selectedAudioIndex = position;
@@ -227,6 +353,9 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
             case R.id.video_button:
                 selectedVideoIndex = position;
                 break;
+            case R.id.subtitle_button:
+                selectedSubtitleIndex = position;
+                break;
         }
     }
 
@@ -238,38 +367,175 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
     // Utils
     //////////////////////////////////////////////////////////////////////////*/
 
-    protected void checkDownloadOptions(View view) {
-        RadioButton audioButton = view.findViewById(R.id.audio_button);
-        RadioButton videoButton = view.findViewById(R.id.video_button);
+    protected void setupDownloadOptions() {
+        setRadioButtonsState(false);
 
-        if (currentInfo.getAudioStreams() == null || currentInfo.getAudioStreams().size() == 0) {
-            audioButton.setVisibility(View.GONE);
+        final RadioButton audioButton = radioVideoAudioGroup.findViewById(R.id.audio_button);
+        final RadioButton videoButton = radioVideoAudioGroup.findViewById(R.id.video_button);
+        final RadioButton subtitleButton = radioVideoAudioGroup.findViewById(R.id.subtitle_button);
+        final boolean isVideoStreamsAvailable = videoStreamsAdapter.getCount() > 0;
+        final boolean isAudioStreamsAvailable = audioStreamsAdapter.getCount() > 0;
+        final boolean isSubtitleStreamsAvailable = subtitleStreamsAdapter.getCount() > 0;
+
+        audioButton.setVisibility(isAudioStreamsAvailable ? View.VISIBLE : View.GONE);
+        videoButton.setVisibility(isVideoStreamsAvailable ? View.VISIBLE : View.GONE);
+        subtitleButton.setVisibility(isSubtitleStreamsAvailable ? View.VISIBLE : View.GONE);
+
+        if (isVideoStreamsAvailable) {
             videoButton.setChecked(true);
-        } else if (sortedStreamVideosList == null || sortedStreamVideosList.size() == 0) {
-            videoButton.setVisibility(View.GONE);
+            setupVideoSpinner();
+        } else if (isAudioStreamsAvailable) {
             audioButton.setChecked(true);
+            setupAudioSpinner();
+        } else if (isSubtitleStreamsAvailable) {
+            subtitleButton.setChecked(true);
+            setupSubtitleSpinner();
+        } else {
+            Toast.makeText(getContext(), R.string.no_streams_available_download, Toast.LENGTH_SHORT).show();
+            getDialog().dismiss();
         }
     }
 
+    private void setRadioButtonsState(boolean enabled) {
+        radioVideoAudioGroup.findViewById(R.id.audio_button).setEnabled(enabled);
+        radioVideoAudioGroup.findViewById(R.id.video_button).setEnabled(enabled);
+        radioVideoAudioGroup.findViewById(R.id.subtitle_button).setEnabled(enabled);
+    }
 
-    private void downloadSelected() {
-        String url, location;
+    private int getSubtitleIndexBy(List<SubtitlesStream> streams) {
+        Localization loc = NewPipe.getPreferredLocalization();
 
-        String fileName = nameEditText.getText().toString().trim();
-        if (fileName.isEmpty()) fileName = FilenameUtils.createFilename(getContext(), currentInfo.getName());
-
-        boolean isAudio = radioVideoAudioGroup.getCheckedRadioButtonId() == R.id.audio_button;
-        if (isAudio) {
-            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();
+        for (int i = 0; i < streams.size(); i++) {
+            Locale streamLocale = streams.get(i).getLocale();
+            String tag = streamLocale.getLanguage().concat("-").concat(streamLocale.getCountry());
+            if (tag.equalsIgnoreCase(loc.getLanguage())) {
+                return i;
+            }
         }
 
-        DownloadManagerService.startMission(getContext(), url, location, fileName, isAudio, threadsSeekBar.getProgress() + 1);
+        // fallback
+        // 1st loop match country & language
+        // 2nd loop match language only
+        int index = loc.getLanguage().indexOf("-");
+        String lang = index > 0 ? loc.getLanguage().substring(0, index) : loc.getLanguage();
+
+        for (int j = 0; j < 2; j++) {
+            for (int i = 0; i < streams.size(); i++) {
+                Locale streamLocale = streams.get(i).getLocale();
+
+                if (streamLocale.getLanguage().equalsIgnoreCase(lang)) {
+                    if (j > 0 || streamLocale.getCountry().equalsIgnoreCase(loc.getCountry())) {
+                        return i;
+                    }
+                }
+            }
+        }
+
+        return 0;
+    }
+
+    private void prepareSelectedDownload() {
+        final Context context = getContext();
+        Stream stream;
+        String location;
+        char kind;
+
+        String fileName = nameEditText.getText().toString().trim();
+        if (fileName.isEmpty())
+            fileName = FilenameUtils.createFilename(context, currentInfo.getName());
+
+        switch (radioVideoAudioGroup.getCheckedRadioButtonId()) {
+            case R.id.audio_button:
+                stream = audioStreamsAdapter.getItem(selectedAudioIndex);
+                location = NewPipeSettings.getAudioDownloadPath(context);
+                kind = 'a';
+                break;
+            case R.id.video_button:
+                stream = videoStreamsAdapter.getItem(selectedVideoIndex);
+                location = NewPipeSettings.getVideoDownloadPath(context);
+                kind = 'v';
+                break;
+            case R.id.subtitle_button:
+                stream = subtitleStreamsAdapter.getItem(selectedSubtitleIndex);
+                location = NewPipeSettings.getVideoDownloadPath(context);// assume that subtitle & video files go together
+                kind = 's';
+                break;
+            default:
+                return;
+        }
+
+        int threads;
+
+        if (radioVideoAudioGroup.getCheckedRadioButtonId() == R.id.subtitle_button) {
+            threads = 1;// use unique thread for subtitles due small file size
+            fileName += ".srt";// final subtitle format
+        } else {
+            threads = threadsSeekBar.getProgress() + 1;
+            fileName += "." + stream.getFormat().getSuffix();
+        }
+
+        final String finalFileName = fileName;
+
+        DownloadManagerService.checkForRunningMission(context, location, fileName, (listed, finished) -> {
+            if (listed) {
+                AlertDialog.Builder builder = new AlertDialog.Builder(context);
+                builder.setTitle(R.string.download_dialog_title)
+                        .setMessage(finished ? R.string.overwrite_warning : R.string.download_already_running)
+                        .setPositiveButton(
+                                finished ? R.string.overwrite : R.string.generate_unique_name,
+                                (dialog, which) -> downloadSelected(context, stream, location, finalFileName, kind, threads)
+                        )
+                        .setNegativeButton(android.R.string.cancel, (dialog, which) -> {
+                            dialog.cancel();
+                        })
+                        .create()
+                        .show();
+            } else {
+                downloadSelected(context, stream, location, finalFileName, kind, threads);
+            }
+        });
+    }
+
+    private void downloadSelected(Context context, Stream selectedStream, String location, String fileName, char kind, int threads) {
+        String[] urls;
+        String psName = null;
+        String[] psArgs = null;
+        String secondaryStreamUrl = null;
+        long nearLength = 0;
+
+        if (selectedStream instanceof VideoStream) {
+            SecondaryStreamHelper<AudioStream> secondaryStream = videoStreamsAdapter
+                    .getAllSecondary()
+                    .get(wrappedVideoStreams.getStreamsList().indexOf(selectedStream));
+
+            if (secondaryStream != null) {
+                secondaryStreamUrl = secondaryStream.getStream().getUrl();
+                psName = selectedStream.getFormat() == MediaFormat.MPEG_4 ? Postprocessing.ALGORITHM_MP4_MUXER : Postprocessing.ALGORITHM_WEBM_MUXER;
+                psArgs = null;
+                long videoSize = wrappedVideoStreams.getSizeInBytes((VideoStream) selectedStream);
+
+                // set nearLength, only, if both sizes are fetched or known. this probably does not work on slow networks
+                if (secondaryStream.getSizeInBytes() > 0 && videoSize > 0) {
+                    nearLength = secondaryStream.getSizeInBytes() + videoSize;
+                }
+            }
+        } else if ((selectedStream instanceof SubtitlesStream) && selectedStream.getFormat() == MediaFormat.TTML) {
+            psName = Postprocessing.ALGORITHM_TTML_CONVERTER;
+            psArgs = new String[]{
+                    selectedStream.getFormat().getSuffix(),
+                    "false",// ignore empty frames
+                    "false",// detect youtube duplicate lines
+            };
+        }
+
+        if (secondaryStreamUrl == null) {
+            urls = new String[]{selectedStream.getUrl()};
+        } else {
+            urls = new String[]{selectedStream.getUrl(), secondaryStreamUrl};
+        }
+
+        DownloadManagerService.startMission(context, urls, location, fileName, kind, threads, currentInfo.getUrl(), psName, psArgs, nearLength);
+
         getDialog().dismiss();
     }
 }

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

@@ -32,7 +32,6 @@ import java.util.concurrent.atomic.AtomicBoolean;
 
 import icepick.State;
 import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.functions.Consumer;
 
 import static org.schabi.newpipe.util.AnimationUtils.animateView;
 
@@ -51,9 +50,6 @@ public abstract class BaseStateFragment<I> extends BaseFragment implements ViewC
     protected Button errorButtonRetry;
     protected TextView errorTextView;
 
-    @State
-    protected boolean useAsFrontPage = false;
-
     @Override
     public void onViewCreated(View rootView, Bundle savedInstanceState) {
         super.onViewCreated(rootView, savedInstanceState);
@@ -66,9 +62,6 @@ public abstract class BaseStateFragment<I> extends BaseFragment implements ViewC
         wasLoading.set(isLoading.get());
     }
 
-    public void useAsFrontPage(boolean value) {
-        useAsFrontPage = value;
-    }
 
     /*//////////////////////////////////////////////////////////////////////////
     // Init
@@ -93,12 +86,7 @@ public abstract class BaseStateFragment<I> extends BaseFragment implements ViewC
         RxView.clicks(errorButtonRetry)
                 .debounce(300, TimeUnit.MILLISECONDS)
                 .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new Consumer<Object>() {
-                    @Override
-                    public void accept(Object o) throws Exception {
-                        onRetryButtonClicked();
-                    }
-                });
+                .subscribe(o -> onRetryButtonClicked());
     }
 
     protected void onRetryButtonClicked() {
@@ -239,20 +227,14 @@ public abstract class BaseStateFragment<I> extends BaseFragment implements ViewC
         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));
+        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)));

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

@@ -2,7 +2,6 @@ package org.schabi.newpipe.fragments;
 
 import android.os.Bundle;
 import android.support.annotation.Nullable;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -14,24 +13,16 @@ public class BlankFragment extends BaseFragment {
     @Nullable
     @Override
     public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, Bundle savedInstanceState) {
-        if(activity != null && activity.getSupportActionBar() != null) {
-            activity.getSupportActionBar()
-                    .setTitle("NewPipe");
-        }
+        setTitle("NewPipe");
         return inflater.inflate(R.layout.fragment_blank, container, false);
     }
 
     @Override
     public void setUserVisibleHint(boolean isVisibleToUser) {
         super.setUserVisibleHint(isVisibleToUser);
-        if(isVisibleToUser) {
-            if(activity != null && activity.getSupportActionBar() != null) {
-                activity.getSupportActionBar()
-                        .setTitle("NewPipe");
-            }
-            // leave this inline. Will make it harder for copy cats.
-            // If you are a Copy cat FUCK YOU.
-            // I WILL FIND YOU, AND I WILL ...
-        }
+        setTitle("NewPipe");
+        // leave this inline. Will make it harder for copy cats.
+        // If you are a Copy cat FUCK YOU.
+        // I WILL FIND YOU, AND I WILL ...
     }
 }

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

@@ -1,6 +1,5 @@
 package org.schabi.newpipe.fragments;
 
-import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
@@ -10,47 +9,37 @@ import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentPagerAdapter;
 import android.support.v4.view.ViewPager;
 import android.support.v7.app.ActionBar;
-import android.support.v7.preference.PreferenceManager;
+import android.support.v7.app.AppCompatActivity;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
-import android.view.SubMenu;
 import android.view.View;
 import android.view.ViewGroup;
 
 import org.schabi.newpipe.BaseFragment;
 import org.schabi.newpipe.R;
-import org.schabi.newpipe.extractor.NewPipe;
-import org.schabi.newpipe.extractor.ServiceList;
-import org.schabi.newpipe.extractor.StreamingService;
-import org.schabi.newpipe.extractor.kiosk.KioskList;
-import org.schabi.newpipe.fragments.list.channel.ChannelFragment;
-import org.schabi.newpipe.fragments.list.feed.FeedFragment;
-import org.schabi.newpipe.fragments.list.kiosk.KioskFragment;
-import org.schabi.newpipe.fragments.subscription.SubscriptionFragment;
+import org.schabi.newpipe.extractor.exceptions.ExtractionException;
 import org.schabi.newpipe.report.ErrorActivity;
 import org.schabi.newpipe.report.UserAction;
-import org.schabi.newpipe.util.KioskTranslator;
+import org.schabi.newpipe.settings.tabs.Tab;
+import org.schabi.newpipe.settings.tabs.TabsManager;
 import org.schabi.newpipe.util.NavigationHelper;
 import org.schabi.newpipe.util.ServiceHelper;
-import org.schabi.newpipe.util.ThemeHelper;
+
+import java.util.ArrayList;
+import java.util.List;
 
 public class MainFragment extends BaseFragment implements TabLayout.OnTabSelectedListener {
-
-    public int currentServiceId = -1;
     private ViewPager viewPager;
+    private SelectedTabsPagerAdapter pagerAdapter;
+    private TabLayout tabLayout;
 
-    /*//////////////////////////////////////////////////////////////////////////
-    // Constants
-    //////////////////////////////////////////////////////////////////////////*/
+    private List<Tab> tabsList = new ArrayList<>();
+    private TabsManager tabsManager;
 
-    private static final int FALLBACK_SERVICE_ID = ServiceList.YouTube.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;
+    private boolean hasTabsChanged = false;
 
     /*//////////////////////////////////////////////////////////////////////////
     // Fragment's LifeCycle
@@ -60,11 +49,22 @@ public class MainFragment extends BaseFragment implements TabLayout.OnTabSelecte
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setHasOptionsMenu(true);
+
+        tabsManager = TabsManager.getManager(activity);
+        tabsManager.setSavedTabsListener(() -> {
+            if (DEBUG) {
+                Log.d(TAG, "TabsManager.SavedTabsChangeListener: onTabsChanged called, isResumed = " + isResumed());
+            }
+            if (isResumed()) {
+                updateTabs();
+            } else {
+                hasTabsChanged = true;
+            }
+        });
     }
 
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        currentServiceId = ServiceHelper.getSelectedServiceId(activity);
         return inflater.inflate(R.layout.fragment_main, container, false);
     }
 
@@ -72,27 +72,34 @@ public class MainFragment extends BaseFragment implements TabLayout.OnTabSelecte
     protected void initViews(View rootView, Bundle savedInstanceState) {
         super.initViews(rootView, savedInstanceState);
 
-        TabLayout tabLayout = rootView.findViewById(R.id.main_tab_layout);
+        tabLayout = rootView.findViewById(R.id.main_tab_layout);
         viewPager = rootView.findViewById(R.id.pager);
 
         /*  Nested fragment, use child fragment here to maintain backstack in view pager. */
-        PagerAdapter adapter = new PagerAdapter(getChildFragmentManager());
-        viewPager.setAdapter(adapter);
-        viewPager.setOffscreenPageLimit(adapter.getCount());
+        pagerAdapter = new SelectedTabsPagerAdapter(getChildFragmentManager());
+        viewPager.setAdapter(pagerAdapter);
 
         tabLayout.setupWithViewPager(viewPager);
+        tabLayout.addOnTabSelectedListener(this);
+        updateTabs();
+    }
 
-        int channelIcon = ThemeHelper.resolveResourceIdFromAttr(activity, R.attr.ic_channel);
-        int whatsHotIcon = ThemeHelper.resolveResourceIdFromAttr(activity, R.attr.ic_hot);
+    @Override
+    public void onResume() {
+        super.onResume();
 
-        if (isSubscriptionsPageOnlySelected()) {
-            tabLayout.getTabAt(0).setIcon(channelIcon);
-        } else {
-            tabLayout.getTabAt(0).setIcon(whatsHotIcon);
-            tabLayout.getTabAt(1).setIcon(channelIcon);
+        if (hasTabsChanged) {
+            hasTabsChanged = false;
+            updateTabs();
         }
     }
 
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        tabsManager.unsetSavedTabsListener();
+    }
+
     /*//////////////////////////////////////////////////////////////////////////
     // Menu
     //////////////////////////////////////////////////////////////////////////*/
@@ -102,16 +109,6 @@ public class MainFragment extends BaseFragment implements TabLayout.OnTabSelecte
         super.onCreateOptionsMenu(menu, inflater);
         if (DEBUG) Log.d(TAG, "onCreateOptionsMenu() called with: menu = [" + menu + "], inflater = [" + inflater + "]");
         inflater.inflate(R.menu.main_fragment_menu, menu);
-        SubMenu kioskMenu = menu.addSubMenu(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) {
@@ -123,7 +120,14 @@ public class MainFragment extends BaseFragment implements TabLayout.OnTabSelecte
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
             case R.id.action_search:
-                NavigationHelper.openSearchFragment(getFragmentManager(), ServiceHelper.getSelectedServiceId(activity), "");
+                try {
+                    NavigationHelper.openSearchFragment(
+                            getFragmentManager(),
+                            ServiceHelper.getSelectedServiceId(activity),
+                            "");
+                } catch (Exception e) {
+                    ErrorActivity.reportUiError((AppCompatActivity) getActivity(), e);
+                }
                 return true;
         }
         return super.onOptionsItemSelected(item);
@@ -133,9 +137,33 @@ public class MainFragment extends BaseFragment implements TabLayout.OnTabSelecte
     // Tabs
     //////////////////////////////////////////////////////////////////////////*/
 
+    public void updateTabs() {
+        tabsList.clear();
+        tabsList.addAll(tabsManager.getTabs());
+        pagerAdapter.notifyDataSetChanged();
+
+        viewPager.setOffscreenPageLimit(pagerAdapter.getCount());
+        updateTabsIcon();
+        updateCurrentTitle();
+    }
+
+    private void updateTabsIcon() {
+        for (int i = 0; i < tabsList.size(); i++) {
+            final TabLayout.Tab tabToSet = tabLayout.getTabAt(i);
+            if (tabToSet != null) {
+                tabToSet.setIcon(tabsList.get(i).getTabIconRes(activity));
+            }
+        }
+    }
+
+    private void updateCurrentTitle() {
+        setTitle(tabsList.get(viewPager.getCurrentItem()).getTabName(requireContext()));
+    }
+
     @Override
-    public void onTabSelected(TabLayout.Tab tab) {
-        viewPager.setCurrentItem(tab.getPosition());
+    public void onTabSelected(TabLayout.Tab selectedTab) {
+        if (DEBUG) Log.d(TAG, "onTabSelected() called with: selectedTab = [" + selectedTab + "]");
+        updateCurrentTitle();
     }
 
     @Override
@@ -144,120 +172,58 @@ public class MainFragment extends BaseFragment implements TabLayout.OnTabSelecte
 
     @Override
     public void onTabReselected(TabLayout.Tab tab) {
+        if (DEBUG) Log.d(TAG, "onTabReselected() called with: tab = [" + tab + "]");
+        updateCurrentTitle();
     }
 
-    private class PagerAdapter extends FragmentPagerAdapter {
-
-        PagerAdapter(FragmentManager fm) {
-            super(fm);
+    private class SelectedTabsPagerAdapter extends FragmentPagerAdapter {
+        private SelectedTabsPagerAdapter(FragmentManager fragmentManager) {
+            super(fragmentManager);
         }
 
         @Override
         public Fragment getItem(int position) {
-            switch (position) {
-                case 0:
-                    return isSubscriptionsPageOnlySelected() ? new SubscriptionFragment() : getMainPageFragment();
-                case 1:
-                    return new SubscriptionFragment();
-                default:
-                    return new BlankFragment();
+            final Tab tab = tabsList.get(position);
+
+            Throwable throwable = null;
+            Fragment fragment = null;
+            try {
+                fragment = tab.getFragment();
+            } catch (ExtractionException e) {
+                throwable = e;
             }
+
+            if (throwable != null) {
+                ErrorActivity.reportError(activity, throwable, activity.getClass(), null,
+                        ErrorActivity.ErrorInfo.make(UserAction.UI_ERROR, "none", "", R.string.app_ui_crash));
+                return new BlankFragment();
+            }
+
+            if (fragment instanceof BaseFragment) {
+                ((BaseFragment) fragment).useAsFrontPage(true);
+            }
+
+            return fragment;
         }
 
         @Override
-        public CharSequence getPageTitle(int position) {
-            //return getString(this.tabTitles[position]);
-            return "";
+        public int getItemPosition(Object object) {
+            // Causes adapter to reload all Fragments when
+            // notifyDataSetChanged is called
+            return POSITION_NONE;
         }
 
         @Override
         public int getCount() {
-            return isSubscriptionsPageOnlySelected() ? 1 : 2;
+            return tabsList.size();
         }
-    }
 
-    /*//////////////////////////////////////////////////////////////////////////
-    // Main page content
-    //////////////////////////////////////////////////////////////////////////*/
-
-    private boolean isSubscriptionsPageOnlySelected() {
-        return PreferenceManager.getDefaultSharedPreferences(activity)
-                .getString(getString(R.string.main_page_content_key), getString(R.string.blank_page_key))
-                .equals(getString(R.string.subscription_page_key));
-    }
-
-    private Fragment getMainPageFragment() {
-        try {
-            SharedPreferences preferences =
-                    PreferenceManager.getDefaultSharedPreferences(getActivity());
-            final String setMainPage = preferences.getString(getString(R.string.main_page_content_key),
-                    getString(R.string.main_page_selectd_kiosk_id));
-            if (setMainPage.equals(getString(R.string.blank_page_key))) {
-                return new BlankFragment();
-            } else if (setMainPage.equals(getString(R.string.kiosk_page_key))) {
-                int serviceId = preferences.getInt(getString(R.string.main_page_selected_service),
-                        FALLBACK_SERVICE_ID);
-                String kioskId = preferences.getString(getString(R.string.main_page_selectd_kiosk_id),
-                        FALLBACK_KIOSK_ID);
-                KioskFragment fragment = KioskFragment.getInstance(serviceId, kioskId);
-                fragment.useAsFrontPage(true);
-                return fragment;
-            } else if (setMainPage.equals(getString(R.string.feed_page_key))) {
-                FeedFragment fragment = new FeedFragment();
-                fragment.useAsFrontPage(true);
-                return fragment;
-            } else if (setMainPage.equals(getString(R.string.channel_page_key))) {
-                int serviceId = preferences.getInt(getString(R.string.main_page_selected_service),
-                        FALLBACK_SERVICE_ID);
-                String url = preferences.getString(getString(R.string.main_page_selected_channel_url),
-                        FALLBACK_CHANNEL_URL);
-                String name = preferences.getString(getString(R.string.main_page_selected_channel_name),
-                        FALLBACK_CHANNEL_NAME);
-                ChannelFragment fragment = ChannelFragment.getInstance(serviceId, url, name);
-                fragment.useAsFrontPage(true);
-                return fragment;
-            } else {
-                return new BlankFragment();
-            }
-
-        } catch (Exception e) {
-            ErrorActivity.reportError(activity, e,
-                    activity.getClass(),
-                    null,
-                    ErrorActivity.ErrorInfo.make(UserAction.UI_ERROR,
-                            "none", "", R.string.app_ui_crash));
-            return new BlankFragment();
-        }
-    }
-
-    /*//////////////////////////////////////////////////////////////////////////
-    // Select Kiosk
-    //////////////////////////////////////////////////////////////////////////*/
-
-    private void createKioskMenu(Menu menu, MenuInflater menuInflater)
-            throws Exception {
-        StreamingService service = NewPipe.getService(currentServiceId);
-        KioskList kl = service.getKioskList();
-        int i = 0;
-        for (final String ks : kl.getAvailableKiosks()) {
-            menu.add(0, KIOSK_MENU_OFFSET + i, Menu.NONE,
-                    KioskTranslator.getTranslatedKioskName(ks, getContext()))
-                    .setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
-                        @Override
-                        public boolean onMenuItemClick(MenuItem menuItem) {
-                            try {
-                                NavigationHelper.openKioskFragment(getFragmentManager(), currentServiceId, ks);
-                            } catch (Exception e) {
-                                ErrorActivity.reportError(activity, e,
-                                        activity.getClass(),
-                                        null,
-                                        ErrorActivity.ErrorInfo.make(UserAction.UI_ERROR,
-                                                "none", "", R.string.app_ui_crash));
-                            }
-                            return true;
-                        }
-                    });
-            i++;
+        @Override
+        public void destroyItem(ViewGroup container, int position, Object object) {
+            getChildFragmentManager()
+                    .beginTransaction()
+                    .remove((Fragment) object)
+                    .commitNowAllowingStateLoss();
         }
     }
 }

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

@@ -1,163 +0,0 @@
-package org.schabi.newpipe.fragments.detail;
-
-import android.content.SharedPreferences;
-import android.preference.PreferenceManager;
-import android.support.v7.app.AppCompatActivity;
-import android.util.Log;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-import android.view.View;
-import android.widget.AdapterView;
-import android.widget.Spinner;
-
-import org.schabi.newpipe.R;
-import org.schabi.newpipe.extractor.stream.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>
- * DetailsMenuHandler.java is part of NewPipe.
- * <p>
- * NewPipe is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * <p>
- * NewPipe is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * <p>
- * You should have received a copy of the GNU General Public License
- * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-@SuppressWarnings("WeakerAccess")
-class ActionBarHandler {
-    private static final String TAG = "ActionBarHandler";
-
-    private AppCompatActivity activity;
-    private int selectedVideoStream = -1;
-
-    private SharedPreferences defaultPreferences;
-
-    private Menu menu;
-
-    // Only callbacks are listed here, there are more actions which don't need a callback.
-    // those are edited directly. Typically VideoDetailFragment will implement those callbacks.
-    private OnActionListener onShareListener;
-    private OnActionListener onOpenInBrowserListener;
-    private OnActionListener onDownloadListener;
-    private OnActionListener onPlayWithKodiListener;
-
-    // Triggered when a stream related action is triggered.
-    public interface OnActionListener {
-        void onActionSelected(int selectedStreamId);
-    }
-
-    public ActionBarHandler(AppCompatActivity activity) {
-        this.activity = activity;
-    }
-
-    public void setupStreamList(final List<VideoStream> videoStreams, Spinner toolbarSpinner) {
-        if (activity == null) return;
-
-        selectedVideoStream = 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));
-        toolbarSpinner.setSelection(selectedVideoStream);
-        toolbarSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
-            @Override
-            public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
-                selectedVideoStream = position;
-            }
-
-            @Override
-            public void onNothingSelected(AdapterView<?> parent) {
-            }
-        });
-
-    }
-
-    public void setupMenu(Menu menu, MenuInflater inflater) {
-        this.menu = menu;
-
-        // CAUTION set item properties programmatically otherwise it would not be accepted by
-        // appcompat itemsinflater.inflate(R.menu.videoitem_detail, menu);
-
-        defaultPreferences = PreferenceManager.getDefaultSharedPreferences(activity);
-        inflater.inflate(R.menu.video_detail_menu, menu);
-
-        updateItemsVisibility();
-    }
-
-    public void updateItemsVisibility(){
-        showPlayWithKodiAction(defaultPreferences.getBoolean(activity.getString(R.string.show_play_with_kodi_key), false));
-    }
-
-    public boolean onItemSelected(MenuItem item) {
-        int id = item.getItemId();
-        switch (id) {
-            case R.id.menu_item_share: {
-                if (onShareListener != null) {
-                    onShareListener.onActionSelected(selectedVideoStream);
-                }
-                return true;
-            }
-            case R.id.menu_item_openInBrowser: {
-                if (onOpenInBrowserListener != null) {
-                    onOpenInBrowserListener.onActionSelected(selectedVideoStream);
-                }
-                return true;
-            }
-            case R.id.menu_item_download:
-                if (onDownloadListener != null) {
-                    onDownloadListener.onActionSelected(selectedVideoStream);
-                }
-                return true;
-            case R.id.action_play_with_kodi:
-                if (onPlayWithKodiListener != null) {
-                    onPlayWithKodiListener.onActionSelected(selectedVideoStream);
-                }
-                return true;
-            default:
-                Log.e(TAG, "Menu Item not known");
-        }
-        return false;
-    }
-
-    public int getSelectedVideoStream() {
-        return selectedVideoStream;
-    }
-
-    public void setOnShareListener(OnActionListener listener) {
-        onShareListener = listener;
-    }
-
-    public void setOnOpenInBrowserListener(OnActionListener listener) {
-        onOpenInBrowserListener = listener;
-    }
-
-    public void setOnDownloadListener(OnActionListener listener) {
-        onDownloadListener = listener;
-    }
-
-    public void setOnPlayWithKodiListener(OnActionListener listener) {
-        onPlayWithKodiListener = listener;
-    }
-
-    public void showDownloadAction(boolean visible) {
-        menu.findItem(R.id.menu_item_download).setVisible(visible);
-    }
-
-    public void showPlayWithKodiAction(boolean visible) {
-        menu.findItem(R.id.action_play_with_kodi).setVisible(visible);
-    }
-}

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

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

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

@@ -3,9 +3,9 @@ package org.schabi.newpipe.fragments.detail;
 import java.io.Serializable;
 
 class StackItem implements Serializable {
-    private int serviceId;
+    private final int serviceId;
     private String title;
-    private String url;
+    private final String url;
 
     StackItem(int serviceId, String url, String title) {
         this.serviceId = serviceId;

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

@@ -3,19 +3,21 @@ package org.schabi.newpipe.fragments.list;
 import android.app.Activity;
 import android.content.Context;
 import android.content.DialogInterface;
-import android.os.Build;
+import android.content.SharedPreferences;
+import android.content.res.Configuration;
+import android.content.res.Resources;
 import android.os.Bundle;
+import android.preference.PreferenceManager;
 import android.support.annotation.NonNull;
 import android.support.v7.app.ActionBar;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.GridLayoutManager;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.util.Log;
-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;
@@ -24,20 +26,22 @@ 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.local.dialog.PlaylistAppendDialog;
+import org.schabi.newpipe.player.playqueue.SinglePlayQueue;
+import org.schabi.newpipe.report.ErrorActivity;
 import org.schabi.newpipe.util.NavigationHelper;
-import org.schabi.newpipe.util.PermissionHelper;
+import org.schabi.newpipe.util.OnClickGesture;
 import org.schabi.newpipe.util.StateSaver;
 
+import java.util.Collections;
 import java.util.List;
 import java.util.Queue;
 
 import static org.schabi.newpipe.util.AnimationUtils.animateView;
 
-public abstract class BaseListFragment<I, N> extends BaseStateFragment<I> implements ListViewContract<I, N>, StateSaver.WriteRead {
+public abstract class BaseListFragment<I, N> extends BaseStateFragment<I> implements ListViewContract<I, N>, StateSaver.WriteRead, SharedPreferences.OnSharedPreferenceChangeListener {
 
     /*//////////////////////////////////////////////////////////////////////////
     // Views
@@ -45,6 +49,9 @@ public abstract class BaseListFragment<I, N> extends BaseStateFragment<I> implem
 
     protected InfoListAdapter infoListAdapter;
     protected RecyclerView itemsList;
+    private int updateFlags = 0;
+
+    private static final int LIST_MODE_UPDATE_FLAG = 0x32;
 
     /*//////////////////////////////////////////////////////////////////////////
     // LifeCycle
@@ -60,12 +67,31 @@ public abstract class BaseListFragment<I, N> extends BaseStateFragment<I> implem
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setHasOptionsMenu(true);
+        PreferenceManager.getDefaultSharedPreferences(activity)
+                .registerOnSharedPreferenceChangeListener(this);
     }
 
     @Override
     public void onDestroy() {
         super.onDestroy();
         StateSaver.onDestroy(savedState);
+        PreferenceManager.getDefaultSharedPreferences(activity)
+                .unregisterOnSharedPreferenceChangeListener(this);
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+
+        if (updateFlags != 0) {
+            if ((updateFlags & LIST_MODE_UPDATE_FLAG) != 0) {
+                final boolean useGrid = isGridLayout();
+                itemsList.setLayoutManager(useGrid ? getGridLayoutManager() : getListLayoutManager());
+                infoListAdapter.setGridItemVariants(useGrid);
+                infoListAdapter.notifyDataSetChanged();
+            }
+            updateFlags = 0;
+        }
     }
 
     /*//////////////////////////////////////////////////////////////////////////
@@ -120,13 +146,25 @@ public abstract class BaseListFragment<I, N> extends BaseStateFragment<I> implem
         return new LinearLayoutManager(activity);
     }
 
+    protected RecyclerView.LayoutManager getGridLayoutManager() {
+        final Resources resources = activity.getResources();
+        int width = resources.getDimensionPixelSize(R.dimen.video_item_grid_thumbnail_image_width);
+        width += (24 * resources.getDisplayMetrics().density);
+        final int spanCount = (int) Math.floor(resources.getDisplayMetrics().widthPixels / (double)width);
+        final GridLayoutManager lm = new GridLayoutManager(activity, spanCount);
+        lm.setSpanSizeLookup(infoListAdapter.getSpanSizeLookup(spanCount));
+        return lm;
+    }
+
     @Override
     protected void initViews(View rootView, Bundle savedInstanceState) {
         super.initViews(rootView, savedInstanceState);
 
+        final boolean useGrid = isGridLayout();
         itemsList = rootView.findViewById(R.id.items_list);
-        itemsList.setLayoutManager(getListLayoutManager());
+        itemsList.setLayoutManager(useGrid ? getGridLayoutManager() : getListLayoutManager());
 
+        infoListAdapter.setGridItemVariants(useGrid);
         infoListAdapter.setFooter(getListFooter());
         infoListAdapter.setHeader(getListHeader());
 
@@ -140,13 +178,10 @@ public abstract class BaseListFragment<I, N> extends BaseStateFragment<I> implem
     @Override
     protected void initListeners() {
         super.initListeners();
-        infoListAdapter.setOnStreamSelectedListener(new InfoItemBuilder.OnInfoItemSelectedListener<StreamInfoItem>() {
+        infoListAdapter.setOnStreamSelectedListener(new OnClickGesture<StreamInfoItem>() {
             @Override
             public void selected(StreamInfoItem selectedItem) {
-                onItemSelected(selectedItem);
-                NavigationHelper.openVideoDetailFragment(
-                        useAsFrontPage?getParentFragment().getFragmentManager():getFragmentManager(),
-                        selectedItem.getServiceId(), selectedItem.getUrl(), selectedItem.getName());
+                onStreamSelected(selectedItem);
             }
 
             @Override
@@ -155,30 +190,34 @@ public abstract class BaseListFragment<I, N> extends BaseStateFragment<I> implem
             }
         });
 
-        infoListAdapter.setOnChannelSelectedListener(new InfoItemBuilder.OnInfoItemSelectedListener<ChannelInfoItem>() {
+        infoListAdapter.setOnChannelSelectedListener(new OnClickGesture<ChannelInfoItem>() {
             @Override
             public void selected(ChannelInfoItem selectedItem) {
-                onItemSelected(selectedItem);
-                NavigationHelper.openChannelFragment(
-                        useAsFrontPage?getParentFragment().getFragmentManager():getFragmentManager(),
-                        selectedItem.getServiceId(), selectedItem.getUrl(), selectedItem.getName());
+                try {
+                    onItemSelected(selectedItem);
+                    NavigationHelper.openChannelFragment(getFM(),
+                            selectedItem.getServiceId(),
+                            selectedItem.getUrl(),
+                            selectedItem.getName());
+                } catch (Exception e) {
+                    ErrorActivity.reportUiError((AppCompatActivity) getActivity(), e);
+                }
             }
-
-            @Override
-            public void held(ChannelInfoItem selectedItem) {}
         });
 
-        infoListAdapter.setOnPlaylistSelectedListener(new InfoItemBuilder.OnInfoItemSelectedListener<PlaylistInfoItem>() {
+        infoListAdapter.setOnPlaylistSelectedListener(new OnClickGesture<PlaylistInfoItem>() {
             @Override
             public void selected(PlaylistInfoItem selectedItem) {
-                onItemSelected(selectedItem);
-                NavigationHelper.openPlaylistFragment(
-                        useAsFrontPage?getParentFragment().getFragmentManager():getFragmentManager(),
-                        selectedItem.getServiceId(), selectedItem.getUrl(), selectedItem.getName());
+                try {
+                    onItemSelected(selectedItem);
+                    NavigationHelper.openPlaylistFragment(getFM(),
+                            selectedItem.getServiceId(),
+                            selectedItem.getUrl(),
+                            selectedItem.getName());
+                } catch (Exception e) {
+                    ErrorActivity.reportUiError((AppCompatActivity) getActivity(), e);
+                }
             }
-
-            @Override
-            public void held(PlaylistInfoItem selectedItem) {}
         });
 
         itemsList.clearOnScrollListeners();
@@ -190,6 +229,12 @@ public abstract class BaseListFragment<I, N> extends BaseStateFragment<I> implem
         });
     }
 
+    private void onStreamSelected(StreamInfoItem selectedItem) {
+        onItemSelected(selectedItem);
+        NavigationHelper.openVideoDetailFragment(getFM(),
+                selectedItem.getServiceId(), selectedItem.getUrl(), selectedItem.getName());
+    }
+
     protected void onScrollToBottom() {
         if (hasMoreItems() && !isLoading.get()) {
             loadMoreItems();
@@ -203,27 +248,36 @@ public abstract class BaseListFragment<I, N> extends BaseStateFragment<I> implem
 
         final String[] commands = new String[]{
                 context.getResources().getString(R.string.enqueue_on_background),
-                context.getResources().getString(R.string.enqueue_on_popup)
+                context.getResources().getString(R.string.enqueue_on_popup),
+                context.getResources().getString(R.string.append_playlist),
+                context.getResources().getString(R.string.share)
         };
 
-        final DialogInterface.OnClickListener actions = new DialogInterface.OnClickListener() {
-            @Override
-            public void onClick(DialogInterface dialogInterface, int i) {
-                switch (i) {
-                    case 0:
-                        NavigationHelper.enqueueOnBackgroundPlayer(context, new SinglePlayQueue(item));
-                        break;
-                    case 1:
-                        NavigationHelper.enqueueOnPopupPlayer(activity, new SinglePlayQueue(item));
-                        break;
-                    default:
-                        break;
-                }
+        final DialogInterface.OnClickListener actions = (dialogInterface, i) -> {
+            switch (i) {
+                case 0:
+                    NavigationHelper.enqueueOnBackgroundPlayer(context, new SinglePlayQueue(item));
+                    break;
+                case 1:
+                    NavigationHelper.enqueueOnPopupPlayer(activity, new SinglePlayQueue(item));
+                    break;
+                case 2:
+                    if (getFragmentManager() != null) {
+                        PlaylistAppendDialog.fromStreamInfoItems(Collections.singletonList(item))
+                                .show(getFragmentManager(), TAG);
+                    }
+                    break;
+                case 3:
+                    shareUrl(item.getName(), item.getUrl());
+                    break;
+                default:
+                    break;
             }
         };
 
         new InfoItemDialog(getActivity(), item, commands, actions).show();
     }
+
     /*//////////////////////////////////////////////////////////////////////////
     // Menu
     //////////////////////////////////////////////////////////////////////////*/
@@ -235,7 +289,7 @@ public abstract class BaseListFragment<I, N> extends BaseStateFragment<I> implem
         ActionBar supportActionBar = activity.getSupportActionBar();
         if (supportActionBar != null) {
             supportActionBar.setDisplayShowTitleEnabled(true);
-            if(useAsFrontPage) {
+            if (useAsFrontPage) {
                 supportActionBar.setDisplayHomeAsUpEnabled(false);
             } else {
                 supportActionBar.setDisplayHomeAsUpEnabled(true);
@@ -282,9 +336,8 @@ public abstract class BaseListFragment<I, N> extends BaseStateFragment<I> implem
 
     @Override
     public void showListFooter(final boolean show) {
-        itemsList.post(new Runnable() {
-            @Override
-            public void run() {
+        itemsList.post(() -> {
+            if (infoListAdapter != null && itemsList != null) {
                 infoListAdapter.showFooter(show);
             }
         });
@@ -294,4 +347,22 @@ public abstract class BaseListFragment<I, N> extends BaseStateFragment<I> implem
     public void handleNextItems(N result) {
         isLoading.set(false);
     }
+
+    @Override
+    public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
+        if (key.equals(getString(R.string.list_view_mode_key))) {
+            updateFlags |= LIST_MODE_UPDATE_FLAG;
+        }
+    }
+
+    protected boolean isGridLayout() {
+        final String list_mode = PreferenceManager.getDefaultSharedPreferences(activity).getString(getString(R.string.list_view_mode_key), getString(R.string.list_view_mode_value));
+        if ("auto".equals(list_mode)) {
+            final Configuration configuration = getResources().getConfiguration();
+            return configuration.orientation == Configuration.ORIENTATION_LANDSCAPE
+                    && configuration.isLayoutSizeAtLeast(Configuration.SCREENLAYOUT_SIZE_LARGE);
+        } else {
+            return "grid".equals(list_mode);
+        }
+    }
 }

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

@@ -16,10 +16,10 @@ 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> {
+public abstract class BaseListInfoFragment<I extends ListInfo>
+        extends BaseListFragment<I, ListExtractor.InfoItemsPage> {
 
     @State
     protected int serviceId = Constants.NO_SERVICE_ID;
@@ -29,7 +29,7 @@ public abstract class BaseListInfoFragment<I extends ListInfo> extends BaseListF
     protected String url;
 
     protected I currentInfo;
-    protected String currentNextItemsUrl;
+    protected String currentNextPageUrl;
     protected Disposable currentWorker;
 
     @Override
@@ -73,7 +73,7 @@ public abstract class BaseListInfoFragment<I extends ListInfo> extends BaseListF
     public void writeTo(Queue<Object> objectsToSave) {
         super.writeTo(objectsToSave);
         objectsToSave.add(currentInfo);
-        objectsToSave.add(currentNextItemsUrl);
+        objectsToSave.add(currentNextPageUrl);
     }
 
     @Override
@@ -81,7 +81,7 @@ public abstract class BaseListInfoFragment<I extends ListInfo> extends BaseListF
     public void readFrom(@NonNull Queue<Object> savedObjects) throws Exception {
         super.readFrom(savedObjects);
         currentInfo = (I) savedObjects.poll();
-        currentNextItemsUrl = (String) savedObjects.poll();
+        currentNextPageUrl = (String) savedObjects.poll();
     }
 
     /*//////////////////////////////////////////////////////////////////////////
@@ -116,7 +116,7 @@ public abstract class BaseListInfoFragment<I extends ListInfo> extends BaseListF
                 .subscribe((@NonNull I result) -> {
                     isLoading.set(false);
                     currentInfo = result;
-                    currentNextItemsUrl = result.next_streams_url;
+                    currentNextPageUrl = result.getNextPageUrl();
                     handleResult(result);
                 }, (@NonNull Throwable throwable) -> onError(throwable));
     }
@@ -125,7 +125,7 @@ public abstract class BaseListInfoFragment<I extends ListInfo> extends BaseListF
      * 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 abstract Single<ListExtractor.InfoItemsPage> loadMoreItemsLogic();
 
     protected void loadMoreItems() {
         isLoading.set(true);
@@ -134,9 +134,9 @@ public abstract class BaseListInfoFragment<I extends ListInfo> extends BaseListF
         currentWorker = loadMoreItemsLogic()
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
-                .subscribe((@io.reactivex.annotations.NonNull ListExtractor.NextItemsResult nextItemsResult) -> {
+                .subscribe((@io.reactivex.annotations.NonNull ListExtractor.InfoItemsPage InfoItemsPage) -> {
                     isLoading.set(false);
-                    handleNextItems(nextItemsResult);
+                    handleNextItems(InfoItemsPage);
                 }, (@io.reactivex.annotations.NonNull Throwable throwable) -> {
                     isLoading.set(false);
                     onError(throwable);
@@ -144,17 +144,17 @@ public abstract class BaseListInfoFragment<I extends ListInfo> extends BaseListF
     }
 
     @Override
-    public void handleNextItems(ListExtractor.NextItemsResult result) {
+    public void handleNextItems(ListExtractor.InfoItemsPage result) {
         super.handleNextItems(result);
-        currentNextItemsUrl = result.nextItemsUrl;
-        infoListAdapter.addInfoItemList(result.nextItemsList);
+        currentNextPageUrl = result.getNextPageUrl();
+        infoListAdapter.addInfoItemList(result.getItems());
 
         showListFooter(hasMoreItems());
     }
 
     @Override
     protected boolean hasMoreItems() {
-        return !TextUtils.isEmpty(currentNextItemsUrl);
+        return !TextUtils.isEmpty(currentNextPageUrl);
     }
 
     /*//////////////////////////////////////////////////////////////////////////
@@ -165,13 +165,12 @@ public abstract class BaseListInfoFragment<I extends ListInfo> extends BaseListF
     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);
+            if (result.getRelatedItems().size() > 0) {
+                infoListAdapter.addInfoItemList(result.getRelatedItems());
                 showListFooter(hasMoreItems());
             } else {
                 infoListAdapter.clearStreamItemList();

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

@@ -27,23 +27,28 @@ import com.jakewharton.rxbinding2.view.RxView;
 
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.database.subscription.SubscriptionEntity;
+import org.schabi.newpipe.extractor.InfoItem;
 import org.schabi.newpipe.extractor.ListExtractor;
 import org.schabi.newpipe.extractor.NewPipe;
 import org.schabi.newpipe.extractor.channel.ChannelInfo;
 import org.schabi.newpipe.extractor.exceptions.ExtractionException;
 import org.schabi.newpipe.extractor.stream.StreamInfoItem;
 import org.schabi.newpipe.fragments.list.BaseListInfoFragment;
-import org.schabi.newpipe.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.local.dialog.PlaylistAppendDialog;
+import org.schabi.newpipe.local.subscription.SubscriptionService;
+import org.schabi.newpipe.player.playqueue.ChannelPlayQueue;
+import org.schabi.newpipe.player.playqueue.PlayQueue;
+import org.schabi.newpipe.player.playqueue.SinglePlayQueue;
 import org.schabi.newpipe.report.UserAction;
 import org.schabi.newpipe.util.AnimationUtils;
 import org.schabi.newpipe.util.ExtractorHelper;
+import org.schabi.newpipe.util.ImageDisplayConstants;
 import org.schabi.newpipe.util.Localization;
 import org.schabi.newpipe.util.NavigationHelper;
 
+import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
@@ -63,7 +68,7 @@ import static org.schabi.newpipe.util.AnimationUtils.animateView;
 
 public class ChannelFragment extends BaseListInfoFragment<ChannelInfo> {
 
-    private CompositeDisposable disposables = new CompositeDisposable();
+    private final CompositeDisposable disposables = new CompositeDisposable();
     private Disposable subscribeButtonMonitor;
     private SubscriptionService subscriptionService;
 
@@ -108,11 +113,11 @@ public class ChannelFragment extends BaseListInfoFragment<ChannelInfo> {
     @Override
     public void onAttach(Context context) {
         super.onAttach(context);
-        subscriptionService = SubscriptionService.getInstance();
+        subscriptionService = SubscriptionService.getInstance(activity);
     }
 
     @Override
-    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
         return inflater.inflate(R.layout.fragment_channel, container, false);
     }
 
@@ -156,31 +161,39 @@ public class ChannelFragment extends BaseListInfoFragment<ChannelInfo> {
                 context.getResources().getString(R.string.start_here_on_main),
                 context.getResources().getString(R.string.start_here_on_background),
                 context.getResources().getString(R.string.start_here_on_popup),
+                context.getResources().getString(R.string.append_playlist),
+                context.getResources().getString(R.string.share)
         };
 
-        final DialogInterface.OnClickListener actions = new DialogInterface.OnClickListener() {
-            @Override
-            public void onClick(DialogInterface dialogInterface, int i) {
-                final int index = Math.max(infoListAdapter.getItemsList().indexOf(item), 0);
-                switch (i) {
-                    case 0:
-                        NavigationHelper.enqueueOnBackgroundPlayer(context, new SinglePlayQueue(item));
-                        break;
-                    case 1:
-                        NavigationHelper.enqueueOnPopupPlayer(activity, new SinglePlayQueue(item));
-                        break;
-                    case 2:
-                        NavigationHelper.playOnMainPlayer(context, getPlayQueue(index));
-                        break;
-                    case 3:
-                        NavigationHelper.playOnBackgroundPlayer(context, getPlayQueue(index));
-                        break;
-                    case 4:
-                        NavigationHelper.playOnPopupPlayer(activity, getPlayQueue(index));
-                        break;
-                    default:
-                        break;
-                }
+        final DialogInterface.OnClickListener actions = (DialogInterface dialogInterface, int i) -> {
+            final int index = Math.max(infoListAdapter.getItemsList().indexOf(item), 0);
+            switch (i) {
+                case 0:
+                    NavigationHelper.enqueueOnBackgroundPlayer(context, new SinglePlayQueue(item));
+                    break;
+                case 1:
+                    NavigationHelper.enqueueOnPopupPlayer(activity, new SinglePlayQueue(item));
+                    break;
+                case 2:
+                    NavigationHelper.playOnMainPlayer(context, getPlayQueue(index));
+                    break;
+                case 3:
+                    NavigationHelper.playOnBackgroundPlayer(context, getPlayQueue(index));
+                    break;
+                case 4:
+                    NavigationHelper.playOnPopupPlayer(activity, getPlayQueue(index));
+                    break;
+                case 5:
+                    if (getFragmentManager() != null) {
+                        PlaylistAppendDialog.fromStreamInfoItems(Collections.singletonList(item))
+                                .show(getFragmentManager(), TAG);
+                    }
+                    break;
+                case 6:
+                    shareUrl(item.getName(), item.getUrl());
+                    break;
+                default:
+                    break;
             }
         };
 
@@ -194,17 +207,14 @@ public class ChannelFragment extends BaseListInfoFragment<ChannelInfo> {
     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
         super.onCreateOptionsMenu(menu, inflater);
         ActionBar supportActionBar = activity.getSupportActionBar();
-        if(useAsFrontPage) {
+        if(useAsFrontPage && supportActionBar != null) {
             supportActionBar.setDisplayHomeAsUpEnabled(false);
         } else {
             inflater.inflate(R.menu.menu_channel, menu);
 
-            if (DEBUG) Log.d(TAG, "onCreateOptionsMenu() called with: menu = [" + menu + "], inflater = [" + inflater + "]");
+            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()));
-            }
-
         }
     }
 
@@ -225,10 +235,9 @@ public class ChannelFragment extends BaseListInfoFragment<ChannelInfo> {
             case R.id.menu_item_openInBrowser:
                 openUrlInBrowser(url);
                 break;
-            case R.id.menu_item_share: {
+            case R.id.menu_item_share:
                 shareUrl(name, url);
                 break;
-            }
             default:
                 return super.onOptionsItemSelected(item);
         }
@@ -242,12 +251,12 @@ public class ChannelFragment extends BaseListInfoFragment<ChannelInfo> {
     private static final int BUTTON_DEBOUNCE_INTERVAL = 100;
 
     private void monitorSubscription(final ChannelInfo info) {
-        final Consumer<Throwable> onError = new Consumer<Throwable>() {
-            @Override
-            public void accept(Throwable throwable) throws Exception {
+        final Consumer<Throwable> onError = (Throwable throwable) -> {
                 animateView(headerSubscribeButton, false, 100);
-                showSnackBarError(throwable, UserAction.SUBSCRIPTION, NewPipe.getNameOfService(currentInfo.getServiceId()), "Get subscription status", 0);
-            }
+                showSnackBarError(throwable, UserAction.SUBSCRIPTION,
+                        NewPipe.getNameOfService(currentInfo.getServiceId()),
+                        "Get subscription status",
+                        0);
         };
 
         final Observable<List<SubscriptionEntity>> observable = subscriptionService.subscriptionTable()
@@ -263,50 +272,38 @@ public class ChannelFragment extends BaseListInfoFragment<ChannelInfo> {
                 // so only update the UI for the latest emission ("sync" the subscribe button's state)
                 .debounce(100, TimeUnit.MILLISECONDS)
                 .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new Consumer<List<SubscriptionEntity>>() {
-                    @Override
-                    public void accept(List<SubscriptionEntity> subscriptionEntities) throws Exception {
-                        updateSubscribeButton(!subscriptionEntities.isEmpty());
-                    }
-                }, onError));
+                .subscribe((List<SubscriptionEntity> subscriptionEntities) ->
+                        updateSubscribeButton(!subscriptionEntities.isEmpty())
+                        , onError));
 
     }
 
     private Function<Object, Object> mapOnSubscribe(final SubscriptionEntity subscription) {
-        return new Function<Object, Object>() {
-            @Override
-            public Object apply(@NonNull Object o) throws Exception {
-                subscriptionService.subscriptionTable().insert(subscription);
-                return o;
-            }
+        return (@NonNull Object o) -> {
+            subscriptionService.subscriptionTable().insert(subscription);
+            return o;
         };
     }
 
     private Function<Object, Object> mapOnUnsubscribe(final SubscriptionEntity subscription) {
-        return new Function<Object, Object>() {
-            @Override
-            public Object apply(@NonNull Object o) throws Exception {
-                subscriptionService.subscriptionTable().delete(subscription);
-                return o;
-            }
+        return (@NonNull Object o) -> {
+            subscriptionService.subscriptionTable().delete(subscription);
+            return o;
         };
     }
 
     private void updateSubscription(final ChannelInfo info) {
         if (DEBUG) Log.d(TAG, "updateSubscription() called with: info = [" + info + "]");
-        final Action onComplete = new Action() {
-            @Override
-            public void run() throws Exception {
+        final Action onComplete = () -> {
                 if (DEBUG) Log.d(TAG, "Updated subscription: " + info.getUrl());
-            }
         };
 
-        final Consumer<Throwable> onError = new Consumer<Throwable>() {
-            @Override
-            public void accept(@NonNull Throwable throwable) throws Exception {
-                onUnrecoverableError(throwable, UserAction.SUBSCRIPTION, NewPipe.getNameOfService(info.getServiceId()), "Updating Subscription for " + info.getUrl(), R.string.subscription_update_failed);
-            }
-        };
+        final Consumer<Throwable> onError = (@NonNull Throwable throwable) ->
+                onUnrecoverableError(throwable,
+                        UserAction.SUBSCRIPTION,
+                        NewPipe.getNameOfService(info.getServiceId()),
+                        "Updating Subscription for " + info.getUrl(),
+                        R.string.subscription_update_failed);
 
         disposables.add(subscriptionService.updateChannelInfo(info)
                 .subscribeOn(Schedulers.io())
@@ -315,19 +312,16 @@ public class ChannelFragment extends BaseListInfoFragment<ChannelInfo> {
     }
 
     private Disposable monitorSubscribeButton(final Button subscribeButton, final Function<Object, Object> action) {
-        final Consumer<Object> onNext = new Consumer<Object>() {
-            @Override
-            public void accept(@NonNull Object o) throws Exception {
+        final Consumer<Object> onNext = (@NonNull Object o) -> {
                 if (DEBUG) Log.d(TAG, "Changed subscription status to this channel!");
-            }
         };
 
-        final Consumer<Throwable> onError = new Consumer<Throwable>() {
-            @Override
-            public void accept(@NonNull Throwable throwable) throws Exception {
-                onUnrecoverableError(throwable, UserAction.SUBSCRIPTION, NewPipe.getNameOfService(currentInfo.getServiceId()), "Subscription Change", R.string.subscription_change_failed);
-            }
-        };
+        final Consumer<Throwable> onError = (@NonNull Throwable throwable) ->
+                onUnrecoverableError(throwable,
+                        UserAction.SUBSCRIPTION,
+                        NewPipe.getNameOfService(currentInfo.getServiceId()),
+                        "Subscription Change",
+                        R.string.subscription_change_failed);
 
         /* Emit clicks from main thread unto io thread */
         return RxView.clicks(subscribeButton)
@@ -339,25 +333,25 @@ public class ChannelFragment extends BaseListInfoFragment<ChannelInfo> {
     }
 
     private Consumer<List<SubscriptionEntity>> getSubscribeUpdateMonitor(final ChannelInfo info) {
-        return new Consumer<List<SubscriptionEntity>>() {
-            @Override
-            public void accept(List<SubscriptionEntity> subscriptionEntities) throws Exception {
-                if (DEBUG)
-                    Log.d(TAG, "subscriptionService.subscriptionTable.doOnNext() called with: subscriptionEntities = [" + subscriptionEntities + "]");
-                if (subscribeButtonMonitor != null) subscribeButtonMonitor.dispose();
+        return (List<SubscriptionEntity> subscriptionEntities) -> {
+            if (DEBUG)
+                Log.d(TAG, "subscriptionService.subscriptionTable.doOnNext() called with: subscriptionEntities = [" + subscriptionEntities + "]");
+            if (subscribeButtonMonitor != null) subscribeButtonMonitor.dispose();
 
-                if (subscriptionEntities.isEmpty()) {
-                    if (DEBUG) Log.d(TAG, "No subscription to this channel!");
-                    SubscriptionEntity channel = new SubscriptionEntity();
-                    channel.setServiceId(info.getServiceId());
-                    channel.setUrl(info.getUrl());
-                    channel.setData(info.getName(), info.getAvatarUrl(), info.getDescription(), info.getSubscriberCount());
-                    subscribeButtonMonitor = monitorSubscribeButton(headerSubscribeButton, mapOnSubscribe(channel));
-                } else {
-                    if (DEBUG) Log.d(TAG, "Found subscription to this channel!");
-                    final SubscriptionEntity subscription = subscriptionEntities.get(0);
-                    subscribeButtonMonitor = monitorSubscribeButton(headerSubscribeButton, mapOnUnsubscribe(subscription));
-                }
+            if (subscriptionEntities.isEmpty()) {
+                if (DEBUG) Log.d(TAG, "No subscription to this channel!");
+                SubscriptionEntity channel = new SubscriptionEntity();
+                channel.setServiceId(info.getServiceId());
+                channel.setUrl(info.getUrl());
+                channel.setData(info.getName(),
+                        info.getAvatarUrl(),
+                        info.getDescription(),
+                        info.getSubscriberCount());
+                subscribeButtonMonitor = monitorSubscribeButton(headerSubscribeButton, mapOnSubscribe(channel));
+            } else {
+                if (DEBUG) Log.d(TAG, "Found subscription to this channel!");
+                final SubscriptionEntity subscription = subscriptionEntities.get(0);
+                subscribeButtonMonitor = monitorSubscribeButton(headerSubscribeButton, mapOnUnsubscribe(subscription));
             }
         };
     }
@@ -392,8 +386,8 @@ public class ChannelFragment extends BaseListInfoFragment<ChannelInfo> {
     //////////////////////////////////////////////////////////////////////////*/
 
     @Override
-    protected Single<ListExtractor.NextItemsResult> loadMoreItemsLogic() {
-        return ExtractorHelper.getMoreChannelItems(serviceId, url, currentNextItemsUrl);
+    protected Single<ListExtractor.InfoItemsPage> loadMoreItemsLogic() {
+        return ExtractorHelper.getMoreChannelItems(serviceId, url, currentNextPageUrl);
     }
 
     @Override
@@ -419,19 +413,24 @@ public class ChannelFragment extends BaseListInfoFragment<ChannelInfo> {
         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);
+        imageLoader.displayImage(result.getBannerUrl(), headerChannelBanner,
+        		ImageDisplayConstants.DISPLAY_BANNER_OPTIONS);
+        imageLoader.displayImage(result.getAvatarUrl(), headerAvatarView,
+        		ImageDisplayConstants.DISPLAY_AVATAR_OPTIONS);
 
-        if (result.getSubscriberCount() != -1) {
+        headerSubscribersTextView.setVisibility(View.VISIBLE);
+        if (result.getSubscriberCount() >= 0) {
             headerSubscribersTextView.setText(Localization.localizeSubscribersCount(activity, result.getSubscriberCount()));
-            headerSubscribersTextView.setVisibility(View.VISIBLE);
-        } else headerSubscribersTextView.setVisibility(View.GONE);
+        } else {
+            headerSubscribersTextView.setText(R.string.subscribers_count_not_available);
+        }
 
         if (menuRssButton != null) menuRssButton.setVisible(!TextUtils.isEmpty(result.getFeedUrl()));
+
         playlistCtrl.setVisibility(View.VISIBLE);
 
-        if (!result.errors.isEmpty()) {
-            showSnackBarError(result.errors, UserAction.REQUESTED_CHANNEL, NewPipe.getNameOfService(result.getServiceId()), result.getUrl(), 0);
+        if (!result.getErrors().isEmpty()) {
+            showSnackBarError(result.getErrors(), UserAction.REQUESTED_CHANNEL, NewPipe.getNameOfService(result.getServiceId()), result.getUrl(), 0);
         }
 
         if (disposables != null) disposables.clear();
@@ -439,24 +438,12 @@ public class ChannelFragment extends BaseListInfoFragment<ChannelInfo> {
         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());
-            }
-        });
+        headerPlayAllButton.setOnClickListener(
+                view -> NavigationHelper.playOnMainPlayer(activity, getPlayQueue()));
+        headerPopupButton.setOnClickListener(
+                view -> NavigationHelper.playOnPopupPlayer(activity, getPlayQueue()));
+        headerBackgroundButton.setOnClickListener(
+                view -> NavigationHelper.playOnBackgroundPlayer(activity, getPlayQueue()));
     }
 
     private PlayQueue getPlayQueue() {
@@ -464,22 +451,31 @@ public class ChannelFragment extends BaseListInfoFragment<ChannelInfo> {
     }
 
     private PlayQueue getPlayQueue(final int index) {
+        final List<StreamInfoItem> streamItems = new ArrayList<>();
+        for(InfoItem i : infoListAdapter.getItemsList()) {
+            if(i instanceof StreamInfoItem) {
+                streamItems.add((StreamInfoItem) i);
+            }
+        }
         return new ChannelPlayQueue(
                 currentInfo.getServiceId(),
                 currentInfo.getUrl(),
-                currentInfo.getNextStreamsUrl(),
-                infoListAdapter.getItemsList(),
+                currentInfo.getNextPageUrl(),
+                streamItems,
                 index
         );
     }
 
     @Override
-    public void handleNextItems(ListExtractor.NextItemsResult result) {
+    public void handleNextItems(ListExtractor.InfoItemsPage result) {
         super.handleNextItems(result);
 
         if (!result.getErrors().isEmpty()) {
-            showSnackBarError(result.getErrors(), UserAction.REQUESTED_CHANNEL, NewPipe.getNameOfService(serviceId),
-                    "Get next page of: " + url, R.string.general_error);
+            showSnackBarError(result.getErrors(),
+                    UserAction.REQUESTED_CHANNEL,
+                    NewPipe.getNameOfService(serviceId),
+                    "Get next page of: " + url,
+                    R.string.general_error);
         }
     }
 
@@ -492,7 +488,11 @@ public class ChannelFragment extends BaseListInfoFragment<ChannelInfo> {
         if (super.onError(exception)) return true;
 
         int errorId = exception instanceof ExtractionException ? R.string.parsing_error : R.string.general_error;
-        onUnrecoverableError(exception, UserAction.REQUESTED_CHANNEL, NewPipe.getNameOfService(serviceId), url, errorId);
+        onUnrecoverableError(exception,
+                UserAction.REQUESTED_CHANNEL,
+                NewPipe.getNameOfService(serviceId),
+                url,
+                errorId);
         return true;
     }
 
@@ -503,6 +503,6 @@ public class ChannelFragment extends BaseListInfoFragment<ChannelInfo> {
     @Override
     public void setTitle(String title) {
         super.setTitle(title);
-        headerTitleView.setText(title);
+        if (!useAsFrontPage) headerTitleView.setText(title);
     }
 }

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

@@ -5,28 +5,23 @@ import android.preference.PreferenceManager;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v7.app.ActionBar;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.TextView;
 
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.extractor.ListExtractor;
 import org.schabi.newpipe.extractor.NewPipe;
 import org.schabi.newpipe.extractor.StreamingService;
-import org.schabi.newpipe.extractor.UrlIdHandler;
 import org.schabi.newpipe.extractor.exceptions.ExtractionException;
 import org.schabi.newpipe.extractor.kiosk.KioskInfo;
-import org.schabi.newpipe.extractor.stream.StreamInfoItem;
+import org.schabi.newpipe.extractor.linkhandler.ListLinkHandlerFactory;
 import org.schabi.newpipe.fragments.list.BaseListInfoFragment;
-import org.schabi.newpipe.info_list.InfoItemBuilder;
 import org.schabi.newpipe.report.UserAction;
 import org.schabi.newpipe.util.ExtractorHelper;
 import org.schabi.newpipe.util.KioskTranslator;
-import org.schabi.newpipe.util.NavigationHelper;
 
 import icepick.State;
 import io.reactivex.Single;
@@ -59,6 +54,7 @@ public class KioskFragment extends BaseListInfoFragment<KioskInfo> {
     protected String kioskId = "";
     protected String kioskTranslatedName;
 
+
     /*//////////////////////////////////////////////////////////////////////////
     // Views
     //////////////////////////////////////////////////////////////////////////*/
@@ -74,11 +70,10 @@ public class KioskFragment extends BaseListInfoFragment<KioskInfo> {
             throws ExtractionException {
         KioskFragment instance = new KioskFragment();
         StreamingService service = NewPipe.getService(serviceId);
-        UrlIdHandler kioskTypeUrlIdHandler = service.getKioskList()
-                .getUrlIdHandlerByType(kioskId);
+        ListLinkHandlerFactory kioskLinkHandlerFactory = service.getKioskList()
+                .getListLinkHandlerFactoryByType(kioskId);
         instance.setInitialData(serviceId,
-                kioskTypeUrlIdHandler.getUrl(kioskId),
-                kioskId);
+                kioskLinkHandlerFactory.fromId(kioskId).getUrl(), kioskId);
         instance.kioskId = kioskId;
         return instance;
     }
@@ -133,20 +128,16 @@ public class KioskFragment extends BaseListInfoFragment<KioskInfo> {
 
     @Override
     public Single<KioskInfo> loadResult(boolean forceReload) {
-        String contentCountry = PreferenceManager
-                .getDefaultSharedPreferences(activity)
-                .getString(getString(R.string.content_country_key),
-                        getString(R.string.default_country_value));
-        return ExtractorHelper.getKioskInfo(serviceId, url, contentCountry, forceReload);
+        return ExtractorHelper.getKioskInfo(serviceId,
+                url,
+                forceReload);
     }
 
     @Override
-    public Single<ListExtractor.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);
+    public Single<ListExtractor.InfoItemsPage> loadMoreItemsLogic() {
+        return ExtractorHelper.getMoreKioskItems(serviceId,
+                url,
+                currentNextPageUrl);
     }
 
     /*//////////////////////////////////////////////////////////////////////////
@@ -164,17 +155,19 @@ public class KioskFragment extends BaseListInfoFragment<KioskInfo> {
         super.handleResult(result);
 
         name = kioskTranslatedName;
-        setTitle(kioskTranslatedName);
+        if(!useAsFrontPage) {
+            setTitle(kioskTranslatedName);
+        }
 
         if (!result.getErrors().isEmpty()) {
             showSnackBarError(result.getErrors(),
-                    UserAction.REQUESTED_PLAYLIST,
+                    UserAction.REQUESTED_KIOSK,
                     NewPipe.getNameOfService(result.getServiceId()), result.getUrl(), 0);
         }
     }
 
     @Override
-    public void handleNextItems(ListExtractor.NextItemsResult result) {
+    public void handleNextItems(ListExtractor.InfoItemsPage result) {
         super.handleNextItems(result);
 
         if (!result.getErrors().isEmpty()) {

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

@@ -6,6 +6,7 @@ import android.content.DialogInterface;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
+import android.support.v7.app.AppCompatActivity;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -17,7 +18,12 @@ import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import org.reactivestreams.Subscriber;
+import org.reactivestreams.Subscription;
+import org.schabi.newpipe.NewPipeDatabase;
 import org.schabi.newpipe.R;
+import org.schabi.newpipe.database.playlist.model.PlaylistRemoteEntity;
+import org.schabi.newpipe.extractor.InfoItem;
 import org.schabi.newpipe.extractor.ListExtractor;
 import org.schabi.newpipe.extractor.NewPipe;
 import org.schabi.newpipe.extractor.exceptions.ExtractionException;
@@ -25,19 +31,38 @@ 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.local.playlist.RemotePlaylistManager;
+import org.schabi.newpipe.player.playqueue.PlayQueue;
+import org.schabi.newpipe.player.playqueue.PlaylistPlayQueue;
+import org.schabi.newpipe.player.playqueue.SinglePlayQueue;
+import org.schabi.newpipe.report.ErrorActivity;
 import org.schabi.newpipe.report.UserAction;
 import org.schabi.newpipe.util.ExtractorHelper;
+import org.schabi.newpipe.util.ImageDisplayConstants;
 import org.schabi.newpipe.util.NavigationHelper;
+import org.schabi.newpipe.util.ThemeHelper;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import io.reactivex.Flowable;
 import io.reactivex.Single;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.disposables.CompositeDisposable;
+import io.reactivex.disposables.Disposable;
+import io.reactivex.disposables.Disposables;
 
 import static org.schabi.newpipe.util.AnimationUtils.animateView;
 
 public class PlaylistFragment extends BaseListInfoFragment<PlaylistInfo> {
 
+    private CompositeDisposable disposables;
+    private Subscription bookmarkReactor;
+    private AtomicBoolean isBookmarkButtonReady;
+
+    private RemotePlaylistManager remotePlaylistManager;
+    private PlaylistRemoteEntity playlistEntity;
     /*//////////////////////////////////////////////////////////////////////////
     // Views
     //////////////////////////////////////////////////////////////////////////*/
@@ -54,6 +79,8 @@ public class PlaylistFragment extends BaseListInfoFragment<PlaylistInfo> {
     private View headerPopupButton;
     private View headerBackgroundButton;
 
+    private MenuItem playlistBookmarkButton;
+
     public static PlaylistFragment getInstance(int serviceId, String url, String name) {
         PlaylistFragment instance = new PlaylistFragment();
         instance.setInitialData(serviceId, url, name);
@@ -65,7 +92,17 @@ public class PlaylistFragment extends BaseListInfoFragment<PlaylistInfo> {
     //////////////////////////////////////////////////////////////////////////*/
 
     @Override
-    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        disposables = new CompositeDisposable();
+        isBookmarkButtonReady = new AtomicBoolean(false);
+        remotePlaylistManager = new RemotePlaylistManager(NewPipeDatabase.getInstance(
+                requireContext()));
+    }
+
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container,
+                             @Nullable Bundle savedInstanceState) {
         return inflater.inflate(R.layout.fragment_playlist, container, false);
     }
 
@@ -86,6 +123,7 @@ public class PlaylistFragment extends BaseListInfoFragment<PlaylistInfo> {
         headerPopupButton = headerRootLayout.findViewById(R.id.playlist_ctrl_play_popup_button);
         headerBackgroundButton = headerRootLayout.findViewById(R.id.playlist_ctrl_play_bg_button);
 
+
         return headerRootLayout;
     }
 
@@ -108,31 +146,32 @@ public class PlaylistFragment extends BaseListInfoFragment<PlaylistInfo> {
                 context.getResources().getString(R.string.start_here_on_main),
                 context.getResources().getString(R.string.start_here_on_background),
                 context.getResources().getString(R.string.start_here_on_popup),
+                context.getResources().getString(R.string.share)
         };
 
-        final DialogInterface.OnClickListener actions = 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;
-                }
+        final DialogInterface.OnClickListener actions = (dialogInterface, i) -> {
+            final int index = Math.max(infoListAdapter.getItemsList().indexOf(item), 0);
+            switch (i) {
+                case 0:
+                    NavigationHelper.enqueueOnBackgroundPlayer(context, new SinglePlayQueue(item));
+                    break;
+                case 1:
+                    NavigationHelper.enqueueOnPopupPlayer(activity, new SinglePlayQueue(item));
+                    break;
+                case 2:
+                    NavigationHelper.playOnMainPlayer(context, getPlayQueue(index));
+                    break;
+                case 3:
+                    NavigationHelper.playOnBackgroundPlayer(context, getPlayQueue(index));
+                    break;
+                case 4:
+                    NavigationHelper.playOnPopupPlayer(activity, getPlayQueue(index));
+                    break;
+                case 5:
+                    shareUrl(item.getName(), item.getUrl());
+                    break;
+                default:
+                    break;
             }
         };
 
@@ -141,9 +180,36 @@ public class PlaylistFragment extends BaseListInfoFragment<PlaylistInfo> {
 
     @Override
     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-        if (DEBUG) Log.d(TAG, "onCreateOptionsMenu() called with: menu = [" + menu + "], inflater = [" + inflater + "]");
+        if (DEBUG) Log.d(TAG, "onCreateOptionsMenu() called with: menu = [" + menu +
+                "], inflater = [" + inflater + "]");
         super.onCreateOptionsMenu(menu, inflater);
         inflater.inflate(R.menu.menu_playlist, menu);
+
+        playlistBookmarkButton = menu.findItem(R.id.menu_item_bookmark);
+        updateBookmarkButtons();
+    }
+
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        if (isBookmarkButtonReady != null) isBookmarkButtonReady.set(false);
+
+        if (disposables != null) disposables.clear();
+        if (bookmarkReactor != null) bookmarkReactor.cancel();
+
+        bookmarkReactor = null;
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+
+        if (disposables != null) disposables.dispose();
+
+        disposables = null;
+        remotePlaylistManager = null;
+        playlistEntity = null;
+        isBookmarkButtonReady = null;
     }
 
     /*//////////////////////////////////////////////////////////////////////////
@@ -151,8 +217,8 @@ public class PlaylistFragment extends BaseListInfoFragment<PlaylistInfo> {
     //////////////////////////////////////////////////////////////////////////*/
 
     @Override
-    protected Single<ListExtractor.NextItemsResult> loadMoreItemsLogic() {
-        return ExtractorHelper.getMorePlaylistItems(serviceId, url, currentNextItemsUrl);
+    protected Single<ListExtractor.InfoItemsPage> loadMoreItemsLogic() {
+        return ExtractorHelper.getMorePlaylistItems(serviceId, url, currentNextPageUrl);
     }
 
     @Override
@@ -166,10 +232,12 @@ public class PlaylistFragment extends BaseListInfoFragment<PlaylistInfo> {
             case R.id.menu_item_openInBrowser:
                 openUrlInBrowser(url);
                 break;
-            case R.id.menu_item_share: {
+            case R.id.menu_item_share:
                 shareUrl(name, url);
                 break;
-            }
+            case R.id.menu_item_bookmark:
+                onBookmarkClicked();
+                break;
             default:
                 return super.onOptionsItemSelected(item);
         }
@@ -201,10 +269,14 @@ public class PlaylistFragment extends BaseListInfoFragment<PlaylistInfo> {
         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());
+                headerUploaderLayout.setOnClickListener(v -> {
+                    try {
+                        NavigationHelper.openChannelFragment(getFragmentManager(),
+                                result.getServiceId(),
+                                result.getUploaderUrl(),
+                                result.getUploaderName());
+                    } catch (Exception e) {
+                        ErrorActivity.reportUiError((AppCompatActivity) getActivity(), e);
                     }
                 });
             }
@@ -212,31 +284,27 @@ public class PlaylistFragment extends BaseListInfoFragment<PlaylistInfo> {
 
         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));
+        imageLoader.displayImage(result.getUploaderAvatarUrl(), headerUploaderAvatar,
+                ImageDisplayConstants.DISPLAY_AVATAR_OPTIONS);
+        headerStreamCount.setText(getResources().getQuantityString(R.plurals.videos,
+                (int) result.getStreamCount(), (int) result.getStreamCount()));
 
         if (!result.getErrors().isEmpty()) {
             showSnackBarError(result.getErrors(), UserAction.REQUESTED_PLAYLIST, NewPipe.getNameOfService(result.getServiceId()), result.getUrl(), 0);
         }
 
-        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());
-            }
-        });
+        remotePlaylistManager.getPlaylist(result)
+                .flatMap(lists -> getUpdateProcessor(lists, result), (lists, id) -> lists)
+                .onBackpressureLatest()
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(getPlaylistBookmarkSubscriber());
+
+        headerPlayAllButton.setOnClickListener(view ->
+                NavigationHelper.playOnMainPlayer(activity, getPlayQueue()));
+        headerPopupButton.setOnClickListener(view ->
+                NavigationHelper.playOnPopupPlayer(activity, getPlayQueue()));
+        headerBackgroundButton.setOnClickListener(view ->
+                NavigationHelper.playOnBackgroundPlayer(activity, getPlayQueue()));
     }
 
     private PlayQueue getPlayQueue() {
@@ -244,17 +312,23 @@ public class PlaylistFragment extends BaseListInfoFragment<PlaylistInfo> {
     }
 
     private PlayQueue getPlayQueue(final int index) {
+        final List<StreamInfoItem> infoItems = new ArrayList<>();
+        for(InfoItem i : infoListAdapter.getItemsList()) {
+            if(i instanceof StreamInfoItem) {
+                infoItems.add((StreamInfoItem) i);
+            }
+        }
         return new PlaylistPlayQueue(
                 currentInfo.getServiceId(),
                 currentInfo.getUrl(),
-                currentInfo.getNextStreamsUrl(),
-                infoListAdapter.getItemsList(),
+                currentInfo.getNextPageUrl(),
+                infoItems,
                 index
         );
     }
 
     @Override
-    public void handleNextItems(ListExtractor.NextItemsResult result) {
+    public void handleNextItems(ListExtractor.InfoItemsPage result) {
         super.handleNextItems(result);
 
         if (!result.getErrors().isEmpty()) {
@@ -272,7 +346,11 @@ public class PlaylistFragment extends BaseListInfoFragment<PlaylistInfo> {
         if (super.onError(exception)) return true;
 
         int errorId = exception instanceof ExtractionException ? R.string.parsing_error : R.string.general_error;
-        onUnrecoverableError(exception, UserAction.REQUESTED_PLAYLIST, NewPipe.getNameOfService(serviceId), url, errorId);
+        onUnrecoverableError(exception,
+                UserAction.REQUESTED_PLAYLIST,
+                NewPipe.getNameOfService(serviceId),
+                url,
+                errorId);
         return true;
     }
 
@@ -280,9 +358,87 @@ public class PlaylistFragment extends BaseListInfoFragment<PlaylistInfo> {
     // Utils
     //////////////////////////////////////////////////////////////////////////*/
 
+    private Flowable<Integer> getUpdateProcessor(@NonNull List<PlaylistRemoteEntity> playlists,
+                                                 @NonNull PlaylistInfo result) {
+        final Flowable<Integer> noItemToUpdate = Flowable.just(/*noItemToUpdate=*/-1);
+        if (playlists.isEmpty()) return noItemToUpdate;
+
+        final PlaylistRemoteEntity playlistEntity = playlists.get(0);
+        if (playlistEntity.isIdenticalTo(result)) return noItemToUpdate;
+
+        return remotePlaylistManager.onUpdate(playlists.get(0).getUid(), result).toFlowable();
+    }
+
+    private Subscriber<List<PlaylistRemoteEntity>> getPlaylistBookmarkSubscriber() {
+        return new Subscriber<List<PlaylistRemoteEntity>>() {
+            @Override
+            public void onSubscribe(Subscription s) {
+                if (bookmarkReactor != null) bookmarkReactor.cancel();
+                bookmarkReactor = s;
+                bookmarkReactor.request(1);
+            }
+
+            @Override
+            public void onNext(List<PlaylistRemoteEntity> playlist) {
+                playlistEntity = playlist.isEmpty() ? null : playlist.get(0);
+
+                updateBookmarkButtons();
+                isBookmarkButtonReady.set(true);
+
+                if (bookmarkReactor != null) bookmarkReactor.request(1);
+            }
+
+            @Override
+            public void onError(Throwable t) {
+                PlaylistFragment.this.onError(t);
+            }
+
+            @Override
+            public void onComplete() {
+
+            }
+        };
+    }
+
     @Override
     public void setTitle(String title) {
         super.setTitle(title);
         headerTitleView.setText(title);
     }
-}
+
+    private void onBookmarkClicked() {
+        if (isBookmarkButtonReady == null || !isBookmarkButtonReady.get() ||
+                remotePlaylistManager == null)
+            return;
+
+        final Disposable action;
+
+        if (currentInfo != null && playlistEntity == null) {
+            action = remotePlaylistManager.onBookmark(currentInfo)
+                    .observeOn(AndroidSchedulers.mainThread())
+                    .subscribe(ignored -> {/* Do nothing */}, this::onError);
+        } else if (playlistEntity != null) {
+            action = remotePlaylistManager.deletePlaylist(playlistEntity.getUid())
+                    .observeOn(AndroidSchedulers.mainThread())
+                    .doFinally(() -> playlistEntity = null)
+                    .subscribe(ignored -> {/* Do nothing */}, this::onError);
+        } else {
+            action = Disposables.empty();
+        }
+
+        disposables.add(action);
+    }
+
+    private void updateBookmarkButtons() {
+        if (playlistBookmarkButton == null || activity == null) return;
+
+        final int iconAttr = playlistEntity == null ?
+                R.attr.ic_playlist_add : R.attr.ic_playlist_check;
+
+        final int titleRes = playlistEntity == null ?
+                R.string.bookmark_playlist : R.string.unbookmark_playlist;
+
+        playlistBookmarkButton.setIcon(ThemeHelper.resolveResourceIdFromAttr(activity, iconAttr));
+        playlistBookmarkButton.setTitle(titleRes);
+    }
+}

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

@@ -2,7 +2,6 @@ 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;
@@ -30,56 +29,56 @@ 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.extractor.search.SearchExtractor;
+import org.schabi.newpipe.extractor.search.SearchInfo;
 import org.schabi.newpipe.fragments.BackPressable;
 import org.schabi.newpipe.fragments.list.BaseListFragment;
-import org.schabi.newpipe.history.HistoryListener;
+import org.schabi.newpipe.local.history.HistoryRecordManager;
+import org.schabi.newpipe.report.ErrorActivity;
 import org.schabi.newpipe.report.UserAction;
 import org.schabi.newpipe.util.Constants;
 import org.schabi.newpipe.util.AnimationUtils;
 import org.schabi.newpipe.util.ExtractorHelper;
 import org.schabi.newpipe.util.LayoutManagerSmoothScroller;
 import org.schabi.newpipe.util.NavigationHelper;
+import org.schabi.newpipe.util.ServiceHelper;
 
 import java.io.IOException;
 import java.io.InterruptedIOException;
 import java.net.SocketException;
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 import java.util.Queue;
-import java.util.concurrent.Callable;
 import java.util.concurrent.TimeUnit;
 
 import icepick.State;
 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 java.util.Arrays.asList;
+
 import static org.schabi.newpipe.util.AnimationUtils.animateView;
 
-public class SearchFragment extends BaseListFragment<SearchResult, ListExtractor.NextItemsResult> implements BackPressable {
+public class SearchFragment
+        extends BaseListFragment<SearchInfo, ListExtractor.InfoItemsPage>
+        implements BackPressable {
 
     /*//////////////////////////////////////////////////////////////////////////
     // Search
@@ -98,30 +97,39 @@ public class SearchFragment extends BaseListFragment<SearchResult, ListExtractor
 
     @State
     protected int filterItemCheckedId = -1;
-    private SearchEngine.Filter filter = SearchEngine.Filter.ANY;
 
     @State
     protected int serviceId = Constants.NO_SERVICE_ID;
+    
+    // this three represet the current search query
     @State
-    protected String searchQuery;
+    protected String searchString;
     @State
-    protected String lastSearchedQuery;
+    protected String[] contentFilter;
+    @State
+    protected String sortFilter;
+    
+    // these represtent the last search
+    @State
+    protected String lastSearchedString;
+    
     @State
     protected boolean wasSearchFocused = false;
 
-    private int currentPage = 0;
-    private int currentNextPage = 0;
+    private Map<Integer, String> menuItemToFilterName;
+    private StreamingService service;
+    private String currentPageUrl;
+    private String nextPageUrl;
     private String contentCountry;
     private boolean isSuggestionsEnabled = true;
-    private boolean isSearchHistoryEnabled = true;
 
-    private PublishSubject<String> suggestionPublisher = PublishSubject.create();
+    private final PublishSubject<String> suggestionPublisher = PublishSubject.create();
     private Disposable searchDisposable;
     private Disposable suggestionDisposable;
-    private CompositeDisposable disposables = new CompositeDisposable();
+    private final CompositeDisposable disposables = new CompositeDisposable();
 
     private SuggestionListAdapter suggestionListAdapter;
-    private SearchHistoryDAO searchHistoryDAO;
+    private HistoryRecordManager historyRecordManager;
 
     /*//////////////////////////////////////////////////////////////////////////
     // Views
@@ -136,11 +144,11 @@ public class SearchFragment extends BaseListFragment<SearchResult, ListExtractor
 
     /*////////////////////////////////////////////////////////////////////////*/
 
-    public static SearchFragment getInstance(int serviceId, String query) {
+    public static SearchFragment getInstance(int serviceId, String searchString) {
         SearchFragment searchFragment = new SearchFragment();
-        searchFragment.setQuery(serviceId, query);
+        searchFragment.setQuery(serviceId, searchString, new String[0], "");
 
-        if (!TextUtils.isEmpty(query)) {
+        if (!TextUtils.isEmpty(searchString)) {
             searchFragment.setSearchOnResume();
         }
 
@@ -164,10 +172,10 @@ public class SearchFragment extends BaseListFragment<SearchResult, ListExtractor
 
         suggestionListAdapter = new SuggestionListAdapter(activity);
         SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(activity);
-        isSearchHistoryEnabled = preferences.getBoolean(getString(R.string.enable_search_history_key), true);
+        boolean isSearchHistoryEnabled = preferences.getBoolean(getString(R.string.enable_search_history_key), true);
         suggestionListAdapter.setShowSuggestionHistory(isSearchHistoryEnabled);
-        
-        searchHistoryDAO = NewPipeDatabase.getInstance().searchHistoryDAO();
+
+        historyRecordManager = new HistoryRecordManager(context);
     }
 
     @Override
@@ -208,13 +216,22 @@ public class SearchFragment extends BaseListFragment<SearchResult, ListExtractor
         if (DEBUG) Log.d(TAG, "onResume() called");
         super.onResume();
 
-        if (!TextUtils.isEmpty(searchQuery)) {
+        try {
+            service = NewPipe.getService(serviceId);
+        } catch (Exception e) {
+            ErrorActivity.reportError(getActivity(), e, getActivity().getClass(),
+                    getActivity().findViewById(android.R.id.content),
+                    ErrorActivity.ErrorInfo.make(UserAction.UI_ERROR,
+                            "",
+                            "", R.string.general_error));
+        }
+
+        if (!TextUtils.isEmpty(searchString)) {
             if (wasLoading.getAndSet(false)) {
-                if (currentNextPage > currentPage) loadMoreItems();
-                else search(searchQuery);
+                search(searchString, contentFilter, sortFilter);
             } else if (infoListAdapter.getItemsList().size() == 0) {
                 if (savedState == null) {
-                    search(searchQuery);
+                    search(searchString, contentFilter, sortFilter);
                 } else if (!isLoading.get() && !wasSearchFocused) {
                     infoListAdapter.clearStreamItemList();
                     showEmptyState();
@@ -224,7 +241,7 @@ public class SearchFragment extends BaseListFragment<SearchResult, ListExtractor
 
         if (suggestionDisposable == null || suggestionDisposable.isDisposed()) initSuggestionObserver();
 
-        if (TextUtils.isEmpty(searchQuery) || wasSearchFocused) {
+        if (TextUtils.isEmpty(searchString) || wasSearchFocused) {
             showKeyboardSearch();
             showSuggestionsPanel();
         } else {
@@ -253,8 +270,9 @@ public class SearchFragment extends BaseListFragment<SearchResult, ListExtractor
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
         switch (requestCode) {
             case ReCaptchaActivity.RECAPTCHA_REQUEST:
-                if (resultCode == Activity.RESULT_OK && !TextUtils.isEmpty(searchQuery)) {
-                    search(searchQuery);
+                if (resultCode == Activity.RESULT_OK
+                        && !TextUtils.isEmpty(searchString)) {
+                    search(searchString, contentFilter, sortFilter);
                 } else Log.e(TAG, "ReCaptcha failed");
                 break;
 
@@ -288,20 +306,22 @@ public class SearchFragment extends BaseListFragment<SearchResult, ListExtractor
     @Override
     public void writeTo(Queue<Object> objectsToSave) {
         super.writeTo(objectsToSave);
-        objectsToSave.add(currentPage);
-        objectsToSave.add(currentNextPage);
+        objectsToSave.add(currentPageUrl);
+        objectsToSave.add(nextPageUrl);
     }
 
     @Override
     public void readFrom(@NonNull Queue<Object> savedObjects) throws Exception {
         super.readFrom(savedObjects);
-        currentPage = (int) savedObjects.poll();
-        currentNextPage = (int) savedObjects.poll();
+        currentPageUrl = (String) savedObjects.poll();
+        nextPageUrl = (String) savedObjects.poll();
     }
 
     @Override
     public void onSaveInstanceState(Bundle bundle) {
-        searchQuery = searchEditText != null ? searchEditText.getText().toString() : searchQuery;
+        searchString = searchEditText != null
+                ? searchEditText.getText().toString()
+                : searchString;
         super.onSaveInstanceState(bundle);
     }
 
@@ -311,8 +331,11 @@ public class SearchFragment extends BaseListFragment<SearchResult, ListExtractor
 
     @Override
     public void reloadContent() {
-        if (!TextUtils.isEmpty(searchQuery) || (searchEditText != null && !TextUtils.isEmpty(searchEditText.getText()))) {
-            search(!TextUtils.isEmpty(searchQuery) ? searchQuery : searchEditText.getText().toString());
+        if (!TextUtils.isEmpty(searchString)
+                || (searchEditText != null && !TextUtils.isEmpty(searchEditText.getText()))) {
+            search(!TextUtils.isEmpty(searchString)
+                    ? searchString
+                    : searchEditText.getText().toString(), new String[0], "");
         } else {
             if (searchEditText != null) {
                 searchEditText.setText("");
@@ -336,22 +359,35 @@ public class SearchFragment extends BaseListFragment<SearchResult, ListExtractor
             supportActionBar.setDisplayHomeAsUpEnabled(true);
         }
 
-        inflater.inflate(R.menu.menu_search, menu);
+        menuItemToFilterName = new HashMap<>();
+
+        int itemId = 0;
+        boolean isFirstItem = true;
+        final Context c = getContext();
+        for(String filter : service.getSearchQHFactory().getAvailableContentFilter()) {
+            menuItemToFilterName.put(itemId, filter);
+            MenuItem item = menu.add(1,
+                    itemId++,
+                    0,
+                    ServiceHelper.getTranslatedFilterString(filter, c));
+            if(isFirstItem) {
+                item.setChecked(true);
+                isFirstItem = false;
+            }
+        }
+        menu.setGroupCheckable(1, true, true);
+
         restoreFilterChecked(menu, filterItemCheckedId);
     }
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-            case R.id.menu_filter_all:
-            case R.id.menu_filter_video:
-            case R.id.menu_filter_channel:
-            case R.id.menu_filter_playlist:
-                changeFilter(item, getFilterFromMenuId(item.getItemId()));
-                return true;
-            default:
-                return super.onOptionsItemSelected(item);
-        }
+
+        List<String> contentFilter = new ArrayList<>(1);
+        contentFilter.add(menuItemToFilterName.get(item.getItemId()));
+        changeContentFilter(item, contentFilter);
+
+        return true;
     }
 
     private void restoreFilterChecked(Menu menu, int itemId) {
@@ -360,21 +396,6 @@ public class SearchFragment extends BaseListFragment<SearchResult, ListExtractor
             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;
         }
     }
 
@@ -385,14 +406,21 @@ public class SearchFragment extends BaseListFragment<SearchResult, ListExtractor
     private TextWatcher textWatcher;
 
     private void showSearchOnStart() {
-        if (DEBUG) Log.d(TAG, "showSearchOnStart() called, searchQuery → " + searchQuery+", lastSearchedQuery → " + lastSearchedQuery);
-        searchEditText.setText(searchQuery);
+        if (DEBUG) Log.d(TAG, "showSearchOnStart() called, searchQuery → "
+                + searchString
+                + ", lastSearchedQuery → "
+                + lastSearchedString);
+        searchEditText.setText(searchString);
 
-        if (TextUtils.isEmpty(searchQuery) || TextUtils.isEmpty(searchEditText.getText())) {
+        if (TextUtils.isEmpty(searchString) || TextUtils.isEmpty(searchEditText.getText())) {
             searchToolbarContainer.setTranslationX(100);
             searchToolbarContainer.setAlpha(0f);
             searchToolbarContainer.setVisibility(View.VISIBLE);
-            searchToolbarContainer.animate().translationX(0).alpha(1f).setDuration(200).setInterpolator(new DecelerateInterpolator()).start();
+            searchToolbarContainer.animate()
+                    .translationX(0)
+                    .alpha(1f)
+                    .setDuration(200)
+                    .setInterpolator(new DecelerateInterpolator()).start();
         } else {
             searchToolbarContainer.setTranslationX(0);
             searchToolbarContainer.setAlpha(1f);
@@ -402,47 +430,38 @@ public class SearchFragment extends BaseListFragment<SearchResult, ListExtractor
 
     private void initSearchListeners() {
         if (DEBUG) Log.d(TAG, "initSearchListeners() called");
-        searchClear.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                if (DEBUG) Log.d(TAG, "onClick() called with: v = [" + v + "]");
-                if (TextUtils.isEmpty(searchEditText.getText())) {
-                    NavigationHelper.gotoMainFragment(getFragmentManager());
-                    return;
-                }
-
-                searchEditText.setText("");
-                suggestionListAdapter.setItems(new ArrayList<SuggestionItem>());
-                showKeyboardSearch();
+        searchClear.setOnClickListener(v -> {
+            if (DEBUG) Log.d(TAG, "onClick() called with: v = [" + v + "]");
+            if (TextUtils.isEmpty(searchEditText.getText())) {
+                NavigationHelper.gotoMainFragment(getFragmentManager());
+                return;
             }
+
+            searchEditText.setText("");
+            suggestionListAdapter.setItems(new ArrayList<>());
+            showKeyboardSearch();
         });
 
         TooltipCompat.setTooltipText(searchClear, getString(R.string.clear));
 
-        searchEditText.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                if (DEBUG) Log.d(TAG, "onClick() called with: v = [" + v + "]");
-                if (isSuggestionsEnabled && errorPanelRoot.getVisibility() != View.VISIBLE) {
-                    showSuggestionsPanel();
-                }
+        searchEditText.setOnClickListener(v -> {
+            if (DEBUG) Log.d(TAG, "onClick() called with: v = [" + v + "]");
+            if (isSuggestionsEnabled && errorPanelRoot.getVisibility() != View.VISIBLE) {
+                showSuggestionsPanel();
             }
         });
 
-        searchEditText.setOnFocusChangeListener(new View.OnFocusChangeListener() {
-            @Override
-            public void onFocusChange(View v, boolean hasFocus) {
-                if (DEBUG) Log.d(TAG, "onFocusChange() called with: v = [" + v + "], hasFocus = [" + hasFocus + "]");
-                if (isSuggestionsEnabled && hasFocus && errorPanelRoot.getVisibility() != View.VISIBLE) {
-                    showSuggestionsPanel();
-                }
+        searchEditText.setOnFocusChangeListener((View v, boolean hasFocus) -> {
+            if (DEBUG) Log.d(TAG, "onFocusChange() called with: v = [" + v + "], hasFocus = [" + hasFocus + "]");
+            if (isSuggestionsEnabled && hasFocus && errorPanelRoot.getVisibility() != View.VISIBLE) {
+                showSuggestionsPanel();
             }
         });
 
         suggestionListAdapter.setListener(new SuggestionListAdapter.OnSuggestionItemSelected() {
             @Override
             public void onSuggestionItemSelected(SuggestionItem item) {
-                search(item.query);
+                search(item.query, new String[0], "");
                 searchEditText.setText(item.query);
             }
 
@@ -475,21 +494,22 @@ public class SearchFragment extends BaseListFragment<SearchResult, ListExtractor
             }
         };
         searchEditText.addTextChangedListener(textWatcher);
-        searchEditText.setOnEditorActionListener(new TextView.OnEditorActionListener() {
-            @Override
-            public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-                if (DEBUG) {
-                    Log.d(TAG, "onEditorAction() called with: v = [" + v + "], actionId = [" + actionId + "], event = [" + event + "]");
-                }
-                if (event != null && (event.getKeyCode() == KeyEvent.KEYCODE_ENTER || event.getAction() == EditorInfo.IME_ACTION_SEARCH)) {
-                    search(searchEditText.getText().toString());
-                    return true;
-                }
-                return false;
-            }
-        });
+        searchEditText.setOnEditorActionListener(
+                (TextView v, int actionId, KeyEvent event) -> {
+                    if (DEBUG) {
+                        Log.d(TAG, "onEditorAction() called with: v = [" + v + "], actionId = [" + actionId + "], event = [" + event + "]");
+                    }
+                    if (event != null
+                            && (event.getKeyCode() == KeyEvent.KEYCODE_ENTER
+                                || event.getAction() == EditorInfo.IME_ACTION_SEARCH)) {
+                        search(searchEditText.getText().toString(), new String[0], "");
+                        return true;
+                    }
+                    return false;
+                });
 
-        if (suggestionDisposable == null || suggestionDisposable.isDisposed()) initSuggestionObserver();
+        if (suggestionDisposable == null || suggestionDisposable.isDisposed())
+            initSuggestionObserver();
     }
 
     private void unsetSearchListeners() {
@@ -519,7 +539,8 @@ public class SearchFragment extends BaseListFragment<SearchResult, ListExtractor
         if (searchEditText == null) return;
 
         if (searchEditText.requestFocus()) {
-            InputMethodManager imm = (InputMethodManager) activity.getSystemService(Context.INPUT_METHOD_SERVICE);
+            InputMethodManager imm = (InputMethodManager) activity.getSystemService(
+                    Context.INPUT_METHOD_SERVICE);
             imm.showSoftInput(searchEditText, InputMethodManager.SHOW_IMPLICIT);
         }
     }
@@ -528,51 +549,45 @@ public class SearchFragment extends BaseListFragment<SearchResult, ListExtractor
         if (DEBUG) Log.d(TAG, "hideKeyboardSearch() called");
         if (searchEditText == null) return;
 
-        InputMethodManager imm = (InputMethodManager) activity.getSystemService(Context.INPUT_METHOD_SERVICE);
-        imm.hideSoftInputFromWindow(searchEditText.getWindowToken(), InputMethodManager.HIDE_NOT_ALWAYS);
+        InputMethodManager imm = (InputMethodManager) activity.getSystemService(
+                Context.INPUT_METHOD_SERVICE);
+        imm.hideSoftInputFromWindow(searchEditText.getWindowToken(),
+                InputMethodManager.HIDE_NOT_ALWAYS);
 
         searchEditText.clearFocus();
     }
 
     private void showDeleteSuggestionDialog(final SuggestionItem item) {
+        if (activity == null || historyRecordManager == null || suggestionPublisher == null ||
+                searchEditText == null || disposables == null) return;
+        final String query = item.query;
         new AlertDialog.Builder(activity)
-                .setTitle(item.query)
+                .setTitle(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();
+                .setPositiveButton(R.string.delete, (dialog, which) -> {
+                    final Disposable onDelete = historyRecordManager.deleteSearchHistory(query)
+                            .observeOn(AndroidSchedulers.mainThread())
+                            .subscribe(
+                                    howManyDeleted -> suggestionPublisher
+                                            .onNext(searchEditText.getText().toString()),
+                                    throwable -> showSnackBarError(throwable,
+                                            UserAction.DELETE_FROM_HISTORY, "none",
+                                            "Deleting item failed", R.string.general_error));
+                    disposables.add(onDelete);
+                })
+                .show();
     }
 
     @Override
     public boolean onBackPressed() {
-        if (suggestionsPanel.getVisibility() == View.VISIBLE && infoListAdapter.getItemsList().size() > 0 && !isLoading.get()) {
+        if (suggestionsPanel.getVisibility() == View.VISIBLE
+                && infoListAdapter.getItemsList().size() > 0
+                && !isLoading.get()) {
             hideSuggestionsPanel();
             hideKeyboardSearch();
-            searchEditText.setText(lastSearchedQuery);
+            searchEditText.setText(lastSearchedString);
             return true;
         }
         return false;
@@ -588,84 +603,70 @@ public class SearchFragment extends BaseListFragment<SearchResult, ListExtractor
 
         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;
-                    }
-                });
+                .startWith(searchString != null
+                        ? searchString
+                        : "")
+                .filter(searchString -> 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;
-                                    }
-                                });
+                .switchMap(query -> {
+                    final Flowable<List<SearchHistoryEntry>> flowable = historyRecordManager
+                            .getRelatedSearches(query, 3, 25);
+                    final Observable<List<SuggestionItem>> local = flowable.toObservable()
+                            .map(searchHistoryEntries -> {
+                                List<SuggestionItem> result = new ArrayList<>();
+                                for (SearchHistoryEntry entry : searchHistoryEntries)
+                                    result.add(new SuggestionItem(true, entry.getSearch()));
+                                return result;
+                            });
 
-                        if (query.length() < THRESHOLD_NETWORK_SUGGESTION) {
-                            // Only pass through if the query length is equal or greater than THRESHOLD_NETWORK_SUGGESTION
-                            return local.materialize();
+                    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)
+                            .toObservable()
+                            .map(strings -> {
+                                List<SuggestionItem> result = new ArrayList<>();
+                                for (String entry : strings) {
+                                    result.add(new SuggestionItem(false, entry));
+                                }
+                                return result;
+                            });
+
+                    return Observable.zip(local, network, (localResult, networkResult) -> {
+                        List<SuggestionItem> result = new ArrayList<>();
+                        if (localResult.size() > 0) result.addAll(localResult);
+
+                        // Remove duplicates
+                        final Iterator<SuggestionItem> iterator = networkResult.iterator();
+                        while (iterator.hasNext() && localResult.size() > 0) {
+                            final SuggestionItem next = iterator.next();
+                            for (SuggestionItem item : localResult) {
+                                if (item.query.equals(next.query)) {
+                                    iterator.remove();
+                                    break;
+                                }
+                            }
                         }
 
-                        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();
-                    }
+                        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);
-                            }
+                .subscribe(listNotification -> {
+                    if (listNotification.isOnNext()) {
+                        handleSuggestions(listNotification.getValue());
+                    } else if (listNotification.isOnError()) {
+                        Throwable error = listNotification.getError();
+                        if (!ExtractorHelper.hasAssignableCauseThrowable(error,
+                                IOException.class, SocketException.class,
+                                InterruptedException.class, InterruptedIOException.class)) {
+                            onSuggestionError(error);
                         }
                     }
                 });
@@ -676,53 +677,44 @@ public class SearchFragment extends BaseListFragment<SearchResult, ListExtractor
         // no-op
     }
 
-    private void search(final String query) {
-        if (DEBUG) Log.d(TAG, "search() called with: query = [" + query + "]");
-        if (query.isEmpty()) return;
+    private void search(final String searchString, String[] contentFilter, String sortFilter) {
+        if (DEBUG) Log.d(TAG, "search() called with: query = [" + searchString + "]");
+        if (searchString.isEmpty()) return;
 
         try {
-            final StreamingService service = NewPipe.getServiceByUrl(query);
+            final StreamingService service = NewPipe.getServiceByUrl(searchString);
             if (service != null) {
                 showLoading();
                 disposables.add(Observable
-                        .fromCallable(new Callable<Intent>() {
-                            @Override
-                            public Intent call() throws Exception {
-                                return NavigationHelper.getIntentByLink(activity, service, query);
-                            }
-                        })
+                        .fromCallable(() ->
+                                NavigationHelper.getIntentByLink(activity, service, searchString))
                         .subscribeOn(Schedulers.io())
                         .observeOn(AndroidSchedulers.mainThread())
-                        .subscribe(new Consumer<Intent>() {
-                            @Override
-                            public void accept(Intent intent) throws Exception {
-                                getFragmentManager().popBackStackImmediate();
-                                activity.startActivity(intent);
-                            }
-                        }, new Consumer<Throwable>() {
-                            @Override
-                            public void accept(Throwable throwable) throws Exception {
-                                showError(getString(R.string.url_not_supported_toast), false);
-                            }
-                        }));
+                        .subscribe(intent -> {
+                            getFragmentManager().popBackStackImmediate();
+                            activity.startActivity(intent);
+                        }, throwable ->
+                                showError(getString(R.string.url_not_supported_toast), false)));
                 return;
             }
         } catch (Exception e) {
             // Exception occurred, it's not a url
         }
 
-        lastSearchedQuery = query;
-        searchQuery = query;
-        currentPage = 0;
+        lastSearchedString = this.searchString;
+        this.searchString = searchString;
         infoListAdapter.clearStreamItemList();
         hideSuggestionsPanel();
         hideKeyboardSearch();
 
-        if (activity instanceof HistoryListener) {
-            ((HistoryListener) activity).onSearch(serviceId, query);
-            suggestionPublisher.onNext(query);
-        }
-
+        historyRecordManager.onSearched(serviceId, searchString)
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(
+                        ignored -> {},
+                        error -> showSnackBarError(error, UserAction.SEARCHED,
+                                NewPipe.getNameOfService(serviceId), searchString, 0)
+                );
+        suggestionPublisher.onNext(searchString);
         startLoading(false);
     }
 
@@ -731,22 +723,15 @@ public class SearchFragment extends BaseListFragment<SearchResult, ListExtractor
         super.startLoading(forceLoad);
         if (disposables != null) disposables.clear();
         if (searchDisposable != null) searchDisposable.dispose();
-        searchDisposable = ExtractorHelper.searchFor(serviceId, searchQuery, currentPage, contentCountry, filter)
+        searchDisposable = ExtractorHelper.searchFor(serviceId,
+                    searchString,
+                    Arrays.asList(contentFilter),
+                    sortFilter)
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
-                .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);
-                    }
-                });
+                .doOnEvent((searchResult, throwable) -> isLoading.set(false))
+                .subscribe(this::handleResult, this::onError);
+
     }
 
     @Override
@@ -754,23 +739,16 @@ public class SearchFragment extends BaseListFragment<SearchResult, ListExtractor
         isLoading.set(true);
         showListFooter(true);
         if (searchDisposable != null) searchDisposable.dispose();
-        currentNextPage = currentPage + 1;
-        searchDisposable = ExtractorHelper.getMoreSearchItems(serviceId, searchQuery, currentNextPage, contentCountry, filter)
+        searchDisposable = ExtractorHelper.getMoreSearchItems(
+                    serviceId,
+                    searchString,
+                    asList(contentFilter),
+                    sortFilter,
+                    nextPageUrl)
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
-                .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);
-                    }
-                });
+                .doOnEvent((nextItemsResult, throwable) -> isLoading.set(false))
+                .subscribe(this::handleNextItems, this::onError);
     }
 
     @Override
@@ -789,19 +767,22 @@ public class SearchFragment extends BaseListFragment<SearchResult, ListExtractor
     // Utils
     //////////////////////////////////////////////////////////////////////////*/
 
-    private void changeFilter(MenuItem item, SearchEngine.Filter filter) {
-        this.filter = filter;
+    private void changeContentFilter(MenuItem item, List<String> contentFilter) {
         this.filterItemCheckedId = item.getItemId();
         item.setChecked(true);
 
-        if (!TextUtils.isEmpty(searchQuery)) {
-            search(searchQuery);
+        this.contentFilter = new String[] {contentFilter.get(0)};
+
+        if (!TextUtils.isEmpty(searchString)) {
+            search(searchString, this.contentFilter, sortFilter);
         }
     }
 
-    private void setQuery(int serviceId, String searchQuery) {
+    private void setQuery(int serviceId, String searchString, String[] contentfilter, String sortFilter) {
         this.serviceId = serviceId;
-        this.searchQuery = searchQuery;
+        this.searchString = searchString;
+        this.contentFilter = contentfilter;
+        this.sortFilter = sortFilter;
     }
 
     /*//////////////////////////////////////////////////////////////////////////
@@ -811,12 +792,7 @@ public class SearchFragment extends BaseListFragment<SearchResult, ListExtractor
     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);
-            }
-        });
+        suggestionsRecyclerView.post(() -> suggestionListAdapter.setItems(suggestions));
 
         if (errorPanelRoot.getVisibility() == View.VISIBLE) {
             hideLoading();
@@ -827,8 +803,11 @@ public class SearchFragment extends BaseListFragment<SearchResult, ListExtractor
         if (DEBUG) Log.d(TAG, "onSuggestionError() called with: exception = [" + exception + "]");
         if (super.onError(exception)) return;
 
-        int errorId = exception instanceof ParsingException ? R.string.parsing_error : R.string.general_error;
-        onUnrecoverableError(exception, UserAction.GET_SUGGESTIONS, NewPipe.getNameOfService(serviceId), searchQuery, errorId);
+        int errorId = exception instanceof ParsingException
+                ? R.string.parsing_error
+                : R.string.general_error;
+        onUnrecoverableError(exception, UserAction.GET_SUGGESTIONS,
+                NewPipe.getNameOfService(serviceId), searchString, errorId);
     }
 
     /*//////////////////////////////////////////////////////////////////////////
@@ -853,16 +832,22 @@ public class SearchFragment extends BaseListFragment<SearchResult, ListExtractor
     //////////////////////////////////////////////////////////////////////////*/
 
     @Override
-    public void handleResult(@NonNull SearchResult result) {
-        if (!result.errors.isEmpty()) {
-            showSnackBarError(result.errors, UserAction.SEARCHED, NewPipe.getNameOfService(serviceId), searchQuery, 0);
+    public void handleResult(@NonNull SearchInfo result) {
+        final List<Throwable> exceptions = result.getErrors();
+        if (!exceptions.isEmpty()
+            && !(exceptions.size() == 1
+                && exceptions.get(0) instanceof SearchExtractor.NothingFoundException)){
+            showSnackBarError(result.getErrors(), UserAction.SEARCHED,
+                    NewPipe.getNameOfService(serviceId), searchString, 0);
         }
 
-        lastSearchedQuery = searchQuery;
+        lastSearchedString = searchString;
+        nextPageUrl = result.getNextPageUrl();
+        currentPageUrl = result.getUrl();
 
         if (infoListAdapter.getItemsList().size() == 0) {
-            if (!result.getResults().isEmpty()) {
-                infoListAdapter.addInfoItemList(result.getResults());
+            if (!result.getRelatedItems().isEmpty()) {
+                infoListAdapter.addInfoItemList(result.getRelatedItems());
             } else {
                 infoListAdapter.clearStreamItemList();
                 showEmptyState();
@@ -874,14 +859,16 @@ public class SearchFragment extends BaseListFragment<SearchResult, ListExtractor
     }
 
     @Override
-    public void handleNextItems(ListExtractor.NextItemsResult result) {
+    public void handleNextItems(ListExtractor.InfoItemsPage result) {
         showListFooter(false);
-        currentPage = Integer.parseInt(result.getNextItemsUrl());
-        infoListAdapter.addInfoItemList(result.getNextItemsList());
+        currentPageUrl = result.getNextPageUrl();
+        infoListAdapter.addInfoItemList(result.getItems());
+        nextPageUrl = result.getNextPageUrl();
 
         if (!result.getErrors().isEmpty()) {
-            showSnackBarError(result.getErrors(), UserAction.SEARCHED, NewPipe.getNameOfService(serviceId)
-                    , "\"" + searchQuery + "\" → page " + currentPage, 0);
+            showSnackBarError(result.getErrors(), UserAction.SEARCHED,
+                    NewPipe.getNameOfService(serviceId)
+                    , "\"" + searchString + "\" → page: " + nextPageUrl, 0);
         }
         super.handleNextItems(result);
     }
@@ -890,12 +877,15 @@ public class SearchFragment extends BaseListFragment<SearchResult, ListExtractor
     protected boolean onError(Throwable exception) {
         if (super.onError(exception)) return true;
 
-        if (exception instanceof SearchEngine.NothingFoundException) {
+        if (exception instanceof SearchExtractor.NothingFoundException) {
             infoListAdapter.clearStreamItemList();
             showEmptyState();
         } else {
-            int errorId = exception instanceof ParsingException ? R.string.parsing_error : R.string.general_error;
-            onUnrecoverableError(exception, UserAction.SEARCHED, NewPipe.getNameOfService(serviceId), searchQuery, errorId);
+            int errorId = exception instanceof ParsingException
+                    ? R.string.parsing_error
+                    : R.string.general_error;
+            onUnrecoverableError(exception, UserAction.SEARCHED,
+                    NewPipe.getNameOfService(serviceId), searchString, errorId);
         }
 
         return true;

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

@@ -63,24 +63,15 @@ public class SuggestionListAdapter extends RecyclerView.Adapter<SuggestionListAd
     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.setOnClickListener(v -> {
+            if (listener != null) listener.onSuggestionItemSelected(currentItem);
         });
-        holder.queryView.setOnLongClickListener(new View.OnLongClickListener() {
-            @Override
-            public boolean onLongClick(View v) {
+        holder.queryView.setOnLongClickListener(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);
-            }
+        holder.insertView.setOnClickListener(v -> {
+            if (listener != null) listener.onSuggestionItemInserted(currentItem);
         });
     }
 

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

@@ -1,259 +0,0 @@
-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/history/HistoryActivity.java

@@ -1,147 +0,0 @@
-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/HistoryFragment.java

@@ -1,312 +0,0 @@
-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/SearchHistoryFragment.java

@@ -1,90 +0,0 @@
-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

@@ -1,116 +0,0 @@
-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/InfoItemBuilder.java

@@ -16,8 +16,10 @@ import org.schabi.newpipe.info_list.holder.ChannelInfoItemHolder;
 import org.schabi.newpipe.info_list.holder.ChannelMiniInfoItemHolder;
 import org.schabi.newpipe.info_list.holder.InfoItemHolder;
 import org.schabi.newpipe.info_list.holder.PlaylistInfoItemHolder;
+import org.schabi.newpipe.info_list.holder.PlaylistMiniInfoItemHolder;
 import org.schabi.newpipe.info_list.holder.StreamInfoItemHolder;
 import org.schabi.newpipe.info_list.holder.StreamMiniInfoItemHolder;
+import org.schabi.newpipe.util.OnClickGesture;
 
 /*
  * Created by Christian Schabesberger on 26.09.16.
@@ -42,17 +44,12 @@ import org.schabi.newpipe.info_list.holder.StreamMiniInfoItemHolder;
 public class InfoItemBuilder {
     private static final String TAG = InfoItemBuilder.class.toString();
 
-    public interface OnInfoItemSelectedListener<T extends InfoItem> {
-        void selected(T selectedItem);
-        void held(T selectedItem);
-    }
-
     private final Context context;
-    private ImageLoader imageLoader = ImageLoader.getInstance();
+    private final ImageLoader imageLoader = ImageLoader.getInstance();
 
-    private OnInfoItemSelectedListener<StreamInfoItem> onStreamSelectedListener;
-    private OnInfoItemSelectedListener<ChannelInfoItem> onChannelSelectedListener;
-    private OnInfoItemSelectedListener<PlaylistInfoItem> onPlaylistSelectedListener;
+    private OnClickGesture<StreamInfoItem> onStreamSelectedListener;
+    private OnClickGesture<ChannelInfoItem> onChannelSelectedListener;
+    private OnClickGesture<PlaylistInfoItem> onPlaylistSelectedListener;
 
     public InfoItemBuilder(Context context) {
         this.context = context;
@@ -63,7 +60,7 @@ public class InfoItemBuilder {
     }
 
     public View buildView(@NonNull ViewGroup parent, @NonNull final InfoItem infoItem, boolean useMiniVariant) {
-        InfoItemHolder holder = holderFromInfoType(parent, infoItem.info_type, useMiniVariant);
+        InfoItemHolder holder = holderFromInfoType(parent, infoItem.getInfoType(), useMiniVariant);
         holder.updateFromItem(infoItem);
         return holder.itemView;
     }
@@ -75,7 +72,7 @@ public class InfoItemBuilder {
             case CHANNEL:
                 return useMiniVariant ? new ChannelMiniInfoItemHolder(this, parent) : new ChannelInfoItemHolder(this, parent);
             case PLAYLIST:
-                return new PlaylistInfoItemHolder(this, parent);
+                return useMiniVariant ? new PlaylistMiniInfoItemHolder(this, parent) : new PlaylistInfoItemHolder(this, parent);
             default:
                 Log.e(TAG, "Trollolo");
                 throw new RuntimeException("InfoType not expected = " + infoType.name());
@@ -90,27 +87,27 @@ public class InfoItemBuilder {
         return imageLoader;
     }
 
-    public OnInfoItemSelectedListener<StreamInfoItem> getOnStreamSelectedListener() {
+    public OnClickGesture<StreamInfoItem> getOnStreamSelectedListener() {
         return onStreamSelectedListener;
     }
 
-    public void setOnStreamSelectedListener(OnInfoItemSelectedListener<StreamInfoItem> listener) {
+    public void setOnStreamSelectedListener(OnClickGesture<StreamInfoItem> listener) {
         this.onStreamSelectedListener = listener;
     }
 
-    public OnInfoItemSelectedListener<ChannelInfoItem> getOnChannelSelectedListener() {
+    public OnClickGesture<ChannelInfoItem> getOnChannelSelectedListener() {
         return onChannelSelectedListener;
     }
 
-    public void setOnChannelSelectedListener(OnInfoItemSelectedListener<ChannelInfoItem> listener) {
+    public void setOnChannelSelectedListener(OnClickGesture<ChannelInfoItem> listener) {
         this.onChannelSelectedListener = listener;
     }
 
-    public OnInfoItemSelectedListener<PlaylistInfoItem> getOnPlaylistSelectedListener() {
+    public OnClickGesture<PlaylistInfoItem> getOnPlaylistSelectedListener() {
         return onPlaylistSelectedListener;
     }
 
-    public void setOnPlaylistSelectedListener(OnInfoItemSelectedListener<PlaylistInfoItem> listener) {
+    public void setOnPlaylistSelectedListener(OnClickGesture<PlaylistInfoItem> listener) {
         this.onPlaylistSelectedListener = listener;
     }
 

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

@@ -5,7 +5,6 @@ import android.app.AlertDialog;
 import android.content.DialogInterface;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
-import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.TextView;
 
@@ -19,7 +18,7 @@ public class InfoItemDialog {
                           @NonNull final StreamInfoItem info,
                           @NonNull final String[] commands,
                           @NonNull final DialogInterface.OnClickListener actions) {
-        this(activity, commands, actions, info.getName(), info.uploader_name);
+        this(activity, commands, actions, info.getName(), info.getUploaderName());
     }
 
     public InfoItemDialog(@NonNull final Activity activity,
@@ -28,8 +27,7 @@ public class InfoItemDialog {
                           @NonNull final String title,
                           @Nullable final String additionalDetail) {
 
-        final LayoutInflater inflater = activity.getLayoutInflater();
-        final View bannerView = inflater.inflate(R.layout.dialog_title, null);
+        final View bannerView = View.inflate(activity, R.layout.dialog_title, null);
         bannerView.setSelected(true);
 
         TextView titleView = bannerView.findViewById(R.id.itemTitleView);

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

@@ -1,6 +1,7 @@
 package org.schabi.newpipe.info_list;
 
 import android.app.Activity;
+import android.support.v7.widget.GridLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.util.Log;
 import android.view.View;
@@ -10,13 +11,18 @@ 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.ChannelGridInfoItemHolder;
 import org.schabi.newpipe.info_list.holder.InfoItemHolder;
+import org.schabi.newpipe.info_list.holder.PlaylistGridInfoItemHolder;
 import org.schabi.newpipe.info_list.holder.PlaylistInfoItemHolder;
+import org.schabi.newpipe.info_list.holder.PlaylistMiniInfoItemHolder;
+import org.schabi.newpipe.info_list.holder.StreamGridInfoItemHolder;
 import org.schabi.newpipe.info_list.holder.StreamInfoItemHolder;
 import org.schabi.newpipe.info_list.holder.StreamMiniInfoItemHolder;
+import org.schabi.newpipe.util.FallbackViewHolder;
+import org.schabi.newpipe.util.OnClickGesture;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -50,13 +56,18 @@ public class InfoListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
 
     private static final int MINI_STREAM_HOLDER_TYPE = 0x100;
     private static final int STREAM_HOLDER_TYPE = 0x101;
+    private static final int GRID_STREAM_HOLDER_TYPE = 0x102;
     private static final int MINI_CHANNEL_HOLDER_TYPE = 0x200;
     private static final int CHANNEL_HOLDER_TYPE = 0x201;
+    private static final int GRID_CHANNEL_HOLDER_TYPE = 0x202;
+    private static final int MINI_PLAYLIST_HOLDER_TYPE = 0x300;
     private static final int PLAYLIST_HOLDER_TYPE = 0x301;
+    private static final int GRID_PLAYLIST_HOLDER_TYPE = 0x302;
 
     private final InfoItemBuilder infoItemBuilder;
     private final ArrayList<InfoItem> infoItemList;
     private boolean useMiniVariant = false;
+    private boolean useGridVariant = false;
     private boolean showFooter = false;
     private View header = null;
     private View footer = null;
@@ -75,15 +86,15 @@ public class InfoListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
         infoItemList = new ArrayList<>();
     }
 
-    public void setOnStreamSelectedListener(OnInfoItemSelectedListener<StreamInfoItem> listener) {
+    public void setOnStreamSelectedListener(OnClickGesture<StreamInfoItem> listener) {
         infoItemBuilder.setOnStreamSelectedListener(listener);
     }
 
-    public void setOnChannelSelectedListener(OnInfoItemSelectedListener<ChannelInfoItem> listener) {
+    public void setOnChannelSelectedListener(OnClickGesture<ChannelInfoItem> listener) {
         infoItemBuilder.setOnChannelSelectedListener(listener);
     }
 
-    public void setOnPlaylistSelectedListener(OnInfoItemSelectedListener<PlaylistInfoItem> listener) {
+    public void setOnPlaylistSelectedListener(OnClickGesture<PlaylistInfoItem> listener) {
         infoItemBuilder.setOnPlaylistSelectedListener(listener);
     }
 
@@ -91,6 +102,10 @@ public class InfoListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
         this.useMiniVariant = useMiniVariant;
     }
 
+    public void setGridItemVariants(boolean useGridVariant) {
+        this.useGridVariant = useGridVariant;
+    }
+
     public void addInfoItemList(List<InfoItem> data) {
         if (data != null) {
             if (DEBUG) {
@@ -200,14 +215,14 @@ public class InfoListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
         if (footer != null && position == infoItemList.size() && showFooter) {
             return FOOTER_TYPE;
         }
-        InfoItem item = infoItemList.get(position);
-        switch (item.info_type) {
+        final InfoItem item = infoItemList.get(position);
+        switch (item.getInfoType()) {
             case STREAM:
-                return useMiniVariant ? MINI_STREAM_HOLDER_TYPE : STREAM_HOLDER_TYPE;
+                return useGridVariant ? GRID_STREAM_HOLDER_TYPE : useMiniVariant ? MINI_STREAM_HOLDER_TYPE : STREAM_HOLDER_TYPE;
             case CHANNEL:
-                return useMiniVariant ? MINI_CHANNEL_HOLDER_TYPE : CHANNEL_HOLDER_TYPE;
+                return useGridVariant ? GRID_CHANNEL_HOLDER_TYPE : useMiniVariant ? MINI_CHANNEL_HOLDER_TYPE : CHANNEL_HOLDER_TYPE;
             case PLAYLIST:
-                return PLAYLIST_HOLDER_TYPE;
+                return useGridVariant ? GRID_PLAYLIST_HOLDER_TYPE : useMiniVariant ? MINI_PLAYLIST_HOLDER_TYPE : PLAYLIST_HOLDER_TYPE;
             default:
                 Log.e(TAG, "Trollolo");
                 return -1;
@@ -226,15 +241,23 @@ public class InfoListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
                 return new StreamMiniInfoItemHolder(infoItemBuilder, parent);
             case STREAM_HOLDER_TYPE:
                 return new StreamInfoItemHolder(infoItemBuilder, parent);
+            case GRID_STREAM_HOLDER_TYPE:
+                return new StreamGridInfoItemHolder(infoItemBuilder, parent);
             case MINI_CHANNEL_HOLDER_TYPE:
                 return new ChannelMiniInfoItemHolder(infoItemBuilder, parent);
             case CHANNEL_HOLDER_TYPE:
                 return new ChannelInfoItemHolder(infoItemBuilder, parent);
+            case GRID_CHANNEL_HOLDER_TYPE:
+                return new ChannelGridInfoItemHolder(infoItemBuilder, parent);
+            case MINI_PLAYLIST_HOLDER_TYPE:
+                return new PlaylistMiniInfoItemHolder(infoItemBuilder, parent);
             case PLAYLIST_HOLDER_TYPE:
                 return new PlaylistInfoItemHolder(infoItemBuilder, parent);
+            case GRID_PLAYLIST_HOLDER_TYPE:
+                return new PlaylistGridInfoItemHolder(infoItemBuilder, parent);
             default:
                 Log.e(TAG, "Trollolo");
-                return null;
+                return new FallbackViewHolder(new View(parent.getContext()));
         }
     }
 
@@ -252,4 +275,14 @@ public class InfoListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
             ((HFHolder) holder).view = footer;
         }
     }
+
+    public GridLayoutManager.SpanSizeLookup getSpanSizeLookup(final int spanCount) {
+        return new GridLayoutManager.SpanSizeLookup() {
+            @Override
+            public int getSpanSize(int position) {
+                final int type = getItemViewType(position);
+                return type == HEADER_TYPE || type == FOOTER_TYPE ? spanCount : 1;
+            }
+        };
+    }
 }

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

@@ -0,0 +1,13 @@
+package org.schabi.newpipe.info_list.holder;
+
+import android.view.ViewGroup;
+
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.info_list.InfoItemBuilder;
+
+public class ChannelGridInfoItemHolder extends ChannelMiniInfoItemHolder {
+
+	public ChannelGridInfoItemHolder(InfoItemBuilder infoItemBuilder, ViewGroup parent) {
+		super(infoItemBuilder, R.layout.list_channel_grid_item, parent);
+	}
+}

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

@@ -44,15 +44,16 @@ public class ChannelInfoItemHolder extends ChannelMiniInfoItemHolder {
         if (!(infoItem instanceof ChannelInfoItem)) return;
         final ChannelInfoItem item = (ChannelInfoItem) infoItem;
 
-        itemChannelDescriptionView.setText(item.description);
+        itemChannelDescriptionView.setText(item.getDescription());
     }
 
     @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 (item.getStreamCount() >= 0) {
+            String formattedVideoAmount = Localization.localizeStreamCount(itemBuilder.getContext(),
+                    item.getStreamCount());
 
             if (!details.isEmpty()) {
                 details += " • " + formattedVideoAmount;

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

@@ -1,15 +1,13 @@
 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.ImageDisplayConstants;
 import org.schabi.newpipe.util.Localization;
 
 import de.hdodenhof.circleimageview.CircleImageView;
@@ -40,34 +38,30 @@ public class ChannelMiniInfoItemHolder extends InfoItemHolder {
         itemAdditionalDetailView.setText(getDetailLine(item));
 
         itemBuilder.getImageLoader()
-                .displayImage(item.thumbnail_url, itemThumbnailView, ChannelInfoItemHolder.DISPLAY_THUMBNAIL_OPTIONS);
+                .displayImage(item.getThumbnailUrl(),
+                        itemThumbnailView,
+                        ImageDisplayConstants.DISPLAY_THUMBNAIL_OPTIONS);
 
-        itemView.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                if (itemBuilder.getOnChannelSelectedListener() != null) {
-                    itemBuilder.getOnChannelSelectedListener().selected(item);
-                }
+        itemView.setOnClickListener(view -> {
+            if (itemBuilder.getOnChannelSelectedListener() != null) {
+                itemBuilder.getOnChannelSelectedListener().selected(item);
             }
         });
+
+        itemView.setOnLongClickListener(view -> {
+            if (itemBuilder.getOnChannelSelectedListener() != null) {
+                itemBuilder.getOnChannelSelectedListener().held(item);
+            }
+            return true;
+        });
     }
 
     protected String getDetailLine(final ChannelInfoItem item) {
         String details = "";
-        if (item.subscriber_count >= 0) {
-            details += Localization.shortSubscriberCount(itemBuilder.getContext(), item.subscriber_count);
+        if (item.getSubscriberCount() >= 0) {
+            details += Localization.shortSubscriberCount(itemBuilder.getContext(),
+                    item.getSubscriberCount());
         }
         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

@@ -4,8 +4,6 @@ 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;
 
@@ -38,16 +36,4 @@ public abstract class InfoItemHolder extends RecyclerView.ViewHolder {
     }
 
     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/PlaylistGridInfoItemHolder.java

@@ -0,0 +1,13 @@
+package org.schabi.newpipe.info_list.holder;
+
+import android.view.ViewGroup;
+
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.info_list.InfoItemBuilder;
+
+public class PlaylistGridInfoItemHolder extends PlaylistMiniInfoItemHolder {
+
+	public PlaylistGridInfoItemHolder(InfoItemBuilder infoItemBuilder, ViewGroup parent) {
+		super(infoItemBuilder, R.layout.list_playlist_grid_item, parent);
+	}
+}

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

@@ -1,62 +1,13 @@
 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 class PlaylistInfoItemHolder extends PlaylistMiniInfoItemHolder {
 
     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/PlaylistMiniInfoItemHolder.java

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

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

@@ -0,0 +1,13 @@
+package org.schabi.newpipe.info_list.holder;
+
+import android.view.ViewGroup;
+
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.info_list.InfoItemBuilder;
+
+public class StreamGridInfoItemHolder extends StreamMiniInfoItemHolder {
+
+	public StreamGridInfoItemHolder(InfoItemBuilder infoItemBuilder, ViewGroup parent) {
+		super(infoItemBuilder, R.layout.list_stream_grid_item, parent);
+	}
+}

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

@@ -51,14 +51,14 @@ public class StreamInfoItemHolder extends StreamMiniInfoItemHolder {
 
     private String getStreamInfoDetailLine(final StreamInfoItem infoItem) {
         String viewsAndDate = "";
-        if (infoItem.view_count >= 0) {
-            viewsAndDate = Localization.shortViewCount(itemBuilder.getContext(), infoItem.view_count);
+        if (infoItem.getViewCount() >= 0) {
+            viewsAndDate = Localization.shortViewCount(itemBuilder.getContext(), infoItem.getViewCount());
         }
-        if (!TextUtils.isEmpty(infoItem.upload_date)) {
+        if (!TextUtils.isEmpty(infoItem.getUploadDate())) {
             if (viewsAndDate.isEmpty()) {
-                viewsAndDate = infoItem.upload_date;
+                viewsAndDate = infoItem.getUploadDate();
             } else {
-                viewsAndDate += " • " + infoItem.upload_date;
+                viewsAndDate += " • " + infoItem.getUploadDate();
             }
         }
         return viewsAndDate;

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

@@ -6,13 +6,12 @@ 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.ImageDisplayConstants;
 import org.schabi.newpipe.util.Localization;
 
 public class StreamMiniInfoItemHolder extends InfoItemHolder {
@@ -41,15 +40,17 @@ public class StreamMiniInfoItemHolder extends InfoItemHolder {
         final StreamInfoItem item = (StreamInfoItem) infoItem;
 
         itemVideoTitleView.setText(item.getName());
-        itemUploaderView.setText(item.uploader_name);
+        itemUploaderView.setText(item.getUploaderName());
 
-        if (item.duration > 0) {
-            itemDurationView.setText(Localization.getDurationString(item.duration));
-            itemDurationView.setBackgroundColor(ContextCompat.getColor(itemBuilder.getContext(), R.color.duration_background_color));
+        if (item.getDuration() > 0) {
+            itemDurationView.setText(Localization.getDurationString(item.getDuration()));
+            itemDurationView.setBackgroundColor(ContextCompat.getColor(itemBuilder.getContext(),
+                    R.color.duration_background_color));
             itemDurationView.setVisibility(View.VISIBLE);
-        } else if (item.stream_type == StreamType.LIVE_STREAM) {
+        } else if (item.getStreamType() == StreamType.LIVE_STREAM) {
             itemDurationView.setText(R.string.duration_live);
-            itemDurationView.setBackgroundColor(ContextCompat.getColor(itemBuilder.getContext(), R.color.live_duration_background_color));
+            itemDurationView.setBackgroundColor(ContextCompat.getColor(itemBuilder.getContext(),
+                    R.color.live_duration_background_color));
             itemDurationView.setVisibility(View.VISIBLE);
         } else {
             itemDurationView.setVisibility(View.GONE);
@@ -57,25 +58,24 @@ public class StreamMiniInfoItemHolder extends InfoItemHolder {
 
         // 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);
+                .displayImage(item.getThumbnailUrl(),
+                        itemThumbnailView,
+                        ImageDisplayConstants.DISPLAY_THUMBNAIL_OPTIONS);
 
-        itemView.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                if (itemBuilder.getOnStreamSelectedListener() != null) {
-                    itemBuilder.getOnStreamSelectedListener().selected(item);
-                }
+        itemView.setOnClickListener(view -> {
+            if (itemBuilder.getOnStreamSelectedListener() != null) {
+                itemBuilder.getOnStreamSelectedListener().selected(item);
             }
         });
 
-        switch (item.stream_type) {
+        switch (item.getStreamType()) {
             case AUDIO_STREAM:
             case VIDEO_STREAM:
-            case FILE:
-                enableLongClick(item);
-                break;
             case LIVE_STREAM:
             case AUDIO_LIVE_STREAM:
+                enableLongClick(item);
+                break;
+            case FILE:
             case NONE:
             default:
                 disableLongClick();
@@ -85,14 +85,11 @@ public class StreamMiniInfoItemHolder extends InfoItemHolder {
 
     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;
+        itemView.setOnLongClickListener(view -> {
+            if (itemBuilder.getOnStreamSelectedListener() != null) {
+                itemBuilder.getOnStreamSelectedListener().held(item);
             }
+            return true;
         });
     }
 
@@ -100,15 +97,4 @@ public class StreamMiniInfoItemHolder extends InfoItemHolder {
         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/local/BaseLocalListFragment.java

@@ -0,0 +1,239 @@
+package org.schabi.newpipe.local;
+
+import android.content.SharedPreferences;
+import android.content.res.Configuration;
+import android.content.res.Resources;
+import android.os.Bundle;
+import android.preference.PreferenceManager;
+import android.support.v4.app.Fragment;
+import android.support.v7.app.ActionBar;
+import android.support.v7.widget.GridLayoutManager;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.util.Log;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.View;
+
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.fragments.BaseStateFragment;
+import org.schabi.newpipe.fragments.list.ListViewContract;
+
+import static org.schabi.newpipe.util.AnimationUtils.animateView;
+
+/**
+ * This fragment is design to be used with persistent data such as
+ * {@link org.schabi.newpipe.database.LocalItem}, and does not cache the data contained
+ * in the list adapter to avoid extra writes when the it exits or re-enters its lifecycle.
+ *
+ * This fragment destroys its adapter and views when {@link Fragment#onDestroyView()} is
+ * called and is memory efficient when in backstack.
+ * */
+public abstract class BaseLocalListFragment<I, N> extends BaseStateFragment<I>
+        implements ListViewContract<I, N>, SharedPreferences.OnSharedPreferenceChangeListener {
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Views
+    //////////////////////////////////////////////////////////////////////////*/
+
+    protected View headerRootView;
+    protected View footerRootView;
+
+    protected LocalItemListAdapter itemListAdapter;
+    protected RecyclerView itemsList;
+    private int updateFlags = 0;
+
+    private static final int LIST_MODE_UPDATE_FLAG = 0x32;
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Lifecycle - Creation
+    //////////////////////////////////////////////////////////////////////////*/
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setHasOptionsMenu(true);
+        PreferenceManager.getDefaultSharedPreferences(activity)
+                .registerOnSharedPreferenceChangeListener(this);
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        PreferenceManager.getDefaultSharedPreferences(activity)
+                .unregisterOnSharedPreferenceChangeListener(this);
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        if (updateFlags != 0) {
+            if ((updateFlags & LIST_MODE_UPDATE_FLAG) != 0) {
+                final boolean useGrid = isGridLayout();
+                itemsList.setLayoutManager(useGrid ? getGridLayoutManager() : getListLayoutManager());
+                itemListAdapter.setGridItemVariants(useGrid);
+                itemListAdapter.notifyDataSetChanged();
+            }
+            updateFlags = 0;
+        }
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Lifecycle - View
+    //////////////////////////////////////////////////////////////////////////*/
+
+    protected View getListHeader() {
+        return null;
+    }
+
+    protected View getListFooter() {
+        return activity.getLayoutInflater().inflate(R.layout.pignate_footer, itemsList, false);
+    }
+
+    protected RecyclerView.LayoutManager getGridLayoutManager() {
+        final Resources resources = activity.getResources();
+        int width = resources.getDimensionPixelSize(R.dimen.video_item_grid_thumbnail_image_width);
+        width += (24 * resources.getDisplayMetrics().density);
+        final int spanCount = (int) Math.floor(resources.getDisplayMetrics().widthPixels / (double)width);
+        final GridLayoutManager lm = new GridLayoutManager(activity, spanCount);
+        lm.setSpanSizeLookup(itemListAdapter.getSpanSizeLookup(spanCount));
+        return lm;
+    }
+
+    protected RecyclerView.LayoutManager getListLayoutManager() {
+        return new LinearLayoutManager(activity);
+    }
+
+    @Override
+    protected void initViews(View rootView, Bundle savedInstanceState) {
+        super.initViews(rootView, savedInstanceState);
+
+        itemListAdapter = new LocalItemListAdapter(activity);
+
+        final boolean useGrid = isGridLayout();
+        itemsList = rootView.findViewById(R.id.items_list);
+        itemsList.setLayoutManager(useGrid ? getGridLayoutManager() : getListLayoutManager());
+
+        itemListAdapter.setGridItemVariants(useGrid);
+        itemListAdapter.setHeader(headerRootView = getListHeader());
+        itemListAdapter.setFooter(footerRootView = getListFooter());
+
+        itemsList.setAdapter(itemListAdapter);
+    }
+
+    @Override
+    protected void initListeners() {
+        super.initListeners();
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Lifecycle - Menu
+    //////////////////////////////////////////////////////////////////////////*/
+
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        super.onCreateOptionsMenu(menu, inflater);
+        if (DEBUG) Log.d(TAG, "onCreateOptionsMenu() called with: menu = [" + menu +
+                "], inflater = [" + inflater + "]");
+
+        final ActionBar supportActionBar = activity.getSupportActionBar();
+        if (supportActionBar == null) return;
+
+        supportActionBar.setDisplayShowTitleEnabled(true);
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Lifecycle - Destruction
+    //////////////////////////////////////////////////////////////////////////*/
+
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        itemsList = null;
+        itemListAdapter = null;
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Contract
+    //////////////////////////////////////////////////////////////////////////*/
+
+    @Override
+    public void startLoading(boolean forceLoad) {
+        super.startLoading(forceLoad);
+        resetFragment();
+    }
+
+    @Override
+    public void showLoading() {
+        super.showLoading();
+        if (itemsList != null) animateView(itemsList, false, 200);
+        if (headerRootView != null) animateView(headerRootView, false, 200);
+    }
+
+    @Override
+    public void hideLoading() {
+        super.hideLoading();
+        if (itemsList != null) animateView(itemsList, true, 200);
+        if (headerRootView != null) animateView(headerRootView, true, 200);
+    }
+
+    @Override
+    public void showError(String message, boolean showRetryButton) {
+        super.showError(message, showRetryButton);
+        showListFooter(false);
+
+        if (itemsList != null) animateView(itemsList, false, 200);
+        if (headerRootView != null) animateView(headerRootView, false, 200);
+    }
+
+    @Override
+    public void showEmptyState() {
+        super.showEmptyState();
+        showListFooter(false);
+    }
+
+    @Override
+    public void showListFooter(final boolean show) {
+        if (itemsList == null) return;
+        itemsList.post(() -> {
+            if (itemListAdapter != null) itemListAdapter.showFooter(show);
+        });
+    }
+
+    @Override
+    public void handleNextItems(N result) {
+        isLoading.set(false);
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Error handling
+    //////////////////////////////////////////////////////////////////////////*/
+
+    protected void resetFragment() {
+        if (itemListAdapter != null) itemListAdapter.clearStreamItemList();
+    }
+
+    @Override
+    protected boolean onError(Throwable exception) {
+        resetFragment();
+        return super.onError(exception);
+    }
+
+    @Override
+    public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
+        if (key.equals(getString(R.string.list_view_mode_key))) {
+            updateFlags |= LIST_MODE_UPDATE_FLAG;
+        }
+    }
+
+    protected boolean isGridLayout() {
+        final String list_mode = PreferenceManager.getDefaultSharedPreferences(activity).getString(getString(R.string.list_view_mode_key), getString(R.string.list_view_mode_value));
+        if ("auto".equals(list_mode)) {
+            final Configuration configuration = getResources().getConfiguration();
+            return configuration.orientation == Configuration.ORIENTATION_LANDSCAPE
+                    && configuration.isLayoutSizeAtLeast(Configuration.SCREENLAYOUT_SIZE_LARGE);
+        } else {
+            return "grid".equals(list_mode);
+        }
+    }
+}

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

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

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

@@ -0,0 +1,60 @@
+package org.schabi.newpipe.local;
+
+import android.content.Context;
+import android.widget.ImageView;
+
+import com.nostra13.universalimageloader.core.DisplayImageOptions;
+import com.nostra13.universalimageloader.core.ImageLoader;
+
+import org.schabi.newpipe.database.LocalItem;
+import org.schabi.newpipe.util.OnClickGesture;
+
+/*
+ * Created by Christian Schabesberger on 26.09.16.
+ * <p>
+ * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
+ * InfoItemBuilder.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 LocalItemBuilder {
+    private static final String TAG = LocalItemBuilder.class.toString();
+
+    private final Context context;
+    private final ImageLoader imageLoader = ImageLoader.getInstance();
+
+    private OnClickGesture<LocalItem> onSelectedListener;
+
+    public LocalItemBuilder(Context context) {
+        this.context = context;
+    }
+
+    public Context getContext() {
+        return context;
+    }
+
+    public void displayImage(final String url, final ImageView view,
+                             final DisplayImageOptions options) {
+        imageLoader.displayImage(url, view, options);
+    }
+
+    public OnClickGesture<LocalItem> getOnItemSelectedListener() {
+        return onSelectedListener;
+    }
+
+    public void setOnItemSelectedListener(OnClickGesture<LocalItem> listener) {
+        this.onSelectedListener = listener;
+    }
+}

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

@@ -0,0 +1,280 @@
+package org.schabi.newpipe.local;
+
+import android.app.Activity;
+import android.support.v7.widget.GridLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.util.Log;
+import android.view.View;
+import android.view.ViewGroup;
+
+import org.schabi.newpipe.database.LocalItem;
+import org.schabi.newpipe.local.holder.LocalItemHolder;
+import org.schabi.newpipe.local.holder.LocalPlaylistGridItemHolder;
+import org.schabi.newpipe.local.holder.LocalPlaylistItemHolder;
+import org.schabi.newpipe.local.holder.LocalPlaylistStreamGridItemHolder;
+import org.schabi.newpipe.local.holder.LocalPlaylistStreamItemHolder;
+import org.schabi.newpipe.local.holder.LocalStatisticStreamGridItemHolder;
+import org.schabi.newpipe.local.holder.LocalStatisticStreamItemHolder;
+import org.schabi.newpipe.local.holder.RemotePlaylistGridItemHolder;
+import org.schabi.newpipe.local.holder.RemotePlaylistItemHolder;
+import org.schabi.newpipe.util.FallbackViewHolder;
+import org.schabi.newpipe.util.Localization;
+import org.schabi.newpipe.util.OnClickGesture;
+
+import java.text.DateFormat;
+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>
+ * InfoListAdapter.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 LocalItemListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
+    
+    private static final String TAG = LocalItemListAdapter.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 STREAM_STATISTICS_HOLDER_TYPE = 0x1000;
+    private static final int STREAM_PLAYLIST_HOLDER_TYPE = 0x1001;
+    private static final int STREAM_STATISTICS_GRID_HOLDER_TYPE = 0x1002;
+    private static final int STREAM_PLAYLIST_GRID_HOLDER_TYPE = 0x1004;
+    private static final int LOCAL_PLAYLIST_HOLDER_TYPE = 0x2000;
+    private static final int REMOTE_PLAYLIST_HOLDER_TYPE = 0x2001;
+	private static final int LOCAL_PLAYLIST_GRID_HOLDER_TYPE = 0x2002;
+	private static final int REMOTE_PLAYLIST_GRID_HOLDER_TYPE = 0x2004;
+
+    private final LocalItemBuilder localItemBuilder;
+    private final ArrayList<LocalItem> localItems;
+    private final DateFormat dateFormat;
+
+    private boolean showFooter = false;
+    private boolean useGridVariant = false;
+    private View header = null;
+    private View footer = null;
+
+    public LocalItemListAdapter(Activity activity) {
+        localItemBuilder = new LocalItemBuilder(activity);
+        localItems = new ArrayList<>();
+        dateFormat = DateFormat.getDateInstance(DateFormat.SHORT,
+                Localization.getPreferredLocale(activity));
+    }
+
+    public void setSelectedListener(OnClickGesture<LocalItem> listener) {
+        localItemBuilder.setOnItemSelectedListener(listener);
+    }
+
+    public void unsetSelectedListener() {
+        localItemBuilder.setOnItemSelectedListener(null);
+    }
+
+    public void addItems(List<? extends LocalItem> data) {
+        if (data != null) {
+            if (DEBUG) {
+                Log.d(TAG, "addItems() before > localItems.size() = " +
+                        localItems.size() + ", data.size() = " + data.size());
+            }
+
+            int offsetStart = sizeConsideringHeader();
+            localItems.addAll(data);
+
+            if (DEBUG) {
+                Log.d(TAG, "addItems() after > offsetStart = " + offsetStart +
+                        ", localItems.size() = " + localItems.size() +
+                        ", header = " + header + ", footer = " + footer +
+                        ", showFooter = " + showFooter);
+            }
+
+            notifyItemRangeInserted(offsetStart, data.size());
+
+            if (footer != null && showFooter) {
+                int footerNow = sizeConsideringHeader();
+                notifyItemMoved(offsetStart, footerNow);
+
+                if (DEBUG) Log.d(TAG, "addItems() footer from " + offsetStart +
+                        " to " + footerNow);
+            }
+        }
+    }
+
+    public void removeItem(final LocalItem data) {
+        final int index = localItems.indexOf(data);
+
+        localItems.remove(index);
+        notifyItemRemoved(index + (header != null ? 1 : 0));
+    }
+
+    public boolean swapItems(int fromAdapterPosition, int toAdapterPosition) {
+        final int actualFrom = adapterOffsetWithoutHeader(fromAdapterPosition);
+        final int actualTo = adapterOffsetWithoutHeader(toAdapterPosition);
+
+        if (actualFrom < 0 || actualTo < 0) return false;
+        if (actualFrom >= localItems.size() || actualTo >= localItems.size()) return false;
+
+        localItems.add(actualTo, localItems.remove(actualFrom));
+        notifyItemMoved(fromAdapterPosition, toAdapterPosition);
+        return true;
+    }
+
+    public void clearStreamItemList() {
+        if (localItems.isEmpty()) {
+            return;
+        }
+        localItems.clear();
+        notifyDataSetChanged();
+    }
+
+    public void setGridItemVariants(boolean useGridVariant) {
+        this.useGridVariant = useGridVariant;
+    }
+
+    public void setHeader(View header) {
+        boolean changed = header != this.header;
+        this.header = header;
+        if (changed) notifyDataSetChanged();
+    }
+
+    public void setFooter(View view) {
+        this.footer = view;
+    }
+
+    public void showFooter(boolean show) {
+        if (DEBUG) Log.d(TAG, "showFooter() called with: show = [" + show + "]");
+        if (show == showFooter) return;
+
+        showFooter = show;
+        if (show) notifyItemInserted(sizeConsideringHeader());
+        else notifyItemRemoved(sizeConsideringHeader());
+    }
+
+    private int adapterOffsetWithoutHeader(final int offset) {
+        return offset - (header != null ? 1 : 0);
+    }
+
+    private int sizeConsideringHeader() {
+        return localItems.size() + (header != null ? 1 : 0);
+    }
+
+    public ArrayList<LocalItem> getItemsList() {
+        return localItems;
+    }
+
+    @Override
+    public int getItemCount() {
+        int count = localItems.size();
+        if (header != null) count++;
+        if (footer != null && showFooter) count++;
+
+        if (DEBUG) {
+            Log.d(TAG, "getItemCount() called, count = " + count +
+                    ", localItems.size() = " + localItems.size() +
+                    ", header = " + header + ", footer = " + footer +
+                    ", showFooter = " + showFooter);
+        }
+        return count;
+    }
+
+    @Override
+    public int getItemViewType(int position) {
+        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 == localItems.size() && showFooter) {
+            return FOOTER_TYPE;
+        }
+        final LocalItem item = localItems.get(position);
+
+        switch (item.getLocalItemType()) {
+            case PLAYLIST_LOCAL_ITEM: return useGridVariant ? LOCAL_PLAYLIST_GRID_HOLDER_TYPE : LOCAL_PLAYLIST_HOLDER_TYPE;
+            case PLAYLIST_REMOTE_ITEM: return useGridVariant ? REMOTE_PLAYLIST_GRID_HOLDER_TYPE : REMOTE_PLAYLIST_HOLDER_TYPE;
+
+            case PLAYLIST_STREAM_ITEM: return useGridVariant ? STREAM_PLAYLIST_GRID_HOLDER_TYPE : STREAM_PLAYLIST_HOLDER_TYPE;
+            case STATISTIC_STREAM_ITEM: return useGridVariant ? STREAM_STATISTICS_GRID_HOLDER_TYPE : STREAM_STATISTICS_HOLDER_TYPE;
+            default:
+                Log.e(TAG, "No holder type has been considered for item: [" +
+                        item.getLocalItemType() + "]");
+                return -1;
+        }
+    }
+
+    @Override
+    public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int type) {
+        if (DEBUG) Log.d(TAG, "onCreateViewHolder() called with: parent = [" +
+                parent + "], type = [" + type + "]");
+        switch (type) {
+            case HEADER_TYPE:
+                return new HeaderFooterHolder(header);
+            case FOOTER_TYPE:
+                return new HeaderFooterHolder(footer);
+            case LOCAL_PLAYLIST_HOLDER_TYPE:
+                return new LocalPlaylistItemHolder(localItemBuilder, parent);
+            case LOCAL_PLAYLIST_GRID_HOLDER_TYPE:
+                return new LocalPlaylistGridItemHolder(localItemBuilder, parent);
+            case REMOTE_PLAYLIST_HOLDER_TYPE:
+                return new RemotePlaylistItemHolder(localItemBuilder, parent);
+            case REMOTE_PLAYLIST_GRID_HOLDER_TYPE:
+                return new RemotePlaylistGridItemHolder(localItemBuilder, parent);
+            case STREAM_PLAYLIST_HOLDER_TYPE:
+                return new LocalPlaylistStreamItemHolder(localItemBuilder, parent);
+            case STREAM_PLAYLIST_GRID_HOLDER_TYPE:
+                return new LocalPlaylistStreamGridItemHolder(localItemBuilder, parent);
+            case STREAM_STATISTICS_HOLDER_TYPE:
+                return new LocalStatisticStreamItemHolder(localItemBuilder, parent);
+            case STREAM_STATISTICS_GRID_HOLDER_TYPE:
+                return new LocalStatisticStreamGridItemHolder(localItemBuilder, parent);
+            default:
+                Log.e(TAG, "No view type has been considered for holder: [" + type + "]");
+                return new FallbackViewHolder(new View(parent.getContext()));
+        }
+    }
+
+    @Override
+    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 LocalItemHolder) {
+            // If header isn't null, offset the items by -1
+            if (header != null) position--;
+
+            ((LocalItemHolder) holder).updateFromItem(localItems.get(position), dateFormat);
+        } else if (holder instanceof HeaderFooterHolder && position == 0 && header != null) {
+            ((HeaderFooterHolder) holder).view = header;
+        } else if (holder instanceof HeaderFooterHolder && position == sizeConsideringHeader()
+                && footer != null && showFooter) {
+            ((HeaderFooterHolder) holder).view = footer;
+        }
+    }
+
+    public GridLayoutManager.SpanSizeLookup getSpanSizeLookup(final int spanCount) {
+        return new GridLayoutManager.SpanSizeLookup() {
+            @Override
+            public int getSpanSize(int position) {
+                final int type = getItemViewType(position);
+                return type == HEADER_TYPE || type == FOOTER_TYPE ? spanCount : 1;
+            }
+        };
+    }
+}

app/src/main/java/org/schabi/newpipe/local/bookmark/BookmarkFragment.java

@@ -0,0 +1,287 @@
+package org.schabi.newpipe.local.bookmark;
+
+import android.app.AlertDialog;
+import android.os.Bundle;
+import android.os.Parcelable;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.v4.app.FragmentManager;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import org.reactivestreams.Subscriber;
+import org.reactivestreams.Subscription;
+import org.schabi.newpipe.NewPipeDatabase;
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.database.AppDatabase;
+import org.schabi.newpipe.database.LocalItem;
+import org.schabi.newpipe.database.playlist.PlaylistLocalItem;
+import org.schabi.newpipe.database.playlist.PlaylistMetadataEntry;
+import org.schabi.newpipe.database.playlist.model.PlaylistRemoteEntity;
+import org.schabi.newpipe.local.BaseLocalListFragment;
+import org.schabi.newpipe.local.playlist.LocalPlaylistManager;
+import org.schabi.newpipe.local.playlist.RemotePlaylistManager;
+import org.schabi.newpipe.report.UserAction;
+import org.schabi.newpipe.util.NavigationHelper;
+import org.schabi.newpipe.util.OnClickGesture;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import icepick.State;
+import io.reactivex.Flowable;
+import io.reactivex.Single;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.disposables.CompositeDisposable;
+
+public final class BookmarkFragment
+        extends BaseLocalListFragment<List<PlaylistLocalItem>, Void> {
+
+    @State
+    protected Parcelable itemsListState;
+
+    private Subscription databaseSubscription;
+    private CompositeDisposable disposables = new CompositeDisposable();
+    private LocalPlaylistManager localPlaylistManager;
+    private RemotePlaylistManager remotePlaylistManager;
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Fragment LifeCycle - Creation
+    ///////////////////////////////////////////////////////////////////////////
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        if (activity == null) return;
+        final AppDatabase database = NewPipeDatabase.getInstance(activity);
+        localPlaylistManager = new LocalPlaylistManager(database);
+        remotePlaylistManager = new RemotePlaylistManager(database);
+        disposables = new CompositeDisposable();
+    }
+
+    @Nullable
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater,
+                             @Nullable ViewGroup container,
+                             Bundle savedInstanceState) {
+
+        if(!useAsFrontPage) {
+            setTitle(activity.getString(R.string.tab_bookmarks));
+        }
+        return inflater.inflate(R.layout.fragment_bookmarks, container, false);
+    }
+
+
+    @Override
+    public void setUserVisibleHint(boolean isVisibleToUser) {
+        super.setUserVisibleHint(isVisibleToUser);
+        if (activity != null && isVisibleToUser) {
+            setTitle(activity.getString(R.string.tab_bookmarks));
+        }
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Fragment LifeCycle - Views
+    ///////////////////////////////////////////////////////////////////////////
+
+    @Override
+    protected void initViews(View rootView, Bundle savedInstanceState) {
+        super.initViews(rootView, savedInstanceState);
+    }
+
+    @Override
+    protected void initListeners() {
+        super.initListeners();
+
+        itemListAdapter.setSelectedListener(new OnClickGesture<LocalItem>() {
+            @Override
+            public void selected(LocalItem selectedItem) {
+                final FragmentManager fragmentManager = getFM();
+
+                if (selectedItem instanceof PlaylistMetadataEntry) {
+                    final PlaylistMetadataEntry entry = ((PlaylistMetadataEntry) selectedItem);
+                    NavigationHelper.openLocalPlaylistFragment(fragmentManager, entry.uid,
+                            entry.name);
+
+                } else if (selectedItem instanceof PlaylistRemoteEntity) {
+                    final PlaylistRemoteEntity entry = ((PlaylistRemoteEntity) selectedItem);
+                    NavigationHelper.openPlaylistFragment(
+                            fragmentManager,
+                            entry.getServiceId(),
+                            entry.getUrl(),
+                            entry.getName());
+                }
+            }
+
+            @Override
+            public void held(LocalItem selectedItem) {
+                if (selectedItem instanceof PlaylistMetadataEntry) {
+                    showLocalDeleteDialog((PlaylistMetadataEntry) selectedItem);
+
+                } else if (selectedItem instanceof PlaylistRemoteEntity) {
+                    showRemoteDeleteDialog((PlaylistRemoteEntity) selectedItem);
+                }
+            }
+        });
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Fragment LifeCycle - Loading
+    ///////////////////////////////////////////////////////////////////////////
+
+    @Override
+    public void startLoading(boolean forceLoad) {
+        super.startLoading(forceLoad);
+
+        Flowable.combineLatest(
+                localPlaylistManager.getPlaylists(),
+                remotePlaylistManager.getPlaylists(),
+                BookmarkFragment::merge
+        ).onBackpressureLatest()
+         .observeOn(AndroidSchedulers.mainThread())
+         .subscribe(getPlaylistsSubscriber());
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Fragment LifeCycle - Destruction
+    ///////////////////////////////////////////////////////////////////////////
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        itemsListState = itemsList.getLayoutManager().onSaveInstanceState();
+    }
+
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+
+        if (disposables != null) disposables.clear();
+        if (databaseSubscription != null) databaseSubscription.cancel();
+
+        databaseSubscription = null;
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        if (disposables != null) disposables.dispose();
+
+        disposables = null;
+        localPlaylistManager = null;
+        remotePlaylistManager = null;
+        itemsListState = null;
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Subscriptions Loader
+    ///////////////////////////////////////////////////////////////////////////
+
+    private Subscriber<List<PlaylistLocalItem>> getPlaylistsSubscriber() {
+        return new Subscriber<List<PlaylistLocalItem>>() {
+            @Override
+            public void onSubscribe(Subscription s) {
+                showLoading();
+                if (databaseSubscription != null) databaseSubscription.cancel();
+                databaseSubscription = s;
+                databaseSubscription.request(1);
+            }
+
+            @Override
+            public void onNext(List<PlaylistLocalItem> subscriptions) {
+                handleResult(subscriptions);
+                if (databaseSubscription != null) databaseSubscription.request(1);
+            }
+
+            @Override
+            public void onError(Throwable exception) {
+                BookmarkFragment.this.onError(exception);
+            }
+
+            @Override
+            public void onComplete() {
+            }
+        };
+    }
+
+    @Override
+    public void handleResult(@NonNull List<PlaylistLocalItem> result) {
+        super.handleResult(result);
+
+        itemListAdapter.clearStreamItemList();
+
+        if (result.isEmpty()) {
+            showEmptyState();
+            return;
+        }
+
+        itemListAdapter.addItems(result);
+        if (itemsListState != null) {
+            itemsList.getLayoutManager().onRestoreInstanceState(itemsListState);
+            itemsListState = null;
+        }
+        hideLoading();
+    }
+    ///////////////////////////////////////////////////////////////////////////
+    // Fragment Error Handling
+    ///////////////////////////////////////////////////////////////////////////
+
+    @Override
+    protected boolean onError(Throwable exception) {
+        if (super.onError(exception)) return true;
+
+        onUnrecoverableError(exception, UserAction.SOMETHING_ELSE,
+                "none", "Bookmark", R.string.general_error);
+        return true;
+    }
+
+    @Override
+    protected void resetFragment() {
+        super.resetFragment();
+        if (disposables != null) disposables.clear();
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Utils
+    ///////////////////////////////////////////////////////////////////////////
+
+    private void showLocalDeleteDialog(final PlaylistMetadataEntry item) {
+        showDeleteDialog(item.name, localPlaylistManager.deletePlaylist(item.uid));
+    }
+
+    private void showRemoteDeleteDialog(final PlaylistRemoteEntity item) {
+        showDeleteDialog(item.getName(), remotePlaylistManager.deletePlaylist(item.getUid()));
+    }
+
+    private void showDeleteDialog(final String name, final Single<Integer> deleteReactor) {
+        if (activity == null || disposables == null) return;
+
+        new AlertDialog.Builder(activity)
+                .setTitle(name)
+                .setMessage(R.string.delete_playlist_prompt)
+                .setCancelable(true)
+                .setPositiveButton(R.string.delete, (dialog, i) ->
+                        disposables.add(deleteReactor
+                                .observeOn(AndroidSchedulers.mainThread())
+                                .subscribe(ignored -> {/*Do nothing on success*/}, this::onError))
+                )
+                .setNegativeButton(R.string.cancel, null)
+                .show();
+    }
+
+    private static List<PlaylistLocalItem> merge(final List<PlaylistMetadataEntry> localPlaylists,
+                                                 final List<PlaylistRemoteEntity> remotePlaylists) {
+        List<PlaylistLocalItem> items = new ArrayList<>(
+                localPlaylists.size() + remotePlaylists.size());
+        items.addAll(localPlaylists);
+        items.addAll(remotePlaylists);
+
+        Collections.sort(items, (left, right) ->
+                left.getOrderingName().compareToIgnoreCase(right.getOrderingName()));
+
+        return items;
+    }
+}
+

app/src/main/java/org/schabi/newpipe/local/dialog/PlaylistAppendDialog.java

@@ -0,0 +1,161 @@
+package org.schabi.newpipe.local.dialog;
+
+import android.annotation.SuppressLint;
+import android.os.Bundle;
+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 android.widget.Toast;
+
+import org.schabi.newpipe.NewPipeDatabase;
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.database.LocalItem;
+import org.schabi.newpipe.database.playlist.PlaylistMetadataEntry;
+import org.schabi.newpipe.database.stream.model.StreamEntity;
+import org.schabi.newpipe.extractor.stream.StreamInfo;
+import org.schabi.newpipe.extractor.stream.StreamInfoItem;
+import org.schabi.newpipe.local.LocalItemListAdapter;
+import org.schabi.newpipe.local.playlist.LocalPlaylistManager;
+import org.schabi.newpipe.player.playqueue.PlayQueueItem;
+import org.schabi.newpipe.util.OnClickGesture;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.disposables.Disposable;
+
+public final class PlaylistAppendDialog extends PlaylistDialog {
+    private static final String TAG = PlaylistAppendDialog.class.getCanonicalName();
+
+    private RecyclerView playlistRecyclerView;
+    private LocalItemListAdapter playlistAdapter;
+
+    private Disposable playlistReactor;
+
+    public static PlaylistAppendDialog fromStreamInfo(final StreamInfo info) {
+        PlaylistAppendDialog dialog = new PlaylistAppendDialog();
+        dialog.setInfo(Collections.singletonList(new StreamEntity(info)));
+        return dialog;
+    }
+
+    public static PlaylistAppendDialog fromStreamInfoItems(final List<StreamInfoItem> items) {
+        PlaylistAppendDialog dialog = new PlaylistAppendDialog();
+        List<StreamEntity> entities = new ArrayList<>(items.size());
+        for (final StreamInfoItem item : items) {
+            entities.add(new StreamEntity(item));
+        }
+        dialog.setInfo(entities);
+        return dialog;
+    }
+
+    public static PlaylistAppendDialog fromPlayQueueItems(final List<PlayQueueItem> items) {
+        PlaylistAppendDialog dialog = new PlaylistAppendDialog();
+        List<StreamEntity> entities = new ArrayList<>(items.size());
+        for (final PlayQueueItem item : items) {
+            entities.add(new StreamEntity(item));
+        }
+        dialog.setInfo(entities);
+        return dialog;
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // LifeCycle - Creation
+    //////////////////////////////////////////////////////////////////////////*/
+
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        return inflater.inflate(R.layout.dialog_playlists, container);
+    }
+
+    @Override
+    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+
+        final LocalPlaylistManager playlistManager =
+                new LocalPlaylistManager(NewPipeDatabase.getInstance(getContext()));
+
+        playlistAdapter = new LocalItemListAdapter(getActivity());
+        playlistAdapter.setSelectedListener(new OnClickGesture<LocalItem>() {
+            @Override
+            public void selected(LocalItem selectedItem) {
+                if (!(selectedItem instanceof PlaylistMetadataEntry) || getStreams() == null)
+                    return;
+                onPlaylistSelected(playlistManager, (PlaylistMetadataEntry) selectedItem,
+                        getStreams());
+            }
+        });
+
+        playlistRecyclerView = view.findViewById(R.id.playlist_list);
+        playlistRecyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
+        playlistRecyclerView.setAdapter(playlistAdapter);
+
+        final View newPlaylistButton = view.findViewById(R.id.newPlaylist);
+        newPlaylistButton.setOnClickListener(ignored -> openCreatePlaylistDialog());
+
+        playlistReactor = playlistManager.getPlaylists()
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(this::onPlaylistsReceived);
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // LifeCycle - Destruction
+    //////////////////////////////////////////////////////////////////////////*/
+
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        if (playlistReactor != null) playlistReactor.dispose();
+        if (playlistAdapter != null) playlistAdapter.unsetSelectedListener();
+
+        playlistReactor = null;
+        playlistRecyclerView = null;
+        playlistAdapter = null;
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Helper
+    //////////////////////////////////////////////////////////////////////////*/
+
+    public void openCreatePlaylistDialog() {
+        if (getStreams() == null || getFragmentManager() == null) return;
+
+        PlaylistCreationDialog.newInstance(getStreams()).show(getFragmentManager(), TAG);
+        getDialog().dismiss();
+    }
+
+    private void onPlaylistsReceived(@NonNull final List<PlaylistMetadataEntry> playlists) {
+        if (playlists.isEmpty()) {
+            openCreatePlaylistDialog();
+            return;
+        }
+
+        if (playlistAdapter != null && playlistRecyclerView != null) {
+            playlistAdapter.clearStreamItemList();
+            playlistAdapter.addItems(playlists);
+            playlistRecyclerView.setVisibility(View.VISIBLE);
+        }
+    }
+
+    private void onPlaylistSelected(@NonNull LocalPlaylistManager manager,
+                                    @NonNull PlaylistMetadataEntry playlist,
+                                    @NonNull List<StreamEntity> streams) {
+        if (getStreams() == null) return;
+
+        @SuppressLint("ShowToast")
+        final Toast successToast = Toast.makeText(getContext(),
+                R.string.playlist_add_stream_success, Toast.LENGTH_SHORT);
+
+        manager.appendToPlaylist(playlist.uid, streams)
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(ignored -> successToast.show());
+
+        getDialog().dismiss();
+    }
+}

app/src/main/java/org/schabi/newpipe/local/dialog/PlaylistCreationDialog.java

@@ -0,0 +1,62 @@
+package org.schabi.newpipe.local.dialog;
+
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.view.View;
+import android.widget.EditText;
+import android.widget.Toast;
+
+import org.schabi.newpipe.NewPipeDatabase;
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.database.stream.model.StreamEntity;
+import org.schabi.newpipe.local.playlist.LocalPlaylistManager;
+
+import java.util.List;
+
+import io.reactivex.android.schedulers.AndroidSchedulers;
+
+public final class PlaylistCreationDialog extends PlaylistDialog {
+    private static final String TAG = PlaylistCreationDialog.class.getCanonicalName();
+
+    public static PlaylistCreationDialog newInstance(final List<StreamEntity> streams) {
+        PlaylistCreationDialog dialog = new PlaylistCreationDialog();
+        dialog.setInfo(streams);
+        return dialog;
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Dialog
+    //////////////////////////////////////////////////////////////////////////*/
+
+    @NonNull
+    @Override
+    public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
+        if (getStreams() == null) return super.onCreateDialog(savedInstanceState);
+
+        View dialogView = View.inflate(getContext(), R.layout.dialog_playlist_name, null);
+        EditText nameInput = dialogView.findViewById(R.id.playlist_name);
+
+        final AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(getContext())
+                .setTitle(R.string.create_playlist)
+                .setView(dialogView)
+                .setCancelable(true)
+                .setNegativeButton(R.string.cancel, null)
+                .setPositiveButton(R.string.create, (dialogInterface, i) -> {
+                    final String name = nameInput.getText().toString();
+                    final LocalPlaylistManager playlistManager =
+                            new LocalPlaylistManager(NewPipeDatabase.getInstance(getContext()));
+                    final Toast successToast = Toast.makeText(getActivity(),
+                            R.string.playlist_creation_success,
+                            Toast.LENGTH_SHORT);
+
+                    playlistManager.createPlaylist(name, getStreams())
+                            .observeOn(AndroidSchedulers.mainThread())
+                            .subscribe(longs -> successToast.show());
+                });
+
+        return dialogBuilder.create();
+    }
+}