Merge branch 'master' of github.com:theScrabi/NewPipe

Currently translated at 71.0% (76 of 107 strings)

.travis.yml

@@ -20,6 +20,7 @@ android:
 env:
   global:
     - ADB_INSTALL_TIMEOUT=8 # minutes (2 by default)
+    - GRADLE_OPTS=-Xmx512m # give gradle more memory since it seem to fail otherwise
   matrix:
     - ANDROID_TARGET=android-19  ANDROID_ABI=armeabi-v7a
 
@@ -28,3 +29,5 @@ before_script:
   - emulator -avd test -no-skin -no-audio -no-window &
   - android-wait-for-emulator
   - adb shell input keyevent 82 &
+
+script: ./gradlew --info build connectedCheck

README.md

@@ -1,7 +1,7 @@
 # NewPipe
 NewPipe: A free lightweight Youtube frontend for Android.  
 
-[![NewPipe](app/src/main/res/mipmap-xhdpi/ic_launcher.png)](http://dasochan.nl/newpipe/)
+[![NewPipe](app/src/main/res/mipmap-xhdpi/ic_launcher.png)](https://newpipe.schabi.org)
 
 Project status:
 [![Translation Status](https://hosted.weblate.org/widgets/NewPipe/-/svg-badge.svg)](https://hosted.weblate.org/engage/NewPipe/)
@@ -11,6 +11,12 @@ Project status:
 
 [![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)
+
 ## Screenshots
 
 [<img src="screenshots/screenshot_1.png" width=150>](screenshots/screenshot_1.png)
@@ -36,6 +42,7 @@ NewPipe does not use any Google framework libraries, or the YouTube API. It only
 * Show Next/Related videos
 * Search YouTube in a specific language
 * Orbot/Tor support (no streaming yet, experimental)
+* Watch age restricted material
 
 ### Coming Features
 

app/build.gradle

@@ -8,8 +8,8 @@ android {
         applicationId "org.schabi.newpipe"
         minSdkVersion 15
         targetSdkVersion 23
-        versionCode 14
-        versionName "0.7.5"
+        versionCode 17
+        versionName "0.7.8"
     }
     buildTypes {
         release {
@@ -32,14 +32,15 @@ android {
 
 dependencies {
     compile fileTree(include: ['*.jar'], dir: 'libs')
-    compile 'com.android.support:appcompat-v7:23.1.1'
-    compile 'com.android.support:support-v4:23.1.1'
-    compile 'com.android.support:design:23.1.1'
-    compile 'com.android.support:recyclerview-v7:23.1.1'
+    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'
     compile 'org.jsoup:jsoup:1.8.3'
     compile 'org.mozilla:rhino:1.7.7'
     compile 'info.guardianproject.netcipher:netcipher:1.2'
     compile 'de.hdodenhof:circleimageview:2.0.0'
     compile 'com.nostra13.universalimageloader:universal-image-loader:1.9.5'
     compile 'com.github.nirhart:parallaxscroll:1.0'
+    compile 'com.google.android.exoplayer:exoplayer:r1.5.5'
 }

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

@@ -1,16 +1,21 @@
-package org.schabi.newpipe.services.youtube;
+package org.schabi.newpipe.extractor.youtube;
 
 import android.test.AndroidTestCase;
 
-import org.schabi.newpipe.extractor.VideoPreviewInfo;
+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 the-scrabi on 29.12.15.
+ * Created by Christian Schabesberger on 29.12.15.
  *
  * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
  * YoutubeSearchEngineTest.java is part of NewPipe.
@@ -30,21 +35,23 @@ import java.util.ArrayList;
  */
 
 public class YoutubeSearchEngineTest extends AndroidTestCase {
-    private SearchEngine.Result result;
+    private SearchResult result;
     private ArrayList<String> suggestionReply;
 
     @Override
     public void setUp() throws Exception{
         super.setUp();
-        SearchEngine engine = new YoutubeSearchEngine();
+        SearchEngine engine = ServiceList.getService("Youtube")
+                .getSearchEngineInstance(new Downloader());
 
-        result = engine.search("https://www.youtube.com/results?search_query=bla",
-                0, "de", new Downloader());
-        suggestionReply = engine.suggestionList("hello", new Downloader());
+        result = engine.search("lefloid",
+                0, "de", new Downloader()).getSearchResult();
+        suggestionReply = engine.suggestionList("hello","de",new Downloader());
     }
 
     public void testIfNoErrorOccur() {
-        assertEquals(result.errorMessage, "");
+        assertTrue(result.errors.isEmpty() ? "" : ExceptionUtils.getStackTrace(result.errors.get(0))
+                ,result.errors.isEmpty());
     }
 
     public void testIfListIsNotEmpty() {
@@ -52,37 +59,58 @@ public class YoutubeSearchEngineTest extends AndroidTestCase {
     }
 
     public void testItemsHaveTitle() {
-        for(VideoPreviewInfo i : result.resultList) {
+        for(StreamPreviewInfo i : result.resultList) {
             assertEquals(i.title.isEmpty(), false);
         }
     }
 
     public void testItemsHaveUploader() {
-        for(VideoPreviewInfo i : result.resultList) {
+        for(StreamPreviewInfo i : result.resultList) {
             assertEquals(i.uploader.isEmpty(), false);
         }
     }
 
     public void testItemsHaveRightDuration() {
-        for(VideoPreviewInfo i : result.resultList) {
-            assertTrue(i.duration, i.duration.contains(":"));
+        for(StreamPreviewInfo i : result.resultList) {
+            assertTrue(i.duration >= 0);
         }
     }
 
     public void testItemsHaveRightThumbnail() {
-        for (VideoPreviewInfo i : result.resultList) {
+        for (StreamPreviewInfo i : result.resultList) {
             assertTrue(i.thumbnail_url, i.thumbnail_url.contains("https://"));
         }
     }
 
     public void testItemsHaveRightVideoUrl() {
-        for (VideoPreviewInfo i : result.resultList) {
+        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.size() > 0, true);
+        assertEquals(!suggestionReply.isEmpty(), true);
     }
 
     public void testIfSuggestionsAreValid() {

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

@@ -1,17 +1,19 @@
-package org.schabi.newpipe.services.youtube;
+package org.schabi.newpipe.extractor.youtube;
 
 import android.test.AndroidTestCase;
 
 import org.schabi.newpipe.Downloader;
-import org.schabi.newpipe.extractor.ExctractionException;
+import org.schabi.newpipe.extractor.AbstractVideoInfo;
+import org.schabi.newpipe.extractor.ExtractionException;
 import org.schabi.newpipe.extractor.ParsingException;
-import org.schabi.newpipe.extractor.services.youtube.YoutubeStreamExtractor;
-import org.schabi.newpipe.extractor.VideoInfo;
+import org.schabi.newpipe.extractor.ServiceList;
+import org.schabi.newpipe.extractor.StreamExtractor;
+import org.schabi.newpipe.extractor.VideoStream;
 
 import java.io.IOException;
 
 /**
- * Created by the-scrabi on 30.12.15.
+ * Created by Christian Schabesberger on 30.12.15.
  *
  * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
  * YoutubeVideoExtractorDefault.java is part of NewPipe.
@@ -31,15 +33,11 @@ import java.io.IOException;
  */
 
 public class YoutubeStreamExtractorDefaultTest extends AndroidTestCase {
-    private YoutubeStreamExtractor extractor;
+    private StreamExtractor extractor;
 
-    public void setUp() throws IOException, ExctractionException {
-        /* some anonymus video test
-        extractor = new YoutubeStreamExtractor("https://www.youtube.com/watch?v=FmG385_uUys",
-                new Downloader()); */
-        /* some vevo video (suggested to test against) */
-        extractor = new YoutubeStreamExtractor("https://www.youtube.com/watch?v=YQHsXMglC9A",
-                new Downloader());
+    public void setUp() throws IOException, ExtractionException {
+        extractor = ServiceList.getService("Youtube")
+                .getExtractorInstance("https://www.youtube.com/watch?v=YQHsXMglC9A", new Downloader());
     }
 
     public void testGetInvalidTimeStamp() throws ParsingException {
@@ -47,9 +45,10 @@ public class YoutubeStreamExtractorDefaultTest extends AndroidTestCase {
                 extractor.getTimeStamp() <= 0);
     }
 
-    public void testGetValidTimeStamp() throws ExctractionException, IOException {
-        YoutubeStreamExtractor extractor =
-                new YoutubeStreamExtractor("https://youtu.be/FmG385_uUys?t=174", new Downloader());
+    public void testGetValidTimeStamp() throws ExtractionException, IOException {
+        StreamExtractor extractor =
+                ServiceList.getService("Youtube")
+                        .getExtractorInstance("https://youtu.be/FmG385_uUys?t=174", new Downloader());
         assertTrue(Integer.toString(extractor.getTimeStamp()),
                 extractor.getTimeStamp() == 174);
     }
@@ -70,8 +69,9 @@ public class YoutubeStreamExtractorDefaultTest extends AndroidTestCase {
         assertTrue(extractor.getLength() > 0);
     }
 
-    public void testGetViews() throws ParsingException {
-        assertTrue(extractor.getLength() > 0);
+    public void testGetViewCount() throws ParsingException {
+        assertTrue(Long.toString(extractor.getViewCount()),
+                extractor.getViewCount() > /* specific to that video */ 1224000074);
     }
 
     public void testGetUploadDate() throws ParsingException {
@@ -93,7 +93,7 @@ public class YoutubeStreamExtractorDefaultTest extends AndroidTestCase {
     }
 
     public void testGetVideoStreams() throws ParsingException {
-        for(VideoInfo.VideoStream s : extractor.getVideoStreams()) {
+        for(VideoStream s : extractor.getVideoStreams()) {
             assertTrue(s.url,
                     s.url.contains("https://"));
             assertTrue(s.resolution.length() > 0);
@@ -102,6 +102,10 @@ public class YoutubeStreamExtractorDefaultTest extends AndroidTestCase {
         }
     }
 
+    public void testStreamType() throws ParsingException {
+        assertTrue(extractor.getStreamType() == AbstractVideoInfo.StreamType.VIDEO_STREAM);
+    }
+
     public void testGetDashMpd() throws ParsingException {
         assertTrue(extractor.getDashMpdUrl(),
                 extractor.getDashMpdUrl() != null || !extractor.getDashMpdUrl().isEmpty());

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

@@ -1,15 +1,16 @@
-package org.schabi.newpipe.services.youtube;
+package org.schabi.newpipe.extractor.youtube;
 
 import android.test.AndroidTestCase;
 
 import org.schabi.newpipe.Downloader;
-import org.schabi.newpipe.extractor.ExctractionException;
+import org.schabi.newpipe.extractor.ExtractionException;
+import org.schabi.newpipe.extractor.ServiceList;
 import org.schabi.newpipe.extractor.services.youtube.YoutubeStreamExtractor;
 
 import java.io.IOException;
 
 /**
- * Created by the-scrabi on 30.12.15.
+ * Created by Christian Schabesberger on 30.12.15.
  *
  * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
  * YoutubeVideoExtractorGema.java is part of NewPipe.
@@ -35,12 +36,12 @@ public class YoutubeStreamExtractorGemaTest extends AndroidTestCase {
     // Deaktivate this Test Case bevore uploading it githup, otherwise CI will fail.
     private static final boolean testActive = false;
 
-    public void testGemaError() throws IOException, ExctractionException {
+    public void testGemaError() throws IOException, ExtractionException {
         if(testActive) {
             try {
-                new YoutubeStreamExtractor("https://www.youtube.com/watch?v=3O1_3zBUKM8",
+                ServiceList.getService("Youtube")
+                        .getExtractorInstance("https://www.youtube.com/watch?v=3O1_3zBUKM8",
                         new Downloader());
-                assertTrue("Gema exception not thrown", false);
             } catch(YoutubeStreamExtractor.GemaException ge) {
                 assertTrue(true);
             }

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

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

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

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

@@ -1,23 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="org.schabi.newpipe" >
-    <uses-permission android:name= "android.permission.INTERNET" />
-    <uses-permission android:name= "android.permission.WAKE_LOCK" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+    package="org.schabi.newpipe">
+
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+
     <application
         android:name=".App"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
-        android:logo="@mipmap/ic_launcher"
         android:label="@string/app_name"
+        android:logo="@mipmap/ic_launcher"
         android:theme="@style/AppTheme"
         tools:ignore="AllowBackup">
         <activity
             android:name=".VideoItemListActivity"
-            android:label="@string/app_name"
-            android:configChanges="orientation|screenSize">
+            android:label="@string/app_name">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -27,9 +28,7 @@
         <activity
             android:name=".VideoItemDetailActivity"
             android:label="@string/title_videoitem_detail"
-            android:theme="@style/AppTheme"
-            android:configChanges="orientation|screenSize"
-            android:screenOrientation="portrait">
+            android:theme="@style/AppTheme">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value=".VideoItemListActivity" />
@@ -76,20 +75,40 @@
                 <data android:scheme="vnd.youtube.launch" />
             </intent-filter>
         </activity>
-        <activity android:name=".PlayVideoActivity"
+        <activity
+            android:name=".player.PlayVideoActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:theme="@style/VideoPlayerTheme"
-            android:parentActivityName=".VideoItemDetailActivity"
-            tools:ignore="UnusedAttribute">
+            tools:ignore="UnusedAttribute"/>
+        <service
+            android:name=".player.BackgroundPlayer"
+            android:exported="false"
+            android:label="@string/background_player_name"/>
+		<activity
+            android:name=".player.ExoPlayerActivity"
+            android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
+            android:label="@string/app_name"
+            android:launchMode="singleInstance"
+            android:theme="@style/PlayerTheme">
+            <intent-filter>
+                <action android:name="org.schabi.newpipe.exoplayer.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+
+                <data android:scheme="http" />
+                <data android:scheme="https" />
+                <data android:scheme="content" />
+                <data android:scheme="asset" />
+                <data android:scheme="file" />
+            </intent-filter>
         </activity>
         <service
-            android:name=".BackgroundPlayer"
+            android:name=".player.BackgroundPlayer"
             android:label="@string/background_player_name"
             android:exported="false" />
         <activity
             android:name=".SettingsActivity"
-            android:label="@string/settings_activity_title" >
-        </activity>
+            android:label="@string/settings_activity_title" />
         <activity
             android:name=".PanicResponderActivity"
             android:launchMode="singleInstance"
@@ -97,11 +116,14 @@
             android:theme="@android:style/Theme.NoDisplay">
             <intent-filter>
                 <action android:name="info.guardianproject.panic.action.TRIGGER" />
+
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
         <activity
             android:name=".ExitActivity"
+            android:label="@string/general_error"
             android:theme="@android:style/Theme.NoDisplay" />
+        <activity android:name=".ErrorActivity"/>
     </application>
 </manifest>

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

@@ -12,7 +12,8 @@ import android.view.MenuItem;
 import android.widget.ArrayAdapter;
 
 import org.schabi.newpipe.extractor.MediaFormat;
-import org.schabi.newpipe.extractor.VideoInfo;
+import org.schabi.newpipe.extractor.StreamInfo;
+import org.schabi.newpipe.extractor.VideoStream;
 
 import java.util.List;
 
@@ -75,7 +76,7 @@ class ActionBarHandler {
         }
     }
 
-    public void setupStreamList(final List<VideoInfo.VideoStream> videoStreams) {
+    public void setupStreamList(final List<VideoStream> videoStreams) {
         if (activity != null) {
             selectedVideoStream = 0;
 
@@ -83,7 +84,7 @@ class ActionBarHandler {
             // this array will be shown in the dropdown menu for selecting the stream/resolution.
             String[] itemArray = new String[videoStreams.size()];
             for (int i = 0; i < videoStreams.size(); i++) {
-                VideoInfo.VideoStream item = videoStreams.get(i);
+                VideoStream item = videoStreams.get(i);
                 itemArray[i] = MediaFormat.getNameById(item.format) + " " + item.resolution;
             }
             int defaultResolution = getDefaultResolution(videoStreams);
@@ -108,13 +109,13 @@ class ActionBarHandler {
     }
 
 
-    private int getDefaultResolution(final List<VideoInfo.VideoStream> videoStreams) {
+    private int getDefaultResolution(final List<VideoStream> videoStreams) {
         String defaultResolution = defaultPreferences
                 .getString(activity.getString(R.string.default_resolution_key),
                         activity.getString(R.string.default_resolution_value));
 
         for (int i = 0; i < videoStreams.size(); i++) {
-            VideoInfo.VideoStream item = videoStreams.get(i);
+            VideoStream item = videoStreams.get(i);
             if (defaultResolution.equals(item.resolution)) {
                 return i;
             }

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

@@ -22,10 +22,12 @@ package org.schabi.newpipe;
 
 import android.graphics.Bitmap;
 
+import java.util.List;
+
 /**
  * Singleton:
  * Used to send data between certain Activity/Services within the same process.
- * This can be considered as hack inside the Android universe. **/
+ * This can be considered as an ugly hack inside the Android universe. **/
 public class ActivityCommunicator {
 
     private static ActivityCommunicator activityCommunicator = null;
@@ -39,4 +41,9 @@ 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

@@ -57,7 +57,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 +66,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/Localization.java

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

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

@@ -25,7 +25,6 @@ import android.content.SharedPreferences;
 import android.os.Environment;
 import android.preference.PreferenceManager;
 import android.support.annotation.NonNull;
-import android.util.Log;
 
 import java.io.File;
 
@@ -33,16 +32,16 @@ import java.io.File;
  * Helper for global settings
  */
 public class NewPipeSettings {
+
+    private NewPipeSettings() {
+    }
+
     public static void initSettings(Context context) {
         PreferenceManager.setDefaultValues(context, R.xml.settings, false);
         getVideoDownloadFolder(context);
         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);
     }

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

@@ -119,18 +119,20 @@ public class SettingsActivity extends PreferenceActivity  {
                 public void onSharedPreferenceChanged(SharedPreferences sharedPreferences,
                                                       String key) {
                     Activity a = getActivity();
-                    updateSummary();
+                    if(a != null) {
+                        updateSummary();
 
-                    if (defaultPreferences.getBoolean(USE_TOR_KEY, false)) {
-                        if (OrbotHelper.isOrbotInstalled(a)) {
-                            App.configureTor(true);
-                            OrbotHelper.requestStartTor(a);
+                        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 {
-                            Intent intent = OrbotHelper.getOrbotInstallIntent(a);
-                            a.startActivityForResult(intent, REQUEST_INSTALL_ORBOT);
+                            App.configureTor(false);
                         }
-                    } else {
-                        App.configureTor(false);
                     }
                 }
             };

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

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

@@ -1,13 +1,14 @@
 package org.schabi.newpipe;
 
-import android.content.Context;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import org.schabi.newpipe.extractor.VideoPreviewInfo;
+import org.schabi.newpipe.extractor.AbstractVideoInfo;
+import org.schabi.newpipe.extractor.StreamPreviewInfo;
+
 import com.nostra13.universalimageloader.core.DisplayImageOptions;
 import com.nostra13.universalimageloader.core.ImageLoader;
 
@@ -31,7 +32,7 @@ import com.nostra13.universalimageloader.core.ImageLoader;
  * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-class VideoInfoItemViewCreator {
+public class VideoInfoItemViewCreator {
     private final LayoutInflater inflater;
     private ImageLoader imageLoader = ImageLoader.getInstance();
     private DisplayImageOptions displayImageOptions = new DisplayImageOptions.Builder().cacheInMemory(true).build();
@@ -40,8 +41,10 @@ class VideoInfoItemViewCreator {
         this.inflater = inflater;
     }
 
-    public View getViewFromVideoInfoItem(View convertView, ViewGroup parent, VideoPreviewInfo info, Context context) {
+    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();
@@ -56,20 +59,43 @@ class VideoInfoItemViewCreator {
             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);
-        holder.itemUploaderView.setText(info.uploader);
-        holder.itemDurationView.setText(info.duration);
-        holder.itemViewCountView.setText(shortViewCount(info.view_count));
+        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.itemUploadDateView.setText(info.upload_date + " • ");
         }
 
-        imageLoader.displayImage(info.thumbnail_url, holder.itemThumbnailView, displayImageOptions);
+        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;
     }
@@ -79,16 +105,69 @@ class VideoInfoItemViewCreator {
         public TextView itemVideoTitleView, itemUploaderView, itemDurationView, itemUploadDateView, itemViewCountView;
     }
 
-    private String shortViewCount(Long view_count){
-        if(view_count >= 1000000000){
-            return Long.toString(view_count/1000000000)+"B views";
-        }else if(view_count>=1000000){
-            return Long.toString(view_count/1000000)+"M views";
-        }else if(view_count>=1000){
-            return Long.toString(view_count/1000)+"K views";
+    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(view_count)+" views";
+            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

@@ -73,7 +73,7 @@ public class VideoItemDetailActivity extends AppCompatActivity {
                 StreamingService[] serviceList = ServiceList.getServices();
                 //StreamExtractor videoExtractor = null;
                 for (int i = 0; i < serviceList.length; i++) {
-                    if (serviceList[i].getUrlIdHandler().acceptUrl(videoUrl)) {
+                    if (serviceList[i].getUrlIdHandlerInstance().acceptUrl(videoUrl)) {
                         arguments.putInt(VideoItemDetailFragment.STREAMING_SERVICE, i);
                         currentStreamingService = i;
                         //videoExtractor = ServiceList.getService(i).getExtractorInstance();

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

@@ -1,5 +1,6 @@
 package org.schabi.newpipe;
 
+import android.app.Activity;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.os.Bundle;
@@ -16,8 +17,9 @@ import android.widget.Toast;
 import java.io.IOException;
 import java.util.List;
 
-import org.schabi.newpipe.extractor.ExctractionException;
-import org.schabi.newpipe.extractor.VideoPreviewInfo;
+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;
 
@@ -67,9 +69,9 @@ public class VideoItemListFragment extends ListFragment {
     private boolean loadingNextPage = true;
 
     private class ResultRunnable implements Runnable {
-        private final SearchEngine.Result result;
+        private final SearchResult result;
         private final int requestId;
-        public ResultRunnable(SearchEngine.Result result, int requestId) {
+        public ResultRunnable(SearchResult result, int requestId) {
             this.result = result;
             this.requestId = requestId;
         }
@@ -100,92 +102,60 @@ public class VideoItemListFragment extends ListFragment {
         }
         @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));
-                SearchEngine.Result result = engine.search(query, page, searchLanguage,
-                        new Downloader());
+                result = SearchResult
+                        .getSearchResult(engine, query, page, searchLanguage, new Downloader());
 
-                Log.i(TAG, "language code passed:\""+searchLanguage+"\"");
                 if(runs) {
                     h.post(new ResultRunnable(result, requestId));
                 }
-            } catch(IOException e) {
-                postNewErrorToast(h, R.string.network_error);
-                e.printStackTrace();
-            } catch(ExctractionException ce) {
-                postNewErrorToast(h, R.string.parsing_error);
-                ce.printStackTrace();
-            } catch(Exception e) {
-                postNewErrorToast(h, R.string.general_error);
-                e.printStackTrace();
-            }
-        }
-    }
-/*
-<<<
-    private class LoadThumbsRunnable implements Runnable {
-        private final Vector<String> thumbnailUrlList = new Vector<>();
-        private final Vector<Boolean> downloadedList;
-        final Handler h = new Handler();
-        private volatile boolean run = true;
-        private final int requestId;
-        public LoadThumbsRunnable(Vector<VideoPreviewInfo> videoList,
-                                  Vector<Boolean> downloadedList, int requestId) {
-            for(VideoPreviewInfo item : videoList) {
-                thumbnailUrlList.add(item.thumbnail_url);
-            }
-            this.downloadedList = downloadedList;
-            this.requestId = requestId;
-        }
-        public void terminate() {
-            run = false;
-        }
-        public boolean isRunning() {
-            return run;
-        }
-        @Override
-        public void run() {
-            for(int i = 0; i < thumbnailUrlList.size() && run; i++) {
-                if(!downloadedList.get(i)) {
-                    Bitmap thumbnail;
-                    try {
-                        //todo: make bitmaps not bypass tor
-                        thumbnail = BitmapFactory.decodeStream(
-                                new URL(thumbnailUrlList.get(i)).openConnection().getInputStream());
-                        h.post(new SetThumbnailRunnable(i, thumbnail, requestId));
-                    } catch (Exception e) {
+
+                // 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();
             }
         }
     }
 
-    private class SetThumbnailRunnable implements Runnable {
-        private final int index;
-        private final Bitmap thumbnail;
-        private final int requestId;
-        public SetThumbnailRunnable(int index, Bitmap thumbnail, int requestId) {
-            this.index = index;
-            this.thumbnail = thumbnail;
-            this.requestId = requestId;
-        }
-        @Override
-        public void run() {
-            if(requestId == currentRequestId) {
-                videoListAdapter.updateDownloadedThumbnailList(index);
-                videoListAdapter.setThumbnail(index, thumbnail);
-            }
-        }
-    }
-
-=======
->>>>>>> 6d1b4652fc98e5c2d5e19b0f98ba38a731137a70
-*/
-    public void present(List<VideoPreviewInfo> videoList) {
+    public void present(List<StreamPreviewInfo> videoList) {
         mode = PRESENT_VIDEOS_MODE;
         setListShown(true);
         getListView().smoothScrollToPosition(0);
@@ -215,7 +185,7 @@ public class VideoItemListFragment extends ListFragment {
     private void startSearch(String query, int page) {
         currentRequestId++;
         terminateThreads();
-        searchRunnable = new SearchRunnable(streamingService.getSearchEngineInstance(),
+        searchRunnable = new SearchRunnable(streamingService.getSearchEngineInstance(new Downloader()),
                                             query, page, currentRequestId);
         searchThread = new Thread(searchRunnable);
         searchThread.start();
@@ -225,28 +195,29 @@ public class VideoItemListFragment extends ListFragment {
         this.streamingService = streamingService;
     }
 
-    private void updateListOnResult(SearchEngine.Result result, int requestId) {
+    private void updateListOnResult(SearchResult result, int requestId) {
         if(requestId == currentRequestId) {
             setListShown(true);
-            if (result.resultList.isEmpty()) {
-                Toast.makeText(getActivity(), result.errorMessage, Toast.LENGTH_LONG).show();
-            } else {
-                if (!result.suggestion.isEmpty()) {
-                    Toast.makeText(getActivity(), getString(R.string.did_you_mean) + result.suggestion + " ?",
-                            Toast.LENGTH_LONG).show();
-                }
-                updateList(result.resultList);
+            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<VideoPreviewInfo> list) {
+    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;
@@ -373,14 +344,25 @@ public class VideoItemListFragment extends ListFragment {
         mActivatedPosition = position;
     }
 
-    private void postNewErrorToast(Handler h, final int stringResource) {
+    private void postNewErrorToast(Handler h, final String message) {
         h.post(new Runnable() {
             @Override
             public void run() {
                 setListShown(true);
-                Toast.makeText(getActivity(), getString(R.string.network_error),
+                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

@@ -8,7 +8,7 @@ import android.view.ViewGroup;
 import android.widget.BaseAdapter;
 import android.widget.ListView;
 
-import org.schabi.newpipe.extractor.VideoPreviewInfo;
+import org.schabi.newpipe.extractor.StreamPreviewInfo;
 
 import java.util.List;
 import java.util.Vector;
@@ -36,7 +36,7 @@ import java.util.Vector;
 class VideoListAdapter extends BaseAdapter {
     private final Context context;
     private final VideoInfoItemViewCreator viewCreator;
-    private Vector<VideoPreviewInfo> videoList = new Vector<>();
+    private Vector<StreamPreviewInfo> videoList = new Vector<>();
     private final ListView listView;
 
     public VideoListAdapter(Context context, VideoItemListFragment videoListFragment) {
@@ -47,7 +47,7 @@ class VideoListAdapter extends BaseAdapter {
         this.context = context;
     }
 
-    public void addVideoList(List<VideoPreviewInfo> videos) {
+    public void addVideoList(List<StreamPreviewInfo> videos) {
         videoList.addAll(videos);
         notifyDataSetChanged();
     }
@@ -57,7 +57,7 @@ class VideoListAdapter extends BaseAdapter {
         notifyDataSetChanged();
     }
 
-    public Vector<VideoPreviewInfo> getVideoList() {
+    public Vector<StreamPreviewInfo> getVideoList() {
         return videoList;
     }
 
@@ -78,7 +78,7 @@ class VideoListAdapter extends BaseAdapter {
 
     @Override
     public View getView(int position, View convertView, ViewGroup parent) {
-        convertView = viewCreator.getViewFromVideoInfoItem(convertView, parent, videoList.get(position), context);
+        convertView = viewCreator.getViewFromVideoInfoItem(convertView, parent, videoList.get(position));
 
         if(listView.isItemChecked(position)) {
             convertView.setBackgroundColor(ContextCompat.getColor(context,R.color.light_youtube_primary_color));

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

@@ -1,4 +1,4 @@
-package org.schabi.newpipe;
+package org.schabi.newpipe.download;
 
 import android.Manifest;
 import android.app.Dialog;
@@ -16,6 +16,10 @@ import android.support.v7.app.AlertDialog;
 import android.util.Log;
 import android.widget.Toast;
 
+import org.schabi.newpipe.App;
+import org.schabi.newpipe.NewPipeSettings;
+import org.schabi.newpipe.R;
+
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
@@ -71,7 +75,8 @@ public class DownloadDialog extends DialogFragment {
                         case 0:     // Video
                             download(arguments.getString(VIDEO_URL),
                                     title,
-                                    arguments.getString(FILE_SUFFIX_VIDEO), context);
+                                    arguments.getString(FILE_SUFFIX_VIDEO),
+                                    NewPipeSettings.getVideoDownloadFolder(context),context);
                             break;
                         default:
                             Log.d(TAG, "lolz");
@@ -89,7 +94,8 @@ public class DownloadDialog extends DialogFragment {
                         case 0:     // Audio
                             download(arguments.getString(AUDIO_URL),
                                     title,
-                                    arguments.getString(FILE_SUFFIX_AUDIO), context);
+                                    arguments.getString(FILE_SUFFIX_AUDIO),
+                                    NewPipeSettings.getAudioDownloadFolder(context),context);
                             break;
                         default:
                             Log.d(TAG, "lolz");
@@ -107,12 +113,14 @@ public class DownloadDialog extends DialogFragment {
                         case 0:     // Video
                             download(arguments.getString(VIDEO_URL),
                                     title,
-                                    arguments.getString(FILE_SUFFIX_VIDEO), context);
+                                    arguments.getString(FILE_SUFFIX_VIDEO),
+                                    NewPipeSettings.getVideoDownloadFolder(context), context);
                             break;
                         case 1:
                             download(arguments.getString(AUDIO_URL),
                                     title,
-                                    arguments.getString(FILE_SUFFIX_AUDIO), context);
+                                    arguments.getString(FILE_SUFFIX_AUDIO),
+                                    NewPipeSettings.getAudioDownloadFolder(context), context);
                             break;
                         default:
                             Log.d(TAG, "lolz");
@@ -130,7 +138,7 @@ public class DownloadDialog extends DialogFragment {
     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<String> ();
+        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
@@ -141,8 +149,8 @@ public class DownloadDialog extends DialogFragment {
         return nameToTest;
     }
 
-    private void download(String url, String title, String fileSuffix, Context context) {
-        File downloadDir = NewPipeSettings.getDownloadFolder();
+    private void download(String url, String title,
+                          String fileSuffix, File downloadDir, Context context) {
 
         if(!downloadDir.exists()) {
             //attempt to create directory
@@ -162,6 +170,8 @@ public class DownloadDialog extends DialogFragment {
         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);

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 HEVEN SAKE !!! DO NOT SIMPLY USE ASYNCTASK. MAKE THIS A PROPER SERVICE !!!
 public class FileDownloader extends AsyncTask<Void, Integer, Void> {
     public static final String TAG = "FileDownloader";
 
@@ -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/AbstractVideoInfo.java

@@ -20,8 +20,19 @@ import android.graphics.Bitmap;
  * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-/**Common properties between VideoInfo and VideoPreviewInfo.*/
+/**Common properties between StreamInfo and StreamPreviewInfo.*/
 public abstract class AbstractVideoInfo {
+    public static enum StreamType {
+        NONE,   // placeholder to check if stream type was checked or not
+        VIDEO_STREAM,
+        AUDIO_STREAM,
+        LIVE_STREAM,
+        AUDIO_LIVE_STREAM,
+        FILE
+    }
+
+    public StreamType stream_type;
+    public int service_id = -1;
     public String id = "";
     public String title = "";
     public String uploader = "";

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

@@ -0,0 +1,46 @@
+package org.schabi.newpipe.extractor;
+
+/**
+ * Created by Christian Schabesberger on 04.03.16.
+ *
+ * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
+ * AudioStream.java is part of NewPipe.
+ *
+ * NewPipe is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * NewPipe is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+public class AudioStream {
+    public String url = "";
+    public int format = -1;
+    public int bandwidth = -1;
+    public int sampling_rate = -1;
+
+    public AudioStream(String url, int format, int bandwidth, int samplingRate) {
+        this.url = url; this.format = format;
+        this.bandwidth = bandwidth; this.sampling_rate = samplingRate;
+    }
+
+    // reveals wether two streams are the same, but have diferent urls
+    public boolean equalStats(AudioStream cmp) {
+        return format == cmp.format
+                && bandwidth == cmp.bandwidth
+                && sampling_rate == cmp.sampling_rate;
+    }
+
+    // revelas wether 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/DashMpdParser.java

@@ -31,13 +31,16 @@ import java.util.Vector;
 
 public class DashMpdParser {
 
+    private DashMpdParser() {
+    }
+
     static class DashMpdParsingException extends ParsingException {
         DashMpdParsingException(String message, Exception e) {
             super(message, e);
         }
     }
 
-    public static List<VideoInfo.AudioStream> getAudioStreams(String dashManifestUrl,
+    public static List<AudioStream> getAudioStreams(String dashManifestUrl,
                                                              Downloader downloader)
             throws DashMpdParsingException {
         String dashDoc;
@@ -46,7 +49,7 @@ public class DashMpdParser {
         } catch(IOException ioe) {
             throw new DashMpdParsingException("Could not get dash mpd: " + dashManifestUrl, ioe);
         }
-        Vector<VideoInfo.AudioStream> audioStreams = new Vector<>();
+        Vector<AudioStream> audioStreams = new Vector<>();
         try {
             XmlPullParser parser = Xml.newPullParser();
             parser.setInput(new StringReader(dashDoc));
@@ -83,7 +86,7 @@ public class DashMpdParser {
                             } else if(currentMimeType.equals(MediaFormat.M4A.mimeType)) {
                                 format = MediaFormat.M4A.id;
                             }
-                            audioStreams.add(new VideoInfo.AudioStream(parser.getText(),
+                            audioStreams.add(new AudioStream(parser.getText(),
                                     format, currentBandwidth, currentSamplingRate));
                         }
                         break;

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

@@ -4,7 +4,7 @@ package org.schabi.newpipe.extractor;
  * Created by Christian Schabesberger on 30.01.16.
  *
  * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
- * ExctractionException.java is part of NewPipe.
+ * ExtractionException.java is part of NewPipe.
  *
  * NewPipe is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -20,18 +20,16 @@ package org.schabi.newpipe.extractor;
  * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-public class ExctractionException extends Exception {
-    public ExctractionException() {}
-
-    public ExctractionException(String message) {
+public class ExtractionException extends Exception {
+    public ExtractionException(String message) {
         super(message);
     }
 
-    public ExctractionException(Throwable cause) {
+    public ExtractionException(Throwable cause) {
         super(cause);
     }
 
-    public ExctractionException(String message, Throwable cause) {
+    public ExtractionException(String message, Throwable cause) {
         super(message, cause);
     }
 }

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

@@ -1,5 +1,7 @@
 package org.schabi.newpipe.extractor;
 
+import android.util.Log;
+
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import java.util.HashMap;
@@ -30,6 +32,9 @@ import java.util.regex.Pattern;
 /** avoid using regex !!! */
 public class Parser {
 
+    private Parser() {
+    }
+
     public static class RegexException extends ParsingException {
         public RegexException(String message) {
             super(message);
@@ -52,8 +57,12 @@ public class Parser {
     public static Map<String, String> compatParseMap(final String input) throws UnsupportedEncodingException {
         Map<String, String> map = new HashMap<>();
         for(String arg : input.split("&")) {
-            String[] split_arg = arg.split("=");
-            map.put(split_arg[0], URLDecoder.decode(split_arg[1], "UTF-8"));
+            String[] splitArg = arg.split("=");
+            if(splitArg.length > 1) {
+                map.put(splitArg[0], URLDecoder.decode(splitArg[1], "UTF-8"));
+            } else {
+                map.put(splitArg[0], "");
+            }
         }
         return map;
     }

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

@@ -21,14 +21,10 @@ package org.schabi.newpipe.extractor;
  */
 
 
-public class ParsingException extends ExctractionException {
-    public ParsingException() {}
+public class ParsingException extends ExtractionException {
     public ParsingException(String message) {
         super(message);
     }
-    public ParsingException(Throwable cause) {
-        super(cause);
-    }
     public ParsingException(String message, Throwable cause) {
         super(message, cause);
     }

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

@@ -26,17 +26,29 @@ import java.util.Vector;
  */
 
 @SuppressWarnings("ALL")
-public interface SearchEngine {
-    class Result {
-        public String errorMessage = "";
-        public String suggestion = "";
-        public final List<VideoPreviewInfo> resultList = new Vector<>();
+public abstract class SearchEngine {
+    public static class NothingFoundException extends ExtractionException {
+        public NothingFoundException(String message) {
+            super(message);
+        }
     }
 
-    ArrayList<String> suggestionList(String query, Downloader dl)
-            throws ExctractionException, IOException;
+    private StreamPreviewInfoCollector collector;
+
+    public SearchEngine(StreamUrlIdHandler urlIdHandler, int serviceId) {
+        collector = new StreamPreviewInfoCollector(urlIdHandler, serviceId);
+    }
+
+    public StreamPreviewInfoCollector getStreamPreviewInfoCollector() {
+        return collector;
+    }
+
+    public abstract ArrayList<String> suggestionList(
+            String query,String contentCountry, Downloader dl)
+            throws ExtractionException, IOException;
 
     //Result search(String query, int page);
-    Result search(String query, int page, String contentCountry, Downloader dl)
-            throws ExctractionException, IOException;
+    public abstract StreamPreviewInfoCollector search(
+            String query, int page, String contentCountry, Downloader dl)
+            throws ExtractionException, IOException;
 }