get down to support lib 25.1.0

25.2.0 is not yet supported by fdroid

.github/CONTRIBUTING.md

@@ -0,0 +1,39 @@
+NewPipe contribution guidelines
+===============================
+
+READ THIS GUIDELINES CAREFULLY BEFORE CONTRIBUTING.
+
+## Crash reporting
+
+Do not report crashes in the GitHub issue tracker. NewPipe has an automated crash report system that will ask you to send a report if a crash occures.
+
+## Issue reporting/feature request
+
+* Search the [existing issues](https://github.com/theScrabi/NewPipe/issues) first to make sure your issue/feature hasn't been reported/requested before
+* Check if this issue/feature is already fixed/implemented in the repository
+* If you are an android/java developer you are always welcome to fix/implement an issue/a feature yourself
+
+## Bugfixing
+* If you want to help NewPipe getting bug free, you can send me a mail to tnp@newpipe.schabi.org to let me know that you intent to help, and than register at our [sentry](https://support.schabi.org) setup. 
+
+## Translation
+
+* NewPipe can be translated on [weblate](https://hosted.weblate.org/projects/newpipe/strings/)
+
+## Code contribution
+
+* Stick to NewPipe style guidelines (just look the other code and than do it the same way :) )
+* Do not bring nonfree software/binary blobs into the project (keep it google free)
+* Stick to [f-droid contribution guidelines](https://f-droid.org/wiki/page/Inclusion_Policy)
+* Make changes on a separate branch, not on the master branch (Feature-branching)
+* When submitting changes, you agree that your code will be licensed under GPLv3
+* Please test (compile and run) your code before you submit changes!!!
+* Try to figure out you selves why CI fails, or why a merge request collides
+* Please maintain your code after you contributed it.
+* Respond yourselves if someone request changes or notifies issues
+
+## Communication
+
+* WE DO NOW HAVE A MAILING LIST: [newpipe@list.schabi.org](https://list.schabi.org/cgi-bin/mailman/listinfo/newpipe).
+* If you want to get in contact with me or one of our other contributors you can send me an email at tnp(at)schabi.org
+* Feel free to post suggestions, changes, ideas etc!

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,2 @@
+- [ ] I carefully read the [contribution guidelines](https://github.com/TeamNewPipe/NewPipe/blob/HEAD/.github/CONTRIBUTING.md) and agree to them.
+- [ ] I checked if the issue/feature exists in the latest version.

.github/PULL_REQUEST_TEAMPLATE.md

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

.gitignore

@@ -7,3 +7,5 @@
 /app/app.iml
 /.idea
 /*.iml
+gradle.properties
+*~

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "app/src/main/java/org/schabi/newpipe/extractor"]
+	path = app/src/main/java/org/schabi/newpipe/extractor
+	url = https://github.com/TeamNewPipe/NewPipeExtractor.git

.travis.yml

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

README.md

@@ -1,20 +1,29 @@
+WARNING: PUTTING NEWPIPE OR ANY FORK OF IT INTO GOOGLE PLAYSTORE VIOLATES THEIR TERMS OF CONDITIONS.
+
 # NewPipe
 NewPipe: A free lightweight Youtube frontend for Android.  
 
-[![NewPipe](app/src/main/res/mipmap-xhdpi/ic_launcher.png)](http://dasochan.nl/newpipe/)
+[![NewPipe](app/src/main/res/mipmap-xhdpi/ic_launcher.png)](https://newpipe.schabi.org)
+[![F-Droid](https://f-droid.org/wiki/images/0/06/F-Droid-button_get-it-on.png)](https://f-droid.org/repository/browse/?fdfilter=newpipe&fdid=org.schabi.newpipe)
+
 
 Project status:
 [![Translation Status](https://hosted.weblate.org/widgets/NewPipe/-/svg-badge.svg)](https://hosted.weblate.org/engage/NewPipe/)
-[![Build Status](https://travis-ci.org/theScrabi/NewPipe.svg)](https://travis-ci.org/theScrabi/NewPipe)
+[![Build Status](https://travis-ci.org/TeamNewPipe/NewPipe.svg)](https://travis-ci.org/TeamNewPipe/NewPipe)
 
-## Get NewPipe
+## Donate
+![Bitcoin](https://bitcoin.org/img/icons/logotop.svg)
+![BitcoinQR](assets/16A9J59ahMRqkLSZjhYj33n9j3fMztFxnh.png)
 
-[![F-Droid](https://f-droid.org/wiki/images/0/06/F-Droid-button_get-it-on.png)](https://f-droid.org/repository/browse/?fdfilter=newpipe&fdid=org.schabi.newpipe)
+`16A9J59ahMRqkLSZjhYj33n9j3fMztFxnh`
 
 ## Screenshots
 
-[<img src="assets/screenshot_1.png" width=200>](assets/screenshot_1.png)
-[<img src="assets/screenshot_2.png" width=200>](assets/screenshot_2.png)
+[<img src="screenshots/screenshot_1.png" width=150>](screenshots/screenshot_1.png)
+[<img src="screenshots/screenshot_2.png" width=150>](screenshots/screenshot_2.png)
+[<img src="screenshots/screenshot_3.png" width=150>](screenshots/screenshot_3.png)
+[<img src="screenshots/screenshot_4.png" width=150>](screenshots/screenshot_4.png)
+[<img src="screenshots/screenshot_5.png" width=150>](screenshots/screenshot_5.png)
 
 ## Description
 
@@ -25,25 +34,26 @@ NewPipe does not use any Google framework libraries, or the YouTube API. It only
 * Search videos
 * Display general information about a video
 * Watch YouTube videos
-* Listen to YouTube videos (audio only streaming)
+* Listen to YouTube videos (experimental)
 * Select the streaming player to watch the video with
-* Download videos (working, but it could be better)
-* Download audio only (working, but it could be better)
-* Open a video in Kodi
+* Download videos 
+* Download audio only * Open a video in Kodi
 * Show Next/Related videos
 * Search YouTube in a specific language
+* Watch age restricted material
+* Display general information about channels
+* Search channels
 
 ### Coming Features
 
-* Improved Downloading
+* Orbot/Tor support
 * Bookmarks
 * View history
 * Search history
-* Search channels
-* Display general information about channels
 * Subscribe to channels
 * Watch videos from a channel
 * Search/Watch Playlists
+* Queeing videos
 * ... and many more
 
 ### Multiservice support
@@ -53,7 +63,7 @@ Although NewPipe only supports YouTube at the moment, it's designed to support m
 Whether you have ideas, translation, design changes, code cleaning, or real heavy code changes, help is always welcome.
 The more is done the better it gets!
 
-Join our [Slack group](http://invite.chschtsch.ml/) if you like to get involved.
+If you'd like to get involved, check our [contribution notes](.github/CONTRIBUTING.md).
 
 ## License
 [![GNU GPLv3 Image](https://www.gnu.org/graphics/gplv3-127x51.png)](http://www.gnu.org/licenses/gpl-3.0.en.html)  

app/build.gradle

@@ -1,15 +1,15 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.1"
+    compileSdkVersion 25
+    buildToolsVersion '23.0.3'
 
     defaultConfig {
         applicationId "org.schabi.newpipe"
         minSdkVersion 15
-        targetSdkVersion 23
-        versionCode 7
-        versionName "0.6.1"
+        targetSdkVersion 25
+        versionCode 25
+        versionName "0.8.11"
     }
     buildTypes {
         release {
@@ -17,20 +17,36 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
-    
+
     lintOptions {
         checkReleaseBuilds false
         // Or, if you prefer, you can continue to check for errors in release builds,
         // but continue the build even when errors are found:
         abortOnError false
     }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_7
+        targetCompatibility JavaVersion.VERSION_1_7
+    }
 }
 
 dependencies {
-    compile fileTree(include: ['*.jar'], dir: 'libs')
-    compile 'com.android.support:appcompat-v7:23.1.1'
-    compile 'com.android.support:support-v4:23.1.1'
-    compile 'com.android.support:design:23.1.1'
+    testCompile 'junit:junit:4.12'
+    compile 'com.android.support:appcompat-v7:25.1.0'
+    compile 'com.android.support:support-v4:25.1.0'
+    compile 'com.android.support:design:25.1.0'
+    compile 'com.android.support:recyclerview-v7:25.1.0'
     compile 'org.jsoup:jsoup:1.8.3'
     compile 'org.mozilla:rhino:1.7.7'
+    compile 'info.guardianproject.netcipher:netcipher:1.2'
+    compile 'de.hdodenhof:circleimageview:2.0.0'
+    compile 'com.nostra13.universalimageloader:universal-image-loader:1.9.5'
+    compile 'com.github.nirhart:parallaxscroll:1.0'
+    compile 'com.google.android.exoplayer:exoplayer:r1.5.5'
+    compile 'com.google.code.gson:gson:2.4'
+    compile 'com.nononsenseapps:filepicker:3.0.0'
+    compile 'ch.acra:acra:4.9.0'
+    testCompile 'junit:junit:4.12'
+    testCompile 'org.mockito:mockito-core:1.10.19'
+    testCompile 'org.json:json:20160810'
 }

app/src/main/AndroidManifest.xml

@@ -1,21 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="org.schabi.newpipe" >
+    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" />
 
-    <uses-permission android:name= "android.permission.INTERNET" />
-    <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:name=".MainActivity"
+            android:label="@string/app_name">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -23,60 +26,155 @@
             </intent-filter>
         </activity>
         <activity
-            android:name=".VideoItemDetailActivity"
+            android:name=".detail.VideoItemDetailActivity"
             android:label="@string/title_videoitem_detail"
+            android:launchMode="singleTask"
             android:theme="@style/AppTheme">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
-                android:value=".VideoItemListActivity" />
+                android:value=".MainActivity" />
+        </activity>
+        <activity
+            android:name=".player.PlayVideoActivity"
+            android:configChanges="orientation|keyboardHidden|screenSize"
+            android:theme="@style/VideoPlayerTheme"
+            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="android.intent.action.VIEW"/>
+                <action android:name="org.schabi.newpipe.exoplayer.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+
+                <data android:scheme="http" />
+                <data android:scheme="https" />
+                <data android:scheme="content" />
+                <data android:scheme="asset" />
+                <data android:scheme="file" />
+            </intent-filter>
+        </activity>
+
+        <service
+            android:name=".player.BackgroundPlayer"
+            android:exported="false"
+            android:label="@string/background_player_name" />
+
+        <activity
+            android:name=".settings.SettingsActivity"
+            android:label="@string/settings_activity_title" />
+        <activity
+            android:name=".PanicResponderActivity"
+            android:launchMode="singleInstance"
+            android:noHistory="true"
+            android:theme="@android:style/Theme.NoDisplay">
+            <intent-filter>
+                <action android:name="info.guardianproject.panic.action.TRIGGER" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+        <activity
+            android:name=".ExitActivity"
+            android:label="@string/general_error"
+            android:theme="@android:style/Theme.NoDisplay" />
+        <activity android:name=".report.ErrorActivity" />
+
+        <!-- giga get related -->
+        <activity
+            android:name=".download.DownloadActivity"
+            android:label="@string/app_name"
+            android:launchMode="singleTask"
+            android:theme="@style/AppTheme" />
+
+        <service android:name="us.shandian.giga.service.DownloadManagerService" />
+
+        <activity
+            android:name="com.nononsenseapps.filepicker.FilePickerActivity"
+            android:label="@string/app_name"
+            android:launchMode="singleTop"
+            android:theme="@style/FilePickerTheme"/>
+        <activity
+            android:name=".ChannelActivity"
+            android:launchMode="singleTask" />
+        <activity
+            android:name=".ReCaptchaActivity"
+            android:label="@string/reCaptchaActivity" />
+
+        <provider
+            android:name="android.support.v4.content.FileProvider"
+            android:authorities="${applicationId}.provider"
+            android:exported="false"
+            android:grantUriPermissions="true">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/provider_paths" />
+        </provider>
+
+        <activity android:name=".RouterActivity"
+            android:theme="@android:style/Theme.NoDisplay">
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <action android:name="android.media.action.MEDIA_PLAY_FROM_SEARCH" />
+                <action android:name="android.nfc.action.NDEF_DISCOVERED" />
+
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
 
-                <data
-                    android:host="youtube.com"
-                    android:scheme="http"
-                    android:pathPattern="/?*#*/*watch"/>
-                <data
-                    android:host="youtube.com"
-                    android:scheme="https"
-                    android:pathPattern="/?*#*/*watch"/>
-                <data
-                    android:host="www.youtube.com"
-                    android:scheme="http"
-                    android:pathPattern="/?*#*/*watch"/>
-                <data
-                    android:host="www.youtube.com"
-                    android:scheme="https"
-                    android:pathPattern="/?*#*/*watch"/>
-                <data
-                    android:host="m.youtube.com"
-                    android:scheme="http"
-                    android:pathPattern="/?*#*/*watch"/>
-                <data
-                    android:host="m.youtube.com"
-                    android:scheme="https"
-                    android:pathPattern="/?*#*/*watch"/>
-                <data
-                    android:host="youtu.be"
-                    android:scheme="https"
-                    android:pathPrefix="/"/>
-                <data
-                    android:host="youtu.be"
-                    android:scheme="http"
-                    android:pathPrefix="/"/>
+                <data android:scheme="http" />
+                <data android:scheme="https" />
+                <data android:host="youtube.com" />
+                <data android:host="m.youtube.com" />
+                <data android:host="www.youtube.com" />
+                <!-- video prefix -->
+                <data android:pathPrefix="/v/" />
+                <data android:pathPrefix="/watch" />
+                <data android:pathPrefix="/attribution_link" />
+                <!-- channel prefix -->
+                <data android:pathPrefix="/channel/"/>
+                <data android:pathPrefix="/user/"/>
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <action android:name="android.media.action.MEDIA_PLAY_FROM_SEARCH" />
+                <action android:name="android.nfc.action.NDEF_DISCOVERED" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data android:scheme="http" />
+                <data android:scheme="https" />
+                <data android:host="youtu.be" />
+                <data android:pathPrefix="/" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <action android:name="android.media.action.MEDIA_PLAY_FROM_SEARCH" />
+                <action android:name="android.nfc.action.NDEF_DISCOVERED" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data android:scheme="vnd.youtube" />
+                <data android:scheme="vnd.youtube.launch" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.SEND" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+
+                <data android:mimeType="text/plain" />
             </intent-filter>
         </activity>
-        <activity android:name=".PlayVideoActivity"
-            android:configChanges="orientation|keyboardHidden|screenSize"
-            android:theme="@style/VideoPlayerTheme"
-            android:parentActivityName=".VideoItemDetailActivity"
-            tools:ignore="UnusedAttribute">
-        </activity>
-        <activity
-            android:name=".SettingsActivity"
-            android:label="@string/title_activity_settings" >
-        </activity>
     </application>
-</manifest>
+
+</manifest>

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

@@ -1,329 +0,0 @@
-package org.schabi.newpipe;
-
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.net.Uri;
-import android.os.Bundle;
-import android.preference.PreferenceManager;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.app.AppCompatActivity;
-import android.util.Log;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-import android.widget.ArrayAdapter;
-
-/**
- * Created by Christian Schabesberger on 18.08.15.
- *
- * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
- * DetailsMenuHandler.java is part of NewPipe.
- *
- * NewPipe is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * NewPipe is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-class ActionBarHandler {
-    private static final String TAG = ActionBarHandler.class.toString();
-    private static final String KORE_PACKET = "org.xbmc.kore";
-
-    private String websiteUrl = "";
-    private AppCompatActivity activity;
-    private VideoInfo.VideoStream[] videoStreams = null;
-    private VideoInfo.AudioStream audioStream = null;
-    private int selectedStream = -1;
-    private String videoTitle = "";
-
-    private SharedPreferences defaultPreferences = null;
-    private int startPosition;
-
-    @SuppressWarnings("deprecation")
-    private class FormatItemSelectListener implements ActionBar.OnNavigationListener {
-        @Override
-        public boolean onNavigationItemSelected(int itemPosition, long itemId) {
-            selectFormatItem((int)itemId);
-            return true;
-        }
-    }
-
-    public ActionBarHandler(AppCompatActivity activity) {
-        this.activity = activity;
-    }
-
-    @SuppressWarnings({"deprecation", "ConstantConditions"})
-    public void setupNavMenu(AppCompatActivity activity) {
-        this.activity = activity;
-        try {
-            activity.getSupportActionBar().setNavigationMode(ActionBar.NAVIGATION_MODE_LIST);
-        } catch(NullPointerException e) {
-            e.printStackTrace();
-        }
-    }
-
-    @SuppressWarnings("deprecation")
-    public void setStreams(VideoInfo.VideoStream[] videoStreams, VideoInfo.AudioStream[] audioStreams) {
-        this.videoStreams = videoStreams;
-        selectedStream = 0;
-        defaultPreferences = PreferenceManager.getDefaultSharedPreferences(activity);
-        String[] itemArray = new String[videoStreams.length];
-        String defaultResolution = defaultPreferences
-                .getString(activity.getString(R.string.defaultResolutionPreference),
-                        activity.getString(R.string.defaultResolutionListItem));
-        int defaultResolutionPos = 0;
-
-        for(int i = 0; i < videoStreams.length; i++) {
-            itemArray[i] = MediaFormat.getNameById(videoStreams[i].format) + " " + videoStreams[i].resolution;
-            if(defaultResolution.equals(videoStreams[i].resolution)) {
-                defaultResolutionPos = i;
-            }
-        }
-
-        ArrayAdapter<String> itemAdapter = new ArrayAdapter<>(activity.getBaseContext(),
-                android.R.layout.simple_spinner_dropdown_item, itemArray);
-        if(activity != null) {
-            ActionBar ab = activity.getSupportActionBar();
-                assert ab != null : "Could not get actionbar";
-                ab.setListNavigationCallbacks(itemAdapter
-                        , new FormatItemSelectListener());
-
-            ab.setSelectedNavigationItem(defaultResolutionPos);
-        }
-
-        // set audioStream
-        audioStream = null;
-        String preferedFormat = defaultPreferences
-                .getString(activity.getString(R.string.defaultAudioFormatPreference), "webm");
-        if(preferedFormat.equals("webm")) {
-            for(VideoInfo.AudioStream s : audioStreams) {
-                if(s.format == MediaFormat.WEBMA.id) {
-                    audioStream = s;
-                }
-            }
-        } else if(preferedFormat.equals("m4a")){
-            for(VideoInfo.AudioStream s : audioStreams) {
-                if(s.format == MediaFormat.M4A.id &&
-                        (audioStream == null || audioStream.bandwidth > s.bandwidth)) {
-                    audioStream = s;
-                }
-            }
-        }
-    }
-
-    private void selectFormatItem(int i) {
-        selectedStream = i;
-    }
-
-    public void setupMenu(Menu menu, MenuInflater inflater) {
-        // CAUTION set item properties programmatically otherwise it would not be accepted by
-        // appcompat itemsinflater.inflate(R.menu.videoitem_detail, menu);
-
-        defaultPreferences = PreferenceManager.getDefaultSharedPreferences(activity);
-
-        inflater.inflate(R.menu.videoitem_detail, menu);
-        MenuItem castItem = menu.findItem(R.id.action_play_with_kodi);
-
-        castItem.setVisible(defaultPreferences
-                .getBoolean(activity.getString(R.string.showPlayWidthKodiPreference), false));
-    }
-
-    public boolean onItemSelected(MenuItem item) {
-        int id = item.getItemId();
-        switch(id) {
-            case R.id.menu_item_share:
-                if(!videoTitle.isEmpty()) {
-                    Intent intent = new Intent();
-                    intent.setAction(Intent.ACTION_SEND);
-                    intent.putExtra(Intent.EXTRA_TEXT, websiteUrl);
-                    intent.setType("text/plain");
-                    activity.startActivity(Intent.createChooser(intent, activity.getString(R.string.shareDialogTitle)));
-                }
-                return true;
-            case R.id.menu_item_openInBrowser: {
-                openInBrowser();
-            }
-                return true;
-            case R.id.menu_item_download:
-                downloadVideo();
-                return true;
-            case R.id.action_settings: {
-                Intent intent = new Intent(activity, SettingsActivity.class);
-                activity.startActivity(intent);
-            }
-            break;
-            case R.id.action_play_with_kodi:
-                playWithKodi();
-                return true;
-            case R.id.menu_item_play_audio:
-                playAudio();
-                return true;
-            default:
-                Log.e(TAG, "Menu Item not known");
-        }
-        return false;
-    }
-
-    public void setVideoInfo(String websiteUrl, String videoTitle) {
-        this.websiteUrl = websiteUrl;
-        this.videoTitle = videoTitle;
-    }
-
-    public void playVideo() {
-        // ----------- THE MAGIC MOMENT ---------------
-        if(!videoTitle.isEmpty()) {
-            if (PreferenceManager.getDefaultSharedPreferences(activity)
-                    .getBoolean(activity.getString(R.string.useExternalPlayer), false)) {
-
-                // External Player
-                Intent intent = new Intent();
-                try {
-                    intent.setAction(Intent.ACTION_VIEW);
-
-                    intent.setDataAndType(Uri.parse(videoStreams[selectedStream].url),
-                            MediaFormat.getMimeById(videoStreams[selectedStream].format));
-                    intent.putExtra(Intent.EXTRA_TITLE, videoTitle);
-                    intent.putExtra("title", videoTitle);
-
-                    activity.startActivity(intent);      // HERE !!!
-                } catch (Exception e) {
-                    e.printStackTrace();
-                    AlertDialog.Builder builder = new AlertDialog.Builder(activity);
-                    builder.setMessage(R.string.noPlayerFound)
-                            .setPositiveButton(R.string.installStreamPlayer, new DialogInterface.OnClickListener() {
-                                @Override
-                                public void onClick(DialogInterface dialog, int which) {
-                                    Intent intent = new Intent();
-                                    intent.setAction(Intent.ACTION_VIEW);
-                                    intent.setData(Uri.parse(activity.getString(R.string.fdroidVLCurl)));
-                                    activity.startActivity(intent);
-                                }
-                            })
-                            .setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
-                                @Override
-                                public void onClick(DialogInterface dialog, int which) {
-
-                                }
-                            });
-                    builder.create().show();
-                }
-            } else {
-                // Internal Player
-                Intent intent = new Intent(activity, PlayVideoActivity.class);
-                intent.putExtra(PlayVideoActivity.VIDEO_TITLE, videoTitle);
-                intent.putExtra(PlayVideoActivity.STREAM_URL, videoStreams[selectedStream].url);
-                intent.putExtra(PlayVideoActivity.VIDEO_URL, websiteUrl);
-                intent.putExtra(PlayVideoActivity.START_POSITION, startPosition);
-                activity.startActivity(intent);     //also HERE !!!
-            }
-        }
-        // --------------------------------------------
-    }
-
-    public void setStartPosition(int startPositionSeconds)
-    {
-        this.startPosition = startPositionSeconds;
-    }
-
-    private void downloadVideo() {
-        if(!videoTitle.isEmpty()) {
-            String videoSuffix = "." + MediaFormat.getSuffixById(videoStreams[selectedStream].format);
-            String audioSuffix = "." + MediaFormat.getSuffixById(audioStream.format);
-            Bundle args = new Bundle();
-            args.putString(DownloadDialog.FILE_SUFFIX_VIDEO, videoSuffix);
-            args.putString(DownloadDialog.FILE_SUFFIX_AUDIO, audioSuffix);
-            args.putString(DownloadDialog.TITLE, videoTitle);
-            args.putString(DownloadDialog.VIDEO_URL, videoStreams[selectedStream].url);
-            args.putString(DownloadDialog.AUDIO_URL, audioStream.url);
-            DownloadDialog downloadDialog = new DownloadDialog();
-            downloadDialog.setArguments(args);
-            downloadDialog.show(activity.getSupportFragmentManager(), "downloadDialog");
-        }
-    }
-
-    private void openInBrowser() {
-        if(!videoTitle.isEmpty()) {
-            Intent intent = new Intent();
-            intent.setAction(Intent.ACTION_VIEW);
-            intent.setData(Uri.parse(websiteUrl));
-
-            activity.startActivity(Intent.createChooser(intent, activity.getString(R.string.chooseBrowser)));
-        }
-    }
-
-    private void playWithKodi() {
-        if(!videoTitle.isEmpty()) {
-            try {
-                Intent intent = new Intent(Intent.ACTION_VIEW);
-                intent.setPackage(KORE_PACKET);
-                intent.setData(Uri.parse(websiteUrl.replace("https", "http")));
-                activity.startActivity(intent);
-            } catch (Exception e) {
-                e.printStackTrace();
-                AlertDialog.Builder builder = new AlertDialog.Builder(activity);
-                builder.setMessage(R.string.koreNotFound)
-                        .setPositiveButton(R.string.installeKore, new DialogInterface.OnClickListener() {
-                            @Override
-                            public void onClick(DialogInterface dialog, int which) {
-                                Intent intent = new Intent();
-                                intent.setAction(Intent.ACTION_VIEW);
-                                intent.setData(Uri.parse(activity.getString(R.string.fdroidKoreUrl)));
-                                activity.startActivity(intent);
-                            }
-                        })
-                        .setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
-                            @Override
-                            public void onClick(DialogInterface dialog, int which) {
-
-                            }
-                        });
-                builder.create().show();
-            }
-        }
-    }
-
-    private void playAudio() {
-        Intent intent = new Intent();
-        try {
-            intent.setAction(Intent.ACTION_VIEW);
-            intent.setDataAndType(Uri.parse(audioStream.url),
-                    MediaFormat.getMimeById(audioStream.format));
-            intent.putExtra(Intent.EXTRA_TITLE, videoTitle);
-            intent.putExtra("title", videoTitle);
-            activity.startActivity(intent);      // HERE !!!
-        } catch (Exception e) {
-            e.printStackTrace();
-            AlertDialog.Builder builder = new AlertDialog.Builder(activity);
-            builder.setMessage(R.string.noPlayerFound)
-                    .setPositiveButton(R.string.installStreamPlayer, new DialogInterface.OnClickListener() {
-                        @Override
-                        public void onClick(DialogInterface dialog, int which) {
-                            Intent intent = new Intent();
-                            intent.setAction(Intent.ACTION_VIEW);
-                            intent.setData(Uri.parse(activity.getString(R.string.fdroidVLCurl)));
-                            activity.startActivity(intent);
-                        }
-                    })
-                    .setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
-                        @Override
-                        public void onClick(DialogInterface dialog, int which) {
-                            Log.i(TAG, "You unlocked a secret unicorn.");
-                        }
-                    });
-            builder.create().show();
-            Log.e(TAG, "Either no Streaming player for audio was installed, or something important crashed:");
-            e.printStackTrace();
-        }
-    }
-}

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

@@ -0,0 +1,46 @@
+package org.schabi.newpipe;
+
+/**
+ * Created by Christian Schabesberger on 24.12.15.
+ *
+ * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
+ * ActivityCommunicator.java is part of NewPipe.
+ *
+ * NewPipe is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * NewPipe is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import 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 an ugly hack inside the Android universe. **/
+public class ActivityCommunicator {
+
+    private static ActivityCommunicator activityCommunicator;
+
+    public static ActivityCommunicator getCommunicator() {
+        if(activityCommunicator == null) {
+            activityCommunicator = new ActivityCommunicator();
+        }
+        return activityCommunicator;
+    }
+
+    // Thumbnail send from VideoItemDetailFragment to BackgroundPlayer
+    public volatile Bitmap backgroundPlayerThumbnail;
+
+    public volatile Class returnActivity;
+}

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

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

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

@@ -0,0 +1,404 @@
+package org.schabi.newpipe;
+
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Bundle;
+import android.os.Handler;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.util.Log;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.widget.Button;
+import android.widget.ImageView;
+import android.widget.ProgressBar;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import com.nostra13.universalimageloader.core.ImageLoader;
+
+import org.schabi.newpipe.detail.VideoItemDetailFragment;
+import org.schabi.newpipe.extractor.NewPipe;
+import org.schabi.newpipe.extractor.StreamingService;
+import org.schabi.newpipe.extractor.channel.ChannelExtractor;
+import org.schabi.newpipe.extractor.channel.ChannelInfo;
+import org.schabi.newpipe.extractor.exceptions.ExtractionException;
+import org.schabi.newpipe.extractor.exceptions.ParsingException;
+import org.schabi.newpipe.info_list.InfoItemBuilder;
+import org.schabi.newpipe.info_list.InfoListAdapter;
+import org.schabi.newpipe.report.ErrorActivity;
+import org.schabi.newpipe.settings.SettingsActivity;
+import org.schabi.newpipe.util.NavStack;
+import java.io.IOException;
+import static android.os.Build.VERSION.SDK_INT;
+import org.schabi.newpipe.util.ThemeHelper;
+
+
+/**
+ * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
+ * ChannelActivity.java is part of NewPipe.
+ *
+ * NewPipe is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * NewPipe is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+public class ChannelActivity extends AppCompatActivity {
+    private static final String TAG = ChannelActivity.class.toString();
+    private View rootView = null;
+
+    private int serviceId = -1;
+    private String channelUrl = "";
+    private int pageNumber = 0;
+    private boolean hasNextPage = true;
+    private boolean isLoading = false;
+
+    private ImageLoader imageLoader = ImageLoader.getInstance();
+    private InfoListAdapter infoListAdapter = null;
+
+    private String subS = "";
+
+    ProgressBar progressBar = null;
+    ImageView channelBanner = null;
+    ImageView avatarView = null;
+    TextView titleView = null;
+    TextView subscirberView = null;
+    Button subscriberButton = null;
+    View subscriberLayout = null;
+
+    View header = null;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        ThemeHelper.setTheme(this, true);
+        setContentView(R.layout.activity_channel);
+        rootView = findViewById(android.R.id.content);
+
+        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+        getSupportActionBar().setDisplayShowTitleEnabled(true);
+
+        infoListAdapter = new InfoListAdapter(this, rootView);
+        RecyclerView recyclerView = (RecyclerView) findViewById(R.id.channel_streams_view);
+        final LinearLayoutManager layoutManager = new LinearLayoutManager(this);
+        recyclerView.setLayoutManager(layoutManager);
+        header = getLayoutInflater().inflate(R.layout.channel_header, recyclerView, false);
+        infoListAdapter.setHeader(header);
+        infoListAdapter.setFooter(
+                getLayoutInflater().inflate(R.layout.pignate_footer, recyclerView, false));
+        recyclerView.setAdapter(infoListAdapter);
+        infoListAdapter.setOnStreamInfoItemSelectedListener(
+                new InfoItemBuilder.OnInfoItemSelectedListener() {
+            @Override
+            public void selected(String url, int serviceId) {
+                NavStack.getInstance()
+                        .openDetailActivity(ChannelActivity.this, url, serviceId);
+            }
+        });
+
+        // detect if list has ben scrolled to the bottom
+        recyclerView.setOnScrollListener(new RecyclerView.OnScrollListener() {
+            @Override
+            public void onScrolled(RecyclerView recyclerView, int dx, int dy) {
+                int pastVisiblesItems, visibleItemCount, totalItemCount;
+                super.onScrolled(recyclerView, dx, dy);
+                if(dy > 0) //check for scroll down
+                {
+                    visibleItemCount = layoutManager.getChildCount();
+                    totalItemCount = layoutManager.getItemCount();
+                    pastVisiblesItems = layoutManager.findFirstVisibleItemPosition();
+
+                    if ( (visibleItemCount + pastVisiblesItems) >= totalItemCount
+                            && !isLoading
+                            && hasNextPage)
+                    {
+                        pageNumber++;
+                        requestData(true);
+                    }
+                }
+            }
+        });
+
+        subS = getString(R.string.subscriber);
+
+        progressBar = (ProgressBar) findViewById(R.id.progressBar);
+        channelBanner = (ImageView) header.findViewById(R.id.channel_banner_image);
+        avatarView = (ImageView) header.findViewById(R.id.channel_avatar_view);
+        titleView = (TextView) header.findViewById(R.id.channel_title_view);
+        subscirberView = (TextView) header.findViewById(R.id.channel_subscriber_view);
+        subscriberButton = (Button) header.findViewById(R.id.channel_subscribe_button);
+        subscriberLayout = header.findViewById(R.id.channel_subscriber_layout);
+
+        if(savedInstanceState == null) {
+            handleIntent(getIntent());
+        } else {
+            channelUrl = savedInstanceState.getString(NavStack.URL);
+            serviceId = savedInstanceState.getInt(NavStack.SERVICE_ID);
+            NavStack.getInstance()
+                    .restoreSavedInstanceState(savedInstanceState);
+        }
+
+    }
+
+    @Override
+    public void onNewIntent(Intent intent) {
+        super.onNewIntent(intent);
+        handleIntent(intent);
+    }
+
+    private void handleIntent(Intent i) {
+        channelUrl = i.getStringExtra(NavStack.URL);
+        serviceId = i.getIntExtra(NavStack.SERVICE_ID, -1);
+        requestData(false);
+    }
+
+    @Override
+    public void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+        outState.putString(NavStack.URL, channelUrl);
+        outState.putInt(NavStack.SERVICE_ID, serviceId);
+        NavStack.getInstance()
+                .onSaveInstanceState(outState);
+    }
+
+    private void updateUi(final ChannelInfo info) {
+        findViewById(R.id.channel_header_layout).setVisibility(View.VISIBLE);
+        progressBar.setVisibility(View.GONE);
+
+        if(info.channel_name != null && !info.channel_name.isEmpty()) {
+            getSupportActionBar().setTitle(info.channel_name);
+            titleView.setText(info.channel_name);
+        }
+
+        if(info.banner_url != null && !info.banner_url.isEmpty()) {
+            imageLoader.displayImage(info.banner_url, channelBanner,
+                   new ImageErrorLoadingListener(this, rootView ,info.service_id));
+        }
+
+        if(info.avatar_url != null && !info.avatar_url.isEmpty()) {
+            avatarView.setVisibility(View.VISIBLE);
+            imageLoader.displayImage(info.avatar_url, avatarView,
+                    new ImageErrorLoadingListener(this, rootView ,info.service_id));
+        }
+
+        if(info.subscriberCount != -1) {
+            subscirberView.setText(buildSubscriberString(info.subscriberCount));
+        }
+
+        if((info.feed_url != null && !info.feed_url.isEmpty()) ||
+                (info.subscriberCount != -1)) {
+            subscriberLayout.setVisibility(View.VISIBLE);
+        }
+
+        if(info.feed_url != null && !info.feed_url.isEmpty()) {
+            subscriberButton.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View view) {
+                    Log.d(TAG, info.feed_url);
+                    Intent i = new Intent(Intent.ACTION_VIEW, Uri.parse(info.feed_url));
+                    startActivity(i);
+                }
+            });
+        } else {
+            subscriberButton.setVisibility(View.INVISIBLE);
+        }
+
+    }
+
+    private void addVideos(final ChannelInfo info) {
+        infoListAdapter.addInfoItemList(info.related_streams);
+    }
+
+    private void postNewErrorToast(Handler h, final int stringResource) {
+        h.post(new Runnable() {
+            @Override
+            public void run() {
+                Toast.makeText(ChannelActivity.this,
+                        stringResource, Toast.LENGTH_LONG).show();
+            }
+        });
+    }
+
+    private void requestData(final boolean onlyVideos) {
+        // start processing
+        isLoading = true;
+
+        if(!onlyVideos) {
+            //delete already displayed content
+            progressBar.setVisibility(View.VISIBLE);
+            infoListAdapter.clearSteamItemList();
+            pageNumber = 0;
+            subscriberLayout.setVisibility(View.GONE);
+            titleView.setText("");
+            getSupportActionBar().setTitle("");
+            if (SDK_INT >= 21) {
+                channelBanner.setImageDrawable(getDrawable(R.drawable.channel_banner));
+                avatarView.setImageDrawable(getDrawable(R.drawable.buddy));
+            }
+            infoListAdapter.showFooter(false);
+        }
+
+        Thread channelExtractorThread = new Thread(new Runnable() {
+            Handler h = new Handler();
+
+            @Override
+            public void run() {
+                StreamingService service = null;
+                try {
+                    service = NewPipe.getService(serviceId);
+                    ChannelExtractor extractor = service.getChannelExtractorInstance(
+                            channelUrl, pageNumber);
+
+                    final ChannelInfo info = ChannelInfo.getInfo(extractor);
+
+
+                    h.post(new Runnable() {
+                        @Override
+                        public void run() {
+                            isLoading = false;
+                            if(!onlyVideos) {
+                                updateUi(info);
+                                infoListAdapter.showFooter(true);
+                            }
+                            hasNextPage = info.hasNextPage;
+                            if(!hasNextPage) {
+                                infoListAdapter.showFooter(false);
+                            }
+                            addVideos(info);
+                        }
+                    });
+
+                    // look for non critical errors during extraction
+                    if(info != null &&
+                            !info.errors.isEmpty()) {
+                        Log.e(TAG, "OCCURRED ERRORS DURING EXTRACTION:");
+                        for (Throwable e : info.errors) {
+                            e.printStackTrace();
+                            Log.e(TAG, "------");
+                        }
+
+                        View rootView = findViewById(android.R.id.content);
+                        ErrorActivity.reportError(h, ChannelActivity.this,
+                                info.errors, null, rootView,
+                                ErrorActivity.ErrorInfo.make(ErrorActivity.REQUESTED_CHANNEL,
+                                        service.getServiceInfo().name, channelUrl, 0 /* no message for the user */));
+                    }
+                } catch(IOException ioe) {
+                    postNewErrorToast(h, R.string.network_error);
+                    ioe.printStackTrace();
+                } catch(ParsingException pe) {
+                    ErrorActivity.reportError(h, ChannelActivity.this, pe, VideoItemDetailFragment.class, null,
+                            ErrorActivity.ErrorInfo.make(ErrorActivity.REQUESTED_CHANNEL,
+                                    service.getServiceInfo().name, channelUrl, R.string.parsing_error));
+                    h.post(new Runnable() {
+                        @Override
+                        public void run() {
+                            ChannelActivity.this.finish();
+                        }
+                    });
+                    pe.printStackTrace();
+                } catch(ExtractionException ex) {
+                    String name = "none";
+                    if(service != null) {
+                        name = service.getServiceInfo().name;
+                    }
+                    ErrorActivity.reportError(h, ChannelActivity.this, ex, VideoItemDetailFragment.class, null,
+                            ErrorActivity.ErrorInfo.make(ErrorActivity.REQUESTED_CHANNEL,
+                                    name, channelUrl, R.string.parsing_error));
+                    h.post(new Runnable() {
+                        @Override
+                        public void run() {
+                            ChannelActivity.this.finish();
+                        }
+                    });
+                    ex.printStackTrace();
+                } catch(Exception e) {
+                    ErrorActivity.reportError(h, ChannelActivity.this, e, VideoItemDetailFragment.class, null,
+                            ErrorActivity.ErrorInfo.make(ErrorActivity.REQUESTED_CHANNEL,
+                                    service.getServiceInfo().name, channelUrl, R.string.general_error));
+                    h.post(new Runnable() {
+                        @Override
+                        public void run() {
+                            ChannelActivity.this.finish();
+                        }
+                    });
+                    e.printStackTrace();
+                }
+            }
+        });
+
+        channelExtractorThread.start();
+    }
+
+    @Override
+    public void onBackPressed() {
+        try {
+            NavStack.getInstance()
+                    .navBack(this);
+        } catch (Exception e) {
+            ErrorActivity.reportUiError(this, e);
+        }
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        super.onCreateOptionsMenu(menu);
+        getMenuInflater().inflate(R.menu.menu_channel, menu);
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        super.onOptionsItemSelected(item);
+        switch(item.getItemId()) {
+            case R.id.action_settings: {
+                Intent intent = new Intent(this, SettingsActivity.class);
+                startActivity(intent);
+                return true;
+            }
+            case R.id.menu_item_openInBrowser: {
+                Intent intent = new Intent();
+                intent.setAction(Intent.ACTION_VIEW);
+                intent.setData(Uri.parse(channelUrl));
+
+                startActivity(Intent.createChooser(intent, getString(R.string.choose_browser)));
+            }
+            case R.id.menu_item_share:
+                Intent intent = new Intent();
+                intent.setAction(Intent.ACTION_SEND);
+                intent.putExtra(Intent.EXTRA_TEXT, channelUrl);
+                intent.setType("text/plain");
+                startActivity(Intent.createChooser(intent, getString(R.string.share_dialog_title)));
+            case android.R.id.home:
+                NavStack.getInstance().openMainActivity(this);
+            default:
+                return super.onOptionsItemSelected(item);
+        }
+    }
+
+    private String buildSubscriberString(long count) {
+        String out = "";
+        if(count >= 1000000000){
+            out += Long.toString((count/1000000000)%1000)+".";
+        }
+        if(count>=1000000){
+            out += Long.toString((count/1000000)%1000) + ".";
+        }
+        if(count>=1000){
+            out += Long.toString((count/1000)%1000)+".";
+        }
+        out += Long.toString(count%1000) + " " + subS;
+        return out;
+    }
+}

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

@@ -1,91 +0,0 @@
-package org.schabi.newpipe;
-
-import android.app.Dialog;
-import android.app.DownloadManager;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.SharedPreferences;
-import android.net.Uri;
-import android.os.Bundle;
-import android.preference.PreferenceManager;
-import android.support.annotation.NonNull;
-import android.support.v4.app.DialogFragment;
-import android.support.v7.app.AlertDialog;
-import android.util.Log;
-
-import java.io.File;
-
-/**
- * Created by Christian Schabesberger on 21.09.15.
- *
- * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
- * DownloadDialog.java is part of NewPipe.
- *
- * NewPipe is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * NewPipe is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-public class DownloadDialog extends DialogFragment {
-    private static final String TAG = DialogFragment.class.getName();
-
-    public static final String TITLE = "name";
-    public static final String FILE_SUFFIX_AUDIO = "file_suffix_audio";
-    public static final String FILE_SUFFIX_VIDEO = "file_suffix_video";
-    public static final String AUDIO_URL = "audio_url";
-    public static final String VIDEO_URL = "video_url";
-    private Bundle arguments;
-
-    @NonNull
-    @Override
-    public Dialog onCreateDialog(Bundle savedInstanceState) {
-        arguments = getArguments();
-        super.onCreateDialog(savedInstanceState);
-        AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
-        builder.setTitle(R.string.downloadDialogTitle)
-                .setItems(R.array.downloadOptions, new DialogInterface.OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface dialog, int which) {
-                        Context context = getActivity();
-                        SharedPreferences defaultPreferences = PreferenceManager.getDefaultSharedPreferences(context);
-                        String suffix = "";
-                        String title = arguments.getString(TITLE);
-                        String url = "";
-                        switch(which) {
-                            case 0:     // Video
-                                suffix = arguments.getString(FILE_SUFFIX_VIDEO);
-                                url = arguments.getString(VIDEO_URL);
-                                break;
-                            case 1:
-                                suffix = arguments.getString(FILE_SUFFIX_AUDIO);
-                                url = arguments.getString(AUDIO_URL);
-                                break;
-                            default:
-                                Log.d(TAG, "lolz");
-                        }
-                        DownloadManager dm = (DownloadManager) context.getSystemService(Context.DOWNLOAD_SERVICE);
-                        DownloadManager.Request request = new DownloadManager.Request(
-                                Uri.parse(url));
-                        request.setDestinationUri(Uri.fromFile(new File(
-                                defaultPreferences.getString("download_path_preference", "/storage/emulated/0/NewPipe")
-                                        + "/" + title + suffix)));
-                        try {
-                            dm.enqueue(request);
-                        } catch (Exception e) {
-                            e.printStackTrace();
-                        }
-                    }
-                });
-        return builder.create();
-    }
-
-}

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

@@ -1,16 +1,23 @@
 package org.schabi.newpipe;
 
+import org.schabi.newpipe.extractor.exceptions.ReCaptchaException;
+
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
-import java.net.HttpURLConnection;
 import java.net.URL;
 import java.net.UnknownHostException;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+import javax.net.ssl.HttpsURLConnection;
+
 
 /**
- * Created by Christian Schabesberger on 14.08.15.
+ * Created by Christian Schabesberger on 28.01.16.
  *
- * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
+ * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
  * Downloader.java is part of NewPipe.
  *
  * NewPipe is free software: you can redistribute it and/or modify
@@ -27,70 +34,113 @@ import java.net.UnknownHostException;
  * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-public class Downloader {
+public class Downloader implements org.schabi.newpipe.extractor.Downloader {
+    
+    private static final String USER_AGENT = "Mozilla/5.0 (Windows NT 6.1; WOW64; rv:43.0) Gecko/20100101 Firefox/43.0";
+    private static String mCookies = "";
 
-    private static final String USER_AGENT = "Mozilla/5.0";
+    private static Downloader instance = null;
+
+    private Downloader() {}
+
+    public static Downloader getInstance() {
+        if(instance == null) {
+            synchronized (Downloader.class) {
+                if (instance == null) {
+                    instance = new Downloader();
+                }
+            }
+        }
+        return instance;
+    }
+
+    public static synchronized void setCookies(String cookies) {
+        Downloader.mCookies = cookies;
+    }
+
+    public static synchronized String getCookies() {
+        return Downloader.mCookies;
+    }
 
     /**Download the text file at the supplied URL as in download(String),
      * but set the HTTP header field "Accept-Language" to the supplied string.
      * @param siteUrl the URL of the text file to return the contents of
      * @param language the language (usually a 2-character code) to set as the preferred language
      * @return the contents of the specified text file*/
-    public static String download(String siteUrl, String language) {
-        String ret = "";
-        try {
-            URL url = new URL(siteUrl);
-            HttpURLConnection con = (HttpURLConnection) url.openConnection();
-            con.setRequestProperty("Accept-Language", language);
-            ret = dl(con);
-        }
-        catch(Exception e) {
-            e.printStackTrace();
-        }
-        return ret;
+    public String download(String siteUrl, String language) throws IOException, ReCaptchaException {
+        Map<String, String> requestProperties = new HashMap<>();
+        requestProperties.put("Accept-Language", language);
+        return download(siteUrl, requestProperties);
     }
+
+
+    /**Download the text file at the supplied URL as in download(String),
+     * but set the HTTP header field "Accept-Language" to the supplied string.
+     * @param siteUrl the URL of the text file to return the contents of
+     * @param customProperties set request header properties
+     * @return the contents of the specified text file
+     * @throws IOException*/
+    public String download(String siteUrl, Map<String, String> customProperties) throws IOException, ReCaptchaException {
+        URL url = new URL(siteUrl);
+        HttpsURLConnection con = (HttpsURLConnection) url.openConnection();
+        Iterator it = customProperties.entrySet().iterator();
+        while(it.hasNext()) {
+            Map.Entry pair = (Map.Entry)it.next();
+            con.setRequestProperty((String)pair.getKey(), (String)pair.getValue());
+        }
+        return dl(con);
+    }
+
     /**Common functionality between download(String url) and download(String url, String language)*/
-    private static String dl(HttpURLConnection con) throws IOException {
+    private static String dl(HttpsURLConnection con) throws IOException, ReCaptchaException {
         StringBuilder response = new StringBuilder();
+        BufferedReader in = null;
 
         try {
             con.setRequestMethod("GET");
             con.setRequestProperty("User-Agent", USER_AGENT);
 
-            BufferedReader in = new BufferedReader(
+            if (getCookies().length() > 0) {
+                con.setRequestProperty("Cookie", getCookies());
+            }
+
+            in = new BufferedReader(
                     new InputStreamReader(con.getInputStream()));
             String inputLine;
 
             while((inputLine = in.readLine()) != null) {
                 response.append(inputLine);
             }
-            in.close();
-
-        }
-        catch(UnknownHostException uhe) {//thrown when there's no internet connection
-            uhe.printStackTrace();
+        } catch(UnknownHostException uhe) {//thrown when there's no internet connection
+            throw new IOException("unknown host or no network", uhe);
             //Toast.makeText(getActivity(), uhe.getMessage(), Toast.LENGTH_LONG).show();
+        } catch(Exception e) {
+            /*
+             * HTTP 429 == Too Many Request
+             * Receive from Youtube.com = ReCaptcha challenge request
+             * See : https://github.com/rg3/youtube-dl/issues/5138
+             */
+            if (con.getResponseCode() == 429) {
+                throw new ReCaptchaException("reCaptcha Challenge requested");
+            }
+            throw new IOException(e);
+        } finally {
+            if(in != null) {
+                in.close();
+            }
         }
 
         return response.toString();
     }
 
-/**Download (via HTTP) the text file located at the supplied URL, and return its contents.
- * Primarily intended for downloading web pages.
- * @param siteUrl the URL of the text file to download
- * @return the contents of the specified text file*/
-    public static String download(String siteUrl) {
-        String ret = "";
-
-        try {
-            URL url = new URL(siteUrl);
-            HttpURLConnection con = (HttpURLConnection) url.openConnection();
-            ret = dl(con);
-        }
-        catch(Exception e) {
-            e.printStackTrace();
-        }
-
-        return ret;
+    /**Download (via HTTP) the text file located at the supplied URL, and return its contents.
+     * Primarily intended for downloading web pages.
+     * @param siteUrl the URL of the text file to download
+     * @return the contents of the specified text file*/
+    public String download(String siteUrl) throws IOException, ReCaptchaException {
+        URL url = new URL(siteUrl);
+        HttpsURLConnection con = (HttpsURLConnection) url.openConnection();
+        //HttpsURLConnection con = NetCipher.getHttpsURLConnection(url);
+        return dl(con);
     }
 }

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

@@ -0,0 +1,54 @@
+
+package org.schabi.newpipe;
+
+import android.annotation.SuppressLint;
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Build;
+import android.os.Bundle;
+
+/**
+ * Copyright (C) Hans-Christoph Steiner 2016 <hans@eds.org>
+ * ExitActivity.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 ExitActivity extends Activity {
+
+    @SuppressLint("NewApi")
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        if (Build.VERSION.SDK_INT >= 21) {
+            finishAndRemoveTask();
+        } else {
+            finish();
+        }
+
+        System.exit(0);
+    }
+
+    public static void exitAndRemoveFromRecentApps(Activity activity) {
+        Intent intent = new Intent(activity, ExitActivity.class);
+
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK
+                | Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS
+                | Intent.FLAG_ACTIVITY_CLEAR_TASK
+                | Intent.FLAG_ACTIVITY_NO_ANIMATION);
+
+        activity.startActivity(intent);
+    }
+}

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

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

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

@@ -0,0 +1,96 @@
+package org.schabi.newpipe;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.content.res.Resources;
+import android.preference.PreferenceManager;
+
+import java.text.DateFormat;
+import java.text.NumberFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Locale;
+
+/**
+ * Created by chschtsch on 12/29/15.
+ *
+ * Copyright (C) Gregory Arkhipov 2015
+ * Localization.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 Localization {
+
+    private Localization() {
+    }
+
+    public static Locale getPreferredLocale(Context context) {
+        SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(context);
+
+        String languageCode = sp.getString(String.valueOf(R.string.search_language_key),
+                context.getString(R.string.default_language_value));
+
+        if(languageCode.length() == 2) {
+            return new Locale(languageCode);
+        }
+        else if(languageCode.contains("_")) {
+            String country = languageCode
+                    .substring(languageCode.indexOf("_"), languageCode.length());
+            return new Locale(languageCode.substring(0, 2), country);
+        }
+        return Locale.getDefault();
+    }
+
+    public static String localizeViewCount(long viewCount, Context context) {
+        Locale locale = getPreferredLocale(context);
+
+        Resources res = context.getResources();
+        String viewsString = res.getString(R.string.view_count_text);
+
+        NumberFormat nf = NumberFormat.getInstance(locale);
+        String formattedViewCount = nf.format(viewCount);
+        return String.format(viewsString, formattedViewCount);
+    }
+
+    public static String localizeNumber(long number, Context context) {
+        Locale locale = getPreferredLocale(context);
+        NumberFormat nf = NumberFormat.getInstance(locale);
+        return nf.format(number);
+    }
+
+    private static String formatDate(String date, Context context) {
+        Locale locale = getPreferredLocale(context);
+        SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
+        Date datum = null;
+        try {
+            datum = formatter.parse(date);
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+
+        DateFormat df = DateFormat.getDateInstance(DateFormat.MEDIUM, locale);
+
+        return df.format(datum);
+    }
+
+    public static String localizeDate(String date, Context context) {
+        Resources res = context.getResources();
+        String dateString = res.getString(R.string.upload_date_text);
+
+        String formattedDate = formatDate(date, context);
+        return String.format(dateString, formattedDate);
+    }
+}

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

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

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

@@ -1,81 +0,0 @@
-package org.schabi.newpipe;
-
-/**
- * Created by Adam Howard on 08/11/15.
- *
- * Copyright (c) Christian Schabesberger <chris.schabesberger@mailbox.org>
- *     and Adam Howard <achdisposable1@gmail.com> 2015
- *
- * 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/>.
- */
-
-/**Static data about various media formats support by Newpipe, eg mime type, extension*/
-
-public enum MediaFormat {
-    //           id      name    suffix  mime type
-    MPEG_4      (0x0,   "MPEG-4", "mp4", "video/mp4"),
-    v3GPP       (0x1,   "3GPP",   "3gp", "video/3gpp"),
-    WEBM        (0x2,   "WebM",  "webm", "video/webm"),
-    M4A         (0x3,   "m4a",   "m4a",  "audio/mp4"),
-    WEBMA       (0x4,   "WebM",  "webm", "audio/webm");
-
-    public final int id;
-    @SuppressWarnings("WeakerAccess")
-    public final String name;
-    @SuppressWarnings("WeakerAccess")
-    public final String suffix;
-    public final String mimeType;
-
-    MediaFormat(int id, String name, String suffix, String mimeType) {
-        this.id = id;
-        this.name = name;
-        this.suffix = suffix;
-        this.mimeType = mimeType;
-    }
-
-    /**Return the friendly name of the media format with the supplied id
-     * @param ident the id of the media format. Currently an arbitrary, NewPipe-specific number.
-     * @return the friendly name of the MediaFormat associated with this ids,
-     * or an empty String if none match it.*/
-    public static String getNameById(int ident) {
-        for (MediaFormat vf : MediaFormat.values()) {
-            if(vf.id == ident) return vf.name;
-        }
-        return "";
-    }
-
-    /**Return the file extension of the media format with the supplied id
-     * @param ident the id of the media format. Currently an arbitrary, NewPipe-specific number.
-     * @return the file extension of the MediaFormat associated with this ids,
-     * or an empty String if none match it.*/
-    public static String getSuffixById(int ident) {
-        for (MediaFormat vf : MediaFormat.values()) {
-            if(vf.id == ident) return vf.suffix;
-        }
-        return "";
-    }
-
-    /**Return the MIME type of the media format with the supplied id
-     * @param ident the id of the media format. Currently an arbitrary, NewPipe-specific number.
-     * @return the MIME type of the MediaFormat associated with this ids,
-     * or an empty String if none match it.*/
-    public static String getMimeById(int ident) {
-        for (MediaFormat vf : MediaFormat.values()) {
-            if(vf.id == ident) return vf.mimeType;
-        }
-        return "";
-    }
-}

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

@@ -0,0 +1,50 @@
+
+package org.schabi.newpipe;
+
+import android.annotation.SuppressLint;
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Build;
+import android.os.Bundle;
+import android.media.AudioManager;
+
+/**
+ * Copyright (C) Hans-Christoph Steiner 2016 <hans@eds.org>
+ * PanicResponderActivity.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 PanicResponderActivity extends Activity {
+
+    public static final String PANIC_TRIGGER_ACTION = "info.guardianproject.panic.action.TRIGGER";
+
+    @SuppressLint("NewApi")
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        Intent intent = getIntent();
+        if (intent != null && PANIC_TRIGGER_ACTION.equals(intent.getAction())) {
+            // TODO explicitly clear the search results once they are restored when the app restarts
+            // or if the app reloads the current video after being killed, that should be cleared also
+            ExitActivity.exitAndRemoveFromRecentApps(this);
+        }
+
+        if (Build.VERSION.SDK_INT >= 21) {
+            finishAndRemoveTask();
+        } else {
+            finish();
+        }
+    }
+}

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

@@ -0,0 +1,151 @@
+package org.schabi.newpipe;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.graphics.Bitmap;
+import android.os.Build;
+import android.os.Bundle;
+import android.support.v4.app.NavUtils;
+import android.support.v7.app.ActionBar;
+import android.support.v7.app.AppCompatActivity;
+import android.view.MenuItem;
+import android.webkit.CookieManager;
+import android.webkit.ValueCallback;
+import android.webkit.WebSettings;
+import android.webkit.WebView;
+import android.webkit.WebViewClient;
+
+/**
+ * Created by beneth <bmauduit@beneth.fr> on 06.12.16.
+ *
+ * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
+ * ReCaptchaActivity.java is part of NewPipe.
+ *
+ * NewPipe is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * NewPipe is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
+ */
+public class ReCaptchaActivity extends AppCompatActivity {
+    public static final int RECAPTCHA_REQUEST = 10;
+
+    public static final String TAG = ReCaptchaActivity.class.toString();
+    public static final String YT_URL = "https://www.youtube.com";
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_recaptcha);
+
+        // Set return to Cancel by default
+        setResult(RESULT_CANCELED);
+
+        ActionBar actionBar = getSupportActionBar();
+        actionBar.setDisplayHomeAsUpEnabled(true);
+        actionBar.setTitle(R.string.reCaptcha_title);
+        actionBar.setDisplayShowTitleEnabled(true);
+
+        WebView myWebView = (WebView) findViewById(R.id.reCaptchaWebView);
+
+        // Enable Javascript
+        WebSettings webSettings = myWebView.getSettings();
+        webSettings.setJavaScriptEnabled(true);
+
+        ReCaptchaWebViewClient webClient = new ReCaptchaWebViewClient(this);
+        myWebView.setWebViewClient(webClient);
+
+        // Cleaning cache, history and cookies from webView
+        myWebView.clearCache(true);
+        myWebView.clearHistory();
+        android.webkit.CookieManager cookieManager = CookieManager.getInstance();
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            cookieManager.removeAllCookies(new ValueCallback<Boolean>() {
+                @Override
+                public void onReceiveValue(Boolean aBoolean) {}
+            });
+        } else {
+            cookieManager.removeAllCookie();
+        }
+
+        myWebView.loadUrl(YT_URL);
+    }
+
+    private class ReCaptchaWebViewClient extends WebViewClient {
+        private Activity context;
+        private String mCookies;
+
+        ReCaptchaWebViewClient(Activity ctx) {
+            context = ctx;
+        }
+
+        @Override
+        public void onPageStarted(WebView view, String url, Bitmap favicon) {
+            // TODO: Start Loader
+            super.onPageStarted(view, url, favicon);
+        }
+
+        @Override
+        public void onPageFinished(WebView view, String url) {
+            String cookies = CookieManager.getInstance().getCookie(url);
+
+            // TODO: Stop Loader
+
+            // find cookies : s_gl & goojf and Add cookies to Downloader
+            if (find_access_cookies(cookies)) {
+                // Give cookies to Downloader class
+                Downloader.setCookies(mCookies);
+
+                // Closing activity and return to parent
+                setResult(RESULT_OK);
+                finish();
+            }
+        }
+
+        private boolean find_access_cookies(String cookies) {
+            boolean ret = false;
+            String c_s_gl = "";
+            String c_goojf = "";
+
+            String[] parts = cookies.split("; ");
+            for (String part : parts) {
+                if (part.trim().startsWith("s_gl")) {
+                    c_s_gl = part.trim();
+                }
+                if (part.trim().startsWith("goojf")) {
+                    c_goojf = part.trim();
+                }
+            }
+            if (c_s_gl.length() > 0 && c_goojf.length() > 0) {
+                ret = true;
+                //mCookies = c_s_gl + "; " + c_goojf;
+                // Youtube seems to also need the other cookies:
+                mCookies = cookies;
+            }
+
+            return ret;
+        }
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        int id = item.getItemId();
+        switch (id) {
+            case android.R.id.home: {
+                Intent intent = new Intent(this, org.schabi.newpipe.MainActivity.class);
+                intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+                NavUtils.navigateUpTo(this, intent);
+                return true;
+            }
+            default:
+                return false;
+        }
+    }
+}

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

@@ -0,0 +1,158 @@
+package org.schabi.newpipe;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.preference.PreferenceManager;
+import android.support.v7.app.AppCompatActivity;
+import android.os.Bundle;
+import android.util.Log;
+import android.widget.Toast;
+
+import org.schabi.newpipe.detail.VideoItemDetailActivity;
+import org.schabi.newpipe.detail.VideoItemDetailFragment;
+import org.schabi.newpipe.extractor.NewPipe;
+import org.schabi.newpipe.extractor.StreamingService;
+import org.schabi.newpipe.util.NavStack;
+
+import java.util.Collection;
+import java.util.HashSet;
+
+/**
+ * Copyright (C) Christian Schabesberger 2017 <chris.schabesberger@mailbox.org>
+ * RouterActivity .java is part of NewPipe.
+ *
+ * OpenHitboxStreams 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.
+ *
+ * OpenHitboxStreams 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 OpenHitboxStreams.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * This Acitivty is designed to route share/open intents to the specified service, and
+ * to the part of the service which can handle the url.
+ */
+public class RouterActivity extends Activity {
+    private static final String TAG = RouterActivity.class.toString();
+
+    /**
+     * Removes invisible separators (\p{Z}) and punctuation characters including
+     * brackets (\p{P}). See http://www.regular-expressions.info/unicode.html for
+     * more details.
+     */
+    private final static String REGEX_REMOVE_FROM_URL = "[\\p{Z}\\p{P}]";
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        handleIntent(getIntent());
+        finish();
+    }
+
+
+    private static String removeHeadingGibberish(final String input) {
+        int start = 0;
+        for (int i = input.indexOf("://") - 1; i >= 0; i--) {
+            if (!input.substring(i, i + 1).matches("\\p{L}")) {
+                start = i + 1;
+                break;
+            }
+        }
+        return input.substring(start, input.length());
+    }
+
+    private static String trim(final String input) {
+        if (input == null || input.length() < 1) {
+            return input;
+        } else {
+            String output = input;
+            while (output.length() > 0 && output.substring(0, 1).matches(REGEX_REMOVE_FROM_URL)) {
+                output = output.substring(1);
+            }
+            while (output.length() > 0
+                    && output.substring(output.length() - 1, output.length()).matches(REGEX_REMOVE_FROM_URL)) {
+                output = output.substring(0, output.length() - 1);
+            }
+            return output;
+        }
+    }
+
+    /**
+     * Retrieves all Strings which look remotely like URLs from a text.
+     * Used if NewPipe was called through share menu.
+     *
+     * @param sharedText text to scan for URLs.
+     * @return potential URLs
+     */
+    private String[] getUris(final String sharedText) {
+        final Collection<String> result = new HashSet<>();
+        if (sharedText != null) {
+            final String[] array = sharedText.split("\\p{Space}");
+            for (String s : array) {
+                s = trim(s);
+                if (s.length() != 0) {
+                    if (s.matches(".+://.+")) {
+                        result.add(removeHeadingGibberish(s));
+                    } else if (s.matches(".+\\..+")) {
+                        result.add("http://" + s);
+                    }
+                }
+            }
+        }
+        return result.toArray(new String[result.size()]);
+    }
+
+    private void handleIntent(Intent intent) {
+        String videoUrl = "";
+        StreamingService service = null;
+
+        // first gather data and find service
+        if (intent.getData() != null) {
+            // this means the video was called though another app
+            videoUrl = intent.getData().toString();
+        } else if(intent.getStringExtra(Intent.EXTRA_TEXT) != null) {
+            //this means that vidoe was called through share menu
+            String extraText = intent.getStringExtra(Intent.EXTRA_TEXT);
+            videoUrl = getUris(extraText)[0];
+        }
+
+        service = NewPipe.getServiceByUrl(videoUrl);
+        if(service == null) {
+            Toast.makeText(this, R.string.url_not_supported_toast, Toast.LENGTH_LONG)
+                    .show();
+            return;
+        } else {
+            Intent callIntent = new Intent();
+            switch(service.getLinkTypeByUrl(videoUrl)) {
+                case CHANNEL:
+                    callIntent.setClass(this, ChannelActivity.class);
+                    break;
+                case STREAM:
+                    callIntent.setClass(this, VideoItemDetailActivity.class);
+                    callIntent.putExtra(VideoItemDetailFragment.AUTO_PLAY,
+                            PreferenceManager.getDefaultSharedPreferences(this)
+                                    .getBoolean(
+                                            getString(R.string.autoplay_through_intent_key), false));
+                    break;
+                case PLAYLIST:
+                    Log.e(TAG, "NOT YET DEFINED");
+                    break;
+                default:
+                    Toast.makeText(this, R.string.url_not_supported_toast, Toast.LENGTH_LONG)
+                            .show();
+                    return;
+            }
+
+            callIntent.putExtra(NavStack.URL, videoUrl);
+            callIntent.putExtra(NavStack.SERVICE_ID, service.getServiceId());
+            startActivity(callIntent);
+        }
+    }
+}

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

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

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

@@ -1,101 +0,0 @@
-package org.schabi.newpipe;
-
-import org.schabi.newpipe.services.AbstractVideoInfo;
-
-import java.util.List;
-
-/**
- * Created by Christian Schabesberger on 26.08.15.
- *
- * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
- * VideoInfo.java is part of NewPipe.
- *
- * NewPipe is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * NewPipe is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**Info object for opened videos, ie the video ready to play.*/
-@SuppressWarnings("ALL")
-public class VideoInfo extends AbstractVideoInfo {
-
-    public String uploader_thumbnail_url = "";
-    public String description = "";
-    public VideoStream[] videoStreams = null;
-    public AudioStream[] audioStreams = null;
-    public int videoAvailableStatus = VIDEO_AVAILABLE;
-    public int duration = -1;
-
-    /*YouTube-specific fields
-    todo: move these to a subclass*/
-    public int age_limit = 0;
-    public int like_count = -1;
-    public int dislike_count = -1;
-    public String average_rating = "";
-    public VideoPreviewInfo nextVideo = null;
-    public List<VideoPreviewInfo> relatedVideos = null;
-    public int startPosition = -1;//in seconds. some metadata is not passed using a VideoInfo object!
-
-    public static final int VIDEO_AVAILABLE = 0x00;
-    public static final int VIDEO_UNAVAILABLE = 0x01;
-    public static final int VIDEO_UNAVAILABLE_GEMA = 0x02;//German DRM organisation
-
-
-    public VideoInfo() {}
-
-
-    /**Creates a new VideoInfo object from an existing AbstractVideoInfo.
-     * All the shared properties are copied to the new VideoInfo.*/
-    @SuppressWarnings("WeakerAccess")
-    public VideoInfo(AbstractVideoInfo avi) {
-        this.id = avi.id;
-        this.title = avi.title;
-        this.uploader = avi.uploader;
-        this.thumbnail_url = avi.thumbnail_url;
-        this.thumbnail = avi.thumbnail;
-        this.webpage_url = avi.webpage_url;
-        this.upload_date = avi.upload_date;
-        this.upload_date = avi.upload_date;
-        this.view_count = avi.view_count;
-
-        //todo: better than this
-        if(avi instanceof VideoPreviewInfo) {//shitty String to convert code
-            String dur = ((VideoPreviewInfo)avi).duration;
-            int minutes = Integer.parseInt(dur.substring(0, dur.indexOf(":")));
-            int seconds = Integer.parseInt(dur.substring(dur.indexOf(":")+1, dur.length()));
-            this.duration = (minutes*60)+seconds;
-        }
-    }
-
-    public static class VideoStream {
-        public String url = "";     //url of the stream
-        public int format = -1;
-        public String resolution = "";
-
-        public VideoStream(String url, int format, String res) {
-            this.url = url; this.format = format; resolution = res;
-        }
-    }
-
-    @SuppressWarnings("unused")
-    public static class AudioStream {
-        public String url = "";
-        public int format = -1;
-        public int bandwidth = -1;
-        public int samplingRate = -1;
-
-        public AudioStream(String url, int format, int bandwidth, int samplingRate) {
-            this.url = url; this.format = format;
-            this.bandwidth = bandwidth; this.samplingRate = samplingRate;
-        }
-    }
-}

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

@@ -1,74 +0,0 @@
-package org.schabi.newpipe;
-
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-/**
- * Created by Christian Schabesberger on 24.10.15.
- *
- * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
- * VideoInfoItemViewCreator.java is part of NewPipe.
- *
- * NewPipe is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * NewPipe is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-class VideoInfoItemViewCreator {
-    private final LayoutInflater inflater;
-
-    public VideoInfoItemViewCreator(LayoutInflater inflater) {
-        this.inflater = inflater;
-    }
-
-    public View getViewByVideoInfoItem(View convertView, ViewGroup parent, VideoPreviewInfo info) {
-        ViewHolder holder;
-        if(convertView == null) {
-            convertView = inflater.inflate(R.layout.video_item, parent, false);
-            holder = new ViewHolder();
-            holder.itemThumbnailView = (ImageView) convertView.findViewById(R.id.itemThumbnailView);
-            holder.itemVideoTitleView = (TextView) convertView.findViewById(R.id.itemVideoTitleView);
-            holder.itemUploaderView = (TextView) convertView.findViewById(R.id.itemUploaderView);
-            holder.itemDurationView = (TextView) convertView.findViewById(R.id.itemDurationView);
-            holder.itemUploadDateView = (TextView) convertView.findViewById(R.id.itemUploadDateView);
-            convertView.setTag(holder);
-        } else {
-            holder = (ViewHolder) convertView.getTag();
-        }
-
-        if(info.thumbnail == null) {
-            holder.itemThumbnailView.setImageResource(R.drawable.dummy_thumbnail);
-        } else {
-            holder.itemThumbnailView.setImageBitmap(info.thumbnail);
-        }
-        holder.itemVideoTitleView.setText(info.title);
-        holder.itemUploaderView.setText(info.uploader);
-        holder.itemDurationView.setText(info.duration);
-        if(!info.upload_date.isEmpty()) {
-            holder.itemUploadDateView.setText(info.upload_date);
-        } else {
-            //tweak if necessary: This is a hack to prevent having white space in the layout :P
-            holder.itemUploadDateView.setText(String.format("%d", info.view_count));
-        }
-
-        return convertView;
-    }
-
-    private class ViewHolder {
-        public ImageView itemThumbnailView;
-        public TextView itemVideoTitleView, itemUploaderView, itemDurationView, itemUploadDateView;
-    }
-
-}

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

@@ -1,488 +0,0 @@
-package org.schabi.newpipe;
-
-import android.annotation.SuppressLint;
-import android.app.Activity;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.content.res.Resources;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.graphics.Point;
-import android.os.Bundle;
-import android.os.Handler;
-import android.preference.PreferenceManager;
-import android.support.design.widget.FloatingActionButton;
-import android.support.v4.app.Fragment;
-import android.support.v7.app.AppCompatActivity;
-import android.text.Html;
-import android.text.method.LinkMovementMethod;
-import android.util.DisplayMetrics;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.FrameLayout;
-import android.widget.ImageView;
-import android.widget.ProgressBar;
-import android.widget.RelativeLayout;
-import android.widget.TextView;
-import android.view.MenuItem;
-
-import java.net.URL;
-import java.text.DateFormat;
-import java.text.NumberFormat;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.Locale;
-import java.util.Vector;
-
-import org.schabi.newpipe.services.VideoExtractor;
-import org.schabi.newpipe.services.ServiceList;
-import org.schabi.newpipe.services.StreamingService;
-
-
-/**
- * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
- * VideoItemDetailFragment.java is part of NewPipe.
- *
- * NewPipe is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * NewPipe is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-public class VideoItemDetailFragment extends Fragment {
-
-    private static final String TAG = VideoItemDetailFragment.class.toString();
-
-    /**
-     * The fragment argument representing the item ID that this fragment
-     * represents.
-     */
-    public static final String ARG_ITEM_ID = "item_id";
-    public static final String VIDEO_URL = "video_url";
-    public static final String STREAMING_SERVICE = "streaming_service";
-    public static final String AUTO_PLAY = "auto_play";
-
-    private AppCompatActivity activity;
-    private ActionBarHandler actionBarHandler;
-
-    private boolean autoPlayEnabled = false;
-    private VideoInfo currentVideoInfo = null;
-    private boolean showNextVideoItem = false;
-
-    private View thumbnailWindowLayout;
-    private FloatingActionButton playVideoButton;
-    private final Point initialThumbnailPos = new Point(0, 0);
-
-    public interface OnInvokeCreateOptionsMenuListener {
-        void createOptionsMenu();
-    }
-
-    private OnInvokeCreateOptionsMenuListener onInvokeCreateOptionsMenuListener = null;
-
-    private class VideoExtractorRunnable implements Runnable {
-        private final Handler h = new Handler();
-        private VideoExtractor videoExtractor;
-        private final StreamingService service;
-        private final String videoUrl;
-
-        public VideoExtractorRunnable(String videoUrl, StreamingService service) {
-            this.service = service;
-            this.videoUrl = videoUrl;
-        }
-        @Override
-        public void run() {
-            try {
-                this.videoExtractor = service.getExtractorInstance(videoUrl);
-                VideoInfo videoInfo = videoExtractor.getVideoInfo();
-                h.post(new VideoResultReturnedRunnable(videoInfo));
-                if (videoInfo.videoAvailableStatus == VideoInfo.VIDEO_AVAILABLE) {
-                    h.post(new SetThumbnailRunnable(
-                            BitmapFactory.decodeStream(
-                                    new URL(videoInfo.thumbnail_url)
-                                            .openConnection()
-                                            .getInputStream()),
-                            SetThumbnailRunnable.VIDEO_THUMBNAIL));
-                    h.post(new SetThumbnailRunnable(
-                            BitmapFactory.decodeStream(
-                                    new URL(videoInfo.uploader_thumbnail_url)
-                                            .openConnection()
-                                            .getInputStream()),
-                            SetThumbnailRunnable.CHANNEL_THUMBNAIL));
-                    if(showNextVideoItem) {
-                        h.post(new SetThumbnailRunnable(
-                                BitmapFactory.decodeStream(
-                                        new URL(videoInfo.nextVideo.thumbnail_url)
-                                                .openConnection()
-                                                .getInputStream()),
-                                SetThumbnailRunnable.NEXT_VIDEO_THUMBNAIL));
-                    }
-                }
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-
-        }
-    }
-
-    private class VideoResultReturnedRunnable implements Runnable {
-        private final VideoInfo videoInfo;
-        public VideoResultReturnedRunnable(VideoInfo videoInfo) {
-            this.videoInfo = videoInfo;
-        }
-        @Override
-        public void run() {
-            //todo: fix expired thread error:
-            // If the thread calling this runnable is expired, the following function will crash.
-            updateInfo(videoInfo);
-        }
-    }
-
-    private class SetThumbnailRunnable implements Runnable {
-        public static final int VIDEO_THUMBNAIL = 1;
-        public static final int CHANNEL_THUMBNAIL = 2;
-        public static final int NEXT_VIDEO_THUMBNAIL = 3;
-        private final Bitmap thumbnail;
-        private final int thumbnailId;
-        public SetThumbnailRunnable(Bitmap thumbnail, int id) {
-            this.thumbnail = thumbnail;
-            this.thumbnailId = id;
-        }
-        @Override
-        public void run() {
-            updateThumbnail(thumbnail, thumbnailId);
-        }
-    }
-
-    private void updateThumbnail(Bitmap thumbnail, int id) {
-        Activity a = getActivity();
-        ImageView thumbnailView;
-        try {
-            switch (id) {
-                case SetThumbnailRunnable.VIDEO_THUMBNAIL:
-                    thumbnailView = (ImageView) a.findViewById(R.id.detailThumbnailView);
-                    break;
-                case SetThumbnailRunnable.CHANNEL_THUMBNAIL:
-                    thumbnailView = (ImageView) a.findViewById(R.id.detailUploaderThumbnailView);
-                    break;
-                case SetThumbnailRunnable.NEXT_VIDEO_THUMBNAIL:
-                    FrameLayout nextVideoFrame = (FrameLayout) a.findViewById(R.id.detailNextVideoFrame);
-                    thumbnailView = (ImageView) nextVideoFrame.findViewById(R.id.itemThumbnailView);
-                    currentVideoInfo.nextVideo.thumbnail = thumbnail;
-                    break;
-                default:
-                    Log.d(TAG, "Error: Thumbnail id not known");
-                    return;
-            }
-
-            if (thumbnailView != null) {
-                thumbnailView.setImageBitmap(thumbnail);
-            }
-
-        } catch (java.lang.NullPointerException e) {
-            // Not good program design, I know. :/
-            Log.w(TAG, "updateThumbnail(): Fragment closed before thread ended work");
-        }
-    }
-
-    private void updateInfo(VideoInfo info) {
-        currentVideoInfo = info;
-        Resources res = activity.getResources();
-        try {
-            VideoInfoItemViewCreator videoItemViewCreator =
-                    new VideoInfoItemViewCreator(LayoutInflater.from(getActivity()));
-
-            RelativeLayout textContentLayout = (RelativeLayout) activity.findViewById(R.id.detailTextContentLayout);
-            ProgressBar progressBar = (ProgressBar) activity.findViewById(R.id.detailProgressBar);
-            TextView videoTitleView = (TextView) activity.findViewById(R.id.detailVideoTitleView);
-            TextView uploaderView = (TextView) activity.findViewById(R.id.detailUploaderView);
-            TextView viewCountView = (TextView) activity.findViewById(R.id.detailViewCountView);
-            TextView thumbsUpView = (TextView) activity.findViewById(R.id.detailThumbsUpCountView);
-            TextView thumbsDownView = (TextView) activity.findViewById(R.id.detailThumbsDownCountView);
-            TextView uploadDateView = (TextView) activity.findViewById(R.id.detailUploadDateView);
-            TextView descriptionView = (TextView) activity.findViewById(R.id.detailDescriptionView);
-            ImageView thumbnailView = (ImageView) activity.findViewById(R.id.detailThumbnailView);
-            FrameLayout nextVideoFrame = (FrameLayout) activity.findViewById(R.id.detailNextVideoFrame);
-            RelativeLayout nextVideoRootFrame =
-                    (RelativeLayout) activity.findViewById(R.id.detailNextVideoRootLayout);
-            View nextVideoView = videoItemViewCreator
-                    .getViewByVideoInfoItem(null, nextVideoFrame, info.nextVideo);
-            nextVideoFrame.addView(nextVideoView);
-            Button nextVideoButton = (Button) activity.findViewById(R.id.detailNextVideoButton);
-            Button similarVideosButton = (Button) activity.findViewById(R.id.detailShowSimilarButton);
-
-            textContentLayout.setVisibility(View.VISIBLE);
-            playVideoButton.setVisibility(View.VISIBLE);
-            progressBar.setVisibility(View.GONE);
-            if(!showNextVideoItem) {
-                nextVideoRootFrame.setVisibility(View.GONE);
-                similarVideosButton.setVisibility(View.GONE);
-            }
-
-            switch (info.videoAvailableStatus) {
-                case VideoInfo.VIDEO_AVAILABLE: {
-                    videoTitleView.setText(info.title);
-                    uploaderView.setText(info.uploader);
-
-                    Locale locale = getPreferredLocale();
-                    NumberFormat nf = NumberFormat.getInstance(locale);
-                    String localisedViewCount = nf.format(info.view_count);
-                    viewCountView.setText(
-                            String.format(
-                                    res.getString(R.string.viewCountText), localisedViewCount));
-
-
-                    thumbsUpView.setText(nf.format(info.like_count));
-                    thumbsDownView.setText(nf.format(info.dislike_count));
-
-                    @SuppressLint("SimpleDateFormat")
-                    SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
-                    Date datum = null;
-                    try {
-                        datum = formatter.parse(info.upload_date);
-                    } catch (ParseException e) {
-                        e.printStackTrace();
-                    }
-
-                    DateFormat df = DateFormat.getDateInstance(DateFormat.MEDIUM, locale);
-
-                    String localisedDate = df.format(datum);
-                    uploadDateView.setText(
-                            String.format(res.getString(R.string.uploadDateText), localisedDate));
-                    descriptionView.setText(Html.fromHtml(info.description));
-                    descriptionView.setMovementMethod(LinkMovementMethod.getInstance());
-
-                    actionBarHandler.setVideoInfo(info.webpage_url, info.title);
-                    actionBarHandler.setStartPosition(info.startPosition);
-
-                    // parse streams
-                    Vector<VideoInfo.VideoStream> streamsToUse = new Vector<>();
-                    for (VideoInfo.VideoStream i : info.videoStreams) {
-                        if (useStream(i, streamsToUse)) {
-                            streamsToUse.add(i);
-                        }
-                    }
-                    VideoInfo.VideoStream[] streamList = new VideoInfo.VideoStream[streamsToUse.size()];
-                    for (int i = 0; i < streamList.length; i++) {
-                        streamList[i] = streamsToUse.get(i);
-                    }
-                    actionBarHandler.setStreams(streamList, info.audioStreams);
-                }
-
-                nextVideoButton.setOnClickListener(new View.OnClickListener() {
-                    @Override
-                    public void onClick(View v) {
-                        Intent detailIntent =
-                                new Intent(getActivity(), VideoItemDetailActivity.class);
-                        detailIntent.putExtra(
-                                VideoItemDetailFragment.ARG_ITEM_ID, currentVideoInfo.nextVideo.id);
-                        detailIntent.putExtra(
-                                VideoItemDetailFragment.VIDEO_URL, currentVideoInfo.nextVideo.webpage_url);
-                        //todo: make id dynamic the following line is crap
-                        detailIntent.putExtra(VideoItemDetailFragment.STREAMING_SERVICE, 0);
-                        startActivity(detailIntent);
-                    }
-                });
-                break;
-                case VideoInfo.VIDEO_UNAVAILABLE_GEMA:
-                    thumbnailView.setImageBitmap(BitmapFactory.decodeResource(
-                            getResources(), R.drawable.gruese_die_gema_unangebracht));
-                    break;
-                case VideoInfo.VIDEO_UNAVAILABLE:
-                    thumbnailView.setImageBitmap(BitmapFactory.decodeResource(
-                            getResources(), R.drawable.not_available_monkey));
-                    break;
-                default:
-                    Log.e(TAG, "Video Available Status not known.");
-            }
-
-            if(autoPlayEnabled) {
-                actionBarHandler.playVideo();
-            }
-        } catch (java.lang.NullPointerException e) {
-            Log.w(TAG, "updateInfo(): Fragment closed before thread ended work... or else");
-            e.printStackTrace();
-        }
-    }
-
-    private boolean useStream(VideoInfo.VideoStream stream, Vector<VideoInfo.VideoStream> streams) {
-        for(VideoInfo.VideoStream i : streams) {
-            if(i.resolution.equals(stream.resolution)) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    /**
-     * Mandatory empty constructor for the fragment manager to instantiate the
-     * fragment (e.g. upon screen orientation changes).
-     */
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        activity = (AppCompatActivity) getActivity();
-        showNextVideoItem = PreferenceManager.getDefaultSharedPreferences(getActivity())
-                .getBoolean(activity.getString(R.string.showNextVideo), true);
-
-    }
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
-        View rootView = inflater.inflate(R.layout.fragment_videoitem_detail, container, false);
-        actionBarHandler = new ActionBarHandler(activity);
-        actionBarHandler.setupNavMenu(activity);
-        if(onInvokeCreateOptionsMenuListener != null) {
-            onInvokeCreateOptionsMenuListener.createOptionsMenu();
-        }
-
-        return rootView;
-    }
-
-    @Override
-    public void onActivityCreated(Bundle savedInstanceBundle) {
-        super.onActivityCreated(savedInstanceBundle);
-        Activity a = getActivity();
-        playVideoButton =
-                (FloatingActionButton) a.findViewById(R.id.playVideoButton);
-        thumbnailWindowLayout = a.findViewById(R.id.detailVideoThumbnailWindowLayout);
-        Button backgroundButton = (Button)
-                a.findViewById(R.id.detailVideoThumbnailWindowBackgroundButton);
-
-        // Sometimes when this fragment is not visible it still gets initiated
-        // then we must not try to access objects of this fragment.
-        // Otherwise the applications would crash.
-        if(playVideoButton != null) {
-            try {
-                StreamingService streamingService = ServiceList.getService(
-                        getArguments().getInt(STREAMING_SERVICE));
-                Thread videoExtractorThread = new Thread(new VideoExtractorRunnable(
-                        getArguments().getString(VIDEO_URL), streamingService));
-
-                autoPlayEnabled = getArguments().getBoolean(AUTO_PLAY);
-                videoExtractorThread.start();
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-
-            if (PreferenceManager.getDefaultSharedPreferences(getActivity())
-                    .getBoolean(getString(R.string.leftHandLayout), false) && checkIfLandscape()) {
-                RelativeLayout.LayoutParams oldLayout =
-                        (RelativeLayout.LayoutParams) playVideoButton.getLayoutParams();
-                RelativeLayout.LayoutParams layoutParams = new RelativeLayout.LayoutParams(
-                        RelativeLayout.LayoutParams.WRAP_CONTENT,
-                        RelativeLayout.LayoutParams.WRAP_CONTENT);
-                layoutParams.addRule(RelativeLayout.ALIGN_PARENT_BOTTOM);
-                layoutParams.addRule(RelativeLayout.ALIGN_PARENT_LEFT);
-                layoutParams.setMargins(oldLayout.leftMargin, oldLayout.topMargin,
-                        oldLayout.rightMargin, oldLayout.bottomMargin);
-                playVideoButton.setLayoutParams(layoutParams);
-            }
-
-            playVideoButton.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    actionBarHandler.playVideo();
-                }
-            });
-
-            backgroundButton.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    actionBarHandler.playVideo();
-                }
-            });
-
-            Button similarVideosButton = (Button) activity.findViewById(R.id.detailShowSimilarButton);
-            similarVideosButton.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    Intent intent = new Intent(activity, VideoItemListActivity.class);
-                    //todo: find more elegant way to do this - converting from List to ArrayList sucks
-                    ArrayList<VideoPreviewInfo> toParcel = new ArrayList<>(currentVideoInfo.relatedVideos);
-                    //why oh why does the parcelable array put method have to be so damn specific
-                    // about the class of its argument?
-                    //why not a List<? extends Parcelable>?
-                    intent.putParcelableArrayListExtra(VideoItemListActivity.VIDEO_INFO_ITEMS, toParcel);
-                    activity.startActivity(intent);
-                }
-            });
-
-            ImageView thumbnailView = (ImageView) activity.findViewById(R.id.detailThumbnailView);
-            thumbnailView.addOnLayoutChangeListener(new View.OnLayoutChangeListener() {
-                // This is used to synchronize the thumbnailWindowButton and the playVideoButton
-                // inside the ScrollView with the actual size of the thumbnail.
-                @Override
-                public void onLayoutChange(View v, int left, int top, int right, int bottom, int oldLeft, int oldTop, int oldRight, int oldBottom) {
-                    RelativeLayout.LayoutParams newWindowLayoutParams =
-                            (RelativeLayout.LayoutParams) thumbnailWindowLayout.getLayoutParams();
-                    newWindowLayoutParams.height = bottom - top;
-                    thumbnailWindowLayout.setLayoutParams(newWindowLayoutParams);
-
-
-                    //noinspection SuspiciousNameCombination
-                    initialThumbnailPos.set(top, left);
-
-                }
-            });
-        }
-    }
-
-    /**Returns the java.util.Locale object which corresponds to the locale set in NewPipe's preferences.
-     * Currently not affected by the device's locale.*/
-    private Locale getPreferredLocale() {
-        SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(getContext());
-        String languageKey = getContext().getString(R.string.searchLanguage);
-        //i know the following line defaults languageCode to "en", but java is picky about uninitialised values
-        // Schabi: well lint tels me the value is redundant. I'll suppress it for now.
-        @SuppressWarnings("UnusedAssignment")
-        String languageCode = "en";
-        languageCode = sp.getString(languageKey, "en");
-
-        if(languageCode.length() == 2) {
-            return new Locale(languageCode);
-        }
-        else if(languageCode.contains("_")) {
-            String country = languageCode
-                    .substring(languageCode.indexOf("_"), languageCode.length());
-            return new Locale(languageCode.substring(0, 2), country);
-        }
-        return Locale.getDefault();
-    }
-
-    private boolean checkIfLandscape() {
-        DisplayMetrics displayMetrics = new DisplayMetrics();
-        getActivity().getWindowManager().getDefaultDisplay().getMetrics(displayMetrics);
-        return displayMetrics.heightPixels < displayMetrics.widthPixels;
-    }
-
-    @Override
-    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-        actionBarHandler.setupMenu(menu, inflater);
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        return actionBarHandler.onItemSelected(item);
-    }
-
-    public void setOnInvokeCreateOptionsMenuListener(OnInvokeCreateOptionsMenuListener listener) {
-        this.onInvokeCreateOptionsMenuListener = listener;
-    }
-}

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

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

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

@@ -1,360 +0,0 @@
-package org.schabi.newpipe;
-
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.os.Bundle;
-import android.os.Handler;
-import android.preference.PreferenceManager;
-import android.support.v4.app.ListFragment;
-import android.util.Log;
-import android.view.View;
-import android.widget.AbsListView;
-import android.widget.ListView;
-import android.widget.Toast;
-
-import java.net.URL;
-import java.util.List;
-import java.util.Vector;
-
-import org.schabi.newpipe.services.SearchEngine;
-import org.schabi.newpipe.services.StreamingService;
-
-
-/**
- * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
- * VideoItemListFragment.java is part of NewPipe.
- *
- * NewPipe is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * NewPipe is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-public class VideoItemListFragment extends ListFragment {
-
-    private static final String TAG = VideoItemListFragment.class.toString();
-
-    private StreamingService streamingService = null;
-    private VideoListAdapter videoListAdapter;
-
-    // activity modes
-    private static final int SEARCH_MODE = 0;
-    private static final int PRESENT_VIDEOS_MODE = 1;
-
-    private int mode = SEARCH_MODE;
-    private String query = "";
-    private int lastPage = 0;
-
-    private Thread searchThread = null;
-    private SearchRunnable searchRunnable = null;
-    private Thread loadThumbsThread = null;
-    private LoadThumbsRunnable loadThumbsRunnable = null;
-    // used to track down if results posted by threads ar still valid
-    private int currentRequestId = -1;
-    private ListView list;
-
-    private class ResultRunnable implements Runnable {
-        private final SearchEngine.Result result;
-        private final int requestId;
-        public ResultRunnable(SearchEngine.Result result, int requestId) {
-            this.result = result;
-            this.requestId = requestId;
-        }
-        @Override
-        public void run() {
-            updateListOnResult(result, requestId);
-        }
-    }
-
-    private class SearchRunnable implements Runnable {
-        private final SearchEngine engine;
-        private final String query;
-        private final int page;
-        final Handler h = new Handler();
-        private volatile boolean run = true;
-        private final int requestId;
-        public SearchRunnable(SearchEngine engine, String query, int page, int requestId) {
-            this.engine = engine;
-            this.query = query;
-            this.page = page;
-            this.requestId = requestId;
-        }
-        void terminate() {
-            run = false;
-        }
-        @Override
-        public void run() {
-            try {
-                SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(getContext());
-                String searchLanguageKey = getContext().getString(R.string.searchLanguage);
-                String searchLanguage = sp.getString(searchLanguageKey, "en");
-                SearchEngine.Result result = engine.search(query, page, searchLanguage);
-                Log.i(TAG, "language code passed:\""+searchLanguage+"\"");
-                if(run) {
-                    h.post(new ResultRunnable(result, requestId));
-                }
-            } catch(Exception e) {
-                e.printStackTrace();
-                h.post(new Runnable() {
-                    @Override
-                    public void run() {
-                        Toast.makeText(getActivity(), "Network Error", Toast.LENGTH_SHORT).show();
-                    }
-                });
-            }
-        }
-    }
-
-    private class LoadThumbsRunnable implements Runnable {
-        private final Vector<String> thumbnailUrlList = new Vector<>();
-        private final Vector<Boolean> downloadedList;
-        final Handler h = new Handler();
-        private volatile boolean run = true;
-        private final int requestId;
-        public LoadThumbsRunnable(Vector<VideoPreviewInfo> videoList,
-                                  Vector<Boolean> downloadedList, int requestId) {
-            for(VideoPreviewInfo item : videoList) {
-                thumbnailUrlList.add(item.thumbnail_url);
-            }
-            this.downloadedList = downloadedList;
-            this.requestId = requestId;
-        }
-        public void terminate() {
-            run = false;
-        }
-        public boolean isRunning() {
-            return run;
-        }
-        @Override
-        public void run() {
-            for(int i = 0; i < thumbnailUrlList.size() && run; i++) {
-                if(!downloadedList.get(i)) {
-                    Bitmap thumbnail;
-                    try {
-                        thumbnail = BitmapFactory.decodeStream(
-                                new URL(thumbnailUrlList.get(i)).openConnection().getInputStream());
-                        h.post(new SetThumbnailRunnable(i, thumbnail, requestId));
-                    } catch (Exception e) {
-                        e.printStackTrace();
-                    }
-                }
-            }
-        }
-    }
-
-    private class SetThumbnailRunnable implements Runnable {
-        private final int index;
-        private final Bitmap thumbnail;
-        private final int requestId;
-        public SetThumbnailRunnable(int index, Bitmap thumbnail, int requestId) {
-            this.index = index;
-            this.thumbnail = thumbnail;
-            this.requestId = requestId;
-        }
-        @Override
-        public void run() {
-            if(requestId == currentRequestId) {
-                videoListAdapter.updateDownloadedThumbnailList(index);
-                videoListAdapter.setThumbnail(index, thumbnail);
-            }
-        }
-    }
-
-    public void present(List<VideoPreviewInfo> videoList) {
-        mode = PRESENT_VIDEOS_MODE;
-        setListShown(true);
-        getListView().smoothScrollToPosition(0);
-
-        updateList(videoList);
-    }
-
-    public void search(String query) {
-        mode = SEARCH_MODE;
-        this.query = query;
-        this.lastPage = 1;
-        videoListAdapter.clearVideoList();
-        setListShown(false);
-        startSearch(query, lastPage);
-        getListView().smoothScrollToPosition(0);
-    }
-
-    private void nextPage() {
-        lastPage++;
-        Log.d(TAG, getString(R.string.searchPage) + Integer.toString(lastPage));
-        startSearch(query, lastPage);
-    }
-
-    private void startSearch(String query, int page) {
-        currentRequestId++;
-        terminateThreads();
-        searchRunnable = new SearchRunnable(streamingService.getSearchEngineInstance(),
-                                            query, page, currentRequestId);
-        searchThread = new Thread(searchRunnable);
-        searchThread.start();
-    }
-
-    public void setStreamingService(StreamingService streamingService) {
-        this.streamingService = streamingService;
-    }
-
-    private void updateListOnResult(SearchEngine.Result result, int requestId) {
-        if(requestId == currentRequestId) {
-            setListShown(true);
-            if (result.resultList.isEmpty()) {
-                Toast.makeText(getActivity(), result.errorMessage, Toast.LENGTH_LONG).show();
-            } else {
-                if (!result.suggestion.isEmpty()) {
-                    Toast.makeText(getActivity(), getString(R.string.didYouMean) + result.suggestion + " ?",
-                            Toast.LENGTH_LONG).show();
-                }
-                updateList(result.resultList);
-            }
-        }
-    }
-
-    private void updateList(List<VideoPreviewInfo> list) {
-        try {
-            videoListAdapter.addVideoList(list);
-            terminateThreads();
-            loadThumbsRunnable = new LoadThumbsRunnable(videoListAdapter.getVideoList(),
-                    videoListAdapter.getDownloadedThumbnailList(), currentRequestId);
-            loadThumbsThread = new Thread(loadThumbsRunnable);
-            loadThumbsThread.start();
-        } catch(java.lang.IllegalStateException e) {
-            Log.w(TAG, "Trying to set value while activity doesn't exist anymore.");
-        } catch(Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    private void terminateThreads() {
-        if(loadThumbsRunnable != null && loadThumbsRunnable.isRunning()) {
-            loadThumbsRunnable.terminate();
-            try {
-                loadThumbsThread.join();
-            } catch(Exception e) {
-                e.printStackTrace();
-            }
-        }
-        if(searchThread != null) {
-            searchRunnable.terminate();
-            // No need to join, since we don't really terminate the thread. We just demand
-            // it to post its result runnable into the gui main loop.
-        }
-    }
-
-    /**
-     * The serialization (saved instance state) Bundle key representing the
-     * activated item position. Only used on tablets.
-     */
-    private static final String STATE_ACTIVATED_POSITION = "activated_position";
-
-    /**
-     * The current activated item position. Only used on tablets.
-     */
-    private int mActivatedPosition = ListView.INVALID_POSITION;
-
-    /**
-     * A callback interface that all activities containing this fragment must
-     * implement. This mechanism allows activities to be notified of item
-     * selections.
-     */
-    public interface Callbacks {
-        /**
-         * Callback for when an item has been selected.
-         */
-        void onItemSelected(String id);
-    }
-
-    private Callbacks mCallbacks = null;
-
-    @Override
-    public void onViewCreated(View view, Bundle savedInstanceState) {
-        super.onViewCreated(view, savedInstanceState);
-        list = getListView();
-        videoListAdapter = new VideoListAdapter(getActivity(), this);
-        setListAdapter(videoListAdapter);
-
-        // Restore the previously serialized activated item position.
-        if (savedInstanceState != null
-
-                && savedInstanceState.containsKey(STATE_ACTIVATED_POSITION)) {
-            setActivatedPosition(savedInstanceState.getInt(STATE_ACTIVATED_POSITION));
-        }
-
-        getListView().setOnScrollListener(new AbsListView.OnScrollListener() {
-            long lastScrollDate = 0;
-
-            @Override
-            public void onScrollStateChanged(AbsListView view, int scrollState) {
-            }
-
-            @Override
-            public void onScroll(AbsListView view, int firstVisibleItem, int visibleItemCount, int totalItemCount) {
-                if (mode != PRESENT_VIDEOS_MODE
-                        && list.getChildAt(0) != null
-                        && list.getLastVisiblePosition() == list.getAdapter().getCount() - 1
-                        && list.getChildAt(list.getChildCount() - 1).getBottom() <= list.getHeight()) {
-                    long time = System.currentTimeMillis();
-                    if ((time - lastScrollDate) > 200) {
-                        lastScrollDate = time;
-                        nextPage();
-                    }
-                }
-            }
-
-        });
-    }
-
-    @Override
-    public void onAttach(Context context) {
-        super.onAttach(context);
-
-        // Activities containing this fragment must implement its callbacks.
-        if (!(context instanceof Callbacks)) {
-            throw new IllegalStateException("Activity must implement fragment's callbacks.");
-        }
-
-        mCallbacks = (Callbacks) context;
-    }
-
-    @Override
-    public void onListItemClick(ListView listView, View view, int position, long id) {
-        super.onListItemClick(listView, view, position, id);
-        setActivatedPosition(position);
-        mCallbacks.onItemSelected(Long.toString(id));
-    }
-
-    /**
-     * Turns on activate-on-click mode. When this mode is on, list items will be
-     * given the 'activated' state when touched.
-     */
-    public void setActivateOnItemClick(@SuppressWarnings("SameParameterValue") boolean activateOnItemClick) {
-        // When setting CHOICE_MODE_SINGLE, ListView will automatically
-        // give items the 'activated' state when touched.
-        getListView().setChoiceMode(activateOnItemClick
-                ? ListView.CHOICE_MODE_SINGLE
-                : ListView.CHOICE_MODE_NONE);
-    }
-
-    private void setActivatedPosition(int position) {
-        if (position == ListView.INVALID_POSITION) {
-            getListView().setItemChecked(mActivatedPosition, false);
-        } else {
-            getListView().setItemChecked(position, true);
-        }
-
-        mActivatedPosition = position;
-    }
-
-}

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

@@ -1,108 +0,0 @@
-package org.schabi.newpipe;
-
-import android.content.Context;
-import android.graphics.Bitmap;
-import android.support.v4.content.ContextCompat;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.BaseAdapter;
-import android.widget.ListView;
-
-import java.util.List;
-import java.util.Vector;
-
-/**
- * Created by Christian Schabesberger on 11.08.15.
- *
- * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
- * VideoListAdapter.java is part of NewPipe.
- *
- * NewPipe is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * NewPipe is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-class VideoListAdapter extends BaseAdapter {
-
-    private final Context context;
-    private final VideoInfoItemViewCreator viewCreator;
-    private Vector<VideoPreviewInfo> videoList = new Vector<>();
-    private Vector<Boolean> downloadedThumbnailList = new Vector<>();
-    private final ListView listView;
-
-    public VideoListAdapter(Context context, VideoItemListFragment videoListFragment) {
-        viewCreator = new VideoInfoItemViewCreator(LayoutInflater.from(context));
-        this.listView = videoListFragment.getListView();
-        this.context = context;
-    }
-
-    public void addVideoList(List<VideoPreviewInfo> videos) {
-        videoList.addAll(videos);
-        for(int i = 0; i < videos.size(); i++) {
-            downloadedThumbnailList.add(false);
-        }
-        notifyDataSetChanged();
-    }
-
-    public void clearVideoList() {
-        videoList = new Vector<>();
-        downloadedThumbnailList = new Vector<>();
-        notifyDataSetChanged();
-    }
-
-    public Vector<VideoPreviewInfo> getVideoList() {
-        return videoList;
-    }
-
-    public void updateDownloadedThumbnailList(int index) {
-        downloadedThumbnailList.set(index, true);
-    }
-
-    public Vector<Boolean> getDownloadedThumbnailList() {
-        return downloadedThumbnailList;
-    }
-
-    public void setThumbnail(int index, Bitmap thumbnail) {
-        videoList.get(index).thumbnail = thumbnail;
-        downloadedThumbnailList.set(index, true);
-        notifyDataSetChanged();
-    }
-
-    @Override
-    public int getCount() {
-        return videoList.size();
-    }
-
-    @Override
-    public Object getItem(int position) {
-        return videoList.get(position);
-    }
-
-    @Override
-    public long getItemId(int position) {
-        return position;
-    }
-
-    @Override
-    public View getView(int position, View convertView, ViewGroup parent) {
-        convertView = viewCreator.getViewByVideoInfoItem(convertView, parent, videoList.get(position));
-
-        if(listView.isItemChecked(position)) {
-            convertView.setBackgroundColor(ContextCompat.getColor(context,R.color.primaryColorYoutube));
-        } else {
-            convertView.setBackgroundColor(0);
-        }
-
-        return convertView;
-    }
-}

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

@@ -1,79 +0,0 @@
-package org.schabi.newpipe;
-
-import android.graphics.Bitmap;
-import android.os.Parcel;
-import android.os.Parcelable;
-
-import org.schabi.newpipe.services.AbstractVideoInfo;
-
-/**
- * Created by Christian Schabesberger on 26.08.15.
- *
- * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
- * VideoPreviewInfo.java is part of NewPipe.
- *
- * NewPipe is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * NewPipe is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**Info object for previews of unopened videos, eg search results, related videos*/
-public class VideoPreviewInfo extends AbstractVideoInfo implements Parcelable {
-    public String duration = "";
-    @SuppressWarnings("WeakerAccess")
-    protected VideoPreviewInfo(Parcel in) {
-        id = in.readString();
-        title = in.readString();
-        uploader = in.readString();
-        duration = in.readString();
-        thumbnail_url = in.readString();
-        thumbnail = (Bitmap) in.readValue(Bitmap.class.getClassLoader());
-        webpage_url = in.readString();
-        upload_date = in.readString();
-        view_count = in.readLong();
-    }
-
-    public VideoPreviewInfo() {
-
-    }
-
-    @Override
-    public int describeContents() {
-        return 0;
-    }
-
-    @Override
-    public void writeToParcel(Parcel dest, int flags) {
-        dest.writeString(id);
-        dest.writeString(title);
-        dest.writeString(uploader);
-        dest.writeString(duration);
-        dest.writeString(thumbnail_url);
-        dest.writeValue(thumbnail);
-        dest.writeString(webpage_url);
-        dest.writeString(upload_date);
-        dest.writeLong(view_count);
-    }
-
-    @SuppressWarnings("unused")
-    public static final Parcelable.Creator<VideoPreviewInfo> CREATOR = new Parcelable.Creator<VideoPreviewInfo>() {
-        @Override
-        public VideoPreviewInfo createFromParcel(Parcel in) {
-            return new VideoPreviewInfo(in);
-        }
-
-        @Override
-        public VideoPreviewInfo[] newArray(int size) {
-            return new VideoPreviewInfo[size];
-        }
-    };
-}

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

@@ -0,0 +1,234 @@
+package org.schabi.newpipe.detail;
+
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.preference.PreferenceManager;
+import android.support.v7.app.ActionBar;
+import android.support.v7.app.AppCompatActivity;
+import android.util.Log;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.widget.ArrayAdapter;
+
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.settings.SettingsActivity;
+import org.schabi.newpipe.extractor.MediaFormat;
+import org.schabi.newpipe.extractor.stream_info.VideoStream;
+
+import java.util.List;
+
+/**
+ * Created by Christian Schabesberger on 18.08.15.
+ *
+ * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
+ * DetailsMenuHandler.java is part of NewPipe.
+ *
+ * NewPipe is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * NewPipe is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+class ActionBarHandler {
+    private static final String TAG = ActionBarHandler.class.toString();
+
+    private AppCompatActivity activity;
+    private int selectedVideoStream = -1;
+
+    private SharedPreferences defaultPreferences;
+
+    private Menu menu;
+
+    // Only callbacks are listed here, there are more actions which don't need a callback.
+    // those are edited directly. Typically VideoItemDetailFragment will implement those callbacks.
+    private OnActionListener onShareListener;
+    private OnActionListener onOpenInBrowserListener;
+    private OnActionListener onDownloadListener;
+    private OnActionListener onPlayWithKodiListener;
+    private OnActionListener onPlayAudioListener;
+
+
+    // Triggered when a stream related action is triggered.
+    public interface OnActionListener {
+        void onActionSelected(int selectedStreamId);
+    }
+
+    public ActionBarHandler(AppCompatActivity activity) {
+        this.activity = activity;
+    }
+
+    @SuppressWarnings({"deprecation", "ConstantConditions"})
+    public void setupNavMenu(AppCompatActivity activity) {
+        this.activity = activity;
+        try {
+            activity.getSupportActionBar().setNavigationMode(ActionBar.NAVIGATION_MODE_LIST);
+        } catch (NullPointerException e) {
+            e.printStackTrace();
+        }
+    }
+
+    public void setupStreamList(final List<VideoStream> videoStreams) {
+        if (activity != null) {
+            selectedVideoStream = 0;
+
+
+            // this array will be shown in the dropdown menu for selecting the stream/resolution.
+            String[] itemArray = new String[videoStreams.size()];
+            for (int i = 0; i < videoStreams.size(); i++) {
+                VideoStream item = videoStreams.get(i);
+                itemArray[i] = MediaFormat.getNameById(item.format) + " " + item.resolution;
+            }
+            int defaultResolution = getDefaultResolution(videoStreams);
+
+            ArrayAdapter<String> itemAdapter = new ArrayAdapter<>(activity.getBaseContext(),
+                    android.R.layout.simple_spinner_dropdown_item, itemArray);
+
+            ActionBar ab = activity.getSupportActionBar();
+            //todo: make this throwsable
+            assert ab != null : "Could not get actionbar";
+            ab.setListNavigationCallbacks(itemAdapter
+                    , new ActionBar.OnNavigationListener() {
+                @Override
+                public boolean onNavigationItemSelected(int itemPosition, long itemId) {
+                    selectedVideoStream = (int) itemId;
+                    return true;
+                }
+            });
+
+            ab.setSelectedNavigationItem(defaultResolution);
+        }
+    }
+
+
+    private int getDefaultResolution(final List<VideoStream> videoStreams) {
+        if (defaultPreferences == null)
+            return 0;
+
+        String defaultResolution = defaultPreferences
+                .getString(activity.getString(R.string.default_resolution_key),
+                        activity.getString(R.string.default_resolution_value));
+
+        for (int i = 0; i < videoStreams.size(); i++) {
+            VideoStream item = videoStreams.get(i);
+            if (defaultResolution.equals(item.resolution)) {
+                return i;
+            }
+        }
+        // this is actually an error,
+        // but maybe there is really no stream fitting to the default value.
+        return 0;
+    }
+
+    public void setupMenu(Menu menu, MenuInflater inflater) {
+        this.menu = menu;
+
+        // CAUTION set item properties programmatically otherwise it would not be accepted by
+        // appcompat itemsinflater.inflate(R.menu.videoitem_detail, menu);
+
+        defaultPreferences = PreferenceManager.getDefaultSharedPreferences(activity);
+        inflater.inflate(R.menu.videoitem_detail, menu);
+
+        showPlayWithKodiAction(defaultPreferences
+                .getBoolean(activity.getString(R.string.show_play_with_kodi_key), false));
+    }
+
+    public boolean onItemSelected(MenuItem item) {
+        int id = item.getItemId();
+        switch (id) {
+            case R.id.menu_item_share: {
+                    /*
+                    Intent intent = new Intent();
+                    intent.setAction(Intent.ACTION_SEND);
+                    intent.putExtra(Intent.EXTRA_TEXT, websiteUrl);
+                    intent.setType("text/plain");
+                    activity.startActivity(Intent.createChooser(intent, activity.getString(R.string.share_dialog_title)));
+                    */
+                if(onShareListener != null) {
+                    onShareListener.onActionSelected(selectedVideoStream);
+                }
+                return true;
+            }
+            case R.id.menu_item_openInBrowser: {
+                if(onOpenInBrowserListener != null) {
+                    onOpenInBrowserListener.onActionSelected(selectedVideoStream);
+                }
+            }
+            return true;
+            case R.id.menu_item_download:
+                if(onDownloadListener != null) {
+                    onDownloadListener.onActionSelected(selectedVideoStream);
+                }
+                return true;
+            case R.id.action_settings: {
+                Intent intent = new Intent(activity, SettingsActivity.class);
+                activity.startActivity(intent);
+                return true;
+            }
+            case R.id.action_play_with_kodi:
+                if(onPlayWithKodiListener != null) {
+                    onPlayWithKodiListener.onActionSelected(selectedVideoStream);
+                }
+                return true;
+            case R.id.menu_item_play_audio:
+                if(onPlayAudioListener != null) {
+                    onPlayAudioListener.onActionSelected(selectedVideoStream);
+                }
+                return true;
+            case R.id.menu_item_downloads: {
+                Intent intent =
+                        new Intent(activity, org.schabi.newpipe.download.DownloadActivity.class);
+                activity.startActivity(intent);
+                return true;
+            }
+            default:
+                Log.e(TAG, "Menu Item not known");
+        }
+        return false;
+    }
+
+    public int getSelectedVideoStream() {
+        return selectedVideoStream;
+    }
+
+    public void setOnShareListener(OnActionListener listener) {
+        onShareListener = listener;
+    }
+
+    public void setOnOpenInBrowserListener(OnActionListener listener) {
+        onOpenInBrowserListener = listener;
+    }
+
+    public void setOnDownloadListener(OnActionListener listener) {
+        onDownloadListener = listener;
+    }
+
+    public void setOnPlayWithKodiListener(OnActionListener listener) {
+        onPlayWithKodiListener = listener;
+    }
+
+    public void setOnPlayAudioListener(OnActionListener listener) {
+        onPlayAudioListener = listener;
+    }
+
+    public void showAudioAction(boolean visible) {
+        menu.findItem(R.id.menu_item_play_audio).setVisible(visible);
+    }
+
+    public void showDownloadAction(boolean visible) {
+        menu.findItem(R.id.menu_item_download).setVisible(visible);
+    }
+
+    public void showPlayWithKodiAction(boolean visible) {
+        menu.findItem(R.id.action_play_with_kodi).setVisible(visible);
+    }
+}

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

@@ -0,0 +1,230 @@
+package org.schabi.newpipe.detail;
+
+import android.app.Activity;
+import android.os.Handler;
+import android.util.Log;
+import android.view.View;
+
+import org.schabi.newpipe.extractor.exceptions.ParsingException;
+import org.schabi.newpipe.extractor.exceptions.ReCaptchaException;
+import org.schabi.newpipe.extractor.stream_info.StreamExtractor;
+import org.schabi.newpipe.extractor.stream_info.StreamInfo;
+import org.schabi.newpipe.report.ErrorActivity;
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.extractor.NewPipe;
+import org.schabi.newpipe.extractor.StreamingService;
+import org.schabi.newpipe.extractor.services.youtube.YoutubeStreamExtractor;
+
+import java.io.IOException;
+
+/**
+ * Created by Christian Schabesberger on 02.08.16.
+ *
+ * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
+ * StreamInfoWorker.java is part of NewPipe.
+ *
+ * NewPipe is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * NewPipe is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+public class StreamInfoWorker {
+
+    private static final String TAG = StreamInfoWorker.class.toString();
+
+    public interface OnStreamInfoReceivedListener {
+        void onReceive(StreamInfo info);
+        void onError(int messageId);
+        void onReCaptchaException();
+        void onBlockedByGemaError();
+        void onContentErrorWithMessage(int messageId);
+        void onContentError();
+    }
+
+    private class StreamExtractorRunnable implements Runnable {
+        private final Handler h = new Handler();
+        private StreamExtractor streamExtractor;
+        private final int serviceId;
+        private final String videoUrl;
+        private Activity a;
+
+        public StreamExtractorRunnable(Activity a, String videoUrl, int serviceId) {
+            this.serviceId = serviceId;
+            this.videoUrl = videoUrl;
+            this.a = a;
+        }
+
+        @Override
+        public void run() {
+            StreamInfo streamInfo = null;
+            StreamingService service = null;
+            try {
+                service = NewPipe.getService(serviceId);
+            } catch (Exception e) {
+                e.printStackTrace();
+                ErrorActivity.reportError(h, a, e, VideoItemDetailFragment.class, null,
+                        ErrorActivity.ErrorInfo.make(ErrorActivity.REQUESTED_STREAM,
+                                "", videoUrl, R.string.could_not_get_stream));
+                return;
+            }
+            try {
+                streamExtractor = service.getExtractorInstance(videoUrl);
+                streamInfo = StreamInfo.getVideoInfo(streamExtractor);
+
+                final StreamInfo info = streamInfo;
+                h.post(new Runnable() {
+                    @Override
+                    public void run() {
+                        onStreamInfoReceivedListener.onReceive(info);
+                    }
+                });
+
+                // look for errors during extraction
+                // this if statement only covers extra information.
+                // if these are not available or caused an error, they are just not available
+                // but don't render the stream information unusalbe.
+                if(streamInfo != null &&
+                        !streamInfo.errors.isEmpty()) {
+                    Log.e(TAG, "OCCURRED ERRORS DURING EXTRACTION:");
+                    for (Throwable e : streamInfo.errors) {
+                        e.printStackTrace();
+                        Log.e(TAG, "------");
+                    }
+
+                    View rootView = a != null ? a.findViewById(R.id.video_item_detail) : null;
+                    ErrorActivity.reportError(h, a,
+                            streamInfo.errors, null, rootView,
+                            ErrorActivity.ErrorInfo.make(ErrorActivity.REQUESTED_STREAM,
+                                    service.getServiceInfo().name, videoUrl, 0 /* no message for the user */));
+                }
+
+                // These errors render the stream information unusable.
+            } catch (ReCaptchaException e) {
+                h.post(new Runnable() {
+                    @Override
+                    public void run() {
+                        onStreamInfoReceivedListener.onReCaptchaException();
+                    }
+                });
+            } catch (IOException e) {
+                h.post(new Runnable() {
+                    @Override
+                    public void run() {
+                        onStreamInfoReceivedListener.onError(R.string.network_error);
+                    }
+                });
+                e.printStackTrace();
+            } catch (YoutubeStreamExtractor.DecryptException de) {
+                // custom service related exceptions
+                ErrorActivity.reportError(h, a, de, VideoItemDetailFragment.class, null,
+                        ErrorActivity.ErrorInfo.make(ErrorActivity.REQUESTED_STREAM,
+                                service.getServiceInfo().name, videoUrl, R.string.youtube_signature_decryption_error));
+                h.post(new Runnable() {
+                    @Override
+                    public void run() {
+                        a.finish();
+                    }
+                });
+                de.printStackTrace();
+            } catch (YoutubeStreamExtractor.GemaException ge) {
+                h.post(new Runnable() {
+                    @Override
+                    public void run() {
+                        onStreamInfoReceivedListener.onBlockedByGemaError();
+                    }
+                });
+            } catch(YoutubeStreamExtractor.LiveStreamException e) {
+                h.post(new Runnable() {
+                    @Override
+                    public void run() {
+                        onStreamInfoReceivedListener
+                                .onContentErrorWithMessage(R.string.live_streams_not_supported);
+                    }
+                });
+            }
+            // ----------------------------------------
+            catch(StreamExtractor.ContentNotAvailableException e) {
+                h.post(new Runnable() {
+                    @Override
+                    public void run() {
+                        onStreamInfoReceivedListener
+                                .onContentError();
+                    }
+                });
+                e.printStackTrace();
+            } catch(StreamInfo.StreamExctractException e) {
+                if(!streamInfo.errors.isEmpty()) {
+                    // !!! if this case ever kicks in someone gets kicked out !!!
+                    ErrorActivity.reportError(h, a, e, VideoItemDetailFragment.class, null,
+                            ErrorActivity.ErrorInfo.make(ErrorActivity.REQUESTED_STREAM,
+                                    service.getServiceInfo().name, videoUrl, R.string.could_not_get_stream));
+                } else {
+                    ErrorActivity.reportError(h, a, streamInfo.errors, VideoItemDetailFragment.class, null,
+                            ErrorActivity.ErrorInfo.make(ErrorActivity.REQUESTED_STREAM,
+                                    service.getServiceInfo().name, videoUrl, R.string.could_not_get_stream));
+                }
+                h.post(new Runnable() {
+                    @Override
+                    public void run() {
+                        a.finish();
+                    }
+                });
+                e.printStackTrace();
+            } catch (ParsingException e) {
+                ErrorActivity.reportError(h, a, e, VideoItemDetailFragment.class, null,
+                        ErrorActivity.ErrorInfo.make(ErrorActivity.REQUESTED_STREAM,
+                                service.getServiceInfo().name, videoUrl, R.string.parsing_error));
+                h.post(new Runnable() {
+                    @Override
+                    public void run() {
+                        a.finish();
+                    }
+                });
+                e.printStackTrace();
+            } catch(Exception e) {
+                ErrorActivity.reportError(h, a, e, VideoItemDetailFragment.class, null,
+                        ErrorActivity.ErrorInfo.make(ErrorActivity.REQUESTED_STREAM,
+                                service.getServiceInfo().name, videoUrl, R.string.general_error));
+                h.post(new Runnable() {
+                    @Override
+                    public void run() {
+                        a.finish();
+                    }
+                });
+                e.printStackTrace();
+            }
+        }
+    }
+
+    private static StreamInfoWorker streamInfoWorker = null;
+    private StreamExtractorRunnable runnable = null;
+    private OnStreamInfoReceivedListener onStreamInfoReceivedListener = null;
+
+    private StreamInfoWorker() {
+
+    }
+
+    public static StreamInfoWorker getInstance() {
+        return streamInfoWorker == null ? (streamInfoWorker = new StreamInfoWorker()) : streamInfoWorker;
+    }
+
+    public void search(int serviceId, String url, Activity a) {
+        runnable = new StreamExtractorRunnable(a, url, serviceId);
+        Thread thread = new Thread(runnable);
+        thread.start();
+    }
+
+    public void setOnStreamInfoReceivedListener(
+            OnStreamInfoReceivedListener onStreamInfoReceivedListener) {
+        this.onStreamInfoReceivedListener = onStreamInfoReceivedListener;
+    }
+}

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

@@ -1,17 +1,17 @@
-package org.schabi.newpipe;
+package org.schabi.newpipe.detail;
 
 import android.content.Intent;
+import android.media.AudioManager;
 import android.os.Bundle;
-import android.preference.PreferenceManager;
-import android.support.v4.app.NavUtils;
 import android.support.v7.app.AppCompatActivity;
 import android.util.Log;
-import android.view.Menu;
 import android.view.MenuItem;
-import android.widget.Toast;
 
-import org.schabi.newpipe.services.ServiceList;
-import org.schabi.newpipe.services.StreamingService;
+import org.schabi.newpipe.App;
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.report.ErrorActivity;
+import org.schabi.newpipe.util.NavStack;
+import org.schabi.newpipe.util.ThemeHelper;
 
 
 /**
@@ -33,7 +33,6 @@ import org.schabi.newpipe.services.StreamingService;
  */
 
 public class VideoItemDetailActivity extends AppCompatActivity {
-
     private static final String TAG = VideoItemDetailActivity.class.toString();
 
     private VideoItemDetailFragment fragment;
@@ -43,8 +42,9 @@ public class VideoItemDetailActivity extends AppCompatActivity {
 
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        ThemeHelper.setTheme(this, true);
         setContentView(R.layout.activity_videoitem_detail);
-
+        setVolumeControlStream(AudioManager.STREAM_MUSIC);
         // Show the Up button in the action bar.
         try {
             //noinspection ConstantConditions
@@ -64,64 +64,68 @@ public class VideoItemDetailActivity extends AppCompatActivity {
         // http://developer.android.com/guide/components/fragments.html
         //
 
-        Bundle arguments = new Bundle();
         if (savedInstanceState == null) {
-            // this means the video was called though another app
-            if (getIntent().getData() != null) {
-                videoUrl = getIntent().getData().toString();
-                StreamingService[] serviceList = ServiceList.getServices();
-                //VideoExtractor videoExtractor = null;
-                for (int i = 0; i < serviceList.length; i++) {
-                    if (serviceList[i].acceptUrl(videoUrl)) {
-                        arguments.putInt(VideoItemDetailFragment.STREAMING_SERVICE, i);
-                        currentStreamingService = i;
-                        //videoExtractor = ServiceList.getService(i).getExtractorInstance();
-                        break;
-                    }
-                }
-                if(currentStreamingService == -1) {
-                    Toast.makeText(this, R.string.urlNotSupportedText, Toast.LENGTH_LONG)
-                            .show();
-                }
-                //arguments.putString(VideoItemDetailFragment.VIDEO_URL,
-                //        videoExtractor.getVideoUrl(videoExtractor.getVideoId(videoUrl)));//cleans URL
-                arguments.putString(VideoItemDetailFragment.VIDEO_URL, videoUrl);
-
-                arguments.putBoolean(VideoItemDetailFragment.AUTO_PLAY,
-                        PreferenceManager.getDefaultSharedPreferences(this)
-                                .getBoolean(getString(R.string.autoPlayThroughIntent), false));
-            } else {
-                videoUrl = getIntent().getStringExtra(VideoItemDetailFragment.VIDEO_URL);
-                currentStreamingService = getIntent().getIntExtra(VideoItemDetailFragment.STREAMING_SERVICE, -1);
-                arguments.putString(VideoItemDetailFragment.VIDEO_URL, videoUrl);
-                arguments.putInt(VideoItemDetailFragment.STREAMING_SERVICE, currentStreamingService);
-                arguments.putBoolean(VideoItemDetailFragment.AUTO_PLAY, false);
-            }
-
+            handleIntent(getIntent());
         } else {
-            videoUrl = savedInstanceState.getString(VideoItemDetailFragment.VIDEO_URL);
-            currentStreamingService = savedInstanceState.getInt(VideoItemDetailFragment.STREAMING_SERVICE);
-            arguments = savedInstanceState;
+            videoUrl = savedInstanceState.getString(NavStack.URL);
+            currentStreamingService = savedInstanceState.getInt(NavStack.SERVICE_ID);
+            NavStack.getInstance()
+                    .restoreSavedInstanceState(savedInstanceState);
+            addFragment(savedInstanceState);
         }
+    }
 
+    @Override
+    protected void onNewIntent(Intent intent) {
+        super.onNewIntent(intent);
+        setIntent(intent);
+        handleIntent(intent);
+    }
+
+    private void handleIntent(Intent intent) {
+        Bundle arguments = new Bundle();
+        boolean autoplay = false;
+
+        videoUrl = intent.getStringExtra(NavStack.URL);
+        currentStreamingService = intent.getIntExtra(NavStack.SERVICE_ID, -1);
+        if(intent.hasExtra(VideoItemDetailFragment.AUTO_PLAY)) {
+            arguments.putBoolean(VideoItemDetailFragment.AUTO_PLAY,
+                    intent.getBooleanExtra(VideoItemDetailFragment.AUTO_PLAY, false));
+        }
+        arguments.putString(NavStack.URL, videoUrl);
+        arguments.putInt(NavStack.SERVICE_ID, currentStreamingService);
+        addFragment(arguments);
+    }
+
+    private void addFragment(final Bundle arguments) {
         // Create the detail fragment and add it to the activity
         // using a fragment transaction.
         fragment = new VideoItemDetailFragment();
         fragment.setArguments(arguments);
         getSupportFragmentManager().beginTransaction()
-                .add(R.id.videoitem_detail_container, fragment)
+                .replace(R.id.videoitem_detail_container, fragment)
                 .commit();
     }
 
+    @Override
+    public void onResume() {
+        super.onResume();
+        App.checkStartTor(this);
+    }
+
     @Override
     public void onSaveInstanceState(Bundle outState) {
-        outState.putString(VideoItemDetailFragment.VIDEO_URL, videoUrl);
-        outState.putInt(VideoItemDetailFragment.STREAMING_SERVICE, currentStreamingService);
+        super.onSaveInstanceState(outState);
+        outState.putString(NavStack.URL, videoUrl);
+        outState.putInt(NavStack.SERVICE_ID, currentStreamingService);
         outState.putBoolean(VideoItemDetailFragment.AUTO_PLAY, false);
+        NavStack.getInstance()
+                .onSaveInstanceState(outState);
     }
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
+        super.onOptionsItemSelected(item);
         int id = item.getItemId();
         if (id == android.R.id.home) {
             // This ID represents the Home or Up button. In the case of this
@@ -131,20 +135,21 @@ public class VideoItemDetailActivity extends AppCompatActivity {
 
             // http://developer.android.com/design/patterns/navigation.html#up-vs-back
 
-            Intent intent = new Intent(this, VideoItemListActivity.class);
-            intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
-            NavUtils.navigateUpTo(this, intent);
+            NavStack.getInstance()
+                    .openMainActivity(this);
             return true;
         } else {
-            return fragment.onOptionsItemSelected(item) ||
-                    super.onOptionsItemSelected(item);
+            return super.onOptionsItemSelected(item);
         }
     }
 
     @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        super.onCreateOptionsMenu(menu);
-        fragment.onCreateOptionsMenu(menu, getMenuInflater());
-        return true;
+    public void onBackPressed() {
+        try {
+            NavStack.getInstance()
+                    .navBack(this);
+        } catch (Exception e) {
+            ErrorActivity.reportUiError(this, e);
+        }
     }
 }

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

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

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

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

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

@@ -0,0 +1,240 @@
+package org.schabi.newpipe.download;
+
+import android.Manifest;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.ServiceConnection;
+import android.content.pm.PackageManager;
+import android.net.Uri;
+import android.os.Bundle;
+import android.os.IBinder;
+import android.support.annotation.Nullable;
+import android.support.v4.app.ActivityCompat;
+import android.support.v4.app.DialogFragment;
+import android.support.v4.content.ContextCompat;
+import android.support.v7.widget.Toolbar;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.EditText;
+import android.widget.RadioButton;
+import android.widget.SeekBar;
+import android.widget.TextView;
+
+import org.schabi.newpipe.App;
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.extractor.NewPipe;
+import org.schabi.newpipe.settings.NewPipeSettings;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
+import us.shandian.giga.get.DownloadManager;
+import us.shandian.giga.get.DownloadMission;
+import us.shandian.giga.service.DownloadManagerService;
+
+
+/**
+ * Created by Christian Schabesberger on 21.09.15.
+ *
+ * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
+ * DownloadDialog.java is part of NewPipe.
+ *
+ * NewPipe is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * NewPipe is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+public class DownloadDialog extends DialogFragment {
+    private static final String TAG = DialogFragment.class.getName();
+
+    public static final String TITLE = "name";
+    public static final String FILE_SUFFIX_AUDIO = "file_suffix_audio";
+    public static final String FILE_SUFFIX_VIDEO = "file_suffix_video";
+    public static final String AUDIO_URL = "audio_url";
+    public static final String VIDEO_URL = "video_url";
+
+    public DownloadDialog() {
+
+    }
+
+    public static DownloadDialog newInstance(Bundle args)
+    {
+        DownloadDialog dialog = new DownloadDialog();
+        dialog.setArguments(args);
+        dialog.setStyle(DialogFragment.STYLE_NO_TITLE, 0);
+        return dialog;
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+
+        if(ContextCompat.checkSelfPermission(this.getContext(),Manifest.permission.WRITE_EXTERNAL_STORAGE)!= PackageManager.PERMISSION_GRANTED)
+            ActivityCompat.requestPermissions(getActivity(),new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE},0);
+
+        return inflater.inflate(R.layout.dialog_url, container);
+    }
+
+    @Override
+    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+
+        Bundle arguments = getArguments();
+        final Toolbar toolbar = (Toolbar) view.findViewById(R.id.toolbar);
+        final EditText name = (EditText) view.findViewById(R.id.file_name);
+        final TextView tCount = (TextView) view.findViewById(R.id.threads_count);
+        final SeekBar threads = (SeekBar) view.findViewById(R.id.threads);
+
+        toolbar.setTitle(R.string.download_dialog_title);
+        toolbar.setNavigationIcon(R.drawable.ic_arrow_back_black_24dp);
+        toolbar.inflateMenu(R.menu.dialog_url);
+        toolbar.setNavigationOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                getDialog().dismiss();
+            }
+        });
+
+        threads.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
+
+            @Override
+            public void onProgressChanged(SeekBar seekbar, int progress, boolean fromUser) {
+                tCount.setText(String.valueOf(progress + 1));
+            }
+
+            @Override
+            public void onStartTrackingTouch(SeekBar p1) {
+
+            }
+
+            @Override
+            public void onStopTrackingTouch(SeekBar p1) {
+
+            }
+        });
+
+        checkDownloadOptions();
+
+        //int def = mPrefs.getInt("threads", 4);
+        int def = 3;
+        threads.setProgress(def - 1);
+        tCount.setText(String.valueOf(def));
+
+        name.setText(createFileName(arguments.getString(TITLE)));
+
+
+        toolbar.setOnMenuItemClickListener(new Toolbar.OnMenuItemClickListener() {
+            @Override
+            public boolean onMenuItemClick(MenuItem item) {
+                if (item.getItemId() == R.id.okay) {
+                    download();
+                    return true;
+                } else {
+                    return false;
+                }
+            }
+        });
+
+    }
+
+    protected void checkDownloadOptions(){
+        View view = getView();
+        Bundle arguments = getArguments();
+        RadioButton audioButton = (RadioButton) view.findViewById(R.id.audio_button);
+        RadioButton videoButton = (RadioButton) view.findViewById(R.id.video_button);
+
+        if(arguments.getString(AUDIO_URL) == null) {
+            audioButton.setVisibility(View.GONE);
+            videoButton.setChecked(true);
+        } else if(arguments.getString(VIDEO_URL) == null) {
+            videoButton.setVisibility(View.GONE);
+            audioButton.setChecked(true);
+        }
+    }
+
+    /**
+     * #143 #44 #42 #22: make shure that the filename does not contain illegal chars.
+     * This should fix some of the "cannot download" problems.
+     * */
+    private String createFileName(String fName) {
+        // from http://eng-przemelek.blogspot.de/2009/07/how-to-create-valid-file-name.html
+
+        List<String> forbiddenCharsPatterns = new ArrayList<> ();
+        forbiddenCharsPatterns.add("[:]+"); // Mac OS, but it looks that also Windows XP
+        forbiddenCharsPatterns.add("[\\*\"/\\\\\\[\\]\\:\\;\\|\\=\\,]+");  // Windows
+        forbiddenCharsPatterns.add("[^\\w\\d\\.]+");  // last chance... only latin letters and digits
+        String nameToTest = fName;
+        for (String pattern : forbiddenCharsPatterns) {
+            nameToTest = nameToTest.replaceAll(pattern, "_");
+        }
+        return nameToTest;
+    }
+
+
+    //download audio, video or both?
+    private void download()
+    {
+        View view = getView();
+        Bundle arguments = getArguments();
+        final EditText name = (EditText) view.findViewById(R.id.file_name);
+        final SeekBar threads = (SeekBar) view.findViewById(R.id.threads);
+        RadioButton audioButton = (RadioButton) view.findViewById(R.id.audio_button);
+        RadioButton videoButton = (RadioButton) view.findViewById(R.id.video_button);
+
+        String fName = name.getText().toString().trim();
+
+        boolean isAudio = audioButton.isChecked();
+        String url, location, filename;
+        if(isAudio) {
+            url = arguments.getString(AUDIO_URL);
+            location = NewPipeSettings.getAudioDownloadPath(getContext());
+            filename = fName + arguments.getString(FILE_SUFFIX_AUDIO);
+        } else {
+            url = arguments.getString(VIDEO_URL);
+            location = NewPipeSettings.getVideoDownloadPath(getContext());
+            filename = fName + arguments.getString(FILE_SUFFIX_VIDEO);
+        }
+
+        DownloadManagerService.startMission(getContext(), url, location, filename, isAudio,
+                threads.getProgress() + 1);
+
+        getDialog().dismiss();
+    }
+
+    private void download(String url, String title,
+                          String fileSuffix, File downloadDir, Context context) {
+
+        File saveFilePath = new File(downloadDir,createFileName(title) + fileSuffix);
+
+        long id = 0;
+
+        Log.i(TAG,"Started downloading '" + url +
+                "' => '" + saveFilePath + "' #" + id);
+
+        if (App.isUsingTor()) {
+            //if using Tor, do not use DownloadManager because the proxy cannot be set
+            //we'll see later
+            FileDownloader.downloadFile(getContext(), url, saveFilePath, title);
+        } else {
+            Intent intent = new Intent(getContext(), DownloadActivity.class);
+            intent.setAction(DownloadActivity.INTENT_DOWNLOAD);
+            intent.setData(Uri.parse(url));
+            intent.putExtra("fileName", createFileName(title) + fileSuffix);
+            startActivity(intent);
+        }
+    }
+}

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

@@ -0,0 +1,165 @@
+package org.schabi.newpipe.download;
+
+import android.app.NotificationManager;
+import android.content.Context;
+import android.graphics.drawable.BitmapDrawable;
+import android.graphics.drawable.Drawable;
+import android.os.AsyncTask;
+import android.support.v4.app.NotificationCompat;
+import android.util.Log;
+
+import org.schabi.newpipe.R;
+
+import java.io.BufferedInputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.HttpURLConnection;
+
+import javax.net.ssl.HttpsURLConnection;
+
+import info.guardianproject.netcipher.NetCipher;
+
+/**
+ * Created by Christian Schabesberger on 14.08.15.
+ *
+ * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
+ * FileDownloader.java is part of NewPipe.
+ *
+ * NewPipe is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * NewPipe is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+// TODO: FOR HEAVEN SAKE !!! DO NOT SIMPLY USE ASYNCTASK. MAKE THIS A PROPER SERVICE !!!
+public class FileDownloader extends AsyncTask<Void, Integer, Void> {
+    public static final String TAG = "FileDownloader";
+
+
+    private NotificationManager nm;
+    private NotificationCompat.Builder builder;
+    private int notifyId = 0x1234;
+    private int fileSize = 0xffffffff;
+
+    private final Context context;
+    private final String fileURL;
+    private final File saveFilePath;
+    private final String title;
+
+    private final String debugContext;
+
+    public FileDownloader(Context context, String fileURL, File saveFilePath, String title) {
+        this.context = context;
+        this.fileURL = fileURL;
+        this.saveFilePath = saveFilePath;
+        this.title = title;
+
+        this.debugContext = "'" + fileURL +
+                "' => '" + saveFilePath + "'";
+    }
+
+    /**
+     * Downloads a file from a URL in the background using an {@link AsyncTask}.
+     *
+     * @param fileURL      HTTP URL of the file to be downloaded
+     * @param saveFilePath path of the directory to save the file
+     * @param title
+     * @throws IOException
+     */
+    public static void downloadFile(final Context context, final String fileURL, final File saveFilePath, String title) {
+        new FileDownloader(context, fileURL, saveFilePath, title).execute();
+    }
+
+    /** AsyncTask impl: executed in gui thread */
+    @Override
+    protected void onPreExecute() {
+        super.onPreExecute();
+        nm = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
+        Drawable icon = context.getResources().getDrawable(R.mipmap.ic_launcher);
+        builder = new NotificationCompat.Builder(context)
+                .setSmallIcon(android.R.drawable.stat_sys_download)
+                .setLargeIcon(((BitmapDrawable) icon).getBitmap())
+                .setContentTitle(saveFilePath.getName())
+                .setContentText(saveFilePath.getAbsolutePath())
+                .setProgress(fileSize, 0, false);
+        nm.notify(notifyId, builder.build());
+    }
+
+    /** AsyncTask impl: executed in background thread does the download */
+    @Override
+    protected Void doInBackground(Void... voids) {
+        HttpsURLConnection con = null;
+        InputStream inputStream = null;
+        FileOutputStream outputStream = null;
+        try {
+            con = NetCipher.getHttpsURLConnection(fileURL);
+            int responseCode = con.getResponseCode();
+
+            // always check HTTP response code first
+            if (responseCode == HttpURLConnection.HTTP_OK) {
+                fileSize = con.getContentLength();
+                inputStream = new BufferedInputStream(con.getInputStream());
+                outputStream = new FileOutputStream(saveFilePath);
+
+                int bufferSize = 8192;
+                int downloaded = 0;
+
+                int bytesRead = -1;
+                byte[] buffer = new byte[bufferSize];
+                while ((bytesRead = inputStream.read(buffer)) != -1) {
+                    outputStream.write(buffer, 0, bytesRead);
+                    downloaded += bytesRead;
+                    if (downloaded % 50000 < bufferSize) {
+                        publishProgress(downloaded);
+                    }
+                }
+
+                publishProgress(bufferSize);
+
+            } else {
+                Log.i(TAG, "No file to download. Server replied HTTP code: " + responseCode);
+            }
+        } catch (IOException e) {
+            Log.e(TAG, "No file to download. Server replied HTTP code: ", e);
+            e.printStackTrace();
+        } finally {
+            try {
+                if (outputStream != null) {
+                    outputStream.close();
+                }
+                if (inputStream != null) {
+                    inputStream.close();
+                }
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+            if (con != null) {
+                con.disconnect();
+            }
+        }
+        return null;
+    }
+
+    @Override
+    protected void onProgressUpdate(Integer... progress) {
+        builder.setProgress(fileSize, progress[0], false);
+        nm.notify(notifyId, builder.build());
+    }
+
+    @Override
+    protected void onPostExecute(Void aVoid) {
+        super.onPostExecute(aVoid);
+        nm.cancel(notifyId);
+    }
+}

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

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

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

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

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

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

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

@@ -0,0 +1,163 @@
+package org.schabi.newpipe.info_list;
+
+import android.app.Activity;
+import android.support.v7.widget.RecyclerView;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.extractor.InfoItem;
+
+import java.util.List;
+import java.util.Vector;
+
+/**
+ * Created by Christian Schabesberger on 01.08.16.
+ *
+ * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
+ * InfoListAdapter.java is part of NewPipe.
+ *
+ * NewPipe is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * NewPipe is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+public class InfoListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
+    private static final String TAG = InfoListAdapter.class.toString();
+
+    private final InfoItemBuilder infoItemBuilder;
+    private final List<InfoItem> infoItemList;
+    private boolean showFooter = false;
+    private View header = null;
+    private View footer = null;
+
+    public class HFHolder extends RecyclerView.ViewHolder {
+        public HFHolder(View v) {
+            super(v);
+            view = v;
+        }
+        public View view;
+    }
+
+    public void showFooter(boolean show) {
+        showFooter = show;
+        notifyDataSetChanged();
+    }
+
+    public InfoListAdapter(Activity a, View rootView) {
+        infoItemBuilder = new InfoItemBuilder(a, rootView);
+        infoItemList = new Vector<>();
+    }
+
+    public void setOnStreamInfoItemSelectedListener
+            (InfoItemBuilder.OnInfoItemSelectedListener listener) {
+        infoItemBuilder.setOnStreamInfoItemSelectedListener(listener);
+    }
+
+    public void setOnChannelInfoItemSelectedListener
+            (InfoItemBuilder.OnInfoItemSelectedListener listener) {
+        infoItemBuilder.setOnChannelInfoItemSelectedListener(listener);
+    }
+
+    public void addInfoItemList(List<InfoItem> data) {
+        if(data != null) {
+            infoItemList.addAll(data);
+            notifyDataSetChanged();
+        }
+    }
+
+    public void clearSteamItemList() {
+        infoItemList.clear();
+        notifyDataSetChanged();
+    }
+
+    public void setHeader(View header) {
+        this.header = header;
+        notifyDataSetChanged();
+    }
+
+    public void setFooter(View view) {
+        this.footer = view;
+        notifyDataSetChanged();
+    }
+
+    @Override
+    public int getItemCount() {
+        int cound = infoItemList.size();
+        if(header != null) cound++;
+        if(footer != null && showFooter) cound++;
+        return cound;
+    }
+
+    // don't ask why we have to do that this way... it's android accept it -.-
+    @Override
+    public int getItemViewType(int position) {
+        if(header != null && position == 0) {
+            return 0;
+        } else if(header != null) {
+            position--;
+        }
+        if(footer != null && position == infoItemList.size() && showFooter) {
+            return 1;
+        }
+        switch(infoItemList.get(position).infoType()) {
+            case STREAM:
+                return 2;
+            case CHANNEL:
+                return 3;
+            case PLAYLIST:
+                return 4;
+            default:
+                Log.e(TAG, "Trollolo");
+                return -1;
+        }
+    }
+
+    @Override
+    public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int type) {
+        switch(type) {
+            case 0:
+                return new HFHolder(header);
+            case 1:
+                return new HFHolder(footer);
+            case 2:
+                return new StreamInfoItemHolder(LayoutInflater.from(parent.getContext())
+                        .inflate(R.layout.stream_item, parent, false));
+            case 3:
+                return new ChannelInfoItemHolder(LayoutInflater.from(parent.getContext())
+                        .inflate(R.layout.channel_item, parent, false));
+            case 4:
+                Log.e(TAG, "Playlist is not yet implemented");
+                return null;
+            default:
+                Log.e(TAG, "Trollolo");
+                return null;
+        }
+    }
+
+    @Override
+    public void onBindViewHolder(RecyclerView.ViewHolder holder, int i) {
+        //god damen f*** ANDROID SH**
+        if(holder instanceof InfoItemHolder) {
+            if(header != null) {
+                i--;
+            }
+            infoItemBuilder.buildByHolder((InfoItemHolder) holder, infoItemList.get(i));
+        } else if(holder instanceof HFHolder && i == 0 && header != null) {
+            ((HFHolder) holder).view = header;
+        } else if(holder instanceof HFHolder && i == infoItemList.size() && footer != null && showFooter) {
+            ((HFHolder) holder).view = footer;
+        }
+    }
+}

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

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

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

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

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

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

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

@@ -1,11 +1,13 @@
-package org.schabi.newpipe;
+package org.schabi.newpipe.player;
 
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.pm.ActivityInfo;
 import android.content.res.Configuration;
+import android.graphics.drawable.Drawable;
 import android.media.MediaPlayer;
+import android.media.AudioManager;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
@@ -26,6 +28,9 @@ import android.widget.MediaController;
 import android.widget.ProgressBar;
 import android.widget.VideoView;
 
+import org.schabi.newpipe.App;
+import org.schabi.newpipe.R;
+
 /**
  * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
  * PlayVideoActivity.java is part of NewPipe.
@@ -61,14 +66,14 @@ public class PlayVideoActivity extends AppCompatActivity {
 
     private ActionBar actionBar;
     private VideoView videoView;
-    private int position = 0;
+    private int position;
     private MediaController mediaController;
     private ProgressBar progressBar;
     private View decorView;
-    private boolean uiIsHidden = false;
-    private static long lastUiShowTime = 0;
+    private boolean uiIsHidden;
+    private static long lastUiShowTime;
     private boolean isLandscape = true;
-    private boolean hasSoftKeys = false;
+    private boolean hasSoftKeys;
 
     private SharedPreferences prefs;
     private static final String PREF_IS_LANDSCAPE = "is_landscape";
@@ -78,6 +83,10 @@ public class PlayVideoActivity extends AppCompatActivity {
         super.onCreate(savedInstanceState);
 
         setContentView(R.layout.activity_play_video);
+        setVolumeControlStream(AudioManager.STREAM_MUSIC);
+
+        //set background arrow style
+        getSupportActionBar().setHomeAsUpIndicator(R.drawable.ic_arrow_back_white_24dp);
 
         isLandscape = checkIfLandscape();
         hasSoftKeys = checkIfHasSoftKeys();
@@ -129,7 +138,7 @@ public class PlayVideoActivity extends AppCompatActivity {
             public void onPrepared(MediaPlayer mp) {
                 progressBar.setVisibility(View.GONE);
                 videoView.seekTo(position);
-                if (position == 0) {
+                if (position <= 0) {
                     videoView.start();
                     showUi();
                 } else {
@@ -187,6 +196,17 @@ public class PlayVideoActivity extends AppCompatActivity {
         videoView.pause();
     }
 
+    @Override
+    public void onResume() {
+        super.onResume();
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        prefs = getPreferences(Context.MODE_PRIVATE);
+    }
+
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         int id = item.getItemId();
@@ -199,7 +219,7 @@ public class PlayVideoActivity extends AppCompatActivity {
                 intent.setAction(Intent.ACTION_SEND);
                 intent.putExtra(Intent.EXTRA_TEXT, videoUrl);
                 intent.setType("text/plain");
-                startActivity(Intent.createChooser(intent, getString(R.string.shareDialogTitle)));
+                startActivity(Intent.createChooser(intent, getString(R.string.share_dialog_title)));
                 break;
             case R.id.menu_item_screen_rotation:
                 toggleOrientation();
@@ -307,7 +327,7 @@ public class PlayVideoActivity extends AppCompatActivity {
 
             int realHeight = realDisplayMetrics.heightPixels;
             int displayHeight = displayMetrics.heightPixels;
-            return (realHeight - displayHeight);
+            return realHeight - displayHeight;
         } else {
             return 50;
         }
@@ -324,7 +344,7 @@ public class PlayVideoActivity extends AppCompatActivity {
 
             int realWidth = realDisplayMetrics.widthPixels;
             int displayWidth = displayMetrics.widthPixels;
-            return (realWidth - displayWidth);
+            return realWidth - displayWidth;
         } else {
             return 50;
         }

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,10 +1,17 @@
-package org.schabi.newpipe.services;
+package org.schabi.newpipe.report;
+
+import android.content.Context;
+
+import org.acra.collector.CrashReportData;
+import org.acra.sender.ReportSender;
+import org.acra.sender.ReportSenderException;
+import org.schabi.newpipe.R;
 
 /**
- * Created by Christian Schabesberger on 23.08.15.
+ * Created by Christian Schabesberger  on 13.09.16.
  *
  * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
- * StreamingService.java is part of NewPipe.
+ * AcraReportSender.java is part of NewPipe.
  *
  * NewPipe is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -20,16 +27,12 @@ package org.schabi.newpipe.services;
  * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-public interface StreamingService {
-    class ServiceInfo {
-        public String name = "";
-    }
-    ServiceInfo getServiceInfo();
-    VideoExtractor getExtractorInstance(String url);
-    SearchEngine getSearchEngineInstance();
+public class AcraReportSender implements ReportSender {
 
-    /**When a VIEW_ACTION is caught this function will test if the url delivered within the calling
-    Intent was meant to be watched with this Service.
-    Return false if this service shall not allow to be callean through ACTIONs.*/
-    boolean acceptUrl(String videoUrl);
+    @Override
+    public void send(Context context, CrashReportData report) throws ReportSenderException {
+        ErrorActivity.reportError(context, report,
+                ErrorActivity.ErrorInfo.make(ErrorActivity.UI_ERROR,"none",
+                        "App crash, UI failure", R.string.app_ui_crash));
+    }
 }

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

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

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

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

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

@@ -0,0 +1,386 @@
+package org.schabi.newpipe.search_fragment;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.support.v7.widget.SearchView;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.inputmethod.InputMethodManager;
+import android.widget.ProgressBar;
+import android.widget.Toast;
+
+import org.schabi.newpipe.ChannelActivity;
+import org.schabi.newpipe.ReCaptchaActivity;
+import org.schabi.newpipe.extractor.NewPipe;
+import org.schabi.newpipe.extractor.search.SearchEngine;
+import org.schabi.newpipe.extractor.search.SearchResult;
+import org.schabi.newpipe.info_list.InfoItemBuilder;
+import org.schabi.newpipe.report.ErrorActivity;
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.detail.VideoItemDetailActivity;
+import org.schabi.newpipe.detail.VideoItemDetailFragment;
+import org.schabi.newpipe.info_list.InfoListAdapter;
+import org.schabi.newpipe.util.NavStack;
+
+import java.util.EnumSet;
+
+import static android.app.Activity.RESULT_OK;
+import static org.schabi.newpipe.ReCaptchaActivity.RECAPTCHA_REQUEST;
+
+/**
+ * Created by Christian Schabesberger on 02.08.16.
+ *
+ * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
+ * SearchInfoItemFragment.java is part of NewPipe.
+ *
+ * NewPipe is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * NewPipe is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+public class SearchInfoItemFragment extends Fragment {
+
+    private static final String TAG = SearchInfoItemFragment.class.toString();
+
+    private EnumSet<SearchEngine.Filter> filter =
+            EnumSet.of(SearchEngine.Filter.CHANNEL, SearchEngine.Filter.STREAM);
+
+    /**
+     * Listener for search queries
+     */
+    public class SearchQueryListener implements SearchView.OnQueryTextListener {
+
+        @Override
+        public boolean onQueryTextSubmit(String query) {
+            Activity a = getActivity();
+            try {
+                search(query);
+
+                // hide virtual keyboard
+                InputMethodManager inputManager =
+                        (InputMethodManager) a.getSystemService(Context.INPUT_METHOD_SERVICE);
+                try {
+                    //noinspection ConstantConditions
+                    inputManager.hideSoftInputFromWindow(
+                            a.getCurrentFocus().getWindowToken(), InputMethodManager.HIDE_NOT_ALWAYS);
+                } catch (NullPointerException e) {
+                    e.printStackTrace();
+                    ErrorActivity.reportError(a, e, null,
+                            a.findViewById(android.R.id.content),
+                            ErrorActivity.ErrorInfo.make(ErrorActivity.SEARCHED,
+                                    NewPipe.getNameOfService(streamingServiceId),
+                                    "Could not get widget with focus", R.string.general_error));
+                }
+                // clear focus
+                // 1. to not open up the keyboard after switching back to this
+                // 2. It's a workaround to a seeming bug by the Android OS it self, causing
+                //    onQueryTextSubmit to trigger twice when focus is not cleared.
+                // See: http://stackoverflow.com/questions/17874951/searchview-onquerytextsubmit-runs-twice-while-i-pressed-once
+                a.getCurrentFocus().clearFocus();
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+            return true;
+        }
+
+        @Override
+        public boolean onQueryTextChange(String newText) {
+            if (!newText.isEmpty()) {
+                searchSuggestions(newText);
+            }
+            return true;
+        }
+    }
+
+    private int streamingServiceId = -1;
+    private String searchQuery = "";
+    private boolean isLoading = false;
+
+    private ProgressBar loadingIndicator = null;
+    private int pageNumber = 0;
+    private SuggestionListAdapter suggestionListAdapter = null;
+    private InfoListAdapter infoListAdapter = null;
+    private LinearLayoutManager streamInfoListLayoutManager = null;
+
+    // savedInstanceBundle arguments
+    private static final String QUERY = "query";
+    private static final String STREAMING_SERVICE = "streaming_service";
+
+    /**
+     * Mandatory empty constructor for the fragment manager to instantiate the
+     * fragment (e.g. upon screen orientation changes).
+     */
+    public SearchInfoItemFragment() {
+    }
+
+    @SuppressWarnings("unused")
+    public static SearchInfoItemFragment newInstance(int streamingServiceId, String searchQuery) {
+        Bundle args = new Bundle();
+        args.putInt(STREAMING_SERVICE, streamingServiceId);
+        args.putString(QUERY, searchQuery);
+        SearchInfoItemFragment fragment = new SearchInfoItemFragment();
+        fragment.setArguments(args);
+        return fragment;
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        searchQuery = "";
+        if (savedInstanceState != null) {
+            searchQuery = savedInstanceState.getString(QUERY);
+            streamingServiceId = savedInstanceState.getInt(STREAMING_SERVICE);
+        } else {
+            try {
+                Bundle args = getArguments();
+                if(args != null) {
+                    searchQuery = args.getString(QUERY);
+                    streamingServiceId = args.getInt(STREAMING_SERVICE);
+                } else {
+                    streamingServiceId = NewPipe.getIdOfService("Youtube");
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+                ErrorActivity.reportError(getActivity(), e, null,
+                        getActivity().findViewById(android.R.id.content),
+                        ErrorActivity.ErrorInfo.make(ErrorActivity.SEARCHED,
+                                NewPipe.getNameOfService(streamingServiceId),
+                                "", R.string.general_error));
+            }
+        }
+
+        setHasOptionsMenu(true);
+
+        SearchWorker sw = SearchWorker.getInstance();
+        sw.setSearchWorkerResultListener(new SearchWorker.SearchWorkerResultListener() {
+            @Override
+            public void onResult(SearchResult result) {
+                infoListAdapter.addInfoItemList(result.resultList);
+                setDoneLoading();
+            }
+
+            @Override
+            public void onNothingFound(int stringResource) {
+                //setListShown(true);
+                Toast.makeText(getActivity(), getString(stringResource),
+                        Toast.LENGTH_SHORT).show();
+                setDoneLoading();
+            }
+
+            @Override
+            public void onError(String message) {
+                //setListShown(true);
+                Toast.makeText(getActivity(), message,
+                        Toast.LENGTH_LONG).show();
+                setDoneLoading();
+            }
+
+            @Override
+            public void onReCaptchaChallenge() {
+                Toast.makeText(getActivity(), "ReCaptcha Challenge requested",
+                        Toast.LENGTH_LONG).show();
+
+                // Starting ReCaptcha Challenge Activity
+                startActivityForResult(
+                        new Intent(getActivity(), ReCaptchaActivity.class),
+                        RECAPTCHA_REQUEST);
+            }
+        });
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        View view = inflater.inflate(R.layout.fragment_searchinfoitem, container, false);
+
+        Context context = view.getContext();
+        loadingIndicator = (ProgressBar) view.findViewById(R.id.progressBar);
+        RecyclerView recyclerView = (RecyclerView) view.findViewById(R.id.list);
+        streamInfoListLayoutManager = new LinearLayoutManager(context);
+        recyclerView.setLayoutManager(streamInfoListLayoutManager);
+
+        infoListAdapter = new InfoListAdapter(getActivity(),
+                getActivity().findViewById(android.R.id.content));
+        infoListAdapter.setFooter(inflater.inflate(R.layout.pignate_footer, recyclerView, false));
+        infoListAdapter.showFooter(false);
+        infoListAdapter.setOnStreamInfoItemSelectedListener(
+                new InfoItemBuilder.OnInfoItemSelectedListener() {
+            @Override
+            public void selected(String url, int serviceId) {
+                NavStack.getInstance()
+                    .openDetailActivity(getContext(), url, serviceId);
+            }
+        });
+        infoListAdapter.setOnChannelInfoItemSelectedListener(new InfoItemBuilder.OnInfoItemSelectedListener() {
+            @Override
+            public void selected(String url, int serviceId) {
+                NavStack.getInstance()
+                        .openChannelActivity(getContext(), url, serviceId);
+            }
+        });
+        recyclerView.setAdapter(infoListAdapter);
+        recyclerView.clearOnScrollListeners();
+        recyclerView.addOnScrollListener(new RecyclerView.OnScrollListener() {
+            @Override
+            public void onScrolled(RecyclerView recyclerView, int dx, int dy) {
+                int pastVisiblesItems, visibleItemCount, totalItemCount;
+                super.onScrolled(recyclerView, dx, dy);
+                if (dy > 0) //check for scroll down
+                {
+                    visibleItemCount = streamInfoListLayoutManager.getChildCount();
+                    totalItemCount = streamInfoListLayoutManager.getItemCount();
+                    pastVisiblesItems = streamInfoListLayoutManager.findFirstVisibleItemPosition();
+
+                    if ((visibleItemCount + pastVisiblesItems) >= totalItemCount && !isLoading) {
+                        pageNumber++;
+                        search(searchQuery, pageNumber);
+                    }
+                }
+            }
+        });
+
+        return view;
+    }
+
+    @Override
+    public void onStart() {
+        super.onStart();
+        if(!searchQuery.isEmpty()) {
+            search(searchQuery);
+        }
+    }
+
+    @Override
+    public void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+        outState.putString(QUERY, searchQuery);
+        outState.putInt(STREAMING_SERVICE, streamingServiceId);
+    }
+
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        super.onCreateOptionsMenu(menu, inflater);
+        inflater.inflate(R.menu.search_menu, menu);
+
+        MenuItem searchItem = menu.findItem(R.id.action_search);
+        SearchView searchView = (SearchView) searchItem.getActionView();
+        setupSearchView(searchView);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch(item.getItemId()) {
+            case R.id.menu_filter_all:
+                changeFilter(item, EnumSet.of(SearchEngine.Filter.STREAM, SearchEngine.Filter.CHANNEL));
+                return true;
+            case R.id.menu_filter_video:
+                changeFilter(item, EnumSet.of(SearchEngine.Filter.STREAM));
+                return true;
+            case R.id.menu_filter_channel:
+                changeFilter(item, EnumSet.of(SearchEngine.Filter.CHANNEL));
+                return true;
+            default:
+                return false;
+        }
+    }
+
+    private void changeFilter(MenuItem item, EnumSet<SearchEngine.Filter> filter) {
+        this.filter = filter;
+        item.setChecked(true);
+        if(searchQuery != null && !searchQuery.isEmpty()) {
+            Log.d(TAG, "Fuck+ " + searchQuery);
+            search(searchQuery);
+        }
+    }
+
+    private void setupSearchView(SearchView searchView) {
+        suggestionListAdapter = new SuggestionListAdapter(getActivity());
+        searchView.setSuggestionsAdapter(suggestionListAdapter);
+        searchView.setOnSuggestionListener(new SearchSuggestionListener(searchView, suggestionListAdapter));
+        searchView.setOnQueryTextListener(new SearchQueryListener());
+        if (searchQuery != null && !searchQuery.isEmpty()) {
+            searchView.setQuery(searchQuery, false);
+            searchView.setIconifiedByDefault(false);
+        }
+    }
+
+    private void search(String query) {
+        infoListAdapter.clearSteamItemList();
+        infoListAdapter.showFooter(false);
+        pageNumber = 0;
+        searchQuery = query;
+        search(query, pageNumber);
+        hideBackground();
+        loadingIndicator.setVisibility(View.VISIBLE);
+    }
+
+    private void search(String query, int page) {
+        isLoading = true;
+        SearchWorker sw = SearchWorker.getInstance();
+        sw.search(streamingServiceId,
+                query,
+                page,
+                getActivity(),
+                filter);
+    }
+
+    private void setDoneLoading() {
+        this.isLoading = false;
+        loadingIndicator.setVisibility(View.GONE);
+        infoListAdapter.showFooter(true);
+    }
+
+    /**
+     * Hides the "dummy" background when no results are shown
+     */
+    private void hideBackground() {
+        View view = getView();
+        if(view == null) return;
+        view.findViewById(R.id.mainBG).setVisibility(View.GONE);
+    }
+
+    private void searchSuggestions(String query) {
+        SuggestionSearchRunnable suggestionSearchRunnable =
+                new SuggestionSearchRunnable(streamingServiceId, query, getActivity(), suggestionListAdapter);
+        Thread suggestionThread = new Thread(suggestionSearchRunnable);
+        suggestionThread.start();
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        switch (requestCode) {
+            case RECAPTCHA_REQUEST:
+                if (resultCode == RESULT_OK) {
+                    if (searchQuery.length() != 0) {
+                        search(searchQuery);
+                    }
+                } else {
+                    Log.d(TAG, "ReCaptcha failed");
+                }
+                break;
+
+            default:
+                Log.e(TAG, "Request code from activity not supported [" + requestCode + "]");
+                break;
+        }
+    }
+}

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

@@ -0,0 +1,49 @@
+package org.schabi.newpipe.search_fragment;
+
+import android.support.v7.widget.SearchView;
+
+/**
+ * Created by Christian Schabesberger on 02.08.16.
+ *
+ * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
+ * SearchSuggestionListener.java is part of NewPipe.
+ *
+ * NewPipe is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * NewPipe is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+public class SearchSuggestionListener implements SearchView.OnSuggestionListener{
+
+    private final SearchView searchView;
+    private final SuggestionListAdapter adapter;
+
+    public SearchSuggestionListener(SearchView searchView, SuggestionListAdapter adapter) {
+        this.searchView = searchView;
+        this.adapter = adapter;
+    }
+
+    @Override
+    public boolean onSuggestionSelect(int position) {
+        String suggestion = adapter.getSuggestion(position);
+        searchView.setQuery(suggestion,true);
+        return false;
+    }
+
+    @Override
+    public boolean onSuggestionClick(int position) {
+        String suggestion = adapter.getSuggestion(position);
+        searchView.setQuery(suggestion,true);
+        return false;
+    }
+}

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

@@ -0,0 +1,215 @@
+package org.schabi.newpipe.search_fragment;
+
+import android.app.Activity;
+import android.content.SharedPreferences;
+import android.os.Handler;
+import android.preference.PreferenceManager;
+import android.util.Log;
+import android.view.View;
+
+import org.schabi.newpipe.extractor.exceptions.ExtractionException;
+import org.schabi.newpipe.extractor.exceptions.ReCaptchaException;
+import org.schabi.newpipe.extractor.search.SearchEngine;
+import org.schabi.newpipe.extractor.search.SearchResult;
+import org.schabi.newpipe.report.ErrorActivity;
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.extractor.NewPipe;
+
+import java.io.IOException;
+import java.util.EnumSet;
+
+/**
+ * Created by Christian Schabesberger on 02.08.16.
+ *
+ * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
+ * SearchWorker.java is part of NewPipe.
+ *
+ * NewPipe is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * NewPipe is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+public class SearchWorker {
+    private static final String TAG = SearchWorker.class.toString();
+
+    public interface SearchWorkerResultListener {
+        void onResult(SearchResult result);
+        void onNothingFound(final int stringResource);
+        void onError(String message);
+        void onReCaptchaChallenge();
+    }
+
+    private class ResultRunnable implements Runnable {
+        private final SearchResult result;
+        private int requestId = 0;
+        public ResultRunnable(SearchResult result, int requestId) {
+            this.result = result;
+            this.requestId = requestId;
+        }
+        @Override
+        public void run() {
+            if(this.requestId == SearchWorker.this.requestId) {
+                searchWorkerResultListener.onResult(result);
+            }
+        }
+    }
+
+    private class SearchRunnable implements Runnable {
+        public static final String YOUTUBE = "Youtube";
+        private final String query;
+        private final int page;
+        private final EnumSet<SearchEngine.Filter> filter;
+        final Handler h = new Handler();
+        private volatile boolean runs = true;
+        private Activity a = null;
+        private int serviceId = -1;
+        public SearchRunnable(int serviceId,
+                              String query,
+                              int page,
+                              EnumSet<SearchEngine.Filter> filter,
+                              Activity activity,
+                              int requestId) {
+            this.serviceId = serviceId;
+            this.query = query;
+            this.page = page;
+            this.filter = filter;
+            this.a = activity;
+        }
+        void terminate() {
+            runs = false;
+        }
+        @Override
+        public void run() {
+            final String serviceName = NewPipe.getNameOfService(serviceId);
+            SearchResult result = null;
+            SearchEngine engine = null;
+
+            try {
+                engine = NewPipe.getService(serviceId)
+                        .getSearchEngineInstance();
+            } catch(ExtractionException e) {
+                ErrorActivity.reportError(h, a, e, null, null,
+                        ErrorActivity.ErrorInfo.make(ErrorActivity.SEARCHED,
+                                Integer.toString(serviceId), query, R.string.general_error));
+                return;
+            }
+
+            try {
+                SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(a);
+                String searchLanguageKey = a.getString(R.string.search_language_key);
+                String searchLanguage = sp.getString(searchLanguageKey,
+                        a.getString(R.string.default_language_value));
+                result = SearchResult
+                        .getSearchResult(engine, query, page, searchLanguage, filter);
+                if(runs) {
+                    h.post(new ResultRunnable(result, requestId));
+                }
+
+                // look for errors during extraction
+                // soft errors:
+                View rootView = a.findViewById(android.R.id.content);
+                if(result != null &&
+                        !result.errors.isEmpty()) {
+                    Log.e(TAG, "OCCURRED ERRORS DURING SEARCH EXTRACTION:");
+                    for(Throwable e : result.errors) {
+                        e.printStackTrace();
+                        Log.e(TAG, "------");
+                    }
+
+                    if(result.resultList.isEmpty()&& !result.errors.isEmpty()) {
+                        // if it compleatly failes dont show snackbar, instead show error directlry
+                        ErrorActivity.reportError(h, a, result.errors, null, null,
+                                ErrorActivity.ErrorInfo.make(ErrorActivity.SEARCHED,
+                                        serviceName, query, R.string.parsing_error));
+                    } else {
+                        // if it partly show snackbar
+                        ErrorActivity.reportError(h, a, result.errors, null, rootView,
+                                ErrorActivity.ErrorInfo.make(ErrorActivity.SEARCHED,
+                                        serviceName, query, R.string.light_parsing_error));
+                    }
+                }
+                // hard errors:
+            } catch (ReCaptchaException e) {
+                h.post(new Runnable() {
+                    @Override
+                    public void run() {
+                        searchWorkerResultListener.onReCaptchaChallenge();
+                    }
+                });
+            } catch(IOException e) {
+                h.post(new Runnable() {
+                    @Override
+                    public void run() {
+                        searchWorkerResultListener.onNothingFound(R.string.network_error);
+                    }
+                });
+                e.printStackTrace();
+            } catch(final SearchEngine.NothingFoundException e) {
+                h.post(new Runnable() {
+                    @Override
+                    public void run() {
+                        searchWorkerResultListener.onError(e.getMessage());
+                    }
+                });
+            } catch(ExtractionException e) {
+                ErrorActivity.reportError(h, a, e, null, null,
+                        ErrorActivity.ErrorInfo.make(ErrorActivity.SEARCHED,
+                                serviceName, query, R.string.parsing_error));
+                //postNewErrorToast(h, R.string.parsing_error);
+                e.printStackTrace();
+
+            } catch(Exception e) {
+                ErrorActivity.reportError(h, a, e, null, null,
+                        ErrorActivity.ErrorInfo.make(ErrorActivity.SEARCHED,
+                        /* todo: this shoudl not be assigned static */ YOUTUBE, query, R.string.general_error));
+
+                e.printStackTrace();
+            }
+        }
+    }
+
+    private static SearchWorker searchWorker = null;
+    private SearchWorkerResultListener searchWorkerResultListener = null;
+    private SearchRunnable runnable = null;
+    private int requestId = 0;     //prevents running requests that have already ben expired
+
+    public static SearchWorker getInstance() {
+        return searchWorker == null ? (searchWorker = new SearchWorker()) : searchWorker;
+    }
+
+    public void setSearchWorkerResultListener(SearchWorkerResultListener listener) {
+        searchWorkerResultListener = listener;
+    }
+
+    private SearchWorker() {
+
+    }
+
+    public void search(int serviceId,
+                       String query,
+                       int page,
+                       Activity a,
+                       EnumSet<SearchEngine.Filter> filter) {
+        if(runnable != null) {
+            terminate();
+        }
+        runnable = new SearchRunnable(serviceId, query, page, filter, a, requestId);
+        Thread thread = new Thread(runnable);
+        thread.start();
+    }
+
+    public void terminate() {
+        requestId++;
+        runnable.terminate();
+    }
+}

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

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

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

@@ -0,0 +1,105 @@
+package org.schabi.newpipe.search_fragment;
+
+import android.app.Activity;
+import android.content.SharedPreferences;
+import android.os.Handler;
+import android.preference.PreferenceManager;
+import android.widget.Toast;
+
+import org.schabi.newpipe.extractor.NewPipe;
+import org.schabi.newpipe.extractor.exceptions.ExtractionException;
+import org.schabi.newpipe.extractor.SuggestionExtractor;
+import org.schabi.newpipe.report.ErrorActivity;
+import org.schabi.newpipe.R;
+
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * Created by Christian Schabesberger on 02.08.16.
+ *
+ * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
+ * SuggestionSearchRunnable.java is part of NewPipe.
+ *
+ * NewPipe is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * NewPipe is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+public class SuggestionSearchRunnable implements Runnable{
+
+    /**
+     * Runnable to update a {@link SuggestionListAdapter}
+     */
+    private class SuggestionResultRunnable implements Runnable{
+
+        private final List<String> suggestions;
+
+        private SuggestionResultRunnable(List<String> suggestions) {
+            this.suggestions = suggestions;
+        }
+
+        @Override
+        public void run() {
+            adapter.updateAdapter(suggestions);
+        }
+    }
+
+    private final int serviceId;
+    private final String query;
+    private final Handler h = new Handler();
+    private final Activity a;
+    private final SuggestionListAdapter adapter;
+    public SuggestionSearchRunnable(int serviceId, String query,
+                                     Activity activity, SuggestionListAdapter adapter) {
+        this.serviceId = serviceId;
+        this.query = query;
+        this.a = activity;
+        this.adapter = adapter;
+    }
+
+    @Override
+    public void run() {
+        try {
+            SuggestionExtractor se =
+                    NewPipe.getService(serviceId).getSuggestionExtractorInstance();
+            SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(a);
+            String searchLanguageKey = a.getString(R.string.search_language_key);
+            String searchLanguage = sp.getString(searchLanguageKey,
+                    a.getString(R.string.default_language_value));
+            List<String> suggestions = se.suggestionList(query, searchLanguage);
+            h.post(new SuggestionResultRunnable(suggestions));
+        } catch (ExtractionException e) {
+            ErrorActivity.reportError(h, a, e, null, a.findViewById(android.R.id.content),
+                    ErrorActivity.ErrorInfo.make(ErrorActivity.SEARCHED,
+                            NewPipe.getNameOfService(serviceId), query, R.string.parsing_error));
+            e.printStackTrace();
+        } catch (IOException e) {
+            postNewErrorToast(h, R.string.network_error);
+            e.printStackTrace();
+        } catch (Exception e) {
+            ErrorActivity.reportError(h, a, e, null, a.findViewById(android.R.id.content),
+                    ErrorActivity.ErrorInfo.make(ErrorActivity.SEARCHED,
+                            NewPipe.getNameOfService(serviceId), query, R.string.general_error));
+        }
+    }
+
+    private void postNewErrorToast(Handler h, final int stringResource) {
+        h.post(new Runnable() {
+            @Override
+            public void run() {
+                Toast.makeText(a, a.getString(stringResource),
+                        Toast.LENGTH_SHORT).show();
+            }
+        });
+    }
+}

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

@@ -1,16 +0,0 @@
-package org.schabi.newpipe.services;
-
-import android.graphics.Bitmap;
-
-/**Common properties between VideoInfo and VideoPreviewInfo.*/
-public abstract class AbstractVideoInfo {
-    public String id = "";
-    public String title = "";
-    public String uploader = "";
-    //public int duration = -1;
-    public String thumbnail_url = "";
-    public Bitmap thumbnail = null;
-    public String webpage_url = "";
-    public String upload_date = "";
-    public long view_count = -1;
-}

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

@@ -1,53 +0,0 @@
-package org.schabi.newpipe.services;
-
-import android.util.Log;
-
-import org.schabi.newpipe.services.youtube.YoutubeService;
-
-/**
- * Created by Christian Schabesberger on 23.08.15.
- *
- * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
- * ServiceList.java is part of NewPipe.
- *
- * NewPipe is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * NewPipe is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**Provides access to the video streaming services supported by NewPipe.
- * Currently only Youtube until the API becomes more stable.*/
-@SuppressWarnings("ALL")
-public class ServiceList {
-    private static final String TAG = ServiceList.class.toString();
-    private static final StreamingService[] services = {
-        new YoutubeService()
-    };
-    public static StreamingService[] getServices() {
-        return services;
-    }
-    public static StreamingService getService(int serviceId) {
-        return services[serviceId];
-    }
-    public static StreamingService getService(String serviceName) {
-        return services[getIdOfService(serviceName)];
-    }
-    public static int getIdOfService(String serviceName) {
-        for(int i = 0; i < services.length; i++) {
-            if(services[i].getServiceInfo().name.equals(serviceName)) {
-                return i;
-            }
-        }
-        Log.e(TAG, "Error: Service " + serviceName + " not known.");
-        return -1;
-    }
-}

app/src/main/java/org/schabi/newpipe/services/VideoExtractor.java

@@ -1,117 +0,0 @@
-package org.schabi.newpipe.services;
-
-/**
- * Created by Christian Schabesberger on 10.08.15.
- *
- * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
- * VideoExtractor.java is part of NewPipe.
- *
- * NewPipe is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * NewPipe is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import org.schabi.newpipe.VideoInfo;
-
-/**Scrapes information from a video streaming service (eg, YouTube).*/
-@SuppressWarnings("ALL")
-public abstract class VideoExtractor {
-    protected final String pageUrl;
-    protected VideoInfo videoInfo;
-
-    @SuppressWarnings("WeakerAccess")
-    public VideoExtractor(String url) {
-        this.pageUrl = url;
-    }
-
-    /**Fills out the video info fields which are common to all services.
-     * Probably needs to be overridden by subclasses*/
-    public VideoInfo getVideoInfo()
-    {
-        if(videoInfo == null) {
-            videoInfo = new VideoInfo();
-        }
-
-        if(videoInfo.webpage_url.isEmpty()) {
-            videoInfo.webpage_url = pageUrl;
-        }
-
-        if(videoInfo.title.isEmpty()) {
-            videoInfo.title = getTitle();
-        }
-
-        if(videoInfo.duration  < 1) {
-            videoInfo.duration = getLength();
-        }
-
-
-        if(videoInfo.uploader.isEmpty()) {
-            videoInfo.uploader = getUploader();
-        }
-
-        if(videoInfo.description.isEmpty()) {
-            videoInfo.description = getDescription();
-        }
-
-        if(videoInfo.view_count == -1) {
-            videoInfo.view_count = getViews();
-        }
-
-        if(videoInfo.upload_date.isEmpty()) {
-            videoInfo.upload_date = getUploadDate();
-        }
-
-        if(videoInfo.thumbnail_url.isEmpty()) {
-            videoInfo.thumbnail_url = getThumbnailUrl();
-        }
-
-        if(videoInfo.id.isEmpty()) {
-            videoInfo.id = getVideoId(pageUrl);
-        }
-
-        /** Load and extract audio*/
-        if(videoInfo.audioStreams == null) {
-            videoInfo.audioStreams = getAudioStreams();
-        }
-        /** Extract video stream url*/
-        if(videoInfo.videoStreams == null) {
-            videoInfo.videoStreams = getVideoStreams();
-        }
-
-        if(videoInfo.uploader_thumbnail_url.isEmpty()) {
-            videoInfo.uploader_thumbnail_url = getUploaderThumbnailUrl();
-        }
-
-        if(videoInfo.startPosition < 0) {
-            videoInfo.startPosition = getTimeStamp();
-        }
-
-        //Bitmap thumbnail = null;
-        //Bitmap uploader_thumbnail = null;
-        //int videoAvailableStatus = VIDEO_AVAILABLE;
-        return videoInfo;
-    }
-
-    protected abstract String getVideoUrl(String videoId);
-    protected abstract String getVideoId(String siteUrl);
-    protected abstract int getTimeStamp();
-    protected abstract String getTitle();
-    protected abstract String getDescription();
-    protected abstract String getUploader();
-    protected abstract int getLength();
-    protected abstract int getViews();
-    protected abstract String getUploadDate();
-    protected abstract String getThumbnailUrl();
-    protected abstract String getUploaderThumbnailUrl();
-    protected abstract VideoInfo.AudioStream[] getAudioStreams();
-    protected abstract VideoInfo.VideoStream[] getVideoStreams();
-}

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

@@ -1,190 +0,0 @@
-package org.schabi.newpipe.services.youtube;
-
-import android.net.Uri;
-import android.util.Log;
-
-import org.jsoup.Jsoup;
-import org.jsoup.nodes.Document;
-import org.jsoup.nodes.Element;
-import org.schabi.newpipe.Downloader;
-import org.schabi.newpipe.services.SearchEngine;
-import org.schabi.newpipe.VideoPreviewInfo;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-
-/**
- * Created by Christian Schabesberger on 09.08.15.
- *
- * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
- * YoutubeSearchEngine.java is part of NewPipe.
- *
- * NewPipe is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * NewPipe is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-public class YoutubeSearchEngine implements SearchEngine {
-
-    private static final String TAG = YoutubeSearchEngine.class.toString();
-
-    @Override
-    public Result search(String query, int page, String languageCode) {
-        //String contentCountry = PreferenceManager.getDefaultSharedPreferences(this).getString(getString(R.string., "");
-        Uri.Builder builder = new Uri.Builder();
-        builder.scheme("https")
-                .authority("www.youtube.com")
-                .appendPath("results")
-                .appendQueryParameter("search_query", query)
-                .appendQueryParameter("page", Integer.toString(page))
-                .appendQueryParameter("filters", "video");
-
-        String site;
-        String url = builder.build().toString();
-        //if we've been passed a valid language code, append it to the URL
-        if(!languageCode.isEmpty()) {
-          //assert Pattern.matches("[a-z]{2}(-([A-Z]{2}|[0-9]{1,3}))?", languageCode);
-                site  = Downloader.download(url, languageCode);
-        }
-        else {
-            site = Downloader.download(url);
-        }
-
-
-        Document doc = Jsoup.parse(site, url);
-        Result result = new Result();
-        Element list = doc.select("ol[class=\"item-section\"]").first();
-
-
-        int i = 0;
-        for(Element item : list.children()) {
-            i++;
-            /* First we need to determine which kind of item we are working with.
-               Youtube depicts five different kinds of items on its search result page. These are
-               regular videos, playlists, channels, two types of video suggestions, and a "no video
-               found" item. Since we only want videos, we need to filter out all the others.
-               An example for this can be seen here:
-               https://www.youtube.com/results?search_query=asdf&page=1
-
-               We already applied a filter to the url, so we don't need to care about channels and
-               playlists now.
-            */
-
-            Element el;
-
-            // both types of spell correction item
-            if(!((el = item.select("div[class*=\"spell-correction\"]").first()) == null)) {
-                result.suggestion = el.select("a").first().text();
-            // search message item
-            } else if(!((el = item.select("div[class*=\"search-message\"]").first()) == null)) {
-                result.errorMessage = el.text();
-
-            // video item type
-            } else if(!((el = item.select("div[class*=\"yt-lockup-video\"").first()) == null)) {
-                VideoPreviewInfo resultItem = new VideoPreviewInfo();
-                Element dl = el.select("h3").first().select("a").first();
-                resultItem.webpage_url = dl.attr("abs:href");
-                try {
-                    Pattern p = Pattern.compile("v=([0-9a-zA-Z-]*)");
-                    Matcher m = p.matcher(resultItem.webpage_url);
-                    resultItem.id=m.group(1);
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-                resultItem.title = dl.text();
-
-                resultItem.duration = item.select("span[class=\"video-time\"]").first().text();
-
-                resultItem.uploader = item.select("div[class=\"yt-lockup-byline\"]").first()
-                        .select("a").first()
-                        .text();
-                resultItem.upload_date = item.select("div[class=\"yt-lockup-meta\"]").first()
-                        .select("li").first()
-                        .text();
-                Element te = item.select("div[class=\"yt-thumb video-thumb\"]").first()
-                        .select("img").first();
-                resultItem.thumbnail_url = te.attr("abs:src");
-                // Sometimes youtube sends links to gif files which somehow seem to not exist
-                // anymore. Items with such gif also offer a secondary image source. So we are going
-                // to use that if we've caught such an item.
-                if(resultItem.thumbnail_url.contains(".gif")) {
-                    resultItem.thumbnail_url = te.attr("abs:data-thumb");
-                }
-                result.resultList.add(resultItem);
-            } else {
-                //noinspection ConstantConditions
-                Log.e(TAG, "unexpected element found:\""+el+"\"");
-            }
-        }
-        return result;
-    }
-
-    @Override
-    public ArrayList<String> suggestionList(String query) {
-
-        ArrayList<String> suggestions = new ArrayList<>();
-
-        Uri.Builder builder = new Uri.Builder();
-        builder.scheme("https")
-                .authority("suggestqueries.google.com")
-                .appendPath("complete")
-                .appendPath("search")
-                .appendQueryParameter("client", "")
-                .appendQueryParameter("output", "toolbar")
-                .appendQueryParameter("ds", "yt")
-                .appendQueryParameter("q", query);
-        String url = builder.build().toString();
-
-        String response = Downloader.download(url);
-
-        //TODO: Parse xml data using Jsoup not done
-        DocumentBuilderFactory dbFactory = DocumentBuilderFactory.newInstance();
-        DocumentBuilder dBuilder;
-        org.w3c.dom.Document doc = null;
-
-        try {
-            dBuilder = dbFactory.newDocumentBuilder();
-            doc = dBuilder.parse(new InputSource(new ByteArrayInputStream(response.getBytes("utf-8"))));
-            doc.getDocumentElement().normalize();
-        }catch (ParserConfigurationException | SAXException | IOException e) {
-            e.printStackTrace();
-        }
-
-        if(doc!=null){
-            NodeList nList = doc.getElementsByTagName("CompleteSuggestion");
-            for (int temp = 0; temp < nList.getLength(); temp++) {
-
-                NodeList nList1 = doc.getElementsByTagName("suggestion");
-                Node nNode1 = nList1.item(temp);
-                if (nNode1.getNodeType() == Node.ELEMENT_NODE) {
-                    org.w3c.dom.Element eElement = (org.w3c.dom.Element) nNode1;
-                    suggestions.add(eElement.getAttribute("data"));
-                }
-            }
-        }else {
-            Log.e(TAG, "GREAT FUCKING ERROR");
-        }
-        return suggestions;
-    }
-
-}

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

@@ -1,53 +0,0 @@
-package org.schabi.newpipe.services.youtube;
-
-import org.schabi.newpipe.services.StreamingService;
-import org.schabi.newpipe.services.VideoExtractor;
-import org.schabi.newpipe.services.SearchEngine;
-
-
-/**
- * Created by Christian Schabesberger on 23.08.15.
- *
- * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
- * YoutubeService.java is part of NewPipe.
- *
- * NewPipe is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * NewPipe is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-public class YoutubeService implements StreamingService {
-    @Override
-    public ServiceInfo getServiceInfo() {
-        ServiceInfo serviceInfo = new ServiceInfo();
-        serviceInfo.name = "Youtube";
-        return serviceInfo;
-    }
-    @Override
-    public VideoExtractor getExtractorInstance(String url) {
-        if(acceptUrl(url)) {
-            return new YoutubeVideoExtractor(url);
-        }
-        else {
-            throw new IllegalArgumentException("supplied String is not a valid Youtube URL");
-        }
-    }
-    @Override
-    public SearchEngine getSearchEngineInstance() {
-        return new YoutubeSearchEngine();
-    }
-    @Override
-    public boolean acceptUrl(String videoUrl) {
-        return videoUrl.contains("youtube") ||
-                videoUrl.contains("youtu.be");
-    }
-}

app/src/main/java/org/schabi/newpipe/services/youtube/YoutubeVideoExtractor.java

@@ -1,610 +0,0 @@
-package org.schabi.newpipe.services.youtube;
-
-import android.util.Log;
-import android.util.Xml;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.jsoup.Jsoup;
-import org.jsoup.nodes.Document;
-import org.jsoup.nodes.Element;
-import org.jsoup.parser.Parser;
-import org.mozilla.javascript.Context;
-import org.mozilla.javascript.Function;
-import org.mozilla.javascript.ScriptableObject;
-import org.schabi.newpipe.Downloader;
-import org.schabi.newpipe.services.VideoExtractor;
-import org.schabi.newpipe.MediaFormat;
-import org.schabi.newpipe.VideoInfo;
-import org.schabi.newpipe.VideoPreviewInfo;
-import org.xmlpull.v1.XmlPullParser;
-
-import java.io.StringReader;
-import java.net.URLDecoder;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Vector;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/**
- * Created by Christian Schabesberger on 06.08.15.
- *
- * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
- * YoutubeVideoExtractor.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 YoutubeVideoExtractor extends VideoExtractor {
-
-    private static final String TAG = YoutubeVideoExtractor.class.toString();
-    private final Document doc;
-    private JSONObject jsonObj;
-    private JSONObject playerArgs;
-
-    // static values
-    private static final String DECRYPTION_FUNC_NAME="decrypt";
-
-    // cached values
-    private static volatile String decryptionCode = "";
-
-
-    public YoutubeVideoExtractor(String pageUrl) {
-        super(pageUrl);//most common videoInfo fields are now set in our superclass, for all services
-        String pageContents = Downloader.download(cleanUrl(pageUrl));
-        doc = Jsoup.parse(pageContents, pageUrl);
-
-        //attempt to load the youtube js player JSON arguments
-        try {
-            String jsonString = matchGroup1("ytplayer.config\\s*=\\s*(\\{.*?\\});", pageContents);
-            jsonObj = new JSONObject(jsonString);
-            playerArgs = jsonObj.getJSONObject("args");
-
-        } catch (Exception e) {//if this fails, the video is most likely not available.
-            // Determining why is done later.
-            videoInfo.videoAvailableStatus = VideoInfo.VIDEO_UNAVAILABLE;
-            Log.d(TAG, "Could not load JSON data for Youtube video \""+pageUrl+"\". This most likely means the video is unavailable");
-        }
-
-        //----------------------------------
-        // load and parse description code, if it isn't already initialised
-        //----------------------------------
-        if (decryptionCode.isEmpty()) {
-            try {
-            // The Youtube service needs to be initialized by downloading the
-            // js-Youtube-player. This is done in order to get the algorithm
-            // for decrypting cryptic signatures inside certain stream urls.
-                JSONObject ytAssets = jsonObj.getJSONObject("assets");
-                String playerUrl = ytAssets.getString("js");
-
-                if (playerUrl.startsWith("//")) {
-                    playerUrl = "https:" + playerUrl;
-                }
-                decryptionCode = loadDecryptionCode(playerUrl);
-            } catch (Exception e){
-                Log.d(TAG, "Could not load decryption code for the Youtube service.");
-                e.printStackTrace();
-            }
-        }
-    }
-
-    @Override
-    public String getTitle() {
-        try {//json player args method
-            return playerArgs.getString("title");
-        } catch(JSONException je) {//html <meta> method
-            je.printStackTrace();
-            Log.w(TAG, "failed to load title from JSON args; trying to extract it from HTML");
-        } try { // fall through to fall-back
-            return doc.select("meta[name=title]").attr("content");
-        } catch (Exception e) {
-            Log.e(TAG, "failed permanently to load title.");
-            e.printStackTrace();
-            return "";
-        }
-    }
-
-    @Override
-    public String getDescription() {
-        try {
-            return doc.select("p[id=\"eow-description\"]").first().html();
-        } catch (Exception e) {//todo: add fallback method
-            Log.e(TAG, "failed to load description.");
-            e.printStackTrace();
-            return "";
-        }
-    }
-
-    @Override
-    public String getUploader() {
-        try {//json player args method
-            return playerArgs.getString("author");
-        } catch(JSONException je) {
-            je.printStackTrace();
-            Log.w(TAG, "failed to load uploader name from JSON args; trying to extract it from HTML");
-        } try {//fall through to fallback HTML method
-            return doc.select("div.yt-user-info").first().text();
-        } catch (Exception e) {
-            e.printStackTrace();
-            Log.e(TAG, "failed permanently to load uploader name.");
-            return "";
-        }
-    }
-
-    @Override
-    public int getLength() {
-        try {
-            return playerArgs.getInt("length_seconds");
-        } catch (JSONException je) {//todo: find fallback method
-            Log.e(TAG, "failed to load video duration from JSON args");
-            je.printStackTrace();
-            return -1;
-        }
-    }
-
-    @Override
-    public int getViews() {
-        try {
-            String viewCountString = doc.select("meta[itemprop=interactionCount]").attr("content");
-            return Integer.parseInt(viewCountString);
-        } catch (Exception e) {//todo: find fallback method
-            Log.e(TAG, "failed to number of views");
-            e.printStackTrace();
-            return -1;
-        }
-    }
-
-    @Override
-    public String getUploadDate() {
-        try {
-            return doc.select("meta[itemprop=datePublished]").attr("content");
-        } catch (Exception e) {//todo: add fallback method
-            Log.e(TAG, "failed to get upload date.");
-            e.printStackTrace();
-            return "";
-        }
-    }
-
-    @Override
-    public String getThumbnailUrl() {
-        //first attempt getting a small image version
-        //in the html extracting part we try to get a thumbnail with a higher resolution
-        // Try to get high resolution thumbnail if it fails use low res from the player instead
-        try {
-            return doc.select("link[itemprop=\"thumbnailUrl\"]").first().attr("abs:href");
-        } catch(Exception e) {
-            Log.w(TAG, "Could not find high res Thumbnail. Using low res instead");
-            //fall through to fallback
-        } try {
-            return playerArgs.getString("thumbnail_url");
-        } catch (JSONException je) {
-            je.printStackTrace();
-            Log.w(TAG, "failed to extract thumbnail URL from JSON args; trying to extract it from HTML");
-            return "";
-        }
-    }
-
-    @Override
-    public String getUploaderThumbnailUrl() {
-        try {
-            return doc.select("a[class*=\"yt-user-photo\"]").first()
-                    .select("img").first()
-                    .attr("abs:data-thumb");
-        } catch (Exception e) {//todo: add fallback method
-            Log.e(TAG, "failed to get uploader thumbnail URL.");
-            e.printStackTrace();
-            return "";
-        }
-    }
-
-    @Override
-    public VideoInfo.AudioStream[] getAudioStreams() {
-        try {
-            String dashManifest = playerArgs.getString("dashmpd");
-            return parseDashManifest(dashManifest, decryptionCode);
-
-        } catch (NullPointerException e) {
-            Log.e(TAG, "Could not find \"dashmpd\" upon the player args (maybe no dash manifest available).");
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return new VideoInfo.AudioStream[0];
-    }
-
-    @Override
-    public VideoInfo.VideoStream[] getVideoStreams() {
-        try{
-            //------------------------------------
-            // extract video stream url
-            //------------------------------------
-            String encoded_url_map = playerArgs.getString("url_encoded_fmt_stream_map");
-            Vector<VideoInfo.VideoStream> videoStreams = new Vector<>();
-            for(String url_data_str : encoded_url_map.split(",")) {
-                Map<String, String> tags = new HashMap<>();
-                for(String raw_tag : Parser.unescapeEntities(url_data_str, true).split("&")) {
-                    String[] split_tag = raw_tag.split("=");
-                    tags.put(split_tag[0], split_tag[1]);
-                }
-
-                int itag = Integer.parseInt(tags.get("itag"));
-                String streamUrl = URLDecoder.decode(tags.get("url"), "UTF-8");
-
-                // if video has a signature: decrypt it and add it to the url
-                if(tags.get("s") != null) {
-                    streamUrl = streamUrl + "&signature=" + decryptSignature(tags.get("s"), decryptionCode);
-                }
-
-                if(resolveFormat(itag) != -1) {
-                    videoStreams.add(new VideoInfo.VideoStream(
-                            streamUrl,
-                            resolveFormat(itag),
-                            resolveResolutionString(itag)));
-                }
-            }
-            return videoStreams.toArray(new VideoInfo.VideoStream[videoStreams.size()]);
-
-        } catch (Exception e) {
-            Log.e(TAG, "Failed to get video stream");
-            e.printStackTrace();
-            return new VideoInfo.VideoStream[0];
-        }
-    }
-
-    /**These lists only contain itag formats that are supported by the common Android Video player.
-    However if you are looking for a list showing all itag formats, look at
-    https://github.com/rg3/youtube-dl/issues/1687 */
-
-    @SuppressWarnings("WeakerAccess")
-    public static int resolveFormat(int itag) {
-        switch(itag) {
-            // video
-            case 17: return MediaFormat.v3GPP.id;
-            case 18: return MediaFormat.MPEG_4.id;
-            case 22: return MediaFormat.MPEG_4.id;
-            case 36: return MediaFormat.v3GPP.id;
-            case 37: return MediaFormat.MPEG_4.id;
-            case 38: return MediaFormat.MPEG_4.id;
-            case 43: return MediaFormat.WEBM.id;
-            case 44: return MediaFormat.WEBM.id;
-            case 45: return MediaFormat.WEBM.id;
-            case 46: return MediaFormat.WEBM.id;
-            default:
-                //Log.i(TAG, "Itag " + Integer.toString(itag) + " not known or not supported.");
-                return -1;
-        }
-    }
-
-    @SuppressWarnings("WeakerAccess")
-    public static String resolveResolutionString(int itag) {
-        switch(itag) {
-            case 17: return "144p";
-            case 18: return "360p";
-            case 22: return "720p";
-            case 36: return "240p";
-            case 37: return "1080p";
-            case 38: return "1080p";
-            case 43: return "360p";
-            case 44: return "480p";
-            case 45: return "720p";
-            case 46: return "1080p";
-            default:
-                //Log.i(TAG, "Itag " + Integer.toString(itag) + " not known or not supported.");
-                return null;
-        }
-    }
-
-    @SuppressWarnings("WeakerAccess")
-    @Override
-    public String getVideoId(String url) {
-        String id;
-        String pat;
-
-        if(url.contains("youtube")) {
-            pat = "youtube\\.com/watch\\?v=([\\-a-zA-Z0-9_]{11})";
-        }
-        else if(url.contains("youtu.be")) {
-            pat = "youtu\\.be/([a-zA-Z0-9_-]{11})";
-        }
-        else {
-            Log.e(TAG, "Error could not parse url: " + url);
-            return "";
-        }
-        id = matchGroup1(pat, url);
-        if(!id.isEmpty()){
-            Log.i(TAG, "string \""+url+"\" matches!");
-            return id;
-        }
-        Log.i(TAG, "string \""+url+"\" does not match.");
-        return "";
-    }
-
-    @SuppressWarnings("WeakerAccess")
-    @Override
-    public String getVideoUrl(String videoId) {
-        return "https://www.youtube.com/watch?v=" + videoId;
-    }
-
-    /**Attempts to parse (and return) the offset to start playing the video from.
-     * @return the offset (in seconds), or 0 if no timestamp is found.*/
-    @Override
-    public int getTimeStamp(){
-        String timeStamp = matchGroup1("((#|&)t=\\d{0,3}h?\\d{0,3}m?\\d{1,3}s?)", pageUrl);
-
-        //TODO: test this
-        if(!timeStamp.isEmpty()) {
-            String secondsString = matchGroup1("(\\d{1,3})s", timeStamp);
-            String minutesString = matchGroup1("(\\d{1,3})m", timeStamp);
-            String hoursString = matchGroup1("(\\d{1,3})h", timeStamp);
-
-            if(secondsString.isEmpty()//if nothing was got,
-            && minutesString.isEmpty()//treat as unlabelled seconds
-            && hoursString.isEmpty())
-                secondsString = matchGroup1("t=(\\d{1,3})", timeStamp);
-
-            int seconds = (secondsString.isEmpty() ? 0 : Integer.parseInt(secondsString));
-            int minutes = (minutesString.isEmpty() ? 0 : Integer.parseInt(minutesString));
-            int hours =   (hoursString.isEmpty()   ? 0 : Integer.parseInt(hoursString));
-
-            int ret = seconds + (60*minutes) + (3600*hours);//don't trust BODMAS!
-            Log.d(TAG, "derived timestamp value:"+ret);
-            return ret;
-            //the ordering varies internationally
-        }//else, return default 0
-        return 0;
-    }
-
-    @Override
-    public VideoInfo getVideoInfo() {
-        videoInfo = super.getVideoInfo();
-        //todo: replace this with a call to getVideoId, if possible
-        videoInfo.id = matchGroup1("v=([0-9a-zA-Z_-]{11})", pageUrl);
-
-        videoInfo.age_limit = 0;
-
-        //average rating
-        try {
-            videoInfo.average_rating = playerArgs.getString("avg_rating");
-        } catch (JSONException e) {
-            e.printStackTrace();
-        }
-
-        //---------------------------------------
-        // extracting information from html page
-        //---------------------------------------
-
-        // Determine what went wrong when the Video is not available
-        if(videoInfo.videoAvailableStatus == VideoInfo.VIDEO_UNAVAILABLE) {
-            if(doc.select("h1[id=\"unavailable-message\"]").first().text().contains("GEMA")) {
-                videoInfo.videoAvailableStatus = VideoInfo.VIDEO_UNAVAILABLE_GEMA;
-            }
-        }
-
-        String likesString = "";
-        String dislikesString = "";
-        try {
-            // likes
-            likesString = doc.select("button.like-button-renderer-like-button").first()
-                    .select("span.yt-uix-button-content").first().text();
-            videoInfo.like_count = Integer.parseInt(likesString.replaceAll("[^\\d]", ""));
-            // dislikes
-            dislikesString = doc.select("button.like-button-renderer-dislike-button").first()
-                            .select("span.yt-uix-button-content").first().text();
-
-            videoInfo.dislike_count = Integer.parseInt(dislikesString.replaceAll("[^\\d]", ""));
-        } catch(NumberFormatException nfe) {
-            Log.e(TAG, "failed to parse likesString \""+likesString+"\" and dislikesString \""+
-            dislikesString+"\" as integers");
-        } catch(Exception e) {
-            // if it fails we know that the video does not offer dislikes.
-            e.printStackTrace();
-            videoInfo.like_count = 0;
-            videoInfo.dislike_count = 0;
-        }
-
-        // next video
-        videoInfo.nextVideo = extractVideoPreviewInfo(doc.select("div[class=\"watch-sidebar-section\"]").first()
-                .select("li").first());
-
-        // related videos
-        Vector<VideoPreviewInfo> relatedVideos = new Vector<>();
-        for(Element li : doc.select("ul[id=\"watch-related\"]").first().children()) {
-            // first check if we have a playlist. If so leave them out
-            if(li.select("a[class*=\"content-link\"]").first() != null) {
-                relatedVideos.add(extractVideoPreviewInfo(li));
-            }
-        }
-        //todo: replace conversion
-        videoInfo.relatedVideos = relatedVideos;
-        //videoInfo.relatedVideos = relatedVideos.toArray(new VideoPreviewInfo[relatedVideos.size()]);
-        return videoInfo;
-    }
-
-
-    private VideoInfo.AudioStream[] parseDashManifest(String dashManifest, String decryptoinCode) {
-        if(!dashManifest.contains("/signature/")) {
-            String encryptedSig = matchGroup1("/s/([a-fA-F0-9\\.]+)", dashManifest);
-            String decryptedSig;
-
-            decryptedSig = decryptSignature(encryptedSig, decryptoinCode);
-            dashManifest = dashManifest.replace("/s/" + encryptedSig, "/signature/" + decryptedSig);
-        }
-        String dashDoc = Downloader.download(dashManifest);
-        Vector<VideoInfo.AudioStream> audioStreams = new Vector<>();
-        try {
-            XmlPullParser parser = Xml.newPullParser();
-            parser.setInput(new StringReader(dashDoc));
-            int eventType = parser.getEventType();
-            String tagName = "";
-            String currentMimeType = "";
-            int currentBandwidth = -1;
-            int currentSamplingRate = -1;
-            boolean currentTagIsBaseUrl = false;
-            while(eventType != XmlPullParser.END_DOCUMENT) {
-                switch(eventType) {
-                    case XmlPullParser.START_TAG:
-                        tagName = parser.getName();
-                        if(tagName.equals("AdaptationSet")) {
-                            currentMimeType = parser.getAttributeValue(XmlPullParser.NO_NAMESPACE, "mimeType");
-                        } else if(tagName.equals("Representation") && currentMimeType.contains("audio")) {
-                            currentBandwidth = Integer.parseInt(
-                                    parser.getAttributeValue(XmlPullParser.NO_NAMESPACE, "bandwidth"));
-                            currentSamplingRate = Integer.parseInt(
-                                    parser.getAttributeValue(XmlPullParser.NO_NAMESPACE, "audioSamplingRate"));
-                        } else if(tagName.equals("BaseURL")) {
-                            currentTagIsBaseUrl = true;
-                        }
-
-                        break;
-                    case XmlPullParser.TEXT:
-                        if(currentTagIsBaseUrl &&
-                                (currentMimeType.contains("audio"))) {
-                            int format = -1;
-                            if(currentMimeType.equals(MediaFormat.WEBMA.mimeType)) {
-                                format = MediaFormat.WEBMA.id;
-                            } else if(currentMimeType.equals(MediaFormat.M4A.mimeType)) {
-                                format = MediaFormat.M4A.id;
-                            }
-                            audioStreams.add(new VideoInfo.AudioStream(parser.getText(),
-                                    format, currentBandwidth, currentSamplingRate));
-                        }
-                    case XmlPullParser.END_TAG:
-                        if(tagName.equals("AdaptationSet")) {
-                            currentMimeType = "";
-                        } else if(tagName.equals("BaseURL")) {
-                            currentTagIsBaseUrl = false;
-                        }
-                        break;
-                    default:
-                }
-                eventType = parser.next();
-            }
-        } catch(Exception e) {
-            e.printStackTrace();
-        }
-        return audioStreams.toArray(new VideoInfo.AudioStream[audioStreams.size()]);
-    }
-    /**Provides information about links to other videos on the video page, such as related videos.
-     * This is encapsulated in a VideoPreviewInfo object,
-     * which is a subset of the fields in a full VideoInfo.*/
-    private VideoPreviewInfo extractVideoPreviewInfo(Element li) {
-        VideoPreviewInfo info = new VideoPreviewInfo();
-        info.webpage_url = li.select("a.content-link").first()
-                .attr("abs:href");
-        try {
-            info.id = matchGroup1("v=([0-9a-zA-Z-]*)", info.webpage_url);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-
-        //todo: check NullPointerException causing
-        info.title = li.select("span.title").first().text();
-        //this page causes the NullPointerException, after finding it by searching for "tjvg":
-        //https://www.youtube.com/watch?v=Uqg0aEhLFAg
-        String views = li.select("span.view-count").first().text();
-        Log.i(TAG, "title:"+info.title);
-        Log.i(TAG, "view count:"+views);
-        try {
-            info.view_count = Long.parseLong(li.select("span.view-count")
-                    .first().text().replaceAll("[^\\d]", ""));
-        } catch (NullPointerException e) {//related videos sometimes have no view count
-            info.view_count = 0;
-        }
-        info.uploader = li.select("span.g-hovercard").first().text();
-
-        info.duration = li.select("span.video-time").first().text();
-
-        Element img = li.select("img").first();
-        info.thumbnail_url = img.attr("abs:src");
-        // Sometimes youtube sends links to gif files which somehow seem to not exist
-        // anymore. Items with such gif also offer a secondary image source. So we are going
-        // to use that if we caught such an item.
-        if(info.thumbnail_url.contains(".gif")) {
-            info.thumbnail_url = img.attr("data-thumb");
-        }
-        if(info.thumbnail_url.startsWith("//")) {
-            info.thumbnail_url = "https:" + info.thumbnail_url;
-        }
-        return info;
-    }
-
-    private String loadDecryptionCode(String playerUrl) {
-        String playerCode = Downloader.download(playerUrl);
-        String decryptionFuncName = "";
-        String decryptionFunc = "";
-        String helperObjectName;
-        String helperObject = "";
-        String callerFunc = "function " + DECRYPTION_FUNC_NAME + "(a){return %%(a);}";
-        String decryptionCode;
-
-        try {
-            decryptionFuncName = matchGroup1("\\.sig\\|\\|([a-zA-Z0-9$]+)\\(", playerCode);
-
-            String functionPattern = "(var "+  decryptionFuncName.replace("$", "\\$") +"=function\\([a-zA-Z0-9_]*\\)\\{.+?\\})";
-            decryptionFunc = matchGroup1(functionPattern, playerCode);
-            decryptionFunc += ";";
-
-            helperObjectName = matchGroup1(";([A-Za-z0-9_\\$]{2})\\...\\(", decryptionFunc);
-
-            String helperPattern = "(var " + helperObjectName.replace("$", "\\$") + "=\\{.+?\\}\\};)";
-            helperObject = matchGroup1(helperPattern, playerCode);
-
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-
-        callerFunc = callerFunc.replace("%%", decryptionFuncName);
-        decryptionCode = helperObject + decryptionFunc + callerFunc;
-
-        return decryptionCode;
-    }
-
-    private String decryptSignature(String encryptedSig, String decryptionCode) {
-        Context context = Context.enter();
-        context.setOptimizationLevel(-1);
-        Object result = null;
-        try {
-            ScriptableObject scope = context.initStandardObjects();
-            context.evaluateString(scope, decryptionCode, "decryptionCode", 1, null);
-            Function decryptionFunc = (Function) scope.get("decrypt", scope);
-            result = decryptionFunc.call(context, scope, scope, new Object[]{encryptedSig});
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        Context.exit();
-        if(result != null)
-            return result.toString();
-        else
-            return "";
-    }
-
-    private String cleanUrl(String complexUrl) {
-        return getVideoUrl(getVideoId(complexUrl));
-    }
-
-    private String matchGroup1(String pattern, String input) {
-        Pattern pat = Pattern.compile(pattern);
-        Matcher mat = pat.matcher(input);
-        boolean foundMatch = mat.find();
-        if (foundMatch) {
-            return mat.group(1);
-        }
-        else {
-            Log.w(TAG, "failed to find pattern \""+pattern+"\" inside of \""+input+"\"");
-            new Exception("failed to find pattern \""+pattern+"\"").printStackTrace();
-            return "";
-        }
-
-    }
-}

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

@@ -0,0 +1,110 @@
+/**
+ * Created by k3b on 07.01.2016.
+ *
+ * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
+ * NewPipeSettings.java is part of NewPipe.
+ *
+ * NewPipe is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * NewPipe is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package org.schabi.newpipe.settings;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.os.Environment;
+import android.preference.PreferenceManager;
+import android.support.annotation.NonNull;
+
+import org.schabi.newpipe.R;
+
+import java.io.File;
+
+import us.shandian.giga.util.Utility;
+
+/**
+ * Helper for global settings
+ */
+
+/**
+ * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
+ * NewPipeSettings.java is part of NewPipe.
+ *
+ * NewPipe is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * NewPipe is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+public class NewPipeSettings {
+
+    private NewPipeSettings() {
+    }
+
+    public static void initSettings(Context context) {
+        PreferenceManager.setDefaultValues(context, R.xml.settings, false);
+        getVideoDownloadFolder(context);
+        getAudioDownloadFolder(context);
+    }
+
+    public static File getVideoDownloadFolder(Context context) {
+        return getFolder(context, R.string.download_path_key, Environment.DIRECTORY_MOVIES);
+    }
+
+    public static String getVideoDownloadPath(Context context) {
+        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
+        final String key = context.getString(R.string.download_path_key);
+        String downloadPath = prefs.getString(key, Environment.DIRECTORY_MOVIES);
+
+        return downloadPath;
+    }
+
+    public static File getAudioDownloadFolder(Context context) {
+        return getFolder(context, R.string.download_path_audio_key, Environment.DIRECTORY_MUSIC);
+    }
+
+    public static String getAudioDownloadPath(Context context) {
+        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
+        final String key = context.getString(R.string.download_path_audio_key);
+        String downloadPath = prefs.getString(key, Environment.DIRECTORY_MUSIC);
+
+        return downloadPath;
+    }
+
+    private static File getFolder(Context context, int keyID, String defaultDirectoryName) {
+        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
+        final String key = context.getString(keyID);
+        String downloadPath = prefs.getString(key, null);
+        if ((downloadPath != null) && (!downloadPath.isEmpty())) return new File(downloadPath.trim());
+
+        final File folder = getFolder(defaultDirectoryName);
+        SharedPreferences.Editor spEditor = prefs.edit();
+        spEditor.putString(key
+                , new File(folder,"NewPipe").getAbsolutePath());
+        spEditor.apply();
+        return folder;
+    }
+
+    @NonNull
+    private static File getFolder(String defaultDirectoryName) {
+        return new File(Environment.getExternalStorageDirectory(),defaultDirectoryName);
+    }
+}

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

@@ -1,13 +1,10 @@
-package org.schabi.newpipe;
+package org.schabi.newpipe.settings;
 
 import android.content.Context;
-import android.content.SharedPreferences;
+import android.content.Intent;
 import android.content.res.Configuration;
 import android.os.Bundle;
-import android.os.Environment;
 import android.preference.PreferenceActivity;
-import android.preference.PreferenceFragment;
-import android.preference.PreferenceManager;
 import android.support.annotation.LayoutRes;
 import android.support.annotation.NonNull;
 import android.support.v7.app.ActionBar;
@@ -17,6 +14,10 @@ import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.util.ThemeHelper;
+
+
 /**
  * Created by Christian Schabesberger on 31.08.15.
  *
@@ -37,30 +38,35 @@ import android.view.ViewGroup;
  * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-public class SettingsActivity extends PreferenceActivity {
-
+public class SettingsActivity extends PreferenceActivity  {
+    SettingsFragment f = new SettingsFragment();
     private AppCompatDelegate mDelegate = null;
 
+    public static void initSettings(Context context) {
+        NewPipeSettings.initSettings(context);
+    }
+
     @Override
     protected void onCreate(Bundle savedInstanceBundle) {
+        ThemeHelper.setTheme(this, true);
         getDelegate().installViewFactory();
         getDelegate().onCreate(savedInstanceBundle);
         super.onCreate(savedInstanceBundle);
 
-        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+        ActionBar actionBar = getSupportActionBar();
+        actionBar.setDisplayHomeAsUpEnabled(true);
+        actionBar.setTitle(R.string.settings_title);
+        actionBar.setDisplayShowTitleEnabled(true);
 
         getFragmentManager().beginTransaction()
-                .replace(android.R.id.content, new SettingsFragment())
+                .replace(android.R.id.content, f)
                 .commit();
-
     }
 
-    public static class SettingsFragment extends PreferenceFragment {
-        @Override
-        public void onCreate(Bundle savedInstanceState) {
-            super.onCreate(savedInstanceState);
-            addPreferencesFromResource(R.xml.settings_screen);
-        }
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        f.onActivityResult(requestCode, resultCode, data);
     }
 
     @Override
@@ -148,17 +154,4 @@ public class SettingsActivity extends PreferenceActivity {
         }
         return true;
     }
-
-    public static void initSettings(Context context) {
-        PreferenceManager.setDefaultValues(context, R.xml.settings_screen, false);
-        SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(context);
-        if(sp.getString(context.getString(R.string.downloadPathPreference), "").isEmpty()){
-            SharedPreferences.Editor spEditor = sp.edit();
-            String newPipeDownloadStorage =
-                    Environment.getExternalStorageDirectory().getAbsolutePath() + "/NewPipe";
-            spEditor.putString(context.getString(R.string.downloadPathPreference)
-                    , newPipeDownloadStorage);
-            spEditor.apply();
-        }
-    }
 }

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

@@ -0,0 +1,278 @@
+package org.schabi.newpipe.settings;
+
+import android.app.Activity;
+import android.content.ClipData;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.net.Uri;
+import android.os.Build;
+import android.os.Bundle;
+import android.preference.ListPreference;
+import android.preference.Preference;
+import android.preference.PreferenceFragment;
+import android.preference.PreferenceManager;
+import android.preference.PreferenceScreen;
+import android.support.v7.app.AlertDialog;
+
+import com.nononsenseapps.filepicker.FilePickerActivity;
+
+import org.schabi.newpipe.App;
+import org.schabi.newpipe.MainActivity;
+import org.schabi.newpipe.R;
+
+import java.util.ArrayList;
+
+import info.guardianproject.netcipher.proxy.OrbotHelper;
+
+/**
+ * Created by david on 15/06/16.
+ *
+ * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
+ * SettingsFragment.java is part of NewPipe.
+ *
+ * NewPipe is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * NewPipe is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+public class SettingsFragment  extends PreferenceFragment
+        implements SharedPreferences.OnSharedPreferenceChangeListener
+{
+    public static final int REQUEST_INSTALL_ORBOT = 0x1234;
+    SharedPreferences.OnSharedPreferenceChangeListener prefListener;
+    // get keys
+    String DEFAULT_RESOLUTION_PREFERENCE;
+    String DEFAULT_AUDIO_FORMAT_PREFERENCE;
+    String SEARCH_LANGUAGE_PREFERENCE;
+    String DOWNLOAD_PATH_PREFERENCE;
+    String DOWNLOAD_PATH_AUDIO_PREFERENCE;
+    String USE_TOR_KEY;
+    String THEME;
+    private ListPreference defaultResolutionPreference;
+    private ListPreference defaultAudioFormatPreference;
+    private ListPreference searchLanguagePreference;
+    private Preference downloadPathPreference;
+    private Preference downloadPathAudioPreference;
+    private Preference themePreference;
+    private SharedPreferences defaultPreferences;
+
+    @Override
+    public void onCreate(final Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        addPreferencesFromResource(R.xml.settings);
+
+        final Activity activity = getActivity();
+
+        defaultPreferences = PreferenceManager.getDefaultSharedPreferences(activity);
+
+        // get keys
+        DEFAULT_RESOLUTION_PREFERENCE = getString(R.string.default_resolution_key);
+        DEFAULT_AUDIO_FORMAT_PREFERENCE = getString(R.string.default_audio_format_key);
+        SEARCH_LANGUAGE_PREFERENCE = getString(R.string.search_language_key);
+        DOWNLOAD_PATH_PREFERENCE = getString(R.string.download_path_key);
+        DOWNLOAD_PATH_AUDIO_PREFERENCE = getString(R.string.download_path_audio_key);
+        THEME = getString(R.string.theme_key);
+        USE_TOR_KEY = getString(R.string.use_tor_key);
+
+        // get pref objects
+        defaultResolutionPreference =
+                (ListPreference) findPreference(DEFAULT_RESOLUTION_PREFERENCE);
+        defaultAudioFormatPreference =
+                (ListPreference) findPreference(DEFAULT_AUDIO_FORMAT_PREFERENCE);
+        searchLanguagePreference =
+                (ListPreference) findPreference(SEARCH_LANGUAGE_PREFERENCE);
+        downloadPathPreference = findPreference(DOWNLOAD_PATH_PREFERENCE);
+        downloadPathAudioPreference = findPreference(DOWNLOAD_PATH_AUDIO_PREFERENCE);
+        themePreference = findPreference(THEME);
+
+        final String currentTheme = defaultPreferences.getString(THEME, "Light");
+
+        prefListener = new SharedPreferences.OnSharedPreferenceChangeListener() {
+            @Override
+            public void onSharedPreferenceChanged(SharedPreferences sharedPreferences,
+                                                  String key) {
+                Activity a = getActivity();
+                if(a == null)
+                {
+                    return;
+                }
+                if (key == USE_TOR_KEY)
+                {
+                    if (defaultPreferences.getBoolean(USE_TOR_KEY, false)) {
+                        if (OrbotHelper.isOrbotInstalled(a)) {
+                            App.configureTor(true);
+                            OrbotHelper.requestStartTor(a);
+                        } else {
+                            Intent intent = OrbotHelper.getOrbotInstallIntent(a);
+                            a.startActivityForResult(intent, REQUEST_INSTALL_ORBOT);
+                        }
+                    } else {
+                        App.configureTor(false);
+                    }
+                }
+                else if (key == DOWNLOAD_PATH_PREFERENCE)
+                {
+                    String downloadPath = sharedPreferences
+                            .getString(DOWNLOAD_PATH_PREFERENCE,
+                                    getString(R.string.download_path_summary));
+                    downloadPathPreference
+                            .setSummary(downloadPath);
+                }
+                else if (key == DOWNLOAD_PATH_AUDIO_PREFERENCE)
+                {
+                    String downloadPath = sharedPreferences
+                            .getString(DOWNLOAD_PATH_AUDIO_PREFERENCE,
+                                    getString(R.string.download_path_audio_summary));
+                    downloadPathAudioPreference
+                            .setSummary(downloadPath);
+                }
+                else if (key == THEME)
+                {
+                    String selectedTheme = sharedPreferences.getString(THEME, "Light");
+                    themePreference.setSummary(selectedTheme);
+
+                    if(!selectedTheme.equals(currentTheme)) { // If it's not the current theme
+                        new AlertDialog.Builder(activity)
+                                .setTitle(R.string.restart_title)
+                                .setMessage(R.string.msg_restart)
+                                .setPositiveButton(R.string.yes, new DialogInterface.OnClickListener() {
+                                    @Override
+                                    public void onClick(DialogInterface dialog, int which) {
+                                        Intent intentToMain = new Intent(activity, MainActivity.class);
+                                        intentToMain.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
+                                        activity.startActivity(intentToMain);
+
+                                        activity.finish();
+                                        Runtime.getRuntime().exit(0);
+                                    }
+                                })
+                                .setNegativeButton(R.string.later, null)
+                                .create().show();
+                    }
+                }
+                updateSummary();
+            }
+        };
+        defaultPreferences.registerOnSharedPreferenceChangeListener(prefListener);
+
+        updateSummary();
+    }
+
+    @Override
+    public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
+
+        if(preference.getKey().equals(downloadPathPreference.getKey()) ||
+                preference.getKey().equals(downloadPathAudioPreference.getKey()))
+        {
+            Activity activity = getActivity();
+            Intent i = new Intent(activity, FilePickerActivity.class);
+
+            i.putExtra(FilePickerActivity.EXTRA_ALLOW_MULTIPLE, false);
+            i.putExtra(FilePickerActivity.EXTRA_ALLOW_CREATE_DIR, true);
+            i.putExtra(FilePickerActivity.EXTRA_MODE, FilePickerActivity.MODE_DIR);
+            if(preference.getKey().equals(downloadPathPreference.getKey()))
+            {
+                activity.startActivityForResult(i, R.string.download_path_key);
+            }
+            else if (preference.getKey().equals(downloadPathAudioPreference.getKey()))
+            {
+                activity.startActivityForResult(i, R.string.download_path_audio_key);
+            }
+        }
+        return super.onPreferenceTreeClick(preferenceScreen, preference);
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        Activity a = getActivity();
+
+        if ((requestCode == R.string.download_path_audio_key
+                || requestCode == R.string.download_path_key)
+                && resultCode == Activity.RESULT_OK) {
+
+            Uri uri = null;
+            if (data.getBooleanExtra(FilePickerActivity.EXTRA_ALLOW_MULTIPLE, false)) {
+                // For JellyBean and above
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
+                    ClipData clip = data.getClipData();
+
+                    if (clip != null) {
+                        for (int i = 0; i < clip.getItemCount(); i++) {
+                            uri = clip.getItemAt(i).getUri();
+                        }
+                    }
+                    // For Ice Cream Sandwich
+                } else {
+                    ArrayList<String> paths = data.getStringArrayListExtra
+                            (FilePickerActivity.EXTRA_PATHS);
+
+                    if (paths != null) {
+                        for (String path: paths) {
+                            uri = Uri.parse(path);
+                        }
+                    }
+                }
+            } else {
+                uri = data.getData();
+            }
+            SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(a);
+
+            //requestCode is equal to  R.string.download_path_key or
+            //R.string.download_path_audio_key
+            String key = getString(requestCode);
+            String path = data.getData().toString().substring(7);
+            prefs.edit()
+                    .putString(key, path)
+                    .apply();
+
+        }
+        else if(requestCode == REQUEST_INSTALL_ORBOT)
+        {
+            // try to start tor regardless of resultCode since clicking back after
+            // installing the app does not necessarily return RESULT_OK
+            App.configureTor(requestCode == REQUEST_INSTALL_ORBOT
+                    && OrbotHelper.requestStartTor(a));
+        }
+
+        updateSummary();
+        super.onActivityResult(requestCode, resultCode, data);
+    }
+
+    // This is used to show the status of some preference in the description
+    private void updateSummary() {
+        defaultResolutionPreference.setSummary(
+                defaultPreferences.getString(DEFAULT_RESOLUTION_PREFERENCE,
+                        getString(R.string.default_resolution_value)));
+        defaultAudioFormatPreference.setSummary(
+                defaultPreferences.getString(DEFAULT_AUDIO_FORMAT_PREFERENCE,
+                        getString(R.string.default_audio_format_value)));
+        searchLanguagePreference.setSummary(
+                defaultPreferences.getString(SEARCH_LANGUAGE_PREFERENCE,
+                        getString(R.string.default_language_value)));
+        downloadPathPreference.setSummary(
+                defaultPreferences.getString(DOWNLOAD_PATH_PREFERENCE,
+                        getString(R.string.download_path_summary)));
+        downloadPathAudioPreference.setSummary(
+                defaultPreferences.getString(DOWNLOAD_PATH_AUDIO_PREFERENCE,
+                        getString(R.string.download_path_audio_summary)));
+        themePreference.setSummary(
+                defaultPreferences.getString(THEME,
+                        getString(R.string.light_theme_title)));
+    }
+
+    @Override
+    public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
+
+    }
+}

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

@@ -0,0 +1,151 @@
+package org.schabi.newpipe.util;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.v4.app.NavUtils;
+import android.support.v7.app.AppCompatActivity;
+import android.util.Log;
+
+import org.schabi.newpipe.ChannelActivity;
+import org.schabi.newpipe.MainActivity;
+import org.schabi.newpipe.detail.VideoItemDetailActivity;
+import org.schabi.newpipe.detail.VideoItemDetailFragment;
+import org.schabi.newpipe.extractor.NewPipe;
+import org.schabi.newpipe.extractor.StreamingService;
+
+import java.util.ArrayList;
+import java.util.Stack;
+
+/**
+ * Created by Christian Schabesberger on 16.02.17.
+ *
+ * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
+ * NavStack.java is part of NewPipe.
+ *
+ * NewPipe is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * NewPipe is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * class helps to navigate within the app
+ * IMPORTAND: the top of the stack is the current activity !!!
+ */
+public class NavStack {
+    private static final String TAG = NavStack.class.toString();
+    public static final String SERVICE_ID = "service_id";
+    public static final String URL = "url";
+
+    private static final String NAV_STACK="nav_stack";
+
+    private enum ActivityId {
+        CHANNEL,
+        DETAIL
+    }
+
+    private class NavEntry {
+        public NavEntry(String url, int serviceId) {
+            this.url = url;
+            this.serviceId = serviceId;
+        }
+        public String url;
+        public int serviceId;
+    }
+
+    private static NavStack instance = new NavStack();
+    private Stack<NavEntry> stack = new Stack<NavEntry>();
+
+    private NavStack() {
+    }
+
+    public static NavStack getInstance() {
+        return instance;
+    }
+
+    private void addEntry(String url, Class ac, int serviceId) {
+        stack.push(new NavEntry(url, serviceId));
+    }
+
+    public void navBack(Activity activity) throws Exception {
+        if(stack.size() == 0) { // if stack is already empty here, activity was probably called
+            // from another app
+            activity.finish();
+            return;
+        }
+        stack.pop(); // remove curent activty, since we dont want to return to itself
+        if (stack.size() == 0) {
+            openMainActivity(activity); // if no more page is on the stack this means we are home
+            return;
+        }
+        NavEntry entry = stack.pop();  // this element will reapear, since by calling the old page
+        // this element will be pushed on top again
+        try {
+            StreamingService service = NewPipe.getService(entry.serviceId);
+            switch (service.getLinkTypeByUrl(entry.url)) {
+                case STREAM:
+                    openDetailActivity(activity, entry.url, entry.serviceId);
+                    break;
+                case CHANNEL:
+                    openChannelActivity(activity, entry.url, entry.serviceId);
+                    break;
+                case NONE:
+                    throw new Exception("Url not known to service. service="
+                            + Integer.toString(entry.serviceId) + " url=" + entry.url);
+                default:
+                    openMainActivity(activity);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+
+    public void openChannelActivity(Context context, String url, int serviceId) {
+        openActivity(context, url, serviceId, ChannelActivity.class);
+    }
+
+    public void openDetailActivity(Context context, String url, int serviceId) {
+        openActivity(context, url, serviceId, VideoItemDetailActivity.class);
+    }
+
+    private void openActivity(Context context, String url, int serviceId, Class acitivtyClass) {
+        stack.push(new NavEntry(url, serviceId));
+        Intent i = new Intent(context, acitivtyClass);
+        i.putExtra(SERVICE_ID, serviceId);
+        i.putExtra(URL, url);
+        context.startActivity(i);
+    }
+
+    public void openMainActivity(Activity a) {
+        stack.clear();
+        Intent i = new Intent(a, MainActivity.class);
+        i.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+        NavUtils.navigateUpTo(a, i);
+    }
+
+    public void onSaveInstanceState(Bundle state) {
+        ArrayList<String> sa = new ArrayList<>();
+        for(NavEntry entry : stack) {
+            sa.add(entry.url);
+        }
+        state.putStringArrayList(NAV_STACK, sa);
+    }
+
+    public void restoreSavedInstanceState(Bundle state) {
+        ArrayList<String> sa = state.getStringArrayList(NAV_STACK);
+        for(String url : sa) {
+            stack.push(new NavEntry(url, NewPipe.getServiceByUrl(url).getServiceId()));
+        }
+    }
+}

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

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

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

@@ -0,0 +1,31 @@
+package org.schabi.newpipe.util;
+
+import android.content.Context;
+import android.preference.PreferenceManager;
+
+import org.schabi.newpipe.R;
+
+public class ThemeHelper {
+
+    public static void setTheme(Context context, boolean mode) {
+        // mode is true for normal theme, false for no action bar theme.
+
+        String themeKey = context.getString(R.string.theme_key);
+        //String lightTheme = context.getResources().getString(R.string.light_theme_title);
+        String darkTheme = context.getResources().getString(R.string.dark_theme_title);
+        String blackTheme = context.getResources().getString(R.string.black_theme_title);
+
+        String sp = PreferenceManager.getDefaultSharedPreferences(context)
+                .getString(themeKey, context.getResources().getString(R.string.light_theme_title));
+
+        if (mode) {
+            if (sp.equals(darkTheme)) context.setTheme(R.style.DarkTheme);
+            else if (sp.equals(blackTheme)) context.setTheme(R.style.BlackTheme);
+            else context.setTheme(R.style.AppTheme);
+        } else {
+            if (sp.equals(darkTheme)) context.setTheme(R.style.DarkTheme_NoActionBar);
+            else if (sp.equals(blackTheme)) context.setTheme(R.style.BlackTheme_NoActionBar);
+            else context.setTheme(R.style.AppTheme_NoActionBar);
+        }
+    }
+}

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

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

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,75 @@
+package us.shandian.giga.get;
+
+import java.io.BufferedInputStream;
+import java.io.RandomAccessFile;
+import java.net.HttpURLConnection;
+import java.net.URL;
+
+// Single-threaded fallback mode
+public class DownloadRunnableFallback implements Runnable
+{
+	private final DownloadMission mMission;
+	//private int mId;
+	
+	public DownloadRunnableFallback(DownloadMission mission) {
+		if(mission == null) throw new NullPointerException("mission is null");
+		//mId = id;
+		mMission = mission;
+	}
+
+	@Override
+	public void run() {
+		try {
+			URL url = new URL(mMission.url);
+			HttpURLConnection conn = (HttpURLConnection) url.openConnection();
+			
+			if (conn.getResponseCode() != 200 && conn.getResponseCode() != 206) {
+				notifyError(DownloadMission.ERROR_SERVER_UNSUPPORTED);
+			} else {
+				RandomAccessFile f = new RandomAccessFile(mMission.location + "/" + mMission.name, "rw");
+				f.seek(0);
+				BufferedInputStream ipt = new BufferedInputStream(conn.getInputStream());
+				byte[] buf = new byte[512];
+				int len = 0;
+				
+				while ((len = ipt.read(buf, 0, 512)) != -1 && mMission.running) {
+					f.write(buf, 0, len);
+					notifyProgress(len);
+					
+					if (Thread.interrupted()) {
+						break;
+					}
+					
+				}
+				
+				f.close();
+				ipt.close();
+			}
+		} catch (Exception e) {
+			notifyError(DownloadMission.ERROR_UNKNOWN);
+		}
+		
+		if (mMission.errCode == -1 && mMission.running) {
+			notifyFinished();
+		}
+	}
+	
+	private void notifyProgress(final long len) {
+		synchronized (mMission) {
+			mMission.notifyProgress(len);
+		}
+	}
+	
+	private void notifyError(final int err) {
+		synchronized (mMission) {
+			mMission.notifyError(err);
+			mMission.pause();
+		}
+	}
+
+	private void notifyFinished() {
+		synchronized (mMission) {
+			mMission.notifyFinished();
+		}
+	}
+}

app/src/main/java/us/shandian/giga/get/sqlite/DownloadMissionSQLiteHelper.java

@@ -0,0 +1,102 @@
+package us.shandian.giga.get.sqlite;
+
+import android.content.ContentValues;
+import android.content.Context;
+import android.database.Cursor;
+import android.database.sqlite.SQLiteDatabase;
+import android.database.sqlite.SQLiteOpenHelper;
+
+import us.shandian.giga.get.DownloadMission;
+
+/**
+ * SqliteHelper to store {@link us.shandian.giga.get.DownloadMission}
+ */
+public class DownloadMissionSQLiteHelper extends SQLiteOpenHelper {
+
+
+    private final String TAG = "DownloadMissionHelper";
+
+    // TODO: use NewPipeSQLiteHelper ('s constants) when playlist branch is merged (?)
+    private static final String DATABASE_NAME = "downloads.db";
+
+    private static final int DATABASE_VERSION = 2;
+    /**
+     * The table name of download missions
+     */
+    static final String MISSIONS_TABLE_NAME = "download_missions";
+
+    /**
+     * The key to the directory location of the mission
+     */
+    static final String KEY_LOCATION = "location";
+    /**
+     * The key to the url of a mission
+     */
+    static final String KEY_URL = "url";
+    /**
+     * The key to the name of a mission
+     */
+    static final String KEY_NAME = "name";
+
+    /**
+     * The key to the done.
+     */
+    static final String KEY_DONE = "bytes_downloaded";
+
+    static final String KEY_TIMESTAMP = "timestamp";
+
+    /**
+     * The statement to create the table
+     */
+    private static final String MISSIONS_CREATE_TABLE =
+            "CREATE TABLE " + MISSIONS_TABLE_NAME + " (" +
+                    KEY_LOCATION + " TEXT NOT NULL, " +
+                    KEY_NAME + " TEXT NOT NULL, " +
+                    KEY_URL + " TEXT NOT NULL, " +
+                    KEY_DONE + " INTEGER NOT NULL, " +
+                    KEY_TIMESTAMP + " INTEGER NOT NULL, " +
+                    " UNIQUE(" + KEY_LOCATION + ", " + KEY_NAME + "));";
+
+
+    DownloadMissionSQLiteHelper(Context context) {
+        super(context, DATABASE_NAME, null, DATABASE_VERSION);
+    }
+
+    /**
+     * Returns all values of the download mission as ContentValues.
+     * @param downloadMission the download mission
+     * @return the content values
+     */
+    public static ContentValues getValuesOfMission(DownloadMission downloadMission) {
+        ContentValues values = new ContentValues();
+        values.put(KEY_URL, downloadMission.url);
+        values.put(KEY_LOCATION, downloadMission.location);
+        values.put(KEY_NAME, downloadMission.name);
+        values.put(KEY_DONE, downloadMission.done);
+        values.put(KEY_TIMESTAMP, downloadMission.timestamp);
+        return values;
+    }
+
+    @Override
+    public void onCreate(SQLiteDatabase db) {
+        db.execSQL(MISSIONS_CREATE_TABLE);
+    }
+
+    @Override
+    public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
+        // Currently nothing to do
+    }
+
+    public static DownloadMission getMissionFromCursor(Cursor cursor) {
+        if(cursor == null) throw new NullPointerException("cursor is null");
+        int pos;
+        String name = cursor.getString(cursor.getColumnIndexOrThrow(KEY_NAME));
+        String location = cursor.getString(cursor.getColumnIndexOrThrow(KEY_LOCATION));
+        String url = cursor.getString(cursor.getColumnIndexOrThrow(KEY_URL));
+        DownloadMission mission = new DownloadMission(name, url, location);
+        mission.done = cursor.getLong(cursor.getColumnIndexOrThrow(KEY_DONE));
+        mission.timestamp = cursor.getLong(cursor.getColumnIndexOrThrow(KEY_TIMESTAMP));
+        mission.finished = true;
+        return mission;
+    }
+}

app/src/main/java/us/shandian/giga/get/sqlite/SQLiteDownloadDataSource.java

@@ -0,0 +1,79 @@
+package us.shandian.giga.get.sqlite;
+
+import android.content.ContentValues;
+import android.content.Context;
+import android.database.Cursor;
+import android.database.sqlite.SQLiteDatabase;
+import android.util.Log;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import us.shandian.giga.get.DownloadDataSource;
+import us.shandian.giga.get.DownloadMission;
+
+import static us.shandian.giga.get.sqlite.DownloadMissionSQLiteHelper.KEY_LOCATION;
+import static us.shandian.giga.get.sqlite.DownloadMissionSQLiteHelper.KEY_NAME;
+import static us.shandian.giga.get.sqlite.DownloadMissionSQLiteHelper.MISSIONS_TABLE_NAME;
+
+
+/**
+ * Non-thread-safe implementation of {@link DownloadDataSource}
+ */
+public class SQLiteDownloadDataSource implements DownloadDataSource {
+
+    private static final String TAG = "DownloadDataSourceImpl";
+    private final DownloadMissionSQLiteHelper downloadMissionSQLiteHelper;
+
+    public SQLiteDownloadDataSource(Context context) {
+        downloadMissionSQLiteHelper = new DownloadMissionSQLiteHelper(context);
+    }
+
+    @Override
+    public List<DownloadMission> loadMissions() {
+        ArrayList<DownloadMission> result;
+        SQLiteDatabase database = downloadMissionSQLiteHelper.getReadableDatabase();
+        Cursor cursor = database.query(MISSIONS_TABLE_NAME, null, null,
+                null, null, null, DownloadMissionSQLiteHelper.KEY_TIMESTAMP);
+
+        int count = cursor.getCount();
+        if(count == 0) return new ArrayList<>();
+        result = new ArrayList<>(count);
+        while (cursor.moveToNext()) {
+            result.add(DownloadMissionSQLiteHelper.getMissionFromCursor(cursor));
+        }
+        return result;
+    }
+
+    @Override
+    public void addMission(DownloadMission downloadMission) {
+        if(downloadMission == null) throw new NullPointerException("downloadMission is null");
+        SQLiteDatabase database = downloadMissionSQLiteHelper.getWritableDatabase();
+        ContentValues values = DownloadMissionSQLiteHelper.getValuesOfMission(downloadMission);
+        database.insert(MISSIONS_TABLE_NAME, null, values);
+    }
+
+    @Override
+    public void updateMission(DownloadMission downloadMission) {
+        if(downloadMission == null) throw new NullPointerException("downloadMission is null");
+        SQLiteDatabase database = downloadMissionSQLiteHelper.getWritableDatabase();
+        ContentValues values = DownloadMissionSQLiteHelper.getValuesOfMission(downloadMission);
+        String whereClause = KEY_LOCATION+ " = ? AND " +
+                KEY_NAME + " = ?";
+        int rowsAffected = database.update(MISSIONS_TABLE_NAME, values,
+                whereClause, new String[]{downloadMission.location, downloadMission.name});
+        if(rowsAffected != 1) {
+            Log.e(TAG, "Expected 1 row to be affected by update but got " + rowsAffected);
+        }
+    }
+
+    @Override
+    public void deleteMission(DownloadMission downloadMission) {
+        if(downloadMission == null) throw new NullPointerException("downloadMission is null");
+        SQLiteDatabase database = downloadMissionSQLiteHelper.getWritableDatabase();
+        database.delete(MISSIONS_TABLE_NAME,
+                KEY_LOCATION + " = ? AND " +
+                KEY_NAME + " = ?",
+                new String[]{downloadMission.location, downloadMission.name});
+    }
+}

app/src/main/java/us/shandian/giga/service/DownloadManagerService.java

@@ -0,0 +1,270 @@
+package us.shandian.giga.service;
+
+import android.Manifest;
+import android.app.Notification;
+import android.app.PendingIntent;
+import android.app.Service;
+import android.content.Context;
+import android.content.Intent;
+import android.content.ServiceConnection;
+import android.graphics.drawable.BitmapDrawable;
+import android.graphics.drawable.Drawable;
+import android.net.Uri;
+import android.os.Binder;
+import android.os.Handler;
+import android.os.HandlerThread;
+import android.os.IBinder;
+import android.os.Message;
+import android.support.v4.app.NotificationCompat.Builder;
+import android.support.v4.content.PermissionChecker;
+import android.util.Log;
+import android.widget.Toast;
+
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.download.DownloadActivity;
+import org.schabi.newpipe.settings.NewPipeSettings;
+
+import java.util.ArrayList;
+
+import us.shandian.giga.get.DownloadDataSource;
+import us.shandian.giga.get.DownloadManager;
+import us.shandian.giga.get.DownloadManagerImpl;
+import us.shandian.giga.get.DownloadMission;
+import us.shandian.giga.get.sqlite.SQLiteDownloadDataSource;
+
+import static org.schabi.newpipe.BuildConfig.DEBUG;
+
+public class DownloadManagerService extends Service
+{
+
+	private static final String TAG = DownloadManagerService.class.getSimpleName();
+
+	/**
+	 * Message code of update messages stored as {@link Message#what}.
+	 */
+	private static final int UPDATE_MESSAGE = 0;
+	private static final int NOTIFICATION_ID = 1000;
+	private static final String EXTRA_NAME = "DownloadManagerService.extra.name";
+	private static final String EXTRA_LOCATION = "DownloadManagerService.extra.location";
+	private static final String EXTRA_IS_AUDIO = "DownloadManagerService.extra.is_audio";
+	private static final String EXTRA_THREADS = "DownloadManagerService.extra.threads";
+
+
+	private DMBinder mBinder;
+	private DownloadManager mManager;
+	private Notification mNotification;
+	private Handler mHandler;
+	private long mLastTimeStamp = System.currentTimeMillis();
+	private DownloadDataSource mDataSource;
+
+
+
+	private MissionListener missionListener = new MissionListener();
+
+
+	private void notifyMediaScanner(DownloadMission mission) {
+		Uri uri = Uri.parse("file://" + mission.location + "/" + mission.name);
+		// notify media scanner on downloaded media file ...
+		sendBroadcast(new Intent(Intent.ACTION_MEDIA_SCANNER_SCAN_FILE, uri));
+	}
+
+	@Override
+	public void onCreate() {
+		super.onCreate();
+
+		if (DEBUG) {
+			Log.d(TAG, "onCreate");
+		}
+
+		mBinder = new DMBinder();
+		if(mDataSource == null) {
+			mDataSource = new SQLiteDownloadDataSource(this);
+		}
+		if (mManager == null) {
+			ArrayList<String> paths = new ArrayList<>(2);
+			paths.add(NewPipeSettings.getVideoDownloadPath(this));
+			paths.add(NewPipeSettings.getAudioDownloadPath(this));
+			mManager = new DownloadManagerImpl(paths, mDataSource);
+			if (DEBUG) {
+				Log.d(TAG, "mManager == null");
+				Log.d(TAG, "Download directory: " + paths);
+			}
+		}
+
+		Intent i = new Intent();
+		i.setAction(Intent.ACTION_MAIN);
+		i.setClass(this, DownloadActivity.class);
+
+		Drawable icon = this.getResources().getDrawable(R.mipmap.ic_launcher);
+
+		Builder builder = new Builder(this)
+				.setContentIntent(PendingIntent.getActivity(this, 0, i, 0))
+				.setSmallIcon(android.R.drawable.stat_sys_download)
+				.setLargeIcon(((BitmapDrawable) icon).getBitmap())
+				.setContentTitle(getString(R.string.msg_running))
+				.setContentText(getString(R.string.msg_running_detail));
+
+		PendingIntent pendingIntent =
+				PendingIntent.getActivity(
+						this,
+						0,
+						new Intent(this, DownloadActivity.class)
+								.setAction(DownloadActivity.INTENT_LIST),
+						PendingIntent.FLAG_UPDATE_CURRENT
+				);
+
+		builder.setContentIntent(pendingIntent);
+
+		mNotification = builder.build();
+
+		HandlerThread thread = new HandlerThread("ServiceMessenger");
+		thread.start();
+			
+		mHandler = new Handler(thread.getLooper()) {
+			@Override
+			public void handleMessage(Message msg) {
+				switch (msg.what) {
+					case UPDATE_MESSAGE: {
+						int runningCount = 0;
+
+						for (int i = 0; i < mManager.getCount(); i++) {
+							if (mManager.getMission(i).running) {
+								runningCount++;
+							}
+						}
+						updateState(runningCount);
+						break;
+					}
+				}
+			}
+		};
+		
+	}
+
+	private void startMissionAsync(final String url, final String location, final String name,
+								   final boolean isAudio, final int threads) {
+		mHandler.post(new Runnable() {
+			@Override
+			public void run() {
+				int missionId = mManager.startMission(url, location, name, isAudio, threads);
+				mBinder.onMissionAdded(mManager.getMission(missionId));
+			}
+		});
+	}
+
+	@Override
+	public int onStartCommand(Intent intent, int flags, int startId) {
+		if (DEBUG) {
+			Log.d(TAG, "Starting");
+		}
+		Log.i(TAG, "Got intent: " + intent);
+		String action = intent.getAction();
+		if(action != null && action.equals(Intent.ACTION_RUN)) {
+			String name = intent.getStringExtra(EXTRA_NAME);
+			String location = intent.getStringExtra(EXTRA_LOCATION);
+			int threads = intent.getIntExtra(EXTRA_THREADS, 1);
+			boolean isAudio = intent.getBooleanExtra(EXTRA_IS_AUDIO, false);
+			String url = intent.getDataString();
+			startMissionAsync(url, location, name, isAudio, threads);
+		}
+		return START_NOT_STICKY;
+	}
+
+	@Override
+	public void onDestroy() {
+		super.onDestroy();
+		
+		if (DEBUG) {
+			Log.d(TAG, "Destroying");
+		}
+		
+		for (int i = 0; i < mManager.getCount(); i++) {
+			mManager.pauseMission(i);
+		}
+
+		stopForeground(true);
+	}
+	
+	@Override
+	public IBinder onBind(Intent intent) {
+		int permissionCheck;
+		if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.JELLY_BEAN) {
+			permissionCheck = PermissionChecker.checkSelfPermission(this, Manifest.permission.READ_EXTERNAL_STORAGE);
+			if(permissionCheck == PermissionChecker.PERMISSION_DENIED) {
+				Toast.makeText(this, "Permission denied (read)", Toast.LENGTH_SHORT).show();
+			}
+		}
+
+		permissionCheck = PermissionChecker.checkSelfPermission(this, Manifest.permission.WRITE_EXTERNAL_STORAGE);
+		if(permissionCheck == PermissionChecker.PERMISSION_DENIED) {
+			Toast.makeText(this, "Permission denied (write)", Toast.LENGTH_SHORT).show();
+		}
+
+		return mBinder;
+	}
+
+	private void postUpdateMessage() {
+		mHandler.sendEmptyMessage(UPDATE_MESSAGE);
+	}
+	
+	private void updateState(int runningCount) {
+		if (runningCount == 0) {
+			stopForeground(true);
+		} else {
+			startForeground(NOTIFICATION_ID, mNotification);
+		}
+	}
+
+	public static void startMission(Context context, String url, String location, String name, boolean isAudio, int threads) {
+		Intent intent = new Intent(context, DownloadManagerService.class);
+		intent.setAction(Intent.ACTION_RUN);
+		intent.setData(Uri.parse(url));
+		intent.putExtra(EXTRA_NAME, name);
+		intent.putExtra(EXTRA_LOCATION, location);
+		intent.putExtra(EXTRA_IS_AUDIO, isAudio);
+		intent.putExtra(EXTRA_THREADS, threads);
+		context.startService(intent);
+	}
+
+
+	class MissionListener implements DownloadMission.MissionListener {
+		@Override
+		public void onProgressUpdate(DownloadMission downloadMission, long done, long total) {
+			long now = System.currentTimeMillis();
+			long delta = now - mLastTimeStamp;
+			if (delta > 2000) {
+				postUpdateMessage();
+				mLastTimeStamp = now;
+			}
+		}
+
+		@Override
+		public void onFinish(DownloadMission downloadMission) {
+			postUpdateMessage();
+			notifyMediaScanner(downloadMission);
+		}
+
+		@Override
+		public void onError(DownloadMission downloadMission, int errCode) {
+			postUpdateMessage();
+		}
+	}
+
+
+	// Wrapper of DownloadManager
+	public class DMBinder extends Binder {
+		public DownloadManager getDownloadManager() {
+			return mManager;
+		}
+		
+		public void onMissionAdded(DownloadMission mission) {
+			mission.addListener(missionListener);
+			postUpdateMessage();
+		}
+		
+		public void onMissionRemoved(DownloadMission mission) {
+			mission.removeListener(missionListener);
+			postUpdateMessage();
+		}
+	}
+}

app/src/main/java/us/shandian/giga/ui/adapter/MissionAdapter.java

@@ -0,0 +1,375 @@
+package us.shandian.giga.ui.adapter;
+
+import android.app.ProgressDialog;
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+import android.os.AsyncTask;
+import android.os.Build;
+import android.support.v4.content.FileProvider;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import android.webkit.MimeTypeMap;
+import android.widget.ImageView;
+import android.widget.PopupMenu;
+import android.widget.TextView;
+
+import android.support.v7.widget.RecyclerView;
+
+import java.io.File;
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Map;
+
+import org.schabi.newpipe.R;
+import us.shandian.giga.get.DownloadManager;
+import us.shandian.giga.get.DownloadMission;
+import us.shandian.giga.service.DownloadManagerService;
+import us.shandian.giga.ui.common.ProgressDrawable;
+import us.shandian.giga.util.Utility;
+
+import static android.content.Intent.FLAG_GRANT_PREFIX_URI_PERMISSION;
+import static android.content.Intent.FLAG_GRANT_READ_URI_PERMISSION;
+
+public class MissionAdapter extends RecyclerView.Adapter<MissionAdapter.ViewHolder>
+{
+	private static final Map<Integer, String> ALGORITHMS = new HashMap<>();
+	private static final String TAG = "MissionAdapter";
+
+	static {
+		ALGORITHMS.put(R.id.md5, "MD5");
+		ALGORITHMS.put(R.id.sha1, "SHA1");
+	}
+	
+	private Context mContext;
+	private LayoutInflater mInflater;
+	private DownloadManager mManager;
+	private DownloadManagerService.DMBinder mBinder;
+	private int mLayout;
+	
+	public MissionAdapter(Context context, DownloadManagerService.DMBinder binder, DownloadManager manager, boolean isLinear) {
+		mContext = context;
+		mManager = manager;
+		mBinder = binder;
+		
+		mInflater = (LayoutInflater) mContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+		
+		mLayout = isLinear ? R.layout.mission_item_linear : R.layout.mission_item;
+	}
+
+	@Override
+	public MissionAdapter.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+		final ViewHolder h =  new ViewHolder(mInflater.inflate(mLayout, parent, false));
+		
+		h.menu.setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				buildPopup(h);
+			}
+		});
+		
+		/*h.itemView.setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				showDetail(h);
+			}
+		});*/
+		
+		return h;
+	}
+
+	@Override
+	public void onViewRecycled(MissionAdapter.ViewHolder h) {
+		super.onViewRecycled(h);
+		h.mission.removeListener(h.observer);
+		h.mission = null;
+		h.observer = null;
+		h.progress = null;
+		h.position = -1;
+		h.lastTimeStamp = -1;
+		h.lastDone = -1;
+		h.colorId = 0;
+	}
+
+	@Override
+	public void onBindViewHolder(MissionAdapter.ViewHolder h, int pos) {
+		DownloadMission ms = mManager.getMission(pos);
+		h.mission = ms;
+		h.position = pos;
+		
+		Utility.FileType type = Utility.getFileType(ms.name);
+		
+		h.icon.setImageResource(Utility.getIconForFileType(type));
+		h.name.setText(ms.name);
+		h.size.setText(Utility.formatBytes(ms.length));
+		
+		h.progress = new ProgressDrawable(mContext, Utility.getBackgroundForFileType(type), Utility.getForegroundForFileType(type));
+		h.bkg.setBackgroundDrawable(h.progress);
+		
+		h.observer = new MissionObserver(this, h);
+		ms.addListener(h.observer);
+		
+		updateProgress(h);
+	}
+
+	@Override
+	public int getItemCount() {
+		return mManager.getCount();
+	}
+
+	@Override
+	public long getItemId(int position) {
+		return position;
+	}
+	
+	private void updateProgress(ViewHolder h) {
+		updateProgress(h, false);
+	}
+	
+	private void updateProgress(ViewHolder h, boolean finished) {
+		if (h.mission == null) return;
+		
+		long now = System.currentTimeMillis();
+		
+		if (h.lastTimeStamp == -1) {
+			h.lastTimeStamp = now;
+		}
+		
+		if (h.lastDone == -1) {
+			h.lastDone = h.mission.done;
+		}
+		
+		long deltaTime = now - h.lastTimeStamp;
+		long deltaDone = h.mission.done - h.lastDone;
+		
+		if (deltaTime == 0 || deltaTime > 1000 || finished) {
+			if (h.mission.errCode > 0) {
+				h.status.setText(R.string.msg_error);
+			} else {
+				float progress = (float) h.mission.done / h.mission.length;
+				h.status.setText(String.format(Locale.US, "%.2f%%", progress * 100));
+				h.progress.setProgress(progress);
+			}
+		}
+		
+		if (deltaTime > 1000 && deltaDone > 0) {
+			float speed = (float) deltaDone / deltaTime;
+			String speedStr = Utility.formatSpeed(speed * 1000);
+			String sizeStr = Utility.formatBytes(h.mission.length);
+			
+			h.size.setText(sizeStr + " " + speedStr);
+			
+			h.lastTimeStamp = now;
+			h.lastDone = h.mission.done;
+		}
+	}
+	
+
+	private void buildPopup(final ViewHolder h) {
+		PopupMenu popup = new PopupMenu(mContext, h.menu);
+		popup.inflate(R.menu.mission);
+		
+		Menu menu = popup.getMenu();
+		MenuItem start = menu.findItem(R.id.start);
+		MenuItem pause = menu.findItem(R.id.pause);
+		MenuItem view = menu.findItem(R.id.view);
+		MenuItem delete = menu.findItem(R.id.delete);
+		MenuItem checksum = menu.findItem(R.id.checksum);
+		
+		// Set to false first
+		start.setVisible(false);
+		pause.setVisible(false);
+		view.setVisible(false);
+		delete.setVisible(false);
+		checksum.setVisible(false);
+		
+		if (!h.mission.finished) {
+			if (!h.mission.running) {
+				if (h.mission.errCode == -1) {
+					start.setVisible(true);
+				}
+				
+				delete.setVisible(true);
+			} else {
+				pause.setVisible(true);
+			}
+		} else {
+			view.setVisible(true);
+			delete.setVisible(true);
+			checksum.setVisible(true);
+		}
+		
+		popup.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
+			@Override
+			public boolean onMenuItemClick(MenuItem item) {
+				int id = item.getItemId();
+				switch (id) {
+					case R.id.start:
+						mManager.resumeMission(h.position);
+						mBinder.onMissionAdded(mManager.getMission(h.position));
+						return true;
+					case R.id.pause:
+						mManager.pauseMission(h.position);
+						mBinder.onMissionRemoved(mManager.getMission(h.position));
+						h.lastTimeStamp = -1;
+						h.lastDone = -1;
+						return true;
+					case R.id.view:
+						File f = new File(h.mission.location, h.mission.name);
+						String ext = Utility.getFileExt(h.mission.name);
+
+						Log.d(TAG, "Viewing file: " + f.getAbsolutePath() + " ext: " + ext);
+
+						if (ext == null) {
+							Log.w(TAG, "Can't view file because it has no extension: " +
+									h.mission.name);
+							return false;
+						}
+						
+						String mime = MimeTypeMap.getSingleton().getMimeTypeFromExtension(ext.substring(1));
+						Log.v(TAG, "Mime: " + mime + " package: " + mContext.getApplicationContext().getPackageName() + ".provider");
+						if (f.exists()) {
+							viewFileWithFileProvider(f, mime);
+						} else {
+							Log.w(TAG, "File doesn't exist");
+						}
+						
+						return true;
+					case R.id.delete:
+						mManager.deleteMission(h.position);
+						notifyDataSetChanged();
+						return true;
+					case R.id.md5:
+					case R.id.sha1:
+						DownloadMission mission = mManager.getMission(h.position);
+						new ChecksumTask().execute(mission.location + "/" + mission.name, ALGORITHMS.get(id));
+						return true;
+					default:
+						return false;
+				}
+			}
+		});
+		
+		popup.show();
+	}
+
+	private void viewFile(File file, String mimetype) {
+		Intent intent = new Intent();
+		intent.setAction(Intent.ACTION_VIEW);
+		intent.setDataAndType(Uri.fromFile(file), mimetype);
+		intent.addFlags(FLAG_GRANT_READ_URI_PERMISSION);
+		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+			intent.addFlags(FLAG_GRANT_PREFIX_URI_PERMISSION);
+		}
+		//mContext.grantUriPermission(packageName, uri, Intent.FLAG_GRANT_READ_URI_PERMISSION);
+		Log.v(TAG, "Starting intent: " + intent);
+		mContext.startActivity(intent);
+	}
+
+	private void viewFileWithFileProvider(File file, String mimetype) {
+		String ourPackage = mContext.getApplicationContext().getPackageName();
+		Uri uri = FileProvider.getUriForFile(mContext,  ourPackage + ".provider", file);
+		Intent intent = new Intent();
+		intent.setAction(Intent.ACTION_VIEW);
+		intent.setDataAndType(uri, mimetype);
+		intent.addFlags(FLAG_GRANT_READ_URI_PERMISSION);
+		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+			intent.addFlags(FLAG_GRANT_PREFIX_URI_PERMISSION);
+		}
+		//mContext.grantUriPermission(packageName, uri, Intent.FLAG_GRANT_READ_URI_PERMISSION);
+		Log.v(TAG, "Starting intent: " + intent);
+		mContext.startActivity(intent);
+	}
+	
+	private class ChecksumTask extends AsyncTask<String, Void, String> {
+		ProgressDialog prog;
+
+		@Override
+		protected void onPreExecute() {
+			super.onPreExecute();
+			
+			// Create dialog
+			prog = new ProgressDialog(mContext);
+			prog.setCancelable(false);
+			prog.setMessage(mContext.getString(R.string.msg_wait));
+			prog.show();
+		}
+
+		@Override
+		protected String doInBackground(String... params) {
+			return Utility.checksum(params[0], params[1]);
+		}
+
+		@Override
+		protected void onPostExecute(String result) {
+			super.onPostExecute(result);
+			prog.dismiss();
+			Utility.copyToClipboard(mContext, result);
+		}
+	}
+	
+	static class ViewHolder extends RecyclerView.ViewHolder {
+		public DownloadMission mission;
+		public int position;
+
+		public TextView status;
+		public ImageView icon;
+		public TextView name;
+		public TextView size;
+		public View bkg;
+		public ImageView menu;
+		public ProgressDrawable progress;
+		public MissionObserver observer;
+
+		public long lastTimeStamp = -1;
+		public long lastDone = -1;
+		public int colorId;
+		
+		public ViewHolder(View v) {
+			super(v);
+			
+			status = Utility.findViewById(v, R.id.item_status);
+			icon = Utility.findViewById(v, R.id.item_icon);
+			name = Utility.findViewById(v, R.id.item_name);
+			size = Utility.findViewById(v, R.id.item_size);
+			bkg = Utility.findViewById(v, R.id.item_bkg);
+			menu = Utility.findViewById(v, R.id.item_more);
+		}
+	}
+	
+	static class MissionObserver implements DownloadMission.MissionListener {
+		private MissionAdapter mAdapter;
+		private ViewHolder mHolder;
+		
+		public MissionObserver(MissionAdapter adapter, ViewHolder holder) {
+			mAdapter = adapter;
+			mHolder = holder;
+		}
+		
+		@Override
+		public void onProgressUpdate(DownloadMission downloadMission, long done, long total) {
+			mAdapter.updateProgress(mHolder);
+		}
+
+		@Override
+		public void onFinish(DownloadMission downloadMission) {
+			//mAdapter.mManager.deleteMission(mHolder.position);
+			// TODO Notification
+			//mAdapter.notifyDataSetChanged();
+			if (mHolder.mission != null) {
+				mHolder.size.setText(Utility.formatBytes(mHolder.mission.length));
+				mAdapter.updateProgress(mHolder, true);
+			}
+		}
+
+		@Override
+		public void onError(DownloadMission downloadMission, int errCode) {
+			mAdapter.updateProgress(mHolder);
+		}
+		
+	}
+}

app/src/main/java/us/shandian/giga/ui/common/ProgressDrawable.java

@@ -0,0 +1,58 @@
+package us.shandian.giga.ui.common;
+
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.ColorFilter;
+import android.graphics.Paint;
+import android.graphics.PixelFormat;
+import android.graphics.drawable.Drawable;
+
+public class ProgressDrawable extends Drawable
+{
+	private float mProgress;
+	private int mBackgroundColor, mForegroundColor;
+	
+	public ProgressDrawable(Context context, int background, int foreground) {
+		this(context.getResources().getColor(background), context.getResources().getColor(foreground));
+	}
+	
+	public ProgressDrawable(int background, int foreground) {
+		mBackgroundColor = background;
+		mForegroundColor = foreground;
+	}
+	
+	public void setProgress(float progress) {
+		mProgress = progress;
+		invalidateSelf();
+	}
+
+	@Override
+	public void draw(Canvas canvas) {
+		int width = canvas.getWidth();
+		int height = canvas.getHeight();
+		
+		Paint paint = new Paint();
+		
+		paint.setColor(mBackgroundColor);
+		canvas.drawRect(0, 0, width, height, paint);
+		
+		paint.setColor(mForegroundColor);
+		canvas.drawRect(0, 0, (int) (mProgress * width), height, paint);
+	}
+
+	@Override
+	public void setAlpha(int alpha) {
+		// Unsupported
+	}
+
+	@Override
+	public void setColorFilter(ColorFilter filter) {
+		// Unsupported
+	}
+
+	@Override
+	public int getOpacity() {
+		return PixelFormat.OPAQUE;
+	}
+
+}

app/src/main/java/us/shandian/giga/ui/common/ToolbarActivity.java

@@ -0,0 +1,26 @@
+package us.shandian.giga.ui.common;
+
+import android.os.Bundle;
+
+import android.support.v7.app.ActionBarActivity;
+import android.support.v7.widget.Toolbar;
+
+import org.schabi.newpipe.R;
+import us.shandian.giga.util.Utility;
+
+public abstract class ToolbarActivity extends ActionBarActivity
+{
+	protected Toolbar mToolbar;
+
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		setContentView(getLayoutResource());
+		
+		mToolbar = Utility.findViewById(this, R.id.toolbar);
+		
+		setSupportActionBar(mToolbar);
+	}
+	
+	protected abstract int getLayoutResource();
+}

app/src/main/java/us/shandian/giga/ui/fragment/AllMissionsFragment.java

@@ -0,0 +1,13 @@
+package us.shandian.giga.ui.fragment;
+
+import us.shandian.giga.get.DownloadManager;
+import us.shandian.giga.service.DownloadManagerService;
+
+public class AllMissionsFragment extends MissionsFragment
+{
+
+	@Override
+	protected DownloadManager setupDownloadManager(DownloadManagerService.DMBinder binder) {
+		return binder.getDownloadManager();
+	}
+}

app/src/main/java/us/shandian/giga/ui/fragment/MissionsFragment.java

@@ -0,0 +1,148 @@
+package us.shandian.giga.ui.fragment;
+
+import android.app.Activity;
+import android.app.Fragment;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.ServiceConnection;
+import android.content.SharedPreferences;
+import android.os.Bundle;
+import android.os.IBinder;
+import android.preference.PreferenceManager;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.MenuInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import android.support.v7.widget.GridLayoutManager;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+
+import org.schabi.newpipe.R;
+import us.shandian.giga.get.DownloadManager;
+import us.shandian.giga.service.DownloadManagerService;
+import us.shandian.giga.ui.adapter.MissionAdapter;
+import us.shandian.giga.util.Utility;
+
+public abstract class MissionsFragment extends Fragment
+{
+	private DownloadManager mManager;
+	private DownloadManagerService.DMBinder mBinder;
+	
+	private SharedPreferences mPrefs;
+	private boolean mLinear;
+	private MenuItem mSwitch;
+	
+	private RecyclerView mList;
+	private MissionAdapter mAdapter;
+	private GridLayoutManager mGridManager;
+	private LinearLayoutManager mLinearManager;
+	private Context mActivity;
+	
+	private ServiceConnection mConnection = new ServiceConnection() {
+
+		@Override
+		public void onServiceConnected(ComponentName name, IBinder binder) {
+			mBinder = (DownloadManagerService.DMBinder) binder;
+			mManager = setupDownloadManager(mBinder);
+			updateList();
+		}
+
+		@Override
+		public void onServiceDisconnected(ComponentName name) {
+			// What to do?
+		}
+
+		
+	};
+
+	@Override
+	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+		View v = inflater.inflate(R.layout.missions, container, false);
+
+		mPrefs = PreferenceManager.getDefaultSharedPreferences(getActivity());
+		mLinear = mPrefs.getBoolean("linear", false);
+
+		// Bind the service
+		Intent i = new Intent();
+		i.setClass(getActivity(), DownloadManagerService.class);
+		getActivity().bindService(i, mConnection, Context.BIND_AUTO_CREATE);
+		
+		// Views
+		mList = Utility.findViewById(v, R.id.mission_recycler);
+		
+		// Init
+		mGridManager = new GridLayoutManager(getActivity(), 2);
+		mLinearManager = new LinearLayoutManager(getActivity());
+		mList.setLayoutManager(mGridManager);
+		
+		setHasOptionsMenu(true);
+		
+		return v;
+	}
+
+	/** Added in API level 23. */
+    @Override
+	public void onAttach(Context activity) {
+		super.onAttach(activity);
+
+		// Bug: in api< 23 this is never called
+		// so mActivity=null
+		// so app crashes with nullpointer exception
+		mActivity = activity;
+	}
+
+	/** deprecated in API level 23,
+	 * but must remain to allow compatibility with api<23 */
+	@Override
+	public void onAttach(Activity activity) {
+		super.onAttach(activity);
+
+		mActivity = activity;
+	}
+
+	@Override
+	public void onDestroyView() {
+		super.onDestroyView();
+		getActivity().unbindService(mConnection);
+	}
+
+	@Override
+	public boolean onOptionsItemSelected(MenuItem item) {
+		switch (item.getItemId()) {
+			case R.id.switch_mode:
+				mLinear = !mLinear;
+				updateList();
+				return true;
+			default:
+				return super.onOptionsItemSelected(item);
+		}
+	}
+
+	public void notifyChange() {
+		mAdapter.notifyDataSetChanged();
+	}
+	
+	private void updateList() {
+		mAdapter = new MissionAdapter(mActivity, mBinder, mManager, mLinear);
+		
+		if (mLinear) {
+			mList.setLayoutManager(mLinearManager);
+		} else {
+			mList.setLayoutManager(mGridManager);
+		}
+		
+		mList.setAdapter(mAdapter);
+		
+		if (mSwitch != null) {
+			mSwitch.setIcon(mLinear ? R.drawable.grid : R.drawable.list);
+		}
+		
+		mPrefs.edit().putBoolean("linear", mLinear).commit();
+	}
+	
+	protected abstract DownloadManager setupDownloadManager(DownloadManagerService.DMBinder binder);
+}

app/src/main/java/us/shandian/giga/util/CrashHandler.java

@@ -0,0 +1,85 @@
+package us.shandian.giga.util;
+
+import android.content.Context;
+import android.content.pm.PackageInfo;
+import android.os.Build;
+import android.os.Environment;
+
+import java.io.File;
+import java.io.PrintWriter;
+
+//todo: replace this by using the internal crash handler of newpipe
+public class CrashHandler implements Thread.UncaughtExceptionHandler
+{
+	public static final String CRASH_DIR = Environment.getExternalStorageDirectory().getPath() + "/GigaCrash/";
+	public static final String CRASH_LOG = CRASH_DIR + "last_crash.log";
+	public static final String CRASH_TAG = CRASH_DIR + ".crashed";
+
+	private static String ANDROID = Build.VERSION.RELEASE;
+	private static String MODEL = Build.MODEL;
+	private static String MANUFACTURER = Build.MANUFACTURER;
+
+	public static String VERSION = "Unknown";
+
+	private Thread.UncaughtExceptionHandler mPrevious;
+
+	public static void init(Context context) {
+		try {
+			PackageInfo info = context.getPackageManager().getPackageInfo(context.getPackageName(), 0);
+			VERSION = info.versionName + info.versionCode;
+		} catch (Exception e) {
+			throw new RuntimeException(e);
+		}
+	}
+
+	public static void register() {
+		new CrashHandler();
+	}
+
+	private CrashHandler() {
+		mPrevious = Thread.currentThread().getUncaughtExceptionHandler();
+		Thread.currentThread().setUncaughtExceptionHandler(this);
+	}
+
+	@Override
+	public void uncaughtException(Thread thread, Throwable throwable) {
+		File f = new File(CRASH_LOG);
+		if (f.exists()) {
+			f.delete();
+		} else {
+			try {
+				new File(CRASH_DIR).mkdirs();
+				f.createNewFile();
+			} catch (Exception e) {
+				return;
+			}
+		}
+
+		PrintWriter p;
+		try {
+			p = new PrintWriter(f);
+		} catch (Exception e) {
+			return;
+		}
+
+		p.write("Android Version: " + ANDROID + "\n");
+		p.write("Device Model: " + MODEL + "\n");
+		p.write("Device Manufacturer: " + MANUFACTURER + "\n");
+		p.write("App Version: " + VERSION + "\n");
+		p.write("*********************\n");
+		throwable.printStackTrace(p);
+
+		p.close();
+
+		try {
+			new File(CRASH_TAG).createNewFile();
+		} catch (Exception e) {
+			return;
+		}
+
+		if (mPrevious != null) {
+			mPrevious.uncaughtException(thread, throwable);
+		}
+	}
+}
+

app/src/main/java/us/shandian/giga/util/Utility.java

@@ -0,0 +1,256 @@
+package us.shandian.giga.util;
+
+import android.app.Activity;
+import android.content.ClipboardManager;
+import android.content.ClipData;
+import android.content.Context;
+import android.content.Intent;
+import android.view.View;
+import android.widget.Toast;
+
+import java.io.BufferedInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+
+import org.schabi.newpipe.settings.NewPipeSettings;
+import org.schabi.newpipe.R;
+
+import com.nononsenseapps.filepicker.FilePickerActivity;
+import com.nononsenseapps.filepicker.AbstractFilePickerFragment;
+
+public class Utility
+{
+	
+	public static enum FileType {
+		VIDEO,
+		MUSIC,
+		UNKNOWN
+	}
+	
+	public static String formatBytes(long bytes) {
+		if (bytes < 1024) {
+			return String.format("%d B", bytes);
+		} else if (bytes < 1024 * 1024) {
+			return String.format("%.2f kB", (float) bytes / 1024);
+		} else if (bytes < 1024 * 1024 * 1024) {
+			return String.format("%.2f MB", (float) bytes / 1024 / 1024);
+		} else {
+			return String.format("%.2f GB", (float) bytes / 1024 / 1024 / 1024);
+		}
+	}
+	
+	public static String formatSpeed(float speed) {
+		if (speed < 1024) {
+			return String.format("%.2f B/s", speed);
+		} else if (speed < 1024 * 1024) {
+			return String.format("%.2f kB/s", speed / 1024);
+		} else if (speed < 1024 * 1024 * 1024) {
+			return String.format("%.2f MB/s", speed / 1024 / 1024);
+		} else {
+			return String.format("%.2f GB/s", speed / 1024 / 1024 / 1024);
+		}
+	}
+	
+	public static void writeToFile(String fileName, String content) {
+		try {
+			writeToFile(fileName, content.getBytes("UTF-8"));
+		} catch (Exception e) {
+			
+		}
+	}
+	
+	public static void writeToFile(String fileName, byte[] content) {
+		File f = new File(fileName);
+		
+		if (!f.exists()) {
+			try {
+				f.createNewFile();
+			} catch (Exception e) {
+				
+			}
+		}
+		
+		try {
+			FileOutputStream opt = new FileOutputStream(f, false);
+			opt.write(content, 0, content.length);
+			opt.close();
+		} catch (Exception e) {
+			
+		}
+	}
+	
+	public static String readFromFile(String file) {
+		try {
+			File f = new File(file);
+			
+			if (!f.exists() || !f.canRead()) {
+				return null;
+			}
+			
+			BufferedInputStream ipt = new BufferedInputStream(new FileInputStream(f));
+			
+			byte[] buf = new byte[512];
+			StringBuilder sb = new StringBuilder();
+			
+			while (ipt.available() > 0) {
+				int len = ipt.read(buf, 0, 512);
+				sb.append(new String(buf, 0, len, "UTF-8"));
+			}
+			
+			ipt.close();
+			return sb.toString();
+		} catch (Exception e) {
+			return null;
+		}
+	}
+	
+	public static <T> T findViewById(View v, int id) {
+		return (T) v.findViewById(id);
+	}
+	
+	public static <T> T findViewById(Activity activity, int id) {
+		return (T) activity.findViewById(id);
+	}
+	
+	public static String getFileExt(String url) {
+		if (url.indexOf("?")>-1) {
+			url = url.substring(0,url.indexOf("?"));
+		}
+		if (url.lastIndexOf(".") == -1) {
+			return null;
+		} else {
+			String ext = url.substring(url.lastIndexOf(".") );
+			if (ext.indexOf("%")>-1) {
+				ext = ext.substring(0,ext.indexOf("%"));
+			}
+			if (ext.indexOf("/")>-1) {
+				ext = ext.substring(0,ext.indexOf("/"));
+			}
+			return ext.toLowerCase();
+
+		}
+	}
+
+	public static FileType getFileType(String file) {
+		if (file.endsWith(".mp3") || file.endsWith(".wav") || file.endsWith(".flac") || file.endsWith(".m4a")) {
+			return FileType.MUSIC;
+		} else if (file.endsWith(".mp4") || file.endsWith(".mpeg") || file.endsWith(".rm") || file.endsWith(".rmvb")
+					|| file.endsWith(".flv") || file.endsWith(".webp") || file.endsWith(".webm")) {
+			return FileType.VIDEO;
+		} else {
+			return FileType.UNKNOWN;
+		}
+	}
+
+	public static Boolean isMusicFile(String file)
+	{
+		 return Utility.getFileType(file) == FileType.MUSIC;
+	}
+
+	public static Boolean isVideoFile(String file)
+	{
+		return Utility.getFileType(file) == FileType.VIDEO;
+	}
+	
+	public static int getBackgroundForFileType(FileType type) {
+		switch (type) {
+			case MUSIC:
+				return R.color.audio_left_to_load_color;
+			case VIDEO:
+				return R.color.video_left_to_load_color;
+			default:
+				return R.color.gray;
+		}
+	}
+	
+	public static int getForegroundForFileType(FileType type) {
+		switch (type) {
+			case MUSIC:
+				return R.color.audio_already_load_color;
+			case VIDEO:
+				return R.color.video_already_load_color;
+			default:
+				return R.color.gray;
+		}
+	}
+
+	public static int getIconForFileType(FileType type) {
+		switch(type) {
+			case MUSIC:
+				return R.drawable.music;
+			case VIDEO:
+				return R.drawable.video;
+			default:
+				return R.drawable.video;
+		}
+	}
+
+	public static boolean isDirectoryAvailble(String path) {
+		File dir = new File(path);
+		return dir.exists() && dir.isDirectory();
+	}
+
+	public static boolean isDownloadDirectoryAvailble(Context context) {
+		return isDirectoryAvailble(NewPipeSettings.getVideoDownloadPath(context));
+	}
+
+	public static void showDirectoryChooser(Activity activity) {
+		Intent i = new Intent(activity, FilePickerActivity.class);
+		i.setAction(Intent.ACTION_GET_CONTENT);
+		i.putExtra(FilePickerActivity.EXTRA_ALLOW_MULTIPLE, false);
+		i.putExtra(FilePickerActivity.EXTRA_ALLOW_CREATE_DIR, true);
+		i.putExtra(FilePickerActivity.EXTRA_MODE, AbstractFilePickerFragment.MODE_DIR);
+		activity.startActivityForResult(i, 233);
+	}
+	
+	public static void copyToClipboard(Context context, String str) {
+		ClipboardManager cm = (ClipboardManager) context.getSystemService(Context.CLIPBOARD_SERVICE);
+		cm.setPrimaryClip(ClipData.newPlainText("text", str));
+		Toast.makeText(context, R.string.msg_copied, Toast.LENGTH_SHORT).show();
+	}
+	
+	public static String checksum(String path, String algorithm) {
+		MessageDigest md = null;
+		
+		try {
+			md = MessageDigest.getInstance(algorithm);
+		} catch (NoSuchAlgorithmException e) {
+			throw new RuntimeException(e);
+		}
+		
+		FileInputStream i = null;
+		
+		try {
+			i = new FileInputStream(path);
+		} catch (FileNotFoundException e) {
+			throw new RuntimeException(e);
+		}
+		
+		byte[] buf = new byte[1024];
+		int len = 0;
+		
+		try {
+			while ((len = i.read(buf)) != -1) {
+				md.update(buf, 0, len);
+			}
+		} catch (IOException e) {
+			
+		}
+		
+		byte[] digest = md.digest();
+		
+		// HEX
+		StringBuilder sb = new StringBuilder();
+		for (byte b : digest) {
+			sb.append(Integer.toString((b & 0xff) + 0x100, 16).substring(1));
+		}
+		
+		return sb.toString();
+		
+	}
+}