add changelog for 730

Currently translated at 100.0% (443 of 443 strings)

.github/CONTRIBUTING.md

@@ -5,44 +5,64 @@ PLEASE READ THESE GUIDELINES CAREFULLY BEFORE ANY CONTRIBUTION!
 
 ## 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 via e-mail when a crash occurs. This contains all the data we need for debugging, and allows you to even add a comment to it. You'll see exactly what is sent, the system is 100% transparent.
+Do not report crashes in the GitHub issue tracker. NewPipe has an automated crash report system that will ask you to
+send a report via e-mail when a crash occurs. This contains all the data we need for debugging, and allows you to even
+add a comment to it. You'll see exactly what is sent, the system is 100% transparent.
 
 ## Issue reporting/feature requests
 
-* Search the [existing issues](https://github.com/TeamNewPipe/NewPipe/issues) first to make sure your issue/feature hasn't been reported/requested before
+* Search the [existing issues](https://github.com/TeamNewPipe/NewPipe/issues) first to make sure your issue/feature
+hasn't been reported/requested before
 * Check whether your issue/feature is already fixed/implemented
 * Check if the issue still exists in the latest release/beta version
 * If you are an Android/Java developer, you are always welcome to fix/implement an issue/a feature yourself. PRs welcome!
 * We use English for development. Issues in other languages will be closed and ignored.
 * Please only add *one* issue at a time. Do not put multiple issues into one thread.
 * When reporting a bug please give us a context, and a description how to reproduce it.
-* Issues that only contain a generated bug report, but no describtion might be closed.
+* Issues that only contain a generated bug report, but no description might be closed.
 
 ## Bug Fixing
-* If you want to help NewPipe to become free of bugs (this is our utopic goal for NewPipe), you can send us an email to tnp@newpipe.schabi.org to let me know that you intend to help. We'll send you further instructions. You may, on request, register at our [Sentry](https://sentry.schabi.org) instance (see section "Crash reporting" for more information.
+* If you want to help NewPipe to become free of bugs (this is our utopic goal for NewPipe), you can send us an email to
+tnp@newpipe.schabi.org to let me know that you intend to help. We'll send you further instructions. You may, on request,
+register at our [Sentry](https://sentry.schabi.org) instance (see section "Crash reporting" for more information.
 
 ## Translation
 
-* NewPipe can be translated via [Weblate](https://hosted.weblate.org/projects/newpipe/strings/). You can log in there with your GitHub account.
+* NewPipe can be translated via [Weblate](https://hosted.weblate.org/projects/newpipe/strings/). You can log in there
+with your GitHub account.
 
 ## Code contribution
 
 * Stick to NewPipe's style conventions (well, just look the other code and then do it the same way :))
-* Do not bring non-free software (e.g., binary blobs) into the project. Also, make sure you do not introduce Google libraries.
+* Do not bring non-free software (e.g., binary blobs) into the project. Also, make sure you do not introduce Google
+  libraries.
 * Stick to [F-Droid contribution guidelines](https://f-droid.org/wiki/page/Inclusion_Policy)
-* Make changes on a separate branch, not on the master branch. This is commonly known as *feature branch workflow*. You may then send your changes as a pull request on GitHub. Patches to the email address mentioned in this document might not be considered, GitHub is the primary platform. (This only affects you if you are a member of TeamNewPipe)
-* When submitting changes, you confirm that your code is licensed under the terms of the [GNU General Public License v3](https://www.gnu.org/licenses/gpl-3.0.html).
-* Please test (compile and run) your code before you submit changes! Ideally, provide test feedback in the PR description. Untested code will **not** be merged!
+* Make changes on a separate branch, not on the master branch. This is commonly known as *feature branch workflow*. You
+  may then send your changes as a pull request on GitHub. Patches to the email address mentioned in this document might
+  not be considered, GitHub is the primary platform. (This only affects you if you are a member of TeamNewPipe)
+* When submitting changes, you confirm that your code is licensed under the terms of the
+  [GNU General Public License v3](https://www.gnu.org/licenses/gpl-3.0.html).
+* Please test (compile and run) your code before you submit changes! Ideally, provide test feedback in the PR
+  description. Untested code will **not** be merged!
 * Try to figure out yourself why builds on our CI fail.
-* Make sure your PR is up-to-date with the rest of the code. Often, a simple click on "Update branch" will do the job, but if not, you are asked to merge the master branch manually and resolve the problems on your own. That will make the maintainers' jobs way easier.
-* Please show intention to maintain your features and code after you contributed it. Unmaintained code is a hassle for the core developers, and just adds work. If you do not intend to maintain features you contributed, please think again about submission, or clearly state that in the description of your PR.
+* Make sure your PR is up-to-date with the rest of the code. Often, a simple click on "Update branch" will do the job,
+  but if not, you are asked to merge the master branch manually and resolve the problems on your own. That will make the
+  maintainers' jobs way easier.
+* Please show intention to maintain your features and code after you contributed it. Unmaintained code is a hassle for
+  the core developers, and just adds work. If you do not intend to maintain features you contributed, please think again
+  about submission, or clearly state that in the description of your PR.
 * Respond yourselves if someone requests changes or otherwise raises issues about your PRs.
 * Check if your contributions align with the [fdroid inclusion guidelines](https://f-droid.org/en/docs/Inclusion_Policy/).
 * Check if your submission can be build with the current fdroid build server setup.
+* Send PR that only cover one specific issue/solution/bug. Do not send PRs that are huge and consists of multiple
+  independent solutions.
 
 ## Communication
 
 * WE DO NOW HAVE A MAILING LIST: [newpipe@list.schabi.org](https://list.schabi.org/cgi-bin/mailman/listinfo/newpipe).
-* There is an IRC channel on Freenode which is regularly visited by the core team and other developers: [#newpipe](irc:irc.freenode.net/newpipe). [Click here for Webchat](https://webchat.freenode.net/?channels=newpipe)!
-* If you want to get in touch with the core team or one of our other contributors you can send an email to tnp(at)schabi.org. Please do not send issue reports, they will be ignored and remain unanswered! Use the GitHub issue tracker described above!
+* There is an IRC channel on Freenode which is regularly visited by the core team and other developers:
+  [#newpipe](irc:irc.freenode.net/newpipe). [Click here for Webchat](https://webchat.freenode.net/?channels=newpipe)!
+* If you want to get in touch with the core team or one of our other contributors you can send an email to
+  tnp(at)schabi.org. Please do not send issue reports, they will be ignored and remain unanswered! Use the GitHub issue
+  tracker described above!
 * Feel free to post suggestions, changes, ideas etc. on GitHub, IRC or the mailing list!

.travis.yml

@@ -5,13 +5,13 @@ android:
   components:
     # The BuildTools version used by NewPipe
     - tools
-    - build-tools-27.0.3
+    - build-tools-28.0.3
 
     # The SDK version used to compile NewPipe
-    - android-27
+    - android-28
 
 before_install: 
-  - yes | sdkmanager "platforms;android-27"
+  - yes | sdkmanager "platforms;android-28"
 script: ./gradlew -Dorg.gradle.jvmargs=-Xmx1536m assembleDebug lintDebug testDebugUnitTest
 
 licenses:

app/build.gradle

@@ -1,28 +1,29 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 27
-    buildToolsVersion '27.0.3'
+    compileSdkVersion 28
+    buildToolsVersion '28.0.3'
 
     defaultConfig {
         applicationId "org.schabi.newpipe"
-        minSdkVersion 15
-        targetSdkVersion 27
-        versionCode 67
-        versionName "0.14.0"
+        minSdkVersion 19
+        targetSdkVersion 28
+        versionCode 730
+        versionName "0.16.1"
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
     }
+
     buildTypes {
         release {
             minifyEnabled true
             shrinkResources true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
+
         debug {
             multiDexEnabled true
-
             debuggable true
             applicationIdSuffix ".debug"
         }
@@ -34,6 +35,7 @@ android {
         // but continue the build even when errors are found:
         abortOnError false
     }
+
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
@@ -41,62 +43,61 @@ android {
 }
 
 ext {
-    supportLibVersion = '27.1.1'
-    exoPlayerLibVersion = '2.8.2'
+    supportLibVersion = '28.0.0'
+    exoPlayerLibVersion = '2.8.4' //2.9.0
     roomDbLibVersion = '1.1.1'
-    leakCanaryLibVersion = '1.5.4'
-    okHttpLibVersion = '3.10.0'
+    leakCanaryLibVersion = '1.5.4' //1.6.1
+    okHttpLibVersion = '3.11.0'
     icepickLibVersion = '3.2.0'
     stethoLibVersion = '1.5.0'
 }
 
 dependencies {
-    androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2') {
+    androidTestImplementation('com.android.support.test.espresso:espresso-core:3.0.2', {
         exclude module: 'support-annotations'
-    }
+    })
 
-    implementation 'com.github.TeamNewPipe:NewPipeExtractor:850670917fce'
+    implementation 'com.github.TeamNewPipe:NewPipeExtractor:e072bf6461b295'
 
     testImplementation 'junit:junit:4.12'
-    testImplementation 'org.mockito:mockito-core:2.8.9'
+    testImplementation 'org.mockito:mockito-core:2.23.0'
 
-    implementation "com.android.support:appcompat-v7:$supportLibVersion"
-    implementation "com.android.support:support-v4:$supportLibVersion"
-    implementation "com.android.support:design:$supportLibVersion"
-    implementation "com.android.support:recyclerview-v7:$supportLibVersion"
-    implementation "com.android.support:preference-v14:$supportLibVersion"
+    implementation "com.android.support:appcompat-v7:${supportLibVersion}"
+    implementation "com.android.support:support-v4:${supportLibVersion}"
+    implementation "com.android.support:design:${supportLibVersion}"
+    implementation "com.android.support:recyclerview-v7:${supportLibVersion}"
+    implementation "com.android.support:preference-v14:${supportLibVersion}"
+    implementation "com.android.support:cardview-v7:${supportLibVersion}"
+    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
 
-    implementation 'ch.acra:acra:4.9.2'
+    implementation 'ch.acra:acra:4.9.2' //4.11
 
     implementation 'com.nostra13.universalimageloader:universal-image-loader:1.9.5'
     implementation 'de.hdodenhof:circleimageview:2.2.0'
     implementation 'com.github.nirhart:ParallaxScroll:dd53d1f9d1'
     implementation 'com.nononsenseapps:filepicker:4.2.1'
 
-    implementation "com.google.android.exoplayer:exoplayer:$exoPlayerLibVersion"
-    implementation "com.google.android.exoplayer:extension-mediasession:$exoPlayerLibVersion"
+    implementation "com.google.android.exoplayer:exoplayer:${exoPlayerLibVersion}"
+    implementation "com.google.android.exoplayer:extension-mediasession:${exoPlayerLibVersion}"
 
-    debugImplementation "com.facebook.stetho:stetho:$stethoLibVersion"
-    debugImplementation "com.facebook.stetho:stetho-urlconnection:$stethoLibVersion"
+    debugImplementation "com.facebook.stetho:stetho:${stethoLibVersion}"
+    debugImplementation "com.facebook.stetho:stetho-urlconnection:${stethoLibVersion}"
     debugImplementation 'com.android.support:multidex:1.0.3'
 
-    implementation 'io.reactivex.rxjava2:rxjava:2.1.14'
-    implementation 'io.reactivex.rxjava2:rxandroid:2.0.2'
+    implementation 'io.reactivex.rxjava2:rxjava:2.2.2'
+    implementation 'io.reactivex.rxjava2:rxandroid:2.1.0'
     implementation 'com.jakewharton.rxbinding2:rxbinding:2.1.1'
 
-    implementation "android.arch.persistence.room:runtime:$roomDbLibVersion"
-    implementation "android.arch.persistence.room:rxjava2:$roomDbLibVersion"
-    annotationProcessor "android.arch.persistence.room:compiler:$roomDbLibVersion"
+    implementation "android.arch.persistence.room:runtime:${roomDbLibVersion}"
+    implementation "android.arch.persistence.room:rxjava2:${roomDbLibVersion}"
+    annotationProcessor "android.arch.persistence.room:compiler:${roomDbLibVersion}"
 
-    implementation "frankiesardo:icepick:$icepickLibVersion"
-    annotationProcessor "frankiesardo:icepick-processor:$icepickLibVersion"
+    implementation "frankiesardo:icepick:${icepickLibVersion}"
+    annotationProcessor "frankiesardo:icepick-processor:${icepickLibVersion}"
 
-    debugImplementation "com.squareup.leakcanary:leakcanary-android:$leakCanaryLibVersion"
-    releaseImplementation "com.squareup.leakcanary:leakcanary-android-no-op:$leakCanaryLibVersion"
+    debugImplementation "com.squareup.leakcanary:leakcanary-android:${leakCanaryLibVersion}"
+    releaseImplementation "com.squareup.leakcanary:leakcanary-android-no-op:${leakCanaryLibVersion}"
 
-
-    implementation "com.squareup.okhttp3:okhttp:$okHttpLibVersion"
-    debugImplementation "com.facebook.stetho:stetho-okhttp3:$stethoLibVersion"
-    implementation 'com.android.support.constraint:constraint-layout:1.1.2'
-    implementation 'com.android.support:cardview-v7:27.1.1'
+    implementation "com.squareup.okhttp3:okhttp:${okHttpLibVersion}"
+    debugImplementation "com.facebook.stetho:stetho-okhttp3:${stethoLibVersion}"
 }

app/src/androidTest/java/org/schabi/newpipe/ApplicationTest.java

@@ -1,13 +0,0 @@
-package org.schabi.newpipe;
-
-import android.app.Application;
-import android.test.ApplicationTestCase;
-
-/**
- * <a href="http://d.android.com/tools/testing/testing_android.html">Testing Fundamentals</a>
- */
-public class ApplicationTest extends ApplicationTestCase<Application> {
-    public ApplicationTest() {
-        super(Application.class);
-    }
-}

app/src/main/AndroidManifest.xml

@@ -9,6 +9,7 @@
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
 
     <application
         android:name=".App"
@@ -34,12 +35,6 @@
             </intent-filter>
         </receiver>
 
-        <activity
-            android:name=".player.old.PlayVideoActivity"
-            android:configChanges="orientation|keyboardHidden|screenSize"
-            android:theme="@style/OldVideoPlayerTheme"
-            tools:ignore="UnusedAttribute"/>
-
         <service
             android:name=".player.BackgroundPlayer"
             android:exported="false">
@@ -118,7 +113,6 @@
         <activity
             android:name=".ReCaptchaActivity"
             android:label="@string/reCaptchaActivity"/>
-        <activity android:name=".download.ExtSDDownloadFailedActivity" />
 
         <provider
             android:name="android.support.v4.content.FileProvider"
@@ -183,6 +177,19 @@
                 <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="www.youtube-nocookie.com"/>
+                <data android:pathPrefix="/embed/"/>
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW"/>
+                <action android:name="android.media.action.MEDIA_PLAY_FROM_SEARCH"/>
+                <action android:name="android.nfc.action.NDEF_DISCOVERED"/>
+
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.BROWSABLE"/>
+
                 <data android:scheme="vnd.youtube"/>
                 <data android:scheme="vnd.youtube.launch"/>
             </intent-filter>
@@ -209,6 +216,29 @@
                 <data android:pathPrefix="/user/"/>
             </intent-filter>
 
+            <!-- Invidious filter -->
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW"/>
+                <action android:name="android.media.action.MEDIA_PLAY_FROM_SEARCH"/>
+                <action android:name="android.nfc.action.NDEF_DISCOVERED"/>
+
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.BROWSABLE"/>
+
+                <data android:scheme="http"/>
+                <data android:scheme="https"/>
+                <data android:host="invidio.us"/>
+                <data android:host="www.invidio.us"/>
+                <!-- video prefix -->
+                <data android:pathPrefix="/embed/"/>
+                <data android:pathPrefix="/watch"/>
+                <!-- channel prefix -->
+                <data android:pathPrefix="/channel/"/>
+                <data android:pathPrefix="/user/"/>
+                <!-- playlist prefix -->
+                <data android:pathPrefix="/playlist"/>
+            </intent-filter>
+
             <!-- Soundcloud filter -->
             <intent-filter>
                 <action android:name="android.intent.action.VIEW"/>
@@ -238,4 +268,4 @@
             android:name=".RouterActivity$FetcherService"
             android:exported="false"/>
     </application>
-</manifest>
+</manifest>

app/src/main/java/android/support/design/widget/FlingBehavior.java

@@ -0,0 +1,116 @@
+package android.support.design.widget;
+
+import android.animation.ValueAnimator;
+import android.content.Context;
+import android.support.annotation.NonNull;
+import android.support.design.animation.AnimationUtils;
+import android.util.AttributeSet;
+import android.view.View;
+
+// check this https://github.com/ToDou/appbarlayout-spring-behavior/blob/master/appbarspring/src/main/java/android/support/design/widget/AppBarFlingFixBehavior.java
+public final class FlingBehavior extends AppBarLayout.Behavior {
+
+    private ValueAnimator mOffsetAnimator;
+    private static final int MAX_OFFSET_ANIMATION_DURATION = 600; // ms
+
+    public FlingBehavior() {
+    }
+
+    public FlingBehavior(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    @Override
+    public void onNestedPreScroll(CoordinatorLayout coordinatorLayout, AppBarLayout child, View target, int dx, int dy, int[] consumed, int type) {
+        if (dy != 0) {
+            int val = child.getBottom();
+            if (val != 0) {
+                int min, max;
+                if (dy < 0) {
+                    // We're scrolling down
+                } else {
+                    // We're scrolling up
+                    if (mOffsetAnimator != null && mOffsetAnimator.isRunning()) {
+                        mOffsetAnimator.cancel();
+                    }
+                    min = -child.getUpNestedPreScrollRange();
+                    max = 0;
+                    consumed[1] = scroll(coordinatorLayout, child, dy, min, max);
+                }
+            }
+        }
+    }
+
+    @Override
+    public boolean onNestedPreFling(@NonNull CoordinatorLayout coordinatorLayout, @NonNull AppBarLayout child, @NonNull View target, float velocityX, float velocityY) {
+
+        if (velocityY != 0) {
+            if (velocityY < 0) {
+                // We're flinging down
+                int val = child.getBottom();
+                if (val != 0) {
+                    final int targetScroll =
+                            +child.getDownNestedPreScrollRange();
+                    animateOffsetTo(coordinatorLayout, child, targetScroll, velocityY);
+                }
+
+            } else {
+                // We're flinging up
+                int val = child.getBottom();
+                if (val != 0) {
+                    final int targetScroll = -child.getUpNestedPreScrollRange();
+                    if (getTopBottomOffsetForScrollingSibling() > targetScroll) {
+                        animateOffsetTo(coordinatorLayout, child, targetScroll, velocityY);
+                    }
+                }
+            }
+        }
+
+        return super.onNestedPreFling(coordinatorLayout, child, target, velocityX, velocityY);
+    }
+
+    private void animateOffsetTo(final CoordinatorLayout coordinatorLayout,
+                                 final AppBarLayout child, final int offset, float velocity) {
+        final int distance = Math.abs(getTopBottomOffsetForScrollingSibling() - offset);
+
+        final int duration;
+        velocity = Math.abs(velocity);
+        if (velocity > 0) {
+            duration = 3 * Math.round(1000 * (distance / velocity));
+        } else {
+            final float distanceRatio = (float) distance / child.getHeight();
+            duration = (int) ((distanceRatio + 1) * 150);
+        }
+
+        animateOffsetWithDuration(coordinatorLayout, child, offset, duration);
+    }
+
+    private void animateOffsetWithDuration(final CoordinatorLayout coordinatorLayout,
+                                           final AppBarLayout child, final int offset, final int duration) {
+        final int currentOffset = getTopBottomOffsetForScrollingSibling();
+        if (currentOffset == offset) {
+            if (mOffsetAnimator != null && mOffsetAnimator.isRunning()) {
+                mOffsetAnimator.cancel();
+            }
+            return;
+        }
+
+        if (mOffsetAnimator == null) {
+            mOffsetAnimator = new ValueAnimator();
+            mOffsetAnimator.setInterpolator(AnimationUtils.DECELERATE_INTERPOLATOR);
+            mOffsetAnimator.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
+                @Override
+                public void onAnimationUpdate(ValueAnimator animator) {
+                    setHeaderTopBottomOffset(coordinatorLayout, child,
+                            (Integer) animator.getAnimatedValue());
+                }
+            });
+        } else {
+            mOffsetAnimator.cancel();
+        }
+
+        mOffsetAnimator.setDuration(Math.min(duration, MAX_OFFSET_ANIMATION_DURATION));
+        mOffsetAnimator.setIntValues(currentOffset, offset);
+        mOffsetAnimator.start();
+    }
+}

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

@@ -1,10 +1,12 @@
 package org.schabi.newpipe;
 
+import android.annotation.TargetApi;
 import android.app.Application;
 import android.app.NotificationChannel;
 import android.app.NotificationManager;
 import android.content.Context;
 import android.os.Build;
+import android.preference.PreferenceManager;
 import android.support.annotation.Nullable;
 import android.util.Log;
 
@@ -21,6 +23,7 @@ import org.acra.config.ConfigurationBuilder;
 import org.acra.sender.ReportSenderFactory;
 import org.schabi.newpipe.extractor.Downloader;
 import org.schabi.newpipe.extractor.NewPipe;
+import org.schabi.newpipe.extractor.utils.Localization;
 import org.schabi.newpipe.report.AcraReportSenderFactory;
 import org.schabi.newpipe.report.ErrorActivity;
 import org.schabi.newpipe.report.UserAction;
@@ -63,9 +66,11 @@ import io.reactivex.plugins.RxJavaPlugins;
 public class App extends Application {
     protected static final String TAG = App.class.toString();
     private RefWatcher refWatcher;
+    private static App app;
 
     @SuppressWarnings("unchecked")
-    private static final Class<? extends ReportSenderFactory>[] reportSenderFactoryClasses = new Class[]{AcraReportSenderFactory.class};
+    private static final Class<? extends ReportSenderFactory>[]
+            reportSenderFactoryClasses = new Class[]{AcraReportSenderFactory.class};
 
     @Override
     protected void attachBaseContext(Context base) {
@@ -85,10 +90,13 @@ public class App extends Application {
         }
         refWatcher = installLeakCanary();
 
+        app = this;
+
         // Initialize settings first because others inits can use its values
         SettingsActivity.initSettings(this);
 
-        NewPipe.init(getDownloader());
+        NewPipe.init(getDownloader(),
+                org.schabi.newpipe.util.Localization.getPreferredExtractorLocal(this));
         StateSaver.init(this);
         initNotificationChannel();
 
@@ -96,6 +104,9 @@ public class App extends Application {
         ImageLoader.getInstance().init(getImageLoaderConfigurations(10, 50));
 
         configureRxJavaErrorHandler();
+
+        // Check for new version
+        new CheckForNewAppVersionTask().execute();
     }
 
     protected Downloader getDownloader() {
@@ -106,7 +117,7 @@ public class App extends Application {
         // https://github.com/ReactiveX/RxJava/wiki/What's-different-in-2.0#error-handling
         RxJavaPlugins.setErrorHandler(new Consumer<Throwable>() {
             @Override
-            public void accept(@NonNull Throwable throwable) throws Exception {
+            public void accept(@NonNull Throwable throwable) {
                 Log.e(TAG, "RxJavaPlugins.ErrorHandler called with -> : " +
                         "throwable = [" + throwable.getClass().getName() + "]");
 
@@ -180,7 +191,11 @@ public class App extends Application {
             ACRA.init(this, acraConfig);
         } catch (ACRAConfigurationException ace) {
             ace.printStackTrace();
-            ErrorActivity.reportError(this, ace, null, null, ErrorActivity.ErrorInfo.make(UserAction.SOMETHING_ELSE, "none",
+            ErrorActivity.reportError(this,
+                    ace,
+                    null,
+                    null,
+                    ErrorActivity.ErrorInfo.make(UserAction.SOMETHING_ELSE, "none",
                     "Could not initialize ACRA crash report", R.string.app_ui_crash));
         }
     }
@@ -200,8 +215,34 @@ public class App extends Application {
         NotificationChannel mChannel = new NotificationChannel(id, name, importance);
         mChannel.setDescription(description);
 
-        NotificationManager mNotificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
+        NotificationManager mNotificationManager =
+                (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
         mNotificationManager.createNotificationChannel(mChannel);
+
+        setUpUpdateNotificationChannel(importance);
+    }
+
+    /**
+     * Set up notification channel for app update.
+     * @param importance
+     */
+    @TargetApi(Build.VERSION_CODES.O)
+    private void setUpUpdateNotificationChannel(int importance) {
+
+        final String appUpdateId
+                = getString(R.string.app_update_notification_channel_id);
+        final CharSequence appUpdateName
+                = getString(R.string.app_update_notification_channel_name);
+        final String appUpdateDescription
+                = getString(R.string.app_update_notification_channel_description);
+
+        NotificationChannel appUpdateChannel
+                = new NotificationChannel(appUpdateId, appUpdateName, importance);
+        appUpdateChannel.setDescription(appUpdateDescription);
+
+        NotificationManager appUpdateNotificationManager
+                = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
+        appUpdateNotificationManager.createNotificationChannel(appUpdateChannel);
     }
 
     @Nullable
@@ -217,4 +258,8 @@ public class App extends Application {
     protected boolean isDisposedRxExceptionsReported() {
         return false;
     }
+
+    public static App getApp() {
+        return app;
+    }
 }

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

@@ -12,14 +12,12 @@ import android.view.View;
 import com.nostra13.universalimageloader.core.ImageLoader;
 import com.squareup.leakcanary.RefWatcher;
 
-import org.schabi.newpipe.report.UserAction;
-
 import icepick.Icepick;
 import icepick.State;
 
 public abstract class BaseFragment extends Fragment {
     protected final String TAG = getClass().getSimpleName() + "@" + Integer.toHexString(hashCode());
-    protected boolean DEBUG = MainActivity.DEBUG;
+    protected final boolean DEBUG = MainActivity.DEBUG;
 
     protected AppCompatActivity activity;
     public static final ImageLoader imageLoader = ImageLoader.getInstance();

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

@@ -0,0 +1,230 @@
+package org.schabi.newpipe;
+
+import android.app.Application;
+import android.app.PendingIntent;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.Signature;
+import android.net.Uri;
+import android.os.AsyncTask;
+import android.preference.PreferenceManager;
+import android.support.v4.app.NotificationCompat;
+import android.support.v4.app.NotificationManagerCompat;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.schabi.newpipe.report.ErrorActivity;
+import org.schabi.newpipe.report.UserAction;
+
+import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.security.cert.CertificateEncodingException;
+import java.security.cert.CertificateException;
+import java.security.cert.CertificateFactory;
+import java.security.cert.X509Certificate;
+import java.util.concurrent.TimeUnit;
+
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.RequestBody;
+import okhttp3.Response;
+
+/**
+ * AsyncTask to check if there is a newer version of the NewPipe github apk available or not.
+ * If there is a newer version we show a notification, informing the user. On tapping
+ * the notification, the user will be directed to the download link.
+ */
+public class CheckForNewAppVersionTask extends AsyncTask<Void, Void, String> {
+
+    private static final Application app = App.getApp();
+    private static final String GITHUB_APK_SHA1 = "B0:2E:90:7C:1C:D6:FC:57:C3:35:F0:88:D0:8F:50:5F:94:E4:D2:15";
+    private static final String newPipeApiUrl = "https://newpipe.schabi.org/api/data.json";
+    private static final int timeoutPeriod = 30;
+
+    private SharedPreferences mPrefs;
+    private OkHttpClient client;
+
+    @Override
+    protected void onPreExecute() {
+
+        mPrefs = PreferenceManager.getDefaultSharedPreferences(app);
+
+        // Check if user has enabled/ disabled update checking
+        // and if the current apk is a github one or not.
+        if (!mPrefs.getBoolean(app.getString(R.string.update_app_key), true)
+                || !isGithubApk()) {
+            this.cancel(true);
+        }
+    }
+
+    @Override
+    protected String doInBackground(Void... voids) {
+
+        // Make a network request to get latest NewPipe data.
+        if (client == null) {
+
+            client = new OkHttpClient
+                    .Builder()
+                    .readTimeout(timeoutPeriod, TimeUnit.SECONDS)
+                    .build();
+        }
+
+        Request request = new Request.Builder()
+                .url(newPipeApiUrl)
+                .build();
+
+        try {
+            Response response = client.newCall(request).execute();
+            return response.body().string();
+        } catch (IOException ex) {
+            ErrorActivity.reportError(app, ex, null, null,
+                    ErrorActivity.ErrorInfo.make(UserAction.SOMETHING_ELSE, "none",
+                            "app update API fail", R.string.app_ui_crash));
+        }
+
+        return null;
+    }
+
+    @Override
+    protected void onPostExecute(String response) {
+
+        // Parse the json from the response.
+        if (response != null) {
+
+            try {
+                JSONObject mainObject = new JSONObject(response);
+                JSONObject flavoursObject = mainObject.getJSONObject("flavors");
+                JSONObject githubObject = flavoursObject.getJSONObject("github");
+                JSONObject githubStableObject = githubObject.getJSONObject("stable");
+
+                String versionName = githubStableObject.getString("version");
+                String versionCode = githubStableObject.getString("version_code");
+                String apkLocationUrl = githubStableObject.getString("apk");
+
+                compareAppVersionAndShowNotification(versionName, apkLocationUrl, versionCode);
+
+            } catch (JSONException ex) {
+                ErrorActivity.reportError(app, ex, null, null,
+                        ErrorActivity.ErrorInfo.make(UserAction.SOMETHING_ELSE, "none",
+                        "could not parse app update JSON data", R.string.app_ui_crash));
+            }
+        }
+    }
+
+    /**
+     * Method to compare the current and latest available app version.
+     * If a newer version is available, we show the update notification.
+     * @param versionName
+     * @param apkLocationUrl
+     */
+    private void compareAppVersionAndShowNotification(String versionName,
+                                                      String apkLocationUrl,
+                                                      String versionCode) {
+
+        int NOTIFICATION_ID = 2000;
+
+        if (BuildConfig.VERSION_CODE < Integer.valueOf(versionCode)) {
+
+            // A pending intent to open the apk location url in the browser.
+            Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(apkLocationUrl));
+            PendingIntent pendingIntent
+                    = PendingIntent.getActivity(app, 0, intent, 0);
+
+            NotificationCompat.Builder notificationBuilder = new NotificationCompat
+                    .Builder(app, app.getString(R.string.app_update_notification_channel_id))
+                    .setSmallIcon(R.drawable.ic_newpipe_update)
+                    .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
+                    .setContentIntent(pendingIntent)
+                    .setAutoCancel(true)
+                    .setContentTitle(app.getString(R.string.app_update_notification_content_title))
+                    .setContentText(app.getString(R.string.app_update_notification_content_text)
+                            + " " + versionName);
+
+            NotificationManagerCompat notificationManager = NotificationManagerCompat.from(app);
+            notificationManager.notify(NOTIFICATION_ID, notificationBuilder.build());
+        }
+    }
+
+    /**
+     * Method to get the apk's SHA1 key.
+     * https://stackoverflow.com/questions/9293019/get-certificate-fingerprint-from-android-app#22506133
+     */
+    private static String getCertificateSHA1Fingerprint() {
+
+        PackageManager pm = app.getPackageManager();
+        String packageName = app.getPackageName();
+        int flags = PackageManager.GET_SIGNATURES;
+        PackageInfo packageInfo = null;
+
+        try {
+            packageInfo = pm.getPackageInfo(packageName, flags);
+        } catch (PackageManager.NameNotFoundException ex) {
+            ErrorActivity.reportError(app, ex, null, null,
+                    ErrorActivity.ErrorInfo.make(UserAction.SOMETHING_ELSE, "none",
+                            "Could not find package info", R.string.app_ui_crash));
+        }
+
+        Signature[] signatures = packageInfo.signatures;
+        byte[] cert = signatures[0].toByteArray();
+        InputStream input = new ByteArrayInputStream(cert);
+
+        CertificateFactory cf = null;
+        X509Certificate c = null;
+
+        try {
+            cf = CertificateFactory.getInstance("X509");
+            c = (X509Certificate) cf.generateCertificate(input);
+        } catch (CertificateException ex) {
+            ErrorActivity.reportError(app, ex, null, null,
+                    ErrorActivity.ErrorInfo.make(UserAction.SOMETHING_ELSE, "none",
+                            "Certificate error", R.string.app_ui_crash));
+        }
+
+        String hexString = null;
+
+        try {
+            MessageDigest md = MessageDigest.getInstance("SHA1");
+            byte[] publicKey = md.digest(c.getEncoded());
+            hexString = byte2HexFormatted(publicKey);
+        } catch (NoSuchAlgorithmException ex1) {
+            ErrorActivity.reportError(app, ex1, null, null,
+                    ErrorActivity.ErrorInfo.make(UserAction.SOMETHING_ELSE, "none",
+                            "Could not retrieve SHA1 key", R.string.app_ui_crash));
+        } catch (CertificateEncodingException ex2) {
+            ErrorActivity.reportError(app, ex2, null, null,
+                    ErrorActivity.ErrorInfo.make(UserAction.SOMETHING_ELSE, "none",
+                            "Could not retrieve SHA1 key", R.string.app_ui_crash));
+        }
+
+        return hexString;
+    }
+
+    private static String byte2HexFormatted(byte[] arr) {
+
+        StringBuilder str = new StringBuilder(arr.length * 2);
+
+        for (int i = 0; i < arr.length; i++) {
+            String h = Integer.toHexString(arr[i]);
+            int l = h.length();
+            if (l == 1) h = "0" + h;
+            if (l > 2) h = h.substring(l - 2, l);
+            str.append(h.toUpperCase());
+            if (i < (arr.length - 1)) str.append(':');
+        }
+        return str.toString();
+    }
+
+    public static boolean isGithubApk() {
+
+        return getCertificateSHA1Fingerprint().equals(GITHUB_APK_SHA1);
+    }
+}

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

@@ -3,17 +3,24 @@ package org.schabi.newpipe;
 import android.support.annotation.Nullable;
 import android.text.TextUtils;
 
+import org.schabi.newpipe.extractor.DownloadRequest;
+import org.schabi.newpipe.extractor.DownloadResponse;
 import org.schabi.newpipe.extractor.exceptions.ReCaptchaException;
+import org.schabi.newpipe.extractor.utils.Localization;
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.Serializable;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
+import okhttp3.MediaType;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
+import okhttp3.RequestBody;
 import okhttp3.Response;
 import okhttp3.ResponseBody;
 
@@ -43,7 +50,7 @@ public class Downloader implements org.schabi.newpipe.extractor.Downloader {
 
     private static Downloader instance;
     private String mCookies;
-    private OkHttpClient client;
+    private final OkHttpClient client;
 
     private Downloader(OkHttpClient.Builder builder) {
         this.client = builder
@@ -88,7 +95,8 @@ public class Downloader implements org.schabi.newpipe.extractor.Downloader {
                     .build();
             response = client.newCall(request).execute();
 
-            return Long.parseLong(response.header("Content-Length"));
+            String contentLength = response.header("Content-Length");
+            return contentLength == null ? -1 : Long.parseLong(contentLength);
         } catch (NumberFormatException e) {
             throw new IOException("Invalid content length", e);
         } finally {
@@ -103,13 +111,13 @@ public class Downloader implements org.schabi.newpipe.extractor.Downloader {
      * but set the HTTP header field "Accept-Language" to the supplied string.
      *
      * @param siteUrl  the URL of the text file to return the contents of
-     * @param language the language (usually a 2-character code) to set as the preferred language
+     * @param localization the language and country (usually a 2-character code) to set
      * @return the contents of the specified text file
      */
     @Override
-    public String download(String siteUrl, String language) throws IOException, ReCaptchaException {
+    public String download(String siteUrl, Localization localization) throws IOException, ReCaptchaException {
         Map<String, String> requestProperties = new HashMap<>();
-        requestProperties.put("Accept-Language", language);
+        requestProperties.put("Accept-Language", localization.getLanguage());
         return download(siteUrl, requestProperties);
     }
 
@@ -137,13 +145,16 @@ public class Downloader implements org.schabi.newpipe.extractor.Downloader {
 
     private ResponseBody getBody(String siteUrl, Map<String, String> customProperties) throws IOException, ReCaptchaException {
         final Request.Builder requestBuilder = new Request.Builder()
-                .method("GET", null).url(siteUrl)
-                .addHeader("User-Agent", USER_AGENT);
+                .method("GET", null).url(siteUrl);
 
         for (Map.Entry<String, String> header : customProperties.entrySet()) {
             requestBuilder.addHeader(header.getKey(), header.getValue());
         }
 
+        if (!customProperties.containsKey("User-Agent")) {
+            requestBuilder.header("User-Agent", USER_AGENT);
+        }
+
         if (!TextUtils.isEmpty(mCookies)) {
             requestBuilder.addHeader("Cookie", mCookies);
         }
@@ -175,4 +186,96 @@ public class Downloader implements org.schabi.newpipe.extractor.Downloader {
     public String download(String siteUrl) throws IOException, ReCaptchaException {
         return download(siteUrl, Collections.emptyMap());
     }
-}
+
+
+    @Override
+    public DownloadResponse get(String siteUrl, DownloadRequest request) throws IOException, ReCaptchaException {
+        final Request.Builder requestBuilder = new Request.Builder()
+                .method("GET", null).url(siteUrl);
+
+        Map<String, List<String>> requestHeaders = request.getRequestHeaders();
+        // set custom headers in request
+        for (Map.Entry<String, List<String>> pair : requestHeaders.entrySet()) {
+            for(String value : pair.getValue()){
+                requestBuilder.addHeader(pair.getKey(), value);
+            }
+        }
+
+        if (!requestHeaders.containsKey("User-Agent")) {
+            requestBuilder.header("User-Agent", USER_AGENT);
+        }
+
+        if (!TextUtils.isEmpty(mCookies)) {
+            requestBuilder.addHeader("Cookie", mCookies);
+        }
+
+        final Request okRequest = requestBuilder.build();
+        final Response response = client.newCall(okRequest).execute();
+        final ResponseBody body = response.body();
+
+        if (response.code() == 429) {
+            throw new ReCaptchaException("reCaptcha Challenge requested");
+        }
+
+        if (body == null) {
+            response.close();
+            return null;
+        }
+
+        return new DownloadResponse(body.string(), response.headers().toMultimap());
+    }
+
+    @Override
+    public DownloadResponse get(String siteUrl) throws IOException, ReCaptchaException {
+        return get(siteUrl, DownloadRequest.emptyRequest);
+    }
+
+    @Override
+    public DownloadResponse post(String siteUrl, DownloadRequest request) throws IOException, ReCaptchaException {
+
+        Map<String, List<String>> requestHeaders = request.getRequestHeaders();
+        if(null == requestHeaders.get("Content-Type") || requestHeaders.get("Content-Type").isEmpty()){
+            // content type header is required. maybe throw an exception here
+            return null;
+        }
+
+        String contentType = requestHeaders.get("Content-Type").get(0);
+
+        RequestBody okRequestBody = null;
+        if(null != request.getRequestBody()){
+            okRequestBody = RequestBody.create(MediaType.parse(contentType), request.getRequestBody());
+        }
+        final Request.Builder requestBuilder = new Request.Builder()
+                .method("POST",  okRequestBody).url(siteUrl);
+
+        // set custom headers in request
+        for (Map.Entry<String, List<String>> pair : requestHeaders.entrySet()) {
+            for(String value : pair.getValue()){
+                requestBuilder.addHeader(pair.getKey(), value);
+            }
+        }
+
+        if (!requestHeaders.containsKey("User-Agent")) {
+            requestBuilder.header("User-Agent", USER_AGENT);
+        }
+
+        if (!TextUtils.isEmpty(mCookies)) {
+            requestBuilder.addHeader("Cookie", mCookies);
+        }
+
+        final Request okRequest = requestBuilder.build();
+        final Response response = client.newCall(okRequest).execute();
+        final ResponseBody body = response.body();
+
+        if (response.code() == 429) {
+            throw new ReCaptchaException("reCaptcha Challenge requested");
+        }
+
+        if (body == null) {
+            response.close();
+            return null;
+        }
+
+        return new DownloadResponse(body.string(), response.headers().toMultimap());
+    }
+}

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

@@ -23,7 +23,6 @@ package org.schabi.newpipe;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
-import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
@@ -66,8 +65,6 @@ import org.schabi.newpipe.util.ServiceHelper;
 import org.schabi.newpipe.util.StateSaver;
 import org.schabi.newpipe.util.ThemeHelper;
 
-import static org.schabi.newpipe.extractor.InfoItem.InfoType.PLAYLIST;
-
 public class MainActivity extends AppCompatActivity {
     private static final String TAG = "MainActivity";
     public static final boolean DEBUG = !BuildConfig.BUILD_TYPE.equals("release");

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

@@ -85,7 +85,7 @@ public class ReCaptchaActivity extends AppCompatActivity {
     }
 
     private class ReCaptchaWebViewClient extends WebViewClient {
-        private Activity context;
+        private final Activity context;
         private String mCookies;
 
         ReCaptchaWebViewClient(Activity ctx) {

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

@@ -1,7 +1,6 @@
 package org.schabi.newpipe;
 
 import android.annotation.SuppressLint;
-import android.app.FragmentManager;
 import android.app.IntentService;
 import android.content.Context;
 import android.content.DialogInterface;
@@ -13,7 +12,6 @@ import android.preference.PreferenceManager;
 import android.support.annotation.DrawableRes;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
 import android.support.v4.app.NotificationCompat;
 import android.support.v7.app.AlertDialog;
 import android.support.v7.app.AppCompatActivity;
@@ -38,7 +36,6 @@ import org.schabi.newpipe.extractor.exceptions.ExtractionException;
 import org.schabi.newpipe.extractor.playlist.PlaylistInfo;
 import org.schabi.newpipe.extractor.stream.StreamInfo;
 import org.schabi.newpipe.extractor.stream.VideoStream;
-import org.schabi.newpipe.fragments.detail.VideoDetailFragment;
 import org.schabi.newpipe.player.helper.PlayerHelper;
 import org.schabi.newpipe.player.playqueue.ChannelPlayQueue;
 import org.schabi.newpipe.player.playqueue.PlayQueue;
@@ -51,14 +48,12 @@ import org.schabi.newpipe.util.NavigationHelper;
 import org.schabi.newpipe.util.PermissionHelper;
 import org.schabi.newpipe.util.ThemeHelper;
 
-import java.io.IOException;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Observer;
 
 import icepick.Icepick;
 import icepick.State;
@@ -86,7 +81,7 @@ public class RouterActivity extends AppCompatActivity {
     protected int selectedPreviously = -1;
 
     protected String currentUrl;
-    protected CompositeDisposable disposables = new CompositeDisposable();
+    protected final CompositeDisposable disposables = new CompositeDisposable();
 
     private boolean selectionIsDownload = false;
 
@@ -184,12 +179,16 @@ public class RouterActivity extends AppCompatActivity {
         if (selectedChoiceKey.equals(alwaysAskKey)) {
             final List<AdapterChoiceItem> choices = getChoicesForService(currentService, currentLinkType);
 
-            if (choices.size() == 1) {
-                handleChoice(choices.get(0).key);
-            } else if (choices.size() == 0) {
-                handleChoice(showInfoKey);
-            } else {
-                showDialog(choices);
+            switch (choices.size()) {
+                case 1:
+                    handleChoice(choices.get(0).key);
+                    break;
+                case 0:
+                    handleChoice(showInfoKey);
+                    break;
+                default:
+                    showDialog(choices);
+                    break;
             }
         } else if (selectedChoiceKey.equals(showInfoKey)) {
             handleChoice(showInfoKey);
@@ -543,8 +542,7 @@ public class RouterActivity extends AppCompatActivity {
 
                 final SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(this);
                 boolean isExtVideoEnabled = preferences.getBoolean(getString(R.string.use_external_video_player_key), false);
-                boolean isExtAudioEnabled = preferences.getBoolean(getString(R.string.use_external_audio_player_key), false);
-                boolean useOldVideoPlayer = PlayerHelper.isUsingOldPlayer(this);
+                boolean isExtAudioEnabled = preferences.getBoolean(getString(R.string.use_external_audio_player_key), false);;
 
                 PlayQueue playQueue;
                 String playerChoice = choice.playerChoice;
@@ -556,9 +554,6 @@ public class RouterActivity extends AppCompatActivity {
                     } else if (playerChoice.equals(videoPlayerKey) && isExtVideoEnabled) {
                         NavigationHelper.playOnExternalVideoPlayer(this, (StreamInfo) info);
 
-                    } else if (playerChoice.equals(videoPlayerKey) && useOldVideoPlayer) {
-                        NavigationHelper.playOnOldVideoPlayer(this, (StreamInfo) info);
-
                     } else {
                         playQueue = new SinglePlayQueue((StreamInfo) info);
 

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

@@ -4,7 +4,6 @@ import android.app.Activity;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.os.AsyncTask;
-import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v7.app.AlertDialog;
 import android.webkit.WebView;
@@ -17,7 +16,7 @@ import java.lang.ref.WeakReference;
 
 public class LicenseFragmentHelper extends AsyncTask<Object, Void, Integer> {
 
-    WeakReference<Activity> weakReference;
+    final WeakReference<Activity> weakReference;
     private License license;
 
     public LicenseFragmentHelper(@Nullable Activity activity) {
@@ -78,18 +77,18 @@ public class LicenseFragmentHelper extends AsyncTask<Object, Void, Integer> {
             throw new NullPointerException("license is null");
         }
 
-        String licenseContent = "";
+        StringBuilder licenseContent = new StringBuilder();
         String webViewData;
         try {
             BufferedReader in = new BufferedReader(new InputStreamReader(context.getAssets().open(license.getFilename()), "UTF-8"));
             String str;
             while ((str = in.readLine()) != null) {
-                licenseContent += str;
+                licenseContent.append(str);
             }
             in.close();
 
             // split the HTML file and insert the stylesheet into the HEAD of the file
-            String[] insert = licenseContent.split("</head>");
+            String[] insert = licenseContent.toString().split("</head>");
             webViewData = insert[0] + "<style type=\"text/css\">"
                     + getLicenseStylesheet(context) + "</style></head>"
                     + insert[1];

app/src/main/java/org/schabi/newpipe/database/BasicDAO.java

@@ -30,7 +30,7 @@ public interface BasicDAO<Entity> {
 
     /* Deletes */
     @Delete
-    int delete(final Entity entity);
+    void delete(final Entity entity);
 
     @Delete
     int delete(final Collection<Entity> entities);
@@ -42,5 +42,5 @@ public interface BasicDAO<Entity> {
     int update(final Entity entity);
 
     @Update
-    int update(final Collection<Entity> entities);
+    void update(final Collection<Entity> entities);
 }

app/src/main/java/org/schabi/newpipe/database/history/dao/SearchHistoryDAO.java

@@ -4,7 +4,6 @@ import android.arch.persistence.room.Dao;
 import android.arch.persistence.room.Query;
 import android.support.annotation.Nullable;
 
-import org.schabi.newpipe.database.BasicDAO;
 import org.schabi.newpipe.database.history.model.SearchHistoryEntry;
 
 import java.util.List;

app/src/main/java/org/schabi/newpipe/database/history/dao/StreamHistoryDAO.java

@@ -5,7 +5,6 @@ import android.arch.persistence.room.Dao;
 import android.arch.persistence.room.Query;
 import android.support.annotation.Nullable;
 
-import org.schabi.newpipe.database.BasicDAO;
 import org.schabi.newpipe.database.history.model.StreamHistoryEntry;
 import org.schabi.newpipe.database.stream.StreamStatisticsEntry;
 import org.schabi.newpipe.database.history.model.StreamHistoryEntity;

app/src/main/java/org/schabi/newpipe/database/playlist/dao/PlaylistDAO.java

@@ -2,7 +2,6 @@ package org.schabi.newpipe.database.playlist.dao;
 
 import android.arch.persistence.room.Dao;
 import android.arch.persistence.room.Query;
-import android.arch.persistence.room.Transaction;
 
 import org.schabi.newpipe.database.BasicDAO;
 import org.schabi.newpipe.database.playlist.model.PlaylistEntity;
@@ -12,7 +11,6 @@ import java.util.List;
 import io.reactivex.Flowable;
 
 import static org.schabi.newpipe.database.playlist.model.PlaylistEntity.PLAYLIST_ID;
-import static org.schabi.newpipe.database.playlist.model.PlaylistEntity.PLAYLIST_NAME;
 import static org.schabi.newpipe.database.playlist.model.PlaylistEntity.PLAYLIST_TABLE;
 
 @Dao

app/src/main/java/org/schabi/newpipe/database/playlist/dao/PlaylistStreamDAO.java

@@ -8,7 +8,6 @@ import org.schabi.newpipe.database.BasicDAO;
 import org.schabi.newpipe.database.playlist.PlaylistMetadataEntry;
 import org.schabi.newpipe.database.playlist.PlaylistStreamEntry;
 import org.schabi.newpipe.database.playlist.model.PlaylistStreamEntity;
-import org.schabi.newpipe.database.stream.model.StreamEntity;
 
 import java.util.List;
 

app/src/main/java/org/schabi/newpipe/database/playlist/model/PlaylistEntity.java

@@ -5,8 +5,6 @@ import android.arch.persistence.room.Entity;
 import android.arch.persistence.room.Index;
 import android.arch.persistence.room.PrimaryKey;
 
-import java.util.Date;
-
 import static org.schabi.newpipe.database.playlist.model.PlaylistEntity.PLAYLIST_NAME;
 import static org.schabi.newpipe.database.playlist.model.PlaylistEntity.PLAYLIST_TABLE;
 

app/src/main/java/org/schabi/newpipe/database/playlist/model/PlaylistRemoteEntity.java

@@ -6,7 +6,6 @@ import android.arch.persistence.room.Ignore;
 import android.arch.persistence.room.Index;
 import android.arch.persistence.room.PrimaryKey;
 
-import org.schabi.newpipe.database.LocalItem;
 import org.schabi.newpipe.database.playlist.PlaylistLocalItem;
 import org.schabi.newpipe.extractor.playlist.PlaylistInfo;
 import org.schabi.newpipe.util.Constants;

app/src/main/java/org/schabi/newpipe/database/stream/dao/StreamDAO.java

@@ -10,7 +10,6 @@ import org.schabi.newpipe.database.BasicDAO;
 import org.schabi.newpipe.database.playlist.model.PlaylistStreamEntity;
 import org.schabi.newpipe.database.stream.model.StreamEntity;
 import org.schabi.newpipe.database.history.model.StreamHistoryEntity;
-import org.schabi.newpipe.database.stream.model.StreamStateEntity;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -23,7 +22,6 @@ import static org.schabi.newpipe.database.stream.model.StreamEntity.STREAM_SERVI
 import static org.schabi.newpipe.database.stream.model.StreamEntity.STREAM_TABLE;
 import static org.schabi.newpipe.database.stream.model.StreamEntity.STREAM_URL;
 import static org.schabi.newpipe.database.history.model.StreamHistoryEntity.STREAM_HISTORY_TABLE;
-import static org.schabi.newpipe.database.stream.model.StreamStateEntity.STREAM_STATE_TABLE;
 
 @Dao
 public abstract class StreamDAO implements BasicDAO<StreamEntity> {

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

@@ -1,158 +0,0 @@
-package org.schabi.newpipe.download;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.design.widget.BaseTransientBottomBar;
-import android.support.design.widget.Snackbar;
-import android.view.View;
-
-import org.schabi.newpipe.R;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-
-import io.reactivex.Completable;
-import io.reactivex.Observable;
-import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.subjects.PublishSubject;
-import us.shandian.giga.get.DownloadManager;
-import us.shandian.giga.get.DownloadMission;
-
-public class DeleteDownloadManager {
-
-    private static final String KEY_STATE = "delete_manager_state";
-
-    private View mView;
-    private HashSet<String> mPendingMap;
-    private List<Disposable> mDisposableList;
-    private DownloadManager mDownloadManager;
-    private PublishSubject<DownloadMission> publishSubject = PublishSubject.create();
-
-    DeleteDownloadManager(Activity activity) {
-        mPendingMap = new HashSet<>();
-        mDisposableList = new ArrayList<>();
-        mView = activity.findViewById(android.R.id.content);
-    }
-
-    public Observable<DownloadMission> getUndoObservable() {
-        return publishSubject;
-    }
-
-    public boolean contains(@NonNull DownloadMission mission) {
-        return mPendingMap.contains(mission.url);
-    }
-
-    public void add(@NonNull DownloadMission mission) {
-        mPendingMap.add(mission.url);
-
-        if (mPendingMap.size() == 1) {
-            showUndoDeleteSnackbar(mission);
-        }
-    }
-
-    public void setDownloadManager(@NonNull DownloadManager downloadManager) {
-        mDownloadManager = downloadManager;
-
-        if (mPendingMap.size() < 1) return;
-
-        showUndoDeleteSnackbar();
-    }
-
-    public void restoreState(@Nullable Bundle savedInstanceState) {
-        if (savedInstanceState == null) return;
-
-        List<String> list = savedInstanceState.getStringArrayList(KEY_STATE);
-        if (list != null) {
-            mPendingMap.addAll(list);
-        }
-    }
-
-    public void saveState(@Nullable Bundle outState) {
-        if (outState == null) return;
-
-        for (Disposable disposable : mDisposableList) {
-            disposable.dispose();
-        }
-
-        outState.putStringArrayList(KEY_STATE, new ArrayList<>(mPendingMap));
-    }
-
-    private void showUndoDeleteSnackbar() {
-        if (mPendingMap.size() < 1) return;
-
-        String url = mPendingMap.iterator().next();
-
-        for (int i = 0; i < mDownloadManager.getCount(); i++) {
-            DownloadMission mission = mDownloadManager.getMission(i);
-            if (url.equals(mission.url)) {
-                showUndoDeleteSnackbar(mission);
-                break;
-            }
-        }
-    }
-
-    private void showUndoDeleteSnackbar(@NonNull DownloadMission mission) {
-        final Snackbar snackbar = Snackbar.make(mView, mission.name, Snackbar.LENGTH_INDEFINITE);
-        final Disposable disposable = Observable.timer(3, TimeUnit.SECONDS)
-                .subscribeOn(AndroidSchedulers.mainThread())
-                .subscribe(l -> snackbar.dismiss());
-
-        mDisposableList.add(disposable);
-
-        snackbar.setAction(R.string.undo, v -> {
-            mPendingMap.remove(mission.url);
-            publishSubject.onNext(mission);
-            disposable.dispose();
-            snackbar.dismiss();
-        });
-
-        snackbar.addCallback(new BaseTransientBottomBar.BaseCallback<Snackbar>() {
-            @Override
-            public void onDismissed(Snackbar transientBottomBar, int event) {
-                if (!disposable.isDisposed()) {
-                    Completable.fromAction(() -> deletePending(mission))
-                            .subscribeOn(Schedulers.io())
-                            .subscribe();
-                }
-                mPendingMap.remove(mission.url);
-                snackbar.removeCallback(this);
-                mDisposableList.remove(disposable);
-                showUndoDeleteSnackbar();
-            }
-        });
-
-        snackbar.show();
-    }
-
-    public void deletePending() {
-        if (mPendingMap.size() < 1) return;
-
-        HashSet<Integer> idSet = new HashSet<>();
-        for (int i = 0; i < mDownloadManager.getCount(); i++) {
-            if (contains(mDownloadManager.getMission(i))) {
-                idSet.add(i);
-            }
-        }
-
-        for (Integer id : idSet) {
-            mDownloadManager.deleteMission(id);
-        }
-
-        mPendingMap.clear();
-    }
-
-    private void deletePending(@NonNull DownloadMission mission) {
-        for (int i = 0; i < mDownloadManager.getCount(); i++) {
-            if (mission.url.equals(mDownloadManager.getMission(i).url)) {
-                mDownloadManager.deleteMission(i);
-                break;
-            }
-        }
-    }
-}

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

@@ -15,16 +15,12 @@ import org.schabi.newpipe.R;
 import org.schabi.newpipe.settings.SettingsActivity;
 import org.schabi.newpipe.util.ThemeHelper;
 
-import io.reactivex.Completable;
-import io.reactivex.schedulers.Schedulers;
 import us.shandian.giga.service.DownloadManagerService;
-import us.shandian.giga.ui.fragment.AllMissionsFragment;
 import us.shandian.giga.ui.fragment.MissionsFragment;
 
 public class DownloadActivity extends AppCompatActivity {
 
     private static final String MISSIONS_FRAGMENT_TAG = "fragment_tag";
-    private DeleteDownloadManager mDeleteDownloadManager;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -47,32 +43,17 @@ public class DownloadActivity extends AppCompatActivity {
             actionBar.setDisplayShowTitleEnabled(true);
         }
 
-        mDeleteDownloadManager = new DeleteDownloadManager(this);
-        mDeleteDownloadManager.restoreState(savedInstanceState);
-
-        MissionsFragment fragment = (MissionsFragment) getFragmentManager().findFragmentByTag(MISSIONS_FRAGMENT_TAG);
-        if (fragment != null) {
-            fragment.setDeleteManager(mDeleteDownloadManager);
-        } else {
-            getWindow().getDecorView().getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
-                @Override
-                public void onGlobalLayout() {
-                    updateFragments();
-                    getWindow().getDecorView().getViewTreeObserver().removeGlobalOnLayoutListener(this);
-                }
-            });
-        }
-    }
-
-    @Override
-    protected void onSaveInstanceState(Bundle outState) {
-        mDeleteDownloadManager.saveState(outState);
-        super.onSaveInstanceState(outState);
+        getWindow().getDecorView().getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
+            @Override
+            public void onGlobalLayout() {
+                updateFragments();
+                getWindow().getDecorView().getViewTreeObserver().removeGlobalOnLayoutListener(this);
+            }
+        });
     }
 
     private void updateFragments() {
-        MissionsFragment fragment = new AllMissionsFragment();
-        fragment.setDeleteManager(mDeleteDownloadManager);
+        MissionsFragment fragment = new MissionsFragment();
 
         getFragmentManager().beginTransaction()
                 .replace(R.id.frame, fragment, MISSIONS_FRAGMENT_TAG)
@@ -99,7 +80,6 @@ public class DownloadActivity extends AppCompatActivity {
             case R.id.action_settings: {
                 Intent intent = new Intent(this, SettingsActivity.class);
                 startActivity(intent);
-                deletePending();
                 return true;
             }
             default:
@@ -108,14 +88,7 @@ public class DownloadActivity extends AppCompatActivity {
     }
 
     @Override
-    public void onBackPressed() {
-        super.onBackPressed();
-        deletePending();
-    }
-
-    private void deletePending() {
-        Completable.fromAction(mDeleteDownloadManager::deletePending)
-                .subscribeOn(Schedulers.io())
-                .subscribe();
+    public void onRestoreInstanceState(Bundle inState){
+        super.onRestoreInstanceState(inState);
     }
 }

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

@@ -1,38 +0,0 @@
-package org.schabi.newpipe.download;
-
-import android.app.AlertDialog;
-import android.content.DialogInterface;
-import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
-
-import org.schabi.newpipe.R;
-import org.schabi.newpipe.settings.NewPipeSettings;
-import org.schabi.newpipe.util.ServiceHelper;
-import org.schabi.newpipe.util.ThemeHelper;
-
-public class ExtSDDownloadFailedActivity extends AppCompatActivity {
-    @Override
-    protected void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        ThemeHelper.setTheme(this, ServiceHelper.getSelectedServiceId(this));
-    }
-
-    @Override
-    protected void onStart() {
-        super.onStart();
-        new AlertDialog.Builder(this)
-                .setTitle(R.string.download_to_sdcard_error_title)
-                .setMessage(R.string.download_to_sdcard_error_message)
-                .setPositiveButton(R.string.yes, (DialogInterface dialogInterface, int i) -> {
-                    NewPipeSettings.resetDownloadFolders(this);
-                    finish();
-                })
-                .setNegativeButton(R.string.cancel, (DialogInterface dialogInterface, int i) -> {
-                    dialogInterface.dismiss();
-                    finish();
-                })
-                .create()
-                .show();
-    }
-}

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

@@ -32,7 +32,6 @@ import java.util.concurrent.atomic.AtomicBoolean;
 
 import icepick.State;
 import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.functions.Consumer;
 
 import static org.schabi.newpipe.util.AnimationUtils.animateView;
 

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

@@ -2,7 +2,6 @@ package org.schabi.newpipe.fragments;
 
 import android.os.Bundle;
 import android.support.annotation.Nullable;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

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

@@ -3,9 +3,9 @@ package org.schabi.newpipe.fragments.detail;
 import java.io.Serializable;
 
 class StackItem implements Serializable {
-    private int serviceId;
+    private final int serviceId;
     private String title;
-    private String url;
+    private final String url;
 
     StackItem(int serviceId, String url, String title) {
         this.serviceId = serviceId;

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

@@ -0,0 +1,73 @@
+package org.schabi.newpipe.fragments.detail;
+
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentManager;
+import android.support.v4.app.FragmentPagerAdapter;
+import android.view.ViewGroup;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class TabAdaptor extends FragmentPagerAdapter {
+
+    private final List<Fragment> mFragmentList = new ArrayList<>();
+    private final List<String> mFragmentTitleList = new ArrayList<>();
+    private final FragmentManager fragmentManager;
+
+    public TabAdaptor(FragmentManager fm) {
+        super(fm);
+        this.fragmentManager = fm;
+    }
+
+    @Override
+    public Fragment getItem(int position) {
+        return mFragmentList.get(position);
+    }
+
+    @Override
+    public int getCount() {
+        return mFragmentList.size();
+    }
+
+    public void addFragment(Fragment fragment, String title) {
+        mFragmentList.add(fragment);
+        mFragmentTitleList.add(title);
+    }
+
+    public void clearAllItems() {
+        mFragmentList.clear();
+        mFragmentTitleList.clear();
+    }
+
+    public void removeItem(int position){
+        mFragmentList.remove(position == 0 ? 0 : position - 1);
+        mFragmentTitleList.remove(position == 0 ? 0 : position - 1);
+    }
+
+    public void updateItem(int position, Fragment fragment){
+        mFragmentList.set(position, fragment);
+    }
+
+    public void updateItem(String title, Fragment fragment){
+        int index = mFragmentTitleList.indexOf(title);
+        if(index != -1){
+            updateItem(index, fragment);
+        }
+    }
+
+    @Override
+    public int getItemPosition(Object object) {
+        if (mFragmentList.contains(object)) return mFragmentList.indexOf(object);
+        else return POSITION_NONE;
+    }
+
+    public void notifyDataSetUpdate(){
+        notifyDataSetChanged();
+    }
+
+    @Override
+    public void destroyItem(ViewGroup container, int position, Object object) {
+        fragmentManager.beginTransaction().remove((Fragment) object).commitNowAllowingStateLoss();
+    }
+
+}