move on to v0.9.10

Currently translated at 97.6% (164 of 168 strings)

.github/CONTRIBUTING.md

@@ -5,13 +5,14 @@ READ THIS GUIDELINES CAREFULLY BEFORE CONTRIBUTING.
 
 ## Crash reporting
 
-Do not report crashes in the GitHub issue tracker. NewPipe has an automated crash report system that will ask you to send a report if a crash occures.
+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. 

.gitignore

@@ -9,3 +9,4 @@
 /*.iml
 gradle.properties
 *~
+.weblate

README.md

@@ -4,7 +4,7 @@ WARNING: PUTTING NEWPIPE OR ANY FORK OF IT INTO GOOGLE PLAYSTORE VIOLATES THEIR
 NewPipe: A free lightweight Youtube frontend for Android.  
 
 [![NewPipe](app/src/main/res/mipmap-xhdpi/ic_launcher.png)](https://newpipe.schabi.org)
-[![F-Droid](https://f-droid.org/wiki/images/0/06/F-Droid-button_get-it-on.png)](https://f-droid.org/repository/browse/?fdfilter=newpipe&fdid=org.schabi.newpipe)
+[![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/)
 
 
 Project status:
@@ -19,11 +19,16 @@ Project status:
 
 ## Screenshots
 
-[<img src="screenshots/screenshot_1.png" width=150>](screenshots/screenshot_1.png)
-[<img src="screenshots/screenshot_2.png" width=150>](screenshots/screenshot_2.png)
-[<img src="screenshots/screenshot_3.png" width=150>](screenshots/screenshot_3.png)
-[<img src="screenshots/screenshot_4.png" width=150>](screenshots/screenshot_4.png)
-[<img src="screenshots/screenshot_5.png" width=150>](screenshots/screenshot_5.png)
+[<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
 
@@ -35,6 +40,7 @@ NewPipe does not use any Google framework libraries, or the YouTube API. It only
 * 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

app/build.gradle

@@ -8,8 +8,10 @@ android {
         applicationId "org.schabi.newpipe"
         minSdkVersion 15
         targetSdkVersion 25
-        versionCode 31
-        versionName "0.9.4"
+        versionCode 37
+        versionName "0.9.10"
+
+        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
         release {
@@ -31,6 +33,11 @@ android {
 }
 
 dependencies {
+    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'
@@ -50,5 +57,5 @@ dependencies {
     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.3.1'
+    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,12 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+<manifest
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="org.schabi.newpipe">
 
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.WAKE_LOCK" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <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
@@ -19,12 +20,10 @@
         tools:ignore="AllowBackup">
         <activity
             android:name=".MainActivity"
-            android:label="@string/app_name"
-            android:launchMode="singleTask">
+            android:label="@string/app_name">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
 
@@ -32,12 +31,15 @@
             android:name=".player.PlayVideoActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:theme="@style/VideoPlayerTheme"
-            tools:ignore="UnusedAttribute" />
+            tools:ignore="UnusedAttribute"/>
 
         <service
             android:name=".player.BackgroundPlayer"
-            android:exported="false"
-            android:label="@string/background_player_name" />
+            android:exported="false"/>
+
+        <service
+            android:name=".player.PopupVideoPlayer"
+            android:exported="false"/>
 
         <activity
             android:name=".player.MainVideoPlayer"
@@ -48,32 +50,32 @@
 
         <activity
             android:name=".settings.SettingsActivity"
-            android:label="@string/settings_activity_title" />
+            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" />
+                <action android:name="info.guardianproject.panic.action.TRIGGER"/>
 
-                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.DEFAULT"/>
             </intent-filter>
         </activity>
         <activity
             android:name=".ExitActivity"
             android:label="@string/general_error"
-            android:theme="@android:style/Theme.NoDisplay" />
-        <activity android:name=".report.ErrorActivity" />
+            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" />
+            android:theme="@style/AppTheme"/>
 
-        <service android:name="us.shandian.giga.service.DownloadManagerService" />
+        <service android:name="us.shandian.giga.service.DownloadManagerService"/>
 
         <activity
             android:name="com.nononsenseapps.filepicker.FilePickerActivity"
@@ -82,7 +84,7 @@
             android:theme="@style/FilePickerTheme"/>
         <activity
             android:name=".ReCaptchaActivity"
-            android:label="@string/reCaptchaActivity" />
+            android:label="@string/reCaptchaActivity"/>
 
         <provider
             android:name="android.support.v4.content.FileProvider"
@@ -91,7 +93,7 @@
             android:grantUriPermissions="true">
             <meta-data
                 android:name="android.support.FILE_PROVIDER_PATHS"
-                android:resource="@xml/provider_paths" />
+                android:resource="@xml/provider_paths"/>
         </provider>
 
         <activity
@@ -99,57 +101,57 @@
             android:taskAffinity=""
             android:theme="@android:style/Theme.NoDisplay">
             <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-                <action android:name="android.media.action.MEDIA_PLAY_FROM_SEARCH" />
-                <action android:name="android.nfc.action.NDEF_DISCOVERED" />
+                <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" />
+                <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" />
+                <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" />
+                <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" />
+                <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" />
+                <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="/" />
+                <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" />
+                <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" />
+                <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" />
+                <data android:scheme="vnd.youtube"/>
+                <data android:scheme="vnd.youtube.launch"/>
             </intent-filter>
             <intent-filter>
-                <action android:name="android.intent.action.SEND" />
+                <action android:name="android.intent.action.SEND"/>
 
-                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.DEFAULT"/>
 
-                <data android:mimeType="text/plain" />
+                <data android:mimeType="text/plain"/>
             </intent-filter>
         </activity>
 
@@ -159,57 +161,59 @@
             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" />
+                <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" />
+                <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" />
+                <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" />
+                <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" />
+                <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" />
+                <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="/" />
+                <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" />
+                <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" />
+                <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" />
+                <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" />
+                <action android:name="android.intent.action.SEND"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <data android:mimeType="text/plain"/>
             </intent-filter>
         </activity>
-
-        <service android:name=".player.PopupVideoPlayer"/>
-
+        <activity
+            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/App.java

@@ -14,6 +14,7 @@ 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;
 
@@ -59,7 +60,7 @@ public class App extends Application {
         } catch(ACRAConfigurationException ace) {
             ace.printStackTrace();
             ErrorActivity.reportError(this, ace, null, null,
-                    ErrorActivity.ErrorInfo.make(ErrorActivity.SEARCHED,"none",
+                    ErrorActivity.ErrorInfo.make(UserAction.SEARCHED,"none",
                             "Could not initialize ACRA crash report", R.string.app_ui_crash));
         }
 

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

@@ -9,6 +9,7 @@ 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.
@@ -49,7 +50,7 @@ public class ImageErrorLoadingListener implements ImageLoadingListener {
     public void onLoadingFailed(String imageUri, View view, FailReason failReason) {
         ErrorActivity.reportError(context,
                 failReason.getCause(), null, rootView,
-                ErrorActivity.ErrorInfo.make(ErrorActivity.LOAD_IMAGE,
+                ErrorActivity.ErrorInfo.make(UserAction.LOAD_IMAGE,
                         NewPipe.getNameOfService(serviceId), imageUri,
                         R.string.could_not_load_image));
     }

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

@@ -21,9 +21,10 @@
 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.v4.app.FragmentManager;
 import android.support.v7.app.ActionBar;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
@@ -33,13 +34,8 @@ import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 
-import com.nostra13.universalimageloader.core.ImageLoader;
-
 import org.schabi.newpipe.download.DownloadActivity;
 import org.schabi.newpipe.extractor.StreamingService;
-import org.schabi.newpipe.fragments.MainFragment;
-import org.schabi.newpipe.fragments.OnItemSelectedListener;
-import org.schabi.newpipe.fragments.channel.ChannelFragment;
 import org.schabi.newpipe.fragments.detail.VideoDetailFragment;
 import org.schabi.newpipe.fragments.search.SearchFragment;
 import org.schabi.newpipe.settings.SettingsActivity;
@@ -48,7 +44,7 @@ import org.schabi.newpipe.util.NavigationHelper;
 import org.schabi.newpipe.util.PermissionHelper;
 import org.schabi.newpipe.util.ThemeHelper;
 
-public class MainActivity extends AppCompatActivity implements OnItemSelectedListener {
+public class MainActivity extends AppCompatActivity {
     private static final String TAG = "MainActivity";
     public static final boolean DEBUG = false;
 
@@ -71,6 +67,19 @@ public class MainActivity extends AppCompatActivity implements OnItemSelectedLis
         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 + "]");
@@ -89,10 +98,14 @@ public class MainActivity extends AppCompatActivity implements OnItemSelectedLis
     @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;
 
-        super.onBackPressed();
+
+        if (getSupportFragmentManager().getBackStackEntryCount() == 1) {
+            finish();
+        } else super.onBackPressed();
     }
 
     /*//////////////////////////////////////////////////////////////////////////
@@ -131,25 +144,19 @@ public class MainActivity extends AppCompatActivity implements OnItemSelectedLis
 
         switch (id) {
             case android.R.id.home: {
-                Fragment fragment = getSupportFragmentManager().findFragmentById(R.id.fragment_holder);
-                if (fragment instanceof VideoDetailFragment) ((VideoDetailFragment) fragment).clearHistory();
-
-                NavigationHelper.openMainActivity(this);
+                NavigationHelper.gotoMainFragment(getSupportFragmentManager());
                 return true;
             }
             case R.id.action_settings: {
-                Intent intent = new Intent(this, SettingsActivity.class);
-                startActivity(intent);
+                NavigationHelper.openSettings(this);
                 return true;
             }
             case R.id.action_show_downloads: {
-                if (!PermissionHelper.checkStoragePermissions(this)) {
-                    return false;
-                }
-                Intent intent = new Intent(this, DownloadActivity.class);
-                startActivity(intent);
-                return true;
+                return NavigationHelper.openDownloads(this);
             }
+            case R.id.action_about:
+                NavigationHelper.openAbout(this);
+                return true;
             default:
                 return super.onOptionsItemSelected(item);
         }
@@ -160,26 +167,9 @@ public class MainActivity extends AppCompatActivity implements OnItemSelectedLis
     //////////////////////////////////////////////////////////////////////////*/
 
     private void initFragments() {
-        openMainFragment();
-        if (getIntent() != null && getIntent().hasExtra(Constants.KEY_URL)) {
+        if (getIntent() != null && getIntent().hasExtra(Constants.KEY_LINK_TYPE)) {
             handleIntent(getIntent());
-        }
-    }
-
-    /*//////////////////////////////////////////////////////////////////////////
-    // OnItemSelectedListener
-    //////////////////////////////////////////////////////////////////////////*/
-
-    @Override
-    public void onItemSelected(StreamingService.LinkType linkType, int serviceId, String url, String name) {
-        switch (linkType) {
-            case STREAM:
-                openVideoDetailFragment(serviceId, url, name, false);
-                break;
-            case CHANNEL:
-                openChannelFragment(serviceId, url, name);
-                break;
-        }
+        } else NavigationHelper.gotoMainFragment(getSupportFragmentManager());
     }
 
     /*//////////////////////////////////////////////////////////////////////////
@@ -187,96 +177,28 @@ public class MainActivity extends AppCompatActivity implements OnItemSelectedLis
     //////////////////////////////////////////////////////////////////////////*/
 
     private void handleIntent(Intent intent) {
-        if (intent.hasExtra(Constants.KEY_THEME_CHANGE) && intent.getBooleanExtra(Constants.KEY_THEME_CHANGE, false)) {
-            this.recreate();
-            Intent setI = new Intent(this, SettingsActivity.class);
-            startActivity(setI);
-            return;
-        }
+        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);
-            try {
-                switch (((StreamingService.LinkType) intent.getSerializableExtra(Constants.KEY_LINK_TYPE))) {
-                    case STREAM:
-                        handleVideoDetailIntent(serviceId, url, intent);
-                        break;
-                    case CHANNEL:
-                        handleChannelIntent(serviceId, url, intent);
-                        break;
-                    case NONE:
-                        throw new Exception("Url not known to service. service=" + Integer.toString(serviceId) + " url=" + url);
-                }
-            } catch (Exception e) {
-                e.printStackTrace();
+            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);
-            openSearchFragment(serviceId, searchQuery);
+            NavigationHelper.openSearchFragment(getSupportFragmentManager(), serviceId, searchQuery);
         } else {
-            getSupportFragmentManager().popBackStackImmediate(null, FragmentManager.POP_BACK_STACK_INCLUSIVE);
-            openMainFragment();//openSearchFragment();
+            NavigationHelper.gotoMainFragment(getSupportFragmentManager());
         }
     }
-
-    private void openMainFragment() {
-        ImageLoader.getInstance().clearMemoryCache();
-        getSupportFragmentManager().beginTransaction()
-                .setCustomAnimations(android.R.anim.fade_in, android.R.anim.fade_out, android.R.anim.fade_in, android.R.anim.fade_out)
-                .replace(R.id.fragment_holder, new MainFragment())
-                .commit();
-    }
-
-    private void openSearchFragment(int serviceId, String query) {
-        getSupportFragmentManager().beginTransaction()
-                .setCustomAnimations(android.R.anim.fade_in, android.R.anim.fade_out, android.R.anim.fade_in, android.R.anim.fade_out)
-                .replace(R.id.fragment_holder, SearchFragment.getInstance(serviceId, query))
-                .addToBackStack(null)
-                .commit();
-    }
-
-    private void openVideoDetailFragment(int serviceId, String url, String title, boolean autoPlay) {
-        Fragment fragment = getSupportFragmentManager().findFragmentById(R.id.fragment_holder);
-        if (title == null) title = "";
-
-        if (fragment instanceof VideoDetailFragment && fragment.isVisible()) {
-            VideoDetailFragment detailFragment = (VideoDetailFragment) fragment;
-            detailFragment.setAutoplay(autoPlay);
-            detailFragment.selectAndLoadVideo(serviceId, url, title);
-            return;
-        }
-
-        VideoDetailFragment instance = VideoDetailFragment.getInstance(serviceId, url, title);
-        instance.setAutoplay(autoPlay);
-
-        getSupportFragmentManager().beginTransaction()
-                .setCustomAnimations(android.R.anim.fade_in, android.R.anim.fade_out, android.R.anim.fade_in, android.R.anim.fade_out)
-                .replace(R.id.fragment_holder, instance)
-                .addToBackStack(null)
-                .commit();
-    }
-
-    private void openChannelFragment(int serviceId, String url, String name) {
-        if (name == null) name = "";
-        getSupportFragmentManager().beginTransaction()
-                .setCustomAnimations(android.R.anim.fade_in, android.R.anim.fade_out, android.R.anim.fade_in, android.R.anim.fade_out)
-                .replace(R.id.fragment_holder, ChannelFragment.getInstance(serviceId, url, name))
-                .addToBackStack(null)
-                .commit();
-    }
-
-    private void handleVideoDetailIntent(int serviceId, String url, Intent intent) {
-        boolean autoPlay = intent.getBooleanExtra(VideoDetailFragment.AUTO_PLAY, false);
-        String title = intent.getStringExtra(Constants.KEY_TITLE);
-        openVideoDetailFragment(serviceId, url, title, autoPlay);
-    }
-
-    private void handleChannelIntent(int serviceId, String url, Intent intent) {
-        String name = intent.getStringExtra(Constants.KEY_TITLE);
-        openChannelFragment(serviceId, url, name);
-    }
-
 }

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

@@ -33,26 +33,39 @@ import java.util.HashSet;
  * to the part of the service which can handle the url.
  */
 public class RouterActivity extends Activity {
-    //private static final String TAG = "RouterActivity"
+
+    @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.
      */
-    private final static String REGEX_REMOVE_FROM_URL = "[\\p{Z}\\p{P}]";
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        handleIntent(getIntent());
-        finish();
-    }
-
-    private void handleIntent(Intent intent) {
-        String videoUrl = "";
+    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();
@@ -62,14 +75,10 @@ public class RouterActivity extends Activity {
             videoUrl = getUris(extraText)[0];
         }
 
-        try {
-            NavigationHelper.openByLink(this, videoUrl);
-        } catch (Exception e) {
-            Toast.makeText(this, R.string.url_not_supported_toast, Toast.LENGTH_LONG).show();
-        }
+        return videoUrl;
     }
 
-    private static String removeHeadingGibberish(final String input) {
+    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}")) {
@@ -80,7 +89,7 @@ public class RouterActivity extends Activity {
         return input.substring(start, input.length());
     }
 
-    private static String trim(final String input) {
+    protected String trim(final String input) {
         if (input == null || input.length() < 1) {
             return input;
         } else {
@@ -103,7 +112,7 @@ public class RouterActivity extends Activity {
      * @param sharedText text to scan for URLs.
      * @return potential URLs
      */
-    private String[] getUris(final String sharedText) {
+    protected String[] getUris(final String sharedText)  {
         final Collection<String> result = new HashSet<>();
         if (sharedText != null) {
             final String[] array = sharedText.split("\\p{Space}");

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

@@ -1,9 +1,7 @@
 package org.schabi.newpipe;
 
-import android.app.Activity;
 import android.content.Intent;
 import android.os.Build;
-import android.os.Bundle;
 import android.widget.Toast;
 
 import org.schabi.newpipe.extractor.NewPipe;
@@ -12,57 +10,26 @@ import org.schabi.newpipe.player.PopupVideoPlayer;
 import org.schabi.newpipe.util.Constants;
 import org.schabi.newpipe.util.PermissionHelper;
 
-import java.util.Collection;
-import java.util.HashSet;
-
 /**
- * This activity is thought to open video streams form an external app using the popup player.
+ * Get the url from the intent and open a popup player
  */
-public class RouterPopupActivity extends Activity {
-    //private static final String TAG = "RouterPopupActivity";
-
-    /**
-     * Removes invisible separators (\p{Z}) and punctuation characters including
-     * brackets (\p{P}). See http://www.regular-expressions.info/unicode.html for
-     * more details.
-     */
-    private final static String REGEX_REMOVE_FROM_URL = "[\\p{Z}\\p{P}]";
+public class RouterPopupActivity extends RouterActivity {
 
     @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        handleIntent(getIntent());
-        finish();
-    }
-
-
-    private void handleIntent(Intent intent) {
+    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;
         }
-        String videoUrl = "";
-        StreamingService service;
-
-        // first gather data and find service
-        if (intent.getData() != null) {
-            // this means the video was called though another app
-            videoUrl = intent.getData().toString();
-        } else if (intent.getStringExtra(Intent.EXTRA_TEXT) != null) {
-            //this means that vidoe was called through share menu
-            String extraText = intent.getStringExtra(Intent.EXTRA_TEXT);
-            videoUrl = getUris(extraText)[0];
-        }
-
-        service = NewPipe.getServiceByUrl(videoUrl);
+        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(videoUrl)) {
+        switch (service.getLinkTypeByUrl(url)) {
             case STREAM:
                 break;
             default:
@@ -70,61 +37,8 @@ public class RouterPopupActivity extends Activity {
                 return;
         }
 
-        callIntent.putExtra(Constants.KEY_URL, videoUrl);
+        callIntent.putExtra(Constants.KEY_URL, url);
         callIntent.putExtra(Constants.KEY_SERVICE_ID, service.getServiceId());
         startService(callIntent);
     }
-
-    private static String removeHeadingGibberish(final String input) {
-        int start = 0;
-        for (int i = input.indexOf("://") - 1; i >= 0; i--) {
-            if (!input.substring(i, i + 1).matches("\\p{L}")) {
-                start = i + 1;
-                break;
-            }
-        }
-        return input.substring(start, input.length());
-    }
-
-    private static String trim(final String input) {
-        if (input == null || input.length() < 1) {
-            return input;
-        } else {
-            String output = input;
-            while (output.length() > 0 && output.substring(0, 1).matches(REGEX_REMOVE_FROM_URL)) {
-                output = output.substring(1);
-            }
-            while (output.length() > 0
-                    && output.substring(output.length() - 1, output.length()).matches(REGEX_REMOVE_FROM_URL)) {
-                output = output.substring(0, output.length() - 1);
-            }
-            return output;
-        }
-    }
-
-    /**
-     * Retrieves all Strings which look remotely like URLs from a text.
-     * Used if NewPipe was called through share menu.
-     *
-     * @param sharedText text to scan for URLs.
-     * @return potential URLs
-     */
-    private String[] getUris(final String sharedText) {
-        final Collection<String> result = new HashSet<>();
-        if (sharedText != null) {
-            final String[] array = sharedText.split("\\p{Space}");
-            for (String s : array) {
-                s = trim(s);
-                if (s.length() != 0) {
-                    if (s.matches(".+://.+")) {
-                        result.add(removeHeadingGibberish(s));
-                    } else if (s.matches(".+\\..+")) {
-                        result.add("http://" + s);
-                    }
-                }
-            }
-        }
-        return result.toArray(new String[result.size()]);
-    }
-
 }

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

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

app/src/main/java/org/schabi/newpipe/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

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

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

@@ -1,113 +1,135 @@
 package org.schabi.newpipe.download;
 
-import android.Manifest;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.net.Uri;
 import android.os.Bundle;
+import android.support.annotation.IdRes;
 import android.support.annotation.Nullable;
-import android.support.v4.app.ActivityCompat;
 import android.support.v4.app.DialogFragment;
-import android.support.v4.content.ContextCompat;
 import android.support.v7.widget.Toolbar;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.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.App;
+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.File;
+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;
 
-/**
- * Created by Christian Schabesberger on 21.09.15.
- * <p>
- * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
- * DownloadDialog.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/>.
- */
+    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";
 
-public class DownloadDialog extends DialogFragment {
-    private static final String TAG = DialogFragment.class.getName();
+    private StreamInfo currentInfo;
+    private ArrayList<VideoStream> sortedStreamVideosList;
+    private int selectedVideoIndex;
+    private int selectedAudioIndex;
 
-    public static final String TITLE = "name";
-    public static final String FILE_SUFFIX_AUDIO = "file_suffix_audio";
-    public static final String FILE_SUFFIX_VIDEO = "file_suffix_video";
-    public static final String AUDIO_URL = "audio_url";
-    public static final String VIDEO_URL = "video_url";
+    private EditText nameEditText;
+    private Spinner streamsSpinner;
+    private RadioGroup radioVideoAudioGroup;
+    private TextView threadsCountTextView;
+    private SeekBar threadsSeekBar;
 
-    public DownloadDialog() {
-
-    }
-
-    public static DownloadDialog newInstance(Bundle args) {
+    public static DownloadDialog newInstance(StreamInfo info, ArrayList<VideoStream> sortedStreamVideosList, int selectedVideoIndex) {
         DownloadDialog dialog = new DownloadDialog();
-        dialog.setArguments(args);
+        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 View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
+    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(ContextCompat.checkSelfPermission(this.getContext(),Manifest.permission.WRITE_EXTERNAL_STORAGE)!= PackageManager.PERMISSION_GRANTED)
-            ActivityCompat.requestPermissions(getActivity(),new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE},0);
+        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);
 
-        Bundle arguments = getArguments();
-        final Toolbar toolbar = (Toolbar) view.findViewById(R.id.toolbar);
-        final EditText name = (EditText) view.findViewById(R.id.file_name);
-        final TextView tCount = (TextView) view.findViewById(R.id.threads_count);
-        final SeekBar threads = (SeekBar) view.findViewById(R.id.threads);
+        streamsSpinner = (Spinner) view.findViewById(R.id.quality_spinner);
+        streamsSpinner.setOnItemSelectedListener(this);
 
-        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();
-            }
-        });
+        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);
 
-        threads.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
+        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) {
-                tCount.setText(String.valueOf(progress + 1));
+                threadsCountTextView.setText(String.valueOf(progress + 1));
             }
 
             @Override
@@ -120,58 +142,128 @@ public class DownloadDialog extends DialogFragment {
 
             }
         });
+    }
 
-        checkDownloadOptions();
+    @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);
+    }
 
-        //int def = mPrefs.getInt("threads", 4);
-        int def = 3;
-        threads.setProgress(def - 1);
-        tCount.setText(String.valueOf(def));
-
-        name.setText(createFileName(arguments.getString(TITLE)));
+    /*//////////////////////////////////////////////////////////////////////////
+    // 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) {
-                    download();
+                    downloadSelected();
                     return true;
-                } else {
-                    return false;
-                }
+                } else return false;
             }
         });
-
     }
 
-    protected void checkDownloadOptions() {
-        View view = getView();
-        Bundle arguments = getArguments();
+    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 (arguments.getString(AUDIO_URL) == null) {
+        if (currentInfo.audio_streams == null || currentInfo.audio_streams.size() == 0) {
             audioButton.setVisibility(View.GONE);
             videoButton.setChecked(true);
-        } else if (arguments.getString(VIDEO_URL) == null) {
+        } else if (sortedStreamVideosList == null || sortedStreamVideosList.size() == 0) {
             videoButton.setVisibility(View.GONE);
             audioButton.setChecked(true);
         }
     }
 
     /**
-     * #143 #44 #42 #22: make shure that the filename does not contain illegal chars.
+     * #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 fName) {
+    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 = fName;
+        String nameToTest = fileName;
         for (String pattern : forbiddenCharsPatterns) {
             nameToTest = nameToTest.replaceAll(pattern, "_");
         }
@@ -179,55 +271,20 @@ public class DownloadDialog extends DialogFragment {
     }
 
 
-    //download audio, video or both?
-    private void download() {
-        View view = getView();
-        Bundle arguments = getArguments();
-        final EditText name = (EditText) view.findViewById(R.id.file_name);
-        final SeekBar threads = (SeekBar) view.findViewById(R.id.threads);
-        RadioButton audioButton = (RadioButton) view.findViewById(R.id.audio_button);
-        RadioButton videoButton = (RadioButton) view.findViewById(R.id.video_button);
+    private void downloadSelected() {
+        String url, location;
 
-        String fName = name.getText().toString().trim();
+        String fileName = nameEditText.getText().toString().trim();
+        if (fileName.isEmpty()) fileName = createFileName(currentInfo.title);
 
-        boolean isAudio = audioButton.isChecked();
-        String url, location, filename;
-        if (isAudio) {
-            url = arguments.getString(AUDIO_URL);
-            location = NewPipeSettings.getAudioDownloadPath(getContext());
-            filename = fName + arguments.getString(FILE_SUFFIX_AUDIO);
-        } else {
-            url = arguments.getString(VIDEO_URL);
-            location = NewPipeSettings.getVideoDownloadPath(getContext());
-            filename = fName + arguments.getString(FILE_SUFFIX_VIDEO);
-        }
+        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());
 
-        DownloadManagerService.startMission(getContext(), url, location, filename, isAudio,
-                threads.getProgress() + 1);
+        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();
     }
-
-    private void download(String url, String title,
-                          String fileSuffix, File downloadDir, Context context) {
-
-        File saveFilePath = new File(downloadDir, createFileName(title) + fileSuffix);
-
-        long id = 0;
-
-        Log.i(TAG, "Started downloading '" + url +
-                "' => '" + saveFilePath + "' #" + id);
-
-        if (App.isUsingTor()) {
-            //if using Tor, do not use DownloadManager because the proxy cannot be set
-            //we'll see later
-            FileDownloader.downloadFile(getContext(), url, saveFilePath, title);
-        } else {
-            Intent intent = new Intent(getContext(), DownloadActivity.class);
-            intent.setAction(DownloadActivity.INTENT_DOWNLOAD);
-            intent.setData(Uri.parse(url));
-            intent.putExtra("fileName", createFileName(title) + fileSuffix);
-            startActivity(intent);
-        }
-    }
 }

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

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

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

@@ -1,7 +1,5 @@
 package org.schabi.newpipe.fragments;
 
-import android.animation.Animator;
-import android.animation.AnimatorListenerAdapter;
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.graphics.Rect;
@@ -28,12 +26,13 @@ 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 OnItemSelectedListener onItemSelectedListener;
 
     protected AtomicBoolean isLoading = new AtomicBoolean(false);
     protected AtomicBoolean wasLoading = new AtomicBoolean(false);
@@ -64,7 +63,6 @@ public abstract class BaseFragment extends Fragment {
         if (DEBUG) Log.d(TAG, "onAttach() called with: context = [" + context + "]");
 
         activity = (AppCompatActivity) context;
-        onItemSelectedListener = (OnItemSelectedListener) context;
     }
 
     @Override
@@ -130,70 +128,6 @@ public abstract class BaseFragment extends Fragment {
     // Utils
     //////////////////////////////////////////////////////////////////////////*/
 
-    public void animateView(final View view, final boolean enterOrExit, long duration) {
-        animateView(view, enterOrExit, duration, 0, null);
-    }
-
-    public void animateView(final View view, final boolean enterOrExit, long duration, final Runnable execOnEnd) {
-        animateView(view, enterOrExit, duration, 0, execOnEnd);
-    }
-
-    public void animateView(final View view, final boolean enterOrExit, long duration, long delay) {
-        animateView(view, enterOrExit, duration, delay, null);
-    }
-
-    /**
-     * Animate the view
-     *
-     * @param view        view that will be animated
-     * @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 take to start, in milliseconds
-     * @param execOnEnd   runnable that will be executed when the animation ends
-     */
-    public void animateView(final View view, final boolean enterOrExit, long duration, long delay, final Runnable execOnEnd) {
-        if (DEBUG) Log.d(TAG, "animateView() called with: view = [" + view + "], enterOrExit = [" + enterOrExit + "], duration = [" + duration + "], execOnEnd = [" + execOnEnd + "]");
-        if (view == null) return;
-
-        if (view.getVisibility() == View.VISIBLE && enterOrExit) {
-            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) {
-            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);
-
-        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();
-        }
-    }
-
     protected void setErrorMessage(String message, boolean showRetryButton) {
         if (errorTextView == null || activity == null) return;
 

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

@@ -51,6 +51,7 @@ public class MainFragment extends Fragment {
     /*//////////////////////////////////////////////////////////////////////////
     // Menu
     //////////////////////////////////////////////////////////////////////////*/
+
     @Override
     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
         super.onCreateOptionsMenu(menu, inflater);
@@ -68,7 +69,7 @@ public class MainFragment extends Fragment {
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
             case R.id.action_search:
-                NavigationHelper.openSearch(activity, 0, "");
+                NavigationHelper.openSearchFragment(getFragmentManager(), 0, "");
                 return true;
         }
         return super.onOptionsItemSelected(item);

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

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

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

@@ -26,6 +26,7 @@ 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;
@@ -36,6 +37,8 @@ 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());
 
@@ -211,7 +214,7 @@ public class ChannelFragment extends BaseFragment implements ChannelExtractorWor
 
         channelVideosList.setLayoutManager(new LinearLayoutManager(activity));
         if (infoListAdapter == null) {
-            infoListAdapter = new InfoListAdapter(activity, rootView);
+            infoListAdapter = new InfoListAdapter(activity);
             if (savedInstanceState != null) {
                 //noinspection unchecked
                 ArrayList<InfoItem> serializable = (ArrayList<InfoItem>) savedInstanceState.getSerializable(INFO_LIST_KEY);
@@ -238,28 +241,17 @@ public class ChannelFragment extends BaseFragment implements ChannelExtractorWor
             @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.openVideoDetail(onItemSelectedListener, serviceId, url, title);
+                NavigationHelper.openVideoDetailFragment(getFragmentManager(), serviceId, url, title);
             }
         });
 
         channelVideosList.clearOnScrollListeners();
-        channelVideosList.addOnScrollListener(new RecyclerView.OnScrollListener() {
+        channelVideosList.addOnScrollListener(new OnScrollBelowItemsListener() {
             @Override
-            public void onScrolled(RecyclerView recyclerView, int dx, int dy) {
-                int pastVisiblesItems, visibleItemCount, totalItemCount;
-                super.onScrolled(recyclerView, dx, dy);
-                //check for scroll down
-                if (dy > 0) {
-                    LinearLayoutManager layoutManager = (LinearLayoutManager) channelVideosList.getLayoutManager();
-
-                    visibleItemCount = layoutManager.getChildCount();
-                    totalItemCount = layoutManager.getItemCount();
-                    pastVisiblesItems = layoutManager.findFirstVisibleItemPosition();
-
-                    if ((visibleItemCount + pastVisiblesItems) >= totalItemCount && (currentChannelWorker == null || !currentChannelWorker.isRunning()) && hasNextPage && !isLoading.get()) {
-                        pageNumber++;
-                        loadMoreVideos();
-                    }
+            public void onScrolledDown(RecyclerView recyclerView) {
+                if ((currentChannelWorker == null || !currentChannelWorker.isRunning()) && hasNextPage && !isLoading.get()) {
+                    pageNumber++;
+                    loadMoreVideos();
                 }
             }
         });

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

@@ -9,11 +9,9 @@ import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.AdapterView;
-import android.widget.ArrayAdapter;
 import android.widget.Spinner;
 
 import org.schabi.newpipe.R;
-import org.schabi.newpipe.extractor.MediaFormat;
 import org.schabi.newpipe.extractor.stream_info.VideoStream;
 import org.schabi.newpipe.util.Utils;
 
@@ -40,6 +38,7 @@ import java.util.List;
  */
 
 
+@SuppressWarnings("WeakerAccess")
 class ActionBarHandler {
     private static final String TAG = "ActionBarHandler";
 
@@ -68,19 +67,12 @@ class ActionBarHandler {
 
     public void setupStreamList(final List<VideoStream> videoStreams, Spinner toolbarSpinner) {
         if (activity == null) return;
-        selectedVideoStream = 0;
 
-        // this array will be shown in the dropdown menu for selecting the stream/resolution.
-        String[] itemArray = new String[videoStreams.size()];
-        for (int i = 0; i < videoStreams.size(); i++) {
-            VideoStream item = videoStreams.get(i);
-            itemArray[i] = MediaFormat.getNameById(item.format) + " " + item.resolution;
-        }
+        selectedVideoStream = Utils.getDefaultResolution(activity, videoStreams);
 
-        int defaultResolutionIndex = Utils.getDefaultResolution(activity, videoStreams);
-        ArrayAdapter<String> itemAdapter = new ArrayAdapter<>(activity.getBaseContext(), android.R.layout.simple_spinner_dropdown_item, itemArray);
-        toolbarSpinner.setAdapter(itemAdapter);
-        toolbarSpinner.setSelection(defaultResolutionIndex);
+        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) {
@@ -103,6 +95,10 @@ class ActionBarHandler {
         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));
     }
 

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

@@ -1,12 +1,17 @@
 package org.schabi.newpipe.fragments.detail;
 
 import android.app.Activity;
+import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
+import android.os.Handler;
+import android.os.HandlerThread;
+import android.os.Looper;
+import android.os.Message;
 import android.preference.PreferenceManager;
 import android.support.annotation.FloatRange;
 import android.support.annotation.NonNull;
@@ -15,17 +20,19 @@ import android.support.v4.view.animation.FastOutSlowInInterpolator;
 import android.support.v7.app.ActionBar;
 import android.support.v7.app.AlertDialog;
 import android.text.Html;
+import android.text.Spanned;
 import android.text.TextUtils;
 import android.text.method.LinkMovementMethod;
 import android.util.Log;
 import android.util.TypedValue;
+import android.view.Gravity;
 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.FrameLayout;
 import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
@@ -39,7 +46,6 @@ import com.nostra13.universalimageloader.core.assist.FailReason;
 import com.nostra13.universalimageloader.core.listener.SimpleImageLoadingListener;
 
 import org.schabi.newpipe.ImageErrorLoadingListener;
-import org.schabi.newpipe.Localization;
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.ReCaptchaActivity;
 import org.schabi.newpipe.download.DownloadDialog;
@@ -55,6 +61,9 @@ import org.schabi.newpipe.player.MainVideoPlayer;
 import org.schabi.newpipe.player.PlayVideoActivity;
 import org.schabi.newpipe.player.PopupVideoPlayer;
 import org.schabi.newpipe.report.ErrorActivity;
+import org.schabi.newpipe.report.UserAction;
+import org.schabi.newpipe.util.Constants;
+import org.schabi.newpipe.util.Localization;
 import org.schabi.newpipe.util.NavigationHelper;
 import org.schabi.newpipe.util.PermissionHelper;
 import org.schabi.newpipe.util.Utils;
@@ -64,6 +73,8 @@ import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Stack;
 
+import static org.schabi.newpipe.util.AnimationUtils.animateView;
+
 public class VideoDetailFragment extends BaseFragment implements StreamExtractorWorker.OnStreamInfoReceivedListener, SharedPreferences.OnSharedPreferenceChangeListener, View.OnClickListener {
     private final String TAG = "VideoDetailFragment@" + Integer.toHexString(hashCode());
 
@@ -71,9 +82,6 @@ public class VideoDetailFragment extends BaseFragment implements StreamExtractor
     private static final int INITIAL_RELATED_VIDEOS = 8;
 
     private static final String KORE_PACKET = "org.xbmc.kore";
-    private static final String SERVICE_ID_KEY = "service_id_key";
-    private static final String VIDEO_URL_KEY = "video_url_key";
-    private static final String VIDEO_TITLE_KEY = "video_title_key";
     private static final String STACK_KEY = "stack_key";
     private static final String INFO_KEY = "info_key";
     private static final String WAS_RELATED_EXPANDED_KEY = "was_related_expanded_key";
@@ -97,12 +105,17 @@ public class VideoDetailFragment extends BaseFragment implements StreamExtractor
 
     private static final int RELATED_STREAMS_UPDATE_FLAG = 0x1;
     private static final int RESOLUTIONS_MENU_UPDATE_FLAG = 0x2;
+    private static final int TOOLBAR_ITEMS_UPDATE_FLAG = 0x4;
     private int updateFlags = 0;
 
     private boolean autoPlayEnabled;
     private boolean showRelatedStreams;
     private boolean wasRelatedStreamsExpanded = false;
 
+    private Handler uiHandler;
+    private Handler backgroundHandler;
+    private HandlerThread backgroundHandlerThread;
+
     /*//////////////////////////////////////////////////////////////////////////
     // Views
     //////////////////////////////////////////////////////////////////////////*/
@@ -110,9 +123,9 @@ public class VideoDetailFragment extends BaseFragment implements StreamExtractor
     private Spinner spinnerToolbar;
 
     private ParallaxScrollView parallaxScrollRootView;
-    private RelativeLayout contentRootLayoutHiding;
+    private LinearLayout contentRootLayoutHiding;
 
-    private Button thumbnailBackgroundButton;
+    private View thumbnailBackgroundButton;
     private ImageView thumbnailImageView;
     private ImageView thumbnailPlayButton;
 
@@ -124,12 +137,11 @@ public class VideoDetailFragment extends BaseFragment implements StreamExtractor
     private TextView detailControlsBackground;
     private TextView detailControlsPopup;
 
-    private RelativeLayout videoDescriptionRootLayout;
+    private LinearLayout videoDescriptionRootLayout;
     private TextView videoUploadDateView;
     private TextView videoDescriptionView;
 
     private View uploaderRootLayout;
-    private Button uploaderButton;
     private TextView uploaderTextView;
     private ImageView uploaderThumb;
 
@@ -140,7 +152,7 @@ public class VideoDetailFragment extends BaseFragment implements StreamExtractor
     private TextView thumbsDisabledTextView;
 
     private TextView nextStreamTitle;
-    private RelativeLayout relatedStreamRootLayout;
+    private LinearLayout relatedStreamRootLayout;
     private LinearLayout relatedStreamsView;
     private ImageButton relatedStreamExpandButton;
 
@@ -170,9 +182,9 @@ public class VideoDetailFragment extends BaseFragment implements StreamExtractor
         if (DEBUG) Log.d(TAG, "onCreate() called with: savedInstanceState = [" + savedInstanceState + "]");
 
         if (savedInstanceState != null) {
-            videoTitle = savedInstanceState.getString(VIDEO_TITLE_KEY);
-            videoUrl = savedInstanceState.getString(VIDEO_URL_KEY);
-            serviceId = savedInstanceState.getInt(SERVICE_ID_KEY, 0);
+            videoTitle = savedInstanceState.getString(Constants.KEY_TITLE);
+            videoUrl = savedInstanceState.getString(Constants.KEY_URL);
+            serviceId = savedInstanceState.getInt(Constants.KEY_SERVICE_ID, 0);
             wasRelatedStreamsExpanded = savedInstanceState.getBoolean(WAS_RELATED_EXPANDED_KEY, false);
             Serializable serializable = savedInstanceState.getSerializable(STACK_KEY);
             if (serializable instanceof Stack) {
@@ -192,6 +204,16 @@ public class VideoDetailFragment extends BaseFragment implements StreamExtractor
         thousand = getString(R.string.short_thousand);
         million = getString(R.string.short_million);
         billion = getString(R.string.short_billion);
+
+        if (uiHandler == null) {
+            uiHandler = new Handler(Looper.getMainLooper(), new UICallback());
+        }
+        if (backgroundHandler == null) {
+            HandlerThread handlerThread = new HandlerThread("VideoDetailFragment-BG");
+            handlerThread.start();
+            backgroundHandlerThread = handlerThread;
+            backgroundHandler = new Handler(handlerThread.getLooper(), new BackgroundCallback(uiHandler, getContext()));
+        }
     }
 
     @Override
@@ -218,6 +240,8 @@ public class VideoDetailFragment extends BaseFragment implements StreamExtractor
                 if ((updateFlags & RELATED_STREAMS_UPDATE_FLAG) != 0) initRelatedVideos(currentStreamInfo);
                 if ((updateFlags & RESOLUTIONS_MENU_UPDATE_FLAG) != 0) setupActionBarHandler(currentStreamInfo);
             }
+
+            if ((updateFlags & TOOLBAR_ITEMS_UPDATE_FLAG) != 0 && actionBarHandler != null) actionBarHandler.updateItemsVisibility();
             updateFlags = 0;
         }
 
@@ -237,6 +261,11 @@ public class VideoDetailFragment extends BaseFragment implements StreamExtractor
     @Override
     public void onDestroy() {
         super.onDestroy();
+        if (backgroundHandlerThread != null) {
+            backgroundHandlerThread.quit();
+        }
+        backgroundHandlerThread = null;
+        backgroundHandler = null;
         PreferenceManager.getDefaultSharedPreferences(activity).unregisterOnSharedPreferenceChangeListener(this);
     }
 
@@ -268,7 +297,7 @@ public class VideoDetailFragment extends BaseFragment implements StreamExtractor
         videoUploadDateView = null;
         videoDescriptionView = null;
 
-        uploaderButton = null;
+        uploaderRootLayout = null;
         uploaderTextView = null;
         uploaderThumb = null;
 
@@ -289,9 +318,9 @@ public class VideoDetailFragment extends BaseFragment implements StreamExtractor
     @Override
     public void onSaveInstanceState(Bundle outState) {
         if (DEBUG) Log.d(TAG, "onSaveInstanceState() called with: outState = [" + outState + "]");
-        outState.putString(VIDEO_URL_KEY, videoUrl);
-        outState.putString(VIDEO_TITLE_KEY, videoTitle);
-        outState.putInt(SERVICE_ID_KEY, serviceId);
+        outState.putString(Constants.KEY_URL, videoUrl);
+        outState.putString(Constants.KEY_TITLE, videoTitle);
+        outState.putInt(Constants.KEY_SERVICE_ID, serviceId);
         outState.putSerializable(STACK_KEY, stack);
 
         int nextCount = currentStreamInfo != null && currentStreamInfo.next_video != null ? 2 : 0;
@@ -310,7 +339,7 @@ public class VideoDetailFragment extends BaseFragment implements StreamExtractor
         switch (requestCode) {
             case ReCaptchaActivity.RECAPTCHA_REQUEST:
                 if (resultCode == Activity.RESULT_OK) {
-                    NavigationHelper.openVideoDetail(onItemSelectedListener, serviceId, videoUrl, videoTitle);
+                    NavigationHelper.openVideoDetailFragment(getFragmentManager(), serviceId, videoUrl, videoTitle);
                 } else Log.e(TAG, "ReCaptcha failed");
                 break;
             default:
@@ -326,8 +355,11 @@ public class VideoDetailFragment extends BaseFragment implements StreamExtractor
             updateFlags |= RELATED_STREAMS_UPDATE_FLAG;
         } else if (key.equals(getString(R.string.preferred_video_format_key))
                 || key.equals(getString(R.string.default_resolution_key))
-                || key.equals(getString(R.string.show_higher_resolutions_key))) {
+                || key.equals(getString(R.string.show_higher_resolutions_key))
+                || key.equals(getString(R.string.use_external_video_player_key))) {
             updateFlags |= RESOLUTIONS_MENU_UPDATE_FLAG;
+        } else if (key.equals(getString(R.string.show_play_with_kodi_key))) {
+            updateFlags |= TOOLBAR_ITEMS_UPDATE_FLAG;
         }
     }
 
@@ -346,10 +378,14 @@ public class VideoDetailFragment extends BaseFragment implements StreamExtractor
             case R.id.detail_controls_popup:
                 openInPopup();
                 break;
-            case R.id.detail_uploader_button:
-                NavigationHelper.openChannel(onItemSelectedListener, currentStreamInfo.service_id, currentStreamInfo.channel_url, currentStreamInfo.uploader);
+            case R.id.detail_uploader_root_layout:
+                if (currentStreamInfo.channel_url == null || currentStreamInfo.channel_url.isEmpty()) {
+                    Log.w(TAG, "Can't open channel because we got no channel URL");
+                } else {
+                    NavigationHelper.openChannelFragment(getFragmentManager(), currentStreamInfo.service_id, currentStreamInfo.channel_url, currentStreamInfo.uploader);
+                }
                 break;
-            case R.id.detail_thumbnail_background_button:
+            case R.id.detail_thumbnail_root_layout:
                 playVideo(currentStreamInfo);
                 break;
             case R.id.detail_title_root_layout:
@@ -420,7 +456,10 @@ public class VideoDetailFragment extends BaseFragment implements StreamExtractor
         if (isLoading.get()) return;
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M && !PermissionHelper.checkSystemAlertWindowPermission(activity)) {
-            Toast.makeText(activity, R.string.msg_popup_permission, Toast.LENGTH_LONG).show();
+            Toast toast = Toast.makeText(activity, R.string.msg_popup_permission, Toast.LENGTH_LONG);
+            TextView messageView = (TextView) toast.getView().findViewById(android.R.id.message);
+            if (messageView != null) messageView.setGravity(Gravity.CENTER);
+            toast.show();
             return;
         }
 
@@ -474,12 +513,11 @@ public class VideoDetailFragment extends BaseFragment implements StreamExtractor
 
         parallaxScrollRootView = (ParallaxScrollView) rootView.findViewById(R.id.detail_main_content);
 
-        //thumbnailRootLayout = (RelativeLayout) rootView.findViewById(R.id.detail_thumbnail_root_layout);
-        thumbnailBackgroundButton = (Button) rootView.findViewById(R.id.detail_thumbnail_background_button);
+        thumbnailBackgroundButton = rootView.findViewById(R.id.detail_thumbnail_root_layout);
         thumbnailImageView = (ImageView) rootView.findViewById(R.id.detail_thumbnail_image_view);
         thumbnailPlayButton = (ImageView) rootView.findViewById(R.id.detail_thumbnail_play_button);
 
-        contentRootLayoutHiding = (RelativeLayout) rootView.findViewById(R.id.detail_content_root_hiding);
+        contentRootLayoutHiding = (LinearLayout) rootView.findViewById(R.id.detail_content_root_hiding);
 
         videoTitleRoot = rootView.findViewById(R.id.detail_title_root_layout);
         videoTitleTextView = (TextView) rootView.findViewById(R.id.detail_video_title_view);
@@ -489,7 +527,7 @@ public class VideoDetailFragment extends BaseFragment implements StreamExtractor
         detailControlsBackground = (TextView) rootView.findViewById(R.id.detail_controls_background);
         detailControlsPopup = (TextView) rootView.findViewById(R.id.detail_controls_popup);
 
-        videoDescriptionRootLayout = (RelativeLayout) rootView.findViewById(R.id.detail_description_root_layout);
+        videoDescriptionRootLayout = (LinearLayout) rootView.findViewById(R.id.detail_description_root_layout);
         videoUploadDateView = (TextView) rootView.findViewById(R.id.detail_upload_date_view);
         videoDescriptionView = (TextView) rootView.findViewById(R.id.detail_description_view);
 
@@ -501,19 +539,19 @@ public class VideoDetailFragment extends BaseFragment implements StreamExtractor
         thumbsDisabledTextView = (TextView) rootView.findViewById(R.id.detail_thumbs_disabled_view);
 
         uploaderRootLayout = rootView.findViewById(R.id.detail_uploader_root_layout);
-        uploaderButton = (Button) rootView.findViewById(R.id.detail_uploader_button);
         uploaderTextView = (TextView) rootView.findViewById(R.id.detail_uploader_text_view);
         uploaderThumb = (ImageView) rootView.findViewById(R.id.detail_uploader_thumbnail_view);
 
-        relatedStreamRootLayout = (RelativeLayout) rootView.findViewById(R.id.detail_related_streams_root_layout);
+        relatedStreamRootLayout = (LinearLayout) rootView.findViewById(R.id.detail_related_streams_root_layout);
         nextStreamTitle = (TextView) rootView.findViewById(R.id.detail_next_stream_title);
         relatedStreamsView = (LinearLayout) rootView.findViewById(R.id.detail_related_streams_view);
+
         relatedStreamExpandButton = ((ImageButton) rootView.findViewById(R.id.detail_related_streams_expand));
 
         actionBarHandler = new ActionBarHandler(activity);
         videoDescriptionView.setMovementMethod(LinkMovementMethod.getInstance());
 
-        infoItemBuilder = new InfoItemBuilder(activity, rootView.findViewById(android.R.id.content));
+        infoItemBuilder = new InfoItemBuilder(activity);
 
         setHeightThumbnail();
     }
@@ -529,7 +567,7 @@ public class VideoDetailFragment extends BaseFragment implements StreamExtractor
         });
 
         videoTitleRoot.setOnClickListener(this);
-        uploaderButton.setOnClickListener(this);
+        uploaderRootLayout.setOnClickListener(this);
         thumbnailBackgroundButton.setOnClickListener(this);
         detailControlsBackground.setOnClickListener(this);
         detailControlsPopup.setOnClickListener(this);
@@ -541,7 +579,7 @@ public class VideoDetailFragment extends BaseFragment implements StreamExtractor
             imageLoader.displayImage(info.thumbnail_url, thumbnailImageView, displayImageOptions, new SimpleImageLoadingListener() {
                 @Override
                 public void onLoadingFailed(String imageUri, View view, FailReason failReason) {
-                    ErrorActivity.reportError(activity, failReason.getCause(), null, activity.findViewById(android.R.id.content), ErrorActivity.ErrorInfo.make(ErrorActivity.LOAD_IMAGE, NewPipe.getNameOfService(currentStreamInfo.service_id), imageUri, R.string.could_not_load_thumbnails));
+                    ErrorActivity.reportError(activity, failReason.getCause(), null, activity.findViewById(android.R.id.content), ErrorActivity.ErrorInfo.make(UserAction.LOAD_IMAGE, NewPipe.getNameOfService(currentStreamInfo.service_id), imageUri, R.string.could_not_load_thumbnails));
                 }
             });
         } else thumbnailImageView.setImageResource(R.drawable.dummy_thumbnail_dark);
@@ -673,33 +711,10 @@ public class VideoDetailFragment extends BaseFragment implements StreamExtractor
                 }
 
                 try {
-                    Bundle args = new Bundle();
-
-                    // Sometimes it may be that some information is not available due to changes fo the
-                    // website which was crawled. Then the ui has to understand this and act right.
-
-                    if (info.audio_streams != null) {
-                        AudioStream audioStream =
-                                info.audio_streams.get(Utils.getPreferredAudioFormat(activity, info.audio_streams));
-
-                        String audioSuffix = "." + MediaFormat.getSuffixById(audioStream.format);
-                        args.putString(DownloadDialog.AUDIO_URL, audioStream.url);
-                        args.putString(DownloadDialog.FILE_SUFFIX_AUDIO, audioSuffix);
-                    }
-
-                    if (sortedStreamVideosList != null) {
-                        VideoStream selectedStreamItem = sortedStreamVideosList.get(selectedStreamId);
-                        String videoSuffix = "." + MediaFormat.getSuffixById(selectedStreamItem.format);
-                        args.putString(DownloadDialog.FILE_SUFFIX_VIDEO, videoSuffix);
-                        args.putString(DownloadDialog.VIDEO_URL, selectedStreamItem.url);
-                    }
-
-                    args.putString(DownloadDialog.TITLE, info.title);
-                    DownloadDialog downloadDialog = DownloadDialog.newInstance(args);
+                    DownloadDialog downloadDialog = DownloadDialog.newInstance(info, sortedStreamVideosList, selectedStreamId);
                     downloadDialog.show(activity.getSupportFragmentManager(), "downloadDialog");
                 } catch (Exception e) {
-                    Toast.makeText(activity,
-                            R.string.could_not_setup_download_menu, Toast.LENGTH_LONG).show();
+                    Toast.makeText(activity, R.string.could_not_setup_download_menu, Toast.LENGTH_LONG).show();
                     e.printStackTrace();
                 }
             }
@@ -752,8 +767,17 @@ public class VideoDetailFragment extends BaseFragment implements StreamExtractor
         // Get url from the new top
         StackItem peek = stack.peek();
 
-        if (peek.getInfo() != null) selectAndHandleInfo(peek.getInfo());
-        else selectAndLoadVideo(0, peek.getUrl(), !TextUtils.isEmpty(peek.getTitle()) ? peek.getTitle() : "");
+        if (peek.getInfo() != null) {
+            final StreamInfo streamInfo = peek.getInfo();
+            getActivity().runOnUiThread(new Runnable() {
+                @Override
+                public void run() {
+                    selectAndHandleInfo(streamInfo);
+                }
+            });
+        } else {
+            selectAndLoadVideo(0, peek.getUrl(), !TextUtils.isEmpty(peek.getTitle()) ? peek.getTitle() : "");
+        }
         return true;
     }
 
@@ -800,7 +824,7 @@ public class VideoDetailFragment extends BaseFragment implements StreamExtractor
      * If it is, check if the cache contains the info already.</br>
      * If the cache doesn't have the info, load from the network.
      *
-     * @param info info to prepare and load, can be null
+     * @param info        info to prepare and load, can be null
      * @param scrollToTop whether or not scroll the scrollView to y = 0
      */
     public void prepareAndLoad(StreamInfo info, boolean scrollToTop) {
@@ -844,7 +868,7 @@ public class VideoDetailFragment extends BaseFragment implements StreamExtractor
                 else parallaxScrollRootView.scrollTo(0, 0);
             }
 
-            animateView(contentRootLayoutHiding, false, greaterThanThreshold ? 250 : 0, new Runnable() {
+            animateView(contentRootLayoutHiding, false, greaterThanThreshold ? 250 : 0, 0, new Runnable() {
                 @Override
                 public void run() {
                     handleStreamInfo(infoFinal, false);
@@ -861,7 +885,7 @@ public class VideoDetailFragment extends BaseFragment implements StreamExtractor
         }
     }
 
-    private void handleStreamInfo(@NonNull StreamInfo info, boolean fromNetwork) {
+    private void handleStreamInfo(@NonNull final StreamInfo info, boolean fromNetwork) {
         if (DEBUG) Log.d(TAG, "handleStreamInfo() called with: info = [" + info + "]");
         currentStreamInfo = info;
         selectVideo(info.service_id, info.webpage_url, info.title);
@@ -875,7 +899,6 @@ public class VideoDetailFragment extends BaseFragment implements StreamExtractor
 
         if (!TextUtils.isEmpty(info.uploader)) uploaderTextView.setText(info.uploader);
         uploaderTextView.setVisibility(!TextUtils.isEmpty(info.uploader) ? View.VISIBLE : View.GONE);
-        uploaderButton.setVisibility(!TextUtils.isEmpty(info.channel_url) ? View.VISIBLE : View.GONE);
         uploaderThumb.setImageDrawable(ContextCompat.getDrawable(activity, R.drawable.buddy));
 
         if (info.view_count >= 0) videoCountView.setText(Localization.localizeViewCount(info.view_count, activity));
@@ -900,14 +923,8 @@ public class VideoDetailFragment extends BaseFragment implements StreamExtractor
             thumbsUpImageView.setVisibility(info.like_count >= 0 ? View.VISIBLE : View.GONE);
         }
 
-        if (!TextUtils.isEmpty(info.upload_date)) videoUploadDateView.setText(Localization.localizeDate(info.upload_date, activity));
-        videoUploadDateView.setVisibility(!TextUtils.isEmpty(info.upload_date) ? View.VISIBLE : View.GONE);
-
-        if (!TextUtils.isEmpty(info.description)) { //noinspection deprecation
-            videoDescriptionView.setText(Build.VERSION.SDK_INT >= 24 ? Html.fromHtml(info.description, 0) : Html.fromHtml(info.description));
-        }
-        videoDescriptionView.setVisibility(!TextUtils.isEmpty(info.description) ? View.VISIBLE : View.GONE);
 
+        videoDescriptionView.setVisibility(View.GONE);
         videoDescriptionRootLayout.setVisibility(View.GONE);
         videoTitleToggleArrow.setImageResource(R.drawable.arrow_down);
         videoTitleToggleArrow.setVisibility(View.VISIBLE);
@@ -921,9 +938,32 @@ public class VideoDetailFragment extends BaseFragment implements StreamExtractor
             toggleExpandRelatedVideos(currentStreamInfo);
             wasRelatedStreamsExpanded = false;
         }
-
         setTitleToUrl(info.webpage_url, info.title);
         setStreamInfoToUrl(info.webpage_url, info);
+
+        prepareDescription(info.description);
+        prepareUploadDate(info.upload_date);
+
+        if (autoPlayEnabled) {
+            playVideo(info);
+            // Only auto play in the first open
+            autoPlayEnabled = false;
+        }
+    }
+
+    private void prepareUploadDate(final String uploadDate) {
+        // Hide until date is prepared or forever if no date is supplied
+        videoUploadDateView.setVisibility(View.GONE);
+        if (!TextUtils.isEmpty(uploadDate)) {
+            backgroundHandler.sendMessage(Message.obtain(backgroundHandler, BackgroundCallback.MESSAGE_UPLOADER_DATE, uploadDate));
+        }
+    }
+
+    private void prepareDescription(final String descriptionHtml) {
+        // Send the unparsed description to the handler as a message
+        if (!TextUtils.isEmpty(descriptionHtml)) {
+            backgroundHandler.sendMessage(Message.obtain(backgroundHandler, BackgroundCallback.MESSAGE_DESCRIPTION, descriptionHtml));
+        }
     }
 
     public void playVideo(StreamInfo info) {
@@ -1000,10 +1040,8 @@ public class VideoDetailFragment extends BaseFragment implements StreamExtractor
         int height = isPortrait ? (int) (getResources().getDisplayMetrics().widthPixels / (16.0f / 9.0f))
                 : (int) (getResources().getDisplayMetrics().heightPixels / 2f);
         thumbnailImageView.setScaleType(isPortrait ? ImageView.ScaleType.CENTER_CROP : ImageView.ScaleType.FIT_CENTER);
-        thumbnailImageView.setLayoutParams(new RelativeLayout.LayoutParams(RelativeLayout.LayoutParams.MATCH_PARENT, height));
+        thumbnailImageView.setLayoutParams(new FrameLayout.LayoutParams(RelativeLayout.LayoutParams.MATCH_PARENT, height));
         thumbnailImageView.setMinimumHeight(height);
-        thumbnailBackgroundButton.setLayoutParams(new RelativeLayout.LayoutParams(RelativeLayout.LayoutParams.MATCH_PARENT, height));
-        thumbnailBackgroundButton.setMinimumHeight(height);
     }
 
     public String getShortCount(Long viewCount) {
@@ -1045,14 +1083,11 @@ public class VideoDetailFragment extends BaseFragment implements StreamExtractor
                     .setStartDelay((long) (duration * .8f) + delay).setDuration(duration).setInterpolator(new FastOutSlowInInterpolator()).start();
         }
     }
-    /*//////////////////////////////////////////////////////////////////////////
-    // OnStreamInfoReceivedListener callbacks
-    //////////////////////////////////////////////////////////////////////////*/
 
     private void setErrorImage(final int imageResource) {
         if (thumbnailImageView == null || activity == null) return;
         thumbnailImageView.setImageDrawable(ContextCompat.getDrawable(activity, imageResource));
-        animateView(thumbnailImageView, false, 0, new Runnable() {
+        animateView(thumbnailImageView, false, 0, 0, new Runnable() {
             @Override
             public void run() {
                 animateView(thumbnailImageView, true, 500);
@@ -1068,6 +1103,10 @@ public class VideoDetailFragment extends BaseFragment implements StreamExtractor
         currentStreamInfo = null;
     }
 
+    /*//////////////////////////////////////////////////////////////////////////
+    // OnStreamInfoReceivedListener callbacks
+    //////////////////////////////////////////////////////////////////////////*/
+
     @Override
     public void onReceive(StreamInfo info) {
         if (DEBUG) Log.d(TAG, "onReceive() called with: info = [" + info + "]");
@@ -1075,15 +1114,8 @@ public class VideoDetailFragment extends BaseFragment implements StreamExtractor
 
         handleStreamInfo(info, true);
         showContentWithAnimation(300, 0, 0);
-
         animateView(loadingProgressBar, false, 200);
 
-        if (autoPlayEnabled) {
-            playVideo(info);
-            // Only auto play in the first open
-            autoPlayEnabled = false;
-        }
-
         StreamInfoCache.getInstance().putInfo(info);
         isLoading.set(false);
 
@@ -1139,4 +1171,73 @@ public class VideoDetailFragment extends BaseFragment implements StreamExtractor
     public void onUnrecoverableError(Exception exception) {
         activity.finish();
     }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Background handling
+    //////////////////////////////////////////////////////////////////////////*/
+
+    private static class BackgroundCallback implements Handler.Callback {
+        private static final int MESSAGE_DESCRIPTION = 1;
+        public static final int MESSAGE_UPLOADER_DATE = 2;
+        private final Handler uiHandler;
+        private final Context context;
+
+        BackgroundCallback(Handler uiHandler, Context context) {
+            this.uiHandler = uiHandler;
+            this.context = context;
+        }
+
+        @Override
+        public boolean handleMessage(Message msg) {
+            switch (msg.what) {
+                case MESSAGE_DESCRIPTION:
+                    handleDescription((String) msg.obj);
+                    return true;
+                case MESSAGE_UPLOADER_DATE:
+                    handleUploadDate((String) msg.obj);
+                    return true;
+            }
+            return false;
+        }
+
+        private void handleUploadDate(String uploadDate) {
+            String localizedDate = Localization.localizeDate(uploadDate, context);
+            uiHandler.sendMessage(Message.obtain(uiHandler, MESSAGE_UPLOADER_DATE, localizedDate));
+        }
+
+        private void handleDescription(String description) {
+            Spanned parsedDescription;
+            if (TextUtils.isEmpty(description)) {
+                return;
+            }
+            if (Build.VERSION.SDK_INT >= 24) {
+                parsedDescription = Html.fromHtml(description, 0);
+            } else {
+                //noinspection deprecation
+                parsedDescription = Html.fromHtml(description);
+            }
+            uiHandler.sendMessage(Message.obtain(uiHandler, MESSAGE_DESCRIPTION, parsedDescription));
+        }
+    }
+
+    private class UICallback implements Handler.Callback {
+        @Override
+        public boolean handleMessage(Message msg) {
+            switch (msg.what) {
+                case BackgroundCallback.MESSAGE_DESCRIPTION:
+                    if (videoDescriptionView != null) {
+                        videoDescriptionView.setText((Spanned) msg.obj);
+                        videoDescriptionView.setVisibility(View.VISIBLE);
+                    }
+                    return true;
+                case BackgroundCallback.MESSAGE_UPLOADER_DATE:
+                    if (videoUploadDateView != null) {
+                        videoUploadDateView.setText((String) msg.obj);
+                        videoUploadDateView.setVisibility(View.VISIBLE);
+                    }
+                    return true;
+            }
+            return false;
+        }
+    }
 }

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

@@ -5,6 +5,7 @@ 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;
@@ -37,6 +38,7 @@ 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;
@@ -45,12 +47,13 @@ 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 SERVICE_KEY = "service_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";
@@ -66,6 +69,7 @@ public class SearchFragment extends BaseFragment implements SuggestionWorker.OnS
     private int serviceId = -1;
     private String searchQuery = "";
     private int pageNumber = 0;
+    private boolean showSuggestions = true;
 
     private SearchWorker curSearchWorker;
     private SuggestionWorker curSuggestionWorker;
@@ -101,7 +105,7 @@ public class SearchFragment extends BaseFragment implements SuggestionWorker.OnS
         setHasOptionsMenu(true);
         if (savedInstanceState != null) {
             searchQuery = savedInstanceState.getString(QUERY_KEY);
-            serviceId = savedInstanceState.getInt(SERVICE_KEY, 0);
+            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);
@@ -133,6 +137,8 @@ public class SearchFragment extends BaseFragment implements SuggestionWorker.OnS
             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
@@ -171,7 +177,7 @@ public class SearchFragment extends BaseFragment implements SuggestionWorker.OnS
         String query = searchEditText != null && !TextUtils.isEmpty(searchEditText.getText().toString())
                 ? searchEditText.getText().toString() : searchQuery;
         outState.putString(QUERY_KEY, query);
-        outState.putInt(SERVICE_KEY, serviceId);
+        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());
@@ -206,7 +212,7 @@ public class SearchFragment extends BaseFragment implements SuggestionWorker.OnS
         resultRecyclerView.setLayoutManager(new LinearLayoutManager(activity));
 
         if (infoListAdapter == null) {
-            infoListAdapter = new InfoListAdapter(getActivity(), getActivity().findViewById(android.R.id.content));
+            infoListAdapter = new InfoListAdapter(getActivity());
             if (savedInstanceState != null) {
                 //noinspection unchecked
                 ArrayList<InfoItem> serializable = (ArrayList<InfoItem>) savedInstanceState.getSerializable(INFO_LIST_KEY);
@@ -218,13 +224,13 @@ public class SearchFragment extends BaseFragment implements SuggestionWorker.OnS
             infoListAdapter.setOnStreamInfoItemSelectedListener(new InfoItemBuilder.OnInfoItemSelectedListener() {
                 @Override
                 public void selected(int serviceId, String url, String title) {
-                    NavigationHelper.openVideoDetail(onItemSelectedListener, serviceId, url, title);
+                    NavigationHelper.openVideoDetailFragment(getFragmentManager(), serviceId, url, title);
                 }
             });
             infoListAdapter.setOnChannelInfoItemSelectedListener(new InfoItemBuilder.OnInfoItemSelectedListener() {
                 @Override
                 public void selected(int serviceId, String url, String title) {
-                    NavigationHelper.openChannel(onItemSelectedListener, serviceId, url, title);
+                    NavigationHelper.openChannelFragment(getFragmentManager(), serviceId, url, title);
                 }
             });
         }
@@ -236,33 +242,24 @@ public class SearchFragment extends BaseFragment implements SuggestionWorker.OnS
     protected void initListeners() {
         super.initListeners();
         resultRecyclerView.clearOnScrollListeners();
-        resultRecyclerView.addOnScrollListener(new RecyclerView.OnScrollListener() {
+        resultRecyclerView.addOnScrollListener(new OnScrollBelowItemsListener() {
             @Override
-            public void onScrolled(RecyclerView recyclerView, int dx, int dy) {
-                int pastVisiblesItems, visibleItemCount, totalItemCount;
-                super.onScrolled(recyclerView, dx, dy);
-                //check for scroll down
-                if (dy > 0) {
-                    LinearLayoutManager layoutManager = (LinearLayoutManager) resultRecyclerView.getLayoutManager();
-                    visibleItemCount = resultRecyclerView.getLayoutManager().getChildCount();
-                    totalItemCount = resultRecyclerView.getLayoutManager().getItemCount();
-                    pastVisiblesItems = layoutManager.findFirstVisibleItemPosition();
-
-                    if ((visibleItemCount + pastVisiblesItems) >= totalItemCount && !isLoading.get()) {
-                        pageNumber++;
-                        recyclerView.post(new Runnable() {
-                            @Override
-                            public void run() {
-                                infoListAdapter.showFooter(true);
-                            }
-                        });
-                        search(searchQuery, pageNumber);
-                    }
+            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");
@@ -383,7 +380,7 @@ public class SearchFragment extends BaseFragment implements SuggestionWorker.OnS
             public void onClick(View v) {
                 if (DEBUG) Log.d(TAG, "onClick() called with: v = [" + v + "]");
                 if (TextUtils.isEmpty(searchEditText.getText())) {
-                    NavigationHelper.openMainActivity(activity);
+                    NavigationHelper.gotoMainFragment(getFragmentManager());
                     return;
                 }
 
@@ -521,6 +518,11 @@ public class SearchFragment extends BaseFragment implements SuggestionWorker.OnS
     }
 
     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);

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

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

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

@@ -31,8 +31,7 @@ import de.hdodenhof.circleimageview.CircleImageView;
 public class ChannelInfoItemHolder extends InfoItemHolder {
     public final CircleImageView itemThumbnailView;
     public final TextView itemChannelTitleView;
-    public final TextView itemSubscriberCountView;
-    public final TextView itemVideoCountView;
+    public final TextView itemAdditionalDetailView;
     public final TextView itemChannelDescriptionView;
 
     public final View itemRoot;
@@ -42,8 +41,7 @@ public class ChannelInfoItemHolder extends InfoItemHolder {
         itemRoot = v.findViewById(R.id.itemRoot);
         itemThumbnailView = (CircleImageView) v.findViewById(R.id.itemThumbnailView);
         itemChannelTitleView = (TextView) v.findViewById(R.id.itemChannelTitleView);
-        itemSubscriberCountView = (TextView) v.findViewById(R.id.itemSubscriberCountView);
-        itemVideoCountView = (TextView) v.findViewById(R.id.itemVideoCountView);
+        itemAdditionalDetailView = (TextView) v.findViewById(R.id.itemAdditionalDetails);
         itemChannelDescriptionView = (TextView) v.findViewById(R.id.itemChannelDescriptionView);
     }
 

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

@@ -17,6 +17,8 @@ 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>
@@ -54,18 +56,35 @@ public class InfoItemBuilder {
         void selected(int serviceId, String url, String title);
     }
 
-    private Context mContext = null;
-    private LayoutInflater inflater;
-    private View rootView = null;
     private ImageLoader imageLoader = ImageLoader.getInstance();
-    private DisplayImageOptions displayImageOptions =
-            new DisplayImageOptions.Builder().cacheInMemory(true).build();
+
+    /** 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, View rootView) {
-        mContext = context;
-        this.rootView = rootView;
+    public InfoItemBuilder(Context context) {
         viewsS = context.getString(R.string.views);
         videosS = context.getString(R.string.videos);
         subsS = context.getString(R.string.subscriber);
@@ -73,7 +92,6 @@ public class InfoItemBuilder {
         thousand = context.getString(R.string.short_thousand);
         million = context.getString(R.string.short_million);
         billion = context.getString(R.string.short_billion);
-        inflater = LayoutInflater.from(context);
     }
 
     public void setOnStreamInfoItemSelectedListener(
@@ -107,6 +125,7 @@ public class InfoItemBuilder {
     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();
@@ -127,6 +146,22 @@ public class InfoItemBuilder {
         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");
@@ -146,46 +181,59 @@ public class InfoItemBuilder {
                 holder.itemDurationView.setVisibility(View.GONE);
             }
         }
-        if (info.view_count >= 0) {
-            holder.itemViewCountView.setText(shortViewCount(info.view_count));
-        } else {
-            holder.itemViewCountView.setVisibility(View.GONE);
-        }
-        if (!TextUtils.isEmpty(info.upload_date)) holder.itemUploadDateView.setText(info.upload_date + " • ");
 
-        holder.itemThumbnailView.setImageResource(R.drawable.dummy_thumbnail);
-        if (!TextUtils.isEmpty(info.thumbnail_url)) {
-            imageLoader.displayImage(info.thumbnail_url,
-                    holder.itemThumbnailView, displayImageOptions,
-                    new ImageErrorLoadingListener(mContext, rootView, info.service_id));
-        }
+        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) {
-                onStreamInfoItemSelectedListener.selected(info.service_id, info.webpage_url, info.getTitle());
+                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.itemSubscriberCountView.setText(shortSubscriber(info.subscriberCount) + " • ");
-        holder.itemVideoCountView.setText(info.videoAmount + " " + videosS);
+        holder.itemAdditionalDetailView.setText(getChannelInfoDetailLine(info));
         if (!TextUtils.isEmpty(info.description)) holder.itemChannelDescriptionView.setText(info.description);
 
-        holder.itemThumbnailView.setImageResource(R.drawable.buddy_channel_item);
-        if (!TextUtils.isEmpty(info.thumbnailUrl)) {
-            imageLoader.displayImage(info.thumbnailUrl,
-                    holder.itemThumbnailView,
-                    displayImageOptions,
-                    new ImageErrorLoadingListener(mContext, rootView, info.serviceId));
-        }
+        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) {
-                onChannelInfoItemSelectedListener.selected(info.serviceId, info.getLink(), info.channelName);
+                if(onStreamInfoItemSelectedListener != null) {
+                    onChannelInfoItemSelectedListener.selected(info.serviceId, info.getLink(), info.channelName);
+                }
             }
         });
     }
@@ -218,7 +266,10 @@ public class InfoItemBuilder {
     }
 
     public static String getDurationString(int duration) {
-        String output = "";
+        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 */
@@ -228,46 +279,12 @@ public class InfoItemBuilder {
 
         //handle days
         if (days > 0) {
-            output = Integer.toString(days) + ":";
-        }
-        // handle hours
-        if (hours > 0 || !output.isEmpty()) {
-            if (hours > 0) {
-                if (hours >= 10 || output.isEmpty()) {
-                    output += Integer.toString(hours);
-                } else {
-                    output += "0" + Integer.toString(hours);
-                }
-            } else {
-                output += "00";
-            }
-            output += ":";
-        }
-        //handle minutes
-        if (minutes > 0 || !output.isEmpty()) {
-            if (minutes > 0) {
-                if (minutes >= 10 || output.isEmpty()) {
-                    output += Integer.toString(minutes);
-                } else {
-                    output += "0" + Integer.toString(minutes);
-                }
-            } else {
-                output += "00";
-            }
-            output += ":";
-        }
-
-        //handle seconds
-        if (output.isEmpty()) {
-            output += "0:";
-        }
-
-        if (seconds >= 10) {
-            output += Integer.toString(seconds);
+            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 += "0" + Integer.toString(seconds);
+            output = String.format(Locale.US, "%d:%02d", minutes, seconds);
         }
-
         return output;
     }
 }

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

@@ -55,8 +55,8 @@ public class InfoListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
         notifyDataSetChanged();
     }
 
-    public InfoListAdapter(Activity a, View rootView) {
-        infoItemBuilder = new InfoItemBuilder(a, rootView);
+    public InfoListAdapter(Activity a) {
+        infoItemBuilder = new InfoItemBuilder(a);
         infoItemList = new ArrayList<>();
     }
 
@@ -78,6 +78,9 @@ public class InfoListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
     }
 
     public void clearStreamItemList() {
+        if(infoItemList.isEmpty()) {
+            return;
+        }
         infoItemList.clear();
         notifyDataSetChanged();
     }
@@ -152,7 +155,7 @@ public class InfoListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
 
     @Override
     public void onBindViewHolder(RecyclerView.ViewHolder holder, int i) {
-        //god damen f*** ANDROID SH**
+        //god damn f*** ANDROID SH**
         if(holder instanceof InfoItemHolder) {
             if(header != null) {
                 i--;

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

@@ -33,8 +33,7 @@ public class StreamInfoItemHolder extends InfoItemHolder {
     public final TextView itemVideoTitleView,
             itemUploaderView,
             itemDurationView,
-            itemUploadDateView,
-            itemViewCountView;
+            itemAdditionalDetails;
     public final View itemRoot;
 
     public StreamInfoItemHolder(View v) {
@@ -44,8 +43,7 @@ public class StreamInfoItemHolder extends InfoItemHolder {
         itemVideoTitleView = (TextView) v.findViewById(R.id.itemVideoTitleView);
         itemUploaderView = (TextView) v.findViewById(R.id.itemUploaderView);
         itemDurationView = (TextView) v.findViewById(R.id.itemDurationView);
-        itemUploadDateView = (TextView) v.findViewById(R.id.itemUploadDateView);
-        itemViewCountView = (TextView) v.findViewById(R.id.itemViewCountView);
+        itemAdditionalDetails = (TextView) v.findViewById(R.id.itemAdditionalDetails);
     }
 
     @Override

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

@@ -286,15 +286,13 @@ public class BackgroundPlayer extends Service {
         public void onPrepared(boolean playWhenReady) {
             super.onPrepared(playWhenReady);
             if (simpleExoPlayer.getDuration() < 15000) {
-                PROGRESS_LOOP_INTERVAL = 1000;
                 FAST_FORWARD_REWIND_AMOUNT = 2000;
             } else if (simpleExoPlayer.getDuration() > 60 * 60 * 1000) {
-                PROGRESS_LOOP_INTERVAL = 2000;
                 FAST_FORWARD_REWIND_AMOUNT = 60000;
             } else {
-                PROGRESS_LOOP_INTERVAL = 2000;
                 FAST_FORWARD_REWIND_AMOUNT = 10000;
             }
+            PROGRESS_LOOP_INTERVAL = 1000;
             basePlayerImpl.getPlayer().setVolume(1f);
         }
 
@@ -323,6 +321,7 @@ public class BackgroundPlayer extends Service {
         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);
         }
 
@@ -452,4 +451,4 @@ public class BackgroundPlayer extends Service {
             releaseWifiAndCpu();
         }
     }
-}
+}

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

@@ -22,6 +22,7 @@ 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;
@@ -47,6 +48,8 @@ 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;
@@ -77,6 +80,7 @@ public abstract class BasePlayer implements ExoPlayer.EventListener, AudioManage
     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 = "";
@@ -176,6 +180,7 @@ public abstract class BasePlayer implements ExoPlayer.EventListener, AudioManage
         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);
@@ -189,6 +194,7 @@ public abstract class BasePlayer implements ExoPlayer.EventListener, AudioManage
         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);
@@ -319,7 +325,6 @@ public abstract class BasePlayer implements ExoPlayer.EventListener, AudioManage
         if (DEBUG) Log.d(TAG, "onAudioFocusGain() called");
         if (simpleExoPlayer != null) simpleExoPlayer.setVolume(DUCK_AUDIO_TO);
         animateAudio(DUCK_AUDIO_TO, 1f, DUCK_DURATION);
-        simpleExoPlayer.setPlayWhenReady(true);
     }
 
     protected void onAudioFocusLoss() {
@@ -438,6 +443,10 @@ public abstract class BasePlayer implements ExoPlayer.EventListener, AudioManage
     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 + "]");
@@ -556,6 +565,7 @@ public abstract class BasePlayer implements ExoPlayer.EventListener, AudioManage
 
     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;
@@ -569,6 +579,10 @@ public abstract class BasePlayer implements ExoPlayer.EventListener, AudioManage
                 : 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);
@@ -714,4 +728,12 @@ public abstract class BasePlayer implements ExoPlayer.EventListener, AudioManage
     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

@@ -21,10 +21,13 @@ 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
  *
@@ -37,14 +40,7 @@ public class MainVideoPlayer extends Activity {
     private AudioManager audioManager;
     private GestureDetector gestureDetector;
 
-    private final Runnable hideUiRunnable = new Runnable() {
-        @Override
-        public void run() {
-            hideSystemUi();
-        }
-    };
     private boolean activityPaused;
-
     private VideoPlayerImpl playerImpl;
 
     /*//////////////////////////////////////////////////////////////////////////
@@ -188,6 +184,7 @@ public class MainVideoPlayer extends Activity {
                 repeatButton.setAlpha(77);
             }
 
+            getRootView().setKeepScreenOn(true);
         }
 
         @Override
@@ -265,14 +262,15 @@ public class MainVideoPlayer extends Activity {
             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.isQualityMenuVisible()) {
-                            animateView(playerImpl.getControlsRoot(), false, 300, DEFAULT_CONTROLS_HIDE_TIME, true);
+                        if (getCurrentState() == STATE_PLAYING && !playerImpl.isSomePopupMenuVisible()) {
+                            hideControls(300, DEFAULT_CONTROLS_HIDE_TIME);
                         }
                     }
-                }, false);
+                });
             }
         }
 
@@ -285,14 +283,14 @@ public class MainVideoPlayer extends Activity {
         public void onStopTrackingTouch(SeekBar seekBar) {
             super.onStopTrackingTouch(seekBar);
             if (playerImpl.wasPlaying()) {
-                animateView(playerImpl.getControlsRoot(), false, 100, 0);
+                hideControls(100, 0);
             }
         }
 
         @Override
         public void onDismiss(PopupMenu menu) {
             super.onDismiss(menu);
-            if (isPlaying()) animateView(getControlsRoot(), false, 500, 0);
+            if (isPlaying()) hideControls(300, 0);
         }
 
         @Override
@@ -310,53 +308,51 @@ public class MainVideoPlayer extends Activity {
         public void onLoading() {
             super.onLoading();
             playPauseButton.setImageResource(R.drawable.ic_pause_white);
-            animateView(playPauseButton, false, 100, 0);
+            animateView(playPauseButton, AnimationUtils.Type.SCALE_AND_ALPHA, false, 100);
+            getRootView().setKeepScreenOn(true);
         }
 
         @Override
         public void onBuffering() {
             super.onBuffering();
-            animateView(playPauseButton, false, 100, 0);
+            animateView(playPauseButton, AnimationUtils.Type.SCALE_AND_ALPHA, false, 100);
+            getRootView().setKeepScreenOn(true);
         }
 
         @Override
         public void onPlaying() {
             super.onPlaying();
-            //playPauseButton.setImageResource(R.drawable.ic_pause_white);
-            //animateView(playPauseButton, true, 500, 0);
-
-            animateView(playPauseButton, false, 80, 0, new Runnable() {
+            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, true, 200, 0);
+                    animateView(playPauseButton, AnimationUtils.Type.SCALE_AND_ALPHA, true, 200);
                 }
             });
-
             showSystemUi();
+            getRootView().setKeepScreenOn(true);
         }
 
         @Override
         public void onPaused() {
             super.onPaused();
-            //playPauseButton.setImageResource(R.drawable.ic_play_arrow_white);
-            //animateView(playPauseButton, true, 100, 0);
-
-            animateView(playPauseButton, false, 80, 0, new Runnable() {
+            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, true, 200, 0);
+                    animateView(playPauseButton, AnimationUtils.Type.SCALE_AND_ALPHA, true, 200);
                 }
             });
 
             showSystemUi();
+            getRootView().setKeepScreenOn(false);
         }
 
         @Override
         public void onPausedSeek() {
             super.onPausedSeek();
-            animateView(playPauseButton, false, 100, 0);
+            animateView(playPauseButton, AnimationUtils.Type.SCALE_AND_ALPHA, false, 100);
+            getRootView().setKeepScreenOn(true);
         }
 
 
@@ -366,14 +362,15 @@ public class MainVideoPlayer extends Activity {
                 playPauseButton.setImageResource(R.drawable.ic_pause_white);
             } else {
                 showSystemUi();
-                animateView(playPauseButton, false, 0, 0, new Runnable() {
+                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, true, 300, 0);
+                        animateView(playPauseButton, AnimationUtils.Type.SCALE_AND_ALPHA, true, 300);
                     }
                 });
             }
+            getRootView().setKeepScreenOn(false);
             super.onCompleted();
         }
 
@@ -382,19 +379,20 @@ public class MainVideoPlayer extends Activity {
         //////////////////////////////////////////////////////////////////////////*/
 
         @Override
-        public void animateView(View view, boolean enterOrExit, long duration, long delay, final Runnable execOnEnd, boolean hideUi) {
-            //if (execOnEnd == null) playerImpl.setDefaultAnimationEnd(hideUiRunnable);
-
-            if (hideUi && execOnEnd != null) {
-                Runnable combinedRunnable = new Runnable() {
-                    @Override
-                    public void run() {
-                        execOnEnd.run();
-                        hideUiRunnable.run();
-                    }
-                };
-                super.animateView(view, enterOrExit, duration, delay, combinedRunnable, true);
-            } else super.animateView(view, enterOrExit, duration, delay, hideUi ? hideUiRunnable : execOnEnd, hideUi);
+        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);
         }
 
         ///////////////////////////////////////////////////////////////////////////
@@ -443,19 +441,16 @@ public class MainVideoPlayer extends Activity {
             if (DEBUG) Log.d(TAG, "onSingleTapConfirmed() called with: e = [" + e + "]");
             if (playerImpl.getCurrentState() != BasePlayer.STATE_PLAYING) return true;
 
-            if (playerImpl.isControlsVisible()) playerImpl.animateView(playerImpl.getControlsRoot(), false, 150, 0, true);
+            if (playerImpl.isControlsVisible()) playerImpl.hideControls(150, 0);
             else {
-                playerImpl.animateView(playerImpl.getControlsRoot(), true, 500, 0, new Runnable() {
-                    @Override
-                    public void run() {
-                        playerImpl.animateView(playerImpl.getControlsRoot(), false, 300, VideoPlayer.DEFAULT_CONTROLS_HIDE_TIME, true);
-                    }
-                });
+                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;
 
@@ -473,6 +468,8 @@ public class MainVideoPlayer extends Activity {
         // 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() + "]" +
@@ -500,7 +497,7 @@ public class MainVideoPlayer extends Activity {
                 if (DEBUG) Log.d(TAG, "onScroll().volumeControl, currentVolume = " + currentVolume);
                 playerImpl.getVolumeTextView().setText(volumeUnicode + " " + Math.round((((float) currentVolume) / maxVolume) * 100) + "%");
 
-                if (playerImpl.getVolumeTextView().getVisibility() != View.VISIBLE) playerImpl.animateView(playerImpl.getVolumeTextView(), true, 200, 0);
+                if (playerImpl.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();
@@ -515,7 +512,7 @@ public class MainVideoPlayer extends Activity {
 
                 playerImpl.getBrightnessTextView().setText(brightnessUnicode + " " + (brightnessNormalized == 1 ? 0 : brightnessNormalized) + "%");
 
-                if (playerImpl.getBrightnessTextView().getVisibility() != View.VISIBLE) playerImpl.animateView(playerImpl.getBrightnessTextView(), true, 200, 0);
+                if (playerImpl.getBrightnessTextView().getVisibility() != View.VISIBLE) animateView(playerImpl.getBrightnessTextView(), true, 200);
                 if (playerImpl.getVolumeTextView().getVisibility() == View.VISIBLE) playerImpl.getVolumeTextView().setVisibility(View.GONE);
             }
             return true;
@@ -527,11 +524,11 @@ public class MainVideoPlayer extends Activity {
             eventsNum = 0;
             /* if (playerImpl.getVolumeTextView().getVisibility() == View.VISIBLE) playerImpl.getVolumeTextView().setVisibility(View.GONE);
             if (playerImpl.getBrightnessTextView().getVisibility() == View.VISIBLE) playerImpl.getBrightnessTextView().setVisibility(View.GONE);*/
-            if (playerImpl.getVolumeTextView().getVisibility() == View.VISIBLE) playerImpl.animateView(playerImpl.getVolumeTextView(), false, 200, 200);
-            if (playerImpl.getBrightnessTextView().getVisibility() == View.VISIBLE) playerImpl.animateView(playerImpl.getBrightnessTextView(), false, 200, 200);
+            if (playerImpl.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.animateView(playerImpl.getControlsRoot(), false, 300, VideoPlayer.DEFAULT_CONTROLS_HIDE_TIME, true);
+                playerImpl.hideControls(300, VideoPlayer.DEFAULT_CONTROLS_HIDE_TIME);
             }
         }
 

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

@@ -7,13 +7,14 @@ 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.content.res.Resources;
 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;
@@ -24,6 +25,8 @@ 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;
@@ -43,6 +46,8 @@ 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
  *
@@ -58,14 +63,19 @@ public class PopupVideoPlayer extends Service {
     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 currentPopupHeight = 110.0f * Resources.getSystem().getDisplayMetrics().density;
-    //private float minimumHeight = 100; // TODO: Use it when implementing the resize of the popup
+
+    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;
@@ -114,6 +124,8 @@ public class PopupVideoPlayer extends Service {
     @Override
     public void onConfigurationChanged(Configuration newConfig) {
         updateScreenSize();
+        updatePopupSize(windowLayoutParams.width, -1);
+        checkPositionBounds();
     }
 
     @Override
@@ -129,6 +141,8 @@ public class PopupVideoPlayer extends Service {
             currentExtractorWorker.cancel();
             currentExtractorWorker = null;
         }
+
+        savePositionAndSize();
     }
 
     @Override
@@ -144,21 +158,33 @@ public class PopupVideoPlayer extends Service {
     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) getMinimumVideoWidth(currentPopupHeight), (int) currentPopupHeight,
+                (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);
+        //gestureDetector.setIsLongpressEnabled(false);
         rootView.setOnTouchListener(listener);
         playerImpl.getLoadingPanel().setMinimumWidth(windowLayoutParams.width);
         playerImpl.getLoadingPanel().setMinimumHeight(windowLayoutParams.height);
@@ -219,13 +245,13 @@ public class PopupVideoPlayer extends Service {
         notificationManager.notify(NOTIFICATION_ID, notBuilder.build());
     }
 
-
     /*//////////////////////////////////////////////////////////////////////////
     // Misc
     //////////////////////////////////////////////////////////////////////////*/
 
     public void onVideoClose() {
         if (DEBUG) Log.d(TAG, "onVideoClose() called");
+        savePositionAndSize();
         stopSelf();
     }
 
@@ -237,6 +263,7 @@ public class PopupVideoPlayer extends Service {
         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));
     }
@@ -245,10 +272,23 @@ public class PopupVideoPlayer extends Service {
     // Utils
     //////////////////////////////////////////////////////////////////////////*/
 
-    private float getMinimumVideoWidth(float height) {
-        float width = height * (16.0f / 9.0f); // Respect the 16:9 ratio that most videos have
-        if (DEBUG) Log.d(TAG, "getMinimumVideoWidth() called with: height = [" + height + "], returned: " + width);
-        return width;
+    private void 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() {
@@ -258,11 +298,39 @@ public class PopupVideoPlayer extends Service {
         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);
         }
@@ -271,13 +339,20 @@ public class PopupVideoPlayer extends Service {
         public void playUrl(String url, String format, boolean autoPlay) {
             super.playUrl(url, format, autoPlay);
 
-            windowLayoutParams.width = (int) getMinimumVideoWidth(currentPopupHeight);
+            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();
@@ -337,7 +412,7 @@ public class PopupVideoPlayer extends Service {
         @Override
         public void onDismiss(PopupMenu menu) {
             super.onDismiss(menu);
-            if (isPlaying()) animateView(getControlsRoot(), false, 500, 0);
+            if (isPlaying()) hideControls(500, 0);
         }
 
         @Override
@@ -347,7 +422,14 @@ public class PopupVideoPlayer extends Service {
             stopSelf();
         }
 
-        /*//////////////////////////////////////////////////////////////////////////
+        @Override
+        public void onStopTrackingTouch(SeekBar seekBar) {
+            super.onStopTrackingTouch(seekBar);
+            if (playerImpl.wasPlaying()) {
+                hideControls(100, 0);
+            }
+        }
+/*//////////////////////////////////////////////////////////////////////////
         // Broadcast Receiver
         //////////////////////////////////////////////////////////////////////////*/
 
@@ -422,12 +504,21 @@ public class PopupVideoPlayer extends Service {
             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());
@@ -450,15 +541,34 @@ public class PopupVideoPlayer extends Service {
             if (DEBUG) Log.d(TAG, "onDown() called with: e = [" + e + "]");
             initialPopupX = windowLayoutParams.x;
             initialPopupY = windowLayoutParams.y;
-            popupWidth = playerImpl.getRootView().getWidth();
-            popupHeight = playerImpl.getRootView().getHeight();
+            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 (!isMoving || playerImpl.getControlsRoot().getAlpha() != 1f) playerImpl.animateView(playerImpl.getControlsRoot(), true, 30, 0);
+            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);
 
@@ -477,7 +587,7 @@ public class PopupVideoPlayer extends Service {
                     ", e2.getRaw = [" + e2.getRawX() + ", " + e2.getRawY() + "]" +
                     ", distanceXy = [" + distanceX + ", " + distanceY + "]" +
                     ", posXy = [" + posX + ", " + posY + "]" +
-                    ", popupWh rootView.get wh = [" + popupWidth + " x " + popupHeight + "]");
+                    ", popupWh = [" + popupWidth + " x " + popupHeight + "]");
             windowManager.updateViewLayout(playerImpl.getRootView(), windowLayoutParams);
             return true;
         }
@@ -485,16 +595,38 @@ public class PopupVideoPlayer extends Service {
         private void onScrollEnd() {
             if (DEBUG) Log.d(TAG, "onScrollEnd() called");
             if (playerImpl.isControlsVisible() && playerImpl.getCurrentState() == BasePlayer.STATE_PLAYING) {
-                playerImpl.animateView(playerImpl.getControlsRoot(), false, 300, VideoPlayer.DEFAULT_CONTROLS_HIDE_TIME);
+                playerImpl.hideControls(300, VideoPlayer.DEFAULT_CONTROLS_HIDE_TIME);
             }
         }
 
         @Override
         public boolean onTouch(View v, MotionEvent event) {
             gestureDetector.onTouchEvent(event);
-            if (event.getAction() == MotionEvent.ACTION_UP && isMoving) {
-                isMoving = false;
-                onScrollEnd();
+            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;
         }
@@ -546,7 +678,9 @@ public class PopupVideoPlayer extends Service {
             imageLoader.resume();
             imageLoader.loadImage(info.thumbnail_url, displayImageOptions, new SimpleImageLoadingListener() {
                 @Override
-                public void onLoadingComplete(String imageUri, View view, final Bitmap loadedImage) {
+                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() {

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

@@ -12,6 +12,7 @@ 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;
@@ -36,12 +37,15 @@ 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
  *
@@ -70,6 +74,7 @@ public abstract class VideoPlayer extends BasePlayer implements SimpleExoPlayer.
     //////////////////////////////////////////////////////////////////////////*/
 
     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;
@@ -95,18 +100,23 @@ public abstract class VideoPlayer extends BasePlayer implements SimpleExoPlayer.
     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 isQualityPopupMenuVisible = false;
+    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) {
@@ -133,6 +143,7 @@ public abstract class VideoPlayer extends BasePlayer implements SimpleExoPlayer.
         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);
@@ -144,6 +155,7 @@ public abstract class VideoPlayer extends BasePlayer implements SimpleExoPlayer.
         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);
 
@@ -153,6 +165,7 @@ public abstract class VideoPlayer extends BasePlayer implements SimpleExoPlayer.
     public void initListeners() {
         super.initListeners();
         playbackSeekBar.setOnSeekBarChangeListener(this);
+        playbackSpeed.setOnClickListener(this);
         fullScreenButton.setOnClickListener(this);
         qualityTextView.setOnClickListener(this);
     }
@@ -203,6 +216,9 @@ public abstract class VideoPlayer extends BasePlayer implements SimpleExoPlayer.
         qualityPopupMenu.getMenu().removeGroup(qualityPopupMenuGroupId);
         buildQualityMenu(qualityPopupMenu);
 
+        playbackSpeedPopupMenu.getMenu().removeGroup(playbackSpeedPopupMenuGroupId);
+        buildPlaybackSpeedMenu(playbackSpeedPopupMenu);
+
         super.playUrl(url, format, autoPlay);
     }
 
@@ -225,6 +241,15 @@ public abstract class VideoPlayer extends BasePlayer implements SimpleExoPlayer.
         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
     //////////////////////////////////////////////////////////////////////////*/
@@ -235,6 +260,9 @@ public abstract class VideoPlayer extends BasePlayer implements SimpleExoPlayer.
 
         if (!isProgressLoopRunning.get()) startProgressLoop();
 
+        controlsVisibilityHandler.removeCallbacksAndMessages(null);
+        animateView(controlsRoot, false, 300);
+
         showAndAnimateControl(-1, true);
         playbackSeekBar.setEnabled(true);
         playbackSeekBar.setProgress(0);
@@ -242,10 +270,10 @@ public abstract class VideoPlayer extends BasePlayer implements SimpleExoPlayer.
         // 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, 0);
+        animateView(endScreen, false, 0);
         loadingPanel.setBackgroundColor(Color.BLACK);
-        animateView(loadingPanel, true, 0, 0);
-        animateView(surfaceForeground, true, 100, 0);
+        animateView(loadingPanel, true, 0);
+        animateView(surfaceForeground, true, 100);
     }
 
     @Override
@@ -254,26 +282,21 @@ public abstract class VideoPlayer extends BasePlayer implements SimpleExoPlayer.
         if (!isProgressLoopRunning.get()) startProgressLoop();
         showAndAnimateControl(-1, true);
         loadingPanel.setVisibility(View.GONE);
-        animateView(controlsRoot, true, 500, 0, new Runnable() {
-            @Override
-            public void run() {
-                animateView(controlsRoot, false, 500, DEFAULT_CONTROLS_HIDE_TIME, true);
-            }
-        });
-        animateView(currentDisplaySeek, false, 200, 0);
+        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, 0);
+        animateView(loadingPanel, true, 500);
     }
 
     @Override
     public void onPaused() {
         if (DEBUG) Log.d(TAG, "onPaused() called");
-        animateView(controlsRoot, true, 500, 100);
+        showControls(400);
         loadingPanel.setVisibility(View.GONE);
     }
 
@@ -289,9 +312,9 @@ public abstract class VideoPlayer extends BasePlayer implements SimpleExoPlayer.
 
         if (isProgressLoopRunning.get()) stopProgressLoop();
 
-        animateView(controlsRoot, true, 500, 0);
-        animateView(endScreen, true, 800, 0);
-        animateView(currentDisplaySeek, false, 200, 0);
+        showControls(500);
+        animateView(endScreen, true, 800);
+        animateView(currentDisplaySeek, AnimationUtils.Type.SCALE_AND_ALPHA, false, 200);
         loadingPanel.setVisibility(View.GONE);
 
         playbackSeekBar.setMax((int) simpleExoPlayer.getDuration());
@@ -302,7 +325,7 @@ public abstract class VideoPlayer extends BasePlayer implements SimpleExoPlayer.
         // 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, 0);
+        animateView(surfaceForeground, true, 100);
 
         if (currentRepeatMode == RepeatMode.REPEAT_ONE) {
             changeState(STATE_LOADING);
@@ -324,7 +347,7 @@ public abstract class VideoPlayer extends BasePlayer implements SimpleExoPlayer.
 
     @Override
     public void onRenderedFirstFrame() {
-        animateView(surfaceForeground, false, 100, 0);
+        animateView(surfaceForeground, false, 100);
     }
 
     /*//////////////////////////////////////////////////////////////////////////
@@ -343,6 +366,7 @@ public abstract class VideoPlayer extends BasePlayer implements SimpleExoPlayer.
 
         playbackSeekBar.setMax((int) simpleExoPlayer.getDuration());
         playbackEndTime.setText(getTimeString((int) simpleExoPlayer.getDuration()));
+        playbackSpeed.setText(formatSpeed(getPlaybackSpeed()));
 
         super.onPrepared(playWhenReady);
     }
@@ -409,47 +433,67 @@ public abstract class VideoPlayer extends BasePlayer implements SimpleExoPlayer.
             onFullScreenButtonClicked();
         } else if (v.getId() == qualityTextView.getId()) {
             onQualitySelectorClicked();
+        } else if (v.getId() == playbackSpeed.getId()) {
+            onPlaybackSpeedClicked();
         }
     }
 
     /**
-     * Called when an item of the quality selector is selected
+     * 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 (selectedIndexStream == menuItem.getItemId()) return true;
-        setVideoStartPos((int) simpleExoPlayer.getCurrentPosition());
 
-        selectedIndexStream = menuItem.getItemId();
-        if (!(getCurrentState() == STATE_COMPLETED)) play(wasPlaying);
-        else qualityChanged = true;
+        if (qualityPopupMenuGroupId == menuItem.getGroupId()) {
+            if (selectedIndexStream == menuItem.getItemId()) return true;
+            setVideoStartPos((int) simpleExoPlayer.getCurrentPosition());
 
-        qualityTextView.setText(menuItem.getTitle());
-        return true;
+            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 the quality selector is dismissed
+     * Called when some popup menu is dismissed
      */
     @Override
     public void onDismiss(PopupMenu menu) {
         if (DEBUG) Log.d(TAG, "onDismiss() called with: menu = [" + menu + "]");
-        isQualityPopupMenuVisible = false;
+        isSomePopupMenuVisible = false;
         qualityTextView.setText(getSelectedVideoStream().resolution);
     }
 
     public void onQualitySelectorClicked() {
         if (DEBUG) Log.d(TAG, "onQualitySelectorClicked() called");
         qualityPopupMenu.show();
-        isQualityPopupMenuVisible = true;
-        animateView(getControlsRoot(), true, 300, 0);
+        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
     //////////////////////////////////////////////////////////////////////////*/
@@ -469,8 +513,8 @@ public abstract class VideoPlayer extends BasePlayer implements SimpleExoPlayer.
         wasPlaying = isPlaying();
         if (isPlaying()) simpleExoPlayer.setPlayWhenReady(false);
 
-        animateView(controlsRoot, true, 0, 0);
-        animateView(currentDisplaySeek, true, 300, 0);
+        showControls(0);
+        animateView(currentDisplaySeek, AnimationUtils.Type.SCALE_AND_ALPHA, true, 300);
     }
 
     @Override
@@ -481,7 +525,7 @@ public abstract class VideoPlayer extends BasePlayer implements SimpleExoPlayer.
         if (wasPlaying || simpleExoPlayer.getDuration() == seekBar.getProgress()) simpleExoPlayer.setPlayWhenReady(true);
 
         playbackCurrentTime.setText(getTimeString(seekBar.getProgress()));
-        animateView(currentDisplaySeek, false, 200, 0);
+        animateView(currentDisplaySeek, AnimationUtils.Type.SCALE_AND_ALPHA, false, 200);
 
         if (getCurrentState() == STATE_PAUSED_SEEK) changeState(STATE_BUFFERING);
         if (!isProgressLoopRunning.get()) startProgressLoop();
@@ -550,105 +594,35 @@ public abstract class VideoPlayer extends BasePlayer implements SimpleExoPlayer.
         controlViewAnimator.start();
     }
 
-    public void animateView(View view, boolean enterOrExit, long duration, long delay) {
-        animateView(view, enterOrExit, duration, delay, null, false);
+    public boolean isSomePopupMenuVisible() {
+        return isSomePopupMenuVisible;
     }
 
-    public void animateView(View view, boolean enterOrExit, long duration, long delay, boolean hideUi) {
-        animateView(view, enterOrExit, duration, delay, null, hideUi);
-    }
-
-    public void animateView(final View view, final boolean enterOrExit, long duration, long delay, final Runnable execOnEnd) {
-        animateView(view, enterOrExit, duration, delay, execOnEnd, false);
-    }
-
-    /**
-     * Animate the view
-     *
-     * @param view        view that will be animated
-     * @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
-     * @param hideUi      need to hide ui when animation ends,
-     *                    just a helper for classes extending this
-     */
-    public void animateView(final View view, final boolean enterOrExit, long duration, long delay, final Runnable execOnEnd, boolean hideUi) {
-        if (DEBUG) {
-            Log.d(TAG, "animateView() called with: view = [" + view + "], 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);
-
-        if (view == controlsRoot) {
-            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();
+    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);
             }
-            return;
-        }
-
-        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();
-        }
+        });
     }
 
-    public boolean isQualityMenuVisible() {
-        return isQualityPopupMenuVisible;
+    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);
     }
 
     /*//////////////////////////////////////////////////////////////////////////
@@ -711,6 +685,10 @@ public abstract class VideoPlayer extends BasePlayer implements SimpleExoPlayer.
         this.startedFromNewPipe = startedFromNewPipe;
     }
 
+    public Handler getControlsVisibilityHandler() {
+        return controlsVisibilityHandler;
+    }
+
     public View getRootView() {
         return rootView;
     }

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

@@ -1,6 +1,7 @@
 package org.schabi.newpipe.report;
 
 import android.content.Context;
+import android.support.annotation.NonNull;
 
 import org.acra.collector.CrashReportData;
 import org.acra.sender.ReportSender;
@@ -30,9 +31,9 @@ import org.schabi.newpipe.R;
 public class AcraReportSender implements ReportSender {
 
     @Override
-    public void send(Context context, CrashReportData report) throws ReportSenderException {
+    public void send(@NonNull Context context, @NonNull CrashReportData report) throws ReportSenderException {
         ErrorActivity.reportError(context, report,
-                ErrorActivity.ErrorInfo.make(ErrorActivity.UI_ERROR,"none",
+                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,6 +1,7 @@
 package org.schabi.newpipe.report;
 
 import android.content.Context;
+import android.support.annotation.NonNull;
 
 import org.acra.config.ACRAConfiguration;
 import org.acra.sender.ReportSender;
@@ -28,7 +29,8 @@ import org.schabi.newpipe.report.AcraReportSender;
  */
 
 public class AcraReportSenderFactory implements ReportSenderFactory {
-    public ReportSender create(Context context, ACRAConfiguration config) {
+    @NonNull
+    public ReportSender create(@NonNull Context context, @NonNull ACRAConfiguration config) {
         return new AcraReportSender();
     }
 }

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

@@ -11,6 +11,8 @@ 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;
@@ -71,24 +73,7 @@ public class ErrorActivity extends AppCompatActivity {
     // BUNDLE TAGS
     public static final String ERROR_INFO = "error_info";
     public static final String ERROR_LIST = "error_list";
-    // MESSAGE ID
-    public static final int SEARCHED = 0;
-    public static final int REQUESTED_STREAM = 1;
-    public static final int GET_SUGGESTIONS = 2;
-    public static final int SOMETHING_ELSE = 3;
-    public static final int USER_REPORT = 4;
-    public static final int LOAD_IMAGE = 5;
-    public static final int UI_ERROR = 6;
-    public static final int REQUESTED_CHANNEL = 7;
-    // MESSAGE STRING
-    public static final String SEARCHED_STRING = "searched";
-    public static final String REQUESTED_STREAM_STRING = "requested stream";
-    public static final String GET_SUGGESTIONS_STRING = "get suggestions";
-    public static final String SOMETHING_ELSE_STRING = "something";
-    public static final String USER_REPORT_STRING = "user report";
-    public static final String LOAD_IMAGE_STRING = "load image";
-    public static final String UI_ERROR_STRING = "ui error";
-    public static final String REQUESTED_CHANNEL_STRING = "requested channel";
+
     public static final String ERROR_EMAIL_ADDRESS = "crashreport@newpipe.schabi.org";
     public static final String ERROR_EMAIL_SUBJECT = "Exception in NewPipe " + BuildConfig.VERSION_NAME;
     Thread globIpRangeThread;
@@ -105,11 +90,11 @@ public class ErrorActivity extends AppCompatActivity {
     private TextView errorMessageView;
 
     public static void reportUiError(final AppCompatActivity activity, final Throwable el) {
-        reportError(activity, el, activity.getClass(), null, ErrorInfo.make(UI_ERROR, "none", "", R.string.app_ui_crash));
+        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 returnAcitivty, View rootView, final ErrorInfo errorInfo) {
+                                   final Class returnActivity, View rootView, final ErrorInfo errorInfo) {
 
         if (rootView != null) {
             Snackbar.make(rootView, R.string.error_snackbar_message, Snackbar.LENGTH_LONG)
@@ -118,7 +103,7 @@ public class ErrorActivity extends AppCompatActivity {
                         @Override
                         public void onClick(View v) {
                             ActivityCommunicator ac = ActivityCommunicator.getCommunicator();
-                            ac.returnActivity = returnAcitivty;
+                            ac.returnActivity = returnActivity;
                             Intent intent = new Intent(context, ErrorActivity.class);
                             intent.putExtra(ERROR_INFO, errorInfo);
                             intent.putExtra(ERROR_LIST, elToSl(el));
@@ -128,7 +113,7 @@ public class ErrorActivity extends AppCompatActivity {
                     }).show();
         } else {
             ActivityCommunicator ac = ActivityCommunicator.getCommunicator();
-            ac.returnActivity = returnAcitivty;
+            ac.returnActivity = returnActivity;
             Intent intent = new Intent(context, ErrorActivity.class);
             intent.putExtra(ERROR_INFO, errorInfo);
             intent.putExtra(ERROR_LIST, elToSl(el));
@@ -138,34 +123,34 @@ public class ErrorActivity extends AppCompatActivity {
     }
 
     public static void reportError(final Context context, final Throwable e,
-                                   final Class returnAcitivty, View rootView, final ErrorInfo errorInfo) {
+                                   final Class returnActivity, View rootView, final ErrorInfo errorInfo) {
         List<Throwable> el = null;
         if(e != null) {
             el = new Vector<>();
             el.add(e);
         }
-        reportError(context, el, returnAcitivty, rootView, errorInfo);
+        reportError(context, el, returnActivity, rootView, errorInfo);
     }
 
     // async call
     public static void reportError(Handler handler, final Context context, final Throwable e,
-                                   final Class returnAcitivty, final View rootView, final ErrorInfo errorInfo) {
+                                   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, returnAcitivty, rootView, errorInfo);
+        reportError(handler, context, el, returnActivity, rootView, errorInfo);
     }
 
     // async call
     public static void reportError(Handler handler, final Context context, final List<Throwable> el,
-                                   final Class returnAcitivty, final View rootView, final ErrorInfo errorInfo) {
+                                   final Class returnActivity, final View rootView, final ErrorInfo errorInfo) {
         handler.post(new Runnable() {
             @Override
             public void run() {
-                reportError(context, el, returnAcitivty, rootView, errorInfo);
+                reportError(context, el, returnActivity, rootView, errorInfo);
             }
         });
     }
@@ -232,7 +217,7 @@ public class ErrorActivity extends AppCompatActivity {
         errorInfo = intent.getParcelableExtra(ERROR_INFO);
         errorList = intent.getStringArrayExtra(ERROR_LIST);
 
-                //importand add gurumeditaion
+        // important add guru meditation
         addGuruMeditaion();
         currentTimeStamp = getCurrentTimeStamp();
 
@@ -250,7 +235,7 @@ public class ErrorActivity extends AppCompatActivity {
         });
         reportButton.setEnabled(false);
 
-        globIpRangeThread = new Thread(new IpRagneRequester());
+        globIpRangeThread = new Thread(new IpRangeRequester());
         globIpRangeThread.start();
 
         // normal bugreport
@@ -308,17 +293,30 @@ public class ErrorActivity extends AppCompatActivity {
         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() {
-        if (returnActivity == null) {
+        Class<? extends Activity> checkedReturnActivity = getReturnActivity(returnActivity);
+        if (checkedReturnActivity == null) {
             super.onBackPressed();
         } else {
-            Intent intent;
-            if (returnActivity != null &&
-                    returnActivity.isAssignableFrom(Activity.class)) {
-                intent = new Intent(this, returnActivity);
-            } else {
-                intent = new Intent(this, MainActivity.class);
-            }
+            Intent intent = new Intent(this, checkedReturnActivity);
             intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
             NavUtils.navigateUpTo(this, intent);
         }
@@ -376,26 +374,11 @@ public class ErrorActivity extends AppCompatActivity {
         return "";
     }
 
-    private String getUserActionString(int userAction) {
-        switch (userAction) {
-            case REQUESTED_STREAM:
-                return REQUESTED_STREAM_STRING;
-            case SEARCHED:
-                return SEARCHED_STRING;
-            case GET_SUGGESTIONS:
-                return GET_SUGGESTIONS_STRING;
-            case SOMETHING_ELSE:
-                return SOMETHING_ELSE_STRING;
-            case USER_REPORT:
-                return USER_REPORT_STRING;
-            case LOAD_IMAGE:
-                return LOAD_IMAGE_STRING;
-            case UI_ERROR:
-                return UI_ERROR_STRING;
-            case REQUESTED_CHANNEL:
-                return REQUESTED_CHANNEL_STRING;
-            default:
-                return "Your description is in another castle.";
+    private String getUserActionString(UserAction userAction) {
+        if(userAction == null) {
+            return "Your description is in another castle.";
+        } else {
+            return userAction.getMessage();
         }
     }
 
@@ -444,28 +427,28 @@ public class ErrorActivity extends AppCompatActivity {
                 return new ErrorInfo[size];
             }
         };
-        public int userAction;
-        public String request;
-        public String serviceName;
-        public int message;
+        final public UserAction userAction;
+        final public String request;
+        final public String serviceName;
+        @StringRes
+        final public int message;
 
-        public ErrorInfo() {
+        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 = in.readInt();
+            this.userAction = UserAction.valueOf(in.readString());
             this.request = in.readString();
             this.serviceName = in.readString();
             this.message = in.readInt();
         }
 
-        public static ErrorInfo make(int userAction, String serviceName, String request, int message) {
-            ErrorInfo info = new ErrorInfo();
-            info.userAction = userAction;
-            info.serviceName = serviceName;
-            info.request = request;
-            info.message = message;
-            return info;
+        public static ErrorInfo make(UserAction userAction, String serviceName, String request, @StringRes int message) {
+            return new ErrorInfo(userAction, serviceName, request, message);
         }
 
         @Override
@@ -475,14 +458,14 @@ public class ErrorActivity extends AppCompatActivity {
 
         @Override
         public void writeToParcel(Parcel dest, int flags) {
-            dest.writeInt(this.userAction);
+            dest.writeString(this.userAction.name());
             dest.writeString(this.request);
             dest.writeString(this.serviceName);
             dest.writeInt(this.message);
         }
     }
 
-    private class IpRagneRequester implements Runnable {
+    private class IpRangeRequester implements Runnable {
         Handler h = new Handler();
         public void run() {
             String ipRange = "none";
@@ -493,17 +476,16 @@ public class ErrorActivity extends AppCompatActivity {
                 ipRange = Parser.matchGroup1("([0-9]*\\.[0-9]*\\.)[0-9]*\\.[0-9]*", ip)
                         + "0.0";
             } catch(Throwable e) {
-                Log.d(TAG, "Error while error: could not get iprange");
-                e.printStackTrace();
+                Log.w(TAG, "Error while error: could not get iprange", e);
             } finally {
-                h.post(new IpRageReturnRunnable(ipRange));
+                h.post(new IpRangeReturnRunnable(ipRange));
             }
         }
     }
 
-    private class IpRageReturnRunnable implements Runnable {
+    private class IpRangeReturnRunnable implements Runnable {
         String ipRange;
-        public IpRageReturnRunnable(String ipRange) {
+        public IpRangeReturnRunnable(String ipRange) {
             this.ipRange = ipRange;
         }
         public void run() {

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

@@ -72,9 +72,7 @@ public class NewPipeSettings {
     public static String getVideoDownloadPath(Context context) {
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
         final String key = context.getString(R.string.download_path_key);
-        String downloadPath = prefs.getString(key, Environment.DIRECTORY_MOVIES);
-
-        return downloadPath;
+        return prefs.getString(key, Environment.DIRECTORY_MOVIES);
     }
 
     public static File getAudioDownloadFolder(Context context) {
@@ -84,9 +82,7 @@ public class NewPipeSettings {
     public static String getAudioDownloadPath(Context context) {
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
         final String key = context.getString(R.string.download_path_audio_key);
-        String downloadPath = prefs.getString(key, Environment.DIRECTORY_MUSIC);
-
-        return downloadPath;
+        return prefs.getString(key, Environment.DIRECTORY_MUSIC);
     }
 
     private static File getFolder(Context context, int keyID, String defaultDirectoryName) {

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

@@ -49,19 +49,21 @@ public class SettingsActivity extends AppCompatActivity {
         ActionBar actionBar = getSupportActionBar();
         if (actionBar != null) {
             actionBar.setDisplayHomeAsUpEnabled(true);
-            actionBar.setTitle(R.string.settings_title);
+            actionBar.setTitle(R.string.settings);
             actionBar.setDisplayShowTitleEnabled(true);
         }
 
-        getFragmentManager().beginTransaction()
-                .replace(R.id.fragment_holder,  new SettingsFragment())
-                .commit();
+        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) {
+        if (id == android.R.id.home) {
             finish();
         }
         return true;

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

@@ -69,7 +69,7 @@ public class SettingsFragment extends PreferenceFragment implements SharedPrefer
 
     @Override
     public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
-        Log.d("TAG", "onPreferenceTreeClick() called with: 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)
@@ -87,11 +87,11 @@ public class SettingsFragment extends PreferenceFragment implements SharedPrefer
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
-        Log.d("TAG", "onActivityResult() called with: requestCode = [" + requestCode + "], resultCode = [" + resultCode + "], data = [" + 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().toString().substring(7);
+            String path = data.getData().getPath();
             defaultPreferences.edit().putString(key, path).apply();
             updatePreferencesSummary();
         } else if (requestCode == REQUEST_INSTALL_ORBOT) {
@@ -101,7 +101,7 @@ public class SettingsFragment extends PreferenceFragment implements SharedPrefer
         }
     }
 
-    /**
+    /*
      * 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,
@@ -114,7 +114,7 @@ public class SettingsFragment extends PreferenceFragment implements SharedPrefer
 
     @Override
     public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
-        Log.d("TAG", "onSharedPreferenceChanged() called with: sharedPreferences = [" + sharedPreferences + "], key = [" + key + "]");
+        if (MainActivity.DEBUG) Log.d("TAG", "onSharedPreferenceChanged() called with: sharedPreferences = [" + sharedPreferences + "], key = [" + key + "]");
         String summary = null;
 
         if (key.equals(USE_TOR_KEY)) {
@@ -131,10 +131,10 @@ public class SettingsFragment extends PreferenceFragment implements SharedPrefer
         } 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
-                Intent intentToMain = new Intent(activity, MainActivity.class);
-                intentToMain.putExtra(Constants.KEY_THEME_CHANGE, true);
-                startActivity(intentToMain);
+                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/Localization.java

@@ -1,10 +1,12 @@
-package org.schabi.newpipe;
+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;

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

@@ -1,23 +1,35 @@
 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.OnItemSelectedListener;
+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
@@ -36,7 +48,6 @@ public class NavigationHelper {
         return mIntent;
     }
 
-
     public static Intent getOpenVideoPlayerIntent(Context context, Class targetClazz, VideoPlayer instance) {
         return new Intent(context, targetClazz)
                 .putExtra(BasePlayer.VIDEO_TITLE, instance.getVideoTitle())
@@ -46,7 +57,8 @@ public class NavigationHelper {
                 .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.START_POSITION, ((int) instance.getPlayer().getCurrentPosition()))
+                .putExtra(BasePlayer.PLAYBACK_SPEED, instance.getPlaybackSpeed());
     }
 
     public static Intent getOpenBackgroundPlayerIntent(Context context, StreamInfo info) {
@@ -66,31 +78,77 @@ public class NavigationHelper {
     }
 
     /*//////////////////////////////////////////////////////////////////////////
-    // Through Interface (faster)
+    // Through FragmentManager
     //////////////////////////////////////////////////////////////////////////*/
 
-    public static void openChannel(OnItemSelectedListener listener, int serviceId, String url) {
-        openChannel(listener, serviceId, url, null);
+    public static void gotoMainFragment(FragmentManager fragmentManager) {
+        ImageLoader.getInstance().clearMemoryCache();
+
+        boolean popped = fragmentManager.popBackStackImmediate(MAIN_FRAGMENT_TAG, 0);
+        if (!popped) openMainFragment(fragmentManager);
     }
 
-    public static void openChannel(OnItemSelectedListener listener, int serviceId, String url, String name) {
-        listener.onItemSelected(StreamingService.LinkType.CHANNEL, serviceId, url, name);
+    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 openVideoDetail(OnItemSelectedListener listener, int serviceId, String url) {
-        openVideoDetail(listener, serviceId, url, null);
+    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 openVideoDetail(OnItemSelectedListener listener, int serviceId, String url, String title) {
-        listener.onItemSelected(StreamingService.LinkType.STREAM, serviceId, url, title);
+    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 openByLink(Context context, String url) throws Exception {
-        context.startActivity(getIntentByLink(context, url));
+    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) {
@@ -118,12 +176,12 @@ public class NavigationHelper {
         context.startActivity(mIntent);
     }
 
-    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 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) {
@@ -147,9 +205,27 @@ public class NavigationHelper {
             case CHANNEL:
                 return getOpenIntent(context, url, serviceId, StreamingService.LinkType.CHANNEL);
             case NONE:
-                throw new Exception("Url not known to service. service="
-                        + Integer.toString(serviceId) + " url=" + url);
+                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/workers/ChannelExtractorWorker.java

@@ -12,6 +12,8 @@ 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
  *
@@ -67,7 +69,7 @@ public class ChannelExtractorWorker extends ExtractorWorker {
         ChannelExtractor extractor = getService().getChannelExtractorInstance(url, pageNumber);
         channelInfo = ChannelInfo.getInfo(extractor);
 
-        if (!channelInfo.errors.isEmpty()) handleErrorsDuringExtraction(channelInfo.errors, ErrorActivity.REQUESTED_CHANNEL);
+        if (!channelInfo.errors.isEmpty()) handleErrorsDuringExtraction(channelInfo.errors, REQUESTED_CHANNEL);
 
         if (callback != null && channelInfo != null && !isInterrupted()) getHandler().post(new Runnable() {
             @Override
@@ -93,7 +95,7 @@ public class ChannelExtractorWorker extends ExtractorWorker {
                 }
             });
         } else if (exception instanceof ParsingException || exception instanceof ExtractionException) {
-            ErrorActivity.reportError(getHandler(), getContext(), exception, MainActivity.class, null, ErrorActivity.ErrorInfo.make(ErrorActivity.REQUESTED_CHANNEL, getServiceName(), url, R.string.parsing_error));
+            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() {
@@ -101,7 +103,7 @@ public class ChannelExtractorWorker extends ExtractorWorker {
                 }
             });
         } else {
-            ErrorActivity.reportError(getHandler(), getContext(), exception, MainActivity.class, null, ErrorActivity.ErrorInfo.make(ErrorActivity.REQUESTED_CHANNEL, getServiceName(), url, R.string.general_error));
+            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() {

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

@@ -6,6 +6,7 @@ import android.util.Log;
 import android.view.View;
 
 import org.schabi.newpipe.report.ErrorActivity;
+import org.schabi.newpipe.report.UserAction;
 
 import java.util.List;
 
@@ -59,14 +60,14 @@ public abstract class ExtractorWorker extends AbstractWorker {
      * @param errorUserAction   what action was the user performing during the error.
      *                          (One of the {@link ErrorActivity}.REQUEST_* error (message) ids)
      */
-    protected void handleErrorsDuringExtraction(List<Throwable> errorsList, int errorUserAction){
+    protected void handleErrorsDuringExtraction(List<Throwable> errorsList, UserAction errorUserAction){
         String errorString = "<error id>";
         switch (errorUserAction) {
-            case ErrorActivity.REQUESTED_STREAM:
-                errorString=  ErrorActivity.REQUESTED_STREAM_STRING;
+            case REQUESTED_STREAM:
+                errorString=  errorUserAction.getMessage();
                 break;
-            case ErrorActivity.REQUESTED_CHANNEL:
-                errorString=  ErrorActivity.REQUESTED_CHANNEL_STRING;
+            case REQUESTED_CHANNEL:
+                errorString=  errorUserAction.getMessage();
                 break;
         }
 

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

@@ -13,10 +13,13 @@ 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
  *
@@ -106,7 +109,7 @@ public class SearchWorker extends AbstractWorker {
             });
         } 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(ErrorActivity.SEARCHED, getServiceName(), query, R.string.parsing_error));
+            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() {
@@ -115,7 +118,7 @@ public class SearchWorker extends AbstractWorker {
             });
         } else {
             View rootView = getContext() instanceof Activity ? ((Activity) getContext()).findViewById(android.R.id.content) : null;
-            ErrorActivity.reportError(getHandler(), getContext(), exception, null, rootView, ErrorActivity.ErrorInfo.make(ErrorActivity.SEARCHED, getServiceName(), query, R.string.general_error));
+            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() {

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

@@ -10,9 +10,12 @@ 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
  *
@@ -66,7 +69,7 @@ public class StreamExtractorWorker extends ExtractorWorker {
         StreamExtractor streamExtractor = getService().getExtractorInstance(url);
         streamInfo = StreamInfo.getVideoInfo(streamExtractor);
 
-        if (streamInfo != null && !streamInfo.errors.isEmpty()) handleErrorsDuringExtraction(streamInfo.errors, ErrorActivity.REQUESTED_STREAM);
+        if (streamInfo != null && !streamInfo.errors.isEmpty()) handleErrorsDuringExtraction(streamInfo.errors, REQUESTED_STREAM);
 
         if (callback != null && getHandler() != null && streamInfo != null && !isInterrupted()) getHandler().post(new Runnable() {
             @Override
@@ -121,7 +124,7 @@ public class StreamExtractorWorker extends ExtractorWorker {
             });
         } else if (exception instanceof YoutubeStreamExtractor.DecryptException) {
             // custom service related exceptions
-            ErrorActivity.reportError(getHandler(), getContext(), exception, MainActivity.class, null, ErrorActivity.ErrorInfo.make(ErrorActivity.REQUESTED_STREAM, getServiceName(), url, R.string.youtube_signature_decryption_error));
+            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() {
@@ -131,9 +134,9 @@ public class StreamExtractorWorker extends ExtractorWorker {
         } else if (exception instanceof StreamInfo.StreamExctractException) {
             if (!streamInfo.errors.isEmpty()) {
                 // !!! if this case ever kicks in someone gets kicked out !!!
-                ErrorActivity.reportError(getHandler(), getContext(), exception, MainActivity.class, null, ErrorActivity.ErrorInfo.make(ErrorActivity.REQUESTED_STREAM, getServiceName(), url, R.string.could_not_get_stream));
+                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(ErrorActivity.REQUESTED_STREAM, getServiceName(), url, R.string.could_not_get_stream));
+                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() {
@@ -143,7 +146,7 @@ public class StreamExtractorWorker extends ExtractorWorker {
                 }
             });
         } else if (exception instanceof ParsingException) {
-            ErrorActivity.reportError(getHandler(), getContext(), exception, MainActivity.class, null, ErrorActivity.ErrorInfo.make(ErrorActivity.REQUESTED_STREAM, getServiceName(), url, R.string.parsing_error));
+            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() {
@@ -151,7 +154,7 @@ public class StreamExtractorWorker extends ExtractorWorker {
                 }
             });
         } else {
-            ErrorActivity.reportError(getHandler(), getContext(), exception, MainActivity.class, null, ErrorActivity.ErrorInfo.make(ErrorActivity.REQUESTED_STREAM, getServiceName(), url, R.string.general_error));
+            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() {

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

@@ -11,10 +11,13 @@ 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
  *
@@ -79,7 +82,7 @@ public class SuggestionWorker extends AbstractWorker {
 
         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(ErrorActivity.GET_SUGGESTIONS, getServiceName(), query, R.string.parsing_error));
+            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() {
@@ -95,7 +98,7 @@ public class SuggestionWorker extends AbstractWorker {
             });
         } else {
             View rootView = getContext() instanceof Activity ? ((Activity) getContext()).findViewById(android.R.id.content) : null;
-            ErrorActivity.reportError(getHandler(), getContext(), exception, null, rootView, ErrorActivity.ErrorInfo.make(ErrorActivity.GET_SUGGESTIONS, getServiceName(), query, R.string.general_error));
+            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() {

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

@@ -9,12 +9,14 @@ public interface DownloadDataSource {
 
     /**
      * Load all missions
+     *
      * @return a list of download missions
      */
     List<DownloadMission> loadMissions();
 
     /**
-     * Add a downlaod mission to the storage
+     * Add a download mission to the storage
+     *
      * @param downloadMission the download mission to add
      * @return the identifier of the mission
      */
@@ -22,6 +24,7 @@ public interface DownloadDataSource {
 
     /**
      * Update a download mission which exists in the storage
+     *
      * @param downloadMission the download mission to update
      * @throws IllegalArgumentException if the mission was not added to storage
      */
@@ -30,6 +33,7 @@ public interface DownloadDataSource {
 
     /**
      * Delete a download mission
+     *
      * @param downloadMission the mission to delete
      */
     void deleteMission(DownloadMission downloadMission);

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

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

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

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

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

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

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

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

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

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

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

@@ -64,6 +64,7 @@ public class DownloadMissionSQLiteHelper extends SQLiteOpenHelper {
 
     /**
      * Returns all values of the download mission as ContentValues.
+     *
      * @param downloadMission the download mission
      * @return the content values
      */
@@ -88,7 +89,7 @@ public class DownloadMissionSQLiteHelper extends SQLiteOpenHelper {
     }
 
     public static DownloadMission getMissionFromCursor(Cursor cursor) {
-        if(cursor == null) throw new NullPointerException("cursor is null");
+        if (cursor == null) throw new NullPointerException("cursor is null");
         int pos;
         String name = cursor.getString(cursor.getColumnIndexOrThrow(KEY_NAME));
         String location = cursor.getString(cursor.getColumnIndexOrThrow(KEY_LOCATION));

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

@@ -37,7 +37,7 @@ public class SQLiteDownloadDataSource implements DownloadDataSource {
                 null, null, null, DownloadMissionSQLiteHelper.KEY_TIMESTAMP);
 
         int count = cursor.getCount();
-        if(count == 0) return new ArrayList<>();
+        if (count == 0) return new ArrayList<>();
         result = new ArrayList<>(count);
         while (cursor.moveToNext()) {
             result.add(DownloadMissionSQLiteHelper.getMissionFromCursor(cursor));
@@ -47,7 +47,7 @@ public class SQLiteDownloadDataSource implements DownloadDataSource {
 
     @Override
     public void addMission(DownloadMission downloadMission) {
-        if(downloadMission == null) throw new NullPointerException("downloadMission is null");
+        if (downloadMission == null) throw new NullPointerException("downloadMission is null");
         SQLiteDatabase database = downloadMissionSQLiteHelper.getWritableDatabase();
         ContentValues values = DownloadMissionSQLiteHelper.getValuesOfMission(downloadMission);
         database.insert(MISSIONS_TABLE_NAME, null, values);
@@ -55,25 +55,25 @@ public class SQLiteDownloadDataSource implements DownloadDataSource {
 
     @Override
     public void updateMission(DownloadMission downloadMission) {
-        if(downloadMission == null) throw new NullPointerException("downloadMission is null");
+        if (downloadMission == null) throw new NullPointerException("downloadMission is null");
         SQLiteDatabase database = downloadMissionSQLiteHelper.getWritableDatabase();
         ContentValues values = DownloadMissionSQLiteHelper.getValuesOfMission(downloadMission);
-        String whereClause = KEY_LOCATION+ " = ? AND " +
+        String whereClause = KEY_LOCATION + " = ? AND " +
                 KEY_NAME + " = ?";
         int rowsAffected = database.update(MISSIONS_TABLE_NAME, values,
                 whereClause, new String[]{downloadMission.location, downloadMission.name});
-        if(rowsAffected != 1) {
+        if (rowsAffected != 1) {
             Log.e(TAG, "Expected 1 row to be affected by update but got " + rowsAffected);
         }
     }
 
     @Override
     public void deleteMission(DownloadMission downloadMission) {
-        if(downloadMission == null) throw new NullPointerException("downloadMission is null");
+        if (downloadMission == null) throw new NullPointerException("downloadMission is null");
         SQLiteDatabase database = downloadMissionSQLiteHelper.getWritableDatabase();
         database.delete(MISSIONS_TABLE_NAME,
                 KEY_LOCATION + " = ? AND " +
-                KEY_NAME + " = ?",
+                        KEY_NAME + " = ?",
                 new String[]{downloadMission.location, downloadMission.name});
     }
 }

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

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

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

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

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

@@ -6,53 +6,55 @@ import android.graphics.ColorFilter;
 import android.graphics.Paint;
 import android.graphics.PixelFormat;
 import android.graphics.drawable.Drawable;
+import android.support.annotation.ColorRes;
+import android.support.annotation.NonNull;
+import android.support.v4.content.ContextCompat;
 
-public class ProgressDrawable extends Drawable
-{
-	private float mProgress;
-	private int mBackgroundColor, mForegroundColor;
-	
-	public ProgressDrawable(Context context, int background, int foreground) {
-		this(context.getResources().getColor(background), context.getResources().getColor(foreground));
-	}
-	
-	public ProgressDrawable(int background, int foreground) {
-		mBackgroundColor = background;
-		mForegroundColor = foreground;
-	}
-	
-	public void setProgress(float progress) {
-		mProgress = progress;
-		invalidateSelf();
-	}
+public class ProgressDrawable extends Drawable {
+    private float mProgress;
+    private int mBackgroundColor, mForegroundColor;
 
-	@Override
-	public void draw(Canvas canvas) {
-		int width = canvas.getWidth();
-		int height = canvas.getHeight();
-		
-		Paint paint = new Paint();
-		
-		paint.setColor(mBackgroundColor);
-		canvas.drawRect(0, 0, width, height, paint);
-		
-		paint.setColor(mForegroundColor);
-		canvas.drawRect(0, 0, (int) (mProgress * width), height, paint);
-	}
+    public ProgressDrawable(Context context, @ColorRes int background, @ColorRes int foreground) {
+        this(ContextCompat.getColor(context, background), ContextCompat.getColor(context, foreground));
+    }
 
-	@Override
-	public void setAlpha(int alpha) {
-		// Unsupported
-	}
+    public ProgressDrawable(int background, int foreground) {
+        mBackgroundColor = background;
+        mForegroundColor = foreground;
+    }
 
-	@Override
-	public void setColorFilter(ColorFilter filter) {
-		// Unsupported
-	}
+    public void setProgress(float progress) {
+        mProgress = progress;
+        invalidateSelf();
+    }
 
-	@Override
-	public int getOpacity() {
-		return PixelFormat.OPAQUE;
-	}
+    @Override
+    public void draw(@NonNull Canvas canvas) {
+        int width = canvas.getWidth();
+        int height = canvas.getHeight();
+
+        Paint paint = new Paint();
+
+        paint.setColor(mBackgroundColor);
+        canvas.drawRect(0, 0, width, height, paint);
+
+        paint.setColor(mForegroundColor);
+        canvas.drawRect(0, 0, (int) (mProgress * width), height, paint);
+    }
+
+    @Override
+    public void setAlpha(int alpha) {
+        // Unsupported
+    }
+
+    @Override
+    public void setColorFilter(ColorFilter filter) {
+        // Unsupported
+    }
+
+    @Override
+    public int getOpacity() {
+        return PixelFormat.OPAQUE;
+    }
 
 }

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

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

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

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

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

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

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

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

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

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

app/src/main/res/anim/custom_fade_in.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<alpha xmlns:android="http://schemas.android.com/apk/res/android"
+       android:duration="200"
+       android:fromAlpha="0.0"
+       android:interpolator="@android:interpolator/accelerate_decelerate"
+       android:toAlpha="1.0"/>

app/src/main/res/anim/custom_fade_out.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<alpha xmlns:android="http://schemas.android.com/apk/res/android"
+       android:duration="200"
+       android:fromAlpha="1.0"
+       android:interpolator="@android:interpolator/accelerate_decelerate"
+       android:toAlpha="0.0"/>

app/src/main/res/layout/activity_about.xml

@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/main_content"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
+    tools:context="org.schabi.newpipe.about.AboutActivity">
+
+    <android.support.design.widget.AppBarLayout
+        android:id="@+id/appbar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingTop="@dimen/appbar_padding_top"
+        android:theme="@style/AppTheme.AppBarOverlay">
+
+        <android.support.v7.widget.Toolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:background="?attr/colorPrimary"
+            app:layout_scrollFlags="scroll|enterAlways"
+            app:popupTheme="@style/AppTheme.PopupOverlay">
+
+        </android.support.v7.widget.Toolbar>
+
+        <android.support.design.widget.TabLayout
+            android:id="@+id/tabs"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+
+    </android.support.design.widget.AppBarLayout>
+
+    <android.support.v4.view.ViewPager
+        android:id="@+id/container"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior"/>
+</android.support.design.widget.CoordinatorLayout>

app/src/main/res/layout/activity_main.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
+<FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -15,4 +15,4 @@
 
     <include layout="@layout/toolbar_layout"/>
 
-</RelativeLayout>
+</FrameLayout>

app/src/main/res/layout/activity_main_player.xml

@@ -5,8 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@android:color/black"
-    android:gravity="center"
-    android:keepScreenOn="true">
+    android:gravity="center">
 
     <com.google.android.exoplayer2.ui.AspectRatioFrameLayout
         android:id="@+id/aspectRatioLayout"
@@ -108,7 +107,7 @@
                     android:layout_height="35dp"
                     android:layout_marginLeft="2dp"
                     android:layout_marginRight="2dp"
-                    android:layout_toLeftOf="@+id/screenRotationButton"
+                    android:layout_toLeftOf="@+id/playbackSpeed"
                     android:gravity="center"
                     android:minWidth="50dp"
                     android:text="720p"
@@ -116,6 +115,20 @@
                     android:textStyle="bold"
                     tools:ignore="HardcodedText,RtlHardcoded"/>
 
+                <TextView
+                    android:id="@+id/playbackSpeed"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginRight="2dp"
+                    android:layout_toLeftOf="@+id/screenRotationButton"
+                    android:gravity="center"
+                    android:minHeight="35dp"
+                    android:minWidth="40dp"
+                    android:textColor="@android:color/white"
+                    android:textStyle="bold"
+                    tools:ignore="RtlHardcoded,RtlSymmetry"
+                    tools:text="1x" />
+
                 <ImageButton
                     android:id="@+id/screenRotationButton"
                     android:layout_width="35dp"

app/src/main/res/layout/channel_item.xml

@@ -4,11 +4,10 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/itemRoot"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
+    android:layout_height="@dimen/video_item_search_height"
     android:background="?attr/selectableItemBackground"
     android:clickable="true"
-    android:orientation="vertical"
-    android:padding="12dp">
+    android:padding="@dimen/video_item_search_padding">
 
     <de.hdodenhof.circleimageview.CircleImageView
         android:id="@+id/itemThumbnailView"
@@ -22,55 +21,43 @@
         android:src="@drawable/buddy_channel_item"
         tools:ignore="RtlHardcoded"/>
 
-    <RelativeLayout
+    <TextView
+        android:id="@+id/itemChannelTitleView"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/video_item_search_thumbnail_image_height"
+        android:layout_height="wrap_content"
+        android:layout_alignParentTop="true"
         android:layout_toRightOf="@id/itemThumbnailView"
-        android:orientation="vertical"
-        tools:ignore="RtlHardcoded">
+        android:layout_marginBottom="@dimen/video_item_search_image_right_margin"
+        android:ellipsize="end"
+        android:lines="1"
+        android:textAppearance="?android:attr/textAppearanceLarge"
+        android:textSize="@dimen/video_item_search_title_text_size"
+        tools:text="Channel Title, Lorem ipsum"/>
 
-        <TextView
-            android:id="@+id/itemChannelTitleView"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_alignParentTop="true"
-            android:ellipsize="end"
-            android:maxLines="1"
-            android:textAppearance="?android:attr/textAppearanceLarge"
-            android:textSize="@dimen/channel_item_detail_title_text_size"
-            tools:text="Channel Title, Lorem ipsum"/>
+  <TextView
+        android:id="@+id/itemAdditionalDetails"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_toRightOf="@id/itemThumbnailView"
+        android:lines="1"
+        android:textAppearance="?android:attr/textAppearanceSmall"
+        android:textSize="@dimen/video_item_search_upload_date_text_size"
+        tools:text="10M subscribers • 1000 videos"/>
 
-        <TextView
-            android:id="@+id/itemChannelDescriptionView"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_above="@+id/itemSubscriberCountView"
-            android:layout_below="@+id/itemChannelTitleView"
-            android:ellipsize="end"
-            android:maxLines="2"
-            android:textAppearance="?android:attr/textAppearanceSmall"
-            android:textSize="@dimen/video_item_search_uploader_text_size"
-            tools:text="Channel description, Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc tristique vitae sem vitae blanditLorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc tristique vitae sem vitae blanditLorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc tristique vitae sem vitae blandit"/>
 
-        <TextView
-            android:id="@+id/itemSubscriberCountView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentBottom="true"
-            android:maxLines="1"
-            android:textAppearance="?android:attr/textAppearanceSmall"
-            android:textSize="@dimen/video_item_search_upload_date_text_size"
-            tools:text="10M subscribers • "/>
+    <TextView
+        android:id="@+id/itemChannelDescriptionView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_above="@id/itemAdditionalDetails"
+        android:layout_marginBottom="@dimen/video_item_detail_description_to_details_margin"
+        android:layout_toRightOf="@id/itemThumbnailView"
+        android:ellipsize="end"
+        android:lines="2"
+        android:textAppearance="?android:attr/textAppearanceSmall"
+        android:textSize="@dimen/video_item_search_uploader_text_size"
+        tools:text="Channel description, Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc tristique vitae sem vitae blanditLorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc tristique vitae sem vitae blanditLorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc tristique vitae sem vitae blandit"/>
+
 
-        <TextView
-            android:id="@+id/itemVideoCountView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentBottom="true"
-            android:layout_toRightOf="@+id/itemSubscriberCountView"
-            android:maxLines="1"
-            android:textAppearance="?android:attr/textAppearanceSmall"
-            android:textSize="@dimen/video_item_search_upload_date_text_size"
-            tools:text="1000 videos"/>
-    </RelativeLayout>
 </RelativeLayout>

app/src/main/res/layout/dialog_url.xml

@@ -32,12 +32,11 @@
 
     <RadioGroup
         android:id="@+id/video_audio_group"
-        android:layout_width="match_parent"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_below="@+id/file_name"
-        android:layout_marginBottom="12dp"
         android:layout_marginLeft="20dp"
-        android:layout_marginRight="20dp"
+        android:layout_marginBottom="6dp"
         android:gravity="left"
         android:orientation="horizontal"
         tools:ignore="RtlHardcoded">
@@ -56,11 +55,22 @@
             android:text="@string/audio"/>
     </RadioGroup>
 
+    <Spinner
+        android:id="@+id/quality_spinner"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:minWidth="150dp"
+        android:layout_below="@+id/video_audio_group"
+        android:layout_marginBottom="12dp"
+        android:layout_marginLeft="20dp"
+        android:layout_marginRight="20dp"
+        tools:listitem="@layout/resolutions_spinner_item"/>
+
     <TextView
         android:id="@+id/threads_text_view"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_below="@+id/video_audio_group"
+        android:layout_below="@+id/quality_spinner"
         android:layout_marginBottom="6dp"
         android:layout_marginLeft="24dp"
         android:layout_marginRight="24dp"

app/src/main/res/layout/error_retry.xml

@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
+<LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:padding="16dp"
+    android:gravity="center_horizontal"
     android:orientation="vertical">
 
     <TextView
         android:id="@+id/error_message_view"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_centerHorizontal="true"
         android:text="@string/general_error"
         android:gravity="center"
         android:textSize="16sp"
@@ -22,8 +22,6 @@
         android:id="@+id/error_button_retry"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_below="@+id/error_message_view"
-        android:layout_centerHorizontal="true"
         android:layout_margin="8dp"
         android:text="@string/retry"
         android:textAlignment="center"
@@ -32,4 +30,4 @@
         android:textSize="16sp"
         android:theme="@style/RedButton"/>
 
-</RelativeLayout>
+</LinearLayout>

app/src/main/res/layout/fragment_about.xml

@@ -0,0 +1,95 @@
+<android.support.v4.widget.NestedScrollView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context="org.schabi.newpipe.about.AboutActivity$AboutFragment">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:paddingBottom="@dimen/activity_vertical_margin"
+        android:paddingLeft="@dimen/activity_horizontal_margin"
+        android:paddingRight="@dimen/activity_horizontal_margin"
+        android:paddingTop="@dimen/activity_vertical_margin">
+
+        <ImageView
+            android:id="@+id/logo"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginBottom="8dp"
+            app:srcCompat="@mipmap/ic_launcher" />
+
+        <TextView
+            android:id="@+id/app_name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:text="@string/app_name"
+            android:textAppearance="@android:style/TextAppearance.Large" />
+
+
+        <TextView
+            android:id="@+id/app_version"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginBottom="16dp"
+            android:textAppearance="@android:style/TextAppearance.Medium"
+            tools:text="0.9.9" />
+
+        <TextView
+            android:id="@+id/app_description"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/app_description" />
+
+        <TextView
+            android:id="@+id/title_contribution"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingTop="10dp"
+            android:text="@string/contribution_title"
+            android:textAppearance="@android:style/TextAppearance.Medium" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/contribution_encouragement" />
+
+
+        <Button
+            android:id="@+id/github_link"
+            style="@style/Base.Widget.AppCompat.Button.Borderless"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="end"
+            android:text="@string/view_on_github" />
+
+        <TextView
+            android:id="@+id/app_license_title"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingTop="10dp"
+            android:text="@string/app_license_title"
+            android:textAppearance="@android:style/TextAppearance.Medium" />
+
+        <TextView
+            android:id="@+id/app_license"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/app_license" />
+
+        <Button
+            android:id="@+id/app_read_license"
+            style="@style/Base.Widget.AppCompat.Button.Borderless"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="end"
+            android:text="@string/read_full_license" />
+
+    </LinearLayout>
+</android.support.v4.widget.NestedScrollView>

app/src/main/res/layout/fragment_channel.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
@@ -11,7 +10,7 @@
         android:layout_height="match_parent"
         android:background="?android:windowBackground"
         android:scrollbars="vertical"
-        tools:listitem="@layout/stream_item"/>
+        tools:listitem="@layout/stream_item" />
 
     <ProgressBar
         android:id="@+id/loading_progress_bar"
@@ -20,7 +19,7 @@
         android:layout_centerInParent="true"
         android:indeterminate="true"
         android:visibility="gone"
-        tools:visibility="visible"/>
+        tools:visibility="visible" />
 
     <!--ERROR PANEL-->
     <include
@@ -31,6 +30,6 @@
         android:layout_centerInParent="true"
         android:layout_marginTop="50dp"
         android:visibility="gone"
-        tools:visibility="visible"/>
+        tools:visibility="visible" />
 
 </RelativeLayout>

app/src/main/res/layout/fragment_licenses.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.v4.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:fillViewport="true">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:paddingBottom="@dimen/activity_vertical_margin"
+        android:paddingTop="@dimen/activity_vertical_margin">
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingLeft="@dimen/activity_horizontal_margin"
+            android:paddingRight="@dimen/activity_horizontal_margin"
+            android:paddingTop="20dp"
+            android:text="@string/title_licenses"
+            android:textAppearance="?android:attr/textAppearanceLarge" />
+
+        <LinearLayout
+            android:id="@+id/software_components"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical" />
+    </LinearLayout>
+</android.support.v4.widget.NestedScrollView>

app/src/main/res/layout/fragment_search.xml

@@ -1,12 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:focusable="true"
-    android:focusableInTouchMode="true">
+    android:layout_height="match_parent">
+
+    <!-- Empty view to receive the focus when the edit text of the toolbar lose it  -->
+    <View
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:focusable="true"
+        android:focusableInTouchMode="true"/>
 
     <android.support.v7.widget.RecyclerView
         android:id="@+id/result_list_view"
@@ -14,7 +18,7 @@
         android:layout_height="match_parent"
         android:scrollbars="vertical"
         app:layoutManager="LinearLayoutManager"
-        tools:listitem="@layout/stream_item"/>
+        tools:listitem="@layout/stream_item" />
 
     <ProgressBar
         android:id="@+id/loading_progress_bar"
@@ -23,7 +27,7 @@
         android:layout_centerInParent="true"
         android:indeterminate="true"
         android:visibility="gone"
-        tools:visibility="visible"/>
+        tools:visibility="visible" />
 
     <!--ERROR PANEL-->
     <include
@@ -34,6 +38,6 @@
         android:layout_centerHorizontal="true"
         android:layout_marginTop="50dp"
         android:visibility="gone"
-        tools:visibility="visible"/>
+        tools:visibility="visible" />
 
 </RelativeLayout>

app/src/main/res/layout/fragment_video_detail.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/video_item_detail"
@@ -16,105 +15,116 @@
         app:parallax_factor="1.9">
 
         <!--WRAPPER-->
-        <RelativeLayout
+        <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
 
             <!-- THUMBNAIL -->
-            <RelativeLayout
+            <FrameLayout
                 android:id="@+id/detail_thumbnail_root_layout"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="@android:color/black">
+                android:background="@android:color/black"
+                android:clickable="true"
+                android:foreground="?attr/selectableItemBackground">
 
                 <ImageView
                     android:id="@+id/detail_thumbnail_image_view"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_alignParentLeft="true"
-                    android:layout_alignParentRight="true"
-                    android:layout_alignParentTop="true"
                     android:background="@android:color/transparent"
                     android:contentDescription="@string/detail_thumbnail_view_description"
                     android:scaleType="centerCrop"
                     tools:ignore="RtlHardcoded"
                     tools:layout_height="200dp"
-                    tools:src="@drawable/dummy_thumbnail"/>
+                    tools:src="@drawable/dummy_thumbnail" />
 
                 <ImageView
                     android:id="@+id/detail_thumbnail_play_button"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_centerInParent="true"
+                    android:layout_gravity="center"
                     android:background="@android:color/transparent"
                     android:src="@drawable/new_play_arrow"
                     android:visibility="invisible"
                     tools:ignore="ContentDescription"
-                    tools:visibility="visible"/>
+                    tools:visibility="visible" />
 
-                <Button
-                    android:id="@+id/detail_thumbnail_background_button"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:background="?attr/selectableItemBackground"/>
-
-            </RelativeLayout>
+            </FrameLayout>
 
             <!-- CONTENT -->
             <RelativeLayout
                 android:id="@+id/detail_content_root_layout"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:layout_below="@+id/detail_thumbnail_root_layout"
                 android:background="?android:windowBackground">
 
                 <!-- TITLE -->
-                <RelativeLayout
+                <FrameLayout
                     android:id="@+id/detail_title_root_layout"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:background="?attr/selectableItemBackground"
                     android:clickable="true"
                     android:paddingLeft="12dp"
-                    android:paddingRight="12dp"
-                    android:paddingTop="12dp">
+                    android:paddingRight="12dp">
 
                     <TextView
                         android:id="@+id/detail_video_title_view"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_alignParentLeft="true"
-                        android:layout_centerVertical="true"
-                        android:layout_toLeftOf="@+id/detail_toggle_description_view"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_marginRight="20dp"
                         android:ellipsize="end"
-                        android:gravity="center_vertical"
                         android:maxLines="1"
-                        android:paddingBottom="2dp"
-                        android:paddingTop="6dp"
+                        android:paddingBottom="8dp"
+                        android:paddingTop="12dp"
                         android:textAppearance="?android:attr/textAppearanceLarge"
                         android:textSize="@dimen/video_item_detail_title_text_size"
                         tools:ignore="RtlHardcoded"
-                        tools:text="Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed a ultricies ex. Integer sit amet sodales risus. Duis non mi et urna pretium bibendum. Nunc eleifend est quis ipsum porttitor egestas. Sed facilisis, nisl quis eleifend pellentesque, orci metus egestas dolor, at accumsan eros metus quis libero."/>
+                        tools:text="Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed a ultricies ex. Integer sit amet sodales risus. Duis non mi et urna pretium bibendum. Nunc eleifend est quis ipsum porttitor egestas. Sed facilisis, nisl quis eleifend pellentesque, orci metus egestas dolor, at accumsan eros metus quis libero." />
 
                     <ImageView
                         android:id="@+id/detail_toggle_description_view"
                         android:layout_width="15dp"
                         android:layout_height="15dp"
-                        android:layout_alignParentRight="true"
-                        android:layout_alignParentTop="true"
+                        android:layout_gravity="center_vertical|right"
                         android:layout_marginLeft="5dp"
-                        android:layout_marginTop="6dp"
                         android:src="@drawable/arrow_down"
-                        tools:ignore="ContentDescription,RtlHardcoded"/>
+                        tools:ignore="ContentDescription,RtlHardcoded" />
 
-                </RelativeLayout>
+                </FrameLayout>
+
+                <!-- LOADING INDICATOR-->
+                <ProgressBar
+                    android:id="@+id/loading_progress_bar"
+                    style="@style/Widget.AppCompat.ProgressBar"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@id/detail_title_root_layout"
+                    android:layout_marginTop="@dimen/video_item_detail_error_panel_margin"
+                    android:indeterminate="true"
+                    android:visibility="gone"
+                    tools:visibility="visible" />
+
+                <!--ERROR PANEL-->
+                <include
+                    android:id="@+id/error_panel"
+                    layout="@layout/error_retry"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@id/detail_title_root_layout"
+                    android:layout_marginTop="@dimen/video_item_detail_error_panel_margin"
+                    android:visibility="gone"
+                    tools:visibility="visible" />
 
                 <!--HIDING ROOT-->
-                <RelativeLayout
+                <LinearLayout
                     android:id="@+id/detail_content_root_hiding"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:layout_below="@+id/detail_title_root_layout"
+                    android:orientation="vertical"
                     android:visibility="gone"
                     tools:visibility="visible">
 
@@ -122,197 +132,156 @@
                     <RelativeLayout
                         android:id="@+id/detail_root"
                         android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
+                        android:layout_height="55dp"
                         android:layout_marginLeft="12dp"
                         android:layout_marginRight="12dp"
+                        android:layout_marginTop="6dp"
                         android:baselineAligned="false"
-                        android:orientation="horizontal"
-                        android:paddingTop="6dp">
+                        android:orientation="horizontal">
 
                         <!-- VIEW & THUMBS -->
-                        <LinearLayout
-                            android:id="@+id/detail_views_thumbs_root"
+                        <TextView
+                            android:id="@+id/detail_view_count_view"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_alignParentLeft="true"
-                            android:layout_centerHorizontal="true"
-                            android:orientation="vertical"
-                            android:paddingTop="6dp"
-                            tools:ignore="RtlHardcoded">
+                            android:layout_marginBottom="6dp"
+                            android:layout_marginTop="6dp"
+                            android:lines="1"
+                            android:textAppearance="?android:attr/textAppearanceLarge"
+                            android:textSize="@dimen/video_item_detail_views_text_size"
+                            tools:ignore="RtlHardcoded"
+                            tools:text="2,816,821,505 views" />
 
-                            <TextView
-                                android:id="@+id/detail_view_count_view"
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:layout_gravity="left"
-                                android:textAppearance="?android:attr/textAppearanceLarge"
-                                android:textSize="@dimen/video_item_detail_views_text_size"
-                                tools:ignore="RtlHardcoded"
-                                tools:text="2,816,821,505 views"/>
+                        <ImageView
+                            android:id="@+id/detail_thumbs_up_img_view"
+                            android:layout_width="@dimen/video_item_detail_like_image_width"
+                            android:layout_height="@dimen/video_item_detail_like_image_height"
+                            android:layout_below="@id/detail_view_count_view"
+                            android:contentDescription="@string/detail_likes_img_view_description"
+                            android:src="?attr/thumbs_up" />
 
-                            <LinearLayout
-                                android:id="@+id/detail_thumbs_root_layout"
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:layout_gravity="left"
-                                android:gravity="center_vertical"
-                                android:minHeight="30dp"
-                                android:orientation="horizontal">
+                        <TextView
+                            android:id="@+id/detail_thumbs_up_count_view"
+                            android:layout_width="wrap_content"
+                            android:layout_height="@dimen/video_item_detail_like_image_height"
+                            android:layout_below="@id/detail_view_count_view"
+                            android:layout_marginLeft="@dimen/video_item_detail_like_margin"
+                            android:layout_toRightOf="@id/detail_thumbs_up_img_view"
+                            android:gravity="left|center_vertical"
+                            android:lines="1"
+                            android:textAppearance="?android:attr/textAppearanceMedium"
+                            android:textSize="@dimen/video_item_detail_likes_text_size"
+                            tools:ignore="RtlHardcoded"
+                            tools:text="12M" />
 
-                                <ImageView
-                                    android:id="@+id/detail_thumbs_up_img_view"
-                                    android:layout_width="@dimen/video_item_detail_like_image_width"
-                                    android:layout_height="@dimen/video_item_detail_like_image_height"
-                                    android:contentDescription="@string/detail_likes_img_view_description"
-                                    android:src="?attr/thumbs_up"/>
+                        <ImageView
+                            android:id="@+id/detail_thumbs_down_img_view"
+                            android:layout_width="@dimen/video_item_detail_like_image_width"
+                            android:layout_height="@dimen/video_item_detail_like_image_height"
+                            android:layout_below="@id/detail_view_count_view"
+                            android:layout_marginLeft="15dp"
+                            android:layout_toRightOf="@id/detail_thumbs_up_count_view"
+                            android:contentDescription="@string/detail_dislikes_img_view_description"
+                            android:src="?attr/thumbs_down"
+                            tools:ignore="RtlHardcoded" />
 
-                                <TextView
-                                    android:id="@+id/detail_thumbs_up_count_view"
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="match_parent"
-                                    android:layout_marginLeft="@dimen/video_item_detail_like_margin"
-                                    android:gravity="left|center_vertical"
-                                    android:textAppearance="?android:attr/textAppearanceMedium"
-                                    android:textSize="@dimen/video_item_detail_likes_text_size"
-                                    tools:ignore="RtlHardcoded"
-                                    tools:text="12M"/>
+                        <TextView
+                            android:id="@+id/detail_thumbs_down_count_view"
+                            android:layout_width="wrap_content"
+                            android:layout_height="@dimen/video_item_detail_like_image_height"
+                            android:layout_below="@id/detail_view_count_view"
+                            android:layout_marginLeft="@dimen/video_item_detail_like_margin"
+                            android:layout_toRightOf="@id/detail_thumbs_down_img_view"
+                            android:gravity="left|center_vertical"
+                            android:lines="1"
+                            android:textAppearance="?android:attr/textAppearanceMedium"
+                            android:textSize="@dimen/video_item_detail_likes_text_size"
+                            tools:ignore="RtlHardcoded"
+                            tools:text="10K" />
 
-                                <ImageView
-                                    android:id="@+id/detail_thumbs_down_img_view"
-                                    android:layout_width="@dimen/video_item_detail_like_image_width"
-                                    android:layout_height="@dimen/video_item_detail_like_image_height"
-                                    android:layout_marginLeft="15dp"
-                                    android:contentDescription="@string/detail_dislikes_img_view_description"
-                                    android:src="?attr/thumbs_down"
-                                    tools:ignore="RtlHardcoded"/>
-
-                                <TextView
-                                    android:id="@+id/detail_thumbs_down_count_view"
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="match_parent"
-                                    android:layout_marginLeft="@dimen/video_item_detail_like_margin"
-                                    android:gravity="left|center_vertical"
-                                    android:textAppearance="?android:attr/textAppearanceMedium"
-                                    android:textSize="@dimen/video_item_detail_likes_text_size"
-                                    tools:ignore="RtlHardcoded"
-                                    tools:text="10K"/>
-
-                                <TextView
-                                    android:id="@+id/detail_thumbs_disabled_view"
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="match_parent"
-                                    android:layout_marginLeft="15dp"
-                                    android:gravity="left|center_vertical"
-                                    android:text="@string/disabled"
-                                    android:textAppearance="?android:attr/textAppearanceLarge"
-                                    android:textSize="@dimen/video_item_detail_likes_text_size"
-                                    android:textStyle="bold"
-                                    android:visibility="gone"
-                                    tools:ignore="RtlHardcoded"/>
-                            </LinearLayout>
-                        </LinearLayout>
+                        <TextView
+                            android:id="@+id/detail_thumbs_disabled_view"
+                            android:layout_width="wrap_content"
+                            android:layout_height="match_parent"
+                            android:layout_below="@id/detail_view_count_view"
+                            android:layout_marginLeft="15dp"
+                            android:gravity="left|center_vertical"
+                            android:text="@string/disabled"
+                            android:textAppearance="?android:attr/textAppearanceLarge"
+                            android:textSize="@dimen/video_item_detail_likes_text_size"
+                            android:textStyle="bold"
+                            android:visibility="gone"
+                            tools:ignore="RtlHardcoded" />
 
                         <!-- CONTROLS -->
-                        <LinearLayout
-                            android:id="@+id/detail_controls_root"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
+                        <TextView
+                            android:id="@+id/detail_controls_popup"
+                            android:layout_width="80dp"
+                            android:layout_height="55dp"
                             android:layout_alignParentRight="true"
-                            android:layout_centerHorizontal="true"
-                            android:orientation="horizontal"
-                            tools:ignore="RtlHardcoded">
-
-                            <TextView
-                                android:id="@+id/detail_controls_background"
-                                android:layout_width="80dp"
-                                android:layout_height="55dp"
-                                android:layout_gravity="center_vertical"
-                                android:background="?attr/selectableItemBackgroundBorderless"
-                                android:clickable="true"
-                                android:contentDescription="@string/play_audio"
-                                android:drawableTop="?attr/audio"
-                                android:gravity="center"
-                                android:paddingBottom="6dp"
-                                android:paddingTop="6dp"
-                                android:text="@string/controls_background_title"
-                                android:textSize="12sp"/>
-
-                            <TextView
-                                android:id="@+id/detail_controls_popup"
-                                android:layout_width="80dp"
-                                android:layout_height="55dp"
-                                android:layout_gravity="center_vertical"
-                                android:background="?attr/selectableItemBackgroundBorderless"
-                                android:clickable="true"
-                                android:contentDescription="@string/open_in_popup_mode"
-                                android:drawableTop="?attr/popup"
-                                android:gravity="center"
-                                android:paddingBottom="6dp"
-                                android:paddingTop="6dp"
-                                android:text="@string/controls_popup_title"
-                                android:textSize="12sp"/>
-
-                        </LinearLayout>
+                            android:layout_alignParentTop="true"
+                            android:layout_gravity="center_vertical"
+                            android:background="?attr/selectableItemBackgroundBorderless"
+                            android:clickable="true"
+                            android:contentDescription="@string/open_in_popup_mode"
+                            android:drawableTop="?attr/popup"
+                            android:gravity="center"
+                            android:paddingBottom="6dp"
+                            android:paddingTop="6dp"
+                            android:text="@string/controls_popup_title"
+                            android:textSize="12sp" />
 
+                        <TextView
+                            android:id="@+id/detail_controls_background"
+                            android:layout_width="80dp"
+                            android:layout_height="55dp"
+                            android:layout_alignParentTop="true"
+                            android:layout_gravity="center_vertical"
+                            android:layout_toLeftOf="@id/detail_controls_popup"
+                            android:background="?attr/selectableItemBackgroundBorderless"
+                            android:clickable="true"
+                            android:contentDescription="@string/play_audio"
+                            android:drawableTop="?attr/audio"
+                            android:gravity="center"
+                            android:paddingBottom="6dp"
+                            android:paddingTop="6dp"
+                            android:text="@string/controls_background_title"
+                            android:textSize="12sp" />
                     </RelativeLayout>
 
                     <!--UPLOADER-->
-                    <FrameLayout
+                    <LinearLayout
                         android:id="@+id/detail_uploader_root_layout"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_below="@+id/detail_root">
+                        android:background="?attr/selectableItemBackground"
+                        android:gravity="center_vertical"
+                        android:orientation="horizontal"
+                        android:paddingBottom="8dp"
+                        android:paddingLeft="12dp"
+                        android:paddingRight="12dp"
+                        android:paddingTop="8dp">
 
-                        <RelativeLayout
-                            android:id="@+id/detail_uploader_layout"
+
+                        <de.hdodenhof.circleimageview.CircleImageView
+                            android:id="@+id/detail_uploader_thumbnail_view"
+                            android:layout_width="@dimen/video_item_detail_uploader_image_size"
+                            android:layout_height="@dimen/video_item_detail_uploader_image_size"
+                            android:contentDescription="@string/detail_uploader_thumbnail_view_description"
+                            android:src="@drawable/buddy"
+                            tools:ignore="RtlHardcoded" />
+
+                        <TextView
+                            android:id="@+id/detail_uploader_text_view"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:layout_marginBottom="8dp"
-                            android:layout_marginLeft="12dp"
-                            android:layout_marginRight="12dp"
-                            android:layout_marginTop="8dp">
-
-
-                            <de.hdodenhof.circleimageview.CircleImageView
-                                android:id="@+id/detail_uploader_thumbnail_view"
-                                android:layout_width="@dimen/video_item_detail_uploader_image_size"
-                                android:layout_height="@dimen/video_item_detail_uploader_image_size"
-                                android:layout_alignParentLeft="true"
-                                android:contentDescription="@string/detail_uploader_thumbnail_view_description"
-                                android:src="@drawable/buddy"
-                                tools:ignore="RtlHardcoded"/>
-
-                            <TextView
-                                android:id="@+id/detail_uploader_text_view"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_centerVertical="true"
-                                android:layout_marginLeft="15dp"
-                                android:layout_toEndOf="@+id/detail_uploader_thumbnail_view"
-                                android:layout_toRightOf="@+id/detail_uploader_thumbnail_view"
-                                android:textAppearance="?android:attr/textAppearanceLarge"
-                                android:textSize="@dimen/video_item_detail_uploader_text_size"
-                                android:textStyle="bold"
-                                tools:ignore="RtlHardcoded"
-                                tools:text="Uploader"/>
-
-
-                        </RelativeLayout>
-
-                        <View
-                            android:layout_width="match_parent"
-                            android:layout_height="1px"
-                            android:layout_gravity="bottom"
-                            android:layout_marginLeft="8dp"
-                            android:layout_marginRight="8dp"
-                            android:background="?attr/separatorColor"/>
-
-                        <Button
-                            android:id="@+id/detail_uploader_button"
-                            android:layout_width="match_parent"
-                            android:layout_height="match_parent"
-                            android:background="?attr/selectableItemBackground"
-                            tools:visibility="gone"/>
+                            android:layout_marginLeft="15dp"
+                            android:textAppearance="?android:attr/textAppearanceLarge"
+                            android:textSize="@dimen/video_item_detail_uploader_text_size"
+                            android:textStyle="bold"
+                            tools:ignore="RtlHardcoded"
+                            tools:text="Uploader" />
 
                         <!--<Button
                             android:id="@+id/detail_uploader_subscribe"
@@ -326,15 +295,22 @@
                             android:drawableLeft="@drawable/ic_rss_feed_white_24dp"
                             tools:ignore="RtlHardcoded"
                             android:visibility="gone"/>-->
-                    </FrameLayout>
+                    </LinearLayout>
+
+                    <View
+                        android:layout_width="match_parent"
+                        android:layout_height="1px"
+                        android:layout_marginLeft="8dp"
+                        android:layout_marginRight="8dp"
+                        android:background="?attr/separatorColor" />
 
                     <!--DESCRIPTIONS-->
-                    <RelativeLayout
+                    <LinearLayout
                         android:id="@+id/detail_description_root_layout"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_below="@id/detail_uploader_root_layout"
                         android:layout_marginTop="5dp"
+                        android:orientation="vertical"
                         android:visibility="gone"
                         tools:visibility="visible">
 
@@ -347,106 +323,72 @@
                             android:textAppearance="?android:attr/textAppearanceMedium"
                             android:textSize="@dimen/video_item_detail_upload_date_text_size"
                             android:textStyle="bold"
-                            tools:text="Upload date"/>
+                            tools:text="Published on Oct 2, 2009" />
 
                         <TextView
                             android:id="@+id/detail_description_view"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:layout_below="@+id/detail_upload_date_view"
                             android:layout_marginBottom="8dp"
                             android:layout_marginLeft="12dp"
                             android:layout_marginRight="12dp"
                             android:layout_marginTop="3dp"
                             android:textAppearance="?android:attr/textAppearanceMedium"
                             android:textSize="@dimen/video_item_detail_description_text_size"
-                            tools:text="Description Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed a ultricies ex. Integer sit amet sodales risus. Duis non mi et urna pretium bibendum."/>
+                            tools:text="Description Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed a ultricies ex. Integer sit amet sodales risus. Duis non mi et urna pretium bibendum." />
 
                         <View
                             android:layout_width="match_parent"
                             android:layout_height="1px"
-                            android:layout_alignParentBottom="true"
                             android:layout_marginLeft="8dp"
                             android:layout_marginRight="8dp"
-                            android:background="?attr/separatorColor"/>
+                            android:background="?attr/separatorColor" />
 
-                    </RelativeLayout>
+                    </LinearLayout>
 
                     <!--NEXT AND RELATED VIDEOS-->
-                    <RelativeLayout
+                    <LinearLayout
                         android:id="@+id/detail_related_streams_root_layout"
                         android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:layout_below="@+id/detail_description_root_layout"
-                        android:layout_centerHorizontal="true"
+                        android:layout_height="wrap_content"
                         android:layout_gravity="center_horizontal|bottom"
-                        android:layout_marginTop="14dp">
+                        android:layout_marginTop="14dp"
+                        android:orientation="vertical">
 
                         <TextView
                             android:id="@+id/detail_next_stream_title"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:layout_alignParentLeft="true"
                             android:layout_marginLeft="12dp"
                             android:text="@string/next_video_title"
                             android:textAllCaps="true"
                             android:textAppearance="?android:attr/textAppearanceMedium"
                             android:textSize="@dimen/video_item_detail_next_text_size"
-                            tools:ignore="RtlHardcoded"/>
+                            tools:ignore="RtlHardcoded" />
 
                         <LinearLayout
                             android:id="@+id/detail_related_streams_view"
                             android:layout_width="match_parent"
                             android:layout_height="match_parent"
-                            android:layout_below="@id/detail_next_stream_title"
                             android:layout_marginTop="2dp"
                             android:orientation="vertical"
-                            tools:minHeight="50dp"/>
+                            tools:minHeight="50dp" />
 
                         <ImageButton
                             android:id="@+id/detail_related_streams_expand"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:layout_below="@id/detail_related_streams_view"
                             android:background="?attr/selectableItemBackground"
                             android:paddingBottom="10dp"
                             android:paddingTop="4dp"
                             android:src="?attr/expand"
                             android:textAlignment="center"
                             android:textAllCaps="true"
-                            tools:ignore="ContentDescription"/>
-
-
-                    </RelativeLayout>
-
-                </RelativeLayout>
-
-                <!-- LOADING BAR -->
-                <ProgressBar
-                    android:id="@+id/loading_progress_bar"
-                    style="@style/Widget.AppCompat.ProgressBar"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_below="@+id/detail_title_root_layout"
-                    android:layout_centerHorizontal="true"
-                    android:layout_marginTop="15dp"
-                    android:indeterminate="true"
-                    android:visibility="gone"
-                    tools:visibility="visible"/>
-
-                <!--ERROR PANEL-->
-                <include
-                    android:id="@+id/error_panel"
-                    layout="@layout/error_retry"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_below="@+id/detail_title_root_layout"
-                    android:layout_centerHorizontal="true"
-                    android:layout_marginTop="@dimen/video_item_detail_error_panel_margin"
-                    android:visibility="gone"
-                    tools:visibility="visible"/>
+                            tools:ignore="ContentDescription" />
+                    </LinearLayout>
+                </LinearLayout>
 
             </RelativeLayout>
-        </RelativeLayout>
+        </LinearLayout>
     </com.nirhart.parallaxscroll.views.ParallaxScrollView>
-</RelativeLayout>
+</FrameLayout>

app/src/main/res/layout/item_software_component.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    android:orientation="vertical"
+    android:background="?attr/selectableItemBackground"
+    android:clickable="true">
+
+    <TextView
+        android:id="@+id/name"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:paddingTop="10dp"
+        android:textAppearance="@android:style/TextAppearance.Medium"
+        tools:text="Software Name" />
+
+    <TextView
+        android:id="@+id/copyright"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/name"
+        android:paddingBottom="10dp"
+        tools:text="@string/copyright" />
+</RelativeLayout>