move on to v0.8.10

Currently translated at 100.0% (149 of 149 strings)

.github/CONTRIBUTING.md

@@ -0,0 +1,39 @@
+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
+
+## Bugfixing
+* If you want to help NewPipe getting bug free, you can send me a mail to tnp@newpipe.schabi.org to let me know that you intent to help, and than register at our [sentry](https://support.schabi.org) setup. 
+
+## 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
+
+* WE DO NOW HAVE A MAILING LIST: [newpipe@list.schabi.org](https://list.schabi.org/cgi-bin/mailman/listinfo/newpipe).
+* If you want to get in contact with me or one of our other contributors you can send me an email at tnp(at)schabi.org
+* Feel free to post suggestions, changes, ideas etc!

.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
@@ -22,7 +25,7 @@ env:
     - 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
@@ -31,3 +34,7 @@ before_script:
   - 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,22 +1,22 @@
+WARNING: PUTTING NEWPIPE OR ANY FORK OF IT INTO GOOGLE PLAYSTORE VIOLATES THEIR TERMS OF CONDITIONS.
+
 # NewPipe
 NewPipe: A free lightweight Youtube frontend for Android.  
 
 [![NewPipe](app/src/main/res/mipmap-xhdpi/ic_launcher.png)](https://newpipe.schabi.org)
+[![F-Droid](https://f-droid.org/wiki/images/0/06/F-Droid-button_get-it-on.png)](https://f-droid.org/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)
-
-## Get NewPipe
-
-[![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)
+[![Build Status](https://travis-ci.org/TeamNewPipe/NewPipe.svg)](https://travis-ci.org/TeamNewPipe/NewPipe)
 
 ## Donate
 ![Bitcoin](https://bitcoin.org/img/icons/logotop.svg)
-`16A9J59ahMRqkLSZjhYj33n9j3fMztFxnh`
-
 ![BitcoinQR](assets/16A9J59ahMRqkLSZjhYj33n9j3fMztFxnh.png)
 
+`16A9J59ahMRqkLSZjhYj33n9j3fMztFxnh`
+
 ## Screenshots
 
 [<img src="screenshots/screenshot_1.png" width=150>](screenshots/screenshot_1.png)
@@ -36,25 +36,24 @@ 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)
-* Open a video in Kodi
+* 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, experimental)
 * Watch age restricted material
+* Display general information about channels
+* Search 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
@@ -64,7 +63,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 16
-        versionName "0.7.7"
+        targetSdkVersion 25
+        versionCode 24
+        versionName "0.8.10"
     }
     buildTypes {
         release {
@@ -31,17 +31,22 @@ android {
 }
 
 dependencies {
-    compile fileTree(include: ['*.jar'], dir: 'libs')
-    compile 'com.android.support:appcompat-v7:23.2.0'
-    compile 'com.android.support:support-v4:23.2.0'
-    compile 'com.android.support:design:23.2.0'
-    compile 'com.android.support:recyclerview-v7:23.2.0'
+    testCompile 'junit:junit:4.12'
+    compile 'com.android.support:appcompat-v7:25.1.1'
+    compile 'com.android.support:support-v4:25.1.1'
+    compile 'com.android.support:design:25.1.1'
+    compile 'com.android.support:recyclerview-v7:25.1.1'
     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 'org.apache.directory.studio:org.apache.commons.lang:2.6'
     compile 'com.google.android.exoplayer:exoplayer:r1.5.5'
+    compile 'com.google.code.gson:gson:2.4'
+    compile 'com.nononsenseapps:filepicker:3.0.0'
+    compile 'ch.acra:acra:4.9.0'
+    testCompile 'junit:junit:4.12'
+    testCompile 'org.mockito:mockito-core:1.10.19'
+    testCompile 'org.json:json:20160810'
 }

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

@@ -1,121 +0,0 @@
-package org.schabi.newpipe.extractor.youtube;
-
-import android.test.AndroidTestCase;
-
-import org.apache.commons.lang.exception.ExceptionUtils;
-import org.schabi.newpipe.extractor.AbstractVideoInfo;
-import org.schabi.newpipe.extractor.SearchResult;
-import org.schabi.newpipe.extractor.ServiceList;
-import org.schabi.newpipe.extractor.StreamPreviewInfo;
-import org.schabi.newpipe.extractor.SearchEngine;
-import org.schabi.newpipe.extractor.services.youtube.YoutubeSearchEngine;
-import org.schabi.newpipe.Downloader;
-import org.schabi.newpipe.extractor.services.youtube.YoutubeService;
-
-import java.util.ArrayList;
-
-/**
- * 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;
-    private ArrayList<String> suggestionReply;
-
-    @Override
-    public void setUp() throws Exception{
-        super.setUp();
-        SearchEngine engine = ServiceList.getService("Youtube")
-                .getSearchEngineInstance(new Downloader());
-
-        result = engine.search("lefloid",
-                0, "de", new Downloader()).getSearchResult();
-        suggestionReply = engine.suggestionList("hello","de",new Downloader());
-    }
-
-    public void testIfNoErrorOccur() {
-        assertTrue(result.errors.isEmpty() ? "" : ExceptionUtils.getStackTrace(result.errors.get(0))
-                ,result.errors.isEmpty());
-    }
-
-    public void testIfListIsNotEmpty() {
-        assertEquals(result.resultList.size() > 0, true);
-    }
-
-    public void testItemsHaveTitle() {
-        for(StreamPreviewInfo i : result.resultList) {
-            assertEquals(i.title.isEmpty(), false);
-        }
-    }
-
-    public void testItemsHaveUploader() {
-        for(StreamPreviewInfo i : result.resultList) {
-            assertEquals(i.uploader.isEmpty(), false);
-        }
-    }
-
-    public void testItemsHaveRightDuration() {
-        for(StreamPreviewInfo i : result.resultList) {
-            assertTrue(i.duration >= 0);
-        }
-    }
-
-    public void testItemsHaveRightThumbnail() {
-        for (StreamPreviewInfo i : result.resultList) {
-            assertTrue(i.thumbnail_url, i.thumbnail_url.contains("https://"));
-        }
-    }
-
-    public void testItemsHaveRightVideoUrl() {
-        for (StreamPreviewInfo i : result.resultList) {
-            assertTrue(i.webpage_url, i.webpage_url.contains("https://"));
-        }
-    }
-
-    public void testViewCount() {
-        /*
-        for(StreamPreviewInfo i : result.resultList) {
-            assertTrue(Long.toString(i.view_count), i.view_count != -1);
-        }
-        */
-        // that specific link used for this test, there are no videos with less
-        // than 10.000 views, so we can test against that.
-        for(StreamPreviewInfo i : result.resultList) {
-            assertTrue(i.title + ": " + Long.toString(i.view_count), i.view_count >= 10000);
-        }
-    }
-
-    public void testStreamType() {
-        for(StreamPreviewInfo i : result.resultList) {
-            assertTrue("not a livestream and not a video",
-                    i.stream_type == AbstractVideoInfo.StreamType.VIDEO_STREAM ||
-                    i.stream_type == AbstractVideoInfo.StreamType.LIVE_STREAM);
-        }
-    }
-
-    public void testIfSuggestionsAreReplied() {
-        assertEquals(!suggestionReply.isEmpty(), true);
-    }
-
-    public void testIfSuggestionsAreValid() {
-        for(String s : suggestionReply) {
-            assertTrue(s, !s.isEmpty());
-        }
-    }
-}

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

@@ -1,52 +0,0 @@
-package org.schabi.newpipe.extractor.youtube;
-
-import android.test.AndroidTestCase;
-
-import org.schabi.newpipe.Downloader;
-import org.schabi.newpipe.extractor.AbstractVideoInfo;
-import org.schabi.newpipe.extractor.ExtractionException;
-import org.schabi.newpipe.extractor.ParsingException;
-import org.schabi.newpipe.extractor.ServiceList;
-import org.schabi.newpipe.extractor.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
-        /*
-        extractor = ServiceList.getService("Youtube")
-                .getExtractorInstance("https://www.youtube.com/watch?v=J0s6NjqdjLE", new Downloader());
-                */
-    }
-
-    public void testStreamType() throws ParsingException {
-        assertTrue(true);
-        // assertTrue(extractor.getStreamType() == AbstractVideoInfo.StreamType.LIVE_STREAM);
-    }
-}
-

app/src/main/AndroidManifest.xml

@@ -16,8 +16,9 @@
         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" />
@@ -26,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" />
@@ -74,17 +76,24 @@
                 <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=".player.PlayVideoActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:theme="@style/VideoPlayerTheme"
-            tools:ignore="UnusedAttribute"/>
+            tools:ignore="UnusedAttribute" />
+
         <service
             android:name=".player.BackgroundPlayer"
             android:exported="false"
-            android:label="@string/background_player_name"/>
-		<activity
+            android:label="@string/background_player_name" />
+
+        <activity
             android:name=".player.ExoPlayerActivity"
             android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
             android:label="@string/app_name"
@@ -102,12 +111,14 @@
                 <data android:scheme="file" />
             </intent-filter>
         </activity>
+
         <service
             android:name=".player.BackgroundPlayer"
-            android:label="@string/background_player_name"
-            android:exported="false" />
+            android:exported="false"
+            android:label="@string/background_player_name" />
+
         <activity
-            android:name=".SettingsActivity"
+            android:name=".settings.SettingsActivity"
             android:label="@string/settings_activity_title" />
         <activity
             android:name=".PanicResponderActivity"
@@ -124,6 +135,43 @@
             android:name=".ExitActivity"
             android:label="@string/general_error"
             android:theme="@android:style/Theme.NoDisplay" />
-        <activity android:name=".ErrorActivity"/>
+        <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:launchMode="singleTask"
+            android:theme="@style/AppTheme.NoActionBar" />
+
+        <activity
+            android:name=".ReCaptchaActivity"
+            android:label="@string/reCaptchaActivity" />
+
+        <provider
+            android:name="android.support.v4.content.FileProvider"
+            android:authorities="${applicationId}.provider"
+            android:exported="false"
+            android:grantUriPermissions="true">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/provider_paths"/>
+        </provider>
     </application>
-</manifest>
+
+</manifest>

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

@@ -30,7 +30,7 @@ import java.util.List;
  * 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) {
@@ -42,8 +42,5 @@ public class ActivityCommunicator {
     // Thumbnail send from VideoItemDetailFragment to BackgroundPlayer
     public volatile Bitmap backgroundPlayerThumbnail;
 
-    // Sent from any activity to ErrorActivity.
-    public volatile List<Exception> errorList;
     public volatile Class returnActivity;
-    public volatile ErrorActivity.ErrorInfo errorInfo;
 }

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

@@ -2,12 +2,20 @@ 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;
 
@@ -30,24 +38,46 @@ 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.
@@ -57,7 +87,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();
@@ -66,13 +96,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/ChannelActivity.java

@@ -0,0 +1,334 @@
+package org.schabi.newpipe;
+
+import android.annotation.TargetApi;
+import android.content.Context;
+import android.content.Intent;
+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.CollapsingToolbarLayout;
+import android.support.design.widget.FloatingActionButton;
+import android.support.v4.content.ContextCompat;
+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.view.Window;
+import android.view.WindowManager;
+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 org.schabi.newpipe.util.NavStack;
+
+import java.io.IOException;
+import java.util.Objects;
+
+import static android.os.Build.VERSION.SDK;
+import static android.os.Build.VERSION.SDK_INT;
+
+/**
+ * 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;
+
+    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);
+
+        //since we set themeing we have to set translucent statusBar by hand
+        if (PreferenceManager.getDefaultSharedPreferences(this)
+                .getString("theme", getResources().getString(R.string.light_theme_title)).
+                        equals(getResources().getString(R.string.dark_theme_title)))  {
+            setTheme(R.style.DarkTheme_NoActionBar);
+        }
+        setTranslucentStatusBar(getWindow());
+
+        setContentView(R.layout.activity_channel);
+        Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
+        rootView = findViewById(R.id.rootView);
+        setSupportActionBar(toolbar);
+        if(savedInstanceState == null) {
+            Intent i = getIntent();
+            channelUrl = i.getStringExtra(NavStack.URL);
+            serviceId = i.getIntExtra(NavStack.SERVICE_ID, -1);
+        } else {
+            channelUrl = savedInstanceState.getString(NavStack.URL);
+            serviceId = savedInstanceState.getInt(NavStack.SERVICE_ID);
+            NavStack.getInstance()
+                    .restoreSavedInstanceState(savedInstanceState);
+        }
+
+
+        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.setOnStreamInfoItemSelectedListener(
+                new InfoItemBuilder.OnInfoItemSelectedListener() {
+            @Override
+            public void selected(String url, int serviceId) {
+                NavStack.getInstance()
+                        .openDetailActivity(ChannelActivity.this, url, serviceId);
+            }
+        });
+
+        // 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);
+    }
+
+    @Override
+    public void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+        outState.putString(NavStack.URL, channelUrl);
+        outState.putInt(NavStack.SERVICE_ID, serviceId);
+        NavStack.getInstance()
+                .onSaveInstanceState(outState);
+    }
+
+    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);
+        final 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.addInfoItemList(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) {
+                    String name = "none";
+                    if(service != null) {
+                        name = service.getServiceInfo().name;
+                    }
+                    ErrorActivity.reportError(h, ChannelActivity.this, ex, VideoItemDetailFragment.class, null,
+                            ErrorActivity.ErrorInfo.make(ErrorActivity.REQUESTED_CHANNEL,
+                                    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();
+    }
+
+
+    // fix transparent statusbar fuckup (fuck google why can't they just leave something that worked
+    // as it is, and everyone gets happy)
+    public static void setTranslucentStatusBar(Window window) {
+        if (window == null) return;
+        int sdkInt = Build.VERSION.SDK_INT;
+        if (sdkInt >= Build.VERSION_CODES.LOLLIPOP) {
+            setTranslucentStatusBarLollipop(window);
+        } else if (sdkInt >= Build.VERSION_CODES.KITKAT) {
+            setTranslucentStatusBarKiKat(window);
+        }
+    }
+
+    @TargetApi(Build.VERSION_CODES.LOLLIPOP)
+    private static void setTranslucentStatusBarLollipop(Window window) {
+        window.setStatusBarColor(
+                ContextCompat.getColor(window.getContext(), android.R.color.transparent));
+    }
+
+    @TargetApi(Build.VERSION_CODES.KITKAT)
+    private static void setTranslucentStatusBarKiKat(Window window) {
+        window.addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
+    }
+
+    @Override
+    public void onBackPressed() {
+        try {
+            NavStack.getInstance()
+                    .navBack(this);
+        } catch (Exception e) {
+            ErrorActivity.reportUiError(this, e);
+        }
+    }
+
+}

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

@@ -1,190 +0,0 @@
-package org.schabi.newpipe;
-
-import android.Manifest;
-import android.app.Dialog;
-import android.app.DownloadManager;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.pm.PackageManager;
-import android.net.Uri;
-import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.app.DialogFragment;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.app.AlertDialog;
-import android.util.Log;
-import android.widget.Toast;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * 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);
-        if(ContextCompat.checkSelfPermission(this.getContext(),Manifest.permission.WRITE_EXTERNAL_STORAGE)!= PackageManager.PERMISSION_GRANTED)
-            ActivityCompat.requestPermissions(getActivity(),new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE},0);
-        AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
-        builder.setTitle(R.string.download_dialog_title);
-
-        // If no audio stream available
-        if(arguments.getString(AUDIO_URL) == null) {
-            builder.setItems(R.array.download_options_no_audio, new DialogInterface.OnClickListener() {
-                @Override
-                public void onClick(DialogInterface dialog, int which) {
-                    Context context = getActivity();
-                    String title = arguments.getString(TITLE);
-                    switch (which) {
-                        case 0:     // Video
-                            download(arguments.getString(VIDEO_URL),
-                                    title,
-                                    arguments.getString(FILE_SUFFIX_VIDEO), context);
-                            break;
-                        default:
-                            Log.d(TAG, "lolz");
-                    }
-                }
-            });
-            // If no video stream available
-        } else if(arguments.getString(VIDEO_URL) == null) {
-            builder.setItems(R.array.download_options_no_video, new DialogInterface.OnClickListener() {
-                @Override
-                public void onClick(DialogInterface dialog, int which) {
-                    Context context = getActivity();
-                    String title = arguments.getString(TITLE);
-                    switch (which) {
-                        case 0:     // Audio
-                            download(arguments.getString(AUDIO_URL),
-                                    title,
-                                    arguments.getString(FILE_SUFFIX_AUDIO), context);
-                            break;
-                        default:
-                            Log.d(TAG, "lolz");
-                    }
-                }
-            });
-            //if both streams ar available
-        } else {
-            builder.setItems(R.array.download_options, new DialogInterface.OnClickListener() {
-                @Override
-                public void onClick(DialogInterface dialog, int which) {
-                    Context context = getActivity();
-                    String title = arguments.getString(TITLE);
-                    switch (which) {
-                        case 0:     // Video
-                            download(arguments.getString(VIDEO_URL),
-                                    title,
-                                    arguments.getString(FILE_SUFFIX_VIDEO), context);
-                            break;
-                        case 1:
-                            download(arguments.getString(AUDIO_URL),
-                                    title,
-                                    arguments.getString(FILE_SUFFIX_AUDIO), context);
-                            break;
-                        default:
-                            Log.d(TAG, "lolz");
-                    }
-                }
-            });
-        }
-        return builder.create();
-    }
-
-    /**
-     * #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;
-    }
-
-    private void download(String url, String title, String fileSuffix, Context context) {
-        File downloadDir = NewPipeSettings.getDownloadFolder();
-
-        if(!downloadDir.exists()) {
-            //attempt to create directory
-            boolean mkdir = downloadDir.mkdirs();
-            if(!mkdir && !downloadDir.isDirectory()) {
-                String message = context.getString(R.string.err_dir_create,downloadDir.toString());
-                Log.e(TAG, message);
-                Toast.makeText(context,message , Toast.LENGTH_LONG).show();
-
-                return;
-            }
-            String message = context.getString(R.string.info_dir_created,downloadDir.toString());
-            Log.e(TAG, message);
-            Toast.makeText(context,message , Toast.LENGTH_LONG).show();
-        }
-
-        File saveFilePath = new File(downloadDir,createFileName(title) + fileSuffix);
-
-        long id = 0;
-        if (App.isUsingTor()) {
-            // if using Tor, do not use DownloadManager because the proxy cannot be set
-            FileDownloader.downloadFile(getContext(), url, saveFilePath, title);
-        } else {
-            DownloadManager dm = (DownloadManager) context.getSystemService(Context.DOWNLOAD_SERVICE);
-            DownloadManager.Request request = new DownloadManager.Request(
-                    Uri.parse(url));
-            request.setDestinationUri(Uri.fromFile(saveFilePath));
-            request.setNotificationVisibility(DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED);
-
-            request.setTitle(title);
-            request.setDescription("'" + url +
-                    "' => '" + saveFilePath + "'");
-            request.allowScanningByMediaScanner();
-
-            try {
-                id = dm.enqueue(request);
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        }
-
-        Log.i(TAG,"Started downloading '" + url +
-                "' => '" + saveFilePath + "' #" + id);
-    }
-}

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

@@ -1,14 +1,18 @@
 package org.schabi.newpipe;
 
+import org.schabi.newpipe.extractor.exceptions.ReCaptchaException;
+
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.net.URL;
 import java.net.UnknownHostException;
+import java.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 28.01.16.
@@ -33,22 +37,62 @@ import info.guardianproject.netcipher.NetCipher;
 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 String download(String siteUrl, String language) throws IOException {
+    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();
-        HttpsURLConnection con = NetCipher.getHttpsURLConnection(url);
-        con.setRequestProperty("Accept-Language", language);
+        HttpsURLConnection con = (HttpsURLConnection) url.openConnection();
+        Iterator it = customProperties.entrySet().iterator();
+        while(it.hasNext()) {
+            Map.Entry pair = (Map.Entry)it.next();
+            con.setRequestProperty((String)pair.getKey(), (String)pair.getValue());
+        }
         return dl(con);
     }
 
     /**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;
 
@@ -56,6 +100,10 @@ public class Downloader implements org.schabi.newpipe.extractor.Downloader {
             con.setRequestMethod("GET");
             con.setRequestProperty("User-Agent", USER_AGENT);
 
+            if (getCookies().length() > 0) {
+                con.setRequestProperty("Cookie", getCookies());
+            }
+
             in = new BufferedReader(
                     new InputStreamReader(con.getInputStream()));
             String inputLine;
@@ -67,6 +115,14 @@ public class Downloader implements org.schabi.newpipe.extractor.Downloader {
             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) {
@@ -81,7 +137,7 @@ public class Downloader implements org.schabi.newpipe.extractor.Downloader {
      * 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 {
+    public String download(String siteUrl) throws IOException, ReCaptchaException {
         URL url = new URL(siteUrl);
         HttpsURLConnection con = (HttpsURLConnection) url.openConnection();
         //HttpsURLConnection con = NetCipher.getHttpsURLConnection(url);

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/MainActivity.java

@@ -0,0 +1,94 @@
+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.os.Bundle;
+import android.util.Log;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.widget.AdapterView;
+
+import org.schabi.newpipe.download.DownloadActivity;
+import org.schabi.newpipe.settings.SettingsActivity;
+import org.schabi.newpipe.util.PermissionHelper;
+
+/**
+ * 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 ThemableActivity {
+    private Fragment mainFragment = null;
+    private static final String TAG = MainActivity.class.toString();
+
+    @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);
+        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: {
+                if (!PermissionHelper.checkStoragePermissions(this)) {
+                    return false;
+                }
+                Intent intent = new Intent(this, DownloadActivity.class);
+                startActivity(intent);
+                return true;
+            }
+            default:
+                return super.onOptionsItemSelected(item);
+        }
+    }
+
+    @Override
+    public void onBackPressed() {
+        //ignore back
+    }
+}

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,262 +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.media.AudioManager;
-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 DOWNLOAD_PATH_AUDIO_PREFERENCE;
-        String USE_TOR_KEY;
-
-        private ListPreference defaultResolutionPreference;
-        private ListPreference defaultAudioFormatPreference;
-        private ListPreference searchLanguagePreference;
-        private EditTextPreference downloadPathPreference;
-        private EditTextPreference downloadPathAudioPreference;
-        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);
-            DOWNLOAD_PATH_AUDIO_PREFERENCE = getString(R.string.download_path_audio_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);
-            downloadPathAudioPreference =
-                    (EditTextPreference) findPreference(DOWNLOAD_PATH_AUDIO_PREFERENCE);
-            useTorCheckBox = (CheckBoxPreference) findPreference(USE_TOR_KEY);
-
-            prefListener = new SharedPreferences.OnSharedPreferenceChangeListener() {
-                @Override
-                public void onSharedPreferenceChanged(SharedPreferences sharedPreferences,
-                                                      String key) {
-                    Activity a = getActivity();
-                    if(a != null) {
-                        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)));
-            downloadPathAudioPreference.setSummary(
-                    defaultPreferences.getString(DOWNLOAD_PATH_AUDIO_PREFERENCE,
-                            getString(R.string.download_path_audio_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) {
-        NewPipeSettings.initSettings(context);
-    }
-}

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

@@ -1,82 +0,0 @@
-package org.schabi.newpipe;
-
-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.ArrayList;
-
-/**
- * Created by Madiyar on 23.02.2016.
- *
- * Copyright (C) Christian Schabesberger 2015 <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(ArrayList<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/ThemableActivity.java

@@ -0,0 +1,28 @@
+package org.schabi.newpipe;
+
+import android.os.Bundle;
+import android.preference.PreferenceManager;
+import android.support.v7.app.AppCompatActivity;
+
+public class ThemableActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        if (PreferenceManager.getDefaultSharedPreferences(this)
+                    .getString("theme", getResources().getString(R.string.light_theme_title)).
+                            equals(getResources().getString(R.string.dark_theme_title)))  {
+                setTheme(R.style.DarkTheme);
+        }
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        if (PreferenceManager.getDefaultSharedPreferences(this)
+                .getString("theme", getResources().getString(R.string.light_theme_title)).
+                        equals(getResources().getString(R.string.dark_theme_title)))  {
+            setTheme(R.style.DarkTheme);
+        }
+    }
+}

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

@@ -1,173 +0,0 @@
-package org.schabi.newpipe;
-
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import org.schabi.newpipe.extractor.AbstractVideoInfo;
-import org.schabi.newpipe.extractor.StreamPreviewInfo;
-
-import com.nostra13.universalimageloader.core.DisplayImageOptions;
-import com.nostra13.universalimageloader.core.ImageLoader;
-
-/**
- * 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/>.
- */
-
-public class VideoInfoItemViewCreator {
-    private final LayoutInflater inflater;
-    private ImageLoader imageLoader = ImageLoader.getInstance();
-    private DisplayImageOptions displayImageOptions = new DisplayImageOptions.Builder().cacheInMemory(true).build();
-
-    public VideoInfoItemViewCreator(LayoutInflater inflater) {
-        this.inflater = inflater;
-    }
-
-    public View getViewFromVideoInfoItem(View convertView, ViewGroup parent, StreamPreviewInfo info) {
-        ViewHolder holder;
-
-        // generate 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);
-            holder.itemViewCountView = (TextView) convertView.findViewById(R.id.itemViewCountView);
-            convertView.setTag(holder);
-        } else {
-            holder = (ViewHolder) convertView.getTag();
-        }
-
-        // fill with information
-
-        /*
-        if(info.thumbnail == null) {
-            holder.itemThumbnailView.setImageResource(R.drawable.dummy_thumbnail);
-        } else {
-            holder.itemThumbnailView.setImageBitmap(info.thumbnail);
-        }
-        */
-        holder.itemVideoTitleView.setText(info.title);
-        if(info.uploader != null && !info.uploader.isEmpty()) {
-            holder.itemUploaderView.setText(info.uploader);
-        } else {
-            holder.itemDurationView.setVisibility(View.INVISIBLE);
-        }
-        if(info.duration > 0) {
-            holder.itemDurationView.setText(getDurationString(info.duration));
-        } else {
-            if(info.stream_type == AbstractVideoInfo.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.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);
-        }
-
-        return convertView;
-    }
-
-    private class ViewHolder {
-        public ImageView itemThumbnailView;
-        public TextView itemVideoTitleView, itemUploaderView, itemDurationView, itemUploadDateView, itemViewCountView;
-    }
-
-    private 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(minutes);
-                } else {
-                    output += "0" + Integer.toString(minutes);
-                }
-            } 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/VideoItemDetailActivity.java

@@ -1,157 +0,0 @@
-package org.schabi.newpipe;
-
-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.extractor.ServiceList;
-import org.schabi.newpipe.extractor.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);
-        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
-        //
-
-        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();
-                //StreamExtractor videoExtractor = null;
-                for (int i = 0; i < serviceList.length; i++) {
-                    if (serviceList[i].getUrlIdHandlerInstance().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/VideoItemListActivity.java

@@ -1,400 +0,0 @@
-package org.schabi.newpipe;
-
-import android.content.Context;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.os.Bundle;
-import android.os.Handler;
-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 android.widget.Toast;
-
-import org.schabi.newpipe.extractor.ExtractionException;
-import org.schabi.newpipe.extractor.SearchEngine;
-import org.schabi.newpipe.extractor.ServiceList;
-import org.schabi.newpipe.extractor.StreamingService;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Vector;
-
-/**
- * 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 SuggestionListAdapter suggestionListAdapter;
-    private SuggestionSearchRunnable suggestionSearchRunnable;
-    private Thread searchThread;
-
-    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");
-                    Toast.makeText(VideoItemListActivity.this, "Could not get widget with focus",
-                            Toast.LENGTH_SHORT).show();
-                    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) {
-            if(!newText.isEmpty()) {
-                searchSuggestions(newText);
-            }
-            return true;
-        }
-
-    }
-    private class SearchSuggestionListener implements SearchView.OnSuggestionListener{
-
-        private SearchView searchView;
-
-        private SearchSuggestionListener(SearchView searchView) {
-            this.searchView = searchView;
-        }
-
-        @Override
-        public boolean onSuggestionSelect(int position) {
-            String suggestion = suggestionListAdapter.getSuggestion(position);
-            searchView.setQuery(suggestion,true);
-            return false;
-        }
-
-        @Override
-        public boolean onSuggestionClick(int position) {
-            String suggestion = suggestionListAdapter.getSuggestion(position);
-            searchView.setQuery(suggestion,true);
-            return false;
-        }
-    }
-
-    private class SuggestionResultRunnable implements Runnable{
-
-        private ArrayList<String>suggestions;
-
-        private SuggestionResultRunnable(ArrayList<String> suggestions) {
-            this.suggestions = suggestions;
-        }
-
-        @Override
-        public void run() {
-            suggestionListAdapter.updateAdapter(suggestions);
-        }
-    }
-
-    private class SuggestionSearchRunnable implements Runnable{
-        private final int serviceId;
-        private final String query;
-        final Handler h = new Handler();
-        private Context context;
-        private SuggestionSearchRunnable(int serviceId, String query) {
-            this.serviceId = serviceId;
-            this.query = query;
-            context = VideoItemListActivity.this;
-        }
-
-        @Override
-        public void run() {
-            try {
-                SearchEngine engine =
-                        ServiceList.getService(serviceId).getSearchEngineInstance(new Downloader());
-                SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(context);
-                String searchLanguageKey = context.getString(R.string.search_language_key);
-                String searchLanguage = sp.getString(searchLanguageKey,
-                        getString(R.string.default_language_value));
-                ArrayList<String>suggestions = engine.suggestionList(query,searchLanguage,new Downloader());
-                h.post(new SuggestionResultRunnable(suggestions));
-            } catch (ExtractionException e) {
-                ErrorActivity.reportError(h, VideoItemListActivity.this, e, null, findViewById(R.id.videoitem_list),
-                        ErrorActivity.ErrorInfo.make(ErrorActivity.SEARCHED,
-                                ServiceList.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, VideoItemListActivity.this, e, null, findViewById(R.id.videoitem_list),
-                        ErrorActivity.ErrorInfo.make(ErrorActivity.SEARCHED,
-                                ServiceList.getNameOfService(serviceId), query, R.string.general_error));
-            }
-        }
-    }
-    /**
-     * 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);
-        StreamingService streamingService = null;
-
-        try {
-            //------ todo: remove this line when multiservice support is implemented ------
-            currentStreamingServiceId = ServiceList.getIdOfService("Youtube");
-            streamingService = ServiceList.getService(currentStreamingServiceId);
-        } catch (Exception e) {
-            e.printStackTrace();
-            ErrorActivity.reportError(VideoItemListActivity.this, e, null, findViewById(R.id.videoitem_list),
-                    ErrorActivity.ErrorInfo.make(ErrorActivity.SEARCHED,
-                            ServiceList.getNameOfService(currentStreamingServiceId), "", R.string.general_error));
-        }
-        //-----------------------------------------------------------------------------
-        //to solve issue 38
-        listFragment = (VideoItemListFragment) getSupportFragmentManager()
-                .findFragmentById(R.id.videoitem_list);
-        listFragment.setStreamingService(streamingService);
-
-        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);
-                if(!searchQuery.isEmpty()) {
-                    searchView.setQuery(searchQuery,false);
-                }
-                searchView.setOnQueryTextListener(new SearchVideoQueryListener());
-                suggestionListAdapter = new SuggestionListAdapter(this);
-                searchView.setSuggestionsAdapter(suggestionListAdapter);
-                searchView.setOnSuggestionListener(new SearchSuggestionListener(searchView));
-            } 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 webpageUrl = 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, webpageUrl);
-            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, webpageUrl);
-            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());
-            suggestionListAdapter = new SuggestionListAdapter(this);
-            searchView.setSuggestionsAdapter(suggestionListAdapter);
-            searchView.setOnSuggestionListener(new SearchSuggestionListener(searchView));
-            if(!searchQuery.isEmpty()) {
-                searchView.setQuery(searchQuery,false);
-                searchView.setIconifiedByDefault(false);
-            }
-        } 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;
-            }
-            case R.id.action_report_error: {
-                ErrorActivity.reportError(VideoItemListActivity.this, new Vector<Exception>(),
-                        null, null,
-                        ErrorActivity.ErrorInfo.make(ErrorActivity.USER_REPORT,
-                                ServiceList.getNameOfService(currentStreamingServiceId),
-                                "user_report", R.string.user_report));
-                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);
-    }
-
-    private void searchSuggestions(String query) {
-        suggestionSearchRunnable =
-                new SuggestionSearchRunnable(currentStreamingServiceId, query);
-        searchThread = new Thread(suggestionSearchRunnable);
-        searchThread.start();
-
-    }
-
-    private void postNewErrorToast(Handler h, final int stringResource) {
-        h.post(new Runnable() {
-            @Override
-            public void run() {
-                Toast.makeText(VideoItemListActivity.this, getString(stringResource),
-                        Toast.LENGTH_SHORT).show();
-            }
-        });
-    }
-}

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

@@ -1,368 +0,0 @@
-package org.schabi.newpipe;
-
-import android.app.Activity;
-import android.content.Context;
-import android.content.SharedPreferences;
-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.io.IOException;
-import java.util.List;
-
-import org.schabi.newpipe.extractor.ExtractionException;
-import org.schabi.newpipe.extractor.SearchResult;
-import org.schabi.newpipe.extractor.StreamPreviewInfo;
-import org.schabi.newpipe.extractor.SearchEngine;
-import org.schabi.newpipe.extractor.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;
-    // 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 SearchResult result;
-        private final int requestId;
-        public ResultRunnable(SearchResult 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() {
-            SearchResult result = null;
-            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));
-                result = SearchResult
-                        .getSearchResult(engine, query, page, searchLanguage, new Downloader());
-
-                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(Exception e : result.errors) {
-                        e.printStackTrace();
-                        Log.e(TAG, "------");
-                    }
-
-                    Activity a = getActivity();
-                    View rootView = a.findViewById(R.id.videoitem_list);
-                    ErrorActivity.reportError(h, getActivity(), 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(IOException e) {
-                postNewNothingFoundToast(h, R.string.network_error);
-                e.printStackTrace();
-            } catch(SearchEngine.NothingFoundException e) {
-                postNewErrorToast(h, e.getMessage());
-            } catch(ExtractionException e) {
-                ErrorActivity.reportError(h, getActivity(), 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, getActivity(), e, null, null,
-                        ErrorActivity.ErrorInfo.make(ErrorActivity.SEARCHED,
-                        /* todo: this shoudl not be assigned static */ "Youtube", query, R.string.general_error));
-
-                e.printStackTrace();
-            }
-        }
-    }
-
-    public void present(List<StreamPreviewInfo> 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(new Downloader()),
-                                            query, page, currentRequestId);
-        searchThread = new Thread(searchRunnable);
-        searchThread.start();
-    }
-
-    public void setStreamingService(StreamingService streamingService) {
-        this.streamingService = streamingService;
-    }
-
-    private void updateListOnResult(SearchResult result, int requestId) {
-        if(requestId == currentRequestId) {
-            setListShown(true);
-            updateList(result.resultList);
-            if(!result.suggestion.isEmpty()) {
-                Toast.makeText(getActivity(),
-                        String.format(getString(R.string.did_you_mean), result.suggestion),
-                        Toast.LENGTH_LONG).show();
-            }
-        }
-    }
-
-    private void updateList(List<StreamPreviewInfo> list) {
-        try {
-            videoListAdapter.addVideoList(list);
-            terminateThreads();
-        } catch(java.lang.IllegalStateException e) {
-            Toast.makeText(getActivity(), "Trying to set value while activity doesn't exist anymore.",
-                    Toast.LENGTH_SHORT).show();
-            Log.w(TAG, "Trying to set value while activity doesn't exist anymore.");
-        } catch(Exception e) {
-            Toast.makeText(getActivity(), getString(R.string.general_error),
-                    Toast.LENGTH_SHORT).show();
-            e.printStackTrace();
-        } finally {
-            loadingNextPage = false;
-        }
-    }
-
-    private void terminateThreads() {
-        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;
-    }
-
-    private void postNewErrorToast(Handler h, final String message) {
-        h.post(new Runnable() {
-            @Override
-            public void run() {
-                setListShown(true);
-                Toast.makeText(getActivity(), message,
-                        Toast.LENGTH_SHORT).show();
-            }
-        });
-    }
-
-    private void postNewNothingFoundToast(Handler h, final int stringResource) {
-        h.post(new Runnable() {
-            @Override
-            public void run() {
-                setListShown(true);
-                Toast.makeText(getActivity(), getString(stringResource),
-                        Toast.LENGTH_LONG).show();
-            }
-        });
-    }
-}

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

@@ -1,91 +0,0 @@
-package org.schabi.newpipe;
-
-import android.content.Context;
-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 org.schabi.newpipe.extractor.StreamPreviewInfo;
-
-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<StreamPreviewInfo> videoList = 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<StreamPreviewInfo> videos) {
-        videoList.addAll(videos);
-        notifyDataSetChanged();
-    }
-
-    public void clearVideoList() {
-        videoList = new Vector<>();
-        notifyDataSetChanged();
-    }
-
-    public Vector<StreamPreviewInfo> getVideoList() {
-        return videoList;
-    }
-
-    @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));
-
-        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/detail/ActionBarHandler.java

@@ -1,4 +1,4 @@
-package org.schabi.newpipe;
+package org.schabi.newpipe.detail;
 
 import android.content.Intent;
 import android.content.SharedPreferences;
@@ -11,9 +11,10 @@ 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.StreamInfo;
-import org.schabi.newpipe.extractor.VideoStream;
+import org.schabi.newpipe.extractor.stream_info.VideoStream;
 
 import java.util.List;
 
@@ -44,17 +45,17 @@ class ActionBarHandler {
     private AppCompatActivity activity;
     private int selectedVideoStream = -1;
 
-    private SharedPreferences defaultPreferences = null;
+    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 = null;
-    private OnActionListener onOpenInBrowserListener = null;
-    private OnActionListener onDownloadListener = null;
-    private OnActionListener onPlayWithKodiListener = null;
-    private OnActionListener onPlayAudioListener = null;
+    private OnActionListener onShareListener;
+    private OnActionListener onOpenInBrowserListener;
+    private OnActionListener onDownloadListener;
+    private OnActionListener onPlayWithKodiListener;
+    private OnActionListener onPlayAudioListener;
 
 
     // Triggered when a stream related action is triggered.
@@ -110,6 +111,9 @@ class ActionBarHandler {
 
 
     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));
@@ -180,6 +184,12 @@ class ActionBarHandler {
                     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");
         }

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

@@ -0,0 +1,230 @@
+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
+                ErrorActivity.reportError(h, a, de, VideoItemDetailFragment.class, null,
+                        ErrorActivity.ErrorInfo.make(ErrorActivity.REQUESTED_STREAM,
+                                service.getServiceInfo().name, videoUrl, R.string.youtube_signature_decryption_error));
+                h.post(new Runnable() {
+                    @Override
+                    public void run() {
+                        a.finish();
+                    }
+                });
+                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,253 @@
+package org.schabi.newpipe.detail;
+
+import android.content.Context;
+import android.content.Intent;
+import android.media.AudioManager;
+import android.os.Bundle;
+import android.preference.PreferenceManager;
+import android.support.v4.app.NavUtils;
+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.ThemableActivity;
+import org.schabi.newpipe.extractor.NewPipe;
+import org.schabi.newpipe.extractor.StreamingService;
+import org.schabi.newpipe.report.ErrorActivity;
+import org.schabi.newpipe.util.NavStack;
+
+import java.util.Collection;
+import java.util.HashSet;
+
+import static android.os.Build.VERSION.SDK_INT;
+
+
+/**
+ * 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 ThemableActivity {
+
+    /**
+     * 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(NavStack.URL);
+            currentStreamingService = savedInstanceState.getInt(NavStack.SERVICE_ID);
+            NavStack.getInstance()
+                    .restoreSavedInstanceState(savedInstanceState);
+            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(NavStack.URL);
+            currentStreamingService = intent.getIntExtra(NavStack.SERVICE_ID, -1);
+        }
+        arguments.putBoolean(VideoItemDetailFragment.AUTO_PLAY, autoplay);
+        arguments.putString(NavStack.URL, videoUrl);
+        arguments.putInt(NavStack.SERVICE_ID, 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) {
+        super.onSaveInstanceState(outState);
+        outState.putString(NavStack.URL, videoUrl);
+        outState.putInt(NavStack.SERVICE_ID, currentStreamingService);
+        outState.putBoolean(VideoItemDetailFragment.AUTO_PLAY, false);
+        NavStack.getInstance()
+                .onSaveInstanceState(outState);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        super.onOptionsItemSelected(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
+
+            NavStack.getInstance()
+                    .openMainActivity(this);
+            return true;
+        } else {
+            return super.onOptionsItemSelected(item);
+        }
+    }
+
+    @Override
+    public void onBackPressed() {
+        try {
+            NavStack.getInstance()
+                    .navBack(this);
+        } catch (Exception e) {
+            ErrorActivity.reportUiError(this, e);
+        }
+    }
+
+    /**
+     * 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].getStreamUrlIdHandlerInstance().acceptUrl(videoUrl)) {
+                service = i;
+                //videoExtractor = ServiceList.getService(i).getExtractorInstance();
+                break;
+            }
+        }
+        return service;
+    }
+}

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

@@ -1,66 +1,68 @@
-package org.schabi.newpipe;
+package org.schabi.newpipe.detail;
 
 import android.app.Activity;
-import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
-import android.content.res.TypedArray;
 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.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.MenuItem;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
-import android.widget.FrameLayout;
 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 java.io.IOException;
-
 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.ArrayList;
+import org.schabi.newpipe.ActivityCommunicator;
+import org.schabi.newpipe.ImageErrorLoadingListener;
+import org.schabi.newpipe.Localization;
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.ReCaptchaActivity;
+import org.schabi.newpipe.download.DownloadDialog;
+import org.schabi.newpipe.extractor.InfoItem;
+import org.schabi.newpipe.extractor.MediaFormat;
+import org.schabi.newpipe.extractor.NewPipe;
+import org.schabi.newpipe.extractor.stream_info.AudioStream;
+import org.schabi.newpipe.extractor.stream_info.StreamInfo;
+import org.schabi.newpipe.extractor.stream_info.VideoStream;
+import org.schabi.newpipe.info_list.InfoItemBuilder;
+import org.schabi.newpipe.player.BackgroundPlayer;
+import org.schabi.newpipe.player.ExoPlayerActivity;
+import org.schabi.newpipe.player.PlayVideoActivity;
+import org.schabi.newpipe.report.ErrorActivity;
 import java.util.Vector;
 
+import org.schabi.newpipe.util.NavStack;
+import org.schabi.newpipe.util.PermissionHelper;
 
-import org.schabi.newpipe.extractor.AudioStream;
-import org.schabi.newpipe.extractor.MediaFormat;
-import org.schabi.newpipe.extractor.ParsingException;
-import org.schabi.newpipe.extractor.ServiceList;
-import org.schabi.newpipe.extractor.StreamExtractor;
-import org.schabi.newpipe.extractor.StreamInfo;
-import org.schabi.newpipe.extractor.StreamPreviewInfo;
-import org.schabi.newpipe.extractor.StreamingService;
-import org.schabi.newpipe.extractor.VideoStream;
-import org.schabi.newpipe.extractor.services.youtube.YoutubeStreamExtractor;
-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;
 
 
 /**
@@ -90,8 +92,6 @@ public class VideoItemDetailFragment extends Fragment {
      * 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;
@@ -100,236 +100,74 @@ public class VideoItemDetailFragment extends Fragment {
 
     private int streamingServiceId = -1;
 
-    private boolean autoPlayEnabled = false;
-    private boolean showNextVideoItem = false;
-    private Bitmap videoThumbnail;
+    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 = null;
-
-    private class VideoExtractorRunnable implements Runnable {
-        private final Handler h = new Handler();
-        private StreamExtractor streamExtractor;
-        private final StreamingService service;
-        private final String videoUrl;
-
-        public VideoExtractorRunnable(String videoUrl, StreamingService service) {
-            this.service = service;
-            this.videoUrl = videoUrl;
-        }
-
-        @Override
-        public void run() {
-            StreamInfo streamInfo = null;
-            try {
-                streamExtractor = service.getExtractorInstance(videoUrl, new Downloader());
-                streamInfo = StreamInfo.getVideoInfo(streamExtractor, new Downloader());
-
-                h.post(new VideoResultReturnedRunnable(streamInfo));
-
-                // 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 (Exception e : streamInfo.errors) {
-                        e.printStackTrace();
-                        Log.e(TAG, "------");
-                    }
-
-                    Activity a = getActivity();
-                    View rootView = a != null ? a.findViewById(R.id.videoitem_detail) : null;
-                    ErrorActivity.reportError(h, getActivity(),
-                            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 (IOException e) {
-                postNewErrorToast(h, R.string.network_error);
-                e.printStackTrace();
-            }
-            // custom service related exceptions
-            catch (YoutubeStreamExtractor.DecryptException de) {
-                postNewErrorToast(h, R.string.youtube_signature_decryption_error);
-                de.printStackTrace();
-            } catch (YoutubeStreamExtractor.GemaException ge) {
-                h.post(new Runnable() {
-                    @Override
-                    public void run() {
-                        onErrorBlockedByGema();
-                    }
-                });
-            } catch(YoutubeStreamExtractor.LiveStreamException e) {
-                h.post(new Runnable() {
-                    @Override
-                    public void run() {
-                        onNotSpecifiedContentErrorWithMessage(R.string.live_streams_not_supported);
-                    }
-                });
-            }
-            // ----------------------------------------
-            catch(StreamExtractor.ContentNotAvailableException e) {
-                h.post(new Runnable() {
-                    @Override
-                    public void run() {
-                        onNotSpecifiedContentError();
-                    }
-                });
-                e.printStackTrace();
-            } catch(StreamInfo.StreamExctractException e) {
-                if(!streamInfo.errors.isEmpty()) {
-                    // !!! if this case ever kicks in someone gets kicked out !!!
-                    ErrorActivity.reportError(h, getActivity(), e, VideoItemListActivity.class, null,
-                            ErrorActivity.ErrorInfo.make(ErrorActivity.REQUESTED_STREAM,
-                                    service.getServiceInfo().name, videoUrl, R.string.could_not_get_stream));
-                } else {
-                    ErrorActivity.reportError(h, getActivity(), streamInfo.errors, VideoItemListActivity.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() {
-                        getActivity().finish();
-                    }
-                });
-                e.printStackTrace();
-            } catch (ParsingException e) {
-                ErrorActivity.reportError(h, getActivity(), e, VideoItemListActivity.class, null,
-                        ErrorActivity.ErrorInfo.make(ErrorActivity.REQUESTED_STREAM,
-                                service.getServiceInfo().name, videoUrl, R.string.parsing_error));
-                        h.post(new Runnable() {
-                            @Override
-                            public void run() {
-                                getActivity().finish();
-                            }
-                        });
-                e.printStackTrace();
-            } catch(Exception e) {
-                ErrorActivity.reportError(h, getActivity(), e, VideoItemListActivity.class, null,
-                        ErrorActivity.ErrorInfo.make(ErrorActivity.REQUESTED_STREAM,
-                                service.getServiceInfo().name, videoUrl, R.string.general_error));
-                        h.post(new Runnable() {
-                            @Override
-                            public void run() {
-                                getActivity().finish();
-                            }
-                        });
-                e.printStackTrace();
-            }
-        }
-    }
-
-    private class VideoResultReturnedRunnable implements Runnable {
-        private final StreamInfo streamInfo;
-        public VideoResultReturnedRunnable(StreamInfo streamInfo) {
-            this.streamInfo = streamInfo;
-        }
-        @Override
-        public void run() {
-            Activity a = getActivity();
-            if(a != null) {
-                boolean showAgeRestrictedContent = PreferenceManager.getDefaultSharedPreferences(a)
-                        .getBoolean(activity.getString(R.string.show_age_restricted_content), false);
-                if (streamInfo.age_limit == 0 || showAgeRestrictedContent) {
-                    updateInfo(streamInfo);
-                } else {
-                    onNotSpecifiedContentErrorWithMessage(R.string.video_is_age_restricted);
-                }
-            }
-        }
-    }
-
-    private class ThumbnailLoadingListener implements ImageLoadingListener {
-        @Override
-        public void onLoadingStarted(String imageUri, View view) {}
-
-        @Override
-        public void onLoadingFailed(String imageUri, View view, FailReason failReason) {
-            if(getContext() != null) {
-                Toast.makeText(VideoItemDetailFragment.this.getActivity(),
-                        R.string.could_not_load_thumbnails, Toast.LENGTH_LONG).show();
-            }
-            failReason.getCause().printStackTrace();
-        }
-
-        @Override
-        public void onLoadingComplete(String imageUri, View view, Bitmap loadedImage) {}
-
-        @Override
-        public void onLoadingCancelled(String imageUri, View view) {}
-    }
+    private OnInvokeCreateOptionsMenuListener onInvokeCreateOptionsMenuListener;
 
     private void updateInfo(final StreamInfo info) {
-        try {
-            Context c = getContext();
-            VideoInfoItemViewCreator videoItemViewCreator =
-                    new VideoInfoItemViewCreator(LayoutInflater.from(getActivity()));
+        Activity a = getActivity();
 
-            RelativeLayout textContentLayout =
-                    (RelativeLayout) activity.findViewById(R.id.detailTextContentLayout);
-            final 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);
-            FrameLayout nextVideoFrame =
-                    (FrameLayout) activity.findViewById(R.id.detailNextVideoFrame);
-            RelativeLayout nextVideoRootFrame =
-                    (RelativeLayout) activity.findViewById(R.id.detailNextVideoRootLayout);
-            Button nextVideoButton = (Button) activity.findViewById(R.id.detailNextVideoButton);
-            TextView similarTitle = (TextView) activity.findViewById(R.id.detailSimilarTitle);
-            Button backgroundButton = (Button)
-                    activity.findViewById(R.id.detailVideoThumbnailWindowBackgroundButton);
-            View topView = activity.findViewById(R.id.detailTopView);
-            View nextVideoView = null;
-            if(info.next_video != null) {
-                nextVideoView = videoItemViewCreator
-                        .getViewFromVideoInfoItem(null, nextVideoFrame, info.next_video);
-            } else {
-                activity.findViewById(R.id.detailNextVidButtonAndContentLayout).setVisibility(View.GONE);
-                activity.findViewById(R.id.detailNextVideoTitle).setVisibility(View.GONE);
-                activity.findViewById(R.id.detailNextVideoButton).setVisibility(View.GONE);
-            }
+        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 thumbnailView = activity.findViewById(R.id.detail_thumbnail_view);
+        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(nextVideoView != null) {
-                nextVideoFrame.addView(nextVideoView);
+            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);
             }
 
-            initThumbnailViews(info, nextVideoFrame);
-
             textContentLayout.setVisibility(View.VISIBLE);
             if (android.os.Build.VERSION.SDK_INT < 18) {
                 playVideoButton.setVisibility(View.VISIBLE);
             } else {
-                ImageView playArrowView = (ImageView) activity.findViewById(R.id.playArrowView);
+                ImageView playArrowView = (ImageView) activity.findViewById(R.id.play_arrow_view);
                 playArrowView.setVisibility(View.VISIBLE);
             }
 
-            if (!showNextVideoItem) {
+            if (!showNextStreamItem) {
                 nextVideoRootFrame.setVisibility(View.GONE);
                 similarTitle.setVisibility(View.GONE);
             }
@@ -340,7 +178,7 @@ public class VideoItemDetailFragment extends Fragment {
                 @Override
                 public boolean onTouch(View v, MotionEvent event) {
                     if (event.getAction() == android.view.MotionEvent.ACTION_UP) {
-                        ImageView arrow = (ImageView) activity.findViewById(R.id.toggleDescriptionView);
+                        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);
@@ -357,36 +195,36 @@ public class VideoItemDetailFragment extends Fragment {
             // 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()) {
+            if (!info.uploader.isEmpty()) {
                 uploaderView.setText(info.uploader);
             } else {
-                activity.findViewById(R.id.detailUploaderWrapView).setVisibility(View.GONE);
+                activity.findViewById(R.id.detail_uploader_view).setVisibility(View.GONE);
             }
-            if(info.view_count >= 0) {
-                viewCountView.setText(Localization.localizeViewCount(info.view_count, c));
+            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, c));
+            if (info.dislike_count >= 0) {
+                thumbsDownView.setText(Localization.localizeNumber(info.dislike_count, a));
             } else {
                 thumbsDownView.setVisibility(View.INVISIBLE);
-                activity.findViewById(R.id.detailThumbsDownImgView).setVisibility(View.GONE);
+                activity.findViewById(R.id.detail_thumbs_down_count_view).setVisibility(View.GONE);
             }
-            if(info.like_count >= 0) {
-                thumbsUpView.setText(Localization.localizeNumber(info.like_count, c));
+            if (info.like_count >= 0) {
+                thumbsUpView.setText(Localization.localizeNumber(info.like_count, a));
             } else {
                 thumbsUpView.setVisibility(View.GONE);
-                activity.findViewById(R.id.detailThumbsUpImgView).setVisibility(View.GONE);
+                activity.findViewById(R.id.detail_thumbs_up_img_view).setVisibility(View.GONE);
                 thumbsDownView.setVisibility(View.GONE);
-                activity.findViewById(R.id.detailThumbsDownImgView).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, c));
+            if (!info.upload_date.isEmpty()) {
+                uploadDateView.setText(Localization.localizeDate(info.upload_date, a));
             } else {
                 uploadDateView.setVisibility(View.GONE);
             }
-            if(!info.description.isEmpty()) {
+            if (!info.description.isEmpty()) {
                 descriptionView.setText(Html.fromHtml(info.description));
             } else {
                 descriptionView.setVisibility(View.GONE);
@@ -402,31 +240,22 @@ public class VideoItemDetailFragment extends Fragment {
                 }
             }
 
-            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, info.next_video.webpage_url);
-                    detailIntent.putExtra(VideoItemDetailFragment.STREAMING_SERVICE, streamingServiceId);
-                    startActivity(detailIntent);
-                }
-            });
             textContentLayout.setVisibility(View.VISIBLE);
 
-            if(info.related_videos != null && !info.related_videos.isEmpty()) {
-                initSimilarVideos(info, videoItemViewCreator);
+            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.detailSimilarTitle).setVisibility(View.GONE);
-                activity.findViewById(R.id.similarVideosView).setVisibility(View.GONE);
+                activity.findViewById(R.id.detail_similar_title).setVisibility(View.GONE);
+                activity.findViewById(R.id.similar_streams_view).setVisibility(View.GONE);
             }
 
             setupActionBarHandler(info);
 
-            if(autoPlayEnabled) {
+            if (autoPlayEnabled) {
                 playVideo(info);
             }
 
@@ -446,20 +275,36 @@ public class VideoItemDetailFragment extends Fragment {
                 }
             });
 
-        } catch (java.lang.NullPointerException e) {
-            Log.w(TAG, "updateInfo(): Fragment closed before thread ended work... or else");
-            e.printStackTrace();
+            //todo: make backgroundButton handle this
+            thumbnailView.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) {
+                        NavStack.getInstance()
+                                .openChannelActivity(getActivity(), info.channel_url, info.service_id);
+                    }
+                });
+            } else {
+                channelButton.setVisibility(Button.GONE);
+            }
+
+            initThumbnailViews(info);
         }
     }
 
-    private void initThumbnailViews(StreamInfo info, View nextVideoFrame) {
-        ImageView videoThumbnailView = (ImageView) activity.findViewById(R.id.detailThumbnailView);
+    private void initThumbnailViews(final StreamInfo info) {
+        ImageView videoThumbnailView = (ImageView) activity.findViewById(R.id.detail_thumbnail_view);
         ImageView uploaderThumb
-                = (ImageView) activity.findViewById(R.id.detailUploaderThumbnailView);
-        ImageView nextVideoThumb =
-                (ImageView) nextVideoFrame.findViewById(R.id.itemThumbnailView);
+                = (ImageView) activity.findViewById(R.id.detail_uploader_thumbnail_view);
 
-        if(info.thumbnail_url != null && !info.thumbnail_url.isEmpty()) {
+        if (info.thumbnail_url != null && !info.thumbnail_url.isEmpty()) {
             imageLoader.displayImage(info.thumbnail_url, videoThumbnailView,
                     displayImageOptions, new ImageLoadingListener() {
                         @Override
@@ -468,14 +313,16 @@ public class VideoItemDetailFragment extends Fragment {
 
                         @Override
                         public void onLoadingFailed(String imageUri, View view, FailReason failReason) {
-                            Toast.makeText(VideoItemDetailFragment.this.getActivity(),
-                                    R.string.could_not_load_thumbnails, Toast.LENGTH_LONG).show();
-                            failReason.getCause().printStackTrace();
+                            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) {
-                            videoThumbnail = loadedImage;
+                            streamThumbnail = loadedImage;
                         }
 
                         @Override
@@ -485,13 +332,10 @@ public class VideoItemDetailFragment extends Fragment {
         } else {
             videoThumbnailView.setImageResource(R.drawable.dummy_thumbnail_dark);
         }
-        if(info.uploader_thumbnail_url != null && !info.uploader_thumbnail_url.isEmpty()) {
+        if (info.uploader_thumbnail_url != null && !info.uploader_thumbnail_url.isEmpty()) {
             imageLoader.displayImage(info.uploader_thumbnail_url,
-                    uploaderThumb, displayImageOptions, new ThumbnailLoadingListener());
-        }
-        if(info.thumbnail_url != null && !info.thumbnail_url.isEmpty() && info.next_video != null) {
-            imageLoader.displayImage(info.next_video.thumbnail_url,
-                    nextVideoThumb, displayImageOptions, new ThumbnailLoadingListener());
+                    uploaderThumb, displayImageOptions,
+                    new ImageErrorLoadingListener(activity, rootView, info.service_id));
         }
     }
 
@@ -555,6 +399,10 @@ public class VideoItemDetailFragment extends Fragment {
         actionBarHandler.setOnDownloadListener(new ActionBarHandler.OnActionListener() {
             @Override
             public void onActionSelected(int selectedStreamId) {
+                if(!PermissionHelper.checkStoragePermissions(getActivity())) {
+                    return;
+                }
+
                 try {
                     Bundle args = new Bundle();
 
@@ -578,8 +426,7 @@ public class VideoItemDetailFragment extends Fragment {
                     }
 
                     args.putString(DownloadDialog.TITLE, info.title);
-                    DownloadDialog downloadDialog = new DownloadDialog();
-                    downloadDialog.setArguments(args);
+                    DownloadDialog downloadDialog = DownloadDialog.newInstance(args);
                     downloadDialog.show(activity.getSupportFragmentManager(), "downloadDialog");
                 } catch (Exception e) {
                     Toast.makeText(VideoItemDetailFragment.this.getActivity(),
@@ -589,7 +436,7 @@ public class VideoItemDetailFragment extends Fragment {
             }
         });
 
-        if(info.audio_streams == null) {
+        if (info.audio_streams == null) {
             actionBarHandler.showAudioAction(false);
         } else {
             actionBarHandler.setOnPlayAudioListener(new ActionBarHandler.OnActionListener() {
@@ -602,9 +449,9 @@ public class VideoItemDetailFragment extends Fragment {
                             info.audio_streams.get(getPreferredAudioStreamId(info));
                     if (!useExternalAudioPlayer && android.os.Build.VERSION.SDK_INT >= 18) {
                         //internal music player: explicit intent
-                        if (!BackgroundPlayer.isRunning && videoThumbnail != null) {
+                        if (!BackgroundPlayer.isRunning && streamThumbnail != null) {
                             ActivityCommunicator.getCommunicator()
-                                    .backgroundPlayerThumbnail = videoThumbnail;
+                                    .backgroundPlayerThumbnail = streamThumbnail;
                             intent = new Intent(activity, BackgroundPlayer.class);
 
                             intent.setAction(Intent.ACTION_VIEW);
@@ -684,47 +531,25 @@ public class VideoItemDetailFragment extends Fragment {
         return 0;
     }
 
-    private void initSimilarVideos(final StreamInfo info, VideoInfoItemViewCreator videoItemViewCreator) {
-        LinearLayout similarLayout = (LinearLayout) activity.findViewById(R.id.similarVideosView);
-        ArrayList<StreamPreviewInfo> similar = new ArrayList<>(info.related_videos);
-        for (final StreamPreviewInfo item : similar) {
-            View similarView = videoItemViewCreator
-                    .getViewFromVideoInfoItem(null, similarLayout, item);
-
-            similarView.setClickable(true);
-            similarView.setFocusable(true);
-            int[] attrs = new int[]{R.attr.selectableItemBackground};
-            TypedArray typedArray = activity.obtainStyledAttributes(attrs);
-            int backgroundResource = typedArray.getResourceId(0, 0);
-            similarView.setBackgroundResource(backgroundResource);
-            typedArray.recycle();
-
-            similarView.setOnTouchListener(new View.OnTouchListener() {
-                @Override
-                public boolean onTouch(View v, MotionEvent event) {
-                    if (event.getAction() == MotionEvent.ACTION_UP) {
-                        Intent detailIntent = new Intent(activity, VideoItemDetailActivity.class);
-                        detailIntent.putExtra(VideoItemDetailFragment.VIDEO_URL, item.webpage_url);
-                        detailIntent.putExtra(
-                                VideoItemDetailFragment.STREAMING_SERVICE, streamingServiceId);
-                        startActivity(detailIntent);
-                        return true;
-                    }
-                    return false;
-                }
-            });
-
-            similarLayout.addView(similarView);
-            ImageView rthumb = (ImageView)similarView.findViewById(R.id.itemThumbnailView);
-            imageLoader.displayImage(item.thumbnail_url, rthumb,
-                    displayImageOptions, new ThumbnailLoadingListener());
+    private void initSimilarVideos(final StreamInfo info) {
+        LinearLayout similarLayout = (LinearLayout) activity.findViewById(R.id.similar_streams_view);
+        for (final InfoItem item : info.related_streams) {
+            similarLayout.addView(infoItemBuilder.buildView(similarLayout, item));
         }
+        infoItemBuilder.setOnStreamInfoItemSelectedListener(
+                new InfoItemBuilder.OnInfoItemSelectedListener() {
+            @Override
+            public void selected(String url, int serviceId) {
+                NavStack.getInstance()
+                        .openDetailActivity(getContext(), url, serviceId);
+            }
+        });
     }
 
     private void onErrorBlockedByGema() {
         Button backgroundButton = (Button)
-                activity.findViewById(R.id.detailVideoThumbnailWindowBackgroundButton);
-        ImageView thumbnailView = (ImageView) activity.findViewById(R.id.detailThumbnailView);
+                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(
@@ -744,7 +569,7 @@ public class VideoItemDetailFragment extends Fragment {
     }
 
     private void onNotSpecifiedContentError() {
-        ImageView thumbnailView = (ImageView) activity.findViewById(R.id.detailThumbnailView);
+        ImageView thumbnailView = (ImageView) activity.findViewById(R.id.detail_thumbnail_view);
         progressBar.setVisibility(View.GONE);
         thumbnailView.setImageBitmap(BitmapFactory.decodeResource(
                 getResources(), R.drawable.not_available_monkey));
@@ -753,7 +578,7 @@ public class VideoItemDetailFragment extends Fragment {
     }
 
     private void onNotSpecifiedContentErrorWithMessage(int resourceId) {
-        ImageView thumbnailView = (ImageView) activity.findViewById(R.id.detailThumbnailView);
+        ImageView thumbnailView = (ImageView) activity.findViewById(R.id.detail_thumbnail_view);
         progressBar.setVisibility(View.GONE);
         thumbnailView.setImageBitmap(BitmapFactory.decodeResource(
                 getResources(), R.drawable.not_available_monkey));
@@ -770,25 +595,60 @@ public class VideoItemDetailFragment extends Fragment {
         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())
+        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();
+            }
+        });
+        setHasOptionsMenu(true);
     }
 
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
-        View rootView = inflater.inflate(R.layout.fragment_videoitem_detail, container, false);
-        progressBar = (ProgressBar) rootView.findViewById(R.id.detailProgressBar);
+        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);
@@ -800,34 +660,31 @@ public class VideoItemDetailFragment extends Fragment {
     }
 
     @Override
-    public void onActivityCreated(Bundle savedInstanceBundle) {
-        super.onActivityCreated(savedInstanceBundle);
+    public void onStart() {
+        super.onStart();
         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.playVideoButton);
+            playVideoButton = (FloatingActionButton) a.findViewById(R.id.play_video_button);
         }
-        thumbnailWindowLayout = a.findViewById(R.id.detailVideoThumbnailWindowLayout);
+        thumbnailWindowLayout = a.findViewById(R.id.detail_stream_thumbnail_window_layout);
         Button backgroundButton = (Button)
-                a.findViewById(R.id.detailVideoThumbnailWindowBackgroundButton);
+                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) {
-            try {
-                streamingServiceId = getArguments().getInt(STREAMING_SERVICE);
-                StreamingService streamingService = ServiceList.getService(streamingServiceId);
-                Thread videoExtractorThread = new Thread(new VideoExtractorRunnable(
-                        getArguments().getString(VIDEO_URL), streamingService));
+            streamingServiceId = getArguments().getInt(NavStack.SERVICE_ID);
+            String videoUrl = getArguments().getString(NavStack.URL);
+            StreamInfoWorker siw = StreamInfoWorker.getInstance();
+            siw.search(streamingServiceId, videoUrl, getActivity());
 
-                autoPlayEnabled = getArguments().getBoolean(AUTO_PLAY);
-                videoExtractorThread.start();
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
+            autoPlayEnabled = getArguments().getBoolean(AUTO_PLAY);
 
             if(Build.VERSION.SDK_INT >= 18) {
-                ImageView thumbnailView = (ImageView) activity.findViewById(R.id.detailThumbnailView);
+                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.
@@ -934,11 +791,13 @@ public class VideoItemDetailFragment extends Fragment {
 
     @Override
     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        super.onCreateOptionsMenu(menu, inflater);
         actionBarHandler.setupMenu(menu, inflater);
     }
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
+        super.onOptionsItemSelected(item);
         return actionBarHandler.onItemSelected(item);
     }
 
@@ -946,23 +805,28 @@ public class VideoItemDetailFragment extends Fragment {
         this.onInvokeCreateOptionsMenuListener = listener;
     }
 
-    private void postNewErrorToast(Handler h, final int stringResource) {
-        h.post(new Runnable() {
-            @Override
-            public void run() {
-                Toast.makeText(VideoItemDetailFragment.this.getActivity(),
-                        stringResource, Toast.LENGTH_LONG).show();
-            }
-        });
+    private void postNewErrorToast(final int stringResource) {
+        Toast.makeText(VideoItemDetailFragment.this.getActivity(),
+                stringResource, Toast.LENGTH_LONG).show();
     }
 
-    private void postNewErrorToast(Handler h, final String message) {
-        h.post(new Runnable() {
-            @Override
-            public void run() {
-                Toast.makeText(VideoItemDetailFragment.this.getActivity(),
-                        message, Toast.LENGTH_LONG).show();
-            }
-        });
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        switch (requestCode) {
+            case RECAPTCHA_REQUEST:
+                if (resultCode == RESULT_OK) {
+                    String videoUrl = getArguments().getString(NavStack.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,258 @@
+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.widget.Toolbar;
+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.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.ThemableActivity;
+import org.schabi.newpipe.report.ErrorActivity;
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.settings.NewPipeSettings;
+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 ThemableActivity 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 String mPendingUrl;
+    private SharedPreferences mPrefs;
+
+    @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);
+
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_downloader);
+
+
+        //noinspection ConstantConditions
+
+        // its ok if this fails, 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 location;
+                    if(audioButton.isChecked()) {
+                        location = NewPipeSettings.getAudioDownloadPath(DownloadActivity.this);
+                    } else {
+                        location = NewPipeSettings.getVideoDownloadPath(DownloadActivity.this);
+                    }
+
+                    String fName = name.getText().toString().trim();
+
+                    File f = new File(location, fName);
+                    if (f.exists()) {
+                        Toast.makeText(DownloadActivity.this, R.string.msg_exists, Toast.LENGTH_SHORT).show();
+                    } else {
+                        DownloadManagerService.startMission(
+                                DownloadActivity.this,
+                                getIntent().getData().toString(), location, fName,
+                                audioButton.isChecked(), threads.getProgress() + 1);
+                        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: {
+                onBackPressed();
+                return true;
+            }
+            case R.id.action_settings: {
+                Intent intent = new Intent(this, SettingsActivity.class);
+                startActivity(intent);
+                return true;
+            }
+            default:
+                return super.onOptionsItemSelected(item);
+        }
+    }
+
+}

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

@@ -0,0 +1,240 @@
+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 org.schabi.newpipe.extractor.NewPipe;
+import org.schabi.newpipe.settings.NewPipeSettings;
+
+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";
+
+    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);
+
+        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();
+
+        boolean isAudio = audioButton.isChecked();
+        String url, location, filename;
+        if(isAudio) {
+            url = arguments.getString(AUDIO_URL);
+            location = NewPipeSettings.getAudioDownloadPath(getContext());
+            filename = fName + arguments.getString(FILE_SUFFIX_AUDIO);
+        } else {
+            url = arguments.getString(VIDEO_URL);
+            location = NewPipeSettings.getVideoDownloadPath(getContext());
+            filename = fName + arguments.getString(FILE_SUFFIX_VIDEO);
+        }
+
+        DownloadManagerService.startMission(getContext(), url, location, filename, isAudio,
+                threads.getProgress() + 1);
+
+        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/FileDownloader.java

@@ -1,26 +1,21 @@
-package org.schabi.newpipe;
-
+package org.schabi.newpipe.download;
 
 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 org.schabi.newpipe.R;
+
 import java.io.BufferedInputStream;
-import java.io.BufferedReader;
 import java.io.File;
 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 javax.net.ssl.HttpsURLConnection;
 
@@ -46,6 +41,8 @@ import info.guardianproject.netcipher.NetCipher;
  * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+
+// TODO: FOR HEAVEN 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";
 
@@ -165,5 +162,4 @@ public class FileDownloader extends AsyncTask<Void, Integer, Void> {
         super.onPostExecute(aVoid);
         nm.cancel(notifyId);
     }
-
 }

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

@@ -1,10 +1,8 @@
 package org.schabi.newpipe.extractor;
 
-import android.graphics.Bitmap;
-
 /**
- * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
- * AbstractVideoInfo.java is part of NewPipe.
+ * 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
@@ -20,9 +18,9 @@ import android.graphics.Bitmap;
  * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-/**Common properties between StreamInfo and StreamPreviewInfo.*/
-public abstract class AbstractVideoInfo {
-    public static enum StreamType {
+/**Common properties between StreamInfo and StreamInfoItem.*/
+public abstract class AbstractStreamInfo {
+    public enum StreamType {
         NONE,   // placeholder to check if stream type was checked or not
         VIDEO_STREAM,
         AUDIO_STREAM,
@@ -37,7 +35,6 @@ public abstract class AbstractVideoInfo {
     public String title = "";
     public String uploader = "";
     public String thumbnail_url = "";
-    public Bitmap thumbnail = null;
     public String webpage_url = "";
     public String upload_date = "";
     public long view_count = -1;

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

@@ -2,6 +2,9 @@ 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;
@@ -40,14 +43,16 @@ public class DashMpdParser {
         }
     }
 
-    public static List<AudioStream> getAudioStreams(String dashManifestUrl,
-                                                             Downloader downloader)
-            throws DashMpdParsingException {
+    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 {

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

@@ -1,6 +1,9 @@
 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.
@@ -30,12 +33,20 @@ public interface Downloader {
      * @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;
+    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;
+    String download(String siteUrl) throws IOException, ReCaptchaException;
 }

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

@@ -0,0 +1,33 @@
+package org.schabi.newpipe.extractor;
+
+/**
+ * Created by the-scrabi on 11.02.17.
+ *
+ * Copyright (C) Christian Schabesberger 2017 <chris.schabesberger@mailbox.org>
+ * InfoItem.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 InfoItem {
+    public enum InfoType {
+        STREAM,
+        PLAYLIST,
+        CHANNEL
+    }
+
+    InfoType infoType();
+    String getTitle();
+    String getLink();
+}

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

@@ -0,0 +1,61 @@
+package org.schabi.newpipe.extractor;
+
+import org.schabi.newpipe.extractor.exceptions.ExtractionException;
+
+import java.util.List;
+import java.util.Vector;
+
+/**
+ * Created by Christian Schabesberger on 12.02.17.
+ *
+ * Copyright (C) Christian Schabesberger 2017 <chris.schabesberger@mailbox.org>
+ * InfoItemCollector.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 InfoItemCollector {
+    private List<InfoItem> itemList = new Vector<>();
+    private List<Throwable> errors = new Vector<>();
+    private int serviceId = -1;
+
+    public InfoItemCollector(int serviceId) {
+        this.serviceId = serviceId;
+    }
+
+    public List<InfoItem> getItemList() {
+        return itemList;
+    }
+    public List<Throwable> getErrors() {
+        return errors;
+    }
+    protected void addFromCollector(InfoItemCollector otherC) throws ExtractionException {
+        if(serviceId != otherC.serviceId) {
+            throw new ExtractionException("Service Id does not equal: "
+                    + NewPipe.getNameOfService(serviceId)
+                    + " and " + NewPipe.getNameOfService(otherC.serviceId));
+        }
+        errors.addAll(otherC.errors);
+        itemList.addAll(otherC.itemList);
+    }
+    protected void addError(Exception e) {
+        errors.add(e);
+    }
+    protected void addItem(InfoItem item) {
+        itemList.add(item);
+    }
+    protected int getServiceId() {
+        return serviceId;
+    }
+}

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

@@ -0,0 +1,88 @@
+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 Downloader downloader = null;
+
+    public static StreamingService[] getServices() {
+        return ServiceList.serviceList;
+    }
+    public static StreamingService getService(int serviceId)throws ExtractionException {
+        for(StreamingService s : ServiceList.serviceList) {
+            if(s.getServiceId() == serviceId) {
+                return s;
+            }
+        }
+        return null;
+    }
+    public static StreamingService getService(String serviceName) throws ExtractionException {
+        return ServiceList.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) {
+        for(int i = 0; i < ServiceList.serviceList.length; i++) {
+            if(ServiceList.serviceList[i].getServiceInfo().name.equals(serviceName)) {
+                return i;
+            }
+        }
+        return -1;
+    }
+
+    public static void init(Downloader d) {
+        downloader = d;
+    }
+
+    public static Downloader getDownloader() {
+        return downloader;
+    }
+
+    public static StreamingService getServiceByUrl(String url) {
+        for(StreamingService s : ServiceList.serviceList) {
+            if(s.getLinkTypeByUrl(url) != StreamingService.LinkType.NONE) {
+                return s;
+            }
+        }
+        return null;
+    }
+}

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

@@ -1,6 +1,6 @@
 package org.schabi.newpipe.extractor;
 
-import android.util.Log;
+import org.schabi.newpipe.extractor.exceptions.ParsingException;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
@@ -42,15 +42,23 @@ public class Parser {
     }
 
     public static String matchGroup1(String pattern, String input) throws RegexException {
+        return matchGroup(pattern, input, 1);
+    }
+
+    public static String matchGroup(String pattern, String input, int group) throws RegexException {
         Pattern pat = Pattern.compile(pattern);
         Matcher mat = pat.matcher(input);
         boolean foundMatch = mat.find();
         if (foundMatch) {
-            return mat.group(1);
+            return mat.group(group);
         }
         else {
             //Log.e(TAG, "failed to find pattern \""+pattern+"\" inside of \""+input+"\"");
-            throw new RegexException("failed to find pattern \""+pattern+" inside of "+input+"\"");
+            if(input.length() > 1024) {
+                throw new RegexException("failed to find pattern \""+pattern);
+            } else {
+                throw new RegexException("failed to find pattern \"" + pattern + " inside of " + input + "\"");
+            }
         }
     }
 

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

@@ -1,71 +1,13 @@
 package org.schabi.newpipe.extractor;
 
-import android.util.Log;
-
 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>
- * ServiceList.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/>.
+ * Created by the-scrabi on 18.02.17.
  */
 
-/**Provides access to the video streaming services supported by NewPipe.
- * Currently only Youtube until the API becomes more stable.*/
-
-@SuppressWarnings("ALL")
-public class ServiceList {
-
-    private ServiceList() {
-    }
-
-    private static final String TAG = ServiceList.class.toString();
-    private static final StreamingService[] services = {
-        new YoutubeService(0)
+class ServiceList {
+    public static final StreamingService[] serviceList = {
+            new YoutubeService(0)
     };
-    public static StreamingService[] getServices() {
-        return services;
-    }
-    public static StreamingService getService(int serviceId) throws ExtractionException {
-        for(StreamingService s : services) {
-            if(s.getServiceId() == serviceId) {
-                return s;
-            }
-        }
-        throw new ExtractionException("Service not known: " + Integer.toString(serviceId));
-    }
-    public static StreamingService getService(String serviceName) throws ExtractionException {
-        return services[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 < services.length; i++) {
-            if(services[i].getServiceInfo().name.equals(serviceName)) {
-                return i;
-            }
-        }
-        throw new ExtractionException("Error: Service " + serviceName + " not known.");
-    }
 }

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

@@ -1,94 +0,0 @@
-package org.schabi.newpipe.extractor;
-
-import org.schabi.newpipe.extractor.services.youtube.YoutubeStreamUrlIdHandler;
-
-/**
- * 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 SearchResult result = new SearchResult();
-    private StreamUrlIdHandler urlIdHandler = null;
-    private int serviceId = -1;
-
-    public StreamPreviewInfoCollector(StreamUrlIdHandler handler, int serviceId) {
-        urlIdHandler = handler;
-        this.serviceId = serviceId;
-    }
-
-    public void setSuggestion(String suggestion) {
-        result.suggestion = suggestion;
-    }
-
-    public void addError(Exception e) {
-        result.errors.add(e);
-    }
-
-    public SearchResult getSearchResult() {
-        return result;
-    }
-
-    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 {
-                resultItem.id = (new YoutubeStreamUrlIdHandler()).getVideoId(resultItem.webpage_url);
-            }
-            resultItem.title = extractor.getTitle();
-            resultItem.stream_type = extractor.getStreamType();
-
-            // optional iformation
-            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);
-            }
-
-            result.resultList.add(resultItem);
-        } catch (Exception e) {
-            addError(e);
-        }
-
-    }
-}

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

@@ -1,5 +1,10 @@
 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.stream_info.StreamExtractor;
+
 import java.io.IOException;
 
 /**
@@ -27,6 +32,13 @@ public abstract class StreamingService {
         public String name = "";
     }
 
+    public enum LinkType {
+        NONE,
+        STREAM,
+        CHANNEL,
+        PLAYLIST
+    }
+
     private int serviceId;
 
     public StreamingService(int id) {
@@ -35,12 +47,32 @@ public abstract class StreamingService {
 
     public abstract ServiceInfo getServiceInfo();
 
-    public abstract StreamExtractor getExtractorInstance(String url, Downloader downloader)
+    public abstract StreamExtractor getExtractorInstance(String url)
             throws IOException, ExtractionException;
-    public abstract SearchEngine getSearchEngineInstance(Downloader downloader);
-    public abstract StreamUrlIdHandler getUrlIdHandlerInstance();
+    public abstract SearchEngine getSearchEngineInstance();
+    public abstract UrlIdHandler getStreamUrlIdHandlerInstance();
+    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;
     }
+
+    /**
+     * figure out where the link is pointing to (a channel, video, playlist, etc.)
+     */
+    public final LinkType getLinkTypeByUrl(String url) {
+        UrlIdHandler sH = getStreamUrlIdHandlerInstance();
+        UrlIdHandler cH = getChannelUrlIdHandlerInstance();
+
+        if(sH.acceptUrl(url)) {
+            return LinkType.STREAM;
+        } else if(cH.acceptUrl(url)) {
+            return LinkType.CHANNEL;
+        } else {
+            return LinkType.NONE;
+        }
+    }
 }

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

@@ -0,0 +1,43 @@
+package org.schabi.newpipe.extractor;
+
+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/UrlIdHandler.java

@@ -1,10 +1,12 @@
 package org.schabi.newpipe.extractor;
 
+import org.schabi.newpipe.extractor.exceptions.ParsingException;
+
 /**
- * Created by Christian Schabesberger on 02.02.16.
+ * Created by Christian Schabesberger on 26.07.16.
  *
  * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
- * StreamUrlIdHandler.java is part of NewPipe.
+ * 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,9 +22,10 @@ package org.schabi.newpipe.extractor;
  * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-public interface StreamUrlIdHandler {
-    String getVideoUrl(String videoId);
-    String getVideoId(String siteUrl) throws ParsingException;
+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

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.StreamInfoItemCollector;
+
+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 StreamInfoItemCollector 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 StreamInfoItemCollector(urlIdHandler, serviceId);
+    }
+
+    public String getUrl() { return url; }
+    public UrlIdHandler getUrlIdHandler() { return urlIdHandler; }
+    public StreamInfoItemCollector 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 StreamInfoItemCollector 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,82 @@
+package org.schabi.newpipe.extractor.channel;
+
+import org.schabi.newpipe.extractor.InfoItem;
+import org.schabi.newpipe.extractor.exceptions.ParsingException;
+import org.schabi.newpipe.extractor.stream_info.StreamInfoItem;
+import org.schabi.newpipe.extractor.stream_info.StreamInfoItemCollector;
+
+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 {
+            StreamInfoItemCollector 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<InfoItem> related_streams = null;
+    public boolean hasNextPage = false;
+
+    public List<Throwable> errors = new Vector<>();
+}

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

@@ -0,0 +1,44 @@
+package org.schabi.newpipe.extractor.channel;
+
+import org.schabi.newpipe.extractor.InfoItem;
+
+/**
+ * Created by Christian Schabesberger on 11.02.17.
+ *
+ * Copyright (C) Christian Schabesberger 2017 <chris.schabesberger@mailbox.org>
+ * ChannelInfoItem.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 ChannelInfoItem implements InfoItem {
+
+    public int serviceId = -1;
+    public String channelName = "";
+    public String thumbnailUrl = "";
+    public String webPageUrl = "";
+    public String description = "";
+    public long subscriberCount = -1;
+    public int videoAmount = -1;
+
+    public InfoType infoType() {
+        return InfoType.CHANNEL;
+    }
+    public String getTitle() {
+        return channelName;
+    }
+    public String getLink() {
+        return webPageUrl;
+    }
+}

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

@@ -0,0 +1,74 @@
+package org.schabi.newpipe.extractor.channel;
+
+import org.schabi.newpipe.extractor.InfoItemCollector;
+import org.schabi.newpipe.extractor.NewPipe;
+import org.schabi.newpipe.extractor.exceptions.FoundAdException;
+import org.schabi.newpipe.extractor.exceptions.ParsingException;
+import org.schabi.newpipe.extractor.stream_info.StreamInfoItem;
+import org.schabi.newpipe.extractor.stream_info.StreamInfoItemExtractor;
+
+/**
+ * Created by Christian Schabesberger on 12.02.17.
+ *
+ * Copyright (C) Christian Schabesberger 2017 <chris.schabesberger@mailbox.org>
+ * ChannelInfoItemCollector.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 ChannelInfoItemCollector extends InfoItemCollector {
+    public ChannelInfoItemCollector(int serviceId) {
+        super(serviceId);
+    }
+
+    public ChannelInfoItem extract(ChannelInfoItemExtractor extractor) throws ParsingException {
+        ChannelInfoItem resultItem = new ChannelInfoItem();
+        // importand information
+        resultItem.channelName = extractor.getChannelName();
+
+        resultItem.serviceId = getServiceId();
+        resultItem.webPageUrl = extractor.getWebPageUrl();
+
+        // optional information
+        try {
+            resultItem.subscriberCount = extractor.getSubscriberCount();
+        } catch (Exception e) {
+            addError(e);
+        }
+        try {
+            resultItem.videoAmount = extractor.getVideoAmount();
+        } catch (Exception e) {
+            addError(e);
+        }
+        try {
+            resultItem.thumbnailUrl = extractor.getThumbnailUrl();
+        } catch (Exception e) {
+            addError(e);
+        }
+        try {
+            resultItem.description = extractor.getDescription();
+        } catch (Exception e) {
+            addError(e);
+        }
+        return resultItem;
+    }
+
+    public void commit(ChannelInfoItemExtractor extractor) throws ParsingException {
+        try {
+            addItem(extract(extractor));
+        } catch (Exception e) {
+            addError(e);
+        }
+    }
+}

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

@@ -0,0 +1,32 @@
+package org.schabi.newpipe.extractor.channel;
+
+import org.schabi.newpipe.extractor.exceptions.ParsingException;
+
+/**
+ * Created by Christian Schabesberger on 12.02.17.
+ *
+ * Copyright (C) Christian Schabesberger 2017 <chris.schabesberger@mailbox.org>
+ * ChannelInfoItemExtractor.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 ChannelInfoItemExtractor {
+    String getThumbnailUrl() throws ParsingException;
+    String getChannelName() throws ParsingException;
+    String getWebPageUrl() throws ParsingException;
+    String getDescription() throws ParsingException;
+    long getSubscriberCount() throws ParsingException;
+    int getVideoAmount() throws ParsingException;
+}

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

@@ -1,4 +1,4 @@
-package org.schabi.newpipe.extractor;
+package org.schabi.newpipe.extractor.exceptions;
 
 /**
  * Created by Christian Schabesberger on 30.01.16.
@@ -24,11 +24,9 @@ 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

@@ -1,4 +1,4 @@
-package org.schabi.newpipe.extractor;
+package org.schabi.newpipe.extractor.exceptions;
 
 /**
  * Created by Christian Schabesberger on 31.01.16.

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

@@ -1,10 +1,10 @@
-package org.schabi.newpipe.extractor;
+package org.schabi.newpipe.extractor.exceptions;
 
 /**
- * Created by Christian Schabesberger on 26.08.15.
+ * Created by beneth <bmauduit@beneth.fr> on 07.12.16.
  *
  * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
- * StreamPreviewInfo.java is part of NewPipe.
+ * 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
@@ -20,7 +20,8 @@ package org.schabi.newpipe.extractor;
  * 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 StreamPreviewInfo extends AbstractVideoInfo {
-    public int duration = 0;
-}
+public class ReCaptchaException extends ExtractionException {
+    public ReCaptchaException(String message) {
+        super(message);
+    }
+}

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

@@ -0,0 +1,79 @@
+package org.schabi.newpipe.extractor.search;
+
+import org.schabi.newpipe.extractor.InfoItemCollector;
+import org.schabi.newpipe.extractor.UrlIdHandler;
+import org.schabi.newpipe.extractor.channel.ChannelInfoItemCollector;
+import org.schabi.newpipe.extractor.channel.ChannelInfoItemExtractor;
+import org.schabi.newpipe.extractor.exceptions.ExtractionException;
+import org.schabi.newpipe.extractor.exceptions.FoundAdException;
+import org.schabi.newpipe.extractor.exceptions.ParsingException;
+import org.schabi.newpipe.extractor.stream_info.StreamInfoItemCollector;
+import org.schabi.newpipe.extractor.stream_info.StreamInfoItemExtractor;
+
+/**
+ * Created by Christian Schabesberger on 12.02.17.
+ *
+ * Copyright (C) Christian Schabesberger 2017 <chris.schabesberger@mailbox.org>
+ * InfoItemSearchCollector.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 InfoItemSearchCollector extends InfoItemCollector {
+    private String suggestion = "";
+    private StreamInfoItemCollector streamCollector;
+    private ChannelInfoItemCollector channelCollector;
+
+    SearchResult result = new SearchResult();
+
+    InfoItemSearchCollector(UrlIdHandler handler, int serviceId) {
+        super(serviceId);
+        streamCollector = new StreamInfoItemCollector(handler, serviceId);
+        channelCollector = new ChannelInfoItemCollector(serviceId);
+    }
+
+    public void setSuggestion(String suggestion) {
+        this.suggestion = suggestion;
+    }
+
+    public SearchResult getSearchResult() throws ExtractionException {
+
+        addFromCollector(channelCollector);
+        addFromCollector(streamCollector);
+
+        result.suggestion = suggestion;
+        result.errors = getErrors();
+        return result;
+    }
+
+    public void commit(StreamInfoItemExtractor extractor) {
+        try {
+            result.resultList.add(streamCollector.extract(extractor));
+        } catch(FoundAdException ae) {
+            System.err.println("Found add");
+        } catch (Exception e) {
+            addError(e);
+        }
+    }
+
+    public void commit(ChannelInfoItemExtractor extractor) {
+        try {
+            result.resultList.add(channelCollector.extract(extractor));
+        } catch(FoundAdException ae) {
+            System.err.println("Found add");
+        } catch (Exception e) {
+            addError(e);
+        }
+    }
+}

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

@@ -1,9 +1,11 @@
-package org.schabi.newpipe.extractor;
+package org.schabi.newpipe.extractor.search;
+
+import org.schabi.newpipe.extractor.UrlIdHandler;
+import org.schabi.newpipe.extractor.exceptions.ExtractionException;
+import org.schabi.newpipe.extractor.stream_info.StreamInfoItemCollector;
 
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Vector;
+import java.util.EnumSet;
 
 /**
  * Created by Christian Schabesberger on 10.08.15.
@@ -25,30 +27,27 @@ import java.util.Vector;
  * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-@SuppressWarnings("ALL")
 public abstract class SearchEngine {
+    public enum Filter {
+        STREAM, CHANNEL, PLAY_LIST
+    }
+
     public static class NothingFoundException extends ExtractionException {
         public NothingFoundException(String message) {
             super(message);
         }
     }
+    private InfoItemSearchCollector collector;
 
-    private StreamPreviewInfoCollector collector;
-
-    public SearchEngine(StreamUrlIdHandler urlIdHandler, int serviceId) {
-        collector = new StreamPreviewInfoCollector(urlIdHandler, serviceId);
+    public SearchEngine(UrlIdHandler urlIdHandler, int serviceId) {
+        collector = new InfoItemSearchCollector(urlIdHandler, serviceId);
     }
 
-    public StreamPreviewInfoCollector getStreamPreviewInfoCollector() {
+    protected  InfoItemSearchCollector getInfoItemSearchCollector() {
         return collector;
     }
-
-    public abstract ArrayList<String> suggestionList(
-            String query,String contentCountry, Downloader dl)
-            throws ExtractionException, IOException;
-
     //Result search(String query, int page);
-    public abstract StreamPreviewInfoCollector search(
-            String query, int page, String contentCountry, Downloader dl)
+    public abstract InfoItemSearchCollector search(
+            String query, int page, String contentCountry, EnumSet<Filter> filter)
             throws ExtractionException, IOException;
 }

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

@@ -1,6 +1,11 @@
-package org.schabi.newpipe.extractor;
+package org.schabi.newpipe.extractor.search;
+
+import org.schabi.newpipe.extractor.InfoItem;
+import org.schabi.newpipe.extractor.exceptions.ExtractionException;
+import org.schabi.newpipe.extractor.stream_info.StreamInfoItem;
 
 import java.io.IOException;
+import java.util.EnumSet;
 import java.util.List;
 import java.util.Vector;
 
@@ -26,13 +31,17 @@ import java.util.Vector;
 
 public class SearchResult {
     public static SearchResult getSearchResult(SearchEngine engine, String query,
-                                               int page, String languageCode, Downloader dl)
+                                               int page, String languageCode, EnumSet<SearchEngine.Filter> filter)
             throws ExtractionException, IOException {
 
-        SearchResult result = engine.search(query, page, languageCode, dl).getSearchResult();
+        SearchResult result = engine
+                .search(query, page, languageCode, filter)
+                .getSearchResult();
         if(result.resultList.isEmpty()) {
             if(result.suggestion.isEmpty()) {
-                throw new ExtractionException("Empty result despite no error");
+                if(result.errors.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);
@@ -42,6 +51,6 @@ public class SearchResult {
     }
 
     public String suggestion = "";
-    public final List<StreamPreviewInfo> resultList = new Vector<>();
-    public List<Exception> errors = new Vector<>();
+    public List<InfoItem> resultList = new Vector<>();
+    public List<Throwable> errors = new Vector<>();
 }

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

@@ -0,0 +1,340 @@
+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.StreamInfoItemCollector;
+import org.schabi.newpipe.extractor.stream_info.StreamInfoItemExtractor;
+
+
+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") || url.contains("default_banner")) {
+                    bannerUrl = null;
+                } else {
+                    bannerUrl = url;
+                }
+            }
+            return bannerUrl;
+        } catch(Exception e) {
+            throw new ParsingException("Could not get Banner", e);
+        }
+    }
+
+    @Override
+    public StreamInfoItemCollector getStreams() throws ParsingException {
+        StreamInfoItemCollector 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 StreamInfoItemExtractor() {
+                    @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/YoutubeChannelInfoItemExtractor.java

@@ -0,0 +1,83 @@
+package org.schabi.newpipe.extractor.services.youtube;
+
+import org.schabi.newpipe.extractor.Parser;
+import org.schabi.newpipe.extractor.channel.ChannelInfoItemExtractor;
+import org.schabi.newpipe.extractor.exceptions.ParsingException;
+import org.jsoup.nodes.Element;
+
+/**
+ * Created by Christian Schabesberger on 12.02.17.
+ *
+ * Copyright (C) Christian Schabesberger 2017 <chris.schabesberger@mailbox.org>
+ * YoutubeChannelInfoItemExtractor.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 YoutubeChannelInfoItemExtractor implements ChannelInfoItemExtractor {
+    private Element el;
+
+    public YoutubeChannelInfoItemExtractor(Element el) {
+        this.el = el;
+    }
+
+    public String getThumbnailUrl() throws ParsingException {
+        Element img = el.select("span[class*=\"yt-thumb-simple\"]").first()
+                .select("img").first();
+
+        String url = img.attr("abs:src");
+
+        if(url.contains("gif")) {
+            url = img.attr("abs:data-thumb");
+        }
+        return url;
+    }
+
+    public String getChannelName() throws ParsingException {
+        return el.select("a[class*=\"yt-uix-tile-link\"]").first()
+                .text();
+    }
+
+    public String getWebPageUrl() throws ParsingException {
+        return el.select("a[class*=\"yt-uix-tile-link\"]").first()
+                .attr("abs:href");
+    }
+
+    public long getSubscriberCount() throws ParsingException {
+        Element subsEl = el.select("span[class*=\"yt-subscriber-count\"]").first();
+        if(subsEl == null) {
+            return 0;
+        } else {
+            return Integer.parseInt(subsEl.text().replaceAll("\\D+",""));
+        }
+    }
+
+    public int getVideoAmount() throws ParsingException {
+        Element metaEl = el.select("ul[class*=\"yt-lockup-meta-info\"]").first();
+        if(metaEl == null) {
+            return 0;
+        } else {
+            return Integer.parseInt(metaEl.text().replaceAll("\\D+",""));
+        }
+    }
+
+    public String getDescription() throws ParsingException {
+        Element desEl = el.select("div[class*=\"yt-lockup-description\"]").first();
+        if(desEl == null) {
+            return "";
+        } else {
+            return desEl.text();
+        }
+    }
+}

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

@@ -1,6 +1,7 @@
 package org.schabi.newpipe.extractor.services.youtube;
 
-import org.schabi.newpipe.extractor.ParsingException;
+
+import org.schabi.newpipe.extractor.exceptions.ParsingException;
 
 /**
  * Created by Christian Schabesberger on 02.03.16.

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

@@ -3,28 +3,17 @@ 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.AbstractVideoInfo;
 import org.schabi.newpipe.extractor.Downloader;
-import org.schabi.newpipe.extractor.ExtractionException;
-import org.schabi.newpipe.extractor.Parser;
-import org.schabi.newpipe.extractor.ParsingException;
-import org.schabi.newpipe.extractor.SearchEngine;
-import org.schabi.newpipe.extractor.StreamPreviewInfoCollector;
-import org.schabi.newpipe.extractor.StreamPreviewInfoExtractor;
-import org.schabi.newpipe.extractor.StreamUrlIdHandler;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
+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.InfoItemSearchCollector;
+import org.schabi.newpipe.extractor.search.SearchEngine;
 
 import java.net.URLEncoder;
-import java.io.ByteArrayInputStream;
 import java.io.IOException;
-import java.util.ArrayList;
+import java.util.EnumSet;
 
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
 
 /**
  * Created by Christian Schabesberger on 09.08.15.
@@ -49,31 +38,31 @@ import javax.xml.parsers.ParserConfigurationException;
 public class YoutubeSearchEngine extends SearchEngine {
 
     private static final String TAG = YoutubeSearchEngine.class.toString();
+    public static final String CHARSET_UTF_8 = "UTF-8";
 
-    public YoutubeSearchEngine(StreamUrlIdHandler urlIdHandler, int serviceId) {
+    public YoutubeSearchEngine(UrlIdHandler urlIdHandler, int serviceId) {
         super(urlIdHandler, serviceId);
     }
 
     @Override
-    public StreamPreviewInfoCollector search(String query, int page, String languageCode, Downloader downloader)
+    public InfoItemSearchCollector search(String query,
+                                          int page,
+                                          String languageCode,
+                                          EnumSet<Filter> filter)
             throws IOException, ExtractionException {
-        StreamPreviewInfoCollector collector = getStreamPreviewInfoCollector();
+        InfoItemSearchCollector collector = getInfoItemSearchCollector();
 
-        /* Cant use Uri.Bilder since it's android code.
-        // Android code is baned from the extractor side.
-        Uri.Builder builder = new Uri.Builder();
-        builder.scheme("https")
-                .authority("www.youtube.com")
-                .appendPath("results")
-                .appendQueryParameter("search_query", query)
-                .appendQueryParameter("page", Integer.toString(page))
-                .appendQueryParameter("filters", "video");
-                */
+
+        Downloader downloader = NewPipe.getDownloader();
 
         String url = "https://www.youtube.com/results"
-                + "?search_query=" + URLEncoder.encode(query, "UTF-8")
-                + "&page=" + Integer.toString(page)
-                + "&filters=" + "video";
+                + "?q=" + URLEncoder.encode(query, CHARSET_UTF_8)
+                + "&page=" + Integer.toString(page + 1);
+        if(filter.contains(Filter.STREAM) && !filter.contains(Filter.CHANNEL)) {
+            url += "&sp=EgIQAQ%253D%253D";
+        } else if(!filter.contains(Filter.STREAM) && filter.contains(Filter.CHANNEL)) {
+            url += "&sp=EgIQAg%253D%253D";
+        }
 
         String site;
         //String url = builder.build().toString();
@@ -86,7 +75,6 @@ public class YoutubeSearchEngine extends SearchEngine {
             site = downloader.download(url);
         }
 
-
         Document doc = Jsoup.parse(site, url);
         Element list = doc.select("ol[class=\"item-section\"]").first();
 
@@ -105,89 +93,27 @@ public class YoutubeSearchEngine extends SearchEngine {
             Element el;
 
             // both types of spell correction item
-            if (!((el = item.select("div[class*=\"spell-correction\"]").first()) == null)) {
+            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();
+            } else if ((el = item.select("div[class*=\"search-message\"]").first()) != null) {
                 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 if ((el = item.select("div[class*=\"yt-lockup-video\"]").first()) != null) {
+                collector.commit(new YoutubeStreamInfoItemExtractor(el));
+            } else if((el = item.select("div[class*=\"yt-lockup-channel\"]").first()) != null) {
+                collector.commit(new YoutubeChannelInfoItemExtractor(el));
             } else {
-                //noinspection ConstantConditions
-                collector.addError(new Exception("unexpected element found:\"" + el + "\""));
+                // noinspection ConstantConditions
+                // simply ignore not known items
+                // throw new ExtractionException("unexpected element found: \"" + item + "\"");
             }
         }
 
         return collector;
     }
-
-    @Override
-    public ArrayList<String> suggestionList(String query, String contentCountry, Downloader dl)
-            throws IOException, ParsingException {
-
-        ArrayList<String> suggestions = new ArrayList<>();
-
-        /* Cant use Uri.Bilder since it's android code.
-        // Android code is baned from the extractor side.
-        Uri.Builder builder = new Uri.Builder();
-        builder.scheme("https")
-                .authority("suggestqueries.google.com")
-                .appendPath("complete")
-                .appendPath("search")
-                .appendQueryParameter("client", "")
-                .appendQueryParameter("output", "toolbar")
-                .appendQueryParameter("ds", "yt")
-                .appendQueryParameter("hl",contentCountry)
-                .appendQueryParameter("q", query);
-                */
-        String url = "https://suggestqueries.google.com/complete/search"
-                + "?client=" + ""
-                + "&output=" + "toolbar"
-                + "&ds=" + "yt"
-                + "&hl=" + URLEncoder.encode(contentCountry, "UTF-8")
-                + "&q=" + URLEncoder.encode(query, "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("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);
-        }
-    }
-
-    private StreamPreviewInfoExtractor extractPreviewInfo(final Element item) {
-        return new YoutubeStreamPreviewInfoExtractor(item);
-    }
 }

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

@@ -1,11 +1,12 @@
 package org.schabi.newpipe.extractor.services.youtube;
 
-import org.schabi.newpipe.extractor.ExtractionException;
-import org.schabi.newpipe.extractor.Downloader;
-import org.schabi.newpipe.extractor.StreamExtractor;
 import org.schabi.newpipe.extractor.StreamingService;
-import org.schabi.newpipe.extractor.StreamUrlIdHandler;
-import org.schabi.newpipe.extractor.SearchEngine;
+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.SuggestionExtractor;
+import org.schabi.newpipe.extractor.stream_info.StreamExtractor;
 
 import java.io.IOException;
 
@@ -43,23 +44,39 @@ public class YoutubeService extends StreamingService {
         return serviceInfo;
     }
     @Override
-    public StreamExtractor getExtractorInstance(String url, Downloader downloader)
+    public StreamExtractor getExtractorInstance(String url)
             throws ExtractionException, IOException {
-        StreamUrlIdHandler urlIdHandler = new YoutubeStreamUrlIdHandler();
+        UrlIdHandler urlIdHandler = YoutubeStreamUrlIdHandler.getInstance();
         if(urlIdHandler.acceptUrl(url)) {
-            return new YoutubeStreamExtractor(url, downloader, getServiceId());
+            return new YoutubeStreamExtractor(urlIdHandler, url, getServiceId());
         }
         else {
             throw new IllegalArgumentException("supplied String is not a valid Youtube URL");
         }
     }
     @Override
-    public SearchEngine getSearchEngineInstance(Downloader downloader) {
-        return new YoutubeSearchEngine(getUrlIdHandlerInstance(), getServiceId());
+    public SearchEngine getSearchEngineInstance() {
+        return new YoutubeSearchEngine(getStreamUrlIdHandlerInstance(), getServiceId());
     }
 
     @Override
-    public StreamUrlIdHandler getUrlIdHandlerInstance() {
-        return new YoutubeStreamUrlIdHandler();
+    public UrlIdHandler getStreamUrlIdHandlerInstance() {
+        return YoutubeStreamUrlIdHandler.getInstance();
+    }
+
+    @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

@@ -8,17 +8,21 @@ 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.AudioStream;
-import org.schabi.newpipe.extractor.ExtractionException;
+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.ParsingException;
-import org.schabi.newpipe.extractor.StreamInfo;
-import org.schabi.newpipe.extractor.StreamPreviewInfo;
-import org.schabi.newpipe.extractor.StreamUrlIdHandler;
-import org.schabi.newpipe.extractor.StreamExtractor;
+import org.schabi.newpipe.extractor.UrlIdHandler;
 import org.schabi.newpipe.extractor.MediaFormat;
-import org.schabi.newpipe.extractor.VideoStream;
+import org.schabi.newpipe.extractor.stream_info.StreamExtractor;
+import org.schabi.newpipe.extractor.stream_info.StreamInfo;
+import org.schabi.newpipe.extractor.stream_info.StreamInfoItemCollector;
+import org.schabi.newpipe.extractor.stream_info.StreamInfoItemExtractor;
+import org.schabi.newpipe.extractor.stream_info.VideoStream;
 
 import java.io.IOException;
 import java.util.List;
@@ -48,6 +52,10 @@ import java.util.regex.Pattern;
  */
 
 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
 
@@ -80,7 +88,7 @@ public class YoutubeStreamExtractor extends StreamExtractor {
     // $$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
+    // eltype is necessary for the url above
     private static final String EL_INFO = "el=info";
 
     public enum ItagType {
@@ -107,7 +115,7 @@ public class YoutubeStreamExtractor extends StreamExtractor {
         public int id;
         public ItagType itagType;
         public int mediaFormatId;
-        public String resolutionString = null;
+        public String resolutionString;
         public int fps = -1;
         public int samplingRate = -1;
         public int bandWidth = -1;
@@ -176,17 +184,15 @@ public class YoutubeStreamExtractor extends StreamExtractor {
     // cached values
     private static volatile String decryptionCode = "";
 
-    StreamUrlIdHandler urlidhandler = new YoutubeStreamUrlIdHandler();
+    UrlIdHandler urlidhandler = YoutubeStreamUrlIdHandler.getInstance();
     String pageUrl = "";
 
-    private Downloader downloader;
-
-    public YoutubeStreamExtractor(String pageUrl, Downloader dl, int serviceId)
+    public YoutubeStreamExtractor(UrlIdHandler urlIdHandler, String pageUrl, int serviceId)
             throws ExtractionException, IOException {
-        super(pageUrl, dl, serviceId);
+        super(urlIdHandler, pageUrl, serviceId);
         //most common videoInfo fields are now set in our superclass, for all services
-        downloader = dl;
         this.pageUrl = pageUrl;
+        Downloader downloader = NewPipe.getDownloader();
         String pageContent = downloader.download(urlidhandler.cleanUrl(pageUrl));
         doc = Jsoup.parse(pageContent, pageUrl);
         JSONObject ytPlayerConfig;
@@ -195,7 +201,7 @@ public class YoutubeStreamExtractor extends StreamExtractor {
         // 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.getVideoId(pageUrl)).replace("$$el_type$$", "&" + EL_INFO);
+                    urlidhandler.getId(pageUrl)).replace("$$el_type$$", "&" + EL_INFO);
             String videoInfoPageString = downloader.download(videoInfoUrl);
             videoInfoPage = Parser.compatParseMap(videoInfoPageString);
             playerUrl = getPlayerUrlFromRestrictedVideo(pageUrl);
@@ -242,7 +248,7 @@ public class YoutubeStreamExtractor extends StreamExtractor {
 
             // 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())) {
+                    || (playerArgs.get(URL_ENCODED_FMT_STREAM_MAP).toString().isEmpty())) {
                 isLiveStream = true;
             }
         }  catch (JSONException e) {
@@ -266,7 +272,7 @@ public class YoutubeStreamExtractor extends StreamExtractor {
             playerUrl = ytAssets.getString("js");
 
             if (playerUrl.startsWith("//")) {
-                playerUrl = "https:" + playerUrl;
+                playerUrl = HTTPS + playerUrl;
             }
             return playerUrl;
         } catch (JSONException e) {
@@ -275,10 +281,11 @@ public class YoutubeStreamExtractor extends StreamExtractor {
         }
     }
 
-    private String getPlayerUrlFromRestrictedVideo(String pageUrl) throws ParsingException {
+    private String getPlayerUrlFromRestrictedVideo(String pageUrl) throws ParsingException, ReCaptchaException {
         try {
+            Downloader downloader = NewPipe.getDownloader();
             String playerUrl = "";
-            String videoId = urlidhandler.getVideoId(pageUrl);
+            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()
@@ -290,12 +297,14 @@ public class YoutubeStreamExtractor extends StreamExtractor {
             playerUrl = playerUrl.replace("\\", "").replace("\"", "");
 
             if (playerUrl.startsWith("//")) {
-                playerUrl = "https:" + playerUrl;
+                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");
         }
     }
 
@@ -311,7 +320,7 @@ public class YoutubeStreamExtractor extends StreamExtractor {
             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");
+                return doc.select("meta[name=title]").attr(CONTENT);
             } catch (Exception e) {
                 throw new ParsingException("failed permanently to load title.", e);
             }
@@ -361,7 +370,7 @@ public class YoutubeStreamExtractor extends StreamExtractor {
     @Override
     public long getViewCount() throws ParsingException {
         try {
-            String viewCountString = doc.select("meta[itemprop=interactionCount]").attr("content");
+            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);
@@ -371,7 +380,7 @@ public class YoutubeStreamExtractor extends StreamExtractor {
     @Override
     public String getUploadDate() throws ParsingException {
         try {
-            return doc.select("meta[itemprop=datePublished]").attr("content");
+            return doc.select("meta[itemprop=datePublished]").attr(CONTENT);
         } catch (Exception e) {//todo: add fallback method
             throw new ParsingException("failed to get upload date.", e);
         }
@@ -481,9 +490,9 @@ public class YoutubeStreamExtractor extends StreamExtractor {
             String encodedUrlMap;
             // playerArgs could be null if the video is age restricted
             if (playerArgs == null) {
-                encodedUrlMap = videoInfoPage.get("url_encoded_fmt_stream_map");
+                encodedUrlMap = videoInfoPage.get(URL_ENCODED_FMT_STREAM_MAP);
             } else {
-                encodedUrlMap = playerArgs.getString("url_encoded_fmt_stream_map");
+                encodedUrlMap = playerArgs.getString(URL_ENCODED_FMT_STREAM_MAP);
             }
             for(String url_data_str : encodedUrlMap.split(",")) {
                 try {
@@ -560,7 +569,7 @@ public class YoutubeStreamExtractor extends StreamExtractor {
                     if (secondsString.isEmpty() //if nothing was got,
                             && minutesString.isEmpty()//treat as unlabelled seconds
                             && hoursString.isEmpty()) {
-                        secondsString = Parser.matchGroup1("t=(\\d{1,3})", timeStamp);
+                        secondsString = Parser.matchGroup1("t=(\\d+)", timeStamp);
                     }
                 }
 
@@ -588,7 +597,7 @@ public class YoutubeStreamExtractor extends StreamExtractor {
         try {
             return Integer.valueOf(doc.head()
                     .getElementsByAttributeValue("property", "og:restrictions:age")
-                    .attr("content").replace("+", ""));
+                    .attr(CONTENT).replace("+", ""));
         } catch (Exception e) {
             throw new ParsingException("Could not get age restriction");
         }
@@ -618,7 +627,7 @@ public class YoutubeStreamExtractor extends StreamExtractor {
                 //if this ckicks in our button has no content and thefore likes/dislikes are disabled
                 return -1;
             }
-            return Integer.parseInt(likesString.replaceAll("[^\\d]", ""));
+            return Integer.parseInt(likesString.replaceAll(REGEX_INT, ""));
         } catch (NumberFormatException nfe) {
             throw new ParsingException(
                     "failed to parse likesString \"" + likesString + "\" as integers", nfe);
@@ -638,7 +647,7 @@ public class YoutubeStreamExtractor extends StreamExtractor {
                 //if this kicks in our button has no content and therefore likes/dislikes are disabled
                 return -1;
             }
-            return Integer.parseInt(dislikesString.replaceAll("[^\\d]", ""));
+            return Integer.parseInt(dislikesString.replaceAll(REGEX_INT, ""));
         } catch(NumberFormatException nfe) {
             throw new ParsingException(
                     "failed to parse dislikesString \"" + dislikesString + "\" as integers", nfe);
@@ -648,7 +657,7 @@ public class YoutubeStreamExtractor extends StreamExtractor {
     }
 
     @Override
-    public StreamPreviewInfo getNextVideo() throws ParsingException {
+    public StreamInfoItemExtractor getNextVideo() throws ParsingException {
         try {
             return extractVideoPreviewInfo(doc.select("div[class=\"watch-sidebar-section\"]").first()
                     .select("li").first());
@@ -658,29 +667,37 @@ public class YoutubeStreamExtractor extends StreamExtractor {
     }
 
     @Override
-    public Vector<StreamPreviewInfo> getRelatedVideos() throws ParsingException {
+    public StreamInfoItemCollector getRelatedVideos() throws ParsingException {
         try {
-            Vector<StreamPreviewInfo> relatedVideos = new Vector<>();
-            for (Element li : doc.select("ul[id=\"watch-related\"]").first().children()) {
-                // first check if we have a playlist. If so leave them out
-                if (li.select("a[class*=\"content-link\"]").first() != null) {
-                    relatedVideos.add(extractVideoPreviewInfo(li));
+            StreamInfoItemCollector 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 relatedVideos;
+            return collector;
         } catch(Exception e) {
             throw new ParsingException("Could not get related videos", e);
         }
     }
 
     @Override
-    public StreamUrlIdHandler getUrlIdConverter() {
-        return new YoutubeStreamUrlIdHandler();
+    public String getPageUrl() {
+        return pageUrl;
     }
 
     @Override
-    public String getPageUrl() {
-        return pageUrl;
+    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
@@ -690,56 +707,80 @@ public class YoutubeStreamExtractor extends StreamExtractor {
     }
 
     /**Provides information about links to other videos on the video page, such as related videos.
-     * This is encapsulated in a StreamPreviewInfo object,
+     * This is encapsulated in a StreamInfoItem object,
      * which is a subset of the fields in a full StreamInfo.*/
-    private StreamPreviewInfo extractVideoPreviewInfo(Element li) throws ParsingException {
-        StreamPreviewInfo info = new StreamPreviewInfo();
-
-        try {
-            info.webpage_url = li.select("a.content-link").first()
-                    .attr("abs:href");
-
-            info.id = Parser.matchGroup1("v=([0-9a-zA-Z-]*)", info.webpage_url);
-
-            //todo: check NullPointerException causing
-            info.title = 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
-
-            //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 {
-                info.view_count = Long.parseLong(li.select("span.view-count")
-                        .first().text().replaceAll("[^\\d]", ""));
-            } catch (Exception e) {//related videos sometimes have no view count
-                info.view_count = 0;
+    private StreamInfoItemExtractor extractVideoPreviewInfo(final Element li) {
+        return new StreamInfoItemExtractor() {
+            @Override
+            public AbstractStreamInfo.StreamType getStreamType() throws ParsingException {
+                return null;
             }
-            info.uploader = li.select("span.g-hovercard").first().text();
 
-            info.duration = YoutubeParsingHelper.parseDurationString(
-                    li.select("span.video-time").first().text());
+            @Override
+            public String getWebPageUrl() throws ParsingException {
+                return li.select("a.content-link").first().attr("abs:href");
+            }
 
-            Element img = li.select("img").first();
-            info.thumbnail_url = 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 (info.thumbnail_url.contains(".gif")) {
-                info.thumbnail_url = img.attr("data-thumb");
+            @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
             }
-            if (info.thumbnail_url.startsWith("//")) {
-                info.thumbnail_url = "https:" + info.thumbnail_url;
+
+            @Override
+            public int getDuration() throws ParsingException {
+                return YoutubeParsingHelper.parseDurationString(
+                        li.select("span.video-time").first().text());
             }
-        } catch (Exception e) {
-            throw new ParsingException("Could not get video preview info", e);
-        }
-        return info;
+
+            @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;
@@ -749,14 +790,20 @@ public class YoutubeStreamExtractor extends StreamExtractor {
         String decryptionCode;
 
         try {
+            Downloader downloader = NewPipe.getDownloader();
+            if(!playerUrl.contains("https://youtube.com")) {
+                //sometimes the https://youtube.com part does not get send with
+                //than we have to add it by hand
+                playerUrl = "https://youtube.com" + playerUrl;
+            }
             String playerCode = downloader.download(playerUrl);
 
             decryptionFuncName =
-                    Parser.matchGroup1("\\.sig\\|\\|([a-zA-Z0-9$]+)\\(", playerCode);
+                    Parser.matchGroup("([\"\\'])signature\\1\\s*,\\s*([a-zA-Z0-9$]+)\\(", playerCode, 2);
 
             String functionPattern = "("
                     + decryptionFuncName.replace("$", "\\$")
-                    + "=function\\([a-zA-Z0-9_]*\\)\\{.+?\\})";
+                    + "=function\\([a-zA-Z0-9_]+\\)\\{.+?\\})";
             decryptionFunc = "var " + Parser.matchGroup1(functionPattern, playerCode) + ";";
 
             helperObjectName = Parser

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

@@ -1,14 +1,14 @@
 package org.schabi.newpipe.extractor.services.youtube;
 
 import org.jsoup.nodes.Element;
-import org.schabi.newpipe.extractor.AbstractVideoInfo;
+import org.schabi.newpipe.extractor.AbstractStreamInfo;
 import org.schabi.newpipe.extractor.Parser;
-import org.schabi.newpipe.extractor.ParsingException;
-import org.schabi.newpipe.extractor.StreamPreviewInfoExtractor;
+import org.schabi.newpipe.extractor.exceptions.ParsingException;
+import org.schabi.newpipe.extractor.stream_info.StreamInfoItemExtractor;
 
 /**
  * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
- * YoutubeStreamPreviewInfoExtractor.java is part of NewPipe.
+ * YoutubeStreamInfoItemExtractor.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
@@ -24,11 +24,11 @@ import org.schabi.newpipe.extractor.StreamPreviewInfoExtractor;
  * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-public class YoutubeStreamPreviewInfoExtractor implements StreamPreviewInfoExtractor {
+public class YoutubeStreamInfoItemExtractor implements StreamInfoItemExtractor {
 
     private final Element item;
 
-    public YoutubeStreamPreviewInfoExtractor(Element item) {
+    public YoutubeStreamInfoItemExtractor(Element item) {
         this.item = item;
     }
 
@@ -66,8 +66,6 @@ public class YoutubeStreamPreviewInfoExtractor implements StreamPreviewInfoExtra
             } else {
                 throw new ParsingException("Could not get Duration: " + getTitle(), e);
             }
-
-
         }
     }
 
@@ -85,9 +83,12 @@ public class YoutubeStreamPreviewInfoExtractor implements StreamPreviewInfoExtra
     @Override
     public String getUploadDate() throws ParsingException {
         try {
-            return item.select("div[class=\"yt-lockup-meta\"]").first()
-                    .select("li").first()
-                    .text();
+            Element div = item.select("div[class=\"yt-lockup-meta\"]").first();
+            if(div == null) {
+                return null;
+            } else {
+                return div.select("li").first().text();
+            }
         } catch(Exception e) {
             throw new ParsingException("Could not get uplaod date", e);
         }
@@ -98,9 +99,13 @@ public class YoutubeStreamPreviewInfoExtractor implements StreamPreviewInfoExtra
         String output;
         String input;
         try {
-            input = item.select("div[class=\"yt-lockup-meta\"]").first()
-                    .select("li").get(1)
-                    .text();
+            Element div = item.select("div[class=\"yt-lockup-meta\"]").first();
+            if(div == null) {
+                return -1;
+            } else {
+                input = div.select("li").get(1)
+                        .text();
+            }
         } catch (IndexOutOfBoundsException e) {
             if(isLiveStream(item)) {
                 // -1 for no view count
@@ -148,11 +153,11 @@ public class YoutubeStreamPreviewInfoExtractor implements StreamPreviewInfoExtra
     }
 
     @Override
-    public AbstractVideoInfo.StreamType getStreamType() {
+    public AbstractStreamInfo.StreamType getStreamType() {
         if(isLiveStream(item)) {
-            return AbstractVideoInfo.StreamType.LIVE_STREAM;
+            return AbstractStreamInfo.StreamType.LIVE_STREAM;
         } else {
-            return AbstractVideoInfo.StreamType.VIDEO_STREAM;
+            return AbstractStreamInfo.StreamType.VIDEO_STREAM;
         }
     }
 

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

@@ -1,11 +1,21 @@
 package org.schabi.newpipe.extractor.services.youtube;
 
-import org.schabi.newpipe.extractor.Parser;
-import org.schabi.newpipe.extractor.ParsingException;
-import org.schabi.newpipe.extractor.StreamUrlIdHandler;
+import android.support.annotation.NonNull;
 
+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.exceptions.FoundAdException;
+import org.schabi.newpipe.extractor.exceptions.ParsingException;
+import org.schabi.newpipe.extractor.exceptions.ReCaptchaException;
+
+import java.io.IOException;
 import java.io.UnsupportedEncodingException;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.net.URLDecoder;
+import java.util.regex.Matcher;
 
 /**
  * Created by Christian Schabesberger on 02.02.16.
@@ -27,36 +37,56 @@ import java.net.URLDecoder;
  * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-public class YoutubeStreamUrlIdHandler implements StreamUrlIdHandler {
-    @SuppressWarnings("WeakerAccess")
+public class YoutubeStreamUrlIdHandler implements UrlIdHandler {
+
+    private static final YoutubeStreamUrlIdHandler instance = new YoutubeStreamUrlIdHandler();
+    private static final String ID_PATTERN = "([\\-a-zA-Z0-9_]{11})";
+
+    private YoutubeStreamUrlIdHandler() {}
+
+    public static YoutubeStreamUrlIdHandler getInstance() {
+        return instance;
+    }
+
     @Override
-    public String getVideoUrl(String videoId) {
+    public String getUrl(String videoId) {
         return "https://www.youtube.com/watch?v=" + videoId;
     }
 
-    @SuppressWarnings("WeakerAccess")
     @Override
-    public String getVideoId(String url) throws ParsingException {
-        String id;
+    public String getId(String url) throws ParsingException, IllegalArgumentException {
+        if(url.isEmpty()) {
+            throw new IllegalArgumentException("The url parameter should not be empty");
+        }
 
-        if(url.contains("youtube")) {
-            if(url.contains("attribution_link")) {
+        String id;
+        String lowercaseUrl = url.toLowerCase();
+        if(lowercaseUrl.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) {
+                    id = Parser.matchGroup1("v=" + ID_PATTERN, query);
+                } catch (UnsupportedEncodingException uee) {
                     throw new ParsingException("Could not parse attribution_link", uee);
                 }
+            } else if(lowercaseUrl.contains("youtube.com/shared?ci=")) {
+                return getRealIdFromSharedLink(url);
+            } else if (url.contains("vnd.youtube")) {
+                id = Parser.matchGroup1(ID_PATTERN, url);
+            } else if (url.contains("embed")) {
+                id = Parser.matchGroup1("embed/" + ID_PATTERN, url);
+            } else if(url.contains("googleads")) {
+                throw new FoundAdException("Error found add: " + url);
             } else {
-                id = Parser.matchGroup1("[?&]v=([\\-a-zA-Z0-9_]{11})", url);
+                id = Parser.matchGroup1("[?&]v=" + ID_PATTERN, url);
             }
         }
-        else if(url.contains("youtu.be")) {
+        else if(lowercaseUrl.contains("youtu.be")) {
             if(url.contains("v=")) {
-                id = Parser.matchGroup1("v=([\\-a-zA-Z0-9_]{11})", url);
+                id = Parser.matchGroup1("v=" + ID_PATTERN, url);
             } else {
-                id = Parser.matchGroup1("youtu\\.be/([a-zA-Z0-9_-]{11})", url);
+                id = Parser.matchGroup1("[Yy][Oo][Uu][Tt][Uu]\\.[Bb][Ee]/" + ID_PATTERN, url);
             }
         }
         else {
@@ -71,13 +101,66 @@ public class YoutubeStreamUrlIdHandler implements StreamUrlIdHandler {
         }
     }
 
+    /**
+     * Get the real url from a shared uri.
+     *
+     * Shared URI's look like this:
+     * <pre>
+     *     * https://www.youtube.com/shared?ci=PJICrTByb3E
+     *     * vnd.youtube://www.youtube.com/shared?ci=PJICrTByb3E&feature=twitter-deep-link
+     * </pre>
+     * @param url The shared url
+     * @return the id of the stream
+     * @throws ParsingException
+     */
+    private @NonNull String getRealIdFromSharedLink(String url) throws ParsingException {
+        URI uri;
+        try {
+            uri = new URI(url);
+        } catch (URISyntaxException e) {
+            throw new ParsingException("Invalid shared link", e);
+        }
+        String sharedId = getSharedId(uri);
+        Downloader downloader = NewPipe.getDownloader();
+        String content;
+        try {
+            content = downloader.download("https://www.youtube.com/shared?ci=" + sharedId);
+        } catch (IOException | ReCaptchaException e) {
+            throw new ParsingException("Unable to resolve shared link", e);
+        }
+        // is this bad? is this fragile?:
+        String realId = Parser.matchGroup1("rel=\"shortlink\" href=\"https://youtu.be/" + ID_PATTERN, content);
+        if(sharedId.equals(realId)) {
+            throw new ParsingException("Got same id for as shared id: " + sharedId);
+        }
+        return realId;
+    }
+
+    private @NonNull String getSharedId(URI uri) throws ParsingException {
+        if (!"/shared".equals(uri.getPath())) {
+            throw new ParsingException("Not a shared link: " + uri.toString() + " (path != " + uri.getPath() + ")");
+        }
+        return Parser.matchGroup1("ci=" + ID_PATTERN, uri.getQuery());
+    }
+
     public String cleanUrl(String complexUrl) throws ParsingException {
-        return getVideoUrl(getVideoId(complexUrl));
+        return getUrl(getId(complexUrl));
     }
 
     @Override
     public boolean acceptUrl(String videoUrl) {
-        return videoUrl.contains("youtube") ||
-                videoUrl.contains("youtu.be");
+        videoUrl = videoUrl.toLowerCase();
+        if(videoUrl.contains("youtube") ||
+                videoUrl.contains("youtu.be")) {
+            // bad programming I know
+            try {
+                getId(videoUrl);
+                return true;
+            } catch (Exception e) {
+                return false;
+            }
+        } else {
+            return false;
+        }
     }
 }

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

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

@@ -1,4 +1,4 @@
-package org.schabi.newpipe.extractor;
+package org.schabi.newpipe.extractor.stream_info;
 
 /**
  * Created by Christian Schabesberger on 04.03.16.
@@ -31,14 +31,14 @@ public class AudioStream {
         this.bandwidth = bandwidth; this.sampling_rate = samplingRate;
     }
 
-    // reveals wether two streams are the same, but have diferent urls
+    // 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;
     }
 
-    // revelas wether two streams are equal
+    // 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

@@ -1,4 +1,4 @@
-package org.schabi.newpipe.extractor;
+package org.schabi.newpipe.extractor.stream_info;
 
 /**
  * Created by Christian Schabesberger on 10.08.15.
@@ -20,6 +20,10 @@ package org.schabi.newpipe.extractor;
  * 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).*/
@@ -29,15 +33,18 @@ import java.util.List;
 public abstract class StreamExtractor {
 
     private int serviceId;
+    private String url;
+    private UrlIdHandler urlIdHandler;
+    private StreamInfoItemCollector previewInfoCollector;
 
-    public class ExctractorInitException extends ExtractionException {
-        public ExctractorInitException(String message) {
+    public class ExtractorInitException extends ExtractionException {
+        public ExtractorInitException(String message) {
             super(message);
         }
-        public ExctractorInitException(Throwable cause) {
+        public ExtractorInitException(Throwable cause) {
             super(cause);
         }
-        public ExctractorInitException(String message, Throwable cause) {
+        public ExtractorInitException(String message, Throwable cause) {
             super(message, cause);
         }
     }
@@ -51,14 +58,29 @@ public abstract class StreamExtractor {
         }
     }
 
-    public StreamExtractor(String url, Downloader dl, int serviceId) {
+    public StreamExtractor(UrlIdHandler urlIdHandler, String url, int serviceId) {
         this.serviceId = serviceId;
+        this.urlIdHandler = urlIdHandler;
+        previewInfoCollector = new StreamInfoItemCollector(urlIdHandler, serviceId);
+    }
+
+    protected StreamInfoItemCollector 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;
@@ -72,9 +94,8 @@ public abstract class StreamExtractor {
     public abstract String getAverageRating() throws ParsingException;
     public abstract int getLikeCount() throws ParsingException;
     public abstract int getDislikeCount() throws ParsingException;
-    public abstract StreamPreviewInfo getNextVideo() throws ParsingException;
-    public abstract List<StreamPreviewInfo> getRelatedVideos() throws ParsingException;
-    public abstract StreamUrlIdHandler getUrlIdConverter();
+    public abstract StreamInfoItemExtractor getNextVideo() throws ParsingException;
+    public abstract StreamInfoItemCollector getRelatedVideos() throws ParsingException;
     public abstract String getPageUrl();
     public abstract StreamInfo.StreamType getStreamType() throws ParsingException;
     public int getServiceId() {

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

@@ -1,4 +1,10 @@
-package org.schabi.newpipe.extractor;
+package org.schabi.newpipe.extractor.stream_info;
+
+import org.schabi.newpipe.extractor.AbstractStreamInfo;
+import org.schabi.newpipe.extractor.DashMpdParser;
+import org.schabi.newpipe.extractor.InfoItem;
+import org.schabi.newpipe.extractor.UrlIdHandler;
+import org.schabi.newpipe.extractor.exceptions.ExtractionException;
 
 import java.io.IOException;
 import java.util.List;
@@ -26,7 +32,7 @@ import java.util.Vector;
 
 /**Info object for opened videos, ie the video ready to play.*/
 @SuppressWarnings("ALL")
-public class StreamInfo extends AbstractVideoInfo {
+public class StreamInfo extends AbstractStreamInfo {
 
     public static class StreamExctractException extends ExtractionException {
         StreamExctractException(String message) {
@@ -39,26 +45,25 @@ public class StreamInfo extends AbstractVideoInfo {
     /**Creates a new StreamInfo object from an existing AbstractVideoInfo.
      * All the shared properties are copied to the new StreamInfo.*/
     @SuppressWarnings("WeakerAccess")
-    public StreamInfo(AbstractVideoInfo avi) {
+    public StreamInfo(AbstractStreamInfo avi) {
         this.id = avi.id;
         this.title = avi.title;
         this.uploader = avi.uploader;
         this.thumbnail_url = avi.thumbnail_url;
-        this.thumbnail = avi.thumbnail;
         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) {
+        if(avi instanceof StreamInfoItem) {
             //shitty String to convert code
             /*
-            String dur = ((StreamPreviewInfo)avi).duration;
+            String dur = ((StreamInfoItem)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;
+            this.duration = ((StreamInfoItem)avi).duration;
         }
     }
 
@@ -68,29 +73,29 @@ public class StreamInfo extends AbstractVideoInfo {
 
     /**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, Downloader downloader)
+    public static StreamInfo getVideoInfo(StreamExtractor extractor)
             throws ExtractionException, IOException {
         StreamInfo streamInfo = new StreamInfo();
 
-        streamInfo = extractImportantData(streamInfo, extractor, downloader);
-        streamInfo = extractStreams(streamInfo, extractor, downloader);
-        streamInfo = extractOptionalData(streamInfo, extractor, downloader);
+        streamInfo = extractImportantData(streamInfo, extractor);
+        streamInfo = extractStreams(streamInfo, extractor);
+        streamInfo = extractOptionalData(streamInfo, extractor);
 
         return streamInfo;
     }
 
     private static StreamInfo extractImportantData(
-            StreamInfo streamInfo, StreamExtractor extractor, Downloader downloader)
+            StreamInfo streamInfo, StreamExtractor extractor)
             throws ExtractionException, IOException {
-        /* ---- importand data, withoug the video can't be displayed goes here: ---- */
-        // if one of these is not available an exception is ment to be thrown directly into the frontend.
+        /* ---- 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.
 
-        StreamUrlIdHandler uiconv = extractor.getUrlIdConverter();
+        UrlIdHandler uiconv = extractor.getUrlIdHandler();
 
         streamInfo.service_id = extractor.getServiceId();
         streamInfo.webpage_url = extractor.getPageUrl();
         streamInfo.stream_type = extractor.getStreamType();
-        streamInfo.id = uiconv.getVideoId(extractor.getPageUrl());
+        streamInfo.id = uiconv.getId(extractor.getPageUrl());
         streamInfo.title = extractor.getTitle();
         streamInfo.age_limit = extractor.getAgeLimit();
 
@@ -106,7 +111,7 @@ public class StreamInfo extends AbstractVideoInfo {
     }
 
     private static StreamInfo extractStreams(
-            StreamInfo streamInfo, StreamExtractor extractor, Downloader downloader)
+            StreamInfo streamInfo, StreamExtractor extractor)
             throws ExtractionException, IOException {
         /* ---- stream extraction goes here ---- */
         // At least one type of stream has to be available,
@@ -130,10 +135,10 @@ public class StreamInfo extends AbstractVideoInfo {
                 streamInfo.audio_streams = new Vector<>();
             }
             //todo: make this quick and dirty solution a real fallback
-            // same as the quick and dirty aboth
+            // same as the quick and dirty above
             try {
                 streamInfo.audio_streams.addAll(
-                        DashMpdParser.getAudioStreams(streamInfo.dashMpdUrl, downloader));
+                        DashMpdParser.getAudioStreams(streamInfo.dashMpdUrl));
             } catch(Exception e) {
                 streamInfo.addException(
                         new ExtractionException("Couldn't get audio streams from dash mpd", e));
@@ -167,11 +172,11 @@ public class StreamInfo extends AbstractVideoInfo {
     }
 
     private static StreamInfo extractOptionalData(
-            StreamInfo streamInfo, StreamExtractor extractor, Downloader downloader) {
+            StreamInfo streamInfo, StreamExtractor extractor) {
         /*  ---- optional data goes here: ---- */
-        // If one of these failes, the frontend neets to handle that they are not available.
-        // Exceptions are therfore not thrown into the frontend, but stored into the error List,
-        // so the frontend can afterwads check where errors happend.
+        // 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();
@@ -188,6 +193,11 @@ public class StreamInfo extends AbstractVideoInfo {
         } 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) {
@@ -229,12 +239,27 @@ public class StreamInfo extends AbstractVideoInfo {
             streamInfo.addException(e);
         }
         try {
-            streamInfo.next_video = extractor.getNextVideo();
-        } catch(Exception e) {
+            // get next video
+            if(streamInfo.next_video != null)
+            {
+                StreamInfoItemCollector c = new StreamInfoItemCollector(
+                        extractor.getUrlIdHandler(), extractor.getServiceId());
+                StreamInfoItemExtractor nextVideo = extractor.getNextVideo();
+                c.commit(nextVideo);
+                if(c.getItemList().size() != 0) {
+                    streamInfo.next_video = (StreamInfoItem) c.getItemList().get(0);
+                }
+                streamInfo.errors.addAll(c.getErrors());
+            }
+        }
+        catch(Exception e) {
             streamInfo.addException(e);
         }
         try {
-            streamInfo.related_videos = extractor.getRelatedVideos();
+            // get related videos
+            StreamInfoItemCollector c = extractor.getRelatedVideos();
+            streamInfo.related_streams = c.getItemList();
+            streamInfo.errors.addAll(c.getErrors());
         } catch(Exception e) {
             streamInfo.addException(e);
         }
@@ -243,6 +268,7 @@ public class StreamInfo extends AbstractVideoInfo {
     }
 
     public String uploader_thumbnail_url = "";
+    public String channel_url = "";
     public String description = "";
 
     public List<VideoStream> video_streams = null;
@@ -259,10 +285,10 @@ public class StreamInfo extends AbstractVideoInfo {
     public int like_count = -1;
     public int dislike_count = -1;
     public String average_rating = "";
-    public StreamPreviewInfo next_video = null;
-    public List<StreamPreviewInfo> related_videos = null;
+    public StreamInfoItem next_video = null;
+    public List<InfoItem> related_streams = null;
     //in seconds. some metadata is not passed using a StreamInfo object!
     public int start_position = 0;
 
-    public List<Exception> errors = new Vector<>();
-}
+    public List<Throwable> errors = new Vector<>();
+}

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

@@ -0,0 +1,41 @@
+package org.schabi.newpipe.extractor.stream_info;
+
+/**
+ * Created by Christian Schabesberger on 26.08.15.
+ *
+ * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
+ * StreamInfoItem.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;
+import org.schabi.newpipe.extractor.InfoItem;
+
+/**Info object for previews of unopened videos, eg search results, related videos*/
+public class StreamInfoItem extends AbstractStreamInfo implements InfoItem {
+    public int duration;
+
+    public InfoType infoType() {
+        return InfoType.STREAM;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public String getLink() {
+        return webpage_url;
+    }
+}

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

@@ -0,0 +1,99 @@
+package org.schabi.newpipe.extractor.stream_info;
+
+import org.schabi.newpipe.extractor.InfoItemCollector;
+import org.schabi.newpipe.extractor.NewPipe;
+import org.schabi.newpipe.extractor.UrlIdHandler;
+import org.schabi.newpipe.extractor.exceptions.FoundAdException;
+import org.schabi.newpipe.extractor.exceptions.ParsingException;
+
+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>
+ * StreamInfoItemCollector.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 StreamInfoItemCollector extends InfoItemCollector {
+
+    private UrlIdHandler urlIdHandler;
+
+    public StreamInfoItemCollector(UrlIdHandler handler, int serviceId) {
+        super(serviceId);
+        urlIdHandler = handler;
+    }
+
+    private UrlIdHandler getUrlIdHandler() {
+        return urlIdHandler;
+    }
+
+    public StreamInfoItem extract(StreamInfoItemExtractor extractor) throws Exception {
+
+        StreamInfoItem resultItem = new StreamInfoItem();
+        // importand information
+        resultItem.service_id = getServiceId();
+        resultItem.webpage_url = extractor.getWebPageUrl();
+        if (getUrlIdHandler() == null) {
+            throw new ParsingException("Error: UrlIdHandler not set");
+        } else if (!resultItem.webpage_url.isEmpty()) {
+            resultItem.id = NewPipe.getService(getServiceId())
+                    .getStreamUrlIdHandlerInstance()
+                    .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);
+        }
+        return resultItem;
+    }
+
+    public void commit(StreamInfoItemExtractor extractor) throws ParsingException {
+        try {
+            addItem(extract(extractor));
+        } 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/StreamInfoItemExtractor.java

@@ -1,10 +1,13 @@
-package org.schabi.newpipe.extractor;
+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.
+ * StreamInfoItemExtractor.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,8 +23,8 @@ package org.schabi.newpipe.extractor;
  * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-public interface StreamPreviewInfoExtractor {
-    AbstractVideoInfo.StreamType getStreamType() throws ParsingException;
+public interface StreamInfoItemExtractor {
+    AbstractStreamInfo.StreamType getStreamType() throws ParsingException;
     String getWebPageUrl() throws ParsingException;
     String getTitle() throws ParsingException;
     int getDuration() throws ParsingException;

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

@@ -1,4 +1,4 @@
-package org.schabi.newpipe.extractor;
+package org.schabi.newpipe.extractor.stream_info;
 
 /**
  * Created by Christian Schabesberger on 04.03.16.

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

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

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

@@ -0,0 +1,270 @@
+package org.schabi.newpipe.info_list;
+
+import android.app.Activity;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.AdapterView;
+
+import com.nostra13.universalimageloader.core.DisplayImageOptions;
+import com.nostra13.universalimageloader.core.ImageLoader;
+
+import org.schabi.newpipe.ImageErrorLoadingListener;
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.extractor.AbstractStreamInfo;
+import org.schabi.newpipe.extractor.InfoItem;
+import org.schabi.newpipe.extractor.channel.ChannelInfoItem;
+import org.schabi.newpipe.extractor.stream_info.StreamInfoItem;
+
+/**
+ * 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 {
+
+    final String viewsS;
+    final String videosS;
+    final String subsS;
+
+    final String thousand;
+    final String million;
+    final String billion;
+
+    private static final String TAG = InfoItemBuilder.class.toString();
+    public interface OnInfoItemSelectedListener {
+        void selected(String url, int serviceId);
+    }
+
+    private Activity activity = null;
+    private View rootView = null;
+    private ImageLoader imageLoader = ImageLoader.getInstance();
+    private DisplayImageOptions displayImageOptions =
+            new DisplayImageOptions.Builder().cacheInMemory(true).build();
+    private OnInfoItemSelectedListener onStreamInfoItemSelectedListener;
+    private OnInfoItemSelectedListener onChannelInfoItemSelectedListener;
+
+    public InfoItemBuilder(Activity a, View rootView) {
+        activity = a;
+        this.rootView = rootView;
+        viewsS = a.getString(R.string.views);
+        videosS = a.getString(R.string.videos);
+        subsS = a.getString(R.string.subscriber);
+        thousand = a.getString(R.string.short_thousand);
+        million = a.getString(R.string.short_million);
+        billion = a.getString(R.string.short_billion);
+    }
+
+    public void setOnStreamInfoItemSelectedListener(
+            OnInfoItemSelectedListener listener) {
+        this.onStreamInfoItemSelectedListener = listener;
+    }
+
+    public void setOnChannelInfoItemSelectedListener(
+            OnInfoItemSelectedListener listener) {
+        this.onChannelInfoItemSelectedListener = listener;
+    }
+
+    public void buildByHolder(InfoItemHolder holder, final InfoItem i) {
+        if(i.infoType() != holder.infoType())
+            return;
+        switch(i.infoType()) {
+            case STREAM:
+                buildStreamInfoItem((StreamInfoItemHolder) holder, (StreamInfoItem) i);
+                break;
+            case CHANNEL:
+                buildChannelInfoItem((ChannelInfoItemHolder) holder, (ChannelInfoItem) i);
+                break;
+            case PLAYLIST:
+                Log.e(TAG, "Not yet implemented");
+                break;
+            default:
+                Log.e(TAG, "Trollolo");
+        }
+    }
+
+    public View buildView(ViewGroup parent, final InfoItem info) {
+        View itemView = null;
+        InfoItemHolder holder = null;
+        switch(info.infoType()) {
+            case STREAM:
+                itemView = LayoutInflater.from(parent.getContext())
+                    .inflate(R.layout.stream_item, parent, false);
+                holder = new StreamInfoItemHolder(itemView);
+                break;
+            case CHANNEL:
+                itemView = LayoutInflater.from(parent.getContext())
+                        .inflate(R.layout.channel_item, parent, false);
+                holder = new ChannelInfoItemHolder(itemView);
+                break;
+            case PLAYLIST:
+                Log.e(TAG, "Not yet implemented");
+            default:
+                Log.e(TAG, "Trollolo");
+        }
+        buildByHolder(holder, info);
+        return itemView;
+    }
+
+    private void buildStreamInfoItem(StreamInfoItemHolder holder, final StreamInfoItem info) {
+        if(info.infoType() != InfoItem.InfoType.STREAM) {
+            Log.e("InfoItemBuilder", "Info type not yet supported");
+        }
+        // fill holder with information
+        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) {
+                onStreamInfoItemSelectedListener.selected(info.webpage_url, info.service_id);
+            }
+        });
+    }
+
+    private void buildChannelInfoItem(ChannelInfoItemHolder holder, final ChannelInfoItem info) {
+        holder.itemChannelTitleView.setText(info.getTitle());
+        holder.itemSubscriberCountView.setText(shortSubscriber(info.subscriberCount) + " • ");
+        holder.itemVideoCountView.setText(info.videoAmount + " " + videosS);
+        holder.itemChannelDescriptionView.setText(info.description);
+
+        holder.itemThumbnailView.setImageResource(R.drawable.buddy_channel_item);
+        if(info.thumbnailUrl != null && !info.thumbnailUrl.isEmpty()) {
+            imageLoader.displayImage(info.thumbnailUrl,
+                    holder.itemThumbnailView,
+                    displayImageOptions,
+                    new ImageErrorLoadingListener(activity, rootView, info.serviceId));
+        }
+
+        holder.itemButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                onChannelInfoItemSelectedListener.selected(info.getLink(), info.serviceId);
+            }
+        });
+    }
+
+
+    public String shortViewCount(Long viewCount){
+        if(viewCount >= 1000000000){
+            return Long.toString(viewCount/1000000000)+ billion + " " + viewsS;
+        }else if(viewCount>=1000000){
+            return Long.toString(viewCount/1000000)+ million + " " + viewsS;
+        }else if(viewCount>=1000){
+            return Long.toString(viewCount/1000)+ thousand + " " + viewsS;
+        }else {
+            return Long.toString(viewCount)+ " " + viewsS;
+        }
+    }
+
+    public String shortSubscriber(Long viewCount){
+        if(viewCount >= 1000000000){
+            return Long.toString(viewCount/1000000000)+ billion + " " + subsS;
+        }else if(viewCount>=1000000){
+            return Long.toString(viewCount/1000000)+ million + " " + subsS;
+        }else if(viewCount>=1000){
+            return Long.toString(viewCount/1000)+ thousand + " " + subsS;
+        }else {
+            return Long.toString(viewCount)+ " " + subsS;
+        }
+    }
+
+    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,33 @@
+package org.schabi.newpipe.info_list;
+
+import android.support.v7.widget.RecyclerView;
+import android.view.View;
+
+import org.schabi.newpipe.extractor.InfoItem;
+
+/**
+ * Created by Christian Schabesberger on 12.02.17.
+ *
+ * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
+ * InfoItemHolder.java is part of NewPipe.
+ *
+ * NewPipe is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * NewPipe is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+public abstract class InfoItemHolder extends RecyclerView.ViewHolder {
+    public InfoItemHolder(View v) {
+        super(v);
+    }
+    public abstract InfoItem.InfoType infoType();
+}

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

@@ -0,0 +1,112 @@
+package org.schabi.newpipe.info_list;
+
+import android.app.Activity;
+import android.support.v7.widget.RecyclerView;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.extractor.InfoItem;
+
+import 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> {
+    private static final String TAG = InfoListAdapter.class.toString();
+
+    private final InfoItemBuilder infoItemBuilder;
+    private final List<InfoItem> infoItemList;
+
+    public InfoListAdapter(Activity a, View rootView) {
+        infoItemBuilder = new InfoItemBuilder(a, rootView);
+        infoItemList = new Vector<>();
+    }
+
+    public void setOnStreamInfoItemSelectedListener
+            (InfoItemBuilder.OnInfoItemSelectedListener listener) {
+        infoItemBuilder.setOnStreamInfoItemSelectedListener(listener);
+    }
+
+    public void setOnChannelInfoItemSelectedListener
+            (InfoItemBuilder.OnInfoItemSelectedListener listener) {
+        infoItemBuilder.setOnChannelInfoItemSelectedListener(listener);
+    }
+
+    public void addInfoItemList(List<InfoItem> videos) {
+        if(videos!= null) {
+            infoItemList.addAll(videos);
+            notifyDataSetChanged();
+        }
+    }
+
+    public void clearSteamItemList() {
+        infoItemList.clear();
+        notifyDataSetChanged();
+    }
+
+    @Override
+    public int getItemCount() {
+        return infoItemList.size();
+    }
+
+    // don't ask why we have to do that this way... it's android accept it -.-
+    @Override
+    public int getItemViewType(int position) {
+        switch(infoItemList.get(position).infoType()) {
+            case STREAM:
+                return 0;
+            case CHANNEL:
+                return 1;
+            case PLAYLIST:
+                return 2;
+            default:
+                Log.e(TAG, "Trollolo");
+                return -1;
+        }
+    }
+
+    @Override
+    public InfoItemHolder onCreateViewHolder(ViewGroup parent, int type) {
+        switch(type) {
+            case 0:
+                return new StreamInfoItemHolder(LayoutInflater.from(parent.getContext())
+                        .inflate(R.layout.stream_item, parent, false));
+            case 1:
+                return new ChannelInfoItemHolder(LayoutInflater.from(parent.getContext())
+                        .inflate(R.layout.channel_item, parent, false));
+            case 2:
+                Log.e(TAG, "Playlist is not yet implemented");
+                return null;
+            default:
+                Log.e(TAG, "Trollolo");
+                return null;
+        }
+    }
+
+    @Override
+    public void onBindViewHolder(InfoItemHolder holder, int i) {
+        infoItemBuilder.buildByHolder(holder, infoItemList.get(i));
+    }
+}

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

@@ -0,0 +1,58 @@
+package org.schabi.newpipe.info_list;
+
+import android.icu.text.IDNA;
+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;
+import org.schabi.newpipe.extractor.InfoItem;
+
+/**
+ * Created by Christian Schabesberger on 01.08.16.
+ *
+ * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
+ * StreamInfoItemHolder.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 StreamInfoItemHolder extends InfoItemHolder {
+
+    public final ImageView itemThumbnailView;
+    public final TextView itemVideoTitleView,
+            itemUploaderView,
+            itemDurationView,
+            itemUploadDateView,
+            itemViewCountView;
+    public final Button itemButton;
+
+    public StreamInfoItemHolder(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);
+    }
+
+    @Override
+    public InfoItem.InfoType infoType() {
+        return InfoItem.InfoType.STREAM;
+    }
+}

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

@@ -14,6 +14,8 @@ 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;
@@ -23,10 +25,12 @@ import android.widget.Toast;
 import org.schabi.newpipe.ActivityCommunicator;
 import org.schabi.newpipe.BuildConfig;
 import org.schabi.newpipe.R;
-import org.schabi.newpipe.VideoItemDetailActivity;
-import org.schabi.newpipe.VideoItemDetailFragment;
+import org.schabi.newpipe.detail.VideoItemDetailActivity;
+import org.schabi.newpipe.detail.VideoItemDetailFragment;
+import org.schabi.newpipe.util.NavStack;
 
 import java.io.IOException;
+import java.util.Arrays;
 
 /**
  * Created by Adam Howard on 08/11/15.
@@ -51,9 +55,13 @@ import java.io.IOException;
 /**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";
+    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";
@@ -67,7 +75,7 @@ public class BackgroundPlayer extends Service /*implements MediaPlayer.OnPrepare
 
     // Determines if the service is already running.
     // Prevents launching the service twice.
-    public static volatile boolean isRunning = false;
+    public static volatile boolean isRunning;
 
     public BackgroundPlayer() {
         super();
@@ -113,6 +121,7 @@ public class BackgroundPlayer extends Service /*implements MediaPlayer.OnPrepare
         isRunning = false;
     }
 
+
     private class PlayerThread extends Thread {
         MediaPlayer mediaPlayer;
         private String source;
@@ -121,9 +130,9 @@ public class BackgroundPlayer extends Service /*implements MediaPlayer.OnPrepare
         private BackgroundPlayer owner;
         private NotificationManager noteMgr;
         private WifiManager.WifiLock wifiLock;
-        private Bitmap videoThumbnail = null;
-        private NotificationCompat.Builder noteBuilder;
-        private Notification note;
+        private Bitmap videoThumbnail;
+        private NoteBuilder noteBuilder;
+        private volatile boolean donePlaying = false;
 
         public PlayerThread(String src, String title, BackgroundPlayer owner) {
             this.source = src;
@@ -133,6 +142,45 @@ public class BackgroundPlayer extends Service /*implements MediaPlayer.OnPrepare
             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
@@ -179,27 +227,30 @@ public class BackgroundPlayer extends Service /*implements MediaPlayer.OnPrepare
             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);
 
-            note = buildNotification();
-
-            startForeground(noteID, note);
+            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 sleepTime = Math.min(2000, (int)((double)vidLength/4));
-            while(mediaPlayer.isPlaying()) {
-                noteBuilder.setProgress(vidLength, mediaPlayer.getCurrentPosition(), false);
-                noteMgr.notify(noteID, noteBuilder.build());
+            int vidLength = mediaPlayer.getDuration();
+            int sleepTime = Math.min(2000, (int)(vidLength / 4));
+            while(!isDonePlaying()) {
+                broadcastState();
                 try {
-                    Thread.sleep(sleepTime);
+                    synchronized (this) {
+                        wait(sleepTime);
+                    }
                 } catch (InterruptedException e) {
-                    Log.d(TAG, "sleep failure");
+                    Log.e(TAG, "sleep failure", e);
                 }
-            }*/
+            }
         }
 
         /**Handles button presses from the notification. */
@@ -208,35 +259,50 @@ public class BackgroundPlayer extends Service /*implements MediaPlayer.OnPrepare
             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();
-                        note.contentView.setImageViewResource(R.id.notificationPlayPause, R.drawable.ic_play_circle_filled_white_24dp);
-                        if(android.os.Build.VERSION.SDK_INT >=16){
-                            note.bigContentView.setImageViewResource(R.id.notificationPlayPause, R.drawable.ic_play_circle_filled_white_24dp);
+                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();
                         }
-                        noteMgr.notify(noteID, note);
-                    }
-                    else {
-                        //reacquire CPU lock after auto-releasing it on pause
-                        mediaPlayer.setWakeMode(getApplicationContext(), PowerManager.PARTIAL_WAKE_LOCK);
-                        mediaPlayer.start();
-                        note.contentView.setImageViewResource(R.id.notificationPlayPause, R.drawable.ic_pause_white_24dp);
-                        if(android.os.Build.VERSION.SDK_INT >=16){
-                            note.bigContentView.setImageViewResource(R.id.notificationPlayPause, R.drawable.ic_pause_white_24dp);
+                        synchronized (PlayerThread.this) {
+                            PlayerThread.this.notifyAll();
                         }
-                        noteMgr.notify(noteID, note);
+                        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;
                     }
-                }
-                else if(action.equals(ACTION_STOP)) {
-                    //this auto-releases CPU lock
-                    mediaPlayer.stop();
-                    afterPlayCleanup();
                 }
             }
         };
 
         private void afterPlayCleanup() {
+            // Notify thread to stop
+            setDonePlaying();
             //remove progress bar
             //noteBuilder.setProgress(0, 0, false);
 
@@ -250,7 +316,12 @@ public class BackgroundPlayer extends Service /*implements MediaPlayer.OnPrepare
             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();
         }
 
@@ -266,78 +337,250 @@ public class BackgroundPlayer extends Service /*implements MediaPlayer.OnPrepare
             }
         }
 
-        private Notification buildNotification() {
+        private void initNotificationBuilder() {
             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();
             */
 
+            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.putExtra(NavStack.SERVICE_ID, serviceId);
+            openDetailViewIntent.putExtra(NavStack.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)
-                    .setTicker(
-                            String.format(res.getString(
-                                    R.string.background_player_time_text), title))
                     .setContentIntent(PendingIntent.getActivity(getApplicationContext(),
                             noteID, openDetailViewIntent,
                             PendingIntent.FLAG_UPDATE_CURRENT))
-                    .setContentIntent(openDetailView);
+                    .setContentIntent(openDetailView)
+                    .setCategory(Notification.CATEGORY_TRANSPORT)
+                    //Make notification appear on lockscreen
+                    .setVisibility(Notification.VISIBILITY_PUBLIC);
+        }
 
 
-            RemoteViews view =
-                    new RemoteViews(BuildConfig.APPLICATION_ID, R.layout.player_notification);
-            view.setImageViewBitmap(R.id.notificationCover, videoThumbnail);
-            view.setTextViewText(R.id.notificationSongName, title);
-            view.setTextViewText(R.id.notificationArtist, channelName);
-            view.setOnClickPendingIntent(R.id.notificationStop, stopPI);
-            view.setOnClickPendingIntent(R.id.notificationPlayPause, playPI);
-            view.setOnClickPendingIntent(R.id.notificationContent, openDetailView);
+        /**
+         * Notification builder which works like the real builder but uses a custom view.
+         */
+        class NoteBuilder extends NotificationCompat.Builder {
 
-            //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.setTextViewText(R.id.notificationSongName, title);
-                expandedView.setTextViewText(R.id.notificationArtist, channelName);
-            expandedView.setOnClickPendingIntent(R.id.notificationStop, stopPI);
-            expandedView.setOnClickPendingIntent(R.id.notificationPlayPause, playPI);
-            expandedView.setOnClickPendingIntent(R.id.notificationContent, openDetailView);
-
-
-            noteBuilder.setCategory(Notification.CATEGORY_TRANSPORT);
-
-            //Make notification appear on lockscreen
-            noteBuilder.setVisibility(Notification.VISIBILITY_PUBLIC);
-
-            note = noteBuilder.build();
-            note.contentView = view;
-
-            if (android.os.Build.VERSION.SDK_INT > 16) {
-                note.bigContentView = expandedView;
+            /**
+             * @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));
             }
 
-            return note;
+            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/PlayVideoActivity.java

@@ -66,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";

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

@@ -0,0 +1,34 @@
+package org.schabi.newpipe.report;
+
+import android.content.Context;
+
+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 13.09.16.
+ *
+ * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
+ * 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
+ * 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 AcraReportSenderFactory implements ReportSenderFactory {
+    public ReportSender create(Context context, ACRAConfiguration config) {
+        return new AcraReportSender();
+    }
+}

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

@@ -1,20 +1,22 @@
 
 
-package org.schabi.newpipe;
+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.AsyncTask;
 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.AppCompatActivity;
+import android.support.v7.app.ActionBar;
 import android.os.Bundle;
 import android.os.Handler;
+import android.support.v7.app.AppCompatActivity;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -23,13 +25,21 @@ import android.view.View;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.TextView;
-import android.widget.Toast;
 
-import org.apache.commons.lang.exception.ExceptionUtils;
+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.ThemableActivity;
 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;
@@ -38,26 +48,26 @@ import java.util.Vector;
 
 /**
  * Created by Christian Schabesberger on 24.10.15.
- * <p>
+ *
  * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
  * ErrorActivity.java is part of NewPipe.
- * <p>
+ *
  * NewPipe is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
- * <p>
+ * <
  * NewPipe is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * <p>
+ * <
  * You should have received a copy of the GNU General Public License
  * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-public class ErrorActivity extends AppCompatActivity {
-    public static class ErrorInfo {
+public class ErrorActivity extends ThemableActivity {
+    public static class ErrorInfo implements Parcelable {
         public int userAction;
         public String request;
         public String serviceName;
@@ -71,29 +81,79 @@ public class ErrorActivity extends AppCompatActivity {
             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 List<Exception> errorList;
+    private String[] errorList;
     private ErrorInfo errorInfo;
     private Class returnActivity;
     private String currentTimeStamp;
     private String globIpRange;
-    Thread globIpRangeThread = null;
+    Thread globIpRangeThread;
 
     // views
     private TextView errorView;
@@ -102,7 +162,11 @@ public class ErrorActivity extends AppCompatActivity {
     private TextView infoView;
     private TextView errorMessageView;
 
-    public static void reportError(final Context context, final List<Exception> el,
+    public static void reportUiError(final AppCompatActivity activity, final Throwable el) {
+        reportError(activity, el, activity.getClass(), null, ErrorInfo.make(UI_ERROR, "none", "", R.string.app_ui_crash));
+    }
+
+    public static void reportError(final Context context, final List<Throwable> el,
                                    final Class returnAcitivty, View rootView, final ErrorInfo errorInfo) {
 
         if (rootView != null) {
@@ -112,26 +176,26 @@ public class ErrorActivity extends AppCompatActivity {
                         @Override
                         public void onClick(View v) {
                             ActivityCommunicator ac = ActivityCommunicator.getCommunicator();
-                            ac.errorList = el;
                             ac.returnActivity = returnAcitivty;
-                            ac.errorInfo = errorInfo;
                             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.errorList = el;
             ac.returnActivity = returnAcitivty;
-            ac.errorInfo = errorInfo;
             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 Exception e,
+    public static void reportError(final Context context, final Throwable e,
                                    final Class returnAcitivty, View rootView, final ErrorInfo errorInfo) {
-        List<Exception> el = null;
+        List<Throwable> el = null;
         if(e != null) {
             el = new Vector<>();
             el.add(e);
@@ -140,10 +204,10 @@ public class ErrorActivity extends AppCompatActivity {
     }
 
     // async call
-    public static void reportError(Handler handler, final Context context, final Exception e,
+    public static void reportError(Handler handler, final Context context, final Throwable e,
                                    final Class returnAcitivty, final View rootView, final ErrorInfo errorInfo) {
 
-        List<Exception> el = null;
+        List<Throwable> el = null;
         if(e != null) {
             el = new Vector<>();
             el.add(e);
@@ -152,7 +216,7 @@ public class ErrorActivity extends AppCompatActivity {
     }
 
     // async call
-    public static void reportError(Handler handler, final Context context, final List<Exception> el,
+    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
@@ -162,16 +226,39 @@ public class ErrorActivity extends AppCompatActivity {
         });
     }
 
+    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);
-        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 
-        ActivityCommunicator ac = ActivityCommunicator.getCommunicator();
-        errorList = ac.errorList;
-        returnActivity = ac.returnActivity;
-        errorInfo = ac.errorInfo;
+        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);
@@ -179,12 +266,14 @@ public class ErrorActivity extends AppCompatActivity {
         infoView = (TextView) findViewById(R.id.errorInfosView);
         errorMessageView = (TextView) findViewById(R.id.errorMessageView);
 
-        errorView.setText(formErrorText(errorList));
+        ActivityCommunicator ac = ActivityCommunicator.getCommunicator();
+        returnActivity = ac.returnActivity;
+        errorInfo = intent.getParcelableExtra(ERROR_INFO);
+        errorList = intent.getStringArrayExtra(ERROR_LIST);
 
-        //importand add gurumeditaion
+                //importand add gurumeditaion
         addGuruMeditaion();
         currentTimeStamp = getCurrentTimeStamp();
-        buildInfo(errorInfo);
 
         reportButton.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -203,12 +292,21 @@ public class ErrorActivity extends AppCompatActivity {
         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));
+
+        //print stack trace once again for debugging:
+        for(String e : errorList) {
+            Log.e(TAG, e);
+        }
     }
 
     @Override
@@ -237,12 +335,19 @@ public class ErrorActivity extends AppCompatActivity {
         return false;
     }
 
-    private String formErrorText(List<Exception> el) {
+    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 (Exception e : el) {
+            for (String e : el) {
                 text += "-------------------------------------\n"
-                        + ExceptionUtils.getStackTrace(e);
+                        + e;
             }
         }
         text += "-------------------------------------";
@@ -258,7 +363,7 @@ public class ErrorActivity extends AppCompatActivity {
                     returnActivity.isAssignableFrom(Activity.class)) {
                 intent = new Intent(this, returnActivity);
             } else {
-                intent = new Intent(this, VideoItemListActivity.class);
+                intent = new Intent(this, MainActivity.class);
             }
             intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
             NavUtils.navigateUpTo(this, intent);
@@ -277,6 +382,7 @@ public class ErrorActivity extends AppCompatActivity {
                 + "\n" + getContentLangString()
                 + "\n" + info.serviceName
                 + "\n" + currentTimeStamp
+                + "\n" + getPackageName()
                 + "\n" + BuildConfig.VERSION_NAME
                 + "\n" + getOsString();
 
@@ -291,6 +397,7 @@ public class ErrorActivity extends AppCompatActivity {
                     .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)
@@ -298,8 +405,8 @@ public class ErrorActivity extends AppCompatActivity {
 
             JSONArray exceptionArray = new JSONArray();
             if(errorList != null) {
-                for (Exception e : errorList) {
-                    exceptionArray.put(ExceptionUtils.getStackTrace(e));
+                for (String e : errorList) {
+                    exceptionArray.put(e);
                 }
             }
 
@@ -307,7 +414,7 @@ public class ErrorActivity extends AppCompatActivity {
             errorObject.put("user_comment", userCommentBox.getText().toString());
 
             return errorObject.toString(3);
-        } catch (Exception e) {
+        } catch (Throwable e) {
             Log.e(TAG, "Error while erroring: Could not build json");
             e.printStackTrace();
         }
@@ -327,6 +434,12 @@ public class ErrorActivity extends AppCompatActivity {
                 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.";
         }
@@ -370,12 +483,12 @@ public class ErrorActivity extends AppCompatActivity {
         public void run() {
             String ipRange = "none";
             try {
-                Downloader dl = new Downloader();
-                String ip = dl.download("https://ifcfg.me/ip");
+                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(Exception e) {
+            } catch(Throwable e) {
                 Log.d(TAG, "Error while error: could not get iprange");
                 e.printStackTrace();
             } finally {
@@ -401,4 +514,13 @@ public class ErrorActivity extends AppCompatActivity {
             }
         }
     }
+
+    // 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,383 @@
+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.ChannelActivity;
+import org.schabi.newpipe.ReCaptchaActivity;
+import org.schabi.newpipe.extractor.NewPipe;
+import org.schabi.newpipe.extractor.search.SearchEngine;
+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 org.schabi.newpipe.util.NavStack;
+
+import java.util.EnumSet;
+
+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();
+
+    private EnumSet<SearchEngine.Filter> filter =
+            EnumSet.of(SearchEngine.Filter.CHANNEL, SearchEngine.Filter.STREAM);
+
+    /**
+     * Listener for search queries
+     */
+    public class SearchQueryListener implements SearchView.OnQueryTextListener {
+
+        @Override
+        public boolean onQueryTextSubmit(String query) {
+            Activity a = getActivity();
+            try {
+                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();
+            }
+            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 int pageNumber = 0;
+    private SuggestionListAdapter suggestionListAdapter = null;
+    private InfoListAdapter infoListAdapter = null;
+    private LinearLayoutManager streamInfoListLayoutManager = 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() {
+    }
+
+    @SuppressWarnings("unused")
+    public static SearchInfoItemFragment newInstance(int streamingServiceId, String searchQuery) {
+        Bundle args = new Bundle();
+        args.putInt(STREAMING_SERVICE, streamingServiceId);
+        args.putString(QUERY, searchQuery);
+        SearchInfoItemFragment fragment = new SearchInfoItemFragment();
+        fragment.setArguments(args);
+        return fragment;
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        searchQuery = "";
+        if (savedInstanceState != null) {
+            searchQuery = savedInstanceState.getString(QUERY);
+            streamingServiceId = savedInstanceState.getInt(STREAMING_SERVICE);
+        } else {
+            try {
+                Bundle args = getArguments();
+                if(args != null) {
+                    searchQuery = args.getString(QUERY);
+                    streamingServiceId = args.getInt(STREAMING_SERVICE);
+                } else {
+                    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));
+            }
+        }
+
+        setHasOptionsMenu(true);
+
+        SearchWorker sw = SearchWorker.getInstance();
+        sw.setSearchWorkerResultListener(new SearchWorker.SearchWorkerResultListener() {
+            @Override
+            public void onResult(SearchResult result) {
+                infoListAdapter.addInfoItemList(result.resultList);
+                setDoneLoading();
+            }
+
+            @Override
+            public void onNothingFound(int stringResource) {
+                //setListShown(true);
+                Toast.makeText(getActivity(), getString(stringResource),
+                        Toast.LENGTH_SHORT).show();
+                setDoneLoading();
+            }
+
+            @Override
+            public void onError(String message) {
+                //setListShown(true);
+                Toast.makeText(getActivity(), message,
+                        Toast.LENGTH_LONG).show();
+                setDoneLoading();
+            }
+
+            @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 = (RecyclerView) view.findViewById(R.id.list);
+        streamInfoListLayoutManager = new LinearLayoutManager(context);
+        recyclerView.setLayoutManager(streamInfoListLayoutManager);
+
+        infoListAdapter = new InfoListAdapter(getActivity(),
+                getActivity().findViewById(android.R.id.content));
+        infoListAdapter.setOnStreamInfoItemSelectedListener(
+                new InfoItemBuilder.OnInfoItemSelectedListener() {
+            @Override
+            public void selected(String url, int serviceId) {
+                NavStack.getInstance()
+                    .openDetailActivity(getContext(), url, serviceId);
+            }
+        });
+        infoListAdapter.setOnChannelInfoItemSelectedListener(new InfoItemBuilder.OnInfoItemSelectedListener() {
+            @Override
+            public void selected(String url, int serviceId) {
+                NavStack.getInstance()
+                        .openChannelActivity(getContext(), url, serviceId);
+            }
+        });
+        recyclerView.setAdapter(infoListAdapter);
+        recyclerView.clearOnScrollListeners();
+        recyclerView.addOnScrollListener(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 onStart() {
+        super.onStart();
+        if(!searchQuery.isEmpty()) {
+            search(searchQuery);
+        }
+    }
+
+    @Override
+    public void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+        outState.putString(QUERY, searchQuery);
+        outState.putInt(STREAMING_SERVICE, streamingServiceId);
+    }
+
+    @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 = (SearchView) searchItem.getActionView();
+        setupSearchView(searchView);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch(item.getItemId()) {
+            case R.id.menu_filter_all:
+                changeFilter(item, EnumSet.of(SearchEngine.Filter.STREAM, SearchEngine.Filter.CHANNEL));
+                return true;
+            case R.id.menu_filter_video:
+                changeFilter(item, EnumSet.of(SearchEngine.Filter.STREAM));
+                return true;
+            case R.id.menu_filter_channel:
+                changeFilter(item, EnumSet.of(SearchEngine.Filter.CHANNEL));
+                return true;
+            default:
+                return false;
+        }
+    }
+
+    private void changeFilter(MenuItem item, EnumSet<SearchEngine.Filter> filter) {
+        this.filter = filter;
+        item.setChecked(true);
+        if(searchQuery != null && !searchQuery.isEmpty()) {
+            Log.d(TAG, "Fuck+ " + searchQuery);
+            search(searchQuery);
+        }
+    }
+
+    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;
+        searchQuery = query;
+        search(query, pageNumber);
+        hideBackground();
+        loadingIndicator.setVisibility(View.VISIBLE);
+    }
+
+    private void search(String query, int page) {
+        isLoading = true;
+        SearchWorker sw = SearchWorker.getInstance();
+        sw.search(streamingServiceId,
+                query,
+                page,
+                getActivity(),
+                filter);
+    }
+
+    private void setDoneLoading() {
+        this.isLoading = false;
+        loadingIndicator.setVisibility(View.GONE);
+    }
+
+    /**
+     * Hides the "dummy" background when no results are shown
+     */
+    private void hideBackground() {
+        View view = getView();
+        if(view == null) return;
+        view.findViewById(R.id.mainBG).setVisibility(View.GONE);
+    }
+
+    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 final SearchView searchView;
+    private final 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,215 @@
+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;
+import java.util.EnumSet;
+
+/**
+ * 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;
+        private final EnumSet<SearchEngine.Filter> filter;
+        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,
+                              EnumSet<SearchEngine.Filter> filter,
+                              Activity activity,
+                              int requestId) {
+            this.serviceId = serviceId;
+            this.query = query;
+            this.page = page;
+            this.filter = filter;
+            this.a = activity;
+        }
+        void terminate() {
+            runs = false;
+        }
+        @Override
+        public void run() {
+            final String serviceName = NewPipe.getNameOfService(serviceId);
+            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, filter);
+                if(runs) {
+                    h.post(new ResultRunnable(result, requestId));
+                }
+
+                // look for errors during extraction
+                // soft errors:
+                View rootView = a.findViewById(android.R.id.content);
+                if(result != null &&
+                        !result.errors.isEmpty()) {
+                    Log.e(TAG, "OCCURRED ERRORS DURING SEARCH EXTRACTION:");
+                    for(Throwable e : result.errors) {
+                        e.printStackTrace();
+                        Log.e(TAG, "------");
+                    }
+
+                    if(result.resultList.isEmpty()&& !result.errors.isEmpty()) {
+                        // if it compleatly failes dont show snackbar, instead show error directlry
+                        ErrorActivity.reportError(h, a, result.errors, null, null,
+                                ErrorActivity.ErrorInfo.make(ErrorActivity.SEARCHED,
+                                        serviceName, query, R.string.parsing_error));
+                    } else {
+                        // if it partly show snackbar
+                        ErrorActivity.reportError(h, a, result.errors, null, rootView,
+                                ErrorActivity.ErrorInfo.make(ErrorActivity.SEARCHED,
+                                        serviceName, 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,
+                                serviceName, 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,
+                       EnumSet<SearchEngine.Filter> filter) {
+        if(runnable != null) {
+            terminate();
+        }
+        runnable = new SearchRunnable(serviceId, query, page, filter, 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,84 @@
+package org.schabi.newpipe.search_fragment;
+
+import android.content.Context;
+import android.database.Cursor;
+import android.database.MatrixCursor;
+import android.support.v4.widget.ResourceCursorAdapter;
+import android.view.View;
+import android.widget.TextView;
+
+import java.util.List;
+
+/**
+ * Created by Christian Schabesberger on 02.08.16.
+ *
+ * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
+ * SuggestionListAdapter.java is part of NewPipe.
+ *
+ * NewPipe is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * NewPipe is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * {@link ResourceCursorAdapter} to display suggestions.
+ */
+public class SuggestionListAdapter extends ResourceCursorAdapter {
+
+    private static final String[] columns = new String[]{"_id", "title"};
+    private static final int INDEX_ID = 0;
+    private static final int INDEX_TITLE = 1;
+
+
+    public SuggestionListAdapter(Context context) {
+        super(context, android.R.layout.simple_list_item_1, null, 0);
+    }
+
+    @Override
+    public void bindView(View view, Context context, Cursor cursor) {
+        ViewHolder viewHolder = new ViewHolder(view);
+        viewHolder.suggestionTitle.setText(cursor.getString(INDEX_TITLE));
+    }
+
+    /**
+     * Update the suggestion list
+     * @param suggestions the list of suggestions
+     */
+    public void updateAdapter(List<String> suggestions) {
+        MatrixCursor cursor = new MatrixCursor(columns, suggestions.size());
+        int i = 0;
+        for (String suggestion : suggestions) {
+            String[] columnValues = new String[columns.length];
+            columnValues[INDEX_TITLE] = suggestion;
+            columnValues[INDEX_ID] = Integer.toString(i);
+            cursor.addRow(columnValues);
+            i++;
+        }
+        changeCursor(cursor);
+    }
+
+    /**
+     * Get the suggestion for a position
+     * @param position the position of the suggestion
+     * @return the suggestion
+     */
+    public String getSuggestion(int position) {
+        return ((Cursor) getItem(position)).getString(INDEX_TITLE);
+    }
+
+    private class ViewHolder {
+        private final TextView suggestionTitle;
+        private ViewHolder(View view) {
+            this.suggestionTitle = (TextView) view.findViewById(android.R.id.text1);
+        }
+    }
+}

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

@@ -0,0 +1,105 @@
+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.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{
+
+    /**
+     * Runnable to update a {@link SuggestionListAdapter}
+     */
+    private class SuggestionResultRunnable implements Runnable{
+
+        private final List<String> suggestions;
+
+        private SuggestionResultRunnable(List<String> suggestions) {
+            this.suggestions = suggestions;
+        }
+
+        @Override
+        public void run() {
+            adapter.updateAdapter(suggestions);
+        }
+    }
+
+    private final int serviceId;
+    private final String query;
+    private final Handler h = new Handler();
+    private final Activity a;
+    private final 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));
+        } 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();
+            }
+        });
+    }
+}

app/src/main/java/org/schabi/newpipe/settings/NewPipeSettings.java

@@ -18,20 +18,42 @@
  * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.schabi.newpipe;
+package org.schabi.newpipe.settings;
 
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.os.Environment;
 import android.preference.PreferenceManager;
 import android.support.annotation.NonNull;
-import android.util.Log;
+
+import org.schabi.newpipe.R;
 
 import java.io.File;
 
+import us.shandian.giga.util.Utility;
+
 /**
  * Helper for global settings
  */
+
+/**
+ * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
+ * NewPipeSettings.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 NewPipeSettings {
 
     private NewPipeSettings() {
@@ -43,18 +65,30 @@ public class NewPipeSettings {
         getAudioDownloadFolder(context);
     }
 
-    public static File getDownloadFolder() {
-        return getFolder(Environment.DIRECTORY_DOWNLOADS);
-    }
-
     public static File getVideoDownloadFolder(Context context) {
         return getFolder(context, R.string.download_path_key, Environment.DIRECTORY_MOVIES);
     }
 
+    public static String getVideoDownloadPath(Context context) {
+        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
+        final String key = context.getString(R.string.download_path_key);
+        String downloadPath = prefs.getString(key, Environment.DIRECTORY_MOVIES);
+
+        return downloadPath;
+    }
+
     public static File getAudioDownloadFolder(Context context) {
         return getFolder(context, R.string.download_path_audio_key, Environment.DIRECTORY_MUSIC);
     }
 
+    public static String getAudioDownloadPath(Context context) {
+        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
+        final String key = context.getString(R.string.download_path_audio_key);
+        String downloadPath = prefs.getString(key, Environment.DIRECTORY_MUSIC);
+
+        return downloadPath;
+    }
+
     private static File getFolder(Context context, int keyID, String defaultDirectoryName) {
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
         final String key = context.getString(keyID);

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

@@ -0,0 +1,163 @@
+package org.schabi.newpipe.settings;
+
+import android.content.Context;
+import android.content.Intent;
+import android.content.res.Configuration;
+import android.os.Bundle;
+import android.preference.PreferenceActivity;
+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 org.schabi.newpipe.R;
+
+import java.util.Objects;
+
+
+/**
+ * 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 AppCompatDelegate mDelegate = null;
+    SettingsFragment f = new SettingsFragment();
+
+    @Override
+    protected void onCreate(Bundle savedInstanceBundle) {
+        if (PreferenceManager.getDefaultSharedPreferences(this)
+                .getString("theme", getResources().getString(R.string.light_theme_title)).
+                        equals(getResources().getString(R.string.dark_theme_title)))  {
+            setTheme(R.style.DarkTheme);
+        }
+        getDelegate().installViewFactory();
+        getDelegate().onCreate(savedInstanceBundle);
+        super.onCreate(savedInstanceBundle);
+
+        ActionBar actionBar = getSupportActionBar();
+        actionBar.setDisplayHomeAsUpEnabled(true);
+        actionBar.setTitle(R.string.settings_title);
+        actionBar.setDisplayShowTitleEnabled(true);
+
+        getFragmentManager().beginTransaction()
+                .replace(android.R.id.content, f)
+                .commit();
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        f.onActivityResult(requestCode, resultCode, data);
+    }
+
+    @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) {
+        NewPipeSettings.initSettings(context);
+    }
+}

app/src/main/java/org/schabi/newpipe/settings/SettingsFragment.java

@@ -0,0 +1,260 @@
+package org.schabi.newpipe.settings;
+
+import android.app.Activity;
+import android.app.ListActivity;
+import android.content.ClipData;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.net.Uri;
+import android.os.Build;
+import android.os.Bundle;
+import android.preference.CheckBoxPreference;
+import android.preference.ListPreference;
+import android.preference.Preference;
+import android.preference.PreferenceFragment;
+import android.preference.PreferenceManager;
+import android.preference.PreferenceScreen;
+
+import com.nononsenseapps.filepicker.FilePickerActivity;
+
+import org.schabi.newpipe.App;
+import org.schabi.newpipe.R;
+
+import java.util.ArrayList;
+import java.util.Objects;
+
+import info.guardianproject.netcipher.proxy.OrbotHelper;
+
+/**
+ * Created by david on 15/06/16.
+ *
+ * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
+ * SettingsFragment.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 SettingsFragment  extends PreferenceFragment
+        implements SharedPreferences.OnSharedPreferenceChangeListener
+{
+    SharedPreferences.OnSharedPreferenceChangeListener prefListener;
+
+    // get keys
+    String DEFAULT_RESOLUTION_PREFERENCE;
+    String DEFAULT_AUDIO_FORMAT_PREFERENCE;
+    String SEARCH_LANGUAGE_PREFERENCE;
+    String DOWNLOAD_PATH_PREFERENCE;
+    String DOWNLOAD_PATH_AUDIO_PREFERENCE;
+    String USE_TOR_KEY;
+    String THEME;
+
+    public static final int REQUEST_INSTALL_ORBOT = 0x1234;
+
+    private ListPreference defaultResolutionPreference;
+    private ListPreference defaultAudioFormatPreference;
+    private ListPreference searchLanguagePreference;
+    private Preference downloadPathPreference;
+    private Preference downloadPathAudioPreference;
+    private Preference themePreference;
+    private SharedPreferences defaultPreferences;
+
+    @Override
+    public void onCreate(final 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);
+        DOWNLOAD_PATH_AUDIO_PREFERENCE = getString(R.string.download_path_audio_key);
+        THEME = getString(R.string.theme_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 = findPreference(DOWNLOAD_PATH_PREFERENCE);
+        downloadPathAudioPreference = findPreference(DOWNLOAD_PATH_AUDIO_PREFERENCE);
+        themePreference = findPreference(THEME);
+
+        prefListener = new SharedPreferences.OnSharedPreferenceChangeListener() {
+            @Override
+            public void onSharedPreferenceChanged(SharedPreferences sharedPreferences,
+                                                  String key) {
+                Activity a = getActivity();
+                if(a == null)
+                {
+                    return;
+                }
+                if (key == USE_TOR_KEY)
+                {
+                    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);
+                    }
+                }
+                else if (key == DOWNLOAD_PATH_PREFERENCE)
+                {
+                    String downloadPath = sharedPreferences
+                            .getString(DOWNLOAD_PATH_PREFERENCE,
+                                    getString(R.string.download_path_summary));
+                    downloadPathPreference
+                            .setSummary(downloadPath);
+                }
+                else if (key == DOWNLOAD_PATH_AUDIO_PREFERENCE)
+                {
+                    String downloadPath = sharedPreferences
+                            .getString(DOWNLOAD_PATH_AUDIO_PREFERENCE,
+                                    getString(R.string.download_path_audio_summary));
+                    downloadPathAudioPreference
+                            .setSummary(downloadPath);
+                }
+                else if (key == THEME)
+                {
+                    String theme = sharedPreferences.getString(THEME, "Light");
+                    themePreference.setSummary(theme);
+                }
+                updateSummary();
+            }
+        };
+        defaultPreferences.registerOnSharedPreferenceChangeListener(prefListener);
+
+        updateSummary();
+    }
+
+    @Override
+    public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
+
+        if(preference.getKey().equals(downloadPathPreference.getKey()) ||
+                preference.getKey().equals(downloadPathAudioPreference.getKey()))
+        {
+            Activity activity = getActivity();
+            Intent i = new Intent(activity, FilePickerActivity.class);
+
+            i.putExtra(FilePickerActivity.EXTRA_ALLOW_MULTIPLE, false);
+            i.putExtra(FilePickerActivity.EXTRA_ALLOW_CREATE_DIR, true);
+            i.putExtra(FilePickerActivity.EXTRA_MODE, FilePickerActivity.MODE_DIR);
+            if(preference.getKey().equals(downloadPathPreference.getKey()))
+            {
+                activity.startActivityForResult(i, R.string.download_path_key);
+            }
+            else if (preference.getKey().equals(downloadPathAudioPreference.getKey()))
+            {
+                activity.startActivityForResult(i, R.string.download_path_audio_key);
+            }
+        }
+        return super.onPreferenceTreeClick(preferenceScreen, preference);
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        Activity a = getActivity();
+
+        if ((requestCode == R.string.download_path_audio_key
+                || requestCode == R.string.download_path_key)
+                && resultCode == Activity.RESULT_OK) {
+
+            Uri uri = null;
+            if (data.getBooleanExtra(FilePickerActivity.EXTRA_ALLOW_MULTIPLE, false)) {
+                // For JellyBean and above
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
+                    ClipData clip = data.getClipData();
+
+                    if (clip != null) {
+                        for (int i = 0; i < clip.getItemCount(); i++) {
+                            uri = clip.getItemAt(i).getUri();
+                        }
+                    }
+                    // For Ice Cream Sandwich
+                } else {
+                    ArrayList<String> paths = data.getStringArrayListExtra
+                            (FilePickerActivity.EXTRA_PATHS);
+
+                    if (paths != null) {
+                        for (String path: paths) {
+                            uri = Uri.parse(path);
+                        }
+                    }
+                }
+            } else {
+                uri = data.getData();
+            }
+            SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(a);
+
+            //requestCode is equal to  R.string.download_path_key or
+            //R.string.download_path_audio_key
+            String key = getString(requestCode);
+            String path = data.getData().toString().substring(7);
+            prefs.edit()
+                    .putString(key, path)
+                    .apply();
+
+        }
+        else if(requestCode == REQUEST_INSTALL_ORBOT)
+        {
+            // 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(a));
+        }
+
+        updateSummary();
+        super.onActivityResult(requestCode, resultCode, data);
+    }
+
+    // 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)));
+        downloadPathAudioPreference.setSummary(
+                defaultPreferences.getString(DOWNLOAD_PATH_AUDIO_PREFERENCE,
+                        getString(R.string.download_path_audio_summary)));
+        themePreference.setSummary(
+                defaultPreferences.getString(THEME,
+                        getString(R.string.light_theme_title)));
+    }
+
+    @Override
+    public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
+
+    }
+}

app/src/main/java/org/schabi/newpipe/util/NavStack.java

@@ -0,0 +1,151 @@
+package org.schabi.newpipe.util;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.v4.app.NavUtils;
+import android.support.v7.app.AppCompatActivity;
+import android.util.Log;
+
+import org.schabi.newpipe.ChannelActivity;
+import org.schabi.newpipe.MainActivity;
+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 java.util.ArrayList;
+import java.util.Stack;
+
+/**
+ * Created by Christian Schabesberger on 16.02.17.
+ *
+ * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
+ * NavStack.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 helps to navigate within the app
+ * IMPORTAND: the top of the stack is the current activity !!!
+ */
+public class NavStack {
+    private static final String TAG = NavStack.class.toString();
+    public static final String SERVICE_ID = "service_id";
+    public static final String URL = "url";
+
+    private static final String NAV_STACK="nav_stack";
+
+    private enum ActivityId {
+        CHANNEL,
+        DETAIL
+    }
+
+    private class NavEntry {
+        public NavEntry(String url, int serviceId) {
+            this.url = url;
+            this.serviceId = serviceId;
+        }
+        public String url;
+        public int serviceId;
+    }
+
+    private static NavStack instance = new NavStack();
+    private Stack<NavEntry> stack = new Stack<NavEntry>();
+
+    private NavStack() {
+    }
+
+    public static NavStack getInstance() {
+        return instance;
+    }
+
+    private void addEntry(String url, Class ac, int serviceId) {
+        stack.push(new NavEntry(url, serviceId));
+    }
+
+    public void navBack(Activity activity) throws Exception {
+        if(stack.size() == 0) { // if stack is already empty here, activity was probably called
+            // from another app
+            activity.finish();
+            return;
+        }
+        stack.pop(); // remove curent activty, since we dont want to return to itself
+        if (stack.size() == 0) {
+            openMainActivity(activity); // if no more page is on the stack this means we are home
+            return;
+        }
+        NavEntry entry = stack.pop();  // this element will reapear, since by calling the old page
+        // this element will be pushed on top again
+        try {
+            StreamingService service = NewPipe.getService(entry.serviceId);
+            switch (service.getLinkTypeByUrl(entry.url)) {
+                case STREAM:
+                    openDetailActivity(activity, entry.url, entry.serviceId);
+                    break;
+                case CHANNEL:
+                    openChannelActivity(activity, entry.url, entry.serviceId);
+                    break;
+                case NONE:
+                    throw new Exception("Url not known to service. service="
+                            + Integer.toString(entry.serviceId) + " url=" + entry.url);
+                default:
+                    openMainActivity(activity);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+
+    public void openChannelActivity(Context context, String url, int serviceId) {
+        openActivity(context, url, serviceId, ChannelActivity.class);
+    }
+
+    public void openDetailActivity(Context context, String url, int serviceId) {
+        openActivity(context, url, serviceId, VideoItemDetailActivity.class);
+    }
+
+    private void openActivity(Context context, String url, int serviceId, Class acitivtyClass) {
+        stack.push(new NavEntry(url, serviceId));
+        Intent i = new Intent(context, acitivtyClass);
+        i.putExtra(SERVICE_ID, serviceId);
+        i.putExtra(URL, url);
+        context.startActivity(i);
+    }
+
+    public void openMainActivity(Activity a) {
+        stack.clear();
+        Intent i = new Intent(a, MainActivity.class);
+        i.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+        NavUtils.navigateUpTo(a, i);
+    }
+
+    public void onSaveInstanceState(Bundle state) {
+        ArrayList<String> sa = new ArrayList<>();
+        for(NavEntry entry : stack) {
+            sa.add(entry.url);
+        }
+        state.putStringArrayList(NAV_STACK, sa);
+    }
+
+    public void restoreSavedInstanceState(Bundle state) {
+        ArrayList<String> sa = state.getStringArrayList(NAV_STACK);
+        for(String url : sa) {
+            stack.push(new NavEntry(url, NewPipe.getServiceByUrl(url).getServiceId()));
+        }
+    }
+}

app/src/main/java/org/schabi/newpipe/util/PermissionHelper.java

@@ -0,0 +1,68 @@
+package org.schabi.newpipe.util;
+
+import android.Manifest;
+import android.app.Activity;
+import android.content.pm.PackageManager;
+import android.os.Build;
+import android.support.annotation.RequiresApi;
+import android.support.v4.app.ActivityCompat;
+import android.support.v4.content.ContextCompat;
+
+public class PermissionHelper {
+    public static final int PERMISSION_WRITE_STORAGE = 778;
+    public static final int PERMISSION_READ_STORAGE = 777;
+
+
+
+    public static boolean checkStoragePermissions(Activity activity) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
+            if(!checkReadStoragePermissions(activity)) return false;
+        }
+        return checkWriteStoragePermissions(activity);
+    }
+
+    @RequiresApi(api = Build.VERSION_CODES.JELLY_BEAN)
+    public static boolean checkReadStoragePermissions(Activity activity) {
+        if (ContextCompat.checkSelfPermission(activity, Manifest.permission.READ_EXTERNAL_STORAGE)
+                != PackageManager.PERMISSION_GRANTED) {
+            ActivityCompat.requestPermissions(activity,
+                    new String[]{
+                            Manifest.permission.READ_EXTERNAL_STORAGE,
+                            Manifest.permission.WRITE_EXTERNAL_STORAGE},
+                    PERMISSION_READ_STORAGE);
+
+            return false;
+        }
+        return true;
+    }
+
+
+    public static boolean checkWriteStoragePermissions(Activity activity) {
+        // Here, thisActivity is the current activity
+        if (ContextCompat.checkSelfPermission(activity,
+                Manifest.permission.WRITE_EXTERNAL_STORAGE)
+                != PackageManager.PERMISSION_GRANTED) {
+
+            // Should we show an explanation?
+            /*if (ActivityCompat.shouldShowRequestPermissionRationale(activity,
+                    Manifest.permission.WRITE_EXTERNAL_STORAGE)) {
+
+                // Show an explanation to the user *asynchronously* -- don't block
+                // this thread waiting for the user's response! After the user
+                // sees the explanation, try again to request the permission.
+            } else {*/
+
+            // No explanation needed, we can request the permission.
+            ActivityCompat.requestPermissions(activity,
+                    new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE},
+                    PERMISSION_WRITE_STORAGE);
+
+            // PERMISSION_WRITE_STORAGE is an
+            // app-defined int constant. The callback method gets the
+            // result of the request.
+            /*}*/
+            return false;
+        }
+        return true;
+    }
+}

app/src/main/java/us/shandian/giga/get/DownloadDataSource.java

@@ -0,0 +1,36 @@
+package us.shandian.giga.get;
+
+import java.util.List;
+
+/**
+ * Provides access to the storage of {@link DownloadMission}s
+ */
+public interface DownloadDataSource {
+
+    /**
+     * Load all missions
+     * @return a list of download missions
+     */
+    List<DownloadMission> loadMissions();
+
+    /**
+     * Add a downlaod mission to the storage
+     * @param downloadMission the download mission to add
+     * @return the identifier of the mission
+     */
+    void addMission(DownloadMission downloadMission);
+
+    /**
+     * Update a download mission which exists in the storage
+     * @param downloadMission the download mission to update
+     * @throws IllegalArgumentException if the mission was not added to storage
+     */
+    void updateMission(DownloadMission downloadMission);
+
+
+    /**
+     * Delete a download mission
+     * @param downloadMission the mission to delete
+     */
+    void deleteMission(DownloadMission downloadMission);
+}

app/src/main/java/us/shandian/giga/get/DownloadManager.java

@@ -0,0 +1,48 @@
+package us.shandian.giga.get;
+
+public interface DownloadManager
+{
+	int BLOCK_SIZE = 512 * 1024;
+
+	/**
+	 * Start a new download mission
+	 * @param url the url to download
+	 * @param location the location
+	 * @param name the name of the file to create
+	 * @param isAudio true if the download is an audio file
+	 * @param threads the number of threads maximal used to download chunks of the file.    @return the identifier of the mission.
+     */
+	int startMission(String url, String location, String name, boolean isAudio, int threads);
+
+	/**
+	 * Resume the execution of a download mission.
+	 * @param id the identifier of the mission to resume.
+	 */
+	void resumeMission(int id);
+
+	/**
+	 * Pause the execution of a download mission.
+	 * @param id the identifier of the mission to pause.
+     */
+	void pauseMission(int id);
+
+	/**
+	 * Deletes the mission from the downloaded list but keeps the downloaded file.
+	 * @param id The mission identifier
+     */
+	void deleteMission(int id);
+
+	/**
+	 * Get the download mission by its identifier
+	 * @param id the identifier of the download mission
+	 * @return the download mission or null if the mission doesn't exist
+     */
+	DownloadMission getMission(int id);
+
+	/**
+	 * Get the number of download missions.
+	 * @return the number of download missions.
+     */
+	int getCount();
+
+}

app/src/main/java/us/shandian/giga/get/DownloadManagerImpl.java

@@ -0,0 +1,367 @@
+package us.shandian.giga.get;
+
+import android.support.annotation.Nullable;
+import android.util.Log;
+
+import com.google.gson.Gson;
+
+import java.io.File;
+import java.io.FilenameFilter;
+import java.io.RandomAccessFile;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+
+import us.shandian.giga.util.Utility;
+import static org.schabi.newpipe.BuildConfig.DEBUG;
+
+public class DownloadManagerImpl implements DownloadManager
+{
+	private static final String TAG = DownloadManagerImpl.class.getSimpleName();
+	private final DownloadDataSource mDownloadDataSource;
+
+	private final ArrayList<DownloadMission> mMissions = new ArrayList<DownloadMission>();
+
+    /**
+     * Create a new instance
+     * @param searchLocations the directories to search for unfinished downloads
+     * @param downloadDataSource the data source for finished downloads
+     */
+	public DownloadManagerImpl(Collection<String> searchLocations, DownloadDataSource downloadDataSource) {
+		mDownloadDataSource = downloadDataSource;
+		loadMissions(searchLocations);
+	}
+
+	@Override
+	public int startMission(String url, String location, String name, boolean isAudio, int threads) {
+		DownloadMission existingMission = getMissionByLocation(location, name);
+		if(existingMission != null) {
+			// Already downloaded or downloading
+			if(existingMission.finished) {
+				// Overwrite mission
+                deleteMission(mMissions.indexOf(existingMission));
+			} else {
+				// Rename file (?)
+                try {
+                    name = generateUniqueName(location, name);
+                }catch (Exception e) {
+                    Log.e(TAG, "Unable to generate unique name", e);
+                    name = System.currentTimeMillis() + name ;
+                    Log.i(TAG, "Using " + name);
+                }
+			}
+		}
+
+		DownloadMission mission = new DownloadMission(name, url, location);
+		mission.timestamp = System.currentTimeMillis();
+		mission.threadCount = threads;
+		mission.addListener(new MissionListener(mission));
+		new Initializer(mission).start();
+		return insertMission(mission);
+	}
+
+	@Override
+	public void resumeMission(int i) {
+		DownloadMission d = getMission(i);
+		if (!d.running && d.errCode == -1) {
+			d.start();
+		}
+	}
+
+	@Override
+	public void pauseMission(int i) {
+		DownloadMission d = getMission(i);
+		if (d.running) {
+			d.pause();
+		}
+	}
+
+	@Override
+	public void deleteMission(int i) {
+		DownloadMission mission = getMission(i);
+		if(mission.finished) {
+			mDownloadDataSource.deleteMission(mission);
+		}
+		mission.delete();
+		mMissions.remove(i);
+	}
+
+	private void loadMissions(Iterable<String> searchLocations) {
+		mMissions.clear();
+		loadFinishedMissions();
+		for(String location: searchLocations) {
+			loadMissions(location);
+		}
+
+	}
+
+
+	/**
+	 * Loads finished missions from the data source
+	 */
+	private void loadFinishedMissions() {
+		List<DownloadMission> finishedMissions = mDownloadDataSource.loadMissions();
+        if(finishedMissions == null) {
+            finishedMissions = new ArrayList<>();
+        }
+        // Ensure its sorted
+        Collections.sort(finishedMissions, new Comparator<DownloadMission>() {
+            @Override
+            public int compare(DownloadMission o1, DownloadMission o2) {
+                return (int) (o1.timestamp - o2.timestamp);
+            }
+        });
+        mMissions.ensureCapacity(mMissions.size() + finishedMissions.size());
+		for(DownloadMission mission: finishedMissions) {
+			File downloadedFile = mission.getDownloadedFile();
+			if(!downloadedFile.isFile()) {
+				if(DEBUG) {
+					Log.d(TAG, "downloaded file removed: " + downloadedFile.getAbsolutePath());
+				}
+				mDownloadDataSource.deleteMission(mission);
+			} else {
+				mission.length = downloadedFile.length();
+				mission.finished = true;
+				mission.running = false;
+				mMissions.add(mission);
+			}
+		}
+	}
+
+	private void loadMissions(String location) {
+
+		File f = new File(location);
+
+		if (f.exists() && f.isDirectory()) {
+			File[] subs = f.listFiles();
+
+            if(subs == null) {
+                Log.e(TAG, "listFiles() returned null");
+                return;
+            }
+
+			for (File sub : subs) {
+				if (sub.isFile() && sub.getName().endsWith(".giga")) {
+					String str = Utility.readFromFile(sub.getAbsolutePath());
+					if (str != null && !str.trim().equals("")) {
+
+						if (DEBUG) {
+							Log.d(TAG, "loading mission " + sub.getName());
+							Log.d(TAG, str);
+						}
+
+						DownloadMission mis = new Gson().fromJson(str, DownloadMission.class);
+
+						if (mis.finished) {
+							if(!sub.delete()) {
+                                Log.w(TAG, "Unable to delete .giga file: " + sub.getPath());
+                            }
+							continue;
+						}
+
+						mis.running = false;
+						mis.recovered = true;
+						insertMission(mis);
+					}
+				}
+			}
+		}
+	}
+	
+	@Override
+	public DownloadMission getMission(int i) {
+		return mMissions.get(i);
+	}
+	
+	@Override
+	public int getCount() {
+		return mMissions.size();
+	}
+	
+	private int insertMission(DownloadMission mission) {
+		int i = -1;
+		
+		DownloadMission m = null;
+		
+		if (mMissions.size() > 0) {
+			do {
+				m = mMissions.get(++i);
+			} while (m.timestamp > mission.timestamp && i < mMissions.size() - 1);
+			
+			//if (i > 0) i--;
+		} else {
+			i = 0;
+		}
+		
+		mMissions.add(i, mission);
+		
+		return i;
+	}
+
+    /**
+	 * Get a mission by its location and name
+	 * @param location the location
+	 * @param name the name
+	 * @return the mission or null if no such mission exists
+	 */
+	private @Nullable DownloadMission getMissionByLocation(String location, String name) {
+		for(DownloadMission mission: mMissions) {
+			if(location.equals(mission.location) && name.equals(mission.name)) {
+				return mission;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Splits the filename into name and extension
+	 *
+	 * Dots are ignored if they appear: not at all, at the beginning of the file,
+	 * at the end of the file
+	 *
+	 * @param name the name to split
+	 * @return a string array with a length of 2 containing the name and the extension
+     */
+	private static String[] splitName(String name) {
+		int dotIndex = name.lastIndexOf('.');
+		if(dotIndex <= 0 || (dotIndex  == name.length() - 1)) {
+			return new String[]{name, ""};
+		} else {
+			return new String[]{name.substring(0, dotIndex), name.substring(dotIndex + 1)};
+		}
+	}
+
+	/**
+	 * Generates a unique file name.
+	 *
+	 * e.g. "myname (1).txt" if the name "myname.txt" exists.
+	 * @param location the location (to check for existing files)
+	 * @param name the name of the file
+     * @return the unique file name
+	 * @throws IllegalArgumentException if the location is not a directory
+	 * @throws SecurityException if the location is not readable
+     */
+	private static String generateUniqueName(String location, String name) {
+		if(location == null) throw new NullPointerException("location is null");
+		if(name == null) throw new NullPointerException("name is null");
+		File destination = new File(location);
+		if(!destination.isDirectory()) {
+			throw new IllegalArgumentException("location is not a directory: " + location);
+		}
+		final String[] nameParts = splitName(name);
+		String[] existingName = destination.list(new FilenameFilter() {
+			@Override
+			public boolean accept(File dir, String name) {
+				return name.startsWith(nameParts[0]);
+			}
+		});
+		Arrays.sort(existingName);
+		String newName;
+		int downloadIndex = 0;
+		do {
+			newName = nameParts[0] + " (" + downloadIndex + ")." + nameParts[1];
+			++downloadIndex;
+			if(downloadIndex == 1000) {  // Probably an error on our side
+				throw new RuntimeException("Too many existing files");
+			}
+		} while (Arrays.binarySearch(existingName, newName) >= 0);
+		return newName;
+	}
+
+	private class Initializer extends Thread {
+		private DownloadMission mission;
+		
+		public Initializer(DownloadMission mission) {
+			this.mission = mission;
+		}
+		
+		@Override
+		public void run() {
+			try {
+				URL url = new URL(mission.url);
+				HttpURLConnection conn = (HttpURLConnection) url.openConnection();
+				mission.length = conn.getContentLength();
+				
+				if (mission.length <= 0) {
+					mission.errCode = DownloadMission.ERROR_SERVER_UNSUPPORTED;
+					//mission.notifyError(DownloadMission.ERROR_SERVER_UNSUPPORTED);
+					return;
+				}
+				
+				// Open again
+				conn = (HttpURLConnection) url.openConnection();
+				conn.setRequestProperty("Range", "bytes=" + (mission.length - 10) + "-" + mission.length);
+				
+				if (conn.getResponseCode() != 206) {
+					// Fallback to single thread if no partial content support
+					mission.fallback = true;
+					
+					if (DEBUG) {
+						Log.d(TAG, "falling back");
+					}
+				}
+				
+				if (DEBUG) {
+					Log.d(TAG, "response = " + conn.getResponseCode());
+				}
+				
+				mission.blocks = mission.length / BLOCK_SIZE;
+				
+				if (mission.threadCount > mission.blocks) {
+					mission.threadCount = (int) mission.blocks;
+				}
+				
+				if (mission.threadCount <= 0) {
+					mission.threadCount = 1;
+				}
+				
+				if (mission.blocks * BLOCK_SIZE < mission.length) {
+					mission.blocks++;
+				}
+				
+
+				new File(mission.location).mkdirs();
+				new File(mission.location + "/" + mission.name).createNewFile();
+				RandomAccessFile af = new RandomAccessFile(mission.location + "/" + mission.name, "rw");
+				af.setLength(mission.length);
+				af.close();
+				
+				mission.start();
+			} catch (Exception e) {
+				// TODO Notify
+				throw new RuntimeException(e);
+			}
+		}
+	}
+
+	/**
+	 * Waits for mission to finish to add it to the {@link #mDownloadDataSource}
+	 */
+	private class MissionListener implements DownloadMission.MissionListener {
+		private final DownloadMission mMission;
+
+		private MissionListener(DownloadMission mission) {
+			if(mission == null) throw new NullPointerException("mission is null");
+			// Could the mission be passed in onFinish()?
+			mMission = mission;
+		}
+
+		@Override
+		public void onProgressUpdate(DownloadMission downloadMission, long done, long total) {
+		}
+
+		@Override
+		public void onFinish(DownloadMission downloadMission) {
+			mDownloadDataSource.addMission(mMission);
+		}
+
+		@Override
+		public void onError(DownloadMission downloadMission, int errCode) {
+		}
+	}
+}

app/src/main/java/us/shandian/giga/get/DownloadMission.java

@@ -0,0 +1,328 @@
+package us.shandian.giga.get;
+
+import android.os.Handler;
+import android.os.Looper;
+import android.util.Log;
+
+import com.google.gson.Gson;
+
+import java.io.File;
+import java.lang.ref.WeakReference;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import us.shandian.giga.util.Utility;
+
+import static org.schabi.newpipe.BuildConfig.DEBUG;
+
+public class DownloadMission
+{
+	private static final String TAG = DownloadMission.class.getSimpleName();
+
+	public interface MissionListener {
+		HashMap<MissionListener, Handler> handlerStore = new HashMap<>();
+		
+		void onProgressUpdate(DownloadMission downloadMission, long done, long total);
+		void onFinish(DownloadMission downloadMission);
+		void onError(DownloadMission downloadMission, int errCode);
+	}
+	
+	public static final int ERROR_SERVER_UNSUPPORTED = 206;
+	public static final int ERROR_UNKNOWN = 233;
+
+	/**
+	 * The filename
+	 */
+	public String name;
+
+	/**
+	 * The url of the file to download
+	 */
+	public String url;
+
+	/**
+	 * The directory to store the download
+	 */
+	public String location;
+
+	/**
+	 * Number of blocks the size of {@link DownloadManager#BLOCK_SIZE}
+	 */
+	public long blocks;
+
+	/**
+	 * Number of bytes
+	 */
+	public long length;
+
+	/**
+	 * Number of bytes downloaded
+	 */
+	public long done;
+	public int threadCount = 3;
+	public int finishCount;
+	private List<Long> threadPositions = new ArrayList<Long>();
+	public final Map<Long, Boolean> blockState = new HashMap<Long, Boolean>();
+	public boolean running;
+	public boolean finished;
+	public boolean fallback;
+	public int errCode = -1;
+	public long timestamp;
+	
+	public transient boolean recovered;
+	
+	private transient ArrayList<WeakReference<MissionListener>> mListeners = new ArrayList<WeakReference<MissionListener>>();
+	private transient boolean mWritingToFile;
+
+	private static final int NO_IDENTIFIER = -1;
+	private long db_identifier = NO_IDENTIFIER;
+
+	public DownloadMission() {
+	}
+
+	public DownloadMission(String name, String url, String location) {
+		if(name == null) throw new NullPointerException("name is null");
+		if(name.isEmpty()) throw new IllegalArgumentException("name is empty");
+		if(url == null) throw new NullPointerException("url is null");
+		if(url.isEmpty()) throw new IllegalArgumentException("url is empty");
+		if(location == null) throw new NullPointerException("location is null");
+		if(location.isEmpty()) throw new IllegalArgumentException("location is empty");
+		this.url = url;
+		this.name = name;
+		this.location = location;
+	}
+
+
+	private void checkBlock(long block) {
+		if(block < 0 || block >= blocks) {
+			throw new IllegalArgumentException("illegal block identifier");
+		}
+	}
+
+	/**
+	 * Check if a block is reserved
+	 * @param block the block identifier
+	 * @return true if the block is reserved and false if otherwise
+     */
+	public boolean isBlockPreserved(long block) {
+		checkBlock(block);
+		return blockState.containsKey(block) ? blockState.get(block) : false;
+	}
+	
+	public void preserveBlock(long block) {
+		checkBlock(block);
+		synchronized (blockState) {
+			blockState.put(block, true);
+		}
+	}
+
+	/**
+	 * Set the download position of the file
+	 * @param threadId the identifier of the thread
+	 * @param position the download position of the thread
+     */
+	public void setPosition(int threadId, long position) {
+		threadPositions.set(threadId, position);
+	}
+
+	/**
+	 * Get the position of a thread
+	 * @param threadId the identifier of the thread
+	 * @return the position for the thread
+     */
+	public long getPosition(int threadId) {
+		return threadPositions.get(threadId);
+	}
+	
+	public synchronized void notifyProgress(long deltaLen) {
+		if (!running) return;
+		
+		if (recovered) {
+			recovered = false;
+		}
+		
+		done += deltaLen;
+		
+		if (done > length) {
+			done = length;
+		}
+		
+		if (done != length) {
+			writeThisToFile();
+		}
+		
+		for (WeakReference<MissionListener> ref: mListeners) {
+			final MissionListener listener = ref.get();
+			if (listener != null) {
+				MissionListener.handlerStore.get(listener).post(new Runnable() {
+					@Override
+					public void run() {
+						listener.onProgressUpdate(DownloadMission.this, done, length);
+					}
+				});
+			}
+		}
+	}
+
+	/**
+	 * Called by a download thread when it finished.
+	 */
+	public synchronized void notifyFinished() {
+		if (errCode > 0) return;
+		
+		finishCount++;
+		
+		if (finishCount == threadCount) {
+			onFinish();
+		}
+	}
+
+	/**
+	 * Called when all parts are downloaded
+	 */
+	private void onFinish() {
+		if (errCode > 0) return;
+		
+		if (DEBUG) {
+			Log.d(TAG, "onFinish");
+		}
+		
+		running = false;
+		finished = true;
+		
+		deleteThisFromFile();
+		
+		for (WeakReference<MissionListener> ref : mListeners) {
+			final MissionListener listener = ref.get();
+			if (listener != null) {
+				MissionListener.handlerStore.get(listener).post(new Runnable() {
+					@Override
+					public void run() {
+						listener.onFinish(DownloadMission.this);
+					}
+				});
+			}
+		}
+	}
+	
+	public synchronized void notifyError(int err) {
+		errCode = err;
+		
+		writeThisToFile();
+		
+		for (WeakReference<MissionListener> ref : mListeners) {
+			final MissionListener listener = ref.get();
+			MissionListener.handlerStore.get(listener).post(new Runnable() {
+				@Override
+				public void run() {
+					listener.onError(DownloadMission.this, errCode);
+				}
+			});
+		}
+	}
+	
+	public synchronized void addListener(MissionListener listener) {
+		Handler handler = new Handler(Looper.getMainLooper());
+		MissionListener.handlerStore.put(listener, handler);
+		mListeners.add(new WeakReference<MissionListener>(listener));
+	}
+	
+	public synchronized void removeListener(MissionListener listener) {
+		for (Iterator<WeakReference<MissionListener>> iterator = mListeners.iterator();
+			 iterator.hasNext(); ) {
+			WeakReference<MissionListener> weakRef = iterator.next();
+			if (listener!=null && listener == weakRef.get())
+			{
+				iterator.remove();
+			}
+		}
+	}
+
+	/**
+	 * Start downloading with multiple threads.
+	 */
+	public void start() {
+		if (!running && !finished) {
+			running = true;
+			
+			if (!fallback) {
+				for (int i = 0; i < threadCount; i++) {
+					if (threadPositions.size() <= i && !recovered) {
+						threadPositions.add((long) i);
+					}
+					new Thread(new DownloadRunnable(this, i)).start();
+				}
+			} else {
+				// In fallback mode, resuming is not supported.
+				threadCount = 1;
+				done = 0;
+				blocks = 0;
+				new Thread(new DownloadRunnableFallback(this)).start();
+			}
+		}
+	}
+	
+	public void pause() {
+		if (running) {
+			running = false;
+			recovered = true;
+			
+			// TODO: Notify & Write state to info file
+			// if (err)
+		}
+	}
+
+	/**
+	 * Removes the file and the meta file
+	 */
+	public void delete() {
+		deleteThisFromFile();
+		new File(location, name).delete();
+	}
+
+	/**
+	 * Write this {@link DownloadMission} to the meta file asynchronously
+	 * if no thread is already running.
+	 */
+	public void writeThisToFile() {
+		if (!mWritingToFile) {
+			mWritingToFile = true;
+			new Thread() {
+				@Override
+				public void run() {
+					doWriteThisToFile();
+					mWritingToFile = false;
+				}
+			}.start();
+		}
+	}
+
+	/**
+	 * Write this {@link DownloadMission} to the meta file.
+	 */
+	private void doWriteThisToFile() {
+		synchronized (blockState) {
+			Utility.writeToFile(getMetaFilename(), new Gson().toJson(this));
+		}
+	}
+	
+	private void deleteThisFromFile() {
+		new File(getMetaFilename()).delete();
+	}
+
+	/**
+	 * Get the path of the meta file
+	 * @return the path to the meta file
+     */
+	private String getMetaFilename() {
+		return location + "/" + name + ".giga";
+	}
+
+	public File getDownloadedFile() {
+		return new File(location, name);
+	}
+
+}

app/src/main/java/us/shandian/giga/get/DownloadRunnable.java

@@ -0,0 +1,178 @@
+package us.shandian.giga.get;
+
+import android.util.Log;
+
+import java.io.BufferedInputStream;
+import java.io.RandomAccessFile;
+import java.net.HttpURLConnection;
+import java.net.URL;
+
+import static org.schabi.newpipe.BuildConfig.DEBUG;
+
+/**
+ * Runnable to download blocks of a file until the file is completely downloaded,
+ * an error occurs or the process is stopped.
+ */
+public class DownloadRunnable implements Runnable
+{
+	private static final String TAG = DownloadRunnable.class.getSimpleName();
+	
+	private final DownloadMission mMission;
+	private final int mId;
+	
+	public DownloadRunnable(DownloadMission mission, int id) {
+		if(mission == null) throw new NullPointerException("mission is null");
+		mMission = mission;
+		mId = id;
+	}
+	
+	@Override
+	public void run() {
+		boolean retry = mMission.recovered;
+		long position = mMission.getPosition(mId);
+		
+		if (DEBUG) {
+			Log.d(TAG, mId + ":default pos " + position);
+			Log.d(TAG, mId + ":recovered: " + mMission.recovered);
+		}
+		
+		while (mMission.errCode == -1 && mMission.running && position < mMission.blocks) {
+			
+			if (Thread.currentThread().isInterrupted()) {
+				mMission.pause();
+				return;
+			}
+			
+			if (DEBUG && retry) {
+				Log.d(TAG, mId + ":retry is true. Resuming at " + position);
+			}
+			
+			// Wait for an unblocked position
+			while (!retry && position < mMission.blocks && mMission.isBlockPreserved(position)) {
+				
+				if (DEBUG) {
+					Log.d(TAG, mId + ":position " + position + " preserved, passing");
+				}
+				
+				position++;
+			}
+			
+			retry = false;
+			
+			if (position >= mMission.blocks) {
+				break;
+			}
+			
+			if (DEBUG) {
+				Log.d(TAG, mId + ":preserving position " + position);
+			}
+			
+			mMission.preserveBlock(position);
+			mMission.setPosition(mId, position);
+			
+			long start = position * DownloadManager.BLOCK_SIZE;
+			long end = start + DownloadManager.BLOCK_SIZE - 1;
+			
+			if (end >= mMission.length) {
+				end = mMission.length - 1;
+			}
+			
+			HttpURLConnection conn = null;
+			
+			int total = 0;
+			
+			try {
+				URL url = new URL(mMission.url);
+				conn = (HttpURLConnection) url.openConnection();
+				conn.setRequestProperty("Range", "bytes=" + start + "-" + end);
+				
+				if (DEBUG) {
+					Log.d(TAG, mId + ":" + conn.getRequestProperty("Range"));
+					Log.d(TAG, mId + ":Content-Length=" + conn.getContentLength() + " Code:" + conn.getResponseCode());
+				}
+				
+				// A server may be ignoring the range request
+				if (conn.getResponseCode() != 206) {
+					mMission.errCode = DownloadMission.ERROR_SERVER_UNSUPPORTED;
+					notifyError(DownloadMission.ERROR_SERVER_UNSUPPORTED);
+					
+					if (DEBUG) {
+						Log.e(TAG, mId + ":Unsupported " + conn.getResponseCode());
+					}
+					
+					break;
+				}
+				
+				RandomAccessFile f = new RandomAccessFile(mMission.location + "/" + mMission.name, "rw");
+				f.seek(start);
+				BufferedInputStream ipt = new BufferedInputStream(conn.getInputStream());
+				byte[] buf = new byte[512];
+				
+				while (start < end && mMission.running) {
+					int len = ipt.read(buf, 0, 512);
+					
+					if (len == -1) {
+						break;
+					} else {
+						start += len;
+						total += len;
+						f.write(buf, 0, len);
+						notifyProgress(len);
+					}
+				}
+				
+				if (DEBUG && mMission.running) {
+					Log.d(TAG, mId + ":position " + position + " finished, total length " + total);
+				}
+				
+				f.close();
+				ipt.close();
+				
+				// TODO We should save progress for each thread
+			} catch (Exception e) {
+				// TODO Retry count limit & notify error
+				retry = true;
+				
+				notifyProgress(-total);
+				
+				if (DEBUG) {
+					Log.d(TAG, mId + ":position " + position + " retrying", e);
+				}
+			}
+		}
+		
+		if (DEBUG) {
+			Log.d(TAG, "thread " + mId + " exited main loop");
+		}
+		
+		if (mMission.errCode == -1 && mMission.running) {
+			if (DEBUG) {
+				Log.d(TAG, "no error has happened, notifying");
+			}
+			notifyFinished();
+		}
+		
+		if (DEBUG && !mMission.running) {
+			Log.d(TAG, "The mission has been paused. Passing.");
+		}
+	}
+	
+	private void notifyProgress(final long len) {
+		synchronized (mMission) {
+			mMission.notifyProgress(len);
+		}
+	}
+	
+	private void notifyError(final int err) {
+		synchronized (mMission) {
+			mMission.notifyError(err);
+			mMission.pause();
+		}
+	}
+	
+	private void notifyFinished() {
+		synchronized (mMission) {
+			mMission.notifyFinished();
+		}
+	}
+}