move on to version 0.9.2

Currently translated at 100.0% (160 of 160 strings)

.github/CONTRIBUTING.md

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

.github/ISSUE_TEMPLATE.md

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

.github/PULL_REQUEST_TEAMPLATE.md

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

.gitignore

@@ -1,7 +1,11 @@
+.gitignore
 .gradle
 /local.properties
-/.idea/workspace.xml
-/.idea/libraries
 .DS_Store
 /build
 /captures
+/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

.idea/.name

@@ -1 +0,0 @@
-NewPipe

.idea/compiler.xml

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <resourceExtensions />
-    <wildcardResourcePatterns>
-      <entry name="!?*.java" />
-      <entry name="!?*.form" />
-      <entry name="!?*.class" />
-      <entry name="!?*.groovy" />
-      <entry name="!?*.scala" />
-      <entry name="!?*.flex" />
-      <entry name="!?*.kt" />
-      <entry name="!?*.clj" />
-      <entry name="!?*.aj" />
-    </wildcardResourcePatterns>
-    <annotationProcessing>
-      <profile default="true" name="Default" enabled="false">
-        <processorPath useClasspath="true" />
-      </profile>
-    </annotationProcessing>
-  </component>
-</project>

.idea/copyright/profiles_settings.xml

@@ -1,3 +0,0 @@
-<component name="CopyrightManager">
-  <settings default="" />
-</component>

.idea/dictionaries/the_scrabi.xml

@@ -1,3 +0,0 @@
-<component name="ProjectDictionaryState">
-  <dictionary name="the-scrabi" />
-</component>

.idea/gradle.xml

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="GradleSettings">
-    <option name="linkedExternalProjectsSettings">
-      <GradleProjectSettings>
-        <option name="distributionType" value="LOCAL" />
-        <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$APPLICATION_HOME_DIR$/gradle/gradle-2.4" />
-        <option name="gradleJvm" value="1.8" />
-        <option name="modules">
-          <set>
-            <option value="$PROJECT_DIR$" />
-            <option value="$PROJECT_DIR$/app" />
-          </set>
-        </option>
-      </GradleProjectSettings>
-    </option>
-  </component>
-</project>

.idea/misc.xml

@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="EntryPointsManager">
-    <entry_points version="2.0" />
-  </component>
-  <component name="NullableNotNullManager">
-    <option name="myDefaultNullable" value="android.support.annotation.Nullable" />
-    <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
-    <option name="myNullables">
-      <value>
-        <list size="4">
-          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
-          <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
-          <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
-          <item index="3" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
-        </list>
-      </value>
-    </option>
-    <option name="myNotNulls">
-      <value>
-        <list size="4">
-          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
-          <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
-          <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
-          <item index="3" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
-        </list>
-      </value>
-    </option>
-  </component>
-  <component name="ProjectLevelVcsManager" settingsEditedManually="false">
-    <OptionsSetting value="true" id="Add" />
-    <OptionsSetting value="true" id="Remove" />
-    <OptionsSetting value="true" id="Checkout" />
-    <OptionsSetting value="true" id="Update" />
-    <OptionsSetting value="true" id="Status" />
-    <OptionsSetting value="true" id="Edit" />
-    <ConfirmationsSetting value="0" id="Add" />
-    <ConfirmationsSetting value="0" id="Remove" />
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/build/classes" />
-  </component>
-  <component name="ProjectType">
-    <option name="id" value="Android" />
-  </component>
-</project>

.idea/modules.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/NewPipe.iml" filepath="$PROJECT_DIR$/NewPipe.iml" />
-      <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
-    </modules>
-  </component>
-</project>

.idea/runConfigurations.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RunConfigurationProducerService">
-    <option name="ignoredProducers">
-      <set>
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
-      </set>
-    </option>
-  </component>
-</project>

.idea/vcs.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-  </component>
-</project>

.travis.yml

@@ -0,0 +1,20 @@
+language: android
+jdk:
+    - oraclejdk8
+android:
+  components:
+    # The BuildTools version used by NewPipe
+    - tools
+    - build-tools-25.0.0
+
+    # The SDK version used to compile NewPipe
+    - android-25
+
+    # Additional components
+    - extra-android-m2repository
+
+script: ./gradlew -Dorg.gradle.jvmargs=-Xmx1536m assembleDebug lintDebug testDebugUnitTest
+
+licenses:
+  - '.+'
+

NewPipe.iml

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="NewPipe" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="java-gradle" name="Java-Gradle">
-      <configuration>
-        <option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
-        <option name="BUILDABLE" value="false" />
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <excludeFolder url="file://$MODULE_DIR$/.gradle" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>

README.md

@@ -1,9 +1,79 @@
-NewPipe
--------
+WARNING: PUTTING NEWPIPE OR ANY FORK OF IT INTO GOOGLE PLAYSTORE VIOLATES THEIR TERMS OF CONDITIONS.
 
-version 0.3
+# NewPipe
+NewPipe: A free lightweight Youtube frontend for Android.  
+
+[![NewPipe](app/src/main/res/mipmap-xhdpi/ic_launcher.png)](https://newpipe.schabi.org)
+[![F-Droid](https://f-droid.org/wiki/images/0/06/F-Droid-button_get-it-on.png)](https://f-droid.org/repository/browse/?fdfilter=newpipe&fdid=org.schabi.newpipe)
 
 
-NewPipe is a lightweight youtube frontend for android. It's supposed to be used without the youtube-api and without any google play services. NewPipe only parses the youtube website in order to gain the information it needs.
+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/TeamNewPipe/NewPipe.svg)](https://travis-ci.org/TeamNewPipe/NewPipe)
 
-This a very early version of the app, so not all functionality is implemented, and there may still be a lot of bugs. But all in all it's doing what it is supposed to do. It makes it possible to watch youtube videos. So don't be cruel to this app. It will improve...
+## Donate
+![Bitcoin](https://bitcoin.org/img/icons/logotop.svg)
+![BitcoinQR](assets/16A9J59ahMRqkLSZjhYj33n9j3fMztFxnh.png)
+
+`16A9J59ahMRqkLSZjhYj33n9j3fMztFxnh`
+
+## Screenshots
+
+[<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
+
+NewPipe does not use any Google framework libraries, or the YouTube API. It only parses the website in order to gain the information it needs. Therefore this app can be used on devices without Google Services installed. Also, you don't need a YouTube account to use NewPipe, and it's FLOSS.
+
+### Features
+
+* Search videos
+* Display general information about a video
+* Watch YouTube videos
+* Listen to YouTube videos (experimental)
+* Select the streaming player to watch the video with
+* 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
+* Watch videos from a channel
+* Orbot/Tor support (not yet directly)
+
+### Coming Features
+
+* Bookmarks
+* View history
+* Search history
+* Subscribe to channels
+* Search/Watch Playlists
+* Queeing videos
+* Subtitles support
+* 1080p support
+* livestream support
+* ... and many more
+
+### Multiservice support
+Although NewPipe only supports YouTube at the moment, it's designed to support many more streaming services. The plan is, that NewPipe will get such support by the version 2.0.
+
+## Contribution
+Whether you have ideas, translation, design changes, code cleaning, or real heavy code changes, help is always welcome.
+The more is done the better it gets!
+
+If you'd like to get involved, check our [contribution notes](.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)  
+
+NewPipe is Free Software: You can use, study share and improve it at your
+will. Specifically you can redistribute and/or modify it under the terms of the
+[GNU General Public License](https://www.gnu.org/licenses/gpl.html) as
+published by the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.  

app/.gitignore

@@ -1 +1,3 @@
+.gitignore
 /build
+app.iml

app/app.iml

@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="NewPipe" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="android-gradle" name="Android-Gradle">
-      <configuration>
-        <option name="GRADLE_PROJECT_PATH" value=":app" />
-      </configuration>
-    </facet>
-    <facet type="android" name="Android">
-      <configuration>
-        <option name="SELECTED_BUILD_VARIANT" value="debug" />
-        <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
-        <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
-        <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
-        <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
-        <option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugAndroidTestSources" />
-        <afterSyncTasks>
-          <task>generateDebugAndroidTestSources</task>
-          <task>generateDebugSources</task>
-        </afterSyncTasks>
-        <option name="ALLOW_USER_CONFIGURATION" value="false" />
-        <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
-        <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
-        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
-        <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
-    <output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/debug" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/debug" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/androidTest/debug" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/coverage-instrumented-classes" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/22.2.1/jars" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/22.2.1/jars" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/libs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/ndk" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
-      <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
-    </content>
-    <orderEntry type="jdk" jdkName="Android API 22 Platform" jdkType="Android SDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" exported="" name="jsoup-1.8.3" level="project" />
-    <orderEntry type="library" exported="" name="support-v4-22.2.1" level="project" />
-    <orderEntry type="library" exported="" name="support-annotations-22.2.1" level="project" />
-    <orderEntry type="library" exported="" name="rhino-1.7.7" level="project" />
-    <orderEntry type="library" exported="" name="appcompat-v7-22.2.1" level="project" />
-  </component>
-</module>

app/build.gradle

@@ -1,15 +1,15 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 22
-    buildToolsVersion "22.0.1"
+    compileSdkVersion 25
+    buildToolsVersion '25.0.0'
 
     defaultConfig {
         applicationId "org.schabi.newpipe"
-        minSdkVersion 16
-        targetSdkVersion 22
-        versionCode 1
-        versionName "0.3"
+        minSdkVersion 15
+        targetSdkVersion 25
+        versionCode 29
+        versionName "0.9.2"
     }
     buildTypes {
         release {
@@ -17,12 +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:22.2.1'
-    compile 'com.android.support:support-v4:22.2.1'
+    testCompile 'junit:junit:4.12'
+    testCompile 'org.mockito:mockito-core:1.10.19'
+    testCompile 'org.json:json:20160810'
+
+    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.code.gson:gson:2.4'
+    compile 'com.nononsenseapps:filepicker:3.0.0'
+    compile 'ch.acra:acra:4.9.0'
+    compile 'com.google.android.exoplayer:exoplayer:r2.3.1'
 }

app/src/main/AndroidManifest.xml

@@ -1,70 +1,215 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.schabi.newpipe" >
+    xmlns:tools="http://schemas.android.com/tools"
+    package="org.schabi.newpipe">
+
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
 
-    <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:theme="@style/AppTheme" >
+        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"
+            android:launchMode="singleTask">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+
         <activity
-            android:name=".VideoItemDetailActivity"
-            android:label="@string/title_videoitem_detail" >
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value=".VideoItemListActivity" />
+            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="singleTask"
+            android:theme="@style/PlayerTheme"/>
+
+        <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="android.intent.action.VIEW"/>
+                <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=".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:taskAffinity=""
+            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:pathPrefix="/watch"/>
-                <data
-                    android:host="youtube.com"
-                    android:scheme="https"
-                    android:pathPrefix="/watch"/>
-                <data
-                    android:host="www.youtube.com"
-                    android:scheme="http"
-                    android:pathPrefix="/watch"/>
-                <data
-                    android:host="www.youtube.com"
-                    android:scheme="https"
-                    android:pathPrefix="/watch"/>
-                <data
-                    android:host="m.youtube.com"
-                    android:scheme="http"
-                    android:pathPrefix="/watch"/>
-                <data
-                    android:host="m.youtube.com"
-                    android:scheme="https"
-                    android:pathPrefix="/watch"/>
+                <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="/embed/" />
+                <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/FullscreenTheme"
-            >
-        </activity>
+
         <activity
-            android:name=".SettingsActivity"
-            android:label="@string/title_activity_settings" >
+            android:name=".RouterPopupActivity"
+            android:taskAffinity=""
+            android:theme="@android:style/Theme.NoDisplay"
+            android:label="@string/popup_mode_share_menu_title">
+            <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="youtube.com" />
+                <data android:host="m.youtube.com" />
+                <data android:host="www.youtube.com" />
+                <!-- video prefix -->
+                <data android:pathPrefix="/v/" />
+                <data android:pathPrefix="/embed/" />
+                <data android:pathPrefix="/watch" />
+                <data android:pathPrefix="/attribution_link" />
+            </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>
+
+        <service android:name=".player.PopupVideoPlayer"/>
+
     </application>
+
 </manifest>

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

@@ -1,229 +0,0 @@
-package org.schabi.newpipe;
-
-import android.app.DownloadManager;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.net.Uri;
-import android.preference.PreferenceManager;
-import android.support.v4.view.MenuItemCompat;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.app.AppCompatActivity;
-import android.util.Log;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-import android.widget.ArrayAdapter;
-
-import java.io.File;
-
-/**
- * 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/>.
- */
-
-public class ActionBarHandler {
-    private static final String TAG = ActionBarHandler.class.toString();
-    private static ActionBarHandler handler = null;
-
-    private Context context = null;
-    private String webisteUrl = "";
-    private AppCompatActivity activity;
-    private VideoInfo.Stream[] streams = null;
-    private int selectedStream = -1;
-    private String videoTitle = "";
-
-    public static ActionBarHandler getHandler() {
-        if(handler == null) {
-            handler = new ActionBarHandler();
-        }
-        return handler;
-    }
-
-    class ForamatItemSelectListener implements ActionBar.OnNavigationListener {
-        @Override
-        public boolean onNavigationItemSelected(int itemPosition, long itemId) {
-            selectFormatItem((int)itemId);
-            return true;
-        }
-    }
-
-    public void setupNavMenu(AppCompatActivity activity) {
-        this.activity = activity;
-        activity.getSupportActionBar().setNavigationMode(ActionBar.NAVIGATION_MODE_LIST);
-    }
-
-    public void setStreams(VideoInfo.Stream[] streams) {
-        this.streams = streams;
-        selectedStream = 0;
-        String[] itemArray = new String[streams.length];
-        for(int i = 0; i < streams.length; i++) {
-            itemArray[i] = streams[i].format + " " + streams[i].resolution;
-        }
-
-        ArrayAdapter<String> itemAdapter = new ArrayAdapter<String>(activity.getBaseContext(),
-                android.R.layout.simple_spinner_dropdown_item, itemArray);
-        if(activity != null) {
-            activity.getSupportActionBar().setListNavigationCallbacks(itemAdapter
-                    ,new ForamatItemSelectListener());
-        }
-    }
-
-    private void selectFormatItem(int i) {
-        selectedStream = i;
-    }
-
-    public boolean setupMenu(Menu menu, MenuInflater inflater, Context constext) {
-        this.context = context;
-        // CAUTION set item properties programmatically otherwise it would not be accepted by
-        // appcompat itemsinflater.inflate(R.menu.videoitem_detail, menu);
-
-        inflater.inflate(R.menu.videoitem_detail, menu);
-        MenuItem playItem = menu.findItem(R.id.menu_item_play);
-        MenuItem shareItem = menu.findItem(R.id.menu_item_share);
-
-        MenuItemCompat.setShowAsAction(playItem, MenuItemCompat.SHOW_AS_ACTION_ALWAYS
-                | MenuItemCompat.SHOW_AS_ACTION_WITH_TEXT);
-        MenuItemCompat.setShowAsAction(shareItem, MenuItemCompat.SHOW_AS_ACTION_IF_ROOM
-                | MenuItemCompat.SHOW_AS_ACTION_WITH_TEXT);
-
-        return true;
-    }
-
-    public boolean onItemSelected(MenuItem item, Context context) {
-        this.context = context;
-        int id = item.getItemId();
-        switch(id) {
-            case R.id.menu_item_play:
-                playVideo();
-                break;
-            case R.id.menu_item_share:
-                if(!videoTitle.isEmpty()) {
-                    Intent intent = new Intent();
-                    intent.setAction(Intent.ACTION_SEND);
-                    intent.putExtra(Intent.EXTRA_TEXT, webisteUrl);
-                    intent.setType("text/plain");
-                    context.startActivity(Intent.createChooser(intent, context.getString(R.string.shareDialogTitle)));
-                }
-                break;
-            case R.id.menu_item_openInBrowser: {
-                openInBrowser();
-            }
-                break;
-            case R.id.menu_item_download:
-                downloadVideo();
-                break;
-            case R.id.action_settings: {
-                Intent intent = new Intent(context, SettingsActivity.class);
-                context.startActivity(intent);
-            }
-            default:
-                Log.e(TAG, "Menu Item not known");
-        }
-        return true;
-    }
-
-    public void setVideoInfo(String websiteUrl, String videoTitle) {
-        this.webisteUrl = websiteUrl;
-        this.videoTitle = videoTitle;
-    }
-
-    public void playVideo() {
-        // ----------- THE MAGIC MOMENT ---------------
-        if(!videoTitle.isEmpty()) {
-            if (PreferenceManager.getDefaultSharedPreferences(context)
-                    .getBoolean("use_external_player", false)) {
-                Intent intent = new Intent();
-                try {
-                    intent.setAction(Intent.ACTION_VIEW);
-                    intent.setDataAndType(Uri.parse(streams[selectedStream].url),
-                            "video/" + streams[selectedStream].format);
-                    context.startActivity(intent);      // HERE !!!
-                } catch (Exception e) {
-                    e.printStackTrace();
-                    AlertDialog.Builder builder = new AlertDialog.Builder(context);
-                    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(context.getString(R.string.fdroidVLCurl)));
-                                    context.startActivity(intent);
-                                }
-                            })
-                            .setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
-                                @Override
-                                public void onClick(DialogInterface dialog, int which) {
-
-                                }
-                            });
-                    builder.create().show();
-                }
-            } else {
-                Intent intent = new Intent(context, PlayVideoActivity.class);
-                intent.putExtra(PlayVideoActivity.VIDEO_TITLE, videoTitle);
-                intent.putExtra(PlayVideoActivity.STREAM_URL, streams[selectedStream].url);
-                intent.putExtra(PlayVideoActivity.VIDEO_URL, webisteUrl);
-                context.startActivity(intent);
-            }
-        }
-        // --------------------------------------------
-    }
-
-    public void downloadVideo() {
-        Log.d(TAG, "bla");
-        if(!videoTitle.isEmpty()) {
-            String suffix = "";
-            switch (streams[selectedStream].format) {
-                case VideoInfo.F_WEBM:
-                    suffix = ".webm";
-                    break;
-                case VideoInfo.F_MPEG_4:
-                    suffix = ".mp4";
-                    break;
-                case VideoInfo.F_3GPP:
-                    suffix = ".3gp";
-                    break;
-            }
-            DownloadManager dm = (DownloadManager) context.getSystemService(Context.DOWNLOAD_SERVICE);
-            DownloadManager.Request request = new DownloadManager.Request(
-                    Uri.parse(streams[selectedStream].url));
-            request.setDestinationUri(Uri.fromFile(new File(
-                            PreferenceManager.getDefaultSharedPreferences(context)
-                            .getString("download_path_preference", "/storage/emulated/0/NewPipe")
-                            + "/" + videoTitle + suffix)));
-            try {
-                dm.enqueue(request);
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        }
-    }
-
-    public void openInBrowser() {
-        if(!videoTitle.isEmpty()) {
-            Intent intent = new Intent();
-            intent.setAction(Intent.ACTION_VIEW);
-            intent.setData(Uri.parse(webisteUrl));
-
-            context.startActivity(Intent.createChooser(intent, context.getString(R.string.chooseBrowser)));
-        }
-    }
-}

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

@@ -1,12 +1,10 @@
 package org.schabi.newpipe;
 
-import android.graphics.Bitmap;
-
 /**
- * Created by Christian Schabesberger on 26.08.15.
+ * Created by Christian Schabesberger on 24.12.15.
  *
  * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
- * VideoInfoItem.java is part of NewPipe.
+ * 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
@@ -22,12 +20,27 @@ import android.graphics.Bitmap;
  * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-public class VideoInfoItem {
-    public String id = "";
-    public String title = "";
-    public String uploader = "";
-    public String duration = "";
-    public String thumbnail_url = "";
-    public Bitmap thumbnail = null;
-    public String webpage_url = "";
-}
+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/Downloader.java

@@ -1,14 +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
@@ -25,29 +34,113 @@ import java.net.URL;
  * 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";
-    public static String download(String siteUrl) {
+    private static Downloader instance = null;
+
+    private Downloader() {}
+
+    public static Downloader getInstance() {
+        if(instance == null) {
+            synchronized (Downloader.class) {
+                if (instance == null) {
+                    instance = new Downloader();
+                }
+            }
+        }
+        return instance;
+    }
+
+    public static synchronized void setCookies(String cookies) {
+        Downloader.mCookies = cookies;
+    }
+
+    public static synchronized String getCookies() {
+        return Downloader.mCookies;
+    }
+
+    /**Download the text file at the supplied URL as in download(String),
+     * but set the HTTP header field "Accept-Language" to the supplied string.
+     * @param siteUrl the URL of the text file to return the contents of
+     * @param language the language (usually a 2-character code) to set as the preferred language
+     * @return the contents of the specified text file*/
+    public String download(String siteUrl, String language) throws IOException, 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(HttpsURLConnection con) throws IOException, ReCaptchaException {
+        StringBuilder response = new StringBuilder();
+        BufferedReader in = null;
 
-        StringBuffer response = new StringBuffer();
         try {
-            URL url = new URL(siteUrl);
-            HttpURLConnection con = (HttpURLConnection) url.openConnection();
             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 (Exception e) {
-            e.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 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.content.Context;
+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.extractor.NewPipe;
+import org.schabi.newpipe.report.ErrorActivity;
+
+/**
+ * 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 Context context = null;
+    private View rootView = null;
+
+    public ImageErrorLoadingListener(Context context, View rootView, int serviceId) {
+        this.context = context;
+        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(context,
+                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,238 @@
+/*
+ * Created by Christian Schabesberger on 02.08.16.
+ * <p>
+ * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
+ * DownloadActivity.java is part of NewPipe.
+ * <p>
+ * NewPipe is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * NewPipe is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+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.FragmentManager;
+import android.support.v7.app.AppCompatActivity;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+
+import com.nostra13.universalimageloader.core.ImageLoader;
+
+import org.schabi.newpipe.download.DownloadActivity;
+import org.schabi.newpipe.extractor.StreamingService;
+import org.schabi.newpipe.fragments.OnItemSelectedListener;
+import org.schabi.newpipe.fragments.channel.ChannelFragment;
+import org.schabi.newpipe.fragments.detail.VideoDetailFragment;
+import org.schabi.newpipe.fragments.search.SearchFragment;
+import org.schabi.newpipe.settings.SettingsActivity;
+import org.schabi.newpipe.util.Constants;
+import org.schabi.newpipe.util.NavigationHelper;
+import org.schabi.newpipe.util.PermissionHelper;
+import org.schabi.newpipe.util.ThemeHelper;
+
+public class MainActivity extends AppCompatActivity implements OnItemSelectedListener {
+    private static final String TAG = MainActivity.class.toString();
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Activity's LifeCycle
+    //////////////////////////////////////////////////////////////////////////*/
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        ThemeHelper.setTheme(this, true);
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+        setVolumeControlStream(AudioManager.STREAM_MUSIC);
+        if (savedInstanceState == null) initFragments();
+    }
+
+    @Override
+    protected void onNewIntent(Intent intent) {
+        super.onNewIntent(intent);
+        handleIntent(intent);
+    }
+
+    @Override
+    public void onBackPressed() {
+        Fragment fragment = getSupportFragmentManager().findFragmentById(R.id.fragment_holder);
+        if (fragment instanceof VideoDetailFragment) if (((VideoDetailFragment) fragment).onActivityBackPressed()) return;
+
+        if (getSupportFragmentManager().getBackStackEntryCount() >= 2) {
+            getSupportFragmentManager().popBackStackImmediate();
+        } else {
+            if (fragment instanceof SearchFragment) {
+                SearchFragment searchFragment = (SearchFragment) fragment;
+                if (!searchFragment.isMainBgVisible()) {
+                    getSupportFragmentManager().beginTransaction().remove(fragment).commitNow();
+                    NavigationHelper.openMainActivity(this);
+                    return;
+                }
+            }
+            finish();
+        }
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Menu
+    //////////////////////////////////////////////////////////////////////////*/
+
+    @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: {
+                Fragment fragment = getSupportFragmentManager().findFragmentById(R.id.fragment_holder);
+                if (fragment instanceof VideoDetailFragment) ((VideoDetailFragment) fragment).clearHistory();
+
+                NavigationHelper.openMainActivity(this);
+                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);
+        }
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Init
+    //////////////////////////////////////////////////////////////////////////*/
+
+    private void initFragments() {
+        if (getIntent() != null && getIntent().hasExtra(Constants.KEY_URL)) {
+            handleIntent(getIntent());
+        } else openSearchFragment();
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // OnItemSelectedListener
+    //////////////////////////////////////////////////////////////////////////*/
+
+    @Override
+    public void onItemSelected(StreamingService.LinkType linkType, int serviceId, String url, String name) {
+        switch (linkType) {
+            case STREAM:
+                openVideoDetailFragment(serviceId, url, name, false);
+                break;
+            case CHANNEL:
+                openChannelFragment(serviceId, url, name);
+                break;
+        }
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Utils
+    //////////////////////////////////////////////////////////////////////////*/
+
+    private void handleIntent(Intent intent) {
+        if (intent.hasExtra(Constants.KEY_LINK_TYPE)) {
+            String url = intent.getStringExtra(Constants.KEY_URL);
+            int serviceId = intent.getIntExtra(Constants.KEY_SERVICE_ID, 0);
+            try {
+                switch (((StreamingService.LinkType) intent.getSerializableExtra(Constants.KEY_LINK_TYPE))) {
+                    case STREAM:
+                        handleVideoDetailIntent(serviceId, url, intent);
+                        break;
+                    case CHANNEL:
+                        handleChannelIntent(serviceId, url, intent);
+                        break;
+                    case NONE:
+                        throw new Exception("Url not known to service. service=" + Integer.toString(serviceId) + " url=" + url);
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        } else {
+            getSupportFragmentManager().popBackStackImmediate(null, FragmentManager.POP_BACK_STACK_INCLUSIVE);
+            openSearchFragment();
+        }
+    }
+
+    private void openSearchFragment() {
+        ImageLoader.getInstance().clearMemoryCache();
+        getSupportFragmentManager().beginTransaction()
+                .setCustomAnimations(android.R.anim.fade_in, android.R.anim.fade_out, android.R.anim.fade_in, android.R.anim.fade_out)
+                .replace(R.id.fragment_holder, new SearchFragment())
+                .addToBackStack(null)
+                .commit();
+    }
+
+    private void openVideoDetailFragment(int serviceId, String url, String title, boolean autoPlay) {
+        ImageLoader.getInstance().clearMemoryCache();
+
+        Fragment fragment = getSupportFragmentManager().findFragmentById(R.id.fragment_holder);
+        if (title == null) title = "";
+
+        if (fragment instanceof VideoDetailFragment && fragment.isVisible()) {
+            VideoDetailFragment detailFragment = (VideoDetailFragment) fragment;
+            detailFragment.setAutoplay(autoPlay);
+            detailFragment.selectAndLoadVideo(serviceId, url, title);
+            return;
+        }
+
+        VideoDetailFragment instance = VideoDetailFragment.getInstance(serviceId, url, title);
+        instance.setAutoplay(autoPlay);
+
+        getSupportFragmentManager().beginTransaction()
+                .setCustomAnimations(android.R.anim.fade_in, android.R.anim.fade_out, android.R.anim.fade_in, android.R.anim.fade_out)
+                .replace(R.id.fragment_holder, instance)
+                .addToBackStack(null)
+                .commit();
+    }
+
+    private void openChannelFragment(int serviceId, String url, String name) {
+        ImageLoader.getInstance().clearMemoryCache();
+        if (name == null) name = "";
+        getSupportFragmentManager().beginTransaction()
+                .setCustomAnimations(android.R.anim.fade_in, android.R.anim.fade_out, android.R.anim.fade_in, android.R.anim.fade_out)
+                .replace(R.id.fragment_holder, ChannelFragment.newInstance(serviceId, url, name))
+                .addToBackStack(null)
+                .commit();
+    }
+
+    private void handleVideoDetailIntent(int serviceId, String url, Intent intent) {
+        boolean autoPlay = intent.getBooleanExtra(VideoDetailFragment.AUTO_PLAY, false);
+        String title = intent.getStringExtra(Constants.KEY_TITLE);
+        openVideoDetailFragment(serviceId, url, title, autoPlay);
+    }
+
+    private void handleChannelIntent(int serviceId, String url, Intent intent) {
+        String name = intent.getStringExtra(Constants.KEY_TITLE);
+        openChannelFragment(serviceId, url, name);
+    }
+
+}

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

@@ -1,215 +0,0 @@
-package org.schabi.newpipe;
-
-import android.content.Intent;
-import android.content.pm.ActivityInfo;
-import android.media.MediaPlayer;
-import android.net.Uri;
-import android.os.Bundle;
-import android.os.Handler;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.AppCompatActivity;
-import android.util.Log;
-import android.view.Display;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-import android.view.Surface;
-import android.view.View;
-import android.view.WindowManager;
-import android.widget.Button;
-import android.widget.MediaController;
-import android.widget.ProgressBar;
-import android.widget.VideoView;
-
-/**
- * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
- * PlayVideoActivity.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 PlayVideoActivity extends AppCompatActivity {
-
-    private static final String TAG = PlayVideoActivity.class.toString();
-    public static final String VIDEO_URL = "video_url";
-    public static final String STREAM_URL = "stream_url";
-    public static final String VIDEO_TITLE = "video_title";
-    private static final String POSITION = "position";
-
-    private static final long HIDING_DELAY = 3000;
-
-    private String videoUrl = "";
-
-    private ActionBar actionBar;
-    private VideoView videoView;
-    private int position = 0;
-    private MediaController mediaController;
-    private ProgressBar progressBar;
-    private View decorView;
-    private boolean uiIsHidden = false;
-    private static long lastUiShowTime = 0;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        setContentView(R.layout.activity_play_video);
-
-        actionBar = getSupportActionBar();
-        actionBar.setDisplayHomeAsUpEnabled(true);
-        Intent intent = getIntent();
-        if(mediaController == null) {
-            mediaController = new MediaController(this);
-        }
-
-        videoView = (VideoView) findViewById(R.id.video_view);
-        progressBar = (ProgressBar) findViewById(R.id.play_video_progress_bar);
-        try {
-            videoView.setMediaController(mediaController);
-            videoView.setVideoURI(Uri.parse(intent.getStringExtra(STREAM_URL)));
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        videoView.requestFocus();
-        videoView.setOnPreparedListener(new MediaPlayer.OnPreparedListener() {
-            @Override
-            public void onPrepared(MediaPlayer mp) {
-                progressBar.setVisibility(View.GONE);
-                videoView.seekTo(position);
-                if (position == 0) {
-                    videoView.start();
-                } else {
-                    videoView.pause();
-                }
-            }
-        });
-        videoUrl = intent.getStringExtra(VIDEO_URL);
-
-        Button button = (Button) findViewById(R.id.content_button);
-        button.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                if(uiIsHidden) {
-                    showUi();
-                } else {
-                    hideUi();
-                }
-            }
-        });
-        decorView = getWindow().getDecorView();
-        decorView.setOnSystemUiVisibilityChangeListener(new View.OnSystemUiVisibilityChangeListener() {
-            @Override
-            public void onSystemUiVisibilityChange(int visibility) {
-                if((visibility & View.SYSTEM_UI_FLAG_FULLSCREEN) == 0) {
-                    uiIsHidden = false;
-                    showUi();
-                } else {
-                    uiIsHidden = true;
-                    hideUi();
-                }
-            }
-        });
-        hideUi();
-    }
-
-    @Override
-    public boolean onCreatePanelMenu(int featured, Menu menu) {
-        super.onCreatePanelMenu(featured, menu);
-        MenuInflater inflater = getMenuInflater();
-        inflater.inflate(R.menu.video_player, menu);
-
-        return true;
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        int id = item.getItemId();
-        switch(id) {
-            case android.R.id.home:
-                finish();
-                break;
-            case R.id.menu_item_share:
-                Intent intent = new Intent();
-                intent.setAction(Intent.ACTION_SEND);
-                intent.putExtra(Intent.EXTRA_TEXT, videoUrl);
-                intent.setType("text/plain");
-                startActivity(Intent.createChooser(intent, getString(R.string.shareDialogTitle)));
-                break;
-            case R.id.menu_item_screen_rotation:
-                Display display = ((WindowManager) getSystemService(WINDOW_SERVICE)).getDefaultDisplay();
-                if(display.getRotation() == Surface.ROTATION_0
-                        || display.getRotation() == Surface.ROTATION_180) {
-                    setRequestedOrientation (ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
-                } else if(display.getRotation() == Surface.ROTATION_90
-                        || display.getRotation() == Surface.ROTATION_270) {
-                    setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
-                }
-                break;
-            default:
-                Log.e(TAG, "Error: MenuItem not known");
-                return false;
-        }
-        return true;
-    }
-
-    @Override
-    protected void onPostCreate(Bundle savedInstanceState) {
-        super.onPostCreate(savedInstanceState);
-    }
-
-    @Override
-    public void onSaveInstanceState(Bundle savedInstanceState) {
-        super.onSaveInstanceState(savedInstanceState);
-        //savedInstanceState.putInt(POSITION, videoView.getCurrentPosition());
-        //videoView.pause();
-    }
-
-    @Override
-    public void onRestoreInstanceState(Bundle savedInstanceState) {
-        super.onRestoreInstanceState(savedInstanceState);
-        position = savedInstanceState.getInt(POSITION);
-        //videoView.seekTo(position);
-    }
-
-    private void showUi() {
-        try {
-            uiIsHidden = false;
-            mediaController.show();
-            actionBar.show();
-            //decorView.setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN);
-            //| View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION);
-            Handler handler = new Handler();
-            handler.postDelayed(new Runnable() {
-                @Override
-                public void run() {
-                    if ((System.currentTimeMillis() - lastUiShowTime) > HIDING_DELAY) {
-                        hideUi();
-                    }
-                }
-            }, HIDING_DELAY);
-            lastUiShowTime = System.currentTimeMillis();
-        }catch(Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    private void hideUi() {
-        uiIsHidden = true;
-        actionBar.hide();
-        mediaController.hide();
-        getWindow().addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
-        //decorView.setSystemUiVisibility(View.SYSTEM_UI_FLAG_FULLSCREEN);
-        //| View.SYSTEM_UI_FLAG_HIDE_NAVIGATION);
-    }
-}

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,124 @@
+package org.schabi.newpipe;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Bundle;
+import android.widget.Toast;
+
+import org.schabi.newpipe.util.NavigationHelper;
+
+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"
+
+    /**
+     * 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 void handleIntent(Intent intent) {
+        String videoUrl = "";
+
+        // 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];
+        }
+
+        try {
+            NavigationHelper.openByLink(this, videoUrl);
+        } catch (Exception e) {
+            Toast.makeText(this, R.string.url_not_supported_toast, Toast.LENGTH_LONG).show();
+        }
+    }
+
+    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()]);
+    }
+
+}

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

@@ -0,0 +1,130 @@
+package org.schabi.newpipe;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Build;
+import android.os.Bundle;
+import android.widget.Toast;
+
+import org.schabi.newpipe.extractor.NewPipe;
+import org.schabi.newpipe.extractor.StreamingService;
+import org.schabi.newpipe.player.PopupVideoPlayer;
+import org.schabi.newpipe.util.Constants;
+import org.schabi.newpipe.util.PermissionHelper;
+
+import java.util.Collection;
+import java.util.HashSet;
+
+/**
+ * This activity is thought to open video streams form an external app using the popup player.
+ */
+public class RouterPopupActivity extends Activity {
+    //private static final String TAG = "RouterPopupActivity";
+
+    /**
+     * 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 void handleIntent(Intent intent) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M
+                && !PermissionHelper.checkSystemAlertWindowPermission(this)) {
+            Toast.makeText(this, R.string.msg_popup_permission, Toast.LENGTH_LONG).show();
+            return;
+        }
+        String videoUrl = "";
+        StreamingService service;
+
+        // 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;
+        }
+
+        Intent callIntent = new Intent(this, PopupVideoPlayer.class);
+        switch (service.getLinkTypeByUrl(videoUrl)) {
+            case STREAM:
+                break;
+            default:
+                Toast.makeText(this, R.string.url_not_supported_toast, Toast.LENGTH_LONG).show();
+                return;
+        }
+
+        callIntent.putExtra(Constants.KEY_URL, videoUrl);
+        callIntent.putExtra(Constants.KEY_SERVICE_ID, service.getServiceId());
+        startService(callIntent);
+    }
+
+    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()]);
+    }
+
+}

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

@@ -1,50 +0,0 @@
-package org.schabi.newpipe;
-
-import android.util.Log;
-
-import org.schabi.newpipe.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/>.
- */
-
-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 == serviceName) {
-                return i;
-            }
-        }
-        Log.e(TAG, "Error: Service " + serviceName + " not known.");
-        return -1;
-    }
-}

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,66 +0,0 @@
-package org.schabi.newpipe;
-
-/**
- * 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/>.
- */
-
-import android.graphics.Bitmap;
-
-import java.util.Vector;
-
-public class VideoInfo {
-
-    public static final String F_MPEG_4 = "MPEG-4";
-    public static final String F_3GPP = "3GPP";
-    public static final String F_WEBM = "WebM";
-
-    public static final int VIDEO_AVAILABLE = 0x00;
-    public static final int VIDEO_UNAVAILABLE = 0x01;
-    public static final int VIDEO_UNAVAILABLE_GEMA = 0x02;
-
-    public static class Stream {
-        public Stream(String u, String f, String r) {
-            url = u; format = f; resolution = r;
-        }
-        public String url = "";     //url of the stream
-        public String format = "";
-        public String resolution = "";
-    }
-
-    public String id = "";
-    public String uploader = "";
-    public String upload_date = "";
-    public String uploader_thumbnail_url = "";
-    public Bitmap uploader_thumbnail = null;
-    public String title = "";
-    public String thumbnail_url = "";
-    public Bitmap thumbnail = null;
-    public String description = "";
-    public int duration = -1;
-    public int age_limit = 0;
-    public String webpage_url = "";
-    public String view_count = "";
-    public String like_count = "";
-    public String dislike_count = "";
-    public String average_rating = "";
-    public Stream[] streams = null;
-    public VideoInfoItem nextVideo = null;
-    public Vector<VideoInfoItem> relatedVideos = null;
-    public int videoAvailableStatus = VIDEO_AVAILABLE;
-}

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

@@ -1,128 +0,0 @@
-package org.schabi.newpipe;
-
-import android.content.ContentProviderOperation;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.AppCompatActivity;
-import android.content.Intent;
-import android.os.Bundle;
-import android.support.v4.app.NavUtils;
-import android.util.Log;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-
-import org.schabi.newpipe.youtube.YoutubeExtractor;
-
-
-/**
- * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
- * ActionBarHandler.java is part of NewPipe.
- *
- * NewPipe is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * NewPipe is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-public class VideoItemDetailActivity extends AppCompatActivity {
-
-    private static final String TAG = VideoItemDetailActivity.class.toString();
-
-    private String videoUrl;
-    private int currentStreamingService = -1;
-
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_videoitem_detail);
-
-
-        // Show the Up button in the action bar.
-        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-        ActionBarHandler.getHandler().setupNavMenu(this);
-
-        // savedInstanceState is non-null when there is fragment state
-        // saved from previous configurations of this activity
-        // (e.g. when rotating the screen from portrait to landscape).
-        // In this case, the fragment will automatically be re-added
-        // to its container so we don't need to manually add it.
-        // For more information, see the Fragments API guide at:
-        //
-        // http://developer.android.com/guide/components/fragments.html
-        //
-
-        Bundle arguments = new Bundle();
-        if (savedInstanceState == null) {
-            // Create the detail fragment and add it to the activity
-            // using a fragment transaction.
-            if (getIntent().getData() != null) {
-                videoUrl = getIntent().getData().toString();
-                StreamingService[] serviceList = ServiceList.getServices();
-                Extractor extractor = null;
-                for (int i = 0; i < serviceList.length; i++) {
-                    if (serviceList[i].acceptUrl(videoUrl)) {
-                        arguments.putInt(VideoItemDetailFragment.STREAMING_SERVICE, i);
-                        try {
-                            currentStreamingService = i;
-                            extractor = (Extractor) ServiceList.getService(i)
-                                    .getExtractorClass().newInstance();
-                        } catch (Exception e) {
-                            e.printStackTrace();
-                        }
-                        break;
-                    }
-                }
-                arguments.putString(VideoItemDetailFragment.VIDEO_URL,
-                        extractor.getVideoUrl(extractor.getVideoId(videoUrl)));
-
-            } 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);
-            }
-            VideoItemDetailFragment fragment = new VideoItemDetailFragment();
-            fragment.setArguments(arguments);
-            getSupportFragmentManager().beginTransaction()
-                    .add(R.id.videoitem_detail_container, fragment)
-                    .commit();
-        }
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        int id = item.getItemId();
-        if (id == android.R.id.home) {
-            // This ID represents the Home or Up button. In the case of this
-            // activity, the Up button is shown. Use NavUtils to allow users
-            // to navigate up one level in the application structure. For
-            // more details, see the Navigation pattern on Android Design:
-            //
-            // http://developer.android.com/design/patterns/navigation.html#up-vs-back
-            //
-            Intent intent = new Intent(this, VideoItemListActivity.class);
-            intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
-            NavUtils.navigateUpTo(this, intent);
-            return true;
-        } else {
-            ActionBarHandler.getHandler().onItemSelected(item, this);
-        }
-        return super.onOptionsItemSelected(item);
-    }
-
-    @Override
-    public boolean onCreatePanelMenu(int featured, Menu menu) {
-        super.onCreatePanelMenu(featured, menu);
-        MenuInflater inflater = getMenuInflater();
-        ActionBarHandler.getHandler().setupMenu(menu, inflater, this);
-
-        return true;
-    }
-}

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

@@ -1,252 +0,0 @@
-package org.schabi.newpipe;
-
-import android.app.Activity;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.media.Image;
-import android.os.Bundle;
-import android.os.Handler;
-import android.support.v4.app.Fragment;
-import android.support.v7.app.ActionBar;
-import android.text.Html;
-import android.text.method.LinkMovementMethod;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ImageView;
-import android.widget.ProgressBar;
-import android.widget.TextView;
-
-
-import java.net.URL;
-import java.util.Vector;
-
-
-/**
- * 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";
-
-    private Thread extractorThread = null;
-
-    private class ExtractorRunnable implements Runnable {
-        private Handler h = new Handler();
-        private Class extractorClass;
-        private String videoUrl;
-        public ExtractorRunnable(String videoUrl, Class extractorClass, VideoItemDetailFragment f) {
-            this.extractorClass = extractorClass;
-            this.videoUrl = videoUrl;
-        }
-        @Override
-        public void run() {
-            try {
-                Extractor extractor = (Extractor) extractorClass.newInstance();
-                VideoInfo videoInfo = extractor.getVideoInfo(videoUrl);
-                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));
-                }
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-
-        }
-    }
-
-    private class VideoResultReturnedRunnable implements Runnable {
-        private VideoInfo videoInfo;
-        public VideoResultReturnedRunnable(VideoInfo videoInfo) {
-            this.videoInfo = videoInfo;
-        }
-        @Override
-        public void run() {
-            updateInfo(videoInfo);
-        }
-    }
-
-    private class SetThumbnailRunnable implements Runnable {
-        public static final int CHANNEL_THUMBNAIL = 2;
-        public static final int VIDEO_THUMBNAIL = 1;
-        private Bitmap thumbnail;
-        private int thumbnailId;
-        public SetThumbnailRunnable(Bitmap thumbnail, int id) {
-            this.thumbnail = thumbnail;
-            this.thumbnailId = id;
-        }
-        @Override
-        public void run() {
-            updateThumbnail(thumbnail, thumbnailId);
-        }
-    }
-
-    public void updateThumbnail(Bitmap thumbnail, int id) {
-        Activity a = getActivity();
-        ImageView thumbnailView = null;
-        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;
-                default:
-                    Log.d(TAG, "Error: Thumbnail id not known");
-                    return;
-            }
-            if (thumbnailView != null) {
-                thumbnailView.setImageBitmap(thumbnail);
-            }
-        } catch (java.lang.NullPointerException e) {
-            // No god programm design i know. :/
-            Log.w(TAG, "updateThumbnail(): Fragment closed before thread ended work");
-        }
-    }
-
-    public void updateInfo(VideoInfo info) {
-        Activity a = getActivity();
-        try {
-            ProgressBar progressBar = (ProgressBar) a.findViewById(R.id.detailProgressBar);
-            TextView videoTitleView = (TextView) a.findViewById(R.id.detailVideoTitleView);
-            TextView uploaderView = (TextView) a.findViewById(R.id.detailUploaderView);
-            TextView viewCountView = (TextView) a.findViewById(R.id.detailViewCountView);
-            TextView thumbsUpView = (TextView) a.findViewById(R.id.detailThumbsUpCountView);
-            TextView thumbsDownView = (TextView) a.findViewById(R.id.detailThumbsDownCountView);
-            TextView uploadDateView = (TextView) a.findViewById(R.id.detailUploadDateView);
-            TextView descriptionView = (TextView) a.findViewById(R.id.detailDescriptionView);
-            ImageView thumbnailView = (ImageView) a.findViewById(R.id.detailThumbnailView);
-            ImageView uploaderThumbnailView = (ImageView) a.findViewById(R.id.detailUploaderThumbnailView);
-            ImageView thumbsUpPic = (ImageView) a.findViewById(R.id.detailThumbsUpImgView);
-            ImageView thumbsDownPic = (ImageView) a.findViewById(R.id.detailThumbsDownImgView);
-
-            progressBar.setVisibility(View.GONE);
-            videoTitleView.setVisibility(View.VISIBLE);
-            uploaderView.setVisibility(View.VISIBLE);
-            uploadDateView.setVisibility(View.VISIBLE);
-            viewCountView.setVisibility(View.VISIBLE);
-            thumbsUpView.setVisibility(View.VISIBLE);
-            thumbsDownView.setVisibility(View.VISIBLE);
-            uploadDateView.setVisibility(View.VISIBLE);
-            descriptionView.setVisibility(View.VISIBLE);
-            thumbnailView.setVisibility(View.VISIBLE);
-            uploaderThumbnailView.setVisibility(View.VISIBLE);
-            thumbsUpPic.setVisibility(View.VISIBLE);
-            thumbsDownPic.setVisibility(View.VISIBLE);
-
-            switch (info.videoAvailableStatus) {
-                case VideoInfo.VIDEO_AVAILABLE: {
-                    videoTitleView.setText(info.title);
-                    uploaderView.setText(info.uploader);
-                    viewCountView.setText(info.view_count + " " + a.getString(R.string.viewSufix));
-                    thumbsUpView.setText(info.like_count);
-                    thumbsDownView.setText(info.dislike_count);
-                    uploadDateView.setText(a.getString(R.string.uploadDatePrefix) + " " + info.upload_date);
-                    descriptionView.setText(Html.fromHtml(info.description));
-                    descriptionView.setMovementMethod(LinkMovementMethod.getInstance());
-
-                    ActionBarHandler.getHandler().setVideoInfo(info.webpage_url, info.title);
-
-                    // parse streams
-                    Vector<VideoInfo.Stream> streamsToUse = new Vector<>();
-                    for (VideoInfo.Stream i : info.streams) {
-                        if (useStream(i, streamsToUse)) {
-                            streamsToUse.add(i);
-                        }
-                    }
-                    VideoInfo.Stream[] streamList = new VideoInfo.Stream[streamsToUse.size()];
-                    for (int i = 0; i < streamList.length; i++) {
-                        streamList[i] = streamsToUse.get(i);
-                    }
-                    ActionBarHandler.getHandler().setStreams(streamList);
-                }
-                    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 Availeble Status not known.");
-            }
-
-        } catch (java.lang.NullPointerException e) {
-            Log.w(TAG, "updateInfo(): Fragment closed before thread ended work... or else");
-            e.printStackTrace();
-        }
-    }
-
-    private boolean useStream(VideoInfo.Stream stream, Vector<VideoInfo.Stream> streams) {
-        for(VideoInfo.Stream 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).
-     */
-    public VideoItemDetailFragment() {
-    }
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        try {
-            StreamingService streamingService = ServiceList.getService(
-                    getArguments().getInt(STREAMING_SERVICE));
-            extractorThread = new Thread(new ExtractorRunnable(
-                    getArguments().getString(VIDEO_URL), streamingService.getExtractorClass(), this));
-            extractorThread.start();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
-        View rootView = inflater.inflate(R.layout.fragment_videoitem_detail, container, false);
-
-        return rootView;
-    }
-}

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

@@ -1,228 +0,0 @@
-package org.schabi.newpipe;
-
-import android.content.Context;
-import android.content.Intent;
-import android.os.Bundle;
-import android.os.Environment;
-import android.preference.PreferenceManager;
-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.view.inputmethod.InputMethodManager;
-import android.support.v7.widget.SearchView;
-import android.widget.ImageView;
-
-/**
- * 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();
-    private static final String QUERY = "query";
-    private static final String STREAMING_SERVICE = "streaming_service";
-
-    private int currentStreamingServiceId = -1;
-    private String searchQuery = "";
-
-    private VideoItemListFragment listFragment;
-
-    public 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);
-                inputManager.hideSoftInputFromWindow(
-                        getCurrentFocus().getWindowToken(), InputMethodManager.HIDE_NOT_ALWAYS);
-                // 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();
-                hideWatermark();
-            } catch(Exception e) {
-                e.printStackTrace();
-            }
-            return true;
-        }
-
-        @Override
-        public boolean onQueryTextChange(String newText) {
-            return true;
-        }
-
-    }
-
-    private void hideWatermark() {
-        ImageView waterMark = (ImageView) findViewById(R.id.list_view_watermark);
-        if(waterMark != null) {
-            waterMark.setVisibility(View.GONE);
-        }
-    }
-
-    /**
-     * 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);
-
-        listFragment = (VideoItemListFragment)
-                getSupportFragmentManager().findFragmentById(R.id.videoitem_list);
-
-        //-------- remove this line when multiservice support is implemented ----------
-        currentStreamingServiceId = ServiceList.getIdOfService("Youtube");
-        //-----------------------------------------------------------------------------
-        VideoItemListFragment listFragment = (VideoItemListFragment) getSupportFragmentManager()
-                .findFragmentById(R.id.videoitem_list);
-        listFragment.setStreamingService(ServiceList.getService(currentStreamingServiceId));
-
-        if(savedInstanceState != null) {
-            searchQuery = savedInstanceState.getString(QUERY);
-            currentStreamingServiceId = savedInstanceState.getInt(STREAMING_SERVICE);
-            if(!searchQuery.isEmpty()) {
-                hideWatermark();
-                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);
-            // 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());
-
-            ActionBarHandler.getHandler().setupNavMenu(this);
-
-        }
-
-        SettingsActivity.initSettings(this);
-
-        // TODO: If exposing deep links into your app, handle intents here.
-    }
-
-    /**
-     * 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);
-            VideoItemDetailFragment fragment = new VideoItemDetailFragment();
-            fragment.setArguments(arguments);
-            getSupportFragmentManager().beginTransaction()
-                    .replace(R.id.videoitem_detail_container, fragment)
-                    .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 onCreatePanelMenu(int featured, Menu menu) {
-        super.onCreatePanelMenu(featured, menu);
-        if(findViewById(R.id.videoitem_detail_container) == null) {
-            MenuInflater inflater = getMenuInflater();
-            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 {
-            MenuInflater inflater = getMenuInflater();
-            ActionBarHandler.getHandler().setupMenu(menu, inflater, this);
-        }
-
-        return true;
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        int id = item.getItemId();
-        if(id == R.id.action_settings) {
-            Intent intent = new Intent(this, SettingsActivity.class);
-            startActivity(intent);
-        } else {
-            ActionBarHandler.getHandler().onItemSelected(item, this);
-            return super.onOptionsItemSelected(item);
-        }
-        return true;
-    }
-
-    @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,367 +0,0 @@
-package org.schabi.newpipe;
-
-import android.app.Activity;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.os.Bundle;
-import android.os.Handler;
-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.Vector;
-
-
-/**
- * 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;
-
-    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 class ResultRunnable implements Runnable {
-        private SearchEngine.Result result;
-        private int reuqestId;
-        public ResultRunnable(SearchEngine.Result result, int requestId) {
-            this.result = result;
-            this.reuqestId = requestId;
-        }
-        @Override
-        public void run() {
-            updateListOnResult(result, reuqestId);
-        }
-    }
-
-    private class SearchRunnable implements Runnable {
-        private Class engineClass = null;
-        private String query;
-        private int page;
-        Handler h = new Handler();
-        private volatile boolean run = true;
-        private int requestId;
-        public SearchRunnable(Class engineClass, String query, int page, int requestId) {
-            this.engineClass = engineClass;
-            this.query = query;
-            this.page = page;
-            this.requestId = requestId;
-        }
-        void terminate() {
-            run = false;
-        }
-        @Override
-        public void run() {
-            SearchEngine engine = null;
-            try {
-                engine = (SearchEngine) engineClass.newInstance();
-            } catch(Exception e) {
-                e.printStackTrace();
-                return;
-            }
-            try {
-                SearchEngine.Result result = engine.search(query, page);
-                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 Vector<String> thumbnailUrlList = new Vector<>();
-        private Vector<Boolean> downloadedList;
-        Handler h = new Handler();
-        private volatile boolean run = true;
-        private int requestId;
-        public LoadThumbsRunnable(Vector<VideoInfoItem> videoList,
-                                  Vector<Boolean> downloadedList, int requestId) {
-            for(VideoInfoItem 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 = null;
-                    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 int index;
-        private Bitmap thumbnail;
-        private 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, true);
-                videoListAdapter.setThumbnail(index, thumbnail);
-            }
-        }
-    }
-
-    public void search(String query) {
-        this.query = query;
-        this.lastPage = 1;
-        videoListAdapter.clearVideoList();
-        setListShown(false);
-        startSearch(query, lastPage);
-        getListView().smoothScrollToPosition(0);
-    }
-
-    public 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.getSearchEngineClass(), query, page, currentRequestId);
-        searchThread = new Thread(searchRunnable);
-        searchThread.start();
-    }
-
-    public void setStreamingService(StreamingService streamingService) {
-        this.streamingService = streamingService;
-    }
-
-    public 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(Vector<VideoInfoItem> 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 is not existing anymore.");
-        } catch(Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    public 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 realy terminate the thread. We just demand
-            // it to post its result runnable into the gui main loop.
-        }
-    }
-
-    void displayList() {
-
-    }
-
-    /**
-     * 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);
-    }
-
-    Callbacks mCallbacks = null;
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-    }
-
-    @Override
-    public void onViewCreated(View view, Bundle savedInstanceState) {
-        super.onViewCreated(view, savedInstanceState);
-        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() {
-            private static final float OVERSCROLL_THRESHOLD_IN_PIXELS = 100;
-            private float downY;
-            long lastScrollDate = 0;
-
-            @Override
-            public void onScrollStateChanged(AbsListView view, int scrollState) {
-            }
-
-            @Override
-            public void onScroll(AbsListView view, int firstVisibleItem, int visibleItemCount, int totalItemCount) {
-                ListView list = getListView();
-                if (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(Activity activity) {
-        super.onAttach(activity);
-
-        // Activities containing this fragment must implement its callbacks.
-        if (!(activity instanceof Callbacks)) {
-            throw new IllegalStateException("Activity must implement fragment's callbacks.");
-        }
-
-        mCallbacks = (Callbacks) activity;
-    }
-
-    @Override
-    public void onDetach() {
-        super.onDetach();
-    }
-
-    @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));
-    }
-
-    @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);
-        }
-        */
-    }
-
-    /**
-     * Turns on activate-on-click mode. When this mode is on, list items will be
-     * given the 'activated' state when touched.
-     */
-    public void setActivateOnItemClick(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,135 +0,0 @@
-package org.schabi.newpipe;
-
-import android.content.Context;
-import android.graphics.Bitmap;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.BaseAdapter;
-import android.widget.ImageView;
-import android.widget.ListView;
-import android.widget.TextView;
-
-import java.util.Vector;
-
-/**
- * Created by the-scrabi 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/>.
- */
-
-public class VideoListAdapter extends BaseAdapter {
-
-    private static final String TAG = VideoListAdapter.class.toString();
-    private LayoutInflater inflater;
-    private Vector<VideoInfoItem> videoList = new Vector<>();
-    private Vector<Boolean> downloadedThumbnailList = new Vector<>();
-    VideoItemListFragment videoListFragment;
-    ListView listView;
-
-    public VideoListAdapter(Context context, VideoItemListFragment videoListFragment) {
-        inflater = LayoutInflater.from(context);
-        this.videoListFragment = videoListFragment;
-        this.listView = videoListFragment.getListView();
-    }
-
-    public void addVideoList(Vector<VideoInfoItem> 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<VideoInfoItem> getVideoList() {
-        return videoList;
-    }
-
-    public void updateDownloadedThumbnailList(int index, boolean val) {
-        downloadedThumbnailList.set(index, val);
-    }
-
-    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) {
-        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);
-            convertView.setTag(holder);
-        } else {
-            holder = (ViewHolder) convertView.getTag();
-        }
-
-        final Context context = parent.getContext();
-        if(videoList.get(position).thumbnail == null) {
-            holder.itemThumbnailView.setImageResource(R.drawable.dummi_thumbnail);
-        } else {
-            holder.itemThumbnailView.setImageBitmap(videoList.get(position).thumbnail);
-        }
-        holder.itemVideoTitleView.setText(videoList.get(position).title);
-        holder.itemUploaderView.setText(videoList.get(position).uploader);
-        holder.itemDurationView.setText(videoList.get(position).duration);
-
-        if(listView.isItemChecked(position)) {
-            convertView.setBackgroundColor(context.getResources().getColor(R.color.actionBarColorYoutube));
-        } else {
-            convertView.setBackgroundColor(0);
-        }
-
-        return convertView;
-    }
-
-    private class ViewHolder {
-        public ImageView itemThumbnailView;
-        public TextView itemVideoTitleView, itemUploaderView, itemDurationView;
-    }
-}

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/fragments/OnItemSelectedListener.java

@@ -0,0 +1,10 @@
+package org.schabi.newpipe.fragments;
+
+import org.schabi.newpipe.extractor.StreamingService;
+
+/**
+ * Interface for communication purposes between activity and fragment
+ */
+public interface OnItemSelectedListener {
+    void onItemSelected(StreamingService.LinkType linkType, int serviceId, String url, String name);
+}

app/src/main/java/org/schabi/newpipe/fragments/channel/ChannelFragment.java

@@ -0,0 +1,416 @@
+package org.schabi.newpipe.fragments.channel;
+
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
+import android.support.v4.content.ContextCompat;
+import android.support.v7.app.ActionBar;
+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.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+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.ImageErrorLoadingListener;
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.extractor.NewPipe;
+import org.schabi.newpipe.extractor.channel.ChannelInfo;
+import org.schabi.newpipe.fragments.OnItemSelectedListener;
+import org.schabi.newpipe.info_list.InfoItemBuilder;
+import org.schabi.newpipe.info_list.InfoListAdapter;
+import org.schabi.newpipe.report.ErrorActivity;
+import org.schabi.newpipe.util.Constants;
+import org.schabi.newpipe.util.NavigationHelper;
+import org.schabi.newpipe.workers.ChannelExtractorWorker;
+
+import java.text.NumberFormat;
+
+import static android.os.Build.VERSION.SDK_INT;
+
+
+/**
+ * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
+ * ChannelFragment.java is part of NewPipe.
+ * <p>
+ * NewPipe is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * NewPipe is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+public class ChannelFragment extends Fragment implements ChannelExtractorWorker.OnChannelInfoReceive {
+    private static final String TAG = "ChannelFragment";
+
+    private AppCompatActivity activity;
+    private OnItemSelectedListener onItemSelectedListener;
+    private InfoListAdapter infoListAdapter;
+
+    private ChannelExtractorWorker currentExtractorWorker;
+    private ChannelInfo currentChannelInfo;
+    private int serviceId = -1;
+    private String channelName = "";
+    private String channelUrl = "";
+
+    private boolean isLoading = false;
+    private int pageNumber = 0;
+    private boolean hasNextPage = true;
+
+    private ImageLoader imageLoader = ImageLoader.getInstance();
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Views
+    //////////////////////////////////////////////////////////////////////////*/
+
+    private View rootView = null;
+
+    private RecyclerView channelVideosList;
+    private LinearLayoutManager layoutManager;
+    private ProgressBar loadingProgressBar;
+
+    private View headerRootLayout;
+    private ImageView headerChannelBanner;
+    private ImageView headerAvatarView;
+    private TextView headerTitleView;
+    private TextView headerSubscriberView;
+    private Button headerSubscriberButton;
+    private View headerSubscriberLayout;
+
+    /*////////////////////////////////////////////////////////////////////////*/
+
+    public ChannelFragment() {
+    }
+
+    public static ChannelFragment newInstance(int serviceId, String url, String name) {
+        ChannelFragment instance = newInstance();
+
+        Bundle bundle = new Bundle();
+        bundle.putString(Constants.KEY_URL, url);
+        bundle.putString(Constants.KEY_TITLE, name);
+        bundle.putInt(Constants.KEY_SERVICE_ID, serviceId);
+
+        instance.setArguments(bundle);
+        return instance;
+    }
+
+    public static ChannelFragment newInstance() {
+        return new ChannelFragment();
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Fragment's LifeCycle
+    //////////////////////////////////////////////////////////////////////////*/
+
+    @Override
+    public void onAttach(Context context) {
+        super.onAttach(context);
+        activity = ((AppCompatActivity) context);
+        onItemSelectedListener = ((OnItemSelectedListener) context);
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setHasOptionsMenu(true);
+        isLoading = false;
+        if (savedInstanceState != null) {
+            channelUrl = savedInstanceState.getString(Constants.KEY_URL);
+            channelName = savedInstanceState.getString(Constants.KEY_TITLE);
+            serviceId = savedInstanceState.getInt(Constants.KEY_SERVICE_ID, -1);
+        } else {
+            try {
+                Bundle args = getArguments();
+                if (args != null) {
+                    channelUrl = args.getString(Constants.KEY_URL);
+                    channelName = args.getString(Constants.KEY_TITLE);
+                    serviceId = args.getInt(Constants.KEY_SERVICE_ID, 0);
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+                ErrorActivity.reportError(getActivity(), e, null,
+                        getActivity().findViewById(android.R.id.content),
+                        ErrorActivity.ErrorInfo.make(ErrorActivity.SEARCHED,
+                                NewPipe.getNameOfService(serviceId),
+                                "", R.string.general_error));
+            }
+        }
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        rootView = inflater.inflate(R.layout.fragment_channel, container, false);
+        return rootView;
+    }
+
+    @Override
+    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+        loadingProgressBar = (ProgressBar) view.findViewById(R.id.loading_progress_bar);
+        channelVideosList = (RecyclerView) view.findViewById(R.id.channel_streams_view);
+
+        infoListAdapter = new InfoListAdapter(activity, rootView);
+        layoutManager = new LinearLayoutManager(activity);
+        channelVideosList.setLayoutManager(layoutManager);
+
+        headerRootLayout = activity.getLayoutInflater().inflate(R.layout.channel_header, channelVideosList, false);
+        infoListAdapter.setHeader(headerRootLayout);
+        infoListAdapter.setFooter(activity.getLayoutInflater().inflate(R.layout.pignate_footer, channelVideosList, false));
+        channelVideosList.setAdapter(infoListAdapter);
+
+        headerChannelBanner = (ImageView) headerRootLayout.findViewById(R.id.channel_banner_image);
+        headerAvatarView = (ImageView) headerRootLayout.findViewById(R.id.channel_avatar_view);
+        headerTitleView = (TextView) headerRootLayout.findViewById(R.id.channel_title_view);
+        headerSubscriberView = (TextView) headerRootLayout.findViewById(R.id.channel_subscriber_view);
+        headerSubscriberButton = (Button) headerRootLayout.findViewById(R.id.channel_subscribe_button);
+        headerSubscriberLayout = headerRootLayout.findViewById(R.id.channel_subscriber_layout);
+
+        initListeners();
+
+        isLoading = true;
+    }
+
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        headerAvatarView.setImageBitmap(null);
+        headerChannelBanner.setImageBitmap(null);
+        channelVideosList.removeAllViews();
+
+        rootView = null;
+        channelVideosList = null;
+        layoutManager = null;
+        loadingProgressBar = null;
+        headerRootLayout = null;
+        headerChannelBanner = null;
+        headerAvatarView = null;
+        headerTitleView = null;
+        headerSubscriberView = null;
+        headerSubscriberButton = null;
+        headerSubscriberLayout = null;
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        if (isLoading) {
+            requestData(false);
+        }
+    }
+
+    @Override
+    public void onStop() {
+        super.onStop();
+        if (currentExtractorWorker != null) currentExtractorWorker.cancel();
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        imageLoader.clearMemoryCache();
+    }
+
+    @Override
+    public void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+        outState.putString(Constants.KEY_URL, channelUrl);
+        outState.putString(Constants.KEY_TITLE, channelName);
+        outState.putInt(Constants.KEY_SERVICE_ID, serviceId);
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Menu
+    //////////////////////////////////////////////////////////////////////////*/
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        super.onCreateOptionsMenu(menu, inflater);
+        inflater.inflate(R.menu.menu_channel, menu);
+
+        ActionBar supportActionBar = activity.getSupportActionBar();
+        if (supportActionBar != null) {
+            supportActionBar.setDisplayShowTitleEnabled(true);
+            supportActionBar.setDisplayHomeAsUpEnabled(true);
+            //noinspection deprecation
+            supportActionBar.setNavigationMode(0);
+        }
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        super.onOptionsItemSelected(item);
+        switch (item.getItemId()) {
+            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)));
+                return true;
+            }
+            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)));
+                return true;
+            default:
+                return super.onOptionsItemSelected(item);
+        }
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Init's
+    //////////////////////////////////////////////////////////////////////////*/
+
+    private void initListeners() {
+        infoListAdapter.setOnStreamInfoItemSelectedListener(new InfoItemBuilder.OnInfoItemSelectedListener() {
+            @Override
+            public void selected(int serviceId, String url, String title) {
+                NavigationHelper.openVideoDetail(onItemSelectedListener, serviceId, url, title);
+            }
+        });
+
+        // detect if list has ben scrolled to the bottom
+        channelVideosList.setOnScrollListener(new RecyclerView.OnScrollListener() {
+            @Override
+            public void onScrolled(RecyclerView recyclerView, int dx, int dy) {
+                int pastVisiblesItems, visibleItemCount, totalItemCount;
+                super.onScrolled(recyclerView, dx, dy);
+                //check for scroll down
+                if (dy > 0) {
+                    visibleItemCount = layoutManager.getChildCount();
+                    totalItemCount = layoutManager.getItemCount();
+                    pastVisiblesItems = layoutManager.findFirstVisibleItemPosition();
+
+                    if ((visibleItemCount + pastVisiblesItems) >= totalItemCount && !currentExtractorWorker.isRunning() && hasNextPage) {
+                        pageNumber++;
+                        requestData(true);
+                    }
+                }
+            }
+        });
+
+        headerSubscriberButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                Log.d(TAG, currentChannelInfo.feed_url);
+                Intent i = new Intent(Intent.ACTION_VIEW, Uri.parse(currentChannelInfo.feed_url));
+                startActivity(i);
+            }
+        });
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Utils
+    //////////////////////////////////////////////////////////////////////////*/
+    private String buildSubscriberString(long count) {
+        String out = NumberFormat.getNumberInstance().format(count);
+        out += " " + getString(count > 1 ? R.string.subscriber_plural : R.string.subscriber);
+        return out;
+    }
+
+    private void requestData(boolean onlyVideos) {
+        if (currentExtractorWorker != null && currentExtractorWorker.isRunning()) currentExtractorWorker.cancel();
+
+        isLoading = true;
+        if (!onlyVideos) {
+            //delete already displayed content
+            loadingProgressBar.setVisibility(View.VISIBLE);
+            infoListAdapter.clearSteamItemList();
+            pageNumber = 0;
+            headerSubscriberLayout.setVisibility(View.GONE);
+            headerTitleView.setText(channelName != null ? channelName : "");
+            if (activity.getSupportActionBar() != null) activity.getSupportActionBar().setTitle(channelName != null ? channelName : "");
+            if (SDK_INT >= 21) {
+                headerChannelBanner.setImageDrawable(ContextCompat.getDrawable(activity, R.drawable.channel_banner));
+                headerAvatarView.setImageDrawable(ContextCompat.getDrawable(activity, R.drawable.buddy));
+            }
+            infoListAdapter.showFooter(false);
+        }
+
+        currentExtractorWorker = new ChannelExtractorWorker(activity, serviceId, channelUrl, pageNumber, this);
+        currentExtractorWorker.setOnlyVideos(onlyVideos);
+        currentExtractorWorker.start();
+    }
+
+    private void addVideos(ChannelInfo info) {
+        infoListAdapter.addInfoItemList(info.related_streams);
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // OnChannelInfoReceiveListener
+    //////////////////////////////////////////////////////////////////////////*/
+
+    @Override
+    public void onReceive(ChannelInfo info) {
+        if (info == null || isRemoving() || !isVisible()) return;
+
+        currentChannelInfo = info;
+
+        if (!currentExtractorWorker.isOnlyVideos()) {
+            headerRootLayout.setVisibility(View.VISIBLE);
+            loadingProgressBar.setVisibility(View.GONE);
+
+            if (info.channel_name != null && !info.channel_name.isEmpty()) {
+                if (activity.getSupportActionBar() != null) activity.getSupportActionBar().setTitle(info.channel_name);
+                headerTitleView.setText(info.channel_name);
+                channelName = info.channel_name;
+            } else channelName = "";
+
+            if (info.banner_url != null && !info.banner_url.isEmpty()) {
+                imageLoader.displayImage(info.banner_url, headerChannelBanner,
+                        new ImageErrorLoadingListener(activity, rootView, info.service_id));
+            }
+
+            if (info.avatar_url != null && !info.avatar_url.isEmpty()) {
+                headerAvatarView.setVisibility(View.VISIBLE);
+                imageLoader.displayImage(info.avatar_url, headerAvatarView,
+                        new ImageErrorLoadingListener(activity, rootView, info.service_id));
+            }
+
+            if (info.subscriberCount != -1) {
+                headerSubscriberView.setText(buildSubscriberString(info.subscriberCount));
+            }
+
+            if ((info.feed_url != null && !info.feed_url.isEmpty()) || (info.subscriberCount != -1)) {
+                headerSubscriberLayout.setVisibility(View.VISIBLE);
+            }
+
+            if (info.feed_url == null || info.feed_url.isEmpty()) {
+                headerSubscriberButton.setVisibility(View.INVISIBLE);
+            }
+
+            infoListAdapter.showFooter(true);
+        }
+        hasNextPage = info.hasNextPage;
+        if (!hasNextPage) infoListAdapter.showFooter(false);
+        addVideos(info);
+        isLoading = false;
+    }
+
+    @Override
+    public void onError(int messageId) {
+        Toast.makeText(activity, messageId, Toast.LENGTH_LONG).show();
+    }
+}

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

@@ -0,0 +1,213 @@
+package org.schabi.newpipe.fragments.detail;
+
+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.extractor.MediaFormat;
+import org.schabi.newpipe.extractor.stream_info.VideoStream;
+import org.schabi.newpipe.util.Utils;
+
+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 VideoDetailFragment will implement those callbacks.
+    private OnActionListener onShareListener;
+    private OnActionListener onOpenInBrowserListener;
+    private OnActionListener onOpenInPopupListener;
+    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 = Utils.getPreferredResolution(activity, 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);
+        }
+    }
+
+    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_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_popup: {
+                if(onOpenInPopupListener != null) {
+                    onOpenInPopupListener.onActionSelected(selectedVideoStream);
+                }
+                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 setOnOpenInPopupListener(OnActionListener listener) {
+        onOpenInPopupListener = 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/fragments/detail/StackItem.java

@@ -0,0 +1,31 @@
+package org.schabi.newpipe.fragments.detail;
+
+import java.io.Serializable;
+
+
+@SuppressWarnings("WeakerAccess")
+public class StackItem implements Serializable {
+    private String title, url;
+
+    public StackItem(String url, String title) {
+        this.title = title;
+        this.url = url;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    @Override
+    public String toString() {
+        return getUrl() + " > " + getTitle();
+    }
+}

app/src/main/java/org/schabi/newpipe/fragments/search/SearchFragment.java

@@ -0,0 +1,440 @@
+package org.schabi.newpipe.fragments.search;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
+import android.support.v7.app.ActionBar;
+import android.support.v7.app.AppCompatActivity;
+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.R;
+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.fragments.OnItemSelectedListener;
+import org.schabi.newpipe.info_list.InfoItemBuilder;
+import org.schabi.newpipe.info_list.InfoListAdapter;
+import org.schabi.newpipe.report.ErrorActivity;
+import org.schabi.newpipe.util.NavigationHelper;
+
+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.
+ * <p>
+ * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
+ * SearchFragment.java is part of NewPipe.
+ * <p>
+ * NewPipe is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * NewPipe is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+public class SearchFragment extends Fragment implements SearchView.OnQueryTextListener, SearchWorker.SearchWorkerResultListener {
+
+    private static final String TAG = SearchFragment.class.toString();
+
+    // savedInstanceBundle arguments
+    private static final String QUERY = "query";
+    private static final String STREAMING_SERVICE = "streaming_service";
+
+    private int streamingServiceId = -1;
+    private String searchQuery = "";
+    private boolean isLoading = false;
+
+    @SuppressWarnings("FieldCanBeLocal")
+    private SearchView searchView;
+    private RecyclerView recyclerView;
+    private ProgressBar loadingIndicator;
+    private int pageNumber = 0;
+    private SuggestionListAdapter suggestionListAdapter;
+    private InfoListAdapter infoListAdapter;
+    private LinearLayoutManager streamInfoListLayoutManager;
+
+    private EnumSet<SearchEngine.Filter> filter = EnumSet.of(SearchEngine.Filter.CHANNEL, SearchEngine.Filter.STREAM);
+    private OnItemSelectedListener onItemSelectedListener;
+
+    /**
+     * Mandatory empty constructor for the fragment manager to instantiate the
+     * fragment (e.g. upon screen orientation changes).
+     */
+    public SearchFragment() {
+    }
+
+    @SuppressWarnings("unused")
+    public static SearchFragment newInstance(int streamingServiceId, String searchQuery) {
+        Bundle args = new Bundle();
+        args.putInt(STREAMING_SERVICE, streamingServiceId);
+        args.putString(QUERY, searchQuery);
+        SearchFragment fragment = new SearchFragment();
+        fragment.setArguments(args);
+        return fragment;
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Fragment's LifeCycle
+    //////////////////////////////////////////////////////////////////////////*/
+
+    @Override
+    public void onAttach(Context context) {
+        super.onAttach(context);
+        onItemSelectedListener = ((OnItemSelectedListener) context);
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        searchQuery = "";
+        isLoading = false;
+        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(this);
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        View view = inflater.inflate(R.layout.fragment_search, container, false);
+
+        Context context = view.getContext();
+        loadingIndicator = (ProgressBar) view.findViewById(R.id.loading_progress_bar);
+        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(int serviceId, String url, String title) {
+                NavigationHelper.openVideoDetail(onItemSelectedListener, serviceId, url, title);
+            }
+        });
+        infoListAdapter.setOnChannelInfoItemSelectedListener(new InfoItemBuilder.OnInfoItemSelectedListener() {
+            @Override
+            public void selected(int serviceId, String url, String title) {
+                NavigationHelper.openChannel(onItemSelectedListener, serviceId, url, title);
+            }
+        });
+        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++;
+                        recyclerView.post(new Runnable() {
+                            @Override
+                            public void run() {
+                                infoListAdapter.showFooter(true);
+
+                            }
+                        });
+                        search(searchQuery, pageNumber);
+                    }
+                }
+            }
+        });
+
+        return view;
+    }
+
+    @Override
+    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        if (!searchQuery.isEmpty()) {
+            search(searchQuery);
+        }
+    }
+
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        recyclerView.removeAllViews();
+        infoListAdapter.clearSteamItemList();
+        recyclerView = null;
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        if (isLoading && !searchQuery.isEmpty()) {
+            search(searchQuery);
+        }
+    }
+
+    @Override
+    public void onStop() {
+        super.onStop();
+        SearchWorker.getInstance().terminate();
+    }
+
+    @Override
+    public void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+        outState.putString(QUERY, searchQuery);
+        outState.putInt(STREAMING_SERVICE, streamingServiceId);
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        switch (requestCode) {
+            case RECAPTCHA_REQUEST:
+                if (resultCode == RESULT_OK && searchQuery.length() != 0) {
+                    search(searchQuery);
+                } else Log.e(TAG, "ReCaptcha failed");
+                break;
+
+            default:
+                Log.e(TAG, "Request code from activity not supported [" + requestCode + "]");
+                break;
+        }
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Menu
+    //////////////////////////////////////////////////////////////////////////*/
+
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        super.onCreateOptionsMenu(menu, inflater);
+        ActionBar supportActionBar = ((AppCompatActivity) getActivity()).getSupportActionBar();
+        if (supportActionBar != null) {
+            supportActionBar.setDisplayHomeAsUpEnabled(false);
+            supportActionBar.setDisplayShowTitleEnabled(false);
+            //noinspection deprecation
+            supportActionBar.setNavigationMode(0);
+        }
+        inflater.inflate(R.menu.search_menu, menu);
+
+        MenuItem searchItem = menu.findItem(R.id.action_search);
+        searchView = (SearchView) searchItem.getActionView();
+        setupSearchView(searchView);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        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;
+        }
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Utils
+    //////////////////////////////////////////////////////////////////////////*/
+
+    private void changeFilter(MenuItem item, EnumSet<SearchEngine.Filter> filter) {
+        this.filter = filter;
+        item.setChecked(true);
+        if (searchQuery != null && !searchQuery.isEmpty()) {
+            Log.e(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(this);
+        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() {
+        isLoading = false;
+        loadingIndicator.setVisibility(View.GONE);
+        infoListAdapter.showFooter(false);
+    }
+
+    /**
+     * 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();
+    }
+
+    public boolean isMainBgVisible() {
+        return getActivity().findViewById(R.id.mainBG).getVisibility() == View.VISIBLE;
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // 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;
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // 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);
+    }
+
+}

app/src/main/java/org/schabi/newpipe/fragments/search/SearchSuggestionListener.java

@@ -0,0 +1,49 @@
+package org.schabi.newpipe.fragments.search;
+
+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/fragments/search/SearchWorker.java

@@ -0,0 +1,216 @@
+package org.schabi.newpipe.fragments.search;
+
+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.R;
+import org.schabi.newpipe.extractor.NewPipe;
+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 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() {
+        if (runnable == null) return;
+        requestId++;
+        runnable.terminate();
+    }
+}

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

@@ -0,0 +1,84 @@
+package org.schabi.newpipe.fragments.search;
+
+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/fragments/search/SuggestionSearchRunnable.java

@@ -0,0 +1,105 @@
+package org.schabi.newpipe.fragments.search;
+
+import android.app.Activity;
+import android.content.SharedPreferences;
+import android.os.Handler;
+import android.preference.PreferenceManager;
+import android.widget.Toast;
+
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.extractor.NewPipe;
+import org.schabi.newpipe.extractor.SuggestionExtractor;
+import org.schabi.newpipe.extractor.exceptions.ExtractionException;
+import org.schabi.newpipe.report.ErrorActivity;
+
+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/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,273 @@
+package org.schabi.newpipe.info_list;
+
+import android.content.Context;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.nostra13.universalimageloader.core.DisplayImageOptions;
+import com.nostra13.universalimageloader.core.ImageLoader;
+
+import org.schabi.newpipe.ImageErrorLoadingListener;
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.extractor.AbstractStreamInfo;
+import org.schabi.newpipe.extractor.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 {
+
+    private final String viewsS;
+    private final String videosS;
+    private final String subsS;
+    private final String subsPluralS;
+
+    private final String thousand;
+    private final String million;
+    private final String billion;
+
+    private static final String TAG = InfoItemBuilder.class.toString();
+    public interface OnInfoItemSelectedListener {
+        void selected(int serviceId, String url, String title);
+    }
+
+    private Context mContext = 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(Context context, View rootView) {
+        mContext = context;
+        this.rootView = rootView;
+        viewsS = context.getString(R.string.views);
+        videosS = context.getString(R.string.videos);
+        subsS = context.getString(R.string.subscriber);
+        subsPluralS = context.getString(R.string.subscriber_plural);
+        thousand = context.getString(R.string.short_thousand);
+        million = context.getString(R.string.short_million);
+        billion = context.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(mContext, rootView, info.service_id));
+        }
+
+        holder.itemButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                onStreamInfoItemSelectedListener.selected(info.service_id, info.webpage_url, info.getTitle());
+            }
+        });
+    }
+
+    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(mContext, rootView, info.serviceId));
+        }
+
+        holder.itemButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                onChannelInfoItemSelectedListener.selected(info.serviceId, info.getLink(), info.channelName);
+            }
+        });
+    }
+
+
+    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) {
+        String curSubString = count > 1 ? subsPluralS : subsS;
+
+        if (count >= 1000000000) {
+            return Long.toString(count / 1000000000) + billion + " " + curSubString;
+        } else if (count >= 1000000) {
+            return Long.toString(count / 1000000) + million + " " + curSubString;
+        } else if (count >= 1000) {
+            return Long.toString(count / 1000) + thousand + " " + curSubString;
+        } else {
+            return Long.toString(count) + " " + curSubString;
+        }
+    }
+
+    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

@@ -1,12 +1,15 @@
-package org.schabi.newpipe;
+package org.schabi.newpipe.info_list;
 
-import android.graphics.Bitmap;
+import android.support.v7.widget.RecyclerView;
+import android.view.View;
+
+import org.schabi.newpipe.extractor.InfoItem;
 
 /**
- * Created by Christian Schabesberger on 10.08.15.
+ * Created by Christian Schabesberger on 12.02.17.
  *
- * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
- * Extractor.java is part of NewPipe.
+ * 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
@@ -22,9 +25,9 @@ import android.graphics.Bitmap;
  * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-
-public interface Extractor {
-    VideoInfo getVideoInfo(String siteUrl);
-    String getVideoUrl(String videoId);
-    String getVideoId(String videoUrl);
+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,587 @@
+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.MainActivity;
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.extractor.StreamingService;
+import org.schabi.newpipe.util.Constants;
+
+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, "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(), MainActivity.class);
+            openDetailViewIntent.putExtra(Constants.KEY_SERVICE_ID, serviceId);
+            openDetailViewIntent.putExtra(Constants.KEY_URL, webUrl);
+            openDetailViewIntent.putExtra(Constants.KEY_TITLE, title);
+            openDetailViewIntent.putExtra(Constants.KEY_LINK_TYPE, StreamingService.LinkType.STREAM);
+            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;
+                } 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,580 @@
+package org.schabi.newpipe.player;
+
+import android.app.Activity;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.pm.ActivityInfo;
+import android.graphics.Color;
+import android.media.AudioManager;
+import android.net.Uri;
+import android.os.Build;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.util.Log;
+import android.view.GestureDetector;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.WindowManager;
+import android.widget.ImageButton;
+import android.widget.PopupMenu;
+import android.widget.SeekBar;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.util.PermissionHelper;
+import org.schabi.newpipe.util.ThemeHelper;
+
+/**
+ * Activity Player implementing AbstractPlayer
+ *
+ * @author mauriciocolli
+ */
+public class ExoPlayerActivity extends Activity {
+    private static final String TAG = ".ExoPlayerActivity";
+    private static final boolean DEBUG = AbstractPlayer.DEBUG;
+
+    private AudioManager audioManager;
+    private BroadcastReceiver broadcastReceiver;
+    private GestureDetector gestureDetector;
+
+    private final Runnable hideUiRunnable = new Runnable() {
+        @Override
+        public void run() {
+            hideSystemUi();
+        }
+    };
+    private boolean activityPaused;
+
+    private AbstractPlayerImpl playerImpl;
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Activity LifeCycle
+    //////////////////////////////////////////////////////////////////////////*/
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        if (DEBUG) Log.d(TAG, "onCreate() called with: savedInstanceState = [" + savedInstanceState + "]");
+        ThemeHelper.setTheme(this, false);
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) getWindow().setStatusBarColor(Color.BLACK);
+        setVolumeControlStream(AudioManager.STREAM_MUSIC);
+        audioManager = (AudioManager) getSystemService(Context.AUDIO_SERVICE);
+
+        if (getIntent() == null) {
+            Toast.makeText(this, R.string.general_error, Toast.LENGTH_SHORT).show();
+            finish();
+            return;
+        }
+
+        showSystemUi();
+        setContentView(R.layout.activity_exo_player);
+        playerImpl = new AbstractPlayerImpl();
+        playerImpl.setup(findViewById(android.R.id.content));
+        initReceiver();
+        playerImpl.handleIntent(getIntent());
+    }
+
+    @Override
+    protected void onNewIntent(Intent intent) {
+        if (DEBUG) Log.d(TAG, "onNewIntent() called with: intent = [" + intent + "]");
+        super.onNewIntent(intent);
+        playerImpl.handleIntent(intent);
+    }
+
+    @Override
+    public void onBackPressed() {
+        if (DEBUG) Log.d(TAG, "onBackPressed() called");
+        super.onBackPressed();
+        if (playerImpl.isPlaying()) playerImpl.getPlayer().setPlayWhenReady(false);
+    }
+
+    @Override
+    protected void onStop() {
+        super.onStop();
+        if (DEBUG) Log.d(TAG, "onStop() called");
+        activityPaused = true;
+        playerImpl.destroy();
+        playerImpl.setVideoStartPos((int) playerImpl.getPlayer().getCurrentPosition());
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        if (DEBUG) Log.d(TAG, "onResume() called");
+        if (activityPaused) {
+            //playerImpl.getPlayer().setPlayWhenReady(true);
+            playerImpl.getPlayPauseButton().setImageResource(R.drawable.ic_play_arrow_white);
+            playerImpl.initPlayer();
+            playerImpl.playVideo(playerImpl.getSelectedStreamUri(), false);
+            activityPaused = false;
+        }
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        if (DEBUG) Log.d(TAG, "onDestroy() called");
+        if (playerImpl != null) playerImpl.destroy();
+        if (broadcastReceiver != null) unregisterReceiver(broadcastReceiver);
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Init
+    //////////////////////////////////////////////////////////////////////////*/
+
+    private void initReceiver() {
+        if (DEBUG) Log.d(TAG, "initReceiver() called");
+        broadcastReceiver = new BroadcastReceiver() {
+            @Override
+            public void onReceive(Context context, Intent intent) {
+                if (DEBUG) Log.d(TAG, "onReceive() called with: context = [" + context + "], intent = [" + intent + "]");
+                switch (intent.getAction()) {
+                    case AbstractPlayer.ACTION_UPDATE_THUMB:
+                        playerImpl.onUpdateThumbnail(intent);
+                        break;
+                }
+            }
+        };
+        IntentFilter intentFilter = new IntentFilter();
+        intentFilter.addAction(AbstractPlayer.ACTION_UPDATE_THUMB);
+        registerReceiver(broadcastReceiver, intentFilter);
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Utils
+    //////////////////////////////////////////////////////////////////////////*/
+
+    private void showSystemUi() {
+        if (DEBUG) Log.d(TAG, "showSystemUi() called");
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
+            getWindow().getDecorView().setSystemUiVisibility(
+                    View.SYSTEM_UI_FLAG_LAYOUT_STABLE
+                            | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
+                            | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
+            );
+        } else getWindow().getDecorView().setSystemUiVisibility(0);
+        getWindow().clearFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
+    }
+
+    private void hideSystemUi() {
+        if (DEBUG) Log.d(TAG, "hideSystemUi() called");
+        if (android.os.Build.VERSION.SDK_INT >= 16) {
+            int visibility = View.SYSTEM_UI_FLAG_LAYOUT_STABLE
+                    | View.SYSTEM_UI_FLAG_FULLSCREEN
+                    | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
+                    | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
+                    | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN;
+            if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.KITKAT) visibility |= View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY;
+            getWindow().getDecorView().setSystemUiVisibility(visibility);
+        }
+        getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN);
+    }
+
+    private void toggleOrientation() {
+        setRequestedOrientation(getResources().getDisplayMetrics().heightPixels > getResources().getDisplayMetrics().widthPixels
+                ? ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE
+                : ActivityInfo.SCREEN_ORIENTATION_SENSOR_PORTRAIT);
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+
+    @SuppressWarnings({"unused", "WeakerAccess"})
+    private class AbstractPlayerImpl extends AbstractPlayer {
+        private TextView titleTextView;
+        private TextView channelTextView;
+        private TextView volumeTextView;
+        private TextView brightnessTextView;
+        private ImageButton repeatButton;
+
+        private ImageButton screenRotationButton;
+        private ImageButton playPauseButton;
+
+        AbstractPlayerImpl() {
+            super("AbstractPlayerImpl" + ExoPlayerActivity.TAG, ExoPlayerActivity.this);
+        }
+
+        @Override
+        public void initViews(View rootView) {
+            super.initViews(rootView);
+            this.titleTextView = (TextView) rootView.findViewById(R.id.titleTextView);
+            this.channelTextView = (TextView) rootView.findViewById(R.id.channelTextView);
+            this.volumeTextView = (TextView) rootView.findViewById(R.id.volumeTextView);
+            this.brightnessTextView = (TextView) rootView.findViewById(R.id.brightnessTextView);
+            this.repeatButton = (ImageButton) rootView.findViewById(R.id.repeatButton);
+
+            this.screenRotationButton = (ImageButton) rootView.findViewById(R.id.screenRotationButton);
+            this.playPauseButton = (ImageButton) rootView.findViewById(R.id.playPauseButton);
+
+            // Due to a bug on lower API, lets set the alpha instead of using a drawable
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) repeatButton.setImageAlpha(77);
+            else { //noinspection deprecation
+                repeatButton.setAlpha(77);
+            }
+
+        }
+
+        @Override
+        public void initListeners() {
+            super.initListeners();
+
+            MySimpleOnGestureListener listener = new MySimpleOnGestureListener();
+            gestureDetector = new GestureDetector(context, listener);
+            gestureDetector.setIsLongpressEnabled(false);
+            playerImpl.getRootView().setOnTouchListener(listener);
+
+            repeatButton.setOnClickListener(this);
+            playPauseButton.setOnClickListener(this);
+            screenRotationButton.setOnClickListener(this);
+        }
+
+        @Override
+        public void handleIntent(Intent intent) {
+            super.handleIntent(intent);
+            titleTextView.setText(getVideoTitle());
+            channelTextView.setText(getChannelName());
+        }
+
+        @Override
+        public void playVideo(Uri videoURI, boolean autoPlay) {
+            super.playVideo(videoURI, autoPlay);
+            playPauseButton.setImageResource(autoPlay ? R.drawable.ic_pause_white : R.drawable.ic_play_arrow_white);
+        }
+
+        @Override
+        public void onFullScreenButtonClicked() {
+            if (DEBUG) Log.d(TAG, "onFullScreenButtonClicked() called");
+            if (playerImpl.getPlayer() == null) return;
+
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M
+                    && !PermissionHelper.checkSystemAlertWindowPermission(ExoPlayerActivity.this)) {
+                Toast.makeText(ExoPlayerActivity.this, R.string.msg_popup_permission, Toast.LENGTH_LONG).show();
+                return;
+            }
+
+            Intent i = new Intent(ExoPlayerActivity.this, PopupVideoPlayer.class);
+            i.putExtra(AbstractPlayer.VIDEO_TITLE, getVideoTitle())
+                    .putExtra(AbstractPlayer.CHANNEL_NAME, getChannelName())
+                    .putExtra(AbstractPlayer.VIDEO_URL, getVideoUrl())
+                    .putExtra(AbstractPlayer.INDEX_SEL_VIDEO_STREAM, getSelectedIndexStream())
+                    .putExtra(AbstractPlayer.VIDEO_STREAMS_LIST, getVideoStreamsList())
+                    .putExtra(AbstractPlayer.START_POSITION, ((int) getPlayer().getCurrentPosition()));
+            context.startService(i);
+            ((View) getControlAnimationView().getParent()).setVisibility(View.GONE);
+            if (playerImpl.isPlaying()) playerImpl.getPlayer().setPlayWhenReady(false);
+            ExoPlayerActivity.this.finish();
+        }
+
+        @Override
+        @SuppressWarnings("deprecation")
+        public void onRepeatClicked() {
+            super.onRepeatClicked();
+            if (DEBUG) Log.d(TAG, "onRepeatClicked() called");
+            switch (getCurrentRepeatMode()) {
+                case REPEAT_DISABLED:
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) repeatButton.setImageAlpha(77);
+                    else repeatButton.setAlpha(77);
+
+                    break;
+                case REPEAT_ONE:
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) repeatButton.setImageAlpha(255);
+                    else repeatButton.setAlpha(255);
+
+                    break;
+                case REPEAT_ALL:
+                    // Waiting :)
+                    break;
+            }
+        }
+
+        @Override
+        public void onClick(View v) {
+            super.onClick(v);
+            if (v.getId() == repeatButton.getId()) onRepeatClicked();
+            else if (v.getId() == playPauseButton.getId()) onVideoPlayPause();
+            else if (v.getId() == screenRotationButton.getId()) onScreenRotationClicked();
+
+            if (getCurrentState() != STATE_COMPLETED) {
+                animateView(playerImpl.getControlsRoot(), true, 300, 0, new Runnable() {
+                    @Override
+                    public void run() {
+                        if (getCurrentState() == STATE_PLAYING && !playerImpl.isQualityMenuVisible()) {
+                            animateView(playerImpl.getControlsRoot(), false, 300, DEFAULT_CONTROLS_HIDE_TIME, true);
+                        }
+                    }
+                }, false);
+            }
+        }
+
+        private void onScreenRotationClicked() {
+            if (DEBUG) Log.d(TAG, "onScreenRotationClicked() called");
+            toggleOrientation();
+        }
+
+        @Override
+        public void onVideoPlayPause() {
+            super.onVideoPlayPause();
+            if (getPlayer().getPlayWhenReady()) {
+                animateView(playPauseButton, false, 80, 0, new Runnable() {
+                    @Override
+                    public void run() {
+                        playPauseButton.setImageResource(R.drawable.ic_pause_white);
+                        animateView(playPauseButton, true, 200, 0);
+                    }
+                });
+            } else {
+                animateView(playPauseButton, false, 80, 0, new Runnable() {
+                    @Override
+                    public void run() {
+                        playPauseButton.setImageResource(R.drawable.ic_play_arrow_white);
+                        animateView(playPauseButton, true, 200, 0);
+                    }
+                });
+            }
+        }
+
+        @Override
+        public void onStopTrackingTouch(SeekBar seekBar) {
+            super.onStopTrackingTouch(seekBar);
+            if (playerImpl.wasPlaying()) {
+                animateView(playerImpl.getControlsRoot(), false, 100, 0);
+            }
+        }
+
+        @Override
+        public void onDismiss(PopupMenu menu) {
+            super.onDismiss(menu);
+            if (isPlaying()) animateView(getControlsRoot(), false, 500, 0, true);
+        }
+
+        @Override
+        public void onError() {
+            Toast.makeText(context, "Failed to play this video", Toast.LENGTH_SHORT).show();
+            finish();
+        }
+
+        /*//////////////////////////////////////////////////////////////////////////
+        // States
+        //////////////////////////////////////////////////////////////////////////*/
+
+        @Override
+        public void onLoading() {
+            super.onLoading();
+            playPauseButton.setImageResource(R.drawable.ic_pause_white);
+            animateView(playPauseButton, false, 100, 0);
+        }
+
+        @Override
+        public void onBuffering() {
+            super.onBuffering();
+            animateView(playPauseButton, false, 100, 0);
+        }
+
+        @Override
+        public void onPaused() {
+            super.onPaused();
+            animateView(playPauseButton, true, 100, 0);
+            showSystemUi();
+        }
+
+        @Override
+        public void onPausedSeek() {
+            super.onPausedSeek();
+            animateView(playPauseButton, false, 100, 0);
+        }
+
+        @Override
+        public void onPlaying() {
+            super.onPlaying();
+            animateView(playPauseButton, true, 500, 0);
+            showSystemUi();
+        }
+
+        @Override
+        public void onCompleted() {
+            if (getCurrentRepeatMode() == RepeatMode.REPEAT_ONE) {
+                playPauseButton.setImageResource(R.drawable.ic_pause_white);
+            } else {
+                showSystemUi();
+                animateView(playPauseButton, false, 0, 0, new Runnable() {
+                    @Override
+                    public void run() {
+                        playPauseButton.setImageResource(R.drawable.ic_replay_white);
+                        animateView(playPauseButton, true, 300, 0);
+                    }
+                });
+            }
+            super.onCompleted();
+        }
+
+        /*//////////////////////////////////////////////////////////////////////////
+        // Utils
+        //////////////////////////////////////////////////////////////////////////*/
+
+        @Override
+        public void animateView(View view, boolean enterOrExit, long duration, long delay, final Runnable execOnEnd, boolean hideUi) {
+            //if (execOnEnd == null) playerImpl.setDefaultAnimationEnd(hideUiRunnable);
+
+            if (hideUi && execOnEnd != null) {
+                Runnable combinedRunnable = new Runnable() {
+                    @Override
+                    public void run() {
+                        execOnEnd.run();
+                        hideUiRunnable.run();
+                    }
+                };
+                super.animateView(view, enterOrExit, duration, delay, combinedRunnable, true);
+            } else super.animateView(view, enterOrExit, duration, delay, hideUi ? hideUiRunnable : execOnEnd, hideUi);
+        }
+
+        ///////////////////////////////////////////////////////////////////////////
+        // Getters
+        ///////////////////////////////////////////////////////////////////////////
+
+        public TextView getTitleTextView() {
+            return titleTextView;
+        }
+
+        public TextView getChannelTextView() {
+            return channelTextView;
+        }
+
+        public TextView getVolumeTextView() {
+            return volumeTextView;
+        }
+
+        public TextView getBrightnessTextView() {
+            return brightnessTextView;
+        }
+
+        public ImageButton getRepeatButton() {
+            return repeatButton;
+        }
+
+        public ImageButton getPlayPauseButton() {
+            return playPauseButton;
+        }
+    }
+
+    private class MySimpleOnGestureListener extends GestureDetector.SimpleOnGestureListener implements View.OnTouchListener {
+        private boolean isMoving;
+
+        @Override
+        public boolean onDoubleTap(MotionEvent e) {
+            if (DEBUG) Log.d(TAG, "onDoubleTap() called with: e = [" + e + "]" + "rawXy = " + e.getRawX() + ", " + e.getRawY() + ", xy = " + e.getX() + ", " + e.getY());
+            if (!playerImpl.isPlaying()) return false;
+            if (e.getX() > playerImpl.getRootView().getWidth() / 2) playerImpl.onFastForward();
+            else playerImpl.onFastRewind();
+            return true;
+        }
+
+        @Override
+        public boolean onSingleTapConfirmed(MotionEvent e) {
+            if (DEBUG) Log.d(TAG, "onSingleTapConfirmed() called with: e = [" + e + "]");
+            if (playerImpl.getCurrentState() != StateInterface.STATE_PLAYING) return true;
+
+            if (playerImpl.isControlsVisible()) playerImpl.animateView(playerImpl.getControlsRoot(), false, 150, 0, true);
+            else {
+                playerImpl.animateView(playerImpl.getControlsRoot(), true, 500, 0, new Runnable() {
+                    @Override
+                    public void run() {
+                        playerImpl.animateView(playerImpl.getControlsRoot(), false, 300, AbstractPlayer.DEFAULT_CONTROLS_HIDE_TIME, true);
+                    }
+                });
+                showSystemUi();
+            }
+            return true;
+        }
+
+        private final float stepsBrightness = 21, stepBrightness = (1f / stepsBrightness), minBrightness = .01f;
+        private float currentBrightness = .5f;
+
+        private int currentVolume, maxVolume = audioManager.getStreamMaxVolume(AudioManager.STREAM_MUSIC);
+
+        private final String brightnessUnicode = new String(Character.toChars(0x2600));
+        //        private final String volumeUnicode = new String(Character.toChars(0x1F50A));
+        private final String volumeUnicode = new String(Character.toChars(0x1F508));
+
+
+        private final int MOVEMENT_THRESHOLD = 40;
+        private final int eventsThreshold = 3;
+        private boolean triggered = false;
+        private int eventsNum;
+
+        @Override
+        public boolean onScroll(MotionEvent e1, MotionEvent e2, float distanceX, float distanceY) {
+            //noinspection PointlessBooleanExpression
+            if (DEBUG && false) Log.d(TAG, "ExoPlayerActivity.onScroll = " +
+                    ", e1.getRaw = [" + e1.getRawX() + ", " + e1.getRawY() + "]" +
+                    ", e2.getRaw = [" + e2.getRawX() + ", " + e2.getRawY() + "]" +
+                    ", distanceXy = [" + distanceX + ", " + distanceY + "]");
+            float abs = Math.abs(e2.getY() - e1.getY());
+            if (!triggered) {
+                triggered = abs > MOVEMENT_THRESHOLD;
+                return false;
+            }
+
+            if (eventsNum++ % eventsThreshold != 0 || playerImpl.getCurrentState() == StateInterface.STATE_COMPLETED) return false;
+            isMoving = true;
+//            boolean up = !((e2.getY() - e1.getY()) > 0) && distanceY > 0; // Android's origin point is on top
+            boolean up = distanceY > 0;
+
+
+            if (e1.getX() > playerImpl.getRootView().getWidth() / 2) {
+                currentVolume = audioManager.getStreamVolume(AudioManager.STREAM_MUSIC) + (up ? 1 : -1);
+                if (currentVolume >= maxVolume) currentVolume = maxVolume;
+                if (currentVolume <= 0) currentVolume = 0;
+                audioManager.setStreamVolume(AudioManager.STREAM_MUSIC, currentVolume, 0);
+
+                if (DEBUG) Log.d(TAG, "onScroll().volumeControl, currentVolume = " + currentVolume);
+                playerImpl.getVolumeTextView().setText(volumeUnicode + " " + Math.round((((float) currentVolume) / maxVolume) * 100) + "%");
+
+                if (playerImpl.getVolumeTextView().getVisibility() != View.VISIBLE) playerImpl.animateView(playerImpl.getVolumeTextView(), true, 200, 0);
+                if (playerImpl.getBrightnessTextView().getVisibility() == View.VISIBLE) playerImpl.getBrightnessTextView().setVisibility(View.GONE);
+            } else {
+                WindowManager.LayoutParams lp = getWindow().getAttributes();
+                currentBrightness += up ? stepBrightness : -stepBrightness;
+                if (currentBrightness >= 1f) currentBrightness = 1f;
+                if (currentBrightness <= minBrightness) currentBrightness = minBrightness;
+
+                lp.screenBrightness = currentBrightness;
+                getWindow().setAttributes(lp);
+                if (DEBUG) Log.d(TAG, "onScroll().brightnessControl, currentBrightness = " + currentBrightness);
+                int brightnessNormalized = Math.round(currentBrightness * 100);
+
+                playerImpl.getBrightnessTextView().setText(brightnessUnicode + " " + (brightnessNormalized == 1 ? 0 : brightnessNormalized) + "%");
+
+                if (playerImpl.getBrightnessTextView().getVisibility() != View.VISIBLE) playerImpl.animateView(playerImpl.getBrightnessTextView(), true, 200, 0);
+                if (playerImpl.getVolumeTextView().getVisibility() == View.VISIBLE) playerImpl.getVolumeTextView().setVisibility(View.GONE);
+            }
+            return true;
+        }
+
+        private void onScrollEnd() {
+            if (DEBUG) Log.d(TAG, "onScrollEnd() called");
+            triggered = false;
+            eventsNum = 0;
+            /* if (playerImpl.getVolumeTextView().getVisibility() == View.VISIBLE) playerImpl.getVolumeTextView().setVisibility(View.GONE);
+            if (playerImpl.getBrightnessTextView().getVisibility() == View.VISIBLE) playerImpl.getBrightnessTextView().setVisibility(View.GONE);*/
+            if (playerImpl.getVolumeTextView().getVisibility() == View.VISIBLE) playerImpl.animateView(playerImpl.getVolumeTextView(), false, 200, 200);
+            if (playerImpl.getBrightnessTextView().getVisibility() == View.VISIBLE) playerImpl.animateView(playerImpl.getBrightnessTextView(), false, 200, 200);
+
+            if (playerImpl.isControlsVisible() && playerImpl.getCurrentState() == StateInterface.STATE_PLAYING) {
+                playerImpl.animateView(playerImpl.getControlsRoot(), false, 300, AbstractPlayer.DEFAULT_CONTROLS_HIDE_TIME);
+            }
+        }
+
+        @Override
+        public boolean onTouch(View v, MotionEvent event) {
+            gestureDetector.onTouchEvent(event);
+            if (event.getAction() == MotionEvent.ACTION_UP && isMoving) {
+                isMoving = false;
+                onScrollEnd();
+            }
+            return true;
+        }
+
+    }
+}

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

@@ -0,0 +1,369 @@
+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.media.AudioManager;
+import android.media.MediaPlayer;
+import android.net.Uri;
+import android.os.Build;
+import android.os.Bundle;
+import android.os.Handler;
+import android.support.v7.app.ActionBar;
+import android.support.v7.app.AppCompatActivity;
+import android.util.DisplayMetrics;
+import android.util.Log;
+import android.view.Display;
+import android.view.KeyEvent;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.WindowManager;
+import android.widget.Button;
+import android.widget.MediaController;
+import android.widget.ProgressBar;
+import android.widget.VideoView;
+
+import org.schabi.newpipe.R;
+
+/**
+ * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
+ * PlayVideoActivity.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 PlayVideoActivity extends AppCompatActivity {
+
+    //// TODO: 11.09.15 add "choose stream" menu 
+    
+    private static final String TAG = PlayVideoActivity.class.toString();
+    public static final String VIDEO_URL = "video_url";
+    public static final String STREAM_URL = "stream_url";
+    public static final String VIDEO_TITLE = "video_title";
+    private static final String POSITION = "position";
+    public static final String START_POSITION = "start_position";
+
+    private static final long HIDING_DELAY = 3000;
+
+    private String videoUrl = "";
+
+    private ActionBar actionBar;
+    private VideoView videoView;
+    private int position;
+    private MediaController mediaController;
+    private ProgressBar progressBar;
+    private View decorView;
+    private boolean uiIsHidden;
+    private static long lastUiShowTime;
+    private boolean isLandscape = true;
+    private boolean hasSoftKeys;
+
+    private SharedPreferences prefs;
+    private static final String PREF_IS_LANDSCAPE = "is_landscape";
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        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();
+
+        actionBar = getSupportActionBar();
+        assert actionBar != null;
+        actionBar.setDisplayHomeAsUpEnabled(true);
+        Intent intent = getIntent();
+        if(mediaController == null) {
+            //prevents back button hiding media controller controls (after showing them)
+            //instead of exiting video
+            //see http://stackoverflow.com/questions/6051825
+            //also solves https://github.com/theScrabi/NewPipe/issues/99
+            mediaController = new MediaController(this) {
+                @Override
+                public boolean dispatchKeyEvent(KeyEvent event) {
+                    int keyCode = event.getKeyCode();
+                    final boolean uniqueDown = event.getRepeatCount() == 0
+                            && event.getAction() == KeyEvent.ACTION_DOWN;
+                    if (keyCode == KeyEvent.KEYCODE_BACK) {
+                        if (uniqueDown)
+                        {
+                            if (isShowing()) {
+                                finish();
+                            } else {
+                                hide();
+                            }
+                        }
+                        return true;
+                    }
+                    return super.dispatchKeyEvent(event);
+                }
+            };
+        }
+
+        position = intent.getIntExtra(START_POSITION, 0)*1000;//convert from seconds to milliseconds
+
+        videoView = (VideoView) findViewById(R.id.video_view);
+        progressBar = (ProgressBar) findViewById(R.id.play_video_progress_bar);
+        try {
+            videoView.setMediaController(mediaController);
+            videoView.setVideoURI(Uri.parse(intent.getStringExtra(STREAM_URL)));
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        videoView.requestFocus();
+        videoView.setOnPreparedListener(new MediaPlayer.OnPreparedListener() {
+            @Override
+            public void onPrepared(MediaPlayer mp) {
+                progressBar.setVisibility(View.GONE);
+                videoView.seekTo(position);
+                if (position <= 0) {
+                    videoView.start();
+                    showUi();
+                } else {
+                    videoView.pause();
+                }
+            }
+        });
+        videoUrl = intent.getStringExtra(VIDEO_URL);
+
+        Button button = (Button) findViewById(R.id.content_button);
+        button.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if(uiIsHidden) {
+                    showUi();
+                } else {
+                    hideUi();
+                }
+            }
+        });
+        decorView = getWindow().getDecorView();
+        decorView.setOnSystemUiVisibilityChangeListener(new View.OnSystemUiVisibilityChangeListener() {
+            @Override
+            public void onSystemUiVisibilityChange(int visibility) {
+                if (visibility == View.VISIBLE && uiIsHidden) {
+                    showUi();
+                }
+            }
+        });
+
+        if (android.os.Build.VERSION.SDK_INT >= 17) {
+            decorView.setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
+                    | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
+                    | View.SYSTEM_UI_FLAG_LAYOUT_STABLE);
+        }
+
+        prefs = getPreferences(Context.MODE_PRIVATE);
+        if(prefs.getBoolean(PREF_IS_LANDSCAPE, false) && !isLandscape) {
+            toggleOrientation();
+        }
+    }
+
+    @Override
+    public boolean onCreatePanelMenu(int featured, Menu menu) {
+        super.onCreatePanelMenu(featured, menu);
+        MenuInflater inflater = getMenuInflater();
+        inflater.inflate(R.menu.video_player, menu);
+
+        return true;
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        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();
+        switch(id) {
+            case android.R.id.home:
+                finish();
+                break;
+            case R.id.menu_item_share:
+                Intent intent = new Intent();
+                intent.setAction(Intent.ACTION_SEND);
+                intent.putExtra(Intent.EXTRA_TEXT, videoUrl);
+                intent.setType("text/plain");
+                startActivity(Intent.createChooser(intent, getString(R.string.share_dialog_title)));
+                break;
+            case R.id.menu_item_screen_rotation:
+                toggleOrientation();
+                break;
+            default:
+                Log.e(TAG, "Error: MenuItem not known");
+                return false;
+        }
+        return true;
+    }
+
+    @Override
+    public void onConfigurationChanged(Configuration config) {
+        super.onConfigurationChanged(config);
+
+        if (config.orientation == Configuration.ORIENTATION_LANDSCAPE) {
+            isLandscape = true;
+            adjustMediaControlMetrics();
+        } else if (config.orientation == Configuration.ORIENTATION_PORTRAIT){
+            isLandscape = false;
+            adjustMediaControlMetrics();
+        }
+    }
+
+    @Override
+    public void onSaveInstanceState(Bundle savedInstanceState) {
+        super.onSaveInstanceState(savedInstanceState);
+        //savedInstanceState.putInt(POSITION, videoView.getCurrentPosition());
+        //videoView.pause();
+    }
+
+    @Override
+    public void onRestoreInstanceState(Bundle savedInstanceState) {
+        super.onRestoreInstanceState(savedInstanceState);
+        position = savedInstanceState.getInt(POSITION);
+        //videoView.seekTo(position);
+    }
+
+    private void showUi() {
+        try {
+            uiIsHidden = false;
+            mediaController.show(100000);
+            actionBar.show();
+            adjustMediaControlMetrics();
+            getWindow().clearFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
+            Handler handler = new Handler();
+            handler.postDelayed(new Runnable() {
+                @Override
+                public void run() {
+                    if ((System.currentTimeMillis() - lastUiShowTime) >= HIDING_DELAY) {
+                        hideUi();
+                    }
+                }
+            }, HIDING_DELAY);
+            lastUiShowTime = System.currentTimeMillis();
+        }catch(Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    private void hideUi() {
+        uiIsHidden = true;
+        actionBar.hide();
+        mediaController.hide();
+        if (android.os.Build.VERSION.SDK_INT >= 17) {
+            decorView.setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
+                    | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
+                    | View.SYSTEM_UI_FLAG_FULLSCREEN
+                    | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
+                    | View.SYSTEM_UI_FLAG_LAYOUT_STABLE);
+        }
+        getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,
+                WindowManager.LayoutParams.FLAG_FULLSCREEN);
+    }
+
+    private void adjustMediaControlMetrics() {
+        MediaController.LayoutParams mediaControllerLayout
+                = new MediaController.LayoutParams(MediaController.LayoutParams.MATCH_PARENT,
+                MediaController.LayoutParams.WRAP_CONTENT);
+
+        if(!hasSoftKeys) {
+            mediaControllerLayout.setMargins(20, 0, 20, 20);
+        } else {
+            int width = getNavigationBarWidth();
+            int height = getNavigationBarHeight();
+            mediaControllerLayout.setMargins(width + 20, 0, width + 20, height + 20);
+        }
+        mediaController.setLayoutParams(mediaControllerLayout);
+    }
+
+    private boolean checkIfHasSoftKeys(){
+        return Build.VERSION.SDK_INT >= 17 ||
+                getNavigationBarHeight() != 0 ||
+                getNavigationBarWidth() != 0;
+    }
+
+    private int getNavigationBarHeight() {
+        if(Build.VERSION.SDK_INT >= 17) {
+            Display d = getWindowManager().getDefaultDisplay();
+
+            DisplayMetrics realDisplayMetrics = new DisplayMetrics();
+            d.getRealMetrics(realDisplayMetrics);
+            DisplayMetrics displayMetrics = new DisplayMetrics();
+            d.getMetrics(displayMetrics);
+
+            int realHeight = realDisplayMetrics.heightPixels;
+            int displayHeight = displayMetrics.heightPixels;
+            return realHeight - displayHeight;
+        } else {
+            return 50;
+        }
+    }
+
+    private int getNavigationBarWidth() {
+        if(Build.VERSION.SDK_INT >= 17) {
+            Display d = getWindowManager().getDefaultDisplay();
+
+            DisplayMetrics realDisplayMetrics = new DisplayMetrics();
+            d.getRealMetrics(realDisplayMetrics);
+            DisplayMetrics displayMetrics = new DisplayMetrics();
+            d.getMetrics(displayMetrics);
+
+            int realWidth = realDisplayMetrics.widthPixels;
+            int displayWidth = displayMetrics.widthPixels;
+            return realWidth - displayWidth;
+        } else {
+            return 50;
+        }
+    }
+
+    private boolean checkIfLandscape() {
+        DisplayMetrics displayMetrics = new DisplayMetrics();
+        getWindowManager().getDefaultDisplay().getMetrics(displayMetrics);
+        return displayMetrics.heightPixels < displayMetrics.widthPixels;
+    }
+
+    private void toggleOrientation() {
+        if(isLandscape)  {
+            isLandscape = false;
+            setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
+        } else {
+            isLandscape = true;
+            setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE);
+        }
+        SharedPreferences.Editor editor = prefs.edit();
+        editor.putBoolean(PREF_IS_LANDSCAPE, isLandscape);
+        editor.apply();
+    }
+}

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

@@ -0,0 +1,594 @@
+package org.schabi.newpipe.player;
+
+import android.annotation.SuppressLint;
+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.Configuration;
+import android.content.res.Resources;
+import android.graphics.Bitmap;
+import android.graphics.PixelFormat;
+import android.net.Uri;
+import android.os.Build;
+import android.os.Handler;
+import android.os.IBinder;
+import android.support.v4.app.NotificationCompat;
+import android.util.DisplayMetrics;
+import android.util.Log;
+import android.view.GestureDetector;
+import android.view.Gravity;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.WindowManager;
+import android.widget.PopupMenu;
+import android.widget.RemoteViews;
+import android.widget.Toast;
+
+import com.nostra13.universalimageloader.core.DisplayImageOptions;
+import com.nostra13.universalimageloader.core.ImageLoader;
+import com.nostra13.universalimageloader.core.listener.SimpleImageLoadingListener;
+
+import org.schabi.newpipe.ActivityCommunicator;
+import org.schabi.newpipe.BuildConfig;
+import org.schabi.newpipe.MainActivity;
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.extractor.MediaFormat;
+import org.schabi.newpipe.extractor.NewPipe;
+import org.schabi.newpipe.extractor.StreamingService;
+import org.schabi.newpipe.extractor.stream_info.StreamExtractor;
+import org.schabi.newpipe.extractor.stream_info.StreamInfo;
+import org.schabi.newpipe.extractor.stream_info.VideoStream;
+import org.schabi.newpipe.util.Constants;
+import org.schabi.newpipe.util.ThemeHelper;
+import org.schabi.newpipe.util.Utils;
+
+import java.io.IOException;
+import java.util.ArrayList;
+
+/**
+ * Service Popup Player implementing AbstractPlayer
+ *
+ * @author mauriciocolli
+ */
+public class PopupVideoPlayer extends Service {
+    private static final String TAG = ".PopupVideoPlayer";
+    private static final boolean DEBUG = AbstractPlayer.DEBUG;
+
+    private static final int NOTIFICATION_ID = 40028922;
+    public static final String ACTION_CLOSE = "org.schabi.newpipe.player.PopupVideoPlayer.CLOSE";
+    public static final String ACTION_PLAY_PAUSE = "org.schabi.newpipe.player.PopupVideoPlayer.PLAY_PAUSE";
+    public static final String ACTION_OPEN_DETAIL = "org.schabi.newpipe.player.PopupVideoPlayer.OPEN_DETAIL";
+    public static final String ACTION_REPEAT = "org.schabi.newpipe.player.PopupVideoPlayer.REPEAT";
+
+    private BroadcastReceiver broadcastReceiver;
+
+    private WindowManager windowManager;
+    private WindowManager.LayoutParams windowLayoutParams;
+    private GestureDetector gestureDetector;
+
+    private float screenWidth, screenHeight;
+    private float popupWidth, popupHeight;
+    private float currentPopupHeight = 110.0f * Resources.getSystem().getDisplayMetrics().density;
+    //private float minimumHeight = 100; // TODO: Use it when implementing the resize of the popup
+
+    private final String setAlphaMethodName = (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) ? "setImageAlpha" : "setAlpha";
+    private NotificationManager notificationManager;
+    private NotificationCompat.Builder notBuilder;
+    private RemoteViews notRemoteView;
+
+
+    private ImageLoader imageLoader = ImageLoader.getInstance();
+    private DisplayImageOptions displayImageOptions = new DisplayImageOptions.Builder().cacheInMemory(true).build();
+
+    private AbstractPlayerImpl playerImpl;
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Service LifeCycle
+    //////////////////////////////////////////////////////////////////////////*/
+
+    @Override
+    public void onCreate() {
+        windowManager = (WindowManager) getSystemService(WINDOW_SERVICE);
+        notificationManager = ((NotificationManager) getSystemService(NOTIFICATION_SERVICE));
+        initReceiver();
+
+        playerImpl = new AbstractPlayerImpl();
+        ThemeHelper.setTheme(this, false);
+    }
+
+    @Override
+    @SuppressWarnings("unchecked")
+    public int onStartCommand(final Intent intent, int flags, int startId) {
+        if (DEBUG) Log.d(TAG, "onStartCommand() called with: intent = [" + intent + "], flags = [" + flags + "], startId = [" + startId + "]");
+        if (playerImpl.getPlayer() == null) initPopup();
+        if (!playerImpl.isPlaying()) playerImpl.getPlayer().setPlayWhenReady(true);
+
+        if (imageLoader != null) imageLoader.clearMemoryCache();
+        if (intent.getStringExtra(Constants.KEY_URL) != null) {
+            playerImpl.setStartedFromNewPipe(false);
+            Thread fetcher = new Thread(new FetcherRunnable(intent));
+            fetcher.start();
+        } else {
+            playerImpl.setStartedFromNewPipe(true);
+            playerImpl.handleIntent(intent);
+        }
+        return START_NOT_STICKY;
+    }
+
+    @Override
+    public void onConfigurationChanged(Configuration newConfig) {
+        updateScreenSize();
+    }
+
+    @Override
+    public void onDestroy() {
+        if (DEBUG) Log.d(TAG, "onDestroy() called");
+        stopForeground(true);
+        if (playerImpl != null) {
+            playerImpl.destroy();
+            if (playerImpl.getRootView() != null) windowManager.removeView(playerImpl.getRootView());
+        }
+        if (imageLoader != null) imageLoader.clearMemoryCache();
+        if (notificationManager != null) notificationManager.cancel(NOTIFICATION_ID);
+        if (broadcastReceiver != null) unregisterReceiver(broadcastReceiver);
+    }
+
+    @Override
+    public IBinder onBind(Intent intent) {
+        return null;
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Init
+    //////////////////////////////////////////////////////////////////////////*/
+
+    private void initReceiver() {
+        broadcastReceiver = new BroadcastReceiver() {
+            @Override
+            public void onReceive(Context context, Intent intent) {
+                if (DEBUG) Log.d(TAG, "onReceive() called with: context = [" + context + "], intent = [" + intent + "]");
+                switch (intent.getAction()) {
+                    case ACTION_CLOSE:
+                        onVideoClose();
+                        break;
+                    case ACTION_PLAY_PAUSE:
+                        playerImpl.onVideoPlayPause();
+                        break;
+                    case ACTION_OPEN_DETAIL:
+                        onOpenDetail(PopupVideoPlayer.this, playerImpl.getVideoUrl(), playerImpl.getVideoTitle());
+                        break;
+                    case ACTION_REPEAT:
+                        playerImpl.onRepeatClicked();
+                        break;
+                    case AbstractPlayer.ACTION_UPDATE_THUMB:
+                        playerImpl.onUpdateThumbnail(intent);
+                        break;
+                }
+            }
+        };
+        IntentFilter intentFilter = new IntentFilter();
+        intentFilter.addAction(ACTION_CLOSE);
+        intentFilter.addAction(ACTION_PLAY_PAUSE);
+        intentFilter.addAction(ACTION_OPEN_DETAIL);
+        intentFilter.addAction(ACTION_REPEAT);
+        intentFilter.addAction(AbstractPlayer.ACTION_UPDATE_THUMB);
+        registerReceiver(broadcastReceiver, intentFilter);
+    }
+
+    @SuppressLint("RtlHardcoded")
+    private void initPopup() {
+        if (DEBUG) Log.d(TAG, "initPopup() called");
+        View rootView = View.inflate(this, R.layout.player_popup, null);
+
+        playerImpl.setup(rootView);
+
+        updateScreenSize();
+        windowLayoutParams = new WindowManager.LayoutParams(
+                (int) getMinimumVideoWidth(currentPopupHeight), (int) currentPopupHeight,
+                WindowManager.LayoutParams.TYPE_PHONE,
+                WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE,
+                PixelFormat.TRANSLUCENT);
+
+        windowLayoutParams.gravity = Gravity.LEFT | Gravity.TOP;
+
+        MySimpleOnGestureListener listener = new MySimpleOnGestureListener();
+        gestureDetector = new GestureDetector(this, listener);
+        gestureDetector.setIsLongpressEnabled(false);
+        rootView.setOnTouchListener(listener);
+        playerImpl.getLoadingPanel().setMinimumWidth(windowLayoutParams.width);
+        playerImpl.getLoadingPanel().setMinimumHeight(windowLayoutParams.height);
+        windowManager.addView(rootView, windowLayoutParams);
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Notification
+    //////////////////////////////////////////////////////////////////////////*/
+
+    private NotificationCompat.Builder createNotification() {
+        notRemoteView = new RemoteViews(BuildConfig.APPLICATION_ID, R.layout.player_popup_notification);
+
+        if (playerImpl.getVideoThumbnail() != null) notRemoteView.setImageViewBitmap(R.id.notificationCover, playerImpl.getVideoThumbnail());
+        else notRemoteView.setImageViewResource(R.id.notificationCover, R.drawable.dummy_thumbnail);
+        notRemoteView.setTextViewText(R.id.notificationSongName, playerImpl.getVideoTitle());
+        notRemoteView.setTextViewText(R.id.notificationArtist, playerImpl.getChannelName());
+
+        notRemoteView.setOnClickPendingIntent(R.id.notificationPlayPause,
+                PendingIntent.getBroadcast(this, NOTIFICATION_ID, new Intent(ACTION_PLAY_PAUSE), PendingIntent.FLAG_UPDATE_CURRENT));
+        notRemoteView.setOnClickPendingIntent(R.id.notificationStop,
+                PendingIntent.getBroadcast(this, NOTIFICATION_ID, new Intent(ACTION_CLOSE), PendingIntent.FLAG_UPDATE_CURRENT));
+        notRemoteView.setOnClickPendingIntent(R.id.notificationContent,
+                PendingIntent.getBroadcast(this, NOTIFICATION_ID, new Intent(ACTION_OPEN_DETAIL), PendingIntent.FLAG_UPDATE_CURRENT));
+        notRemoteView.setOnClickPendingIntent(R.id.notificationRepeat,
+                PendingIntent.getBroadcast(this, NOTIFICATION_ID, new Intent(ACTION_REPEAT), PendingIntent.FLAG_UPDATE_CURRENT));
+
+        switch (playerImpl.getCurrentRepeatMode()) {
+            case REPEAT_DISABLED:
+                notRemoteView.setInt(R.id.notificationRepeat, setAlphaMethodName, 77);
+                break;
+            case REPEAT_ONE:
+                notRemoteView.setInt(R.id.notificationRepeat, setAlphaMethodName, 255);
+                break;
+            case REPEAT_ALL:
+                // Waiting :)
+                break;
+        }
+
+        return new NotificationCompat.Builder(this)
+                .setOngoing(true)
+                .setSmallIcon(R.drawable.ic_play_arrow_white)
+                .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
+                .setContent(notRemoteView);
+    }
+
+    /**
+     * Updates the notification, and the play/pause button in it.
+     * Used for changes on the remoteView
+     *
+     * @param drawableId if != -1, sets the drawable with that id on the play/pause button
+     */
+    private void updateNotification(int drawableId) {
+        if (DEBUG) Log.d(TAG, "updateNotification() called with: drawableId = [" + drawableId + "]");
+        if (notBuilder == null || notRemoteView == null) return;
+        if (drawableId != -1) notRemoteView.setImageViewResource(R.id.notificationPlayPause, drawableId);
+        notificationManager.notify(NOTIFICATION_ID, notBuilder.build());
+    }
+
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Misc
+    //////////////////////////////////////////////////////////////////////////*/
+
+    public void onVideoClose() {
+        if (DEBUG) Log.d(TAG, "onVideoClose() called");
+        stopSelf();
+    }
+
+    public void onOpenDetail(Context context, String videoUrl, String videoTitle) {
+        if (DEBUG) Log.d(TAG, "onOpenDetail() called with: context = [" + context + "], videoUrl = [" + videoUrl + "]");
+        Intent i = new Intent(context, MainActivity.class);
+        i.putExtra(Constants.KEY_SERVICE_ID, 0);
+        i.putExtra(Constants.KEY_URL, videoUrl);
+        i.putExtra(Constants.KEY_TITLE, videoTitle);
+        i.putExtra(Constants.KEY_LINK_TYPE, StreamingService.LinkType.STREAM);
+        i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        context.startActivity(i);
+        context.sendBroadcast(new Intent(Intent.ACTION_CLOSE_SYSTEM_DIALOGS));
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Utils
+    //////////////////////////////////////////////////////////////////////////*/
+
+    private float getMinimumVideoWidth(float height) {
+        float width = height * (16.0f / 9.0f); // Respect the 16:9 ratio that most videos have
+        if (DEBUG) Log.d(TAG, "getMinimumVideoWidth() called with: height = [" + height + "], returned: " + width);
+        return width;
+    }
+
+    private void updateScreenSize() {
+        DisplayMetrics metrics = new DisplayMetrics();
+        windowManager.getDefaultDisplay().getMetrics(metrics);
+
+        screenWidth = metrics.widthPixels;
+        screenHeight = metrics.heightPixels;
+        if (DEBUG) Log.d(TAG, "updateScreenSize() called > screenWidth = " + screenWidth + ", screenHeight = " + screenHeight);
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+
+    private class AbstractPlayerImpl extends AbstractPlayer {
+        AbstractPlayerImpl() {
+            super("AbstractPlayerImpl" + PopupVideoPlayer.TAG, PopupVideoPlayer.this);
+        }
+
+        @Override
+        public void playVideo(Uri videoURI, boolean autoPlay) {
+            super.playVideo(videoURI, autoPlay);
+
+            windowLayoutParams.width = (int) getMinimumVideoWidth(currentPopupHeight);
+            windowManager.updateViewLayout(getRootView(), windowLayoutParams);
+
+            notBuilder = createNotification();
+            startForeground(NOTIFICATION_ID, notBuilder.build());
+            notificationManager.notify(NOTIFICATION_ID, notBuilder.build());
+        }
+
+        @Override
+        public void onFullScreenButtonClicked() {
+            if (DEBUG) Log.d(TAG, "onFullScreenButtonClicked() called");
+            Intent intent;
+            //if (getSharedPreferences().getBoolean(getResources().getString(R.string.use_exoplayer_key), false)) {
+            // TODO: Remove this check when ExoPlayer is the default
+            // For now just disable the non-exoplayer player
+            //noinspection ConstantConditions,ConstantIfStatement
+            if (true) {
+                intent = new Intent(PopupVideoPlayer.this, ExoPlayerActivity.class)
+                        .putExtra(AbstractPlayer.VIDEO_TITLE, getVideoTitle())
+                        .putExtra(AbstractPlayer.VIDEO_URL, getVideoUrl())
+                        .putExtra(AbstractPlayer.CHANNEL_NAME, getChannelName())
+                        .putExtra(AbstractPlayer.INDEX_SEL_VIDEO_STREAM, getSelectedIndexStream())
+                        .putExtra(AbstractPlayer.VIDEO_STREAMS_LIST, getVideoStreamsList())
+                        .putExtra(AbstractPlayer.START_POSITION, ((int) getPlayer().getCurrentPosition()));
+                if (!playerImpl.isStartedFromNewPipe()) intent.putExtra(AbstractPlayer.STARTED_FROM_NEWPIPE, false);
+                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            } else {
+                intent = new Intent(PopupVideoPlayer.this, PlayVideoActivity.class)
+                        .putExtra(PlayVideoActivity.VIDEO_TITLE, getVideoTitle())
+                        .putExtra(PlayVideoActivity.STREAM_URL, getSelectedStreamUri().toString())
+                        .putExtra(PlayVideoActivity.VIDEO_URL, getVideoUrl())
+                        .putExtra(PlayVideoActivity.START_POSITION, Math.round(getPlayer().getCurrentPosition() / 1000f));
+                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            }
+            context.startActivity(intent);
+            stopSelf();
+        }
+
+        @Override
+        public void onRepeatClicked() {
+            super.onRepeatClicked();
+            switch (getCurrentRepeatMode()) {
+                case REPEAT_DISABLED:
+                    // Drawable didn't work on low API :/
+                    //notRemoteView.setImageViewResource(R.id.notificationRepeat, R.drawable.ic_repeat_disabled_white);
+                    // Set the icon to 30% opacity - 255 (max) * .3
+                    notRemoteView.setInt(R.id.notificationRepeat, setAlphaMethodName, 77);
+                    break;
+                case REPEAT_ONE:
+                    notRemoteView.setInt(R.id.notificationRepeat, setAlphaMethodName, 255);
+                    break;
+                case REPEAT_ALL:
+                    // Waiting :)
+                    break;
+            }
+            updateNotification(-1);
+        }
+
+        @Override
+        public void onUpdateThumbnail(Intent intent) {
+            super.onUpdateThumbnail(intent);
+            if (getVideoThumbnail() != null) notRemoteView.setImageViewBitmap(R.id.notificationCover, getVideoThumbnail());
+            updateNotification(-1);
+        }
+
+        @Override
+        public void onDismiss(PopupMenu menu) {
+            super.onDismiss(menu);
+            if (isPlaying()) animateView(getControlsRoot(), false, 500, 0);
+        }
+
+        @Override
+        public void onError() {
+            Toast.makeText(context, "Failed to play this video", Toast.LENGTH_SHORT).show();
+            stopSelf();
+        }
+
+        /*//////////////////////////////////////////////////////////////////////////
+        // States
+        //////////////////////////////////////////////////////////////////////////*/
+
+        @Override
+        public void onLoading() {
+            super.onLoading();
+            updateNotification(R.drawable.ic_play_arrow_white);
+        }
+
+        @Override
+        public void onPlaying() {
+            super.onPlaying();
+            updateNotification(R.drawable.ic_pause_white);
+        }
+
+        @Override
+        public void onBuffering() {
+            super.onBuffering();
+            updateNotification(R.drawable.ic_play_arrow_white);
+        }
+
+        @Override
+        public void onPaused() {
+            super.onPaused();
+            updateNotification(R.drawable.ic_play_arrow_white);
+            showAndAnimateControl(R.drawable.ic_play_arrow_white, false);
+        }
+
+        @Override
+        public void onPausedSeek() {
+            super.onPausedSeek();
+            updateNotification(R.drawable.ic_play_arrow_white);
+        }
+
+        @Override
+        public void onCompleted() {
+            super.onCompleted();
+            updateNotification(R.drawable.ic_replay_white);
+            showAndAnimateControl(R.drawable.ic_replay_white, false);
+        }
+
+    }
+
+    private class MySimpleOnGestureListener extends GestureDetector.SimpleOnGestureListener implements View.OnTouchListener {
+        private int initialPopupX, initialPopupY;
+        private boolean isMoving;
+
+        @Override
+        public boolean onDoubleTap(MotionEvent e) {
+            if (DEBUG) Log.d(TAG, "onDoubleTap() called with: e = [" + e + "]" + "rawXy = " + e.getRawX() + ", " + e.getRawY() + ", xy = " + e.getX() + ", " + e.getY());
+            if (!playerImpl.isPlaying()) return false;
+            if (e.getX() > popupWidth / 2) playerImpl.onFastForward();
+            else playerImpl.onFastRewind();
+            return true;
+        }
+
+        @Override
+        public boolean onSingleTapConfirmed(MotionEvent e) {
+            if (DEBUG) Log.d(TAG, "onSingleTapConfirmed() called with: e = [" + e + "]");
+            if (playerImpl.getPlayer() == null) return false;
+            playerImpl.onVideoPlayPause();
+            return true;
+        }
+
+        @Override
+        public boolean onDown(MotionEvent e) {
+            if (DEBUG) Log.d(TAG, "onDown() called with: e = [" + e + "]");
+            initialPopupX = windowLayoutParams.x;
+            initialPopupY = windowLayoutParams.y;
+            popupWidth = playerImpl.getRootView().getWidth();
+            popupHeight = playerImpl.getRootView().getHeight();
+            return false;
+        }
+
+        @Override
+        public boolean onScroll(MotionEvent e1, MotionEvent e2, float distanceX, float distanceY) {
+            if (!isMoving || playerImpl.getControlsRoot().getAlpha() != 1f) playerImpl.animateView(playerImpl.getControlsRoot(), true, 30, 0);
+            isMoving = true;
+            float diffX = (int) (e2.getRawX() - e1.getRawX()), posX = (int) (initialPopupX + diffX);
+            float diffY = (int) (e2.getRawY() - e1.getRawY()), posY = (int) (initialPopupY + diffY);
+
+            if (posX > (screenWidth - popupWidth)) posX = (int) (screenWidth - popupWidth);
+            else if (posX < 0) posX = 0;
+
+            if (posY > (screenHeight - popupHeight)) posY = (int) (screenHeight - popupHeight);
+            else if (posY < 0) posY = 0;
+
+            windowLayoutParams.x = (int) posX;
+            windowLayoutParams.y = (int) posY;
+
+            //noinspection PointlessBooleanExpression
+            if (DEBUG && false) Log.d(TAG, "PopupVideoPlayer.onScroll = " +
+                    ", e1.getRaw = [" + e1.getRawX() + ", " + e1.getRawY() + "]" +
+                    ", e2.getRaw = [" + e2.getRawX() + ", " + e2.getRawY() + "]" +
+                    ", distanceXy = [" + distanceX + ", " + distanceY + "]" +
+                    ", posXy = [" + posX + ", " + posY + "]" +
+                    ", popupWh rootView.get wh = [" + popupWidth + " x " + popupHeight + "]");
+            windowManager.updateViewLayout(playerImpl.getRootView(), windowLayoutParams);
+            return true;
+        }
+
+        private void onScrollEnd() {
+            if (DEBUG) Log.d(TAG, "onScrollEnd() called");
+            if (playerImpl.isControlsVisible() && playerImpl.getCurrentState() == StateInterface.STATE_PLAYING) {
+                playerImpl.animateView(playerImpl.getControlsRoot(), false, 300, AbstractPlayer.DEFAULT_CONTROLS_HIDE_TIME);
+            }
+        }
+
+        @Override
+        public boolean onTouch(View v, MotionEvent event) {
+            gestureDetector.onTouchEvent(event);
+            if (event.getAction() == MotionEvent.ACTION_UP && isMoving) {
+                isMoving = false;
+                onScrollEnd();
+            }
+            return true;
+        }
+
+    }
+
+    /**
+     * Fetcher used if open by a link out of NewPipe
+     */
+    private class FetcherRunnable implements Runnable {
+        private final Intent intent;
+        private final Handler mainHandler;
+
+        FetcherRunnable(Intent intent) {
+            this.intent = intent;
+            this.mainHandler = new Handler(PopupVideoPlayer.this.getMainLooper());
+        }
+
+        @Override
+        public void run() {
+            StreamExtractor streamExtractor;
+            try {
+                StreamingService service = NewPipe.getService(0);
+                if (service == null) return;
+                streamExtractor = service.getExtractorInstance(intent.getStringExtra(Constants.KEY_URL));
+                StreamInfo info = StreamInfo.getVideoInfo(streamExtractor);
+                playerImpl.setVideoStreamsList(info.video_streams instanceof ArrayList
+                        ? (ArrayList<VideoStream>) info.video_streams
+                        : new ArrayList<>(info.video_streams));
+
+                int defaultResolution = Utils.getPreferredResolution(PopupVideoPlayer.this, info.video_streams);
+                playerImpl.setSelectedIndexStream(defaultResolution);
+
+                if (DEBUG) {
+                    Log.d(TAG, "FetcherRunnable.StreamExtractor: chosen = "
+                            + MediaFormat.getNameById(info.video_streams.get(defaultResolution).format) + " "
+                            + info.video_streams.get(defaultResolution).resolution + " > "
+                            + info.video_streams.get(defaultResolution).url);
+                }
+
+                playerImpl.setVideoUrl(info.webpage_url);
+                playerImpl.setVideoTitle(info.title);
+                playerImpl.setChannelName(info.uploader);
+                if (info.start_position > 0) playerImpl.setVideoStartPos(info.start_position * 1000);
+                else playerImpl.setVideoStartPos(-1);
+
+                mainHandler.post(new Runnable() {
+                    @Override
+                    public void run() {
+                        playerImpl.playVideo(playerImpl.getSelectedStreamUri(), true);
+                    }
+                });
+
+                imageLoader.resume();
+                imageLoader.loadImage(info.thumbnail_url, displayImageOptions, new SimpleImageLoadingListener() {
+                    @Override
+                    public void onLoadingComplete(String imageUri, View view, final Bitmap loadedImage) {
+                        mainHandler.post(new Runnable() {
+                            @Override
+                            public void run() {
+                                playerImpl.setVideoThumbnail(loadedImage);
+                                if (loadedImage != null) notRemoteView.setImageViewBitmap(R.id.notificationCover, loadedImage);
+                                updateNotification(-1);
+                                ActivityCommunicator.getCommunicator().backgroundPlayerThumbnail = loadedImage;
+                            }
+                        });
+                    }
+                });
+            } catch (IOException ie) {
+                if (DEBUG) ie.printStackTrace();
+                mainHandler.post(new Runnable() {
+                    @Override
+                    public void run() {
+                        Toast.makeText(PopupVideoPlayer.this, R.string.network_error, Toast.LENGTH_SHORT).show();
+                    }
+                });
+                stopSelf();
+            } catch (Exception e) {
+                if (DEBUG) e.printStackTrace();
+                mainHandler.post(new Runnable() {
+                    @Override
+                    public void run() {
+                        Toast.makeText(PopupVideoPlayer.this, R.string.content_not_available, Toast.LENGTH_SHORT).show();
+                    }
+                });
+                stopSelf();
+            }
+        }
+    }
+
+}

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

@@ -0,0 +1,19 @@
+package org.schabi.newpipe.player;
+
+public interface StateInterface {
+    int STATE_LOADING = 123;
+    int STATE_PLAYING = 124;
+    int STATE_BUFFERING = 125;
+    int STATE_PAUSED = 126;
+    int STATE_PAUSED_SEEK = 127;
+    int STATE_COMPLETED = 128;
+
+    void changeState(int state);
+
+    void onLoading();
+    void onPlaying();
+    void onBuffering();
+    void onPaused();
+    void onPausedSeek();
+    void onCompleted();
+}

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

@@ -1,10 +1,17 @@
-package org.schabi.newpipe;
+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;
  * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-public interface StreamingService {
-    class ServiceInfo {
-        public String name = "";
-    }
-    ServiceInfo getServiceInfo();
-    Class getExtractorClass();
-    Class getSearchEngineClass();
+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,14 +1,17 @@
-package org.schabi.newpipe;
+package org.schabi.newpipe.report;
 
-import android.graphics.Bitmap;
+import android.content.Context;
 
-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
@@ -24,14 +27,8 @@ import java.util.Vector;
  * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-public interface SearchEngine {
-
-
-    class Result {
-        public String errorMessage = "";
-        public String suggestion = "";
-        public Vector<VideoInfoItem> resultList = new Vector<>();
+public class AcraReportSenderFactory implements ReportSenderFactory {
+    public ReportSender create(Context context, ACRAConfiguration config) {
+        return new AcraReportSender();
     }
-
-    Result search(String query, int page);
 }

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/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,23 +1,23 @@
-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.Nullable;
+import android.support.annotation.NonNull;
 import android.support.v7.app.ActionBar;
 import android.support.v7.app.AppCompatDelegate;
-import android.support.v7.widget.Toolbar;
 import android.view.MenuInflater;
 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.
  *
@@ -38,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
@@ -70,14 +75,11 @@ public class SettingsActivity extends PreferenceActivity {
         getDelegate().onPostCreate(savedInstanceState);
     }
 
-    public ActionBar getSupportActionBar() {
+    private ActionBar getSupportActionBar() {
         return getDelegate().getSupportActionBar();
     }
 
-    public void setSupportActionBar(@Nullable Toolbar toolbar) {
-        getDelegate().setSupportActionBar(toolbar);
-    }
-
+    @NonNull
     @Override
     public MenuInflater getMenuInflater() {
         return getDelegate().getMenuInflater();
@@ -152,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.commit();
-        }
-    }
 }

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

@@ -0,0 +1,287 @@
+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 java.util.List;
+
+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 PREFERRED_VIDEO_FORMAT_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 preferredVideoFormatPreference;
+    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);
+        PREFERRED_VIDEO_FORMAT_PREFERENCE = getString(R.string.preferred_video_format_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);
+        preferredVideoFormatPreference =
+                (ListPreference) findPreference(PREFERRED_VIDEO_FORMAT_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)));
+        preferredVideoFormatPreference.setSummary(
+                defaultPreferences.getString(PREFERRED_VIDEO_FORMAT_PREFERENCE,
+                        getString(R.string.preferred_video_format_default)));
+        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/Constants.java

@@ -0,0 +1,8 @@
+package org.schabi.newpipe.util;
+
+public class Constants {
+    public static final String KEY_SERVICE_ID = "key_service_id";
+    public static final String KEY_URL = "key_url";
+    public static final String KEY_TITLE = "key_title";
+    public static final String KEY_LINK_TYPE = "key_link_type";
+}

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

@@ -0,0 +1,96 @@
+package org.schabi.newpipe.util;
+
+import android.content.Context;
+import android.content.Intent;
+import android.preference.PreferenceManager;
+
+import org.schabi.newpipe.MainActivity;
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.extractor.NewPipe;
+import org.schabi.newpipe.extractor.StreamingService;
+import org.schabi.newpipe.fragments.OnItemSelectedListener;
+import org.schabi.newpipe.fragments.detail.VideoDetailFragment;
+
+@SuppressWarnings({"unused", "WeakerAccess"})
+public class NavigationHelper {
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Through Interface (faster)
+    //////////////////////////////////////////////////////////////////////////*/
+
+    public static void openChannel(OnItemSelectedListener listener, int serviceId, String url) {
+        openChannel(listener, serviceId, url, null);
+    }
+
+    public static void openChannel(OnItemSelectedListener listener, int serviceId, String url, String name) {
+        listener.onItemSelected(StreamingService.LinkType.CHANNEL, serviceId, url, name);
+    }
+
+    public static void openVideoDetail(OnItemSelectedListener listener, int serviceId, String url) {
+        openVideoDetail(listener, serviceId, url, null);
+    }
+
+    public static void openVideoDetail(OnItemSelectedListener listener, int serviceId, String url, String title) {
+        listener.onItemSelected(StreamingService.LinkType.STREAM, serviceId, url, title);
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Through Intents
+    //////////////////////////////////////////////////////////////////////////*/
+
+    public static void openByLink(Context context, String url) throws Exception {
+        context.startActivity(getIntentByLink(context, url));
+    }
+
+    public static void openChannel(Context context, int serviceId, String url) {
+        openChannel(context, serviceId, url, null);
+    }
+
+    public static void openChannel(Context context, int serviceId, String url, String name) {
+        Intent openIntent = getOpenIntent(context, url, serviceId, StreamingService.LinkType.CHANNEL);
+        if (name != null && !name.isEmpty()) openIntent.putExtra(Constants.KEY_TITLE, name);
+        context.startActivity(openIntent);
+    }
+
+    public static void openVideoDetail(Context context, int serviceId, String url) {
+        openVideoDetail(context, serviceId, url, null);
+    }
+
+    public static void openVideoDetail(Context context, int serviceId, String url, String title) {
+        Intent openIntent = getOpenIntent(context, url, serviceId, StreamingService.LinkType.STREAM);
+        if (title != null && !title.isEmpty()) openIntent.putExtra(Constants.KEY_TITLE, title);
+        context.startActivity(openIntent);
+    }
+
+    public static void openMainActivity(Context context) {
+        Intent mIntent = new Intent(context, MainActivity.class);
+        context.startActivity(mIntent);
+    }
+
+    private static Intent getOpenIntent(Context context, String url, int serviceId, StreamingService.LinkType type) {
+        Intent mIntent = new Intent(context, MainActivity.class);
+        mIntent.putExtra(Constants.KEY_SERVICE_ID, serviceId);
+        mIntent.putExtra(Constants.KEY_URL, url);
+        mIntent.putExtra(Constants.KEY_LINK_TYPE, type);
+        return mIntent;
+    }
+
+    private static Intent getIntentByLink(Context context, String url) throws Exception {
+        StreamingService service = NewPipe.getServiceByUrl(url);
+        if (service == null) throw new Exception("NewPipe.getServiceByUrl returned null for url > \"" + url + "\"");
+        int serviceId = service.getServiceId();
+        switch (service.getLinkTypeByUrl(url)) {
+            case STREAM:
+                Intent sIntent = getOpenIntent(context, url, serviceId, StreamingService.LinkType.STREAM);
+                sIntent.putExtra(VideoDetailFragment.AUTO_PLAY, PreferenceManager.getDefaultSharedPreferences(context)
+                        .getBoolean(context.getString(R.string.autoplay_through_intent_key), false));
+                return sIntent;
+            case CHANNEL:
+                return getOpenIntent(context, url, serviceId, StreamingService.LinkType.CHANNEL);
+            case NONE:
+                throw new Exception("Url not known to service. service="
+                        + Integer.toString(serviceId) + " url=" + url);
+        }
+        return null;
+    }
+}

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

@@ -0,0 +1,95 @@
+package org.schabi.newpipe.util;
+
+import android.Manifest;
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.net.Uri;
+import android.os.Build;
+import android.provider.Settings;
+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 final int PERMISSION_SYSTEM_ALERT_WINDOW = 779;
+
+
+    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;
+    }
+
+
+    /**
+     * In order to be able to draw over other apps, the permission android.permission.SYSTEM_ALERT_WINDOW have to be granted.
+     * <p>
+     * On < API 23 (MarshMallow) the permission was granted when the user installed the application (via AndroidManifest),
+     * on > 23, however, it have to start a activity asking the user if he agree.
+     * <p>
+     * This method just return if canDraw over other apps, if it doesn't, try to get the permission,
+     * it does not get the result of the startActivityForResult, if the user accept, the next time that he tries to open
+     * it will return true.
+     *
+     * @param activity context to startActivityForResult
+     * @return returns {@link Settings#canDrawOverlays(Context)}
+     **/
+    @RequiresApi(api = Build.VERSION_CODES.M)
+    public static boolean checkSystemAlertWindowPermission(Activity activity) {
+        if (!Settings.canDrawOverlays(activity)) {
+            Intent i = new Intent(Settings.ACTION_MANAGE_OVERLAY_PERMISSION, Uri.parse("package:" + activity.getPackageName()));
+            activity.startActivityForResult(i, PERMISSION_SYSTEM_ALERT_WINDOW);
+            return false;
+        }else return true;
+    }
+}

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

@@ -0,0 +1,34 @@
+package org.schabi.newpipe.util;
+
+import android.content.Context;
+import android.preference.PreferenceManager;
+
+import org.schabi.newpipe.R;
+
+public class ThemeHelper {
+
+    /**
+     * Apply the selected theme (on NewPipe settings) in the context
+     *
+     * @param context               context that the theme will be applied
+     * @param useActionbarTheme     whether to use an action bar theme or not
+     */
+    public static void setTheme(Context context, boolean useActionbarTheme) {
+        String themeKey = context.getString(R.string.theme_key);
+        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 (useActionbarTheme) {
+            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/org/schabi/newpipe/util/Utils.java

@@ -0,0 +1,91 @@
+package org.schabi.newpipe.util;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.preference.PreferenceManager;
+
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.extractor.MediaFormat;
+import org.schabi.newpipe.extractor.stream_info.AudioStream;
+import org.schabi.newpipe.extractor.stream_info.VideoStream;
+
+import java.util.List;
+
+public class Utils {
+
+    /**
+     * Return the index of the default stream in the list, based on the
+     * preferred resolution and format chosen in the settings
+     *
+     * @param videoStreams      the list that will be extracted the index
+     * @return index of the preferred resolution&format
+     */
+    public static int getPreferredResolution(Context context, List<VideoStream> videoStreams) {
+        SharedPreferences defaultPreferences = PreferenceManager.getDefaultSharedPreferences(context);
+        if (defaultPreferences == null) return 0;
+
+        String defaultResolution = defaultPreferences
+                .getString(context.getString(R.string.default_resolution_key),
+                        context.getString(R.string.default_resolution_value));
+
+        String preferredFormat = defaultPreferences
+                .getString(context.getString(R.string.preferred_video_format_key),
+                        context.getString(R.string.preferred_video_format_default));
+
+        // first try to find the one with the right resolution
+        int selectedFormat = 0;
+        for (int i = 0; i < videoStreams.size(); i++) {
+            VideoStream item = videoStreams.get(i);
+            if (defaultResolution.equals(item.resolution)) {
+                selectedFormat = i;
+            }
+        }
+
+        // than try to find the one with the right resolution and format
+        for (int i = 0; i < videoStreams.size(); i++) {
+            VideoStream item = videoStreams.get(i);
+            if (defaultResolution.equals(item.resolution)
+                    && preferredFormat.equals(MediaFormat.getNameById(item.format))) {
+                selectedFormat = i;
+            }
+        }
+
+        // this is actually an error,
+        // but maybe there is really no stream fitting to the default value.
+        return selectedFormat;
+    }
+
+    /**
+     * Return the index of the default stream in the list, based on the
+     * preferred audio format chosen in the settings
+     *
+     * @param audioStreams      the list that will be extracted the index
+     * @return index of the preferred format
+     */
+    public static int getPreferredAudioFormat(Context context, List<AudioStream> audioStreams) {
+        SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context);
+        if (sharedPreferences == null) return 0;
+
+        String preferredFormatString = sharedPreferences.getString(context.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 < audioStreams.size(); i++) {
+            if (audioStreams.get(i).format == preferredFormat) {
+                return i;
+            }
+        }
+
+        return 0;
+    }
+}

app/src/main/java/org/schabi/newpipe/workers/ChannelExtractorWorker.java

@@ -0,0 +1,102 @@
+package org.schabi.newpipe.workers;
+
+import android.content.Context;
+
+import org.schabi.newpipe.MainActivity;
+import org.schabi.newpipe.R;
+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.report.ErrorActivity;
+
+import java.io.IOException;
+
+/**
+ * Extract {@link ChannelInfo} with {@link ChannelExtractor} from the given url of the given service
+ *
+ * @author mauriciocolli
+ */
+@SuppressWarnings("WeakerAccess")
+public class ChannelExtractorWorker extends ExtractorWorker {
+    //private static final String TAG = "ChannelExtractorWorker";
+
+    private int pageNumber;
+    private boolean onlyVideos;
+
+    private ChannelInfo channelInfo = null;
+    private OnChannelInfoReceive callback;
+
+    /**
+     * Interface which will be called for result and errors
+     */
+    public interface OnChannelInfoReceive {
+        void onReceive(ChannelInfo info);
+        void onError(int messageId);
+    }
+
+    /**
+     * @param context           context for error reporting purposes
+     * @param serviceId         id of the request service
+     * @param channelUrl        channelUrl of the service (e.g. https://www.youtube.com/channel/UC_aEa8K-EOJ3D6gOs7HcyNg)
+     * @param callback          listener that will be called-back when events occur (check {@link ChannelExtractorWorker.OnChannelInfoReceive})
+     */
+    public ChannelExtractorWorker(Context context, int serviceId, String channelUrl, int pageNumber, OnChannelInfoReceive callback) {
+        super(context, channelUrl, serviceId);
+        this.pageNumber = pageNumber;
+        this.callback = callback;
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        this.callback = null;
+        this.channelInfo = null;
+    }
+
+    @Override
+    protected void doWork(int serviceId, String url) throws Exception {
+        ChannelExtractor extractor = getService().getChannelExtractorInstance(url, pageNumber);
+        channelInfo = ChannelInfo.getInfo(extractor);
+
+        if (!channelInfo.errors.isEmpty()) handleErrorsDuringExtraction(channelInfo.errors, ErrorActivity.REQUESTED_CHANNEL);
+
+        if (callback != null && channelInfo != null && !isInterrupted()) getHandler().post(new Runnable() {
+            @Override
+            public void run() {
+                if (isInterrupted() || callback == null) return;
+
+                callback.onReceive(channelInfo);
+                onDestroy();
+            }
+        });
+    }
+
+
+    @Override
+    protected void handleException(Exception exception, int serviceId, String url) {
+        if (exception instanceof IOException) {
+            if (callback != null) getHandler().post(new Runnable() {
+                @Override
+                public void run() {
+                    callback.onError(R.string.network_error);
+                }
+            });
+        } else if (exception instanceof ParsingException || exception instanceof ExtractionException) {
+            ErrorActivity.reportError(getHandler(), getContext(), exception, MainActivity.class, null, ErrorActivity.ErrorInfo.make(ErrorActivity.REQUESTED_CHANNEL, getServiceName(), url, R.string.parsing_error));
+            finishIfActivity();
+        } else {
+            ErrorActivity.reportError(getHandler(), getContext(), exception, MainActivity.class, null, ErrorActivity.ErrorInfo.make(ErrorActivity.REQUESTED_CHANNEL, getServiceName(), url, R.string.general_error));
+            finishIfActivity();
+        }
+    }
+
+    public boolean isOnlyVideos() {
+        return onlyVideos;
+    }
+
+    public void setOnlyVideos(boolean onlyVideos) {
+        this.onlyVideos = onlyVideos;
+    }
+}
+

app/src/main/java/org/schabi/newpipe/workers/ExtractorWorker.java

@@ -0,0 +1,168 @@
+package org.schabi.newpipe.workers;
+
+import android.app.Activity;
+import android.content.Context;
+import android.os.Handler;
+import android.util.Log;
+import android.view.View;
+
+import org.schabi.newpipe.extractor.NewPipe;
+import org.schabi.newpipe.extractor.StreamingService;
+import org.schabi.newpipe.extractor.stream_info.StreamInfo;
+import org.schabi.newpipe.report.ErrorActivity;
+
+import java.io.InterruptedIOException;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+/**
+ * Common properties of ExtractorWorkers
+ *
+ * @author mauriciocolli
+ */
+@SuppressWarnings("WeakerAccess")
+public abstract class ExtractorWorker extends Thread {
+
+    private final AtomicBoolean isRunning = new AtomicBoolean(false);
+
+    private final String url;
+    private final int serviceId;
+    private Context context;
+    private Handler handler;
+    private StreamingService service;
+
+    public ExtractorWorker(Context context, String url, int serviceId) {
+        this.context = context;
+        this.url = url;
+        this.serviceId = serviceId;
+        this.handler = new Handler(context.getMainLooper());
+        if (url.length() >= 40) setName("Thread-" + url.substring(url.length() - 11, url.length()));
+    }
+
+    @Override
+    public void run() {
+        try {
+            isRunning.set(true);
+            service = NewPipe.getService(serviceId);
+            doWork(serviceId, url);
+        } catch (Exception e) {
+            // Handle the exception only if thread is not interrupted
+            if (!isInterrupted() && !(e instanceof InterruptedIOException) && !(e.getCause() instanceof InterruptedIOException)) {
+                handleException(e, serviceId, url);
+            }
+        } finally {
+            isRunning.set(false);
+        }
+    }
+
+    /**
+     * Here is the place that the heavy work is realized
+     *
+     * @param serviceId     serviceId that was passed when created this object
+     * @param url           url that was passed when created this object
+     *
+     * @throws Exception    these exceptions are handled by the {@link #handleException(Exception, int, String)}
+     */
+    protected abstract void doWork(int serviceId, String url) throws Exception;
+
+
+    /**
+     * Method that handle the exception thrown by the {@link #doWork(int, String)}.
+     *
+     * @param exception {@link Exception} that was thrown by {@link #doWork(int, String)}
+     */
+    protected abstract void handleException(Exception exception, int serviceId, String url);
+
+    /**
+     * Handle the errors <b>during</b> extraction and shows a Report button to the user.<br/>
+     * Subclasses <b>maybe</b> call this method.
+     *
+     * @param errorsList        list of exceptions that happened during extraction
+     * @param errorUserAction   what action was the user performing during the error.
+     *                          (One of the {@link ErrorActivity}.REQUEST_* error (message) ids)
+     */
+    protected void handleErrorsDuringExtraction(List<Throwable> errorsList, int errorUserAction){
+        String errorString = "<error id>";
+        switch (errorUserAction) {
+            case ErrorActivity.REQUESTED_STREAM:
+                errorString=  ErrorActivity.REQUESTED_STREAM_STRING;
+                break;
+            case ErrorActivity.REQUESTED_CHANNEL:
+                errorString=  ErrorActivity.REQUESTED_CHANNEL_STRING;
+                break;
+        }
+
+        Log.e(errorString, "OCCURRED ERRORS DURING EXTRACTION:");
+        for (Throwable e : errorsList) {
+            e.printStackTrace();
+            Log.e(errorString, "------");
+        }
+
+        if (getContext() instanceof Activity) {
+            View rootView = getContext() != null ? ((Activity) getContext()).findViewById(android.R.id.content) : null;
+            ErrorActivity.reportError(getHandler(), getContext(), errorsList, null, rootView, ErrorActivity.ErrorInfo.make(errorUserAction, getServiceName(), url, 0 /* no message for the user */));
+        }
+    }
+
+    /**
+     * Return true if the extraction is not completed yet
+     *
+     * @return the value of the AtomicBoolean {@link #isRunning}
+     */
+    public boolean isRunning() {
+        return isRunning.get();
+    }
+
+    /**
+     * Cancel this ExtractorWorker, calling {@link #onDestroy()} and interrupting this thread.
+     * <p>
+     * <b>Note:</b> Any I/O that is active in the moment that this method is called will be canceled and a Exception will be thrown, because of the {@link #interrupt()}.<br>
+     * This is useful when you don't want the resulting {@link StreamInfo} anymore, but don't want to waste bandwidth, otherwise it'd run till it receives the StreamInfo.
+     */
+    public void cancel() {
+        onDestroy();
+        this.interrupt();
+    }
+
+    /**
+     * Method that discards everything that doesn't need anymore.<br>
+     * Subclasses can override this method to destroy their garbage.
+     */
+    protected void onDestroy() {
+        this.isRunning.set(false);
+        this.context = null;
+        this.handler = null;
+        this.service = null;
+    }
+
+    /**
+     * If the context passed in the constructor is an {@link Activity}, finish it.
+     */
+    protected void finishIfActivity() {
+        if (getContext() instanceof Activity) ((Activity) getContext()).finish();
+    }
+
+    public Handler getHandler() {
+        return handler;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public StreamingService getService() {
+        return service;
+    }
+
+    public int getServiceId() {
+        return serviceId;
+    }
+
+    public String getServiceName() {
+        return service == null ? "none" : service.getServiceInfo().name;
+    }
+
+    public Context getContext() {
+        return context;
+    }
+}

app/src/main/java/org/schabi/newpipe/workers/StreamExtractorWorker.java

@@ -0,0 +1,136 @@
+package org.schabi.newpipe.workers;
+
+import android.content.Context;
+
+import org.schabi.newpipe.MainActivity;
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.extractor.exceptions.ParsingException;
+import org.schabi.newpipe.extractor.exceptions.ReCaptchaException;
+import org.schabi.newpipe.extractor.services.youtube.YoutubeStreamExtractor;
+import org.schabi.newpipe.extractor.stream_info.StreamExtractor;
+import org.schabi.newpipe.extractor.stream_info.StreamInfo;
+import org.schabi.newpipe.report.ErrorActivity;
+
+import java.io.IOException;
+
+/**
+ * Extract {@link StreamInfo} with {@link StreamExtractor} from the given url of the given service
+ *
+ * @author mauriciocolli
+ */
+@SuppressWarnings("WeakerAccess")
+public class StreamExtractorWorker extends ExtractorWorker {
+    //private static final String TAG = "StreamExtractorWorker";
+
+    private StreamInfo streamInfo = null;
+    private OnStreamInfoReceivedListener callback;
+
+    /**
+     * Interface which will be called for result and errors
+     */
+    public interface OnStreamInfoReceivedListener {
+        void onReceive(StreamInfo info);
+        void onError(int messageId);
+        void onReCaptchaException();
+        void onBlockedByGemaError();
+        void onContentErrorWithMessage(int messageId);
+        void onContentError();
+    }
+
+    /**
+     * @param context   context for error reporting purposes
+     * @param serviceId id of the request service
+     * @param videoUrl  videoUrl of the service (e.g. https://www.youtube.com/watch?v=HyHNuVaZJ-k)
+     * @param callback  listener that will be called-back when events occur (check {@link StreamExtractorWorker.OnStreamInfoReceivedListener})
+     */
+    public StreamExtractorWorker(Context context, int serviceId, String videoUrl, OnStreamInfoReceivedListener callback) {
+        super(context, videoUrl, serviceId);
+        this.callback = callback;
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        this.callback = null;
+        this.streamInfo = null;
+    }
+
+    @Override
+    protected void doWork(int serviceId, String url) throws Exception {
+        StreamExtractor streamExtractor = getService().getExtractorInstance(url);
+        streamInfo = StreamInfo.getVideoInfo(streamExtractor);
+
+        if (streamInfo != null && !streamInfo.errors.isEmpty()) handleErrorsDuringExtraction(streamInfo.errors, ErrorActivity.REQUESTED_STREAM);
+
+        if (callback != null && streamInfo != null && !isInterrupted()) getHandler().post(new Runnable() {
+            @Override
+            public void run() {
+                if (isInterrupted() || callback == null) return;
+
+                callback.onReceive(streamInfo);
+                onDestroy();
+            }
+        });
+
+    }
+
+    @Override
+    protected void handleException(final Exception exception, int serviceId, String url) {
+        if (exception instanceof ReCaptchaException) {
+            if (callback != null) getHandler().post(new Runnable() {
+                @Override
+                public void run() {
+                    callback.onReCaptchaException();
+                }
+            });
+        } else if (exception instanceof IOException) {
+            if (callback != null) getHandler().post(new Runnable() {
+                @Override
+                public void run() {
+                    callback.onError(R.string.network_error);
+                }
+            });
+        } else if (exception instanceof YoutubeStreamExtractor.GemaException) {
+            if (callback != null) getHandler().post(new Runnable() {
+                @Override
+                public void run() {
+                    callback.onBlockedByGemaError();
+                }
+            });
+        } else if (exception instanceof YoutubeStreamExtractor.LiveStreamException) {
+            if (callback != null) getHandler().post(new Runnable() {
+                @Override
+                public void run() {
+                    callback.onContentErrorWithMessage(R.string.live_streams_not_supported);
+                }
+            });
+        } else if (exception instanceof StreamExtractor.ContentNotAvailableException) {
+            if (callback != null) getHandler().post(new Runnable() {
+                @Override
+                public void run() {
+                    callback.onContentError();
+                }
+            });
+        } else if (exception instanceof YoutubeStreamExtractor.DecryptException) {
+            // custom service related exceptions
+            ErrorActivity.reportError(getHandler(), getContext(), exception, MainActivity.class, null, ErrorActivity.ErrorInfo.make(ErrorActivity.REQUESTED_STREAM, getServiceName(), url, R.string.youtube_signature_decryption_error));
+            finishIfActivity();
+        } else if (exception instanceof StreamInfo.StreamExctractException) {
+            if (!streamInfo.errors.isEmpty()) {
+                // !!! if this case ever kicks in someone gets kicked out !!!
+                ErrorActivity.reportError(getHandler(), getContext(), exception, MainActivity.class, null, ErrorActivity.ErrorInfo.make(ErrorActivity.REQUESTED_STREAM, getServiceName(), url, R.string.could_not_get_stream));
+            } else {
+                ErrorActivity.reportError(getHandler(), getContext(), streamInfo.errors, MainActivity.class, null, ErrorActivity.ErrorInfo.make(ErrorActivity.REQUESTED_STREAM, getServiceName(), url, R.string.could_not_get_stream));
+            }
+            finishIfActivity();
+        } else if (exception instanceof ParsingException) {
+            ErrorActivity.reportError(getHandler(), getContext(), exception, MainActivity.class, null, ErrorActivity.ErrorInfo.make(ErrorActivity.REQUESTED_STREAM, getServiceName(), url, R.string.parsing_error));
+            finishIfActivity();
+        } else {
+            ErrorActivity.reportError(getHandler(), getContext(), exception, MainActivity.class, null, ErrorActivity.ErrorInfo.make(ErrorActivity.REQUESTED_STREAM, getServiceName(), url, R.string.general_error));
+            finishIfActivity();
+        }
+
+    }
+
+}

app/src/main/java/org/schabi/newpipe/youtube/YoutubeExtractor.java

@@ -1,399 +0,0 @@
-package org.schabi.newpipe.youtube;
-import org.jsoup.nodes.Element;
-import org.schabi.newpipe.Downloader;
-import org.schabi.newpipe.Extractor;
-import org.schabi.newpipe.VideoInfo;
-
-import android.util.Log;
-
-import java.net.URI;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Vector;
-import java.util.regex.Pattern;
-import java.util.regex.Matcher;
-import org.json.JSONObject;
-
-import org.jsoup.Jsoup;
-import org.jsoup.nodes.Document;
-import org.jsoup.parser.Parser;
-
-import org.mozilla.javascript.Context;
-import org.mozilla.javascript.Function;
-import org.mozilla.javascript.ScriptableObject;
-import org.schabi.newpipe.VideoInfoItem;
-
-/**
- * Created by Christian Schabesberger on 06.08.15.
- *
- * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
- * YoutubeExtractor.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 YoutubeExtractor implements Extractor {
-
-
-
-    private static final String TAG = YoutubeExtractor.class.toString();
-
-    // These lists only contain itag formats that are supported by the common Android Video player.
-    // How ever if you are heading for a list showing all itag formats lock at
-    // https://github.com/rg3/youtube-dl/issues/1687
-
-    public static String resolveFormat(int itag) {
-        switch(itag) {
-            case 17: return VideoInfo.F_3GPP;
-            case 18: return VideoInfo.F_MPEG_4;
-            case 22: return VideoInfo.F_MPEG_4;
-            case 36: return VideoInfo.F_3GPP;
-            case 37: return VideoInfo.F_MPEG_4;
-            case 38: return VideoInfo.F_MPEG_4;
-            case 43: return VideoInfo.F_WEBM;
-            case 44: return VideoInfo.F_WEBM;
-            case 45: return VideoInfo.F_WEBM;
-            case 46: return VideoInfo.F_WEBM;
-            default:
-                //Log.i(TAG, "Itag " + Integer.toString(itag) + " not known or not supported.");
-                return null;
-        }
-    }
-
-    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;
-        }
-    }
-
-    private String decryptoinCode = "";
-    private static final String DECRYPTION_FUNC_NAME="decrypt";
-
-    @Override
-    public String getVideoId(String videoUrl) {
-        try {
-            String query = (new URI(videoUrl)).getQuery();
-            String queryElements[] = query.split("&");
-            Map<String, String> queryArguments = new HashMap<>();
-            for(String e : queryElements) {
-                String[] s = e.split("=");
-                queryArguments.put(s[0], s[1]);
-            }
-            return queryArguments.get("v");
-        } catch(Exception e) {
-            Log.e(TAG, "Error could not parse url: " + videoUrl);
-            e.printStackTrace();
-            return "";
-        }
-    }
-
-    @Override
-    public String getVideoUrl(String videoId) {
-        return "https://www.youtube.com/watch?v=" + videoId;
-    }
-
-    @Override
-    public VideoInfo getVideoInfo(String siteUrl) {
-        String site = Downloader.download(siteUrl);
-        VideoInfo videoInfo = new VideoInfo();
-
-        Document doc = Jsoup.parse(site, siteUrl);
-
-        try {
-            Pattern p = Pattern.compile("v=([0-9a-zA-Z]*)");
-            Matcher m = p.matcher(siteUrl);
-            m.find();
-            videoInfo.id = m.group(1);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-
-        videoInfo.age_limit = 0;
-        videoInfo.webpage_url = siteUrl;
-
-        //-------------------------------------
-        // extracting form player args
-        //-------------------------------------
-        JSONObject playerArgs = null;
-        JSONObject ytAssets = null;
-        {
-            Pattern p = Pattern.compile("ytplayer.config\\s*=\\s*(\\{.*?\\});");
-            Matcher m = p.matcher(site);
-            m.find();
-
-            try {
-                playerArgs = (new JSONObject(m.group(1)))
-                        .getJSONObject("args");
-                ytAssets = (new JSONObject(m.group(1)))
-                        .getJSONObject("assets");
-            }catch (Exception e) {
-                e.printStackTrace();
-                // If we fail in this part the video is most likely not available.
-                // Determining why is done later.
-                videoInfo.videoAvailableStatus = VideoInfo.VIDEO_UNAVAILABLE;
-            }
-        }
-
-        try {
-            videoInfo.uploader = playerArgs.getString("author");
-            videoInfo.title = playerArgs.getString("title");
-            //first attempt gating a small image version
-            //in the html extracting part we try to get a thumbnail with a higher resolution
-            videoInfo.thumbnail_url = playerArgs.getString("thumbnail_url");
-            videoInfo.duration = playerArgs.getInt("length_seconds");
-            videoInfo.average_rating = playerArgs.getString("avg_rating");
-            // View Count will be extracted from html
-            //videoInfo.view_count = playerArgs.getString("view_count");
-
-            //------------------------------------
-            // extract stream url
-            //------------------------------------
-            String encoded_url_map = playerArgs.getString("url_encoded_fmt_stream_map");
-            Vector<VideoInfo.Stream> streams = 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 = terrible_unescape_workaround_fuck(tags.get("url"));
-
-                // if video has a signature decrypt it and add it to the url
-                if(tags.get("s") != null) {
-                    String playerUrl = ytAssets.getString("js");
-                    if(playerUrl.startsWith("//")) {
-                        playerUrl = "https:" + playerUrl;
-                    }
-                    if(decryptoinCode.isEmpty()) {
-                        decryptoinCode = loadDecryptioinCode(playerUrl);
-                    }
-                    streamUrl = streamUrl + "&signature=" + decriptSignature(tags.get("s"), decryptoinCode);
-                }
-
-                if(resolveFormat(itag) != null) {
-                    streams.add(new VideoInfo.Stream(
-                            streamUrl,   //sometimes i have no idea what im programming -.-
-                            resolveFormat(itag),
-                            resolveResolutionString(itag)));
-                }
-            }
-            videoInfo.streams = new VideoInfo.Stream[streams.size()];
-            for(int i = 0; i < streams.size(); i++) {
-                videoInfo.streams[i] = streams.get(i);
-            }
-
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-
-        //-------------------------------
-        // extrating 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;
-            }
-        }
-
-        // Try to get high resolution thumbnail if it fails use low res from the player instead
-        try {
-            videoInfo.thumbnail_url = doc.select("link[itemprop=\"thumbnailUrl\"]").first()
-                    .attr("abs:href");
-        } catch(Exception e) {
-            Log.i(TAG, "Could not find high res Thumbnail. Use low res instead");
-        }
-
-        // upload date
-        videoInfo.upload_date = doc.select("strong[class=\"watch-time-text\"").first()
-                .text();
-        // Try to only use date not the text around it
-        try {
-            Pattern p = Pattern.compile("([0-9.]*$)");
-            Matcher m = p.matcher(videoInfo.upload_date);
-            m.find();
-            videoInfo.upload_date = m.group(1);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-
-        // description
-        videoInfo.description = doc.select("p[id=\"eow-description\"]").first()
-                .html();
-
-        try {
-            // likes
-            videoInfo.like_count = doc.select("span[class=\"like-button-renderer \"]").first()
-                    .getAllElements().select("button")
-                    .select("span").get(0).text();
-
-
-            // dislikes
-            videoInfo.dislike_count = doc.select("span[class=\"like-button-renderer \"]").first()
-                    .getAllElements().select("button")
-                    .select("span").get(2).text();
-        } catch(Exception e) {
-            // if it fails we know that the video does not offer dislikes.
-            videoInfo.like_count = "0";
-            videoInfo.dislike_count = "0";
-        }
-
-        // uploader thumbnail
-        videoInfo.uploader_thumbnail_url = doc.select("a[class*=\"yt-user-photo\"]").first()
-                .select("img").first()
-                .attr("abs:data-thumb");
-
-        // view count
-        videoInfo.view_count = doc.select("div[class=\"watch-view-count\"]").first().text();
-
-        /* todo finish this code
-
-        // next video
-        videoInfo.nextVideo = extractVideoInfoItem(doc.select("div[class=\"watch-sidebar-section\"]").first()
-                .select("li").first());
-
-        int i = 0;
-        // related videos
-        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) {
-                //videoInfo.relatedVideos.add(extractVideoInfoItem(li));
-                //i++;
-                //Log.d(TAG, Integer.toString(i));
-            }
-        }
-
-        */
-
-        return videoInfo;
-    }
-
-    private VideoInfoItem extractVideoInfoItem(Element li) {
-        VideoInfoItem info = new VideoInfoItem();
-        info.webpage_url = li.select("a[class*=\"content-link\"]").first()
-                .attr("abs:href");
-        try {
-            Pattern p = Pattern.compile("v=([0-9a-zA-Z-]*)");
-            Matcher m = p.matcher(info.webpage_url);
-            m.find();
-            info.id=m.group(1);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        info.title = li.select("span[class=\"title\"]").first()
-                .text();
-
-        info.uploader = li.select("span[class=\"g-hovercard\"]").first().text();
-
-        info.duration = li.select("span[class=\"video-time\"]").first().text();
-
-        Element img = li.select("img").first();
-        info.thumbnail_url = img.attr("abs:src");
-        // Sometimes youtube sends links to gif files witch somehow seam 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");
-        }
-
-        return info;
-    }
-
-    private String terrible_unescape_workaround_fuck(String shit) {
-        String[] splitAtEscape = shit.split("%");
-        String retval = "";
-        retval += splitAtEscape[0];
-        for(int i = 1; i < splitAtEscape.length; i++) {
-            String escNum = splitAtEscape[i].substring(0, 2);
-            char c = (char) Integer.parseInt(escNum,16);
-            retval += c;
-            retval += splitAtEscape[i].substring(2);
-        }
-        return retval;
-    }
-
-    private String loadDecryptioinCode(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 {
-            Pattern p = Pattern.compile("\\.sig\\|\\|([a-zA-Z0-9$]+)\\(");
-            Matcher m = p.matcher(playerCode);
-            m.find();
-            decryptionFuncName = m.group(1);
-
-            String functionPattern = "(function " + decryptionFuncName.replace("$", "\\$") + "\\([a-zA-Z0-9_]*\\)\\{.+?\\})";
-            p = Pattern.compile(functionPattern);
-            m = p.matcher(playerCode);
-            m.find();
-            decryptionFunc = m.group(1);
-
-            p = Pattern.compile(";([A-Za-z0-9_\\$]{2})\\...\\(");
-            m = p.matcher(decryptionFunc);
-            m.find();
-            helperObjectName = m.group(1);
-
-            String helperPattern = "(var " + helperObjectName.replace("$", "\\$") + "=\\{.+?\\}\\};)function";
-            p = Pattern.compile(helperPattern);
-            m = p.matcher(playerCode);
-            m.find();
-            helperObject = m.group(1);
-
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-
-        callerFunc = callerFunc.replace("%%", decryptionFuncName);
-        decryptionCode = helperObject + decryptionFunc + callerFunc;
-
-        return decryptionCode;
-    }
-
-    private String decriptSignature(String encryptedSig, String decryptoinCode) {
-        Context context = Context.enter();
-        context.setOptimizationLevel(-1);
-        Object result = null;
-        try {
-            ScriptableObject scope = context.initStandardObjects();
-            context.evaluateString(scope, decryptoinCode, "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();
-        return result.toString();
-    }
-}

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

@@ -1,117 +0,0 @@
-package org.schabi.newpipe.youtube;
-
-import org.schabi.newpipe.Downloader;
-import org.schabi.newpipe.SearchEngine;
-import org.schabi.newpipe.VideoInfoItem;
-
-import android.net.Uri;
-import android.util.Log;
-
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.jsoup.Jsoup;
-import org.jsoup.nodes.Document;
-import org.jsoup.nodes.Element;
-
-/**
- * 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) {
-        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 url = builder.build().toString();
-
-        String 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 witch kind of item we are working with.
-               Youtube depicts fife different kinds if items at 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 net 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)) {
-                VideoInfoItem resultItem = new VideoInfoItem();
-                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);
-                    m.find();
-                    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();
-                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 witch somehow seam 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(resultItem.thumbnail_url.contains(".gif")) {
-                    resultItem.thumbnail_url = te.attr("abs:data-thumb");
-                }
-                result.resultList.add(resultItem);
-            } else {
-                Log.e(TAG, "GREAT FUCKING ERROR");
-            }
-        }
-
-        return result;
-    }
-}

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

@@ -1,48 +0,0 @@
-package org.schabi.newpipe.youtube;
-
-import org.schabi.newpipe.StreamingService;
-
-/**
- * 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 Class getExtractorClass() {
-        return YoutubeExtractor.class;
-    }
-    @Override
-    public Class getSearchEngineClass() {
-        return YoutubeSearchEngine.class;
-    }
-    @Override
-    public boolean acceptUrl(String videoUrl) {
-        if(videoUrl.contains("youtube")) {
-            return true;
-        } else {
-            return false;
-        }
-    }
-}

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);
+		}
+	}
+}
+