update support lib and move on to 0.8.7

* Use startActivityForResult() and onActivityResult() to refresh the
  search request when returning from reCaptcha activity.

.github/CONTRIBUTING.md

@@ -0,0 +1,36 @@
+NewPipe contribution guidelines
+===============================
+
+READ THIS GUIDELINES CAREFULLY BEFORE CONTRIBUTING.
+
+## Crash reporting
+
+Do not report crashes in the GitHub issue tracker. NewPipe has an automated crash report system that will ask you to send a report if a crash occures.
+
+## Issue reporting/feature request
+
+* Search the [existing issues](https://github.com/theScrabi/NewPipe/issues) first to make sure your issue/feature hasn't been reported/requested before
+* Check if this issue/feature is already fixed/implemented in the repository
+* If you are an android/java developer you are always welcome to fix/implement an issue/a feature yourself
+
+## Translation
+
+* NewPipe can be translated on [weblate](https://hosted.weblate.org/projects/newpipe/strings/)
+
+## Code contribution
+
+* Stick to NewPipe style guidelines (just look the other code and than do it the same way :) )
+* Do not bring nonfree software/binary blobs into the project (keep it google free)
+* Stick to [f-droid contribution guidelines](https://f-droid.org/wiki/page/Inclusion_Policy)
+* Make changes on a separate branch, not on the master branch (Feature-branching)
+* When submitting changes, you agree that your code will be licensed under GPLv3
+* Please test (compile and run) your code before you submit changes!!!
+* Try to figure out you selves why CI fails, or why a merge request collides
+* Please maintain your code after you contributed it.
+* Respond yourselves if someone request changes or notifies issues
+
+## Communication
+
+* I hereby declare our Slack channel as dead!!! There are no plans on building a new chat, but if there is interest on creating one and keeping it alive, I'd be pleased to create one again. 
+* If you want to get in contact with me or one of our other contributors you can send me an email at tnp(at)schabi.org
+* Feel free to post suggestions, changes, ideas etc!

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,2 @@
+- [ ] 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.

.github/PULL_REQUEST_TEAMPLATE.md

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

.gitignore

@@ -8,3 +8,4 @@
 /.idea
 /*.iml
 gradle.properties
+*~

.travis.yml

@@ -1,16 +1,19 @@
 language: android
+jdk:
+    - oraclejdk8
 android:
   components:
     # The BuildTools version used by NewPipe
     - tools
-    - build-tools-23.0.2
+    - build-tools-23.0.3
 
     # The SDK version used to compile NewPipe
-    - android-23
+    - android-25
 
     # Additional components
     - extra-android-support
     - extra-android-m2repository
+    - extra-google-m2repository
 
     # Emulators
     - sys-img-armeabi-v7a-android-21
@@ -20,11 +23,18 @@ android:
 env:
   global:
     - ADB_INSTALL_TIMEOUT=8 # minutes (2 by default)
+    - GRADLE_OPTS=-Xmx512m # give gradle more memory since it seem to fail otherwise
   matrix:
-    - ANDROID_TARGET=android-19  ANDROID_ABI=armeabi-v7a
+    - ANDROID_TARGET=android-21  ANDROID_ABI=armeabi-v7a
 
 before_script:
   - echo no | android create avd --force -n test -t $ANDROID_TARGET --abi $ANDROID_ABI
   - emulator -avd test -no-skin -no-audio -no-window &
   - android-wait-for-emulator
   - adb shell input keyevent 82 &
+
+script: ./gradlew --info build connectedCheck
+
+licenses:
+  - '.+'
+

CONTRIBUTING.md

@@ -1,33 +0,0 @@
-#Contribution
-
-This document contains guidelines on making contributions to NewPipe.
-
-## Programming
-
-* Follow the [Google Style Guidelines](https://google.github.io/styleguide/javaguide.html)
-* Make a new feature on a separate branch, not on the master branch
-* Make a [pull request](https://github.com/theScrabi/NewPipe/pulls) if you're done with your changes
-* When submitting changes, you agree that your code will be GPLv3 licensed
-
-## Commit messages
-
-* The subject line of your commit message shouldn't be longer than 72 characters
-* Try to keep each line of your commit message 72 characters to ensure proper
- compatibility with all git tools
-* [This guide](http://chris.beams.io/posts/git-commit/) goes more in depth on what makes a good commit message
-
-## Translation
-
-* NewPipe can be translated on [weblate](https://hosted.weblate.org/projects/newpipe/strings/)
-
-## Issue reporting
-
-* Search the [existing issues](https://github.com/theScrabi/NewPipe/issues) first to make sure your issue hasn't been reported before
-* Check if this issue is already fixed in the repository
-* When making bug reports, be sure to tell which version of NewPipe you are using and the steps to reproduce the problem
-* Please include a log if you can
-
-## Communication
-
-* For the time being, [Slack](http://invite.chschtsch.ml/) is being used for project communication
-* Feel free to post suggestions, changes, ideas etc!

README.md

@@ -1,15 +1,21 @@
+WARNING: PUTTING NEWPIPE OR ANY FORK OF IT INTO GOOGLE PLAYSTORE VIOLATES THEIR TERMS OF CONDITIONS.
+
 # NewPipe
 NewPipe: A free lightweight Youtube frontend for Android.  
 
-[![NewPipe](app/src/main/res/mipmap-xhdpi/ic_launcher.png)](http://dasochan.nl/newpipe/)
+[![NewPipe](app/src/main/res/mipmap-xhdpi/ic_launcher.png)](https://newpipe.schabi.org)
+[![F-Droid](https://f-droid.org/wiki/images/0/06/F-Droid-button_get-it-on.png)](https://f-droid.org/repository/browse/?fdfilter=newpipe&fdid=org.schabi.newpipe)
+
 
 Project status:
 [![Translation Status](https://hosted.weblate.org/widgets/NewPipe/-/svg-badge.svg)](https://hosted.weblate.org/engage/NewPipe/)
-[![Build Status](https://travis-ci.org/theScrabi/NewPipe.svg)](https://travis-ci.org/theScrabi/NewPipe)
+[![Build Status](https://travis-ci.org/TeamNewPipe/NewPipe.svg)](https://travis-ci.org/TeamNewPipe/NewPipe)
 
-## Get NewPipe
+## Donate
+![Bitcoin](https://bitcoin.org/img/icons/logotop.svg)
+![BitcoinQR](assets/16A9J59ahMRqkLSZjhYj33n9j3fMztFxnh.png)
 
-[![F-Droid](https://f-droid.org/wiki/images/0/06/F-Droid-button_get-it-on.png)](https://f-droid.org/repository/browse/?fdfilter=newpipe&fdid=org.schabi.newpipe)
+`16A9J59ahMRqkLSZjhYj33n9j3fMztFxnh`
 
 ## Screenshots
 
@@ -18,7 +24,6 @@ Project status:
 [<img src="screenshots/screenshot_3.png" width=150>](screenshots/screenshot_3.png)
 [<img src="screenshots/screenshot_4.png" width=150>](screenshots/screenshot_4.png)
 [<img src="screenshots/screenshot_5.png" width=150>](screenshots/screenshot_5.png)
-[<img src="screenshots/screenshot_6.png" width=250>](screenshots/screenshot_6.png)
 
 ## Description
 
@@ -31,24 +36,25 @@ NewPipe does not use any Google framework libraries, or the YouTube API. It only
 * Watch YouTube videos
 * Listen to YouTube videos (experimental)
 * Select the streaming player to watch the video with
-* Download videos (experimental)
-* Download audio only (experimental)
+* Download videos 
+* Download audio only 
 * Open a video in Kodi
 * Show Next/Related videos
 * Search YouTube in a specific language
-* Orbot/Tor support (no streaming yet)
+* Watch age restricted material
+* Display general information about channels
 
 ### Coming Features
 
-* Improved Downloading
+* Orbot/Tor support
 * Bookmarks
 * View history
 * Search history
 * Search channels
-* Display general information about channels
 * Subscribe to channels
 * Watch videos from a channel
 * Search/Watch Playlists
+* Queeing videos
 * ... and many more
 
 ### Multiservice support
@@ -58,7 +64,7 @@ Although NewPipe only supports YouTube at the moment, it's designed to support m
 Whether you have ideas, translation, design changes, code cleaning, or real heavy code changes, help is always welcome.
 The more is done the better it gets!
 
-If you'd like to get involved, check our [contribution notes](CONTRIBUTING.md).
+If you'd like to get involved, check our [contribution notes](.github/CONTRIBUTING.md).
 
 ## 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,15 +1,15 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.2"
+    compileSdkVersion 25
+    buildToolsVersion '23.0.3'
 
     defaultConfig {
         applicationId "org.schabi.newpipe"
         minSdkVersion 15
-        targetSdkVersion 23
-        versionCode 11
-        versionName "0.7.2"
+        targetSdkVersion 25
+        versionCode 21
+        versionName "0.8.7"
     }
     buildTypes {
         release {
@@ -24,16 +24,27 @@ android {
         // but continue the build even when errors are found:
         abortOnError false
     }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_7
+        targetCompatibility JavaVersion.VERSION_1_7
+    }
 }
 
 dependencies {
-    compile fileTree(include: ['*.jar'], dir: 'libs')
-    compile 'com.android.support:appcompat-v7:23.1.1'
-    compile 'com.android.support:support-v4:23.1.1'
-    compile 'com.android.support:design:23.1.1'
-    compile 'com.android.support:cardview-v7:23.1.1'
-    compile 'com.android.support:recyclerview-v7:23.1.1'
+    testCompile 'junit:junit:4.12'
+    compile 'com.android.support:appcompat-v7:25.1.0'
+    compile 'com.android.support:support-v4:25.1.0'
+    compile 'com.android.support:design:25.1.0'
+    compile 'com.android.support:recyclerview-v7:25.1.0'
     compile 'org.jsoup:jsoup:1.8.3'
     compile 'org.mozilla:rhino:1.7.7'
     compile 'info.guardianproject.netcipher:netcipher:1.2'
+    compile 'de.hdodenhof:circleimageview:2.0.0'
+    compile 'com.nostra13.universalimageloader:universal-image-loader:1.9.5'
+    compile 'com.github.nirhart:parallaxscroll:1.0'
+    compile 'com.google.android.exoplayer:exoplayer:r1.5.5'
+    compile 'com.google.code.gson:gson:2.4'
+    compile 'com.nononsenseapps:filepicker:3.0.0'
+    testCompile 'junit:junit:4.12'
+    compile 'ch.acra:acra:4.9.0'
 }

app/src/androidTest/java/org/schabi/newpipe/extractor/youtube/YoutubeChannelExtractorTest.java

@@ -0,0 +1,84 @@
+package org.schabi.newpipe.extractor.youtube;
+
+import android.test.AndroidTestCase;
+
+import org.schabi.newpipe.Downloader;
+import org.schabi.newpipe.extractor.NewPipe;
+import org.schabi.newpipe.extractor.channel.ChannelExtractor;
+
+/**
+ * Created by Christian Schabesberger on 12.09.16.
+ *
+ * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
+ * YoutubeSearchEngineTest.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 YoutubeChannelExtractorTest extends AndroidTestCase  {
+
+    ChannelExtractor extractor;
+    @Override
+    public void setUp() throws Exception {
+        super.setUp();
+        NewPipe.init(Downloader.getInstance());
+        extractor = NewPipe.getService("Youtube")
+                .getChannelExtractorInstance("https://www.youtube.com/channel/UCYJ61XIK64sp6ZFFS8sctxw", 0);
+    }
+
+    public void testGetDownloader()  throws Exception {
+        assertNotNull(NewPipe.getDownloader());
+    }
+
+    public void testGetChannelName() throws Exception {
+        assertEquals(extractor.getChannelName(), "Gronkh");
+    }
+
+    public void testGetAvatarUrl() throws Exception {
+        assertTrue(extractor.getAvatarUrl(), extractor.getAvatarUrl().contains("yt3"));
+    }
+
+    public void testGetBannerurl() throws Exception {
+        assertTrue(extractor.getBannerUrl(), extractor.getBannerUrl().contains("yt3"));
+    }
+
+    public void testGetFeedUrl() throws Exception {
+        assertTrue(extractor.getFeedUrl(), extractor.getFeedUrl().contains("feed"));
+    }
+
+    public void testGetStreams() throws Exception {
+        assertTrue("no streams are received", !extractor.getStreams().getItemList().isEmpty());
+    }
+
+    public void testGetStreamsErrors() throws Exception {
+        assertTrue("errors during stream list extraction", extractor.getStreams().getErrors().isEmpty());
+    }
+
+    public void testHasNextPage() throws Exception {
+        // this particular example (link) has a next page !!!
+        assertTrue("no next page link found", extractor.hasNextPage());
+    }
+
+    public void testGetNextPage() throws Exception {
+        extractor = NewPipe.getService("Youtube")
+                .getChannelExtractorInstance("https://www.youtube.com/channel/UCYJ61XIK64sp6ZFFS8sctxw", 1);
+        assertTrue("next page didn't have content", !extractor.getStreams().getItemList().isEmpty());
+    }
+
+    public void testGetNextNextPageUrl() throws Exception {
+        extractor = NewPipe.getService("Youtube")
+                .getChannelExtractorInstance("https://www.youtube.com/channel/UCYJ61XIK64sp6ZFFS8sctxw", 2);
+        assertTrue("next page didn't have content", extractor.hasNextPage());
+    }
+}

app/src/androidTest/java/org/schabi/newpipe/extractor/youtube/YoutubeSearchEngineTest.java

@@ -0,0 +1,56 @@
+package org.schabi.newpipe.extractor.youtube;
+
+import android.test.AndroidTestCase;
+
+import org.schabi.newpipe.Downloader;
+import org.schabi.newpipe.extractor.NewPipe;
+import org.schabi.newpipe.extractor.search.SearchEngine;
+import org.schabi.newpipe.extractor.search.SearchResult;
+
+import java.util.List;
+
+/**
+ * Created by Christian Schabesberger on 29.12.15.
+ *
+ * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
+ * YoutubeSearchEngineTest.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 YoutubeSearchEngineTest extends AndroidTestCase {
+    private SearchResult result;
+
+    @Override
+    public void setUp() throws Exception {
+        super.setUp();
+        NewPipe.init(Downloader.getInstance());
+        SearchEngine engine = NewPipe.getService("Youtube").getSearchEngineInstance();
+
+        result = engine.search("this is something boring", 0, "de").getSearchResult();
+    }
+
+    public void testResultList() {
+        assertFalse(result.resultList.isEmpty());
+    }
+
+    public void testResultErrors() {
+        assertTrue(result.errors == null || result.errors.isEmpty());
+    }
+
+    public void testSuggestion() {
+        //todo write a real test
+        assertTrue(result.suggestion != null);
+    }
+}

app/src/androidTest/java/org/schabi/newpipe/extractor/youtube/YoutubeSearchResultTest.java

@@ -0,0 +1,49 @@
+package org.schabi.newpipe.extractor.youtube;
+
+import android.test.AndroidTestCase;
+
+import org.schabi.newpipe.Downloader;
+import org.schabi.newpipe.extractor.NewPipe;
+import org.schabi.newpipe.extractor.exceptions.ExtractionException;
+import org.schabi.newpipe.extractor.search.SuggestionExtractor;
+import org.schabi.newpipe.extractor.services.youtube.YoutubeSuggestionExtractor;
+
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * Created by Christian Schabesberger on 18.11.16.
+ *
+ * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
+ * YoutubeSearchResultTest.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 YoutubeSearchResultTest extends AndroidTestCase {
+    List<String> suggestionReply;
+
+
+    @Override
+    public void setUp() throws Exception {
+        super.setUp();
+        NewPipe.init(Downloader.getInstance());
+        SuggestionExtractor engine = new YoutubeSuggestionExtractor(0);
+        suggestionReply = engine.suggestionList("hello", "de");
+    }
+
+    public void testIfSuggestions() {
+        assertFalse(suggestionReply.isEmpty());
+    }
+}

app/src/androidTest/java/org/schabi/newpipe/extractor/youtube/YoutubeStreamExtractorDefaultTest.java

@@ -0,0 +1,120 @@
+package org.schabi.newpipe.extractor.youtube;
+
+import android.test.AndroidTestCase;
+
+import org.schabi.newpipe.Downloader;
+import org.schabi.newpipe.extractor.AbstractStreamInfo;
+import org.schabi.newpipe.extractor.NewPipe;
+import org.schabi.newpipe.extractor.exceptions.ExtractionException;
+import org.schabi.newpipe.extractor.exceptions.ParsingException;
+import org.schabi.newpipe.extractor.stream_info.StreamExtractor;
+import org.schabi.newpipe.extractor.stream_info.VideoStream;
+
+import java.io.IOException;
+
+/**
+ * Created by Christian Schabesberger on 30.12.15.
+ *
+ * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
+ * YoutubeVideoExtractorDefault.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 YoutubeStreamExtractorDefaultTest extends AndroidTestCase {
+    public static final String HTTPS = "https://";
+    private StreamExtractor extractor;
+
+    public void setUp() throws Exception {
+        super.setUp();
+        NewPipe.init(Downloader.getInstance());
+        extractor = NewPipe.getService("Youtube")
+                .getExtractorInstance("https://www.youtube.com/watch?v=YQHsXMglC9A");
+    }
+
+    public void testGetInvalidTimeStamp() throws ParsingException {
+        assertTrue(Integer.toString(extractor.getTimeStamp()),
+                extractor.getTimeStamp() <= 0);
+    }
+
+    public void testGetValidTimeStamp() throws ExtractionException, IOException {
+        StreamExtractor extractor =
+                NewPipe.getService("Youtube")
+                        .getExtractorInstance("https://youtu.be/FmG385_uUys?t=174");
+        assertTrue(Integer.toString(extractor.getTimeStamp()),
+                extractor.getTimeStamp() == 174);
+    }
+
+    public void testGetTitle() throws ParsingException {
+        assertTrue(!extractor.getTitle().isEmpty());
+    }
+
+    public void testGetDescription() throws ParsingException {
+        assertTrue(extractor.getDescription() != null);
+    }
+
+    public void testGetUploader() throws ParsingException {
+        assertTrue(!extractor.getUploader().isEmpty());
+    }
+
+    public void testGetLength() throws ParsingException {
+        assertTrue(extractor.getLength() > 0);
+    }
+
+    public void testGetViewCount() throws ParsingException {
+        assertTrue(Long.toString(extractor.getViewCount()),
+                extractor.getViewCount() > /* specific to that video */ 1224000074);
+    }
+
+    public void testGetUploadDate() throws ParsingException {
+        assertTrue(extractor.getUploadDate().length() > 0);
+    }
+
+    public void testGetChannelUrl() throws ParsingException {
+        assertTrue(extractor.getChannelUrl().length() > 0);
+    }
+
+    public void testGetThumbnailUrl() throws ParsingException {
+        assertTrue(extractor.getThumbnailUrl(),
+                extractor.getThumbnailUrl().contains(HTTPS));
+    }
+
+    public void testGetUploaderThumbnailUrl() throws ParsingException {
+        assertTrue(extractor.getUploaderThumbnailUrl(),
+                extractor.getUploaderThumbnailUrl().contains(HTTPS));
+    }
+
+    public void testGetAudioStreams() throws ParsingException {
+        assertTrue(!extractor.getAudioStreams().isEmpty());
+    }
+
+    public void testGetVideoStreams() throws ParsingException {
+        for(VideoStream s : extractor.getVideoStreams()) {
+            assertTrue(s.url,
+                    s.url.contains(HTTPS));
+            assertTrue(s.resolution.length() > 0);
+            assertTrue(Integer.toString(s.format),
+                    0 <= s.format && s.format <= 4);
+        }
+    }
+
+    public void testStreamType() throws ParsingException {
+        assertTrue(extractor.getStreamType() == AbstractStreamInfo.StreamType.VIDEO_STREAM);
+    }
+
+    public void testGetDashMpd() throws ParsingException {
+        assertTrue(extractor.getDashMpdUrl(),
+                extractor.getDashMpdUrl() != null || !extractor.getDashMpdUrl().isEmpty());
+    }
+}

app/src/androidTest/java/org/schabi/newpipe/extractor/youtube/YoutubeStreamExtractorGemaTest.java

@@ -1,11 +1,16 @@
-package org.schabi.newpipe.services.youtube;
+package org.schabi.newpipe.extractor.youtube;
 
 import android.test.AndroidTestCase;
 
-import org.schabi.newpipe.services.VideoInfo;
+import org.schabi.newpipe.Downloader;
+import org.schabi.newpipe.extractor.NewPipe;
+import org.schabi.newpipe.extractor.exceptions.ExtractionException;
+import org.schabi.newpipe.extractor.services.youtube.YoutubeStreamExtractor;
+
+import java.io.IOException;
 
 /**
- * Created by the-scrabi on 30.12.15.
+ * Created by Christian Schabesberger on 30.12.15.
  *
  * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
  * YoutubeVideoExtractorGema.java is part of NewPipe.
@@ -26,34 +31,20 @@ import org.schabi.newpipe.services.VideoInfo;
 
 
 // This class only works in Germany.
-public class YoutubeVideoExtractorGemaTest extends AndroidTestCase {
+public class YoutubeStreamExtractorGemaTest extends AndroidTestCase {
 
     // Deaktivate this Test Case bevore uploading it githup, otherwise CI will fail.
     private static final boolean testActive = false;
 
-
-    private YoutubeVideoExtractor extractor;
-
-    public void setUp() {
+    public void testGemaError() throws IOException, ExtractionException {
         if(testActive) {
-            extractor = new YoutubeVideoExtractor("https://www.youtube.com/watch?v=3O1_3zBUKM8");
-        }
-    }
-
-    public void testGetErrorCode() {
-        if(testActive) {
-            assertEquals(extractor.getErrorCode(), VideoInfo.ERROR_BLOCKED_BY_GEMA);
-        } else {
-            assertTrue(true);
-        }
-    }
-
-    public void testGetErrorMessage() {
-        if(testActive) {
-            assertTrue(extractor.getErrorMessage(),
-                    extractor.getErrorMessage().contains("GEMA"));
-        } else {
-            assertTrue(true);
+            try {
+                NewPipe.init(Downloader.getInstance());
+                NewPipe.getService("Youtube")
+                        .getExtractorInstance("https://www.youtube.com/watch?v=3O1_3zBUKM8");
+            } catch(YoutubeStreamExtractor.GemaException ge) {
+                assertTrue(true);
+            }
         }
     }
 }

app/src/androidTest/java/org/schabi/newpipe/extractor/youtube/YoutubeStreamExtractorLiveStreamTest.java

@@ -0,0 +1,52 @@
+package org.schabi.newpipe.extractor.youtube;
+
+import android.test.AndroidTestCase;
+
+
+import org.schabi.newpipe.extractor.exceptions.ExtractionException;
+import org.schabi.newpipe.extractor.exceptions.ParsingException;
+import org.schabi.newpipe.extractor.stream_info.StreamExtractor;
+
+import java.io.IOException;
+
+/**
+ * Created by Christian Schabesberger on 11.03.16.
+ *
+ * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
+ * YoutubeStreamExtractorLiveStreamTest.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 YoutubeStreamExtractorLiveStreamTest extends AndroidTestCase {
+
+    private StreamExtractor extractor;
+
+    public void setUp() throws IOException, ExtractionException {
+        //todo: make the extractor not throw over a livestream
+        /*
+
+        NewPipe.init(Downloader.getInstance());
+        extractor = NewPipe.getService("Youtube")
+                .getExtractorInstance("https://www.youtube.com/watch?v=J0s6NjqdjLE", Downloader.getInstance());
+                */
+    }
+
+    public void testStreamType() throws ParsingException {
+        assertTrue(true);
+        // assertTrue(extractor.getStreamType() == AbstractVideoInfo.StreamType.LIVE_STREAM);
+    }
+}
+

app/src/androidTest/java/org/schabi/newpipe/extractor/youtube/YoutubeStreamExtractorRestrictedTest.java

@@ -0,0 +1,89 @@
+package org.schabi.newpipe.extractor.youtube;
+
+import android.test.AndroidTestCase;
+
+import org.schabi.newpipe.Downloader;
+import org.schabi.newpipe.extractor.NewPipe;
+import org.schabi.newpipe.extractor.exceptions.ExtractionException;
+import org.schabi.newpipe.extractor.exceptions.ParsingException;
+import org.schabi.newpipe.extractor.stream_info.StreamExtractor;
+import org.schabi.newpipe.extractor.stream_info.VideoStream;
+
+import java.io.IOException;
+
+public class YoutubeStreamExtractorRestrictedTest extends AndroidTestCase {
+    public static final String HTTPS = "https://";
+    private StreamExtractor extractor;
+
+    public void setUp() throws Exception {
+        super.setUp();
+        NewPipe.init(Downloader.getInstance());
+        extractor = NewPipe.getService("Youtube")
+                .getExtractorInstance("https://www.youtube.com/watch?v=i6JTvzrpBy0");
+    }
+
+    public void testGetInvalidTimeStamp() throws ParsingException {
+        assertTrue(Integer.toString(extractor.getTimeStamp()),
+                extractor.getTimeStamp() <= 0);
+    }
+
+    public void testGetValidTimeStamp() throws ExtractionException, IOException {
+        StreamExtractor extractor= NewPipe.getService("Youtube")
+                .getExtractorInstance("https://youtu.be/FmG385_uUys?t=174");
+        assertTrue(Integer.toString(extractor.getTimeStamp()),
+                extractor.getTimeStamp() == 174);
+    }
+
+    public void testGetAgeLimit() throws ParsingException {
+        assertTrue(extractor.getAgeLimit() == 18);
+    }
+
+    public void testGetTitle() throws ParsingException {
+        assertTrue(!extractor.getTitle().isEmpty());
+    }
+
+    public void testGetDescription() throws ParsingException {
+        assertTrue(extractor.getDescription() != null);
+    }
+
+    public void testGetUploader() throws ParsingException {
+        assertTrue(!extractor.getUploader().isEmpty());
+    }
+
+    public void testGetLength() throws ParsingException {
+        assertTrue(extractor.getLength() > 0);
+    }
+
+    public void testGetViews() throws ParsingException {
+        assertTrue(extractor.getLength() > 0);
+    }
+
+    public void testGetUploadDate() throws ParsingException {
+        assertTrue(extractor.getUploadDate().length() > 0);
+    }
+
+    public void testGetThumbnailUrl() throws ParsingException {
+        assertTrue(extractor.getThumbnailUrl(),
+                extractor.getThumbnailUrl().contains(HTTPS));
+    }
+
+    public void testGetUploaderThumbnailUrl() throws ParsingException {
+        assertTrue(extractor.getUploaderThumbnailUrl(),
+                extractor.getUploaderThumbnailUrl().contains(HTTPS));
+    }
+
+    public void testGetAudioStreams() throws ParsingException {
+        // audiostream not always necessary
+        //assertTrue(!extractor.getAudioStreams().isEmpty());
+    }
+
+    public void testGetVideoStreams() throws ParsingException {
+        for(VideoStream s : extractor.getVideoStreams()) {
+            assertTrue(s.url,
+                    s.url.contains(HTTPS));
+            assertTrue(s.resolution.length() > 0);
+            assertTrue(Integer.toString(s.format),
+                    0 <= s.format && s.format <= 4);
+        }
+    }
+}

app/src/androidTest/java/org/schabi/newpipe/services/youtube/YoutubeSearchEngineTest.java

@@ -1,89 +0,0 @@
-package org.schabi.newpipe.services.youtube;
-
-import android.test.AndroidTestCase;
-
-import org.schabi.newpipe.VideoPreviewInfo;
-import org.schabi.newpipe.services.SearchEngine;
-
-import java.util.ArrayList;
-
-/**
- * Created by the-scrabi on 29.12.15.
- *
- * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
- * YoutubeSearchEngineTest.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 YoutubeSearchEngineTest extends AndroidTestCase {
-    private SearchEngine.Result result;
-    private ArrayList<String> suggestionReply;
-
-    @Override
-    public void setUp() throws Exception{
-        super.setUp();
-        SearchEngine engine = new YoutubeSearchEngine();
-        result = engine.search("https://www.youtube.com/results?search_query=bla", 0, "de");
-        suggestionReply = engine.suggestionList("hello");
-    }
-
-    public void testIfNoErrorOccur() {
-        assertEquals(result.errorMessage, "");
-    }
-
-    public void testIfListIsNotEmpty() {
-        assertEquals(result.resultList.size() > 0, true);
-    }
-
-    public void testItemsHaveTitle() {
-        for(VideoPreviewInfo i : result.resultList) {
-            assertEquals(i.title.isEmpty(), false);
-        }
-    }
-
-    public void testItemsHaveUploader() {
-        for(VideoPreviewInfo i : result.resultList) {
-            assertEquals(i.uploader.isEmpty(), false);
-        }
-    }
-
-    public void testItemsHaveRightDuration() {
-        for(VideoPreviewInfo i : result.resultList) {
-            assertTrue(i.duration, i.duration.contains(":"));
-        }
-    }
-
-    public void testItemsHaveRightThumbnail() {
-        for (VideoPreviewInfo i : result.resultList) {
-            assertTrue(i.thumbnail_url, i.thumbnail_url.contains("https://"));
-        }
-    }
-
-    public void testItemsHaveRightVideoUrl() {
-        for (VideoPreviewInfo i : result.resultList) {
-            assertTrue(i.webpage_url, i.webpage_url.contains("https://"));
-        }
-    }
-
-    public void testIfSuggestionsAreReplied() {
-        assertEquals(suggestionReply.size() > 0, true);
-    }
-
-    public void testIfSuggestionsAreValid() {
-        for(String s : suggestionReply) {
-            assertTrue(s, !s.isEmpty());
-        }
-    }
-}

app/src/androidTest/java/org/schabi/newpipe/services/youtube/YoutubeVideoExtractorDefaultTest.java

@@ -1,100 +0,0 @@
-package org.schabi.newpipe.services.youtube;
-
-import android.test.AndroidTestCase;
-import android.util.Log;
-
-import org.schabi.newpipe.services.VideoInfo;
-
-/**
- * Created by the-scrabi on 30.12.15.
- *
- * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
- * YoutubeVideoExtractorDefault.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 YoutubeVideoExtractorDefaultTest extends AndroidTestCase {
-    private YoutubeVideoExtractor extractor;
-
-    public void setUp() {
-        extractor = new YoutubeVideoExtractor("https://www.youtube.com/watch?v=FmG385_uUys");
-    }
-
-    public void testGetErrorCode() {
-        assertEquals(extractor.getErrorCode(), VideoInfo.NO_ERROR);
-    }
-
-    public void testGetErrorMessage() {
-        assertEquals(extractor.getErrorMessage(), "");
-    }
-
-    public void testGetTimeStamp() {
-        assertTrue(Integer.toString(extractor.getTimeStamp()),
-                extractor.getTimeStamp() >= 0);
-    }
-
-    public void testGetTitle() {
-        assertTrue(!extractor.getTitle().isEmpty());
-    }
-
-    public void testGetDescription() {
-        assertTrue(extractor.getDescription() != null);
-    }
-
-    public void testGetUploader() {
-        assertTrue(!extractor.getUploader().isEmpty());
-    }
-
-    public void testGetLength() {
-        assertTrue(extractor.getLength() > 0);
-    }
-
-    public void testGetViews() {
-        assertTrue(extractor.getLength() > 0);
-    }
-
-    public void testGetUploadDate() {
-        assertTrue(extractor.getUploadDate().length() > 0);
-    }
-
-    public void testGetThumbnailUrl() {
-        assertTrue(extractor.getThumbnailUrl(),
-                extractor.getThumbnailUrl().contains("https://"));
-    }
-
-    public void testGetUploaderThumbnailUrl() {
-        assertTrue(extractor.getUploaderThumbnailUrl(),
-                extractor.getUploaderThumbnailUrl().contains("https://"));
-    }
-
-    public void testGetAudioStreams() {
-        for(VideoInfo.AudioStream s : extractor.getAudioStreams()) {
-            assertTrue(s.url,
-                    s.url.contains("https://"));
-            assertTrue(s.bandwidth > 0);
-            assertTrue(s.samplingRate > 0);
-        }
-    }
-
-    public void testGetVideoStreams() {
-        for(VideoInfo.VideoStream s : extractor.getVideoStreams()) {
-            assertTrue(s.url,
-                    s.url.contains("https://"));
-            assertTrue(s.resolution.length() > 0);
-            assertTrue(Integer.toString(s.format),
-                    0 <= s.format && s.format <= 4);
-        }
-    }
-}

app/src/main/AndroidManifest.xml

@@ -1,21 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="org.schabi.newpipe" >
-    <uses-permission android:name= "android.permission.INTERNET" />
-    <uses-permission android:name= "android.permission.WAKE_LOCK" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+    package="org.schabi.newpipe">
+
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+
     <application
         android:name=".App"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
-        android:logo="@mipmap/ic_launcher"
         android:label="@string/app_name"
+        android:logo="@mipmap/ic_launcher"
         android:theme="@style/AppTheme"
         tools:ignore="AllowBackup">
+
         <activity
-            android:name=".VideoItemListActivity"
+            android:name=".MainActivity"
             android:label="@string/app_name">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -24,12 +27,13 @@
             </intent-filter>
         </activity>
         <activity
-            android:name=".VideoItemDetailActivity"
+            android:name=".detail.VideoItemDetailActivity"
             android:label="@string/title_videoitem_detail"
+            android:launchMode="singleTask"
             android:theme="@style/AppTheme">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
-                android:value=".VideoItemListActivity" />
+                android:value=".MainActivity" />
 
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
@@ -46,6 +50,7 @@
                 <data android:host="www.youtube.com" />
                 <data android:pathPrefix="/v/" />
                 <data android:pathPrefix="/watch" />
+                <data android:pathPrefix="/attribution_link" />
             </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
@@ -71,21 +76,50 @@
                 <data android:scheme="vnd.youtube" />
                 <data android:scheme="vnd.youtube.launch" />
             </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.SEND" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:mimeType="text/plain" />
+            </intent-filter>
         </activity>
-        <activity android:name=".PlayVideoActivity"
+        <activity
+            android:name=".player.PlayVideoActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:theme="@style/VideoPlayerTheme"
-            android:parentActivityName=".VideoItemDetailActivity"
-            tools:ignore="UnusedAttribute">
-        </activity>
+            tools:ignore="UnusedAttribute" />
+
         <service
-            android:name=".BackgroundPlayer"
-            android:label="@string/background_player_name"
-            android:exported="false" />
+            android:name=".player.BackgroundPlayer"
+            android:exported="false"
+            android:label="@string/background_player_name" />
+
         <activity
-            android:name=".SettingsActivity"
-            android:label="@string/settings_activity_title" >
+            android:name=".player.ExoPlayerActivity"
+            android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
+            android:label="@string/app_name"
+            android:launchMode="singleInstance"
+            android:theme="@style/PlayerTheme">
+            <intent-filter>
+                <action android:name="org.schabi.newpipe.exoplayer.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+
+                <data android:scheme="http" />
+                <data android:scheme="https" />
+                <data android:scheme="content" />
+                <data android:scheme="asset" />
+                <data android:scheme="file" />
+            </intent-filter>
         </activity>
+
+        <service
+            android:name=".player.BackgroundPlayer"
+            android:exported="false"
+            android:label="@string/background_player_name" />
+
+        <activity
+            android:name=".settings.SettingsActivity"
+            android:label="@string/settings_activity_title" />
         <activity
             android:name=".PanicResponderActivity"
             android:launchMode="singleInstance"
@@ -93,11 +127,40 @@
             android:theme="@android:style/Theme.NoDisplay">
             <intent-filter>
                 <action android:name="info.guardianproject.panic.action.TRIGGER" />
+
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
         <activity
             android:name=".ExitActivity"
+            android:label="@string/general_error"
             android:theme="@android:style/Theme.NoDisplay" />
+        <activity android:name=".report.ErrorActivity" />
+
+        <!-- giga get related -->
+        <activity
+            android:name=".download.DownloadActivity"
+            android:label="@string/app_name"
+            android:launchMode="singleTask"
+            android:theme="@style/AppTheme" />
+
+        <service android:name="us.shandian.giga.service.DownloadManagerService" />
+
+        <activity
+            android:name="com.nononsenseapps.filepicker.FilePickerActivity"
+            android:label="@string/app_name"
+            android:theme="@style/FilePickerTheme"
+            android:launchMode="singleTop">
+        </activity>
+
+        <activity
+            android:name=".ChannelActivity"
+            android:label="@string/title_activity_channel"
+            android:theme="@style/AppTheme.NoActionBar" />
+
+        <activity
+            android:name=".ReCaptchaActivity"
+            android:label="@string/reCaptchaActivity" />
     </application>
-</manifest>
+
+</manifest>

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

@@ -1,381 +0,0 @@
-package org.schabi.newpipe;
-
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.graphics.Bitmap;
-import android.net.Uri;
-import android.os.Bundle;
-import android.preference.PreferenceManager;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.app.AppCompatActivity;
-import android.util.Log;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-import android.widget.ArrayAdapter;
-
-import org.schabi.newpipe.services.MediaFormat;
-import org.schabi.newpipe.services.VideoInfo;
-
-/**
- * Created by Christian Schabesberger on 18.08.15.
- *
- * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
- * DetailsMenuHandler.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/>.
- */
-
-
-class ActionBarHandler {
-    private static final String TAG = ActionBarHandler.class.toString();
-    private static final String KORE_PACKET = "org.xbmc.kore";
-
-    private int serviceId;
-    private String websiteUrl = "";
-    private Bitmap videoThumbnail = null;
-    private String channelName = "";
-    private AppCompatActivity activity;
-    private VideoInfo.VideoStream[] videoStreams = null;
-    private VideoInfo.AudioStream audioStream = null;
-    private int selectedStream = -1;
-    private String videoTitle = "";
-
-    private SharedPreferences defaultPreferences = null;
-    private int startPosition;
-
-    @SuppressWarnings("deprecation")
-    private class FormatItemSelectListener implements ActionBar.OnNavigationListener {
-        @Override
-        public boolean onNavigationItemSelected(int itemPosition, long itemId) {
-            selectFormatItem((int)itemId);
-            return true;
-        }
-    }
-
-    public ActionBarHandler(AppCompatActivity activity) {
-        this.activity = activity;
-    }
-
-    @SuppressWarnings({"deprecation", "ConstantConditions"})
-    public void setupNavMenu(AppCompatActivity activity) {
-        this.activity = activity;
-        try {
-            activity.getSupportActionBar().setNavigationMode(ActionBar.NAVIGATION_MODE_LIST);
-        } catch(NullPointerException e) {
-            e.printStackTrace();
-        }
-    }
-
-    public void setServiceId(int id) {
-        serviceId = id;
-    }
-
-    public void setSetVideoThumbnail(Bitmap bitmap) {
-        videoThumbnail = bitmap;
-    }
-
-    public void setChannelName(String name) {
-        channelName = name;
-    }
-
-    @SuppressWarnings("deprecation")
-    public void setStreams(VideoInfo.VideoStream[] videoStreams, VideoInfo.AudioStream[] audioStreams) {
-        this.videoStreams = videoStreams;
-        selectedStream = 0;
-        defaultPreferences = PreferenceManager.getDefaultSharedPreferences(activity);
-        String[] itemArray = new String[videoStreams.length];
-        String defaultResolution = defaultPreferences
-                .getString(activity.getString(R.string.default_resolution_key),
-                        activity.getString(R.string.default_resolution_value));
-        int defaultResolutionPos = 0;
-
-        for(int i = 0; i < videoStreams.length; i++) {
-            itemArray[i] = MediaFormat.getNameById(videoStreams[i].format) + " " + videoStreams[i].resolution;
-            if(defaultResolution.equals(videoStreams[i].resolution)) {
-                defaultResolutionPos = i;
-            }
-        }
-
-        ArrayAdapter<String> itemAdapter = new ArrayAdapter<>(activity.getBaseContext(),
-                android.R.layout.simple_spinner_dropdown_item, itemArray);
-        if(activity != null) {
-            ActionBar ab = activity.getSupportActionBar();
-                assert ab != null : "Could not get actionbar";
-                ab.setListNavigationCallbacks(itemAdapter
-                        , new FormatItemSelectListener());
-
-            ab.setSelectedNavigationItem(defaultResolutionPos);
-        }
-
-        // set audioStream
-        audioStream = null;
-        String preferedFormat = defaultPreferences
-                .getString(activity.getString(R.string.default_audio_format_key), "webm");
-        if(preferedFormat.equals("webm")) {
-            for(VideoInfo.AudioStream s : audioStreams) {
-                if(s.format == MediaFormat.WEBMA.id) {
-                    audioStream = s;
-                }
-            }
-        } else if(preferedFormat.equals("m4a")){
-            for(VideoInfo.AudioStream s : audioStreams) {
-                if(s.format == MediaFormat.M4A.id &&
-                        (audioStream == null || audioStream.bandwidth > s.bandwidth)) {
-                    audioStream = s;
-                }
-            }
-        }
-        else {
-            Log.e(TAG, "FAILED to set audioStream value!");
-        }
-    }
-
-    private void selectFormatItem(int i) {
-        selectedStream = i;
-    }
-
-    public void setupMenu(Menu menu, MenuInflater inflater) {
-        // 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.videoitem_detail, menu);
-        MenuItem castItem = menu.findItem(R.id.action_play_with_kodi);
-
-        castItem.setVisible(defaultPreferences
-                .getBoolean(activity.getString(R.string.show_play_with_kodi_key), false));
-    }
-
-    public boolean onItemSelected(MenuItem item) {
-        if(!videoTitle.isEmpty()) {
-            int id = item.getItemId();
-            switch (id) {
-                case R.id.menu_item_share: {
-                    Intent intent = new Intent();
-                    intent.setAction(Intent.ACTION_SEND);
-                    intent.putExtra(Intent.EXTRA_TEXT, websiteUrl);
-                    intent.setType("text/plain");
-                    activity.startActivity(Intent.createChooser(intent, activity.getString(R.string.share_dialog_title)));
-                    return true;
-                }
-                case R.id.menu_item_openInBrowser: {
-                    openInBrowser();
-                }
-                return true;
-                case R.id.menu_item_download:
-                    downloadVideo();
-                    return true;
-                case R.id.action_settings: {
-                    Intent intent = new Intent(activity, SettingsActivity.class);
-                    activity.startActivity(intent);
-                }
-                break;
-                case R.id.action_play_with_kodi:
-                    playWithKodi();
-                    return true;
-                case R.id.menu_item_play_audio:
-                    playAudio();
-                    return true;
-                default:
-                    Log.e(TAG, "Menu Item not known");
-            }
-        } else {
-            // That line may not be necessary.
-            return true;
-        }
-        return false;
-    }
-
-    public void setVideoInfo(String websiteUrl, String videoTitle) {
-        this.websiteUrl = websiteUrl;
-        this.videoTitle = videoTitle;
-    }
-
-    public void playVideo() {
-        // ----------- THE MAGIC MOMENT ---------------
-        if(!videoTitle.isEmpty()) {
-            if (PreferenceManager.getDefaultSharedPreferences(activity)
-                    .getBoolean(activity.getString(R.string.use_external_video_player_key), false)) {
-
-                // External Player
-                Intent intent = new Intent();
-                try {
-                    intent.setAction(Intent.ACTION_VIEW);
-
-                    intent.setDataAndType(Uri.parse(videoStreams[selectedStream].url),
-                            MediaFormat.getMimeById(videoStreams[selectedStream].format));
-                    intent.putExtra(Intent.EXTRA_TITLE, videoTitle);
-                    intent.putExtra("title", videoTitle);
-
-                    activity.startActivity(intent);      // HERE !!!
-                } catch (Exception e) {
-                    e.printStackTrace();
-                    AlertDialog.Builder builder = new AlertDialog.Builder(activity);
-                    builder.setMessage(R.string.no_player_found)
-                            .setPositiveButton(R.string.install, new DialogInterface.OnClickListener() {
-                                @Override
-                                public void onClick(DialogInterface dialog, int which) {
-                                    Intent intent = new Intent();
-                                    intent.setAction(Intent.ACTION_VIEW);
-                                    intent.setData(Uri.parse(activity.getString(R.string.fdroid_vlc_url)));
-                                    activity.startActivity(intent);
-                                }
-                            })
-                            .setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
-                                @Override
-                                public void onClick(DialogInterface dialog, int which) {
-
-                                }
-                            });
-                    builder.create().show();
-                }
-            } else {
-                // Internal Player
-                Intent intent = new Intent(activity, PlayVideoActivity.class);
-                intent.putExtra(PlayVideoActivity.VIDEO_TITLE, videoTitle);
-                intent.putExtra(PlayVideoActivity.STREAM_URL, videoStreams[selectedStream].url);
-                intent.putExtra(PlayVideoActivity.VIDEO_URL, websiteUrl);
-                intent.putExtra(PlayVideoActivity.START_POSITION, startPosition);
-                activity.startActivity(intent);     //also HERE !!!
-            }
-        }
-        // --------------------------------------------
-    }
-
-    public void setStartPosition(int startPositionSeconds)
-    {
-        this.startPosition = startPositionSeconds;
-    }
-
-    private void downloadVideo() {
-        if(!videoTitle.isEmpty()) {
-            String videoSuffix = "." + MediaFormat.getSuffixById(videoStreams[selectedStream].format);
-            String audioSuffix = "." + MediaFormat.getSuffixById(audioStream.format);
-            Bundle args = new Bundle();
-            args.putString(DownloadDialog.FILE_SUFFIX_VIDEO, videoSuffix);
-            args.putString(DownloadDialog.FILE_SUFFIX_AUDIO, audioSuffix);
-            args.putString(DownloadDialog.TITLE, videoTitle);
-            args.putString(DownloadDialog.VIDEO_URL, videoStreams[selectedStream].url);
-            args.putString(DownloadDialog.AUDIO_URL, audioStream.url);
-            DownloadDialog downloadDialog = new DownloadDialog();
-            downloadDialog.setArguments(args);
-            downloadDialog.show(activity.getSupportFragmentManager(), "downloadDialog");
-        }
-    }
-
-    private void openInBrowser() {
-        if(!videoTitle.isEmpty()) {
-            Intent intent = new Intent();
-            intent.setAction(Intent.ACTION_VIEW);
-            intent.setData(Uri.parse(websiteUrl));
-
-            activity.startActivity(Intent.createChooser(intent, activity.getString(R.string.choose_browser)));
-        }
-    }
-
-    private void playWithKodi() {
-        if(!videoTitle.isEmpty()) {
-            try {
-                Intent intent = new Intent(Intent.ACTION_VIEW);
-                intent.setPackage(KORE_PACKET);
-                intent.setData(Uri.parse(websiteUrl.replace("https", "http")));
-                activity.startActivity(intent);
-            } catch (Exception e) {
-                e.printStackTrace();
-                AlertDialog.Builder builder = new AlertDialog.Builder(activity);
-                builder.setMessage(R.string.kore_not_found)
-                        .setPositiveButton(R.string.install, new DialogInterface.OnClickListener() {
-                            @Override
-                            public void onClick(DialogInterface dialog, int which) {
-                                Intent intent = new Intent();
-                                intent.setAction(Intent.ACTION_VIEW);
-                                intent.setData(Uri.parse(activity.getString(R.string.fdroid_kore_url)));
-                                activity.startActivity(intent);
-                            }
-                        })
-                        .setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
-                            @Override
-                            public void onClick(DialogInterface dialog, int which) {
-
-                            }
-                        });
-                builder.create().show();
-            }
-        }
-    }
-
-    public void playAudio() {
-
-        boolean externalAudioPlayer = PreferenceManager.getDefaultSharedPreferences(activity)
-                .getBoolean(activity.getString(R.string.use_external_audio_player_key), false);
-        Intent intent;
-
-        if (!externalAudioPlayer && android.os.Build.VERSION.SDK_INT >= 18) {
-            //internal music player: explicit intent
-            if (!BackgroundPlayer.isRunning  && videoThumbnail != null) {
-                ActivityCommunicator.getCommunicator()
-                        .backgroundPlayerThumbnail = videoThumbnail;
-                intent = new Intent(activity, BackgroundPlayer.class);
-
-                intent.setAction(Intent.ACTION_VIEW);
-                Log.i(TAG, "audioStream is null:" + (audioStream == null));
-                Log.i(TAG, "audioStream.url is null:" + (audioStream.url == null));
-                intent.setDataAndType(Uri.parse(audioStream.url),
-                        MediaFormat.getMimeById(audioStream.format));
-                intent.putExtra(BackgroundPlayer.TITLE, videoTitle);
-                intent.putExtra(BackgroundPlayer.WEB_URL, websiteUrl);
-                intent.putExtra(BackgroundPlayer.SERVICE_ID, serviceId);
-                intent.putExtra(BackgroundPlayer.CHANNEL_NAME, channelName);
-                activity.startService(intent);
-            }
-        } else {
-            intent = new Intent();
-            try {
-                intent.setAction(Intent.ACTION_VIEW);
-                intent.setDataAndType(Uri.parse(audioStream.url),
-                        MediaFormat.getMimeById(audioStream.format));
-                intent.putExtra(Intent.EXTRA_TITLE, videoTitle);
-                intent.putExtra("title", videoTitle);
-
-                activity.startActivity(intent);      // HERE !!!
-            } catch (Exception e) {
-                e.printStackTrace();
-                AlertDialog.Builder builder = new AlertDialog.Builder(activity);
-                builder.setMessage(R.string.no_player_found)
-                        .setPositiveButton(R.string.install, new DialogInterface.OnClickListener() {
-                            @Override
-                            public void onClick(DialogInterface dialog, int which) {
-                                Intent intent = new Intent();
-                                intent.setAction(Intent.ACTION_VIEW);
-                                intent.setData(Uri.parse(activity.getString(R.string.fdroid_vlc_url)));
-                                activity.startActivity(intent);
-                            }
-                        })
-                        .setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
-                            @Override
-                            public void onClick(DialogInterface dialog, int which) {
-                                Log.i(TAG, "You unlocked a secret unicorn.");
-                            }
-                        });
-                builder.create().show();
-                Log.e(TAG, "Either no Streaming player for audio was installed, or something important crashed:");
-                e.printStackTrace();
-            }
-        }
-    }
-}

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

@@ -22,13 +22,15 @@ package org.schabi.newpipe;
 
 import android.graphics.Bitmap;
 
+import java.util.List;
+
 /**
  * Singleton:
  * Used to send data between certain Activity/Services within the same process.
- * This can be considered as hack inside the Android universe. **/
+ * This can be considered as an ugly hack inside the Android universe. **/
 public class ActivityCommunicator {
 
-    private static ActivityCommunicator activityCommunicator = null;
+    private static ActivityCommunicator activityCommunicator;
 
     public static ActivityCommunicator getCommunicator() {
         if(activityCommunicator == null) {
@@ -39,4 +41,6 @@ public class ActivityCommunicator {
 
     // Thumbnail send from VideoItemDetailFragment to BackgroundPlayer
     public volatile Bitmap backgroundPlayerThumbnail;
+
+    public volatile Class returnActivity;
 }

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

@@ -2,8 +2,19 @@ package org.schabi.newpipe;
 
 import android.app.Application;
 import android.content.Context;
-import android.content.SharedPreferences;
-import android.preference.PreferenceManager;
+
+import com.nostra13.universalimageloader.core.ImageLoader;
+import com.nostra13.universalimageloader.core.ImageLoaderConfiguration;
+
+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.NewPipe;
+import org.schabi.newpipe.report.AcraReportSenderFactory;
+import org.schabi.newpipe.report.ErrorActivity;
+import org.schabi.newpipe.settings.SettingsActivity;
 
 import info.guardianproject.netcipher.NetCipher;
 import info.guardianproject.netcipher.proxy.OrbotHelper;
@@ -27,20 +38,45 @@ import info.guardianproject.netcipher.proxy.OrbotHelper;
  */
 
 public class App extends Application {
+    private static final String TAG = App.class.toString();
 
     private static boolean useTor;
 
+    final Class<? extends ReportSenderFactory>[] reportSenderFactoryClasses
+            = new Class[]{AcraReportSenderFactory.class};
+
     @Override
     public void onCreate() {
         super.onCreate();
+        // init crashreport
+        try {
+            final ACRAConfiguration acraConfig = new ConfigurationBuilder(this)
+                    .setReportSenderFactoryClasses(reportSenderFactoryClasses)
+                    .build();
+            ACRA.init(this, acraConfig);
+        } catch(ACRAConfigurationException ace) {
+            ace.printStackTrace();
+            ErrorActivity.reportError(this, ace, null, null,
+                    ErrorActivity.ErrorInfo.make(ErrorActivity.SEARCHED,"none",
+                            "Could not initialize ACRA crash report", R.string.app_ui_crash));
+        }
 
+        //init NewPipe
+        NewPipe.init(Downloader.getInstance());
+
+        // Initialize image loader
+        ImageLoaderConfiguration config = new ImageLoaderConfiguration.Builder(this).build();
+        ImageLoader.getInstance().init(config);
+
+        /*
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
         if(prefs.getBoolean(getString(R.string.use_tor_key), false)) {
             OrbotHelper.requestStartTor(this);
             configureTor(true);
         } else {
             configureTor(false);
-        }
+        }*/
+        configureTor(false);
 
         // DO NOT REMOVE THIS FUNCTION!!!
         // Otherwise downloadPathPreference has invalid value.
@@ -50,7 +86,7 @@ public class App extends Application {
     /**
      * Set the proxy settings based on whether Tor should be enabled or not.
      */
-    static void configureTor(boolean enabled) {
+    public static void configureTor(boolean enabled) {
         useTor = enabled;
         if (useTor) {
             NetCipher.useTor();
@@ -59,13 +95,13 @@ public class App extends Application {
         }
     }
 
-    static void checkStartTor(Context context) {
+    public static void checkStartTor(Context context) {
         if (useTor) {
             OrbotHelper.requestStartTor(context);
         }
     }
 
-    static boolean isUsingTor() {
+    public static boolean isUsingTor() {
         return useTor;
     }
 }

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

@@ -1,357 +0,0 @@
-package org.schabi.newpipe;
-
-import android.app.Notification;
-import android.app.NotificationManager;
-import android.app.PendingIntent;
-import android.app.Service;
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.content.res.Resources;
-import android.graphics.Bitmap;
-import android.media.AudioManager;
-import android.media.MediaPlayer;
-import android.net.wifi.WifiManager;
-import android.os.IBinder;
-import android.os.PowerManager;
-import android.support.v7.app.NotificationCompat;
-import android.util.Log;
-import android.widget.RemoteViews;
-import android.widget.Toast;
-
-import java.io.IOException;
-
-/**
- * Created by Adam Howard on 08/11/15.
- * Copyright (c) Adam Howard <achdisposable1@gmail.com> 2015
- *
- * BackgroundPlayer.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/>.
- */
-
-/**Plays the audio stream of videos in the background.*/
-public class BackgroundPlayer extends Service /*implements MediaPlayer.OnPreparedListener*/ {
-
-    private static final String TAG = BackgroundPlayer.class.toString();
-    private static final String ACTION_STOP = TAG + ".STOP";
-    private static final String ACTION_PLAYPAUSE = TAG + ".PLAYPAUSE";
-
-    // Extra intent arguments
-    public static final String TITLE = "title";
-    public static final String WEB_URL = "web_url";
-    public static final String SERVICE_ID = "service_id";
-    public static final String CHANNEL_NAME="channel_name";
-
-    private volatile String webUrl = "";
-    private volatile int serviceId = -1;
-    private volatile String channelName = "";
-
-    // Determines if the service is already running.
-    // Prevents launching the service twice.
-    public static volatile boolean isRunning = false;
-
-    public BackgroundPlayer() {
-        super();
-    }
-
-    @Override
-    public void onCreate() {
-        /*PendingIntent pi = PendingIntent.getActivity(this, 0,
-                new Intent(this, getClass()).addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP), 0);*/
-        super.onCreate();
-    }
-    @Override
-    public int onStartCommand(Intent intent, int flags, int startId) {
-        Toast.makeText(this, R.string.background_player_playing_toast,
-                Toast.LENGTH_SHORT).show();
-
-        String source = intent.getDataString();
-        //Log.i(TAG, "backgroundPLayer source:"+source);
-        String videoTitle = intent.getStringExtra(TITLE);
-        webUrl = intent.getStringExtra(WEB_URL);
-        serviceId = intent.getIntExtra(SERVICE_ID, -1);
-        channelName = intent.getStringExtra(CHANNEL_NAME);
-
-        //do nearly everything in a separate thread
-        PlayerThread player = new PlayerThread(source, videoTitle, this);
-        player.start();
-
-        isRunning = true;
-
-        // If we get killed after returning here, don't restart
-        return START_NOT_STICKY;
-    }
-
-    @Override
-    public IBinder onBind(Intent intent) {
-        // We don't provide binding (yet?), so return null
-        return null;
-    }
-
-    @Override
-    public void onDestroy() {
-        //Toast.makeText(this, "service done", Toast.LENGTH_SHORT).show();
-        isRunning = false;
-    }
-
-    private class PlayerThread extends Thread {
-        MediaPlayer mediaPlayer;
-        private String source;
-        private String title;
-        private int noteID = TAG.hashCode();
-        private BackgroundPlayer owner;
-        private NotificationManager noteMgr;
-        private WifiManager.WifiLock wifiLock;
-        private Bitmap videoThumbnail = null;
-        private NotificationCompat.Builder noteBuilder;
-
-        public PlayerThread(String src, String title, BackgroundPlayer owner) {
-            this.source = src;
-            this.title = title;
-            this.owner = owner;
-            mediaPlayer = new MediaPlayer();
-            mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC);
-        }
-
-        @Override
-        public void run() {
-            mediaPlayer.setWakeMode(getApplicationContext(), PowerManager.PARTIAL_WAKE_LOCK);//cpu lock
-            try {
-                mediaPlayer.setDataSource(source);
-                //We are already in a separate worker thread,
-                //so calling the blocking prepare() method should be ok
-                mediaPlayer.prepare();
-
-            } catch (IOException ioe) {
-                ioe.printStackTrace();
-                Log.e(TAG, "video source:" + source);
-                Log.e(TAG, "video title:" + title);
-                //can't do anything useful without a file to play; exit early
-                return;
-            }
-
-            try {
-                videoThumbnail = ActivityCommunicator.getCommunicator().backgroundPlayerThumbnail;
-            } catch (Exception e) {
-                Log.e(TAG, "Could not get video thumbnail from ActivityCommunicator");
-                e.printStackTrace();
-            }
-
-            WifiManager wifiMgr = ((WifiManager)getSystemService(Context.WIFI_SERVICE));
-            wifiLock = wifiMgr.createWifiLock(WifiManager.WIFI_MODE_FULL, TAG);
-
-            //listen for end of video
-            mediaPlayer.setOnCompletionListener(new EndListener(wifiLock));
-
-            //get audio focus
-            /*
-            AudioManager audioManager = (AudioManager) getSystemService(Context.AUDIO_SERVICE);
-            int result = audioManager.requestAudioFocus(this, AudioManager.STREAM_MUSIC,
-                    AudioManager.AUDIOFOCUS_GAIN);
-
-            if (result != AudioManager.AUDIOFOCUS_REQUEST_GRANTED) {
-                // could not get audio focus.
-            }*/
-            wifiLock.acquire();
-            mediaPlayer.start();
-
-            IntentFilter filter = new IntentFilter();
-            filter.setPriority(Integer.MAX_VALUE);
-            filter.addAction(ACTION_PLAYPAUSE);
-            filter.addAction(ACTION_STOP);
-            registerReceiver(broadcastReceiver, filter);
-
-            Notification note = buildNotification();
-
-            startForeground(noteID, note);
-
-            //currently decommissioned progressbar looping update code - works, but doesn't fit inside
-            //Notification.MediaStyle Notification layout.
-            noteMgr = (NotificationManager)getSystemService(NOTIFICATION_SERVICE);
-            /*
-            //update every 2s or 4 times in the video, whichever is shorter
-            int sleepTime = Math.min(2000, (int)((double)vidLength/4));
-            while(mediaPlayer.isPlaying()) {
-                noteBuilder.setProgress(vidLength, mediaPlayer.getCurrentPosition(), false);
-                noteMgr.notify(noteID, noteBuilder.build());
-                try {
-                    Thread.sleep(sleepTime);
-                } catch (InterruptedException e) {
-                    Log.d(TAG, "sleep failure");
-                }
-            }*/
-        }
-
-        /**Handles button presses from the notification. */
-        private final BroadcastReceiver broadcastReceiver = new BroadcastReceiver() {
-            @Override
-            public void onReceive(Context context, Intent intent) {
-                String action = intent.getAction();
-                //Log.i(TAG, "received broadcast action:"+action);
-                if(action.equals(ACTION_PLAYPAUSE)) {
-                    if(mediaPlayer.isPlaying()) {
-                        mediaPlayer.pause();
-                    }
-                    else {
-                        //reacquire CPU lock after auto-releasing it on pause
-                        mediaPlayer.setWakeMode(getApplicationContext(), PowerManager.PARTIAL_WAKE_LOCK);
-                        mediaPlayer.start();
-                    }
-                }
-                else if(action.equals(ACTION_STOP)) {
-                    //this auto-releases CPU lock
-                    mediaPlayer.stop();
-                    afterPlayCleanup();
-                }
-            }
-        };
-
-        private void afterPlayCleanup() {
-            //remove progress bar
-            //noteBuilder.setProgress(0, 0, false);
-
-            //remove notification
-            noteMgr.cancel(noteID);
-            unregisterReceiver(broadcastReceiver);
-            //release mediaPlayer's system resources
-            mediaPlayer.release();
-
-            //release wifilock
-            wifiLock.release();
-            //remove foreground status of service; make BackgroundPlayer killable
-            stopForeground(true);
-
-            stopSelf();
-        }
-
-        private class EndListener implements MediaPlayer.OnCompletionListener {
-            private WifiManager.WifiLock wl;
-            public EndListener(WifiManager.WifiLock wifiLock) {
-                this.wl = wifiLock;
-            }
-
-            @Override
-            public void onCompletion(MediaPlayer mp) {
-                afterPlayCleanup();
-            }
-        }
-
-        private Notification buildNotification() {
-            Notification note;
-            Resources res = getApplicationContext().getResources();
-            noteBuilder = new NotificationCompat.Builder(owner);
-
-            PendingIntent playPI = PendingIntent.getBroadcast(owner, noteID,
-                    new Intent(ACTION_PLAYPAUSE), PendingIntent.FLAG_UPDATE_CURRENT);
-            PendingIntent stopPI = PendingIntent.getBroadcast(owner, noteID,
-                    new Intent(ACTION_STOP), PendingIntent.FLAG_UPDATE_CURRENT);
-            /*
-            NotificationCompat.Action pauseButton = new NotificationCompat.Action.Builder
-                    (R.drawable.ic_pause_white_24dp, "Pause", playPI).build();
-            */
-
-            //build intent to return to video, on tapping notification
-            Intent openDetailView = new Intent(getApplicationContext(),
-                    VideoItemDetailActivity.class);
-            openDetailView.putExtra(VideoItemDetailFragment.STREAMING_SERVICE, serviceId);
-            openDetailView.putExtra(VideoItemDetailFragment.VIDEO_URL, webUrl);
-            openDetailView.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-
-            noteBuilder
-                    .setOngoing(true)
-                    .setDeleteIntent(stopPI)
-                            //doesn't fit with Notification.MediaStyle
-                            //.setProgress(vidLength, 0, false)
-                    .setSmallIcon(R.drawable.ic_play_circle_filled_white_24dp)
-                    .setTicker(
-                            String.format(res.getString(
-                                    R.string.background_player_time_text), title))
-                    .setContentIntent(PendingIntent.getActivity(getApplicationContext(),
-                            noteID, openDetailView,
-                            PendingIntent.FLAG_UPDATE_CURRENT));
-
-
-            if (android.os.Build.VERSION.SDK_INT < 21) {
-
-                NotificationCompat.Action playButton = new NotificationCompat.Action.Builder
-                        (R.drawable.ic_play_arrow_white_48dp,
-                                res.getString(R.string.play_btn_text), playPI).build();
-
-                noteBuilder
-                        .setContentTitle(title)
-                                //really? Id like to put something more helpful here.
-                                //was more of a placeholder than anything else. -medavox
-                                //.setContentText("NewPipe is playing in the background")
-                        .setContentText(channelName)
-                                //.setAutoCancel(!mediaPlayer.isPlaying())
-                        .setDeleteIntent(stopPI)
-                                //doesn't fit with Notification.MediaStyle
-                                //.setProgress(vidLength, 0, false)
-                        .setLargeIcon(videoThumbnail)
-                        .addAction(playButton);
-                        //.setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
-                        //.setLargeIcon(cover)
-
-                //is wrapping this in an SDK version check really necessary,
-                // if we're using NotificationCompat?
-                // the compat libraries should handle this, right? -medavox
-                if (android.os.Build.VERSION.SDK_INT >= 16)
-                    noteBuilder.setPriority(Notification.PRIORITY_LOW);
-
-                noteBuilder.setStyle(new NotificationCompat.MediaStyle()
-                        //.setMediaSession(mMediaSession.getSessionToken())
-                        .setShowActionsInCompactView(new int[]{0})
-                        .setShowCancelButton(true)
-                        .setCancelButtonIntent(stopPI));
-                if (videoThumbnail != null) {
-                    noteBuilder.setLargeIcon(videoThumbnail);
-                }
-                note = noteBuilder.build();
-            } else {
-                RemoteViews view =
-                        new RemoteViews(BuildConfig.APPLICATION_ID, R.layout.player_notification);
-                view.setImageViewBitmap(R.id.backgroundCover, videoThumbnail);
-                view.setTextViewText(R.id.backgroundSongName, title);
-                view.setTextViewText(R.id.backgroundArtist, channelName);
-                view.setOnClickPendingIntent(R.id.backgroundStop, stopPI);
-                view.setOnClickPendingIntent(R.id.backgroundPlayPause, playPI);
-
-                //possibly found the expandedView problem,
-                //but can't test it as I don't have a 5.0 device. -medavox
-                RemoteViews expandedView =
-                        new RemoteViews(BuildConfig.APPLICATION_ID, R.layout.player_notification_expanded);
-                expandedView.setImageViewBitmap(R.id.backgroundCover, videoThumbnail);
-                expandedView.setTextViewText(R.id.backgroundSongName, title);
-                expandedView.setTextViewText(R.id.backgroundArtist, channelName);
-                expandedView.setOnClickPendingIntent(R.id.backgroundStop, stopPI);
-                expandedView.setOnClickPendingIntent(R.id.backgroundPlayPause, playPI);
-
-                noteBuilder.setCategory(Notification.CATEGORY_TRANSPORT);
-
-                //Make notification appear on lockscreen
-                noteBuilder.setVisibility(Notification.VISIBILITY_PUBLIC);
-
-                note = noteBuilder.build();
-                note.contentView = view;
-
-                //todo: This never shows up. I was not able to figure out why:
-                note.bigContentView = expandedView;
-            }
-
-            return note;
-        }
-    }
-}

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

@@ -0,0 +1,268 @@
+package org.schabi.newpipe;
+
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Bundle;
+import android.os.Handler;
+import android.support.design.widget.CollapsingToolbarLayout;
+import android.support.design.widget.FloatingActionButton;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.support.v7.widget.Toolbar;
+import android.util.Log;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.ProgressBar;
+import android.widget.Toast;
+
+import com.nostra13.universalimageloader.core.ImageLoader;
+
+import org.schabi.newpipe.detail.VideoItemDetailActivity;
+import org.schabi.newpipe.detail.VideoItemDetailFragment;
+import org.schabi.newpipe.extractor.NewPipe;
+import org.schabi.newpipe.extractor.StreamingService;
+import org.schabi.newpipe.extractor.channel.ChannelExtractor;
+import org.schabi.newpipe.extractor.channel.ChannelInfo;
+import org.schabi.newpipe.extractor.exceptions.ExtractionException;
+import org.schabi.newpipe.extractor.exceptions.ParsingException;
+import org.schabi.newpipe.info_list.InfoItemBuilder;
+import org.schabi.newpipe.info_list.InfoListAdapter;
+import org.schabi.newpipe.report.ErrorActivity;
+
+import java.io.IOException;
+
+/**
+ * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
+ * ChannelActivity.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 ChannelActivity extends AppCompatActivity {
+
+
+    private static final String TAG = ChannelActivity.class.toString();
+    private View rootView = null;
+
+    // intent const
+    public static final String CHANNEL_URL = "channel_url";
+    public static final String SERVICE_ID = "service_id";
+
+    private int serviceId = -1;
+    private String channelUrl = "";
+    private int pageNumber = 0;
+    private boolean hasNextPage = true;
+    private boolean isLoading = false;
+
+    private ImageLoader imageLoader = ImageLoader.getInstance();
+    private InfoListAdapter infoListAdapter = null;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_channel);
+        Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
+        rootView = findViewById(R.id.rootView);
+        setSupportActionBar(toolbar);
+        Intent i = getIntent();
+        channelUrl = i.getStringExtra(CHANNEL_URL);
+        serviceId = i.getIntExtra(SERVICE_ID, -1);
+
+        infoListAdapter = new InfoListAdapter(this, rootView);
+        RecyclerView recyclerView = (RecyclerView) findViewById(R.id.channel_streams_view);
+        final LinearLayoutManager layoutManager = new LinearLayoutManager(this);
+        recyclerView.setLayoutManager(layoutManager);
+        recyclerView.setAdapter(infoListAdapter);
+        infoListAdapter.setOnItemSelectedListener(new InfoItemBuilder.OnItemSelectedListener() {
+            @Override
+            public void selected(String url) {
+                Intent detailIntent = new Intent(ChannelActivity.this, VideoItemDetailActivity.class);
+                detailIntent.putExtra(VideoItemDetailFragment.VIDEO_URL, url);
+                detailIntent.putExtra(
+                        VideoItemDetailFragment.STREAMING_SERVICE, serviceId);
+                startActivity(detailIntent);
+            }
+        });
+
+        // detect if list has ben scrolled to the bottom
+        recyclerView.setOnScrollListener(new RecyclerView.OnScrollListener() {
+            @Override
+            public void onScrolled(RecyclerView recyclerView, int dx, int dy) {
+                int pastVisiblesItems, visibleItemCount, totalItemCount;
+                super.onScrolled(recyclerView, dx, dy);
+                if(dy > 0) //check for scroll down
+                {
+                    visibleItemCount = layoutManager.getChildCount();
+                    totalItemCount = layoutManager.getItemCount();
+                    pastVisiblesItems = layoutManager.findFirstVisibleItemPosition();
+
+                    if ( (visibleItemCount + pastVisiblesItems) >= totalItemCount
+                            && !isLoading
+                            && hasNextPage)
+                    {
+                        pageNumber++;
+                        requestData(true);
+                    }
+                }
+            }
+        });
+
+        requestData(false);
+    }
+
+
+
+    private void updateUi(final ChannelInfo info) {
+        CollapsingToolbarLayout ctl = (CollapsingToolbarLayout) findViewById(R.id.channel_toolbar_layout);
+        ProgressBar progressBar = (ProgressBar) findViewById(R.id.progressBar);
+        ImageView channelBanner = (ImageView) findViewById(R.id.channel_banner_image);
+        FloatingActionButton feedButton = (FloatingActionButton) findViewById(R.id.channel_rss_fab);
+        ImageView avatarView = (ImageView) findViewById(R.id.channel_avatar_view);
+        ImageView haloView = (ImageView) findViewById(R.id.channel_avatar_halo);
+
+        progressBar.setVisibility(View.GONE);
+
+        if(info.channel_name != null && !info.channel_name.isEmpty()) {
+            ctl.setTitle(info.channel_name);
+        }
+
+        if(info.banner_url != null && !info.banner_url.isEmpty()) {
+            imageLoader.displayImage(info.banner_url, channelBanner,
+                    new ImageErrorLoadingListener(this, rootView ,info.service_id));
+        }
+
+        if(info.avatar_url != null && !info.avatar_url.isEmpty()) {
+            avatarView.setVisibility(View.VISIBLE);
+            haloView.setVisibility(View.VISIBLE);
+            imageLoader.displayImage(info.avatar_url, avatarView,
+                    new ImageErrorLoadingListener(this, rootView ,info.service_id));
+        }
+
+        if(info.feed_url != null && !info.feed_url.isEmpty()) {
+            feedButton.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View view) {
+                    Log.d(TAG, info.feed_url);
+                    Intent i = new Intent(Intent.ACTION_VIEW, Uri.parse(info.feed_url));
+                    startActivity(i);
+                }
+            });
+        } else {
+            feedButton.setVisibility(View.GONE);
+        }
+    }
+
+    private void addVideos(final ChannelInfo info) {
+        infoListAdapter.addStreamItemList(info.related_streams);
+    }
+
+    private void postNewErrorToast(Handler h, final int stringResource) {
+        h.post(new Runnable() {
+            @Override
+            public void run() {
+                Toast.makeText(ChannelActivity.this,
+                        stringResource, Toast.LENGTH_LONG).show();
+            }
+        });
+    }
+
+    private void requestData(final boolean onlyVideos) {
+        // start processing
+        isLoading = true;
+        Thread channelExtractorThread = new Thread(new Runnable() {
+            Handler h = new Handler();
+
+            @Override
+            public void run() {
+                StreamingService service = null;
+                try {
+                    service = NewPipe.getService(serviceId);
+                    ChannelExtractor extractor = service.getChannelExtractorInstance(
+                            channelUrl, pageNumber);
+
+                    final ChannelInfo info = ChannelInfo.getInfo(extractor);
+
+
+                    h.post(new Runnable() {
+                        @Override
+                        public void run() {
+                            isLoading = false;
+                            if(!onlyVideos) {
+                                updateUi(info);
+                            }
+                            hasNextPage = info.hasNextPage;
+                            addVideos(info);
+                        }
+                    });
+
+                    // look for non critical errors during extraction
+                    if(info != null &&
+                            !info.errors.isEmpty()) {
+                        Log.e(TAG, "OCCURRED ERRORS DURING EXTRACTION:");
+                        for (Throwable e : info.errors) {
+                            e.printStackTrace();
+                            Log.e(TAG, "------");
+                        }
+
+                        View rootView = findViewById(android.R.id.content);
+                        ErrorActivity.reportError(h, ChannelActivity.this,
+                                info.errors, null, rootView,
+                                ErrorActivity.ErrorInfo.make(ErrorActivity.REQUESTED_CHANNEL,
+                                        service.getServiceInfo().name, channelUrl, 0 /* no message for the user */));
+                    }
+                } catch(IOException ioe) {
+                    postNewErrorToast(h, R.string.network_error);
+                    ioe.printStackTrace();
+                } catch(ParsingException pe) {
+                    ErrorActivity.reportError(h, ChannelActivity.this, pe, VideoItemDetailFragment.class, null,
+                            ErrorActivity.ErrorInfo.make(ErrorActivity.REQUESTED_CHANNEL,
+                                    service.getServiceInfo().name, channelUrl, R.string.parsing_error));
+                    h.post(new Runnable() {
+                        @Override
+                        public void run() {
+                            ChannelActivity.this.finish();
+                        }
+                    });
+                    pe.printStackTrace();
+                } catch(ExtractionException ex) {
+                    ErrorActivity.reportError(h, ChannelActivity.this, ex, VideoItemDetailFragment.class, null,
+                            ErrorActivity.ErrorInfo.make(ErrorActivity.REQUESTED_CHANNEL,
+                                    service.getServiceInfo().name, channelUrl, R.string.parsing_error));
+                    h.post(new Runnable() {
+                        @Override
+                        public void run() {
+                            ChannelActivity.this.finish();
+                        }
+                    });
+                    ex.printStackTrace();
+                } catch(Exception e) {
+                    ErrorActivity.reportError(h, ChannelActivity.this, e, VideoItemDetailFragment.class, null,
+                            ErrorActivity.ErrorInfo.make(ErrorActivity.REQUESTED_CHANNEL,
+                                    service.getServiceInfo().name, channelUrl, R.string.general_error));
+                    h.post(new Runnable() {
+                        @Override
+                        public void run() {
+                            ChannelActivity.this.finish();
+                        }
+                    });
+                    e.printStackTrace();
+                }
+            }
+        });
+
+        channelExtractorThread.start();
+    }
+
+}

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

@@ -1,113 +0,0 @@
-package org.schabi.newpipe;
-
-import android.app.Dialog;
-import android.app.DownloadManager;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.SharedPreferences;
-import android.net.Uri;
-import android.os.Bundle;
-import android.os.Environment;
-import android.preference.PreferenceManager;
-import android.support.annotation.NonNull;
-import android.support.v4.app.DialogFragment;
-import android.support.v7.app.AlertDialog;
-import android.util.Log;
-
-import java.io.File;
-
-/**
- * Created by Christian Schabesberger on 21.09.15.
- *
- * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
- * DownloadDialog.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 DownloadDialog extends DialogFragment {
-    private static final String TAG = DialogFragment.class.getName();
-
-    public static final String TITLE = "name";
-    public static final String FILE_SUFFIX_AUDIO = "file_suffix_audio";
-    public static final String FILE_SUFFIX_VIDEO = "file_suffix_video";
-    public static final String AUDIO_URL = "audio_url";
-    public static final String VIDEO_URL = "video_url";
-    private Bundle arguments;
-
-    @NonNull
-    @Override
-    public Dialog onCreateDialog(Bundle savedInstanceState) {
-        arguments = getArguments();
-        super.onCreateDialog(savedInstanceState);
-        AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
-        builder.setTitle(R.string.download_dialog_title)
-                .setItems(R.array.download_options, new DialogInterface.OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface dialog, int which) {
-                        Context context = getActivity();
-                        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
-                        String suffix = "";
-                        String title = arguments.getString(TITLE);
-                        String url = "";
-                        String downloadFolder = Environment.DIRECTORY_DOWNLOADS;
-                        switch(which) {
-                            case 0:     // Video
-                                suffix = arguments.getString(FILE_SUFFIX_VIDEO);
-                                url = arguments.getString(VIDEO_URL);
-                                downloadFolder = Environment.DIRECTORY_MOVIES;
-                                break;
-                            case 1:
-                                suffix = arguments.getString(FILE_SUFFIX_AUDIO);
-                                url = arguments.getString(AUDIO_URL);
-                                downloadFolder = Environment.DIRECTORY_MUSIC;
-                                break;
-                            default:
-                                Log.d(TAG, "lolz");
-                        }
-                        //to avoid hard-coded string like "/storage/emulated/0/Movies"
-                        String downloadPath = prefs.getString(getString(R.string.download_path_key),
-                                Environment.getExternalStorageDirectory().getAbsolutePath() + "/" + downloadFolder);
-                        final File dir = new File(downloadPath);
-                        if(!dir.exists()) {
-                            //attempt to create directory
-                            boolean mkdir = dir.mkdir();
-                            if(!mkdir && !dir.isDirectory()) {
-                                Log.e(TAG, "Cant' create directory named " + dir.toString());
-                                //TODO notify user "download directory should be changed" ?
-                            }
-                        }
-
-                        String saveFilePath = dir + "/" + title + suffix;
-                        if (App.isUsingTor()) {
-                            // if using Tor, do not use DownloadManager because the proxy cannot be set
-                            Downloader.downloadFile(getContext(), url, saveFilePath);
-                        } else {
-                            DownloadManager dm = (DownloadManager) context.getSystemService(Context.DOWNLOAD_SERVICE);
-                            DownloadManager.Request request = new DownloadManager.Request(
-                                    Uri.parse(url));
-                            request.setDestinationUri(Uri.fromFile(new File(saveFilePath)));
-                            request.setNotificationVisibility(DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED);
-                            try {
-                                dm.enqueue(request);
-                            } catch (Exception e) {
-                                e.printStackTrace();
-                            }
-                        }
-                    }
-                });
-        return builder.create();
-    }
-
-}

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

@@ -1,34 +1,23 @@
 package org.schabi.newpipe;
 
+import org.schabi.newpipe.extractor.exceptions.ReCaptchaException;
 
-import android.app.NotificationManager;
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.graphics.drawable.BitmapDrawable;
-import android.graphics.drawable.Drawable;
-import android.os.AsyncTask;
-import android.preference.PreferenceManager;
-import android.support.v4.app.NotificationCompat;
-import android.util.Log;
-
-import java.io.BufferedInputStream;
 import java.io.BufferedReader;
-import java.io.FileOutputStream;
 import java.io.IOException;
-import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.net.HttpURLConnection;
 import java.net.URL;
 import java.net.UnknownHostException;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
 
 import javax.net.ssl.HttpsURLConnection;
 
-import info.guardianproject.netcipher.NetCipher;
 
 /**
- * Created by Christian Schabesberger on 14.08.15.
+ * Created by Christian Schabesberger on 28.01.16.
  *
- * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
+ * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
  * Downloader.java is part of NewPipe.
  *
  * NewPipe is free software: you can redistribute it and/or modify
@@ -45,159 +34,113 @@ import info.guardianproject.netcipher.NetCipher;
  * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-public class Downloader {
-    public static final String TAG = "Downloader";
-    private static final String USER_AGENT = "Mozilla/5.0";
+public class Downloader implements org.schabi.newpipe.extractor.Downloader {
+    
+    private static final String USER_AGENT = "Mozilla/5.0 (Windows NT 6.1; WOW64; rv:43.0) Gecko/20100101 Firefox/43.0";
+    private static String mCookies = "";
+
+    private static Downloader instance = null;
+
+    private Downloader() {}
+
+    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 static synchronized String getCookies() {
+        return Downloader.mCookies;
+    }
 
     /**Download the text file at the supplied URL as in download(String),
      * but set the HTTP header field "Accept-Language" to the supplied string.
      * @param siteUrl the URL of the text file to return the contents of
      * @param language the language (usually a 2-character code) to set as the preferred language
      * @return the contents of the specified text file*/
-    public static String download(String siteUrl, String language) {
-        String ret = "";
-        try {
-            URL url = new URL(siteUrl);
-            HttpsURLConnection con = (HttpsURLConnection) url.openConnection();
-            con.setRequestProperty("Accept-Language", language);
-            ret = dl(con);
+    public String download(String siteUrl, String language) throws IOException, ReCaptchaException {
+        Map<String, String> requestProperties = new HashMap<>();
+        requestProperties.put("Accept-Language", language);
+        return download(siteUrl, requestProperties);
+    }
+
+
+    /**Download the text file at the supplied URL as in download(String),
+     * but set the HTTP header field "Accept-Language" to the supplied string.
+     * @param siteUrl the URL of the text file to return the contents of
+     * @param customProperties set request header properties
+     * @return the contents of the specified text file
+     * @throws IOException*/
+    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());
         }
-        catch(Exception e) {
-            e.printStackTrace();
-        }
-        return ret;
+        return dl(con);
     }
 
     /**Common functionality between download(String url) and download(String url, String language)*/
-    private static String dl(HttpsURLConnection con) throws IOException {
+    private static String dl(HttpsURLConnection con) throws IOException, ReCaptchaException {
         StringBuilder response = new StringBuilder();
+        BufferedReader in = null;
 
         try {
             con.setRequestMethod("GET");
             con.setRequestProperty("User-Agent", USER_AGENT);
 
-            BufferedReader in = new BufferedReader(
+            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);
             }
-            in.close();
-
-        }
-        catch(UnknownHostException uhe) {//thrown when there's no internet connection
-            uhe.printStackTrace();
+        } catch(UnknownHostException uhe) {//thrown when there's no internet connection
+            throw new IOException("unknown host or no network", uhe);
             //Toast.makeText(getActivity(), uhe.getMessage(), Toast.LENGTH_LONG).show();
+        } catch(Exception e) {
+            /*
+             * HTTP 429 == Too Many Request
+             * Receive from Youtube.com = ReCaptcha challenge request
+             * See : https://github.com/rg3/youtube-dl/issues/5138
+             */
+            if (con.getResponseCode() == 429) {
+                throw new ReCaptchaException("reCaptcha Challenge requested");
+            }
+            throw new IOException(e);
+        } finally {
+            if(in != null) {
+                in.close();
+            }
         }
 
         return response.toString();
     }
 
-/**Download (via HTTP) the text file located at the supplied URL, and return its contents.
- * Primarily intended for downloading web pages.
- * @param siteUrl the URL of the text file to download
- * @return the contents of the specified text file*/
-    public static String download(String siteUrl) {
-        String ret = "";
-
-        try {
-            URL url = new URL(siteUrl);
-            HttpsURLConnection con = NetCipher.getHttpsURLConnection(url);
-            ret = dl(con);
-        }
-        catch(Exception e) {
-            e.printStackTrace();
-        }
-
-        return ret;
+    /**Download (via HTTP) the text file located at the supplied URL, and return its contents.
+     * Primarily intended for downloading web pages.
+     * @param siteUrl the URL of the text file to download
+     * @return the contents of the specified text file*/
+    public String download(String siteUrl) throws IOException, ReCaptchaException {
+        URL url = new URL(siteUrl);
+        HttpsURLConnection con = (HttpsURLConnection) url.openConnection();
+        //HttpsURLConnection con = NetCipher.getHttpsURLConnection(url);
+        return dl(con);
     }
-
-    /**
-     * Downloads a file from a URL in the background using an {@link AsyncTask}.
-     *
-     * @param fileURL      HTTP URL of the file to be downloaded
-     * @param saveFilePath path of the directory to save the file
-     * @throws IOException
-     */
-    public static void downloadFile(final Context context, final String fileURL, final String saveFilePath) {
-        new AsyncTask<Void, Integer, Void>() {
-
-            private NotificationManager nm;
-            private NotificationCompat.Builder builder;
-            private int notifyId = 0x1234;
-            private int fileSize = 0xffffffff;
-
-            @Override
-            protected void onPreExecute() {
-                super.onPreExecute();
-                nm = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
-                Drawable icon = context.getResources().getDrawable(R.mipmap.ic_launcher);
-                builder = new NotificationCompat.Builder(context)
-                        .setSmallIcon(android.R.drawable.stat_sys_download)
-                        .setLargeIcon(((BitmapDrawable) icon).getBitmap())
-                        .setContentTitle(saveFilePath.substring(saveFilePath.lastIndexOf('/') + 1))
-                        .setContentText(saveFilePath)
-                        .setProgress(fileSize, 0, false);
-                nm.notify(notifyId, builder.build());
-            }
-
-            @Override
-            protected Void doInBackground(Void... voids) {
-                HttpsURLConnection con = null;
-                try {
-                    con = NetCipher.getHttpsURLConnection(fileURL);
-                    int responseCode = con.getResponseCode();
-
-                    // always check HTTP response code first
-                    if (responseCode == HttpURLConnection.HTTP_OK) {
-                        fileSize = con.getContentLength();
-                        InputStream inputStream = new BufferedInputStream(con.getInputStream());
-                        FileOutputStream outputStream = new FileOutputStream(saveFilePath);
-
-                        int bufferSize = 8192;
-                        int downloaded = 0;
-
-                        int bytesRead = -1;
-                        byte[] buffer = new byte[bufferSize];
-                        while ((bytesRead = inputStream.read(buffer)) != -1) {
-                            outputStream.write(buffer, 0, bytesRead);
-                            downloaded += bytesRead;
-                            if (downloaded % 50000 < bufferSize) {
-                                publishProgress(downloaded);
-                            }
-                        }
-
-                        outputStream.close();
-                        inputStream.close();
-                        publishProgress(bufferSize);
-
-                    } else {
-                        Log.i(TAG, "No file to download. Server replied HTTP code: " + responseCode);
-                    }
-                } catch (IOException e) {
-                    e.printStackTrace();
-                } finally {
-                    if (con != null) {
-                        con.disconnect();
-                        con = null;
-                    }
-                }
-                return null;
-            }
-
-            @Override
-            protected void onProgressUpdate(Integer... progress) {
-                builder.setProgress(fileSize, progress[0], false);
-                nm.notify(notifyId, builder.build());
-            }
-
-            @Override
-            protected void onPostExecute(Void aVoid) {
-                super.onPostExecute(aVoid);
-                nm.cancel(notifyId);
-            }
-        }.execute();
-    }
-
 }

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

@@ -0,0 +1,64 @@
+package org.schabi.newpipe;
+
+import android.app.Activity;
+import android.graphics.Bitmap;
+import android.view.View;
+
+import com.nostra13.universalimageloader.core.assist.FailReason;
+import com.nostra13.universalimageloader.core.listener.ImageLoadingListener;
+
+import org.schabi.newpipe.report.ErrorActivity;
+import org.schabi.newpipe.extractor.NewPipe;
+
+/**
+ * Created by Christian Schabesberger on 01.08.16.
+ *
+ * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
+ * StreamInfoItemViewCreator.java is part of NewPipe.
+ *
+ * NewPipe is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * NewPipe is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+public class ImageErrorLoadingListener implements ImageLoadingListener {
+
+    private int serviceId = -1;
+    private Activity activity = null;
+    private View rootView = null;
+
+    public ImageErrorLoadingListener(Activity activity, View rootView, int serviceId) {
+        this.activity = activity;
+        this.serviceId= serviceId;
+        this.rootView = rootView;
+    }
+
+    @Override
+    public void onLoadingStarted(String imageUri, View view) {}
+
+    @Override
+    public void onLoadingFailed(String imageUri, View view, FailReason failReason) {
+        ErrorActivity.reportError(activity,
+                failReason.getCause(), null, rootView,
+                ErrorActivity.ErrorInfo.make(ErrorActivity.LOAD_IMAGE,
+                        NewPipe.getNameOfService(serviceId), imageUri,
+                        R.string.could_not_load_image));
+    }
+
+    @Override
+    public void onLoadingComplete(String imageUri, View view, Bitmap loadedImage) {
+
+    }
+
+    @Override
+    public void onLoadingCancelled(String imageUri, View view) {}
+}

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

@@ -34,6 +34,9 @@ import java.util.Locale;
 
 public class Localization {
 
+    private Localization() {
+    }
+
     public static Locale getPreferredLocale(Context context) {
         SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(context);
 

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

@@ -0,0 +1,86 @@
+package org.schabi.newpipe;
+
+import android.content.Intent;
+import android.media.AudioManager;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.NavUtils;
+import android.support.v7.app.AppCompatActivity;
+import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+
+import org.schabi.newpipe.settings.SettingsActivity;
+
+/**
+ * Created by Christian Schabesberger on 02.08.16.
+ *
+ * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
+ * DownloadActivity.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 MainActivity extends AppCompatActivity {
+
+    private Fragment mainFragment = null;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
+        setVolumeControlStream(AudioManager.STREAM_MUSIC);
+        mainFragment = getSupportFragmentManager()
+                .findFragmentById(R.id.search_fragment);
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        super.onCreateOptionsMenu(menu);
+        MenuInflater inflater = getMenuInflater();
+
+        inflater.inflate(R.menu.main_menu, menu);
+
+        mainFragment.onCreateOptionsMenu(menu, inflater);
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        int id = item.getItemId();
+
+        switch(id) {
+            case android.R.id.home: {
+                Intent intent = new Intent(this, MainActivity.class);
+                intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+                NavUtils.navigateUpTo(this, intent);
+                return true;
+            }
+            case R.id.action_settings: {
+                Intent intent = new Intent(this, SettingsActivity.class);
+                startActivity(intent);
+                return true;
+            }
+            case R.id.action_show_downloads: {
+                Intent intent = new Intent(this, org.schabi.newpipe.download.DownloadActivity.class);
+                startActivity(intent);
+                return true;
+            }
+            default:
+                return mainFragment.onOptionsItemSelected(item) ||
+                        super.onOptionsItemSelected(item);
+        }
+    }
+}

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

@@ -6,6 +6,7 @@ import android.app.Activity;
 import android.content.Intent;
 import android.os.Build;
 import android.os.Bundle;
+import android.media.AudioManager;
 
 /**
  * Copyright (C) Hans-Christoph Steiner 2016 <hans@eds.org>
@@ -33,7 +34,6 @@ public class PanicResponderActivity extends Activity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-
         Intent intent = getIntent();
         if (intent != null && PANIC_TRIGGER_ACTION.equals(intent.getAction())) {
             // TODO explicitly clear the search results once they are restored when the app restarts

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

@@ -0,0 +1,151 @@
+package org.schabi.newpipe;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.graphics.Bitmap;
+import android.os.Build;
+import android.os.Bundle;
+import android.support.v4.app.NavUtils;
+import android.support.v7.app.ActionBar;
+import android.support.v7.app.AppCompatActivity;
+import android.view.MenuItem;
+import android.webkit.CookieManager;
+import android.webkit.ValueCallback;
+import android.webkit.WebSettings;
+import android.webkit.WebView;
+import android.webkit.WebViewClient;
+
+/**
+ * Created by beneth <bmauduit@beneth.fr> on 06.12.16.
+ *
+ * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
+ * ReCaptchaActivity.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 ReCaptchaActivity extends AppCompatActivity {
+    public static final int RECAPTCHA_REQUEST = 10;
+
+    public static final String TAG = ReCaptchaActivity.class.toString();
+    public static final String YT_URL = "https://www.youtube.com";
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_recaptcha);
+
+        // Set return to Cancel by default
+        setResult(RESULT_CANCELED);
+
+        ActionBar actionBar = getSupportActionBar();
+        actionBar.setDisplayHomeAsUpEnabled(true);
+        actionBar.setTitle(R.string.reCaptcha_title);
+        actionBar.setDisplayShowTitleEnabled(true);
+
+        WebView myWebView = (WebView) findViewById(R.id.reCaptchaWebView);
+
+        // Enable Javascript
+        WebSettings webSettings = myWebView.getSettings();
+        webSettings.setJavaScriptEnabled(true);
+
+        ReCaptchaWebViewClient webClient = new ReCaptchaWebViewClient(this);
+        myWebView.setWebViewClient(webClient);
+
+        // Cleaning cache, history and cookies from webView
+        myWebView.clearCache(true);
+        myWebView.clearHistory();
+        android.webkit.CookieManager cookieManager = CookieManager.getInstance();
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            cookieManager.removeAllCookies(new ValueCallback<Boolean>() {
+                @Override
+                public void onReceiveValue(Boolean aBoolean) {}
+            });
+        } else {
+            cookieManager.removeAllCookie();
+        }
+
+        myWebView.loadUrl(YT_URL);
+    }
+
+    private class ReCaptchaWebViewClient extends WebViewClient {
+        private Activity context;
+        private String mCookies;
+
+        ReCaptchaWebViewClient(Activity ctx) {
+            context = ctx;
+        }
+
+        @Override
+        public void onPageStarted(WebView view, String url, Bitmap favicon) {
+            // TODO: Start Loader
+            super.onPageStarted(view, url, favicon);
+        }
+
+        @Override
+        public void onPageFinished(WebView view, String url) {
+            String cookies = CookieManager.getInstance().getCookie(url);
+
+            // TODO: Stop Loader
+
+            // find cookies : s_gl & goojf and Add cookies to Downloader
+            if (find_access_cookies(cookies)) {
+                // Give cookies to Downloader class
+                Downloader.setCookies(mCookies);
+
+                // Closing activity and return to parent
+                setResult(RESULT_OK);
+                finish();
+            }
+        }
+
+        private boolean find_access_cookies(String cookies) {
+            boolean ret = false;
+            String c_s_gl = "";
+            String c_goojf = "";
+
+            String[] parts = cookies.split("; ");
+            for (String part : parts) {
+                if (part.trim().startsWith("s_gl")) {
+                    c_s_gl = part.trim();
+                }
+                if (part.trim().startsWith("goojf")) {
+                    c_goojf = part.trim();
+                }
+            }
+            if (c_s_gl.length() > 0 && c_goojf.length() > 0) {
+                ret = true;
+                //mCookies = c_s_gl + "; " + c_goojf;
+                // Youtube seems to also need the other cookies:
+                mCookies = cookies;
+            }
+
+            return ret;
+        }
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        int id = item.getItemId();
+        switch (id) {
+            case android.R.id.home: {
+                Intent intent = new Intent(this, org.schabi.newpipe.MainActivity.class);
+                intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+                NavUtils.navigateUpTo(this, intent);
+                return true;
+            }
+            default:
+                return false;
+        }
+    }
+}

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

@@ -1,260 +0,0 @@
-package org.schabi.newpipe;
-
-import android.app.Activity;
-import android.content.Context;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.content.res.Configuration;
-import android.os.Bundle;
-import android.os.Environment;
-import android.preference.CheckBoxPreference;
-import android.preference.EditTextPreference;
-import android.preference.ListPreference;
-import android.preference.PreferenceActivity;
-import android.preference.PreferenceFragment;
-import android.preference.PreferenceManager;
-import android.support.annotation.LayoutRes;
-import android.support.annotation.NonNull;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.AppCompatDelegate;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.ViewGroup;
-
-import info.guardianproject.netcipher.proxy.OrbotHelper;
-
-/**
- * Created by Christian Schabesberger on 31.08.15.
- *
- * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
- * SettingsActivity.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 SettingsActivity extends PreferenceActivity  {
-
-    private static final int REQUEST_INSTALL_ORBOT = 0x1234;
-    private AppCompatDelegate mDelegate = null;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceBundle) {
-        getDelegate().installViewFactory();
-        getDelegate().onCreate(savedInstanceBundle);
-        super.onCreate(savedInstanceBundle);
-
-        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-
-        getFragmentManager().beginTransaction()
-                .replace(android.R.id.content, new SettingsFragment())
-                .commit();
-
-    }
-
-    public static class SettingsFragment extends PreferenceFragment{
-        SharedPreferences.OnSharedPreferenceChangeListener prefListener;
-
-        // get keys
-        String DEFAULT_RESOLUTION_PREFERENCE;
-        String DEFAULT_AUDIO_FORMAT_PREFERENCE;
-        String SEARCH_LANGUAGE_PREFERENCE;
-        String DOWNLOAD_PATH_PREFERENCE;
-        String USE_TOR_KEY;
-
-        private ListPreference defaultResolutionPreference;
-        private ListPreference defaultAudioFormatPreference;
-        private ListPreference searchLanguagePreference;
-        private EditTextPreference downloadPathPreference;
-        private CheckBoxPreference useTorCheckBox;
-        private SharedPreferences defaultPreferences;
-
-
-        @Override
-        public void onCreate(Bundle savedInstanceState) {
-            super.onCreate(savedInstanceState);
-            addPreferencesFromResource(R.xml.settings);
-
-            final Activity activity = getActivity();
-
-            defaultPreferences = PreferenceManager.getDefaultSharedPreferences(activity);
-
-            // get keys
-            DEFAULT_RESOLUTION_PREFERENCE =getString(R.string.default_resolution_key);
-            DEFAULT_AUDIO_FORMAT_PREFERENCE =getString(R.string.default_audio_format_key);
-            SEARCH_LANGUAGE_PREFERENCE =getString(R.string.search_language_key);
-            DOWNLOAD_PATH_PREFERENCE = getString(R.string.download_path_key);
-            USE_TOR_KEY = getString(R.string.use_tor_key);
-
-            // get pref objects
-            defaultResolutionPreference =
-                    (ListPreference) findPreference(DEFAULT_RESOLUTION_PREFERENCE);
-            defaultAudioFormatPreference =
-                    (ListPreference) findPreference(DEFAULT_AUDIO_FORMAT_PREFERENCE);
-            searchLanguagePreference =
-                    (ListPreference) findPreference(SEARCH_LANGUAGE_PREFERENCE);
-            downloadPathPreference =
-                    (EditTextPreference) findPreference(DOWNLOAD_PATH_PREFERENCE);
-            useTorCheckBox = (CheckBoxPreference) findPreference(USE_TOR_KEY);
-
-            prefListener = new SharedPreferences.OnSharedPreferenceChangeListener() {
-                @Override
-                public void onSharedPreferenceChanged(SharedPreferences sharedPreferences,
-                                                      String key) {
-                    Activity a = getActivity();
-                    updateSummary();
-
-                    if (defaultPreferences.getBoolean(USE_TOR_KEY, false)) {
-                        if (OrbotHelper.isOrbotInstalled(a)) {
-                            App.configureTor(true);
-                            OrbotHelper.requestStartTor(a);
-                        } else {
-                            Intent intent = OrbotHelper.getOrbotInstallIntent(a);
-                            a.startActivityForResult(intent, REQUEST_INSTALL_ORBOT);
-                        }
-                    } else {
-                        App.configureTor(false);
-                    }
-                }
-            };
-            defaultPreferences.registerOnSharedPreferenceChangeListener(prefListener);
-
-            updateSummary();
-        }
-
-        // This is used to show the status of some preference in the description
-        private void updateSummary() {
-            defaultResolutionPreference.setSummary(
-                    defaultPreferences.getString(DEFAULT_RESOLUTION_PREFERENCE,
-                            getString(R.string.default_resolution_value)));
-            defaultAudioFormatPreference.setSummary(
-                    defaultPreferences.getString(DEFAULT_AUDIO_FORMAT_PREFERENCE,
-                            getString(R.string.default_audio_format_value)));
-            searchLanguagePreference.setSummary(
-                    defaultPreferences.getString(SEARCH_LANGUAGE_PREFERENCE,
-                            getString(R.string.default_language_value)));
-            downloadPathPreference.setSummary(
-                    defaultPreferences.getString(DOWNLOAD_PATH_PREFERENCE,
-                            getString(R.string.download_path_summary)));
-        }
-    }
-
-    @Override
-    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-        super.onActivityResult(requestCode, resultCode, data);
-        // try to start tor regardless of resultCode since clicking back after
-        // installing the app does not necessarily return RESULT_OK
-        App.configureTor(requestCode == REQUEST_INSTALL_ORBOT
-                && OrbotHelper.requestStartTor(this));
-    }
-
-    @Override
-    protected void onPostCreate(Bundle savedInstanceState) {
-        super.onPostCreate(savedInstanceState);
-        getDelegate().onPostCreate(savedInstanceState);
-    }
-
-    private ActionBar getSupportActionBar() {
-        return getDelegate().getSupportActionBar();
-    }
-
-    @NonNull
-    @Override
-    public MenuInflater getMenuInflater() {
-        return getDelegate().getMenuInflater();
-    }
-
-    @Override
-    public void setContentView(@LayoutRes int layoutResID) {
-        getDelegate().setContentView(layoutResID);
-    }
-
-    @Override
-    public void setContentView(View view) {
-        getDelegate().setContentView(view);
-    }
-
-    @Override
-    public void setContentView(View view, ViewGroup.LayoutParams params) {
-        getDelegate().setContentView(view, params);
-    }
-
-    @Override
-    public void addContentView(View view, ViewGroup.LayoutParams params) {
-        getDelegate().addContentView(view, params);
-    }
-
-    @Override
-    protected void onPostResume() {
-        super.onPostResume();
-        getDelegate().onPostResume();
-    }
-
-    @Override
-    protected void onTitleChanged(CharSequence title, int color) {
-        super.onTitleChanged(title, color);
-        getDelegate().setTitle(title);
-    }
-
-    @Override
-    public void onConfigurationChanged(Configuration newConfig) {
-        super.onConfigurationChanged(newConfig);
-        getDelegate().onConfigurationChanged(newConfig);
-    }
-
-    @Override
-    protected void onStop() {
-        super.onStop();
-        getDelegate().onStop();
-    }
-
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-        getDelegate().onDestroy();
-    }
-
-    public void invalidateOptionsMenu() {
-        getDelegate().invalidateOptionsMenu();
-    }
-
-    private AppCompatDelegate getDelegate() {
-        if (mDelegate == null) {
-            mDelegate = AppCompatDelegate.create(this, null);
-        }
-        return mDelegate;
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        int id = item.getItemId();
-        if(id == android.R.id.home) {
-            finish();
-        }
-        return true;
-    }
-
-    public static void initSettings(Context context) {
-        PreferenceManager.setDefaultValues(context, R.xml.settings, false);
-        SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(context);
-        if(sp.getString(context.getString(R.string.download_path_key), "").isEmpty()){
-            SharedPreferences.Editor spEditor = sp.edit();
-            String newPipeDownloadStorage =
-                    Environment.getExternalStorageDirectory().getAbsolutePath() + "/NewPipe";
-            spEditor.putString(context.getString(R.string.download_path_key)
-                    , newPipeDownloadStorage);
-            spEditor.apply();
-        }
-    }
-}

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

@@ -1,74 +0,0 @@
-package org.schabi.newpipe;
-
-import android.content.Context;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-/**
- * Created by Christian Schabesberger on 24.10.15.
- *
- * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
- * VideoInfoItemViewCreator.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/>.
- */
-
-class VideoInfoItemViewCreator {
-    private final LayoutInflater inflater;
-
-    public VideoInfoItemViewCreator(LayoutInflater inflater) {
-        this.inflater = inflater;
-    }
-
-    public View getViewFromVideoInfoItem(View convertView, ViewGroup parent, VideoPreviewInfo info, Context context) {
-        ViewHolder holder;
-        if(convertView == null) {
-            convertView = inflater.inflate(R.layout.video_item, parent, false);
-            holder = new ViewHolder();
-            holder.itemThumbnailView = (ImageView) convertView.findViewById(R.id.itemThumbnailView);
-            holder.itemVideoTitleView = (TextView) convertView.findViewById(R.id.itemVideoTitleView);
-            holder.itemUploaderView = (TextView) convertView.findViewById(R.id.itemUploaderView);
-            holder.itemDurationView = (TextView) convertView.findViewById(R.id.itemDurationView);
-            holder.itemUploadDateView = (TextView) convertView.findViewById(R.id.itemUploadDateView);
-            convertView.setTag(holder);
-        } else {
-            holder = (ViewHolder) convertView.getTag();
-        }
-
-        if(info.thumbnail == null) {
-            holder.itemThumbnailView.setImageResource(R.drawable.dummy_thumbnail);
-        } else {
-            holder.itemThumbnailView.setImageBitmap(info.thumbnail);
-        }
-        holder.itemVideoTitleView.setText(info.title);
-        holder.itemUploaderView.setText(info.uploader);
-        holder.itemDurationView.setText(info.duration);
-        if(!info.upload_date.isEmpty()) {
-            holder.itemUploadDateView.setText(info.upload_date);
-        } else {
-            holder.itemUploadDateView.setText(Localization.localizeViewCount(info.view_count, context));
-        }
-
-        return convertView;
-    }
-
-    private class ViewHolder {
-        public ImageView itemThumbnailView;
-        public TextView itemVideoTitleView, itemUploaderView, itemDurationView, itemUploadDateView;
-    }
-
-}

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

@@ -1,156 +0,0 @@
-package org.schabi.newpipe;
-
-import android.content.Intent;
-import android.os.Bundle;
-import android.preference.PreferenceManager;
-import android.support.v4.app.NavUtils;
-import android.support.v7.app.AppCompatActivity;
-import android.util.Log;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.widget.Toast;
-
-import org.schabi.newpipe.services.ServiceList;
-import org.schabi.newpipe.services.StreamingService;
-
-
-/**
- * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
- * VideoItemDetailActivity.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 VideoItemDetailActivity extends AppCompatActivity {
-
-    private static final String TAG = VideoItemDetailActivity.class.toString();
-
-    private VideoItemDetailFragment fragment;
-
-    private String videoUrl;
-    private int currentStreamingService = -1;
-
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_videoitem_detail);
-
-        // Show the Up button in the action bar.
-        try {
-            //noinspection ConstantConditions
-            getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-        } catch(Exception e) {
-            Log.d(TAG, "Could not get SupportActionBar");
-            e.printStackTrace();
-        }
-
-        // savedInstanceState is non-null when there is fragment state
-        // saved from previous configurations of this activity
-        // (e.g. when rotating the screen from portrait to landscape).
-        // In this case, the fragment will automatically be re-added
-        // to its container so we don't need to manually add it.
-        // For more information, see the Fragments API guide at:
-        //
-        // http://developer.android.com/guide/components/fragments.html
-        //
-
-        Bundle arguments = new Bundle();
-        if (savedInstanceState == null) {
-            // this means the video was called though another app
-            if (getIntent().getData() != null) {
-                videoUrl = getIntent().getData().toString();
-                StreamingService[] serviceList = ServiceList.getServices();
-                //VideoExtractor videoExtractor = null;
-                for (int i = 0; i < serviceList.length; i++) {
-                    if (serviceList[i].acceptUrl(videoUrl)) {
-                        arguments.putInt(VideoItemDetailFragment.STREAMING_SERVICE, i);
-                        currentStreamingService = i;
-                        //videoExtractor = ServiceList.getService(i).getExtractorInstance();
-                        break;
-                    }
-                }
-                if(currentStreamingService == -1) {
-                    Toast.makeText(this, R.string.url_not_supported_toast, Toast.LENGTH_LONG)
-                            .show();
-                }
-                //arguments.putString(VideoItemDetailFragment.VIDEO_URL,
-                //        videoExtractor.getVideoUrl(videoExtractor.getVideoId(videoUrl)));//cleans URL
-                arguments.putString(VideoItemDetailFragment.VIDEO_URL, videoUrl);
-
-                arguments.putBoolean(VideoItemDetailFragment.AUTO_PLAY,
-                        PreferenceManager.getDefaultSharedPreferences(this)
-                                .getBoolean(getString(R.string.autoplay_through_intent_key), false));
-            } else {
-                videoUrl = getIntent().getStringExtra(VideoItemDetailFragment.VIDEO_URL);
-                currentStreamingService = getIntent().getIntExtra(VideoItemDetailFragment.STREAMING_SERVICE, -1);
-                arguments.putString(VideoItemDetailFragment.VIDEO_URL, videoUrl);
-                arguments.putInt(VideoItemDetailFragment.STREAMING_SERVICE, currentStreamingService);
-                arguments.putBoolean(VideoItemDetailFragment.AUTO_PLAY, false);
-            }
-
-        } else {
-            videoUrl = savedInstanceState.getString(VideoItemDetailFragment.VIDEO_URL);
-            currentStreamingService = savedInstanceState.getInt(VideoItemDetailFragment.STREAMING_SERVICE);
-            arguments = savedInstanceState;
-        }
-
-        // Create the detail fragment and add it to the activity
-        // using a fragment transaction.
-        fragment = new VideoItemDetailFragment();
-        fragment.setArguments(arguments);
-        getSupportFragmentManager().beginTransaction()
-                .add(R.id.videoitem_detail_container, fragment)
-                .commit();
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        App.checkStartTor(this);
-    }
-
-    @Override
-    public void onSaveInstanceState(Bundle outState) {
-        outState.putString(VideoItemDetailFragment.VIDEO_URL, videoUrl);
-        outState.putInt(VideoItemDetailFragment.STREAMING_SERVICE, currentStreamingService);
-        outState.putBoolean(VideoItemDetailFragment.AUTO_PLAY, false);
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        int id = item.getItemId();
-        if (id == android.R.id.home) {
-            // This ID represents the Home or Up button. In the case of this
-            // activity, the Up button is shown. Use NavUtils to allow users
-            // to navigate up one level in the application structure. For
-            // more details, see the Navigation pattern on Android Design:
-
-            // http://developer.android.com/design/patterns/navigation.html#up-vs-back
-
-            Intent intent = new Intent(this, VideoItemListActivity.class);
-            intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
-            NavUtils.navigateUpTo(this, intent);
-            return true;
-        } else {
-            return fragment.onOptionsItemSelected(item) ||
-                    super.onOptionsItemSelected(item);
-        }
-    }
-
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        super.onCreateOptionsMenu(menu);
-        fragment.onCreateOptionsMenu(menu, getMenuInflater());
-        return true;
-    }
-}

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

@@ -1,461 +0,0 @@
-package org.schabi.newpipe;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.content.res.Resources;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.graphics.Point;
-import android.net.Uri;
-import android.os.Build;
-import android.os.Bundle;
-import android.os.Handler;
-import android.preference.PreferenceManager;
-import android.support.design.widget.FloatingActionButton;
-import android.support.v4.app.Fragment;
-import android.support.v7.app.AppCompatActivity;
-import android.text.Html;
-import android.text.method.LinkMovementMethod;
-import android.util.DisplayMetrics;
-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.Button;
-import android.widget.FrameLayout;
-import android.widget.ImageView;
-import android.widget.ProgressBar;
-import android.widget.RelativeLayout;
-import android.widget.TextView;
-import android.view.MenuItem;
-import android.widget.Toast;
-
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Vector;
-
-import org.schabi.newpipe.services.VideoExtractor;
-import org.schabi.newpipe.services.ServiceList;
-import org.schabi.newpipe.services.StreamingService;
-import org.schabi.newpipe.services.VideoInfo;
-
-
-/**
- * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
- * VideoItemDetailFragment.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 VideoItemDetailFragment extends Fragment {
-
-    private static final String TAG = VideoItemDetailFragment.class.toString();
-
-    /**
-     * The fragment argument representing the item ID that this fragment
-     * represents.
-     */
-    //public static final String ARG_ITEM_ID = "item_id";
-    public static final String VIDEO_URL = "video_url";
-    public static final String STREAMING_SERVICE = "streaming_service";
-    public static final String AUTO_PLAY = "auto_play";
-
-    private AppCompatActivity activity;
-    private ActionBarHandler actionBarHandler;
-
-    private int streamingServiceId = -1;
-
-    private boolean autoPlayEnabled = false;
-    private VideoInfo currentVideoInfo = null;
-    private boolean showNextVideoItem = false;
-
-    private View thumbnailWindowLayout;
-    private FloatingActionButton playVideoButton;
-    private final Point initialThumbnailPos = new Point(0, 0);
-
-    public interface OnInvokeCreateOptionsMenuListener {
-        void createOptionsMenu();
-    }
-
-    private OnInvokeCreateOptionsMenuListener onInvokeCreateOptionsMenuListener = null;
-
-    private class VideoExtractorRunnable implements Runnable {
-        private final Handler h = new Handler();
-        private VideoExtractor videoExtractor;
-        private final StreamingService service;
-        private final String videoUrl;
-
-        public VideoExtractorRunnable(String videoUrl, StreamingService service) {
-            this.service = service;
-            this.videoUrl = videoUrl;
-        }
-
-        @Override
-        public void run() {
-            try {
-                this.videoExtractor = service.getExtractorInstance(videoUrl);
-                VideoInfo videoInfo = videoExtractor.getVideoInfo();
-                h.post(new VideoResultReturnedRunnable(videoInfo));
-                if (videoInfo.errorCode == VideoInfo.NO_ERROR) {
-                    h.post(new SetThumbnailRunnable(
-                            BitmapFactory.decodeStream(
-                                    new URL(videoInfo.thumbnail_url)
-                                            .openConnection()
-                                            .getInputStream()),
-                            SetThumbnailRunnable.VIDEO_THUMBNAIL));
-                    h.post(new SetThumbnailRunnable(
-                            BitmapFactory.decodeStream(
-                                    new URL(videoInfo.uploader_thumbnail_url)
-                                            .openConnection()
-                                            .getInputStream()),
-                            SetThumbnailRunnable.CHANNEL_THUMBNAIL));
-                    if(showNextVideoItem) {
-                        h.post(new SetThumbnailRunnable(
-                                BitmapFactory.decodeStream(
-                                        new URL(videoInfo.nextVideo.thumbnail_url)
-                                                .openConnection()
-                                                .getInputStream()),
-                                SetThumbnailRunnable.NEXT_VIDEO_THUMBNAIL));
-                    }
-                }
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-
-        }
-    }
-
-    private class VideoResultReturnedRunnable implements Runnable {
-        private final VideoInfo videoInfo;
-        public VideoResultReturnedRunnable(VideoInfo videoInfo) {
-            this.videoInfo = videoInfo;
-        }
-        @Override
-        public void run() {
-            //todo: fix expired thread error:
-            // If the thread calling this runnable is expired, the following function will crash.
-            updateInfo(videoInfo);
-        }
-    }
-
-    private class SetThumbnailRunnable implements Runnable {
-        public static final int VIDEO_THUMBNAIL = 1;
-        public static final int CHANNEL_THUMBNAIL = 2;
-        public static final int NEXT_VIDEO_THUMBNAIL = 3;
-        private final Bitmap thumbnail;
-        private final int thumbnailId;
-        public SetThumbnailRunnable(Bitmap thumbnail, int id) {
-            this.thumbnail = thumbnail;
-            this.thumbnailId = id;
-        }
-        @Override
-        public void run() {
-            updateThumbnail(thumbnail, thumbnailId);
-        }
-    }
-
-    private void updateThumbnail(Bitmap thumbnail, int id) {
-        Activity a = getActivity();
-        ImageView thumbnailView;
-        try {
-            switch (id) {
-                case SetThumbnailRunnable.VIDEO_THUMBNAIL:
-                    thumbnailView = (ImageView) a.findViewById(R.id.detailThumbnailView);
-                    actionBarHandler.setSetVideoThumbnail(thumbnail);
-                    break;
-                case SetThumbnailRunnable.CHANNEL_THUMBNAIL:
-                    thumbnailView = (ImageView) a.findViewById(R.id.detailUploaderThumbnailView);
-                    break;
-                case SetThumbnailRunnable.NEXT_VIDEO_THUMBNAIL:
-                    FrameLayout nextVideoFrame = (FrameLayout) a.findViewById(R.id.detailNextVideoFrame);
-                    thumbnailView = (ImageView) nextVideoFrame.findViewById(R.id.itemThumbnailView);
-                    currentVideoInfo.nextVideo.thumbnail = thumbnail;
-                    break;
-                default:
-                    Log.d(TAG, "Error: Thumbnail id not known");
-                    return;
-            }
-
-            if (thumbnailView != null) {
-                thumbnailView.setImageBitmap(thumbnail);
-            }
-
-        } catch (java.lang.NullPointerException e) {
-            // Not good program design, I know. :/
-            Log.w(TAG, "updateThumbnail(): Fragment closed before thread ended work");
-        }
-    }
-
-    private void updateInfo(VideoInfo info) {
-        currentVideoInfo = info;
-        Resources res = activity.getResources();
-        try {
-            VideoInfoItemViewCreator videoItemViewCreator =
-                    new VideoInfoItemViewCreator(LayoutInflater.from(getActivity()));
-
-            RelativeLayout textContentLayout = (RelativeLayout) activity.findViewById(R.id.detailTextContentLayout);
-            ProgressBar progressBar = (ProgressBar) activity.findViewById(R.id.detailProgressBar);
-            TextView videoTitleView = (TextView) activity.findViewById(R.id.detailVideoTitleView);
-            TextView uploaderView = (TextView) activity.findViewById(R.id.detailUploaderView);
-            TextView viewCountView = (TextView) activity.findViewById(R.id.detailViewCountView);
-            TextView thumbsUpView = (TextView) activity.findViewById(R.id.detailThumbsUpCountView);
-            TextView thumbsDownView = (TextView) activity.findViewById(R.id.detailThumbsDownCountView);
-            TextView uploadDateView = (TextView) activity.findViewById(R.id.detailUploadDateView);
-            TextView descriptionView = (TextView) activity.findViewById(R.id.detailDescriptionView);
-            ImageView thumbnailView = (ImageView) activity.findViewById(R.id.detailThumbnailView);
-            FrameLayout nextVideoFrame = (FrameLayout) activity.findViewById(R.id.detailNextVideoFrame);
-            RelativeLayout nextVideoRootFrame =
-                    (RelativeLayout) activity.findViewById(R.id.detailNextVideoRootLayout);
-            Button backgroundButton = (Button)
-                    activity.findViewById(R.id.detailVideoThumbnailWindowBackgroundButton);
-
-            progressBar.setVisibility(View.GONE);
-
-            switch (info.errorCode) {
-                case VideoInfo.NO_ERROR: {
-                    View nextVideoView = videoItemViewCreator
-                            .getViewFromVideoInfoItem(null, nextVideoFrame, info.nextVideo, getContext());
-                    nextVideoFrame.addView(nextVideoView);
-
-
-                    Button nextVideoButton = (Button) activity.findViewById(R.id.detailNextVideoButton);
-                    Button similarVideosButton = (Button) activity.findViewById(R.id.detailShowSimilarButton);
-
-                    textContentLayout.setVisibility(View.VISIBLE);
-                    playVideoButton.setVisibility(View.VISIBLE);
-                    if (!showNextVideoItem) {
-                        nextVideoRootFrame.setVisibility(View.GONE);
-                        similarVideosButton.setVisibility(View.GONE);
-                    }
-
-                    videoTitleView.setText(info.title);
-                    uploaderView.setText(info.uploader);
-                    actionBarHandler.setChannelName(info.uploader);
-
-                    String localizedViewCount = Localization.localizeViewCount(info.view_count, getContext());
-                    viewCountView.setText(localizedViewCount);
-
-                    String localizedLikeCount = Localization.localizeNumber(info.like_count, getContext());
-                    thumbsUpView.setText(localizedLikeCount);
-
-                    String localizedDislikeCount = Localization.localizeNumber(info.dislike_count, getContext());
-                    thumbsDownView.setText(localizedDislikeCount);
-
-                    String localizedDate = Localization.localizeDate(info.upload_date, getContext());
-                    uploadDateView.setText(localizedDate);
-
-                    descriptionView.setText(Html.fromHtml(info.description));
-
-                    descriptionView.setMovementMethod(LinkMovementMethod.getInstance());
-
-                    actionBarHandler.setServiceId(streamingServiceId);
-                    actionBarHandler.setVideoInfo(info.webpage_url, info.title);
-                    actionBarHandler.setStartPosition(info.startPosition);
-
-                    // parse streams
-                    Vector<VideoInfo.VideoStream> streamsToUse = new Vector<>();
-                    for (VideoInfo.VideoStream i : info.videoStreams) {
-                        if (useStream(i, streamsToUse)) {
-                            streamsToUse.add(i);
-                        }
-                    }
-                    VideoInfo.VideoStream[] streamList = new VideoInfo.VideoStream[streamsToUse.size()];
-                    for (int i = 0; i < streamList.length; i++) {
-                        streamList[i] = streamsToUse.get(i);
-                    }
-                    actionBarHandler.setStreams(streamList, info.audioStreams);
-
-                    nextVideoButton.setOnClickListener(new View.OnClickListener() {
-                        @Override
-                        public void onClick(View v) {
-                            Intent detailIntent =
-                                    new Intent(getActivity(), VideoItemDetailActivity.class);
-                        /*detailIntent.putExtra(
-                                VideoItemDetailFragment.ARG_ITEM_ID, currentVideoInfo.nextVideo.id); */
-                            detailIntent.putExtra(
-                                    VideoItemDetailFragment.VIDEO_URL, currentVideoInfo.nextVideo.webpage_url);
-
-                            detailIntent.putExtra(VideoItemDetailFragment.STREAMING_SERVICE, streamingServiceId);
-                            startActivity(detailIntent);
-                        }
-                    });
-                }
-                break;
-                case VideoInfo.ERROR_BLOCKED_BY_GEMA:
-                    thumbnailView.setImageBitmap(BitmapFactory.decodeResource(
-                            getResources(), R.drawable.gruese_die_gema));
-                    backgroundButton.setOnClickListener(new View.OnClickListener() {
-                        @Override
-                        public void onClick(View v) {
-                            Intent intent = new Intent();
-                            intent.setAction(Intent.ACTION_VIEW);
-                            intent.setData(Uri.parse(activity.getString(R.string.c3s_url)));
-                            activity.startActivity(intent);
-                        }
-                    });
-                    break;
-                case VideoInfo.ERROR_NO_SPECIFIED_ERROR:
-                    thumbnailView.setImageBitmap(BitmapFactory.decodeResource(
-                            getResources(), R.drawable.not_available_monkey));
-                    Toast.makeText(activity, info.errorMessage, Toast.LENGTH_LONG)
-                            .show();
-                    break;
-                default:
-                    Log.e(TAG, "Video Available Status not known.");
-            }
-
-            if(autoPlayEnabled) {
-                actionBarHandler.playVideo();
-            }
-        } catch (java.lang.NullPointerException e) {
-            Log.w(TAG, "updateInfo(): Fragment closed before thread ended work... or else");
-            e.printStackTrace();
-        }
-    }
-
-    private boolean useStream(VideoInfo.VideoStream stream, Vector<VideoInfo.VideoStream> streams) {
-        for(VideoInfo.VideoStream i : streams) {
-            if(i.resolution.equals(stream.resolution)) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    /**
-     * Mandatory empty constructor for the fragment manager to instantiate the
-     * fragment (e.g. upon screen orientation changes).
-     */
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        activity = (AppCompatActivity) getActivity();
-        showNextVideoItem = PreferenceManager.getDefaultSharedPreferences(getActivity())
-                .getBoolean(activity.getString(R.string.show_next_video_key), true);
-
-    }
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
-        View rootView = inflater.inflate(R.layout.fragment_videoitem_detail, container, false);
-        actionBarHandler = new ActionBarHandler(activity);
-        actionBarHandler.setupNavMenu(activity);
-        if(onInvokeCreateOptionsMenuListener != null) {
-            onInvokeCreateOptionsMenuListener.createOptionsMenu();
-        }
-
-        return rootView;
-    }
-
-    @Override
-    public void onActivityCreated(Bundle savedInstanceBundle) {
-        super.onActivityCreated(savedInstanceBundle);
-        Activity a = getActivity();
-        playVideoButton = (FloatingActionButton) a.findViewById(R.id.playVideoButton);
-        thumbnailWindowLayout = a.findViewById(R.id.detailVideoThumbnailWindowLayout);
-        Button backgroundButton = (Button)
-                a.findViewById(R.id.detailVideoThumbnailWindowBackgroundButton);
-
-        // Sometimes when this fragment is not visible it still gets initiated
-        // then we must not try to access objects of this fragment.
-        // Otherwise the applications would crash.
-        if(playVideoButton != null) {
-            try {
-                streamingServiceId = getArguments().getInt(STREAMING_SERVICE);
-                StreamingService streamingService = ServiceList.getService(streamingServiceId);
-                Thread videoExtractorThread = new Thread(new VideoExtractorRunnable(
-                        getArguments().getString(VIDEO_URL), streamingService));
-
-                autoPlayEnabled = getArguments().getBoolean(AUTO_PLAY);
-                videoExtractorThread.start();
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-
-            playVideoButton.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    actionBarHandler.playVideo();
-                }
-            });
-
-            backgroundButton.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    actionBarHandler.playVideo();
-                }
-            });
-
-            Button similarVideosButton = (Button) activity.findViewById(R.id.detailShowSimilarButton);
-            similarVideosButton.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    Intent intent = new Intent(activity, VideoItemListActivity.class);
-                    //todo: find more elegant way to do this - converting from List to ArrayList sucks
-                    ArrayList<VideoPreviewInfo> toParcel = new ArrayList<>(currentVideoInfo.relatedVideos);
-                    //why oh why does the parcelable array put method have to be so damn specific
-                    // about the class of its argument?
-                    //why not a List<? extends Parcelable>?
-                    intent.putParcelableArrayListExtra(VideoItemListActivity.VIDEO_INFO_ITEMS, toParcel);
-                    activity.startActivity(intent);
-                }
-            });
-
-            // todo: Fix this workaround (probably with a better design), so that older android
-            // versions don't have problems rendering the thumbnail right.
-            if(Build.VERSION.SDK_INT >= 18) {
-                ImageView thumbnailView = (ImageView) activity.findViewById(R.id.detailThumbnailView);
-                thumbnailView.addOnLayoutChangeListener(new View.OnLayoutChangeListener() {
-                    // This is used to synchronize the thumbnailWindowButton and the playVideoButton
-                    // inside the ScrollView with the actual size of the thumbnail.
-                    @Override
-                    public void onLayoutChange(View v, int left, int top, int right, int bottom, int oldLeft, int oldTop, int oldRight, int oldBottom) {
-                        RelativeLayout.LayoutParams newWindowLayoutParams =
-                                (RelativeLayout.LayoutParams) thumbnailWindowLayout.getLayoutParams();
-                        newWindowLayoutParams.height = bottom - top;
-                        thumbnailWindowLayout.setLayoutParams(newWindowLayoutParams);
-
-                        //noinspection SuspiciousNameCombination
-                        initialThumbnailPos.set(top, left);
-
-                    }
-                });
-            }
-        }
-    }
-
-    private boolean checkIfLandscape() {
-        DisplayMetrics displayMetrics = new DisplayMetrics();
-        getActivity().getWindowManager().getDefaultDisplay().getMetrics(displayMetrics);
-        return displayMetrics.heightPixels < displayMetrics.widthPixels;
-    }
-
-    @Override
-    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-        actionBarHandler.setupMenu(menu, inflater);
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        return actionBarHandler.onItemSelected(item);
-    }
-
-    public void setOnInvokeCreateOptionsMenuListener(OnInvokeCreateOptionsMenuListener listener) {
-        this.onInvokeCreateOptionsMenuListener = listener;
-    }
-}

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

@@ -1,283 +0,0 @@
-package org.schabi.newpipe;
-
-import android.content.Context;
-import android.content.Intent;
-import android.os.Bundle;
-import android.preference.PreferenceManager;
-import android.support.v4.app.NavUtils;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.SearchView;
-import android.util.Log;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.inputmethod.InputMethodManager;
-
-import java.util.ArrayList;
-
-import org.schabi.newpipe.services.ServiceList;
-
-/**
- * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
- * VideoItemListActivity.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 VideoItemListActivity extends AppCompatActivity
-        implements VideoItemListFragment.Callbacks {
-
-    private static final String TAG = VideoItemListFragment.class.toString();
-
-    // arguments to give to this activity
-    public static final String VIDEO_INFO_ITEMS = "video_info_items";
-
-    // savedInstanceBundle arguments
-    private static final String QUERY = "query";
-    private static final String STREAMING_SERVICE = "streaming_service";
-
-    // activity modes
-    private static final int SEARCH_MODE = 0;
-    private static final int PRESENT_VIDEOS_MODE = 1;
-
-    private int mode = SEARCH_MODE;
-    private int currentStreamingServiceId = -1;
-    private String searchQuery = "";
-
-    private VideoItemListFragment listFragment;
-    private VideoItemDetailFragment videoFragment = null;
-    private Menu menu = null;
-
-    private class SearchVideoQueryListener implements SearchView.OnQueryTextListener {
-
-        @Override
-        public boolean onQueryTextSubmit(String query) {
-            try {
-                searchQuery = query;
-                listFragment.search(query);
-
-                // hide virtual keyboard
-                InputMethodManager inputManager =
-                        (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
-                try {
-                    //noinspection ConstantConditions
-                    inputManager.hideSoftInputFromWindow(
-                            getCurrentFocus().getWindowToken(), InputMethodManager.HIDE_NOT_ALWAYS);
-                } catch(NullPointerException e) {
-                    Log.e(TAG, "Could not get widget with focus");
-                    e.printStackTrace();
-                }
-                // clear focus
-                // 1. to not open up the keyboard after switching back to this
-                // 2. It's a workaround to a seeming bug by the Android OS it self, causing
-                //    onQueryTextSubmit to trigger twice when focus is not cleared.
-                // See: http://stackoverflow.com/questions/17874951/searchview-onquerytextsubmit-runs-twice-while-i-pressed-once
-                getCurrentFocus().clearFocus();
-            } catch(Exception e) {
-                e.printStackTrace();
-            }
-            return true;
-        }
-
-        @Override
-        public boolean onQueryTextChange(String newText) {
-            return true;
-        }
-
-    }
-
-    /**
-     * Whether or not the activity is in two-pane mode, i.e. running on a tablet
-     * device.
-     */
-    private boolean mTwoPane;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_videoitem_list);
-
-        //------ todo: remove this line when multiservice support is implemented ------
-        currentStreamingServiceId = ServiceList.getIdOfService("Youtube");
-        //-----------------------------------------------------------------------------
-
-        listFragment = (VideoItemListFragment) getSupportFragmentManager()
-                .findFragmentById(R.id.videoitem_list);
-        listFragment.setStreamingService(ServiceList.getService(currentStreamingServiceId));
-
-        Bundle arguments = getIntent().getExtras();
-
-        if(arguments != null) {
-            //Parcelable[] p = arguments.getParcelableArray(VIDEO_INFO_ITEMS);
-            ArrayList<VideoPreviewInfo> p = arguments.getParcelableArrayList(VIDEO_INFO_ITEMS);
-            if(p != null) {
-                mode = PRESENT_VIDEOS_MODE;
-                try {
-                    //noinspection ConstantConditions
-                    getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-                } catch (NullPointerException e) {
-                    Log.e(TAG, "Could not get SupportActionBar");
-                    e.printStackTrace();
-                }
-
-                listFragment.present(p);
-            }
-        }
-
-
-        if(savedInstanceState != null
-                && mode != PRESENT_VIDEOS_MODE) {
-            searchQuery = savedInstanceState.getString(QUERY);
-            currentStreamingServiceId = savedInstanceState.getInt(STREAMING_SERVICE);
-            if(!searchQuery.isEmpty()) {
-                listFragment.search(searchQuery);
-            }
-        }
-
-        if (findViewById(R.id.videoitem_detail_container) != null) {
-            // The detail container view will be present only in the
-            // large-screen layouts (res/values-large and
-            // res/values-sw600dp). If this view is present, then the
-            // activity should be in two-pane mode.
-            mTwoPane = true;
-
-            // In two-pane mode, list items should be given the
-            // 'activated' state when touched.
-
-            ((VideoItemListFragment) getSupportFragmentManager()
-                    .findFragmentById(R.id.videoitem_list))
-                    .setActivateOnItemClick(true);
-
-            SearchView searchView = (SearchView)findViewById(R.id.searchViewTablet);
-            if(mode != PRESENT_VIDEOS_MODE) {
-                // Somehow the seticonifiedbydefault property set by the layout xml is not working on
-                // the support version on SearchView, so it needs to be set programmatically.
-                searchView.setIconifiedByDefault(false);
-                searchView.setIconified(false);
-                searchView.setOnQueryTextListener(new SearchVideoQueryListener());
-            } else {
-                searchView.setVisibility(View.GONE);
-            }
-        }
-
-        PreferenceManager.setDefaultValues(this, R.xml.settings, false);
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        App.checkStartTor(this);
-    }
-
-    /**
-     * Callback method from {@link VideoItemListFragment.Callbacks}
-     * indicating that the item with the given ID was selected.
-     */
-    @Override
-    public void onItemSelected(String id) {
-        VideoListAdapter listAdapter = (VideoListAdapter) ((VideoItemListFragment)
-                getSupportFragmentManager()
-                        .findFragmentById(R.id.videoitem_list))
-                .getListAdapter();
-        String webpage_url = listAdapter.getVideoList().get((int) Long.parseLong(id)).webpage_url;
-        if (mTwoPane) {
-            // In two-pane mode, show the detail view in this activity by
-            // adding or replacing the detail fragment using a
-            // fragment transaction.
-            Bundle arguments = new Bundle();
-            //arguments.putString(VideoItemDetailFragment.ARG_ITEM_ID, id);
-            arguments.putString(VideoItemDetailFragment.VIDEO_URL, webpage_url);
-            arguments.putInt(VideoItemDetailFragment.STREAMING_SERVICE, currentStreamingServiceId);
-            videoFragment = new VideoItemDetailFragment();
-            videoFragment.setArguments(arguments);
-            videoFragment.setOnInvokeCreateOptionsMenuListener(new VideoItemDetailFragment.OnInvokeCreateOptionsMenuListener() {
-                @Override
-                public void createOptionsMenu() {
-                    menu.clear();
-                    onCreateOptionsMenu(menu);
-                }
-            });
-            getSupportFragmentManager().beginTransaction()
-                    .replace(R.id.videoitem_detail_container, videoFragment)
-                    .commit();
-        } else {
-            // In single-pane mode, simply start the detail activity
-            // for the selected item ID.
-            Intent detailIntent = new Intent(this, VideoItemDetailActivity.class);
-            //detailIntent.putExtra(VideoItemDetailFragment.ARG_ITEM_ID, id);
-            detailIntent.putExtra(VideoItemDetailFragment.VIDEO_URL, webpage_url);
-            detailIntent.putExtra(VideoItemDetailFragment.STREAMING_SERVICE, currentStreamingServiceId);
-            startActivity(detailIntent);
-        }
-    }
-
-
-    public boolean onCreateOptionsMenu(Menu menu) {
-        super.onCreateOptionsMenu(menu);
-        this.menu = menu;
-        MenuInflater inflater = getMenuInflater();
-        if(mode != PRESENT_VIDEOS_MODE &&
-                findViewById(R.id.videoitem_detail_container) == null) {
-            inflater.inflate(R.menu.videoitem_list, menu);
-            MenuItem searchItem = menu.findItem(R.id.action_search);
-            SearchView searchView = (SearchView) searchItem.getActionView();
-            searchView.setFocusable(false);
-            searchView.setOnQueryTextListener(
-                    new SearchVideoQueryListener());
-
-        } else if (videoFragment != null){
-            videoFragment.onCreateOptionsMenu(menu, inflater);
-        } else {
-            inflater.inflate(R.menu.videoitem_two_pannel, menu);
-        }
-
-        return true;
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        int id = item.getItemId();
-
-        switch(id) {
-            case android.R.id.home: {
-                Intent intent = new Intent(this, VideoItemListActivity.class);
-                intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
-                NavUtils.navigateUpTo(this, intent);
-                return true;
-            }
-            case R.id.action_settings: {
-                Intent intent = new Intent(this, SettingsActivity.class);
-                startActivity(intent);
-                return true;
-            }
-            default:
-                return videoFragment.onOptionsItemSelected(item) ||
-                    super.onOptionsItemSelected(item);
-        }
-    }
-
-    @Override
-    public void onSaveInstanceState(Bundle outState) {
-        super.onSaveInstanceState(outState);
-        /*
-        if (mActivatedPosition != ListView.INVALID_POSITION) {
-            // Serialize and persist the activated item position.
-            outState.putInt(STATE_ACTIVATED_POSITION, mActivatedPosition);
-        }
-        */
-        outState.putString(QUERY, searchQuery);
-        outState.putInt(STREAMING_SERVICE, currentStreamingServiceId);
-    }
-}

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

@@ -1,384 +0,0 @@
-package org.schabi.newpipe;
-
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.os.Bundle;
-import android.os.Handler;
-import android.preference.PreferenceManager;
-import android.support.v4.app.ListFragment;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.widget.AbsListView;
-import android.widget.ListView;
-import android.widget.Toast;
-
-import java.net.URL;
-import java.util.List;
-import java.util.Vector;
-
-import org.schabi.newpipe.services.SearchEngine;
-import org.schabi.newpipe.services.StreamingService;
-
-
-/**
- * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
- * VideoItemListFragment.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 VideoItemListFragment extends ListFragment {
-
-    private static final String TAG = VideoItemListFragment.class.toString();
-
-    private StreamingService streamingService = null;
-    private VideoListAdapter videoListAdapter;
-
-    // activity modes
-    private static final int SEARCH_MODE = 0;
-    private static final int PRESENT_VIDEOS_MODE = 1;
-
-    private int mode = SEARCH_MODE;
-    private String query = "";
-    private int lastPage = 0;
-
-    private Thread searchThread = null;
-    private SearchRunnable searchRunnable = null;
-    private Thread loadThumbsThread = null;
-    private LoadThumbsRunnable loadThumbsRunnable = null;
-    // used to track down if results posted by threads ar still valid
-    private int currentRequestId = -1;
-    private ListView list;
-
-    private View footer;
-
-    // used to suppress request for loading a new page while another page is already loading.
-    private boolean loadingNextPage = true;
-
-    private class ResultRunnable implements Runnable {
-        private final SearchEngine.Result result;
-        private final int requestId;
-        public ResultRunnable(SearchEngine.Result result, int requestId) {
-            this.result = result;
-            this.requestId = requestId;
-        }
-        @Override
-        public void run() {
-            updateListOnResult(result, requestId);
-            if (android.os.Build.VERSION.SDK_INT >= 19) {
-                getListView().removeFooterView(footer);
-            }
-        }
-    }
-
-    private class SearchRunnable implements Runnable {
-        private final SearchEngine engine;
-        private final String query;
-        private final int page;
-        final Handler h = new Handler();
-        private volatile boolean runs = true;
-        private final int requestId;
-        public SearchRunnable(SearchEngine engine, String query, int page, int requestId) {
-            this.engine = engine;
-            this.query = query;
-            this.page = page;
-            this.requestId = requestId;
-        }
-        void terminate() {
-            runs = false;
-        }
-        @Override
-        public void run() {
-            try {
-                SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(getContext());
-                String searchLanguageKey = getContext().getString(R.string.search_language_key);
-                String searchLanguage = sp.getString(searchLanguageKey,
-                        getString(R.string.default_language_value));
-                SearchEngine.Result result = engine.search(query, page, searchLanguage);
-                Log.i(TAG, "language code passed:\""+searchLanguage+"\"");
-                if(runs) {
-                    h.post(new ResultRunnable(result, requestId));
-                }
-            } catch(Exception e) {
-                e.printStackTrace();
-                h.post(new Runnable() {
-                    @Override
-                    public void run() {
-                        Toast.makeText(getActivity(), getString(R.string.network_error),
-                                Toast.LENGTH_SHORT).show();
-                    }
-                });
-            }
-        }
-    }
-
-    private class LoadThumbsRunnable implements Runnable {
-        private final Vector<String> thumbnailUrlList = new Vector<>();
-        private final Vector<Boolean> downloadedList;
-        final Handler h = new Handler();
-        private volatile boolean run = true;
-        private final int requestId;
-        public LoadThumbsRunnable(Vector<VideoPreviewInfo> videoList,
-                                  Vector<Boolean> downloadedList, int requestId) {
-            for(VideoPreviewInfo item : videoList) {
-                thumbnailUrlList.add(item.thumbnail_url);
-            }
-            this.downloadedList = downloadedList;
-            this.requestId = requestId;
-        }
-        public void terminate() {
-            run = false;
-        }
-        public boolean isRunning() {
-            return run;
-        }
-        @Override
-        public void run() {
-            for(int i = 0; i < thumbnailUrlList.size() && run; i++) {
-                if(!downloadedList.get(i)) {
-                    Bitmap thumbnail;
-                    try {
-                        thumbnail = BitmapFactory.decodeStream(
-                                new URL(thumbnailUrlList.get(i)).openConnection().getInputStream());
-                        h.post(new SetThumbnailRunnable(i, thumbnail, requestId));
-                    } catch (Exception e) {
-                        e.printStackTrace();
-                    }
-                }
-            }
-        }
-    }
-
-    private class SetThumbnailRunnable implements Runnable {
-        private final int index;
-        private final Bitmap thumbnail;
-        private final int requestId;
-        public SetThumbnailRunnable(int index, Bitmap thumbnail, int requestId) {
-            this.index = index;
-            this.thumbnail = thumbnail;
-            this.requestId = requestId;
-        }
-        @Override
-        public void run() {
-            if(requestId == currentRequestId) {
-                videoListAdapter.updateDownloadedThumbnailList(index);
-                videoListAdapter.setThumbnail(index, thumbnail);
-            }
-        }
-    }
-
-    public void present(List<VideoPreviewInfo> videoList) {
-        mode = PRESENT_VIDEOS_MODE;
-        setListShown(true);
-        getListView().smoothScrollToPosition(0);
-
-        updateList(videoList);
-    }
-
-    public void search(String query) {
-        mode = SEARCH_MODE;
-        this.query = query;
-        this.lastPage = 1;
-        videoListAdapter.clearVideoList();
-        setListShown(false);
-        startSearch(query, lastPage);
-        //todo: Somehow this command is not working on older devices,
-        // although it was introduced with API level 8. Test this and find a solution.
-        getListView().smoothScrollToPosition(0);
-    }
-
-    private void nextPage() {
-        loadingNextPage = true;
-        lastPage++;
-        Log.d(TAG, getString(R.string.search_page) + Integer.toString(lastPage));
-        startSearch(query, lastPage);
-    }
-
-    private void startSearch(String query, int page) {
-        currentRequestId++;
-        terminateThreads();
-        searchRunnable = new SearchRunnable(streamingService.getSearchEngineInstance(),
-                                            query, page, currentRequestId);
-        searchThread = new Thread(searchRunnable);
-        searchThread.start();
-    }
-
-    public void setStreamingService(StreamingService streamingService) {
-        this.streamingService = streamingService;
-    }
-
-    private void updateListOnResult(SearchEngine.Result result, int requestId) {
-        if(requestId == currentRequestId) {
-            setListShown(true);
-            if (result.resultList.isEmpty()) {
-                Toast.makeText(getActivity(), result.errorMessage, Toast.LENGTH_LONG).show();
-            } else {
-                if (!result.suggestion.isEmpty()) {
-                    Toast.makeText(getActivity(), getString(R.string.did_you_mean) + result.suggestion + " ?",
-                            Toast.LENGTH_LONG).show();
-                }
-                updateList(result.resultList);
-            }
-        }
-    }
-
-    private void updateList(List<VideoPreviewInfo> list) {
-        try {
-            videoListAdapter.addVideoList(list);
-            terminateThreads();
-            loadThumbsRunnable = new LoadThumbsRunnable(videoListAdapter.getVideoList(),
-                    videoListAdapter.getDownloadedThumbnailList(), currentRequestId);
-            loadThumbsThread = new Thread(loadThumbsRunnable);
-            loadThumbsThread.start();
-        } catch(java.lang.IllegalStateException e) {
-            Log.w(TAG, "Trying to set value while activity doesn't exist anymore.");
-        } catch(Exception e) {
-            e.printStackTrace();
-        } finally {
-            loadingNextPage = false;
-        }
-    }
-
-    private void terminateThreads() {
-        if(loadThumbsRunnable != null && loadThumbsRunnable.isRunning()) {
-            loadThumbsRunnable.terminate();
-            try {
-                loadThumbsThread.join();
-            } catch(Exception e) {
-                e.printStackTrace();
-            }
-        }
-        if(searchThread != null) {
-            searchRunnable.terminate();
-            // No need to join, since we don't really terminate the thread. We just demand
-            // it to post its result runnable into the gui main loop.
-        }
-    }
-
-    /**
-     * The serialization (saved instance state) Bundle key representing the
-     * activated item position. Only used on tablets.
-     */
-    private static final String STATE_ACTIVATED_POSITION = "activated_position";
-
-    /**
-     * The current activated item position. Only used on tablets.
-     */
-    private int mActivatedPosition = ListView.INVALID_POSITION;
-
-    /**
-     * A callback interface that all activities containing this fragment must
-     * implement. This mechanism allows activities to be notified of item
-     * selections.
-     */
-    public interface Callbacks {
-        /**
-         * Callback for when an item has been selected.
-         */
-        void onItemSelected(String id);
-    }
-
-    private Callbacks mCallbacks = null;
-
-    @Override
-    public void onViewCreated(View view, Bundle savedInstanceState) {
-        super.onViewCreated(view, savedInstanceState);
-        list = getListView();
-        videoListAdapter = new VideoListAdapter(getActivity(), this);
-        footer = ((LayoutInflater) getActivity().getSystemService(Context.LAYOUT_INFLATER_SERVICE))
-                .inflate(R.layout.paginate_footer, null, false);
-
-
-        setListAdapter(videoListAdapter);
-
-        // Restore the previously serialized activated item position.
-        if (savedInstanceState != null
-
-                && savedInstanceState.containsKey(STATE_ACTIVATED_POSITION)) {
-            setActivatedPosition(savedInstanceState.getInt(STATE_ACTIVATED_POSITION));
-        }
-
-
-        getListView().setOnScrollListener(new AbsListView.OnScrollListener() {
-            long lastScrollDate = 0;
-
-            @Override
-            public void onScrollStateChanged(AbsListView view, int scrollState) {
-            }
-
-            @Override
-            public void onScroll(AbsListView view, int firstVisibleItem,
-                                 int visibleItemCount, int totalItemCount) {
-                if (mode != PRESENT_VIDEOS_MODE
-                        && list.getChildAt(0) != null
-                        && list.getLastVisiblePosition() == list.getAdapter().getCount() - 1
-                        && list.getChildAt(list.getChildCount() - 1).getBottom() <= list.getHeight()) {
-                    long time = System.currentTimeMillis();
-                    if ((time - lastScrollDate) > 200
-                            && !loadingNextPage) {
-                        lastScrollDate = time;
-                        getListView().addFooterView(footer);
-                        nextPage();
-                    }
-                }
-            }
-
-        });
-    }
-
-    @Override
-    public void onAttach(Context context) {
-        super.onAttach(context);
-
-        // Activities containing this fragment must implement its callbacks.
-        if (!(context instanceof Callbacks)) {
-            throw new IllegalStateException("Activity must implement fragment's callbacks.");
-        }
-
-        mCallbacks = (Callbacks) context;
-    }
-
-    @Override
-    public void onListItemClick(ListView listView, View view, int position, long id) {
-        super.onListItemClick(listView, view, position, id);
-        setActivatedPosition(position);
-        mCallbacks.onItemSelected(Long.toString(id));
-    }
-
-    /**
-     * Turns on activate-on-click mode. When this mode is on, list items will be
-     * given the 'activated' state when touched.
-     */
-    public void setActivateOnItemClick(@SuppressWarnings("SameParameterValue") boolean activateOnItemClick) {
-        // When setting CHOICE_MODE_SINGLE, ListView will automatically
-        // give items the 'activated' state when touched.
-        getListView().setChoiceMode(activateOnItemClick
-                ? ListView.CHOICE_MODE_SINGLE
-                : ListView.CHOICE_MODE_NONE);
-    }
-
-    private void setActivatedPosition(int position) {
-        if (position == ListView.INVALID_POSITION) {
-            getListView().setItemChecked(mActivatedPosition, false);
-        } else {
-            getListView().setItemChecked(position, true);
-        }
-
-        mActivatedPosition = position;
-    }
-
-}

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

@@ -1,109 +0,0 @@
-package org.schabi.newpipe;
-
-import android.content.Context;
-import android.graphics.Bitmap;
-import android.support.v4.content.ContextCompat;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.BaseAdapter;
-import android.widget.ListView;
-
-import java.util.List;
-import java.util.Vector;
-
-/**
- * Created by Christian Schabesberger on 11.08.15.
- *
- * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
- * VideoListAdapter.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/>.
- */
-
-class VideoListAdapter extends BaseAdapter {
-    private final Context context;
-    private final VideoInfoItemViewCreator viewCreator;
-    private Vector<VideoPreviewInfo> videoList = new Vector<>();
-    private Vector<Boolean> downloadedThumbnailList = new Vector<>();
-    private final ListView listView;
-
-    public VideoListAdapter(Context context, VideoItemListFragment videoListFragment) {
-        viewCreator = new VideoInfoItemViewCreator(LayoutInflater.from(context));
-        this.listView = videoListFragment.getListView();
-        this.listView.setDivider(null);
-        this.listView.setDividerHeight(0);
-        this.context = context;
-    }
-
-    public void addVideoList(List<VideoPreviewInfo> videos) {
-        videoList.addAll(videos);
-        for(int i = 0; i < videos.size(); i++) {
-            downloadedThumbnailList.add(false);
-        }
-        notifyDataSetChanged();
-    }
-
-    public void clearVideoList() {
-        videoList = new Vector<>();
-        downloadedThumbnailList = new Vector<>();
-        notifyDataSetChanged();
-    }
-
-    public Vector<VideoPreviewInfo> getVideoList() {
-        return videoList;
-    }
-
-    public void updateDownloadedThumbnailList(int index) {
-        downloadedThumbnailList.set(index, true);
-    }
-
-    public Vector<Boolean> getDownloadedThumbnailList() {
-        return downloadedThumbnailList;
-    }
-
-    public void setThumbnail(int index, Bitmap thumbnail) {
-        videoList.get(index).thumbnail = thumbnail;
-        downloadedThumbnailList.set(index, true);
-        notifyDataSetChanged();
-    }
-
-    @Override
-    public int getCount() {
-        return videoList.size();
-    }
-
-    @Override
-    public Object getItem(int position) {
-        return videoList.get(position);
-    }
-
-    @Override
-    public long getItemId(int position) {
-        return position;
-    }
-
-    @Override
-    public View getView(int position, View convertView, ViewGroup parent) {
-        convertView = viewCreator.getViewFromVideoInfoItem(convertView, parent, videoList.get(position), context);
-
-        if(listView.isItemChecked(position)) {
-            convertView.setBackgroundColor(ContextCompat.getColor(context,R.color.light_youtube_primary_color));
-        } else {
-            convertView.setBackgroundColor(0);
-        }
-
-        return convertView;
-    }
-}

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

@@ -1,79 +0,0 @@
-package org.schabi.newpipe;
-
-import android.graphics.Bitmap;
-import android.os.Parcel;
-import android.os.Parcelable;
-
-import org.schabi.newpipe.services.AbstractVideoInfo;
-
-/**
- * Created by Christian Schabesberger on 26.08.15.
- *
- * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
- * VideoPreviewInfo.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/>.
- */
-
-/**Info object for previews of unopened videos, eg search results, related videos*/
-public class VideoPreviewInfo extends AbstractVideoInfo implements Parcelable {
-    public String duration = "";
-    @SuppressWarnings("WeakerAccess")
-    protected VideoPreviewInfo(Parcel in) {
-        id = in.readString();
-        title = in.readString();
-        uploader = in.readString();
-        duration = in.readString();
-        thumbnail_url = in.readString();
-        thumbnail = (Bitmap) in.readValue(Bitmap.class.getClassLoader());
-        webpage_url = in.readString();
-        upload_date = in.readString();
-        view_count = in.readLong();
-    }
-
-    public VideoPreviewInfo() {
-
-    }
-
-    @Override
-    public int describeContents() {
-        return 0;
-    }
-
-    @Override
-    public void writeToParcel(Parcel dest, int flags) {
-        dest.writeString(id);
-        dest.writeString(title);
-        dest.writeString(uploader);
-        dest.writeString(duration);
-        dest.writeString(thumbnail_url);
-        dest.writeValue(thumbnail);
-        dest.writeString(webpage_url);
-        dest.writeString(upload_date);
-        dest.writeLong(view_count);
-    }
-
-    @SuppressWarnings("unused")
-    public static final Parcelable.Creator<VideoPreviewInfo> CREATOR = new Parcelable.Creator<VideoPreviewInfo>() {
-        @Override
-        public VideoPreviewInfo createFromParcel(Parcel in) {
-            return new VideoPreviewInfo(in);
-        }
-
-        @Override
-        public VideoPreviewInfo[] newArray(int size) {
-            return new VideoPreviewInfo[size];
-        }
-    };
-}

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

@@ -0,0 +1,234 @@
+package org.schabi.newpipe.detail;
+
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.preference.PreferenceManager;
+import android.support.v7.app.ActionBar;
+import android.support.v7.app.AppCompatActivity;
+import android.util.Log;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.widget.ArrayAdapter;
+
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.settings.SettingsActivity;
+import org.schabi.newpipe.extractor.MediaFormat;
+import org.schabi.newpipe.extractor.stream_info.VideoStream;
+
+import java.util.List;
+
+/**
+ * Created by Christian Schabesberger on 18.08.15.
+ *
+ * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
+ * DetailsMenuHandler.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/>.
+ */
+
+
+class ActionBarHandler {
+    private static final String TAG = ActionBarHandler.class.toString();
+
+    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 VideoItemDetailFragment will implement those callbacks.
+    private OnActionListener onShareListener;
+    private OnActionListener onOpenInBrowserListener;
+    private OnActionListener onDownloadListener;
+    private OnActionListener onPlayWithKodiListener;
+    private OnActionListener onPlayAudioListener;
+
+
+    // Triggered when a stream related action is triggered.
+    public interface OnActionListener {
+        void onActionSelected(int selectedStreamId);
+    }
+
+    public ActionBarHandler(AppCompatActivity activity) {
+        this.activity = activity;
+    }
+
+    @SuppressWarnings({"deprecation", "ConstantConditions"})
+    public void setupNavMenu(AppCompatActivity activity) {
+        this.activity = activity;
+        try {
+            activity.getSupportActionBar().setNavigationMode(ActionBar.NAVIGATION_MODE_LIST);
+        } catch (NullPointerException e) {
+            e.printStackTrace();
+        }
+    }
+
+    public void setupStreamList(final List<VideoStream> videoStreams) {
+        if (activity != null) {
+            selectedVideoStream = 0;
+
+
+            // this array will be shown in the dropdown menu for selecting the stream/resolution.
+            String[] itemArray = new String[videoStreams.size()];
+            for (int i = 0; i < videoStreams.size(); i++) {
+                VideoStream item = videoStreams.get(i);
+                itemArray[i] = MediaFormat.getNameById(item.format) + " " + item.resolution;
+            }
+            int defaultResolution = getDefaultResolution(videoStreams);
+
+            ArrayAdapter<String> itemAdapter = new ArrayAdapter<>(activity.getBaseContext(),
+                    android.R.layout.simple_spinner_dropdown_item, itemArray);
+
+            ActionBar ab = activity.getSupportActionBar();
+            //todo: make this throwsable
+            assert ab != null : "Could not get actionbar";
+            ab.setListNavigationCallbacks(itemAdapter
+                    , new ActionBar.OnNavigationListener() {
+                @Override
+                public boolean onNavigationItemSelected(int itemPosition, long itemId) {
+                    selectedVideoStream = (int) itemId;
+                    return true;
+                }
+            });
+
+            ab.setSelectedNavigationItem(defaultResolution);
+        }
+    }
+
+
+    private int getDefaultResolution(final List<VideoStream> videoStreams) {
+        if (defaultPreferences == null)
+            return 0;
+
+        String defaultResolution = defaultPreferences
+                .getString(activity.getString(R.string.default_resolution_key),
+                        activity.getString(R.string.default_resolution_value));
+
+        for (int i = 0; i < videoStreams.size(); i++) {
+            VideoStream item = videoStreams.get(i);
+            if (defaultResolution.equals(item.resolution)) {
+                return i;
+            }
+        }
+        // this is actually an error,
+        // but maybe there is really no stream fitting to the default value.
+        return 0;
+    }
+
+    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.videoitem_detail, menu);
+
+        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: {
+                    /*
+                    Intent intent = new Intent();
+                    intent.setAction(Intent.ACTION_SEND);
+                    intent.putExtra(Intent.EXTRA_TEXT, websiteUrl);
+                    intent.setType("text/plain");
+                    activity.startActivity(Intent.createChooser(intent, activity.getString(R.string.share_dialog_title)));
+                    */
+                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_settings: {
+                Intent intent = new Intent(activity, SettingsActivity.class);
+                activity.startActivity(intent);
+                return true;
+            }
+            case R.id.action_play_with_kodi:
+                if(onPlayWithKodiListener != null) {
+                    onPlayWithKodiListener.onActionSelected(selectedVideoStream);
+                }
+                return true;
+            case R.id.menu_item_play_audio:
+                if(onPlayAudioListener != null) {
+                    onPlayAudioListener.onActionSelected(selectedVideoStream);
+                }
+                return true;
+            case R.id.menu_item_downloads: {
+                Intent intent =
+                        new Intent(activity, org.schabi.newpipe.download.DownloadActivity.class);
+                activity.startActivity(intent);
+                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 setOnPlayAudioListener(OnActionListener listener) {
+        onPlayAudioListener = listener;
+    }
+
+    public void showAudioAction(boolean visible) {
+        menu.findItem(R.id.menu_item_play_audio).setVisible(visible);
+    }
+
+    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/detail/StreamInfoWorker.java

@@ -0,0 +1,227 @@
+package org.schabi.newpipe.detail;
+
+import android.app.Activity;
+import android.os.Handler;
+import android.util.Log;
+import android.view.View;
+
+import org.schabi.newpipe.extractor.exceptions.ParsingException;
+import org.schabi.newpipe.extractor.exceptions.ReCaptchaException;
+import org.schabi.newpipe.extractor.stream_info.StreamExtractor;
+import org.schabi.newpipe.extractor.stream_info.StreamInfo;
+import org.schabi.newpipe.report.ErrorActivity;
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.extractor.NewPipe;
+import org.schabi.newpipe.extractor.StreamingService;
+import org.schabi.newpipe.extractor.services.youtube.YoutubeStreamExtractor;
+
+import java.io.IOException;
+
+/**
+ * Created by Christian Schabesberger on 02.08.16.
+ *
+ * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
+ * StreamInfoWorker.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 StreamInfoWorker {
+
+    private static final String TAG = StreamInfoWorker.class.toString();
+
+    public interface OnStreamInfoReceivedListener {
+        void onReceive(StreamInfo info);
+        void onError(int messageId);
+        void onReCaptchaException();
+        void onBlockedByGemaError();
+        void onContentErrorWithMessage(int messageId);
+        void onContentError();
+    }
+
+    private class StreamExtractorRunnable implements Runnable {
+        private final Handler h = new Handler();
+        private StreamExtractor streamExtractor;
+        private final int serviceId;
+        private final String videoUrl;
+        private Activity a;
+
+        public StreamExtractorRunnable(Activity a, String videoUrl, int serviceId) {
+            this.serviceId = serviceId;
+            this.videoUrl = videoUrl;
+            this.a = a;
+        }
+
+        @Override
+        public void run() {
+            StreamInfo streamInfo = null;
+            StreamingService service = null;
+            try {
+                service = NewPipe.getService(serviceId);
+            } catch (Exception e) {
+                e.printStackTrace();
+                ErrorActivity.reportError(h, a, e, VideoItemDetailFragment.class, null,
+                        ErrorActivity.ErrorInfo.make(ErrorActivity.REQUESTED_STREAM,
+                                "", videoUrl, R.string.could_not_get_stream));
+                return;
+            }
+            try {
+                streamExtractor = service.getExtractorInstance(videoUrl);
+                streamInfo = StreamInfo.getVideoInfo(streamExtractor);
+
+                final StreamInfo info = streamInfo;
+                h.post(new Runnable() {
+                    @Override
+                    public void run() {
+                        onStreamInfoReceivedListener.onReceive(info);
+                    }
+                });
+
+                // look for errors during extraction
+                // this if statement only covers extra information.
+                // if these are not available or caused an error, they are just not available
+                // but don't render the stream information unusalbe.
+                if(streamInfo != null &&
+                        !streamInfo.errors.isEmpty()) {
+                    Log.e(TAG, "OCCURRED ERRORS DURING EXTRACTION:");
+                    for (Throwable e : streamInfo.errors) {
+                        e.printStackTrace();
+                        Log.e(TAG, "------");
+                    }
+
+                    View rootView = a != null ? a.findViewById(R.id.video_item_detail) : null;
+                    ErrorActivity.reportError(h, a,
+                            streamInfo.errors, null, rootView,
+                            ErrorActivity.ErrorInfo.make(ErrorActivity.REQUESTED_STREAM,
+                                    service.getServiceInfo().name, videoUrl, 0 /* no message for the user */));
+                }
+
+                // These errors render the stream information unusable.
+            } catch (ReCaptchaException e) {
+                h.post(new Runnable() {
+                    @Override
+                    public void run() {
+                        onStreamInfoReceivedListener.onReCaptchaException();
+                    }
+                });
+            } catch (IOException e) {
+                h.post(new Runnable() {
+                    @Override
+                    public void run() {
+                        onStreamInfoReceivedListener.onError(R.string.network_error);
+                    }
+                });
+                e.printStackTrace();
+            } catch (YoutubeStreamExtractor.DecryptException de) {
+                // custom service related exceptions
+                h.post(new Runnable() {
+                    @Override
+                    public void run() {
+                        onStreamInfoReceivedListener.onError(R.string.youtube_signature_decryption_error);
+                    }
+                });
+                de.printStackTrace();
+            } catch (YoutubeStreamExtractor.GemaException ge) {
+                h.post(new Runnable() {
+                    @Override
+                    public void run() {
+                        onStreamInfoReceivedListener.onBlockedByGemaError();
+                    }
+                });
+            } catch(YoutubeStreamExtractor.LiveStreamException e) {
+                h.post(new Runnable() {
+                    @Override
+                    public void run() {
+                        onStreamInfoReceivedListener
+                                .onContentErrorWithMessage(R.string.live_streams_not_supported);
+                    }
+                });
+            }
+            // ----------------------------------------
+            catch(StreamExtractor.ContentNotAvailableException e) {
+                h.post(new Runnable() {
+                    @Override
+                    public void run() {
+                        onStreamInfoReceivedListener
+                                .onContentError();
+                    }
+                });
+                e.printStackTrace();
+            } catch(StreamInfo.StreamExctractException e) {
+                if(!streamInfo.errors.isEmpty()) {
+                    // !!! if this case ever kicks in someone gets kicked out !!!
+                    ErrorActivity.reportError(h, a, e, VideoItemDetailFragment.class, null,
+                            ErrorActivity.ErrorInfo.make(ErrorActivity.REQUESTED_STREAM,
+                                    service.getServiceInfo().name, videoUrl, R.string.could_not_get_stream));
+                } else {
+                    ErrorActivity.reportError(h, a, streamInfo.errors, VideoItemDetailFragment.class, null,
+                            ErrorActivity.ErrorInfo.make(ErrorActivity.REQUESTED_STREAM,
+                                    service.getServiceInfo().name, videoUrl, R.string.could_not_get_stream));
+                }
+                h.post(new Runnable() {
+                    @Override
+                    public void run() {
+                        a.finish();
+                    }
+                });
+                e.printStackTrace();
+            } catch (ParsingException e) {
+                ErrorActivity.reportError(h, a, e, VideoItemDetailFragment.class, null,
+                        ErrorActivity.ErrorInfo.make(ErrorActivity.REQUESTED_STREAM,
+                                service.getServiceInfo().name, videoUrl, R.string.parsing_error));
+                h.post(new Runnable() {
+                    @Override
+                    public void run() {
+                        a.finish();
+                    }
+                });
+                e.printStackTrace();
+            } catch(Exception e) {
+                ErrorActivity.reportError(h, a, e, VideoItemDetailFragment.class, null,
+                        ErrorActivity.ErrorInfo.make(ErrorActivity.REQUESTED_STREAM,
+                                service.getServiceInfo().name, videoUrl, R.string.general_error));
+                h.post(new Runnable() {
+                    @Override
+                    public void run() {
+                        a.finish();
+                    }
+                });
+                e.printStackTrace();
+            }
+        }
+    }
+
+    private static StreamInfoWorker streamInfoWorker = null;
+    private StreamExtractorRunnable runnable = null;
+    private OnStreamInfoReceivedListener onStreamInfoReceivedListener = null;
+
+    private StreamInfoWorker() {
+
+    }
+
+    public static StreamInfoWorker getInstance() {
+        return streamInfoWorker == null ? (streamInfoWorker = new StreamInfoWorker()) : streamInfoWorker;
+    }
+
+    public void search(int serviceId, String url, Activity a) {
+        runnable = new StreamExtractorRunnable(a, url, serviceId);
+        Thread thread = new Thread(runnable);
+        thread.start();
+    }
+
+    public void setOnStreamInfoReceivedListener(
+            OnStreamInfoReceivedListener onStreamInfoReceivedListener) {
+        this.onStreamInfoReceivedListener = onStreamInfoReceivedListener;
+    }
+}

app/src/main/java/org/schabi/newpipe/detail/VideoItemDetailActivity.java

@@ -0,0 +1,242 @@
+package org.schabi.newpipe.detail;
+
+import android.content.Intent;
+import android.media.AudioManager;
+import android.os.Bundle;
+import android.preference.PreferenceManager;
+import android.support.v4.app.NavUtils;
+import android.support.v7.app.AppCompatActivity;
+import android.util.Log;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.widget.Toast;
+
+import org.schabi.newpipe.App;
+import org.schabi.newpipe.MainActivity;
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.extractor.NewPipe;
+import org.schabi.newpipe.extractor.StreamingService;
+
+import java.util.Collection;
+import java.util.HashSet;
+
+
+/**
+ * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
+ * VideoItemDetailActivity.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 VideoItemDetailActivity extends AppCompatActivity {
+
+    /**
+     * Removes invisible separators (\p{Z}) and punctuation characters including
+     * brackets (\p{P}). See http://www.regular-expressions.info/unicode.html for
+     * more details.
+     */
+    private final static String REGEX_REMOVE_FROM_URL = "[\\p{Z}\\p{P}]";
+
+    private static final String TAG = VideoItemDetailActivity.class.toString();
+
+    private VideoItemDetailFragment fragment;
+
+    private String videoUrl;
+    private int currentStreamingService = -1;
+
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_videoitem_detail);
+        setVolumeControlStream(AudioManager.STREAM_MUSIC);
+        // Show the Up button in the action bar.
+        try {
+            //noinspection ConstantConditions
+            getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+        } catch(Exception e) {
+            Log.d(TAG, "Could not get SupportActionBar");
+            e.printStackTrace();
+        }
+
+        // savedInstanceState is non-null when there is fragment state
+        // saved from previous configurations of this activity
+        // (e.g. when rotating the screen from portrait to landscape).
+        // In this case, the fragment will automatically be re-added
+        // to its container so we don't need to manually add it.
+        // For more information, see the Fragments API guide at:
+        //
+        // http://developer.android.com/guide/components/fragments.html
+        //
+
+        if (savedInstanceState == null) {
+            handleIntent(getIntent());
+        } else {
+            videoUrl = savedInstanceState.getString(VideoItemDetailFragment.VIDEO_URL);
+            currentStreamingService = savedInstanceState.getInt(VideoItemDetailFragment.STREAMING_SERVICE);
+            addFragment(savedInstanceState);
+        }
+    }
+
+    @Override
+    protected void onNewIntent(Intent intent) {
+        super.onNewIntent(intent);
+        setIntent(intent);
+        handleIntent(intent);
+    }
+
+    private void handleIntent(Intent intent) {
+        Bundle arguments = new Bundle();
+        boolean autoplay = false;
+        if (intent.getData() != null) {
+            // this means the video was called though another app
+            videoUrl = intent.getData().toString();
+            currentStreamingService = getServiceIdByUrl(videoUrl);
+            if(currentStreamingService == -1) {
+                Toast.makeText(this, R.string.url_not_supported_toast, Toast.LENGTH_LONG)
+                        .show();
+            }
+            autoplay = PreferenceManager.getDefaultSharedPreferences(this)
+                            .getBoolean(getString(R.string.autoplay_through_intent_key), false);
+        } else if(intent.getStringExtra(Intent.EXTRA_TEXT) != null) {
+            //this means that vidoe was called through share menu
+            String extraText = intent.getStringExtra(Intent.EXTRA_TEXT);
+            videoUrl = getUris(extraText)[0];
+            currentStreamingService = getServiceIdByUrl(videoUrl);
+        } else {
+            //this is if the video was called through another NewPipe activity
+            videoUrl = intent.getStringExtra(VideoItemDetailFragment.VIDEO_URL);
+            currentStreamingService = intent.getIntExtra(VideoItemDetailFragment.STREAMING_SERVICE, -1);
+        }
+        arguments.putBoolean(VideoItemDetailFragment.AUTO_PLAY, autoplay);
+        arguments.putString(VideoItemDetailFragment.VIDEO_URL, videoUrl);
+        arguments.putInt(VideoItemDetailFragment.STREAMING_SERVICE, currentStreamingService);
+        addFragment(arguments);
+    }
+
+    private void addFragment(final Bundle arguments) {
+        // Create the detail fragment and add it to the activity
+        // using a fragment transaction.
+        fragment = new VideoItemDetailFragment();
+        fragment.setArguments(arguments);
+        getSupportFragmentManager().beginTransaction()
+                .replace(R.id.videoitem_detail_container, fragment)
+                .commit();
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        App.checkStartTor(this);
+    }
+
+    @Override
+    public void onSaveInstanceState(Bundle outState) {
+        outState.putString(VideoItemDetailFragment.VIDEO_URL, videoUrl);
+        outState.putInt(VideoItemDetailFragment.STREAMING_SERVICE, currentStreamingService);
+        outState.putBoolean(VideoItemDetailFragment.AUTO_PLAY, false);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        int id = item.getItemId();
+        if (id == android.R.id.home) {
+            // This ID represents the Home or Up button. In the case of this
+            // activity, the Up button is shown. Use NavUtils to allow users
+            // to navigate up one level in the application structure. For
+            // more details, see the Navigation pattern on Android Design:
+
+            // http://developer.android.com/design/patterns/navigation.html#up-vs-back
+
+            Intent intent = new Intent(this, MainActivity.class);
+            intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+            NavUtils.navigateUpTo(this, intent);
+            return true;
+        } else {
+            return fragment.onOptionsItemSelected(item) ||
+                    super.onOptionsItemSelected(item);
+        }
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        super.onCreateOptionsMenu(menu);
+        fragment.onCreateOptionsMenu(menu, getMenuInflater());
+        return true;
+    }
+
+
+    /**
+     * Retrieves all Strings which look remotely like URLs from a text.
+     * Used if NewPipe was called through share menu.
+     *
+     * @param sharedText text to scan for URLs.
+     * @return potential URLs
+     */
+    private String[] getUris(final String sharedText) {
+        final Collection<String> result = new HashSet<>();
+        if (sharedText != null) {
+            final String[] array = sharedText.split("\\p{Space}");
+            for (String s : array) {
+                s = trim(s);
+                if (s.length() != 0) {
+                    if (s.matches(".+://.+")) {
+                        result.add(removeHeadingGibberish(s));
+                    } else if (s.matches(".+\\..+")) {
+                        result.add("http://" + s);
+                    }
+                }
+            }
+        }
+        return result.toArray(new String[result.size()]);
+    }
+
+    private static 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}")) {
+                start = i + 1;
+                break;
+            }
+        }
+        return input.substring(start, input.length());
+    }
+
+    private static String trim(final String input) {
+        if (input == null || input.length() < 1) {
+            return input;
+        } else {
+            String output = input;
+            while (output.length() > 0 && output.substring(0, 1).matches(REGEX_REMOVE_FROM_URL)) {
+                output = output.substring(1);
+            }
+            while (output.length() > 0
+                    && output.substring(output.length() - 1, output.length()).matches(REGEX_REMOVE_FROM_URL)) {
+                output = output.substring(0, output.length() - 1);
+            }
+            return output;
+        }
+    }
+
+    private int getServiceIdByUrl(String url) {
+        StreamingService[] serviceList = NewPipe.getServices();
+        int service = -1;
+        for (int i = 0; i < serviceList.length; i++) {
+            if (serviceList[i].getUrlIdHandlerInstance().acceptUrl(videoUrl)) {
+                service = i;
+                //videoExtractor = ServiceList.getService(i).getExtractorInstance();
+                break;
+            }
+        }
+        return service;
+    }
+}

app/src/main/java/org/schabi/newpipe/detail/VideoItemDetailFragment.java

@@ -0,0 +1,825 @@
+package org.schabi.newpipe.detail;
+
+import android.app.Activity;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.Point;
+import android.net.Uri;
+import android.os.Build;
+import android.os.Bundle;
+import android.preference.PreferenceManager;
+import android.support.design.widget.FloatingActionButton;
+import android.support.v4.app.Fragment;
+import android.support.v7.app.AlertDialog;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.RecyclerView;
+import android.text.Html;
+import android.text.method.LinkMovementMethod;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.ProgressBar;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+import android.view.MenuItem;
+import android.widget.Toast;
+
+import com.google.android.exoplayer.util.Util;
+import com.nostra13.universalimageloader.core.DisplayImageOptions;
+import com.nostra13.universalimageloader.core.ImageLoader;
+import com.nostra13.universalimageloader.core.assist.FailReason;
+import com.nostra13.universalimageloader.core.listener.ImageLoadingListener;
+
+import java.util.Vector;
+
+import org.schabi.newpipe.ActivityCommunicator;
+import org.schabi.newpipe.ChannelActivity;
+import org.schabi.newpipe.ReCaptchaActivity;
+import org.schabi.newpipe.extractor.stream_info.StreamInfo;
+import org.schabi.newpipe.extractor.stream_info.StreamPreviewInfo;
+import org.schabi.newpipe.info_list.InfoItemBuilder;
+import org.schabi.newpipe.report.ErrorActivity;
+import org.schabi.newpipe.ImageErrorLoadingListener;
+import org.schabi.newpipe.Localization;
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.download.DownloadDialog;
+import org.schabi.newpipe.extractor.stream_info.AudioStream;
+import org.schabi.newpipe.extractor.MediaFormat;
+import org.schabi.newpipe.extractor.NewPipe;
+import org.schabi.newpipe.extractor.stream_info.VideoStream;
+import org.schabi.newpipe.player.BackgroundPlayer;
+import org.schabi.newpipe.player.PlayVideoActivity;
+import org.schabi.newpipe.player.ExoPlayerActivity;
+
+import static android.app.Activity.RESULT_OK;
+import static org.schabi.newpipe.ReCaptchaActivity.RECAPTCHA_REQUEST;
+
+
+/**
+ * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
+ * VideoItemDetailFragment.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 VideoItemDetailFragment extends Fragment {
+
+    private static final String TAG = VideoItemDetailFragment.class.toString();
+    private static final String KORE_PACKET = "org.xbmc.kore";
+
+    /**
+     * The fragment argument representing the item ID that this fragment
+     * represents.
+     */
+    public static final String VIDEO_URL = "video_url";
+    public static final String STREAMING_SERVICE = "streaming_service";
+    public static final String AUTO_PLAY = "auto_play";
+
+    private AppCompatActivity activity;
+    private ActionBarHandler actionBarHandler;
+    private ProgressBar progressBar;
+
+    private int streamingServiceId = -1;
+
+    private boolean autoPlayEnabled;
+    private boolean showNextStreamItem;
+
+    private View thumbnailWindowLayout;
+    //this only remains due to downwards compatibility
+    private FloatingActionButton playVideoButton;
+    private final Point initialThumbnailPos = new Point(0, 0);
+    private View rootView = null;
+    private Bitmap streamThumbnail = null;
+
+    private ImageLoader imageLoader = ImageLoader.getInstance();
+    private DisplayImageOptions displayImageOptions =
+            new DisplayImageOptions.Builder().cacheInMemory(true).build();
+
+    private InfoItemBuilder infoItemBuilder = null;
+
+    public interface OnInvokeCreateOptionsMenuListener {
+        void createOptionsMenu();
+    }
+
+    private OnInvokeCreateOptionsMenuListener onInvokeCreateOptionsMenuListener;
+
+    private void updateInfo(final StreamInfo info) {
+        Activity a = getActivity();
+
+        RelativeLayout textContentLayout =
+                (RelativeLayout) activity.findViewById(R.id.detail_text_content_layout);
+        final TextView videoTitleView =
+                (TextView) activity.findViewById(R.id.detail_video_title_view);
+        TextView uploaderView = (TextView) activity.findViewById(R.id.detail_uploader_view);
+        TextView viewCountView = (TextView) activity.findViewById(R.id.detail_view_count_view);
+        TextView thumbsUpView = (TextView) activity.findViewById(R.id.detail_thumbs_up_count_view);
+        TextView thumbsDownView =
+                (TextView) activity.findViewById(R.id.detail_thumbs_down_count_view);
+        TextView uploadDateView = (TextView) activity.findViewById(R.id.detail_upload_date_view);
+        TextView descriptionView = (TextView) activity.findViewById(R.id.detail_description_view);
+        RecyclerView nextStreamView =
+                (RecyclerView) activity.findViewById(R.id.detail_next_stream_content);
+        RelativeLayout nextVideoRootFrame =
+                (RelativeLayout) activity.findViewById(R.id.detail_next_stream_root_layout);
+        TextView similarTitle = (TextView) activity.findViewById(R.id.detail_similar_title);
+        Button backgroundButton = (Button)
+                activity.findViewById(R.id.detail_stream_thumbnail_window_background_button);
+        View topView = activity.findViewById(R.id.detailTopView);
+        Button channelButton = (Button) activity.findViewById(R.id.channel_button);
+
+        // prevents a crash if the activity/fragment was already left when the response came
+        if(channelButton != null) {
+
+            progressBar.setVisibility(View.GONE);
+            if (info.next_video != null) {
+                // todo: activate this function or remove it
+                nextStreamView.setVisibility(View.GONE);
+            } else {
+                nextStreamView.setVisibility(View.GONE);
+                activity.findViewById(R.id.detail_similar_title).setVisibility(View.GONE);
+            }
+
+            textContentLayout.setVisibility(View.VISIBLE);
+            if (android.os.Build.VERSION.SDK_INT < 18) {
+                playVideoButton.setVisibility(View.VISIBLE);
+            } else {
+                ImageView playArrowView = (ImageView) activity.findViewById(R.id.play_arrow_view);
+                playArrowView.setVisibility(View.VISIBLE);
+            }
+
+            if (!showNextStreamItem) {
+                nextVideoRootFrame.setVisibility(View.GONE);
+                similarTitle.setVisibility(View.GONE);
+            }
+
+            videoTitleView.setText(info.title);
+
+            topView.setOnTouchListener(new View.OnTouchListener() {
+                @Override
+                public boolean onTouch(View v, MotionEvent event) {
+                    if (event.getAction() == android.view.MotionEvent.ACTION_UP) {
+                        ImageView arrow = (ImageView) activity.findViewById(R.id.toggle_description_view);
+                        View extra = activity.findViewById(R.id.detailExtraView);
+                        if (extra.getVisibility() == View.VISIBLE) {
+                            extra.setVisibility(View.GONE);
+                            arrow.setImageResource(R.drawable.arrow_down);
+                        } else {
+                            extra.setVisibility(View.VISIBLE);
+                            arrow.setImageResource(R.drawable.arrow_up);
+                        }
+                    }
+                    return true;
+                }
+            });
+
+            // Since newpipe is designed to work even if certain information is not available,
+            // the UI has to react on missing information.
+            videoTitleView.setText(info.title);
+            if (!info.uploader.isEmpty()) {
+                uploaderView.setText(info.uploader);
+            } else {
+                activity.findViewById(R.id.detail_uploader_view).setVisibility(View.GONE);
+            }
+            if (info.view_count >= 0) {
+                viewCountView.setText(Localization.localizeViewCount(info.view_count, a));
+            } else {
+                viewCountView.setVisibility(View.GONE);
+            }
+            if (info.dislike_count >= 0) {
+                thumbsDownView.setText(Localization.localizeNumber(info.dislike_count, a));
+            } else {
+                thumbsDownView.setVisibility(View.INVISIBLE);
+                activity.findViewById(R.id.detail_thumbs_down_count_view).setVisibility(View.GONE);
+            }
+            if (info.like_count >= 0) {
+                thumbsUpView.setText(Localization.localizeNumber(info.like_count, a));
+            } else {
+                thumbsUpView.setVisibility(View.GONE);
+                activity.findViewById(R.id.detail_thumbs_up_img_view).setVisibility(View.GONE);
+                thumbsDownView.setVisibility(View.GONE);
+                activity.findViewById(R.id.detail_thumbs_down_img_view).setVisibility(View.GONE);
+            }
+            if (!info.upload_date.isEmpty()) {
+                uploadDateView.setText(Localization.localizeDate(info.upload_date, a));
+            } else {
+                uploadDateView.setVisibility(View.GONE);
+            }
+            if (!info.description.isEmpty()) {
+                descriptionView.setText(Html.fromHtml(info.description));
+            } else {
+                descriptionView.setVisibility(View.GONE);
+            }
+
+            descriptionView.setMovementMethod(LinkMovementMethod.getInstance());
+
+            // parse streams
+            Vector<VideoStream> streamsToUse = new Vector<>();
+            for (VideoStream i : info.video_streams) {
+                if (useStream(i, streamsToUse)) {
+                    streamsToUse.add(i);
+                }
+            }
+
+            textContentLayout.setVisibility(View.VISIBLE);
+
+            if (info.next_video == null) {
+                activity.findViewById(R.id.detail_next_stream_title).setVisibility(View.GONE);
+            }
+
+            if (info.related_streams != null && !info.related_streams.isEmpty()) {
+                initSimilarVideos(info);
+            } else {
+                activity.findViewById(R.id.detail_similar_title).setVisibility(View.GONE);
+                activity.findViewById(R.id.similar_streams_view).setVisibility(View.GONE);
+            }
+
+            setupActionBarHandler(info);
+
+            if (autoPlayEnabled) {
+                playVideo(info);
+            }
+
+            if (android.os.Build.VERSION.SDK_INT < 18) {
+                playVideoButton.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        playVideo(info);
+                    }
+                });
+            }
+
+            backgroundButton.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    playVideo(info);
+                }
+            });
+
+            if (info.channel_url != null && info.channel_url != "") {
+                channelButton.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View view) {
+                        Intent i = new Intent(activity, ChannelActivity.class);
+                        i.putExtra(ChannelActivity.CHANNEL_URL, info.channel_url);
+                        i.putExtra(ChannelActivity.SERVICE_ID, info.service_id);
+                        startActivity(i);
+                    }
+                });
+            } else {
+                channelButton.setVisibility(Button.GONE);
+            }
+
+            initThumbnailViews(info);
+        }
+    }
+
+    private void initThumbnailViews(final StreamInfo info) {
+        ImageView videoThumbnailView = (ImageView) activity.findViewById(R.id.detail_thumbnail_view);
+        ImageView uploaderThumb
+                = (ImageView) activity.findViewById(R.id.detail_uploader_thumbnail_view);
+
+        if (info.thumbnail_url != null && !info.thumbnail_url.isEmpty()) {
+            imageLoader.displayImage(info.thumbnail_url, videoThumbnailView,
+                    displayImageOptions, new ImageLoadingListener() {
+                        @Override
+                        public void onLoadingStarted(String imageUri, View view) {
+                        }
+
+                        @Override
+                        public void onLoadingFailed(String imageUri, View view, FailReason failReason) {
+                            ErrorActivity.reportError(getActivity(),
+                                    failReason.getCause(), null, rootView,
+                                    ErrorActivity.ErrorInfo.make(ErrorActivity.LOAD_IMAGE,
+                                            NewPipe.getNameOfService(info.service_id), imageUri,
+                                            R.string.could_not_load_thumbnails));
+                        }
+
+                        @Override
+                        public void onLoadingComplete(String imageUri, View view, Bitmap loadedImage) {
+                            streamThumbnail = loadedImage;
+                        }
+
+                        @Override
+                        public void onLoadingCancelled(String imageUri, View view) {
+                        }
+                    });
+        } else {
+            videoThumbnailView.setImageResource(R.drawable.dummy_thumbnail_dark);
+        }
+        if (info.uploader_thumbnail_url != null && !info.uploader_thumbnail_url.isEmpty()) {
+            imageLoader.displayImage(info.uploader_thumbnail_url,
+                    uploaderThumb, displayImageOptions,
+                    new ImageErrorLoadingListener(activity, rootView, info.service_id));
+        }
+    }
+
+    private void setupActionBarHandler(final StreamInfo info) {
+        actionBarHandler.setupStreamList(info.video_streams);
+
+        actionBarHandler.setOnShareListener(new ActionBarHandler.OnActionListener() {
+            @Override
+            public void onActionSelected(int selectedStreamId) {
+                Intent intent = new Intent();
+                intent.setAction(Intent.ACTION_SEND);
+                intent.putExtra(Intent.EXTRA_TEXT, info.webpage_url);
+                intent.setType("text/plain");
+                activity.startActivity(Intent.createChooser(intent, activity.getString(R.string.share_dialog_title)));
+            }
+        });
+
+        actionBarHandler.setOnOpenInBrowserListener(new ActionBarHandler.OnActionListener() {
+            @Override
+            public void onActionSelected(int selectedStreamId) {
+                Intent intent = new Intent();
+                intent.setAction(Intent.ACTION_VIEW);
+                intent.setData(Uri.parse(info.webpage_url));
+
+                activity.startActivity(Intent.createChooser(intent, activity.getString(R.string.choose_browser)));
+            }
+        });
+
+        actionBarHandler.setOnPlayWithKodiListener(new ActionBarHandler.OnActionListener() {
+            @Override
+            public void onActionSelected(int selectedStreamId) {
+                try {
+                    Intent intent = new Intent(Intent.ACTION_VIEW);
+                    intent.setPackage(KORE_PACKET);
+                    intent.setData(Uri.parse(info.webpage_url.replace("https", "http")));
+                    activity.startActivity(intent);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                    AlertDialog.Builder builder = new AlertDialog.Builder(activity);
+                    builder.setMessage(R.string.kore_not_found)
+                            .setPositiveButton(R.string.install, new DialogInterface.OnClickListener() {
+                                @Override
+                                public void onClick(DialogInterface dialog, int which) {
+                                    Intent intent = new Intent();
+                                    intent.setAction(Intent.ACTION_VIEW);
+                                    intent.setData(Uri.parse(activity.getString(R.string.fdroid_kore_url)));
+                                    activity.startActivity(intent);
+                                }
+                            })
+                            .setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
+                                @Override
+                                public void onClick(DialogInterface dialog, int which) {
+
+                                }
+                            });
+                    builder.create().show();
+                }
+            }
+        });
+
+        actionBarHandler.setOnDownloadListener(new ActionBarHandler.OnActionListener() {
+            @Override
+            public void onActionSelected(int selectedStreamId) {
+                try {
+                    Bundle args = new Bundle();
+
+                    // Sometimes it may be that some information is not available due to changes fo the
+                    // website which was crawled. Then the ui has to understand this and act right.
+
+                    if (info.audio_streams != null) {
+                        AudioStream audioStream =
+                                info.audio_streams.get(getPreferredAudioStreamId(info));
+
+                        String audioSuffix = "." + MediaFormat.getSuffixById(audioStream.format);
+                        args.putString(DownloadDialog.AUDIO_URL, audioStream.url);
+                        args.putString(DownloadDialog.FILE_SUFFIX_AUDIO, audioSuffix);
+                    }
+
+                    if (info.video_streams != null) {
+                        VideoStream selectedStreamItem = info.video_streams.get(selectedStreamId);
+                        String videoSuffix = "." + MediaFormat.getSuffixById(selectedStreamItem.format);
+                        args.putString(DownloadDialog.FILE_SUFFIX_VIDEO, videoSuffix);
+                        args.putString(DownloadDialog.VIDEO_URL, selectedStreamItem.url);
+                    }
+
+                    args.putString(DownloadDialog.TITLE, info.title);
+                    DownloadDialog downloadDialog = DownloadDialog.newInstance(args);
+                    downloadDialog.show(activity.getSupportFragmentManager(), "downloadDialog");
+                } catch (Exception e) {
+                    Toast.makeText(VideoItemDetailFragment.this.getActivity(),
+                            R.string.could_not_setup_download_menu, Toast.LENGTH_LONG).show();
+                    e.printStackTrace();
+                }
+            }
+        });
+
+        if (info.audio_streams == null) {
+            actionBarHandler.showAudioAction(false);
+        } else {
+            actionBarHandler.setOnPlayAudioListener(new ActionBarHandler.OnActionListener() {
+                @Override
+                public void onActionSelected(int selectedStreamId) {
+                    boolean useExternalAudioPlayer = PreferenceManager.getDefaultSharedPreferences(activity)
+                            .getBoolean(activity.getString(R.string.use_external_audio_player_key), false);
+                    Intent intent;
+                    AudioStream audioStream =
+                            info.audio_streams.get(getPreferredAudioStreamId(info));
+                    if (!useExternalAudioPlayer && android.os.Build.VERSION.SDK_INT >= 18) {
+                        //internal music player: explicit intent
+                        if (!BackgroundPlayer.isRunning && streamThumbnail != null) {
+                            ActivityCommunicator.getCommunicator()
+                                    .backgroundPlayerThumbnail = streamThumbnail;
+                            intent = new Intent(activity, BackgroundPlayer.class);
+
+                            intent.setAction(Intent.ACTION_VIEW);
+                            Log.i(TAG, "audioStream is null:" + (audioStream == null));
+                            Log.i(TAG, "audioStream.url is null:" + (audioStream.url == null));
+                            intent.setDataAndType(Uri.parse(audioStream.url),
+                                    MediaFormat.getMimeById(audioStream.format));
+                            intent.putExtra(BackgroundPlayer.TITLE, info.title);
+                            intent.putExtra(BackgroundPlayer.WEB_URL, info.webpage_url);
+                            intent.putExtra(BackgroundPlayer.SERVICE_ID, streamingServiceId);
+                            intent.putExtra(BackgroundPlayer.CHANNEL_NAME, info.uploader);
+                            activity.startService(intent);
+                        }
+                    } else {
+                        intent = new Intent();
+                        try {
+                            intent.setAction(Intent.ACTION_VIEW);
+                            intent.setDataAndType(Uri.parse(audioStream.url),
+                                    MediaFormat.getMimeById(audioStream.format));
+                            intent.putExtra(Intent.EXTRA_TITLE, info.title);
+                            intent.putExtra("title", info.title);
+                            // HERE !!!
+                            activity.startActivity(intent);
+                        } catch (Exception e) {
+                            e.printStackTrace();
+                            AlertDialog.Builder builder = new AlertDialog.Builder(activity);
+                            builder.setMessage(R.string.no_player_found)
+                                    .setPositiveButton(R.string.install, new DialogInterface.OnClickListener() {
+                                        @Override
+                                        public void onClick(DialogInterface dialog, int which) {
+                                            Intent intent = new Intent();
+                                            intent.setAction(Intent.ACTION_VIEW);
+                                            intent.setData(Uri.parse(activity.getString(R.string.fdroid_vlc_url)));
+                                            activity.startActivity(intent);
+                                        }
+                                    })
+                                    .setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
+                                        @Override
+                                        public void onClick(DialogInterface dialog, int which) {
+                                            Log.i(TAG, "You unlocked a secret unicorn.");
+                                        }
+                                    });
+                            builder.create().show();
+                            Log.e(TAG, "Either no Streaming player for audio was installed, or something important crashed:");
+                            e.printStackTrace();
+                        }
+                    }
+                }
+            });
+        }
+    }
+
+    private int getPreferredAudioStreamId(final StreamInfo info) {
+        String preferredFormatString = PreferenceManager.getDefaultSharedPreferences(getActivity())
+                .getString(activity.getString(R.string.default_audio_format_key), "webm");
+
+        int preferredFormat = MediaFormat.WEBMA.id;
+        switch(preferredFormatString) {
+            case "webm":
+                preferredFormat = MediaFormat.WEBMA.id;
+                break;
+            case "m4a":
+                preferredFormat = MediaFormat.M4A.id;
+                break;
+            default:
+                break;
+        }
+
+        for(int i = 0; i < info.audio_streams.size(); i++) {
+            if(info.audio_streams.get(i).format == preferredFormat) {
+                return i;
+            }
+        }
+
+        //todo: make this a proper error
+        Log.e(TAG, "FAILED to set audioStream value!");
+        return 0;
+    }
+
+    private void initSimilarVideos(final StreamInfo info) {
+        LinearLayout similarLayout = (LinearLayout) activity.findViewById(R.id.similar_streams_view);
+        for (final StreamPreviewInfo item : info.related_streams) {
+            similarLayout.addView(infoItemBuilder.buildView(similarLayout, item));
+        }
+        infoItemBuilder.setOnItemSelectedListener(new InfoItemBuilder.OnItemSelectedListener() {
+            @Override
+            public void selected(String url) {
+                openStreamUrl(url);
+            }
+        });
+    }
+
+    private void onErrorBlockedByGema() {
+        Button backgroundButton = (Button)
+                activity.findViewById(R.id.detail_stream_thumbnail_window_background_button);
+        ImageView thumbnailView = (ImageView) activity.findViewById(R.id.detail_thumbnail_view);
+
+        progressBar.setVisibility(View.GONE);
+        thumbnailView.setImageBitmap(BitmapFactory.decodeResource(
+                getResources(), R.drawable.gruese_die_gema));
+        backgroundButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Intent intent = new Intent();
+                intent.setAction(Intent.ACTION_VIEW);
+                intent.setData(Uri.parse(activity.getString(R.string.c3s_url)));
+                activity.startActivity(intent);
+            }
+        });
+
+        Toast.makeText(VideoItemDetailFragment.this.getActivity(),
+                R.string.blocked_by_gema, Toast.LENGTH_LONG).show();
+    }
+
+    private void onNotSpecifiedContentError() {
+        ImageView thumbnailView = (ImageView) activity.findViewById(R.id.detail_thumbnail_view);
+        progressBar.setVisibility(View.GONE);
+        thumbnailView.setImageBitmap(BitmapFactory.decodeResource(
+                getResources(), R.drawable.not_available_monkey));
+        Toast.makeText(activity, R.string.content_not_available, Toast.LENGTH_LONG)
+                .show();
+    }
+
+    private void onNotSpecifiedContentErrorWithMessage(int resourceId) {
+        ImageView thumbnailView = (ImageView) activity.findViewById(R.id.detail_thumbnail_view);
+        progressBar.setVisibility(View.GONE);
+        thumbnailView.setImageBitmap(BitmapFactory.decodeResource(
+                getResources(), R.drawable.not_available_monkey));
+        Toast.makeText(activity, resourceId, Toast.LENGTH_LONG)
+                .show();
+    }
+
+    private boolean useStream(VideoStream stream, Vector<VideoStream> streams) {
+        for(VideoStream i : streams) {
+            if(i.resolution.equals(stream.resolution)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        activity = (AppCompatActivity) getActivity();
+        showNextStreamItem = PreferenceManager.getDefaultSharedPreferences(getActivity())
+                .getBoolean(activity.getString(R.string.show_next_video_key), true);
+
+
+        StreamInfoWorker siw = StreamInfoWorker.getInstance();
+        siw.setOnStreamInfoReceivedListener(new StreamInfoWorker.OnStreamInfoReceivedListener() {
+            @Override
+            public void onReceive(StreamInfo info) {
+                updateInfo(info);
+            }
+
+            @Override
+            public void onError(int messageId) {
+                postNewErrorToast(messageId);
+            }
+
+            @Override
+            public void onReCaptchaException() {
+                Toast.makeText(getActivity(), R.string.recaptcha_request_toast,
+                        Toast.LENGTH_LONG).show();
+
+                // Starting ReCaptcha Challenge Activity
+                startActivityForResult(
+                        new Intent(getActivity(), ReCaptchaActivity.class),
+                        RECAPTCHA_REQUEST);
+            }
+
+            @Override
+            public void onBlockedByGemaError() {
+                onErrorBlockedByGema();
+            }
+
+            @Override
+            public void onContentErrorWithMessage(int messageId) {
+                onNotSpecifiedContentErrorWithMessage(messageId);
+            }
+
+            @Override
+            public void onContentError() {
+                onNotSpecifiedContentError();
+            }
+        });
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        rootView = inflater.inflate(R.layout.fragment_videoitem_detail, container, false);
+        progressBar = (ProgressBar) rootView.findViewById(R.id.detail_progress_bar);
+
+        actionBarHandler = new ActionBarHandler(activity);
+        actionBarHandler.setupNavMenu(activity);
+        if(onInvokeCreateOptionsMenuListener != null) {
+            onInvokeCreateOptionsMenuListener.createOptionsMenu();
+        }
+
+        return rootView;
+    }
+
+    @Override
+    public void onActivityCreated(Bundle savedInstanceBundle) {
+        super.onActivityCreated(savedInstanceBundle);
+        Activity a = getActivity();
+
+        infoItemBuilder = new InfoItemBuilder(a, a.findViewById(android.R.id.content));
+
+        if (android.os.Build.VERSION.SDK_INT < 18) {
+            playVideoButton = (FloatingActionButton) a.findViewById(R.id.play_video_button);
+        }
+        thumbnailWindowLayout = a.findViewById(R.id.detail_stream_thumbnail_window_layout);
+        Button backgroundButton = (Button)
+                a.findViewById(R.id.detail_stream_thumbnail_window_background_button);
+
+        // Sometimes when this fragment is not visible it still gets initiated
+        // then we must not try to access objects of this fragment.
+        // Otherwise the applications would crash.
+        if(backgroundButton != null) {
+            streamingServiceId = getArguments().getInt(STREAMING_SERVICE);
+            String videoUrl = getArguments().getString(VIDEO_URL);
+            StreamInfoWorker siw = StreamInfoWorker.getInstance();
+            siw.search(streamingServiceId, videoUrl, getActivity());
+
+            autoPlayEnabled = getArguments().getBoolean(AUTO_PLAY);
+
+            if(Build.VERSION.SDK_INT >= 18) {
+                ImageView thumbnailView = (ImageView) activity.findViewById(R.id.detail_thumbnail_view);
+                thumbnailView.addOnLayoutChangeListener(new View.OnLayoutChangeListener() {
+                    // This is used to synchronize the thumbnailWindowButton and the playVideoButton
+                    // inside the ScrollView with the actual size of the thumbnail.
+                    //todo: onLayoutChage sometimes not triggered
+                    // background buttons area seem to overlap the thumbnail view
+                    // So although you just clicked slightly beneath the thumbnail the action still
+                    // gets triggered.
+                    @Override
+                    public void onLayoutChange(View v, int left, int top, int right, int bottom,
+                                               int oldLeft, int oldTop, int oldRight, int oldBottom) {
+                        RelativeLayout.LayoutParams newWindowLayoutParams =
+                                (RelativeLayout.LayoutParams) thumbnailWindowLayout.getLayoutParams();
+                        newWindowLayoutParams.height = bottom - top;
+                        thumbnailWindowLayout.setLayoutParams(newWindowLayoutParams);
+
+                        //noinspection SuspiciousNameCombination
+                        initialThumbnailPos.set(top, left);
+
+                    }
+                });
+            }
+        }
+    }
+
+    public void playVideo(final StreamInfo info) {
+        // ----------- THE MAGIC MOMENT ---------------
+        VideoStream selectedVideoStream =
+                info.video_streams.get(actionBarHandler.getSelectedVideoStream());
+
+        if (PreferenceManager.getDefaultSharedPreferences(activity)
+                .getBoolean(activity.getString(R.string.use_external_video_player_key), false)) {
+
+            // External Player
+            Intent intent = new Intent();
+            try {
+                intent.setAction(Intent.ACTION_VIEW)
+                        .setDataAndType(Uri.parse(selectedVideoStream.url),
+                            MediaFormat.getMimeById(selectedVideoStream.format))
+                        .putExtra(Intent.EXTRA_TITLE, info.title)
+                        .putExtra("title", info.title);
+
+                activity.startActivity(intent);      // HERE !!!
+            } catch (Exception e) {
+                e.printStackTrace();
+                AlertDialog.Builder builder = new AlertDialog.Builder(activity);
+                builder.setMessage(R.string.no_player_found)
+                        .setPositiveButton(R.string.install, new DialogInterface.OnClickListener() {
+                            @Override
+                            public void onClick(DialogInterface dialog, int which) {
+                                Intent intent = new Intent()
+                                        .setAction(Intent.ACTION_VIEW)
+                                        .setData(Uri.parse(activity.getString(R.string.fdroid_vlc_url)));
+                                activity.startActivity(intent);
+                            }
+                        })
+                        .setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
+                            @Override
+                            public void onClick(DialogInterface dialog, int which) {
+
+                            }
+                        });
+                builder.create().show();
+            }
+        } else {
+            if (PreferenceManager.getDefaultSharedPreferences(activity)
+                    .getBoolean(activity.getString(R.string.use_exoplayer_key), false)) {
+
+                // exo player
+
+                if(info.dashMpdUrl != null && !info.dashMpdUrl.isEmpty()) {
+                    // try dash
+                    Intent intent = new Intent(activity, ExoPlayerActivity.class)
+                            .setData(Uri.parse(info.dashMpdUrl))
+                            .putExtra(ExoPlayerActivity.CONTENT_TYPE_EXTRA, Util.TYPE_DASH);
+                    startActivity(intent);
+                } else if((info.audio_streams != null  && !info.audio_streams.isEmpty()) &&
+                        (info.video_only_streams != null && !info.video_only_streams.isEmpty())) {
+                    // try smooth streaming
+
+                } else {
+                    //default streaming
+                    Intent intent = new Intent(activity, ExoPlayerActivity.class)
+                            .setDataAndType(Uri.parse(selectedVideoStream.url),
+                                MediaFormat.getMimeById(selectedVideoStream.format))
+                            .putExtra(ExoPlayerActivity.CONTENT_TYPE_EXTRA, Util.TYPE_OTHER);
+
+                    activity.startActivity(intent);      // HERE !!!
+                }
+                //-------------
+
+            } else {
+                // Internal Player
+                Intent intent = new Intent(activity, PlayVideoActivity.class)
+                        .putExtra(PlayVideoActivity.VIDEO_TITLE, info.title)
+                        .putExtra(PlayVideoActivity.STREAM_URL, selectedVideoStream.url)
+                        .putExtra(PlayVideoActivity.VIDEO_URL, info.webpage_url)
+                        .putExtra(PlayVideoActivity.START_POSITION, info.start_position);
+                activity.startActivity(intent);     //also HERE !!!
+            }
+        }
+
+        // --------------------------------------------
+    }
+
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        actionBarHandler.setupMenu(menu, inflater);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        return actionBarHandler.onItemSelected(item);
+    }
+
+    public void setOnInvokeCreateOptionsMenuListener(OnInvokeCreateOptionsMenuListener listener) {
+        this.onInvokeCreateOptionsMenuListener = listener;
+    }
+
+    private void postNewErrorToast(final int stringResource) {
+        Toast.makeText(VideoItemDetailFragment.this.getActivity(),
+                stringResource, Toast.LENGTH_LONG).show();
+    }
+
+    private void openStreamUrl(String url) {
+        Intent detailIntent = new Intent(activity, VideoItemDetailActivity.class);
+        detailIntent.putExtra(VideoItemDetailFragment.VIDEO_URL, url);
+        detailIntent.putExtra(
+                VideoItemDetailFragment.STREAMING_SERVICE, streamingServiceId);
+        activity.startActivity(detailIntent);
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        switch (requestCode) {
+            case RECAPTCHA_REQUEST:
+                if (resultCode == RESULT_OK) {
+                    String videoUrl = getArguments().getString(VIDEO_URL);
+                    StreamInfoWorker siw = StreamInfoWorker.getInstance();
+                    siw.search(streamingServiceId, videoUrl, getActivity());
+                } else {
+                    Log.d(TAG, "ReCaptcha failed");
+                }
+                break;
+
+            default:
+                Log.e(TAG, "Request code from activity not supported [" + requestCode + "]");
+                break;
+        }
+    }
+}

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

@@ -0,0 +1,280 @@
+package org.schabi.newpipe.download;
+
+import android.annotation.TargetApi;
+import android.app.AlertDialog;
+import android.app.FragmentTransaction;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.ServiceConnection;
+import android.content.SharedPreferences;
+import android.os.Bundle;
+import android.os.IBinder;
+import android.preference.PreferenceManager;
+import android.support.v4.app.NavUtils;
+import android.support.v7.app.ActionBar;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.Toolbar;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewTreeObserver;
+import android.widget.AdapterView;
+import android.widget.EditText;
+import android.widget.RadioButton;
+import android.widget.SeekBar;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import org.schabi.newpipe.report.ErrorActivity;
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.settings.SettingsActivity;
+
+import java.io.File;
+import java.util.Vector;
+
+import us.shandian.giga.get.DownloadManager;
+import us.shandian.giga.service.DownloadManagerService;
+import us.shandian.giga.ui.fragment.AllMissionsFragment;
+import us.shandian.giga.ui.fragment.MissionsFragment;
+import us.shandian.giga.util.CrashHandler;
+import us.shandian.giga.util.Utility;
+
+public class DownloadActivity extends AppCompatActivity implements AdapterView.OnItemClickListener{
+
+    public static final String INTENT_DOWNLOAD = "us.shandian.giga.intent.DOWNLOAD";
+
+    public static final String INTENT_LIST = "us.shandian.giga.intent.LIST";
+
+    private static final String TAG = DownloadActivity.class.toString();
+    public static final String THREADS = "threads";
+
+
+    private MissionsFragment mFragment;
+    private DownloadManager mManager;
+    private DownloadManagerService.DMBinder mBinder;
+
+    private String mPendingUrl;
+    private SharedPreferences mPrefs;
+
+    private ServiceConnection mConnection = new ServiceConnection() {
+
+        @Override
+        public void onServiceConnected(ComponentName p1, IBinder binder) {
+            mBinder = (DownloadManagerService.DMBinder) binder;
+            mManager = mBinder.getDownloadManager();
+        }
+
+        @Override
+        public void onServiceDisconnected(ComponentName p1) {
+
+        }
+    };
+
+    @Override
+    @TargetApi(21)
+    protected void onCreate(Bundle savedInstanceState) {
+        CrashHandler.init(this);
+        CrashHandler.register();
+
+        // Service
+        Intent i = new Intent();
+        i.setClass(this, DownloadManagerService.class);
+        startService(i);
+        bindService(i, mConnection, Context.BIND_AUTO_CREATE);
+
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_downloader);
+
+
+        //noinspection ConstantConditions
+
+        // its ok if this failes, we will catch that error later, and send it as report
+        ActionBar actionBar = getSupportActionBar();
+        actionBar.setDisplayHomeAsUpEnabled(true);
+        actionBar.setTitle(R.string.downloads_title);
+        actionBar.setDisplayShowTitleEnabled(true);
+
+        mPrefs = PreferenceManager.getDefaultSharedPreferences(this);
+
+        // Fragment
+        getWindow().getDecorView().getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
+            @Override
+            public void onGlobalLayout() {
+                updateFragments();
+                getWindow().getDecorView().getViewTreeObserver().removeGlobalOnLayoutListener(this);
+            }
+        });
+
+        // Intent
+        if (getIntent().getAction() != null && getIntent().getAction().equals(INTENT_DOWNLOAD)) {
+            mPendingUrl = getIntent().getData().toString();
+        }
+    }
+
+    @Override
+    protected void onNewIntent(Intent intent) {
+        super.onNewIntent(intent);
+
+        if (intent.getAction().equals(INTENT_DOWNLOAD)) {
+            mPendingUrl = intent.getData().toString();
+        }
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+
+        if (mPendingUrl != null) {
+            showUrlDialog();
+            mPendingUrl = null;
+        }
+    }
+
+    private void updateFragments() {
+
+        mFragment = new AllMissionsFragment();
+
+        getFragmentManager().beginTransaction()
+                .replace(R.id.frame, mFragment)
+                .setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE)
+                .commit();
+    }
+
+    private void showUrlDialog() {
+        // Create the view
+        LayoutInflater inflater = (LayoutInflater) getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+        View v = inflater.inflate(R.layout.dialog_url, null);
+        final EditText name = Utility.findViewById(v, R.id.file_name);
+        final TextView tCount = Utility.findViewById(v, R.id.threads_count);
+        final SeekBar threads = Utility.findViewById(v, R.id.threads);
+        final Toolbar toolbar = Utility.findViewById(v, R.id.toolbar);
+        final RadioButton audioButton = (RadioButton) Utility.findViewById(v, R.id.audio_button);
+
+
+        threads.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
+
+            @Override
+            public void onProgressChanged(SeekBar seekbar, int progress, boolean fromUser) {
+                tCount.setText(String.valueOf(progress + 1));
+            }
+
+            @Override
+            public void onStartTrackingTouch(SeekBar p1) {
+
+            }
+
+            @Override
+            public void onStopTrackingTouch(SeekBar p1) {
+
+            }
+
+        });
+
+        int def = mPrefs.getInt(THREADS, 4);
+        threads.setProgress(def - 1);
+        tCount.setText(String.valueOf(def));
+
+        name.setText(getIntent().getStringExtra("fileName"));
+
+        toolbar.setTitle(R.string.add);
+        toolbar.setNavigationIcon(R.drawable.ic_arrow_back_black_24dp);
+        toolbar.inflateMenu(R.menu.dialog_url);
+
+        // Show the dialog
+        final AlertDialog dialog = new AlertDialog.Builder(this)
+                .setCancelable(true)
+                .setView(v)
+                .create();
+
+        dialog.show();
+
+        toolbar.setNavigationOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                dialog.dismiss();
+            }
+        });
+
+        toolbar.setOnMenuItemClickListener(new Toolbar.OnMenuItemClickListener() {
+            @Override
+            public boolean onMenuItemClick(MenuItem item) {
+                if (item.getItemId() == R.id.okay) {
+                    String fName = name.getText().toString().trim();
+
+                    File f = new File(mManager.getLocation() + "/" + fName);
+
+                    if (f.exists()) {
+                        Toast.makeText(DownloadActivity.this, R.string.msg_exists, Toast.LENGTH_SHORT).show();
+                    } else {
+
+                        while (mBinder == null);
+
+                        int res = mManager.startMission(
+                                getIntent().getData().toString(),
+                                fName,
+                                audioButton.isChecked(),
+                                threads.getProgress() + 1);
+                        mBinder.onMissionAdded(mManager.getMission(res));
+                        mFragment.notifyChange();
+
+                        mPrefs.edit().putInt(THREADS, threads.getProgress() + 1).commit();
+                        mPendingUrl = null;
+                        dialog.dismiss();
+                    }
+
+                    return true;
+                } else {
+                    return false;
+                }
+            }
+        });
+
+    }
+
+    @Override
+    public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+
+    }
+
+    public boolean onCreateOptionsMenu(Menu menu) {
+        super.onCreateOptionsMenu(menu);
+        MenuInflater inflater = getMenuInflater();
+
+        inflater.inflate(R.menu.download_menu, menu);
+
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        int id = item.getItemId();
+
+        switch (id) {
+            case android.R.id.home: {
+                Intent intent = new Intent(this, org.schabi.newpipe.MainActivity.class);
+                intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+                NavUtils.navigateUpTo(this, intent);
+                return true;
+            }
+            case R.id.action_settings: {
+                Intent intent = new Intent(this, SettingsActivity.class);
+                startActivity(intent);
+                return true;
+            }
+            case R.id.action_report_error: {
+                ErrorActivity.reportError(DownloadActivity.this, new Vector<Throwable>(),
+                        null, null,
+                        ErrorActivity.ErrorInfo.make(ErrorActivity.USER_REPORT,
+                                null,
+                                "user_report", R.string.user_report));
+                return true;
+            }
+            default:
+                return mFragment.onOptionsItemSelected(item) ||
+                        super.onOptionsItemSelected(item);
+        }
+    }
+}

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

@@ -0,0 +1,276 @@
+package org.schabi.newpipe.download;
+
+import android.Manifest;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.ServiceConnection;
+import android.content.pm.PackageManager;
+import android.net.Uri;
+import android.os.Bundle;
+import android.os.IBinder;
+import android.support.annotation.Nullable;
+import android.support.v4.app.ActivityCompat;
+import android.support.v4.app.DialogFragment;
+import android.support.v4.content.ContextCompat;
+import android.support.v7.widget.Toolbar;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.EditText;
+import android.widget.RadioButton;
+import android.widget.SeekBar;
+import android.widget.TextView;
+
+import org.schabi.newpipe.App;
+import org.schabi.newpipe.R;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
+import us.shandian.giga.get.DownloadManager;
+import us.shandian.giga.get.DownloadMission;
+import us.shandian.giga.service.DownloadManagerService;
+
+
+/**
+ * Created by Christian Schabesberger on 21.09.15.
+ *
+ * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
+ * DownloadDialog.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 DownloadDialog extends DialogFragment {
+    private static final String TAG = DialogFragment.class.getName();
+
+    public static final String TITLE = "name";
+    public static final String FILE_SUFFIX_AUDIO = "file_suffix_audio";
+    public static final String FILE_SUFFIX_VIDEO = "file_suffix_video";
+    public static final String AUDIO_URL = "audio_url";
+    public static final String VIDEO_URL = "video_url";
+
+    private DownloadManager mManager;
+    private DownloadManagerService.DMBinder mBinder;
+
+    private ServiceConnection mConnection = new ServiceConnection() {
+
+        @Override
+        public void onServiceConnected(ComponentName p1, IBinder binder) {
+            mBinder = (DownloadManagerService.DMBinder) binder;
+            mManager = mBinder.getDownloadManager();
+        }
+
+        @Override
+        public void onServiceDisconnected(ComponentName p1) {
+
+        }
+    };
+
+
+    public DownloadDialog() {
+
+    }
+
+    public static DownloadDialog newInstance(Bundle args)
+    {
+        DownloadDialog dialog = new DownloadDialog();
+        dialog.setArguments(args);
+        dialog.setStyle(DialogFragment.STYLE_NO_TITLE, 0);
+        return dialog;
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+
+        if(ContextCompat.checkSelfPermission(this.getContext(),Manifest.permission.WRITE_EXTERNAL_STORAGE)!= PackageManager.PERMISSION_GRANTED)
+            ActivityCompat.requestPermissions(getActivity(),new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE},0);
+
+        Intent i = new Intent();
+        i.setClass(getContext(), DownloadManagerService.class);
+        getContext().startService(i);
+        getContext().bindService(i, mConnection, Context.BIND_AUTO_CREATE);
+
+
+        return inflater.inflate(R.layout.dialog_url, container);
+    }
+
+    @Override
+    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+
+        Bundle arguments = getArguments();
+        final Toolbar toolbar = (Toolbar) view.findViewById(R.id.toolbar);
+        final EditText name = (EditText) view.findViewById(R.id.file_name);
+        final TextView tCount = (TextView) view.findViewById(R.id.threads_count);
+        final SeekBar threads = (SeekBar) view.findViewById(R.id.threads);
+
+        toolbar.setTitle(R.string.download_dialog_title);
+        toolbar.setNavigationIcon(R.drawable.ic_arrow_back_black_24dp);
+        toolbar.inflateMenu(R.menu.dialog_url);
+        toolbar.setNavigationOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                getDialog().dismiss();
+            }
+        });
+
+        threads.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
+
+            @Override
+            public void onProgressChanged(SeekBar seekbar, int progress, boolean fromUser) {
+                tCount.setText(String.valueOf(progress + 1));
+            }
+
+            @Override
+            public void onStartTrackingTouch(SeekBar p1) {
+
+            }
+
+            @Override
+            public void onStopTrackingTouch(SeekBar p1) {
+
+            }
+        });
+
+        checkDownloadOptions();
+
+        //int def = mPrefs.getInt("threads", 4);
+        int def = 3;
+        threads.setProgress(def - 1);
+        tCount.setText(String.valueOf(def));
+
+        name.setText(createFileName(arguments.getString(TITLE)));
+
+
+        toolbar.setOnMenuItemClickListener(new Toolbar.OnMenuItemClickListener() {
+            @Override
+            public boolean onMenuItemClick(MenuItem item) {
+                if (item.getItemId() == R.id.okay) {
+                    download();
+                    return true;
+                } else {
+                    return false;
+                }
+            }
+        });
+
+    }
+
+    protected void checkDownloadOptions(){
+        View view = getView();
+        Bundle arguments = getArguments();
+        RadioButton audioButton = (RadioButton) view.findViewById(R.id.audio_button);
+        RadioButton videoButton = (RadioButton) view.findViewById(R.id.video_button);
+
+        if(arguments.getString(AUDIO_URL) == null) {
+            audioButton.setVisibility(View.GONE);
+            videoButton.setChecked(true);
+        } else if(arguments.getString(VIDEO_URL) == null) {
+            videoButton.setVisibility(View.GONE);
+            audioButton.setChecked(true);
+        }
+    }
+
+    /**
+     * #143 #44 #42 #22: make shure that the filename does not contain illegal chars.
+     * This should fix some of the "cannot download" problems.
+     * */
+    private String createFileName(String fName) {
+        // from http://eng-przemelek.blogspot.de/2009/07/how-to-create-valid-file-name.html
+
+        List<String> forbiddenCharsPatterns = new ArrayList<> ();
+        forbiddenCharsPatterns.add("[:]+"); // Mac OS, but it looks that also Windows XP
+        forbiddenCharsPatterns.add("[\\*\"/\\\\\\[\\]\\:\\;\\|\\=\\,]+");  // Windows
+        forbiddenCharsPatterns.add("[^\\w\\d\\.]+");  // last chance... only latin letters and digits
+        String nameToTest = fName;
+        for (String pattern : forbiddenCharsPatterns) {
+            nameToTest = nameToTest.replaceAll(pattern, "_");
+        }
+        return nameToTest;
+    }
+
+
+    //download audio, video or both?
+    private void download()
+    {
+        View view = getView();
+        Bundle arguments = getArguments();
+        final EditText name = (EditText) view.findViewById(R.id.file_name);
+        final SeekBar threads = (SeekBar) view.findViewById(R.id.threads);
+        RadioButton audioButton = (RadioButton) view.findViewById(R.id.audio_button);
+        RadioButton videoButton = (RadioButton) view.findViewById(R.id.video_button);
+
+        String fName = name.getText().toString().trim();
+
+        // todo: add timeout? would be bad if the thread gets locked dueto this.
+        while (mBinder == null);
+
+        if(audioButton.isChecked()){
+            int res = mManager.startMission(
+                    arguments.getString(AUDIO_URL),
+                    fName + arguments.getString(FILE_SUFFIX_AUDIO),
+                    audioButton.isChecked(),
+                    threads.getProgress() + 1);
+            DownloadMission mission = mManager.getMission(res);
+            mBinder.onMissionAdded(mission);
+            // add download listener to allow media scan notification
+            DownloadListener listener = new DownloadListener(getContext(), mission);
+            mission.addListener(listener);
+        }
+
+        if(videoButton.isChecked()){
+            int res = mManager.startMission(
+                    arguments.getString(VIDEO_URL),
+                    fName + arguments.getString(FILE_SUFFIX_VIDEO),
+                    audioButton.isChecked(),
+                    threads.getProgress() + 1);
+            DownloadMission mission = mManager.getMission(res);
+            mBinder.onMissionAdded(mission);
+            // add download listener to allow media scan notification
+            DownloadListener listener = new DownloadListener(getContext(), mission);
+            mission.addListener(listener);
+        }
+        getDialog().dismiss();
+
+    }
+
+    private void download(String url, String title,
+                          String fileSuffix, File downloadDir, Context context) {
+
+        File saveFilePath = new File(downloadDir,createFileName(title) + fileSuffix);
+
+        long id = 0;
+
+        Log.i(TAG,"Started downloading '" + url +
+                "' => '" + saveFilePath + "' #" + id);
+
+        if (App.isUsingTor()) {
+            //if using Tor, do not use DownloadManager because the proxy cannot be set
+            //we'll see later
+            FileDownloader.downloadFile(getContext(), url, saveFilePath, title);
+        } else {
+            Intent intent = new Intent(getContext(), DownloadActivity.class);
+            intent.setAction(DownloadActivity.INTENT_DOWNLOAD);
+            intent.setData(Uri.parse(url));
+            intent.putExtra("fileName", createFileName(title) + fileSuffix);
+            startActivity(intent);
+        }
+    }
+}

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

@@ -0,0 +1,62 @@
+package org.schabi.newpipe.download;
+
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+
+import us.shandian.giga.get.DownloadMission;
+import us.shandian.giga.get.DownloadMission.MissionListener;
+
+/**
+ * Created by erwin on 06.11.16.
+ *
+ * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
+ * DownloadListener.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/>.
+ */
+
+class DownloadListener implements MissionListener
+{
+    DownloadMission mMission;
+    Context mContext;
+
+    public DownloadListener(Context context, DownloadMission mission)
+    {
+        super();
+        mMission = mission;
+        mContext = context;
+    }
+
+    @Override
+    public void onProgressUpdate(long done, long total)
+    {
+        // do nothing special ...
+    }
+
+    @Override
+    public void onFinish()
+    {
+        // notify media scanner on downloaded media file ...
+        mContext.sendBroadcast(new Intent(Intent.ACTION_MEDIA_SCANNER_SCAN_FILE,
+                                          Uri.parse( "file://" + mMission.location
+                                                     + "/" + mMission.name)));
+    }
+
+    @Override
+    public void onError(int errCode)
+    {
+        // do nothing special ...
+    }
+}

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

@@ -0,0 +1,165 @@
+package org.schabi.newpipe.download;
+
+import android.app.NotificationManager;
+import android.content.Context;
+import android.graphics.drawable.BitmapDrawable;
+import android.graphics.drawable.Drawable;
+import android.os.AsyncTask;
+import android.support.v4.app.NotificationCompat;
+import android.util.Log;
+
+import org.schabi.newpipe.R;
+
+import java.io.BufferedInputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.HttpURLConnection;
+
+import javax.net.ssl.HttpsURLConnection;
+
+import info.guardianproject.netcipher.NetCipher;
+
+/**
+ * Created by Christian Schabesberger on 14.08.15.
+ *
+ * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
+ * FileDownloader.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/>.
+ */
+
+
+// TODO: FOR HEVEN SAKE !!! DO NOT SIMPLY USE ASYNCTASK. MAKE THIS A PROPER SERVICE !!!
+public class FileDownloader extends AsyncTask<Void, Integer, Void> {
+    public static final String TAG = "FileDownloader";
+
+
+    private NotificationManager nm;
+    private NotificationCompat.Builder builder;
+    private int notifyId = 0x1234;
+    private int fileSize = 0xffffffff;
+
+    private final Context context;
+    private final String fileURL;
+    private final File saveFilePath;
+    private final String title;
+
+    private final String debugContext;
+
+    public FileDownloader(Context context, String fileURL, File saveFilePath, String title) {
+        this.context = context;
+        this.fileURL = fileURL;
+        this.saveFilePath = saveFilePath;
+        this.title = title;
+
+        this.debugContext = "'" + fileURL +
+                "' => '" + saveFilePath + "'";
+    }
+
+    /**
+     * Downloads a file from a URL in the background using an {@link AsyncTask}.
+     *
+     * @param fileURL      HTTP URL of the file to be downloaded
+     * @param saveFilePath path of the directory to save the file
+     * @param title
+     * @throws IOException
+     */
+    public static void downloadFile(final Context context, final String fileURL, final File saveFilePath, String title) {
+        new FileDownloader(context, fileURL, saveFilePath, title).execute();
+    }
+
+    /** AsyncTask impl: executed in gui thread */
+    @Override
+    protected void onPreExecute() {
+        super.onPreExecute();
+        nm = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
+        Drawable icon = context.getResources().getDrawable(R.mipmap.ic_launcher);
+        builder = new NotificationCompat.Builder(context)
+                .setSmallIcon(android.R.drawable.stat_sys_download)
+                .setLargeIcon(((BitmapDrawable) icon).getBitmap())
+                .setContentTitle(saveFilePath.getName())
+                .setContentText(saveFilePath.getAbsolutePath())
+                .setProgress(fileSize, 0, false);
+        nm.notify(notifyId, builder.build());
+    }
+
+    /** AsyncTask impl: executed in background thread does the download */
+    @Override
+    protected Void doInBackground(Void... voids) {
+        HttpsURLConnection con = null;
+        InputStream inputStream = null;
+        FileOutputStream outputStream = null;
+        try {
+            con = NetCipher.getHttpsURLConnection(fileURL);
+            int responseCode = con.getResponseCode();
+
+            // always check HTTP response code first
+            if (responseCode == HttpURLConnection.HTTP_OK) {
+                fileSize = con.getContentLength();
+                inputStream = new BufferedInputStream(con.getInputStream());
+                outputStream = new FileOutputStream(saveFilePath);
+
+                int bufferSize = 8192;
+                int downloaded = 0;
+
+                int bytesRead = -1;
+                byte[] buffer = new byte[bufferSize];
+                while ((bytesRead = inputStream.read(buffer)) != -1) {
+                    outputStream.write(buffer, 0, bytesRead);
+                    downloaded += bytesRead;
+                    if (downloaded % 50000 < bufferSize) {
+                        publishProgress(downloaded);
+                    }
+                }
+
+                publishProgress(bufferSize);
+
+            } else {
+                Log.i(TAG, "No file to download. Server replied HTTP code: " + responseCode);
+            }
+        } catch (IOException e) {
+            Log.e(TAG, "No file to download. Server replied HTTP code: ", e);
+            e.printStackTrace();
+        } finally {
+            try {
+                if (outputStream != null) {
+                    outputStream.close();
+                }
+                if (inputStream != null) {
+                    inputStream.close();
+                }
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+            if (con != null) {
+                con.disconnect();
+            }
+        }
+        return null;
+    }
+
+    @Override
+    protected void onProgressUpdate(Integer... progress) {
+        builder.setProgress(fileSize, progress[0], false);
+        nm.notify(notifyId, builder.build());
+    }
+
+    @Override
+    protected void onPostExecute(Void aVoid) {
+        super.onPostExecute(aVoid);
+        nm.cancel(notifyId);
+    }
+}

app/src/main/java/org/schabi/newpipe/extractor/AbstractStreamInfo.java

@@ -0,0 +1,41 @@
+package org.schabi.newpipe.extractor;
+
+/**
+ * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
+ * AbstractStreamInfo.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/>.
+ */
+
+/**Common properties between StreamInfo and StreamPreviewInfo.*/
+public abstract class AbstractStreamInfo {
+    public static enum StreamType {
+        NONE,   // placeholder to check if stream type was checked or not
+        VIDEO_STREAM,
+        AUDIO_STREAM,
+        LIVE_STREAM,
+        AUDIO_LIVE_STREAM,
+        FILE
+    }
+
+    public StreamType stream_type;
+    public int service_id = -1;
+    public String id = "";
+    public String title = "";
+    public String uploader = "";
+    public String thumbnail_url = "";
+    public String webpage_url = "";
+    public String upload_date = "";
+    public long view_count = -1;
+}

app/src/main/java/org/schabi/newpipe/extractor/DashMpdParser.java

@@ -0,0 +1,113 @@
+package org.schabi.newpipe.extractor;
+
+import android.util.Xml;
+
+import org.schabi.newpipe.extractor.exceptions.ParsingException;
+import org.schabi.newpipe.extractor.exceptions.ReCaptchaException;
+import org.schabi.newpipe.extractor.stream_info.AudioStream;
+import org.xmlpull.v1.XmlPullParser;
+
+import java.io.IOException;
+import java.io.StringReader;
+import java.util.List;
+import java.util.Vector;
+
+/**
+ * Created by Christian Schabesberger on 02.02.16.
+ *
+ * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
+ * DashMpdParser.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 DashMpdParser {
+
+    private DashMpdParser() {
+    }
+
+    static class DashMpdParsingException extends ParsingException {
+        DashMpdParsingException(String message, Exception e) {
+            super(message, e);
+        }
+    }
+
+    public static List<AudioStream> getAudioStreams(String dashManifestUrl)
+            throws DashMpdParsingException, ReCaptchaException {
+        String dashDoc;
+        Downloader downloader = NewPipe.getDownloader();
+        try {
+            dashDoc = downloader.download(dashManifestUrl);
+        } catch(IOException ioe) {
+            throw new DashMpdParsingException("Could not get dash mpd: " + dashManifestUrl, ioe);
+        } catch (ReCaptchaException e) {
+            throw new ReCaptchaException("reCaptcha Challenge needed");
+        }
+        Vector<AudioStream> audioStreams = new Vector<>();
+        try {
+            XmlPullParser parser = Xml.newPullParser();
+            parser.setInput(new StringReader(dashDoc));
+            String tagName = "";
+            String currentMimeType = "";
+            int currentBandwidth = -1;
+            int currentSamplingRate = -1;
+            boolean currentTagIsBaseUrl = false;
+            for(int eventType = parser.getEventType();
+                eventType != XmlPullParser.END_DOCUMENT;
+                eventType = parser.next() ) {
+                switch(eventType) {
+                    case XmlPullParser.START_TAG:
+                        tagName = parser.getName();
+                        if(tagName.equals("AdaptationSet")) {
+                            currentMimeType = parser.getAttributeValue(XmlPullParser.NO_NAMESPACE, "mimeType");
+                        } else if(tagName.equals("Representation") && currentMimeType.contains("audio")) {
+                            currentBandwidth = Integer.parseInt(
+                                    parser.getAttributeValue(XmlPullParser.NO_NAMESPACE, "bandwidth"));
+                            currentSamplingRate = Integer.parseInt(
+                                    parser.getAttributeValue(XmlPullParser.NO_NAMESPACE, "audioSamplingRate"));
+                        } else if(tagName.equals("BaseURL")) {
+                            currentTagIsBaseUrl = true;
+                        }
+                        break;
+
+                    case XmlPullParser.TEXT:
+                        // actual stream tag
+                        if(currentTagIsBaseUrl &&
+                                (currentMimeType.contains("audio"))) {
+                            int format = -1;
+                            if(currentMimeType.equals(MediaFormat.WEBMA.mimeType)) {
+                                format = MediaFormat.WEBMA.id;
+                            } else if(currentMimeType.equals(MediaFormat.M4A.mimeType)) {
+                                format = MediaFormat.M4A.id;
+                            }
+                            audioStreams.add(new AudioStream(parser.getText(),
+                                    format, currentBandwidth, currentSamplingRate));
+                        }
+                        break;
+
+                    case XmlPullParser.END_TAG:
+                        if(tagName.equals("AdaptationSet")) {
+                            currentMimeType = "";
+                        } else if(tagName.equals("BaseURL")) {
+                            currentTagIsBaseUrl = false;
+                        }
+                        break;
+                }
+            }
+        } catch(Exception e) {
+            throw new DashMpdParsingException("Could not parse Dash mpd", e);
+        }
+        return audioStreams;
+    }
+}

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

@@ -0,0 +1,52 @@
+package org.schabi.newpipe.extractor;
+
+import org.schabi.newpipe.extractor.exceptions.ReCaptchaException;
+
+import java.io.IOException;
+import java.util.Map;
+
+/**
+ * Created by Christian Schabesberger on 28.01.16.
+ *
+ * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
+ * Downloader.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 interface Downloader {
+
+    /**Download the text file at the supplied URL as in download(String),
+     * but set the HTTP header field "Accept-Language" to the supplied string.
+     * @param siteUrl the URL of the text file to return the contents of
+     * @param language the language (usually a 2-character code) to set as the preferred language
+     * @return the contents of the specified text file
+     * @throws IOException*/
+    String download(String siteUrl, String language) throws IOException, ReCaptchaException;
+
+    /**Download the text file at the supplied URL as in download(String),
+     * but set the HTTP header field "Accept-Language" to the supplied string.
+     * @param siteUrl the URL of the text file to return the contents of
+     * @param customProperties set request header properties
+     * @return the contents of the specified text file
+     * @throws IOException*/
+    String download(String siteUrl, Map<String, String> customProperties) throws IOException, ReCaptchaException;
+
+    /**Download (via HTTP) the text file located at the supplied URL, and return its contents.
+     * Primarily intended for downloading web pages.
+     * @param siteUrl the URL of the text file to download
+     * @return the contents of the specified text file
+     * @throws IOException*/
+    String download(String siteUrl) throws IOException, ReCaptchaException;
+}

app/src/main/java/org/schabi/newpipe/extractor/MediaFormat.java

@@ -1,4 +1,4 @@
-package org.schabi.newpipe.services;
+package org.schabi.newpipe.extractor;
 
 /**
  * Created by Adam Howard on 08/11/15.
@@ -6,7 +6,7 @@ package org.schabi.newpipe.services;
  * Copyright (c) Christian Schabesberger <chris.schabesberger@mailbox.org>
  *     and Adam Howard <achdisposable1@gmail.com> 2015
  *
- * VideoListAdapter.java is part of NewPipe.
+ * MediaFormat.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
@@ -25,10 +25,12 @@ package org.schabi.newpipe.services;
 /**Static data about various media formats support by Newpipe, eg mime type, extension*/
 
 public enum MediaFormat {
+    //video and audio combined formats
     //           id      name    suffix  mime type
     MPEG_4      (0x0,   "MPEG-4", "mp4", "video/mp4"),
     v3GPP       (0x1,   "3GPP",   "3gp", "video/3gpp"),
     WEBM        (0x2,   "WebM",  "webm", "video/webm"),
+    // audio formats
     M4A         (0x3,   "m4a",   "m4a",  "audio/mp4"),
     WEBMA       (0x4,   "WebM",  "webm", "audio/webm");
 

app/src/main/java/org/schabi/newpipe/extractor/NewPipe.java

@@ -0,0 +1,82 @@
+package org.schabi.newpipe.extractor;
+
+import org.schabi.newpipe.extractor.exceptions.ExtractionException;
+import org.schabi.newpipe.extractor.services.youtube.YoutubeService;
+
+/**
+ * Created by Christian Schabesberger on 23.08.15.
+ *
+ * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
+ * NewPipe.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/>.
+ */
+
+/**Provides access to the video streaming services supported by NewPipe.
+ * Currently only Youtube until the API becomes more stable.*/
+
+@SuppressWarnings("ALL")
+public class NewPipe {
+
+    private NewPipe() {
+    }
+
+    private static final String TAG = NewPipe.class.toString();
+
+    private static final StreamingService[] serviceList = {
+        new YoutubeService(0)
+    };
+
+    private static Downloader downloader = null;
+
+    public static StreamingService[] getServices() {
+        return serviceList;
+    }
+    public static StreamingService getService(int serviceId)throws ExtractionException {
+        for(StreamingService s : serviceList) {
+            if(s.getServiceId() == serviceId) {
+                return s;
+            }
+        }
+        throw new ExtractionException("Service not known: " + Integer.toString(serviceId));
+    }
+    public static StreamingService getService(String serviceName) throws ExtractionException {
+        return serviceList[getIdOfService(serviceName)];
+    }
+    public static String getNameOfService(int id) {
+        try {
+            return getService(id).getServiceInfo().name;
+        } catch (Exception e) {
+            System.err.println("Service id not known");
+            e.printStackTrace();
+            return "";
+        }
+    }
+    public static int getIdOfService(String serviceName) throws ExtractionException {
+        for(int i = 0; i < serviceList.length; i++) {
+            if(serviceList[i].getServiceInfo().name.equals(serviceName)) {
+                return i;
+            }
+        }
+        throw new ExtractionException("Error: Service " + serviceName + " not known.");
+    }
+
+    public static void init(Downloader d) {
+        downloader = d;
+    }
+
+    public static Downloader getDownloader() {
+        return downloader;
+    }
+}

app/src/main/java/org/schabi/newpipe/extractor/Parser.java

@@ -0,0 +1,69 @@
+package org.schabi.newpipe.extractor;
+
+import org.schabi.newpipe.extractor.exceptions.ParsingException;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * Created by Christian Schabesberger on 02.02.16.
+ *
+ * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
+ * Parser.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/>.
+ */
+
+/** avoid using regex !!! */
+public class Parser {
+
+    private Parser() {
+    }
+
+    public static class RegexException extends ParsingException {
+        public RegexException(String message) {
+            super(message);
+        }
+    }
+
+    public static String matchGroup1(String pattern, String input) throws RegexException {
+        Pattern pat = Pattern.compile(pattern);
+        Matcher mat = pat.matcher(input);
+        boolean foundMatch = mat.find();
+        if (foundMatch) {
+            return mat.group(1);
+        }
+        else {
+            //Log.e(TAG, "failed to find pattern \""+pattern+"\" inside of \""+input+"\"");
+            throw new RegexException("failed to find pattern \""+pattern+" inside of "+input+"\"");
+        }
+    }
+
+    public static Map<String, String> compatParseMap(final String input) throws UnsupportedEncodingException {
+        Map<String, String> map = new HashMap<>();
+        for(String arg : input.split("&")) {
+            String[] splitArg = arg.split("=");
+            if(splitArg.length > 1) {
+                map.put(splitArg[0], URLDecoder.decode(splitArg[1], "UTF-8"));
+            } else {
+                map.put(splitArg[0], "");
+            }
+        }
+        return map;
+    }
+}

app/src/main/java/org/schabi/newpipe/extractor/StreamingService.java

@@ -0,0 +1,56 @@
+package org.schabi.newpipe.extractor;
+
+import org.schabi.newpipe.extractor.channel.ChannelExtractor;
+import org.schabi.newpipe.extractor.exceptions.ExtractionException;
+import org.schabi.newpipe.extractor.search.SearchEngine;
+import org.schabi.newpipe.extractor.search.SuggestionExtractor;
+import org.schabi.newpipe.extractor.stream_info.StreamExtractor;
+
+import java.io.IOException;
+
+/**
+ * Created by Christian Schabesberger on 23.08.15.
+ *
+ * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
+ * StreamingService.java is part of NewPipe.
+ *
+ * NewPipe is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * NewPipe is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+public abstract class StreamingService {
+    public class ServiceInfo {
+        public String name = "";
+    }
+
+    private int serviceId;
+
+    public StreamingService(int id) {
+        serviceId = id;
+    }
+
+    public abstract ServiceInfo getServiceInfo();
+
+    public abstract StreamExtractor getExtractorInstance(String url)
+            throws IOException, ExtractionException;
+    public abstract SearchEngine getSearchEngineInstance();
+    public abstract UrlIdHandler getUrlIdHandlerInstance();
+    public abstract UrlIdHandler getChannelUrlIdHandlerInstance();
+    public abstract ChannelExtractor getChannelExtractorInstance(String url, int page)
+            throws ExtractionException, IOException;
+    public abstract SuggestionExtractor getSuggestionExtractorInstance();
+
+    public final int getServiceId() {
+        return serviceId;
+    }
+}

app/src/main/java/org/schabi/newpipe/extractor/UrlIdHandler.java

@@ -1,10 +1,12 @@
-package org.schabi.newpipe.services;
+package org.schabi.newpipe.extractor;
+
+import org.schabi.newpipe.extractor.exceptions.ParsingException;
 
 /**
- * Created by Christian Schabesberger on 23.08.15.
+ * Created by Christian Schabesberger on 26.07.16.
  *
- * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
- * StreamingService.java is part of NewPipe.
+ * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
+ * UrlIdHandler.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
@@ -20,16 +22,13 @@ package org.schabi.newpipe.services;
  * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-public interface StreamingService {
-    class ServiceInfo {
-        public String name = "";
-    }
-    ServiceInfo getServiceInfo();
-    VideoExtractor getExtractorInstance(String url);
-    SearchEngine getSearchEngineInstance();
+public interface UrlIdHandler {
+    String getUrl(String videoId);
+    String getId(String siteUrl) throws ParsingException;
+    String cleanUrl(String siteUrl) throws ParsingException;
 
     /**When a VIEW_ACTION is caught this function will test if the url delivered within the calling
-    Intent was meant to be watched with this Service.
-    Return false if this service shall not allow to be called through ACTIONs.*/
+     Intent was meant to be watched with this Service.
+     Return false if this service shall not allow to be called through ACTIONs.*/
     boolean acceptUrl(String videoUrl);
 }

app/src/main/java/org/schabi/newpipe/extractor/channel/ChannelExtractor.java

@@ -0,0 +1,61 @@
+package org.schabi.newpipe.extractor.channel;
+
+import org.schabi.newpipe.extractor.UrlIdHandler;
+import org.schabi.newpipe.extractor.exceptions.ExtractionException;
+import org.schabi.newpipe.extractor.exceptions.ParsingException;
+import org.schabi.newpipe.extractor.stream_info.StreamPreviewInfoCollector;
+
+import java.io.IOException;
+
+/**
+ * Created by Christian Schabesberger on 25.07.16.
+ *
+ * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
+ * ChannelExtractor.java is part of NewPipe.
+ *
+ * NewPipe is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * NewPipe is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+public abstract class ChannelExtractor {
+    private int serviceId;
+    private String url;
+    private UrlIdHandler urlIdHandler;
+    private StreamPreviewInfoCollector previewInfoCollector;
+    private int page = -1;
+
+    public ChannelExtractor(UrlIdHandler urlIdHandler, String url, int page, int serviceId)
+            throws ExtractionException, IOException {
+        this.url = url;
+        this.page = page;
+        this.serviceId = serviceId;
+        this.urlIdHandler = urlIdHandler;
+        previewInfoCollector = new StreamPreviewInfoCollector(urlIdHandler, serviceId);
+    }
+
+    public String getUrl() { return url; }
+    public UrlIdHandler getUrlIdHandler() { return urlIdHandler; }
+    public StreamPreviewInfoCollector getStreamPreviewInfoCollector() {
+        return previewInfoCollector;
+    }
+
+    public abstract String getChannelName() throws ParsingException;
+    public abstract String getAvatarUrl() throws ParsingException;
+    public abstract String getBannerUrl() throws ParsingException;
+    public abstract String getFeedUrl() throws ParsingException;
+    public abstract StreamPreviewInfoCollector getStreams() throws ParsingException;
+    public abstract boolean hasNextPage() throws ParsingException;
+    public int getServiceId() {
+        return serviceId;
+    }
+}

app/src/main/java/org/schabi/newpipe/extractor/channel/ChannelInfo.java

@@ -0,0 +1,81 @@
+package org.schabi.newpipe.extractor.channel;
+
+import org.schabi.newpipe.extractor.exceptions.ParsingException;
+import org.schabi.newpipe.extractor.stream_info.StreamPreviewInfo;
+import org.schabi.newpipe.extractor.stream_info.StreamPreviewInfoCollector;
+
+import java.util.List;
+import java.util.Vector;
+
+/**
+ * Created by Christian Schabesberger on 31.07.16.
+ *
+ * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
+ * ChannelInfo.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 ChannelInfo {
+
+
+    public void addException(Exception e) {
+        errors.add(e);
+    }
+
+    public static ChannelInfo getInfo(ChannelExtractor extractor)
+        throws ParsingException {
+        ChannelInfo info = new ChannelInfo();
+
+        // importand data
+        info.service_id = extractor.getServiceId();
+        info.channel_name = extractor.getChannelName();
+        info.hasNextPage = extractor.hasNextPage();
+
+        try {
+            info.avatar_url = extractor.getAvatarUrl();
+        } catch (Exception e) {
+            info.errors.add(e);
+        }
+        try {
+            info.banner_url = extractor.getBannerUrl();
+        } catch (Exception e) {
+            info.errors.add(e);
+        }
+        try {
+            info.feed_url = extractor.getFeedUrl();
+        } catch(Exception e) {
+            info.errors.add(e);
+        }
+        try {
+            StreamPreviewInfoCollector c = extractor.getStreams();
+            info.related_streams = c.getItemList();
+            info.errors.addAll(c.getErrors());
+        } catch(Exception e) {
+            info.errors.add(e);
+        }
+
+        return info;
+    }
+
+    public int service_id = -1;
+    public String channel_name = "";
+    public String avatar_url = "";
+    public String banner_url = "";
+    public String feed_url = "";
+    public List<StreamPreviewInfo> related_streams = null;
+    public boolean hasNextPage = false;
+
+    public List<Throwable> errors = new Vector<>();
+}

app/src/main/java/org/schabi/newpipe/extractor/exceptions/ExtractionException.java

@@ -0,0 +1,33 @@
+package org.schabi.newpipe.extractor.exceptions;
+
+/**
+ * Created by Christian Schabesberger on 30.01.16.
+ *
+ * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
+ * ExtractionException.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 ExtractionException extends Exception {
+    public ExtractionException(String message) {
+        super(message);
+    }
+    public ExtractionException(Throwable cause) {
+        super(cause);
+    }
+    public ExtractionException(String message, Throwable cause) {
+        super(message, cause);
+    }
+}

app/src/main/java/org/schabi/newpipe/extractor/exceptions/FoundAdException.java

@@ -0,0 +1,30 @@
+package org.schabi.newpipe.extractor.exceptions;
+
+/**
+ * Created by Christian Schabesberger on 12.09.16.
+ *
+ * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
+ * FoundAdException.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 FoundAdException extends ParsingException {
+    public FoundAdException(String message) {
+        super(message);
+    }
+    public FoundAdException(String message, Throwable cause) {
+        super(message, cause);
+    }
+}

app/src/main/java/org/schabi/newpipe/extractor/exceptions/ParsingException.java

@@ -0,0 +1,31 @@
+package org.schabi.newpipe.extractor.exceptions;
+
+/**
+ * Created by Christian Schabesberger on 31.01.16.
+ *
+ * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
+ * ParsingException.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 ParsingException extends ExtractionException {
+    public ParsingException(String message) {
+        super(message);
+    }
+    public ParsingException(String message, Throwable cause) {
+        super(message, cause);
+    }
+}

app/src/main/java/org/schabi/newpipe/extractor/exceptions/ReCaptchaException.java

@@ -0,0 +1,27 @@
+package org.schabi.newpipe.extractor.exceptions;
+
+/**
+ * Created by beneth <bmauduit@beneth.fr> on 07.12.16.
+ *
+ * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
+ * ReCaptchaException.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 ReCaptchaException extends ExtractionException {
+    public ReCaptchaException(String message) {
+        super(message);
+    }
+}

app/src/main/java/org/schabi/newpipe/extractor/search/SearchEngine.java

@@ -0,0 +1,51 @@
+package org.schabi.newpipe.extractor.search;
+
+import org.schabi.newpipe.extractor.UrlIdHandler;
+import org.schabi.newpipe.extractor.exceptions.ExtractionException;
+
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * Created by Christian Schabesberger on 10.08.15.
+ *
+ * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
+ * SearchEngine.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/>.
+ */
+
+@SuppressWarnings("ALL")
+public abstract class SearchEngine {
+    public static class NothingFoundException extends ExtractionException {
+        public NothingFoundException(String message) {
+            super(message);
+        }
+    }
+
+    private StreamPreviewInfoSearchCollector collector;
+
+    public SearchEngine(UrlIdHandler urlIdHandler, int serviceId) {
+        collector = new StreamPreviewInfoSearchCollector(urlIdHandler, serviceId);
+    }
+
+    protected StreamPreviewInfoSearchCollector getStreamPreviewInfoSearchCollector() {
+        return collector;
+    }
+
+    //Result search(String query, int page);
+    public abstract StreamPreviewInfoSearchCollector search(
+            String query, int page, String contentCountry)
+            throws ExtractionException, IOException;
+}

app/src/main/java/org/schabi/newpipe/extractor/search/SearchResult.java

@@ -0,0 +1,50 @@
+package org.schabi.newpipe.extractor.search;
+
+import org.schabi.newpipe.extractor.exceptions.ExtractionException;
+import org.schabi.newpipe.extractor.stream_info.StreamPreviewInfo;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.Vector;
+
+/**
+ * Created by Christian Schabesberger on 29.02.16.
+ *
+ * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
+ * SearchResult.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 SearchResult {
+    public static SearchResult getSearchResult(SearchEngine engine, String query,
+                                               int page, String languageCode)
+            throws ExtractionException, IOException {
+
+        SearchResult result = engine.search(query, page, languageCode).getSearchResult();
+        if(result.resultList.isEmpty()) {
+            if(result.suggestion.isEmpty()) {
+                throw new ExtractionException("Empty result despite no error");
+            } else {
+                // This is used as a fallback. Do not relay on it !!!
+                throw new SearchEngine.NothingFoundException(result.suggestion);
+            }
+        }
+        return result;
+    }
+
+    public String suggestion = "";
+    public List<StreamPreviewInfo> resultList = new Vector<>();
+    public List<Throwable> errors = new Vector<>();
+}

app/src/main/java/org/schabi/newpipe/extractor/search/StreamPreviewInfoSearchCollector.java

@@ -0,0 +1,45 @@
+package org.schabi.newpipe.extractor.search;
+
+import org.schabi.newpipe.extractor.UrlIdHandler;
+import org.schabi.newpipe.extractor.stream_info.StreamPreviewInfoCollector;
+
+/**
+ * Created by Christian Schabesberger on 11.05.16.
+ *
+ * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
+ * StreamPreviewInfoSearchCollector.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 StreamPreviewInfoSearchCollector extends StreamPreviewInfoCollector {
+
+    private String suggestion = "";
+
+    public StreamPreviewInfoSearchCollector(UrlIdHandler handler, int serviceId) {
+        super(handler, serviceId);
+    }
+
+    public void setSuggestion(String suggestion) {
+        this.suggestion = suggestion;
+    }
+
+    public SearchResult getSearchResult() {
+        SearchResult result = new SearchResult();
+        result.suggestion = suggestion;
+        result.errors = getErrors();
+        result.resultList = getItemList();
+        return result;
+    }
+}

app/src/main/java/org/schabi/newpipe/extractor/search/SuggestionExtractor.java

@@ -0,0 +1,43 @@
+package org.schabi.newpipe.extractor.search;
+
+import org.schabi.newpipe.extractor.exceptions.ExtractionException;
+
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * Created by Christian Schabesberger on 28.09.16.
+ *
+ * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
+ * SuggestionExtractor.java is part of NewPipe.
+ *
+ * NewPipe is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * NewPipe is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+public abstract class SuggestionExtractor {
+
+    private int serviceId;
+
+    public SuggestionExtractor(int serviceId) {
+        this.serviceId = serviceId;
+    }
+
+    public abstract List<String> suggestionList(
+            String query,String contentCountry)
+            throws ExtractionException, IOException;
+
+    public int getServiceId() {
+        return serviceId;
+    }
+}

app/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeChannelExtractor.java

@@ -0,0 +1,339 @@
+package org.schabi.newpipe.extractor.services.youtube;
+
+
+
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.jsoup.Jsoup;
+import org.jsoup.nodes.Document;
+import org.jsoup.nodes.Element;
+import org.schabi.newpipe.extractor.AbstractStreamInfo;
+import org.schabi.newpipe.extractor.Downloader;
+import org.schabi.newpipe.extractor.NewPipe;
+import org.schabi.newpipe.extractor.Parser;
+import org.schabi.newpipe.extractor.UrlIdHandler;
+import org.schabi.newpipe.extractor.channel.ChannelExtractor;
+import org.schabi.newpipe.extractor.exceptions.ExtractionException;
+import org.schabi.newpipe.extractor.exceptions.ParsingException;
+import org.schabi.newpipe.extractor.stream_info.StreamPreviewInfoCollector;
+import org.schabi.newpipe.extractor.stream_info.StreamPreviewInfoExtractor;
+
+
+import java.io.IOException;
+
+/**
+ * Created by Christian Schabesberger on 25.07.16.
+ *
+ * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
+ * YoutubeChannelExtractor.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 YoutubeChannelExtractor extends ChannelExtractor {
+
+    private static final String TAG = YoutubeChannelExtractor.class.toString();
+
+    // private CSSOMParser cssParser = new CSSOMParser(new SACParserCSS3());
+
+    private Document doc = null;
+
+    private boolean isAjaxPage = false;
+    private static String userUrl = "";
+    private static String channelName = "";
+    private static String avatarUrl = "";
+    private static String bannerUrl = "";
+    private static String feedUrl = "";
+    // the fist page is html all other pages are ajax. Every new page can be requested by sending
+    // this request url.
+    private static String nextPageUrl = "";
+
+    public YoutubeChannelExtractor(UrlIdHandler urlIdHandler, String url, int page, int serviceId)
+            throws ExtractionException, IOException {
+        super(urlIdHandler, url, page, serviceId);
+
+        Downloader downloader = NewPipe.getDownloader();
+
+        url = urlIdHandler.cleanUrl(url) ; //+ "/video?veiw=0&flow=list&sort=dd";
+
+        if(page == 0) {
+            if (isUserUrl(url)) {
+                userUrl = url;
+            } else {
+                // we first need to get the user url. Otherwise we can't find videos
+                String channelPageContent = downloader.download(url);
+                Document channelDoc = Jsoup.parse(channelPageContent, url);
+                userUrl = getUserUrl(channelDoc);
+            }
+
+            userUrl = userUrl + "/videos?veiw=0&flow=list&sort=dd&live_view=10000";
+            String pageContent = downloader.download(userUrl);
+            doc = Jsoup.parse(pageContent, userUrl);
+            nextPageUrl = getNextPageUrl(doc);
+            isAjaxPage = false;
+        } else {
+            String ajaxDataRaw = downloader.download(nextPageUrl);
+            JSONObject ajaxData;
+            try {
+                ajaxData = new JSONObject(ajaxDataRaw);
+                String htmlDataRaw = ajaxData.getString("content_html");
+                doc = Jsoup.parse(htmlDataRaw, nextPageUrl);
+
+                String nextPageHtmlDataRaw = ajaxData.getString("load_more_widget_html");
+                if(!nextPageHtmlDataRaw.isEmpty()) {
+                    Document nextPageData = Jsoup.parse(nextPageHtmlDataRaw, nextPageUrl);
+                    nextPageUrl = getNextPageUrl(nextPageData);
+                } else {
+                    nextPageUrl = "";
+                }
+            } catch (JSONException e) {
+                throw new ParsingException("Could not parse json data for next page", e);
+            }
+            isAjaxPage = true;
+        }
+    }
+
+    @Override
+    public String getChannelName() throws ParsingException {
+        try {
+            if(!isAjaxPage) {
+                channelName = doc.select("span[class=\"qualified-channel-title-text\"]").first()
+                        .select("a").first().text();
+            }
+            return channelName;
+        } catch(Exception e) {
+            throw new ParsingException("Could not get channel name");
+        }
+    }
+
+    @Override
+    public String getAvatarUrl() throws ParsingException {
+        try {
+            if(!isAjaxPage) {
+                avatarUrl = doc.select("img[class=\"channel-header-profile-image\"]")
+                        .first().attr("abs:src");
+            }
+            return avatarUrl;
+        } catch(Exception e) {
+            throw new ParsingException("Could not get avatar", e);
+        }
+    }
+
+    @Override
+    public String getBannerUrl() throws ParsingException {
+        try {
+            if(!isAjaxPage) {
+                Element el = doc.select("div[id=\"gh-banner\"]").first().select("style").first();
+                String cssContent = el.html();
+                String url = "https:" + Parser.matchGroup1("url\\(([^)]+)\\)", cssContent);
+                if (url.contains("s.ytimg.com")) {
+                    bannerUrl = null;
+                } else {
+                    bannerUrl = url;
+                }
+            }
+            return bannerUrl;
+        } catch(Exception e) {
+            throw new ParsingException("Could not get Banner", e);
+        }
+    }
+
+    @Override
+    public StreamPreviewInfoCollector getStreams() throws ParsingException {
+        StreamPreviewInfoCollector collector = getStreamPreviewInfoCollector();
+        Element ul = null;
+        if(isAjaxPage) {
+            ul = doc.select("body").first();
+        } else {
+            ul = doc.select("ul[id=\"browse-items-primary\"]").first();
+        }
+
+        for(final Element li : ul.children()) {
+            if (li.select("div[class=\"feed-item-dismissable\"]").first() != null) {
+                collector.commit(new StreamPreviewInfoExtractor() {
+                    @Override
+                    public AbstractStreamInfo.StreamType getStreamType() throws ParsingException {
+                        return AbstractStreamInfo.StreamType.VIDEO_STREAM;
+                    }
+
+                    @Override
+                    public String getWebPageUrl() throws ParsingException {
+                        try {
+                            Element el = li.select("div[class=\"feed-item-dismissable\"]").first();
+                            Element dl = el.select("h3").first().select("a").first();
+                            return dl.attr("abs:href");
+                        } catch (Exception e) {
+                            throw new ParsingException("Could not get web page url for the video", e);
+                        }
+                    }
+
+                    @Override
+                    public String getTitle() throws ParsingException {
+                        try {
+                            Element el = li.select("div[class=\"feed-item-dismissable\"]").first();
+                            Element dl = el.select("h3").first().select("a").first();
+                            return dl.text();
+                        } catch (Exception e) {
+                            throw new ParsingException("Could not get title", e);
+                        }
+                    }
+
+                    @Override
+                    public int getDuration() throws ParsingException {
+                        try {
+                            return YoutubeParsingHelper.parseDurationString(
+                                    li.select("span[class=\"video-time\"]").first().text());
+                        } catch(Exception e) {
+                            if(isLiveStream(li)) {
+                                // -1 for no duration
+                                return -1;
+                            } else {
+                                throw new ParsingException("Could not get Duration: " + getTitle(), e);
+                            }
+                        }
+                    }
+
+                    @Override
+                    public String getUploader() throws ParsingException {
+                        return getChannelName();
+                    }
+
+                    @Override
+                    public String getUploadDate() throws ParsingException {
+                        try {
+                            return li.select("div[class=\"yt-lockup-meta\"]").first()
+                                    .select("li").first()
+                                    .text();
+                        } catch(Exception e) {
+                            throw new ParsingException("Could not get uplaod date", e);
+                        }
+                    }
+
+                    @Override
+                    public long getViewCount() throws ParsingException {
+                        String output;
+                        String input;
+                        try {
+                            input = li.select("div[class=\"yt-lockup-meta\"]").first()
+                                    .select("li").get(1)
+                                    .text();
+                        } catch (IndexOutOfBoundsException e) {
+                            if(isLiveStream(li)) {
+                                // -1 for no view count
+                                return -1;
+                            } else {
+                                throw new ParsingException(
+                                        "Could not parse yt-lockup-meta although available: " + getTitle(), e);
+                            }
+                        }
+
+                        output = Parser.matchGroup1("([0-9,\\. ]*)", input)
+                                .replace(" ", "")
+                                .replace(".", "")
+                                .replace(",", "");
+
+                        try {
+                            return Long.parseLong(output);
+                        } catch (NumberFormatException e) {
+                            // if this happens the video probably has no views
+                            if(!input.isEmpty()) {
+                                return 0;
+                            } else {
+                                throw new ParsingException("Could not handle input: " + input, e);
+                            }
+                        }
+                    }
+
+                    @Override
+                    public String getThumbnailUrl() throws ParsingException {
+                        try {
+                            String url;
+                            Element te = li.select("span[class=\"yt-thumb-clip\"]").first()
+                                    .select("img").first();
+                            url = te.attr("abs:src");
+                            // Sometimes youtube sends links to gif files which somehow seem to not exist
+                            // anymore. Items with such gif also offer a secondary image source. So we are going
+                            // to use that if we've caught such an item.
+                            if (url.contains(".gif")) {
+                                url = te.attr("abs:data-thumb");
+                            }
+                            return url;
+                        } catch (Exception e) {
+                            throw new ParsingException("Could not get thumbnail url", e);
+                        }
+                    }
+
+                    private boolean isLiveStream(Element item) {
+                        Element bla = item.select("span[class*=\"yt-badge-live\"]").first();
+
+                        if(bla == null) {
+                            // sometimes livestreams dont have badges but sill are live streams
+                            // if video time is not available we most likly have an offline livestream
+                            if(item.select("span[class*=\"video-time\"]").first() == null) {
+                                return true;
+                            }
+                        }
+                        return bla != null;
+                    }
+                });
+            }
+        }
+
+        return collector;
+    }
+
+    @Override
+    public String getFeedUrl() throws ParsingException {
+        try {
+            if(userUrl.contains("channel")) {
+                //channels don't have feeds in youtube, only user can provide such
+                return "";
+            }
+            if(!isAjaxPage) {
+                feedUrl = doc.select("link[title=\"RSS\"]").first().attr("abs:href");
+            }
+            return feedUrl;
+        } catch(Exception e) {
+            throw new ParsingException("Could not get feed url", e);
+        }
+    }
+
+    @Override
+    public boolean hasNextPage() throws ParsingException {
+        return !nextPageUrl.isEmpty();
+    }
+
+    private String getUserUrl(Document d) throws ParsingException {
+        return d.select("span[class=\"qualified-channel-title-text\"]").first()
+                .select("a").first().attr("abs:href");
+    }
+
+    private boolean isUserUrl(String url) throws ParsingException {
+        return url.contains("/user/");
+    }
+
+    private String getNextPageUrl(Document d) throws ParsingException {
+        try {
+            Element button = d.select("button[class*=\"yt-uix-load-more\"]").first();
+            if(button != null) {
+                return button.attr("abs:data-uix-load-more-href");
+            } else {
+                // sometimes channels are simply so small, they don't have a second/next4q page
+                return "";
+            }
+        } catch(Exception e) {
+            throw new ParsingException("could not load next page url", e);
+        }
+    }
+}

app/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeChannelUrlIdHandler.java

@@ -0,0 +1,47 @@
+package org.schabi.newpipe.extractor.services.youtube;
+
+import org.schabi.newpipe.extractor.Parser;
+import org.schabi.newpipe.extractor.UrlIdHandler;
+import org.schabi.newpipe.extractor.exceptions.ParsingException;
+
+/**
+ * Created by Christian Schabesberger on 25.07.16.
+ *
+ * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
+ * YoutubeChannelUrlIdHandler.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 YoutubeChannelUrlIdHandler implements UrlIdHandler {
+
+    public String getUrl(String channelId) {
+        return "https://www.youtube.com/" + channelId;
+    }
+
+    public String getId(String siteUrl) throws ParsingException {
+        return Parser.matchGroup1("/(user/[A-Za-z0-9_-]*|channel/[A-Za-z0-9_-]*)", siteUrl);
+    }
+
+    public String cleanUrl(String siteUrl) throws ParsingException {
+       return getUrl(getId(siteUrl));
+    }
+
+    public boolean acceptUrl(String videoUrl) {
+        return (videoUrl.contains("youtube") ||
+                videoUrl.contains("youtu.be")) &&
+                ( videoUrl.contains("/user/") ||
+                        videoUrl.contains("/channel/"));
+    }
+}

app/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeParsingHelper.java

@@ -0,0 +1,66 @@
+package org.schabi.newpipe.extractor.services.youtube;
+
+
+import org.schabi.newpipe.extractor.exceptions.ParsingException;
+
+/**
+ * Created by Christian Schabesberger on 02.03.16.
+ *
+ * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
+ * YoutubeParsingHelper.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 YoutubeParsingHelper {
+
+    private YoutubeParsingHelper() {
+    }
+
+    public static int parseDurationString(String input)
+            throws ParsingException, NumberFormatException {
+        String[] splitInput = input.split(":");
+        String days = "0";
+        String hours = "0";
+        String minutes = "0";
+        String seconds;
+
+        switch(splitInput.length) {
+            case 4:
+                days = splitInput[0];
+                hours = splitInput[1];
+                minutes = splitInput[2];
+                seconds = splitInput[3];
+                break;
+            case 3:
+                hours = splitInput[0];
+                minutes = splitInput[1];
+                seconds = splitInput[2];
+                break;
+            case 2:
+                minutes = splitInput[0];
+                seconds = splitInput[1];
+                break;
+            case 1:
+                seconds = splitInput[0];
+                break;
+            default:
+                throw new ParsingException("Error duration string with unknown format: " + input);
+        }
+        return ((((Integer.parseInt(days) * 24)
+                + Integer.parseInt(hours) * 60)
+                + Integer.parseInt(minutes)) * 60)
+                + Integer.parseInt(seconds);
+    }
+}

app/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeSearchEngine.java

@@ -0,0 +1,113 @@
+package org.schabi.newpipe.extractor.services.youtube;
+
+import org.jsoup.Jsoup;
+import org.jsoup.nodes.Document;
+import org.jsoup.nodes.Element;
+import org.schabi.newpipe.extractor.Downloader;
+import org.schabi.newpipe.extractor.NewPipe;
+import org.schabi.newpipe.extractor.UrlIdHandler;
+import org.schabi.newpipe.extractor.exceptions.ExtractionException;
+import org.schabi.newpipe.extractor.search.SearchEngine;
+import org.schabi.newpipe.extractor.search.StreamPreviewInfoSearchCollector;
+import org.schabi.newpipe.extractor.stream_info.StreamPreviewInfoExtractor;
+
+import java.net.URLEncoder;
+import java.io.IOException;
+
+
+/**
+ * Created by Christian Schabesberger on 09.08.15.
+ *
+ * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
+ * YoutubeSearchEngine.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 YoutubeSearchEngine extends SearchEngine {
+
+    private static final String TAG = YoutubeSearchEngine.class.toString();
+    public static final String CHARSET_UTF_8 = "UTF-8";
+
+    public YoutubeSearchEngine(UrlIdHandler urlIdHandler, int serviceId) {
+        super(urlIdHandler, serviceId);
+    }
+
+    @Override
+    public StreamPreviewInfoSearchCollector search(String query, int page, String languageCode)
+            throws IOException, ExtractionException {
+        StreamPreviewInfoSearchCollector collector = getStreamPreviewInfoSearchCollector();
+
+        Downloader downloader = NewPipe.getDownloader();
+
+        String url = "https://www.youtube.com/results"
+                + "?search_query=" + URLEncoder.encode(query, CHARSET_UTF_8)
+                + "&page=" + Integer.toString(page + 1)
+                + "&filters=" + "video";
+
+        String site;
+        //String url = builder.build().toString();
+        //if we've been passed a valid language code, append it to the URL
+        if(!languageCode.isEmpty()) {
+            //assert Pattern.matches("[a-z]{2}(-([A-Z]{2}|[0-9]{1,3}))?", languageCode);
+            site  = downloader.download(url, languageCode);
+        }
+        else {
+            site = downloader.download(url);
+        }
+
+        Document doc = Jsoup.parse(site, url);
+        Element list = doc.select("ol[class=\"item-section\"]").first();
+
+        for (Element item : list.children()) {
+            /* First we need to determine which kind of item we are working with.
+               Youtube depicts five different kinds of items on its search result page. These are
+               regular videos, playlists, channels, two types of video suggestions, and a "no video
+               found" item. Since we only want videos, we need to filter out all the others.
+               An example for this can be seen here:
+               https://www.youtube.com/results?search_query=asdf&page=1
+
+               We already applied a filter to the url, so we don't need to care about channels and
+               playlists now.
+            */
+
+            Element el;
+
+            // both types of spell correction item
+            if (!((el = item.select("div[class*=\"spell-correction\"]").first()) == null)) {
+                collector.setSuggestion(el.select("a").first().text());
+                if(list.children().size() == 1) {
+                    throw new NothingFoundException("Did you mean: " + el.select("a").first().text());
+                }
+                // search message item
+            } else if (!((el = item.select("div[class*=\"search-message\"]").first()) == null)) {
+                //result.errorMessage = el.text();
+                throw new NothingFoundException(el.text());
+
+                // video item type
+            } else if (!((el = item.select("div[class*=\"yt-lockup-video\"").first()) == null)) {
+                collector.commit(extractPreviewInfo(el));
+            } else {
+                //noinspection ConstantConditions
+                collector.addError(new Exception("unexpected element found:\"" + el + "\""));
+            }
+        }
+
+        return collector;
+    }
+
+    private StreamPreviewInfoExtractor extractPreviewInfo(final Element item) {
+        return new YoutubeStreamPreviewInfoExtractor(item);
+    }
+}

app/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeService.java

@@ -0,0 +1,82 @@
+package org.schabi.newpipe.extractor.services.youtube;
+
+import org.schabi.newpipe.extractor.StreamingService;
+import org.schabi.newpipe.extractor.UrlIdHandler;
+import org.schabi.newpipe.extractor.channel.ChannelExtractor;
+import org.schabi.newpipe.extractor.exceptions.ExtractionException;
+import org.schabi.newpipe.extractor.search.SearchEngine;
+import org.schabi.newpipe.extractor.search.SuggestionExtractor;
+import org.schabi.newpipe.extractor.stream_info.StreamExtractor;
+
+import java.io.IOException;
+
+
+/**
+ * Created by Christian Schabesberger on 23.08.15.
+ *
+ * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
+ * YoutubeService.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 YoutubeService extends StreamingService {
+
+    public YoutubeService(int id) {
+        super(id);
+    }
+
+    @Override
+    public ServiceInfo getServiceInfo() {
+        ServiceInfo serviceInfo = new ServiceInfo();
+        serviceInfo.name = "Youtube";
+        return serviceInfo;
+    }
+    @Override
+    public StreamExtractor getExtractorInstance(String url)
+            throws ExtractionException, IOException {
+        UrlIdHandler urlIdHandler = new YoutubeStreamUrlIdHandler();
+        if(urlIdHandler.acceptUrl(url)) {
+            return new YoutubeStreamExtractor(urlIdHandler, url, getServiceId());
+        }
+        else {
+            throw new IllegalArgumentException("supplied String is not a valid Youtube URL");
+        }
+    }
+    @Override
+    public SearchEngine getSearchEngineInstance() {
+        return new YoutubeSearchEngine(getUrlIdHandlerInstance(), getServiceId());
+    }
+
+    @Override
+    public UrlIdHandler getUrlIdHandlerInstance() {
+        return new YoutubeStreamUrlIdHandler();
+    }
+
+    @Override
+    public UrlIdHandler getChannelUrlIdHandlerInstance() {
+        return new YoutubeChannelUrlIdHandler();
+    }
+
+    @Override
+    public ChannelExtractor getChannelExtractorInstance(String url, int page)
+        throws ExtractionException, IOException {
+        return new YoutubeChannelExtractor(getChannelUrlIdHandlerInstance(), url, page, getServiceId());
+    }
+
+    @Override
+    public SuggestionExtractor getSuggestionExtractorInstance() {
+        return new YoutubeSuggestionExtractor(getServiceId());
+    }
+}

app/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeStreamExtractor.java

@@ -0,0 +1,852 @@
+package org.schabi.newpipe.extractor.services.youtube;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.jsoup.Jsoup;
+import org.jsoup.nodes.Document;
+import org.jsoup.nodes.Element;
+import org.mozilla.javascript.Context;
+import org.mozilla.javascript.Function;
+import org.mozilla.javascript.ScriptableObject;
+import org.schabi.newpipe.extractor.AbstractStreamInfo;
+import org.schabi.newpipe.extractor.exceptions.ExtractionException;
+import org.schabi.newpipe.extractor.exceptions.ParsingException;
+import org.schabi.newpipe.extractor.exceptions.ReCaptchaException;
+import org.schabi.newpipe.extractor.stream_info.AudioStream;
+import org.schabi.newpipe.extractor.Downloader;
+import org.schabi.newpipe.extractor.NewPipe;
+import org.schabi.newpipe.extractor.Parser;
+import org.schabi.newpipe.extractor.UrlIdHandler;
+import org.schabi.newpipe.extractor.MediaFormat;
+import org.schabi.newpipe.extractor.stream_info.StreamExtractor;
+import org.schabi.newpipe.extractor.stream_info.StreamInfo;
+import org.schabi.newpipe.extractor.stream_info.StreamPreviewInfoCollector;
+import org.schabi.newpipe.extractor.stream_info.StreamPreviewInfoExtractor;
+import org.schabi.newpipe.extractor.stream_info.VideoStream;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+import java.util.Vector;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * Created by Christian Schabesberger on 06.08.15.
+ *
+ * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
+ * YoutubeStreamExtractor.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 YoutubeStreamExtractor extends StreamExtractor {
+    public static final String URL_ENCODED_FMT_STREAM_MAP = "url_encoded_fmt_stream_map";
+    public static final String HTTPS = "https:";
+    public static final String CONTENT = "content";
+    public static final String REGEX_INT = "[^\\d]";
+
+    // exceptions
+
+    public class DecryptException extends ParsingException {
+        DecryptException(String message, Throwable cause) {
+            super(message, cause);
+        }
+    }
+
+    // special content not available exceptions
+
+    public class GemaException extends ContentNotAvailableException {
+        GemaException(String message) {
+            super(message);
+        }
+    }
+
+    public class LiveStreamException extends ContentNotAvailableException {
+        LiveStreamException(String message) {
+            super(message);
+        }
+    }
+
+    // ----------------
+
+    // Sometimes if the html page of youtube is already downloaded, youtube web page will internally
+    // download the /get_video_info page. Since a certain date dashmpd url is only available over
+    // this /get_video_info page, so we always need to download this one to.
+    // %%video_id%% will be replaced by the actual video id
+    // $$el_type$$ will be replaced by the actual el_type (se the declarations below)
+    private static final String GET_VIDEO_INFO_URL =
+            "https://www.youtube.com/get_video_info?video_id=%%video_id%%$$el_type$$&ps=default&eurl=&gl=US&hl=en";
+    // eltype is nececeary for the url aboth
+    private static final String EL_INFO = "el=info";
+
+    public enum ItagType {
+        AUDIO,
+        VIDEO,
+        VIDEO_ONLY
+    }
+
+    private static class ItagItem {
+        public ItagItem(int id, ItagType type, MediaFormat format, String res, int fps) {
+            this.id = id;
+            this.itagType = type;
+            this.mediaFormatId = format.id;
+            this.resolutionString = res;
+            this.fps = fps;
+        }
+        public ItagItem(int id, ItagType type, MediaFormat format, int samplingRate, int bandWidth) {
+            this.id = id;
+            this.itagType = type;
+            this.mediaFormatId = format.id;
+            this.samplingRate = samplingRate;
+            this.bandWidth = bandWidth;
+        }
+        public int id;
+        public ItagType itagType;
+        public int mediaFormatId;
+        public String resolutionString;
+        public int fps = -1;
+        public int samplingRate = -1;
+        public int bandWidth = -1;
+    }
+
+    private static final ItagItem[] itagList = {
+            // video streams
+            //           id, ItagType,       MediaFormat,    Resolution, fps
+            new ItagItem(17, ItagType.VIDEO, MediaFormat.v3GPP, "144p", 12),
+            new ItagItem(18, ItagType.VIDEO, MediaFormat.MPEG_4, "360p", 24),
+            new ItagItem(22, ItagType.VIDEO, MediaFormat.MPEG_4, "720p", 24),
+            new ItagItem(36, ItagType.VIDEO, MediaFormat.v3GPP, "240p", 24),
+            new ItagItem(37, ItagType.VIDEO, MediaFormat.MPEG_4, "1080p", 24),
+            new ItagItem(38, ItagType.VIDEO, MediaFormat.MPEG_4, "1080p", 24),
+            new ItagItem(43, ItagType.VIDEO, MediaFormat.WEBM, "360p", 24),
+            new ItagItem(44, ItagType.VIDEO, MediaFormat.WEBM, "480p", 24),
+            new ItagItem(45, ItagType.VIDEO, MediaFormat.WEBM, "720p", 24),
+            new ItagItem(46, ItagType.VIDEO, MediaFormat.WEBM, "1080p", 24),
+            // audio streams
+            //           id, ItagType,       MediaFormat,    samplingR, bandwidth
+            new ItagItem(249, ItagType.AUDIO, MediaFormat.WEBMA, 0, 0),  // bandwith/samplingR 0 because not known
+            new ItagItem(250, ItagType.AUDIO, MediaFormat.WEBMA, 0, 0),
+            new ItagItem(171, ItagType.AUDIO, MediaFormat.WEBMA, 0, 0),
+            new ItagItem(140, ItagType.AUDIO, MediaFormat.M4A, 0, 0),
+            new ItagItem(251, ItagType.AUDIO, MediaFormat.WEBMA, 0, 0),
+            // video only streams
+            new ItagItem(160, ItagType.VIDEO_ONLY, MediaFormat.MPEG_4, "144p", 24),
+            new ItagItem(133, ItagType.VIDEO_ONLY, MediaFormat.MPEG_4, "240p", 24),
+            new ItagItem(134, ItagType.VIDEO_ONLY, MediaFormat.MPEG_4, "360p", 24),
+            new ItagItem(135, ItagType.VIDEO_ONLY, MediaFormat.MPEG_4, "480p", 24),
+            new ItagItem(136, ItagType.VIDEO_ONLY, MediaFormat.MPEG_4, "720p", 24),
+            new ItagItem(137, ItagType.VIDEO_ONLY, MediaFormat.MPEG_4, "1080p", 24),
+    };
+
+    /**These lists only contain itag formats that are supported by the common Android Video player.
+     However if you are looking for a list showing all itag formats, look at
+     https://github.com/rg3/youtube-dl/issues/1687 */
+
+    public static boolean itagIsSupported(int itag) {
+        for(ItagItem item : itagList) {
+            if(itag == item.id) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public static ItagItem getItagItem(int itag) throws ParsingException {
+        for(ItagItem item : itagList) {
+            if(itag == item.id) {
+                return item;
+            }
+        }
+        throw new ParsingException("itag=" + Integer.toString(itag) + " not supported");
+    }
+
+    private static final String TAG = YoutubeStreamExtractor.class.toString();
+    private final Document doc;
+    private JSONObject playerArgs;
+    private boolean isAgeRestricted;
+    private Map<String, String> videoInfoPage;
+
+    // static values
+    private static final String DECRYPTION_FUNC_NAME="decrypt";
+
+    // cached values
+    private static volatile String decryptionCode = "";
+
+    UrlIdHandler urlidhandler = new YoutubeStreamUrlIdHandler();
+    String pageUrl = "";
+
+    public YoutubeStreamExtractor(UrlIdHandler urlIdHandler, String pageUrl, int serviceId)
+            throws ExtractionException, IOException {
+        super(urlIdHandler, pageUrl, serviceId);
+        //most common videoInfo fields are now set in our superclass, for all services
+        this.pageUrl = pageUrl;
+        Downloader downloader = NewPipe.getDownloader();
+        String pageContent = downloader.download(urlidhandler.cleanUrl(pageUrl));
+        doc = Jsoup.parse(pageContent, pageUrl);
+        JSONObject ytPlayerConfig;
+        String playerUrl;
+
+        // Check if the video is age restricted
+        if (pageContent.contains("<meta property=\"og:restrictions:age")) {
+            String videoInfoUrl = GET_VIDEO_INFO_URL.replace("%%video_id%%",
+                    urlidhandler.getId(pageUrl)).replace("$$el_type$$", "&" + EL_INFO);
+            String videoInfoPageString = downloader.download(videoInfoUrl);
+            videoInfoPage = Parser.compatParseMap(videoInfoPageString);
+            playerUrl = getPlayerUrlFromRestrictedVideo(pageUrl);
+            isAgeRestricted = true;
+        } else {
+            ytPlayerConfig = getPlayerConfig(pageContent);
+            playerArgs = getPlayerArgs(ytPlayerConfig);
+            playerUrl = getPlayerUrl(ytPlayerConfig);
+            isAgeRestricted = false;
+        }
+
+        if(decryptionCode.isEmpty()) {
+            decryptionCode = loadDecryptionCode(playerUrl);
+        }
+    }
+
+    private JSONObject getPlayerConfig(String pageContent) throws ParsingException {
+        try {
+            String ytPlayerConfigRaw =
+                    Parser.matchGroup1("ytplayer.config\\s*=\\s*(\\{.*?\\});", pageContent);
+            return new JSONObject(ytPlayerConfigRaw);
+        } catch (Parser.RegexException e) {
+            String errorReason = findErrorReason(doc);
+            switch(errorReason) {
+                case "GEMA":
+                    throw new GemaException(errorReason);
+                case "":
+                    throw new ContentNotAvailableException("Content not available: player config empty", e);
+                default:
+                    throw new ContentNotAvailableException("Content not available", e);
+            }
+        } catch (JSONException e) {
+            throw new ParsingException("Could not parse yt player config", e);
+        }
+    }
+
+    private JSONObject getPlayerArgs(JSONObject playerConfig) throws ParsingException {
+        JSONObject playerArgs;
+
+        //attempt to load the youtube js player JSON arguments
+        boolean isLiveStream = false; //used to determine if this is a livestream or not
+        try {
+            playerArgs = playerConfig.getJSONObject("args");
+
+            // check if we have a live stream. We need to filter it, since its not yet supported.
+            if((playerArgs.has("ps") && playerArgs.get("ps").toString().equals("live"))
+                    || (playerArgs.get(URL_ENCODED_FMT_STREAM_MAP).toString().isEmpty())) {
+                isLiveStream = true;
+            }
+        }  catch (JSONException e) {
+            throw new ParsingException("Could not parse yt player config", e);
+        }
+        if (isLiveStream) {
+            throw new LiveStreamException("This is a Life stream. Can't use those right now.");
+        }
+
+        return playerArgs;
+    }
+
+    private String getPlayerUrl(JSONObject playerConfig) throws ParsingException {
+        try {
+            // The Youtube service needs to be initialized by downloading the
+            // js-Youtube-player. This is done in order to get the algorithm
+            // for decrypting cryptic signatures inside certain stream urls.
+            String playerUrl = "";
+
+            JSONObject ytAssets = playerConfig.getJSONObject("assets");
+            playerUrl = ytAssets.getString("js");
+
+            if (playerUrl.startsWith("//")) {
+                playerUrl = HTTPS + playerUrl;
+            }
+            return playerUrl;
+        } catch (JSONException e) {
+            throw new ParsingException(
+                    "Could not load decryption code for the Youtube service.", e);
+        }
+    }
+
+    private String getPlayerUrlFromRestrictedVideo(String pageUrl) throws ParsingException, ReCaptchaException {
+        try {
+            Downloader downloader = NewPipe.getDownloader();
+            String playerUrl = "";
+            String videoId = urlidhandler.getId(pageUrl);
+            String embedUrl = "https://www.youtube.com/embed/" + videoId;
+            String embedPageContent = downloader.download(embedUrl);
+            //todo: find out if this can be reapaced by Parser.matchGroup1()
+            Pattern assetsPattern = Pattern.compile("\"assets\":.+?\"js\":\\s*(\"[^\"]+\")");
+            Matcher patternMatcher = assetsPattern.matcher(embedPageContent);
+            while (patternMatcher.find()) {
+                playerUrl = patternMatcher.group(1);
+            }
+            playerUrl = playerUrl.replace("\\", "").replace("\"", "");
+
+            if (playerUrl.startsWith("//")) {
+                playerUrl = HTTPS + playerUrl;
+            }
+            return playerUrl;
+        } catch (IOException e) {
+            throw new ParsingException(
+                    "Could load decryption code form restricted video for the Youtube service.", e);
+        } catch (ReCaptchaException e) {
+            throw new ReCaptchaException("reCaptcha Challenge requested");
+        }
+    }
+
+    @Override
+    public String getTitle() throws ParsingException {
+        try {
+            if (playerArgs == null) {
+                return videoInfoPage.get("title");
+            }
+            //json player args method
+            return playerArgs.getString("title");
+        } catch(JSONException je) {//html <meta> method
+            je.printStackTrace();
+            System.err.println("failed to load title from JSON args; trying to extract it from HTML");
+            try { // fall through to fall-back
+                return doc.select("meta[name=title]").attr(CONTENT);
+            } catch (Exception e) {
+                throw new ParsingException("failed permanently to load title.", e);
+            }
+        }
+    }
+
+    @Override
+    public String getDescription() throws ParsingException {
+        try {
+            return doc.select("p[id=\"eow-description\"]").first().html();
+        } catch (Exception e) {//todo: add fallback method <-- there is no ... as long as i know
+            throw new ParsingException("failed to load description.", e);
+        }
+    }
+
+    @Override
+    public String getUploader() throws ParsingException {
+        try {
+            if (playerArgs == null) {
+                return videoInfoPage.get("author");
+            }
+            //json player args method
+            return playerArgs.getString("author");
+        } catch(JSONException je) {
+            je.printStackTrace();
+            System.err.println(
+                    "failed to load uploader name from JSON args; trying to extract it from HTML");
+        } try {//fall through to fallback HTML method
+            return doc.select("div.yt-user-info").first().text();
+        } catch (Exception e) {
+            throw new ParsingException("failed permanently to load uploader name.", e);
+        }
+    }
+
+    @Override
+    public int getLength() throws ParsingException {
+        try {
+            if (playerArgs == null) {
+                return Integer.valueOf(videoInfoPage.get("length_seconds"));
+            }
+            return playerArgs.getInt("length_seconds");
+        } catch (JSONException e) {//todo: find fallback method
+            throw new ParsingException("failed to load video duration from JSON args", e);
+        }
+    }
+
+    @Override
+    public long getViewCount() throws ParsingException {
+        try {
+            String viewCountString = doc.select("meta[itemprop=interactionCount]").attr(CONTENT);
+            return Long.parseLong(viewCountString);
+        } catch (Exception e) {//todo: find fallback method
+            throw new ParsingException("failed to get number of views", e);
+        }
+    }
+
+    @Override
+    public String getUploadDate() throws ParsingException {
+        try {
+            return doc.select("meta[itemprop=datePublished]").attr(CONTENT);
+        } catch (Exception e) {//todo: add fallback method
+            throw new ParsingException("failed to get upload date.", e);
+        }
+    }
+
+    @Override
+    public String getThumbnailUrl() throws ParsingException {
+        //first attempt getting a small image version
+        //in the html extracting part we try to get a thumbnail with a higher resolution
+        // Try to get high resolution thumbnail if it fails use low res from the player instead
+        try {
+            return doc.select("link[itemprop=\"thumbnailUrl\"]").first().attr("abs:href");
+        } catch(Exception e) {
+            System.err.println("Could not find high res Thumbnail. Using low res instead");
+        }
+        try { //fall through to fallback
+            return playerArgs.getString("thumbnail_url");
+        } catch (JSONException je) {
+            throw new ParsingException(
+                    "failed to extract thumbnail URL from JSON args; trying to extract it from HTML", je);
+        } catch (NullPointerException ne) {
+            // Get from the video info page instead
+            return videoInfoPage.get("thumbnail_url");
+        }
+    }
+
+    @Override
+    public String getUploaderThumbnailUrl() throws ParsingException {
+        try {
+            return doc.select("a[class*=\"yt-user-photo\"]").first()
+                    .select("img").first()
+                    .attr("abs:data-thumb");
+        } catch (Exception e) {//todo: add fallback method
+            throw new ParsingException("failed to get uploader thumbnail URL.", e);
+        }
+    }
+
+    @Override
+    public String getDashMpdUrl() throws ParsingException {
+        /*
+        try {
+            String dashManifestUrl = videoInfoPage.get("dashmpd");
+            if(!dashManifestUrl.contains("/signature/")) {
+                String encryptedSig = Parser.matchGroup1("/s/([a-fA-F0-9\\.]+)", dashManifestUrl);
+                String decryptedSig;
+
+                decryptedSig = decryptSignature(encryptedSig, decryptionCode);
+                dashManifestUrl = dashManifestUrl.replace("/s/" + encryptedSig, "/signature/" + decryptedSig);
+            }
+            return dashManifestUrl;
+        } catch (Exception e) {
+            throw new ParsingException(
+                    "Could not get \"dashmpd\" maybe VideoInfoPage is broken.", e);
+        }
+        */
+        return "";
+    }
+
+
+    @Override
+    public List<AudioStream> getAudioStreams() throws ParsingException {
+        Vector<AudioStream> audioStreams = new Vector<>();
+        try{
+            String encodedUrlMap;
+            // playerArgs could be null if the video is age restricted
+            if (playerArgs == null) {
+                encodedUrlMap = videoInfoPage.get("adaptive_fmts");
+            } else {
+                encodedUrlMap = playerArgs.getString("adaptive_fmts");
+            }
+            for(String url_data_str : encodedUrlMap.split(",")) {
+                // This loop iterates through multiple streams, therefor tags
+                // is related to one and the same stream at a time.
+                Map<String, String> tags = Parser.compatParseMap(
+                        org.jsoup.parser.Parser.unescapeEntities(url_data_str, true));
+
+                int itag = Integer.parseInt(tags.get("itag"));
+
+                if (itagIsSupported(itag)) {
+                    ItagItem itagItem = getItagItem(itag);
+                    if (itagItem.itagType == ItagType.AUDIO) {
+                        String streamUrl = tags.get("url");
+                        // if video has a signature: decrypt it and add it to the url
+                        if (tags.get("s") != null) {
+                            streamUrl = streamUrl + "&signature="
+                                    + decryptSignature(tags.get("s"), decryptionCode);
+                        }
+
+                        audioStreams.add(new AudioStream(streamUrl,
+                                itagItem.mediaFormatId,
+                                itagItem.bandWidth,
+                                itagItem.samplingRate));
+                    }
+                }
+            }
+        } catch (Exception e) {
+            throw new ParsingException("Could not get audiostreams", e);
+        }
+        return audioStreams;
+    }
+
+    @Override
+    public List<VideoStream> getVideoStreams() throws ParsingException {
+        Vector<VideoStream> videoStreams = new Vector<>();
+
+        try{
+            String encodedUrlMap;
+            // playerArgs could be null if the video is age restricted
+            if (playerArgs == null) {
+                encodedUrlMap = videoInfoPage.get(URL_ENCODED_FMT_STREAM_MAP);
+            } else {
+                encodedUrlMap = playerArgs.getString(URL_ENCODED_FMT_STREAM_MAP);
+            }
+            for(String url_data_str : encodedUrlMap.split(",")) {
+                try {
+                    // This loop iterates through multiple streams, therefor tags
+                    // is related to one and the same stream at a time.
+                    Map<String, String> tags = Parser.compatParseMap(
+                            org.jsoup.parser.Parser.unescapeEntities(url_data_str, true));
+
+                    int itag = Integer.parseInt(tags.get("itag"));
+
+                    if (itagIsSupported(itag)) {
+                        ItagItem itagItem = getItagItem(itag);
+                        if(itagItem.itagType == ItagType.VIDEO) {
+                            String streamUrl = tags.get("url");
+                            // if video has a signature: decrypt it and add it to the url
+                            if (tags.get("s") != null) {
+                                streamUrl = streamUrl + "&signature="
+                                        + decryptSignature(tags.get("s"), decryptionCode);
+                            }
+                            videoStreams.add(new VideoStream(
+                                    streamUrl,
+                                    itagItem.mediaFormatId,
+                                    itagItem.resolutionString));
+                        }
+                    }
+                } catch (Exception e) {
+                    //todo: dont log throw an error
+                    System.err.println("Could not get Video stream.");
+                    e.printStackTrace();
+                }
+            }
+
+        } catch (Exception e) {
+            throw new ParsingException("Failed to get video streams", e);
+        }
+
+        if(videoStreams.isEmpty()) {
+            throw new ParsingException("Failed to get any video stream");
+        }
+        return videoStreams;
+    }
+
+    @Override
+    public List<VideoStream> getVideoOnlyStreams() throws ParsingException {
+        return null;
+    }
+
+    /**Attempts to parse (and return) the offset to start playing the video from.
+     * @return the offset (in seconds), or 0 if no timestamp is found.*/
+    @Override
+    public int getTimeStamp() throws ParsingException {
+        String timeStamp;
+        try {
+            timeStamp = Parser.matchGroup1("((#|&|\\?)t=\\d{0,3}h?\\d{0,3}m?\\d{1,3}s?)", pageUrl);
+        } catch (Parser.RegexException e) {
+            // catch this instantly since an url does not necessarily have to have a time stamp
+
+            // -2 because well the testing system will then know its the regex that failed :/
+            // not good i know
+            return -2;
+        }
+
+        if(!timeStamp.isEmpty()) {
+            try {
+                String secondsString = "";
+                String minutesString = "";
+                String hoursString = "";
+                try {
+                    secondsString = Parser.matchGroup1("(\\d{1,3})s", timeStamp);
+                    minutesString = Parser.matchGroup1("(\\d{1,3})m", timeStamp);
+                    hoursString = Parser.matchGroup1("(\\d{1,3})h", timeStamp);
+                } catch (Exception e) {
+                    //it could be that time is given in another method
+                    if (secondsString.isEmpty() //if nothing was got,
+                            && minutesString.isEmpty()//treat as unlabelled seconds
+                            && hoursString.isEmpty()) {
+                        secondsString = Parser.matchGroup1("t=(\\d+)", timeStamp);
+                    }
+                }
+
+                int seconds = secondsString.isEmpty() ? 0 : Integer.parseInt(secondsString);
+                int minutes = minutesString.isEmpty() ? 0 : Integer.parseInt(minutesString);
+                int hours = hoursString.isEmpty() ? 0 : Integer.parseInt(hoursString);
+
+                //don't trust BODMAS!
+                return seconds + (60 * minutes) + (3600 * hours);
+                //Log.d(TAG, "derived timestamp value:"+ret);
+                //the ordering varies internationally
+            } catch (ParsingException e) {
+                throw new ParsingException("Could not get timestamp.", e);
+            }
+        } else {
+            return 0;
+        }
+    }
+
+    @Override
+    public int getAgeLimit() throws ParsingException {
+        if (!isAgeRestricted) {
+            return 0;
+        }
+        try {
+            return Integer.valueOf(doc.head()
+                    .getElementsByAttributeValue("property", "og:restrictions:age")
+                    .attr(CONTENT).replace("+", ""));
+        } catch (Exception e) {
+            throw new ParsingException("Could not get age restriction");
+        }
+    }
+
+    @Override
+    public String getAverageRating() throws ParsingException {
+        try {
+            if (playerArgs == null) {
+                return videoInfoPage.get("avg_rating");
+            }
+            return playerArgs.getString("avg_rating");
+        } catch (JSONException e) {
+            throw new ParsingException("Could not get Average rating", e);
+        }
+    }
+
+    @Override
+    public int getLikeCount() throws ParsingException {
+        String likesString = "";
+        try {
+
+            Element button = doc.select("button.like-button-renderer-like-button").first();
+            try {
+                likesString = button.select("span.yt-uix-button-content").first().text();
+            } catch (NullPointerException e) {
+                //if this ckicks in our button has no content and thefore likes/dislikes are disabled
+                return -1;
+            }
+            return Integer.parseInt(likesString.replaceAll(REGEX_INT, ""));
+        } catch (NumberFormatException nfe) {
+            throw new ParsingException(
+                    "failed to parse likesString \"" + likesString + "\" as integers", nfe);
+        } catch (Exception e) {
+            throw new ParsingException("Could not get like count", e);
+        }
+    }
+
+    @Override
+    public int getDislikeCount() throws ParsingException {
+        String dislikesString = "";
+        try {
+            Element button = doc.select("button.like-button-renderer-dislike-button").first();
+            try {
+                dislikesString = button.select("span.yt-uix-button-content").first().text();
+            } catch (NullPointerException e) {
+                //if this kicks in our button has no content and therefore likes/dislikes are disabled
+                return -1;
+            }
+            return Integer.parseInt(dislikesString.replaceAll(REGEX_INT, ""));
+        } catch(NumberFormatException nfe) {
+            throw new ParsingException(
+                    "failed to parse dislikesString \"" + dislikesString + "\" as integers", nfe);
+        } catch(Exception e) {
+            throw new ParsingException("Could not get dislike count", e);
+        }
+    }
+
+    @Override
+    public StreamPreviewInfoExtractor getNextVideo() throws ParsingException {
+        try {
+            return extractVideoPreviewInfo(doc.select("div[class=\"watch-sidebar-section\"]").first()
+                    .select("li").first());
+        } catch(Exception e) {
+            throw new ParsingException("Could not get next video", e);
+        }
+    }
+
+    @Override
+    public StreamPreviewInfoCollector getRelatedVideos() throws ParsingException {
+        try {
+            StreamPreviewInfoCollector collector = getStreamPreviewInfoCollector();
+            Element ul = doc.select("ul[id=\"watch-related\"]").first();
+            if(ul != null) {
+                for (Element li : ul.children()) {
+                    // first check if we have a playlist. If so leave them out
+                    if (li.select("a[class*=\"content-link\"]").first() != null) {
+                        collector.commit(extractVideoPreviewInfo(li));
+                    }
+                }
+            }
+            return collector;
+        } catch(Exception e) {
+            throw new ParsingException("Could not get related videos", e);
+        }
+    }
+
+    @Override
+    public String getPageUrl() {
+        return pageUrl;
+    }
+
+    @Override
+    public String getChannelUrl() throws ParsingException {
+        try {
+            return doc.select("div[class=\"yt-user-info\"]").first().children()
+                    .select("a").first().attr("abs:href");
+        } catch(Exception e) {
+            throw new ParsingException("Could not get channel link", e);
+        }
+    }
+
+    @Override
+    public StreamInfo.StreamType getStreamType() throws ParsingException {
+        //todo: if implementing livestream support this value should be generated dynamically
+        return StreamInfo.StreamType.VIDEO_STREAM;
+    }
+
+    /**Provides information about links to other videos on the video page, such as related videos.
+     * This is encapsulated in a StreamPreviewInfo object,
+     * which is a subset of the fields in a full StreamInfo.*/
+    private StreamPreviewInfoExtractor extractVideoPreviewInfo(final Element li) {
+        return new StreamPreviewInfoExtractor() {
+            @Override
+            public AbstractStreamInfo.StreamType getStreamType() throws ParsingException {
+                return null;
+            }
+
+            @Override
+            public String getWebPageUrl() throws ParsingException {
+                return li.select("a.content-link").first().attr("abs:href");
+            }
+
+            @Override
+            public String getTitle() throws ParsingException {
+                //todo: check NullPointerException causing
+                return li.select("span.title").first().text();
+                //this page causes the NullPointerException, after finding it by searching for "tjvg":
+                //https://www.youtube.com/watch?v=Uqg0aEhLFAg
+            }
+
+            @Override
+            public int getDuration() throws ParsingException {
+                return YoutubeParsingHelper.parseDurationString(
+                        li.select("span.video-time").first().text());
+            }
+
+            @Override
+            public String getUploader() throws ParsingException {
+                return li.select("span.g-hovercard").first().text();
+            }
+
+            @Override
+            public String getUploadDate() throws ParsingException {
+                return null;
+            }
+
+            @Override
+            public long getViewCount() throws ParsingException {
+                //this line is unused
+                //String views = li.select("span.view-count").first().text();
+
+                //Log.i(TAG, "title:"+info.title);
+                //Log.i(TAG, "view count:"+views);
+
+                try {
+                    return Long.parseLong(li.select("span.view-count")
+                            .first().text().replaceAll(REGEX_INT, ""));
+                } catch (Exception e) {
+                    //related videos sometimes have no view count
+                    return 0;
+                }
+            }
+
+            @Override
+            public String getThumbnailUrl() throws ParsingException {
+                Element img = li.select("img").first();
+                String thumbnailUrl = img.attr("abs:src");
+                // Sometimes youtube sends links to gif files which somehow seem to not exist
+                // anymore. Items with such gif also offer a secondary image source. So we are going
+                // to use that if we caught such an item.
+                if (thumbnailUrl.contains(".gif")) {
+                    thumbnailUrl = img.attr("data-thumb");
+                }
+                if (thumbnailUrl.startsWith("//")) {
+                    thumbnailUrl = HTTPS + thumbnailUrl;
+                }
+                return thumbnailUrl;
+            }
+        };
+    }
+
+
+    private String loadDecryptionCode(String playerUrl) throws DecryptException {
+        String decryptionFuncName;
+        String decryptionFunc;
+        String helperObjectName;
+        String helperObject;
+        String callerFunc = "function " + DECRYPTION_FUNC_NAME + "(a){return %%(a);}";
+        String decryptionCode;
+
+        try {
+            Downloader downloader = NewPipe.getDownloader();
+            String playerCode = downloader.download(playerUrl);
+
+            decryptionFuncName =
+                    Parser.matchGroup1("\\.sig\\|\\|([a-zA-Z0-9$]+)\\(", playerCode);
+
+            String functionPattern = "("
+                    + decryptionFuncName.replace("$", "\\$")
+                    + "=function\\([a-zA-Z0-9_]+\\)\\{.+?\\})";
+            decryptionFunc = "var " + Parser.matchGroup1(functionPattern, playerCode) + ";";
+
+            helperObjectName = Parser
+                    .matchGroup1(";([A-Za-z0-9_\\$]{2})\\...\\(", decryptionFunc);
+
+            String helperPattern = "(var "
+                    + helperObjectName.replace("$", "\\$") + "=\\{.+?\\}\\};)";
+            helperObject = Parser.matchGroup1(helperPattern, playerCode);
+
+
+            callerFunc = callerFunc.replace("%%", decryptionFuncName);
+            decryptionCode = helperObject + decryptionFunc + callerFunc;
+        } catch(IOException ioe) {
+            throw new DecryptException("Could not load decrypt function", ioe);
+        } catch(Exception e) {
+            throw new DecryptException("Could not parse decrypt function ", e);
+        }
+
+        return decryptionCode;
+    }
+
+    private String decryptSignature(String encryptedSig, String decryptionCode)
+            throws DecryptException{
+        Context context = Context.enter();
+        context.setOptimizationLevel(-1);
+        Object result = null;
+        try {
+            ScriptableObject scope = context.initStandardObjects();
+            context.evaluateString(scope, decryptionCode, "decryptionCode", 1, null);
+            Function decryptionFunc = (Function) scope.get("decrypt", scope);
+            result = decryptionFunc.call(context, scope, scope, new Object[]{encryptedSig});
+        } catch (Exception e) {
+            throw new DecryptException("could not get decrypt signature", e);
+        } finally {
+            Context.exit();
+        }
+        return result == null ? "" : result.toString();
+    }
+
+    private String findErrorReason(Document doc) {
+        String errorMessage = doc.select("h1[id=\"unavailable-message\"]").first().text();
+        if(errorMessage.contains("GEMA")) {
+            // Gema sometimes blocks youtube music content in germany:
+            // https://www.gema.de/en/
+            // Detailed description:
+            // https://en.wikipedia.org/wiki/GEMA_%28German_organization%29
+            return "GEMA";
+        }
+        return "";
+    }
+}

app/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeStreamPreviewInfoExtractor.java

@@ -0,0 +1,169 @@
+package org.schabi.newpipe.extractor.services.youtube;
+
+import org.jsoup.nodes.Element;
+import org.schabi.newpipe.extractor.AbstractStreamInfo;
+import org.schabi.newpipe.extractor.Parser;
+import org.schabi.newpipe.extractor.exceptions.ParsingException;
+import org.schabi.newpipe.extractor.stream_info.StreamPreviewInfoExtractor;
+
+/**
+ * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
+ * YoutubeStreamPreviewInfoExtractor.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 YoutubeStreamPreviewInfoExtractor implements StreamPreviewInfoExtractor {
+
+    private final Element item;
+
+    public YoutubeStreamPreviewInfoExtractor(Element item) {
+        this.item = item;
+    }
+
+    @Override
+    public String getWebPageUrl() throws ParsingException {
+        try {
+            Element el = item.select("div[class*=\"yt-lockup-video\"").first();
+            Element dl = el.select("h3").first().select("a").first();
+            return dl.attr("abs:href");
+        } catch (Exception e) {
+            throw new ParsingException("Could not get web page url for the video", e);
+        }
+    }
+
+    @Override
+    public String getTitle() throws ParsingException {
+        try {
+            Element el = item.select("div[class*=\"yt-lockup-video\"").first();
+            Element dl = el.select("h3").first().select("a").first();
+            return dl.text();
+        } catch (Exception e) {
+            throw new ParsingException("Could not get title", e);
+        }
+    }
+
+    @Override
+    public int getDuration() throws ParsingException {
+        try {
+            return YoutubeParsingHelper.parseDurationString(
+                    item.select("span[class=\"video-time\"]").first().text());
+        } catch(Exception e) {
+            if(isLiveStream(item)) {
+                // -1 for no duration
+                return -1;
+            } else {
+                throw new ParsingException("Could not get Duration: " + getTitle(), e);
+            }
+        }
+    }
+
+    @Override
+    public String getUploader() throws ParsingException {
+        try {
+            return item.select("div[class=\"yt-lockup-byline\"]").first()
+                    .select("a").first()
+                    .text();
+        } catch (Exception e) {
+            throw new ParsingException("Could not get uploader", e);
+        }
+    }
+
+    @Override
+    public String getUploadDate() throws ParsingException {
+        try {
+            return item.select("div[class=\"yt-lockup-meta\"]").first()
+                    .select("li").first()
+                    .text();
+        } catch(Exception e) {
+            throw new ParsingException("Could not get uplaod date", e);
+        }
+    }
+
+    @Override
+    public long getViewCount() throws ParsingException {
+        String output;
+        String input;
+        try {
+            input = item.select("div[class=\"yt-lockup-meta\"]").first()
+                    .select("li").get(1)
+                    .text();
+        } catch (IndexOutOfBoundsException e) {
+            if(isLiveStream(item)) {
+                // -1 for no view count
+                return -1;
+            } else {
+                throw new ParsingException(
+                        "Could not parse yt-lockup-meta although available: " + getTitle(), e);
+            }
+        }
+
+        output = Parser.matchGroup1("([0-9,\\. ]*)", input)
+                .replace(" ", "")
+                .replace(".", "")
+                .replace(",", "");
+
+        try {
+            return Long.parseLong(output);
+        } catch (NumberFormatException e) {
+            // if this happens the video probably has no views
+            if(!input.isEmpty()) {
+                return 0;
+            } else {
+                throw new ParsingException("Could not handle input: " + input, e);
+            }
+        }
+    }
+
+    @Override
+    public String getThumbnailUrl() throws ParsingException {
+        try {
+            String url;
+            Element te = item.select("div[class=\"yt-thumb video-thumb\"]").first()
+                    .select("img").first();
+            url = te.attr("abs:src");
+            // Sometimes youtube sends links to gif files which somehow seem to not exist
+            // anymore. Items with such gif also offer a secondary image source. So we are going
+            // to use that if we've caught such an item.
+            if (url.contains(".gif")) {
+                url = te.attr("abs:data-thumb");
+            }
+            return url;
+        } catch (Exception e) {
+            throw new ParsingException("Could not get thumbnail url", e);
+        }
+    }
+
+    @Override
+    public AbstractStreamInfo.StreamType getStreamType() {
+        if(isLiveStream(item)) {
+            return AbstractStreamInfo.StreamType.LIVE_STREAM;
+        } else {
+            return AbstractStreamInfo.StreamType.VIDEO_STREAM;
+        }
+    }
+
+    private boolean isLiveStream(Element item) {
+        Element bla = item.select("span[class*=\"yt-badge-live\"]").first();
+
+        if(bla == null) {
+            // sometimes livestreams dont have badges but sill are live streams
+            // if video time is not available we most likly have an offline livestream
+            if(item.select("span[class*=\"video-time\"]").first() == null) {
+                return true;
+            }
+        }
+        return bla != null;
+    }
+}

app/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeStreamUrlIdHandler.java

@@ -0,0 +1,94 @@
+package org.schabi.newpipe.extractor.services.youtube;
+
+import org.schabi.newpipe.extractor.Parser;
+import org.schabi.newpipe.extractor.UrlIdHandler;
+import org.schabi.newpipe.extractor.exceptions.FoundAdException;
+import org.schabi.newpipe.extractor.exceptions.ParsingException;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+
+/**
+ * Created by Christian Schabesberger on 02.02.16.
+ *
+ * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
+ * YoutubeStreamUrlIdHandler.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 YoutubeStreamUrlIdHandler implements UrlIdHandler {
+    @SuppressWarnings("WeakerAccess")
+    @Override
+    public String getUrl(String videoId) {
+        return "https://www.youtube.com/watch?v=" + videoId;
+    }
+
+    @SuppressWarnings("WeakerAccess")
+    @Override
+    public String getId(String url) throws ParsingException, IllegalArgumentException {
+        if(url.isEmpty())
+        {
+            throw new IllegalArgumentException("The url parameter should not be empty");
+        }
+        String id;
+
+        if(url.contains("youtube")) {
+            if(url.contains("attribution_link")) {
+                try {
+                    String escapedQuery = Parser.matchGroup1("u=(.[^&|$]*)", url);
+                    String query = URLDecoder.decode(escapedQuery, "UTF-8");
+                    id = Parser.matchGroup1("v=([\\-a-zA-Z0-9_]{11})", query);
+                } catch(UnsupportedEncodingException uee) {
+                    throw new ParsingException("Could not parse attribution_link", uee);
+                }
+            }
+            else if(url.contains("vnd.youtube"))
+            {
+                id = Parser.matchGroup1("([\\-a-zA-Z0-9_]{11}).*", url);
+            } else if(url.contains("googleads")) {
+                throw new FoundAdException("Error found add: " + url);
+            } else {
+                id = Parser.matchGroup1("[?&]v=([\\-a-zA-Z0-9_]{11})", url);
+            }
+        }
+        else if(url.contains("youtu.be")) {
+            if(url.contains("v=")) {
+                id = Parser.matchGroup1("v=([\\-a-zA-Z0-9_]{11})", url);
+            } else {
+                id = Parser.matchGroup1("youtu\\.be/([a-zA-Z0-9_-]{11})", url);
+            }
+        }
+        else {
+            throw new ParsingException("Error no suitable url: " + url);
+        }
+
+
+        if(!id.isEmpty()){
+            return id;
+        } else {
+            throw new ParsingException("Error could not parse url: " + url);
+        }
+    }
+
+    public String cleanUrl(String complexUrl) throws ParsingException {
+        return getUrl(getId(complexUrl));
+    }
+
+    @Override
+    public boolean acceptUrl(String videoUrl) {
+        return videoUrl.contains("youtube") ||
+                videoUrl.contains("youtu.be");
+    }
+}

app/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeSuggestionExtractor.java

@@ -0,0 +1,100 @@
+package org.schabi.newpipe.extractor.services.youtube;
+
+import org.schabi.newpipe.extractor.Downloader;
+import org.schabi.newpipe.extractor.NewPipe;
+import org.schabi.newpipe.extractor.exceptions.ExtractionException;
+import org.schabi.newpipe.extractor.exceptions.ParsingException;
+import org.schabi.newpipe.extractor.search.SuggestionExtractor;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.net.URLEncoder;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Vector;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+
+/**
+ * Created by Christian Schabesberger on 28.09.16.
+ *
+ * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
+ * YoutubeSuggestionExtractor.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 YoutubeSuggestionExtractor extends SuggestionExtractor {
+
+    public static final String CHARSET_UTF_8 = "UTF-8";
+
+    public YoutubeSuggestionExtractor(int serviceId) {
+        super(serviceId);
+    }
+
+    @Override
+    public List<String> suggestionList(
+            String query, String contentCountry)
+            throws ExtractionException, IOException {
+        List<String> suggestions = new ArrayList<>();
+
+        Downloader dl = NewPipe.getDownloader();
+
+        String url = "https://suggestqueries.google.com/complete/search"
+                + "?client=" + ""
+                + "&output=" + "toolbar"
+                + "&ds=" + "yt"
+                + "&hl=" + URLEncoder.encode(contentCountry, CHARSET_UTF_8)
+                + "&q=" + URLEncoder.encode(query, CHARSET_UTF_8);
+
+
+        String response = dl.download(url);
+
+        //TODO: Parse xml data using Jsoup not done
+        DocumentBuilderFactory dbFactory = DocumentBuilderFactory.newInstance();
+        DocumentBuilder dBuilder;
+        org.w3c.dom.Document doc = null;
+
+        try {
+            dBuilder = dbFactory.newDocumentBuilder();
+            doc = dBuilder.parse(new InputSource(
+                    new ByteArrayInputStream(response.getBytes(CHARSET_UTF_8))));
+            doc.getDocumentElement().normalize();
+        } catch (ParserConfigurationException | SAXException | IOException e) {
+            throw new ParsingException("Could not parse document.");
+        }
+
+        try {
+            NodeList nList = doc.getElementsByTagName("CompleteSuggestion");
+            for (int temp = 0; temp < nList.getLength(); temp++) {
+
+                NodeList nList1 = doc.getElementsByTagName("suggestion");
+                Node nNode1 = nList1.item(temp);
+                if (nNode1.getNodeType() == Node.ELEMENT_NODE) {
+                    org.w3c.dom.Element eElement = (org.w3c.dom.Element) nNode1;
+                    suggestions.add(eElement.getAttribute("data"));
+                }
+            }
+            return suggestions;
+        } catch(Exception e) {
+            throw new ParsingException("Could not get suggestions form document.", e);
+        }
+    }
+}

app/src/main/java/org/schabi/newpipe/extractor/stream_info/AudioStream.java

@@ -0,0 +1,46 @@
+package org.schabi.newpipe.extractor.stream_info;
+
+/**
+ * Created by Christian Schabesberger on 04.03.16.
+ *
+ * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
+ * AudioStream.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 AudioStream {
+    public String url = "";
+    public int format = -1;
+    public int bandwidth = -1;
+    public int sampling_rate = -1;
+
+    public AudioStream(String url, int format, int bandwidth, int samplingRate) {
+        this.url = url; this.format = format;
+        this.bandwidth = bandwidth; this.sampling_rate = samplingRate;
+    }
+
+    // reveals whether two streams are the same, but have different urls
+    public boolean equalStats(AudioStream cmp) {
+        return format == cmp.format
+                && bandwidth == cmp.bandwidth
+                && sampling_rate == cmp.sampling_rate;
+    }
+
+    // reveals whether two streams are equal
+    public boolean equals(AudioStream cmp) {
+        return cmp != null && equalStats(cmp)
+                && url == cmp.url;
+    }
+}

app/src/main/java/org/schabi/newpipe/extractor/stream_info/StreamExtractor.java

@@ -0,0 +1,104 @@
+package org.schabi.newpipe.extractor.stream_info;
+
+/**
+ * Created by Christian Schabesberger on 10.08.15.
+ *
+ * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
+ * StreamExtractor.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 org.schabi.newpipe.extractor.UrlIdHandler;
+import org.schabi.newpipe.extractor.exceptions.ExtractionException;
+import org.schabi.newpipe.extractor.exceptions.ParsingException;
+
+import java.util.List;
+
+/**Scrapes information from a video streaming service (eg, YouTube).*/
+
+
+@SuppressWarnings("ALL")
+public abstract class StreamExtractor {
+
+    private int serviceId;
+    private String url;
+    private UrlIdHandler urlIdHandler;
+    private StreamPreviewInfoCollector previewInfoCollector;
+
+    public class ExtractorInitException extends ExtractionException {
+        public ExtractorInitException(String message) {
+            super(message);
+        }
+        public ExtractorInitException(Throwable cause) {
+            super(cause);
+        }
+        public ExtractorInitException(String message, Throwable cause) {
+            super(message, cause);
+        }
+    }
+
+    public class ContentNotAvailableException extends ParsingException {
+        public ContentNotAvailableException(String message) {
+            super(message);
+        }
+        public ContentNotAvailableException(String message, Throwable cause) {
+            super(message, cause);
+        }
+    }
+
+    public StreamExtractor(UrlIdHandler urlIdHandler, String url, int serviceId) {
+        this.serviceId = serviceId;
+        this.urlIdHandler = urlIdHandler;
+        previewInfoCollector = new StreamPreviewInfoCollector(urlIdHandler, serviceId);
+    }
+
+    protected StreamPreviewInfoCollector getStreamPreviewInfoCollector() {
+        return previewInfoCollector;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public UrlIdHandler getUrlIdHandler() {
+        return urlIdHandler;
+    }
+
+    public abstract int getTimeStamp() throws ParsingException;
+    public abstract String getTitle() throws ParsingException;
+    public abstract String getDescription() throws ParsingException;
+    public abstract String getUploader() throws ParsingException;
+    public abstract String getChannelUrl() throws ParsingException;
+    public abstract int getLength() throws ParsingException;
+    public abstract long getViewCount() throws ParsingException;
+    public abstract String getUploadDate() throws ParsingException;
+    public abstract String getThumbnailUrl() throws ParsingException;
+    public abstract String getUploaderThumbnailUrl() throws ParsingException;
+    public abstract List<AudioStream> getAudioStreams() throws ParsingException;
+    public abstract List<VideoStream> getVideoStreams() throws ParsingException;
+    public abstract List<VideoStream> getVideoOnlyStreams() throws ParsingException;
+    public abstract String getDashMpdUrl() throws ParsingException;
+    public abstract int getAgeLimit() throws ParsingException;
+    public abstract String getAverageRating() throws ParsingException;
+    public abstract int getLikeCount() throws ParsingException;
+    public abstract int getDislikeCount() throws ParsingException;
+    public abstract StreamPreviewInfoExtractor getNextVideo() throws ParsingException;
+    public abstract StreamPreviewInfoCollector getRelatedVideos() throws ParsingException;
+    public abstract String getPageUrl();
+    public abstract StreamInfo.StreamType getStreamType() throws ParsingException;
+    public int getServiceId() {
+        return serviceId;
+    }
+}

app/src/main/java/org/schabi/newpipe/extractor/stream_info/StreamInfo.java

@@ -0,0 +1,293 @@
+package org.schabi.newpipe.extractor.stream_info;
+
+import org.schabi.newpipe.extractor.AbstractStreamInfo;
+import org.schabi.newpipe.extractor.DashMpdParser;
+import org.schabi.newpipe.extractor.UrlIdHandler;
+import org.schabi.newpipe.extractor.exceptions.ExtractionException;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.Vector;
+
+/**
+ * Created by Christian Schabesberger on 26.08.15.
+ *
+ * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
+ * StreamInfo.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/>.
+ */
+
+/**Info object for opened videos, ie the video ready to play.*/
+@SuppressWarnings("ALL")
+public class StreamInfo extends AbstractStreamInfo {
+
+    public static class StreamExctractException extends ExtractionException {
+        StreamExctractException(String message) {
+            super(message);
+        }
+    }
+
+    public StreamInfo() {}
+
+    /**Creates a new StreamInfo object from an existing AbstractVideoInfo.
+     * All the shared properties are copied to the new StreamInfo.*/
+    @SuppressWarnings("WeakerAccess")
+    public StreamInfo(AbstractStreamInfo avi) {
+        this.id = avi.id;
+        this.title = avi.title;
+        this.uploader = avi.uploader;
+        this.thumbnail_url = avi.thumbnail_url;
+        this.webpage_url = avi.webpage_url;
+        this.upload_date = avi.upload_date;
+        this.upload_date = avi.upload_date;
+        this.view_count = avi.view_count;
+
+        //todo: better than this
+        if(avi instanceof StreamPreviewInfo) {
+            //shitty String to convert code
+            /*
+            String dur = ((StreamPreviewInfo)avi).duration;
+            int minutes = Integer.parseInt(dur.substring(0, dur.indexOf(":")));
+            int seconds = Integer.parseInt(dur.substring(dur.indexOf(":")+1, dur.length()));
+            */
+            this.duration = ((StreamPreviewInfo)avi).duration;
+        }
+    }
+
+    public void addException(Exception e) {
+        errors.add(e);
+    }
+
+    /**Fills out the video info fields which are common to all services.
+     * Probably needs to be overridden by subclasses*/
+    public static StreamInfo getVideoInfo(StreamExtractor extractor)
+            throws ExtractionException, IOException {
+        StreamInfo streamInfo = new StreamInfo();
+
+        streamInfo = extractImportantData(streamInfo, extractor);
+        streamInfo = extractStreams(streamInfo, extractor);
+        streamInfo = extractOptionalData(streamInfo, extractor);
+
+        return streamInfo;
+    }
+
+    private static StreamInfo extractImportantData(
+            StreamInfo streamInfo, StreamExtractor extractor)
+            throws ExtractionException, IOException {
+        /* ---- important data, withoug the video can't be displayed goes here: ---- */
+        // if one of these is not available an exception is meant to be thrown directly into the frontend.
+
+        UrlIdHandler uiconv = extractor.getUrlIdHandler();
+
+        streamInfo.service_id = extractor.getServiceId();
+        streamInfo.webpage_url = extractor.getPageUrl();
+        streamInfo.stream_type = extractor.getStreamType();
+        streamInfo.id = uiconv.getId(extractor.getPageUrl());
+        streamInfo.title = extractor.getTitle();
+        streamInfo.age_limit = extractor.getAgeLimit();
+
+        if((streamInfo.stream_type == StreamType.NONE)
+                || (streamInfo.webpage_url == null || streamInfo.webpage_url.isEmpty())
+                || (streamInfo.id == null || streamInfo.id.isEmpty())
+                || (streamInfo.title == null /* streamInfo.title can be empty of course */)
+                || (streamInfo.age_limit == -1)) {
+            throw new ExtractionException("Some importand stream information was not given.");
+        }
+
+        return streamInfo;
+    }
+
+    private static StreamInfo extractStreams(
+            StreamInfo streamInfo, StreamExtractor extractor)
+            throws ExtractionException, IOException {
+        /* ---- stream extraction goes here ---- */
+        // At least one type of stream has to be available,
+        // otherwise an exception will be thrown directly into the frontend.
+
+        try {
+            streamInfo.dashMpdUrl = extractor.getDashMpdUrl();
+        } catch(Exception e) {
+            streamInfo.addException(new ExtractionException("Couldn't get Dash manifest", e));
+        }
+
+        /*  Load and extract audio */
+        try {
+            streamInfo.audio_streams = extractor.getAudioStreams();
+        } catch(Exception e) {
+            streamInfo.addException(new ExtractionException("Couldn't get audio streams", e));
+        }
+        // also try to get streams from the dashMpd
+        if(streamInfo.dashMpdUrl != null && !streamInfo.dashMpdUrl.isEmpty()) {
+            if(streamInfo.audio_streams == null) {
+                streamInfo.audio_streams = new Vector<>();
+            }
+            //todo: make this quick and dirty solution a real fallback
+            // same as the quick and dirty above
+            try {
+                streamInfo.audio_streams.addAll(
+                        DashMpdParser.getAudioStreams(streamInfo.dashMpdUrl));
+            } catch(Exception e) {
+                streamInfo.addException(
+                        new ExtractionException("Couldn't get audio streams from dash mpd", e));
+            }
+        }
+        /* Extract video stream url*/
+        try {
+            streamInfo.video_streams = extractor.getVideoStreams();
+        } catch (Exception e) {
+            streamInfo.addException(
+                    new ExtractionException("Couldn't get video streams", e));
+        }
+        /* Extract video only stream url*/
+        try {
+            streamInfo.video_only_streams = extractor.getVideoOnlyStreams();
+        } catch(Exception e) {
+            streamInfo.addException(
+                    new ExtractionException("Couldn't get video only streams", e));
+        }
+
+        // either dash_mpd audio_only or video has to be available, otherwise we didn't get a stream,
+        // and therefore failed. (Since video_only_streams are just optional they don't caunt).
+        if((streamInfo.video_streams == null || streamInfo.video_streams.isEmpty())
+                && (streamInfo.audio_streams == null || streamInfo.audio_streams.isEmpty())
+                && (streamInfo.dashMpdUrl == null || streamInfo.dashMpdUrl.isEmpty())) {
+            throw new StreamExctractException(
+                    "Could not get any stream. See error variable to get further details.");
+        }
+
+        return streamInfo;
+    }
+
+    private static StreamInfo extractOptionalData(
+            StreamInfo streamInfo, StreamExtractor extractor) {
+        /*  ---- optional data goes here: ---- */
+        // If one of these fails, the frontend needs to handle that they are not available.
+        // Exceptions are therefore not thrown into the frontend, but stored into the error List,
+        // so the frontend can afterwards check where errors happened.
+
+        try {
+            streamInfo.thumbnail_url = extractor.getThumbnailUrl();
+        } catch(Exception e) {
+            streamInfo.addException(e);
+        }
+        try {
+            streamInfo.duration = extractor.getLength();
+        } catch(Exception e) {
+            streamInfo.addException(e);
+        }
+        try {
+            streamInfo.uploader = extractor.getUploader();
+        } catch(Exception e) {
+            streamInfo.addException(e);
+        }
+        try {
+            streamInfo.channel_url = extractor.getChannelUrl();
+        } catch(Exception e) {
+            streamInfo.addException(e);
+        }
+        try {
+            streamInfo.description = extractor.getDescription();
+        } catch(Exception e) {
+            streamInfo.addException(e);
+        }
+        try {
+            streamInfo.view_count = extractor.getViewCount();
+        } catch(Exception e) {
+            streamInfo.addException(e);
+        }
+        try {
+            streamInfo.upload_date = extractor.getUploadDate();
+        } catch(Exception e) {
+            streamInfo.addException(e);
+        }
+        try {
+            streamInfo.uploader_thumbnail_url = extractor.getUploaderThumbnailUrl();
+        } catch(Exception e) {
+            streamInfo.addException(e);
+        }
+        try {
+            streamInfo.start_position = extractor.getTimeStamp();
+        } catch(Exception e) {
+            streamInfo.addException(e);
+        }
+        try {
+            streamInfo.average_rating = extractor.getAverageRating();
+        } catch(Exception e) {
+            streamInfo.addException(e);
+        }
+        try {
+            streamInfo.like_count = extractor.getLikeCount();
+        } catch(Exception e) {
+            streamInfo.addException(e);
+        }
+        try {
+            streamInfo.dislike_count = extractor.getDislikeCount();
+        } catch(Exception e) {
+            streamInfo.addException(e);
+        }
+        try {
+            // get next video
+            if(streamInfo.next_video != null)
+            {
+                StreamPreviewInfoCollector c = new StreamPreviewInfoCollector(
+                        extractor.getUrlIdHandler(), extractor.getServiceId());
+                StreamPreviewInfoExtractor nextVideo = extractor.getNextVideo();
+                c.commit(nextVideo);
+                if(c.getItemList().size() != 0) {
+                    streamInfo.next_video = c.getItemList().get(0);
+                }
+                streamInfo.errors.addAll(c.getErrors());
+            }
+        }
+        catch(Exception e) {
+            streamInfo.addException(e);
+        }
+        try {
+            // get related videos
+            StreamPreviewInfoCollector c = extractor.getRelatedVideos();
+            streamInfo.related_streams = c.getItemList();
+            streamInfo.errors.addAll(c.getErrors());
+        } catch(Exception e) {
+            streamInfo.addException(e);
+        }
+
+        return streamInfo;
+    }
+
+    public String uploader_thumbnail_url = "";
+    public String channel_url = "";
+    public String description = "";
+
+    public List<VideoStream> video_streams = null;
+    public List<AudioStream> audio_streams = null;
+    public List<VideoStream> video_only_streams = null;
+    // video streams provided by the dash mpd do not need to be provided as VideoStream.
+    // Later on this will also aplly to audio streams. Since dash mpd is standarized,
+    // crawling such a file is not service dependent. Therefore getting audio only streams by yust
+    // providing the dash mpd fille will be possible in the future.
+    public String dashMpdUrl = "";
+    public int duration = -1;
+
+    public int age_limit = -1;
+    public int like_count = -1;
+    public int dislike_count = -1;
+    public String average_rating = "";
+    public StreamPreviewInfo next_video = null;
+    public List<StreamPreviewInfo> related_streams = null;
+    //in seconds. some metadata is not passed using a StreamInfo object!
+    public int start_position = 0;
+
+    public List<Throwable> errors = new Vector<>();
+}

app/src/main/java/org/schabi/newpipe/extractor/stream_info/StreamPreviewInfo.java

@@ -0,0 +1,28 @@
+package org.schabi.newpipe.extractor.stream_info;
+
+/**
+ * Created by Christian Schabesberger on 26.08.15.
+ *
+ * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
+ * StreamPreviewInfo.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 org.schabi.newpipe.extractor.AbstractStreamInfo;
+
+/**Info object for previews of unopened videos, eg search results, related videos*/
+public class StreamPreviewInfo extends AbstractStreamInfo {
+    public int duration;
+}

app/src/main/java/org/schabi/newpipe/extractor/stream_info/StreamPreviewInfoCollector.java

@@ -0,0 +1,101 @@
+package org.schabi.newpipe.extractor.stream_info;
+
+import org.schabi.newpipe.extractor.UrlIdHandler;
+import org.schabi.newpipe.extractor.exceptions.FoundAdException;
+import org.schabi.newpipe.extractor.exceptions.ParsingException;
+import org.schabi.newpipe.extractor.services.youtube.YoutubeStreamUrlIdHandler;
+
+import java.util.List;
+import java.util.Vector;
+
+/**
+ * Created by Christian Schabesberger on 28.02.16.
+ *
+ * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
+ * StreamPreviewInfoCollector.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 StreamPreviewInfoCollector {
+    private List<StreamPreviewInfo> itemList = new Vector<>();
+    private List<Throwable> errors = new Vector<>();
+    private UrlIdHandler urlIdHandler;
+    private int serviceId = -1;
+
+    public StreamPreviewInfoCollector(UrlIdHandler handler, int serviceId) {
+        urlIdHandler = handler;
+        this.serviceId = serviceId;
+    }
+
+    public List<StreamPreviewInfo> getItemList() {
+        return itemList;
+    }
+
+    public List<Throwable> getErrors() {
+        return errors;
+    }
+
+    public void addError(Exception e) {
+        errors.add(e);
+    }
+
+    public void commit(StreamPreviewInfoExtractor extractor) throws ParsingException {
+        try {
+            StreamPreviewInfo resultItem = new StreamPreviewInfo();
+            // importand information
+            resultItem.service_id = serviceId;
+            resultItem.webpage_url = extractor.getWebPageUrl();
+            if (urlIdHandler == null) {
+                throw new ParsingException("Error: UrlIdHandler not set");
+            } else if(!resultItem.webpage_url.isEmpty()) {
+                resultItem.id = (new YoutubeStreamUrlIdHandler()).getId(resultItem.webpage_url);
+            }
+            resultItem.title = extractor.getTitle();
+            resultItem.stream_type = extractor.getStreamType();
+
+            // optional information
+            try {
+                resultItem.duration = extractor.getDuration();
+            } catch (Exception e) {
+                addError(e);
+            }
+            try {
+                resultItem.uploader = extractor.getUploader();
+            } catch (Exception e) {
+                addError(e);
+            }
+            try {
+                resultItem.upload_date = extractor.getUploadDate();
+            } catch (Exception e) {
+                addError(e);
+            }
+            try {
+                resultItem.view_count = extractor.getViewCount();
+            } catch (Exception e) {
+                addError(e);
+            }
+            try {
+                resultItem.thumbnail_url = extractor.getThumbnailUrl();
+            } catch (Exception e) {
+                addError(e);
+            }
+            itemList.add(resultItem);
+        } catch(FoundAdException ae) {
+            System.out.println("AD_WARNING: " + ae.getMessage());
+        } catch (Exception e) {
+            addError(e);
+        }
+    }
+}

app/src/main/java/org/schabi/newpipe/extractor/stream_info/StreamPreviewInfoExtractor.java

@@ -0,0 +1,35 @@
+package org.schabi.newpipe.extractor.stream_info;
+
+import org.schabi.newpipe.extractor.AbstractStreamInfo;
+import org.schabi.newpipe.extractor.exceptions.ParsingException;
+
+/**
+ * Created by Christian Schabesberger on 28.02.16.
+ *
+ * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
+ * StreamPreviewInfoExtractor.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 interface StreamPreviewInfoExtractor {
+    AbstractStreamInfo.StreamType getStreamType() throws ParsingException;
+    String getWebPageUrl() throws ParsingException;
+    String getTitle() throws ParsingException;
+    int getDuration() throws ParsingException;
+    String getUploader() throws ParsingException;
+    String getUploadDate() throws ParsingException;
+    long getViewCount() throws  ParsingException;
+    String getThumbnailUrl() throws  ParsingException;
+}

app/src/main/java/org/schabi/newpipe/extractor/stream_info/VideoStream.java

@@ -0,0 +1,44 @@
+package org.schabi.newpipe.extractor.stream_info;
+
+/**
+ * Created by Christian Schabesberger on 04.03.16.
+ *
+ * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
+ * VideoStream.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 VideoStream {
+    //url of the stream
+    public String url = "";
+    public int format = -1;
+    public String resolution = "";
+
+    public VideoStream(String url, int format, String res) {
+        this.url = url; this.format = format; resolution = res;
+    }
+
+    // reveals wether two streams are the same, but have diferent urls
+    public boolean equalStats(VideoStream cmp) {
+        return format == cmp.format
+                && resolution == cmp.resolution;
+    }
+
+    // revelas wether two streams are equal
+    public boolean equals(VideoStream cmp) {
+        return cmp != null && equalStats(cmp)
+                && url == cmp.url;
+    }
+}

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

@@ -0,0 +1,174 @@
+package org.schabi.newpipe.info_list;
+
+import android.app.Activity;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.nostra13.universalimageloader.core.DisplayImageOptions;
+import com.nostra13.universalimageloader.core.ImageLoader;
+
+import org.schabi.newpipe.ImageErrorLoadingListener;
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.extractor.AbstractStreamInfo;
+import org.schabi.newpipe.extractor.stream_info.StreamPreviewInfo;
+
+/**
+ * Created by Christian Schabesberger on 26.09.16.
+ *
+ * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
+ * InfoItemBuilder.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 InfoItemBuilder {
+
+    public interface OnItemSelectedListener {
+        void selected(String url);
+    }
+
+    private Activity activity = null;
+    private View rootView = null;
+    private ImageLoader imageLoader = ImageLoader.getInstance();
+    private DisplayImageOptions displayImageOptions =
+            new DisplayImageOptions.Builder().cacheInMemory(true).build();
+    private OnItemSelectedListener onItemSelectedListener;
+
+    public InfoItemBuilder(Activity a, View rootView) {
+        activity = a;
+        this.rootView = rootView;
+    }
+
+    public void setOnItemSelectedListener(OnItemSelectedListener onItemSelectedListener) {
+        this.onItemSelectedListener = onItemSelectedListener;
+    }
+
+    public void buildByHolder(InfoItemHolder holder, final StreamPreviewInfo info) {
+        // fill holder with information
+        holder.itemVideoTitleView.setText(info.title);
+        if(info.uploader != null && !info.uploader.isEmpty()) {
+            holder.itemUploaderView.setText(info.uploader);
+        } else {
+            holder.itemUploaderView.setVisibility(View.INVISIBLE);
+        }
+        if(info.duration > 0) {
+            holder.itemDurationView.setText(getDurationString(info.duration));
+        } else {
+            if(info.stream_type == AbstractStreamInfo.StreamType.LIVE_STREAM) {
+                holder.itemDurationView.setText(R.string.duration_live);
+            } else {
+                holder.itemDurationView.setVisibility(View.GONE);
+            }
+        }
+        if(info.view_count >= 0) {
+            holder.itemViewCountView.setText(shortViewCount(info.view_count));
+        } else {
+            holder.itemViewCountView.setVisibility(View.GONE);
+        }
+        if(info.upload_date != null && !info.upload_date.isEmpty()) {
+            holder.itemUploadDateView.setText(info.upload_date + " • ");
+        }
+
+        holder.itemThumbnailView.setImageResource(R.drawable.dummy_thumbnail);
+        if(info.thumbnail_url != null && !info.thumbnail_url.isEmpty()) {
+            imageLoader.displayImage(info.thumbnail_url,
+                    holder.itemThumbnailView,
+                    displayImageOptions,
+                    new ImageErrorLoadingListener(activity, rootView, info.service_id));
+        }
+
+        holder.itemButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                onItemSelectedListener.selected(info.webpage_url);
+            }
+        });
+    }
+
+    public View buildView(ViewGroup parent, final StreamPreviewInfo info) {
+        View streamPreviewView = LayoutInflater.from(parent.getContext())
+                .inflate(R.layout.video_item, parent, false);
+        InfoItemHolder holder = new InfoItemHolder(streamPreviewView);
+        buildByHolder(holder, info);
+        return streamPreviewView;
+    }
+
+
+    public static String shortViewCount(Long viewCount){
+        if(viewCount >= 1000000000){
+            return Long.toString(viewCount/1000000000)+"B views";
+        }else if(viewCount>=1000000){
+            return Long.toString(viewCount/1000000)+"M views";
+        }else if(viewCount>=1000){
+            return Long.toString(viewCount/1000)+"K views";
+        }else {
+            return Long.toString(viewCount)+" views";
+        }
+    }
+
+    public static String getDurationString(int duration) {
+        String output = "";
+        int days = duration / (24 * 60 * 60); /* greater than a day */
+        duration %= (24 * 60 * 60);
+        int hours = duration / (60 * 60); /* greater than an hour */
+        duration %= (60 * 60);
+        int minutes = duration / 60;
+        int seconds = duration % 60;
+
+        //handle days
+        if(days > 0) {
+            output = Integer.toString(days) + ":";
+        }
+        // handle hours
+        if(hours > 0 || !output.isEmpty()) {
+            if(hours > 0) {
+                if(hours >= 10 || output.isEmpty()) {
+                    output += Integer.toString(hours);
+                } else {
+                    output += "0" + Integer.toString(hours);
+                }
+            } else {
+                output += "00";
+            }
+            output += ":";
+        }
+        //handle minutes
+        if(minutes > 0 || !output.isEmpty()) {
+            if(minutes > 0) {
+                if(minutes >= 10 || output.isEmpty()) {
+                    output += Integer.toString(minutes);
+                } else {
+                    output += "0" + Integer.toString(minutes);
+                }
+            } else {
+                output += "00";
+            }
+            output += ":";
+        }
+
+        //handle seconds
+        if(output.isEmpty()) {
+            output += "0:";
+        }
+
+        if(seconds >= 10) {
+            output += Integer.toString(seconds);
+        } else {
+            output += "0" + Integer.toString(seconds);
+        }
+
+        return output;
+    }
+}

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

@@ -0,0 +1,51 @@
+package org.schabi.newpipe.info_list;
+
+import android.support.v7.widget.RecyclerView;
+import android.view.View;
+import android.widget.Button;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import org.schabi.newpipe.R;
+
+/**
+ * Created by Christian Schabesberger on 01.08.16.
+ *
+ * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
+ * InfoItemHolder.java is part of NewPipe.
+ *
+ * NewPipe is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * NewPipe is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+public class InfoItemHolder extends RecyclerView.ViewHolder {
+
+    public ImageView itemThumbnailView;
+    public TextView itemVideoTitleView,
+            itemUploaderView,
+            itemDurationView,
+            itemUploadDateView,
+            itemViewCountView;
+    public Button itemButton;
+
+    public InfoItemHolder(View v) {
+        super(v);
+        itemThumbnailView = (ImageView) v.findViewById(R.id.itemThumbnailView);
+        itemVideoTitleView = (TextView) v.findViewById(R.id.itemVideoTitleView);
+        itemUploaderView = (TextView) v.findViewById(R.id.itemUploaderView);
+        itemDurationView = (TextView) v.findViewById(R.id.itemDurationView);
+        itemUploadDateView = (TextView) v.findViewById(R.id.itemUploadDateView);
+        itemViewCountView = (TextView) v.findViewById(R.id.itemViewCountView);
+        itemButton = (Button) v.findViewById(R.id.item_button);
+    }
+}

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

@@ -0,0 +1,78 @@
+package org.schabi.newpipe.info_list;
+
+import android.app.Activity;
+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.extractor.stream_info.StreamPreviewInfo;
+
+import java.util.List;
+import java.util.Vector;
+
+/**
+ * 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 InfoListAdapter extends RecyclerView.Adapter<InfoItemHolder> {
+
+    InfoItemBuilder infoItemBuilder = null;
+    List<StreamPreviewInfo> streamList = new Vector<>();
+
+    public InfoListAdapter(Activity a, View rootView) {
+        infoItemBuilder = new InfoItemBuilder(a, rootView);
+    }
+
+    public void setOnItemSelectedListener
+            (InfoItemBuilder.OnItemSelectedListener onItemSelectedListener) {
+        infoItemBuilder.setOnItemSelectedListener(onItemSelectedListener);
+    }
+
+    public void addStreamItemList(List<StreamPreviewInfo> videos) {
+        if(videos!= null) {
+            streamList.addAll(videos);
+            notifyDataSetChanged();
+        }
+    }
+
+    public void clearSteamItemList() {
+        streamList = new Vector<>();
+        notifyDataSetChanged();
+    }
+
+    @Override
+    public int getItemCount() {
+        return streamList.size();
+    }
+
+    @Override
+    public InfoItemHolder onCreateViewHolder(ViewGroup parent, int i) {
+        View itemView = LayoutInflater.from(parent.getContext())
+                .inflate(R.layout.video_item, parent, false);
+
+        return new InfoItemHolder(itemView);
+    }
+
+    @Override
+    public void onBindViewHolder(InfoItemHolder holder, int i) {
+        infoItemBuilder.buildByHolder(holder, streamList.get(i));
+    }
+}

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

@@ -0,0 +1,585 @@
+package org.schabi.newpipe.player;
+
+import android.app.Notification;
+import android.app.NotificationManager;
+import android.app.PendingIntent;
+import android.app.Service;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.res.Resources;
+import android.graphics.Bitmap;
+import android.media.AudioManager;
+import android.media.MediaPlayer;
+import android.net.wifi.WifiManager;
+import android.os.IBinder;
+import android.os.Parcel;
+import android.os.Parcelable;
+import android.os.PowerManager;
+import android.support.v7.app.NotificationCompat;
+import android.util.Log;
+import android.widget.RemoteViews;
+import android.widget.Toast;
+
+import org.schabi.newpipe.ActivityCommunicator;
+import org.schabi.newpipe.BuildConfig;
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.detail.VideoItemDetailActivity;
+import org.schabi.newpipe.detail.VideoItemDetailFragment;
+
+import java.io.IOException;
+import java.util.Arrays;
+
+/**
+ * Created by Adam Howard on 08/11/15.
+ * Copyright (c) Adam Howard <achdisposable1@gmail.com> 2015
+ *
+ * BackgroundPlayer.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/>.
+ */
+
+/**Plays the audio stream of videos in the background.*/
+public class BackgroundPlayer extends Service /*implements MediaPlayer.OnPreparedListener*/ {
+
+    private static final String TAG = "BackgroundPlayer";
+    private static final String CLASSNAME = "org.schabi.newpipe.player.BackgroundPlayer";
+    private static final String ACTION_STOP = CLASSNAME + ".STOP";
+    private static final String ACTION_PLAYPAUSE = CLASSNAME + ".PLAYPAUSE";
+    private static final String ACTION_REWIND = CLASSNAME + ".REWIND";
+    private static final String ACTION_PLAYBACK_STATE = CLASSNAME + ".PLAYBACK_STATE";
+    private static final String EXTRA_PLAYBACK_STATE = CLASSNAME + ".extras.EXTRA_PLAYBACK_STATE";
+
+    // Extra intent arguments
+    public static final String TITLE = "title";
+    public static final String WEB_URL = "web_url";
+    public static final String SERVICE_ID = "service_id";
+    public static final String CHANNEL_NAME = "channel_name";
+
+    private volatile String webUrl = "";
+    private volatile int serviceId = -1;
+    private volatile String channelName = "";
+
+    // Determines if the service is already running.
+    // Prevents launching the service twice.
+    public static volatile boolean isRunning;
+
+    public BackgroundPlayer() {
+        super();
+    }
+
+    @Override
+    public void onCreate() {
+        /*PendingIntent pi = PendingIntent.getActivity(this, 0,
+                new Intent(this, getClass()).addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP), 0);*/
+        super.onCreate();
+    }
+    @Override
+    public int onStartCommand(Intent intent, int flags, int startId) {
+        Toast.makeText(this, R.string.background_player_playing_toast,
+                Toast.LENGTH_SHORT).show();
+
+        String source = intent.getDataString();
+        //Log.i(TAG, "backgroundPLayer source:"+source);
+        String videoTitle = intent.getStringExtra(TITLE);
+        webUrl = intent.getStringExtra(WEB_URL);
+        serviceId = intent.getIntExtra(SERVICE_ID, -1);
+        channelName = intent.getStringExtra(CHANNEL_NAME);
+
+        //do nearly everything in a separate thread
+        PlayerThread player = new PlayerThread(source, videoTitle, this);
+        player.start();
+
+        isRunning = true;
+
+        // If we get killed after returning here, don't restart
+        return START_NOT_STICKY;
+    }
+
+    @Override
+    public IBinder onBind(Intent intent) {
+        // We don't provide binding (yet?), so return null
+        return null;
+    }
+
+    @Override
+    public void onDestroy() {
+        //Toast.makeText(this, "service done", Toast.LENGTH_SHORT).show();
+        isRunning = false;
+    }
+
+
+    private class PlayerThread extends Thread {
+        MediaPlayer mediaPlayer;
+        private String source;
+        private String title;
+        private int noteID = TAG.hashCode();
+        private BackgroundPlayer owner;
+        private NotificationManager noteMgr;
+        private WifiManager.WifiLock wifiLock;
+        private Bitmap videoThumbnail;
+        private NoteBuilder noteBuilder;
+        private volatile boolean donePlaying = false;
+
+        public PlayerThread(String src, String title, BackgroundPlayer owner) {
+            this.source = src;
+            this.title = title;
+            this.owner = owner;
+            mediaPlayer = new MediaPlayer();
+            mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC);
+        }
+
+        public boolean isDonePlaying() {
+            return donePlaying;
+        }
+
+        private boolean isPlaying() {
+            try {
+                return mediaPlayer.isPlaying();
+            } catch (IllegalStateException e) {
+                Log.w(TAG, "Unable to retrieve playing state", e);
+                return false;
+            }
+        }
+
+        private void setDonePlaying() {
+            donePlaying = true;
+            synchronized (PlayerThread.this) {
+                PlayerThread.this.notifyAll();
+            }
+        }
+
+        private synchronized PlaybackState getPlaybackState() {
+            try {
+                return new PlaybackState(mediaPlayer.getDuration(), mediaPlayer.getCurrentPosition(), isPlaying());
+            } catch (IllegalStateException e) {
+                // This isn't that nice way to handle this.
+                // maybe there is a better way
+                Log.w(TAG, this + ": Got illegal state exception while creating playback state", e);
+                return PlaybackState.UNPREPARED;
+            }
+        }
+
+        private void broadcastState() {
+            PlaybackState state = getPlaybackState();
+            if(state == null) return;
+            Intent intent = new Intent(ACTION_PLAYBACK_STATE);
+            intent.putExtra(EXTRA_PLAYBACK_STATE, state);
+            sendBroadcast(intent);
+        }
+
+        @Override
+        public void run() {
+            mediaPlayer.setWakeMode(getApplicationContext(), PowerManager.PARTIAL_WAKE_LOCK);//cpu lock
+            try {
+                mediaPlayer.setDataSource(source);
+                //We are already in a separate worker thread,
+                //so calling the blocking prepare() method should be ok
+                mediaPlayer.prepare();
+
+            } catch (IOException ioe) {
+                ioe.printStackTrace();
+                Log.e(TAG, "video source:" + source);
+                Log.e(TAG, "video title:" + title);
+                //can't do anything useful without a file to play; exit early
+                return;
+            }
+
+            try {
+                videoThumbnail = ActivityCommunicator.getCommunicator().backgroundPlayerThumbnail;
+            } catch (Exception e) {
+                Log.e(TAG, "Could not get video thumbnail from ActivityCommunicator");
+                e.printStackTrace();
+            }
+
+            WifiManager wifiMgr = (WifiManager)getSystemService(Context.WIFI_SERVICE);
+            wifiLock = wifiMgr.createWifiLock(WifiManager.WIFI_MODE_FULL, TAG);
+
+            //listen for end of video
+            mediaPlayer.setOnCompletionListener(new EndListener(wifiLock));
+
+            //get audio focus
+            /*
+            AudioManager audioManager = (AudioManager) getSystemService(Context.AUDIO_SERVICE);
+            int result = audioManager.requestAudioFocus(this, AudioManager.STREAM_MUSIC,
+                    AudioManager.AUDIOFOCUS_GAIN);
+
+            if (result != AudioManager.AUDIOFOCUS_REQUEST_GRANTED) {
+                // could not get audio focus.
+            }*/
+            wifiLock.acquire();
+            mediaPlayer.start();
+
+            IntentFilter filter = new IntentFilter();
+            filter.setPriority(Integer.MAX_VALUE);
+            filter.addAction(ACTION_PLAYPAUSE);
+            filter.addAction(ACTION_STOP);
+            filter.addAction(ACTION_REWIND);
+            filter.addAction(ACTION_PLAYBACK_STATE);
+            registerReceiver(broadcastReceiver, filter);
+
+            initNotificationBuilder();
+            startForeground(noteID, noteBuilder.build());
+
+            //currently decommissioned progressbar looping update code - works, but doesn't fit inside
+            //Notification.MediaStyle Notification layout.
+            noteMgr = (NotificationManager)getSystemService(NOTIFICATION_SERVICE);
+
+            //update every 2s or 4 times in the video, whichever is shorter
+            int vidLength = mediaPlayer.getDuration();
+            int sleepTime = Math.min(2000, (int)(vidLength / 4));
+            while(!isDonePlaying()) {
+                broadcastState();
+                try {
+                    synchronized (this) {
+                        wait(sleepTime);
+                    }
+                } catch (InterruptedException e) {
+                    Log.e(TAG, "sleep failure", e);
+                }
+            }
+        }
+
+        /**Handles button presses from the notification. */
+        private final BroadcastReceiver broadcastReceiver = new BroadcastReceiver() {
+            @Override
+            public void onReceive(Context context, Intent intent) {
+                String action = intent.getAction();
+                //Log.i(TAG, "received broadcast action:"+action);
+                switch (action) {
+                    case ACTION_PLAYPAUSE: {
+                        boolean isPlaying = mediaPlayer.isPlaying();
+                        if(isPlaying) {
+                            mediaPlayer.pause();
+                        } else {
+                            //reacquire CPU lock after auto-releasing it on pause
+                            mediaPlayer.setWakeMode(getApplicationContext(), PowerManager.PARTIAL_WAKE_LOCK);
+                            mediaPlayer.start();
+                        }
+                        synchronized (PlayerThread.this) {
+                            PlayerThread.this.notifyAll();
+                        }
+                        break;
+                    }
+                    case ACTION_REWIND:
+                        mediaPlayer.seekTo(0);
+                        synchronized (PlayerThread.this) {
+                            PlayerThread.this.notifyAll();
+                        }
+                        break;
+                    case ACTION_STOP:
+                        //this auto-releases CPU lock
+                        mediaPlayer.stop();
+                        afterPlayCleanup();
+                        break;
+                    case ACTION_PLAYBACK_STATE: {
+                        PlaybackState playbackState = intent.getParcelableExtra(EXTRA_PLAYBACK_STATE);
+                        if(!playbackState.equals(PlaybackState.UNPREPARED)) {
+                            noteBuilder.setProgress(playbackState.getDuration(), playbackState.getPlayedTime(), false);
+                            noteBuilder.setIsPlaying(playbackState.isPlaying());
+                        } else {
+                            noteBuilder.setProgress(0, 0, true);
+                        }
+                        noteMgr.notify(noteID, noteBuilder.build());
+                        break;
+                    }
+                }
+            }
+        };
+
+        private void afterPlayCleanup() {
+            // Notify thread to stop
+            setDonePlaying();
+            //remove progress bar
+            //noteBuilder.setProgress(0, 0, false);
+
+            //remove notification
+            noteMgr.cancel(noteID);
+            unregisterReceiver(broadcastReceiver);
+            //release mediaPlayer's system resources
+            mediaPlayer.release();
+
+            //release wifilock
+            wifiLock.release();
+            //remove foreground status of service; make BackgroundPlayer killable
+            stopForeground(true);
+            try {
+                // Wait for thread to stop
+                PlayerThread.this.join();
+            } catch (InterruptedException e) {
+                Log.e(TAG, "unable to join player thread", e);
+            }
+            stopSelf();
+        }
+
+        private class EndListener implements MediaPlayer.OnCompletionListener {
+            private WifiManager.WifiLock wl;
+            public EndListener(WifiManager.WifiLock wifiLock) {
+                this.wl = wifiLock;
+            }
+
+            @Override
+            public void onCompletion(MediaPlayer mp) {
+                afterPlayCleanup();
+            }
+        }
+
+        private void initNotificationBuilder() {
+            Notification note;
+            Resources res = getApplicationContext().getResources();
+
+            /*
+            NotificationCompat.Action pauseButton = new NotificationCompat.Action.Builder
+                    (R.drawable.ic_pause_white_24dp, "Pause", playPI).build();
+            */
+
+            PendingIntent playPI = PendingIntent.getBroadcast(owner, noteID,
+                    new Intent(ACTION_PLAYPAUSE), PendingIntent.FLAG_UPDATE_CURRENT);
+            PendingIntent stopPI = PendingIntent.getBroadcast(owner, noteID,
+                    new Intent(ACTION_STOP), PendingIntent.FLAG_UPDATE_CURRENT);
+            PendingIntent rewindPI = PendingIntent.getBroadcast(owner, noteID,
+                    new Intent(ACTION_REWIND), PendingIntent.FLAG_UPDATE_CURRENT);
+
+            //build intent to return to video, on tapping notification
+            Intent openDetailViewIntent = new Intent(getApplicationContext(),
+                    VideoItemDetailActivity.class);
+            openDetailViewIntent.putExtra(VideoItemDetailFragment.STREAMING_SERVICE, serviceId);
+            openDetailViewIntent.putExtra(VideoItemDetailFragment.VIDEO_URL, webUrl);
+            openDetailViewIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            PendingIntent openDetailView = PendingIntent.getActivity(owner, noteID,
+                    openDetailViewIntent, PendingIntent.FLAG_UPDATE_CURRENT);
+            noteBuilder = new NoteBuilder(owner, playPI, stopPI, rewindPI, openDetailView);
+            noteBuilder
+                    .setTitle(title)
+                    .setArtist(channelName)
+                    .setOngoing(true)
+                    .setDeleteIntent(stopPI)
+                            //doesn't fit with Notification.MediaStyle
+                            //.setProgress(vidLength, 0, false)
+                    .setSmallIcon(R.drawable.ic_play_circle_filled_white_24dp)
+                    .setContentIntent(PendingIntent.getActivity(getApplicationContext(),
+                            noteID, openDetailViewIntent,
+                            PendingIntent.FLAG_UPDATE_CURRENT))
+                    .setContentIntent(openDetailView)
+                    .setCategory(Notification.CATEGORY_TRANSPORT)
+                    //Make notification appear on lockscreen
+                    .setVisibility(Notification.VISIBILITY_PUBLIC);
+        }
+
+
+        /**
+         * Notification builder which works like the real builder but uses a custom view.
+         */
+        class NoteBuilder extends NotificationCompat.Builder {
+
+            /**
+             * @param context
+             * @inheritDoc
+             */
+            public NoteBuilder(Context context, PendingIntent playPI, PendingIntent stopPI,
+                               PendingIntent rewindPI, PendingIntent openDetailView) {
+                super(context);
+                setCustomContentView(createCustomContentView(playPI, stopPI, rewindPI, openDetailView));
+                setCustomBigContentView(createCustomBigContentView(playPI, stopPI, rewindPI, openDetailView));
+            }
+
+            private RemoteViews createCustomBigContentView(PendingIntent playPI,
+                                                           PendingIntent stopPI,
+                                                           PendingIntent rewindPI,
+                                                           PendingIntent openDetailView) {
+                //possibly found the expandedView problem,
+                //but can't test it as I don't have a 5.0 device. -medavox
+                RemoteViews expandedView =
+                        new RemoteViews(BuildConfig.APPLICATION_ID, R.layout.player_notification_expanded);
+                expandedView.setImageViewBitmap(R.id.notificationCover, videoThumbnail);
+                expandedView.setOnClickPendingIntent(R.id.notificationStop, stopPI);
+                expandedView.setOnClickPendingIntent(R.id.notificationPlayPause, playPI);
+                expandedView.setOnClickPendingIntent(R.id.notificationRewind, rewindPI);
+                expandedView.setOnClickPendingIntent(R.id.notificationContent, openDetailView);
+                return expandedView;
+            }
+
+            private RemoteViews createCustomContentView(PendingIntent playPI, PendingIntent stopPI,
+                                                        PendingIntent rewindPI,
+                                                        PendingIntent openDetailView) {
+                RemoteViews view = new RemoteViews(BuildConfig.APPLICATION_ID, R.layout.player_notification);
+                view.setImageViewBitmap(R.id.notificationCover, videoThumbnail);
+                view.setOnClickPendingIntent(R.id.notificationStop, stopPI);
+                view.setOnClickPendingIntent(R.id.notificationPlayPause, playPI);
+                view.setOnClickPendingIntent(R.id.notificationRewind, rewindPI);
+                view.setOnClickPendingIntent(R.id.notificationContent, openDetailView);
+                return view;
+            }
+
+            /**
+             * Set the title of the stream
+             * @param title the title of the stream
+             * @return this builder for chaining
+             */
+            NoteBuilder setTitle(String title) {
+                setContentTitle(title);
+                getContentView().setTextViewText(R.id.notificationSongName, title);
+                getBigContentView().setTextViewText(R.id.notificationSongName, title);
+                setTicker(String.format(getBaseContext().getString(
+                        R.string.background_player_time_text), title));
+                return this;
+            }
+
+            /**
+             * Set the artist of the stream
+             * @param artist the artist of the stream
+             * @return this builder for chaining
+             */
+            NoteBuilder setArtist(String artist) {
+                setSubText(artist);
+                getContentView().setTextViewText(R.id.notificationArtist, artist);
+                getBigContentView().setTextViewText(R.id.notificationArtist, artist);
+                return this;
+            }
+
+            @Override
+            public android.support.v4.app.NotificationCompat.Builder setProgress(int max, int progress, boolean indeterminate) {
+                super.setProgress(max, progress, indeterminate);
+                getBigContentView().setProgressBar(R.id.playbackProgress, max, progress, indeterminate);
+                return this;
+            }
+
+            /**
+             * Set the isPlaying state
+             * @param isPlaying the is playing state
+             */
+            public void setIsPlaying(boolean isPlaying) {
+                RemoteViews views = getContentView(), bigViews = getBigContentView();
+                int imageSrc;
+                if(isPlaying) {
+                    imageSrc = R.drawable.ic_pause_white_24dp;
+                } else {
+                    imageSrc = R.drawable.ic_play_circle_filled_white_24dp;
+                }
+                views.setImageViewResource(R.id.notificationPlayPause, imageSrc);
+                bigViews.setImageViewResource(R.id.notificationPlayPause, imageSrc);
+
+            }
+
+        }
+    }
+
+    /**
+     * Represents the state of the player.
+     */
+    public static class PlaybackState implements Parcelable {
+
+        private static final int INDEX_IS_PLAYING = 0;
+        private static final int INDEX_IS_PREPARED= 1;
+        private static final int INDEX_HAS_ERROR  = 2;
+        private final int duration;
+        private final int played;
+        private final boolean[] booleanValues = new boolean[3];
+
+        static final PlaybackState UNPREPARED = new PlaybackState(false, false, false);
+        static final PlaybackState FAILED = new PlaybackState(false, false, true);
+
+
+        PlaybackState(Parcel in) {
+            duration = in.readInt();
+            played = in.readInt();
+            in.readBooleanArray(booleanValues);
+        }
+
+        PlaybackState(int duration, int played, boolean isPlaying) {
+            this.played = played;
+            this.duration = duration;
+            this.booleanValues[INDEX_IS_PLAYING] = isPlaying;
+            this.booleanValues[INDEX_IS_PREPARED] = true;
+            this.booleanValues[INDEX_HAS_ERROR] = false;
+        }
+
+        private PlaybackState(boolean isPlaying, boolean isPrepared, boolean hasErrors) {
+            this.played = 0;
+            this.duration = 0;
+            this.booleanValues[INDEX_IS_PLAYING] = isPlaying;
+            this.booleanValues[INDEX_IS_PREPARED] = isPrepared;
+            this.booleanValues[INDEX_HAS_ERROR] = hasErrors;
+        }
+
+        int getDuration() {
+            return duration;
+        }
+
+        int getPlayedTime() {
+            return played;
+        }
+
+        boolean isPlaying() {
+            return booleanValues[INDEX_IS_PLAYING];
+        }
+
+        boolean isPrepared() {
+            return booleanValues[INDEX_IS_PREPARED];
+        }
+
+        boolean hasErrors() {
+            return booleanValues[INDEX_HAS_ERROR];
+        }
+
+
+        @Override
+        public void writeToParcel(Parcel dest, int flags) {
+            dest.writeInt(duration);
+            dest.writeInt(played);
+            dest.writeBooleanArray(booleanValues);
+        }
+
+        @Override
+        public int describeContents() {
+            return 0;
+        }
+
+        public static final Creator<PlaybackState> CREATOR = new Creator<PlaybackState>() {
+            @Override
+            public PlaybackState createFromParcel(Parcel in) {
+                return new PlaybackState(in);
+            }
+
+            @Override
+            public PlaybackState[] newArray(int size) {
+                return new PlaybackState[size];
+            }
+        };
+
+        @Override
+        public boolean equals(Object o) {
+            if (this == o) return true;
+            if (o == null || getClass() != o.getClass()) return false;
+
+            PlaybackState that = (PlaybackState) o;
+
+            if (duration != that.duration) return false;
+            if (played != that.played) return false;
+            return Arrays.equals(booleanValues, that.booleanValues);
+
+        }
+
+        @Override
+        public int hashCode() {
+            if(this == UNPREPARED) return 1;
+            if(this == FAILED) return 2;
+            int result = duration;
+            result = 31 * result + played;
+            result = 31 * result + Arrays.hashCode(booleanValues);
+            return result + 2;
+        }
+    }
+}

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

@@ -0,0 +1,564 @@
+/*
+ * Copyright (C) 2014 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Extended by Christian Schabesberger on 24.12.15.
+ *
+ * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
+ * ExoPlayerActivity.java is part of NewPipe. all changes are under GPL3
+ *
+ * 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/>.
+ */
+
+package org.schabi.newpipe.player;
+
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.player.exoplayer.DashRendererBuilder;
+import org.schabi.newpipe.player.exoplayer.EventLogger;
+import org.schabi.newpipe.player.exoplayer.ExtractorRendererBuilder;
+import org.schabi.newpipe.player.exoplayer.HlsRendererBuilder;
+import org.schabi.newpipe.player.exoplayer.NPExoPlayer;
+import org.schabi.newpipe.player.exoplayer.NPExoPlayer.RendererBuilder;
+import org.schabi.newpipe.player.exoplayer.SmoothStreamingRendererBuilder;
+
+import com.google.android.exoplayer.AspectRatioFrameLayout;
+import com.google.android.exoplayer.ExoPlaybackException;
+import com.google.android.exoplayer.ExoPlayer;
+import com.google.android.exoplayer.MediaCodecTrackRenderer.DecoderInitializationException;
+import com.google.android.exoplayer.MediaCodecUtil.DecoderQueryException;
+import com.google.android.exoplayer.MediaFormat;
+import com.google.android.exoplayer.audio.AudioCapabilities;
+import com.google.android.exoplayer.audio.AudioCapabilitiesReceiver;
+import com.google.android.exoplayer.drm.UnsupportedDrmException;
+import com.google.android.exoplayer.metadata.GeobMetadata;
+import com.google.android.exoplayer.metadata.PrivMetadata;
+import com.google.android.exoplayer.metadata.TxxxMetadata;
+import com.google.android.exoplayer.text.CaptionStyleCompat;
+import com.google.android.exoplayer.text.Cue;
+import com.google.android.exoplayer.text.SubtitleLayout;
+import com.google.android.exoplayer.util.DebugTextViewHelper;
+import com.google.android.exoplayer.util.MimeTypes;
+import com.google.android.exoplayer.util.Util;
+import com.google.android.exoplayer.util.VerboseLogUtil;
+
+import android.Manifest.permission;
+import android.annotation.TargetApi;
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.net.Uri;
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.util.Log;
+import android.view.KeyEvent;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.MotionEvent;
+import android.view.SurfaceHolder;
+import android.view.SurfaceView;
+import android.view.View;
+import android.view.View.OnKeyListener;
+import android.view.View.OnTouchListener;
+import android.view.accessibility.CaptioningManager;
+import android.widget.MediaController;
+import android.widget.PopupMenu;
+import android.widget.PopupMenu.OnMenuItemClickListener;
+import android.widget.Toast;
+
+import java.net.CookieHandler;
+import java.net.CookieManager;
+import java.net.CookiePolicy;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+
+/**
+ * An activity that plays media using {@link NPExoPlayer}.
+ */
+public class ExoPlayerActivity extends Activity {
+
+    // For use within demo app code.
+    public static final String CONTENT_ID_EXTRA = "content_id";
+    public static final String CONTENT_TYPE_EXTRA = "content_type";
+    public static final String PROVIDER_EXTRA = "provider";
+
+    // For use when launching the demo app using adb.
+    private static final String CONTENT_EXT_EXTRA = "type";
+
+    private static final String TAG = "PlayerActivity";
+    private static final int MENU_GROUP_TRACKS = 1;
+    private static final int ID_OFFSET = 2;
+
+    private static final CookieManager defaultCookieManager;
+    static {
+        defaultCookieManager = new CookieManager();
+        defaultCookieManager.setCookiePolicy(CookiePolicy.ACCEPT_ORIGINAL_SERVER);
+    }
+
+    private EventLogger eventLogger;
+    private MediaController mediaController;
+    private View shutterView;
+    private AspectRatioFrameLayout videoFrame;
+    private SurfaceView surfaceView;
+    private SubtitleLayout subtitleLayout;
+
+    private NPExoPlayer player;
+    private boolean playerNeedsPrepare;
+
+    private long playerPosition;
+    private boolean enableBackgroundAudio = true;
+
+    private Uri contentUri;
+    private int contentType;
+    private String contentId;
+    private String provider;
+
+    private AudioCapabilitiesReceiver audioCapabilitiesReceiver;
+
+
+    NPExoPlayer.Listener exoPlayerListener = new NPExoPlayer.Listener() {
+        @Override
+        public void onStateChanged(boolean playWhenReady, int playbackState) {
+            if (playbackState == ExoPlayer.STATE_ENDED) {
+                showControls();
+            }
+            String text = "playWhenReady=" + playWhenReady + ", playbackState=";
+            switch(playbackState) {
+                case ExoPlayer.STATE_BUFFERING:
+                    text += "buffering";
+                    break;
+                case ExoPlayer.STATE_ENDED:
+                    text += "ended";
+                    break;
+                case ExoPlayer.STATE_IDLE:
+                    text += "idle";
+                    break;
+                case ExoPlayer.STATE_PREPARING:
+                    text += "preparing";
+                    break;
+                case ExoPlayer.STATE_READY:
+                    text += "ready";
+                    break;
+                default:
+                    text += "unknown";
+                    break;
+            }
+            //todo: put text in some log
+        }
+
+        @Override
+        public void onError(Exception e) {
+            String errorString = null;
+            if (e instanceof UnsupportedDrmException) {
+                // Special case DRM failures.
+                UnsupportedDrmException unsupportedDrmException = (UnsupportedDrmException) e;
+                errorString = getString(Util.SDK_INT < 18 ? R.string.error_drm_not_supported
+                        : unsupportedDrmException.reason == UnsupportedDrmException.REASON_UNSUPPORTED_SCHEME
+                        ? R.string.error_drm_unsupported_scheme : R.string.error_drm_unknown);
+            } else if (e instanceof ExoPlaybackException
+                    && e.getCause() instanceof DecoderInitializationException) {
+                // Special case for decoder initialization failures.
+                DecoderInitializationException decoderInitializationException =
+                        (DecoderInitializationException) e.getCause();
+                if (decoderInitializationException.decoderName == null) {
+                    if (decoderInitializationException.getCause() instanceof DecoderQueryException) {
+                        errorString = getString(R.string.error_querying_decoders);
+                    } else if (decoderInitializationException.secureDecoderRequired) {
+                        errorString = getString(R.string.error_no_secure_decoder,
+                                decoderInitializationException.mimeType);
+                    } else {
+                        errorString = getString(R.string.error_no_decoder,
+                                decoderInitializationException.mimeType);
+                    }
+                } else {
+                    errorString = getString(R.string.error_instantiating_decoder,
+                            decoderInitializationException.decoderName);
+                }
+            }
+            if (errorString != null) {
+                Toast.makeText(getApplicationContext(), errorString, Toast.LENGTH_LONG).show();
+            }
+            playerNeedsPrepare = true;
+            showControls();
+        }
+
+        @Override
+        public void onVideoSizeChanged(int width, int height, int unappliedRotationDegrees, float pixelWidthAspectRatio) {
+            shutterView.setVisibility(View.GONE);
+            videoFrame.setAspectRatio(
+                    height == 0 ? 1 : (width * pixelWidthAspectRatio) / height);
+        }
+    };
+
+    SurfaceHolder.Callback surfaceHolderCallback = new SurfaceHolder.Callback() {
+        @Override
+        public void surfaceCreated(SurfaceHolder holder) {
+            if (player != null) {
+                player.setSurface(holder.getSurface());
+            }
+        }
+
+        @Override
+        public void surfaceChanged(SurfaceHolder holder, int format, int width, int height) {
+            // Do nothing.
+        }
+
+        @Override
+        public void surfaceDestroyed(SurfaceHolder holder) {
+            if (player != null) {
+                player.blockingClearSurface();
+            }
+        }
+    };
+
+    NPExoPlayer.CaptionListener captionListener = new NPExoPlayer.CaptionListener() {
+        @Override
+        public void onCues(List<Cue> cues) {
+            subtitleLayout.setCues(cues);
+        }
+    };
+
+    NPExoPlayer.Id3MetadataListener id3MetadataListener = new NPExoPlayer.Id3MetadataListener() {
+        @Override
+        public void onId3Metadata(Map<String, Object> metadata) {
+            for (Map.Entry<String, Object> entry : metadata.entrySet()) {
+                if (TxxxMetadata.TYPE.equals(entry.getKey())) {
+                    TxxxMetadata txxxMetadata = (TxxxMetadata) entry.getValue();
+                    Log.i(TAG, String.format("ID3 TimedMetadata %s: description=%s, value=%s",
+                            TxxxMetadata.TYPE, txxxMetadata.description, txxxMetadata.value));
+                } else if (PrivMetadata.TYPE.equals(entry.getKey())) {
+                    PrivMetadata privMetadata = (PrivMetadata) entry.getValue();
+                    Log.i(TAG, String.format("ID3 TimedMetadata %s: owner=%s",
+                            PrivMetadata.TYPE, privMetadata.owner));
+                } else if (GeobMetadata.TYPE.equals(entry.getKey())) {
+                    GeobMetadata geobMetadata = (GeobMetadata) entry.getValue();
+                    Log.i(TAG, String.format("ID3 TimedMetadata %s: mimeType=%s, filename=%s, description=%s",
+                            GeobMetadata.TYPE, geobMetadata.mimeType, geobMetadata.filename,
+                            geobMetadata.description));
+                } else {
+                    Log.i(TAG, String.format("ID3 TimedMetadata %s", entry.getKey()));
+                }
+            }
+        }
+    };
+
+    AudioCapabilitiesReceiver.Listener audioCapabilitiesListener = new AudioCapabilitiesReceiver.Listener() {
+        @Override
+        public void onAudioCapabilitiesChanged(AudioCapabilities audioCapabilities) {
+            if (player == null) {
+                return;
+            }
+            boolean backgrounded = player.getBackgrounded();
+            boolean playWhenReady = player.getPlayWhenReady();
+            releasePlayer();
+            preparePlayer(playWhenReady);
+            player.setBackgrounded(backgrounded);
+        }
+    };
+
+    // Activity lifecycle
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        setContentView(R.layout.exo_player_activity);
+        View root = findViewById(R.id.root);
+        root.setOnTouchListener(new OnTouchListener() {
+            @Override
+            public boolean onTouch(View view, MotionEvent motionEvent) {
+                if (motionEvent.getAction() == MotionEvent.ACTION_DOWN) {
+                    toggleControlsVisibility();
+                } else if (motionEvent.getAction() == MotionEvent.ACTION_UP) {
+                    view.performClick();
+                }
+                return true;
+            }
+        });
+        root.setOnKeyListener(new OnKeyListener() {
+            @Override
+            public boolean onKey(View v, int keyCode, KeyEvent event) {
+                if (keyCode == KeyEvent.KEYCODE_BACK || keyCode == KeyEvent.KEYCODE_ESCAPE
+                        || keyCode == KeyEvent.KEYCODE_MENU) {
+                    return false;
+                }
+                return mediaController.dispatchKeyEvent(event);
+            }
+        });
+
+        shutterView = findViewById(R.id.shutter);
+
+        videoFrame = (AspectRatioFrameLayout) findViewById(R.id.video_frame);
+        surfaceView = (SurfaceView) findViewById(R.id.surface_view);
+        surfaceView.getHolder().addCallback(surfaceHolderCallback);
+        subtitleLayout = (SubtitleLayout) findViewById(R.id.subtitles);
+
+        //todo: replace that creapy mediaController
+        mediaController = new KeyCompatibleMediaController(this);
+        mediaController.setAnchorView(root);
+
+        //todo: check what cookie handler does, and if we even need it
+        CookieHandler currentHandler = CookieHandler.getDefault();
+        if (currentHandler != defaultCookieManager) {
+            CookieHandler.setDefault(defaultCookieManager);
+        }
+
+        audioCapabilitiesReceiver = new AudioCapabilitiesReceiver(this, audioCapabilitiesListener);
+        audioCapabilitiesReceiver.register();
+    }
+
+    @Override
+    public void onNewIntent(Intent intent) {
+        releasePlayer();
+        playerPosition = 0;
+        setIntent(intent);
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        Intent intent = getIntent();
+        contentUri = intent.getData();
+        contentType = intent.getIntExtra(CONTENT_TYPE_EXTRA,
+                inferContentType(contentUri, intent.getStringExtra(CONTENT_EXT_EXTRA)));
+        contentId = intent.getStringExtra(CONTENT_ID_EXTRA);
+        provider = intent.getStringExtra(PROVIDER_EXTRA);
+        configureSubtitleView();
+        if (player == null) {
+            if (!maybeRequestPermission()) {
+                preparePlayer(true);
+            }
+        } else {
+            player.setBackgrounded(false);
+        }
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        if (!enableBackgroundAudio) {
+            releasePlayer();
+        } else {
+            player.setBackgrounded(true);
+        }
+        shutterView.setVisibility(View.VISIBLE);
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        audioCapabilitiesReceiver.unregister();
+        releasePlayer();
+    }
+
+
+    // Permission request listener method
+
+    @Override
+    public void onRequestPermissionsResult(int requestCode, String[] permissions,
+                                           int[] grantResults) {
+        if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
+            preparePlayer(true);
+        } else {
+            Toast.makeText(getApplicationContext(), R.string.storage_permission_denied,
+                    Toast.LENGTH_LONG).show();
+            finish();
+        }
+    }
+
+    // Permission management methods
+
+    /**
+     * Checks whether it is necessary to ask for permission to read storage. If necessary, it also
+     * requests permission.
+     *
+     * @return true if a permission request is made. False if it is not necessary.
+     */
+    @TargetApi(23)
+    private boolean maybeRequestPermission() {
+        if (requiresPermission(contentUri)) {
+            requestPermissions(new String[] {permission.READ_EXTERNAL_STORAGE}, 0);
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    @TargetApi(23)
+    private boolean requiresPermission(Uri uri) {
+        return Util.SDK_INT >= 23
+                && Util.isLocalFileUri(uri)
+                && checkSelfPermission(permission.READ_EXTERNAL_STORAGE)
+                != PackageManager.PERMISSION_GRANTED;
+    }
+
+    // Internal methods
+
+    private RendererBuilder getRendererBuilder() {
+        String userAgent = Util.getUserAgent(this, "NewPipeExoPlayer");
+        switch (contentType) {
+            case Util.TYPE_SS:
+                // default
+                //return new SmoothStreamingRendererBuilder(this, userAgent, contentUri.toString());
+            case Util.TYPE_DASH:
+                // if a dash manifest is available
+                //return new DashRendererBuilder(this, userAgent, contentUri.toString());
+            case Util.TYPE_HLS:
+                // for livestreams
+                return new HlsRendererBuilder(this, userAgent, contentUri.toString());
+            case Util.TYPE_OTHER:
+                // video only streaming
+                return new ExtractorRendererBuilder(this, userAgent, contentUri);
+            default:
+                throw new IllegalStateException("Unsupported type: " + contentType);
+        }
+    }
+
+    private void preparePlayer(boolean playWhenReady) {
+        if (player == null) {
+            player = new NPExoPlayer(getRendererBuilder());
+            player.addListener(exoPlayerListener);
+            player.setCaptionListener(captionListener);
+            player.setMetadataListener(id3MetadataListener);
+            player.seekTo(playerPosition);
+            playerNeedsPrepare = true;
+            mediaController.setMediaPlayer(player.getPlayerControl());
+            mediaController.setEnabled(true);
+            eventLogger = new EventLogger();
+            eventLogger.startSession();
+            player.addListener(eventLogger);
+            player.setInfoListener(eventLogger);
+            player.setInternalErrorListener(eventLogger);
+        }
+        if (playerNeedsPrepare) {
+            player.prepare();
+            playerNeedsPrepare = false;
+        }
+        player.setSurface(surfaceView.getHolder().getSurface());
+        player.setPlayWhenReady(playWhenReady);
+    }
+
+    private void releasePlayer() {
+        if (player != null) {
+            playerPosition = player.getCurrentPosition();
+            player.release();
+            player = null;
+            eventLogger.endSession();
+            eventLogger = null;
+        }
+    }
+
+    private void toggleControlsVisibility()  {
+        if (mediaController.isShowing()) {
+            mediaController.hide();
+        } else {
+            showControls();
+        }
+    }
+
+    private void showControls() {
+        mediaController.show(0);
+    }
+
+    private void configureSubtitleView() {
+        CaptionStyleCompat style;
+        float fontScale;
+        if (Util.SDK_INT >= 19) {
+            style = getUserCaptionStyleV19();
+            fontScale = getUserCaptionFontScaleV19();
+        } else {
+            style = CaptionStyleCompat.DEFAULT;
+            fontScale = 1.0f;
+        }
+        subtitleLayout.setStyle(style);
+        subtitleLayout.setFractionalTextSize(SubtitleLayout.DEFAULT_TEXT_SIZE_FRACTION * fontScale);
+    }
+
+    @TargetApi(19)
+    private float getUserCaptionFontScaleV19() {
+        CaptioningManager captioningManager =
+                (CaptioningManager) getSystemService(Context.CAPTIONING_SERVICE);
+        return captioningManager.getFontScale();
+    }
+
+    @TargetApi(19)
+    private CaptionStyleCompat getUserCaptionStyleV19() {
+        CaptioningManager captioningManager =
+                (CaptioningManager) getSystemService(Context.CAPTIONING_SERVICE);
+        return CaptionStyleCompat.createFromCaptionStyle(captioningManager.getUserStyle());
+    }
+
+    /**
+     * Makes a best guess to infer the type from a media {@link Uri} and an optional overriding file
+     * extension.
+     *
+     * @param uri The {@link Uri} of the media.
+     * @param fileExtension An overriding file extension.
+     * @return The inferred type.
+     */
+    private static int inferContentType(Uri uri, String fileExtension) {
+        String lastPathSegment = !TextUtils.isEmpty(fileExtension) ? "." + fileExtension
+                : uri.getLastPathSegment();
+        return Util.inferContentType(lastPathSegment);
+    }
+
+    private static final class KeyCompatibleMediaController extends MediaController {
+
+        private MediaController.MediaPlayerControl playerControl;
+
+        public KeyCompatibleMediaController(Context context) {
+            super(context);
+        }
+
+        @Override
+        public void setMediaPlayer(MediaController.MediaPlayerControl playerControl) {
+            super.setMediaPlayer(playerControl);
+            this.playerControl = playerControl;
+        }
+
+        @Override
+        public boolean dispatchKeyEvent(KeyEvent event) {
+            int keyCode = event.getKeyCode();
+            if (playerControl.canSeekForward() && keyCode == KeyEvent.KEYCODE_MEDIA_FAST_FORWARD) {
+                if (event.getAction() == KeyEvent.ACTION_DOWN) {
+                    playerControl.seekTo(playerControl.getCurrentPosition() + 15000); // milliseconds
+                    show();
+                }
+                return true;
+            } else if (playerControl.canSeekBackward() && keyCode == KeyEvent.KEYCODE_MEDIA_REWIND) {
+                if (event.getAction() == KeyEvent.ACTION_DOWN) {
+                    playerControl.seekTo(playerControl.getCurrentPosition() - 5000); // milliseconds
+                    show();
+                }
+                return true;
+            }
+            return super.dispatchKeyEvent(event);
+        }
+    }
+
+}

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

@@ -1,11 +1,13 @@
-package org.schabi.newpipe;
+package org.schabi.newpipe.player;
 
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.pm.ActivityInfo;
 import android.content.res.Configuration;
+import android.graphics.drawable.Drawable;
 import android.media.MediaPlayer;
+import android.media.AudioManager;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
@@ -26,6 +28,9 @@ import android.widget.MediaController;
 import android.widget.ProgressBar;
 import android.widget.VideoView;
 
+import org.schabi.newpipe.App;
+import org.schabi.newpipe.R;
+
 /**
  * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
  * PlayVideoActivity.java is part of NewPipe.
@@ -61,14 +66,14 @@ public class PlayVideoActivity extends AppCompatActivity {
 
     private ActionBar actionBar;
     private VideoView videoView;
-    private int position = 0;
+    private int position;
     private MediaController mediaController;
     private ProgressBar progressBar;
     private View decorView;
-    private boolean uiIsHidden = false;
-    private static long lastUiShowTime = 0;
+    private boolean uiIsHidden;
+    private static long lastUiShowTime;
     private boolean isLandscape = true;
-    private boolean hasSoftKeys = false;
+    private boolean hasSoftKeys;
 
     private SharedPreferences prefs;
     private static final String PREF_IS_LANDSCAPE = "is_landscape";
@@ -78,6 +83,10 @@ public class PlayVideoActivity extends AppCompatActivity {
         super.onCreate(savedInstanceState);
 
         setContentView(R.layout.activity_play_video);
+        setVolumeControlStream(AudioManager.STREAM_MUSIC);
+
+        //set background arrow style
+        getSupportActionBar().setHomeAsUpIndicator(R.drawable.ic_arrow_back_white_24dp);
 
         isLandscape = checkIfLandscape();
         hasSoftKeys = checkIfHasSoftKeys();
@@ -129,7 +138,7 @@ public class PlayVideoActivity extends AppCompatActivity {
             public void onPrepared(MediaPlayer mp) {
                 progressBar.setVisibility(View.GONE);
                 videoView.seekTo(position);
-                if (position == 0) {
+                if (position <= 0) {
                     videoView.start();
                     showUi();
                 } else {
@@ -190,7 +199,6 @@ public class PlayVideoActivity extends AppCompatActivity {
     @Override
     public void onResume() {
         super.onResume();
-        App.checkStartTor(this);
     }
 
     @Override
@@ -319,7 +327,7 @@ public class PlayVideoActivity extends AppCompatActivity {
 
             int realHeight = realDisplayMetrics.heightPixels;
             int displayHeight = displayMetrics.heightPixels;
-            return (realHeight - displayHeight);
+            return realHeight - displayHeight;
         } else {
             return 50;
         }
@@ -336,7 +344,7 @@ public class PlayVideoActivity extends AppCompatActivity {
 
             int realWidth = realDisplayMetrics.widthPixels;
             int displayWidth = displayMetrics.widthPixels;
-            return (realWidth - displayWidth);
+            return realWidth - displayWidth;
         } else {
             return 50;
         }

app/src/main/java/org/schabi/newpipe/player/exoplayer/DashRendererBuilder.java

@@ -0,0 +1,268 @@
+/*
+ * Copyright (C) 2014 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.schabi.newpipe.player.exoplayer;
+
+import org.schabi.newpipe.player.exoplayer.NPExoPlayer.RendererBuilder;
+
+import com.google.android.exoplayer.DefaultLoadControl;
+import com.google.android.exoplayer.LoadControl;
+import com.google.android.exoplayer.MediaCodecAudioTrackRenderer;
+import com.google.android.exoplayer.MediaCodecSelector;
+import com.google.android.exoplayer.MediaCodecVideoTrackRenderer;
+import com.google.android.exoplayer.TrackRenderer;
+import com.google.android.exoplayer.audio.AudioCapabilities;
+import com.google.android.exoplayer.chunk.ChunkSampleSource;
+import com.google.android.exoplayer.chunk.ChunkSource;
+import com.google.android.exoplayer.chunk.FormatEvaluator.AdaptiveEvaluator;
+import com.google.android.exoplayer.dash.DashChunkSource;
+import com.google.android.exoplayer.dash.DefaultDashTrackSelector;
+import com.google.android.exoplayer.dash.mpd.AdaptationSet;
+import com.google.android.exoplayer.dash.mpd.MediaPresentationDescription;
+import com.google.android.exoplayer.dash.mpd.MediaPresentationDescriptionParser;
+import com.google.android.exoplayer.dash.mpd.Period;
+import com.google.android.exoplayer.dash.mpd.UtcTimingElement;
+import com.google.android.exoplayer.dash.mpd.UtcTimingElementResolver;
+import com.google.android.exoplayer.dash.mpd.UtcTimingElementResolver.UtcTimingCallback;
+import com.google.android.exoplayer.drm.MediaDrmCallback;
+import com.google.android.exoplayer.drm.StreamingDrmSessionManager;
+import com.google.android.exoplayer.drm.UnsupportedDrmException;
+import com.google.android.exoplayer.text.TextTrackRenderer;
+import com.google.android.exoplayer.upstream.DataSource;
+import com.google.android.exoplayer.upstream.DefaultAllocator;
+import com.google.android.exoplayer.upstream.DefaultBandwidthMeter;
+import com.google.android.exoplayer.upstream.DefaultUriDataSource;
+import com.google.android.exoplayer.upstream.UriDataSource;
+import com.google.android.exoplayer.util.ManifestFetcher;
+import com.google.android.exoplayer.util.Util;
+
+import android.content.Context;
+import android.media.AudioManager;
+import android.media.MediaCodec;
+import android.os.Handler;
+import android.util.Log;
+
+import java.io.IOException;
+
+/**
+ * A {@link RendererBuilder} for DASH.
+ */
+public class DashRendererBuilder implements RendererBuilder {
+
+  private static final String TAG = "DashRendererBuilder";
+
+  private static final int BUFFER_SEGMENT_SIZE = 64 * 1024;
+  private static final int VIDEO_BUFFER_SEGMENTS = 200;
+  private static final int AUDIO_BUFFER_SEGMENTS = 54;
+  private static final int TEXT_BUFFER_SEGMENTS = 2;
+  private static final int LIVE_EDGE_LATENCY_MS = 30000;
+
+  private static final int SECURITY_LEVEL_UNKNOWN = -1;
+  private static final int SECURITY_LEVEL_1 = 1;
+  private static final int SECURITY_LEVEL_3 = 3;
+
+  private final Context context;
+  private final String userAgent;
+  private final String url;
+  private final MediaDrmCallback drmCallback;
+
+  private AsyncRendererBuilder currentAsyncBuilder;
+
+  public DashRendererBuilder(Context context, String userAgent, String url,
+      MediaDrmCallback drmCallback) {
+    this.context = context;
+    this.userAgent = userAgent;
+    this.url = url;
+    this.drmCallback = drmCallback;
+  }
+
+  @Override
+  public void buildRenderers(NPExoPlayer player) {
+    currentAsyncBuilder = new AsyncRendererBuilder(context, userAgent, url, drmCallback, player);
+    currentAsyncBuilder.init();
+  }
+
+  @Override
+  public void cancel() {
+    if (currentAsyncBuilder != null) {
+      currentAsyncBuilder.cancel();
+      currentAsyncBuilder = null;
+    }
+  }
+
+  private static final class AsyncRendererBuilder
+      implements ManifestFetcher.ManifestCallback<MediaPresentationDescription>, UtcTimingCallback {
+
+    private final Context context;
+    private final String userAgent;
+    private final MediaDrmCallback drmCallback;
+    private final NPExoPlayer player;
+    private final ManifestFetcher<MediaPresentationDescription> manifestFetcher;
+    private final UriDataSource manifestDataSource;
+
+    private boolean canceled;
+    private MediaPresentationDescription manifest;
+    private long elapsedRealtimeOffset;
+
+    public AsyncRendererBuilder(Context context, String userAgent, String url,
+        MediaDrmCallback drmCallback, NPExoPlayer player) {
+      this.context = context;
+      this.userAgent = userAgent;
+      this.drmCallback = drmCallback;
+      this.player = player;
+      MediaPresentationDescriptionParser parser = new MediaPresentationDescriptionParser();
+      manifestDataSource = new DefaultUriDataSource(context, userAgent);
+      manifestFetcher = new ManifestFetcher<>(url, manifestDataSource, parser);
+    }
+
+    public void init() {
+      manifestFetcher.singleLoad(player.getMainHandler().getLooper(), this);
+    }
+
+    public void cancel() {
+      canceled = true;
+    }
+
+    @Override
+    public void onSingleManifest(MediaPresentationDescription manifest) {
+      if (canceled) {
+        return;
+      }
+
+      this.manifest = manifest;
+      if (manifest.dynamic && manifest.utcTiming != null) {
+        UtcTimingElementResolver.resolveTimingElement(manifestDataSource, manifest.utcTiming,
+            manifestFetcher.getManifestLoadCompleteTimestamp(), this);
+      } else {
+        buildRenderers();
+      }
+    }
+
+    @Override
+    public void onSingleManifestError(IOException e) {
+      if (canceled) {
+        return;
+      }
+
+      player.onRenderersError(e);
+    }
+
+    @Override
+    public void onTimestampResolved(UtcTimingElement utcTiming, long elapsedRealtimeOffset) {
+      if (canceled) {
+        return;
+      }
+
+      this.elapsedRealtimeOffset = elapsedRealtimeOffset;
+      buildRenderers();
+    }
+
+    @Override
+    public void onTimestampError(UtcTimingElement utcTiming, IOException e) {
+      if (canceled) {
+        return;
+      }
+
+      Log.e(TAG, "Failed to resolve UtcTiming element [" + utcTiming + "]", e);
+      // Be optimistic and continue in the hope that the device clock is correct.
+      buildRenderers();
+    }
+
+    private void buildRenderers() {
+      Period period = manifest.getPeriod(0);
+      Handler mainHandler = player.getMainHandler();
+      LoadControl loadControl = new DefaultLoadControl(new DefaultAllocator(BUFFER_SEGMENT_SIZE));
+      DefaultBandwidthMeter bandwidthMeter = new DefaultBandwidthMeter(mainHandler, player);
+
+      boolean hasContentProtection = false;
+      for (int i = 0; i < period.adaptationSets.size(); i++) {
+        AdaptationSet adaptationSet = period.adaptationSets.get(i);
+        if (adaptationSet.type != AdaptationSet.TYPE_UNKNOWN) {
+          hasContentProtection |= adaptationSet.hasContentProtection();
+        }
+      }
+
+      // Check drm support if necessary.
+      boolean filterHdContent = false;
+      StreamingDrmSessionManager drmSessionManager = null;
+      if (hasContentProtection) {
+        if (Util.SDK_INT < 18) {
+          player.onRenderersError(
+              new UnsupportedDrmException(UnsupportedDrmException.REASON_UNSUPPORTED_SCHEME));
+          return;
+        }
+        try {
+          drmSessionManager = StreamingDrmSessionManager.newWidevineInstance(
+              player.getPlaybackLooper(), drmCallback, null, player.getMainHandler(), player);
+          filterHdContent = getWidevineSecurityLevel(drmSessionManager) != SECURITY_LEVEL_1;
+        } catch (UnsupportedDrmException e) {
+          player.onRenderersError(e);
+          return;
+        }
+      }
+
+      // Build the video renderer.
+      DataSource videoDataSource = new DefaultUriDataSource(context, bandwidthMeter, userAgent);
+      ChunkSource videoChunkSource = new DashChunkSource(manifestFetcher,
+          DefaultDashTrackSelector.newVideoInstance(context, true, filterHdContent),
+          videoDataSource, new AdaptiveEvaluator(bandwidthMeter), LIVE_EDGE_LATENCY_MS,
+          elapsedRealtimeOffset, mainHandler, player, NPExoPlayer.TYPE_VIDEO);
+      ChunkSampleSource videoSampleSource = new ChunkSampleSource(videoChunkSource, loadControl,
+          VIDEO_BUFFER_SEGMENTS * BUFFER_SEGMENT_SIZE, mainHandler, player,
+          NPExoPlayer.TYPE_VIDEO);
+      TrackRenderer videoRenderer = new MediaCodecVideoTrackRenderer(context, videoSampleSource,
+          MediaCodecSelector.DEFAULT, MediaCodec.VIDEO_SCALING_MODE_SCALE_TO_FIT, 5000,
+          drmSessionManager, true, mainHandler, player, 50);
+
+      // Build the audio renderer.
+      DataSource audioDataSource = new DefaultUriDataSource(context, bandwidthMeter, userAgent);
+      ChunkSource audioChunkSource = new DashChunkSource(manifestFetcher,
+          DefaultDashTrackSelector.newAudioInstance(), audioDataSource, null, LIVE_EDGE_LATENCY_MS,
+          elapsedRealtimeOffset, mainHandler, player, NPExoPlayer.TYPE_AUDIO);
+      ChunkSampleSource audioSampleSource = new ChunkSampleSource(audioChunkSource, loadControl,
+          AUDIO_BUFFER_SEGMENTS * BUFFER_SEGMENT_SIZE, mainHandler, player,
+          NPExoPlayer.TYPE_AUDIO);
+      TrackRenderer audioRenderer = new MediaCodecAudioTrackRenderer(audioSampleSource,
+          MediaCodecSelector.DEFAULT, drmSessionManager, true, mainHandler, player,
+          AudioCapabilities.getCapabilities(context), AudioManager.STREAM_MUSIC);
+
+      // Build the text renderer.
+      DataSource textDataSource = new DefaultUriDataSource(context, bandwidthMeter, userAgent);
+      ChunkSource textChunkSource = new DashChunkSource(manifestFetcher,
+          DefaultDashTrackSelector.newTextInstance(), textDataSource, null, LIVE_EDGE_LATENCY_MS,
+          elapsedRealtimeOffset, mainHandler, player, NPExoPlayer.TYPE_TEXT);
+      ChunkSampleSource textSampleSource = new ChunkSampleSource(textChunkSource, loadControl,
+          TEXT_BUFFER_SEGMENTS * BUFFER_SEGMENT_SIZE, mainHandler, player,
+          NPExoPlayer.TYPE_TEXT);
+      TrackRenderer textRenderer = new TextTrackRenderer(textSampleSource, player,
+          mainHandler.getLooper());
+
+      // Invoke the callback.
+      TrackRenderer[] renderers = new TrackRenderer[NPExoPlayer.RENDERER_COUNT];
+      renderers[NPExoPlayer.TYPE_VIDEO] = videoRenderer;
+      renderers[NPExoPlayer.TYPE_AUDIO] = audioRenderer;
+      renderers[NPExoPlayer.TYPE_TEXT] = textRenderer;
+      player.onRenderers(renderers, bandwidthMeter);
+    }
+
+    private static int getWidevineSecurityLevel(StreamingDrmSessionManager sessionManager) {
+      String securityLevelProperty = sessionManager.getPropertyString("securityLevel");
+      return securityLevelProperty.equals("L1") ? SECURITY_LEVEL_1 : securityLevelProperty
+          .equals("L3") ? SECURITY_LEVEL_3 : SECURITY_LEVEL_UNKNOWN;
+    }
+
+  }
+
+}

app/src/main/java/org/schabi/newpipe/player/exoplayer/EventLogger.java

@@ -0,0 +1,214 @@
+/*
+ * Copyright (C) 2014 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.schabi.newpipe.player.exoplayer;
+
+import com.google.android.exoplayer.ExoPlayer;
+import com.google.android.exoplayer.MediaCodecTrackRenderer.DecoderInitializationException;
+import com.google.android.exoplayer.TimeRange;
+import com.google.android.exoplayer.audio.AudioTrack;
+import com.google.android.exoplayer.chunk.Format;
+import com.google.android.exoplayer.util.VerboseLogUtil;
+
+import android.media.MediaCodec.CryptoException;
+import android.os.SystemClock;
+import android.util.Log;
+
+import java.io.IOException;
+import java.text.NumberFormat;
+import java.util.Locale;
+
+/**
+ * Logs player events using {@link Log}.
+ */
+public class EventLogger implements NPExoPlayer.Listener, NPExoPlayer.InfoListener,
+    NPExoPlayer.InternalErrorListener {
+
+  private static final String TAG = "EventLogger";
+  private static final NumberFormat TIME_FORMAT;
+  static {
+    TIME_FORMAT = NumberFormat.getInstance(Locale.US);
+    TIME_FORMAT.setMinimumFractionDigits(2);
+    TIME_FORMAT.setMaximumFractionDigits(2);
+  }
+
+  private long sessionStartTimeMs;
+  private long[] loadStartTimeMs;
+  private long[] availableRangeValuesUs;
+
+  public EventLogger() {
+    loadStartTimeMs = new long[NPExoPlayer.RENDERER_COUNT];
+  }
+
+  public void startSession() {
+    sessionStartTimeMs = SystemClock.elapsedRealtime();
+    Log.d(TAG, "start [0]");
+  }
+
+  public void endSession() {
+    Log.d(TAG, "end [" + getSessionTimeString() + "]");
+  }
+
+  // NPExoPlayer.Listener
+
+  @Override
+  public void onStateChanged(boolean playWhenReady, int state) {
+    Log.d(TAG, "state [" + getSessionTimeString() + ", " + playWhenReady + ", "
+        + getStateString(state) + "]");
+  }
+
+  @Override
+  public void onError(Exception e) {
+    Log.e(TAG, "playerFailed [" + getSessionTimeString() + "]", e);
+  }
+
+  @Override
+  public void onVideoSizeChanged(int width, int height, int unappliedRotationDegrees,
+      float pixelWidthHeightRatio) {
+    Log.d(TAG, "videoSizeChanged [" + width + ", " + height + ", " + unappliedRotationDegrees
+        + ", " + pixelWidthHeightRatio + "]");
+  }
+
+  // NPExoPlayer.InfoListener
+
+  @Override
+  public void onBandwidthSample(int elapsedMs, long bytes, long bitrateEstimate) {
+    Log.d(TAG, "bandwidth [" + getSessionTimeString() + ", " + bytes + ", "
+        + getTimeString(elapsedMs) + ", " + bitrateEstimate + "]");
+  }
+
+  @Override
+  public void onDroppedFrames(int count, long elapsed) {
+    Log.d(TAG, "droppedFrames [" + getSessionTimeString() + ", " + count + "]");
+  }
+
+  @Override
+  public void onLoadStarted(int sourceId, long length, int type, int trigger, Format format,
+      long mediaStartTimeMs, long mediaEndTimeMs) {
+    loadStartTimeMs[sourceId] = SystemClock.elapsedRealtime();
+    if (VerboseLogUtil.isTagEnabled(TAG)) {
+      Log.v(TAG, "loadStart [" + getSessionTimeString() + ", " + sourceId + ", " + type
+          + ", " + mediaStartTimeMs + ", " + mediaEndTimeMs + "]");
+    }
+  }
+
+  @Override
+  public void onLoadCompleted(int sourceId, long bytesLoaded, int type, int trigger, Format format,
+       long mediaStartTimeMs, long mediaEndTimeMs, long elapsedRealtimeMs, long loadDurationMs) {
+    if (VerboseLogUtil.isTagEnabled(TAG)) {
+      long downloadTime = SystemClock.elapsedRealtime() - loadStartTimeMs[sourceId];
+      Log.v(TAG, "loadEnd [" + getSessionTimeString() + ", " + sourceId + ", " + downloadTime
+          + "]");
+    }
+  }
+
+  @Override
+  public void onVideoFormatEnabled(Format format, int trigger, long mediaTimeMs) {
+    Log.d(TAG, "videoFormat [" + getSessionTimeString() + ", " + format.id + ", "
+        + Integer.toString(trigger) + "]");
+  }
+
+  @Override
+  public void onAudioFormatEnabled(Format format, int trigger, long mediaTimeMs) {
+    Log.d(TAG, "audioFormat [" + getSessionTimeString() + ", " + format.id + ", "
+        + Integer.toString(trigger) + "]");
+  }
+
+  // NPExoPlayer.InternalErrorListener
+
+  @Override
+  public void onLoadError(int sourceId, IOException e) {
+    printInternalError("loadError", e);
+  }
+
+  @Override
+  public void onRendererInitializationError(Exception e) {
+    printInternalError("rendererInitError", e);
+  }
+
+  @Override
+  public void onDrmSessionManagerError(Exception e) {
+    printInternalError("drmSessionManagerError", e);
+  }
+
+  @Override
+  public void onDecoderInitializationError(DecoderInitializationException e) {
+    printInternalError("decoderInitializationError", e);
+  }
+
+  @Override
+  public void onAudioTrackInitializationError(AudioTrack.InitializationException e) {
+    printInternalError("audioTrackInitializationError", e);
+  }
+
+  @Override
+  public void onAudioTrackWriteError(AudioTrack.WriteException e) {
+    printInternalError("audioTrackWriteError", e);
+  }
+
+  @Override
+  public void onAudioTrackUnderrun(int bufferSize, long bufferSizeMs, long elapsedSinceLastFeedMs) {
+    printInternalError("audioTrackUnderrun [" + bufferSize + ", " + bufferSizeMs + ", "
+        + elapsedSinceLastFeedMs + "]", null);
+  }
+
+  @Override
+  public void onCryptoError(CryptoException e) {
+    printInternalError("cryptoError", e);
+  }
+
+  @Override
+  public void onDecoderInitialized(String decoderName, long elapsedRealtimeMs,
+      long initializationDurationMs) {
+    Log.d(TAG, "decoderInitialized [" + getSessionTimeString() + ", " + decoderName + "]");
+  }
+
+  @Override
+  public void onAvailableRangeChanged(int sourceId, TimeRange availableRange) {
+    availableRangeValuesUs = availableRange.getCurrentBoundsUs(availableRangeValuesUs);
+    Log.d(TAG, "availableRange [" + availableRange.isStatic() + ", " + availableRangeValuesUs[0]
+        + ", " + availableRangeValuesUs[1] + "]");
+  }
+
+  private void printInternalError(String type, Exception e) {
+    Log.e(TAG, "internalError [" + getSessionTimeString() + ", " + type + "]", e);
+  }
+
+  private String getStateString(int state) {
+    switch (state) {
+      case ExoPlayer.STATE_BUFFERING:
+        return "B";
+      case ExoPlayer.STATE_ENDED:
+        return "E";
+      case ExoPlayer.STATE_IDLE:
+        return "I";
+      case ExoPlayer.STATE_PREPARING:
+        return "P";
+      case ExoPlayer.STATE_READY:
+        return "R";
+      default:
+        return "?";
+    }
+  }
+
+  private String getSessionTimeString() {
+    return getTimeString(SystemClock.elapsedRealtime() - sessionStartTimeMs);
+  }
+
+  private String getTimeString(long timeMs) {
+    return TIME_FORMAT.format((timeMs) / 1000f);
+  }
+
+}

app/src/main/java/org/schabi/newpipe/player/exoplayer/ExtractorRendererBuilder.java

@@ -0,0 +1,89 @@
+/*
+ * Copyright (C) 2014 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.schabi.newpipe.player.exoplayer;
+
+import org.schabi.newpipe.player.exoplayer.NPExoPlayer.RendererBuilder;
+
+import com.google.android.exoplayer.MediaCodecAudioTrackRenderer;
+import com.google.android.exoplayer.MediaCodecSelector;
+import com.google.android.exoplayer.MediaCodecVideoTrackRenderer;
+import com.google.android.exoplayer.TrackRenderer;
+import com.google.android.exoplayer.audio.AudioCapabilities;
+import com.google.android.exoplayer.extractor.Extractor;
+import com.google.android.exoplayer.extractor.ExtractorSampleSource;
+import com.google.android.exoplayer.text.TextTrackRenderer;
+import com.google.android.exoplayer.upstream.Allocator;
+import com.google.android.exoplayer.upstream.DataSource;
+import com.google.android.exoplayer.upstream.DefaultAllocator;
+import com.google.android.exoplayer.upstream.DefaultBandwidthMeter;
+import com.google.android.exoplayer.upstream.DefaultUriDataSource;
+
+import android.content.Context;
+import android.media.AudioManager;
+import android.media.MediaCodec;
+import android.net.Uri;
+
+/**
+ * A {@link RendererBuilder} for streams that can be read using an {@link Extractor}.
+ */
+public class ExtractorRendererBuilder implements RendererBuilder {
+
+  private static final int BUFFER_SEGMENT_SIZE = 64 * 1024;
+  private static final int BUFFER_SEGMENT_COUNT = 256;
+
+  private final Context context;
+  private final String userAgent;
+  private final Uri uri;
+
+  public ExtractorRendererBuilder(Context context, String userAgent, Uri uri) {
+    this.context = context;
+    this.userAgent = userAgent;
+    this.uri = uri;
+  }
+
+  @Override
+  public void buildRenderers(NPExoPlayer player) {
+    Allocator allocator = new DefaultAllocator(BUFFER_SEGMENT_SIZE);
+
+    // Build the video and audio renderers.
+    DefaultBandwidthMeter bandwidthMeter = new DefaultBandwidthMeter(player.getMainHandler(),
+        null);
+    DataSource dataSource = new DefaultUriDataSource(context, bandwidthMeter, userAgent);
+    ExtractorSampleSource sampleSource = new ExtractorSampleSource(uri, dataSource, allocator,
+        BUFFER_SEGMENT_COUNT * BUFFER_SEGMENT_SIZE);
+    MediaCodecVideoTrackRenderer videoRenderer = new MediaCodecVideoTrackRenderer(context,
+        sampleSource, MediaCodecSelector.DEFAULT, MediaCodec.VIDEO_SCALING_MODE_SCALE_TO_FIT, 5000,
+        player.getMainHandler(), player, 50);
+    MediaCodecAudioTrackRenderer audioRenderer = new MediaCodecAudioTrackRenderer(sampleSource,
+        MediaCodecSelector.DEFAULT, null, true, player.getMainHandler(), player,
+        AudioCapabilities.getCapabilities(context), AudioManager.STREAM_MUSIC);
+    TrackRenderer textRenderer = new TextTrackRenderer(sampleSource, player,
+        player.getMainHandler().getLooper());
+
+    // Invoke the callback.
+    TrackRenderer[] renderers = new TrackRenderer[NPExoPlayer.RENDERER_COUNT];
+    renderers[NPExoPlayer.TYPE_VIDEO] = videoRenderer;
+    renderers[NPExoPlayer.TYPE_AUDIO] = audioRenderer;
+    renderers[NPExoPlayer.TYPE_TEXT] = textRenderer;
+    player.onRenderers(renderers, bandwidthMeter);
+  }
+
+  @Override
+  public void cancel() {
+    // Do nothing.
+  }
+
+}

app/src/main/java/org/schabi/newpipe/player/exoplayer/HlsRendererBuilder.java

@@ -0,0 +1,180 @@
+/*
+ * Copyright (C) 2014 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.schabi.newpipe.player.exoplayer;
+
+import org.schabi.newpipe.player.exoplayer.NPExoPlayer.RendererBuilder;
+
+import com.google.android.exoplayer.DefaultLoadControl;
+import com.google.android.exoplayer.LoadControl;
+import com.google.android.exoplayer.MediaCodecAudioTrackRenderer;
+import com.google.android.exoplayer.MediaCodecSelector;
+import com.google.android.exoplayer.MediaCodecVideoTrackRenderer;
+import com.google.android.exoplayer.TrackRenderer;
+import com.google.android.exoplayer.audio.AudioCapabilities;
+import com.google.android.exoplayer.hls.DefaultHlsTrackSelector;
+import com.google.android.exoplayer.hls.HlsChunkSource;
+import com.google.android.exoplayer.hls.HlsMasterPlaylist;
+import com.google.android.exoplayer.hls.HlsPlaylist;
+import com.google.android.exoplayer.hls.HlsPlaylistParser;
+import com.google.android.exoplayer.hls.HlsSampleSource;
+import com.google.android.exoplayer.hls.PtsTimestampAdjusterProvider;
+import com.google.android.exoplayer.metadata.Id3Parser;
+import com.google.android.exoplayer.metadata.MetadataTrackRenderer;
+import com.google.android.exoplayer.text.TextTrackRenderer;
+import com.google.android.exoplayer.text.eia608.Eia608TrackRenderer;
+import com.google.android.exoplayer.upstream.DataSource;
+import com.google.android.exoplayer.upstream.DefaultAllocator;
+import com.google.android.exoplayer.upstream.DefaultBandwidthMeter;
+import com.google.android.exoplayer.upstream.DefaultUriDataSource;
+import com.google.android.exoplayer.util.ManifestFetcher;
+import com.google.android.exoplayer.util.ManifestFetcher.ManifestCallback;
+
+import android.content.Context;
+import android.media.AudioManager;
+import android.media.MediaCodec;
+import android.os.Handler;
+
+import java.io.IOException;
+import java.util.Map;
+
+/**
+ * A {@link RendererBuilder} for HLS.
+ */
+public class HlsRendererBuilder implements RendererBuilder {
+
+  private static final int BUFFER_SEGMENT_SIZE = 64 * 1024;
+  private static final int MAIN_BUFFER_SEGMENTS = 256;
+  private static final int TEXT_BUFFER_SEGMENTS = 2;
+
+  private final Context context;
+  private final String userAgent;
+  private final String url;
+
+  private AsyncRendererBuilder currentAsyncBuilder;
+
+  public HlsRendererBuilder(Context context, String userAgent, String url) {
+    this.context = context;
+    this.userAgent = userAgent;
+    this.url = url;
+  }
+
+  @Override
+  public void buildRenderers(NPExoPlayer player) {
+    currentAsyncBuilder = new AsyncRendererBuilder(context, userAgent, url, player);
+    currentAsyncBuilder.init();
+  }
+
+  @Override
+  public void cancel() {
+    if (currentAsyncBuilder != null) {
+      currentAsyncBuilder.cancel();
+      currentAsyncBuilder = null;
+    }
+  }
+
+  private static final class AsyncRendererBuilder implements ManifestCallback<HlsPlaylist> {
+
+    private final Context context;
+    private final String userAgent;
+    private final String url;
+    private final NPExoPlayer player;
+    private final ManifestFetcher<HlsPlaylist> playlistFetcher;
+
+    private boolean canceled;
+
+    public AsyncRendererBuilder(Context context, String userAgent, String url, NPExoPlayer player) {
+      this.context = context;
+      this.userAgent = userAgent;
+      this.url = url;
+      this.player = player;
+      HlsPlaylistParser parser = new HlsPlaylistParser();
+      playlistFetcher = new ManifestFetcher<>(url, new DefaultUriDataSource(context, userAgent),
+          parser);
+    }
+
+    public void init() {
+      playlistFetcher.singleLoad(player.getMainHandler().getLooper(), this);
+    }
+
+    public void cancel() {
+      canceled = true;
+    }
+
+    @Override
+    public void onSingleManifestError(IOException e) {
+      if (canceled) {
+        return;
+      }
+
+      player.onRenderersError(e);
+    }
+
+    @Override
+    public void onSingleManifest(HlsPlaylist manifest) {
+      if (canceled) {
+        return;
+      }
+
+      Handler mainHandler = player.getMainHandler();
+      LoadControl loadControl = new DefaultLoadControl(new DefaultAllocator(BUFFER_SEGMENT_SIZE));
+      DefaultBandwidthMeter bandwidthMeter = new DefaultBandwidthMeter();
+      PtsTimestampAdjusterProvider timestampAdjusterProvider = new PtsTimestampAdjusterProvider();
+
+      // Build the video/audio/metadata renderers.
+      DataSource dataSource = new DefaultUriDataSource(context, bandwidthMeter, userAgent);
+      HlsChunkSource chunkSource = new HlsChunkSource(true /* isMaster */, dataSource, url,
+          manifest, DefaultHlsTrackSelector.newDefaultInstance(context), bandwidthMeter,
+          timestampAdjusterProvider, HlsChunkSource.ADAPTIVE_MODE_SPLICE);
+      HlsSampleSource sampleSource = new HlsSampleSource(chunkSource, loadControl,
+          MAIN_BUFFER_SEGMENTS * BUFFER_SEGMENT_SIZE, mainHandler, player, NPExoPlayer.TYPE_VIDEO);
+      MediaCodecVideoTrackRenderer videoRenderer = new MediaCodecVideoTrackRenderer(context,
+          sampleSource, MediaCodecSelector.DEFAULT, MediaCodec.VIDEO_SCALING_MODE_SCALE_TO_FIT,
+          5000, mainHandler, player, 50);
+      MediaCodecAudioTrackRenderer audioRenderer = new MediaCodecAudioTrackRenderer(sampleSource,
+          MediaCodecSelector.DEFAULT, null, true, player.getMainHandler(), player,
+          AudioCapabilities.getCapabilities(context), AudioManager.STREAM_MUSIC);
+      MetadataTrackRenderer<Map<String, Object>> id3Renderer = new MetadataTrackRenderer<>(
+          sampleSource, new Id3Parser(), player, mainHandler.getLooper());
+
+      // Build the text renderer, preferring Webvtt where available.
+      boolean preferWebvtt = false;
+      if (manifest instanceof HlsMasterPlaylist) {
+        preferWebvtt = !((HlsMasterPlaylist) manifest).subtitles.isEmpty();
+      }
+      TrackRenderer textRenderer;
+      if (preferWebvtt) {
+        DataSource textDataSource = new DefaultUriDataSource(context, bandwidthMeter, userAgent);
+        HlsChunkSource textChunkSource = new HlsChunkSource(false /* isMaster */, textDataSource,
+            url, manifest, DefaultHlsTrackSelector.newVttInstance(), bandwidthMeter,
+            timestampAdjusterProvider, HlsChunkSource.ADAPTIVE_MODE_SPLICE);
+        HlsSampleSource textSampleSource = new HlsSampleSource(textChunkSource, loadControl,
+            TEXT_BUFFER_SEGMENTS * BUFFER_SEGMENT_SIZE, mainHandler, player, NPExoPlayer.TYPE_TEXT);
+        textRenderer = new TextTrackRenderer(textSampleSource, player, mainHandler.getLooper());
+      } else {
+        textRenderer = new Eia608TrackRenderer(sampleSource, player, mainHandler.getLooper());
+      }
+
+      TrackRenderer[] renderers = new TrackRenderer[NPExoPlayer.RENDERER_COUNT];
+      renderers[NPExoPlayer.TYPE_VIDEO] = videoRenderer;
+      renderers[NPExoPlayer.TYPE_AUDIO] = audioRenderer;
+      renderers[NPExoPlayer.TYPE_METADATA] = id3Renderer;
+      renderers[NPExoPlayer.TYPE_TEXT] = textRenderer;
+      player.onRenderers(renderers, bandwidthMeter);
+    }
+
+  }
+
+}

app/src/main/java/org/schabi/newpipe/player/exoplayer/NPExoPlayer.java

@@ -0,0 +1,599 @@
+/*
+ * Copyright (C) 2014 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.schabi.newpipe.player.exoplayer;
+
+import com.google.android.exoplayer.CodecCounters;
+import com.google.android.exoplayer.DummyTrackRenderer;
+import com.google.android.exoplayer.ExoPlaybackException;
+import com.google.android.exoplayer.ExoPlayer;
+import com.google.android.exoplayer.MediaCodecAudioTrackRenderer;
+import com.google.android.exoplayer.MediaCodecTrackRenderer;
+import com.google.android.exoplayer.MediaCodecTrackRenderer.DecoderInitializationException;
+import com.google.android.exoplayer.MediaCodecVideoTrackRenderer;
+import com.google.android.exoplayer.MediaFormat;
+import com.google.android.exoplayer.TimeRange;
+import com.google.android.exoplayer.TrackRenderer;
+import com.google.android.exoplayer.audio.AudioTrack;
+import com.google.android.exoplayer.chunk.ChunkSampleSource;
+import com.google.android.exoplayer.chunk.Format;
+import com.google.android.exoplayer.dash.DashChunkSource;
+import com.google.android.exoplayer.drm.StreamingDrmSessionManager;
+import com.google.android.exoplayer.hls.HlsSampleSource;
+import com.google.android.exoplayer.metadata.MetadataTrackRenderer.MetadataRenderer;
+import com.google.android.exoplayer.text.Cue;
+import com.google.android.exoplayer.text.TextRenderer;
+import com.google.android.exoplayer.upstream.BandwidthMeter;
+import com.google.android.exoplayer.upstream.DefaultBandwidthMeter;
+import com.google.android.exoplayer.util.DebugTextViewHelper;
+import com.google.android.exoplayer.util.PlayerControl;
+
+import android.media.MediaCodec.CryptoException;
+import android.os.Handler;
+import android.os.Looper;
+import android.view.Surface;
+
+import java.io.IOException;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.CopyOnWriteArrayList;
+
+/**
+ * A wrapper around {@link ExoPlayer} that provides a higher level interface. It can be prepared
+ * with one of a number of {@link RendererBuilder} classes to suit different use cases (e.g. DASH,
+ * SmoothStreaming and so on).
+ */
+public class NPExoPlayer implements ExoPlayer.Listener, ChunkSampleSource.EventListener,
+    HlsSampleSource.EventListener, DefaultBandwidthMeter.EventListener,
+    MediaCodecVideoTrackRenderer.EventListener, MediaCodecAudioTrackRenderer.EventListener,
+    StreamingDrmSessionManager.EventListener, DashChunkSource.EventListener, TextRenderer,
+    MetadataRenderer<Map<String, Object>>, DebugTextViewHelper.Provider {
+
+  /**
+   * Builds renderers for the player.
+   */
+  public interface RendererBuilder {
+    /**
+     * Builds renderers for playback.
+     *
+     * @param player The player for which renderers are being built. {@link NPExoPlayer#onRenderers}
+     *     should be invoked once the renderers have been built. If building fails,
+     *     {@link NPExoPlayer#onRenderersError} should be invoked.
+     */
+    void buildRenderers(NPExoPlayer player);
+    /**
+     * Cancels the current build operation, if there is one. Else does nothing.
+     * <p>
+     * A canceled build operation must not invoke {@link NPExoPlayer#onRenderers} or
+     * {@link NPExoPlayer#onRenderersError} on the player, which may have been released.
+     */
+    void cancel();
+  }
+
+  /**
+   * A listener for core events.
+   */
+  public interface Listener {
+    void onStateChanged(boolean playWhenReady, int playbackState);
+    void onError(Exception e);
+    void onVideoSizeChanged(int width, int height, int unappliedRotationDegrees,
+        float pixelWidthHeightRatio);
+  }
+
+  /**
+   * A listener for internal errors.
+   * <p>
+   * These errors are not visible to the user, and hence this listener is provided for
+   * informational purposes only. Note however that an internal error may cause a fatal
+   * error if the player fails to recover. If this happens, {@link Listener#onError(Exception)}
+   * will be invoked.
+   */
+  public interface InternalErrorListener {
+    void onRendererInitializationError(Exception e);
+    void onAudioTrackInitializationError(AudioTrack.InitializationException e);
+    void onAudioTrackWriteError(AudioTrack.WriteException e);
+    void onAudioTrackUnderrun(int bufferSize, long bufferSizeMs, long elapsedSinceLastFeedMs);
+    void onDecoderInitializationError(DecoderInitializationException e);
+    void onCryptoError(CryptoException e);
+    void onLoadError(int sourceId, IOException e);
+    void onDrmSessionManagerError(Exception e);
+  }
+
+  /**
+   * A listener for debugging information.
+   */
+  public interface InfoListener {
+    void onVideoFormatEnabled(Format format, int trigger, long mediaTimeMs);
+    void onAudioFormatEnabled(Format format, int trigger, long mediaTimeMs);
+    void onDroppedFrames(int count, long elapsed);
+    void onBandwidthSample(int elapsedMs, long bytes, long bitrateEstimate);
+    void onLoadStarted(int sourceId, long length, int type, int trigger, Format format,
+        long mediaStartTimeMs, long mediaEndTimeMs);
+    void onLoadCompleted(int sourceId, long bytesLoaded, int type, int trigger, Format format,
+        long mediaStartTimeMs, long mediaEndTimeMs, long elapsedRealtimeMs, long loadDurationMs);
+    void onDecoderInitialized(String decoderName, long elapsedRealtimeMs,
+        long initializationDurationMs);
+    void onAvailableRangeChanged(int sourceId, TimeRange availableRange);
+  }
+
+  /**
+   * A listener for receiving notifications of timed text.
+   */
+  public interface CaptionListener {
+    void onCues(List<Cue> cues);
+  }
+
+  /**
+   * A listener for receiving ID3 metadata parsed from the media stream.
+   */
+  public interface Id3MetadataListener {
+    void onId3Metadata(Map<String, Object> metadata);
+  }
+
+  // Constants pulled into this class for convenience.
+  public static final int STATE_IDLE = ExoPlayer.STATE_IDLE;
+  public static final int STATE_PREPARING = ExoPlayer.STATE_PREPARING;
+  public static final int STATE_BUFFERING = ExoPlayer.STATE_BUFFERING;
+  public static final int STATE_READY = ExoPlayer.STATE_READY;
+  public static final int STATE_ENDED = ExoPlayer.STATE_ENDED;
+  public static final int TRACK_DISABLED = ExoPlayer.TRACK_DISABLED;
+  public static final int TRACK_DEFAULT = ExoPlayer.TRACK_DEFAULT;
+
+  public static final int RENDERER_COUNT = 4;
+  public static final int TYPE_VIDEO = 0;
+  public static final int TYPE_AUDIO = 1;
+  public static final int TYPE_TEXT = 2;
+  public static final int TYPE_METADATA = 3;
+
+  private static final int RENDERER_BUILDING_STATE_IDLE = 1;
+  private static final int RENDERER_BUILDING_STATE_BUILDING = 2;
+  private static final int RENDERER_BUILDING_STATE_BUILT = 3;
+
+  private final RendererBuilder rendererBuilder;
+  private final ExoPlayer player;
+  private final PlayerControl playerControl;
+  private final Handler mainHandler;
+  private final CopyOnWriteArrayList<Listener> listeners;
+
+  private int rendererBuildingState;
+  private int lastReportedPlaybackState;
+  private boolean lastReportedPlayWhenReady;
+
+  private Surface surface;
+  private TrackRenderer videoRenderer;
+  private CodecCounters codecCounters;
+  private Format videoFormat;
+  private int videoTrackToRestore;
+
+  private BandwidthMeter bandwidthMeter;
+  private boolean backgrounded;
+
+  private CaptionListener captionListener;
+  private Id3MetadataListener id3MetadataListener;
+  private InternalErrorListener internalErrorListener;
+  private InfoListener infoListener;
+
+  public NPExoPlayer(RendererBuilder rendererBuilder) {
+    this.rendererBuilder = rendererBuilder;
+    player = ExoPlayer.Factory.newInstance(RENDERER_COUNT, 1000, 5000);
+    player.addListener(this);
+    playerControl = new PlayerControl(player);
+    mainHandler = new Handler();
+    listeners = new CopyOnWriteArrayList<>();
+    lastReportedPlaybackState = STATE_IDLE;
+    rendererBuildingState = RENDERER_BUILDING_STATE_IDLE;
+    // Disable text initially.
+    player.setSelectedTrack(TYPE_TEXT, TRACK_DISABLED);
+  }
+
+  public PlayerControl getPlayerControl() {
+    return playerControl;
+  }
+
+  public void addListener(Listener listener) {
+    listeners.add(listener);
+  }
+
+  public void removeListener(Listener listener) {
+    listeners.remove(listener);
+  }
+
+  public void setInternalErrorListener(InternalErrorListener listener) {
+    internalErrorListener = listener;
+  }
+
+  public void setInfoListener(InfoListener listener) {
+    infoListener = listener;
+  }
+
+  public void setCaptionListener(CaptionListener listener) {
+    captionListener = listener;
+  }
+
+  public void setMetadataListener(Id3MetadataListener listener) {
+    id3MetadataListener = listener;
+  }
+
+  public void setSurface(Surface surface) {
+    this.surface = surface;
+    pushSurface(false);
+  }
+
+  public Surface getSurface() {
+    return surface;
+  }
+
+  public void blockingClearSurface() {
+    surface = null;
+    pushSurface(true);
+  }
+
+  public int getTrackCount(int type) {
+    return player.getTrackCount(type);
+  }
+
+  public MediaFormat getTrackFormat(int type, int index) {
+    return player.getTrackFormat(type, index);
+  }
+
+  public int getSelectedTrack(int type) {
+    return player.getSelectedTrack(type);
+  }
+
+  public void setSelectedTrack(int type, int index) {
+    player.setSelectedTrack(type, index);
+    if (type == TYPE_TEXT && index < 0 && captionListener != null) {
+      captionListener.onCues(Collections.<Cue>emptyList());
+    }
+  }
+
+  public boolean getBackgrounded() {
+    return backgrounded;
+  }
+
+  public void setBackgrounded(boolean backgrounded) {
+    if (this.backgrounded == backgrounded) {
+      return;
+    }
+    this.backgrounded = backgrounded;
+    if (backgrounded) {
+      videoTrackToRestore = getSelectedTrack(TYPE_VIDEO);
+      setSelectedTrack(TYPE_VIDEO, TRACK_DISABLED);
+      blockingClearSurface();
+    } else {
+      setSelectedTrack(TYPE_VIDEO, videoTrackToRestore);
+    }
+  }
+
+  public void prepare() {
+    if (rendererBuildingState == RENDERER_BUILDING_STATE_BUILT) {
+      player.stop();
+    }
+    rendererBuilder.cancel();
+    videoFormat = null;
+    videoRenderer = null;
+    rendererBuildingState = RENDERER_BUILDING_STATE_BUILDING;
+    maybeReportPlayerState();
+    rendererBuilder.buildRenderers(this);
+  }
+
+  /**
+   * Invoked with the results from a {@link RendererBuilder}.
+   *
+   * @param renderers Renderers indexed by {@link NPExoPlayer} TYPE_* constants. An individual
+   *     element may be null if there do not exist tracks of the corresponding type.
+   * @param bandwidthMeter Provides an estimate of the currently available bandwidth. May be null.
+   */
+  /* package */ void onRenderers(TrackRenderer[] renderers, BandwidthMeter bandwidthMeter) {
+    for (int i = 0; i < RENDERER_COUNT; i++) {
+      if (renderers[i] == null) {
+        // Convert a null renderer to a dummy renderer.
+        renderers[i] = new DummyTrackRenderer();
+      }
+    }
+    // Complete preparation.
+    this.videoRenderer = renderers[TYPE_VIDEO];
+    this.codecCounters = videoRenderer instanceof MediaCodecTrackRenderer
+        ? ((MediaCodecTrackRenderer) videoRenderer).codecCounters
+        : renderers[TYPE_AUDIO] instanceof MediaCodecTrackRenderer
+        ? ((MediaCodecTrackRenderer) renderers[TYPE_AUDIO]).codecCounters : null;
+    this.bandwidthMeter = bandwidthMeter;
+    pushSurface(false);
+    player.prepare(renderers);
+    rendererBuildingState = RENDERER_BUILDING_STATE_BUILT;
+  }
+
+  /**
+   * Invoked if a {@link RendererBuilder} encounters an error.
+   *
+   * @param e Describes the error.
+   */
+  /* package */ void onRenderersError(Exception e) {
+    if (internalErrorListener != null) {
+      internalErrorListener.onRendererInitializationError(e);
+    }
+    for (Listener listener : listeners) {
+      listener.onError(e);
+    }
+    rendererBuildingState = RENDERER_BUILDING_STATE_IDLE;
+    maybeReportPlayerState();
+  }
+
+  public void setPlayWhenReady(boolean playWhenReady) {
+    player.setPlayWhenReady(playWhenReady);
+  }
+
+  public void seekTo(long positionMs) {
+    player.seekTo(positionMs);
+  }
+
+  public void release() {
+    rendererBuilder.cancel();
+    rendererBuildingState = RENDERER_BUILDING_STATE_IDLE;
+    surface = null;
+    player.release();
+  }
+
+  public int getPlaybackState() {
+    if (rendererBuildingState == RENDERER_BUILDING_STATE_BUILDING) {
+      return STATE_PREPARING;
+    }
+    int playerState = player.getPlaybackState();
+    if (rendererBuildingState == RENDERER_BUILDING_STATE_BUILT && playerState == STATE_IDLE) {
+      // This is an edge case where the renderers are built, but are still being passed to the
+      // player's playback thread.
+      return STATE_PREPARING;
+    }
+    return playerState;
+  }
+
+  @Override
+  public Format getFormat() {
+    return videoFormat;
+  }
+
+  @Override
+  public BandwidthMeter getBandwidthMeter() {
+    return bandwidthMeter;
+  }
+
+  @Override
+  public CodecCounters getCodecCounters() {
+    return codecCounters;
+  }
+
+  @Override
+  public long getCurrentPosition() {
+    return player.getCurrentPosition();
+  }
+
+  public long getDuration() {
+    return player.getDuration();
+  }
+
+  public int getBufferedPercentage() {
+    return player.getBufferedPercentage();
+  }
+
+  public boolean getPlayWhenReady() {
+    return player.getPlayWhenReady();
+  }
+
+  /* package */ Looper getPlaybackLooper() {
+    return player.getPlaybackLooper();
+  }
+
+  /* package */ Handler getMainHandler() {
+    return mainHandler;
+  }
+
+  @Override
+  public void onPlayerStateChanged(boolean playWhenReady, int state) {
+    maybeReportPlayerState();
+  }
+
+  @Override
+  public void onPlayerError(ExoPlaybackException exception) {
+    rendererBuildingState = RENDERER_BUILDING_STATE_IDLE;
+    for (Listener listener : listeners) {
+      listener.onError(exception);
+    }
+  }
+
+  @Override
+  public void onVideoSizeChanged(int width, int height, int unappliedRotationDegrees,
+      float pixelWidthHeightRatio) {
+    for (Listener listener : listeners) {
+      listener.onVideoSizeChanged(width, height, unappliedRotationDegrees, pixelWidthHeightRatio);
+    }
+  }
+
+  @Override
+  public void onDroppedFrames(int count, long elapsed) {
+    if (infoListener != null) {
+      infoListener.onDroppedFrames(count, elapsed);
+    }
+  }
+
+  @Override
+  public void onBandwidthSample(int elapsedMs, long bytes, long bitrateEstimate) {
+    if (infoListener != null) {
+      infoListener.onBandwidthSample(elapsedMs, bytes, bitrateEstimate);
+    }
+  }
+
+  @Override
+  public void onDownstreamFormatChanged(int sourceId, Format format, int trigger,
+      long mediaTimeMs) {
+    if (infoListener == null) {
+      return;
+    }
+    if (sourceId == TYPE_VIDEO) {
+      videoFormat = format;
+      infoListener.onVideoFormatEnabled(format, trigger, mediaTimeMs);
+    } else if (sourceId == TYPE_AUDIO) {
+      infoListener.onAudioFormatEnabled(format, trigger, mediaTimeMs);
+    }
+  }
+
+  @Override
+  public void onDrmKeysLoaded() {
+    // Do nothing.
+  }
+
+  @Override
+  public void onDrmSessionManagerError(Exception e) {
+    if (internalErrorListener != null) {
+      internalErrorListener.onDrmSessionManagerError(e);
+    }
+  }
+
+  @Override
+  public void onDecoderInitializationError(DecoderInitializationException e) {
+    if (internalErrorListener != null) {
+      internalErrorListener.onDecoderInitializationError(e);
+    }
+  }
+
+  @Override
+  public void onAudioTrackInitializationError(AudioTrack.InitializationException e) {
+    if (internalErrorListener != null) {
+      internalErrorListener.onAudioTrackInitializationError(e);
+    }
+  }
+
+  @Override
+  public void onAudioTrackWriteError(AudioTrack.WriteException e) {
+    if (internalErrorListener != null) {
+      internalErrorListener.onAudioTrackWriteError(e);
+    }
+  }
+
+  @Override
+  public void onAudioTrackUnderrun(int bufferSize, long bufferSizeMs, long elapsedSinceLastFeedMs) {
+    if (internalErrorListener != null) {
+      internalErrorListener.onAudioTrackUnderrun(bufferSize, bufferSizeMs, elapsedSinceLastFeedMs);
+    }
+  }
+
+  @Override
+  public void onCryptoError(CryptoException e) {
+    if (internalErrorListener != null) {
+      internalErrorListener.onCryptoError(e);
+    }
+  }
+
+  @Override
+  public void onDecoderInitialized(String decoderName, long elapsedRealtimeMs,
+      long initializationDurationMs) {
+    if (infoListener != null) {
+      infoListener.onDecoderInitialized(decoderName, elapsedRealtimeMs, initializationDurationMs);
+    }
+  }
+
+  @Override
+  public void onLoadError(int sourceId, IOException e) {
+    if (internalErrorListener != null) {
+      internalErrorListener.onLoadError(sourceId, e);
+    }
+  }
+
+  @Override
+  public void onCues(List<Cue> cues) {
+    if (captionListener != null && getSelectedTrack(TYPE_TEXT) != TRACK_DISABLED) {
+      captionListener.onCues(cues);
+    }
+  }
+
+  @Override
+  public void onMetadata(Map<String, Object> metadata) {
+    if (id3MetadataListener != null && getSelectedTrack(TYPE_METADATA) != TRACK_DISABLED) {
+      id3MetadataListener.onId3Metadata(metadata);
+    }
+  }
+
+  @Override
+  public void onAvailableRangeChanged(int sourceId, TimeRange availableRange) {
+    if (infoListener != null) {
+      infoListener.onAvailableRangeChanged(sourceId, availableRange);
+    }
+  }
+
+  @Override
+  public void onPlayWhenReadyCommitted() {
+    // Do nothing.
+  }
+
+  @Override
+  public void onDrawnToSurface(Surface surface) {
+    // Do nothing.
+  }
+
+  @Override
+  public void onLoadStarted(int sourceId, long length, int type, int trigger, Format format,
+      long mediaStartTimeMs, long mediaEndTimeMs) {
+    if (infoListener != null) {
+      infoListener.onLoadStarted(sourceId, length, type, trigger, format, mediaStartTimeMs,
+          mediaEndTimeMs);
+    }
+  }
+
+  @Override
+  public void onLoadCompleted(int sourceId, long bytesLoaded, int type, int trigger, Format format,
+      long mediaStartTimeMs, long mediaEndTimeMs, long elapsedRealtimeMs, long loadDurationMs) {
+    if (infoListener != null) {
+      infoListener.onLoadCompleted(sourceId, bytesLoaded, type, trigger, format, mediaStartTimeMs,
+          mediaEndTimeMs, elapsedRealtimeMs, loadDurationMs);
+    }
+  }
+
+  @Override
+  public void onLoadCanceled(int sourceId, long bytesLoaded) {
+    // Do nothing.
+  }
+
+  @Override
+  public void onUpstreamDiscarded(int sourceId, long mediaStartTimeMs, long mediaEndTimeMs) {
+    // Do nothing.
+  }
+
+  private void maybeReportPlayerState() {
+    boolean playWhenReady = player.getPlayWhenReady();
+    int playbackState = getPlaybackState();
+    if (lastReportedPlayWhenReady != playWhenReady || lastReportedPlaybackState != playbackState) {
+      for (Listener listener : listeners) {
+        listener.onStateChanged(playWhenReady, playbackState);
+      }
+      lastReportedPlayWhenReady = playWhenReady;
+      lastReportedPlaybackState = playbackState;
+    }
+  }
+
+  private void pushSurface(boolean blockForSurfacePush) {
+    if (videoRenderer == null) {
+      return;
+    }
+
+    if (blockForSurfacePush) {
+      player.blockingSendMessage(
+          videoRenderer, MediaCodecVideoTrackRenderer.MSG_SET_SURFACE, surface);
+    } else {
+      player.sendMessage(
+          videoRenderer, MediaCodecVideoTrackRenderer.MSG_SET_SURFACE, surface);
+    }
+  }
+
+}

app/src/main/java/org/schabi/newpipe/player/exoplayer/SmoothStreamingRendererBuilder.java

@@ -0,0 +1,206 @@
+/*
+ * Copyright (C) 2014 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.schabi.newpipe.player.exoplayer;
+
+
+import org.schabi.newpipe.player.exoplayer.NPExoPlayer.RendererBuilder;
+
+import com.google.android.exoplayer.DefaultLoadControl;
+import com.google.android.exoplayer.LoadControl;
+import com.google.android.exoplayer.MediaCodecAudioTrackRenderer;
+import com.google.android.exoplayer.MediaCodecSelector;
+import com.google.android.exoplayer.MediaCodecVideoTrackRenderer;
+import com.google.android.exoplayer.TrackRenderer;
+import com.google.android.exoplayer.audio.AudioCapabilities;
+import com.google.android.exoplayer.chunk.ChunkSampleSource;
+import com.google.android.exoplayer.chunk.ChunkSource;
+import com.google.android.exoplayer.chunk.FormatEvaluator.AdaptiveEvaluator;
+import com.google.android.exoplayer.drm.DrmSessionManager;
+import com.google.android.exoplayer.drm.MediaDrmCallback;
+import com.google.android.exoplayer.drm.StreamingDrmSessionManager;
+import com.google.android.exoplayer.drm.UnsupportedDrmException;
+import com.google.android.exoplayer.smoothstreaming.DefaultSmoothStreamingTrackSelector;
+import com.google.android.exoplayer.smoothstreaming.SmoothStreamingChunkSource;
+import com.google.android.exoplayer.smoothstreaming.SmoothStreamingManifest;
+import com.google.android.exoplayer.smoothstreaming.SmoothStreamingManifestParser;
+import com.google.android.exoplayer.text.TextTrackRenderer;
+import com.google.android.exoplayer.upstream.DataSource;
+import com.google.android.exoplayer.upstream.DefaultAllocator;
+import com.google.android.exoplayer.upstream.DefaultBandwidthMeter;
+import com.google.android.exoplayer.upstream.DefaultHttpDataSource;
+import com.google.android.exoplayer.upstream.DefaultUriDataSource;
+import com.google.android.exoplayer.util.ManifestFetcher;
+import com.google.android.exoplayer.util.Util;
+
+import android.content.Context;
+import android.media.AudioManager;
+import android.media.MediaCodec;
+import android.os.Handler;
+
+import java.io.IOException;
+
+/**
+ * A {@link RendererBuilder} for SmoothStreaming.
+ */
+public class SmoothStreamingRendererBuilder implements RendererBuilder {
+
+  private static final int BUFFER_SEGMENT_SIZE = 64 * 1024;
+  private static final int VIDEO_BUFFER_SEGMENTS = 200;
+  private static final int AUDIO_BUFFER_SEGMENTS = 54;
+  private static final int TEXT_BUFFER_SEGMENTS = 2;
+  private static final int LIVE_EDGE_LATENCY_MS = 30000;
+
+  private final Context context;
+  private final String userAgent;
+  private final String url;
+  private final MediaDrmCallback drmCallback;
+
+  private AsyncRendererBuilder currentAsyncBuilder;
+
+  public SmoothStreamingRendererBuilder(Context context, String userAgent, String url,
+      MediaDrmCallback drmCallback) {
+    this.context = context;
+    this.userAgent = userAgent;
+    this.url = Util.toLowerInvariant(url).endsWith("/manifest") ? url : url + "/Manifest";
+    this.drmCallback = drmCallback;
+  }
+
+  @Override
+  public void buildRenderers(NPExoPlayer player) {
+    currentAsyncBuilder = new AsyncRendererBuilder(context, userAgent, url, drmCallback, player);
+    currentAsyncBuilder.init();
+  }
+
+  @Override
+  public void cancel() {
+    if (currentAsyncBuilder != null) {
+      currentAsyncBuilder.cancel();
+      currentAsyncBuilder = null;
+    }
+  }
+
+  private static final class AsyncRendererBuilder
+      implements ManifestFetcher.ManifestCallback<SmoothStreamingManifest> {
+
+    private final Context context;
+    private final String userAgent;
+    private final MediaDrmCallback drmCallback;
+    private final NPExoPlayer player;
+    private final ManifestFetcher<SmoothStreamingManifest> manifestFetcher;
+
+    private boolean canceled;
+
+    public AsyncRendererBuilder(Context context, String userAgent, String url,
+        MediaDrmCallback drmCallback, NPExoPlayer player) {
+      this.context = context;
+      this.userAgent = userAgent;
+      this.drmCallback = drmCallback;
+      this.player = player;
+      SmoothStreamingManifestParser parser = new SmoothStreamingManifestParser();
+      manifestFetcher = new ManifestFetcher<>(url, new DefaultHttpDataSource(userAgent, null),
+          parser);
+    }
+
+    public void init() {
+      manifestFetcher.singleLoad(player.getMainHandler().getLooper(), this);
+    }
+
+    public void cancel() {
+      canceled = true;
+    }
+
+    @Override
+    public void onSingleManifestError(IOException exception) {
+      if (canceled) {
+        return;
+      }
+
+      player.onRenderersError(exception);
+    }
+
+    @Override
+    public void onSingleManifest(SmoothStreamingManifest manifest) {
+      if (canceled) {
+        return;
+      }
+
+      Handler mainHandler = player.getMainHandler();
+      LoadControl loadControl = new DefaultLoadControl(new DefaultAllocator(BUFFER_SEGMENT_SIZE));
+      DefaultBandwidthMeter bandwidthMeter = new DefaultBandwidthMeter(mainHandler, player);
+
+      // Check drm support if necessary.
+      DrmSessionManager drmSessionManager = null;
+      if (manifest.protectionElement != null) {
+        if (Util.SDK_INT < 18) {
+          player.onRenderersError(
+              new UnsupportedDrmException(UnsupportedDrmException.REASON_UNSUPPORTED_SCHEME));
+          return;
+        }
+        try {
+          drmSessionManager = new StreamingDrmSessionManager(manifest.protectionElement.uuid,
+              player.getPlaybackLooper(), drmCallback, null, player.getMainHandler(), player);
+        } catch (UnsupportedDrmException e) {
+          player.onRenderersError(e);
+          return;
+        }
+      }
+
+      // Build the video renderer.
+      DataSource videoDataSource = new DefaultUriDataSource(context, bandwidthMeter, userAgent);
+      ChunkSource videoChunkSource = new SmoothStreamingChunkSource(manifestFetcher,
+          DefaultSmoothStreamingTrackSelector.newVideoInstance(context, true, false),
+          videoDataSource, new AdaptiveEvaluator(bandwidthMeter), LIVE_EDGE_LATENCY_MS);
+      ChunkSampleSource videoSampleSource = new ChunkSampleSource(videoChunkSource, loadControl,
+          VIDEO_BUFFER_SEGMENTS * BUFFER_SEGMENT_SIZE, mainHandler, player,
+          NPExoPlayer.TYPE_VIDEO);
+      TrackRenderer videoRenderer = new MediaCodecVideoTrackRenderer(context, videoSampleSource,
+          MediaCodecSelector.DEFAULT, MediaCodec.VIDEO_SCALING_MODE_SCALE_TO_FIT, 5000,
+          drmSessionManager, true, mainHandler, player, 50);
+
+      // Build the audio renderer.
+      DataSource audioDataSource = new DefaultUriDataSource(context, bandwidthMeter, userAgent);
+      ChunkSource audioChunkSource = new SmoothStreamingChunkSource(manifestFetcher,
+          DefaultSmoothStreamingTrackSelector.newAudioInstance(),
+          audioDataSource, null, LIVE_EDGE_LATENCY_MS);
+      ChunkSampleSource audioSampleSource = new ChunkSampleSource(audioChunkSource, loadControl,
+          AUDIO_BUFFER_SEGMENTS * BUFFER_SEGMENT_SIZE, mainHandler, player,
+          NPExoPlayer.TYPE_AUDIO);
+      TrackRenderer audioRenderer = new MediaCodecAudioTrackRenderer(audioSampleSource,
+          MediaCodecSelector.DEFAULT, drmSessionManager, true, mainHandler, player,
+          AudioCapabilities.getCapabilities(context), AudioManager.STREAM_MUSIC);
+
+      // Build the text renderer.
+      DataSource textDataSource = new DefaultUriDataSource(context, bandwidthMeter, userAgent);
+      ChunkSource textChunkSource = new SmoothStreamingChunkSource(manifestFetcher,
+          DefaultSmoothStreamingTrackSelector.newTextInstance(),
+          textDataSource, null, LIVE_EDGE_LATENCY_MS);
+      ChunkSampleSource textSampleSource = new ChunkSampleSource(textChunkSource, loadControl,
+          TEXT_BUFFER_SEGMENTS * BUFFER_SEGMENT_SIZE, mainHandler, player,
+          NPExoPlayer.TYPE_TEXT);
+      TrackRenderer textRenderer = new TextTrackRenderer(textSampleSource, player,
+          mainHandler.getLooper());
+
+      // Invoke the callback.
+      TrackRenderer[] renderers = new TrackRenderer[NPExoPlayer.RENDERER_COUNT];
+      renderers[NPExoPlayer.TYPE_VIDEO] = videoRenderer;
+      renderers[NPExoPlayer.TYPE_AUDIO] = audioRenderer;
+      renderers[NPExoPlayer.TYPE_TEXT] = textRenderer;
+      player.onRenderers(renderers, bandwidthMeter);
+    }
+
+  }
+
+}

app/src/main/java/org/schabi/newpipe/report/AcraReportSender.java

@@ -0,0 +1,38 @@
+package org.schabi.newpipe.report;
+
+import android.content.Context;
+
+import org.acra.collector.CrashReportData;
+import org.acra.sender.ReportSender;
+import org.acra.sender.ReportSenderException;
+import org.schabi.newpipe.R;
+
+/**
+ * Created by Christian Schabesberger  on 13.09.16.
+ *
+ * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
+ * AcraReportSender.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 AcraReportSender implements ReportSender {
+
+    @Override
+    public void send(Context context, CrashReportData report) throws ReportSenderException {
+        ErrorActivity.reportError(context, report,
+                ErrorActivity.ErrorInfo.make(ErrorActivity.UI_ERROR,"none",
+                        "App crash, UI failure", R.string.app_ui_crash));
+    }
+}

app/src/main/java/org/schabi/newpipe/report/AcraReportSenderFactory.java

@@ -1,15 +1,17 @@
-package org.schabi.newpipe.services;
+package org.schabi.newpipe.report;
 
-import org.schabi.newpipe.VideoPreviewInfo;
+import android.content.Context;
 
-import java.util.ArrayList;
-import java.util.Vector;
+import org.acra.config.ACRAConfiguration;
+import org.acra.sender.ReportSender;
+import org.acra.sender.ReportSenderFactory;
+import org.schabi.newpipe.report.AcraReportSender;
 
 /**
- * Created by Christian Schabesberger on 10.08.15.
+ * Created by Christian Schabesberger  on 13.09.16.
  *
  * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
- * SearchEngine.java is part of NewPipe.
+ * AcraReportSenderFactory.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
@@ -25,18 +27,8 @@ import java.util.Vector;
  * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-@SuppressWarnings("ALL")
-public interface SearchEngine {
-
-
-    class Result {
-        public String errorMessage = "";
-        public String suggestion = "";
-        public final Vector<VideoPreviewInfo> resultList = new Vector<>();
+public class AcraReportSenderFactory implements ReportSenderFactory {
+    public ReportSender create(Context context, ACRAConfiguration config) {
+        return new AcraReportSender();
     }
-
-    ArrayList<String> suggestionList(String query);
-
-    //Result search(String query, int page);
-    Result search(String query, int page, String contentCountry);
 }

app/src/main/java/org/schabi/newpipe/report/ErrorActivity.java

@@ -0,0 +1,516 @@
+
+
+package org.schabi.newpipe.report;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.graphics.Color;
+import android.net.Uri;
+import android.os.Build;
+import android.os.Parcel;
+import android.os.Parcelable;
+import android.preference.PreferenceManager;
+import android.support.design.widget.Snackbar;
+import android.support.v4.app.NavUtils;
+import android.support.v7.app.ActionBar;
+import android.support.v7.app.AppCompatActivity;
+import android.os.Bundle;
+import android.os.Handler;
+import android.util.Log;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.TextView;
+
+import org.acra.ReportField;
+import org.acra.collector.CrashReportData;
+import org.json.JSONArray;
+import org.json.JSONObject;
+import org.schabi.newpipe.ActivityCommunicator;
+import org.schabi.newpipe.BuildConfig;
+import org.schabi.newpipe.Downloader;
+import org.schabi.newpipe.MainActivity;
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.extractor.Parser;
+
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+import java.util.TimeZone;
+import java.util.Vector;
+
+/**
+ * Created by Christian Schabesberger on 24.10.15.
+ *
+ * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
+ * ErrorActivity.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 ErrorActivity extends AppCompatActivity {
+    public static class ErrorInfo implements Parcelable {
+        public int userAction;
+        public String request;
+        public String serviceName;
+        public int message;
+
+        public static ErrorInfo make(int userAction, String serviceName, String request, int message) {
+            ErrorInfo info = new ErrorInfo();
+            info.userAction = userAction;
+            info.serviceName = serviceName;
+            info.request = request;
+            info.message = message;
+            return info;
+        }
+
+        @Override
+        public int describeContents() {
+            return 0;
+        }
+
+        @Override
+        public void writeToParcel(Parcel dest, int flags) {
+            dest.writeInt(this.userAction);
+            dest.writeString(this.request);
+            dest.writeString(this.serviceName);
+            dest.writeInt(this.message);
+        }
+
+        public ErrorInfo() {
+        }
+
+        protected ErrorInfo(Parcel in) {
+            this.userAction = in.readInt();
+            this.request = in.readString();
+            this.serviceName = in.readString();
+            this.message = in.readInt();
+        }
+
+        public static final Parcelable.Creator<ErrorInfo> CREATOR = new Parcelable.Creator<ErrorInfo>() {
+            @Override
+            public ErrorInfo createFromParcel(Parcel source) {
+                return new ErrorInfo(source);
+            }
+
+            @Override
+            public ErrorInfo[] newArray(int size) {
+                return new ErrorInfo[size];
+            }
+        };
+    }
+
+    // LOG TAGS
+    public static final String TAG = ErrorActivity.class.toString();
+
+    // BUNDLE TAGS
+    public static final String ERROR_INFO = "error_info";
+    public static final String ERROR_LIST = "error_list";
+
+    // MESSAGE ID
+    public static final int SEARCHED = 0;
+    public static final int REQUESTED_STREAM = 1;
+    public static final int GET_SUGGESTIONS = 2;
+    public static final int SOMETHING_ELSE = 3;
+    public static final int USER_REPORT = 4;
+    public static final int LOAD_IMAGE = 5;
+    public static final int UI_ERROR = 6;
+    public static final int REQUESTED_CHANNEL = 7;
+
+    // MESSAGE STRING
+    public static final String SEARCHED_STRING = "searched";
+    public static final String REQUESTED_STREAM_STRING = "requested stream";
+    public static final String GET_SUGGESTIONS_STRING = "get suggestions";
+    public static final String SOMETHING_ELSE_STRING = "something";
+    public static final String USER_REPORT_STRING = "user report";
+    public static final String LOAD_IMAGE_STRING = "load image";
+    public static final String UI_ERROR_STRING = "ui error";
+    public static final String REQUESTED_CHANNEL_STRING = "requested channel";
+
+    public static final String ERROR_EMAIL_ADDRESS = "crashreport@newpipe.schabi.org";
+    public static final String ERROR_EMAIL_SUBJECT = "Exception in NewPipe " + BuildConfig.VERSION_NAME;
+
+    private String[] errorList;
+    private ErrorInfo errorInfo;
+    private Class returnActivity;
+    private String currentTimeStamp;
+    private String globIpRange;
+    Thread globIpRangeThread;
+
+    // views
+    private TextView errorView;
+    private EditText userCommentBox;
+    private Button reportButton;
+    private TextView infoView;
+    private TextView errorMessageView;
+
+    public static void reportError(final Context context, final List<Throwable> el,
+                                   final Class returnAcitivty, View rootView, final ErrorInfo errorInfo) {
+
+        if (rootView != null) {
+            Snackbar.make(rootView, R.string.error_snackbar_message, Snackbar.LENGTH_LONG)
+                    .setActionTextColor(Color.YELLOW)
+                    .setAction(R.string.error_snackbar_action, new View.OnClickListener() {
+                        @Override
+                        public void onClick(View v) {
+                            ActivityCommunicator ac = ActivityCommunicator.getCommunicator();
+                            ac.returnActivity = returnAcitivty;
+                            Intent intent = new Intent(context, ErrorActivity.class);
+                            intent.putExtra(ERROR_INFO, errorInfo);
+                            intent.putExtra(ERROR_LIST, elToSl(el));
+                            context.startActivity(intent);
+                        }
+                    }).show();
+        } else {
+            ActivityCommunicator ac = ActivityCommunicator.getCommunicator();
+            ac.returnActivity = returnAcitivty;
+            Intent intent = new Intent(context, ErrorActivity.class);
+            intent.putExtra(ERROR_INFO, errorInfo);
+            intent.putExtra(ERROR_LIST, elToSl(el));
+            context.startActivity(intent);
+        }
+    }
+
+    public static void reportError(final Context context, final Throwable e,
+                                   final Class returnAcitivty, View rootView, final ErrorInfo errorInfo) {
+        List<Throwable> el = null;
+        if(e != null) {
+            el = new Vector<>();
+            el.add(e);
+        }
+        reportError(context, el, returnAcitivty, rootView, errorInfo);
+    }
+
+    // async call
+    public static void reportError(Handler handler, final Context context, final Throwable e,
+                                   final Class returnAcitivty, final View rootView, final ErrorInfo errorInfo) {
+
+        List<Throwable> el = null;
+        if(e != null) {
+            el = new Vector<>();
+            el.add(e);
+        }
+        reportError(handler, context, el, returnAcitivty, rootView, errorInfo);
+    }
+
+    // async call
+    public static void reportError(Handler handler, final Context context, final List<Throwable> el,
+                                   final Class returnAcitivty, final View rootView, final ErrorInfo errorInfo) {
+        handler.post(new Runnable() {
+            @Override
+            public void run() {
+                reportError(context, el, returnAcitivty, rootView, errorInfo);
+            }
+        });
+    }
+
+    public static void reportError(final Context context, final CrashReportData report, final ErrorInfo errorInfo) {
+        // get key first (don't ask about this solution)
+        ReportField key = null;
+        for(ReportField k : report.keySet()) {
+            if(k.toString().equals("STACK_TRACE")) {
+                key = k;
+            }
+        }
+        String[] el = new String[] { report.get(key) };
+
+        Intent intent = new Intent(context, ErrorActivity.class);
+        intent.putExtra(ERROR_INFO, errorInfo);
+        intent.putExtra(ERROR_LIST, el);
+        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        context.startActivity(intent);
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_error);
+
+        Intent intent = getIntent();
+
+        try {
+            ActionBar actionBar = getSupportActionBar();
+            actionBar.setDisplayHomeAsUpEnabled(true);
+            actionBar.setTitle(R.string.error_report_title);
+            actionBar.setDisplayShowTitleEnabled(true);
+        } catch (Throwable e) {
+            Log.e(TAG, "Error turing exception handling");
+            e.printStackTrace();
+        }
+
+        reportButton = (Button) findViewById(R.id.errorReportButton);
+        userCommentBox = (EditText) findViewById(R.id.errorCommentBox);
+        errorView = (TextView) findViewById(R.id.errorView);
+        infoView = (TextView) findViewById(R.id.errorInfosView);
+        errorMessageView = (TextView) findViewById(R.id.errorMessageView);
+
+        ActivityCommunicator ac = ActivityCommunicator.getCommunicator();
+        returnActivity = ac.returnActivity;
+        errorInfo = intent.getParcelableExtra(ERROR_INFO);
+        errorList = intent.getStringArrayExtra(ERROR_LIST);
+
+                //importand add gurumeditaion
+        addGuruMeditaion();
+        currentTimeStamp = getCurrentTimeStamp();
+
+        reportButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+
+                Intent intent = new Intent(Intent.ACTION_SENDTO);
+                intent.setData(Uri.parse("mailto:" + ERROR_EMAIL_ADDRESS))
+                        .putExtra(Intent.EXTRA_SUBJECT, ERROR_EMAIL_SUBJECT)
+                        .putExtra(Intent.EXTRA_TEXT, buildJson());
+
+                startActivity(Intent.createChooser(intent, "Send Email"));
+            }
+        });
+        reportButton.setEnabled(false);
+
+        globIpRangeThread = new Thread(new IpRagneRequester());
+        globIpRangeThread.start();
+
+        // normal bugreport
+        buildInfo(errorInfo);
+        if(errorInfo.message != 0) {
+            errorMessageView.setText(errorInfo.message);
+        } else {
+            errorMessageView.setVisibility(View.GONE);
+            findViewById(R.id.messageWhatHappenedView).setVisibility(View.GONE);
+        }
+
+        errorView.setText(formErrorText(errorList));
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        MenuInflater inflater = getMenuInflater();
+        inflater.inflate(R.menu.error_menu, menu);
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        int id = item.getItemId();
+        switch (id) {
+            case android.R.id.home:
+                goToReturnActivity();
+                break;
+            case R.id.menu_item_share_error: {
+                Intent intent = new Intent();
+                intent.setAction(Intent.ACTION_SEND);
+                intent.putExtra(Intent.EXTRA_TEXT, buildJson());
+                intent.setType("text/plain");
+                startActivity(Intent.createChooser(intent, getString(R.string.share_dialog_title)));
+            }
+            break;
+        }
+        return false;
+    }
+
+    private static String getStackTrace(final Throwable throwable) {
+        final StringWriter sw = new StringWriter();
+        final PrintWriter pw = new PrintWriter(sw, true);
+        throwable.printStackTrace(pw);
+        return sw.getBuffer().toString();
+    }
+
+    private String formErrorText(String[] el) {
+        String text = "";
+        if(el != null) {
+            for (String e : el) {
+                text += "-------------------------------------\n"
+                        + e;
+            }
+        }
+        text += "-------------------------------------";
+        return text;
+    }
+
+    private void goToReturnActivity() {
+        if (returnActivity == null) {
+            super.onBackPressed();
+        } else {
+            Intent intent;
+            if (returnActivity != null &&
+                    returnActivity.isAssignableFrom(Activity.class)) {
+                intent = new Intent(this, returnActivity);
+            } else {
+                intent = new Intent(this, MainActivity.class);
+            }
+            intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+            NavUtils.navigateUpTo(this, intent);
+        }
+    }
+
+    private void buildInfo(ErrorInfo info) {
+        TextView infoLabelView = (TextView) findViewById(R.id.errorInfoLabelsView);
+        TextView infoView = (TextView) findViewById(R.id.errorInfosView);
+        String text = "";
+
+        infoLabelView.setText(getString(R.string.info_labels).replace("\\n", "\n"));
+
+        text += getUserActionString(info.userAction)
+                + "\n" + info.request
+                + "\n" + getContentLangString()
+                + "\n" + info.serviceName
+                + "\n" + currentTimeStamp
+                + "\n" + getPackageName()
+                + "\n" + BuildConfig.VERSION_NAME
+                + "\n" + getOsString();
+
+        infoView.setText(text);
+    }
+
+    private String buildJson() {
+        JSONObject errorObject = new JSONObject();
+
+        try {
+            errorObject.put("user_action", getUserActionString(errorInfo.userAction))
+                    .put("request", errorInfo.request)
+                    .put("content_language", getContentLangString())
+                    .put("service", errorInfo.serviceName)
+                    .put("package", getPackageName())
+                    .put("version", BuildConfig.VERSION_NAME)
+                    .put("os", getOsString())
+                    .put("time", currentTimeStamp)
+                    .put("ip_range", globIpRange);
+
+            JSONArray exceptionArray = new JSONArray();
+            if(errorList != null) {
+                for (String e : errorList) {
+                    exceptionArray.put(e);
+                }
+            }
+
+            errorObject.put("exceptions", exceptionArray);
+            errorObject.put("user_comment", userCommentBox.getText().toString());
+
+            return errorObject.toString(3);
+        } catch (Throwable e) {
+            Log.e(TAG, "Error while erroring: Could not build json");
+            e.printStackTrace();
+        }
+
+        return "";
+    }
+
+    private String getUserActionString(int userAction) {
+        switch (userAction) {
+            case REQUESTED_STREAM:
+                return REQUESTED_STREAM_STRING;
+            case SEARCHED:
+                return SEARCHED_STRING;
+            case GET_SUGGESTIONS:
+                return GET_SUGGESTIONS_STRING;
+            case SOMETHING_ELSE:
+                return SOMETHING_ELSE_STRING;
+            case USER_REPORT:
+                return USER_REPORT_STRING;
+            case LOAD_IMAGE:
+                return LOAD_IMAGE_STRING;
+            case UI_ERROR:
+                return UI_ERROR_STRING;
+            case REQUESTED_CHANNEL:
+                return REQUESTED_CHANNEL_STRING;
+            default:
+                return "Your description is in another castle.";
+        }
+    }
+
+    private String getContentLangString() {
+        return PreferenceManager.getDefaultSharedPreferences(this)
+                .getString(this.getString(R.string.search_language_key), "none");
+    }
+
+    private String getOsString() {
+        String osBase = Build.VERSION.SDK_INT >= 23 ? Build.VERSION.BASE_OS : "Android";
+        return System.getProperty("os.name")
+                + " " + (osBase.isEmpty() ? "Android" : osBase)
+                + " " + Build.VERSION.RELEASE
+                + " - " + Integer.toString(Build.VERSION.SDK_INT);
+    }
+
+    private void addGuruMeditaion() {
+        //just an easter egg
+        TextView sorryView = (TextView) findViewById(R.id.errorSorryView);
+        String text = sorryView.getText().toString();
+        text += "\n" + getString(R.string.guru_meditation);
+        sorryView.setText(text);
+    }
+
+    @Override
+    public void onBackPressed() {
+        //super.onBackPressed();
+        goToReturnActivity();
+    }
+
+    public String getCurrentTimeStamp() {
+        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+        df.setTimeZone(TimeZone.getTimeZone("GMT"));
+        return df.format(new Date());
+    }
+
+    private class IpRagneRequester implements Runnable {
+        Handler h = new Handler();
+        public void run() {
+            String ipRange = "none";
+            try {
+                Downloader dl = Downloader.getInstance();
+                String ip = dl.download("https://ipv4.icanhazip.com");
+
+                ipRange = Parser.matchGroup1("([0-9]*\\.[0-9]*\\.)[0-9]*\\.[0-9]*", ip)
+                        + "0.0";
+            } catch(Throwable e) {
+                Log.d(TAG, "Error while error: could not get iprange");
+                e.printStackTrace();
+            } finally {
+                h.post(new IpRageReturnRunnable(ipRange));
+            }
+        }
+    }
+
+
+
+    private class IpRageReturnRunnable implements Runnable {
+        String ipRange;
+        public IpRageReturnRunnable(String ipRange) {
+            this.ipRange = ipRange;
+        }
+        public void run() {
+            globIpRange = ipRange;
+            if(infoView != null) {
+                String text = infoView.getText().toString();
+                text += "\n" + globIpRange;
+                infoView.setText(text);
+                reportButton.setEnabled(true);
+            }
+        }
+    }
+
+    // errorList to StringList
+    private static String[] elToSl(List<Throwable> stackTraces) {
+        String[] out = new String[stackTraces.size()];
+        for(int i = 0; i < stackTraces.size(); i++) {
+            out[i] = getStackTrace(stackTraces.get(i));
+        }
+        return out;
+    }
+}

app/src/main/java/org/schabi/newpipe/search_fragment/SearchInfoItemFragment.java

@@ -0,0 +1,316 @@
+package org.schabi.newpipe.search_fragment;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.support.v7.widget.SearchView;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.inputmethod.InputMethodManager;
+import android.widget.ProgressBar;
+import android.widget.Toast;
+
+import org.schabi.newpipe.ReCaptchaActivity;
+import org.schabi.newpipe.extractor.NewPipe;
+import org.schabi.newpipe.extractor.search.SearchResult;
+import org.schabi.newpipe.info_list.InfoItemBuilder;
+import org.schabi.newpipe.report.ErrorActivity;
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.detail.VideoItemDetailActivity;
+import org.schabi.newpipe.detail.VideoItemDetailFragment;
+import org.schabi.newpipe.info_list.InfoListAdapter;
+
+import static android.app.Activity.RESULT_OK;
+import static org.schabi.newpipe.ReCaptchaActivity.RECAPTCHA_REQUEST;
+
+/**
+ * Created by Christian Schabesberger on 02.08.16.
+ *
+ * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
+ * SearchInfoItemFragment.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 SearchInfoItemFragment extends Fragment {
+
+    private static final String TAG = SearchInfoItemFragment.class.toString();
+
+    public class SearchQueryListener implements SearchView.OnQueryTextListener {
+
+        @Override
+        public boolean onQueryTextSubmit(String query) {
+            Activity a = getActivity();
+            try {
+                searchQuery = query;
+                search(query);
+
+                // hide virtual keyboard
+                InputMethodManager inputManager =
+                        (InputMethodManager) a.getSystemService(Context.INPUT_METHOD_SERVICE);
+                try {
+                    //noinspection ConstantConditions
+                    inputManager.hideSoftInputFromWindow(
+                            a.getCurrentFocus().getWindowToken(), InputMethodManager.HIDE_NOT_ALWAYS);
+                } catch (NullPointerException e) {
+                    e.printStackTrace();
+                    ErrorActivity.reportError(a, e, null,
+                            a.findViewById(android.R.id.content),
+                            ErrorActivity.ErrorInfo.make(ErrorActivity.SEARCHED,
+                                    NewPipe.getNameOfService(streamingServiceId),
+                                    "Could not get widget with focus", R.string.general_error));
+                }
+                // clear focus
+                // 1. to not open up the keyboard after switching back to this
+                // 2. It's a workaround to a seeming bug by the Android OS it self, causing
+                //    onQueryTextSubmit to trigger twice when focus is not cleared.
+                // See: http://stackoverflow.com/questions/17874951/searchview-onquerytextsubmit-runs-twice-while-i-pressed-once
+                a.getCurrentFocus().clearFocus();
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+            View bg = a.findViewById(R.id.mainBG);
+            bg.setVisibility(View.GONE);
+            return true;
+        }
+
+        @Override
+        public boolean onQueryTextChange(String newText) {
+            if (!newText.isEmpty()) {
+                searchSuggestions(newText);
+            }
+            return true;
+        }
+    }
+
+    private int streamingServiceId = -1;
+    private String searchQuery = "";
+    private boolean isLoading = false;
+
+    private ProgressBar loadingIndicator = null;
+    private SearchView searchView = null;
+    private int pageNumber = 0;
+    private SuggestionListAdapter suggestionListAdapter = null;
+    private InfoListAdapter infoListAdapter = null;
+    private LinearLayoutManager streamInfoListLayoutManager = null;
+    private RecyclerView recyclerView = null;
+
+    // savedInstanceBundle arguments
+    private static final String QUERY = "query";
+    private static final String STREAMING_SERVICE = "streaming_service";
+
+    /**
+     * Mandatory empty constructor for the fragment manager to instantiate the
+     * fragment (e.g. upon screen orientation changes).
+     */
+    public SearchInfoItemFragment() {
+    }
+
+    // TODO: Customize parameter initialization
+    @SuppressWarnings("unused")
+    public static SearchInfoItemFragment newInstance(int columnCount) {
+        SearchInfoItemFragment fragment = new SearchInfoItemFragment();
+        return fragment;
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        if (savedInstanceState != null) {
+            searchQuery = savedInstanceState.getString(QUERY);
+            streamingServiceId = savedInstanceState.getInt(STREAMING_SERVICE);
+        } else {
+            try {
+                streamingServiceId = NewPipe.getIdOfService("Youtube");
+            } catch (Exception e) {
+                e.printStackTrace();
+                ErrorActivity.reportError(getActivity(), e, null,
+                        getActivity().findViewById(android.R.id.content),
+                        ErrorActivity.ErrorInfo.make(ErrorActivity.SEARCHED,
+                                NewPipe.getNameOfService(streamingServiceId),
+                                "", R.string.general_error));
+            }
+        }
+
+        SearchWorker sw = SearchWorker.getInstance();
+        sw.setSearchWorkerResultListener(new SearchWorker.SearchWorkerResultListener() {
+            @Override
+            public void onResult(SearchResult result) {
+                infoListAdapter.addStreamItemList(result.resultList);
+                isLoading = false;
+                loadingIndicator.setVisibility(View.GONE);
+            }
+
+            @Override
+            public void onNothingFound(int stringResource) {
+                //setListShown(true);
+                Toast.makeText(getActivity(), getString(stringResource),
+                        Toast.LENGTH_SHORT).show();
+                isLoading = false;
+                loadingIndicator.setVisibility(View.GONE);
+            }
+
+            @Override
+            public void onError(String message) {
+                //setListShown(true);
+                Toast.makeText(getActivity(), message,
+                        Toast.LENGTH_LONG).show();
+                isLoading = false;
+                loadingIndicator.setVisibility(View.GONE);
+            }
+
+            @Override
+            public void onReCaptchaChallenge() {
+                Toast.makeText(getActivity(), "ReCaptcha Challenge requested",
+                        Toast.LENGTH_LONG).show();
+
+                // Starting ReCaptcha Challenge Activity
+                startActivityForResult(
+                        new Intent(getActivity(), ReCaptchaActivity.class),
+                        RECAPTCHA_REQUEST);
+            }
+        });
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        View view = inflater.inflate(R.layout.fragment_searchinfoitem, container, false);
+
+        Context context = view.getContext();
+        loadingIndicator = (ProgressBar) view.findViewById(R.id.progressBar);
+        recyclerView = (RecyclerView) view.findViewById(R.id.list);
+        streamInfoListLayoutManager = new LinearLayoutManager(context);
+        recyclerView.setLayoutManager(streamInfoListLayoutManager);
+
+        infoListAdapter = new InfoListAdapter(getActivity(),
+                getActivity().findViewById(android.R.id.content));
+        infoListAdapter.setOnItemSelectedListener(new InfoItemBuilder.OnItemSelectedListener() {
+            @Override
+            public void selected(String url) {
+                Intent i = new Intent(getActivity(), VideoItemDetailActivity.class);
+                i.putExtra(VideoItemDetailFragment.STREAMING_SERVICE, streamingServiceId);
+                i.putExtra(VideoItemDetailFragment.VIDEO_URL, url);
+                getActivity().startActivity(i);
+            }
+        });
+        recyclerView.setAdapter(infoListAdapter);
+
+        recyclerView.setOnScrollListener(new RecyclerView.OnScrollListener() {
+            @Override
+            public void onScrolled(RecyclerView recyclerView, int dx, int dy) {
+                int pastVisiblesItems, visibleItemCount, totalItemCount;
+                super.onScrolled(recyclerView, dx, dy);
+                if (dy > 0) //check for scroll down
+                {
+                    visibleItemCount = streamInfoListLayoutManager.getChildCount();
+                    totalItemCount = streamInfoListLayoutManager.getItemCount();
+                    pastVisiblesItems = streamInfoListLayoutManager.findFirstVisibleItemPosition();
+
+                    if ((visibleItemCount + pastVisiblesItems) >= totalItemCount && !isLoading) {
+                        pageNumber++;
+                        search(searchQuery, pageNumber);
+                    }
+                }
+            }
+        });
+
+        return view;
+    }
+
+    @Override
+    public void onAttach(Context context) {
+        super.onAttach(context);
+    }
+
+    @Override
+    public void onDetach() {
+        super.onDetach();
+    }
+
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        super.onCreateOptionsMenu(menu, inflater);
+        inflater.inflate(R.menu.search_menu, menu);
+
+        MenuItem searchItem = menu.findItem(R.id.action_search);
+        searchView = (SearchView) searchItem.getActionView();
+        setupSearchView(searchView);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        return super.onOptionsItemSelected(item);
+    }
+
+    private void setupSearchView(SearchView searchView) {
+        suggestionListAdapter = new SuggestionListAdapter(getActivity());
+        searchView.setSuggestionsAdapter(suggestionListAdapter);
+        searchView.setOnSuggestionListener(new SearchSuggestionListener(searchView, suggestionListAdapter));
+        searchView.setOnQueryTextListener(new SearchQueryListener());
+        if (searchQuery != null && !searchQuery.isEmpty()) {
+            searchView.setQuery(searchQuery, false);
+            searchView.setIconifiedByDefault(false);
+        }
+    }
+
+    private void search(String query) {
+        infoListAdapter.clearSteamItemList();
+        pageNumber = 0;
+        search(query, pageNumber);
+        loadingIndicator.setVisibility(View.VISIBLE);
+    }
+
+    private void search(String query, int page) {
+        isLoading = true;
+        SearchWorker sw = SearchWorker.getInstance();
+        sw.search(streamingServiceId, query, page, getActivity());
+    }
+
+    private void searchSuggestions(String query) {
+        SuggestionSearchRunnable suggestionSearchRunnable =
+                new SuggestionSearchRunnable(streamingServiceId, query, getActivity(), suggestionListAdapter);
+        Thread suggestionThread = new Thread(suggestionSearchRunnable);
+        suggestionThread.start();
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        switch (requestCode) {
+            case RECAPTCHA_REQUEST:
+                if (resultCode == RESULT_OK) {
+                    if (searchQuery.length() != 0) {
+                        search(searchQuery);
+                    }
+                } else {
+                    Log.d(TAG, "ReCaptcha failed");
+                }
+                break;
+
+            default:
+                Log.e(TAG, "Request code from activity not supported [" + requestCode + "]");
+                break;
+        }
+    }
+}

app/src/main/java/org/schabi/newpipe/search_fragment/SearchSuggestionListener.java

@@ -0,0 +1,49 @@
+package org.schabi.newpipe.search_fragment;
+
+import android.support.v7.widget.SearchView;
+
+/**
+ * Created by Christian Schabesberger on 02.08.16.
+ *
+ * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
+ * SearchSuggestionListener.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 SearchSuggestionListener implements SearchView.OnSuggestionListener{
+
+    private SearchView searchView;
+    private SuggestionListAdapter adapter;
+
+    public SearchSuggestionListener(SearchView searchView, SuggestionListAdapter adapter) {
+        this.searchView = searchView;
+        this.adapter = adapter;
+    }
+
+    @Override
+    public boolean onSuggestionSelect(int position) {
+        String suggestion = adapter.getSuggestion(position);
+        searchView.setQuery(suggestion,true);
+        return false;
+    }
+
+    @Override
+    public boolean onSuggestionClick(int position) {
+        String suggestion = adapter.getSuggestion(position);
+        searchView.setQuery(suggestion,true);
+        return false;
+    }
+}

app/src/main/java/org/schabi/newpipe/search_fragment/SearchWorker.java

@@ -0,0 +1,196 @@
+package org.schabi.newpipe.search_fragment;
+
+import android.app.Activity;
+import android.content.SharedPreferences;
+import android.os.Handler;
+import android.preference.PreferenceManager;
+import android.util.Log;
+import android.view.View;
+
+import org.schabi.newpipe.extractor.exceptions.ExtractionException;
+import org.schabi.newpipe.extractor.exceptions.ReCaptchaException;
+import org.schabi.newpipe.extractor.search.SearchEngine;
+import org.schabi.newpipe.extractor.search.SearchResult;
+import org.schabi.newpipe.report.ErrorActivity;
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.extractor.NewPipe;
+
+import java.io.IOException;
+
+/**
+ * Created by Christian Schabesberger on 02.08.16.
+ *
+ * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
+ * SearchWorker.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 SearchWorker {
+    private static final String TAG = SearchWorker.class.toString();
+
+    public interface SearchWorkerResultListener {
+        void onResult(SearchResult result);
+        void onNothingFound(final int stringResource);
+        void onError(String message);
+        void onReCaptchaChallenge();
+    }
+
+    private class ResultRunnable implements Runnable {
+        private final SearchResult result;
+        private int requestId = 0;
+        public ResultRunnable(SearchResult result, int requestId) {
+            this.result = result;
+            this.requestId = requestId;
+        }
+        @Override
+        public void run() {
+            if(this.requestId == SearchWorker.this.requestId) {
+                searchWorkerResultListener.onResult(result);
+            }
+        }
+    }
+
+    private class SearchRunnable implements Runnable {
+        public static final String YOUTUBE = "Youtube";
+        private final String query;
+        private final int page;
+        final Handler h = new Handler();
+        private volatile boolean runs = true;
+        private Activity a = null;
+        private int serviceId = -1;
+        public SearchRunnable(int serviceId, String query, int page, Activity activity, int requestId) {
+            this.serviceId = serviceId;
+            this.query = query;
+            this.page = page;
+            this.a = activity;
+        }
+        void terminate() {
+            runs = false;
+        }
+        @Override
+        public void run() {
+            SearchResult result = null;
+            SearchEngine engine = null;
+
+            try {
+                engine = NewPipe.getService(serviceId)
+                        .getSearchEngineInstance();
+            } catch(ExtractionException e) {
+                ErrorActivity.reportError(h, a, e, null, null,
+                        ErrorActivity.ErrorInfo.make(ErrorActivity.SEARCHED,
+                                Integer.toString(serviceId), query, R.string.general_error));
+                return;
+            }
+
+            try {
+                SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(a);
+                String searchLanguageKey = a.getString(R.string.search_language_key);
+                String searchLanguage = sp.getString(searchLanguageKey,
+                        a.getString(R.string.default_language_value));
+                result = SearchResult
+                        .getSearchResult(engine, query, page, searchLanguage);
+                if(runs) {
+                    h.post(new ResultRunnable(result, requestId));
+                }
+
+                // look for errors during extraction
+                // soft errors:
+                if(result != null &&
+                        !result.errors.isEmpty()) {
+                    Log.e(TAG, "OCCURRED ERRORS DURING SEARCH EXTRACTION:");
+                    for(Throwable e : result.errors) {
+                        e.printStackTrace();
+                        Log.e(TAG, "------");
+                    }
+
+                    View rootView = a.findViewById(android.R.id.content);
+                    ErrorActivity.reportError(h, a, result.errors, null, rootView,
+                            ErrorActivity.ErrorInfo.make(ErrorActivity.SEARCHED,
+                        /* todo: this shoudl not be assigned static */  YOUTUBE, query, R.string.light_parsing_error));
+
+                }
+                // hard errors:
+            } catch (ReCaptchaException e) {
+                h.post(new Runnable() {
+                    @Override
+                    public void run() {
+                        searchWorkerResultListener.onReCaptchaChallenge();
+                    }
+                });
+            } catch(IOException e) {
+                h.post(new Runnable() {
+                    @Override
+                    public void run() {
+                        searchWorkerResultListener.onNothingFound(R.string.network_error);
+                    }
+                });
+                e.printStackTrace();
+            } catch(final SearchEngine.NothingFoundException e) {
+                h.post(new Runnable() {
+                    @Override
+                    public void run() {
+                        searchWorkerResultListener.onError(e.getMessage());
+                    }
+                });
+            } catch(ExtractionException e) {
+                ErrorActivity.reportError(h, a, e, null, null,
+                        ErrorActivity.ErrorInfo.make(ErrorActivity.SEARCHED,
+                        /* todo: this shoudl not be assigned static */
+                                YOUTUBE, query, R.string.parsing_error));
+                //postNewErrorToast(h, R.string.parsing_error);
+                e.printStackTrace();
+
+            } catch(Exception e) {
+                ErrorActivity.reportError(h, a, e, null, null,
+                        ErrorActivity.ErrorInfo.make(ErrorActivity.SEARCHED,
+                        /* todo: this shoudl not be assigned static */ YOUTUBE, query, R.string.general_error));
+
+                e.printStackTrace();
+            }
+        }
+    }
+
+    private static SearchWorker searchWorker = null;
+    private SearchWorkerResultListener searchWorkerResultListener = null;
+    private SearchRunnable runnable = null;
+    private int requestId = 0;     //prevents running requests that have already ben expired
+
+    public static SearchWorker getInstance() {
+        return searchWorker == null ? (searchWorker = new SearchWorker()) : searchWorker;
+    }
+
+    public void setSearchWorkerResultListener(SearchWorkerResultListener listener) {
+        searchWorkerResultListener = listener;
+    }
+
+    private SearchWorker() {
+
+    }
+
+    public void search(int serviceId, String query, int page, Activity a) {
+        if(runnable != null) {
+            terminate();
+        }
+        runnable = new SearchRunnable(serviceId, query, page, a, requestId);
+        Thread thread = new Thread(runnable);
+        thread.start();
+    }
+
+    public void terminate() {
+        requestId++;
+        runnable.terminate();
+    }
+}

app/src/main/java/org/schabi/newpipe/search_fragment/SuggestionListAdapter.java

@@ -0,0 +1,82 @@
+package org.schabi.newpipe.search_fragment;
+
+import android.content.Context;
+import android.database.Cursor;
+import android.database.MatrixCursor;
+import android.support.v4.widget.CursorAdapter;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import java.util.List;
+
+/**
+ * Created by Christian Schabesberger on 02.08.16.
+ *
+ * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
+ * SuggestionListAdapter.java is part of NewPipe.
+ *
+ * NewPipe is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * NewPipe is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+public class SuggestionListAdapter extends CursorAdapter {
+
+    private String[] columns = new String[]{"_id", "title"};
+
+    public SuggestionListAdapter(Context context) {
+        super(context, null, false);
+    }
+
+    @Override
+    public View newView(Context context, Cursor cursor, ViewGroup parent) {
+        ViewHolder viewHolder;
+
+        View view = LayoutInflater.from(context).inflate(android.R.layout.simple_list_item_1, parent, false);
+        viewHolder = new ViewHolder();
+        viewHolder.suggestionTitle = (TextView) view.findViewById(android.R.id.text1);
+        view.setTag(viewHolder);
+
+
+        return view;
+    }
+
+    @Override
+    public void bindView(View view, Context context, Cursor cursor) {
+        ViewHolder viewHolder = (ViewHolder) view.getTag();
+        viewHolder.suggestionTitle.setText(cursor.getString(1));
+    }
+
+
+    public void updateAdapter(List<String> suggestions) {
+        MatrixCursor cursor = new MatrixCursor(columns);
+        int i = 0;
+        for (String s : suggestions) {
+            String[] temp = new String[2];
+            temp[0] = Integer.toString(i);
+            temp[1] = s;
+            i++;
+            cursor.addRow(temp);
+        }
+        changeCursor(cursor);
+    }
+
+    public String getSuggestion(int position) {
+        return ((Cursor) getItem(position)).getString(1);
+    }
+
+    private class ViewHolder {
+        public TextView suggestionTitle;
+    }
+}

app/src/main/java/org/schabi/newpipe/search_fragment/SuggestionSearchRunnable.java

@@ -0,0 +1,104 @@
+package org.schabi.newpipe.search_fragment;
+
+import android.app.Activity;
+import android.content.SharedPreferences;
+import android.os.Handler;
+import android.preference.PreferenceManager;
+import android.widget.Toast;
+
+import org.schabi.newpipe.extractor.NewPipe;
+import org.schabi.newpipe.extractor.exceptions.ExtractionException;
+import org.schabi.newpipe.extractor.search.SuggestionExtractor;
+import org.schabi.newpipe.report.ErrorActivity;
+import org.schabi.newpipe.R;
+
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * Created by Christian Schabesberger on 02.08.16.
+ *
+ * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
+ * SuggestionSearchRunnable.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 SuggestionSearchRunnable implements Runnable{
+
+    private class SuggestionResultRunnable implements Runnable{
+
+        private List<String> suggestions;
+        private SuggestionListAdapter adapter;
+
+        private SuggestionResultRunnable(List<String> suggestions, SuggestionListAdapter adapter) {
+            this.suggestions = suggestions;
+            this.adapter = adapter;
+        }
+
+        @Override
+        public void run() {
+            adapter.updateAdapter(suggestions);
+        }
+    }
+
+    private final int serviceId;
+    private final String query;
+    final Handler h = new Handler();
+    private Activity a = null;
+    private SuggestionListAdapter adapter;
+    public SuggestionSearchRunnable(int serviceId, String query,
+                                     Activity activity, SuggestionListAdapter adapter) {
+        this.serviceId = serviceId;
+        this.query = query;
+        this.a = activity;
+        this.adapter = adapter;
+    }
+
+    @Override
+    public void run() {
+        try {
+            SuggestionExtractor se =
+                    NewPipe.getService(serviceId).getSuggestionExtractorInstance();
+            SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(a);
+            String searchLanguageKey = a.getString(R.string.search_language_key);
+            String searchLanguage = sp.getString(searchLanguageKey,
+                    a.getString(R.string.default_language_value));
+            List<String> suggestions = se.suggestionList(query, searchLanguage);
+            h.post(new SuggestionResultRunnable(suggestions, adapter));
+        } catch (ExtractionException e) {
+            ErrorActivity.reportError(h, a, e, null, a.findViewById(android.R.id.content),
+                    ErrorActivity.ErrorInfo.make(ErrorActivity.SEARCHED,
+                            NewPipe.getNameOfService(serviceId), query, R.string.parsing_error));
+            e.printStackTrace();
+        } catch (IOException e) {
+            postNewErrorToast(h, R.string.network_error);
+            e.printStackTrace();
+        } catch (Exception e) {
+            ErrorActivity.reportError(h, a, e, null, a.findViewById(android.R.id.content),
+                    ErrorActivity.ErrorInfo.make(ErrorActivity.SEARCHED,
+                            NewPipe.getNameOfService(serviceId), query, R.string.general_error));
+        }
+    }
+
+    private void postNewErrorToast(Handler h, final int stringResource) {
+        h.post(new Runnable() {
+            @Override
+            public void run() {
+                Toast.makeText(a, a.getString(stringResource),
+                        Toast.LENGTH_SHORT).show();
+            }
+        });
+    }
+}