make download dialog use radio button

Currently translated at 97.1% (134 of 138 strings)

.travis.yml

@@ -1,12 +1,14 @@
 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-24
 
     # Additional components
     - extra-android-support
@@ -22,7 +24,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

CONTRIBUTING.md

@@ -29,5 +29,5 @@ This document contains guidelines on making contributions to NewPipe.
 
 ## Communication
 
-* For the time being, [Slack](http://invite.chschtsch.ml/) is being used for project communication
+* For the time being, [Slack](https://newpipe.slack.com/) is being used for project communication. Ask [me](https://github.com/theScrabi) to sign up.
 * 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)
-
 ## 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,25 @@ NewPipe does not use any Google framework libraries, or the YouTube API. It only
 * Watch YouTube videos
 * Listen to YouTube videos (experimental)
 * Select the streaming player to watch the video with
-* Download videos (experimental)
-* Download audio only (experimental)
+* Download videos 
+* Download audio only 
 * Open a video in Kodi
 * Show Next/Related videos
 * Search YouTube in a specific language
-* Orbot/Tor support (no streaming yet, experimental)
 * Watch age restricted material
+* Display general information about channels
 
 ### Coming Features
 
-* Improved Downloading
+* Orbot/Tor support
 * Bookmarks
 * View history
 * Search history
 * Search channels
-* Display general information about channels
 * Subscribe to channels
 * Watch videos from a channel
 * Search/Watch Playlists
+* Queeing videos
 * ... and many more
 
 ### Multiservice support

app/build.gradle

@@ -1,15 +1,15 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion '23.0.2'
+    compileSdkVersion 24
+    buildToolsVersion '23.0.3'
 
     defaultConfig {
         applicationId "org.schabi.newpipe"
         minSdkVersion 15
-        targetSdkVersion 23
-        versionCode 17
-        versionName "0.7.8"
+        targetSdkVersion 24
+        versionCode 19
+        versionName "0.8.5"
     }
     buildTypes {
         release {
@@ -31,11 +31,11 @@ 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:24.2.1'
+    compile 'com.android.support:support-v4:24.2.1'
+    compile 'com.android.support:design:24.2.1'
+    compile 'com.android.support:recyclerview-v7:24.2.1'
     compile 'org.jsoup:jsoup:1.8.3'
     compile 'org.mozilla:rhino:1.7.7'
     compile 'info.guardianproject.netcipher:netcipher:1.2'
@@ -43,4 +43,8 @@ dependencies {
     compile 'com.nostra13.universalimageloader:universal-image-loader:1.9.5'
     compile 'com.github.nirhart:parallaxscroll:1.0'
     compile 'com.google.android.exoplayer:exoplayer:r1.5.5'
+    compile 'com.google.code.gson:gson:2.4'
+    compile 'com.nononsenseapps:filepicker:3.0.0'
+    testCompile 'junit:junit:4.12'
+    compile 'ch.acra:acra:4.9.0'
 }

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

@@ -0,0 +1,80 @@
+package org.schabi.newpipe.extractor.youtube;
+
+import android.test.AndroidTestCase;
+
+import org.schabi.newpipe.Downloader;
+import org.schabi.newpipe.extractor.ChannelExtractor;
+import org.schabi.newpipe.extractor.SearchEngine;
+import org.schabi.newpipe.extractor.ServiceList;
+
+/**
+ * Created by Christian Schabesberger on 12.09.16.
+ *
+ * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
+ * YoutubeSearchEngineTest.java is part of NewPipe.
+ *
+ * NewPipe is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * NewPipe is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+public class YoutubeChannelExtractorTest extends AndroidTestCase  {
+
+    ChannelExtractor extractor;
+    @Override
+    public void setUp() throws Exception {
+        super.setUp();
+        extractor = ServiceList.getService("Youtube")
+                .getChannelExtractorInstance("https://www.youtube.com/channel/UCYJ61XIK64sp6ZFFS8sctxw", 0, new Downloader());
+    }
+
+    public void testGetChannelName() throws Exception {
+        assertEquals(extractor.getChannelName(), "Gronkh");
+    }
+
+    public void testGetAvatarUrl() throws Exception {
+        assertTrue(extractor.getAvatarUrl(), extractor.getAvatarUrl().contains("yt3"));
+    }
+
+    public void testGetBannerurl() throws Exception {
+        assertTrue(extractor.getBannerUrl(), extractor.getBannerUrl().contains("yt3"));
+    }
+
+    public void testGetFeedUrl() throws Exception {
+        assertTrue(extractor.getFeedUrl(), extractor.getFeedUrl().contains("feed"));
+    }
+
+    public void testGetStreams() throws Exception {
+        assertTrue("no streams are received", !extractor.getStreams().getItemList().isEmpty());
+    }
+
+    public void testGetStreamsErrors() throws Exception {
+        assertTrue("errors during stream list extraction", extractor.getStreams().getErrors().isEmpty());
+    }
+
+    public void testHasNextPage() throws Exception {
+        // this particular example (link) has a next page !!!
+        assertTrue("no next page link found", extractor.hasNextPage());
+    }
+
+    public void testGetNextPage() throws Exception {
+        extractor = ServiceList.getService("Youtube")
+                .getChannelExtractorInstance("https://www.youtube.com/channel/UCYJ61XIK64sp6ZFFS8sctxw", 1, new Downloader());
+        assertTrue("next page didn't have content", !extractor.getStreams().getItemList().isEmpty());
+    }
+
+    public void testGetNextNextPageUrl() throws Exception {
+        extractor = ServiceList.getService("Youtube")
+                .getChannelExtractorInstance("https://www.youtube.com/channel/UCYJ61XIK64sp6ZFFS8sctxw", 2, new Downloader());
+        assertTrue("next page didn't have content", extractor.hasNextPage());
+    }
+}

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

@@ -2,17 +2,16 @@ 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;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.util.List;
 
 /**
  * Created by Christian Schabesberger on 29.12.15.
@@ -36,86 +35,16 @@ import java.util.ArrayList;
 
 public class YoutubeSearchEngineTest extends AndroidTestCase {
     private SearchResult result;
-    private ArrayList<String> suggestionReply;
+    private List<String> suggestionReply;
 
     @Override
-    public void setUp() throws Exception{
+    public void setUp() throws Exception {
         super.setUp();
         SearchEngine engine = ServiceList.getService("Youtube")
                 .getSearchEngineInstance(new Downloader());
 
-        result = engine.search("lefloid",
+        result = engine.search("this is something boring",
                 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());
-        }
+        suggestionReply = engine.suggestionList("hello", "de", new Downloader());
     }
 }

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

@@ -33,6 +33,7 @@ import java.io.IOException;
  */
 
 public class YoutubeStreamExtractorDefaultTest extends AndroidTestCase {
+    public static final String HTTPS = "https://";
     private StreamExtractor extractor;
 
     public void setUp() throws IOException, ExtractionException {
@@ -78,14 +79,18 @@ public class YoutubeStreamExtractorDefaultTest extends AndroidTestCase {
         assertTrue(extractor.getUploadDate().length() > 0);
     }
 
+    public void testGetChannelUrl() throws ParsingException {
+        assertTrue(extractor.getChannelUrl().length() > 0);
+    }
+
     public void testGetThumbnailUrl() throws ParsingException {
         assertTrue(extractor.getThumbnailUrl(),
-                extractor.getThumbnailUrl().contains("https://"));
+                extractor.getThumbnailUrl().contains(HTTPS));
     }
 
     public void testGetUploaderThumbnailUrl() throws ParsingException {
         assertTrue(extractor.getUploaderThumbnailUrl(),
-                extractor.getUploaderThumbnailUrl().contains("https://"));
+                extractor.getUploaderThumbnailUrl().contains(HTTPS));
     }
 
     public void testGetAudioStreams() throws ParsingException {
@@ -95,7 +100,7 @@ public class YoutubeStreamExtractorDefaultTest extends AndroidTestCase {
     public void testGetVideoStreams() throws ParsingException {
         for(VideoStream s : extractor.getVideoStreams()) {
             assertTrue(s.url,
-                    s.url.contains("https://"));
+                    s.url.contains(HTTPS));
             assertTrue(s.resolution.length() > 0);
             assertTrue(Integer.toString(s.format),
                     0 <= s.format && s.format <= 4);

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

@@ -15,7 +15,7 @@ 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.
+ * 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
@@ -32,7 +32,7 @@ import java.io.IOException;
  */
 
 
-public class YoutubestreamExtractorLiveStreamTest extends AndroidTestCase {
+public class YoutubeStreamExtractorLiveStreamTest extends AndroidTestCase {
 
     private StreamExtractor extractor;
 

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

@@ -12,6 +12,7 @@ import org.schabi.newpipe.extractor.VideoStream;
 import java.io.IOException;
 
 public class YoutubeStreamExtractorRestrictedTest extends AndroidTestCase {
+    public static final String HTTPS = "https://";
     private StreamExtractor extractor;
 
     public void setUp() throws IOException, ExtractionException {
@@ -63,12 +64,12 @@ public class YoutubeStreamExtractorRestrictedTest extends AndroidTestCase {
 
     public void testGetThumbnailUrl() throws ParsingException {
         assertTrue(extractor.getThumbnailUrl(),
-                extractor.getThumbnailUrl().contains("https://"));
+                extractor.getThumbnailUrl().contains(HTTPS));
     }
 
     public void testGetUploaderThumbnailUrl() throws ParsingException {
         assertTrue(extractor.getUploaderThumbnailUrl(),
-                extractor.getUploaderThumbnailUrl().contains("https://"));
+                extractor.getUploaderThumbnailUrl().contains(HTTPS));
     }
 
     public void testGetAudioStreams() throws ParsingException {
@@ -78,7 +79,7 @@ public class YoutubeStreamExtractorRestrictedTest extends AndroidTestCase {
     public void testGetVideoStreams() throws ParsingException {
         for(VideoStream s : extractor.getVideoStreams()) {
             assertTrue(s.url,
-                    s.url.contains("https://"));
+                    s.url.contains(HTTPS));
             assertTrue(s.resolution.length() > 0);
             assertTrue(Integer.toString(s.format),
                     0 <= s.format && s.format <= 4);

app/src/main/AndroidManifest.xml

@@ -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,12 @@
             </intent-filter>
         </activity>
         <activity
-            android:name=".VideoItemDetailActivity"
+            android:name=".detail.VideoItemDetailActivity"
             android:label="@string/title_videoitem_detail"
             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" />
@@ -79,12 +80,14 @@
             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 +105,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 +129,29 @@
             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.MainActivity"
+            android:label="@string/app_name"
+            android:launchMode="singleTask"
+            android:theme="@style/AppTheme" />
+
+        <service android:name="us.shandian.giga.service.DownloadManagerService" />
+
+        <activity
+            android:name="com.nononsenseapps.filepicker.FilePickerActivity"
+            android:label="@string/app_name"
+            android:theme="@style/FilePickerTheme"
+            android:launchMode="singleTop">
+        </activity>
+
+        <activity
+            android:name=".ChannelActivity"
+            android:label="@string/title_activity_channel"
+            android:theme="@style/AppTheme.NoActionBar" />
+
     </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,19 @@ package org.schabi.newpipe;
 
 import android.app.Application;
 import android.content.Context;
-import android.content.SharedPreferences;
-import android.preference.PreferenceManager;
 
 import com.nostra13.universalimageloader.core.ImageLoader;
 import com.nostra13.universalimageloader.core.ImageLoaderConfiguration;
 
+import org.acra.ACRA;
+import org.acra.config.ACRAConfiguration;
+import org.acra.config.ACRAConfigurationException;
+import org.acra.config.ConfigurationBuilder;
+import org.acra.sender.ReportSenderFactory;
+import org.schabi.newpipe.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 +37,42 @@ 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));
+        }
 
         // 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.

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

@@ -5,10 +5,12 @@ 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.
@@ -40,10 +42,26 @@ public class Downloader implements org.schabi.newpipe.extractor.Downloader {
      * @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 {
+        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 {
         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);
     }
 

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.ServiceList;
+
+/**
+ * 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,
+                        ServiceList.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,85 @@
+package org.schabi.newpipe;
+
+import android.content.Intent;
+import android.media.AudioManager;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.NavUtils;
+import android.support.v7.app.AppCompatActivity;
+import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+
+import org.schabi.newpipe.settings.SettingsActivity;
+
+/**
+ * Created by Christian Schabesberger on 02.08.16.
+ *
+ * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
+ * MainActivity.java is part of NewPipe.
+ *
+ * NewPipe is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * NewPipe is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+public class MainActivity extends AppCompatActivity {
+
+    private Fragment mainFragment = null;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
+        setVolumeControlStream(AudioManager.STREAM_MUSIC);
+        mainFragment = getSupportFragmentManager()
+                .findFragmentById(R.id.search_fragment);
+    }
+
+    public boolean onCreateOptionsMenu(Menu menu) {
+        super.onCreateOptionsMenu(menu);
+        MenuInflater inflater = getMenuInflater();
+
+        inflater.inflate(R.menu.main_menu, menu);
+
+        mainFragment.onCreateOptionsMenu(menu, inflater);
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        int id = item.getItemId();
+
+        switch(id) {
+            case android.R.id.home: {
+                Intent intent = new Intent(this, MainActivity.class);
+                intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+                NavUtils.navigateUpTo(this, intent);
+                return true;
+            }
+            case R.id.action_settings: {
+                Intent intent = new Intent(this, SettingsActivity.class);
+                startActivity(intent);
+                return true;
+            }
+            case R.id.action_show_downloads: {
+                Intent intent = new Intent(this, org.schabi.newpipe.download.MainActivity.class);
+                startActivity(intent);
+                return true;
+            }
+            default:
+                return mainFragment.onOptionsItemSelected(item) ||
+                        super.onOptionsItemSelected(item);
+        }
+    }
+}

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,8 +11,9 @@ 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 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.
@@ -180,6 +181,12 @@ class ActionBarHandler {
                     onPlayAudioListener.onActionSelected(selectedVideoStream);
                 }
                 return true;
+            case R.id.menu_item_downloads: {
+                Intent intent =
+                        new Intent(activity, org.schabi.newpipe.download.MainActivity.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,204 @@
+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.Downloader;
+import org.schabi.newpipe.report.ErrorActivity;
+import org.schabi.newpipe.R;
+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.StreamingService;
+import org.schabi.newpipe.extractor.services.youtube.YoutubeStreamExtractor;
+
+import java.io.IOException;
+
+/**
+ * Created by the-scrabi on 02.08.16.
+ */
+
+public class StreamInfoWorker {
+
+    private static final String TAG = StreamInfoWorker.class.toString();
+
+    public interface OnStreamInfoReceivedListener {
+        void onReceive(StreamInfo info);
+        void onError(int messageId);
+        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 = ServiceList.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, new Downloader());
+                streamInfo = StreamInfo.getVideoInfo(streamExtractor, new Downloader());
+
+                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 (IOException e) {
+                h.post(new Runnable() {
+                    @Override
+                    public void run() {
+                        onStreamInfoReceivedListener.onError(R.string.network_error);
+                    }
+                });
+                e.printStackTrace();
+            }
+            // custom service related exceptions
+            catch (YoutubeStreamExtractor.DecryptException de) {
+                h.post(new Runnable() {
+                    @Override
+                    public void run() {
+                        onStreamInfoReceivedListener.onError(R.string.youtube_signature_decryption_error);
+                    }
+                });
+                de.printStackTrace();
+            } catch (YoutubeStreamExtractor.GemaException ge) {
+                h.post(new Runnable() {
+                    @Override
+                    public void run() {
+                        onStreamInfoReceivedListener.onBlockedByGemaError();
+                    }
+                });
+            } catch(YoutubeStreamExtractor.LiveStreamException e) {
+                h.post(new Runnable() {
+                    @Override
+                    public void run() {
+                        onStreamInfoReceivedListener
+                                .onContentErrorWithMessage(R.string.live_streams_not_supported);
+                    }
+                });
+            }
+            // ----------------------------------------
+            catch(StreamExtractor.ContentNotAvailableException e) {
+                h.post(new Runnable() {
+                    @Override
+                    public void run() {
+                        onStreamInfoReceivedListener
+                                .onContentError();
+                    }
+                });
+                e.printStackTrace();
+            } catch(StreamInfo.StreamExctractException e) {
+                if(!streamInfo.errors.isEmpty()) {
+                    // !!! if this case ever kicks in someone gets kicked out !!!
+                    ErrorActivity.reportError(h, a, e, VideoItemDetailFragment.class, null,
+                            ErrorActivity.ErrorInfo.make(ErrorActivity.REQUESTED_STREAM,
+                                    service.getServiceInfo().name, videoUrl, R.string.could_not_get_stream));
+                } else {
+                    ErrorActivity.reportError(h, a, streamInfo.errors, VideoItemDetailFragment.class, null,
+                            ErrorActivity.ErrorInfo.make(ErrorActivity.REQUESTED_STREAM,
+                                    service.getServiceInfo().name, videoUrl, R.string.could_not_get_stream));
+                }
+                h.post(new Runnable() {
+                    @Override
+                    public void run() {
+                        a.finish();
+                    }
+                });
+                e.printStackTrace();
+            } catch (ParsingException e) {
+                ErrorActivity.reportError(h, a, e, VideoItemDetailFragment.class, null,
+                        ErrorActivity.ErrorInfo.make(ErrorActivity.REQUESTED_STREAM,
+                                service.getServiceInfo().name, videoUrl, R.string.parsing_error));
+                h.post(new Runnable() {
+                    @Override
+                    public void run() {
+                        a.finish();
+                    }
+                });
+                e.printStackTrace();
+            } catch(Exception e) {
+                ErrorActivity.reportError(h, a, e, VideoItemDetailFragment.class, null,
+                        ErrorActivity.ErrorInfo.make(ErrorActivity.REQUESTED_STREAM,
+                                service.getServiceInfo().name, videoUrl, R.string.general_error));
+                h.post(new Runnable() {
+                    @Override
+                    public void run() {
+                        a.finish();
+                    }
+                });
+                e.printStackTrace();
+            }
+        }
+    }
+
+    private static StreamInfoWorker streamInfoWorker = null;
+    private StreamExtractorRunnable runnable = null;
+    private OnStreamInfoReceivedListener onStreamInfoReceivedListener = null;
+
+    private StreamInfoWorker() {
+
+    }
+
+    public static StreamInfoWorker getInstance() {
+        return streamInfoWorker == null ? (streamInfoWorker = new StreamInfoWorker()) : streamInfoWorker;
+    }
+
+    public void search(int serviceId, String url, Activity a) {
+        runnable = new StreamExtractorRunnable(a, url, serviceId);
+        Thread thread = new Thread(runnable);
+        thread.start();
+    }
+
+    public void setOnStreamInfoReceivedListener(
+            OnStreamInfoReceivedListener onStreamInfoReceivedListener) {
+        this.onStreamInfoReceivedListener = onStreamInfoReceivedListener;
+    }
+}

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

@@ -1,4 +1,4 @@
-package org.schabi.newpipe;
+package org.schabi.newpipe.detail;
 
 import android.content.Intent;
 import android.media.AudioManager;
@@ -11,6 +11,9 @@ import android.view.Menu;
 import android.view.MenuItem;
 import android.widget.Toast;
 
+import org.schabi.newpipe.App;
+import org.schabi.newpipe.MainActivity;
+import org.schabi.newpipe.R;
 import org.schabi.newpipe.extractor.ServiceList;
 import org.schabi.newpipe.extractor.StreamingService;
 
@@ -85,7 +88,7 @@ public class VideoItemDetailActivity extends AppCompatActivity {
                             .show();
                 }
                 //arguments.putString(VideoItemDetailFragment.VIDEO_URL,
-                //        videoExtractor.getVideoUrl(videoExtractor.getVideoId(videoUrl)));//cleans URL
+                //        videoExtractor.getUrl(videoExtractor.getId(videoUrl)));//cleans URL
                 arguments.putString(VideoItemDetailFragment.VIDEO_URL, videoUrl);
 
                 arguments.putBoolean(VideoItemDetailFragment.AUTO_PLAY,
@@ -138,7 +141,7 @@ public class VideoItemDetailActivity extends AppCompatActivity {
 
             // http://developer.android.com/design/patterns/navigation.html#up-vs-back
 
-            Intent intent = new Intent(this, VideoItemListActivity.class);
+            Intent intent = new Intent(this, MainActivity.class);
             intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
             NavUtils.navigateUpTo(this, intent);
             return true;

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

@@ -37,7 +37,7 @@ public abstract class AbstractVideoInfo {
     public String title = "";
     public String uploader = "";
     public String thumbnail_url = "";
-    public Bitmap thumbnail = null;
+    public Bitmap thumbnail;
     public String webpage_url = "";
     public String upload_date = "";
     public long view_count = -1;

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

@@ -0,0 +1,59 @@
+package org.schabi.newpipe.extractor;
+
+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 Downloader downloader;
+    private StreamPreviewInfoCollector previewInfoCollector;
+    private int page = -1;
+
+    public ChannelExtractor(UrlIdHandler urlIdHandler, String url, int page, Downloader dl, int serviceId)
+            throws ExtractionException, IOException {
+        this.url = url;
+        this.page = page;
+        this.downloader = dl;
+        this.serviceId = serviceId;
+        this.urlIdHandler = urlIdHandler;
+        previewInfoCollector = new StreamPreviewInfoCollector(urlIdHandler, serviceId);
+    }
+
+    public String getUrl() { return url; }
+    public UrlIdHandler getUrlIdHandler() { return urlIdHandler; }
+    public Downloader getDownloader() { return downloader; }
+    public StreamPreviewInfoCollector getStreamPreviewInfoCollector() {
+        return previewInfoCollector;
+    }
+
+    public abstract String getChannelName() throws ParsingException;
+    public abstract String getAvatarUrl() throws ParsingException;
+    public abstract String getBannerUrl() throws ParsingException;
+    public abstract String getFeedUrl() throws ParsingException;
+    public abstract StreamPreviewInfoCollector getStreams() throws ParsingException;
+    public abstract boolean hasNextPage() throws ParsingException;
+    public int getServiceId() {
+        return serviceId;
+    }
+}

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

@@ -0,0 +1,79 @@
+package org.schabi.newpipe.extractor;
+
+import android.util.Log;
+
+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, Downloader dl)
+        throws ParsingException {
+        ChannelInfo info = new ChannelInfo();
+
+        // importand data
+        info.service_id = extractor.getServiceId();
+        info.channel_name = extractor.getChannelName();
+        info.hasNextPage = extractor.hasNextPage();
+
+        try {
+            info.avatar_url = extractor.getAvatarUrl();
+        } catch (Exception e) {
+            info.errors.add(e);
+        }
+        try {
+            info.banner_url = extractor.getBannerUrl();
+        } catch (Exception e) {
+            info.errors.add(e);
+        }
+        try {
+            info.feed_url = extractor.getFeedUrl();
+        } catch(Exception e) {
+            info.errors.add(e);
+        }
+        try {
+            StreamPreviewInfoCollector c = extractor.getStreams();
+            info.related_streams = c.getItemList();
+            info.errors.addAll(c.getErrors());
+        } catch(Exception e) {
+            info.errors.add(e);
+        }
+
+        return info;
+    }
+
+    public int service_id = -1;
+    public String channel_name = "";
+    public String avatar_url = "";
+    public String banner_url = "";
+    public String feed_url = "";
+    public List<StreamPreviewInfo> related_streams = null;
+    public boolean hasNextPage = false;
+
+    public List<Throwable> errors = new Vector<>();
+}

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

@@ -1,6 +1,7 @@
 package org.schabi.newpipe.extractor;
 
 import java.io.IOException;
+import java.util.Map;
 
 /**
  * Created by Christian Schabesberger on 28.01.16.
@@ -32,6 +33,14 @@ public interface Downloader {
      * @throws IOException*/
     String download(String siteUrl, String language) throws IOException;
 
+    /**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;
+
     /**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

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

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

@@ -1,9 +1,7 @@
 package org.schabi.newpipe.extractor;
 
 import java.io.IOException;
-import java.util.ArrayList;
 import java.util.List;
-import java.util.Vector;
 
 /**
  * Created by Christian Schabesberger on 10.08.15.
@@ -33,22 +31,22 @@ public abstract class SearchEngine {
         }
     }
 
-    private StreamPreviewInfoCollector collector;
+    private StreamPreviewInfoSearchCollector collector;
 
-    public SearchEngine(StreamUrlIdHandler urlIdHandler, int serviceId) {
-        collector = new StreamPreviewInfoCollector(urlIdHandler, serviceId);
+    public SearchEngine(UrlIdHandler urlIdHandler, int serviceId) {
+        collector = new StreamPreviewInfoSearchCollector(urlIdHandler, serviceId);
     }
 
-    public StreamPreviewInfoCollector getStreamPreviewInfoCollector() {
+    protected StreamPreviewInfoSearchCollector getStreamPreviewInfoSearchCollector() {
         return collector;
     }
 
-    public abstract ArrayList<String> suggestionList(
+    public abstract List<String> suggestionList(
             String query,String contentCountry, Downloader dl)
             throws ExtractionException, IOException;
 
     //Result search(String query, int page);
-    public abstract StreamPreviewInfoCollector search(
+    public abstract StreamPreviewInfoSearchCollector search(
             String query, int page, String contentCountry, Downloader dl)
             throws ExtractionException, IOException;
 }