move on to v0.9.10

Currently translated at 97.6% (164 of 168 strings)

.github/CONTRIBUTING.md

@@ -0,0 +1,40 @@
+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 occurs.
+
+## 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
+* Use english
+
+## 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,12 @@
+.gitignore
 .gradle
 /local.properties
-/.idea/workspace.xml
-/.idea/libraries
 .DS_Store
 /build
 /captures
+/app/app.iml
+/.idea
+/*.iml
+gradle.properties
+*~
+.weblate

.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.2
+
+    # 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,7 +1,85 @@
-NewPipe
--------
+WARNING: PUTTING NEWPIPE OR ANY FORK OF IT INTO GOOGLE PLAYSTORE VIOLATES THEIR TERMS OF CONDITIONS.
+
+# NewPipe
+NewPipe: A free lightweight Youtube frontend for Android.  
+
+[![NewPipe](app/src/main/res/mipmap-xhdpi/ic_launcher.png)](https://newpipe.schabi.org)
+[![F-Droid](https://f-droid.org/wiki/images/0/06/F-Droid-button_get-it-on.png)](https://f-droid.org/packages/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=160>](screenshots/screenshot_1.png)
+[<img src="screenshots/screenshot_2.png" width=160>](screenshots/screenshot_2.png)
+[<img src="screenshots/screenshot_3.png" width=160>](screenshots/screenshot_3.png)
+[<img src="screenshots/screenshot_4.png" width=160>](screenshots/screenshot_4.png)
+[<img src="screenshots/screenshot_5.png" width=160>](screenshots/screenshot_5.png)
+[<img src="screenshots/screenshot_6.png" width=160>](screenshots/screenshot_6.png)
+[<img src="screenshots/screenshot_7.png" width=160>](screenshots/screenshot_7.png)
+[<img src="screenshots/screenshot_8.png" width=160>](screenshots/screenshot_8.png)
+[<img src="screenshots/screenshot_9.png" width=160>](screenshots/screenshot_9.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)
+* Popup mode (floating player)
+* 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)
+* 1080p/2k/4k support
+
+### Coming Features
+
+* Bookmarks
+* View history
+* Search history
+* Subscribe to channels
+* Search/Watch Playlists
+* Queeing videos
+* Subtitles 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,101 +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/resValues/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/resValues/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/23.0.1/jars" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/design/23.0.1/jars" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.0.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 23 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-23.0.1" level="project" />
-    <orderEntry type="library" exported="" name="rhino-1.7.7" level="project" />
-    <orderEntry type="library" exported="" name="design-23.0.1" level="project" />
-    <orderEntry type="library" exported="" name="appcompat-v7-23.0.1" level="project" />
-    <orderEntry type="library" exported="" name="support-annotations-23.0.1" level="project" />
-  </component>
-</module>

app/build.gradle

@@ -1,15 +1,17 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.1"
+    compileSdkVersion 25
+    buildToolsVersion '25.0.2'
 
     defaultConfig {
         applicationId "org.schabi.newpipe"
         minSdkVersion 15
-        targetSdkVersion 23
-        versionCode 4
-        versionName "0.4.1"
+        targetSdkVersion 25
+        versionCode 37
+        versionName "0.9.10"
+
+        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
         release {
@@ -17,13 +19,43 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+
+    lintOptions {
+        checkReleaseBuilds false
+        // Or, if you prefer, you can continue to check for errors in release builds,
+        // but continue the build even when errors are found:
+        abortOnError false
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_7
+        targetCompatibility JavaVersion.VERSION_1_7
+    }
 }
 
 dependencies {
-    compile fileTree(include: ['*.jar'], dir: 'libs')
-    compile 'com.android.support:appcompat-v7:23.0.1'
-    compile 'com.android.support:support-v4:23.0.1'
+    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2') {
+        exclude module: 'support-annotations'
+    }
+
+
+    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.3.1'
+    compile 'com.android.support:support-v4:25.3.1'
+    compile 'com.android.support:design:25.3.1'
+    compile 'com.android.support:recyclerview-v7:25.3.1'
+
+    compile 'com.google.code.gson:gson:2.7'
     compile 'org.jsoup:jsoup:1.8.3'
     compile 'org.mozilla:rhino:1.7.7'
-    compile 'com.android.support:design:23.0.1'
+    compile 'ch.acra:acra:4.9.0'
+    compile 'info.guardianproject.netcipher:netcipher:1.2'
+
+    compile 'com.nostra13.universalimageloader:universal-image-loader:1.9.5'
+    compile 'de.hdodenhof:circleimageview:2.0.0'
+    compile 'com.github.nirhart:parallaxscroll:1.0'
+    compile 'com.nononsenseapps:filepicker:3.0.0'
+    compile 'com.google.android.exoplayer:exoplayer:r2.4.2'
 }

app/src/androidTest/java/org/schabi/newpipe/report/ErrorInfoTest.java

@@ -0,0 +1,37 @@
+package org.schabi.newpipe.report;
+
+import android.os.Parcel;
+import android.support.test.filters.LargeTest;
+import android.support.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.report.ErrorActivity.ErrorInfo;
+
+import static org.junit.Assert.assertEquals;
+
+/**
+ * Instrumented tests for {@link ErrorInfo}
+ */
+@RunWith(AndroidJUnit4.class)
+@LargeTest
+public class ErrorInfoTest {
+
+    @Test
+    public void errorInfo_testParcelable() {
+        ErrorInfo info = ErrorInfo.make(UserAction.USER_REPORT, "youtube", "request", R.string.general_error);
+        // Obtain a Parcel object and write the parcelable object to it:
+        Parcel parcel = Parcel.obtain();
+        info.writeToParcel(parcel, 0);
+        parcel.setDataPosition(0);
+        ErrorInfo infoFromParcel = ErrorInfo.CREATOR.createFromParcel(parcel);
+
+        assertEquals(UserAction.USER_REPORT, infoFromParcel.userAction);
+        assertEquals("youtube", infoFromParcel.serviceName);
+        assertEquals("request", infoFromParcel.request);
+        assertEquals(R.string.general_error, infoFromParcel.message);
+
+        parcel.recycle();
+    }
+}

app/src/main/AndroidManifest.xml

@@ -1,78 +1,219 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.schabi.newpipe" >
+<manifest
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    package="org.schabi.newpipe">
 
-    <uses-permission android:name= "android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.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"/>
+
     <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">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
+            </intent-filter>
+        </activity>
 
-                <category android:name="android.intent.category.LAUNCHER" />
+        <activity
+            android:name=".player.PlayVideoActivity"
+            android:configChanges="orientation|keyboardHidden|screenSize"
+            android:theme="@style/VideoPlayerTheme"
+            tools:ignore="UnusedAttribute"/>
+
+        <service
+            android:name=".player.BackgroundPlayer"
+            android:exported="false"/>
+
+        <service
+            android:name=".player.PopupVideoPlayer"
+            android:exported="false"/>
+
+        <activity
+            android:name=".player.MainVideoPlayer"
+            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
+            android:name=".PanicResponderActivity"
+            android:launchMode="singleInstance"
+            android:noHistory="true"
+            android:theme="@android:style/Theme.NoDisplay">
+            <intent-filter>
+                <action android:name="info.guardianproject.panic.action.TRIGGER"/>
+
+                <category android:name="android.intent.category.DEFAULT"/>
             </intent-filter>
         </activity>
         <activity
-            android:name=".VideoItemDetailActivity"
-            android:label="@string/title_videoitem_detail" >
+            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.PARENT_ACTIVITY"
-                android:value=".VideoItemListActivity" />
+                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"/>
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
+                <action android:name="android.media.action.MEDIA_PLAY_FROM_SEARCH"/>
+                <action android:name="android.nfc.action.NDEF_DISCOVERED"/>
 
-                <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:host="youtu.be"
-                    android:scheme="https"
-                    android:pathPrefix="/"/>
-                <data
-                    android:host="youtu.be"
-                    android:scheme="http"
-                    android:pathPrefix="/"/>
+                <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"/>
+                <!-- 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
+            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>
         <activity
-            android:name=".SettingsActivity"
-            android:label="@string/title_activity_settings" >
+            android:name=".about.AboutActivity"
+            android:label="@string/title_activity_about"
+            android:theme="@style/AppTheme">
         </activity>
     </application>
+
 </manifest>

app/src/main/assets/apache2.html

@@ -0,0 +1,162 @@
+<!doctype html>
+<html lang="en">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>Apache License - Version 2.0, January 2004</title>
+</head>
+<body>
+<p>Apache License<br>Version 2.0, January 2004<br>
+    <a href="http://www.apache.org/licenses/">http://www.apache.org/licenses/</a> </p>
+<p>TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION</p>
+<p><strong><a name="definitions">1. Definitions</a></strong>.</p>
+<p>"License" shall mean the terms and conditions for use, reproduction, and
+    distribution as defined by Sections 1 through 9 of this document.</p>
+<p>"Licensor" shall mean the copyright owner or entity authorized by the
+    copyright owner that is granting the License.</p>
+<p>"Legal Entity" shall mean the union of the acting entity and all other
+    entities that control, are controlled by, or are under common control with
+    that entity. For the purposes of this definition, "control" means (i) the
+    power, direct or indirect, to cause the direction or management of such
+    entity, whether by contract or otherwise, or (ii) ownership of fifty
+    percent (50%) or more of the outstanding shares, or (iii) beneficial
+    ownership of such entity.</p>
+<p>"You" (or "Your") shall mean an individual or Legal Entity exercising
+    permissions granted by this License.</p>
+<p>"Source" form shall mean the preferred form for making modifications,
+    including but not limited to software source code, documentation source,
+    and configuration files.</p>
+<p>"Object" form shall mean any form resulting from mechanical transformation
+    or translation of a Source form, including but not limited to compiled
+    object code, generated documentation, and conversions to other media types.</p>
+<p>"Work" shall mean the work of authorship, whether in Source or Object form,
+    made available under the License, as indicated by a copyright notice that
+    is included in or attached to the work (an example is provided in the
+    Appendix below).</p>
+<p>"Derivative Works" shall mean any work, whether in Source or Object form,
+    that is based on (or derived from) the Work and for which the editorial
+    revisions, annotations, elaborations, or other modifications represent, as
+    a whole, an original work of authorship. For the purposes of this License,
+    Derivative Works shall not include works that remain separable from, or
+    merely link (or bind by name) to the interfaces of, the Work and Derivative
+    Works thereof.</p>
+<p>"Contribution" shall mean any work of authorship, including the original
+    version of the Work and any modifications or additions to that Work or
+    Derivative Works thereof, that is intentionally submitted to Licensor for
+    inclusion in the Work by the copyright owner or by an individual or Legal
+    Entity authorized to submit on behalf of the copyright owner. For the
+    purposes of this definition, "submitted" means any form of electronic,
+    verbal, or written communication sent to the Licensor or its
+    representatives, including but not limited to communication on electronic
+    mailing lists, source code control systems, and issue tracking systems that
+    are managed by, or on behalf of, the Licensor for the purpose of discussing
+    and improving the Work, but excluding communication that is conspicuously
+    marked or otherwise designated in writing by the copyright owner as "Not a
+    Contribution."</p>
+<p>"Contributor" shall mean Licensor and any individual or Legal Entity on
+    behalf of whom a Contribution has been received by Licensor and
+    subsequently incorporated within the Work.</p>
+<p><strong><a name="copyright">2. Grant of Copyright License</a></strong>. Subject to the
+    terms and conditions of this License, each Contributor hereby grants to You
+    a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+    copyright license to reproduce, prepare Derivative Works of, publicly
+    display, publicly perform, sublicense, and distribute the Work and such
+    Derivative Works in Source or Object form.</p>
+<p><strong><a name="patent">3. Grant of Patent License</a></strong>. Subject to the terms
+    and conditions of this License, each Contributor hereby grants to You a
+    perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+    (except as stated in this section) patent license to make, have made, use,
+    offer to sell, sell, import, and otherwise transfer the Work, where such
+    license applies only to those patent claims licensable by such Contributor
+    that are necessarily infringed by their Contribution(s) alone or by
+    combination of their Contribution(s) with the Work to which such
+    Contribution(s) was submitted. If You institute patent litigation against
+    any entity (including a cross-claim or counterclaim in a lawsuit) alleging
+    that the Work or a Contribution incorporated within the Work constitutes
+    direct or contributory patent infringement, then any patent licenses
+    granted to You under this License for that Work shall terminate as of the
+    date such litigation is filed.</p>
+<p><strong><a name="redistribution">4. Redistribution</a></strong>. You may reproduce and
+    distribute copies of the Work or Derivative Works thereof in any medium,
+    with or without modifications, and in Source or Object form, provided that
+    You meet the following conditions:</p>
+<ol style="list-style: lower-latin;">
+    <li>You must give any other recipients of the Work or Derivative Works a
+        copy of this License; and</li>
+
+    <li>You must cause any modified files to carry prominent notices stating
+        that You changed the files; and</li>
+
+    <li>You must retain, in the Source form of any Derivative Works that You
+        distribute, all copyright, patent, trademark, and attribution notices from
+        the Source form of the Work, excluding those notices that do not pertain to
+        any part of the Derivative Works; and</li>
+
+    <li>If the Work includes a "NOTICE" text file as part of its distribution,
+        then any Derivative Works that You distribute must include a readable copy
+        of the attribution notices contained within such NOTICE file, excluding
+        those notices that do not pertain to any part of the Derivative Works, in
+        at least one of the following places: within a NOTICE text file distributed
+        as part of the Derivative Works; within the Source form or documentation,
+        if provided along with the Derivative Works; or, within a display generated
+        by the Derivative Works, if and wherever such third-party notices normally
+        appear. The contents of the NOTICE file are for informational purposes only
+        and do not modify the License. You may add Your own attribution notices
+        within Derivative Works that You distribute, alongside or as an addendum to
+        the NOTICE text from the Work, provided that such additional attribution
+        notices cannot be construed as modifying the License.
+        <br/>
+        <br/>
+        You may add Your own copyright statement to Your modifications and may
+        provide additional or different license terms and conditions for use,
+        reproduction, or distribution of Your modifications, or for any such
+        Derivative Works as a whole, provided Your use, reproduction, and
+        distribution of the Work otherwise complies with the conditions stated in
+        this License.
+    </li>
+
+</ol>
+
+<p><strong><a name="contributions">5. Submission of Contributions</a></strong>. Unless You
+    explicitly state otherwise, any Contribution intentionally submitted for
+    inclusion in the Work by You to the Licensor shall be under the terms and
+    conditions of this License, without any additional terms or conditions.
+    Notwithstanding the above, nothing herein shall supersede or modify the
+    terms of any separate license agreement you may have executed with Licensor
+    regarding such Contributions.</p>
+<p><strong><a name="trademarks">6. Trademarks</a></strong>. This License does not grant
+    permission to use the trade names, trademarks, service marks, or product
+    names of the Licensor, except as required for reasonable and customary use
+    in describing the origin of the Work and reproducing the content of the
+    NOTICE file.</p>
+<p><strong><a name="no-warranty">7. Disclaimer of Warranty</a></strong>. Unless required by
+    applicable law or agreed to in writing, Licensor provides the Work (and
+    each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT
+    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including,
+    without limitation, any warranties or conditions of TITLE,
+    NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You
+    are solely responsible for determining the appropriateness of using or
+    redistributing the Work and assume any risks associated with Your exercise
+    of permissions under this License.</p>
+<p><strong><a name="no-liability">8. Limitation of Liability</a></strong>. In no event and
+    under no legal theory, whether in tort (including negligence), contract, or
+    otherwise, unless required by applicable law (such as deliberate and
+    grossly negligent acts) or agreed to in writing, shall any Contributor be
+    liable to You for damages, including any direct, indirect, special,
+    incidental, or consequential damages of any character arising as a result
+    of this License or out of the use or inability to use the Work (including
+    but not limited to damages for loss of goodwill, work stoppage, computer
+    failure or malfunction, or any and all other commercial damages or losses),
+    even if such Contributor has been advised of the possibility of such
+    damages.</p>
+<p><strong><a name="additional">9. Accepting Warranty or Additional Liability</a></strong>.
+    While redistributing the Work or Derivative Works thereof, You may choose
+    to offer, and charge a fee for, acceptance of support, warranty, indemnity,
+    or other liability obligations and/or rights consistent with this License.
+    However, in accepting such obligations, You may act only on Your own behalf
+    and on Your sole responsibility, not on behalf of any other Contributor,
+    and only if You agree to indemnify, defend, and hold each Contributor
+    harmless for any liability incurred by, or claims asserted against, such
+    Contributor by reason of your accepting any such warranty or additional
+    liability.</p>
+</body>
+</html>

app/src/main/assets/gpl_2.html

@@ -0,0 +1,400 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <title>GNU General Public License v2.0 - GNU Project - Free Software Foundation (FSF)</title>
+ <link rel="alternate" type="application/rdf+xml"
+       href="http://www.gnu.org/licenses/old-licenses/gpl-2.0.rdf" />
+</head>
+<body>
+<h3><a id="SEC1">GNU GENERAL PUBLIC LICENSE</a></h3>
+<p>
+Version 2, June 1991
+</p>
+
+<pre>
+Copyright (C) 1989, 1991 Free Software Foundation, Inc.  
+51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+
+Everyone is permitted to copy and distribute verbatim copies
+of this license document, but changing it is not allowed.
+</pre>
+
+<h3 id="preamble"><a id="SEC2">Preamble</a></h3>
+
+<p>
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+</p>
+
+<p>
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+</p>
+
+<p>
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+</p>
+
+<p>
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+</p>
+
+<p>
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+</p>
+
+<p>
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+</p>
+
+<p>
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+</p>
+
+<p>
+  The precise terms and conditions for copying, distribution and
+modification follow.
+</p>
+
+
+<h3 id="terms"><a id="SEC3">TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION</a></h3>
+
+
+<p id="section0">
+<strong>0.</strong>
+ This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+</p>
+
+<p>
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+</p>
+
+<p id="section1">
+<strong>1.</strong>
+ You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+</p>
+
+<p>
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+</p>
+
+<p id="section2">
+<strong>2.</strong>
+ You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+</p>
+
+<dl>
+  <dt></dt>
+    <dd>
+      <strong>a)</strong>
+      You must cause the modified files to carry prominent notices
+      stating that you changed the files and the date of any change.
+    </dd>
+  <dt></dt>
+    <dd>
+      <strong>b)</strong>
+      You must cause any work that you distribute or publish, that in
+      whole or in part contains or is derived from the Program or any
+      part thereof, to be licensed as a whole at no charge to all third
+      parties under the terms of this License.
+    </dd>
+  <dt></dt>
+    <dd>
+      <strong>c)</strong>
+      If the modified program normally reads commands interactively
+      when run, you must cause it, when started running for such
+      interactive use in the most ordinary way, to print or display an
+      announcement including an appropriate copyright notice and a
+      notice that there is no warranty (or else, saying that you provide
+      a warranty) and that users may redistribute the program under
+      these conditions, and telling the user how to view a copy of this
+      License.  (Exception: if the Program itself is interactive but
+      does not normally print such an announcement, your work based on
+      the Program is not required to print an announcement.)
+    </dd>
+</dl>
+
+<p>
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+</p>
+
+<p>
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+</p>
+
+<p>
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+</p>
+
+<p id="section3">
+<strong>3.</strong>
+ You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+</p>
+
+<!-- we use this doubled UL to get the sub-sections indented, -->
+<!-- while making the bullets as unobvious as possible. -->
+
+<dl>
+  <dt></dt>
+    <dd>
+      <strong>a)</strong>
+      Accompany it with the complete corresponding machine-readable
+      source code, which must be distributed under the terms of Sections
+      1 and 2 above on a medium customarily used for software interchange; or,
+    </dd>
+  <dt></dt>
+    <dd>
+      <strong>b)</strong>
+      Accompany it with a written offer, valid for at least three
+      years, to give any third party, for a charge no more than your
+      cost of physically performing source distribution, a complete
+      machine-readable copy of the corresponding source code, to be
+      distributed under the terms of Sections 1 and 2 above on a medium
+      customarily used for software interchange; or,
+    </dd>
+  <dt></dt>
+    <dd>
+      <strong>c)</strong>
+      Accompany it with the information you received as to the offer
+      to distribute corresponding source code.  (This alternative is
+      allowed only for noncommercial distribution and only if you
+      received the program in object code or executable form with such
+      an offer, in accord with Subsection b above.)
+    </dd>
+</dl>
+
+<p>
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major softwareComponents (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+</p>
+
+<p>
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+</p>
+
+<p id="section4">
+<strong>4.</strong>
+ You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+</p>
+
+<p id="section5">
+<strong>5.</strong>
+ You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+</p>
+
+<p id="section6">
+<strong>6.</strong>
+ Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+</p>
+
+<p id="section7">
+<strong>7.</strong>
+ If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+</p>
+
+<p>
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+</p>
+
+<p>
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+</p>
+
+<p>
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+</p>
+
+<p id="section8">
+<strong>8.</strong>
+ If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+</p>
+
+<p id="section9">
+<strong>9.</strong>
+ The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+</p>
+
+<p>
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+</p>
+
+<p id="section10">
+<strong>10.</strong>
+ If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+</p>
+
+<p id="section11"><strong>NO WARRANTY</strong></p>
+
+<p>
+<strong>11.</strong>
+ BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+</p>
+
+<p id="section12">
+<strong>12.</strong>
+ IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+</p>
+</body></html>

app/src/main/assets/gpl_3.html

@@ -0,0 +1,639 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <title>GNU General Public License v3.0 - GNU Project - Free Software Foundation (FSF)</title>
+ <link rel="alternate" type="application/rdf+xml"
+       href="http://www.gnu.org/licenses/gpl-3.0.rdf" /> 
+</head>
+<body>
+<h3 style="text-align: center;">GNU GENERAL PUBLIC LICENSE</h3>
+<p style="text-align: center;">Version 3, 29 June 2007</p>
+
+<p>Copyright &copy; 2007 Free Software Foundation, Inc.
+ &lt;<a href="http://fsf.org/">http://fsf.org/</a>&gt;</p><p>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.</p>
+
+<h3><a name="preamble"></a>Preamble</h3>
+
+<p>The GNU General Public License is a free, copyleft license for
+software and other kinds of works.</p>
+
+<p>The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.</p>
+
+<p>When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.</p>
+
+<p>To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.</p>
+
+<p>For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.</p>
+
+<p>Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.</p>
+
+<p>For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.</p>
+
+<p>Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.</p>
+
+<p>Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.</p>
+
+<p>The precise terms and conditions for copying, distribution and
+modification follow.</p>
+
+<h3><a name="terms"></a>TERMS AND CONDITIONS</h3>
+
+<h4><a name="section0"></a>0. Definitions.</h4>
+
+<p>&ldquo;This License&rdquo; refers to version 3 of the GNU General Public License.</p>
+
+<p>&ldquo;Copyright&rdquo; also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.</p>
+ 
+<p>&ldquo;The Program&rdquo; refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as &ldquo;you&rdquo;.  &ldquo;Licensees&rdquo; and
+&ldquo;recipients&rdquo; may be individuals or organizations.</p>
+
+<p>To &ldquo;modify&rdquo; a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a &ldquo;modified version&rdquo; of the
+earlier work or a work &ldquo;based on&rdquo; the earlier work.</p>
+
+<p>A &ldquo;covered work&rdquo; means either the unmodified Program or a work based
+on the Program.</p>
+
+<p>To &ldquo;propagate&rdquo; a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.</p>
+
+<p>To &ldquo;convey&rdquo; a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.</p>
+
+<p>An interactive user interface displays &ldquo;Appropriate Legal Notices&rdquo;
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.</p>
+
+<h4><a name="section1"></a>1. Source Code.</h4>
+
+<p>The &ldquo;source code&rdquo; for a work means the preferred form of the work
+for making modifications to it.  &ldquo;Object code&rdquo; means any non-source
+form of a work.</p>
+
+<p>A &ldquo;Standard Interface&rdquo; means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.</p>
+
+<p>The &ldquo;System Libraries&rdquo; of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+&ldquo;Major Component&rdquo;, in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.</p>
+
+<p>The &ldquo;Corresponding Source&rdquo; for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.</p>
+
+<p>The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.</p>
+
+<p>The Corresponding Source for a work in source code form is that
+same work.</p>
+
+<h4><a name="section2"></a>2. Basic Permissions.</h4>
+
+<p>All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.</p>
+
+<p>You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.</p>
+
+<p>Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.</p>
+
+<h4><a name="section3"></a>3. Protecting Users' Legal Rights From Anti-Circumvention Law.</h4>
+
+<p>No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.</p>
+
+<p>When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.</p>
+
+<h4><a name="section4"></a>4. Conveying Verbatim Copies.</h4>
+
+<p>You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.</p>
+
+<p>You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.</p>
+
+<h4><a name="section5"></a>5. Conveying Modified Source Versions.</h4>
+
+<p>You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:</p>
+
+<ul>
+<li>a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.</li>
+
+<li>b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    &ldquo;keep intact all notices&rdquo;.</li>
+
+<li>c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.</li>
+
+<li>d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.</li>
+</ul>
+
+<p>A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+&ldquo;aggregate&rdquo; if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.</p>
+
+<h4><a name="section6"></a>6. Conveying Non-Source Forms.</h4>
+
+<p>You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:</p>
+
+<ul>
+<li>a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.</li>
+
+<li>b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.</li>
+
+<li>c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.</li>
+
+<li>d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.</li>
+
+<li>e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.</li>
+</ul>
+
+<p>A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.</p>
+
+<p>A &ldquo;User Product&rdquo; is either (1) a &ldquo;consumer product&rdquo;, which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, &ldquo;normally used&rdquo; refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.</p>
+
+<p>&ldquo;Installation Information&rdquo; for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.</p>
+
+<p>If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).</p>
+
+<p>The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.</p>
+
+<p>Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.</p>
+
+<h4><a name="section7"></a>7. Additional Terms.</h4>
+
+<p>&ldquo;Additional permissions&rdquo; are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.</p>
+
+<p>When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.</p>
+
+<p>Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:</p>
+
+<ul>
+<li>a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or</li>
+
+<li>b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or</li>
+
+<li>c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or</li>
+
+<li>d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or</li>
+
+<li>e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or</li>
+
+<li>f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.</li>
+</ul>
+
+<p>All other non-permissive additional terms are considered &ldquo;further
+restrictions&rdquo; within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.</p>
+
+<p>If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.</p>
+
+<p>Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.</p>
+
+<h4><a name="section8"></a>8. Termination.</h4>
+
+<p>You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).</p>
+
+<p>However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.</p>
+
+<p>Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.</p>
+
+<p>Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.</p>
+
+<h4><a name="section9"></a>9. Acceptance Not Required for Having Copies.</h4>
+
+<p>You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.</p>
+
+<h4><a name="section10"></a>10. Automatic Licensing of Downstream Recipients.</h4>
+
+<p>Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.</p>
+
+<p>An &ldquo;entity transaction&rdquo; is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.</p>
+
+<p>You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.</p>
+
+<h4><a name="section11"></a>11. Patents.</h4>
+
+<p>A &ldquo;contributor&rdquo; is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's &ldquo;contributor version&rdquo;.</p>
+
+<p>A contributor's &ldquo;essential patent claims&rdquo; are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, &ldquo;control&rdquo; includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.</p>
+
+<p>Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.</p>
+
+<p>In the following three paragraphs, a &ldquo;patent license&rdquo; is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To &ldquo;grant&rdquo; such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.</p>
+
+<p>If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  &ldquo;Knowingly relying&rdquo; means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.</p>
+  
+<p>If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.</p>
+
+<p>A patent license is &ldquo;discriminatory&rdquo; if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.</p>
+
+<p>Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.</p>
+
+<h4><a name="section12"></a>12. No Surrender of Others' Freedom.</h4>
+
+<p>If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.</p>
+
+<h4><a name="section13"></a>13. Use with the GNU Affero General Public License.</h4>
+
+<p>Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.</p>
+
+<h4><a name="section14"></a>14. Revised Versions of this License.</h4>
+
+<p>The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.</p>
+
+<p>Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License &ldquo;or any later version&rdquo; applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.</p>
+
+<p>If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.</p>
+
+<p>Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.</p>
+
+<h4><a name="section15"></a>15. Disclaimer of Warranty.</h4>
+
+<p>THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM &ldquo;AS IS&rdquo; WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.</p>
+
+<h4><a name="section16"></a>16. Limitation of Liability.</h4>
+
+<p>IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.</p>
+
+<h4><a name="section17"></a>17. Interpretation of Sections 15 and 16.</h4>
+
+<p>If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.</p>
+
+</body></html>

app/src/main/assets/mit.html

@@ -0,0 +1,26 @@
+<html>
+<head></head>
+<body>
+<p>Copyright (c) &lt;year&gt; &lt;copyright holders&gt;</p>
+
+<p>Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:</p>
+
+<p>
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.</p>
+<p>
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.<br />
+NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.</p>
+</body>
+</html>

app/src/main/assets/mpl2.html

@@ -0,0 +1,260 @@
+<!DOCTYPE html>
+<!-- saved from url=(0038)https://www.mozilla.org/en-US/MPL/2.0/ -->
+<html>
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+    <title>Mozilla Public License, version 2.0</title>
+<body>
+<h1 id="mozilla-public-license-version-2.0">Mozilla Public License<br>Version 2.0</h1>
+<h2 id="definitions">1. Definitions</h2>
+<dl>
+    <dt>1.1. “Contributor”</dt>
+    <dd><p>means each individual or legal entity that creates, contributes to the creation of, or
+        owns Covered Software.</p>
+    </dd>
+    <dt>1.2. “Contributor Version”</dt>
+    <dd><p>means the combination of the Contributions of others (if any) used by a Contributor and
+        that particular Contributor’s Contribution.</p>
+    </dd>
+    <dt>1.3. “Contribution”</dt>
+    <dd><p>means Covered Software of a particular Contributor.</p>
+    </dd>
+    <dt>1.4. “Covered Software”</dt>
+    <dd><p>means Source Code Form to which the initial Contributor has attached the notice in
+        Exhibit A, the Executable Form of such Source Code Form, and Modifications of such Source
+        Code Form, in each case including portions thereof.</p>
+    </dd>
+    <dt>1.5. “Incompatible With Secondary Licenses”</dt>
+    <dd><p>means</p>
+        <ol type="a">
+            <li><p>that the initial Contributor has attached the notice described in Exhibit B to
+                the Covered Software; or</p></li>
+            <li><p>that the Covered Software was made available under the terms of version 1.1 or
+                earlier of the License, but not also under the terms of a Secondary License.</p>
+            </li>
+        </ol>
+    </dd>
+    <dt>1.6. “Executable Form”</dt>
+    <dd><p>means any form of the work other than Source Code Form.</p>
+    </dd>
+    <dt>1.7. “Larger Work”</dt>
+    <dd><p>means a work that combines Covered Software with other material, in a separate file or
+        files, that is not Covered Software.</p>
+    </dd>
+    <dt>1.8. “License”</dt>
+    <dd><p>means this document.</p>
+    </dd>
+    <dt>1.9. “Licensable”</dt>
+    <dd><p>means having the right to grant, to the maximum extent possible, whether at the time of
+        the initial grant or subsequently, any and all of the rights conveyed by this License.</p>
+    </dd>
+    <dt>1.10. “Modifications”</dt>
+    <dd><p>means any of the following:</p>
+        <ol type="a">
+            <li><p>any file in Source Code Form that results from an addition to, deletion from, or
+                modification of the contents of Covered Software; or</p></li>
+            <li><p>any new file in Source Code Form that contains any Covered Software.</p></li>
+        </ol>
+    </dd>
+    <dt>1.11. “Patent Claims” of a Contributor</dt>
+    <dd><p>means any patent claim(s), including without limitation, method, process, and apparatus
+        claims, in any patent Licensable by such Contributor that would be infringed, but for the
+        grant of the License, by the making, using, selling, offering for sale, having made, import,
+        or transfer of either its Contributions or its Contributor Version.</p>
+    </dd>
+    <dt>1.12. “Secondary License”</dt>
+    <dd><p>means either the GNU General Public License, Version 2.0, the GNU Lesser General Public
+        License, Version 2.1, the GNU Affero General Public License, Version 3.0, or any later
+        versions of those licenses.</p>
+    </dd>
+    <dt>1.13. “Source Code Form”</dt>
+    <dd><p>means the form of the work preferred for making modifications.</p>
+    </dd>
+    <dt>1.14. “You” (or “Your”)</dt>
+    <dd><p>means an individual or a legal entity exercising rights under this License. For legal
+        entities, “You” includes any entity that controls, is controlled by, or is under common
+        control with You. For purposes of this definition, “control” means (a) the power, direct or
+        indirect, to cause the direction or management of such entity, whether by contract or
+        otherwise, or (b) ownership of more than fifty percent (50%) of the outstanding shares or
+        beneficial ownership of such entity.</p>
+    </dd>
+</dl>
+<h2 id="license-grants-and-conditions">2. License Grants and Conditions</h2>
+<h3 id="grants">2.1. Grants</h3>
+<p>Each Contributor hereby grants You a world-wide, royalty-free, non-exclusive license:</p>
+<ol type="a">
+    <li><p>under intellectual property rights (other than patent or trademark) Licensable by such
+        Contributor to use, reproduce, make available, modify, display, perform, distribute, and
+        otherwise exploit its Contributions, either on an unmodified basis, with Modifications, or
+        as part of a Larger Work; and</p></li>
+    <li><p>under Patent Claims of such Contributor to make, use, sell, offer for sale, have made,
+        import, and otherwise transfer either its Contributions or its Contributor Version.</p></li>
+</ol>
+<h3 id="effective-date">2.2. Effective Date</h3>
+<p>The licenses granted in Section&nbsp;2.1 with respect to any Contribution become effective for
+    each Contribution on the date the Contributor first distributes such Contribution.</p>
+<h3 id="limitations-on-grant-scope">2.3. Limitations on Grant Scope</h3>
+<p>The licenses granted in this Section&nbsp;2 are the only rights granted under this License. No
+    additional rights or licenses will be implied from the distribution or licensing of Covered
+    Software under this License. Notwithstanding Section&nbsp;2.1(b) above, no patent license is
+    granted by a Contributor:</p>
+<ol type="a">
+    <li><p>for any code that a Contributor has removed from Covered Software; or</p></li>
+    <li><p>for infringements caused by: (i) Your and any other third party’s modifications of
+        Covered Software, or (ii) the combination of its Contributions with other software (except
+        as part of its Contributor Version); or</p></li>
+    <li><p>under Patent Claims infringed by Covered Software in the absence of its
+        Contributions.</p></li>
+</ol>
+<p>This License does not grant any rights in the trademarks, service marks, or logos of any
+    Contributor (except as may be necessary to comply with the notice requirements in Section&nbsp;3.4).</p>
+<h3 id="subsequent-licenses">2.4. Subsequent Licenses</h3>
+<p>No Contributor makes additional grants as a result of Your choice to distribute the Covered
+    Software under a subsequent version of this License (see Section&nbsp;10.2) or under the terms
+    of a Secondary License (if permitted under the terms of Section&nbsp;3.3).</p>
+<h3 id="representation">2.5. Representation</h3>
+<p>Each Contributor represents that the Contributor believes its Contributions are its original
+    creation(s) or it has sufficient rights to grant the rights to its Contributions conveyed by
+    this License.</p>
+<h3 id="fair-use">2.6. Fair Use</h3>
+<p>This License is not intended to limit any rights You have under applicable copyright doctrines of
+    fair use, fair dealing, or other equivalents.</p>
+<h3 id="conditions">2.7. Conditions</h3>
+<p>Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted in Section&nbsp;2.1.</p>
+<h2 id="responsibilities">3. Responsibilities</h2>
+<h3 id="distribution-of-source-form">3.1. Distribution of Source Form</h3>
+<p>All distribution of Covered Software in Source Code Form, including any Modifications that You
+    create or to which You contribute, must be under the terms of this License. You must inform
+    recipients that the Source Code Form of the Covered Software is governed by the terms of this
+    License, and how they can obtain a copy of this License. You may not attempt to alter or
+    restrict the recipients’ rights in the Source Code Form.</p>
+<h3 id="distribution-of-executable-form">3.2. Distribution of Executable Form</h3>
+<p>If You distribute Covered Software in Executable Form then:</p>
+<ol type="a">
+    <li><p>such Covered Software must also be made available in Source Code Form, as described in
+        Section&nbsp;3.1, and You must inform recipients of the Executable Form how they can obtain
+        a copy of such Source Code Form by reasonable means in a timely manner, at a charge no more
+        than the cost of distribution to the recipient; and</p></li>
+    <li><p>You may distribute such Executable Form under the terms of this License, or sublicense it
+        under different terms, provided that the license for the Executable Form does not attempt to
+        limit or alter the recipients’ rights in the Source Code Form under this License.</p></li>
+</ol>
+<h3 id="distribution-of-a-larger-work">3.3. Distribution of a Larger Work</h3>
+<p>You may create and distribute a Larger Work under terms of Your choice, provided that You also
+    comply with the requirements of this License for the Covered Software. If the Larger Work is a
+    combination of Covered Software with a work governed by one or more Secondary Licenses, and the
+    Covered Software is not Incompatible With Secondary Licenses, this License permits You to
+    additionally distribute such Covered Software under the terms of such Secondary License(s), so
+    that the recipient of the Larger Work may, at their option, further distribute the Covered
+    Software under the terms of either this License or such Secondary License(s).</p>
+<h3 id="notices">3.4. Notices</h3>
+<p>You may not remove or alter the substance of any license notices (including copyright notices,
+    patent notices, disclaimers of warranty, or limitations of liability) contained within the
+    Source Code Form of the Covered Software, except that You may alter any license notices to the
+    extent required to remedy known factual inaccuracies.</p>
+<h3 id="application-of-additional-terms">3.5. Application of Additional Terms</h3>
+<p>You may choose to offer, and to charge a fee for, warranty, support, indemnity or liability
+    obligations to one or more recipients of Covered Software. However, You may do so only on Your
+    own behalf, and not on behalf of any Contributor. You must make it absolutely clear that any
+    such warranty, support, indemnity, or liability obligation is offered by You alone, and You
+    hereby agree to indemnify every Contributor for any liability incurred by such Contributor as a
+    result of warranty, support, indemnity or liability terms You offer. You may include additional
+    disclaimers of warranty and limitations of liability specific to any jurisdiction.</p>
+<h2 id="inability-to-comply-due-to-statute-or-regulation">4. Inability to Comply Due to Statute or
+    Regulation</h2>
+<p>If it is impossible for You to comply with any of the terms of this License with respect to some
+    or all of the Covered Software due to statute, judicial order, or regulation then You must: (a)
+    comply with the terms of this License to the maximum extent possible; and (b) describe the
+    limitations and the code they affect. Such description must be placed in a text file included
+    with all distributions of the Covered Software under this License. Except to the extent
+    prohibited by statute or regulation, such description must be sufficiently detailed for a
+    recipient of ordinary skill to be able to understand it.</p>
+<h2 id="termination">5. Termination</h2>
+<p>5.1. The rights granted under this License will terminate automatically if You fail to comply
+    with any of its terms. However, if You become compliant, then the rights granted under this
+    License from a particular Contributor are reinstated (a) provisionally, unless and until such
+    Contributor explicitly and finally terminates Your grants, and (b) on an ongoing basis, if such
+    Contributor fails to notify You of the non-compliance by some reasonable means prior to 60 days
+    after You have come back into compliance. Moreover, Your grants from a particular Contributor
+    are reinstated on an ongoing basis if such Contributor notifies You of the non-compliance by
+    some reasonable means, this is the first time You have received notice of non-compliance with
+    this License from such Contributor, and You become compliant prior to 30 days after Your receipt
+    of the notice.</p>
+<p>5.2. If You initiate litigation against any entity by asserting a patent infringement claim
+    (excluding declaratory judgment actions, counter-claims, and cross-claims) alleging that a
+    Contributor Version directly or indirectly infringes any patent, then the rights granted to You
+    by any and all Contributors for the Covered Software under Section&nbsp;2.1 of this License
+    shall terminate.</p>
+<p>5.3. In the event of termination under Sections&nbsp;5.1 or 5.2 above, all end user license
+    agreements (excluding distributors and resellers) which have been validly granted by You or Your
+    distributors under this License prior to termination shall survive termination.</p>
+<h2 id="disclaimer-of-warranty">6. Disclaimer of Warranty</h2>
+<p><em>Covered Software is provided under this License on an “as is” basis, without warranty of any
+    kind, either expressed, implied, or statutory, including, without limitation, warranties that
+    the Covered Software is free of defects, merchantable, fit for a particular purpose or
+    non-infringing. The entire risk as to the quality and performance of the Covered Software is
+    with You. Should any Covered Software prove defective in any respect, You (not any Contributor)
+    assume the cost of any necessary servicing, repair, or correction. This disclaimer of warranty
+    constitutes an essential part of this License. No use of any Covered Software is authorized
+    under this License except under this disclaimer.</em></p>
+<h2 id="limitation-of-liability">7. Limitation of Liability</h2>
+<p><em>Under no circumstances and under no legal theory, whether tort (including negligence),
+    contract, or otherwise, shall any Contributor, or anyone who distributes Covered Software as
+    permitted above, be liable to You for any direct, indirect, special, incidental, or
+    consequential damages of any character including, without limitation, damages for lost profits,
+    loss of goodwill, work stoppage, computer failure or malfunction, or any and all other
+    commercial damages or losses, even if such party shall have been informed of the possibility of
+    such damages. This limitation of liability shall not apply to liability for death or personal
+    injury resulting from such party’s negligence to the extent applicable law prohibits such
+    limitation. Some jurisdictions do not allow the exclusion or limitation of incidental or
+    consequential damages, so this exclusion and limitation may not apply to You.</em></p>
+<h2 id="litigation">8. Litigation</h2>
+<p>Any litigation relating to this License may be brought only in the courts of a jurisdiction where
+    the defendant maintains its principal place of business and such litigation shall be governed by
+    laws of that jurisdiction, without reference to its conflict-of-law provisions. Nothing in this
+    Section shall prevent a party’s ability to bring cross-claims or counter-claims.</p>
+<h2 id="miscellaneous">9. Miscellaneous</h2>
+<p>This License represents the complete agreement concerning the subject matter hereof. If any
+    provision of this License is held to be unenforceable, such provision shall be reformed only to
+    the extent necessary to make it enforceable. Any law or regulation which provides that the
+    language of a contract shall be construed against the drafter shall not be used to construe this
+    License against a Contributor.</p>
+<h2 id="versions-of-the-license">10. Versions of the License</h2>
+<h3 id="new-versions">10.1. New Versions</h3>
+<p>Mozilla Foundation is the license steward. Except as provided in Section&nbsp;10.3, no one other
+    than the license steward has the right to modify or publish new versions of this License. Each
+    version will be given a distinguishing version number.</p>
+<h3 id="effect-of-new-versions">10.2. Effect of New Versions</h3>
+<p>You may distribute the Covered Software under the terms of the version of the License under which
+    You originally received the Covered Software, or under the terms of any subsequent version
+    published by the license steward.</p>
+<h3 id="modified-versions">10.3. Modified Versions</h3>
+<p>If you create software not governed by this License, and you want to create a new license for
+    such software, you may create and use a modified version of this License if you rename the
+    license and remove any references to the name of the license steward (except to note that such
+    modified license differs from this License).</p>
+<h3 id="distributing-source-code-form-that-is-incompatible-with-secondary-licenses">10.4.
+    Distributing Source Code Form that is Incompatible With Secondary Licenses</h3>
+<p>If You choose to distribute Source Code Form that is Incompatible With Secondary Licenses under
+    the terms of this version of the License, the notice described in Exhibit B of this License must
+    be attached.</p>
+<h2 id="exhibit-a---source-code-form-license-notice">Exhibit A - Source Code Form License
+    Notice</h2>
+<blockquote>
+    <p>This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. If a
+        copy of the MPL was not distributed with this file, You can obtain one at
+        https://mozilla.org/MPL/2.0/.</p>
+</blockquote>
+<p>If it is not possible or desirable to put the notice in a particular file, then You may include
+    the notice in a location (such as a LICENSE file in a relevant directory) where a recipient
+    would be likely to look for such a notice.</p>
+<p>You may add additional accurate notices of copyright ownership.</p>
+<h2 id="exhibit-b---incompatible-with-secondary-licenses-notice">Exhibit B - “Incompatible With
+    Secondary Licenses” Notice</h2>
+<blockquote>
+    <p>This Source Code Form is “Incompatible With Secondary Licenses”, as defined by the Mozilla
+        Public License, v. 2.0.</p>
+</blockquote>
+
+</body>
+</html>

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

@@ -1,329 +0,0 @@
-package org.schabi.newpipe;
-
-import android.app.DownloadManager;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.net.Uri;
-import android.os.Bundle;
-import android.preference.Preference;
-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 final String KORE_PACKET = "org.xbmc.kore";
-
-    private static ActionBarHandler handler = null;
-
-    private Context context = null;
-    private String webisteUrl = "";
-    private AppCompatActivity activity;
-    private VideoInfo.VideoStream[] videoStreams = null;
-    private VideoInfo.AudioStream audioStream = null;
-    private int selectedStream = -1;
-    private String videoTitle = "";
-
-    SharedPreferences defaultPreferences = null;
-
-    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.VideoStream[] videoStreams, VideoInfo.AudioStream[] audioStreams) {
-        this.videoStreams = videoStreams;
-        selectedStream = 0;
-        String[] itemArray = new String[videoStreams.length];
-        String defaultResolution = defaultPreferences
-                .getString(context.getString(R.string.defaultResolutionPreference),
-                        context.getString(R.string.defaultResolutionListItem));
-        int defaultResolutionPos = 0;
-
-        for(int i = 0; i < videoStreams.length; i++) {
-            itemArray[i] = VideoInfo.getNameById(videoStreams[i].format) + " " + videoStreams[i].resolution;
-            if(defaultResolution.equals(videoStreams[i].resolution)) {
-                defaultResolutionPos = i;
-            }
-        }
-
-        ArrayAdapter<String> itemAdapter = new ArrayAdapter<String>(activity.getBaseContext(),
-                android.R.layout.simple_spinner_dropdown_item, itemArray);
-        if(activity != null) {
-            ActionBar ab = activity.getSupportActionBar();
-            ab.setListNavigationCallbacks(itemAdapter
-                    ,new ForamatItemSelectListener());
-            ab.setSelectedNavigationItem(defaultResolutionPos);
-        }
-
-        // set audioStream
-        audioStream = null;
-        String preferedFormat = PreferenceManager.getDefaultSharedPreferences(context)
-                .getString(context.getString(R.string.defaultAudioFormatPreference), "webm");
-        if(preferedFormat.equals("webm")) {
-            for(VideoInfo.AudioStream s : audioStreams) {
-                if(s.format == VideoInfo.I_WEBMA) {
-                    audioStream = s;
-                }
-            }
-        } else if(preferedFormat.equals("m4a")){
-            for(VideoInfo.AudioStream s : audioStreams) {
-                Log.d(TAG, VideoInfo.getMimeById(s.format) + " : " + Integer.toString(s.bandWidth));
-                if(s.format == VideoInfo.I_M4A &&
-                        (audioStream == null || audioStream.bandWidth > s.bandWidth)) {
-                    audioStream = s;
-                    Log.d(TAG, "last choosen");
-                }
-            }
-        }
-    }
-
-    private void selectFormatItem(int i) {
-        selectedStream = i;
-    }
-
-    public boolean setupMenu(Menu menu, MenuInflater inflater, Context context) {
-        this.context = context;
-        // CAUTION set item properties programmatically otherwise it would not be accepted by
-        // appcompat itemsinflater.inflate(R.menu.videoitem_detail, menu);
-
-        defaultPreferences = PreferenceManager.getDefaultSharedPreferences(context);
-
-        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);
-        MenuItem castItem = menu.findItem(R.id.action_play_with_kodi);
-
-        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);
-
-        castItem.setVisible(defaultPreferences
-                .getBoolean(context.getString(R.string.showPlayWidthKodiPreference), false));
-
-        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);
-            }
-            break;
-            case R.id.action_play_with_kodi:
-                playWithKodi();
-                break;
-            case R.id.menu_item_play_audio:
-                playAudio();
-                break;
-            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(context.getString(R.string.useExternalPlayer), false)) {
-                Intent intent = new Intent();
-                try {
-                    intent.setAction(Intent.ACTION_VIEW);
-                    intent.setDataAndType(Uri.parse(videoStreams[selectedStream].url),
-                            VideoInfo.getMimeById(videoStreams[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, videoStreams[selectedStream].url);
-                intent.putExtra(PlayVideoActivity.VIDEO_URL, webisteUrl);
-                context.startActivity(intent);
-            }
-        }
-        // --------------------------------------------
-    }
-
-    public void downloadVideo() {
-        Log.d(TAG, "bla");
-        if(!videoTitle.isEmpty()) {
-            String videoSuffix = "." + VideoInfo.getSuffixById(videoStreams[selectedStream].format);
-            String audioSuffix = "." + VideoInfo.getSuffixById(audioStream.format);
-            Bundle args = new Bundle();
-            args.putString(DownloadDialog.FILE_SUFFIX_VIDEO, videoSuffix);
-            args.putString(DownloadDialog.FILE_SUFFIX_AUDIO, audioSuffix);
-            args.putString(DownloadDialog.TITLE, videoTitle);
-            args.putString(DownloadDialog.VIDEO_URL, videoStreams[selectedStream].url);
-            args.putString(DownloadDialog.AUDIO_URL, audioStream.url);
-            DownloadDialog downloadDialog = new DownloadDialog();
-            downloadDialog.setArguments(args);
-            downloadDialog.show(activity.getSupportFragmentManager(), "downloadDialog");
-        }
-    }
-
-    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)));
-        }
-    }
-
-    public void playWithKodi() {
-        if(!videoTitle.isEmpty()) {
-            try {
-                Intent intent = new Intent(Intent.ACTION_VIEW);
-                intent.setPackage(KORE_PACKET);
-                intent.setData(Uri.parse(webisteUrl.replace("https", "http")));
-                context.startActivity(intent);
-            } catch (Exception e) {
-                e.printStackTrace();
-                AlertDialog.Builder builder = new AlertDialog.Builder(context);
-                builder.setMessage(R.string.koreNotFound)
-                        .setPositiveButton(R.string.installeKore, new DialogInterface.OnClickListener() {
-                            @Override
-                            public void onClick(DialogInterface dialog, int which) {
-                                Intent intent = new Intent();
-                                intent.setAction(Intent.ACTION_VIEW);
-                                intent.setData(Uri.parse(context.getString(R.string.fdroidKoreUrl)));
-                                context.startActivity(intent);
-                            }
-                        })
-                        .setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
-                            @Override
-                            public void onClick(DialogInterface dialog, int which) {
-
-                            }
-                        });
-                builder.create().show();
-            }
-        }
-    }
-
-    public void playAudio() {
-        Intent intent = new Intent();
-        try {
-            intent.setAction(Intent.ACTION_VIEW);
-            intent.setDataAndType(Uri.parse(audioStream.url),
-                    VideoInfo.getMimeById(audioStream.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) {
-                            Log.i(TAG, "You unlocked a secret unicorn.");
-                        }
-                    });
-            builder.create().show();
-        }
-    }
-}

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

@@ -1,10 +1,10 @@
 package org.schabi.newpipe;
 
 /**
- * Created by Christian Schabesberger on 23.08.15.
+ * Created by Christian Schabesberger on 24.12.15.
  *
  * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
- * StreamingService.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
@@ -20,16 +20,20 @@ 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();
+/**
+ * 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 {
 
-    // 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);
+    private static ActivityCommunicator activityCommunicator;
+
+    public static ActivityCommunicator getCommunicator() {
+        if(activityCommunicator == null) {
+            activityCommunicator = new ActivityCommunicator();
+        }
+        return activityCommunicator;
+    }
+
+    public volatile Class returnActivity;
 }

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

@@ -0,0 +1,112 @@
+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.report.UserAction;
+import org.schabi.newpipe.settings.SettingsActivity;
+import org.schabi.newpipe.util.ThemeHelper;
+
+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(UserAction.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);
+
+        ThemeHelper.setTheme(getApplicationContext());
+    }
+
+    /**
+     * 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/DownloadDialog.java

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

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

@@ -1,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,65 @@
+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;
+import org.schabi.newpipe.report.UserAction;
+
+/**
+ * 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(UserAction.LOAD_IMAGE,
+                        NewPipe.getNameOfService(serviceId), imageUri,
+                        R.string.could_not_load_image));
+    }
+
+    @Override
+    public void onLoadingComplete(String imageUri, View view, Bitmap loadedImage) {
+
+    }
+
+    @Override
+    public void onLoadingCancelled(String imageUri, View view) {}
+}

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

@@ -0,0 +1,204 @@
+/*
+ * 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.content.SharedPreferences;
+import android.os.Bundle;
+import android.preference.PreferenceManager;
+import android.support.v4.app.Fragment;
+import android.support.v7.app.ActionBar;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.Toolbar;
+import android.util.Log;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+
+import org.schabi.newpipe.download.DownloadActivity;
+import org.schabi.newpipe.extractor.StreamingService;
+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 {
+    private static final String TAG = "MainActivity";
+    public static final boolean DEBUG = false;
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Activity's LifeCycle
+    //////////////////////////////////////////////////////////////////////////*/
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        if (DEBUG) Log.d(TAG, "onCreate() called with: savedInstanceState = [" + savedInstanceState + "]");
+        ThemeHelper.setTheme(this);
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
+        if (getSupportFragmentManager() != null && getSupportFragmentManager().getBackStackEntryCount() == 0) {
+            initFragments();
+        }
+
+        Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
+        setSupportActionBar(toolbar);
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+
+        SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this);
+        if (sharedPreferences.getBoolean(Constants.KEY_THEME_CHANGE, false)) {
+            if (DEBUG) Log.d(TAG, "Theme has changed, recreating activity...");
+            sharedPreferences.edit().putBoolean(Constants.KEY_THEME_CHANGE, false).apply();
+            this.recreate();
+        }
+
+    }
+
+    @Override
+    protected void onNewIntent(Intent intent) {
+        if (DEBUG) Log.d(TAG, "onNewIntent() called with: intent = [" + intent + "]");
+        if (intent != null) {
+            // Return if launched from a launcher (e.g. Nova Launcher, Pixel Launcher ...)
+            // to not destroy the already created backstack
+            String action = intent.getAction();
+            if ((action != null && action.equals(Intent.ACTION_MAIN)) && intent.hasCategory(Intent.CATEGORY_LAUNCHER)) return;
+        }
+
+        super.onNewIntent(intent);
+        setIntent(intent);
+        handleIntent(intent);
+    }
+
+    @Override
+    public void onBackPressed() {
+        if (DEBUG) Log.d(TAG, "onBackPressed() called");
+
+        Fragment fragment = getSupportFragmentManager().findFragmentById(R.id.fragment_holder);
+        if (fragment instanceof VideoDetailFragment) if (((VideoDetailFragment) fragment).onActivityBackPressed()) return;
+
+
+        if (getSupportFragmentManager().getBackStackEntryCount() == 1) {
+            finish();
+        } else super.onBackPressed();
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Menu
+    //////////////////////////////////////////////////////////////////////////*/
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        if (DEBUG) Log.d(TAG, "onCreateOptionsMenu() called with: menu = [" + menu + "]");
+        super.onCreateOptionsMenu(menu);
+
+        Fragment fragment = getSupportFragmentManager().findFragmentById(R.id.fragment_holder);
+        if (!(fragment instanceof VideoDetailFragment)) {
+            findViewById(R.id.toolbar).findViewById(R.id.toolbar_spinner).setVisibility(View.GONE);
+        }
+
+        if (!(fragment instanceof SearchFragment)) {
+            findViewById(R.id.toolbar).findViewById(R.id.toolbar_search_container).setVisibility(View.GONE);
+
+            MenuInflater inflater = getMenuInflater();
+            inflater.inflate(R.menu.main_menu, menu);
+        }
+
+        ActionBar actionBar = getSupportActionBar();
+        if (actionBar != null) {
+            actionBar.setDisplayShowTitleEnabled(false);
+            actionBar.setDisplayHomeAsUpEnabled(false);
+        }
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (DEBUG) Log.d(TAG, "onOptionsItemSelected() called with: item = [" + item + "]");
+        int id = item.getItemId();
+
+        switch (id) {
+            case android.R.id.home: {
+                NavigationHelper.gotoMainFragment(getSupportFragmentManager());
+                return true;
+            }
+            case R.id.action_settings: {
+                NavigationHelper.openSettings(this);
+                return true;
+            }
+            case R.id.action_show_downloads: {
+                return NavigationHelper.openDownloads(this);
+            }
+            case R.id.action_about:
+                NavigationHelper.openAbout(this);
+                return true;
+            default:
+                return super.onOptionsItemSelected(item);
+        }
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Init
+    //////////////////////////////////////////////////////////////////////////*/
+
+    private void initFragments() {
+        if (getIntent() != null && getIntent().hasExtra(Constants.KEY_LINK_TYPE)) {
+            handleIntent(getIntent());
+        } else NavigationHelper.gotoMainFragment(getSupportFragmentManager());
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Utils
+    //////////////////////////////////////////////////////////////////////////*/
+
+    private void handleIntent(Intent intent) {
+        if (DEBUG) Log.d(TAG, "handleIntent() called with: 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);
+            String title = intent.getStringExtra(Constants.KEY_TITLE);
+            switch (((StreamingService.LinkType) intent.getSerializableExtra(Constants.KEY_LINK_TYPE))) {
+                case STREAM:
+                    boolean autoPlay = intent.getBooleanExtra(VideoDetailFragment.AUTO_PLAY, false);
+                    NavigationHelper.openVideoDetailFragment(getSupportFragmentManager(), serviceId, url, title, autoPlay);
+                    break;
+                case CHANNEL:
+                    NavigationHelper.openChannelFragment(getSupportFragmentManager(), serviceId, url, title);
+                    break;
+            }
+        } else if (intent.hasExtra(Constants.KEY_OPEN_SEARCH)) {
+            String searchQuery = intent.getStringExtra(Constants.KEY_QUERY);
+            if (searchQuery == null) searchQuery = "";
+            int serviceId = intent.getIntExtra(Constants.KEY_SERVICE_ID, 0);
+            NavigationHelper.openSearchFragment(getSupportFragmentManager(), serviceId, searchQuery);
+        } else {
+            NavigationHelper.gotoMainFragment(getSupportFragmentManager());
+        }
+    }
+}

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

@@ -0,0 +1,50 @@
+
+package org.schabi.newpipe;
+
+import android.annotation.SuppressLint;
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Build;
+import android.os.Bundle;
+import android.media.AudioManager;
+
+/**
+ * Copyright (C) Hans-Christoph Steiner 2016 <hans@eds.org>
+ * PanicResponderActivity.java is part of NewPipe.
+ *
+ * NewPipe is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * NewPipe is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+public class PanicResponderActivity extends Activity {
+
+    public static final String PANIC_TRIGGER_ACTION = "info.guardianproject.panic.action.TRIGGER";
+
+    @SuppressLint("NewApi")
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        Intent intent = getIntent();
+        if (intent != null && PANIC_TRIGGER_ACTION.equals(intent.getAction())) {
+            // TODO explicitly clear the search results once they are restored when the app restarts
+            // or if the app reloads the current video after being killed, that should be cleared also
+            ExitActivity.exitAndRemoveFromRecentApps(this);
+        }
+
+        if (Build.VERSION.SDK_INT >= 21) {
+            finishAndRemoveTask();
+        } else {
+            finish();
+        }
+    }
+}

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

@@ -0,0 +1,157 @@
+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.support.v7.widget.Toolbar;
+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);
+
+        Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
+        setSupportActionBar(toolbar);
+
+        ActionBar actionBar = getSupportActionBar();
+        if (actionBar != null) {
+            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,133 @@
+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 {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        String videoUrl = getUrl(getIntent());
+        handleUrl(videoUrl);
+
+        finish();
+    }
+
+    protected void handleUrl(String url) {
+        try {
+            NavigationHelper.openByLink(this, url);
+        } catch (Exception e) {
+            Toast.makeText(this, R.string.url_not_supported_toast, Toast.LENGTH_LONG).show();
+        }
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Utils
+    //////////////////////////////////////////////////////////////////////////*/
+
+    /**
+     * Removes invisible separators (\p{Z}) and punctuation characters including
+     * brackets (\p{P}). See http://www.regular-expressions.info/unicode.html for
+     * more details.
+     */
+    protected final static String REGEX_REMOVE_FROM_URL = "[\\p{Z}\\p{P}]";
+
+    protected String getUrl(Intent intent) {
+        // first gather data and find service
+        String videoUrl = null;
+        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];
+        }
+
+        return videoUrl;
+    }
+
+    protected 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());
+    }
+
+    protected 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
+     */
+    protected 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,44 @@
+package org.schabi.newpipe;
+
+import android.content.Intent;
+import android.os.Build;
+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;
+
+/**
+ * Get the url from the intent and open a popup player
+ */
+public class RouterPopupActivity extends RouterActivity {
+
+    @Override
+    protected void handleUrl(String url) {
+        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;
+        }
+        StreamingService service = NewPipe.getServiceByUrl(url);
+        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(url)) {
+            case STREAM:
+                break;
+            default:
+                Toast.makeText(this, R.string.url_not_supported_toast, Toast.LENGTH_LONG).show();
+                return;
+        }
+
+        callIntent.putExtra(Constants.KEY_URL, url);
+        callIntent.putExtra(Constants.KEY_SERVICE_ID, service.getServiceId());
+        startService(callIntent);
+    }
+}

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

@@ -1,168 +0,0 @@
-package org.schabi.newpipe;
-
-import android.content.Context;
-import android.content.SharedPreferences;
-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.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;
-
-/**
- * Created by Christian Schabesberger on 31.08.15.
- *
- * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
- * SettingsActivity.java is part of NewPipe.
- *
- * NewPipe is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * NewPipe is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-public class SettingsActivity extends PreferenceActivity {
-
-    private AppCompatDelegate mDelegate = null;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceBundle) {
-        getDelegate().installViewFactory();
-        getDelegate().onCreate(savedInstanceBundle);
-        super.onCreate(savedInstanceBundle);
-
-        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-
-        getFragmentManager().beginTransaction()
-                .replace(android.R.id.content, new SettingsFragment())
-                .commit();
-
-    }
-
-    public static class SettingsFragment extends PreferenceFragment {
-        @Override
-        public void onCreate(Bundle savedInstanceState) {
-            super.onCreate(savedInstanceState);
-            addPreferencesFromResource(R.xml.settings_screen);
-        }
-    }
-
-    @Override
-    protected void onPostCreate(Bundle savedInstanceState) {
-        super.onPostCreate(savedInstanceState);
-        getDelegate().onPostCreate(savedInstanceState);
-    }
-
-    public ActionBar getSupportActionBar() {
-        return getDelegate().getSupportActionBar();
-    }
-
-    public void setSupportActionBar(@Nullable Toolbar toolbar) {
-        getDelegate().setSupportActionBar(toolbar);
-    }
-
-    @Override
-    public MenuInflater getMenuInflater() {
-        return getDelegate().getMenuInflater();
-    }
-
-    @Override
-    public void setContentView(@LayoutRes int layoutResID) {
-        getDelegate().setContentView(layoutResID);
-    }
-
-    @Override
-    public void setContentView(View view) {
-        getDelegate().setContentView(view);
-    }
-
-    @Override
-    public void setContentView(View view, ViewGroup.LayoutParams params) {
-        getDelegate().setContentView(view, params);
-    }
-
-    @Override
-    public void addContentView(View view, ViewGroup.LayoutParams params) {
-        getDelegate().addContentView(view, params);
-    }
-
-    @Override
-    protected void onPostResume() {
-        super.onPostResume();
-        getDelegate().onPostResume();
-    }
-
-    @Override
-    protected void onTitleChanged(CharSequence title, int color) {
-        super.onTitleChanged(title, color);
-        getDelegate().setTitle(title);
-    }
-
-    @Override
-    public void onConfigurationChanged(Configuration newConfig) {
-        super.onConfigurationChanged(newConfig);
-        getDelegate().onConfigurationChanged(newConfig);
-    }
-
-    @Override
-    protected void onStop() {
-        super.onStop();
-        getDelegate().onStop();
-    }
-
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-        getDelegate().onDestroy();
-    }
-
-    public void invalidateOptionsMenu() {
-        getDelegate().invalidateOptionsMenu();
-    }
-
-    private AppCompatDelegate getDelegate() {
-        if (mDelegate == null) {
-            mDelegate = AppCompatDelegate.create(this, null);
-        }
-        return mDelegate;
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        int id = item.getItemId();
-        if(id == android.R.id.home) {
-            finish();
-        }
-        return true;
-    }
-
-    public static void initSettings(Context context) {
-        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/VideoInfo.java

@@ -1,145 +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 android.util.Log;
-
-import java.util.Vector;
-
-public class VideoInfo {
-
-    private static final String TAG = VideoInfo.class.toString();
-
-    // format identifier
-    public static final int I_MPEG_4 = 0x0;
-    public static final int I_3GPP = 0x1;
-    public static final int I_WEBM = 0x2;
-    public static final int I_M4A = 0x3;
-    public static final int I_WEBMA = 0x4;
-
-    // format name
-    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 String F_M4A = "m4a";
-    public static final String F_WEBMA = "WebM";
-
-    // file suffix
-    public static final String C_MPEG_4 = "mp4";
-    public static final String C_3GPP = "3gp";
-    public static final String C_WEBM = "webm";
-    public static final String C_M4A = "m4a";
-    public static final String C_WEBMA = "webm";
-
-    // mimeType
-    public static final String M_MPEG_4 = "video/mp4";
-    public static final String M_3GPP = "video/3gpp";
-    public static final String M_WEBM = "video/webm";
-    public static final String M_M4A = "audio/mp4";
-    public static final String M_WEBMA = "audio/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 String getNameById(int id) {
-        switch(id) {
-            case I_MPEG_4: return F_MPEG_4;
-            case I_3GPP: return F_3GPP;
-            case I_WEBM: return F_WEBM;
-            case I_M4A: return F_M4A;
-            case I_WEBMA: return F_WEBMA;
-            default: Log.e(TAG, "format not known: " +
-                    Integer.toString(id) + "call the programmer he messed it up.");
-        }
-        return "";
-    }
-
-    public static String getSuffixById(int id) {
-        switch(id) {
-            case I_MPEG_4: return C_MPEG_4;
-            case I_3GPP: return C_3GPP;
-            case I_WEBM: return C_WEBM;
-            case I_M4A: return C_M4A;
-            case I_WEBMA: return C_WEBMA;
-            default: Log.e(TAG, "format not known: " +
-                    Integer.toString(id) + "call the programmer he messed it up.");
-        }
-        return "";
-    }
-
-    public static String getMimeById(int id) {
-        switch(id) {
-            case I_MPEG_4: return M_MPEG_4;
-            case I_3GPP: return M_3GPP;
-            case I_WEBM: return M_WEBM;
-            case I_M4A: return M_M4A;
-            case I_WEBMA: return M_WEBMA;
-            default: Log.e(TAG, "format not known: " +
-                    Integer.toString(id) + "call the programmer he messed it up.");
-        }
-        return "";
-    }
-
-    public static class VideoStream {
-        public VideoStream(String url, int format, String res) {
-            this.url = url; this.format = format; resolution = res;
-        }
-        public String url = "";     //url of the stream
-        public int format = -1;
-        public String resolution = "";
-    }
-
-    public static class AudioStream {
-        public AudioStream(String url, int format, int bandWidth, int samplingRate) {
-            this.url = url; this.format = format;
-            this.bandWidth = bandWidth; this.samplingRate = samplingRate;
-        }
-        public String url = "";
-        public int format = -1;
-        public int bandWidth = -1;
-        public int samplingRate = -1;
-
-    }
-
-    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 VideoStream[] videoStreams = null;
-    public AudioStream[] audioStreams = null;
-    public VideoInfoItem nextVideo = null;
-    public Vector<VideoInfoItem> relatedVideos = null;
-    public int videoAvailableStatus = VIDEO_AVAILABLE;
-}

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

@@ -1,34 +0,0 @@
-package org.schabi.newpipe;
-
-import android.graphics.Bitmap;
-
-/**
- * Created by Christian Schabesberger on 26.08.15.
- *
- * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
- * VideoInfoItem.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 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 = "";
-    public String upload_date = "";
-}

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

@@ -1,137 +0,0 @@
-package org.schabi.newpipe;
-
-import android.content.ContentProviderOperation;
-import android.content.res.Configuration;
-import android.os.Build;
-import android.preference.PreferenceManager;
-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.DisplayMetrics;
-import android.util.Log;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-import android.view.WindowManager;
-
-import org.schabi.newpipe.youtube.YoutubeExtractor;
-
-
-/**
- * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
- * VideoItemDetailActivity.java is part of NewPipe.
- *
- * NewPipe is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * NewPipe is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-public class VideoItemDetailActivity extends AppCompatActivity {
-
-    private static final String TAG = VideoItemDetailActivity.class.toString();
-
-    private String videoUrl;
-    private int currentStreamingService = -1;
-    private boolean isLandscape;
-
-    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) {
-            // this means the video was called though another app
-            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)));
-                arguments.putBoolean(VideoItemDetailFragment.AUTO_PLAY,
-                        PreferenceManager.getDefaultSharedPreferences(this)
-                                .getBoolean(getString(R.string.autoPlayThroughIntent), false));
-            } else {
-                videoUrl = getIntent().getStringExtra(VideoItemDetailFragment.VIDEO_URL);
-                currentStreamingService = getIntent().getIntExtra(VideoItemDetailFragment.STREAMING_SERVICE, -1);
-                arguments.putString(VideoItemDetailFragment.VIDEO_URL, videoUrl);
-                arguments.putInt(VideoItemDetailFragment.STREAMING_SERVICE, currentStreamingService);
-                arguments.putBoolean(VideoItemDetailFragment.AUTO_PLAY, false);
-            }
-            // Create the detail fragment and add it to the activity
-            // using a fragment transaction.
-            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,299 +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.preference.PreferenceManager;
-import android.support.design.widget.FloatingActionButton;
-import android.support.v4.app.Fragment;
-import android.support.v7.app.ActionBar;
-import android.text.Html;
-import android.text.method.LinkMovementMethod;
-import android.util.DisplayMetrics;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.GridLayout;
-import android.widget.ImageView;
-import android.widget.ListView;
-import android.widget.ProgressBar;
-import android.widget.RelativeLayout;
-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";
-    public static final String AUTO_PLAY = "auto_play";
-
-    private boolean autoPlayEnabled = false;
-    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);
-            View textSeperationLine = a.findViewById(R.id.textSeperationLine);
-
-
-            if(textSeperationLine != null) {
-                textSeperationLine.setVisibility(View.VISIBLE);
-            }
-            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.VideoStream> streamsToUse = new Vector<>();
-                    for (VideoInfo.VideoStream i : info.videoStreams) {
-                        if (useStream(i, streamsToUse)) {
-                            streamsToUse.add(i);
-                        }
-                    }
-                    VideoInfo.VideoStream[] streamList = new VideoInfo.VideoStream[streamsToUse.size()];
-                    for (int i = 0; i < streamList.length; i++) {
-                        streamList[i] = streamsToUse.get(i);
-                    }
-                    ActionBarHandler.getHandler().setStreams(streamList, info.audioStreams);
-                }
-                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.");
-            }
-
-            if(autoPlayEnabled) {
-                ActionBarHandler.getHandler().playVideo();
-            }
-        } catch (java.lang.NullPointerException e) {
-            Log.w(TAG, "updateInfo(): Fragment closed before thread ended work... or else");
-            e.printStackTrace();
-        }
-    }
-
-    private boolean useStream(VideoInfo.VideoStream stream, Vector<VideoInfo.VideoStream> streams) {
-        for(VideoInfo.VideoStream i : streams) {
-            if(i.resolution.equals(stream.resolution)) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    /**
-     * Mandatory empty constructor for the fragment manager to instantiate the
-     * fragment (e.g. upon screen orientation changes).
-     */
-    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));
-            autoPlayEnabled = getArguments().getBoolean(AUTO_PLAY);
-            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;
-    }
-
-    @Override
-    public void onActivityCreated(Bundle savedInstanceBundle) {
-        super.onActivityCreated(savedInstanceBundle);
-        FloatingActionButton playVideoButton = (FloatingActionButton) getActivity().findViewById(R.id.playVideoButton);
-
-        if(PreferenceManager.getDefaultSharedPreferences(getActivity())
-                .getBoolean(getString(R.string.leftHandLayout), false) && checkIfLandscape()) {
-            RelativeLayout.LayoutParams oldLayout = (RelativeLayout.LayoutParams) playVideoButton.getLayoutParams();
-            RelativeLayout.LayoutParams layoutParams = new RelativeLayout.LayoutParams(
-                    RelativeLayout.LayoutParams.WRAP_CONTENT,
-                    RelativeLayout.LayoutParams.WRAP_CONTENT);
-            layoutParams.addRule(RelativeLayout.ALIGN_PARENT_BOTTOM);
-            layoutParams.addRule(RelativeLayout.ALIGN_PARENT_LEFT);
-            layoutParams.setMargins(oldLayout.leftMargin, oldLayout.topMargin, oldLayout.rightMargin, oldLayout.rightMargin);
-            playVideoButton.setLayoutParams(layoutParams);
-        }
-
-        playVideoButton.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                ActionBarHandler.getHandler().playVideo();
-            }
-        });
-    }
-
-    public boolean checkIfLandscape() {
-        DisplayMetrics displayMetrics = new DisplayMetrics();
-        getActivity().getWindowManager().getDefaultDisplay().getMetrics(displayMetrics);
-        return displayMetrics.heightPixels < displayMetrics.widthPixels;
-    }
-}

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

@@ -1,232 +0,0 @@
-package org.schabi.newpipe;
-
-import android.content.Context;
-import android.content.Intent;
-import android.content.res.Configuration;
-import android.os.Build;
-import android.os.Bundle;
-import android.os.Environment;
-import android.preference.PreferenceManager;
-import android.support.v7.app.AppCompatActivity;
-import android.util.DisplayMetrics;
-import android.util.Log;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.WindowManager;
-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,368 +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.List;
-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,137 +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);
-            holder.itemUploadDateView = (TextView) convertView.findViewById(R.id.itemUploadDateView);
-            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);
-        holder.itemUploadDateView.setText(videoList.get(position).upload_date);
-
-        if(listView.isItemChecked(position)) {
-            convertView.setBackgroundColor(context.getResources().getColor(R.color.primaryColorYoutube));
-        } else {
-            convertView.setBackgroundColor(0);
-        }
-
-        return convertView;
-    }
-
-    private class ViewHolder {
-        public ImageView itemThumbnailView;
-        public TextView itemVideoTitleView, itemUploaderView, itemDurationView, itemUploadDateView;
-    }
-}

app/src/main/java/org/schabi/newpipe/about/AboutActivity.java

@@ -0,0 +1,197 @@
+package org.schabi.newpipe.about;
+
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Bundle;
+import android.support.design.widget.TabLayout;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentManager;
+import android.support.v4.app.FragmentPagerAdapter;
+import android.support.v4.view.ViewPager;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.Toolbar;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import org.schabi.newpipe.BuildConfig;
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.util.NavigationHelper;
+import org.schabi.newpipe.util.ThemeHelper;
+
+public class AboutActivity extends AppCompatActivity {
+
+    /**
+     * List of all software components
+     */
+    private static final SoftwareComponent[] SOFTWARE_COMPONENTS = new SoftwareComponent[]{
+            new SoftwareComponent("Giga Get", "2014", "Peter Cai", "https://github.com/PaperAirplane-Dev-Team/GigaGet", StandardLicenses.GPL2),
+            new SoftwareComponent("NewPipe Extractor", "2017", "Christian Schabesberger", "https://github.com/TeamNewPipe/NewPipeExtractor", StandardLicenses.GPL3),
+            new SoftwareComponent("Jsoup", "2017", "Jonathan Hedley", "https://github.com/jhy/jsoup", StandardLicenses.MIT),
+            new SoftwareComponent("Google Gson", "2008", "Google Inc", "https://github.com/google/gson", StandardLicenses.APACHE2),
+            new SoftwareComponent("Rhino", "2015", "Mozilla", "https://www.mozilla.org/rhino/", StandardLicenses.MPL2),
+            new SoftwareComponent("ACRA", "2013", "Kevin Gaudin", "http://www.acra.ch", StandardLicenses.APACHE2),
+            new SoftwareComponent("Universal Image Loader", "2011 - 2015", "Sergey Tarasevich", "https://github.com/nostra13/Android-Universal-Image-Loader", StandardLicenses.APACHE2),
+            new SoftwareComponent("Netcipher", "2015", "The Guardian Project", "https://guardianproject.info/code/netcipher/", StandardLicenses.APACHE2),
+            new SoftwareComponent("CircleImageView", "2014 - 2017", "Henning Dodenhof", "https://github.com/hdodenhof/CircleImageView", StandardLicenses.APACHE2),
+            new SoftwareComponent("ParalaxScrollView", "2014", "Nir Hartmann", "https://github.com/nirhart/ParallaxScroll", StandardLicenses.MIT),
+            new SoftwareComponent("NoNonsense-FilePicker", "2016", "Jonas Kalderstam", "https://github.com/spacecowboy/NoNonsense-FilePicker", StandardLicenses.MPL2),
+            new SoftwareComponent("ExoPlayer", "2014-2017", "Google Inc", "https://github.com/google/ExoPlayer", StandardLicenses.APACHE2)
+    };
+
+    /**
+     * The {@link android.support.v4.view.PagerAdapter} that will provide
+     * fragments for each of the sections. We use a
+     * {@link FragmentPagerAdapter} derivative, which will keep every
+     * loaded fragment in memory. If this becomes too memory intensive, it
+     * may be best to switch to a
+     * {@link android.support.v4.app.FragmentStatePagerAdapter}.
+     */
+    private SectionsPagerAdapter mSectionsPagerAdapter;
+
+    /**
+     * The {@link ViewPager} that will host the section contents.
+     */
+    private ViewPager mViewPager;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        ThemeHelper.setTheme(this);
+
+        setContentView(R.layout.activity_about);
+
+        Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
+        setSupportActionBar(toolbar);
+        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+        // Create the adapter that will return a fragment for each of the three
+        // primary sections of the activity.
+        mSectionsPagerAdapter = new SectionsPagerAdapter(getSupportFragmentManager());
+
+        // Set up the ViewPager with the sections adapter.
+        mViewPager = (ViewPager) findViewById(R.id.container);
+        mViewPager.setAdapter(mSectionsPagerAdapter);
+
+        TabLayout tabLayout = (TabLayout) findViewById(R.id.tabs);
+        tabLayout.setupWithViewPager(mViewPager);
+    }
+
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        // Inflate the menu; this adds items to the action bar if it is present.
+        getMenuInflater().inflate(R.menu.menu_about, menu);
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+
+        int id = item.getItemId();
+
+        switch (id) {
+            case android.R.id.home:
+                finish();
+                return true;
+            case R.id.action_settings:
+                NavigationHelper.openSettings(this);
+                return true;
+            case R.id.action_show_downloads:
+                return NavigationHelper.openDownloads(this);
+        }
+
+        return super.onOptionsItemSelected(item);
+    }
+
+    /**
+     * A placeholder fragment containing a simple view.
+     */
+    public static class AboutFragment extends Fragment {
+
+        public AboutFragment() {
+        }
+
+        /**
+         * Returns a new instance of this fragment for the given section
+         * number.
+         */
+        public static AboutFragment newInstance() {
+            return new AboutFragment();
+        }
+
+        @Override
+        public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                                 Bundle savedInstanceState) {
+            View rootView = inflater.inflate(R.layout.fragment_about, container, false);
+            TextView version = (TextView) rootView.findViewById(R.id.app_version);
+            version.setText(BuildConfig.VERSION_NAME);
+
+            View githubLink = rootView.findViewById(R.id.github_link);
+            githubLink.setOnClickListener(new OnGithubLinkClickListener());
+
+            View licenseLink = rootView.findViewById(R.id.app_read_license);
+            licenseLink.setOnClickListener(new OnReadFullLicenseClickListener());
+            return rootView;
+        }
+
+        private static class OnGithubLinkClickListener implements View.OnClickListener {
+            @Override
+            public void onClick(final View view) {
+                final Context context = view.getContext();
+                Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(context.getString(R.string.github_url)));
+                context.startActivity(intent);
+            }
+        }
+
+        private static class OnReadFullLicenseClickListener implements View.OnClickListener {
+            @Override
+            public void onClick(View v) {
+                LicenseFragment.showLicense(v.getContext(), StandardLicenses.GPL3);
+            }
+        }
+    }
+
+
+    /**
+     * A {@link FragmentPagerAdapter} that returns a fragment corresponding to
+     * one of the sections/tabs/pages.
+     */
+    public class SectionsPagerAdapter extends FragmentPagerAdapter {
+
+        public SectionsPagerAdapter(FragmentManager fm) {
+            super(fm);
+        }
+
+        @Override
+        public Fragment getItem(int position) {
+            switch (position) {
+                case 0:
+                    return AboutFragment.newInstance();
+                case 1:
+                    return LicenseFragment.newInstance(SOFTWARE_COMPONENTS);
+            }
+            return null;
+        }
+
+        @Override
+        public int getCount() {
+            // Show 2 total pages.
+            return 2;
+        }
+
+        @Override
+        public CharSequence getPageTitle(int position) {
+            switch (position) {
+                case 0:
+                    return getString(R.string.tab_about);
+                case 1:
+                    return getString(R.string.tab_licenses);
+            }
+            return null;
+        }
+    }
+}

app/src/main/java/org/schabi/newpipe/about/License.java

@@ -0,0 +1,72 @@
+package org.schabi.newpipe.about;
+
+import android.net.Uri;
+import android.os.Parcel;
+import android.os.Parcelable;
+import android.text.TextUtils;
+
+import java.net.URLEncoder;
+
+/**
+ * A software license
+ */
+public class License implements Parcelable {
+
+    public static final Creator<License> CREATOR = new Creator<License>() {
+        @Override
+        public License createFromParcel(Parcel source) {
+            return new License(source);
+        }
+
+        @Override
+        public License[] newArray(int size) {
+            return new License[size];
+        }
+    };
+    private final String abbreviation;
+    private final String name;
+    private String filename;
+
+    public License(String name, String abbreviation, String filename) {
+        if(name == null) throw new NullPointerException("name is null");
+        if(abbreviation == null) throw new NullPointerException("abbreviation is null");
+        if(filename == null) throw new NullPointerException("filename is null");
+        this.name = name;
+        this.filename = filename;
+        this.abbreviation = abbreviation;
+    }
+
+    protected License(Parcel in) {
+        this.filename = in.readString();
+        this.abbreviation = in.readString();
+        this.name = in.readString();
+    }
+
+    public Uri getContentUri() {
+        return new Uri.Builder()
+                .scheme("file")
+                .path("/android_asset")
+                .appendPath(filename)
+                .build();
+    }
+
+    public String getAbbreviation() {
+        return abbreviation;
+    }
+
+    @Override
+    public int describeContents() {
+        return 0;
+    }
+
+    @Override
+    public void writeToParcel(Parcel dest, int flags) {
+        dest.writeString(this.filename);
+        dest.writeString(this.abbreviation);
+        dest.writeString(this.name);
+    }
+
+    public String getName() {
+        return name;
+    }
+}

app/src/main/java/org/schabi/newpipe/about/LicenseFragment.java

@@ -0,0 +1,150 @@
+package org.schabi.newpipe.about;
+
+import android.content.Context;
+import android.content.DialogInterface;
+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.v7.app.AlertDialog;
+import android.view.ContextMenu;
+import android.view.LayoutInflater;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import android.webkit.WebView;
+import android.widget.TextView;
+
+import org.schabi.newpipe.R;
+
+import java.util.Arrays;
+import java.util.Comparator;
+
+/**
+ * Fragment containing the software licenses
+ */
+public class LicenseFragment extends Fragment {
+
+    private static final String ARG_COMPONENTS = "components";
+    private SoftwareComponent[] softwareComponents;
+    private SoftwareComponent mComponentForContextMenu;
+
+    public static LicenseFragment newInstance(SoftwareComponent[] softwareComponents) {
+        if(softwareComponents == null) {
+            throw new NullPointerException("softwareComponents is null");
+        }
+        LicenseFragment fragment = new LicenseFragment();
+        Bundle bundle = new Bundle();
+        bundle.putParcelableArray(ARG_COMPONENTS, softwareComponents);
+        fragment.setArguments(bundle);
+        return fragment;
+    }
+
+    /**
+     * Shows a popup containing the license
+     * @param context the context to use
+     * @param license the license to show
+     */
+    public static void showLicense(Context context, License license) {
+        if(context == null) {
+            throw new NullPointerException("context is null");
+        }
+        if(license == null) {
+            throw new NullPointerException("license is null");
+        }
+        AlertDialog.Builder alert = new AlertDialog.Builder(context);
+        alert.setTitle(license.getName());
+
+        WebView wv = new WebView(context);
+        wv.loadUrl(license.getContentUri().toString());
+        alert.setView(wv);
+        alert.setNegativeButton(android.R.string.ok, new DialogInterface.OnClickListener() {
+            @Override
+            public void onClick(DialogInterface dialog, int which) {
+                dialog.dismiss();
+            }
+        });
+        alert.show();
+    }
+
+    @Override
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        softwareComponents = (SoftwareComponent[]) getArguments().getParcelableArray(ARG_COMPONENTS);
+
+        // Sort components by name
+        Arrays.sort(softwareComponents, new Comparator<SoftwareComponent>() {
+            @Override
+            public int compare(SoftwareComponent o1, SoftwareComponent o2) {
+                return o1.getName().compareTo(o2.getName());
+            }
+        });
+    }
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        View rootView = inflater.inflate(R.layout.fragment_licenses, container, false);
+        ViewGroup softwareComponentsView = (ViewGroup) rootView.findViewById(R.id.software_components);
+
+        for (final SoftwareComponent component : softwareComponents) {
+            View componentView = inflater.inflate(R.layout.item_software_component, container, false);
+            TextView softwareName = (TextView) componentView.findViewById(R.id.name);
+            TextView copyright = (TextView) componentView.findViewById(R.id.copyright);
+            softwareName.setText(component.getName());
+            copyright.setText(getContext().getString(R.string.copyright,
+                    component.getYears(),
+                    component.getCopyrightOwner(),
+                    component.getLicense().getAbbreviation()));
+
+            componentView.setTag(component);
+            componentView.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    Context context = v.getContext();
+                    if (context != null) {
+                        showLicense(context, component.getLicense());
+                    }
+                }
+            });
+            softwareComponentsView.addView(componentView);
+            registerForContextMenu(componentView);
+
+        }
+        return rootView;
+    }
+
+    @Override
+    public void onCreateContextMenu(ContextMenu menu, View v, ContextMenu.ContextMenuInfo menuInfo) {
+        MenuInflater inflater = getActivity().getMenuInflater();
+        SoftwareComponent component = (SoftwareComponent) v.getTag();
+        menu.setHeaderTitle(component.getName());
+        inflater.inflate(R.menu.software_component, menu);
+        super.onCreateContextMenu(menu, v, menuInfo);
+        mComponentForContextMenu = (SoftwareComponent) v.getTag();
+    }
+
+    @Override
+    public boolean onContextItemSelected(MenuItem item) {
+        // item.getMenuInfo() is null so we use the tag of the view
+        final SoftwareComponent component = mComponentForContextMenu;
+        if (component == null) {
+            return false;
+        }
+        switch (item.getItemId()) {
+            case R.id.action_website:
+                openWebsite(component.getLink());
+                return true;
+            case R.id.action_show_license:
+                showLicense(getContext(), component.getLicense());
+        }
+        return false;
+    }
+
+    private void openWebsite(String componentLink) {
+        Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(componentLink));
+        startActivity(browserIntent);
+    }
+}

app/src/main/java/org/schabi/newpipe/about/SoftwareComponent.java

@@ -0,0 +1,83 @@
+package org.schabi.newpipe.about;
+
+import android.os.Parcel;
+import android.os.Parcelable;
+
+public class SoftwareComponent implements Parcelable {
+
+    public static final Creator<SoftwareComponent> CREATOR = new Creator<SoftwareComponent>() {
+        @Override
+        public SoftwareComponent createFromParcel(Parcel source) {
+            return new SoftwareComponent(source);
+        }
+
+        @Override
+        public SoftwareComponent[] newArray(int size) {
+            return new SoftwareComponent[size];
+        }
+    };
+
+    public String getName() {
+        return name;
+    }
+
+    public String getYears() {
+        return years;
+    }
+
+    public String getCopyrightOwner() {
+        return copyrightOwner;
+    }
+
+    public String getLink() {
+        return link;
+    }
+
+    public String getVersion() {
+        return version;
+    }
+
+    private final License license;
+    private final String name;
+    private final String years;
+    private final String copyrightOwner;
+    private final String link;
+    private final String version;
+
+    public SoftwareComponent(String name, String years, String copyrightOwner, String link, License license) {
+        this.name = name;
+        this.years = years;
+        this.copyrightOwner = copyrightOwner;
+        this.link = link;
+        this.license = license;
+        this.version = null;
+    }
+
+    protected SoftwareComponent(Parcel in) {
+        this.name = in.readString();
+        this.license = in.readParcelable(License.class.getClassLoader());
+        this.copyrightOwner = in.readString();
+        this.link = in.readString();
+        this.years = in.readString();
+        this.version = in.readString();
+    }
+
+    public License getLicense() {
+        return license;
+    }
+
+    @Override
+    public int describeContents() {
+        return 0;
+    }
+
+    @Override
+    public void writeToParcel(Parcel dest, int flags) {
+        dest.writeString(name);
+        dest.writeParcelable(license, flags);
+        dest.writeString(copyrightOwner);
+        dest.writeString(link);
+        dest.writeString(years);
+        dest.writeString(version);
+    }
+}

app/src/main/java/org/schabi/newpipe/about/StandardLicenses.java

@@ -0,0 +1,12 @@
+package org.schabi.newpipe.about;
+
+/**
+ * Standard software licenses
+ */
+public final class StandardLicenses {
+    public static final License GPL2 = new License("GNU General Public License, Version 2.0", "GPLv2", "gpl_2.html");
+    public static final License GPL3 = new License("GNU General Public License, Version 3.0", "GPLv3", "gpl_3.html");
+    public static final License APACHE2 = new License("Apache License, Version 2.0", "ALv2", "apache2.html");
+    public static final License MPL2 = new License("Mozilla Public License, Version 2.0", "MPL 2.0", "mpl2.html");
+    public static final License MIT = new License("MIT License", "MIT", "mit.html");
+}

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

@@ -0,0 +1,90 @@
+package org.schabi.newpipe.download;
+
+import android.app.FragmentTransaction;
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.v7.app.ActionBar;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.Toolbar;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.ViewTreeObserver;
+
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.settings.SettingsActivity;
+import org.schabi.newpipe.util.ThemeHelper;
+
+import us.shandian.giga.service.DownloadManagerService;
+import us.shandian.giga.ui.fragment.AllMissionsFragment;
+import us.shandian.giga.ui.fragment.MissionsFragment;
+
+public class DownloadActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        // Service
+        Intent i = new Intent();
+        i.setClass(this, DownloadManagerService.class);
+        startService(i);
+
+        ThemeHelper.setTheme(this);
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_downloader);
+
+        Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
+        setSupportActionBar(toolbar);
+
+        ActionBar actionBar = getSupportActionBar();
+        if (actionBar != null) {
+            actionBar.setDisplayHomeAsUpEnabled(true);
+            actionBar.setTitle(R.string.downloads_title);
+            actionBar.setDisplayShowTitleEnabled(true);
+        }
+
+        // Fragment
+        getWindow().getDecorView().getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
+            @Override
+            public void onGlobalLayout() {
+                updateFragments();
+                getWindow().getDecorView().getViewTreeObserver().removeGlobalOnLayoutListener(this);
+            }
+        });
+    }
+
+    private void updateFragments() {
+
+        MissionsFragment fragment = new AllMissionsFragment();
+        getFragmentManager().beginTransaction()
+                .replace(R.id.frame, fragment)
+                .setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE)
+                .commit();
+    }
+
+    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) {
+        switch (item.getItemId()) {
+            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,290 @@
+package org.schabi.newpipe.download;
+
+import android.os.Bundle;
+import android.support.annotation.IdRes;
+import android.support.annotation.Nullable;
+import android.support.v4.app.DialogFragment;
+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.AdapterView;
+import android.widget.ArrayAdapter;
+import android.widget.EditText;
+import android.widget.RadioButton;
+import android.widget.RadioGroup;
+import android.widget.SeekBar;
+import android.widget.Spinner;
+import android.widget.TextView;
+
+import org.schabi.newpipe.MainActivity;
+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.StreamInfo;
+import org.schabi.newpipe.extractor.stream_info.VideoStream;
+import org.schabi.newpipe.fragments.detail.SpinnerToolbarAdapter;
+import org.schabi.newpipe.settings.NewPipeSettings;
+import org.schabi.newpipe.util.PermissionHelper;
+import org.schabi.newpipe.util.ThemeHelper;
+import org.schabi.newpipe.util.Utils;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+import us.shandian.giga.service.DownloadManagerService;
+
+public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheckedChangeListener, AdapterView.OnItemSelectedListener {
+    private static final String TAG = "DialogFragment";
+    private static final boolean DEBUG = MainActivity.DEBUG;
+
+    private static final String INFO_KEY = "info_key";
+    private static final String SORTED_VIDEOS_LIST_KEY = "sorted_videos_list_key";
+    private static final String SELECTED_VIDEO_KEY = "selected_video_key";
+    private static final String SELECTED_AUDIO_KEY = "selected_audio_key";
+
+    private StreamInfo currentInfo;
+    private ArrayList<VideoStream> sortedStreamVideosList;
+    private int selectedVideoIndex;
+    private int selectedAudioIndex;
+
+    private EditText nameEditText;
+    private Spinner streamsSpinner;
+    private RadioGroup radioVideoAudioGroup;
+    private TextView threadsCountTextView;
+    private SeekBar threadsSeekBar;
+
+    public static DownloadDialog newInstance(StreamInfo info, ArrayList<VideoStream> sortedStreamVideosList, int selectedVideoIndex) {
+        DownloadDialog dialog = new DownloadDialog();
+        dialog.setInfo(info, sortedStreamVideosList, selectedVideoIndex);
+        dialog.setStyle(DialogFragment.STYLE_NO_TITLE, 0);
+        return dialog;
+    }
+
+    private void setInfo(StreamInfo info, ArrayList<VideoStream> sortedStreamVideosList, int selectedVideoIndex) {
+        this.currentInfo = info;
+        this.selectedVideoIndex = selectedVideoIndex;
+        this.sortedStreamVideosList = sortedStreamVideosList;
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // LifeCycle
+    //////////////////////////////////////////////////////////////////////////*/
+
+    @Override
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        if (DEBUG) Log.d(TAG, "onCreate() called with: savedInstanceState = [" + savedInstanceState + "]");
+        if (!PermissionHelper.checkStoragePermissions(getActivity())) {
+            getDialog().dismiss();
+            return;
+        }
+
+        if (savedInstanceState != null) {
+            Serializable serial = savedInstanceState.getSerializable(INFO_KEY);
+            if (serial instanceof StreamInfo) currentInfo = (StreamInfo) serial;
+
+            serial = savedInstanceState.getSerializable(SORTED_VIDEOS_LIST_KEY);
+            if (serial instanceof ArrayList) { //noinspection unchecked
+                sortedStreamVideosList = (ArrayList<VideoStream>) serial;
+            }
+
+            selectedVideoIndex = savedInstanceState.getInt(SELECTED_VIDEO_KEY, 0);
+            selectedAudioIndex = savedInstanceState.getInt(SELECTED_AUDIO_KEY, 0);
+        }
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        if (DEBUG) Log.d(TAG, "onCreateView() called with: inflater = [" + inflater + "], container = [" + container + "], savedInstanceState = [" + savedInstanceState + "]");
+        return inflater.inflate(R.layout.dialog_url, container);
+    }
+
+    @Override
+    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        nameEditText = ((EditText) view.findViewById(R.id.file_name));
+        nameEditText.setText(createFileName(currentInfo.title));
+        selectedAudioIndex = Utils.getPreferredAudioFormat(getContext(), currentInfo.audio_streams);
+
+        streamsSpinner = (Spinner) view.findViewById(R.id.quality_spinner);
+        streamsSpinner.setOnItemSelectedListener(this);
+
+        threadsCountTextView = (TextView) view.findViewById(R.id.threads_count);
+        threadsSeekBar = (SeekBar) view.findViewById(R.id.threads);
+        radioVideoAudioGroup = (RadioGroup) view.findViewById(R.id.video_audio_group);
+        radioVideoAudioGroup.setOnCheckedChangeListener(this);
+
+        initToolbar((Toolbar) view.findViewById(R.id.toolbar));
+        checkDownloadOptions(view);
+        setupVideoSpinner(sortedStreamVideosList, streamsSpinner);
+
+        int def = 3;
+        threadsCountTextView.setText(String.valueOf(def));
+        threadsSeekBar.setProgress(def - 1);
+        threadsSeekBar.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
+
+            @Override
+            public void onProgressChanged(SeekBar seekbar, int progress, boolean fromUser) {
+                threadsCountTextView.setText(String.valueOf(progress + 1));
+            }
+
+            @Override
+            public void onStartTrackingTouch(SeekBar p1) {
+
+            }
+
+            @Override
+            public void onStopTrackingTouch(SeekBar p1) {
+
+            }
+        });
+    }
+
+    @Override
+    public void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+        outState.putSerializable(INFO_KEY, currentInfo);
+        outState.putSerializable(SORTED_VIDEOS_LIST_KEY, sortedStreamVideosList);
+        outState.putInt(SELECTED_VIDEO_KEY, selectedVideoIndex);
+        outState.putInt(SELECTED_AUDIO_KEY, selectedAudioIndex);
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Inits
+    //////////////////////////////////////////////////////////////////////////*/
+
+    private void initToolbar(Toolbar toolbar) {
+        if (DEBUG) Log.d(TAG, "initToolbar() called with: toolbar = [" + toolbar + "]");
+        toolbar.setTitle(R.string.download_dialog_title);
+        toolbar.setNavigationIcon(ThemeHelper.isLightThemeSelected(getActivity()) ? R.drawable.ic_arrow_back_black_24dp : R.drawable.ic_arrow_back_white_24dp);
+        toolbar.inflateMenu(R.menu.dialog_url);
+        toolbar.setNavigationOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                getDialog().dismiss();
+            }
+        });
+
+        toolbar.setOnMenuItemClickListener(new Toolbar.OnMenuItemClickListener() {
+            @Override
+            public boolean onMenuItemClick(MenuItem item) {
+                if (item.getItemId() == R.id.okay) {
+                    downloadSelected();
+                    return true;
+                } else return false;
+            }
+        });
+    }
+
+    public void setupAudioSpinner(final List<AudioStream> audioStreams, Spinner spinner) {
+        String[] items = new String[audioStreams.size()];
+        for (int i = 0; i < audioStreams.size(); i++) {
+            AudioStream audioStream = audioStreams.get(i);
+            items[i] = MediaFormat.getNameById(audioStream.format) + " " + audioStream.avgBitrate + "kbps";
+        }
+
+        ArrayAdapter<String> itemAdapter = new ArrayAdapter<>(getContext(), android.R.layout.simple_spinner_dropdown_item, items);
+        spinner.setAdapter(itemAdapter);
+        spinner.setSelection(selectedAudioIndex);
+    }
+
+    public void setupVideoSpinner(final List<VideoStream> videoStreams, Spinner spinner) {
+        spinner.setAdapter(new SpinnerToolbarAdapter(getContext(), videoStreams, true));
+        spinner.setSelection(selectedVideoIndex);
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Radio group Video&Audio options - Listener
+    //////////////////////////////////////////////////////////////////////////*/
+
+    @Override
+    public void onCheckedChanged(RadioGroup group, @IdRes int checkedId) {
+        if (DEBUG) Log.d(TAG, "onCheckedChanged() called with: group = [" + group + "], checkedId = [" + checkedId + "]");
+        switch (checkedId) {
+            case R.id.audio_button:
+                setupAudioSpinner(currentInfo.audio_streams, streamsSpinner);
+                break;
+            case R.id.video_button:
+                setupVideoSpinner(sortedStreamVideosList, streamsSpinner);
+                break;
+        }
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Streams Spinner Listener
+    //////////////////////////////////////////////////////////////////////////*/
+
+    @Override
+    public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
+        if (DEBUG) Log.d(TAG, "onItemSelected() called with: parent = [" + parent + "], view = [" + view + "], position = [" + position + "], id = [" + id + "]");
+        switch (radioVideoAudioGroup.getCheckedRadioButtonId()) {
+            case R.id.audio_button:
+                selectedAudioIndex = position;
+                break;
+            case R.id.video_button:
+                selectedVideoIndex = position;
+                break;
+        }
+    }
+
+    @Override
+    public void onNothingSelected(AdapterView<?> parent) {
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Utils
+    //////////////////////////////////////////////////////////////////////////*/
+
+    protected void checkDownloadOptions(View view) {
+        RadioButton audioButton = (RadioButton) view.findViewById(R.id.audio_button);
+        RadioButton videoButton = (RadioButton) view.findViewById(R.id.video_button);
+
+        if (currentInfo.audio_streams == null || currentInfo.audio_streams.size() == 0) {
+            audioButton.setVisibility(View.GONE);
+            videoButton.setChecked(true);
+        } else if (sortedStreamVideosList == null || sortedStreamVideosList.size() == 0) {
+            videoButton.setVisibility(View.GONE);
+            audioButton.setChecked(true);
+        }
+    }
+
+    /**
+     * #143 #44 #42 #22: make sure that the filename does not contain illegal chars.
+     * This should fix some of the "cannot download" problems.
+     */
+    private String createFileName(String fileName) {
+        // 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 = fileName;
+        for (String pattern : forbiddenCharsPatterns) {
+            nameToTest = nameToTest.replaceAll(pattern, "_");
+        }
+        return nameToTest;
+    }
+
+
+    private void downloadSelected() {
+        String url, location;
+
+        String fileName = nameEditText.getText().toString().trim();
+        if (fileName.isEmpty()) fileName = createFileName(currentInfo.title);
+
+        boolean isAudio = radioVideoAudioGroup.getCheckedRadioButtonId() == R.id.audio_button;
+        url = isAudio ? currentInfo.audio_streams.get(selectedAudioIndex).url : sortedStreamVideosList.get(selectedVideoIndex).url;
+        location = isAudio ? NewPipeSettings.getAudioDownloadPath(getContext()) : NewPipeSettings.getVideoDownloadPath(getContext());
+
+        if (isAudio) fileName += "." + MediaFormat.getSuffixById(currentInfo.audio_streams.get(selectedAudioIndex).format);
+        else fileName += "." + MediaFormat.getSuffixById(sortedStreamVideosList.get(selectedVideoIndex).format);
+
+        DownloadManagerService.startMission(getContext(), url, location, fileName, isAudio, threadsSeekBar.getProgress() + 1);
+        getDialog().dismiss();
+    }
+}

app/src/main/java/org/schabi/newpipe/fragments/BaseFragment.java

@@ -0,0 +1,177 @@
+package org.schabi.newpipe.fragments;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.graphics.Rect;
+import android.os.Bundle;
+import android.support.annotation.AttrRes;
+import android.support.v4.app.Fragment;
+import android.support.v4.view.ViewCompat;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.Toolbar;
+import android.util.Log;
+import android.view.Gravity;
+import android.view.View;
+import android.widget.Button;
+import android.widget.ProgressBar;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import com.nostra13.universalimageloader.core.DisplayImageOptions;
+import com.nostra13.universalimageloader.core.ImageLoader;
+import com.nostra13.universalimageloader.core.display.FadeInBitmapDisplayer;
+
+import org.schabi.newpipe.MainActivity;
+import org.schabi.newpipe.R;
+
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import static org.schabi.newpipe.util.AnimationUtils.animateView;
+
+public abstract class BaseFragment extends Fragment {
+    protected final String TAG = "BaseFragment@" + Integer.toHexString(hashCode());
+    protected static final boolean DEBUG = MainActivity.DEBUG;
+
+    protected AppCompatActivity activity;
+
+    protected AtomicBoolean isLoading = new AtomicBoolean(false);
+    protected AtomicBoolean wasLoading = new AtomicBoolean(false);
+
+    protected static final ImageLoader imageLoader = ImageLoader.getInstance();
+    protected static final DisplayImageOptions displayImageOptions =
+            new DisplayImageOptions.Builder().displayer(new FadeInBitmapDisplayer(400)).cacheInMemory(false).build();
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Views
+    //////////////////////////////////////////////////////////////////////////*/
+
+    protected Toolbar toolbar;
+
+    protected View errorPanel;
+    protected Button errorButtonRetry;
+    protected TextView errorTextView;
+    protected ProgressBar loadingProgressBar;
+    //protected SwipeRefreshLayout swipeRefreshLayout;
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Fragment's Lifecycle
+    //////////////////////////////////////////////////////////////////////////*/
+
+    @Override
+    public void onAttach(Context context) {
+        super.onAttach(context);
+        if (DEBUG) Log.d(TAG, "onAttach() called with: context = [" + context + "]");
+
+        activity = (AppCompatActivity) context;
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        if (DEBUG) Log.d(TAG, "onCreate() called with: savedInstanceState = [" + savedInstanceState + "]");
+
+        isLoading.set(false);
+        setHasOptionsMenu(true);
+    }
+
+    @Override
+    public void onViewCreated(View rootView, Bundle savedInstanceState) {
+        if (DEBUG) Log.d(TAG, "onViewCreated() called with: rootView = [" + rootView + "], savedInstanceState = [" + savedInstanceState + "]");
+        initViews(rootView, savedInstanceState);
+        initListeners();
+        wasLoading.set(false);
+    }
+
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        if (DEBUG) Log.d(TAG, "onDestroyView() called");
+        toolbar = null;
+
+        errorPanel = null;
+        errorButtonRetry = null;
+        errorTextView = null;
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Init
+    //////////////////////////////////////////////////////////////////////////*/
+
+    protected void initViews(View rootView, Bundle savedInstanceState) {
+        toolbar = (Toolbar) activity.findViewById(R.id.toolbar);
+
+        loadingProgressBar = (ProgressBar) rootView.findViewById(R.id.loading_progress_bar);
+        //swipeRefreshLayout = (SwipeRefreshLayout) rootView.findViewById(R.id.swipe_refresh);
+
+        errorPanel = rootView.findViewById(R.id.error_panel);
+        errorButtonRetry = (Button) rootView.findViewById(R.id.error_button_retry);
+        errorTextView = (TextView) rootView.findViewById(R.id.error_message_view);
+    }
+
+    protected void initListeners() {
+        errorButtonRetry.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                onRetryButtonClicked();
+            }
+        });
+    }
+
+    protected abstract void reloadContent();
+
+    protected void onRetryButtonClicked() {
+        if (DEBUG) Log.d(TAG, "onRetryButtonClicked() called");
+        reloadContent();
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Utils
+    //////////////////////////////////////////////////////////////////////////*/
+
+    protected void setErrorMessage(String message, boolean showRetryButton) {
+        if (errorTextView == null || activity == null) return;
+
+        errorTextView.setText(message);
+        if (showRetryButton) animateView(errorButtonRetry, true, 300);
+        else animateView(errorButtonRetry, false, 0);
+
+        animateView(errorPanel, true, 300);
+        isLoading.set(false);
+
+        animateView(loadingProgressBar, false, 200);
+    }
+
+    protected int getResourceIdFromAttr(@AttrRes int attr) {
+        TypedArray a = activity.getTheme().obtainStyledAttributes(new int[]{attr});
+        int attributeResourceId = a.getResourceId(0, 0);
+        a.recycle();
+        return attributeResourceId;
+    }
+
+    public static void showMenuTooltip(View v, String message) {
+        final int[] screenPos = new int[2];
+        final Rect displayFrame = new Rect();
+        v.getLocationOnScreen(screenPos);
+        v.getWindowVisibleDisplayFrame(displayFrame);
+
+        final Context context = v.getContext();
+        final int width = v.getWidth();
+        final int height = v.getHeight();
+        final int midy = screenPos[1] + height / 2;
+        int referenceX = screenPos[0] + width / 2;
+        if (ViewCompat.getLayoutDirection(v) == View.LAYOUT_DIRECTION_LTR) {
+            final int screenWidth = context.getResources().getDisplayMetrics().widthPixels;
+            referenceX = screenWidth - referenceX; // mirror
+        }
+        Toast cheatSheet = Toast.makeText(context, message, Toast.LENGTH_SHORT);
+        if (midy < displayFrame.height()) {
+            // Show along the top; follow action buttons
+            cheatSheet.setGravity(Gravity.TOP | Gravity.END, referenceX,
+                    screenPos[1] + height - displayFrame.top);
+        } else {
+            // Show along the bottom center
+            cheatSheet.setGravity(Gravity.BOTTOM | Gravity.CENTER_HORIZONTAL, 0, height);
+        }
+        cheatSheet.show();
+    }
+}

app/src/main/java/org/schabi/newpipe/fragments/MainFragment.java

@@ -0,0 +1,77 @@
+package org.schabi.newpipe.fragments;
+
+import android.content.Context;
+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.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 org.schabi.newpipe.MainActivity;
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.util.NavigationHelper;
+
+public class MainFragment extends Fragment {
+    private final String TAG = "MainFragment@" + Integer.toHexString(hashCode());
+    private static final boolean DEBUG = MainActivity.DEBUG;
+
+    private AppCompatActivity activity;
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Fragment's LifeCycle
+    //////////////////////////////////////////////////////////////////////////*/
+
+    @Override
+    public void onAttach(Context context) {
+        super.onAttach(context);
+        if (DEBUG) Log.d(TAG, "onAttach() called with: context = [" + context + "]");
+        activity = ((AppCompatActivity) context);
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        if (DEBUG) Log.d(TAG, "onCreate() called with: savedInstanceState = [" + savedInstanceState + "]");
+        setHasOptionsMenu(true);
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        if (DEBUG) Log.d(TAG, "onCreateView() called with: inflater = [" + inflater + "], container = [" + container + "], savedInstanceState = [" + savedInstanceState + "]");
+        return inflater.inflate(R.layout.fragment_main, container, false);
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Menu
+    //////////////////////////////////////////////////////////////////////////*/
+
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        super.onCreateOptionsMenu(menu, inflater);
+        if (DEBUG) Log.d(TAG, "onCreateOptionsMenu() called with: menu = [" + menu + "], inflater = [" + inflater + "]");
+        inflater.inflate(R.menu.main_fragment_menu, menu);
+
+        ActionBar supportActionBar = activity.getSupportActionBar();
+        if (supportActionBar != null) {
+            supportActionBar.setDisplayShowTitleEnabled(false);
+            supportActionBar.setDisplayHomeAsUpEnabled(false);
+        }
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.action_search:
+                NavigationHelper.openSearchFragment(getFragmentManager(), 0, "");
+                return true;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+}

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

@@ -0,0 +1,403 @@
+package org.schabi.newpipe.fragments.channel;
+
+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.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.text.TextUtils;
+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.TextView;
+
+import org.schabi.newpipe.ImageErrorLoadingListener;
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.extractor.InfoItem;
+import org.schabi.newpipe.extractor.channel.ChannelInfo;
+import org.schabi.newpipe.fragments.BaseFragment;
+import org.schabi.newpipe.fragments.search.OnScrollBelowItemsListener;
+import org.schabi.newpipe.info_list.InfoItemBuilder;
+import org.schabi.newpipe.info_list.InfoListAdapter;
+import org.schabi.newpipe.util.Constants;
+import org.schabi.newpipe.util.NavigationHelper;
+import org.schabi.newpipe.workers.ChannelExtractorWorker;
+
+import java.io.Serializable;
+import java.text.NumberFormat;
+import java.util.ArrayList;
+
+import static org.schabi.newpipe.util.AnimationUtils.animateView;
+
+public class ChannelFragment extends BaseFragment implements ChannelExtractorWorker.OnChannelInfoReceive {
+    private final String TAG = "ChannelFragment@" + Integer.toHexString(hashCode());
+
+    private static final String INFO_LIST_KEY = "info_list_key";
+    private static final String CHANNEL_INFO_KEY = "channel_info_key";
+    private static final String PAGE_NUMBER_KEY = "page_number_key";
+
+    private InfoListAdapter infoListAdapter;
+
+    private ChannelExtractorWorker currentChannelWorker;
+    private ChannelInfo currentChannelInfo;
+    private int serviceId = -1;
+    private String channelName = "";
+    private String channelUrl = "";
+    private int pageNumber = 0;
+    private boolean hasNextPage = true;
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Views
+    //////////////////////////////////////////////////////////////////////////*/
+
+    private RecyclerView channelVideosList;
+
+    private View headerRootLayout;
+    private ImageView headerChannelBanner;
+    private ImageView headerAvatarView;
+    private TextView headerTitleView;
+    private TextView headerSubscribersTextView;
+    private Button headerRssButton;
+
+    /*////////////////////////////////////////////////////////////////////////*/
+
+    public ChannelFragment() {
+    }
+
+    public static Fragment getInstance(int serviceId, String channelUrl, String name) {
+        ChannelFragment instance = new ChannelFragment();
+        instance.setChannel(serviceId, channelUrl, name);
+        return instance;
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Fragment's LifeCycle
+    //////////////////////////////////////////////////////////////////////////*/
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        if (DEBUG) Log.d(TAG, "onCreate() called with: savedInstanceState = [" + savedInstanceState + "]");
+        super.onCreate(savedInstanceState);
+        setHasOptionsMenu(true);
+        if (savedInstanceState != null) {
+            channelUrl = savedInstanceState.getString(Constants.KEY_URL);
+            channelName = savedInstanceState.getString(Constants.KEY_TITLE);
+            serviceId = savedInstanceState.getInt(Constants.KEY_SERVICE_ID, -1);
+
+            pageNumber = savedInstanceState.getInt(PAGE_NUMBER_KEY, 0);
+            Serializable serializable = savedInstanceState.getSerializable(CHANNEL_INFO_KEY);
+            if (serializable instanceof ChannelInfo) currentChannelInfo = (ChannelInfo) serializable;
+        }
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        if (DEBUG) Log.d(TAG, "onCreateView() called with: inflater = [" + inflater + "], container = [" + container + "], savedInstanceState = [" + savedInstanceState + "]");
+        return inflater.inflate(R.layout.fragment_channel, container, false);
+    }
+
+    @Override
+    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+
+        if (currentChannelInfo == null) loadPage(0);
+        else handleChannelInfo(currentChannelInfo, false, false);
+    }
+
+    @Override
+    public void onDestroyView() {
+        if (DEBUG) Log.d(TAG, "onDestroyView() called");
+        headerAvatarView.setImageBitmap(null);
+        headerChannelBanner.setImageBitmap(null);
+        channelVideosList.removeAllViews();
+
+        channelVideosList = null;
+        headerRootLayout = null;
+        headerChannelBanner = null;
+        headerAvatarView = null;
+        headerTitleView = null;
+        headerSubscribersTextView = null;
+        headerRssButton = null;
+
+        super.onDestroyView();
+    }
+
+    @Override
+    public void onResume() {
+        if (DEBUG) Log.d(TAG, "onResume() called");
+        super.onResume();
+        if (wasLoading.getAndSet(false) && (currentChannelWorker == null || !currentChannelWorker.isRunning())) {
+            loadPage(pageNumber);
+        }
+    }
+
+    @Override
+    public void onStop() {
+        if (DEBUG) Log.d(TAG, "onStop() called");
+        super.onStop();
+        wasLoading.set(currentChannelWorker != null && currentChannelWorker.isRunning());
+        if (currentChannelWorker != null && currentChannelWorker.isRunning()) currentChannelWorker.cancel();
+    }
+
+    @Override
+    public void onSaveInstanceState(Bundle outState) {
+        if (DEBUG) Log.d(TAG, "onSaveInstanceState() called with: outState = [" + outState + "]");
+        super.onSaveInstanceState(outState);
+        outState.putString(Constants.KEY_URL, channelUrl);
+        outState.putString(Constants.KEY_TITLE, channelName);
+        outState.putInt(Constants.KEY_SERVICE_ID, serviceId);
+
+        outState.putSerializable(INFO_LIST_KEY, ((ArrayList<InfoItem>) infoListAdapter.getItemsList()));
+        outState.putSerializable(CHANNEL_INFO_KEY, currentChannelInfo);
+        outState.putInt(PAGE_NUMBER_KEY, pageNumber);
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Menu
+    //////////////////////////////////////////////////////////////////////////*/
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        if (DEBUG) Log.d(TAG, "onCreateOptionsMenu() called with: menu = [" + menu + "], inflater = [" + 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);
+        }
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (DEBUG) Log.d(TAG, "onOptionsItemSelected() called with: item = [" + 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
+    //////////////////////////////////////////////////////////////////////////*/
+
+    @Override
+    protected void initViews(View rootView, Bundle savedInstanceState) {
+        super.initViews(rootView, savedInstanceState);
+
+        channelVideosList = (RecyclerView) rootView.findViewById(R.id.channel_streams_view);
+
+        channelVideosList.setLayoutManager(new LinearLayoutManager(activity));
+        if (infoListAdapter == null) {
+            infoListAdapter = new InfoListAdapter(activity);
+            if (savedInstanceState != null) {
+                //noinspection unchecked
+                ArrayList<InfoItem> serializable = (ArrayList<InfoItem>) savedInstanceState.getSerializable(INFO_LIST_KEY);
+                infoListAdapter.addInfoItemList(serializable);
+            }
+        }
+
+        channelVideosList.setAdapter(infoListAdapter);
+        headerRootLayout = activity.getLayoutInflater().inflate(R.layout.channel_header, channelVideosList, false);
+        infoListAdapter.setHeader(headerRootLayout);
+        infoListAdapter.setFooter(activity.getLayoutInflater().inflate(R.layout.pignate_footer, channelVideosList, false));
+
+        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);
+        headerSubscribersTextView = (TextView) headerRootLayout.findViewById(R.id.channel_subscriber_view);
+        headerRssButton = (Button) headerRootLayout.findViewById(R.id.channel_rss_button);
+    }
+
+    protected void initListeners() {
+        super.initListeners();
+
+        infoListAdapter.setOnStreamInfoItemSelectedListener(new InfoItemBuilder.OnInfoItemSelectedListener() {
+            @Override
+            public void selected(int serviceId, String url, String title) {
+                if (DEBUG) Log.d(TAG, "selected() called with: serviceId = [" + serviceId + "], url = [" + url + "], title = [" + title + "]");
+                NavigationHelper.openVideoDetailFragment(getFragmentManager(), serviceId, url, title);
+            }
+        });
+
+        channelVideosList.clearOnScrollListeners();
+        channelVideosList.addOnScrollListener(new OnScrollBelowItemsListener() {
+            @Override
+            public void onScrolledDown(RecyclerView recyclerView) {
+                if ((currentChannelWorker == null || !currentChannelWorker.isRunning()) && hasNextPage && !isLoading.get()) {
+                    pageNumber++;
+                    loadMoreVideos();
+                }
+            }
+        });
+
+        headerRssButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                if (DEBUG) Log.d(TAG, "onClick() called with: view = [" + view + "] feed url > " + currentChannelInfo.feed_url);
+                Intent i = new Intent(Intent.ACTION_VIEW, Uri.parse(currentChannelInfo.feed_url));
+                startActivity(i);
+            }
+        });
+    }
+
+    @Override
+    protected void reloadContent() {
+        if (DEBUG) Log.d(TAG, "reloadContent() called");
+        currentChannelInfo = null;
+        infoListAdapter.clearStreamItemList();
+        loadPage(0);
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // 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 loadPage(int page) {
+        if (DEBUG) Log.d(TAG, "loadPage() called with: page = [" + page + "]");
+        if (currentChannelWorker != null && currentChannelWorker.isRunning()) currentChannelWorker.cancel();
+        isLoading.set(true);
+        pageNumber = page;
+        infoListAdapter.showFooter(false);
+
+        animateView(loadingProgressBar, true, 200);
+        animateView(errorPanel, false, 200);
+
+        imageLoader.cancelDisplayTask(headerChannelBanner);
+        imageLoader.cancelDisplayTask(headerAvatarView);
+
+        headerRssButton.setVisibility(View.GONE);
+        headerSubscribersTextView.setVisibility(View.GONE);
+
+        headerTitleView.setText(channelName != null ? channelName : "");
+        headerChannelBanner.setImageDrawable(ContextCompat.getDrawable(activity, R.drawable.channel_banner));
+        headerAvatarView.setImageDrawable(ContextCompat.getDrawable(activity, R.drawable.buddy));
+        if (activity.getSupportActionBar() != null) activity.getSupportActionBar().setTitle(channelName != null ? channelName : "");
+
+        currentChannelWorker = new ChannelExtractorWorker(activity, serviceId, channelUrl, page, false, this);
+        currentChannelWorker.start();
+    }
+
+    private void loadMoreVideos() {
+        if (DEBUG) Log.d(TAG, "loadMoreVideos() called");
+        if (currentChannelWorker != null && currentChannelWorker.isRunning()) currentChannelWorker.cancel();
+        isLoading.set(true);
+        currentChannelWorker = new ChannelExtractorWorker(activity, serviceId, channelUrl, pageNumber, true, this);
+        currentChannelWorker.start();
+    }
+
+    private void setChannel(int serviceId, String channelUrl, String name) {
+        this.serviceId = serviceId;
+        this.channelUrl = channelUrl;
+        this.channelName = name;
+    }
+
+    private void handleChannelInfo(ChannelInfo info, boolean onlyVideos, boolean addVideos) {
+        currentChannelInfo = info;
+
+        animateView(errorPanel, false, 300);
+        animateView(channelVideosList, true, 200);
+        animateView(loadingProgressBar, false, 200);
+
+        if (!onlyVideos) {
+            headerRootLayout.setVisibility(View.VISIBLE);
+            //animateView(loadingProgressBar, false, 200, null);
+
+            if (!TextUtils.isEmpty(info.channel_name)) {
+                if (activity.getSupportActionBar() != null) activity.getSupportActionBar().setTitle(info.channel_name);
+                headerTitleView.setText(info.channel_name);
+                channelName = info.channel_name;
+            } else channelName = "";
+
+            if (!TextUtils.isEmpty(info.banner_url)) {
+                imageLoader.displayImage(info.banner_url, headerChannelBanner, displayImageOptions,  new ImageErrorLoadingListener(activity, getView(), info.service_id));
+            }
+
+            if (!TextUtils.isEmpty(info.avatar_url)) {
+                headerAvatarView.setVisibility(View.VISIBLE);
+                imageLoader.displayImage(info.avatar_url, headerAvatarView, displayImageOptions, new ImageErrorLoadingListener(activity, getView(), info.service_id));
+            }
+
+            if (info.subscriberCount != -1) {
+                headerSubscribersTextView.setText(buildSubscriberString(info.subscriberCount));
+                headerSubscribersTextView.setVisibility(View.VISIBLE);
+            } else headerSubscribersTextView.setVisibility(View.GONE);
+
+            if (!TextUtils.isEmpty(info.feed_url)) headerRssButton.setVisibility(View.VISIBLE);
+            else headerRssButton.setVisibility(View.INVISIBLE);
+
+            infoListAdapter.showFooter(true);
+        }
+
+        hasNextPage = info.hasNextPage;
+        if (!hasNextPage) infoListAdapter.showFooter(false);
+
+        //if (!listRestored) {
+        if (addVideos) infoListAdapter.addInfoItemList(info.related_streams);
+        //}
+    }
+
+    @Override
+    protected void setErrorMessage(String message, boolean showRetryButton) {
+        super.setErrorMessage(message, showRetryButton);
+
+        animateView(channelVideosList, false, 200);
+        currentChannelInfo = null;
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // OnChannelInfoReceiveListener
+    //////////////////////////////////////////////////////////////////////////*/
+
+    @Override
+    public void onReceive(ChannelInfo info, boolean onlyVideos) {
+        if (DEBUG) Log.d(TAG, "onReceive() called with: info = [" + info + "]");
+        if (info == null || isRemoving() || !isVisible()) return;
+
+        handleChannelInfo(info, onlyVideos, true);
+        isLoading.set(false);
+    }
+
+    @Override
+    public void onError(int messageId) {
+        if (DEBUG) Log.d(TAG, "onError() called with: messageId = [" + messageId + "]");
+        setErrorMessage(getString(messageId), true);
+    }
+
+    @Override
+    public void onUnrecoverableError(Exception exception) {
+        if (DEBUG) Log.d(TAG, "onUnrecoverableError() called with: exception = [" + exception + "]");
+        activity.finish();
+    }
+}

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

@@ -0,0 +1,163 @@
+package org.schabi.newpipe.fragments.detail;
+
+import android.content.SharedPreferences;
+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.widget.AdapterView;
+import android.widget.Spinner;
+
+import org.schabi.newpipe.R;
+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.
+ * <p>
+ * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
+ * DetailsMenuHandler.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/>.
+ */
+
+
+@SuppressWarnings("WeakerAccess")
+class ActionBarHandler {
+    private static final String TAG = "ActionBarHandler";
+
+    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 onDownloadListener;
+    private OnActionListener onPlayWithKodiListener;
+
+    // Triggered when a stream related action is triggered.
+    public interface OnActionListener {
+        void onActionSelected(int selectedStreamId);
+    }
+
+    public ActionBarHandler(AppCompatActivity activity) {
+        this.activity = activity;
+    }
+
+    public void setupStreamList(final List<VideoStream> videoStreams, Spinner toolbarSpinner) {
+        if (activity == null) return;
+
+        selectedVideoStream = Utils.getDefaultResolution(activity, videoStreams);
+
+        boolean isExternalPlayerEnabled = PreferenceManager.getDefaultSharedPreferences(activity).getBoolean(activity.getString(R.string.use_external_video_player_key), false);
+        toolbarSpinner.setAdapter(new SpinnerToolbarAdapter(activity, videoStreams, isExternalPlayerEnabled));
+        toolbarSpinner.setSelection(selectedVideoStream);
+        toolbarSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+            @Override
+            public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
+                selectedVideoStream = position;
+            }
+
+            @Override
+            public void onNothingSelected(AdapterView<?> parent) {
+            }
+        });
+
+    }
+
+    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.video_detail_menu, menu);
+
+        updateItemsVisibility();
+    }
+
+    public void updateItemsVisibility(){
+        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: {
+                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;
+            default:
+                Log.e(TAG, "Menu Item not known");
+        }
+        return false;
+    }
+
+    public int getSelectedVideoStream() {
+        return selectedVideoStream;
+    }
+
+    public void setOnShareListener(OnActionListener listener) {
+        onShareListener = listener;
+    }
+
+    public void setOnOpenInBrowserListener(OnActionListener listener) {
+        onOpenInBrowserListener = listener;
+    }
+
+    public void setOnDownloadListener(OnActionListener listener) {
+        onDownloadListener = listener;
+    }
+
+    public void setOnPlayWithKodiListener(OnActionListener listener) {
+        onPlayWithKodiListener = listener;
+    }
+
+    public void 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/SpinnerToolbarAdapter.java

@@ -0,0 +1,74 @@
+package org.schabi.newpipe.fragments.detail;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+import android.widget.ImageView;
+import android.widget.Spinner;
+import android.widget.TextView;
+
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.extractor.MediaFormat;
+import org.schabi.newpipe.extractor.stream_info.VideoStream;
+
+import java.util.List;
+
+public class SpinnerToolbarAdapter extends BaseAdapter {
+    private final List<VideoStream> videoStreams;
+    private final boolean showIconNoAudio;
+
+    private final Context context;
+
+    public SpinnerToolbarAdapter(Context context, List<VideoStream> videoStreams, boolean showIconNoAudio) {
+        this.context = context;
+        this.videoStreams = videoStreams;
+        this.showIconNoAudio = showIconNoAudio;
+    }
+
+    @Override
+    public int getCount() {
+        return videoStreams.size();
+    }
+
+    @Override
+    public Object getItem(int position) {
+        return videoStreams.get(position);
+    }
+
+    @Override
+    public long getItemId(int position) {
+        return position;
+    }
+
+    @Override
+    public View getDropDownView(int position, View convertView, ViewGroup parent) {
+        return getCustomView(position, convertView, parent, true);
+    }
+
+    @Override
+    public View getView(int position, View convertView, ViewGroup parent) {
+        return getCustomView(((Spinner) parent).getSelectedItemPosition(), convertView, parent, false);
+    }
+
+    private View getCustomView(int position, View convertView, ViewGroup parent, boolean isDropdownItem) {
+        if (convertView == null) {
+            convertView = LayoutInflater.from(context).inflate(R.layout.resolutions_spinner_item, parent, false);
+        }
+
+        ImageView woSoundIcon = (ImageView) convertView.findViewById(R.id.wo_sound_icon);
+        TextView text = (TextView) convertView.findViewById(android.R.id.text1);
+        VideoStream item = (VideoStream) getItem(position);
+        text.setText(MediaFormat.getNameById(item.format) + " " + item.resolution);
+
+        int visibility = !showIconNoAudio ? View.GONE
+                : item.isVideoOnly ? View.VISIBLE
+                : isDropdownItem ? View.INVISIBLE
+                : View.GONE;
+        woSoundIcon.setVisibility(visibility);
+
+        return convertView;
+    }
+
+}

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

@@ -0,0 +1,42 @@
+package org.schabi.newpipe.fragments.detail;
+
+import org.schabi.newpipe.extractor.stream_info.StreamInfo;
+
+import java.io.Serializable;
+
+
+@SuppressWarnings("WeakerAccess")
+public class StackItem implements Serializable {
+    private String title, url;
+    private StreamInfo info;
+
+    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;
+    }
+
+    public void setInfo(StreamInfo info) {
+        this.info = info;
+    }
+
+    public StreamInfo getInfo() {
+        return info;
+    }
+
+    @Override
+    public String toString() {
+        return getUrl() + " > " + getTitle();
+    }
+}

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

@@ -0,0 +1,85 @@
+package org.schabi.newpipe.fragments.detail;
+
+import android.support.annotation.NonNull;
+import android.text.TextUtils;
+import android.util.Log;
+
+import org.schabi.newpipe.MainActivity;
+import org.schabi.newpipe.extractor.stream_info.StreamInfo;
+
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+
+
+@SuppressWarnings("WeakerAccess")
+public class StreamInfoCache {
+    private static String TAG = "StreamInfoCache@";
+    private static final boolean DEBUG = MainActivity.DEBUG;
+    private static final StreamInfoCache instance = new StreamInfoCache();
+    private static final int MAX_ITEMS_ON_CACHE = 20;
+
+    private final LinkedHashMap<String, StreamInfo> myCache = new LinkedHashMap<>();
+
+    private StreamInfoCache() {
+        TAG += "" + Integer.toHexString(hashCode());
+    }
+
+    public static StreamInfoCache getInstance() {
+        if (DEBUG) Log.d(TAG, "getInstance() called");
+        return instance;
+    }
+
+    public boolean hasKey(@NonNull String url) {
+        if (DEBUG) Log.d(TAG, "hasKey() called with: url = [" + url + "]");
+        return !TextUtils.isEmpty(url) && myCache.containsKey(url) && myCache.get(url) != null;
+    }
+
+    public StreamInfo getFromKey(@NonNull String url) {
+        if (DEBUG) Log.d(TAG, "getFromKey() called with: url = [" + url + "]");
+        return myCache.get(url);
+    }
+
+    public void putInfo(@NonNull StreamInfo info) {
+        if (DEBUG) Log.d(TAG, "putInfo() called with: info = [" + info + "]");
+        putInfo(info.webpage_url, info);
+    }
+
+    public void putInfo(@NonNull String url, @NonNull StreamInfo info) {
+        if (DEBUG) Log.d(TAG, "putInfo() called with: url = [" + url + "], info = [" + info + "]");
+        myCache.put(url, info);
+    }
+
+    public void removeInfo(@NonNull StreamInfo info) {
+        if (DEBUG) Log.d(TAG, "removeInfo() called with: info = [" + info + "]");
+        myCache.remove(info.webpage_url);
+    }
+
+    public void removeInfo(@NonNull String url) {
+        if (DEBUG) Log.d(TAG, "removeInfo() called with: url = [" + url + "]");
+        myCache.remove(url);
+    }
+
+    @SuppressWarnings("unused")
+    public void clearCache() {
+        if (DEBUG) Log.d(TAG, "clearCache() called");
+        myCache.clear();
+    }
+
+    public void removeOldEntries() {
+        if (DEBUG) Log.d(TAG, "removeOldEntries() called , size = " + getSize());
+        if (getSize() > MAX_ITEMS_ON_CACHE) {
+            Iterator<String> iterator = myCache.keySet().iterator();
+            while (iterator.hasNext()) {
+                iterator.next();
+                iterator.remove();
+                if (DEBUG) Log.d(TAG, "getSize() = " + getSize());
+                if (getSize() <= MAX_ITEMS_ON_CACHE) break;
+            }
+        }
+    }
+
+    public int getSize() {
+        return myCache.size();
+    }
+
+}

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

@@ -0,0 +1,33 @@
+package org.schabi.newpipe.fragments.search;
+
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+
+/**
+ * Recycler view scroll listener which calls the method {@link #onScrolledDown(RecyclerView)}
+ * if the view is scrolled below the last item.
+ */
+public abstract class OnScrollBelowItemsListener extends RecyclerView.OnScrollListener {
+
+    @Override
+    public void onScrolled(RecyclerView recyclerView, int dx, int dy) {
+        super.onScrolled(recyclerView, dx, dy);
+        //check for scroll down
+        if (dy > 0) {
+            int pastVisibleItems, visibleItemCount, totalItemCount;
+            LinearLayoutManager layoutManager = (LinearLayoutManager) recyclerView.getLayoutManager();
+            visibleItemCount = recyclerView.getLayoutManager().getChildCount();
+            totalItemCount = recyclerView.getLayoutManager().getItemCount();
+            pastVisibleItems = layoutManager.findFirstVisibleItemPosition();
+            if ((visibleItemCount + pastVisibleItems) >= totalItemCount) {
+                onScrolledDown(recyclerView);
+            }
+        }
+    }
+
+    /**
+     * Called when the recycler view is scrolled below the last item.
+     * @param recyclerView the recycler view
+     */
+    public abstract void onScrolledDown(RecyclerView recyclerView);
+}

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

@@ -0,0 +1,615 @@
+package org.schabi.newpipe.fragments.search;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Build;
+import android.os.Bundle;
+import android.preference.PreferenceManager;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.v7.app.ActionBar;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.text.Editable;
+import android.text.TextUtils;
+import android.text.TextWatcher;
+import android.util.Log;
+import android.view.KeyEvent;
+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.animation.DecelerateInterpolator;
+import android.view.inputmethod.EditorInfo;
+import android.view.inputmethod.InputMethodManager;
+import android.widget.AdapterView;
+import android.widget.AutoCompleteTextView;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.ReCaptchaActivity;
+import org.schabi.newpipe.extractor.InfoItem;
+import org.schabi.newpipe.extractor.search.SearchEngine;
+import org.schabi.newpipe.extractor.search.SearchResult;
+import org.schabi.newpipe.fragments.BaseFragment;
+import org.schabi.newpipe.info_list.InfoItemBuilder;
+import org.schabi.newpipe.info_list.InfoListAdapter;
+import org.schabi.newpipe.util.Constants;
+import org.schabi.newpipe.util.NavigationHelper;
+import org.schabi.newpipe.workers.SearchWorker;
+import org.schabi.newpipe.workers.SuggestionWorker;
+
+import java.util.ArrayList;
+import java.util.EnumSet;
+import java.util.List;
+
+import static org.schabi.newpipe.util.AnimationUtils.animateView;
+
+public class SearchFragment extends BaseFragment implements SuggestionWorker.OnSuggestionResult, SearchWorker.OnSearchResult {
+    private final String TAG = "SearchFragment@" + Integer.toHexString(hashCode());
+    // savedInstanceBundle arguments
+    private static final String QUERY_KEY = "query_key";
+    private static final String PAGE_NUMBER_KEY = "page_number_key";
+    private static final String INFO_LIST_KEY = "info_list_key";
+    private static final String WAS_LOADING_KEY = "was_loading_key";
+    private static final String ERROR_KEY = "error_key";
+    private static final String FILTER_CHECKED_ID_KEY = "filter_checked_id_key";
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Search
+    //////////////////////////////////////////////////////////////////////////*/
+
+    private int filterItemCheckedId = -1;
+    private EnumSet<SearchEngine.Filter> filter = EnumSet.of(SearchEngine.Filter.CHANNEL, SearchEngine.Filter.STREAM);
+
+    private int serviceId = -1;
+    private String searchQuery = "";
+    private int pageNumber = 0;
+    private boolean showSuggestions = true;
+
+    private SearchWorker curSearchWorker;
+    private SuggestionWorker curSuggestionWorker;
+    private SuggestionListAdapter suggestionListAdapter;
+    private InfoListAdapter infoListAdapter;
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Views
+    //////////////////////////////////////////////////////////////////////////*/
+
+    private View searchToolbarContainer;
+    private AutoCompleteTextView searchEditText;
+    private View searchClear;
+
+    private RecyclerView resultRecyclerView;
+
+    /*////////////////////////////////////////////////////////////////////////*/
+
+    public static SearchFragment getInstance(int serviceId, String query) {
+        SearchFragment searchFragment = new SearchFragment();
+        searchFragment.setQuery(serviceId, query);
+        return searchFragment;
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Fragment's LifeCycle
+    //////////////////////////////////////////////////////////////////////////*/
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        if (DEBUG) Log.d(TAG, "onCreate() called with: savedInstanceState = [" + savedInstanceState + "]");
+        setHasOptionsMenu(true);
+        if (savedInstanceState != null) {
+            searchQuery = savedInstanceState.getString(QUERY_KEY);
+            serviceId = savedInstanceState.getInt(Constants.KEY_SERVICE_ID, 0);
+            pageNumber = savedInstanceState.getInt(PAGE_NUMBER_KEY, 0);
+            wasLoading.set(savedInstanceState.getBoolean(WAS_LOADING_KEY, false));
+            filterItemCheckedId = savedInstanceState.getInt(FILTER_CHECKED_ID_KEY, 0);
+        }
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        if (DEBUG) Log.d(TAG, "onCreateView() called with: inflater = [" + inflater + "], container = [" + container + "], savedInstanceState = [" + savedInstanceState + "]");
+        return inflater.inflate(R.layout.fragment_search, container, false);
+    }
+
+    @Override
+    public void onViewCreated(View rootView, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(rootView, savedInstanceState);
+        if (DEBUG) Log.d(TAG, "onViewCreated() called with: rootView = [" + rootView + "], savedInstanceState = [" + savedInstanceState + "]");
+
+        if (savedInstanceState != null && savedInstanceState.getBoolean(ERROR_KEY, false)) {
+            search(searchQuery, 0, true);
+        }
+
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        if (DEBUG) Log.d(TAG, "onResume() called");
+        if (wasLoading.getAndSet(false) && !TextUtils.isEmpty(searchQuery)) {
+            if (pageNumber > 0) search(searchQuery, pageNumber);
+            else search(searchQuery, 0, true);
+        }
+
+        showSuggestions = PreferenceManager.getDefaultSharedPreferences(activity).getBoolean(getString(R.string.show_search_suggestions_key), true);
+    }
+
+    @Override
+    public void onStop() {
+        super.onStop();
+        if (DEBUG) Log.d(TAG, "onStop() called");
+
+        hideSoftKeyboard(searchEditText);
+
+        wasLoading.set(curSearchWorker != null && curSearchWorker.isRunning());
+        if (curSearchWorker != null && curSearchWorker.isRunning()) curSearchWorker.cancel();
+        if (curSuggestionWorker != null && curSuggestionWorker.isRunning()) curSuggestionWorker.cancel();
+    }
+
+    @Override
+    public void onDestroyView() {
+        if (DEBUG) Log.d(TAG, "onDestroyView() called");
+        unsetSearchListeners();
+
+        resultRecyclerView.removeAllViews();
+
+        searchToolbarContainer = null;
+        searchEditText = null;
+        searchClear = null;
+
+        resultRecyclerView = null;
+
+        super.onDestroyView();
+    }
+
+    @Override
+    public void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+        if (DEBUG) Log.d(TAG, "onSaveInstanceState() called with: outState = [" + outState + "]");
+
+        String query = searchEditText != null && !TextUtils.isEmpty(searchEditText.getText().toString())
+                ? searchEditText.getText().toString() : searchQuery;
+        outState.putString(QUERY_KEY, query);
+        outState.putInt(Constants.KEY_SERVICE_ID, serviceId);
+        outState.putInt(PAGE_NUMBER_KEY, pageNumber);
+        outState.putSerializable(INFO_LIST_KEY, ((ArrayList<InfoItem>) infoListAdapter.getItemsList()));
+        outState.putBoolean(WAS_LOADING_KEY, curSearchWorker != null && curSearchWorker.isRunning());
+
+        if (errorPanel != null && errorPanel.getVisibility() == View.VISIBLE) outState.putBoolean(ERROR_KEY, true);
+        if (filterItemCheckedId != -1) outState.putInt(FILTER_CHECKED_ID_KEY, filterItemCheckedId);
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        switch (requestCode) {
+            case ReCaptchaActivity.RECAPTCHA_REQUEST:
+                if (resultCode == Activity.RESULT_OK && searchQuery.length() != 0) {
+                    search(searchQuery, pageNumber, true);
+                } else Log.e(TAG, "ReCaptcha failed");
+                break;
+
+            default:
+                Log.e(TAG, "Request code from activity not supported [" + requestCode + "]");
+                break;
+        }
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Init's
+    //////////////////////////////////////////////////////////////////////////*/
+
+    @Override
+    protected void initViews(View rootView, Bundle savedInstanceState) {
+        super.initViews(rootView, savedInstanceState);
+        resultRecyclerView = ((RecyclerView) rootView.findViewById(R.id.result_list_view));
+        resultRecyclerView.setLayoutManager(new LinearLayoutManager(activity));
+
+        if (infoListAdapter == null) {
+            infoListAdapter = new InfoListAdapter(getActivity());
+            if (savedInstanceState != null) {
+                //noinspection unchecked
+                ArrayList<InfoItem> serializable = (ArrayList<InfoItem>) savedInstanceState.getSerializable(INFO_LIST_KEY);
+                infoListAdapter.addInfoItemList(serializable);
+            }
+
+            infoListAdapter.setFooter(activity.getLayoutInflater().inflate(R.layout.pignate_footer, resultRecyclerView, false));
+            infoListAdapter.showFooter(false);
+            infoListAdapter.setOnStreamInfoItemSelectedListener(new InfoItemBuilder.OnInfoItemSelectedListener() {
+                @Override
+                public void selected(int serviceId, String url, String title) {
+                    NavigationHelper.openVideoDetailFragment(getFragmentManager(), serviceId, url, title);
+                }
+            });
+            infoListAdapter.setOnChannelInfoItemSelectedListener(new InfoItemBuilder.OnInfoItemSelectedListener() {
+                @Override
+                public void selected(int serviceId, String url, String title) {
+                    NavigationHelper.openChannelFragment(getFragmentManager(), serviceId, url, title);
+                }
+            });
+        }
+
+        resultRecyclerView.setAdapter(infoListAdapter);
+    }
+
+    @Override
+    protected void initListeners() {
+        super.initListeners();
+        resultRecyclerView.clearOnScrollListeners();
+        resultRecyclerView.addOnScrollListener(new OnScrollBelowItemsListener() {
+            @Override
+            public void onScrolledDown(RecyclerView recyclerView) {
+                if(!isLoading.get()) {
+                    pageNumber++;
+                    recyclerView.post(new Runnable() {
+                        @Override
+                        public void run() {
+                            infoListAdapter.showFooter(true);
+                        }
+                    });
+                    search(searchQuery, pageNumber);
+                }
+            }
+        });
+    }
+
+
+    @Override
+    protected void reloadContent() {
+        if (DEBUG) Log.d(TAG, "reloadContent() called");
+        if (!TextUtils.isEmpty(searchQuery) || (searchEditText != null && !TextUtils.isEmpty(searchEditText.getText()))) {
+            search(!TextUtils.isEmpty(searchQuery) ? searchQuery : searchEditText.getText().toString(), 0, true);
+        } else {
+            if (searchEditText != null) {
+                searchEditText.setText("");
+                showSoftKeyboard(searchEditText);
+            }
+            animateView(errorPanel, false, 200);
+        }
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Menu
+    //////////////////////////////////////////////////////////////////////////*/
+
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        super.onCreateOptionsMenu(menu, inflater);
+        if (DEBUG) Log.d(TAG, "onCreateOptionsMenu() called with: menu = [" + menu + "], inflater = [" + inflater + "]");
+        inflater.inflate(R.menu.search_menu, menu);
+
+        ActionBar supportActionBar = activity.getSupportActionBar();
+        if (supportActionBar != null) {
+            supportActionBar.setDisplayShowTitleEnabled(false);
+            supportActionBar.setDisplayHomeAsUpEnabled(true);
+        }
+
+        searchToolbarContainer = activity.findViewById(R.id.toolbar_search_container);
+        searchEditText = (AutoCompleteTextView) searchToolbarContainer.findViewById(R.id.toolbar_search_edit_text);
+        searchClear = searchToolbarContainer.findViewById(R.id.toolbar_search_clear);
+        setupSearchView();
+
+        restoreFilterChecked(menu, filterItemCheckedId);
+    }
+
+    private void restoreFilterChecked(Menu menu, int itemId) {
+        if (itemId != -1) {
+            MenuItem item = menu.findItem(itemId);
+            if (item == null) return;
+
+            item.setChecked(true);
+            switch (itemId) {
+                case R.id.menu_filter_all:
+                    filter = EnumSet.of(SearchEngine.Filter.STREAM, SearchEngine.Filter.CHANNEL);
+                    break;
+                case R.id.menu_filter_video:
+                    filter = EnumSet.of(SearchEngine.Filter.STREAM);
+                    break;
+                case R.id.menu_filter_channel:
+                    filter = EnumSet.of(SearchEngine.Filter.CHANNEL);
+                    break;
+            }
+        }
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (DEBUG) Log.d(TAG, "onOptionsItemSelected() called with: item = [" + 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;
+        }
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Search
+    //////////////////////////////////////////////////////////////////////////*/
+
+    private TextWatcher textWatcher;
+
+    private void setupSearchView() {
+        searchEditText.setText(searchQuery != null ? searchQuery : "");
+        searchEditText.setHint(getString(R.string.search) + "...");
+        ////searchEditText.setCursorVisible(true);
+
+        suggestionListAdapter = new SuggestionListAdapter(activity);
+        searchEditText.setAdapter(suggestionListAdapter);
+
+
+        if (TextUtils.isEmpty(searchQuery) || TextUtils.isEmpty(searchEditText.getText())) {
+            searchToolbarContainer.setTranslationX(100);
+            searchToolbarContainer.setAlpha(0f);
+            searchToolbarContainer.setVisibility(View.VISIBLE);
+            searchToolbarContainer.animate().translationX(0).alpha(1f).setDuration(400).setInterpolator(new DecelerateInterpolator()).start();
+        } else {
+            searchToolbarContainer.setTranslationX(0);
+            searchToolbarContainer.setAlpha(1f);
+            searchToolbarContainer.setVisibility(View.VISIBLE);
+        }
+
+        //
+        initSearchListeners();
+
+        if (TextUtils.isEmpty(searchQuery)) showSoftKeyboard(searchEditText);
+        else hideSoftKeyboard(searchEditText);
+
+        if (!TextUtils.isEmpty(searchQuery) && searchQuery.length() > 2 && suggestionListAdapter != null && suggestionListAdapter.isEmpty()) {
+            searchSuggestions(searchQuery);
+        }
+    }
+
+    private void initSearchListeners() {
+        searchClear.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (DEBUG) Log.d(TAG, "onClick() called with: v = [" + v + "]");
+                if (TextUtils.isEmpty(searchEditText.getText())) {
+                    NavigationHelper.gotoMainFragment(getFragmentManager());
+                    return;
+                }
+
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
+                    searchEditText.setText("", false);
+                } else searchEditText.setText("");
+                suggestionListAdapter.updateAdapter(new ArrayList<String>());
+                showSoftKeyboard(searchEditText);
+            }
+        });
+
+        searchClear.setOnLongClickListener(new View.OnLongClickListener() {
+            @Override
+            public boolean onLongClick(View v) {
+                if (DEBUG) Log.d(TAG, "onLongClick() called with: v = [" + v + "]");
+                showMenuTooltip(v, getString(R.string.clear));
+                return true;
+            }
+        });
+
+        searchEditText.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                searchEditText.showDropDown();
+            }
+        });
+
+        searchEditText.setOnFocusChangeListener(new View.OnFocusChangeListener() {
+            @Override
+            public void onFocusChange(View v, boolean hasFocus) {
+                if (hasFocus) searchEditText.showDropDown();
+            }
+        });
+
+        searchEditText.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+            @Override
+            public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+                if (DEBUG) Log.d(TAG, "onItemClick() called with: parent = [" + parent + "], view = [" + view + "], position = [" + position + "], id = [" + id + "]");
+                String s = suggestionListAdapter.getSuggestion(position);
+                if (DEBUG) Log.d(TAG, "onItemClick text = " + s);
+                submitQuery(s);
+            }
+        });
+
+
+        if (textWatcher != null) searchEditText.removeTextChangedListener(textWatcher);
+        textWatcher = new TextWatcher() {
+            @Override
+            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+            }
+
+            @Override
+            public void onTextChanged(CharSequence s, int start, int before, int count) {
+            }
+
+            @Override
+            public void afterTextChanged(Editable s) {
+                String newText = searchEditText.getText().toString();
+                if (!TextUtils.isEmpty(newText) && newText.length() > 1) onQueryTextChange(newText);
+            }
+        };
+        searchEditText.addTextChangedListener(textWatcher);
+
+        searchEditText.setOnEditorActionListener(new TextView.OnEditorActionListener() {
+            @Override
+            public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
+                if (DEBUG) Log.d(TAG, "onEditorAction() called with: v = [" + v + "], actionId = [" + actionId + "], event = [" + event + "]");
+                if (event != null && (event.getKeyCode() == KeyEvent.KEYCODE_ENTER || event.getAction() == EditorInfo.IME_ACTION_SEARCH)) {
+                    submitQuery(searchEditText.getText().toString());
+                    return true;
+                }
+                return false;
+            }
+        });
+    }
+
+    private void unsetSearchListeners() {
+        searchClear.setOnClickListener(null);
+        searchClear.setOnLongClickListener(null);
+        if (textWatcher != null) searchEditText.removeTextChangedListener(textWatcher);
+        searchEditText.setOnClickListener(null);
+        searchEditText.setOnItemClickListener(null);
+        searchEditText.setOnFocusChangeListener(null);
+        searchEditText.setOnEditorActionListener(null);
+
+        textWatcher = null;
+    }
+
+    public void showSoftKeyboard(View view) {
+        if (DEBUG) Log.d(TAG, "showSoftKeyboard() called with: view = [" + view + "]");
+        if (view == null) return;
+
+        if (view.requestFocus()) {
+            InputMethodManager imm = (InputMethodManager) activity.getSystemService(Context.INPUT_METHOD_SERVICE);
+            imm.showSoftInput(view, InputMethodManager.SHOW_IMPLICIT);
+        }
+    }
+
+    public void hideSoftKeyboard(View view) {
+        if (DEBUG) Log.d(TAG, "hideSoftKeyboard() called with: view = [" + view + "]");
+        if (view == null) return;
+
+        InputMethodManager imm = (InputMethodManager) activity.getSystemService(Context.INPUT_METHOD_SERVICE);
+        imm.hideSoftInputFromWindow(view.getWindowToken(), InputMethodManager.HIDE_NOT_ALWAYS);
+
+        view.clearFocus();
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Utils
+    //////////////////////////////////////////////////////////////////////////*/
+
+    private void changeFilter(MenuItem item, EnumSet<SearchEngine.Filter> filter) {
+        this.filter = filter;
+        this.filterItemCheckedId = item.getItemId();
+        item.setChecked(true);
+        if (searchQuery != null && !searchQuery.isEmpty()) search(searchQuery, 0, true);
+    }
+
+    public void submitQuery(String query) {
+        if (DEBUG) Log.d(TAG, "submitQuery() called with: query = [" + query + "]");
+        if (query.isEmpty()) return;
+        search(query, 0, true);
+        searchQuery = query;
+    }
+
+    public void onQueryTextChange(String newText) {
+        if (DEBUG) Log.d(TAG, "onQueryTextChange() called with: newText = [" + newText + "]");
+        if (!newText.isEmpty()) searchSuggestions(newText);
+    }
+
+    private void setQuery(int serviceId, String searchQuery) {
+        this.serviceId = serviceId;
+        this.searchQuery = searchQuery;
+    }
+
+    private void searchSuggestions(String query) {
+        if (!showSuggestions) {
+            if (DEBUG) Log.d(TAG, "searchSuggestions() showSuggestions is disabled");
+            return;
+        }
+
+        if (DEBUG) Log.d(TAG, "searchSuggestions() called with: query = [" + query + "]");
+        if (curSuggestionWorker != null && curSuggestionWorker.isRunning()) curSuggestionWorker.cancel();
+        curSuggestionWorker = SuggestionWorker.startForQuery(activity, serviceId, query, this);
+    }
+
+    private void search(String query, int pageNumber) {
+        if (DEBUG) Log.d(TAG, "search() called with: query = [" + query + "], pageNumber = [" + pageNumber + "]");
+        search(query, pageNumber, false);
+    }
+
+    private void search(String query, int pageNumber, boolean clearList) {
+        if (DEBUG) Log.d(TAG, "search() called with: query = [" + query + "], pageNumber = [" + pageNumber + "], clearList = [" + clearList + "]");
+        isLoading.set(true);
+        hideSoftKeyboard(searchEditText);
+
+        searchQuery = query;
+        this.pageNumber = pageNumber;
+
+        if (clearList) {
+            animateView(resultRecyclerView, false, 50);
+            infoListAdapter.clearStreamItemList();
+            infoListAdapter.showFooter(false);
+            animateView(loadingProgressBar, true, 200);
+        }
+        animateView(errorPanel, false, 200);
+
+        if (curSearchWorker != null && curSearchWorker.isRunning()) curSearchWorker.cancel();
+        curSearchWorker = SearchWorker.startForQuery(activity, serviceId, query, pageNumber, filter, this);
+    }
+
+    protected void setErrorMessage(String message, boolean showRetryButton) {
+        super.setErrorMessage(message, showRetryButton);
+
+        animateView(resultRecyclerView, false, 400);
+        hideSoftKeyboard(searchEditText);
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // OnSuggestionResult
+    //////////////////////////////////////////////////////////////////////////*/
+
+    @Override
+    public void onSuggestionResult(@NonNull List<String> suggestions) {
+        if (DEBUG) Log.d(TAG, "onSuggestionResult() called with: suggestions = [" + suggestions + "]");
+        suggestionListAdapter.updateAdapter(suggestions);
+    }
+
+    @Override
+    public void onSuggestionError(int messageId) {
+        if (DEBUG) Log.d(TAG, "onSuggestionError() called with: messageId = [" + messageId + "]");
+        setErrorMessage(getString(messageId), true);
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // SearchWorkerResultListener
+    //////////////////////////////////////////////////////////////////////////*/
+
+    @Override
+    public void onSearchResult(SearchResult result) {
+        if (DEBUG) Log.d(TAG, "onSearchResult() called with: result = [" + result + "]");
+        infoListAdapter.addInfoItemList(result.resultList);
+        animateView(resultRecyclerView, true, 400);
+        animateView(loadingProgressBar, false, 200);
+        isLoading.set(false);
+    }
+
+    @Override
+    public void onNothingFound(String message) {
+        if (DEBUG) Log.d(TAG, "onNothingFound() called with: messageId = [" + message + "]");
+        setErrorMessage(message, false);
+    }
+
+    @Override
+    public void onSearchError(int messageId) {
+        if (DEBUG) Log.d(TAG, "onSearchError() called with: messageId = [" + messageId + "]");
+        //Toast.makeText(getActivity(), messageId, Toast.LENGTH_LONG).show();
+        setErrorMessage(getString(messageId), true);
+    }
+
+    @Override
+    public void onReCaptchaChallenge() {
+        if (DEBUG) Log.d(TAG, "onReCaptchaChallenge() called");
+        Toast.makeText(getActivity(), R.string.recaptcha_request_toast, Toast.LENGTH_LONG).show();
+        setErrorMessage(getString(R.string.recaptcha_request_toast), false);
+
+        // Starting ReCaptcha Challenge Activity
+        startActivityForResult(new Intent(getActivity(), ReCaptchaActivity.class), ReCaptchaActivity.RECAPTCHA_REQUEST);
+    }
+
+}

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

@@ -0,0 +1,89 @@
+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);
+    }
+
+    @Override
+    public CharSequence convertToString(Cursor cursor) {
+        return cursor.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/info_list/ChannelInfoItemHolder.java

@@ -0,0 +1,52 @@
+package org.schabi.newpipe.info_list;
+
+import android.view.View;
+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 itemAdditionalDetailView;
+    public final TextView itemChannelDescriptionView;
+
+    public final View itemRoot;
+
+    ChannelInfoItemHolder(View v) {
+        super(v);
+        itemRoot = v.findViewById(R.id.itemRoot);
+        itemThumbnailView = (CircleImageView) v.findViewById(R.id.itemThumbnailView);
+        itemChannelTitleView = (TextView) v.findViewById(R.id.itemChannelTitleView);
+        itemAdditionalDetailView = (TextView) v.findViewById(R.id.itemAdditionalDetails);
+        itemChannelDescriptionView = (TextView) v.findViewById(R.id.itemChannelDescriptionView);
+    }
+
+    @Override
+    public InfoItem.InfoType infoType() {
+        return InfoItem.InfoType.CHANNEL;
+    }
+}

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

@@ -0,0 +1,290 @@
+package org.schabi.newpipe.info_list;
+
+import android.content.Context;
+import android.text.TextUtils;
+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;
+
+import java.util.Locale;
+
+/**
+ * Created by Christian Schabesberger on 26.09.16.
+ * <p>
+ * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
+ * InfoItemBuilder.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 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 ImageLoader imageLoader = ImageLoader.getInstance();
+
+    /** Base display options */
+    private static final DisplayImageOptions DISPLAY_IMAGE_OPTIONS =
+            new DisplayImageOptions.Builder()
+                    .cacheInMemory(true)
+                    .build();
+
+    /** Display options for stream thumbnails */
+    private static final DisplayImageOptions DISPLAY_STREAM_THUMBNAIL_OPTIONS =
+            new DisplayImageOptions.Builder()
+            .cloneFrom(DISPLAY_IMAGE_OPTIONS)
+            .showImageOnFail(R.drawable.dummy_thumbnail)
+            .showImageForEmptyUri(R.drawable.dummy_thumbnail)
+            .showImageOnLoading(R.drawable.dummy_thumbnail)
+            .build();
+
+    /** Display options for channel thumbnails */
+    private static final DisplayImageOptions DISPLAY_CHANNEL_THUMBNAIL_OPTIONS =
+            new DisplayImageOptions.Builder()
+            .cloneFrom(DISPLAY_IMAGE_OPTIONS)
+            .showImageOnLoading(R.drawable.buddy_channel_item)
+            .showImageForEmptyUri(R.drawable.buddy_channel_item)
+            .showImageOnFail(R.drawable.buddy_channel_item)
+            .build();
+    private OnInfoItemSelectedListener onStreamInfoItemSelectedListener;
+    private OnInfoItemSelectedListener onChannelInfoItemSelectedListener;
+
+    public InfoItemBuilder(Context context) {
+        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;
+        LayoutInflater inflater = LayoutInflater.from(parent.getContext());
+        switch (info.infoType()) {
+            case STREAM:
+                //long start = System.nanoTime();
+                itemView = inflater.inflate(R.layout.stream_item, parent, false);
+                //Log.d(TAG, "time to inflate: " + ((System.nanoTime() - start) / 1000000L) + "ms");
+                holder = new StreamInfoItemHolder(itemView);
+                break;
+            case CHANNEL:
+                itemView = inflater.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 String getStreamInfoDetailLine(final StreamInfoItem info) {
+        String viewsAndDate = "";
+        if(info.view_count >= 0) {
+            viewsAndDate = shortViewCount(info.view_count);
+        }
+        if(!TextUtils.isEmpty(info.upload_date)) {
+            if(viewsAndDate.isEmpty()) {
+                viewsAndDate = info.upload_date;
+            } else {
+                viewsAndDate += " • " + info.upload_date;
+            }
+        }
+        return viewsAndDate;
+    }
+
+    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
+        if (!TextUtils.isEmpty(info.title)) holder.itemVideoTitleView.setText(info.title);
+
+        if (!TextUtils.isEmpty(info.uploader)) 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);
+            }
+        }
+
+        holder.itemAdditionalDetails.setText(getStreamInfoDetailLine(info));
+
+        // Default thumbnail is shown on error, while loading and if the url is empty
+        imageLoader.displayImage(info.thumbnail_url,
+                holder.itemThumbnailView,
+                DISPLAY_STREAM_THUMBNAIL_OPTIONS,
+                new ImageErrorLoadingListener(holder.itemRoot.getContext(), holder.itemRoot.getRootView(), info.service_id));
+
+
+        holder.itemRoot.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                if(onStreamInfoItemSelectedListener != null) {
+                    onStreamInfoItemSelectedListener.selected(info.service_id, info.webpage_url, info.getTitle());
+                }
+            }
+        });
+    }
+
+    private String getChannelInfoDetailLine(final ChannelInfoItem info) {
+        String details = "";
+        if(info.subscriberCount >= 0) {
+            details = shortSubscriber(info.subscriberCount);
+        }
+        if(info.videoAmount >= 0) {
+            String formattedVideoAmount = info.videoAmount + " " + videosS;
+            if(!details.isEmpty()) {
+                details += " • " + formattedVideoAmount;
+            } else {
+                details = formattedVideoAmount;
+            }
+        }
+        return details;
+    }
+
+    private void buildChannelInfoItem(ChannelInfoItemHolder holder, final ChannelInfoItem info) {
+        if (!TextUtils.isEmpty(info.getTitle())) holder.itemChannelTitleView.setText(info.getTitle());
+        holder.itemAdditionalDetailView.setText(getChannelInfoDetailLine(info));
+        if (!TextUtils.isEmpty(info.description)) holder.itemChannelDescriptionView.setText(info.description);
+
+        imageLoader.displayImage(info.thumbnailUrl,
+                holder.itemThumbnailView,
+                DISPLAY_CHANNEL_THUMBNAIL_OPTIONS,
+                new ImageErrorLoadingListener(holder.itemRoot.getContext(), holder.itemRoot.getRootView(), info.serviceId));
+
+
+        holder.itemRoot.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                if(onStreamInfoItemSelectedListener != null) {
+                    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) {
+        if(duration < 0) {
+            duration = 0;
+        }
+        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 = String.format(Locale.US, "%d:%02d:%02d:%02d", days, hours, minutes, seconds);
+        } else if(hours > 0) {
+            output = String.format(Locale.US, "%d:%02d:%02d", hours, minutes, seconds);
+        } else {
+            output = String.format(Locale.US, "%d:%02d", minutes, seconds);
+        }
+        return output;
+    }
+}

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

@@ -1,14 +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 java.util.Vector;
+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>
- * SearchEngine.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
@@ -24,14 +25,9 @@ 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 abstract class InfoItemHolder extends RecyclerView.ViewHolder {
+    public InfoItemHolder(View v) {
+        super(v);
     }
-
-    Result search(String query, int page);
+    public abstract InfoItem.InfoType infoType();
 }

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

@@ -0,0 +1,170 @@
+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.ArrayList;
+import java.util.List;
+
+/**
+ * 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) {
+        infoItemBuilder = new InfoItemBuilder(a);
+        infoItemList = new ArrayList<>();
+    }
+
+    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 clearStreamItemList() {
+        if(infoItemList.isEmpty()) {
+            return;
+        }
+        infoItemList.clear();
+        notifyDataSetChanged();
+    }
+
+    public void setHeader(View header) {
+        this.header = header;
+        notifyDataSetChanged();
+    }
+
+    public void setFooter(View view) {
+        this.footer = view;
+        notifyDataSetChanged();
+    }
+
+    public List<InfoItem> getItemsList() {
+        return infoItemList;
+    }
+
+    @Override
+    public int getItemCount() {
+        int count = infoItemList.size();
+        if(header != null) count++;
+        if(footer != null && showFooter) count++;
+        return count;
+    }
+
+    // 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 damn 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,53 @@
+package org.schabi.newpipe.info_list;
+
+import android.view.View;
+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.
+ * <p>
+ * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
+ * StreamInfoItemHolder.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 StreamInfoItemHolder extends InfoItemHolder {
+
+    public final ImageView itemThumbnailView;
+    public final TextView itemVideoTitleView,
+            itemUploaderView,
+            itemDurationView,
+            itemAdditionalDetails;
+    public final View itemRoot;
+
+    public StreamInfoItemHolder(View v) {
+        super(v);
+        itemRoot = v.findViewById(R.id.itemRoot);
+        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);
+        itemAdditionalDetails = (TextView) v.findViewById(R.id.itemAdditionalDetails);
+    }
+
+    @Override
+    public InfoItem.InfoType infoType() {
+        return InfoItem.InfoType.STREAM;
+    }
+}

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

@@ -0,0 +1,454 @@
+package org.schabi.newpipe.player;
+
+import android.app.Notification;
+import android.app.NotificationManager;
+import android.app.PendingIntent;
+import android.app.Service;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.graphics.Bitmap;
+import android.net.wifi.WifiManager;
+import android.os.Build;
+import android.os.IBinder;
+import android.os.PowerManager;
+import android.support.annotation.IntRange;
+import android.support.v4.app.NotificationCompat;
+import android.util.Log;
+import android.widget.RemoteViews;
+
+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.StreamingService;
+import org.schabi.newpipe.extractor.stream_info.AudioStream;
+import org.schabi.newpipe.util.Constants;
+import org.schabi.newpipe.util.ThemeHelper;
+
+import java.io.Serializable;
+
+
+/**
+ * Base players joining the common properties
+ *
+ * @author mauriciocolli
+ */
+public class BackgroundPlayer extends Service {
+    private static final String TAG = "BackgroundPlayer";
+    private static final boolean DEBUG = BasePlayer.DEBUG;
+
+    public static final String ACTION_CLOSE = "org.schabi.newpipe.player.BackgroundPlayer.CLOSE";
+    public static final String ACTION_PLAY_PAUSE = "org.schabi.newpipe.player.BackgroundPlayer.PLAY_PAUSE";
+    public static final String ACTION_OPEN_DETAIL = "org.schabi.newpipe.player.BackgroundPlayer.OPEN_DETAIL";
+    public static final String ACTION_REPEAT = "org.schabi.newpipe.player.BackgroundPlayer.REPEAT";
+    public static final String ACTION_FAST_REWIND = "org.schabi.newpipe.player.BackgroundPlayer.ACTION_FAST_REWIND";
+    public static final String ACTION_FAST_FORWARD = "org.schabi.newpipe.player.BackgroundPlayer.ACTION_FAST_FORWARD";
+
+    public static final String AUDIO_STREAM = "video_only_audio_stream";
+    private AudioStream audioStream;
+
+    private BasePlayerImpl basePlayerImpl;
+    private PowerManager powerManager;
+    private WifiManager wifiManager;
+
+    private PowerManager.WakeLock wakeLock;
+    private WifiManager.WifiLock wifiLock;
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Notification
+    //////////////////////////////////////////////////////////////////////////*/
+    private static final int NOTIFICATION_ID = 123789;
+
+    private NotificationManager notificationManager;
+    private NotificationCompat.Builder notBuilder;
+    private RemoteViews notRemoteView;
+    private RemoteViews bigNotRemoteView;
+    private final String setAlphaMethodName = (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) ? "setImageAlpha" : "setAlpha";
+
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Service's LifeCycle
+    //////////////////////////////////////////////////////////////////////////*/
+
+    @Override
+    public void onCreate() {
+        if (DEBUG) Log.d(TAG, "onCreate() called");
+        notificationManager = ((NotificationManager) getSystemService(NOTIFICATION_SERVICE));
+        powerManager = ((PowerManager) getSystemService(POWER_SERVICE));
+        wifiManager = ((WifiManager) getApplicationContext().getSystemService(WIFI_SERVICE));
+
+        ThemeHelper.setTheme(this);
+        basePlayerImpl = new BasePlayerImpl(this);
+        basePlayerImpl.setup();
+    }
+
+    @Override
+    public int onStartCommand(Intent intent, int flags, int startId) {
+        if (DEBUG) Log.d(TAG, "onStartCommand() called with: intent = [" + intent + "], flags = [" + flags + "], startId = [" + startId + "]");
+        basePlayerImpl.handleIntent(intent);
+        return START_NOT_STICKY;
+    }
+
+    @Override
+    public void onDestroy() {
+        if (DEBUG) Log.d(TAG, "destroy() called");
+        releaseWifiAndCpu();
+        stopForeground(true);
+        if (basePlayerImpl != null) basePlayerImpl.destroy();
+    }
+
+    @Override
+    public IBinder onBind(Intent intent) {
+        return null;
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Actions
+    //////////////////////////////////////////////////////////////////////////*/
+
+    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));
+    }
+
+    private void onClose() {
+        if (basePlayerImpl != null) basePlayerImpl.destroyPlayer();
+        stopForeground(true);
+        releaseWifiAndCpu();
+        stopSelf();
+    }
+
+    private void onScreenOnOff(boolean on) {
+        if (DEBUG) Log.d(TAG, "onScreenOnOff() called with: on = [" + on + "]");
+        if (on) {
+            if (basePlayerImpl.isPlaying() && !basePlayerImpl.isProgressLoopRunning.get()) basePlayerImpl.startProgressLoop();
+        } else basePlayerImpl.stopProgressLoop();
+
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Notification
+    //////////////////////////////////////////////////////////////////////////*/
+
+    private NotificationCompat.Builder createNotification() {
+        notRemoteView = new RemoteViews(BuildConfig.APPLICATION_ID, R.layout.player_notification);
+        bigNotRemoteView = new RemoteViews(BuildConfig.APPLICATION_ID, R.layout.player_notification_expanded);
+
+        setupNotification(notRemoteView);
+        setupNotification(bigNotRemoteView);
+
+        NotificationCompat.Builder builder = new NotificationCompat.Builder(this)
+                .setOngoing(true)
+                .setSmallIcon(R.drawable.ic_play_circle_filled_white_24dp)
+                .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
+                .setCustomContentView(notRemoteView)
+                .setCustomBigContentView(bigNotRemoteView);
+        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.JELLY_BEAN) builder.setPriority(Notification.PRIORITY_MAX);
+        return builder;
+    }
+
+    private void setupNotification(RemoteViews remoteViews) {
+        //if (videoThumbnail != null) remoteViews.setImageViewBitmap(R.id.notificationCover, videoThumbnail);
+        ///else remoteViews.setImageViewResource(R.id.notificationCover, R.drawable.dummy_thumbnail);
+        remoteViews.setTextViewText(R.id.notificationSongName, basePlayerImpl.getVideoTitle());
+        remoteViews.setTextViewText(R.id.notificationArtist, basePlayerImpl.getChannelName());
+
+        remoteViews.setOnClickPendingIntent(R.id.notificationPlayPause,
+                PendingIntent.getBroadcast(this, NOTIFICATION_ID, new Intent(ACTION_PLAY_PAUSE), PendingIntent.FLAG_UPDATE_CURRENT));
+        remoteViews.setOnClickPendingIntent(R.id.notificationStop,
+                PendingIntent.getBroadcast(this, NOTIFICATION_ID, new Intent(ACTION_CLOSE), PendingIntent.FLAG_UPDATE_CURRENT));
+        remoteViews.setOnClickPendingIntent(R.id.notificationContent,
+                PendingIntent.getBroadcast(this, NOTIFICATION_ID, new Intent(ACTION_OPEN_DETAIL), PendingIntent.FLAG_UPDATE_CURRENT));
+        remoteViews.setOnClickPendingIntent(R.id.notificationRepeat,
+                PendingIntent.getBroadcast(this, NOTIFICATION_ID, new Intent(ACTION_REPEAT), PendingIntent.FLAG_UPDATE_CURRENT));
+
+        remoteViews.setOnClickPendingIntent(R.id.notificationFRewind,
+                PendingIntent.getBroadcast(this, NOTIFICATION_ID, new Intent(ACTION_FAST_REWIND), PendingIntent.FLAG_UPDATE_CURRENT));
+        remoteViews.setOnClickPendingIntent(R.id.notificationFForward,
+                PendingIntent.getBroadcast(this, NOTIFICATION_ID, new Intent(ACTION_FAST_FORWARD), PendingIntent.FLAG_UPDATE_CURRENT));
+
+        switch (basePlayerImpl.getCurrentRepeatMode()) {
+            case REPEAT_DISABLED:
+                remoteViews.setInt(R.id.notificationRepeat, setAlphaMethodName, 77);
+                break;
+            case REPEAT_ONE:
+                remoteViews.setInt(R.id.notificationRepeat, setAlphaMethodName, 255);
+                break;
+            case REPEAT_ALL:
+                // Waiting :)
+                break;
+        }
+    }
+
+    /**
+     * 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) return;
+        if (drawableId != -1) {
+            if (notRemoteView != null) notRemoteView.setImageViewResource(R.id.notificationPlayPause, drawableId);
+            if (bigNotRemoteView != null) bigNotRemoteView.setImageViewResource(R.id.notificationPlayPause, drawableId);
+        }
+        notificationManager.notify(NOTIFICATION_ID, notBuilder.build());
+    }
+
+    private void setControlsOpacity(@IntRange(from = 0, to = 255) int opacity) {
+        if (notRemoteView != null) notRemoteView.setInt(R.id.notificationPlayPause, setAlphaMethodName, opacity);
+        if (bigNotRemoteView != null) bigNotRemoteView.setInt(R.id.notificationPlayPause, setAlphaMethodName, opacity);
+        if (notRemoteView != null) notRemoteView.setInt(R.id.notificationFForward, setAlphaMethodName, opacity);
+        if (bigNotRemoteView != null) bigNotRemoteView.setInt(R.id.notificationFForward, setAlphaMethodName, opacity);
+        if (notRemoteView != null) notRemoteView.setInt(R.id.notificationFRewind, setAlphaMethodName, opacity);
+        if (bigNotRemoteView != null) bigNotRemoteView.setInt(R.id.notificationFRewind, setAlphaMethodName, opacity);
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Utils
+    //////////////////////////////////////////////////////////////////////////*/
+
+    private void lockWifiAndCpu() {
+        if (DEBUG) Log.d(TAG, "lockWifiAndCpu() called");
+        if (wakeLock != null && wakeLock.isHeld() && wifiLock != null && wifiLock.isHeld()) return;
+
+        wakeLock = powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, TAG);
+        wifiLock = wifiManager.createWifiLock(WifiManager.WIFI_MODE_FULL, TAG);
+
+        if (wakeLock != null) wakeLock.acquire();
+        if (wifiLock != null) wifiLock.acquire();
+    }
+
+    private void releaseWifiAndCpu() {
+        if (DEBUG) Log.d(TAG, "releaseWifiAndCpu() called");
+        if (wakeLock != null && wakeLock.isHeld()) wakeLock.release();
+        if (wifiLock != null && wifiLock.isHeld()) wifiLock.release();
+
+        wakeLock = null;
+        wifiLock = null;
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+
+    private class BasePlayerImpl extends BasePlayer {
+
+        BasePlayerImpl(Context context) {
+            super(context);
+        }
+
+        @Override
+        public void handleIntent(Intent intent) {
+            super.handleIntent(intent);
+            Serializable serializable = intent.getSerializableExtra(BackgroundPlayer.AUDIO_STREAM);
+            if (serializable instanceof AudioStream) audioStream = (AudioStream) serializable;
+            playUrl(audioStream.url, MediaFormat.getSuffixById(audioStream.format), true);
+
+            if (bigNotRemoteView != null) bigNotRemoteView.setProgressBar(R.id.notificationProgressBar, 100, 0, false);
+            if (notRemoteView != null) notRemoteView.setProgressBar(R.id.notificationProgressBar, 100, 0, false);
+        }
+
+        @Override
+        public void initThumbnail() {
+            if (notRemoteView != null) notRemoteView.setImageViewResource(R.id.notificationCover, R.drawable.dummy_thumbnail);
+            if (bigNotRemoteView != null) bigNotRemoteView.setImageViewResource(R.id.notificationCover, R.drawable.dummy_thumbnail);
+            updateNotification(-1);
+            super.initThumbnail();
+        }
+
+        @Override
+        public void onThumbnailReceived(Bitmap thumbnail) {
+            super.onThumbnailReceived(thumbnail);
+            if (thumbnail != null) {
+                if (notRemoteView != null) notRemoteView.setImageViewBitmap(R.id.notificationCover, thumbnail);
+                if (bigNotRemoteView != null) bigNotRemoteView.setImageViewBitmap(R.id.notificationCover, thumbnail);
+                updateNotification(-1);
+            }
+        }
+
+        @Override
+        public void playUrl(String url, String format, boolean autoPlay) {
+            super.playUrl(url, format, autoPlay);
+
+            notBuilder = createNotification();
+            startForeground(NOTIFICATION_ID, notBuilder.build());
+        }
+
+        @Override
+        public void onPrepared(boolean playWhenReady) {
+            super.onPrepared(playWhenReady);
+            if (simpleExoPlayer.getDuration() < 15000) {
+                FAST_FORWARD_REWIND_AMOUNT = 2000;
+            } else if (simpleExoPlayer.getDuration() > 60 * 60 * 1000) {
+                FAST_FORWARD_REWIND_AMOUNT = 60000;
+            } else {
+                FAST_FORWARD_REWIND_AMOUNT = 10000;
+            }
+            PROGRESS_LOOP_INTERVAL = 1000;
+            basePlayerImpl.getPlayer().setVolume(1f);
+        }
+
+        @Override
+        public void onRepeatClicked() {
+            super.onRepeatClicked();
+
+            int opacity = 255;
+            switch (currentRepeatMode) {
+                case REPEAT_DISABLED:
+                    opacity = 77;
+                    break;
+                case REPEAT_ONE:
+                    opacity = 255;
+                    break;
+                case REPEAT_ALL:
+                    // Waiting :)
+                    break;
+            }
+            if (notRemoteView != null) notRemoteView.setInt(R.id.notificationRepeat, setAlphaMethodName, opacity);
+            if (bigNotRemoteView != null) bigNotRemoteView.setInt(R.id.notificationRepeat, setAlphaMethodName, opacity);
+            updateNotification(-1);
+        }
+
+        @Override
+        public void onUpdateProgress(int currentProgress, int duration, int bufferPercent) {
+            if (bigNotRemoteView != null) bigNotRemoteView.setProgressBar(R.id.notificationProgressBar, duration, currentProgress, false);
+            if (notRemoteView != null) notRemoteView.setProgressBar(R.id.notificationProgressBar, duration, currentProgress, false);
+            if (bigNotRemoteView != null) bigNotRemoteView.setTextViewText(R.id.notificationTime, getTimeString(currentProgress) + " / " + getTimeString(duration));
+            updateNotification(-1);
+        }
+
+        @Override
+        public void onFastRewind() {
+            super.onFastRewind();
+            triggerProgressUpdate();
+        }
+
+        @Override
+        public void onFastForward() {
+            super.onFastForward();
+            triggerProgressUpdate();
+        }
+
+        @Override
+        public void onLoadingChanged(boolean isLoading) {
+            // Disable default behavior
+        }
+
+        @Override
+        public void destroy() {
+            super.destroy();
+            if (notRemoteView != null) notRemoteView.setImageViewBitmap(R.id.notificationCover, null);
+            if (bigNotRemoteView != null) bigNotRemoteView.setImageViewBitmap(R.id.notificationCover, null);
+        }
+
+        @Override
+        public void onError(Exception exception) {
+            exception.printStackTrace();
+            stopSelf();
+        }
+
+        /*//////////////////////////////////////////////////////////////////////////
+        // Broadcast Receiver
+        //////////////////////////////////////////////////////////////////////////*/
+
+        @Override
+        protected void setupBroadcastReceiver(IntentFilter intentFilter) {
+            super.setupBroadcastReceiver(intentFilter);
+            intentFilter.addAction(ACTION_CLOSE);
+            intentFilter.addAction(ACTION_PLAY_PAUSE);
+            intentFilter.addAction(ACTION_OPEN_DETAIL);
+            intentFilter.addAction(ACTION_REPEAT);
+            intentFilter.addAction(ACTION_FAST_FORWARD);
+            intentFilter.addAction(ACTION_FAST_REWIND);
+
+            intentFilter.addAction(Intent.ACTION_SCREEN_ON);
+            intentFilter.addAction(Intent.ACTION_SCREEN_OFF);
+
+            intentFilter.addAction(Intent.ACTION_HEADSET_PLUG);
+        }
+
+        @Override
+        public void onBroadcastReceived(Intent intent) {
+            super.onBroadcastReceived(intent);
+            if (DEBUG) Log.d(TAG, "onBroadcastReceived() called with: intent = [" + intent + "]");
+            switch (intent.getAction()) {
+                case ACTION_CLOSE:
+                    onClose();
+                    break;
+                case ACTION_PLAY_PAUSE:
+                    onVideoPlayPause();
+                    break;
+                case ACTION_OPEN_DETAIL:
+                    onOpenDetail(BackgroundPlayer.this, basePlayerImpl.getVideoUrl(), basePlayerImpl.getVideoTitle());
+                    break;
+                case ACTION_REPEAT:
+                    onRepeatClicked();
+                    break;
+                case ACTION_FAST_REWIND:
+                    onFastRewind();
+                    break;
+                case ACTION_FAST_FORWARD:
+                    onFastForward();
+                    break;
+                case Intent.ACTION_SCREEN_ON:
+                    onScreenOnOff(true);
+                    break;
+                case Intent.ACTION_SCREEN_OFF:
+                    onScreenOnOff(false);
+                    break;
+            }
+        }
+
+        /*//////////////////////////////////////////////////////////////////////////
+        // States
+        //////////////////////////////////////////////////////////////////////////*/
+
+        @Override
+        public void onLoading() {
+            super.onLoading();
+
+            setControlsOpacity(77);
+            updateNotification(-1);
+        }
+
+        @Override
+        public void onPlaying() {
+            super.onPlaying();
+
+            setControlsOpacity(255);
+            updateNotification(R.drawable.ic_pause_white);
+
+            lockWifiAndCpu();
+        }
+
+        @Override
+        public void onPaused() {
+            super.onPaused();
+
+            updateNotification(R.drawable.ic_play_arrow_white);
+            if (isProgressLoopRunning.get()) stopProgressLoop();
+
+            releaseWifiAndCpu();
+        }
+
+        @Override
+        public void onCompleted() {
+            super.onCompleted();
+
+            setControlsOpacity(255);
+            if (bigNotRemoteView != null) bigNotRemoteView.setProgressBar(R.id.notificationProgressBar, 100, 100, false);
+            if (notRemoteView != null) notRemoteView.setProgressBar(R.id.notificationProgressBar, 100, 100, false);
+            updateNotification(R.drawable.ic_replay_white);
+
+            releaseWifiAndCpu();
+        }
+    }
+}

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

@@ -0,0 +1,739 @@
+package org.schabi.newpipe.player;
+
+import android.animation.Animator;
+import android.animation.AnimatorListenerAdapter;
+import android.animation.ValueAnimator;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.SharedPreferences;
+import android.graphics.Bitmap;
+import android.media.AudioManager;
+import android.net.Uri;
+import android.os.Handler;
+import android.preference.PreferenceManager;
+import android.text.TextUtils;
+import android.util.Log;
+import android.view.View;
+
+import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.DefaultLoadControl;
+import com.google.android.exoplayer2.ExoPlaybackException;
+import com.google.android.exoplayer2.ExoPlayer;
+import com.google.android.exoplayer2.ExoPlayerFactory;
+import com.google.android.exoplayer2.PlaybackParameters;
+import com.google.android.exoplayer2.SimpleExoPlayer;
+import com.google.android.exoplayer2.Timeline;
+import com.google.android.exoplayer2.extractor.DefaultExtractorsFactory;
+import com.google.android.exoplayer2.source.ExtractorMediaSource;
+import com.google.android.exoplayer2.source.MediaSource;
+import com.google.android.exoplayer2.source.TrackGroupArray;
+import com.google.android.exoplayer2.source.dash.DashMediaSource;
+import com.google.android.exoplayer2.source.dash.DefaultDashChunkSource;
+import com.google.android.exoplayer2.source.hls.HlsMediaSource;
+import com.google.android.exoplayer2.source.smoothstreaming.DefaultSsChunkSource;
+import com.google.android.exoplayer2.source.smoothstreaming.SsMediaSource;
+import com.google.android.exoplayer2.trackselection.AdaptiveTrackSelection;
+import com.google.android.exoplayer2.trackselection.DefaultTrackSelector;
+import com.google.android.exoplayer2.trackselection.TrackSelectionArray;
+import com.google.android.exoplayer2.upstream.DefaultBandwidthMeter;
+import com.google.android.exoplayer2.upstream.DefaultDataSourceFactory;
+import com.google.android.exoplayer2.upstream.cache.CacheDataSource;
+import com.google.android.exoplayer2.upstream.cache.CacheDataSourceFactory;
+import com.google.android.exoplayer2.upstream.cache.LeastRecentlyUsedCacheEvictor;
+import com.google.android.exoplayer2.upstream.cache.SimpleCache;
+import com.google.android.exoplayer2.util.Util;
+import com.nostra13.universalimageloader.core.ImageLoader;
+import com.nostra13.universalimageloader.core.listener.SimpleImageLoadingListener;
+
+import java.io.File;
+import java.text.DecimalFormat;
+import java.text.NumberFormat;
+import java.util.Formatter;
+import java.util.Locale;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+/**
+ * Base for the players, joining the common properties
+ *
+ * @author mauriciocolli
+ */
+@SuppressWarnings({"WeakerAccess", "unused"})
+public abstract class BasePlayer implements ExoPlayer.EventListener, AudioManager.OnAudioFocusChangeListener {
+    public static final boolean DEBUG = false;
+    public static final String TAG = "BasePlayer";
+
+    protected Context context;
+    protected SharedPreferences sharedPreferences;
+    protected AudioManager audioManager;
+
+    protected BroadcastReceiver broadcastReceiver;
+    protected IntentFilter intentFilter;
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Intent
+    //////////////////////////////////////////////////////////////////////////*/
+
+    public static final String VIDEO_URL = "video_url";
+    public static final String VIDEO_TITLE = "video_title";
+    public static final String VIDEO_THUMBNAIL_URL = "video_thumbnail_url";
+    public static final String START_POSITION = "start_position";
+    public static final String CHANNEL_NAME = "channel_name";
+    public static final String PLAYBACK_SPEED = "playback_speed";
+
+    protected Bitmap videoThumbnail = null;
+    protected String videoUrl = "";
+    protected String videoTitle = "";
+    protected String videoThumbnailUrl = "";
+    protected int videoStartPos = -1;
+    protected String channelName = "";
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Player
+    //////////////////////////////////////////////////////////////////////////*/
+
+    public int FAST_FORWARD_REWIND_AMOUNT = 10000; // 10 Seconds
+    public static final String CACHE_FOLDER_NAME = "exoplayer";
+
+    protected SimpleExoPlayer simpleExoPlayer;
+    protected boolean isPrepared = false;
+
+    protected MediaSource mediaSource;
+    protected CacheDataSourceFactory cacheDataSourceFactory;
+    protected final DefaultExtractorsFactory extractorsFactory = new DefaultExtractorsFactory();
+    protected final DefaultBandwidthMeter bandwidthMeter = new DefaultBandwidthMeter();
+
+    protected int PROGRESS_LOOP_INTERVAL = 100;
+    protected AtomicBoolean isProgressLoopRunning = new AtomicBoolean();
+    protected Handler progressLoop;
+    protected Runnable progressUpdate;
+
+    //////////////////////////////////////////////////////////////////////////*/
+
+    public BasePlayer(Context context) {
+        this.context = context;
+        this.progressLoop = new Handler();
+        this.sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context);
+        this.audioManager = ((AudioManager) context.getSystemService(Context.AUDIO_SERVICE));
+
+        this.broadcastReceiver = new BroadcastReceiver() {
+            @Override
+            public void onReceive(Context context, Intent intent) {
+                onBroadcastReceived(intent);
+            }
+        };
+        this.intentFilter = new IntentFilter();
+        setupBroadcastReceiver(intentFilter);
+        context.registerReceiver(broadcastReceiver, intentFilter);
+    }
+
+    public void setup() {
+        if (simpleExoPlayer == null) initPlayer();
+        initListeners();
+    }
+
+    private void initExoPlayerCache() {
+        if (cacheDataSourceFactory == null) {
+            DefaultDataSourceFactory dataSourceFactory = new DefaultDataSourceFactory(context, Util.getUserAgent(context, context.getPackageName()), bandwidthMeter);
+            File cacheDir = new File(context.getExternalCacheDir(), CACHE_FOLDER_NAME);
+            if (!cacheDir.exists()) {
+                //noinspection ResultOfMethodCallIgnored
+                cacheDir.mkdir();
+            }
+
+            if (DEBUG) Log.d(TAG, "initExoPlayerCache: cacheDir = " + cacheDir.getAbsolutePath());
+            SimpleCache simpleCache = new SimpleCache(cacheDir, new LeastRecentlyUsedCacheEvictor(64 * 1024 * 1024L));
+            cacheDataSourceFactory = new CacheDataSourceFactory(simpleCache, dataSourceFactory, CacheDataSource.FLAG_BLOCK_ON_CACHE, 512 * 1024);
+        }
+    }
+
+    public void initPlayer() {
+        if (DEBUG) Log.d(TAG, "initPlayer() called with: context = [" + context + "]");
+        initExoPlayerCache();
+
+        AdaptiveTrackSelection.Factory trackSelectionFactory = new AdaptiveTrackSelection.Factory(bandwidthMeter);
+        DefaultTrackSelector defaultTrackSelector = new DefaultTrackSelector(trackSelectionFactory);
+        DefaultLoadControl loadControl = new DefaultLoadControl();
+
+        simpleExoPlayer = ExoPlayerFactory.newSimpleInstance(context, defaultTrackSelector, loadControl);
+        simpleExoPlayer.addListener(this);
+    }
+
+    public void initListeners() {
+        progressUpdate = new Runnable() {
+            @Override
+            public void run() {
+                //if(DEBUG) Log.d(TAG, "progressUpdate run() called");
+                onUpdateProgress((int) simpleExoPlayer.getCurrentPosition(), (int) simpleExoPlayer.getDuration(), simpleExoPlayer.getBufferedPercentage());
+                if (isProgressLoopRunning.get()) progressLoop.postDelayed(this, PROGRESS_LOOP_INTERVAL);
+            }
+        };
+    }
+
+    public void handleIntent(Intent intent) {
+        if (DEBUG) Log.d(TAG, "handleIntent() called with: intent = [" + intent + "]");
+        if (intent == null) return;
+
+        videoUrl = intent.getStringExtra(VIDEO_URL);
+        videoTitle = intent.getStringExtra(VIDEO_TITLE);
+        videoThumbnailUrl = intent.getStringExtra(VIDEO_THUMBNAIL_URL);
+        videoStartPos = intent.getIntExtra(START_POSITION, -1);
+        channelName = intent.getStringExtra(CHANNEL_NAME);
+        setPlaybackSpeed(intent.getFloatExtra(PLAYBACK_SPEED, getPlaybackSpeed()));
+
+        initThumbnail();
+        //play(getSelectedVideoStream(), true);
+    }
+
+    public void initThumbnail() {
+        if (DEBUG) Log.d(TAG, "initThumbnail() called");
+        videoThumbnail = null;
+        if (videoThumbnailUrl == null || videoThumbnailUrl.isEmpty()) return;
+        ImageLoader.getInstance().resume();
+        ImageLoader.getInstance().loadImage(videoThumbnailUrl, new SimpleImageLoadingListener() {
+            @Override
+            public void onLoadingComplete(String imageUri, View view, Bitmap loadedImage) {
+                if (simpleExoPlayer == null) return;
+                if (DEBUG) Log.d(TAG, "onLoadingComplete() called with: imageUri = [" + imageUri + "], view = [" + view + "], loadedImage = [" + loadedImage + "]");
+                videoThumbnail = loadedImage;
+                onThumbnailReceived(loadedImage);
+            }
+        });
+    }
+
+    public void playUrl(String url, String format, boolean autoPlay) {
+        if (DEBUG) {
+            Log.d(TAG, "play() called with: url = [" + url + "], autoPlay = [" + autoPlay + "]");
+        }
+
+        if (url == null || simpleExoPlayer == null) {
+            RuntimeException runtimeException = new RuntimeException((url == null ? "Url " : "Player ") + " null");
+            onError(runtimeException);
+            throw runtimeException;
+        }
+
+        changeState(STATE_LOADING);
+
+        isPrepared = false;
+        mediaSource = buildMediaSource(url, format);
+
+        if (simpleExoPlayer.getPlaybackState() != ExoPlayer.STATE_IDLE) simpleExoPlayer.stop();
+        if (videoStartPos > 0) simpleExoPlayer.seekTo(videoStartPos);
+        simpleExoPlayer.prepare(mediaSource);
+        simpleExoPlayer.setPlayWhenReady(autoPlay);
+    }
+
+    public void destroyPlayer() {
+        if (DEBUG) Log.d(TAG, "destroyPlayer() called");
+        if (simpleExoPlayer != null) {
+            simpleExoPlayer.stop();
+            simpleExoPlayer.release();
+        }
+        if (progressLoop != null && isProgressLoopRunning.get()) stopProgressLoop();
+    }
+
+    public void destroy() {
+        if (DEBUG) Log.d(TAG, "destroy() called");
+        destroyPlayer();
+        unregisterBroadcastReceiver();
+        videoThumbnail = null;
+        simpleExoPlayer = null;
+    }
+
+    public MediaSource buildMediaSource(String url, String overrideExtension) {
+        if (DEBUG) {
+            Log.d(TAG, "buildMediaSource() called with: url = [" + url + "], overrideExtension = [" + overrideExtension + "]");
+        }
+        Uri uri = Uri.parse(url);
+        int type = TextUtils.isEmpty(overrideExtension) ? Util.inferContentType(uri) : Util.inferContentType("." + overrideExtension);
+        MediaSource mediaSource;
+        switch (type) {
+            case C.TYPE_SS:
+                mediaSource = new SsMediaSource(uri, cacheDataSourceFactory, new DefaultSsChunkSource.Factory(cacheDataSourceFactory), null, null);
+                break;
+            case C.TYPE_DASH:
+                mediaSource = new DashMediaSource(uri, cacheDataSourceFactory, new DefaultDashChunkSource.Factory(cacheDataSourceFactory), null, null);
+                break;
+            case C.TYPE_HLS:
+                mediaSource = new HlsMediaSource(uri, cacheDataSourceFactory, null, null);
+                break;
+            case C.TYPE_OTHER:
+                mediaSource = new ExtractorMediaSource(uri, cacheDataSourceFactory, extractorsFactory, null, null);
+                break;
+            default: {
+                throw new IllegalStateException("Unsupported type: " + type);
+            }
+        }
+        return mediaSource;
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Broadcast Receiver
+    //////////////////////////////////////////////////////////////////////////*/
+
+    /**
+     * Add your action in the intentFilter
+     *
+     * @param intentFilter intent filter that will be used for register the receiver
+     */
+    protected void setupBroadcastReceiver(IntentFilter intentFilter) {
+        intentFilter.addAction(AudioManager.ACTION_AUDIO_BECOMING_NOISY);
+    }
+
+    public void onBroadcastReceived(Intent intent) {
+        switch (intent.getAction()) {
+            case AudioManager.ACTION_AUDIO_BECOMING_NOISY:
+                if (isPlaying()) simpleExoPlayer.setPlayWhenReady(false);
+                break;
+        }
+    }
+
+    public void unregisterBroadcastReceiver() {
+        if (broadcastReceiver != null && context != null) {
+            context.unregisterReceiver(broadcastReceiver);
+            broadcastReceiver = null;
+        }
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // AudioFocus
+    //////////////////////////////////////////////////////////////////////////*/
+
+    private static final int DUCK_DURATION = 1500;
+    private static final float DUCK_AUDIO_TO = .2f;
+
+    @Override
+    public void onAudioFocusChange(int focusChange) {
+        if (DEBUG) Log.d(TAG, "onAudioFocusChange() called with: focusChange = [" + focusChange + "]");
+        if (simpleExoPlayer == null) return;
+        switch (focusChange) {
+            case AudioManager.AUDIOFOCUS_GAIN:
+                onAudioFocusGain();
+                break;
+            case AudioManager.AUDIOFOCUS_LOSS_TRANSIENT_CAN_DUCK:
+                onAudioFocusLossCanDuck();
+                break;
+            case AudioManager.AUDIOFOCUS_LOSS:
+            case AudioManager.AUDIOFOCUS_LOSS_TRANSIENT:
+                onAudioFocusLoss();
+                break;
+        }
+    }
+
+    protected void onAudioFocusGain() {
+        if (DEBUG) Log.d(TAG, "onAudioFocusGain() called");
+        if (simpleExoPlayer != null) simpleExoPlayer.setVolume(DUCK_AUDIO_TO);
+        animateAudio(DUCK_AUDIO_TO, 1f, DUCK_DURATION);
+    }
+
+    protected void onAudioFocusLoss() {
+        if (DEBUG) Log.d(TAG, "onAudioFocusLoss() called");
+        simpleExoPlayer.setPlayWhenReady(false);
+    }
+
+    protected void onAudioFocusLossCanDuck() {
+        if (DEBUG) Log.d(TAG, "onAudioFocusLossCanDuck() called");
+        // Set the volume to 1/10 on ducking
+        animateAudio(simpleExoPlayer.getVolume(), DUCK_AUDIO_TO, DUCK_DURATION);
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // States Implementation
+    //////////////////////////////////////////////////////////////////////////*/
+
+    public static final int STATE_LOADING = 123;
+    public static final int STATE_PLAYING = 124;
+    public static final int STATE_BUFFERING = 125;
+    public static final int STATE_PAUSED = 126;
+    public static final int STATE_PAUSED_SEEK = 127;
+    public static final int STATE_COMPLETED = 128;
+
+
+    protected int currentState = -1;
+
+    public void changeState(int state) {
+        if (DEBUG) Log.d(TAG, "changeState() called with: state = [" + state + "]");
+        currentState = state;
+        switch (state) {
+            case STATE_LOADING:
+                onLoading();
+                break;
+            case STATE_PLAYING:
+                onPlaying();
+                break;
+            case STATE_BUFFERING:
+                onBuffering();
+                break;
+            case STATE_PAUSED:
+                onPaused();
+                break;
+            case STATE_PAUSED_SEEK:
+                onPausedSeek();
+                break;
+            case STATE_COMPLETED:
+                onCompleted();
+                break;
+        }
+    }
+
+    public void onLoading() {
+        if (DEBUG) Log.d(TAG, "onLoading() called");
+        if (!isProgressLoopRunning.get()) startProgressLoop();
+    }
+
+    public void onPlaying() {
+        if (DEBUG) Log.d(TAG, "onPlaying() called");
+        if (!isProgressLoopRunning.get()) startProgressLoop();
+    }
+
+    public void onBuffering() {
+    }
+
+    public void onPaused() {
+        if (isProgressLoopRunning.get()) stopProgressLoop();
+    }
+
+    public void onPausedSeek() {
+    }
+
+    public void onCompleted() {
+        if (DEBUG) Log.d(TAG, "onCompleted() called");
+        if (isProgressLoopRunning.get()) stopProgressLoop();
+
+        if (currentRepeatMode == RepeatMode.REPEAT_ONE) {
+            changeState(STATE_LOADING);
+            simpleExoPlayer.seekTo(0);
+        }
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Repeat
+    //////////////////////////////////////////////////////////////////////////*/
+
+    protected RepeatMode currentRepeatMode = RepeatMode.REPEAT_DISABLED;
+
+    public enum RepeatMode {
+        REPEAT_DISABLED,
+        REPEAT_ONE,
+        REPEAT_ALL
+    }
+
+    public void onRepeatClicked() {
+        if (DEBUG) Log.d(TAG, "onRepeatClicked() called");
+        // TODO: implement repeat all when playlist is implemented
+
+        // Switch the modes between DISABLED and REPEAT_ONE, till playlist is implemented
+        setCurrentRepeatMode(getCurrentRepeatMode() == RepeatMode.REPEAT_DISABLED ?
+                RepeatMode.REPEAT_ONE :
+                RepeatMode.REPEAT_DISABLED);
+
+        if (DEBUG) Log.d(TAG, "onRepeatClicked() currentRepeatMode = " + getCurrentRepeatMode().name());
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // ExoPlayer Listener
+    //////////////////////////////////////////////////////////////////////////*/
+
+    @Override
+    public void onTimelineChanged(Timeline timeline, Object manifest) {
+    }
+
+    @Override
+    public void onTracksChanged(TrackGroupArray trackGroups, TrackSelectionArray trackSelections) {
+    }
+
+    @Override
+    public void onPlaybackParametersChanged(PlaybackParameters playbackParameters) {
+    }
+
+    @Override
+    public void onLoadingChanged(boolean isLoading) {
+        if (DEBUG) Log.d(TAG, "onLoadingChanged() called with: isLoading = [" + isLoading + "]");
+
+        if (!isLoading && getCurrentState() == STATE_PAUSED && isProgressLoopRunning.get()) stopProgressLoop();
+        else if (isLoading && !isProgressLoopRunning.get()) startProgressLoop();
+    }
+
+    @Override
+    public void onPlayerStateChanged(boolean playWhenReady, int playbackState) {
+        if (DEBUG) Log.d(TAG, "onPlayerStateChanged() called with: playWhenReady = [" + playWhenReady + "], playbackState = [" + playbackState + "]");
+        if (getCurrentState() == STATE_PAUSED_SEEK) {
+            if (DEBUG) Log.d(TAG, "onPlayerStateChanged() currently on PausedSeek");
+            return;
+        }
+
+        switch (playbackState) {
+            case ExoPlayer.STATE_IDLE: // 1
+                isPrepared = false;
+                break;
+            case ExoPlayer.STATE_BUFFERING: // 2
+                if (isPrepared && getCurrentState() != STATE_LOADING) changeState(STATE_BUFFERING);
+                break;
+            case ExoPlayer.STATE_READY: //3
+                if (!isPrepared) {
+                    isPrepared = true;
+                    onPrepared(playWhenReady);
+                    break;
+                }
+                if (currentState == STATE_PAUSED_SEEK) break;
+                changeState(playWhenReady ? STATE_PLAYING : STATE_PAUSED);
+                break;
+            case ExoPlayer.STATE_ENDED: // 4
+                changeState(STATE_COMPLETED);
+                isPrepared = false;
+                break;
+        }
+    }
+
+    @Override
+    public void onPlayerError(ExoPlaybackException error) {
+        if (DEBUG) Log.d(TAG, "onPlayerError() called with: error = [" + error + "]");
+        onError(error);
+    }
+
+    @Override
+    public void onPositionDiscontinuity() {
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // General Player
+    //////////////////////////////////////////////////////////////////////////*/
+
+    public abstract void onError(Exception exception);
+
+    public void onPrepared(boolean playWhenReady) {
+        if (DEBUG) Log.d(TAG, "onPrepared() called with: playWhenReady = [" + playWhenReady + "]");
+        if (playWhenReady) audioManager.requestAudioFocus(this, AudioManager.STREAM_MUSIC, AudioManager.AUDIOFOCUS_GAIN);
+        changeState(playWhenReady ? STATE_PLAYING : STATE_PAUSED);
+    }
+
+    public abstract void onUpdateProgress(int currentProgress, int duration, int bufferPercent);
+
+    public void onVideoPlayPause() {
+        if (DEBUG) Log.d(TAG, "onVideoPlayPause() called");
+
+        if (currentState == STATE_COMPLETED) {
+            onVideoPlayPauseRepeat();
+            return;
+        }
+
+        if (!isPlaying()) audioManager.requestAudioFocus(this, AudioManager.STREAM_MUSIC, AudioManager.AUDIOFOCUS_GAIN);
+        else audioManager.abandonAudioFocus(null);
+
+        simpleExoPlayer.setPlayWhenReady(!isPlaying());
+    }
+
+    public void onVideoPlayPauseRepeat() {
+        if (DEBUG) Log.d(TAG, "onVideoPlayPauseRepeat() called");
+        changeState(STATE_LOADING);
+        setVideoStartPos(0);
+        simpleExoPlayer.seekTo(0);
+        simpleExoPlayer.setPlayWhenReady(true);
+        audioManager.requestAudioFocus(this, AudioManager.STREAM_MUSIC, AudioManager.AUDIOFOCUS_GAIN);
+    }
+
+    public void onFastRewind() {
+        if (DEBUG) Log.d(TAG, "onFastRewind() called");
+        seekBy(-FAST_FORWARD_REWIND_AMOUNT);
+    }
+
+    public void onFastForward() {
+        if (DEBUG) Log.d(TAG, "onFastForward() called");
+        seekBy(FAST_FORWARD_REWIND_AMOUNT);
+    }
+
+    public void onThumbnailReceived(Bitmap thumbnail) {
+        if (DEBUG) Log.d(TAG, "onThumbnailReceived() called with: thumbnail = [" + thumbnail + "]");
+    }
+
+    public void seekBy(int milliSeconds) {
+        if (DEBUG) Log.d(TAG, "seekBy() called with: milliSeconds = [" + milliSeconds + "]");
+        if (simpleExoPlayer == null || (isCompleted() && milliSeconds > 0) || ((milliSeconds < 0 && simpleExoPlayer.getCurrentPosition() == 0))) return;
+        int progress = (int) (simpleExoPlayer.getCurrentPosition() + milliSeconds);
+        if (progress < 0) progress = 0;
+        simpleExoPlayer.seekTo(progress);
+    }
+
+    public boolean isPlaying() {
+        return simpleExoPlayer.getPlaybackState() == ExoPlayer.STATE_READY && simpleExoPlayer.getPlayWhenReady();
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Utils
+    //////////////////////////////////////////////////////////////////////////*/
+
+    private final StringBuilder stringBuilder = new StringBuilder();
+    private final Formatter formatter = new Formatter(stringBuilder, Locale.getDefault());
+    private final NumberFormat speedFormatter = new DecimalFormat("0.##x");
+
+    public String getTimeString(int milliSeconds) {
+        long seconds = (milliSeconds % 60000L) / 1000L;
+        long minutes = (milliSeconds % 3600000L) / 60000L;
+        long hours = (milliSeconds % 86400000L) / 3600000L;
+        long days = (milliSeconds % (86400000L * 7L)) / 86400000L;
+
+        stringBuilder.setLength(0);
+        return days > 0 ? formatter.format("%d:%02d:%02d:%02d", days, hours, minutes, seconds).toString()
+                : hours > 0 ? formatter.format("%d:%02d:%02d", hours, minutes, seconds).toString()
+                : formatter.format("%02d:%02d", minutes, seconds).toString();
+    }
+
+    protected String formatSpeed(float speed) {
+        return speedFormatter.format(speed);
+    }
+
+    protected void startProgressLoop() {
+        progressLoop.removeCallbacksAndMessages(null);
+        isProgressLoopRunning.set(true);
+        progressLoop.post(progressUpdate);
+    }
+
+    protected void stopProgressLoop() {
+        isProgressLoopRunning.set(false);
+        progressLoop.removeCallbacksAndMessages(null);
+    }
+
+    protected void tryDeleteCacheFiles(Context context) {
+        File cacheDir = new File(context.getExternalCacheDir(), CACHE_FOLDER_NAME);
+
+        if (cacheDir.exists()) {
+            try {
+                if (cacheDir.isDirectory()) {
+                    for (File file : cacheDir.listFiles()) {
+                        try {
+                            if (DEBUG) Log.d(TAG, "tryDeleteCacheFiles: " + file.getAbsolutePath() + " deleted = " + file.delete());
+                        } catch (Exception ignored) {
+                        }
+                    }
+                }
+            } catch (Exception ignored) {
+            }
+        }
+    }
+
+    public void triggerProgressUpdate() {
+        onUpdateProgress((int) simpleExoPlayer.getCurrentPosition(), (int) simpleExoPlayer.getDuration(), simpleExoPlayer.getBufferedPercentage());
+    }
+
+    public void animateAudio(final float from, final float to, int duration) {
+        ValueAnimator valueAnimator = new ValueAnimator();
+        valueAnimator.setFloatValues(from, to);
+        valueAnimator.setDuration(duration);
+        valueAnimator.addListener(new AnimatorListenerAdapter() {
+            @Override
+            public void onAnimationStart(Animator animation) {
+                if (simpleExoPlayer != null) simpleExoPlayer.setVolume(from);
+            }
+
+            @Override
+            public void onAnimationCancel(Animator animation) {
+                if (simpleExoPlayer != null) simpleExoPlayer.setVolume(to);
+            }
+
+            @Override
+            public void onAnimationEnd(Animator animation) {
+                if (simpleExoPlayer != null) simpleExoPlayer.setVolume(to);
+            }
+        });
+        valueAnimator.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
+            @Override
+            public void onAnimationUpdate(ValueAnimator animation) {
+                if (simpleExoPlayer != null) simpleExoPlayer.setVolume(((float) animation.getAnimatedValue()));
+            }
+        });
+        valueAnimator.start();
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Getters and Setters
+    //////////////////////////////////////////////////////////////////////////*/
+
+    public SimpleExoPlayer getPlayer() {
+        return simpleExoPlayer;
+    }
+
+    public SharedPreferences getSharedPreferences() {
+        return sharedPreferences;
+    }
+
+    public RepeatMode getCurrentRepeatMode() {
+        return currentRepeatMode;
+    }
+
+    public void setCurrentRepeatMode(RepeatMode mode) {
+        currentRepeatMode = mode;
+    }
+
+    public int getCurrentState() {
+        return currentState;
+    }
+
+    public String getVideoUrl() {
+        return videoUrl;
+    }
+
+    public void setVideoUrl(String videoUrl) {
+        this.videoUrl = videoUrl;
+    }
+
+    public int getVideoStartPos() {
+        return videoStartPos;
+    }
+
+    public void setVideoStartPos(int videoStartPos) {
+        this.videoStartPos = videoStartPos;
+    }
+
+    public String getVideoTitle() {
+        return videoTitle;
+    }
+
+    public void setVideoTitle(String videoTitle) {
+        this.videoTitle = videoTitle;
+    }
+
+    public String getChannelName() {
+        return channelName;
+    }
+
+    public void setChannelName(String channelName) {
+        this.channelName = channelName;
+    }
+
+    public boolean isCompleted() {
+        return simpleExoPlayer != null && simpleExoPlayer.getPlaybackState() == ExoPlayer.STATE_ENDED;
+    }
+
+    public boolean isPrepared() {
+        return isPrepared;
+    }
+
+    public void setPrepared(boolean prepared) {
+        isPrepared = prepared;
+    }
+
+    public Bitmap getVideoThumbnail() {
+        return videoThumbnail;
+    }
+
+    public void setVideoThumbnail(Bitmap videoThumbnail) {
+        this.videoThumbnail = videoThumbnail;
+    }
+
+    public String getVideoThumbnailUrl() {
+        return videoThumbnailUrl;
+    }
+
+    public void setVideoThumbnailUrl(String videoThumbnailUrl) {
+        this.videoThumbnailUrl = videoThumbnailUrl;
+    }
+
+    public float getPlaybackSpeed() {
+        return simpleExoPlayer.getPlaybackParameters().speed;
+    }
+
+    public void setPlaybackSpeed(float speed) {
+        simpleExoPlayer.setPlaybackParameters(new PlaybackParameters(speed, 1f));
+    }
+}

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

@@ -0,0 +1,548 @@
+package org.schabi.newpipe.player;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.ActivityInfo;
+import android.graphics.Color;
+import android.media.AudioManager;
+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.AnimationUtils;
+import org.schabi.newpipe.util.NavigationHelper;
+import org.schabi.newpipe.util.PermissionHelper;
+import org.schabi.newpipe.util.ThemeHelper;
+
+import static org.schabi.newpipe.util.AnimationUtils.animateView;
+
+/**
+ * Activity Player implementing VideoPlayer
+ *
+ * @author mauriciocolli
+ */
+public class MainVideoPlayer extends Activity {
+    private static final String TAG = ".MainVideoPlayer";
+    private static final boolean DEBUG = BasePlayer.DEBUG;
+
+    private AudioManager audioManager;
+    private GestureDetector gestureDetector;
+
+    private boolean activityPaused;
+    private VideoPlayerImpl 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);
+        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_main_player);
+        playerImpl = new VideoPlayerImpl();
+        playerImpl.setup(findViewById(android.R.id.content));
+        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;
+        if (playerImpl.getPlayer() != null) {
+            playerImpl.setVideoStartPos((int) playerImpl.getPlayer().getCurrentPosition());
+            playerImpl.destroyPlayer();
+        }
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        if (DEBUG) Log.d(TAG, "onResume() called");
+        if (activityPaused) {
+            playerImpl.initPlayer();
+            playerImpl.getPlayPauseButton().setImageResource(R.drawable.ic_play_arrow_white);
+            playerImpl.play(false);
+            activityPaused = false;
+        }
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        if (DEBUG) Log.d(TAG, "onDestroy() called");
+        if (playerImpl != null) playerImpl.destroy();
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // 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 VideoPlayerImpl extends VideoPlayer {
+        private TextView titleTextView;
+        private TextView channelTextView;
+        private TextView volumeTextView;
+        private TextView brightnessTextView;
+        private ImageButton repeatButton;
+
+        private ImageButton screenRotationButton;
+        private ImageButton playPauseButton;
+
+        VideoPlayerImpl() {
+            super("VideoPlayerImpl" + MainVideoPlayer.TAG, MainVideoPlayer.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);
+            }
+
+            getRootView().setKeepScreenOn(true);
+        }
+
+        @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 playUrl(String url, String format, boolean autoPlay) {
+            super.playUrl(url, format, 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(MainVideoPlayer.this)) {
+                Toast.makeText(MainVideoPlayer.this, R.string.msg_popup_permission, Toast.LENGTH_LONG).show();
+                return;
+            }
+
+            context.startService(NavigationHelper.getOpenVideoPlayerIntent(context, PopupVideoPlayer.class, playerImpl));
+            if (playerImpl != null) playerImpl.destroyPlayer();
+
+            ((View) getControlAnimationView().getParent()).setVisibility(View.GONE);
+            MainVideoPlayer.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) {
+                getControlsVisibilityHandler().removeCallbacksAndMessages(null);
+                animateView(playerImpl.getControlsRoot(), true, 300, 0, new Runnable() {
+                    @Override
+                    public void run() {
+                        if (getCurrentState() == STATE_PLAYING && !playerImpl.isSomePopupMenuVisible()) {
+                            hideControls(300, DEFAULT_CONTROLS_HIDE_TIME);
+                        }
+                    }
+                });
+            }
+        }
+
+        private void onScreenRotationClicked() {
+            if (DEBUG) Log.d(TAG, "onScreenRotationClicked() called");
+            toggleOrientation();
+        }
+
+        @Override
+        public void onStopTrackingTouch(SeekBar seekBar) {
+            super.onStopTrackingTouch(seekBar);
+            if (playerImpl.wasPlaying()) {
+                hideControls(100, 0);
+            }
+        }
+
+        @Override
+        public void onDismiss(PopupMenu menu) {
+            super.onDismiss(menu);
+            if (isPlaying()) hideControls(300, 0);
+        }
+
+        @Override
+        public void onError(Exception exception) {
+            exception.printStackTrace();
+            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, AnimationUtils.Type.SCALE_AND_ALPHA, false, 100);
+            getRootView().setKeepScreenOn(true);
+        }
+
+        @Override
+        public void onBuffering() {
+            super.onBuffering();
+            animateView(playPauseButton, AnimationUtils.Type.SCALE_AND_ALPHA, false, 100);
+            getRootView().setKeepScreenOn(true);
+        }
+
+        @Override
+        public void onPlaying() {
+            super.onPlaying();
+            animateView(playPauseButton, AnimationUtils.Type.SCALE_AND_ALPHA, false, 80, 0, new Runnable() {
+                @Override
+                public void run() {
+                    playPauseButton.setImageResource(R.drawable.ic_pause_white);
+                    animateView(playPauseButton, AnimationUtils.Type.SCALE_AND_ALPHA, true, 200);
+                }
+            });
+            showSystemUi();
+            getRootView().setKeepScreenOn(true);
+        }
+
+        @Override
+        public void onPaused() {
+            super.onPaused();
+            animateView(playPauseButton, AnimationUtils.Type.SCALE_AND_ALPHA, false, 80, 0, new Runnable() {
+                @Override
+                public void run() {
+                    playPauseButton.setImageResource(R.drawable.ic_play_arrow_white);
+                    animateView(playPauseButton, AnimationUtils.Type.SCALE_AND_ALPHA, true, 200);
+                }
+            });
+
+            showSystemUi();
+            getRootView().setKeepScreenOn(false);
+        }
+
+        @Override
+        public void onPausedSeek() {
+            super.onPausedSeek();
+            animateView(playPauseButton, AnimationUtils.Type.SCALE_AND_ALPHA, false, 100);
+            getRootView().setKeepScreenOn(true);
+        }
+
+
+        @Override
+        public void onCompleted() {
+            if (getCurrentRepeatMode() == RepeatMode.REPEAT_ONE) {
+                playPauseButton.setImageResource(R.drawable.ic_pause_white);
+            } else {
+                showSystemUi();
+                animateView(playPauseButton, AnimationUtils.Type.SCALE_AND_ALPHA, false, 0, 0, new Runnable() {
+                    @Override
+                    public void run() {
+                        playPauseButton.setImageResource(R.drawable.ic_replay_white);
+                        animateView(playPauseButton, AnimationUtils.Type.SCALE_AND_ALPHA, true, 300);
+                    }
+                });
+            }
+            getRootView().setKeepScreenOn(false);
+            super.onCompleted();
+        }
+
+        /*//////////////////////////////////////////////////////////////////////////
+        // Utils
+        //////////////////////////////////////////////////////////////////////////*/
+
+        @Override
+        public void hideControls(final long duration, long delay) {
+            if (DEBUG) Log.d(TAG, "hideControls() called with: delay = [" + delay + "]");
+            getControlsVisibilityHandler().removeCallbacksAndMessages(null);
+            getControlsVisibilityHandler().postDelayed(new Runnable() {
+                @Override
+                public void run() {
+                    animateView(getControlsRoot(), false, duration, 0, new Runnable() {
+                        @Override
+                        public void run() {
+                            hideSystemUi();
+                        }
+                    });
+                }
+            }, delay);
+        }
+
+        ///////////////////////////////////////////////////////////////////////////
+        // 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() != BasePlayer.STATE_PLAYING) return true;
+
+            if (playerImpl.isControlsVisible()) playerImpl.hideControls(150, 0);
+            else {
+                playerImpl.showControlsThenHide();
+                showSystemUi();
+            }
+            return true;
+        }
+
+        private final boolean isGestureControlsEnabled = playerImpl.getSharedPreferences().getBoolean(getString(R.string.player_gesture_controls_key), true);
+
+        private final float stepsBrightness = 15, stepBrightness = (1f / stepsBrightness), minBrightness = .01f;
+        private float currentBrightness = .5f;
+
+        private int currentVolume, maxVolume = audioManager.getStreamMaxVolume(AudioManager.STREAM_MUSIC);
+        private final float stepsVolume = 15, stepVolume = (float) Math.ceil(maxVolume / stepsVolume), minVolume = 0;
+
+        private final String brightnessUnicode = new String(Character.toChars(0x2600));
+        private final String volumeUnicode = new String(Character.toChars(0x1F508));
+
+        private final int MOVEMENT_THRESHOLD = 40;
+        private final int eventsThreshold = 8;
+        private boolean triggered = false;
+        private int eventsNum;
+
+        // TODO: Improve video gesture controls
+        @Override
+        public boolean onScroll(MotionEvent e1, MotionEvent e2, float distanceX, float distanceY) {
+            if (!isGestureControlsEnabled) return false;
+
+            //noinspection PointlessBooleanExpression
+            if (DEBUG && false) Log.d(TAG, "MainVideoPlayer.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() == BasePlayer.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) {
+                double floor = Math.floor(up ? stepVolume : -stepVolume);
+                currentVolume = (int) (audioManager.getStreamVolume(AudioManager.STREAM_MUSIC) + floor);
+                if (currentVolume >= maxVolume) currentVolume = maxVolume;
+                if (currentVolume <= minVolume) currentVolume = (int) minVolume;
+                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) animateView(playerImpl.getVolumeTextView(), true, 200);
+                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) animateView(playerImpl.getBrightnessTextView(), true, 200);
+                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) animateView(playerImpl.getVolumeTextView(), false, 200, 200);
+            if (playerImpl.getBrightnessTextView().getVisibility() == View.VISIBLE) animateView(playerImpl.getBrightnessTextView(), false, 200, 200);
+
+            if (playerImpl.isControlsVisible() && playerImpl.getCurrentState() == BasePlayer.STATE_PLAYING) {
+                playerImpl.hideControls(300, VideoPlayer.DEFAULT_CONTROLS_HIDE_TIME);
+            }
+        }
+
+        @Override
+        public boolean onTouch(View v, MotionEvent event) {
+            //noinspection PointlessBooleanExpression
+            if (DEBUG && false) Log.d(TAG, "onTouch() called with: v = [" + v + "], event = [" + 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

@@ -1,9 +1,11 @@
-package org.schabi.newpipe;
+package org.schabi.newpipe.player;
 
+import android.content.Context;
 import android.content.Intent;
+import android.content.SharedPreferences;
 import android.content.pm.ActivityInfo;
 import android.content.res.Configuration;
-import android.content.res.Resources;
+import android.media.AudioManager;
 import android.media.MediaPlayer;
 import android.net.Uri;
 import android.os.Build;
@@ -14,20 +16,19 @@ 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.Surface;
 import android.view.View;
 import android.view.WindowManager;
 import android.widget.Button;
-import android.widget.FrameLayout;
-import android.widget.LinearLayout;
 import android.widget.MediaController;
 import android.widget.ProgressBar;
-import android.widget.SeekBar;
 import android.widget.VideoView;
 
+import org.schabi.newpipe.R;
+
 /**
  * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
  * PlayVideoActivity.java is part of NewPipe.
@@ -55,39 +56,72 @@ public class PlayVideoActivity extends AppCompatActivity {
     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 static final long TAB_HIDING_DELAY = 100;
 
     private String videoUrl = "";
 
     private ActionBar actionBar;
     private VideoView videoView;
-    private int position = 0;
+    private int position;
     private MediaController mediaController;
     private ProgressBar progressBar;
     private View decorView;
-    private boolean uiIsHidden = false;
-    private static long lastUiShowTime = 0;
+    private boolean uiIsHidden;
+    private static long lastUiShowTime;
     private boolean isLandscape = true;
-    private boolean hasSoftKeys = false;
+    private boolean hasSoftKeys;
+
+    private SharedPreferences prefs;
+    private static final String PREF_IS_LANDSCAPE = "is_landscape";
 
     @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();
+        hasSoftKeys = checkIfHasSoftKeys();
 
         actionBar = getSupportActionBar();
+        assert actionBar != null;
         actionBar.setDisplayHomeAsUpEnabled(true);
         Intent intent = getIntent();
         if(mediaController == null) {
-            mediaController = new MediaController(this);
+            //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 {
@@ -102,7 +136,7 @@ public class PlayVideoActivity extends AppCompatActivity {
             public void onPrepared(MediaPlayer mp) {
                 progressBar.setVisibility(View.GONE);
                 videoView.seekTo(position);
-                if (position == 0) {
+                if (position <= 0) {
                     videoView.start();
                     showUi();
                 } else {
@@ -133,15 +167,16 @@ public class PlayVideoActivity extends AppCompatActivity {
             }
         });
 
-        decorView.setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
-                | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
-                | View.SYSTEM_UI_FLAG_LAYOUT_STABLE);
-    }
-
-    @Override
-    protected void onPostCreate(Bundle savedInstanceState) {
-        super.onPostCreate(savedInstanceState);
+        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
@@ -153,15 +188,21 @@ public class PlayVideoActivity extends AppCompatActivity {
         return true;
     }
 
+    @Override
+    public void onPause() {
+        super.onPause();
+        videoView.pause();
+    }
+
     @Override
     public void onResume() {
         super.onResume();
     }
 
     @Override
-    public void onPause() {
-        super.onPause();
-        videoView.pause();
+    protected void onDestroy() {
+        super.onDestroy();
+        prefs = getPreferences(Context.MODE_PRIVATE);
     }
 
     @Override
@@ -176,17 +217,10 @@ public class PlayVideoActivity extends AppCompatActivity {
                 intent.setAction(Intent.ACTION_SEND);
                 intent.putExtra(Intent.EXTRA_TEXT, videoUrl);
                 intent.setType("text/plain");
-                startActivity(Intent.createChooser(intent, getString(R.string.shareDialogTitle)));
+                startActivity(Intent.createChooser(intent, getString(R.string.share_dialog_title)));
                 break;
             case R.id.menu_item_screen_rotation:
-                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);
-                }
+                toggleOrientation();
                 break;
             default:
                 Log.e(TAG, "Error: MenuItem not known");
@@ -201,10 +235,10 @@ public class PlayVideoActivity extends AppCompatActivity {
 
         if (config.orientation == Configuration.ORIENTATION_LANDSCAPE) {
             isLandscape = true;
-            adjustMediaControllMetrics();
+            adjustMediaControlMetrics();
         } else if (config.orientation == Configuration.ORIENTATION_PORTRAIT){
             isLandscape = false;
-            adjustMediaControllMetrics();
+            adjustMediaControlMetrics();
         }
     }
 
@@ -227,7 +261,7 @@ public class PlayVideoActivity extends AppCompatActivity {
             uiIsHidden = false;
             mediaController.show(100000);
             actionBar.show();
-            adjustMediaControllMetrics();
+            adjustMediaControlMetrics();
             getWindow().clearFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
             Handler handler = new Handler();
             handler.postDelayed(new Runnable() {
@@ -248,16 +282,18 @@ public class PlayVideoActivity extends AppCompatActivity {
         uiIsHidden = true;
         actionBar.hide();
         mediaController.hide();
-        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);
+        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 adjustMediaControllMetrics() {
+    private void adjustMediaControlMetrics() {
         MediaController.LayoutParams mediaControllerLayout
                 = new MediaController.LayoutParams(MediaController.LayoutParams.MATCH_PARENT,
                 MediaController.LayoutParams.WRAP_CONTENT);
@@ -272,12 +308,10 @@ public class PlayVideoActivity extends AppCompatActivity {
         mediaController.setLayoutParams(mediaControllerLayout);
     }
 
-    private boolean checkIfhasSoftKeys(){
-        if(Build.VERSION.SDK_INT >= 17) {
-            return getNavigationBarHeight() != 0 || getNavigationBarWidth() != 0;
-        } else {
-            return true;
-        }
+    private boolean checkIfHasSoftKeys(){
+        return Build.VERSION.SDK_INT >= 17 ||
+                getNavigationBarHeight() != 0 ||
+                getNavigationBarWidth() != 0;
     }
 
     private int getNavigationBarHeight() {
@@ -291,7 +325,7 @@ public class PlayVideoActivity extends AppCompatActivity {
 
             int realHeight = realDisplayMetrics.heightPixels;
             int displayHeight = displayMetrics.heightPixels;
-            return (realHeight - displayHeight);
+            return realHeight - displayHeight;
         } else {
             return 50;
         }
@@ -308,15 +342,28 @@ public class PlayVideoActivity extends AppCompatActivity {
 
             int realWidth = realDisplayMetrics.widthPixels;
             int displayWidth = displayMetrics.widthPixels;
-            return (realWidth - displayWidth);
+            return realWidth - displayWidth;
         } else {
             return 50;
         }
     }
 
-    public boolean checkIfLandscape() {
+    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,762 @@
+package org.schabi.newpipe.player;
+
+import android.annotation.SuppressLint;
+import android.app.NotificationManager;
+import android.app.PendingIntent;
+import android.app.Service;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.SharedPreferences;
+import android.content.res.Configuration;
+import android.graphics.Bitmap;
+import android.graphics.PixelFormat;
+import android.os.Build;
+import android.os.Handler;
+import android.os.IBinder;
+import android.preference.PreferenceManager;
+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.SeekBar;
+import android.widget.TextView;
+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.BuildConfig;
+import org.schabi.newpipe.MainActivity;
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.ReCaptchaActivity;
+import org.schabi.newpipe.extractor.MediaFormat;
+import org.schabi.newpipe.extractor.StreamingService;
+import org.schabi.newpipe.extractor.stream_info.StreamInfo;
+import org.schabi.newpipe.util.Constants;
+import org.schabi.newpipe.util.NavigationHelper;
+import org.schabi.newpipe.util.ThemeHelper;
+import org.schabi.newpipe.util.Utils;
+import org.schabi.newpipe.workers.StreamExtractorWorker;
+
+import static org.schabi.newpipe.util.AnimationUtils.animateView;
+
+/**
+ * Service Popup Player implementing VideoPlayer
+ *
+ * @author mauriciocolli
+ */
+public class PopupVideoPlayer extends Service {
+    private static final String TAG = ".PopupVideoPlayer";
+    private static final boolean DEBUG = BasePlayer.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 static final String POPUP_SAVED_WIDTH = "popup_saved_width";
+    private static final String POPUP_SAVED_X = "popup_saved_x";
+    private static final String POPUP_SAVED_Y = "popup_saved_y";
+
+    private WindowManager windowManager;
+    private WindowManager.LayoutParams windowLayoutParams;
+    private GestureDetector gestureDetector;
+
+    private float screenWidth, screenHeight;
+    private float popupWidth, popupHeight;
+
+    private float minimumWidth, minimumHeight;
+    private float maximumWidth, maximumHeight;
+
+    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 VideoPlayerImpl playerImpl;
+    private StreamExtractorWorker currentExtractorWorker;
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Service LifeCycle
+    //////////////////////////////////////////////////////////////////////////*/
+
+    @Override
+    public void onCreate() {
+        windowManager = (WindowManager) getSystemService(WINDOW_SERVICE);
+        notificationManager = ((NotificationManager) getSystemService(NOTIFICATION_SERVICE));
+
+        playerImpl = new VideoPlayerImpl();
+        ThemeHelper.setTheme(this);
+    }
+
+    @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);
+            currentExtractorWorker = new StreamExtractorWorker(this, 0, intent.getStringExtra(Constants.KEY_URL), new FetcherRunnable(this));
+            currentExtractorWorker.start();
+        } else {
+            playerImpl.setStartedFromNewPipe(true);
+            playerImpl.handleIntent(intent);
+        }
+        return START_NOT_STICKY;
+    }
+
+    @Override
+    public void onConfigurationChanged(Configuration newConfig) {
+        updateScreenSize();
+        updatePopupSize(windowLayoutParams.width, -1);
+        checkPositionBounds();
+    }
+
+    @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 (notificationManager != null) notificationManager.cancel(NOTIFICATION_ID);
+        if (currentExtractorWorker != null) {
+            currentExtractorWorker.cancel();
+            currentExtractorWorker = null;
+        }
+
+        savePositionAndSize();
+    }
+
+    @Override
+    public IBinder onBind(Intent intent) {
+        return null;
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Init
+    //////////////////////////////////////////////////////////////////////////*/
+
+    @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();
+
+        SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this);
+        boolean popupRememberSizeAndPos = sharedPreferences.getBoolean(getString(R.string.popup_remember_size_pos_key), true);
+
+        float defaultSize = getResources().getDimension(R.dimen.popup_default_width);
+        popupWidth = popupRememberSizeAndPos ? sharedPreferences.getFloat(POPUP_SAVED_WIDTH, defaultSize) : defaultSize;
+
+        windowLayoutParams = new WindowManager.LayoutParams(
+                (int) popupWidth, (int) getMinimumVideoHeight(popupWidth),
+                WindowManager.LayoutParams.TYPE_PHONE,
+                WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE,
+                PixelFormat.TRANSLUCENT);
+        windowLayoutParams.gravity = Gravity.LEFT | Gravity.TOP;
+
+        int centerX = (int) (screenWidth / 2f - popupWidth / 2f);
+        int centerY = (int) (screenHeight / 2f - popupHeight / 2f);
+        windowLayoutParams.x = popupRememberSizeAndPos ? sharedPreferences.getInt(POPUP_SAVED_X, centerX) : centerX;
+        windowLayoutParams.y = popupRememberSizeAndPos ? sharedPreferences.getInt(POPUP_SAVED_Y, centerY) : centerY;
+
+        checkPositionBounds();
+
+        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.setImageViewResource(R.id.notificationCover, R.drawable.dummy_thumbnail);
+        else notRemoteView.setImageViewBitmap(R.id.notificationCover, playerImpl.getVideoThumbnail());
+
+        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");
+        savePositionAndSize();
+        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);
+        i.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
+        context.startActivity(i);
+        context.sendBroadcast(new Intent(Intent.ACTION_CLOSE_SYSTEM_DIALOGS));
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Utils
+    //////////////////////////////////////////////////////////////////////////*/
+
+    private void checkPositionBounds() {
+        if (windowLayoutParams.x > screenWidth - windowLayoutParams.width) windowLayoutParams.x = (int) (screenWidth - windowLayoutParams.width);
+        if (windowLayoutParams.x < 0) windowLayoutParams.x = 0;
+        if (windowLayoutParams.y > screenHeight - windowLayoutParams.height) windowLayoutParams.y = (int) (screenHeight - windowLayoutParams.height);
+        if (windowLayoutParams.y < 0) windowLayoutParams.y = 0;
+    }
+
+    private void savePositionAndSize() {
+        SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(PopupVideoPlayer.this);
+        sharedPreferences.edit().putInt(POPUP_SAVED_X, windowLayoutParams.x).apply();
+        sharedPreferences.edit().putInt(POPUP_SAVED_Y, windowLayoutParams.y).apply();
+        sharedPreferences.edit().putFloat(POPUP_SAVED_WIDTH, windowLayoutParams.width).apply();
+    }
+
+    private float getMinimumVideoHeight(float width) {
+        //if (DEBUG) Log.d(TAG, "getMinimumVideoHeight() called with: width = [" + width + "], returned: " + height);
+        return width / (16.0f / 9.0f); // Respect the 16:9 ratio that most videos have
+    }
+
+    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);
+
+        popupWidth = getResources().getDimension(R.dimen.popup_default_width);
+        popupHeight = getMinimumVideoHeight(popupWidth);
+
+        minimumWidth = getResources().getDimension(R.dimen.popup_minimum_width);
+        minimumHeight = getMinimumVideoHeight(minimumWidth);
+
+        maximumWidth = screenWidth;
+        maximumHeight = screenHeight;
+    }
+
+    private void updatePopupSize(int width, int height) {
+        //if (DEBUG) Log.d(TAG, "updatePopupSize() called with: width = [" + width + "], height = [" + height + "]");
+
+        width = (int) (width > maximumWidth ? maximumWidth : width < minimumWidth ? minimumWidth : width);
+
+        if (height == -1) height = (int) getMinimumVideoHeight(width);
+        else height = (int) (height > maximumHeight ? maximumHeight : height < minimumHeight ? minimumHeight : height);
+
+        windowLayoutParams.width = width;
+        windowLayoutParams.height = height;
+        popupWidth = width;
+        popupHeight = height;
+
+        if (DEBUG) Log.d(TAG, "updatePopupSize() updated values:  width = [" + width + "], height = [" + height + "]");
+        windowManager.updateViewLayout(playerImpl.getRootView(), windowLayoutParams);
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+
+    private class VideoPlayerImpl extends VideoPlayer {
+        private TextView resizingIndicator;
+
+        VideoPlayerImpl() {
+            super("VideoPlayerImpl" + PopupVideoPlayer.TAG, PopupVideoPlayer.this);
+        }
+
+        @Override
+        public void playUrl(String url, String format, boolean autoPlay) {
+            super.playUrl(url, format, autoPlay);
+
+            windowLayoutParams.width = (int) popupWidth;
+            windowLayoutParams.height = (int) getMinimumVideoHeight(popupWidth);
+            windowManager.updateViewLayout(getRootView(), windowLayoutParams);
+
+            notBuilder = createNotification();
+            startForeground(NOTIFICATION_ID, notBuilder.build());
+        }
+
+        @Override
+        public void initViews(View rootView) {
+            super.initViews(rootView);
+            resizingIndicator = (TextView) rootView.findViewById(R.id.resizing_indicator);
+        }
+
+        @Override
+        public void destroy() {
+            super.destroy();
+            if (notRemoteView != null) notRemoteView.setImageViewBitmap(R.id.notificationCover, null);
+        }
+
+        @Override
+        public void onThumbnailReceived(Bitmap thumbnail) {
+            super.onThumbnailReceived(thumbnail);
+            if (thumbnail != null) {
+                if (notRemoteView != null) notRemoteView.setImageViewBitmap(R.id.notificationCover, thumbnail);
+                updateNotification(-1);
+            }
+        }
+
+        @Override
+        public void onFullScreenButtonClicked() {
+            if (DEBUG) Log.d(TAG, "onFullScreenButtonClicked() called");
+            Intent intent;
+            if (!getSharedPreferences().getBoolean(getResources().getString(R.string.use_old_player_key), false)) {
+                intent = NavigationHelper.getOpenVideoPlayerIntent(context, MainVideoPlayer.class, playerImpl);
+                if (!playerImpl.isStartedFromNewPipe()) intent.putExtra(VideoPlayer.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);
+            if (playerImpl != null) playerImpl.destroyPlayer();
+            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 onDismiss(PopupMenu menu) {
+            super.onDismiss(menu);
+            if (isPlaying()) hideControls(500, 0);
+        }
+
+        @Override
+        public void onError(Exception exception) {
+            exception.printStackTrace();
+            Toast.makeText(context, "Failed to play this video", Toast.LENGTH_SHORT).show();
+            stopSelf();
+        }
+
+        @Override
+        public void onStopTrackingTouch(SeekBar seekBar) {
+            super.onStopTrackingTouch(seekBar);
+            if (playerImpl.wasPlaying()) {
+                hideControls(100, 0);
+            }
+        }
+/*//////////////////////////////////////////////////////////////////////////
+        // Broadcast Receiver
+        //////////////////////////////////////////////////////////////////////////*/
+
+        @Override
+        protected void setupBroadcastReceiver(IntentFilter intentFilter) {
+            super.setupBroadcastReceiver(intentFilter);
+            if (DEBUG) Log.d(TAG, "setupBroadcastReceiver() called with: intentFilter = [" + intentFilter + "]");
+            intentFilter.addAction(ACTION_CLOSE);
+            intentFilter.addAction(ACTION_PLAY_PAUSE);
+            intentFilter.addAction(ACTION_OPEN_DETAIL);
+            intentFilter.addAction(ACTION_REPEAT);
+        }
+
+        @Override
+        public void onBroadcastReceived(Intent intent) {
+            super.onBroadcastReceived(intent);
+            if (DEBUG) Log.d(TAG, "onBroadcastReceived() called with: 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;
+            }
+        }
+        /*//////////////////////////////////////////////////////////////////////////
+        // 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);
+        }
+
+
+        @SuppressWarnings("WeakerAccess")
+        public TextView getResizingIndicator() {
+            return resizingIndicator;
+        }
+    }
+
+    private class MySimpleOnGestureListener extends GestureDetector.SimpleOnGestureListener implements View.OnTouchListener {
+        private int initialPopupX, initialPopupY;
+        private boolean isMoving;
+
+        private int onDownPopupWidth = 0;
+        private boolean isResizing;
+        private boolean isResizingRightSide;
+
+        @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 = windowLayoutParams.width;
+            popupHeight = windowLayoutParams.height;
+            onDownPopupWidth = windowLayoutParams.width;
+            return false;
+        }
+
+        @Override
+        public void onLongPress(MotionEvent e) {
+            if (DEBUG) Log.d(TAG, "onLongPress() called with: e = [" + e + "]");
+            playerImpl.showAndAnimateControl(-1, true);
+            playerImpl.getLoadingPanel().setVisibility(View.GONE);
+
+            playerImpl.hideControls(0, 0);
+            animateView(playerImpl.getCurrentDisplaySeek(), false, 0, 0);
+            animateView(playerImpl.getResizingIndicator(), true, 200, 0);
+
+            isResizing = true;
+            isResizingRightSide = e.getRawX() > windowLayoutParams.x + (windowLayoutParams.width / 2f);
+        }
+
+        @Override
+        public boolean onScroll(MotionEvent e1, MotionEvent e2, float distanceX, float distanceY) {
+            if (isResizing) return false;
+
+            if (playerImpl.getCurrentState() != BasePlayer.STATE_BUFFERING
+                    && (!isMoving || playerImpl.getControlsRoot().getAlpha() != 1f)) playerImpl.showControls(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 = [" + 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() == BasePlayer.STATE_PLAYING) {
+                playerImpl.hideControls(300, VideoPlayer.DEFAULT_CONTROLS_HIDE_TIME);
+            }
+        }
+
+        @Override
+        public boolean onTouch(View v, MotionEvent event) {
+            gestureDetector.onTouchEvent(event);
+            if (event.getAction() == MotionEvent.ACTION_MOVE && isResizing && !isMoving) {
+                //if (DEBUG) Log.d(TAG, "onTouch() ACTION_MOVE > v = [" + v + "],  e1.getRaw = [" + event.getRawX() + ", " + event.getRawY() + "]");
+                int width;
+                if (isResizingRightSide) width = (int) event.getRawX() - windowLayoutParams.x;
+                else {
+                    width = (int) (windowLayoutParams.width + (windowLayoutParams.x - event.getRawX()));
+                    if (width > minimumWidth) windowLayoutParams.x = initialPopupX - (width - onDownPopupWidth);
+                }
+                if (width <= maximumWidth && width >= minimumWidth) updatePopupSize(width, -1);
+                return true;
+            }
+
+            if (event.getAction() == MotionEvent.ACTION_UP) {
+                if (DEBUG) Log.d(TAG, "onTouch() ACTION_UP > v = [" + v + "],  e1.getRaw = [" + event.getRawX() + ", " + event.getRawY() + "]");
+                if (isMoving) {
+                    isMoving = false;
+                    onScrollEnd();
+                }
+
+                if (isResizing) {
+                    isResizing = false;
+                    animateView(playerImpl.getResizingIndicator(), false, 100, 0);
+                    playerImpl.changeState(playerImpl.getCurrentState());
+                }
+                savePositionAndSize();
+            }
+            return true;
+        }
+
+    }
+
+    /**
+     * Fetcher used if open by a link out of NewPipe
+     */
+    private class FetcherRunnable implements StreamExtractorWorker.OnStreamInfoReceivedListener {
+        private final Context context;
+        private final Handler mainHandler;
+
+        FetcherRunnable(Context context) {
+            this.mainHandler = new Handler(PopupVideoPlayer.this.getMainLooper());
+            this.context = context;
+        }
+
+        @Override
+        public void onReceive(StreamInfo info) {
+            playerImpl.setVideoTitle(info.title);
+            playerImpl.setVideoUrl(info.webpage_url);
+            playerImpl.setVideoThumbnailUrl(info.thumbnail_url);
+            playerImpl.setChannelName(info.uploader);
+
+            playerImpl.setVideoStreamsList(Utils.getSortedStreamVideosList(context, info.video_streams, info.video_only_streams, false));
+            playerImpl.setAudioStream(Utils.getHighestQualityAudio(info.audio_streams));
+
+            int defaultResolution = Utils.getPopupDefaultResolution(context, playerImpl.getVideoStreamsList());
+            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);
+            }
+
+            if (info.start_position > 0) playerImpl.setVideoStartPos(info.start_position * 1000);
+            else playerImpl.setVideoStartPos(-1);
+
+            mainHandler.post(new Runnable() {
+                @Override
+                public void run() {
+                    playerImpl.play(true);
+                }
+            });
+
+            imageLoader.resume();
+            imageLoader.loadImage(info.thumbnail_url, displayImageOptions, new SimpleImageLoadingListener() {
+                @Override
+                public void onLoadingComplete(final String imageUri, View view, final Bitmap loadedImage) {
+                    if (playerImpl == null || playerImpl.getPlayer() == null) return;
+                    if (DEBUG) Log.d(TAG, "FetcherRunnable.imageLoader.onLoadingComplete() called with: imageUri = [" + imageUri + "]");
+                    mainHandler.post(new Runnable() {
+                        @Override
+                        public void run() {
+                            playerImpl.setVideoThumbnail(loadedImage);
+                            if (loadedImage != null) notRemoteView.setImageViewBitmap(R.id.notificationCover, loadedImage);
+                            updateNotification(-1);
+                        }
+                    });
+                }
+            });
+        }
+
+        @Override
+        public void onError(final int messageId) {
+            mainHandler.post(new Runnable() {
+                @Override
+                public void run() {
+                    Toast.makeText(context, messageId, Toast.LENGTH_LONG).show();
+                }
+            });
+            stopSelf();
+        }
+
+        @Override
+        public void onReCaptchaException() {
+            mainHandler.post(new Runnable() {
+                @Override
+                public void run() {
+                    Toast.makeText(context, R.string.recaptcha_request_toast, Toast.LENGTH_LONG).show();
+                }
+            });
+            // Starting ReCaptcha Challenge Activity
+            Intent intent = new Intent(context, ReCaptchaActivity.class);
+            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            context.startActivity(intent);
+            stopSelf();
+        }
+
+        @Override
+        public void onBlockedByGemaError() {
+            mainHandler.post(new Runnable() {
+                @Override
+                public void run() {
+                    Toast.makeText(context, R.string.blocked_by_gema, Toast.LENGTH_LONG).show();
+                }
+            });
+            stopSelf();
+        }
+
+        @Override
+        public void onContentErrorWithMessage(final int messageId) {
+            mainHandler.post(new Runnable() {
+                @Override
+                public void run() {
+                    Toast.makeText(context, messageId, Toast.LENGTH_LONG).show();
+                }
+            });
+            stopSelf();
+        }
+
+        @Override
+        public void onContentError() {
+            mainHandler.post(new Runnable() {
+                @Override
+                public void run() {
+                    Toast.makeText(context, R.string.content_not_available, Toast.LENGTH_LONG).show();
+                }
+            });
+            stopSelf();
+        }
+
+        @Override
+        public void onUnrecoverableError(Exception exception) {
+            exception.printStackTrace();
+            stopSelf();
+        }
+    }
+
+}

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

@@ -0,0 +1,756 @@
+package org.schabi.newpipe.player;
+
+import android.animation.Animator;
+import android.animation.AnimatorListenerAdapter;
+import android.animation.ObjectAnimator;
+import android.animation.PropertyValuesHolder;
+import android.animation.ValueAnimator;
+import android.content.Context;
+import android.content.Intent;
+import android.graphics.Bitmap;
+import android.graphics.Color;
+import android.graphics.PorterDuff;
+import android.net.Uri;
+import android.os.Build;
+import android.os.Handler;
+import android.support.v4.content.ContextCompat;
+import android.util.Log;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.SurfaceView;
+import android.view.View;
+import android.widget.ImageButton;
+import android.widget.ImageView;
+import android.widget.PopupMenu;
+import android.widget.ProgressBar;
+import android.widget.SeekBar;
+import android.widget.TextView;
+
+import com.google.android.exoplayer2.ExoPlayer;
+import com.google.android.exoplayer2.SimpleExoPlayer;
+import com.google.android.exoplayer2.source.ExtractorMediaSource;
+import com.google.android.exoplayer2.source.MediaSource;
+import com.google.android.exoplayer2.source.MergingMediaSource;
+import com.google.android.exoplayer2.ui.AspectRatioFrameLayout;
+
+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 org.schabi.newpipe.util.AnimationUtils;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Vector;
+
+import static org.schabi.newpipe.util.AnimationUtils.animateView;
+
+/**
+ * Base for <b>video</b> players
+ *
+ * @author mauriciocolli
+ */
+@SuppressWarnings({"WeakerAccess", "unused"})
+public abstract class VideoPlayer extends BasePlayer implements SimpleExoPlayer.VideoListener, SeekBar.OnSeekBarChangeListener, View.OnClickListener, ExoPlayer.EventListener, PopupMenu.OnMenuItemClickListener, PopupMenu.OnDismissListener {
+    public static final boolean DEBUG = BasePlayer.DEBUG;
+    public final String TAG;
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Intent
+    //////////////////////////////////////////////////////////////////////////*/
+
+    public static final String VIDEO_STREAMS_LIST = "video_streams_list";
+    public static final String VIDEO_ONLY_AUDIO_STREAM = "video_only_audio_stream";
+    public static final String INDEX_SEL_VIDEO_STREAM = "index_selected_video_stream";
+    public static final String STARTED_FROM_NEWPIPE = "started_from_newpipe";
+
+    private int selectedIndexStream;
+    private ArrayList<VideoStream> videoStreamsList = new ArrayList<>();
+    private AudioStream videoOnlyAudioStream;
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Player
+    //////////////////////////////////////////////////////////////////////////*/
+
+    public static final int DEFAULT_CONTROLS_HIDE_TIME = 3000;  // 3 Seconds
+    private static final float[] PLAYBACK_SPEEDS = {0.5f, 0.75f, 1f, 1.25f, 1.5f, 1.75f, 2f};
+
+    private boolean startedFromNewPipe = true;
+    private boolean wasPlaying = false;
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Views
+    //////////////////////////////////////////////////////////////////////////*/
+
+    private View rootView;
+
+    private AspectRatioFrameLayout aspectRatioFrameLayout;
+    private SurfaceView surfaceView;
+    private View surfaceForeground;
+
+    private View loadingPanel;
+    private ImageView endScreen;
+    private ImageView controlAnimationView;
+
+    private View controlsRoot;
+    private TextView currentDisplaySeek;
+
+    private View bottomControlsRoot;
+    private SeekBar playbackSeekBar;
+    private TextView playbackCurrentTime;
+    private TextView playbackEndTime;
+    private TextView playbackSpeed;
+
+    private View topControlsRoot;
+    private TextView qualityTextView;
+    private ImageButton fullScreenButton;
+
+    private ValueAnimator controlViewAnimator;
+    private Handler controlsVisibilityHandler = new Handler();
+
+    private boolean isSomePopupMenuVisible = false;
+    private boolean qualityChanged = false;
+    private int qualityPopupMenuGroupId = 69;
+    private PopupMenu qualityPopupMenu;
+
+    private int playbackSpeedPopupMenuGroupId = 79;
+    private PopupMenu playbackSpeedPopupMenu;
+
+    ///////////////////////////////////////////////////////////////////////////
+
+    public VideoPlayer(String debugTag, Context context) {
+        super(context);
+        this.TAG = debugTag;
+        this.context = context;
+    }
+
+    public void setup(View rootView) {
+        initViews(rootView);
+        setup();
+    }
+
+    public void initViews(View rootView) {
+        this.rootView = rootView;
+        this.aspectRatioFrameLayout = (AspectRatioFrameLayout) rootView.findViewById(R.id.aspectRatioLayout);
+        this.surfaceView = (SurfaceView) rootView.findViewById(R.id.surfaceView);
+        this.surfaceForeground = rootView.findViewById(R.id.surfaceForeground);
+        this.loadingPanel = rootView.findViewById(R.id.loading_panel);
+        this.endScreen = (ImageView) rootView.findViewById(R.id.endScreen);
+        this.controlAnimationView = (ImageView) rootView.findViewById(R.id.controlAnimationView);
+        this.controlsRoot = rootView.findViewById(R.id.playbackControlRoot);
+        this.currentDisplaySeek = (TextView) rootView.findViewById(R.id.currentDisplaySeek);
+        this.playbackSeekBar = (SeekBar) rootView.findViewById(R.id.playbackSeekBar);
+        this.playbackCurrentTime = (TextView) rootView.findViewById(R.id.playbackCurrentTime);
+        this.playbackEndTime = (TextView) rootView.findViewById(R.id.playbackEndTime);
+        this.playbackSpeed = (TextView) rootView.findViewById(R.id.playbackSpeed);
+        this.bottomControlsRoot = rootView.findViewById(R.id.bottomControls);
+        this.topControlsRoot = rootView.findViewById(R.id.topControls);
+        this.qualityTextView = (TextView) rootView.findViewById(R.id.qualityTextView);
+        this.fullScreenButton = (ImageButton) rootView.findViewById(R.id.fullScreenButton);
+
+        //this.aspectRatioFrameLayout.setAspectRatio(16.0f / 9.0f);
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) playbackSeekBar.getThumb().setColorFilter(Color.RED, PorterDuff.Mode.SRC_IN);
+        this.playbackSeekBar.getProgressDrawable().setColorFilter(Color.RED, PorterDuff.Mode.MULTIPLY);
+
+        this.qualityPopupMenu = new PopupMenu(context, qualityTextView);
+        this.playbackSpeedPopupMenu = new PopupMenu(context, playbackSpeed);
+
+        ((ProgressBar) this.loadingPanel.findViewById(R.id.progressBarLoadingPanel)).getIndeterminateDrawable().setColorFilter(Color.WHITE, PorterDuff.Mode.MULTIPLY);
+
+    }
+
+    @Override
+    public void initListeners() {
+        super.initListeners();
+        playbackSeekBar.setOnSeekBarChangeListener(this);
+        playbackSpeed.setOnClickListener(this);
+        fullScreenButton.setOnClickListener(this);
+        qualityTextView.setOnClickListener(this);
+    }
+
+    @Override
+    public void initPlayer() {
+        super.initPlayer();
+        simpleExoPlayer.setVideoSurfaceView(surfaceView);
+        simpleExoPlayer.setVideoListener(this);
+    }
+
+    @SuppressWarnings("unchecked")
+    public void handleIntent(Intent intent) {
+        super.handleIntent(intent);
+        if (DEBUG) Log.d(TAG, "handleIntent() called with: intent = [" + intent + "]");
+        if (intent == null) return;
+
+        selectedIndexStream = intent.getIntExtra(INDEX_SEL_VIDEO_STREAM, -1);
+
+        Serializable serializable = intent.getSerializableExtra(VIDEO_STREAMS_LIST);
+
+        if (serializable instanceof ArrayList) videoStreamsList = (ArrayList<VideoStream>) serializable;
+        if (serializable instanceof Vector) videoStreamsList = new ArrayList<>((List<VideoStream>) serializable);
+
+        Serializable audioStream = intent.getSerializableExtra(VIDEO_ONLY_AUDIO_STREAM);
+        if (audioStream != null) videoOnlyAudioStream = (AudioStream) audioStream;
+
+        startedFromNewPipe = intent.getBooleanExtra(STARTED_FROM_NEWPIPE, true);
+        play(true);
+    }
+
+
+    public void play(boolean autoPlay) {
+        playUrl(getSelectedVideoStream().url, MediaFormat.getSuffixById(getSelectedVideoStream().format), autoPlay);
+    }
+
+    @Override
+    public void playUrl(String url, String format, boolean autoPlay) {
+        if (DEBUG) Log.d(TAG, "play() called with: url = [" + url + "], autoPlay = [" + autoPlay + "]");
+        qualityChanged = false;
+
+        if (url == null || simpleExoPlayer == null) {
+            RuntimeException runtimeException = new RuntimeException((url == null ? "Url " : "Player ") + " null");
+            onError(runtimeException);
+            throw runtimeException;
+        }
+
+        qualityPopupMenu.getMenu().removeGroup(qualityPopupMenuGroupId);
+        buildQualityMenu(qualityPopupMenu);
+
+        playbackSpeedPopupMenu.getMenu().removeGroup(playbackSpeedPopupMenuGroupId);
+        buildPlaybackSpeedMenu(playbackSpeedPopupMenu);
+
+        super.playUrl(url, format, autoPlay);
+    }
+
+    @Override
+    public MediaSource buildMediaSource(String url, String overrideExtension) {
+        MediaSource mediaSource = super.buildMediaSource(url, overrideExtension);
+        if (!getSelectedVideoStream().isVideoOnly) return mediaSource;
+
+        Uri audioUri = Uri.parse(videoOnlyAudioStream.url);
+        return new MergingMediaSource(mediaSource, new ExtractorMediaSource(audioUri, cacheDataSourceFactory, extractorsFactory, null, null));
+    }
+
+    public void buildQualityMenu(PopupMenu popupMenu) {
+        for (int i = 0; i < videoStreamsList.size(); i++) {
+            VideoStream videoStream = videoStreamsList.get(i);
+            popupMenu.getMenu().add(qualityPopupMenuGroupId, i, Menu.NONE, MediaFormat.getNameById(videoStream.format) + " " + videoStream.resolution);
+        }
+        qualityTextView.setText(getSelectedVideoStream().resolution);
+        popupMenu.setOnMenuItemClickListener(this);
+        popupMenu.setOnDismissListener(this);
+    }
+
+    private void buildPlaybackSpeedMenu(PopupMenu popupMenu) {
+        for (int i = 0; i < PLAYBACK_SPEEDS.length; i++) {
+            popupMenu.getMenu().add(playbackSpeedPopupMenuGroupId, i, Menu.NONE, formatSpeed(PLAYBACK_SPEEDS[i]));
+        }
+        playbackSpeed.setText(formatSpeed(getPlaybackSpeed()));
+        popupMenu.setOnMenuItemClickListener(this);
+        popupMenu.setOnDismissListener(this);
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // States Implementation
+    //////////////////////////////////////////////////////////////////////////*/
+
+    @Override
+    public void onLoading() {
+        if (DEBUG) Log.d(TAG, "onLoading() called");
+
+        if (!isProgressLoopRunning.get()) startProgressLoop();
+
+        controlsVisibilityHandler.removeCallbacksAndMessages(null);
+        animateView(controlsRoot, false, 300);
+
+        showAndAnimateControl(-1, true);
+        playbackSeekBar.setEnabled(true);
+        playbackSeekBar.setProgress(0);
+
+        // Bug on lower api, disabling and enabling the seekBar resets the thumb color -.-, so sets the color again
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) playbackSeekBar.getThumb().setColorFilter(Color.RED, PorterDuff.Mode.SRC_IN);
+
+        animateView(endScreen, false, 0);
+        loadingPanel.setBackgroundColor(Color.BLACK);
+        animateView(loadingPanel, true, 0);
+        animateView(surfaceForeground, true, 100);
+    }
+
+    @Override
+    public void onPlaying() {
+        if (DEBUG) Log.d(TAG, "onPlaying() called");
+        if (!isProgressLoopRunning.get()) startProgressLoop();
+        showAndAnimateControl(-1, true);
+        loadingPanel.setVisibility(View.GONE);
+        showControlsThenHide();
+        animateView(currentDisplaySeek, AnimationUtils.Type.SCALE_AND_ALPHA, false, 200);
+    }
+
+    @Override
+    public void onBuffering() {
+        if (DEBUG) Log.d(TAG, "onBuffering() called");
+        loadingPanel.setBackgroundColor(Color.TRANSPARENT);
+        animateView(loadingPanel, true, 500);
+    }
+
+    @Override
+    public void onPaused() {
+        if (DEBUG) Log.d(TAG, "onPaused() called");
+        showControls(400);
+        loadingPanel.setVisibility(View.GONE);
+    }
+
+    @Override
+    public void onPausedSeek() {
+        if (DEBUG) Log.d(TAG, "onPausedSeek() called");
+        showAndAnimateControl(-1, true);
+    }
+
+    @Override
+    public void onCompleted() {
+        if (DEBUG) Log.d(TAG, "onCompleted() called");
+
+        if (isProgressLoopRunning.get()) stopProgressLoop();
+
+        showControls(500);
+        animateView(endScreen, true, 800);
+        animateView(currentDisplaySeek, AnimationUtils.Type.SCALE_AND_ALPHA, false, 200);
+        loadingPanel.setVisibility(View.GONE);
+
+        playbackSeekBar.setMax((int) simpleExoPlayer.getDuration());
+        playbackSeekBar.setProgress(playbackSeekBar.getMax());
+        playbackSeekBar.setEnabled(false);
+        playbackEndTime.setText(getTimeString(playbackSeekBar.getMax()));
+        playbackCurrentTime.setText(playbackEndTime.getText());
+        // Bug on lower api, disabling and enabling the seekBar resets the thumb color -.-, so sets the color again
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) playbackSeekBar.getThumb().setColorFilter(Color.RED, PorterDuff.Mode.SRC_IN);
+
+        animateView(surfaceForeground, true, 100);
+
+        if (currentRepeatMode == RepeatMode.REPEAT_ONE) {
+            changeState(STATE_LOADING);
+            simpleExoPlayer.seekTo(0);
+        }
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // ExoPlayer Video Listener
+    //////////////////////////////////////////////////////////////////////////*/
+
+    @Override
+    public void onVideoSizeChanged(int width, int height, int unappliedRotationDegrees, float pixelWidthHeightRatio) {
+        if (DEBUG) {
+            Log.d(TAG, "onVideoSizeChanged() called with: width / height = [" + width + " / " + height + " = " + (((float) width) / height) + "], unappliedRotationDegrees = [" + unappliedRotationDegrees + "], pixelWidthHeightRatio = [" + pixelWidthHeightRatio + "]");
+        }
+        aspectRatioFrameLayout.setAspectRatio(((float) width) / height);
+    }
+
+    @Override
+    public void onRenderedFirstFrame() {
+        animateView(surfaceForeground, false, 100);
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // General Player
+    //////////////////////////////////////////////////////////////////////////*/
+
+    @Override
+    public void onPrepared(boolean playWhenReady) {
+        if (DEBUG) Log.d(TAG, "onPrepared() called with: playWhenReady = [" + playWhenReady + "]");
+
+        if (videoStartPos > 0) {
+            playbackSeekBar.setProgress(videoStartPos);
+            playbackCurrentTime.setText(getTimeString(videoStartPos));
+            videoStartPos = -1;
+        }
+
+        playbackSeekBar.setMax((int) simpleExoPlayer.getDuration());
+        playbackEndTime.setText(getTimeString((int) simpleExoPlayer.getDuration()));
+        playbackSpeed.setText(formatSpeed(getPlaybackSpeed()));
+
+        super.onPrepared(playWhenReady);
+    }
+
+    @Override
+    public void destroy() {
+        super.destroy();
+        if (endScreen != null) endScreen.setImageBitmap(null);
+    }
+
+    @Override
+    public void onUpdateProgress(int currentProgress, int duration, int bufferPercent) {
+        if (!isPrepared) return;
+
+        if (currentState != STATE_PAUSED) {
+            if (currentState != STATE_PAUSED_SEEK) playbackSeekBar.setProgress(currentProgress);
+            playbackCurrentTime.setText(getTimeString(currentProgress));
+        }
+        if (simpleExoPlayer.isLoading() || bufferPercent > 90) {
+            playbackSeekBar.setSecondaryProgress((int) (playbackSeekBar.getMax() * ((float) bufferPercent / 100)));
+        }
+        if (DEBUG && bufferPercent % 20 == 0) { //Limit log
+            Log.d(TAG, "updateProgress() called with: isVisible = " + isControlsVisible() + ", currentProgress = [" + currentProgress + "], duration = [" + duration + "], bufferPercent = [" + bufferPercent + "]");
+        }
+    }
+
+    @Override
+    public void onVideoPlayPauseRepeat() {
+        if (DEBUG) Log.d(TAG, "onVideoPlayPauseRepeat() called");
+        if (qualityChanged) {
+            setVideoStartPos(0);
+            play(true);
+        } else super.onVideoPlayPauseRepeat();
+    }
+
+    @Override
+    public void onThumbnailReceived(Bitmap thumbnail) {
+        super.onThumbnailReceived(thumbnail);
+        if (thumbnail != null) endScreen.setImageBitmap(thumbnail);
+    }
+
+    protected abstract void onFullScreenButtonClicked();
+
+    @Override
+    public void onFastRewind() {
+        super.onFastRewind();
+        showAndAnimateControl(R.drawable.ic_action_av_fast_rewind, true);
+    }
+
+    @Override
+    public void onFastForward() {
+        super.onFastForward();
+        showAndAnimateControl(R.drawable.ic_action_av_fast_forward, true);
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // OnClick related
+    //////////////////////////////////////////////////////////////////////////*/
+
+    @Override
+    public void onClick(View v) {
+        if (DEBUG) Log.d(TAG, "onClick() called with: v = [" + v + "]");
+        if (v.getId() == fullScreenButton.getId()) {
+            onFullScreenButtonClicked();
+        } else if (v.getId() == qualityTextView.getId()) {
+            onQualitySelectorClicked();
+        } else if (v.getId() == playbackSpeed.getId()) {
+            onPlaybackSpeedClicked();
+        }
+    }
+
+    /**
+     * Called when an item of the quality selector or the playback speed selector is selected
+     */
+    @Override
+    public boolean onMenuItemClick(MenuItem menuItem) {
+        if (DEBUG) Log.d(TAG, "onMenuItemClick() called with: menuItem = [" + menuItem + "], menuItem.getItemId = [" + menuItem.getItemId() + "]");
+
+        if (qualityPopupMenuGroupId == menuItem.getGroupId()) {
+            if (selectedIndexStream == menuItem.getItemId()) return true;
+            setVideoStartPos((int) simpleExoPlayer.getCurrentPosition());
+
+            selectedIndexStream = menuItem.getItemId();
+            if (!(getCurrentState() == STATE_COMPLETED)) play(wasPlaying);
+            else qualityChanged = true;
+
+            qualityTextView.setText(menuItem.getTitle());
+            return true;
+        } else if (playbackSpeedPopupMenuGroupId == menuItem.getGroupId()) {
+            int speedIndex = menuItem.getItemId();
+            float speed = PLAYBACK_SPEEDS[speedIndex];
+
+            setPlaybackSpeed(speed);
+            playbackSpeed.setText(formatSpeed(speed));
+        }
+
+        return false;
+    }
+
+    /**
+     * Called when some popup menu is dismissed
+     */
+    @Override
+    public void onDismiss(PopupMenu menu) {
+        if (DEBUG) Log.d(TAG, "onDismiss() called with: menu = [" + menu + "]");
+        isSomePopupMenuVisible = false;
+        qualityTextView.setText(getSelectedVideoStream().resolution);
+    }
+
+    public void onQualitySelectorClicked() {
+        if (DEBUG) Log.d(TAG, "onQualitySelectorClicked() called");
+        qualityPopupMenu.show();
+        isSomePopupMenuVisible = true;
+        showControls(300);
+
+        VideoStream videoStream = getSelectedVideoStream();
+        qualityTextView.setText(MediaFormat.getNameById(videoStream.format) + " " + videoStream.resolution);
+        wasPlaying = isPlaying();
+    }
+
+    private void onPlaybackSpeedClicked() {
+        if (DEBUG) Log.d(TAG, "onPlaybackSpeedClicked() called");
+        playbackSpeedPopupMenu.show();
+        isSomePopupMenuVisible = true;
+        showControls(300);
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // SeekBar Listener
+    //////////////////////////////////////////////////////////////////////////*/
+
+    @Override
+    public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
+        if (DEBUG && fromUser) Log.d(TAG, "onProgressChanged() called with: seekBar = [" + seekBar + "], progress = [" + progress + "]");
+        //if (fromUser) playbackCurrentTime.setText(getTimeString(progress));
+        if (fromUser) currentDisplaySeek.setText(getTimeString(progress));
+    }
+
+    @Override
+    public void onStartTrackingTouch(SeekBar seekBar) {
+        if (DEBUG) Log.d(TAG, "onStartTrackingTouch() called with: seekBar = [" + seekBar + "]");
+        if (getCurrentState() != STATE_PAUSED_SEEK) changeState(STATE_PAUSED_SEEK);
+
+        wasPlaying = isPlaying();
+        if (isPlaying()) simpleExoPlayer.setPlayWhenReady(false);
+
+        showControls(0);
+        animateView(currentDisplaySeek, AnimationUtils.Type.SCALE_AND_ALPHA, true, 300);
+    }
+
+    @Override
+    public void onStopTrackingTouch(SeekBar seekBar) {
+        if (DEBUG) Log.d(TAG, "onStopTrackingTouch() called with: seekBar = [" + seekBar + "]");
+
+        simpleExoPlayer.seekTo(seekBar.getProgress());
+        if (wasPlaying || simpleExoPlayer.getDuration() == seekBar.getProgress()) simpleExoPlayer.setPlayWhenReady(true);
+
+        playbackCurrentTime.setText(getTimeString(seekBar.getProgress()));
+        animateView(currentDisplaySeek, AnimationUtils.Type.SCALE_AND_ALPHA, false, 200);
+
+        if (getCurrentState() == STATE_PAUSED_SEEK) changeState(STATE_BUFFERING);
+        if (!isProgressLoopRunning.get()) startProgressLoop();
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Utils
+    //////////////////////////////////////////////////////////////////////////*/
+
+    public boolean isControlsVisible() {
+        return controlsRoot != null && controlsRoot.getVisibility() == View.VISIBLE;
+    }
+
+    /**
+     * Show a animation, and depending on goneOnEnd, will stay on the screen or be gone
+     *
+     * @param drawableId the drawable that will be used to animate, pass -1 to clear any animation that is visible
+     * @param goneOnEnd  will set the animation view to GONE on the end of the animation
+     */
+    public void showAndAnimateControl(final int drawableId, final boolean goneOnEnd) {
+        if (DEBUG) Log.d(TAG, "showAndAnimateControl() called with: drawableId = [" + drawableId + "], goneOnEnd = [" + goneOnEnd + "]");
+        if (controlViewAnimator != null && controlViewAnimator.isRunning()) {
+            if (DEBUG) Log.d(TAG, "showAndAnimateControl: controlViewAnimator.isRunning");
+            controlViewAnimator.end();
+        }
+
+        if (drawableId == -1) {
+            if (controlAnimationView.getVisibility() == View.VISIBLE) {
+                controlViewAnimator = ObjectAnimator.ofPropertyValuesHolder(controlAnimationView,
+                        PropertyValuesHolder.ofFloat(View.ALPHA, 1f, 0f),
+                        PropertyValuesHolder.ofFloat(View.SCALE_X, 1.4f, 1f),
+                        PropertyValuesHolder.ofFloat(View.SCALE_Y, 1.4f, 1f)
+                ).setDuration(300);
+                controlViewAnimator.addListener(new AnimatorListenerAdapter() {
+                    @Override
+                    public void onAnimationEnd(Animator animation) {
+                        controlAnimationView.setVisibility(View.GONE);
+                    }
+                });
+                controlViewAnimator.start();
+            }
+            return;
+        }
+
+        float scaleFrom = goneOnEnd ? 1f : 1f, scaleTo = goneOnEnd ? 1.8f : 1.4f;
+        float alphaFrom = goneOnEnd ? 1f : 0f, alphaTo = goneOnEnd ? 0f : 1f;
+
+
+        controlViewAnimator = ObjectAnimator.ofPropertyValuesHolder(controlAnimationView,
+                PropertyValuesHolder.ofFloat(View.ALPHA, alphaFrom, alphaTo),
+                PropertyValuesHolder.ofFloat(View.SCALE_X, scaleFrom, scaleTo),
+                PropertyValuesHolder.ofFloat(View.SCALE_Y, scaleFrom, scaleTo)
+        );
+        controlViewAnimator.setDuration(goneOnEnd ? 1000 : 500);
+        controlViewAnimator.addListener(new AnimatorListenerAdapter() {
+            @Override
+            public void onAnimationEnd(Animator animation) {
+                if (goneOnEnd) controlAnimationView.setVisibility(View.GONE);
+                else controlAnimationView.setVisibility(View.VISIBLE);
+            }
+        });
+
+
+        controlAnimationView.setVisibility(View.VISIBLE);
+        controlAnimationView.setImageDrawable(ContextCompat.getDrawable(context, drawableId));
+        controlViewAnimator.start();
+    }
+
+    public boolean isSomePopupMenuVisible() {
+        return isSomePopupMenuVisible;
+    }
+
+    public void showControlsThenHide() {
+        if (DEBUG) Log.d(TAG, "showControlsThenHide() called");
+        animateView(controlsRoot, true, 300, 0, new Runnable() {
+            @Override
+            public void run() {
+                hideControls(300, DEFAULT_CONTROLS_HIDE_TIME);
+            }
+        });
+    }
+
+    public void showControls(long duration) {
+        if (DEBUG) Log.d(TAG, "showControls() called");
+        controlsVisibilityHandler.removeCallbacksAndMessages(null);
+        animateView(controlsRoot, true, duration);
+    }
+
+    public void hideControls(final long duration, long delay) {
+        if (DEBUG) Log.d(TAG, "hideControls() called with: delay = [" + delay + "]");
+        controlsVisibilityHandler.removeCallbacksAndMessages(null);
+        controlsVisibilityHandler.postDelayed(new Runnable() {
+            @Override
+            public void run() {
+                animateView(controlsRoot, false, duration);
+            }
+        }, delay);
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Getters and Setters
+    //////////////////////////////////////////////////////////////////////////*/
+
+    public AspectRatioFrameLayout getAspectRatioFrameLayout() {
+        return aspectRatioFrameLayout;
+    }
+
+    public SurfaceView getSurfaceView() {
+        return surfaceView;
+    }
+
+    public boolean wasPlaying() {
+        return wasPlaying;
+    }
+
+    public VideoStream getSelectedVideoStream() {
+        return videoStreamsList.get(selectedIndexStream);
+    }
+
+    public Uri getSelectedStreamUri() {
+        return Uri.parse(getSelectedVideoStream().url);
+    }
+
+    public int getQualityPopupMenuGroupId() {
+        return qualityPopupMenuGroupId;
+    }
+
+    public int getSelectedStreamIndex() {
+        return selectedIndexStream;
+    }
+
+    public void setSelectedIndexStream(int selectedIndexStream) {
+        this.selectedIndexStream = selectedIndexStream;
+    }
+
+    public void setAudioStream(AudioStream audioStream) {
+        this.videoOnlyAudioStream = audioStream;
+    }
+
+    public AudioStream getAudioStream() {
+        return videoOnlyAudioStream;
+    }
+
+    public ArrayList<VideoStream> getVideoStreamsList() {
+        return videoStreamsList;
+    }
+
+    public void setVideoStreamsList(ArrayList<VideoStream> videoStreamsList) {
+        this.videoStreamsList = videoStreamsList;
+    }
+
+    public boolean isStartedFromNewPipe() {
+        return startedFromNewPipe;
+    }
+
+    public void setStartedFromNewPipe(boolean startedFromNewPipe) {
+        this.startedFromNewPipe = startedFromNewPipe;
+    }
+
+    public Handler getControlsVisibilityHandler() {
+        return controlsVisibilityHandler;
+    }
+
+    public View getRootView() {
+        return rootView;
+    }
+
+    public void setRootView(View rootView) {
+        this.rootView = rootView;
+    }
+
+    public View getLoadingPanel() {
+        return loadingPanel;
+    }
+
+    public ImageView getEndScreen() {
+        return endScreen;
+    }
+
+    public ImageView getControlAnimationView() {
+        return controlAnimationView;
+    }
+
+    public View getControlsRoot() {
+        return controlsRoot;
+    }
+
+    public View getBottomControlsRoot() {
+        return bottomControlsRoot;
+    }
+
+    public SeekBar getPlaybackSeekBar() {
+        return playbackSeekBar;
+    }
+
+    public TextView getPlaybackCurrentTime() {
+        return playbackCurrentTime;
+    }
+
+    public TextView getPlaybackEndTime() {
+        return playbackEndTime;
+    }
+
+    public View getTopControlsRoot() {
+        return topControlsRoot;
+    }
+
+    public TextView getQualityTextView() {
+        return qualityTextView;
+    }
+
+    public ImageButton getFullScreenButton() {
+        return fullScreenButton;
+    }
+
+    public PopupMenu getQualityPopupMenu() {
+        return qualityPopupMenu;
+    }
+
+    public View getSurfaceForeground() {
+        return surfaceForeground;
+    }
+
+    public TextView getCurrentDisplaySeek() {
+        return currentDisplaySeek;
+    }
+
+}

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

@@ -0,0 +1,39 @@
+package org.schabi.newpipe.report;
+
+import android.content.Context;
+import android.support.annotation.NonNull;
+
+import org.acra.collector.CrashReportData;
+import org.acra.sender.ReportSender;
+import org.acra.sender.ReportSenderException;
+import org.schabi.newpipe.R;
+
+/**
+ * Created by Christian Schabesberger  on 13.09.16.
+ *
+ * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
+ * AcraReportSender.java is part of NewPipe.
+ *
+ * NewPipe is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * NewPipe is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+public class AcraReportSender implements ReportSender {
+
+    @Override
+    public void send(@NonNull Context context, @NonNull CrashReportData report) throws ReportSenderException {
+        ErrorActivity.reportError(context, report,
+                ErrorActivity.ErrorInfo.make(UserAction.UI_ERROR,"none",
+                        "App crash, UI failure", R.string.app_ui_crash));
+    }
+}

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

@@ -1,12 +1,18 @@
-package org.schabi.newpipe;
+package org.schabi.newpipe.report;
 
-import android.graphics.Bitmap;
+import android.content.Context;
+import android.support.annotation.NonNull;
+
+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>
- * Extractor.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
@@ -22,9 +28,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 class AcraReportSenderFactory implements ReportSenderFactory {
+    @NonNull
+    public ReportSender create(@NonNull Context context, @NonNull ACRAConfiguration config) {
+        return new AcraReportSender();
+    }
 }

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

@@ -0,0 +1,501 @@
+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.annotation.Nullable;
+import android.support.annotation.StringRes;
+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.support.v7.widget.Toolbar;
+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";
+
+    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(UserAction.UI_ERROR, "none", "", R.string.app_ui_crash));
+    }
+
+    public static void reportError(final Context context, final List<Throwable> el,
+                                   final Class returnActivity, 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 = returnActivity;
+                            Intent intent = new Intent(context, ErrorActivity.class);
+                            intent.putExtra(ERROR_INFO, errorInfo);
+                            intent.putExtra(ERROR_LIST, elToSl(el));
+                            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                            context.startActivity(intent);
+                        }
+                    }).show();
+        } else {
+            ActivityCommunicator ac = ActivityCommunicator.getCommunicator();
+            ac.returnActivity = returnActivity;
+            Intent intent = new Intent(context, ErrorActivity.class);
+            intent.putExtra(ERROR_INFO, errorInfo);
+            intent.putExtra(ERROR_LIST, elToSl(el));
+            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            context.startActivity(intent);
+        }
+    }
+
+    public static void reportError(final Context context, final Throwable e,
+                                   final Class returnActivity, View rootView, final ErrorInfo errorInfo) {
+        List<Throwable> el = null;
+        if(e != null) {
+            el = new Vector<>();
+            el.add(e);
+        }
+        reportError(context, el, returnActivity, rootView, errorInfo);
+    }
+
+    // async call
+    public static void reportError(Handler handler, final Context context, final Throwable e,
+                                   final Class returnActivity, final View rootView, final ErrorInfo errorInfo) {
+
+        List<Throwable> el = null;
+        if(e != null) {
+            el = new Vector<>();
+            el.add(e);
+        }
+        reportError(handler, context, el, returnActivity, rootView, errorInfo);
+    }
+
+    // async call
+    public static void reportError(Handler handler, final Context context, final List<Throwable> el,
+                                   final Class returnActivity, final View rootView, final ErrorInfo errorInfo) {
+        handler.post(new Runnable() {
+            @Override
+            public void run() {
+                reportError(context, el, returnActivity, 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.addFlags(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);
+        setContentView(R.layout.activity_error);
+
+        Intent intent = getIntent();
+
+        Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
+        setSupportActionBar(toolbar);
+
+        ActionBar actionBar = getSupportActionBar();
+        if (actionBar != null) {
+            actionBar.setDisplayHomeAsUpEnabled(true);
+            actionBar.setTitle(R.string.error_report_title);
+            actionBar.setDisplayShowTitleEnabled(true);
+        }
+
+        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);
+
+        // important add guru meditation
+        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 IpRangeRequester());
+        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;
+    }
+
+    /**
+     * Get the checked activity.
+     * @param returnActivity the activity to return to
+     * @return the casted return activity or null
+     */
+    @Nullable
+    static Class<? extends Activity> getReturnActivity(Class<?> returnActivity) {
+        Class<? extends Activity> checkedReturnActivity = null;
+        if (returnActivity != null){
+            if (Activity.class.isAssignableFrom(returnActivity)) {
+                checkedReturnActivity = returnActivity.asSubclass(Activity.class);
+            } else {
+                checkedReturnActivity = MainActivity.class;
+            }
+        }
+        return checkedReturnActivity;
+    }
+
+    private void goToReturnActivity() {
+        Class<? extends Activity> checkedReturnActivity = getReturnActivity(returnActivity);
+        if (checkedReturnActivity == null) {
+            super.onBackPressed();
+        } else {
+            Intent intent = new Intent(this, checkedReturnActivity);
+            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(UserAction userAction) {
+        if(userAction == null) {
+            return "Your description is in another castle.";
+        } else {
+            return userAction.getMessage();
+        }
+    }
+
+    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];
+            }
+        };
+        final public UserAction userAction;
+        final public String request;
+        final public String serviceName;
+        @StringRes
+        final public int message;
+
+        private ErrorInfo(UserAction userAction, String serviceName, String request, @StringRes int message) {
+            this.userAction = userAction;
+            this.serviceName = serviceName;
+            this.request = request;
+            this.message = message;
+        }
+
+        protected ErrorInfo(Parcel in) {
+            this.userAction = UserAction.valueOf(in.readString());
+            this.request = in.readString();
+            this.serviceName = in.readString();
+            this.message = in.readInt();
+        }
+
+        public static ErrorInfo make(UserAction userAction, String serviceName, String request, @StringRes int message) {
+            return new ErrorInfo(userAction, serviceName, request, message);
+        }
+
+        @Override
+        public int describeContents() {
+            return 0;
+        }
+
+        @Override
+        public void writeToParcel(Parcel dest, int flags) {
+            dest.writeString(this.userAction.name());
+            dest.writeString(this.request);
+            dest.writeString(this.serviceName);
+            dest.writeInt(this.message);
+        }
+    }
+
+    private class IpRangeRequester 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.w(TAG, "Error while error: could not get iprange", e);
+            } finally {
+                h.post(new IpRangeReturnRunnable(ipRange));
+            }
+        }
+    }
+
+    private class IpRangeReturnRunnable implements Runnable {
+        String ipRange;
+        public IpRangeReturnRunnable(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/report/UserAction.java

@@ -0,0 +1,26 @@
+package org.schabi.newpipe.report;
+
+/**
+ * The user actions that can cause an error.
+ */
+public enum UserAction {
+    SEARCHED("searched"),
+    REQUESTED_STREAM("requested stream"),
+    GET_SUGGESTIONS("get suggestions"),
+    SOMETHING_ELSE("something"),
+    USER_REPORT("user report"),
+    LOAD_IMAGE("load image"),
+    UI_ERROR("ui error"),
+    REQUESTED_CHANNEL("requested channel");
+
+
+    private final String message;
+
+    UserAction(String message) {
+        this.message = message;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+}

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

@@ -0,0 +1,106 @@
+/**
+ * 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);
+        return prefs.getString(key, Environment.DIRECTORY_MOVIES);
+    }
+
+    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);
+        return prefs.getString(key, Environment.DIRECTORY_MUSIC);
+    }
+
+    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

@@ -0,0 +1,71 @@
+package org.schabi.newpipe.settings;
+
+import android.content.Context;
+import android.os.Bundle;
+import android.support.v7.app.ActionBar;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.Toolbar;
+import android.view.MenuItem;
+
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.util.ThemeHelper;
+
+
+/**
+ * Created by Christian Schabesberger on 31.08.15.
+ *
+ * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
+ * SettingsActivity.java is part of NewPipe.
+ *
+ * NewPipe is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * NewPipe is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+public class SettingsActivity extends AppCompatActivity {
+
+    public static void initSettings(Context context) {
+        NewPipeSettings.initSettings(context);
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceBundle) {
+        ThemeHelper.setTheme(this);
+        super.onCreate(savedInstanceBundle);
+        setContentView(R.layout.settings_layout);
+
+        Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
+        setSupportActionBar(toolbar);
+
+        ActionBar actionBar = getSupportActionBar();
+        if (actionBar != null) {
+            actionBar.setDisplayHomeAsUpEnabled(true);
+            actionBar.setTitle(R.string.settings);
+            actionBar.setDisplayShowTitleEnabled(true);
+        }
+
+        if (savedInstanceBundle == null) {
+            getFragmentManager().beginTransaction()
+                    .replace(R.id.fragment_holder, new SettingsFragment())
+                    .commit();
+        }
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        int id = item.getItemId();
+        if (id == android.R.id.home) {
+            finish();
+        }
+        return true;
+    }
+}

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

@@ -0,0 +1,142 @@
+package org.schabi.newpipe.settings;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.os.Bundle;
+import android.preference.Preference;
+import android.preference.PreferenceFragment;
+import android.preference.PreferenceManager;
+import android.preference.PreferenceScreen;
+import android.text.TextUtils;
+import android.util.Log;
+
+import com.nononsenseapps.filepicker.FilePickerActivity;
+
+import org.schabi.newpipe.App;
+import org.schabi.newpipe.MainActivity;
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.util.Constants;
+
+import info.guardianproject.netcipher.proxy.OrbotHelper;
+
+public class SettingsFragment extends PreferenceFragment implements SharedPreferences.OnSharedPreferenceChangeListener {
+    private static final int REQUEST_INSTALL_ORBOT = 0x1234;
+    private static final int REQUEST_DOWNLOAD_PATH = 0x1235;
+    private static final int REQUEST_DOWNLOAD_AUDIO_PATH = 0x1236;
+
+    private String DOWNLOAD_PATH_PREFERENCE;
+    private String DOWNLOAD_PATH_AUDIO_PREFERENCE;
+    private String USE_TOR_KEY;
+    private String THEME;
+
+    private String currentTheme;
+    private SharedPreferences defaultPreferences;
+
+    private Activity activity;
+
+    @Override
+    public void onCreate(final Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        activity = getActivity();
+        addPreferencesFromResource(R.xml.settings);
+
+        defaultPreferences = PreferenceManager.getDefaultSharedPreferences(activity);
+        initKeys();
+        updatePreferencesSummary();
+
+        currentTheme = defaultPreferences.getString(THEME, getString(R.string.default_theme_value));
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        defaultPreferences.registerOnSharedPreferenceChangeListener(this);
+    }
+
+    @Override
+    public void onStop() {
+        super.onStop();
+        defaultPreferences.unregisterOnSharedPreferenceChangeListener(this);
+    }
+
+    private void initKeys() {
+        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);
+    }
+
+    @Override
+    public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
+        if (MainActivity.DEBUG) Log.d("TAG", "onPreferenceTreeClick() called with: preferenceScreen = [" + preferenceScreen + "], preference = [" + preference + "]");
+        if (preference.getKey().equals(DOWNLOAD_PATH_PREFERENCE) || preference.getKey().equals(DOWNLOAD_PATH_AUDIO_PREFERENCE)) {
+            Intent i = new Intent(activity, FilePickerActivity.class)
+                    .putExtra(FilePickerActivity.EXTRA_ALLOW_MULTIPLE, false)
+                    .putExtra(FilePickerActivity.EXTRA_ALLOW_CREATE_DIR, true)
+                    .putExtra(FilePickerActivity.EXTRA_MODE, FilePickerActivity.MODE_DIR);
+            if (preference.getKey().equals(DOWNLOAD_PATH_PREFERENCE)) {
+                startActivityForResult(i, REQUEST_DOWNLOAD_PATH);
+            } else if (preference.getKey().equals(DOWNLOAD_PATH_AUDIO_PREFERENCE)) {
+                startActivityForResult(i, REQUEST_DOWNLOAD_AUDIO_PATH);
+            }
+        }
+        return super.onPreferenceTreeClick(preferenceScreen, preference);
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (MainActivity.DEBUG) Log.d("TAG", "onActivityResult() called with: requestCode = [" + requestCode + "], resultCode = [" + resultCode + "], data = [" + data + "]");
+
+        if ((requestCode == REQUEST_DOWNLOAD_PATH || requestCode == REQUEST_DOWNLOAD_AUDIO_PATH) && resultCode == Activity.RESULT_OK) {
+            String key = getString(requestCode == REQUEST_DOWNLOAD_PATH ? R.string.download_path_key : R.string.download_path_audio_key);
+            String path = data.getData().getPath();
+            defaultPreferences.edit().putString(key, path).apply();
+            updatePreferencesSummary();
+        } 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(OrbotHelper.requestStartTor(activity));
+        }
+    }
+
+    /*
+     * Update ONLY the summary of some preferences that don't fire in the onSharedPreferenceChanged or CAN'T be update via xml (%s)
+     *
+     * For example, the download_path use the startActivityForResult, firing the onStop of this fragment,
+     * unregistering the listener (unregisterOnSharedPreferenceChangeListener)
+     */
+    private void updatePreferencesSummary() {
+        findPreference(DOWNLOAD_PATH_PREFERENCE).setSummary(defaultPreferences.getString(DOWNLOAD_PATH_PREFERENCE, getString(R.string.download_path_summary)));
+        findPreference(DOWNLOAD_PATH_AUDIO_PREFERENCE).setSummary(defaultPreferences.getString(DOWNLOAD_PATH_AUDIO_PREFERENCE, getString(R.string.download_path_audio_summary)));
+    }
+
+    @Override
+    public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
+        if (MainActivity.DEBUG) Log.d("TAG", "onSharedPreferenceChanged() called with: sharedPreferences = [" + sharedPreferences + "], key = [" + key + "]");
+        String summary = null;
+
+        if (key.equals(USE_TOR_KEY)) {
+            if (defaultPreferences.getBoolean(USE_TOR_KEY, false)) {
+                if (OrbotHelper.isOrbotInstalled(activity)) {
+                    App.configureTor(true);
+                    OrbotHelper.requestStartTor(activity);
+                } else {
+                    Intent intent = OrbotHelper.getOrbotInstallIntent(activity);
+                    startActivityForResult(intent, REQUEST_INSTALL_ORBOT);
+                }
+            } else App.configureTor(false);
+            return;
+        } else if (key.equals(THEME)) {
+            summary = sharedPreferences.getString(THEME, getString(R.string.default_theme_value));
+            if (!summary.equals(currentTheme)) { // If it's not the current theme
+                getActivity().recreate();
+            }
+
+            defaultPreferences.edit().putBoolean(Constants.KEY_THEME_CHANGE, true).apply();
+        }
+
+        if (!TextUtils.isEmpty(summary)) findPreference(key).setSummary(summary);
+    }
+}

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

@@ -0,0 +1,126 @@
+package org.schabi.newpipe.util;
+
+import android.animation.Animator;
+import android.animation.AnimatorListenerAdapter;
+import android.util.Log;
+import android.view.View;
+
+import org.schabi.newpipe.player.BasePlayer;
+
+public class AnimationUtils {
+    private static final String TAG = "AnimationUtils";
+    private static final boolean DEBUG = BasePlayer.DEBUG;
+
+    public enum Type {
+        ALPHA, SCALE_AND_ALPHA
+    }
+
+    public static void animateView(View view, boolean enterOrExit, long duration) {
+        animateView(view, Type.ALPHA, enterOrExit, duration, 0, null);
+    }
+
+    public static void animateView(View view, boolean enterOrExit, long duration, long delay) {
+        animateView(view, Type.ALPHA, enterOrExit, duration, delay, null);
+    }
+
+    public static void animateView(View view, boolean enterOrExit, long duration, long delay, Runnable execOnEnd) {
+        animateView(view, Type.ALPHA, enterOrExit, duration, delay, execOnEnd);
+    }
+
+    public static void animateView(View view, Type animationType, boolean enterOrExit, long duration) {
+        animateView(view, animationType, enterOrExit, duration, 0, null);
+    }
+
+    public static void animateView(View view, Type animationType, boolean enterOrExit, long duration, long delay) {
+        animateView(view, animationType, enterOrExit, duration, delay, null);
+    }
+
+    /**
+     * Animate the view
+     *
+     * @param view          view that will be animated
+     * @param animationType {@link Type} of the animation
+     * @param enterOrExit   true to enter, false to exit
+     * @param duration      how long the animation will take, in milliseconds
+     * @param delay         how long the animation will wait to start, in milliseconds
+     * @param execOnEnd     runnable that will be executed when the animation ends
+     */
+    public static void animateView(final View view, Type animationType, boolean enterOrExit, long duration, long delay, Runnable execOnEnd) {
+        if (DEBUG) {
+            Log.d(TAG, "animateView() called with: view = [" + view + "], animationType = [" + animationType + "], enterOrExit = [" + enterOrExit + "], duration = [" + duration + "], delay = [" + delay + "], execOnEnd = [" + execOnEnd + "]");
+        }
+
+        if (view.getVisibility() == View.VISIBLE && enterOrExit) {
+            if (DEBUG) Log.d(TAG, "animateView() view was already visible > view = [" + view + "]");
+            view.animate().setListener(null).cancel();
+            view.setVisibility(View.VISIBLE);
+            view.setAlpha(1f);
+            if (execOnEnd != null) execOnEnd.run();
+            return;
+        } else if ((view.getVisibility() == View.GONE || view.getVisibility() == View.INVISIBLE) && !enterOrExit) {
+            if (DEBUG) Log.d(TAG, "animateView() view was already gone > view = [" + view + "]");
+            view.animate().setListener(null).cancel();
+            view.setVisibility(View.GONE);
+            view.setAlpha(0f);
+            if (execOnEnd != null) execOnEnd.run();
+            return;
+        }
+
+        view.animate().setListener(null).cancel();
+        view.setVisibility(View.VISIBLE);
+
+        switch (animationType) {
+            case ALPHA:
+                animateAlpha(view, enterOrExit, duration, delay, execOnEnd);
+                break;
+            case SCALE_AND_ALPHA:
+                animateScaleAndAlpha(view, enterOrExit, duration, delay, execOnEnd);
+                break;
+        }
+    }
+
+    private static void animateScaleAndAlpha(final View view, boolean enterOrExit, long duration, long delay, final Runnable execOnEnd) {
+        if (enterOrExit) {
+            view.setAlpha(0f);
+            view.setScaleX(.8f);
+            view.setScaleY(.8f);
+            view.animate().alpha(1f).scaleX(1f).scaleY(1f).setDuration(duration).setStartDelay(delay).setListener(new AnimatorListenerAdapter() {
+                @Override
+                public void onAnimationEnd(Animator animation) {
+                    if (execOnEnd != null) execOnEnd.run();
+                }
+            }).start();
+        } else {
+            view.setAlpha(1f);
+            view.setScaleX(1f);
+            view.setScaleY(1f);
+            view.animate().alpha(0f).scaleX(.8f).scaleY(.8f).setDuration(duration).setStartDelay(delay).setListener(new AnimatorListenerAdapter() {
+                @Override
+                public void onAnimationEnd(Animator animation) {
+                    view.setVisibility(View.GONE);
+                    if (execOnEnd != null) execOnEnd.run();
+                }
+            }).start();
+        }
+    }
+
+
+    private static void animateAlpha(final View view, boolean enterOrExit, long duration, long delay, final Runnable execOnEnd) {
+        if (enterOrExit) {
+            view.animate().alpha(1f).setDuration(duration).setStartDelay(delay).setListener(new AnimatorListenerAdapter() {
+                @Override
+                public void onAnimationEnd(Animator animation) {
+                    if (execOnEnd != null) execOnEnd.run();
+                }
+            }).start();
+        } else {
+            view.animate().alpha(0f).setDuration(duration).setStartDelay(delay).setListener(new AnimatorListenerAdapter() {
+                @Override
+                public void onAnimationEnd(Animator animation) {
+                    view.setVisibility(View.GONE);
+                    if (execOnEnd != null) execOnEnd.run();
+                }
+            }).start();
+        }
+    }
+}

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

@@ -0,0 +1,12 @@
+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";
+    public static final String KEY_OPEN_SEARCH = "key_open_search";
+    public static final String KEY_QUERY = "key_query";
+
+    public static final String KEY_THEME_CHANGE = "key_theme_change";
+}

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

@@ -0,0 +1,98 @@
+package org.schabi.newpipe.util;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.content.res.Resources;
+import android.preference.PreferenceManager;
+
+import org.schabi.newpipe.R;
+
+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/util/NavigationHelper.java

@@ -0,0 +1,231 @@
+package org.schabi.newpipe.util;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.preference.PreferenceManager;
+import android.support.annotation.CheckResult;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentManager;
+
+import com.nostra13.universalimageloader.core.ImageLoader;
+
+import org.schabi.newpipe.about.AboutActivity;
+import org.schabi.newpipe.MainActivity;
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.download.DownloadActivity;
+import org.schabi.newpipe.extractor.NewPipe;
+import org.schabi.newpipe.extractor.StreamingService;
+import org.schabi.newpipe.extractor.stream_info.AudioStream;
+import org.schabi.newpipe.extractor.stream_info.StreamInfo;
+import org.schabi.newpipe.fragments.MainFragment;
+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.player.BackgroundPlayer;
+import org.schabi.newpipe.player.BasePlayer;
+import org.schabi.newpipe.player.VideoPlayer;
+import org.schabi.newpipe.settings.SettingsActivity;
+
+@SuppressWarnings({"unused", "WeakerAccess"})
+public class NavigationHelper {
+    public static final String MAIN_FRAGMENT_TAG = "main_fragment_tag";
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Players
+    //////////////////////////////////////////////////////////////////////////*/
+
+    public static Intent getOpenVideoPlayerIntent(Context context, Class targetClazz, StreamInfo info, int selectedStreamIndex) {
+        Intent mIntent = new Intent(context, targetClazz)
+                .putExtra(BasePlayer.VIDEO_TITLE, info.title)
+                .putExtra(BasePlayer.VIDEO_URL, info.webpage_url)
+                .putExtra(BasePlayer.VIDEO_THUMBNAIL_URL, info.thumbnail_url)
+                .putExtra(BasePlayer.CHANNEL_NAME, info.uploader)
+                .putExtra(VideoPlayer.INDEX_SEL_VIDEO_STREAM, selectedStreamIndex)
+                .putExtra(VideoPlayer.VIDEO_STREAMS_LIST, Utils.getSortedStreamVideosList(context, info.video_streams, info.video_only_streams, false))
+                .putExtra(VideoPlayer.VIDEO_ONLY_AUDIO_STREAM, Utils.getHighestQualityAudio(info.audio_streams));
+        if (info.start_position > 0) mIntent.putExtra(BasePlayer.START_POSITION, info.start_position * 1000);
+        return mIntent;
+    }
+
+    public static Intent getOpenVideoPlayerIntent(Context context, Class targetClazz, VideoPlayer instance) {
+        return new Intent(context, targetClazz)
+                .putExtra(BasePlayer.VIDEO_TITLE, instance.getVideoTitle())
+                .putExtra(BasePlayer.VIDEO_URL, instance.getVideoUrl())
+                .putExtra(BasePlayer.VIDEO_THUMBNAIL_URL, instance.getVideoThumbnailUrl())
+                .putExtra(BasePlayer.CHANNEL_NAME, instance.getChannelName())
+                .putExtra(VideoPlayer.INDEX_SEL_VIDEO_STREAM, instance.getSelectedStreamIndex())
+                .putExtra(VideoPlayer.VIDEO_STREAMS_LIST, instance.getVideoStreamsList())
+                .putExtra(VideoPlayer.VIDEO_ONLY_AUDIO_STREAM, instance.getAudioStream())
+                .putExtra(BasePlayer.START_POSITION, ((int) instance.getPlayer().getCurrentPosition()))
+                .putExtra(BasePlayer.PLAYBACK_SPEED, instance.getPlaybackSpeed());
+    }
+
+    public static Intent getOpenBackgroundPlayerIntent(Context context, StreamInfo info) {
+        return getOpenBackgroundPlayerIntent(context, info, info.audio_streams.get(Utils.getPreferredAudioFormat(context, info.audio_streams)));
+    }
+
+    public static Intent getOpenBackgroundPlayerIntent(Context context, StreamInfo info, AudioStream audioStream) {
+        Intent mIntent = new Intent(context, BackgroundPlayer.class)
+                .putExtra(BasePlayer.VIDEO_TITLE, info.title)
+                .putExtra(BasePlayer.VIDEO_URL, info.webpage_url)
+                .putExtra(BasePlayer.VIDEO_THUMBNAIL_URL, info.thumbnail_url)
+                .putExtra(BasePlayer.CHANNEL_NAME, info.uploader)
+                .putExtra(BasePlayer.CHANNEL_NAME, info.uploader)
+                .putExtra(BackgroundPlayer.AUDIO_STREAM, audioStream);
+        if (info.start_position > 0) mIntent.putExtra(BasePlayer.START_POSITION, info.start_position * 1000);
+        return mIntent;
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Through FragmentManager
+    //////////////////////////////////////////////////////////////////////////*/
+
+    public static void gotoMainFragment(FragmentManager fragmentManager) {
+        ImageLoader.getInstance().clearMemoryCache();
+
+        boolean popped = fragmentManager.popBackStackImmediate(MAIN_FRAGMENT_TAG, 0);
+        if (!popped) openMainFragment(fragmentManager);
+    }
+
+    private static void openMainFragment(FragmentManager fragmentManager) {
+        fragmentManager.popBackStackImmediate(null, FragmentManager.POP_BACK_STACK_INCLUSIVE);
+        fragmentManager.beginTransaction()
+                .setCustomAnimations(R.anim.custom_fade_in, R.anim.custom_fade_out, R.anim.custom_fade_in, R.anim.custom_fade_out)
+                .replace(R.id.fragment_holder, new MainFragment())
+                .addToBackStack(MAIN_FRAGMENT_TAG)
+                .commit();
+    }
+
+    public static void openSearchFragment(FragmentManager fragmentManager, int serviceId, String query) {
+        fragmentManager.beginTransaction()
+                .setCustomAnimations(R.anim.custom_fade_in, R.anim.custom_fade_out, R.anim.custom_fade_in, R.anim.custom_fade_out)
+                .replace(R.id.fragment_holder, SearchFragment.getInstance(serviceId, query))
+                .addToBackStack(null)
+                .commit();
+    }
+
+    public static void openVideoDetailFragment(FragmentManager fragmentManager, int serviceId, String url, String title) {
+        openVideoDetailFragment(fragmentManager, serviceId, url, title, false);
+    }
+
+    public static void openVideoDetailFragment(FragmentManager fragmentManager, int serviceId, String url, String title, boolean autoPlay) {
+        Fragment fragment = fragmentManager.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);
+
+        fragmentManager.beginTransaction()
+                .setCustomAnimations(R.anim.custom_fade_in, R.anim.custom_fade_out, R.anim.custom_fade_in, R.anim.custom_fade_out)
+                .replace(R.id.fragment_holder, instance)
+                .addToBackStack(null)
+                .commit();
+    }
+
+    public static void openChannelFragment(FragmentManager fragmentManager, int serviceId, String url, String name) {
+        if (name == null) name = "";
+        fragmentManager.beginTransaction()
+                .setCustomAnimations(R.anim.custom_fade_in, R.anim.custom_fade_out, R.anim.custom_fade_in, R.anim.custom_fade_out)
+                .replace(R.id.fragment_holder, ChannelFragment.getInstance(serviceId, url, name))
+                .addToBackStack(null)
+                .commit();
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Through Intents
+    //////////////////////////////////////////////////////////////////////////*/
+
+    public static void openSearch(Context context, int serviceId, String query) {
+        Intent mIntent = new Intent(context, MainActivity.class);
+        mIntent.putExtra(Constants.KEY_SERVICE_ID, serviceId);
+        mIntent.putExtra(Constants.KEY_QUERY, query);
+        mIntent.putExtra(Constants.KEY_OPEN_SEARCH, true);
+        context.startActivity(mIntent);
+    }
+
+    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);
+    }
+
+    public static void openByLink(Context context, String url) throws Exception {
+        Intent intentByLink = getIntentByLink(context, url);
+        if (intentByLink == null) throw new NullPointerException("getIntentByLink(context = [" + context + "], url = [" + url + "]) returned null");
+        intentByLink.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        intentByLink.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
+        context.startActivity(intentByLink);
+    }
+
+    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=" + serviceId + " url=" + url);
+        }
+        return null;
+    }
+
+    public static void openAbout(Context context) {
+        Intent intent = new Intent(context, AboutActivity.class);
+        context.startActivity(intent);
+    }
+
+    public static void openSettings(Context context) {
+        Intent intent = new Intent(context, SettingsActivity.class);
+        context.startActivity(intent);
+    }
+
+    public static boolean openDownloads(Activity activity) {
+        if (!PermissionHelper.checkStoragePermissions(activity)) {
+            return false;
+        }
+        Intent intent = new Intent(activity, DownloadActivity.class);
+        activity.startActivity(intent);
+        return true;
+    }
+}

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,42 @@
+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
+     */
+    public static void setTheme(Context context) {
+
+        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 (sp.equals(darkTheme)) context.setTheme(R.style.DarkTheme);
+        else if (sp.equals(blackTheme)) context.setTheme(R.style.BlackTheme);
+        else context.setTheme(R.style.AppTheme);
+    }
+
+    /**
+     * Return true if the selected theme (on NewPipe settings) is the Light theme
+     *
+     * @param context context to get the preference
+     */
+    public static boolean isLightThemeSelected(Context context) {
+        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));
+
+        return !(sp.equals(darkTheme) || sp.equals(blackTheme));
+    }
+}

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

@@ -0,0 +1,273 @@
+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.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.List;
+
+@SuppressWarnings("WeakerAccess")
+public class Utils {
+
+    private static final List<String> HIGH_RESOLUTION_LIST = Arrays.asList("1440p", "2160p", "1440p60", "2160p60");
+
+    /**
+     * Return the index of the default stream in the list, based on the parameters
+     * defaultResolution and preferredFormat
+     *
+     * @param videoStreams          the list that will be extracted the index
+     *
+     * @return index of the preferred resolution&format
+     */
+    public static int getDefaultResolution(String defaultResolution, String preferredFormat, List<VideoStream> videoStreams) {
+
+        if (defaultResolution.equals("Best resolution")) {
+            return 0;
+        }
+
+        // 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;
+            }
+        }
+
+        if (selectedFormat == 0 && !videoStreams.get(selectedFormat).resolution.contains(defaultResolution.replace("p60", "p"))) {
+            // Maybe there's no 60 fps variant available, so fallback to the normal version
+            String replace = defaultResolution.replace("p60", "p");
+            for (int i = 0; i < videoStreams.size(); i++) {
+                VideoStream item = videoStreams.get(i);
+                if (replace.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 (replace.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;
+    }
+
+    /**
+     * @see #getDefaultResolution(String, String, List)
+     */
+    public static int getDefaultResolution(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));
+
+        return getDefaultResolution(defaultResolution, preferredFormat, videoStreams);
+    }
+
+    /**
+     * @see #getDefaultResolution(String, String, List)
+     */
+    public static int getPopupDefaultResolution(Context context, List<VideoStream> videoStreams) {
+        SharedPreferences defaultPreferences = PreferenceManager.getDefaultSharedPreferences(context);
+        if (defaultPreferences == null) return 0;
+
+        String defaultResolution = defaultPreferences
+                .getString(context.getString(R.string.default_popup_resolution_key), context.getString(R.string.default_popup_resolution_value));
+
+        String preferredFormat = defaultPreferences
+                .getString(context.getString(R.string.preferred_video_format_key), context.getString(R.string.preferred_video_format_default));
+
+        return getDefaultResolution(defaultResolution, preferredFormat, videoStreams);
+    }
+
+    /**
+     * Return the index of the default stream in the list, based on the
+     * preferred audio format chosen in the settings
+     *
+     * @param context           context to get the preferred audio format
+     * @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;
+        }
+
+        int highestQualityIndex = 0;
+
+        // Try to find a audio stream with the preferred format
+        for (int i = 0; i < audioStreams.size(); i++) if (audioStreams.get(i).format == preferredFormat) highestQualityIndex = i;
+
+        // Try to find a audio stream with the highest bitrate and preferred format
+        for (int i = 0; i < audioStreams.size(); i++) {
+            AudioStream audioStream = audioStreams.get(i);
+            if (audioStream.avgBitrate > audioStreams.get(highestQualityIndex).avgBitrate
+                    && audioStream.format == preferredFormat) highestQualityIndex = i;
+        }
+
+        return highestQualityIndex;
+    }
+
+    /**
+     * Get the audio from the list with the highest bitrate
+     *
+     * @param audioStreams list the audio streams
+     * @return audio with highest average bitrate
+     */
+    public static AudioStream getHighestQualityAudio(List<AudioStream> audioStreams) {
+        int highestQualityIndex = 0;
+
+        for (int i = 1; i < audioStreams.size(); i++) {
+            AudioStream audioStream = audioStreams.get(i);
+            if (audioStream.avgBitrate > audioStreams.get(highestQualityIndex).avgBitrate) highestQualityIndex = i;
+        }
+
+        return audioStreams.get(highestQualityIndex);
+    }
+
+    /**
+     * Join the two lists of video streams (video_only and normal videos), and sort them according with preferred format
+     * chosen by the user
+     *
+     * @param context          context to search for the format to give preference
+     * @param videoStreams     normal videos list
+     * @param videoOnlyStreams video only stream list
+     * @param ascendingOrder   true -> smallest to greatest | false -> greatest to smallest
+     * @return the sorted list
+     */
+    public static ArrayList<VideoStream> getSortedStreamVideosList(Context context, List<VideoStream> videoStreams, List<VideoStream> videoOnlyStreams, boolean ascendingOrder) {
+        boolean showHigherResolutions = PreferenceManager.getDefaultSharedPreferences(context).getBoolean(context.getString(R.string.show_higher_resolutions_key), false);
+        String preferredFormatString = PreferenceManager.getDefaultSharedPreferences(context).getString(context.getString(R.string.preferred_video_format_key), context.getString(R.string.preferred_video_format_default));
+        MediaFormat preferredFormat = MediaFormat.WEBM;
+        switch (preferredFormatString) {
+            case "WebM":
+                preferredFormat = MediaFormat.WEBM;
+                break;
+            case "MPEG-4":
+                preferredFormat = MediaFormat.MPEG_4;
+                break;
+            case "3GPP":
+                preferredFormat = MediaFormat.v3GPP;
+                break;
+            default:
+                break;
+        }
+        return getSortedStreamVideosList(preferredFormat, showHigherResolutions, videoStreams, videoOnlyStreams, ascendingOrder);
+    }
+
+    /**
+     * Join the two lists of video streams (video_only and normal videos), and sort them according with preferred format
+     * chosen by the user
+     *
+     * @param preferredFormat       format to give preference
+     * @param showHigherResolutions show >1080p resolutions
+     * @param videoStreams          normal videos list
+     * @param videoOnlyStreams      video only stream list
+     * @param ascendingOrder        true -> smallest to greatest | false -> greatest to smallest    @return the sorted list
+     * @return the sorted list
+     */
+    public static ArrayList<VideoStream> getSortedStreamVideosList(MediaFormat preferredFormat, boolean showHigherResolutions, List<VideoStream> videoStreams, List<VideoStream> videoOnlyStreams, boolean ascendingOrder) {
+        ArrayList<VideoStream> retList = new ArrayList<>();
+        HashMap<String, VideoStream> hashMap = new HashMap<>();
+
+        if (videoOnlyStreams != null) {
+            for (VideoStream stream : videoOnlyStreams) {
+                if (!showHigherResolutions && HIGH_RESOLUTION_LIST.contains(stream.resolution)) continue;
+                retList.add(stream);
+            }
+        }
+        if (videoStreams != null) {
+            for (VideoStream stream : videoStreams) {
+                if (!showHigherResolutions && HIGH_RESOLUTION_LIST.contains(stream.resolution)) continue;
+                retList.add(stream);
+            }
+        }
+
+        // Add all to the hashmap
+        for (VideoStream videoStream : retList) hashMap.put(videoStream.resolution, videoStream);
+
+        // Override the values when the key == resolution, with the preferredFormat
+        for (VideoStream videoStream : retList) {
+            if (videoStream.format == preferredFormat.id) hashMap.put(videoStream.resolution, videoStream);
+        }
+
+        retList.clear();
+        retList.addAll(hashMap.values());
+        sortStreamList(retList, ascendingOrder);
+        return retList;
+    }
+
+    /**
+     * Sort the streams list depending on the parameter ascendingOrder;
+     * <p>
+     * It works like that:<br>
+     * - Take a string resolution, remove the letters, replace "0p60" (for 60fps videos) with "1"
+     * and sort by the greatest:<br>
+     * <blockquote><pre>
+     *      720p     ->  720
+     *      720p60   ->  721
+     *      360p     ->  360
+     *      1080p    ->  1080
+     *      1080p60  ->  1081
+     * <p>
+     *  ascendingOrder  ? 360 < 720 < 721 < 1080 < 1081
+     *  !ascendingOrder ? 1081 < 1080 < 721 < 720 < 360/pre></blockquote>
+     * <p>
+     * @param videoStreams   list that the sorting will be applied
+     * @param ascendingOrder true -> smallest to greatest | false -> greatest to smallest
+     */
+    public static void sortStreamList(List<VideoStream> videoStreams, final boolean ascendingOrder) {
+        Collections.sort(videoStreams, new Comparator<VideoStream>() {
+            @Override
+            public int compare(VideoStream o1, VideoStream o2) {
+                int res1 = Integer.parseInt(o1.resolution.replace("0p60", "1").replaceAll("[^\\d.]", ""));
+                int res2 = Integer.parseInt(o2.resolution.replace("0p60", "1").replaceAll("[^\\d.]", ""));
+
+                return ascendingOrder ? res1 - res2 : res2 - res1;
+            }
+        });
+    }
+}

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

@@ -0,0 +1,118 @@
+package org.schabi.newpipe.workers;
+
+import android.content.Context;
+import android.os.Handler;
+
+import org.schabi.newpipe.extractor.NewPipe;
+import org.schabi.newpipe.extractor.StreamingService;
+import org.schabi.newpipe.extractor.stream_info.StreamInfo;
+
+import java.io.InterruptedIOException;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+/**
+ * Common properties of Workers
+ *
+ * @author mauriciocolli
+ */
+@SuppressWarnings("WeakerAccess")
+public abstract class AbstractWorker extends Thread {
+
+    private final AtomicBoolean isRunning = new AtomicBoolean(false);
+
+    private final int serviceId;
+    private Context context;
+    private Handler handler;
+    private StreamingService service;
+
+    public AbstractWorker(Context context, int serviceId) {
+        this.context = context;
+        this.serviceId = serviceId;
+        this.handler = new Handler(context.getMainLooper());
+    }
+
+    @Override
+    public void run() {
+        try {
+            isRunning.set(true);
+            service = NewPipe.getService(serviceId);
+            doWork(serviceId);
+        } catch (Exception e) {
+            // Handle the exception only if thread is not interrupted
+            e.printStackTrace();
+            if (!isInterrupted() && !(e instanceof InterruptedIOException) && !(e.getCause() instanceof InterruptedIOException)) {
+                handleException(e, serviceId);
+            }
+        } finally {
+            isRunning.set(false);
+        }
+    }
+
+    /**
+     * Here is the place that the heavy work is realized
+     *
+     * @param serviceId     serviceId that was passed when created this object
+     *
+     * @throws Exception    these exceptions are handled by the {@link #handleException(Exception, int)}
+     */
+    protected abstract void doWork(int serviceId) throws Exception;
+
+
+    /**
+     * Method that handle the exception thrown by the {@link #doWork(int)}.
+     *
+     * @param exception {@link Exception} that was thrown by {@link #doWork(int)}
+     */
+    protected abstract void handleException(Exception exception, int serviceId);
+
+    /**
+     * 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;
+    }
+
+    public Handler getHandler() {
+        return handler;
+    }
+
+    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/ChannelExtractorWorker.java

@@ -0,0 +1,116 @@
+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;
+
+import static org.schabi.newpipe.report.UserAction.REQUESTED_CHANNEL;
+
+/**
+ * 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, boolean onlyVideos);
+        void onError(int messageId);
+        /**
+         * Called when an unrecoverable error has occurred.
+         * <p> This is a good place to finish the caller. </p>
+         */
+        void onUnrecoverableError(Exception exception);
+    }
+
+    /**
+     * @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 pageNumber        which page to extract
+     * @param onlyVideos        flag that will be send by {@link OnChannelInfoReceive#onReceive(ChannelInfo, boolean)}
+     * @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, boolean onlyVideos, OnChannelInfoReceive callback) {
+        super(context, channelUrl, serviceId);
+        this.pageNumber = pageNumber;
+        this.callback = callback;
+        this.onlyVideos = onlyVideos;
+    }
+
+    @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, REQUESTED_CHANNEL);
+
+        if (callback != null && channelInfo != null && !isInterrupted()) getHandler().post(new Runnable() {
+            @Override
+            public void run() {
+                if (isInterrupted() || callback == null) return;
+
+                callback.onReceive(channelInfo, onlyVideos);
+                onDestroy();
+            }
+        });
+    }
+
+
+    @Override
+    protected void handleException(final Exception exception, int serviceId, String url) {
+        if (callback == null || getHandler() == null || isInterrupted()) return;
+
+        if (exception instanceof IOException) {
+            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(REQUESTED_CHANNEL, getServiceName(), url, R.string.parsing_error));
+            getHandler().post(new Runnable() {
+                @Override
+                public void run() {
+                    callback.onUnrecoverableError(exception);
+                }
+            });
+        } else {
+            ErrorActivity.reportError(getHandler(), getContext(), exception, MainActivity.class, null, ErrorActivity.ErrorInfo.make(REQUESTED_CHANNEL, getServiceName(), url, R.string.general_error));
+            getHandler().post(new Runnable() {
+                @Override
+                public void run() {
+                    callback.onUnrecoverableError(exception);
+                }
+            });
+        }
+    }
+}
+

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

@@ -0,0 +1,89 @@
+package org.schabi.newpipe.workers;
+
+import android.app.Activity;
+import android.content.Context;
+import android.util.Log;
+import android.view.View;
+
+import org.schabi.newpipe.report.ErrorActivity;
+import org.schabi.newpipe.report.UserAction;
+
+import java.util.List;
+
+/**
+ * Common properties of ExtractorWorkers
+ *
+ * @author mauriciocolli
+ */
+@SuppressWarnings("WeakerAccess")
+public abstract class ExtractorWorker extends AbstractWorker {
+    private final String url;
+
+    public ExtractorWorker(Context context, String url, int serviceId) {
+        super(context, serviceId);
+        this.url = url;
+        if (url.length() >= 40) setName("Thread-" + url.substring(url.length() - 11, url.length()));
+    }
+
+    @Override
+    protected void doWork(int serviceId) throws Exception {
+        doWork(serviceId, url);
+    }
+
+    /**
+     * 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;
+
+    @Override
+    protected void handleException(Exception exception, int serviceId) {
+        handleException(exception, serviceId, url);
+    }
+
+    /**
+     * 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, UserAction errorUserAction){
+        String errorString = "<error id>";
+        switch (errorUserAction) {
+            case REQUESTED_STREAM:
+                errorString=  errorUserAction.getMessage();
+                break;
+            case REQUESTED_CHANNEL:
+                errorString=  errorUserAction.getMessage();
+                break;
+        }
+
+        Log.e(errorString, "OCCURRED ERRORS DURING EXTRACTION:");
+        for (Throwable e : errorsList) {
+            e.printStackTrace();
+            Log.e(errorString, "------");
+        }
+
+        if (getContext() instanceof Activity) {
+            View rootView = getContext() instanceof Activity ? ((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 */));
+        }
+    }
+
+    public String getUrl() {
+        return url;
+    }
+}

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

@@ -0,0 +1,130 @@
+package org.schabi.newpipe.workers;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.preference.PreferenceManager;
+import android.support.annotation.NonNull;
+import android.view.View;
+
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.extractor.exceptions.ExtractionException;
+import org.schabi.newpipe.extractor.exceptions.ReCaptchaException;
+import org.schabi.newpipe.extractor.search.SearchEngine;
+import org.schabi.newpipe.extractor.search.SearchResult;
+import org.schabi.newpipe.report.ErrorActivity;
+import org.schabi.newpipe.report.UserAction;
+
+import java.io.IOException;
+import java.util.EnumSet;
+
+import static org.schabi.newpipe.report.UserAction.*;
+
+/**
+ * Return list of results based on a query
+ *
+ * @author mauriciocolli
+ */
+public class SearchWorker extends AbstractWorker {
+
+    private EnumSet<SearchEngine.Filter> filter;
+    private String query;
+    private int page;
+    private OnSearchResult callback;
+
+    /**
+     * Interface which will be called for result and errors
+     */
+    public interface OnSearchResult {
+        void onSearchResult(SearchResult result);
+        void onNothingFound(String message);
+        void onSearchError(int messageId);
+        void onReCaptchaChallenge();
+    }
+
+    public SearchWorker(Context context, int serviceId, String query, int page, EnumSet<SearchEngine.Filter> filter, OnSearchResult callback) {
+        super(context, serviceId);
+        this.callback = callback;
+        this.query = query;
+        this.page = page;
+        this.filter = filter;
+    }
+
+    public static SearchWorker startForQuery(Context context, int serviceId, @NonNull String query, int page, EnumSet<SearchEngine.Filter> filter, OnSearchResult callback) {
+        SearchWorker worker = new SearchWorker(context, serviceId, query, page, filter, callback);
+        worker.start();
+        return worker;
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        this.callback = null;
+    }
+
+    @Override
+    protected void doWork(int serviceId) throws Exception {
+        SearchEngine searchEngine = getService().getSearchEngineInstance();
+
+        SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(getContext());
+        String searchLanguageKey = getContext().getString(R.string.search_language_key);
+        String searchLanguage = sharedPreferences.getString(searchLanguageKey, getContext().getString(R.string.default_language_value));
+
+        final SearchResult searchResult = SearchResult.getSearchResult(searchEngine, query, page, searchLanguage, filter);
+        if (callback != null && searchResult != null && !isInterrupted()) getHandler().post(new Runnable() {
+            @Override
+            public void run() {
+                if (isInterrupted() || callback == null) return;
+
+                callback.onSearchResult(searchResult);
+                onDestroy();
+            }
+        });
+    }
+
+    @Override
+    protected void handleException(final Exception exception, int serviceId) {
+        if (callback == null || getHandler() == null || isInterrupted()) return;
+
+        if (exception instanceof ReCaptchaException) {
+            getHandler().post(new Runnable() {
+                @Override
+                public void run() {
+                    callback.onReCaptchaChallenge();
+                }
+            });
+        } else if (exception instanceof IOException) {
+            getHandler().post(new Runnable() {
+                @Override
+                public void run() {
+                    callback.onSearchError(R.string.network_error);
+                }
+            });
+        } else if (exception instanceof SearchEngine.NothingFoundException) {
+            getHandler().post(new Runnable() {
+                @Override
+                public void run() {
+                    callback.onNothingFound(exception.getMessage());
+                }
+            });
+        } else if (exception instanceof ExtractionException) {
+            View rootView = getContext() instanceof Activity ? ((Activity) getContext()).findViewById(android.R.id.content) : null;
+            ErrorActivity.reportError(getHandler(), getContext(), exception, null, rootView, ErrorActivity.ErrorInfo.make(SEARCHED, getServiceName(), query, R.string.parsing_error));
+            getHandler().post(new Runnable() {
+                @Override
+                public void run() {
+                    callback.onSearchError(R.string.parsing_error);
+                }
+            });
+        } else {
+            View rootView = getContext() instanceof Activity ? ((Activity) getContext()).findViewById(android.R.id.content) : null;
+            ErrorActivity.reportError(getHandler(), getContext(), exception, null, rootView, ErrorActivity.ErrorInfo.make(SEARCHED, getServiceName(), query, R.string.general_error));
+            getHandler().post(new Runnable() {
+                @Override
+                public void run() {
+                    callback.onSearchError(R.string.general_error);
+                }
+            });
+        }
+    }
+}

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

@@ -0,0 +1,168 @@
+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 org.schabi.newpipe.report.UserAction;
+
+import java.io.IOException;
+
+import static org.schabi.newpipe.report.UserAction.*;
+
+/**
+ * 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();
+
+        /**
+         * Called when an unrecoverable error has occurred.
+         * <p> This is a good place to finish the caller. </p>
+         */
+        void onUnrecoverableError(Exception exception);
+    }
+
+    /**
+     * @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, REQUESTED_STREAM);
+
+        if (callback != null && getHandler() != 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, final String url) {
+        if (callback == null || getHandler() == null || isInterrupted()) return;
+
+        if (exception instanceof ReCaptchaException) {
+            getHandler().post(new Runnable() {
+                @Override
+                public void run() {
+                    callback.onReCaptchaException();
+                }
+            });
+        } else if (exception instanceof IOException) {
+            getHandler().post(new Runnable() {
+                @Override
+                public void run() {
+                    callback.onError(R.string.network_error);
+                }
+            });
+        } else if (exception instanceof YoutubeStreamExtractor.GemaException) {
+            getHandler().post(new Runnable() {
+                @Override
+                public void run() {
+                    callback.onBlockedByGemaError();
+                }
+            });
+        } else if (exception instanceof YoutubeStreamExtractor.LiveStreamException) {
+            getHandler().post(new Runnable() {
+                @Override
+                public void run() {
+                    callback.onContentErrorWithMessage(R.string.live_streams_not_supported);
+                }
+            });
+        } else if (exception instanceof StreamExtractor.ContentNotAvailableException) {
+            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(REQUESTED_STREAM, getServiceName(), url, R.string.youtube_signature_decryption_error));
+            getHandler().post(new Runnable() {
+                @Override
+                public void run() {
+                    callback.onUnrecoverableError(exception);
+                }
+            });
+        } 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(REQUESTED_STREAM, getServiceName(), url, R.string.could_not_get_stream));
+            } else {
+                ErrorActivity.reportError(getHandler(), getContext(), streamInfo.errors, MainActivity.class, null, ErrorActivity.ErrorInfo.make(REQUESTED_STREAM, getServiceName(), url, R.string.could_not_get_stream));
+            }
+
+            getHandler().post(new Runnable() {
+                @Override
+                public void run() {
+                    callback.onUnrecoverableError(exception);
+                }
+            });
+        } else if (exception instanceof ParsingException) {
+            ErrorActivity.reportError(getHandler(), getContext(), exception, MainActivity.class, null, ErrorActivity.ErrorInfo.make(REQUESTED_STREAM, getServiceName(), url, R.string.parsing_error));
+            getHandler().post(new Runnable() {
+                @Override
+                public void run() {
+                    callback.onUnrecoverableError(exception);
+                }
+            });
+        } else {
+            ErrorActivity.reportError(getHandler(), getContext(), exception, MainActivity.class, null, ErrorActivity.ErrorInfo.make(REQUESTED_STREAM, getServiceName(), url, R.string.general_error));
+            getHandler().post(new Runnable() {
+                @Override
+                public void run() {
+                    callback.onUnrecoverableError(exception);
+                }
+            });
+        }
+
+    }
+
+}

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

@@ -0,0 +1,111 @@
+package org.schabi.newpipe.workers;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.preference.PreferenceManager;
+import android.support.annotation.NonNull;
+import android.view.View;
+
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.extractor.SuggestionExtractor;
+import org.schabi.newpipe.extractor.exceptions.ExtractionException;
+import org.schabi.newpipe.report.ErrorActivity;
+import org.schabi.newpipe.report.UserAction;
+
+import java.io.IOException;
+import java.util.List;
+
+import static org.schabi.newpipe.report.UserAction.*;
+
+/**
+ * Worker that get suggestions based on the query
+ *
+ * @author mauriciocolli
+ */
+public class SuggestionWorker extends AbstractWorker {
+
+    private String query;
+    private OnSuggestionResult callback;
+
+    /**
+     * Interface which will be called for result and errors
+     */
+    public interface OnSuggestionResult {
+        void onSuggestionResult(@NonNull List<String> suggestions);
+        void onSuggestionError(int messageId);
+    }
+
+    public SuggestionWorker(Context context, int serviceId, String query, OnSuggestionResult callback) {
+        super(context, serviceId);
+        this.callback = callback;
+        this.query = query;
+    }
+
+    public static SuggestionWorker startForQuery(Context context, int serviceId, @NonNull String query, OnSuggestionResult callback) {
+        SuggestionWorker worker = new SuggestionWorker(context, serviceId, query, callback);
+        worker.start();
+        return worker;
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        this.callback = null;
+        this.query = null;
+    }
+
+    @Override
+    protected void doWork(int serviceId) throws Exception {
+        SuggestionExtractor suggestionExtractor = getService().getSuggestionExtractorInstance();
+
+        SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(getContext());
+        String searchLanguageKey = getContext().getString(R.string.search_language_key);
+        String searchLanguage = sharedPreferences.getString(searchLanguageKey, getContext().getString(R.string.default_language_value));
+
+        final List<String> suggestions = suggestionExtractor.suggestionList(query, searchLanguage);
+
+        if (callback != null && suggestions != null && !isInterrupted()) getHandler().post(new Runnable() {
+            @Override
+            public void run() {
+                if (isInterrupted() || callback == null) return;
+
+                callback.onSuggestionResult(suggestions);
+                onDestroy();
+            }
+        });
+    }
+
+    @Override
+    protected void handleException(final Exception exception, int serviceId) {
+        if (callback == null || getHandler() == null || isInterrupted()) return;
+
+        if (exception instanceof ExtractionException) {
+            View rootView = getContext() instanceof Activity ? ((Activity) getContext()).findViewById(android.R.id.content) : null;
+            ErrorActivity.reportError(getHandler(), getContext(), exception, null, rootView, ErrorActivity.ErrorInfo.make(GET_SUGGESTIONS, getServiceName(), query, R.string.parsing_error));
+            getHandler().post(new Runnable() {
+                @Override
+                public void run() {
+                    callback.onSuggestionError(R.string.parsing_error);
+                }
+            });
+        } else if (exception instanceof IOException) {
+            getHandler().post(new Runnable() {
+                @Override
+                public void run() {
+                    callback.onSuggestionError(R.string.network_error);
+                }
+            });
+        } else {
+            View rootView = getContext() instanceof Activity ? ((Activity) getContext()).findViewById(android.R.id.content) : null;
+            ErrorActivity.reportError(getHandler(), getContext(), exception, null, rootView, ErrorActivity.ErrorInfo.make(GET_SUGGESTIONS, getServiceName(), query, R.string.general_error));
+            getHandler().post(new Runnable() {
+                @Override
+                public void run() {
+                    callback.onSuggestionError(R.string.general_error);
+                }
+            });
+        }
+
+    }
+}

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

@@ -1,498 +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 android.util.Xml;
-
-import java.io.StringReader;
-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;
-import org.xmlpull.v1.XmlPullParser;
-
-/**
- * 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 int resolveFormat(int itag) {
-        switch(itag) {
-            // video
-            case 17: return VideoInfo.I_3GPP;
-            case 18: return VideoInfo.I_MPEG_4;
-            case 22: return VideoInfo.I_MPEG_4;
-            case 36: return VideoInfo.I_3GPP;
-            case 37: return VideoInfo.I_MPEG_4;
-            case 38: return VideoInfo.I_MPEG_4;
-            case 43: return VideoInfo.I_WEBM;
-            case 44: return VideoInfo.I_WEBM;
-            case 45: return VideoInfo.I_WEBM;
-            case 46: return VideoInfo.I_WEBM;
-            default:
-                //Log.i(TAG, "Itag " + Integer.toString(itag) + " not known or not supported.");
-                return -1;
-        }
-    }
-
-    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 {
-            URI uri = new URI(videoUrl);
-            if(uri.getHost().contains("youtube")) {
-                String query = uri.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");
-            } else if(uri.getHost().contains("youtu.be")) {
-                // uri.getRawPath() does somehow not return the last character.
-                // so we do a workaround instead.
-                //return uri.getRawPath();
-                String url[] = videoUrl.split("/");
-                return url[url.length-1];
-            } else {
-                Log.e(TAG, "Error could not parse url: " + videoUrl);
-
-            }
-        }  catch(Exception e) {
-            Log.e(TAG, "Error could not parse url: " + videoUrl);
-            e.printStackTrace();
-            return "";
-        }
-        return null;
-    }
-
-    @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;
-        String dashManifest = "";
-        {
-            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
-            dashManifest = playerArgs.getString("dashmpd");
-            String playerUrl = ytAssets.getString("js");
-            if(playerUrl.startsWith("//")) {
-                playerUrl = "https:" + playerUrl;
-            }
-            if(decryptoinCode.isEmpty()) {
-                decryptoinCode = loadDecryptioinCode(playerUrl);
-            }
-
-            // extract audio
-            videoInfo.audioStreams = parseDashManifest(dashManifest, decryptoinCode);
-
-            //------------------------------------
-            // extract video stream url
-            //------------------------------------
-            String encoded_url_map = playerArgs.getString("url_encoded_fmt_stream_map");
-            Vector<VideoInfo.VideoStream> videoStreams = new Vector<>();
-            for(String url_data_str : encoded_url_map.split(",")) {
-                Map<String, String> tags = new HashMap<>();
-                for(String raw_tag : Parser.unescapeEntities(url_data_str, true).split("&")) {
-                    String[] split_tag = raw_tag.split("=");
-                    tags.put(split_tag[0], split_tag[1]);
-                }
-
-                int itag = Integer.parseInt(tags.get("itag"));
-                String streamUrl = 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) {
-                    if(decryptoinCode.isEmpty()) {
-                        decryptoinCode = loadDecryptioinCode(playerUrl);
-                    }
-                    streamUrl = streamUrl + "&signature=" + decryptSignature(tags.get("s"), decryptoinCode);
-                }
-
-                if(resolveFormat(itag) != -1) {
-                    videoStreams.add(new VideoInfo.VideoStream(
-                            streamUrl,
-                            resolveFormat(itag),
-                            resolveResolutionString(itag)));
-                }
-            }
-            videoInfo.videoStreams = new VideoInfo.VideoStream[videoStreams.size()];
-            for(int i = 0; i < videoStreams.size(); i++) {
-                videoInfo.videoStreams[i] = videoStreams.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 VideoInfo.AudioStream[] parseDashManifest(String dashManifest, String decryptoinCode) {
-        if(!dashManifest.contains("/signature/")) {
-            String encryptedSig = "";
-            String decryptedSig = "";
-            try {
-                Pattern p = Pattern.compile("/s/([a-fA-F0-9\\.]+)");
-                Matcher m = p.matcher(dashManifest);
-                m.find();
-                encryptedSig = m.group(1);
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-            decryptedSig = decryptSignature(encryptedSig, decryptoinCode);
-            dashManifest = dashManifest.replace("/s/" + encryptedSig, "/signature/" + decryptedSig);
-        }
-        String dashDoc = Downloader.download(dashManifest);
-        Vector<VideoInfo.AudioStream> audioStreams = new Vector<>();
-        try {
-            XmlPullParser parser = Xml.newPullParser();
-            parser.setInput(new StringReader(dashDoc));
-            int eventType = parser.getEventType();
-            String tagName = "";
-            String currentMimeType = "";
-            int currentBandwidth = -1;
-            int currentSamplingRate = -1;
-            boolean currentTagIsBaseUrl = false;
-            while(eventType != XmlPullParser.END_DOCUMENT) {
-                switch(eventType) {
-                    case XmlPullParser.START_TAG:
-                        tagName = parser.getName();
-                        if(tagName.equals("AdaptationSet")) {
-                            currentMimeType = parser.getAttributeValue(XmlPullParser.NO_NAMESPACE, "mimeType");
-                        } else if(tagName.equals("Representation") && currentMimeType.contains("audio")) {
-                            currentBandwidth = Integer.parseInt(
-                                    parser.getAttributeValue(XmlPullParser.NO_NAMESPACE, "bandwidth"));
-                            currentSamplingRate = Integer.parseInt(
-                                    parser.getAttributeValue(XmlPullParser.NO_NAMESPACE, "audioSamplingRate"));
-                        } else if(tagName.equals("BaseURL")) {
-                            currentTagIsBaseUrl = true;
-                        }
-
-                        break;
-                    case XmlPullParser.TEXT:
-                        if(currentTagIsBaseUrl &&
-                                (currentMimeType.contains("audio"))) {
-                            int format = -1;
-                            if(currentMimeType.equals(VideoInfo.M_WEBMA)) {
-                                format = VideoInfo.I_WEBMA;
-                            } else if(currentMimeType.equals(VideoInfo.M_M4A)) {
-                                format = VideoInfo.I_M4A;
-                            }
-                            audioStreams.add(new VideoInfo.AudioStream(parser.getText(),
-                                     format, currentBandwidth, currentSamplingRate));
-                        }
-                    case XmlPullParser.END_TAG:
-                        if(tagName.equals("AdaptationSet")) {
-                            currentMimeType = "";
-                        } else if(tagName.equals("BaseURL")) {
-                            currentTagIsBaseUrl = false;
-                        }
-                        break;
-                    default:
-                }
-                eventType = parser.next();
-            }
-        } catch(Exception e) {
-            e.printStackTrace();
-        }
-        VideoInfo.AudioStream[] output = new VideoInfo.AudioStream[audioStreams.size()];
-        for(int i = 0; i < output.length; i++) {
-            output[i] = audioStreams.get(i);
-        }
-        return output;
-    }
-
-    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 decryptSignature(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();
-    }
-}