Bump version to 0.18.2 [hotfix release]

Release v0.18.1

.gitignore

@@ -7,7 +7,6 @@
 /app/app.iml
 /.idea
 /*.iml
-gradle.properties
 *~
 .weblate
 *.class

README.md

@@ -81,6 +81,7 @@ NewPipe supports multiple services. Our [docs](https://teamnewpipe.github.io/doc
 * YouTube
 * SoundCloud \[beta\]
 * media.ccc.de \[beta\]
+* PeerTube instances \[beta\]
 
 ## Updates
 When a change to the NewPipe code occurs (due to either adding features or bug fixing), eventually a release will occur. These are in the format x.xx.x . In order to get this new version, you can:

app/build.gradle

@@ -1,4 +1,7 @@
 apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-android-extensions'
+apply plugin: 'kotlin-kapt'
 
 android {
     compileSdkVersion 28
@@ -8,10 +11,10 @@ android {
         applicationId "org.schabi.newpipe"
         minSdkVersion 19
         targetSdkVersion 28
-        versionCode 780
-        versionName "0.17.3"
+        versionCode 820
+        versionName "0.18.2"
 
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
     }
 
@@ -43,37 +46,42 @@ android {
 }
 
 ext {
-    supportLibVersion = '28.0.0'
-    exoPlayerLibVersion = '2.9.6'
-    roomDbLibVersion = '1.1.1'
+    androidxLibVersion = '1.0.0'
+    exoPlayerLibVersion = '2.10.8'
+    roomDbLibVersion = '2.1.0'
     leakCanaryLibVersion = '1.5.4' //1.6.1
-    okHttpLibVersion = '3.12.1'
+    okHttpLibVersion = '3.12.6'
     icepickLibVersion = '3.2.0'
     stethoLibVersion = '1.5.0'
 }
 
 dependencies {
-    androidTestImplementation('com.android.support.test.espresso:espresso-core:3.0.2', {
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+
+    androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', {
         exclude module: 'support-annotations'
     })
 
-    implementation 'com.github.teamnewpipe:NewPipeExtractor:6d504e08836b0b'
+    implementation 'com.github.TeamNewPipe:NewPipeExtractor:ff61e284'
     testImplementation 'junit:junit:4.12'
     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:cardview-v7:${supportLibVersion}"
-    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
+    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation "androidx.legacy:legacy-support-v4:${androidxLibVersion}"
+    implementation "com.google.android.material:material:${androidxLibVersion}"
+    implementation "androidx.recyclerview:recyclerview:${androidxLibVersion}"
+    implementation "androidx.legacy:legacy-preference-v14:${androidxLibVersion}"
+    implementation "androidx.cardview:cardview:${androidxLibVersion}"
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+
+    // Originally in NewPipeExtractor
+    implementation 'com.grack:nanojson:1.1'
+    implementation 'org.jsoup:jsoup:1.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}"
@@ -81,18 +89,19 @@ dependencies {
 
     debugImplementation "com.facebook.stetho:stetho:${stethoLibVersion}"
     debugImplementation "com.facebook.stetho:stetho-urlconnection:${stethoLibVersion}"
-    debugImplementation 'com.android.support:multidex:1.0.3'
+    debugImplementation 'androidx.multidex:multidex:2.0.1'
 
     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 'org.ocpsoft.prettytime:prettytime:4.0.1.Final'
 
-    implementation "android.arch.persistence.room:runtime:${roomDbLibVersion}"
-    implementation "android.arch.persistence.room:rxjava2:${roomDbLibVersion}"
-    annotationProcessor "android.arch.persistence.room:compiler:${roomDbLibVersion}"
+    implementation "androidx.room:room-runtime:${roomDbLibVersion}"
+    implementation "androidx.room:room-rxjava2:${roomDbLibVersion}"
+    kapt "androidx.room:room-compiler:${roomDbLibVersion}"
 
     implementation "frankiesardo:icepick:${icepickLibVersion}"
-    annotationProcessor "frankiesardo:icepick-processor:${icepickLibVersion}"
+    kapt "frankiesardo:icepick-processor:${icepickLibVersion}"
 
     debugImplementation "com.squareup.leakcanary:leakcanary-android:${leakCanaryLibVersion}"
     releaseImplementation "com.squareup.leakcanary:leakcanary-android-no-op:${leakCanaryLibVersion}"

app/proguard-rules.pro

@@ -17,6 +17,9 @@
 #}
 
 -dontobfuscate
+-keep class org.schabi.newpipe.extractor.timeago.patterns.** { *; }
+-keep class org.ocpsoft.prettytime.i18n.** { *; }
+
 -keep class org.mozilla.javascript.** { *; }
 
 -keep class org.mozilla.classfile.ClassFileWriter

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

@@ -1,8 +1,8 @@
 package org.schabi.newpipe.report;
 
 import android.os.Parcel;
-import android.support.test.filters.LargeTest;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.filters.LargeTest;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

app/src/debug/java/org/schabi/newpipe/DebugApp.java

@@ -3,8 +3,8 @@ package org.schabi.newpipe;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.preference.PreferenceManager;
-import android.support.annotation.NonNull;
-import android.support.multidex.MultiDex;
+import androidx.annotation.NonNull;
+import androidx.multidex.MultiDex;
 
 import com.facebook.stetho.Stetho;
 import com.facebook.stetho.okhttp3.StethoInterceptor;
@@ -15,7 +15,7 @@ import com.squareup.leakcanary.LeakCanary;
 import com.squareup.leakcanary.LeakDirectoryProvider;
 import com.squareup.leakcanary.RefWatcher;
 
-import org.schabi.newpipe.extractor.Downloader;
+import org.schabi.newpipe.extractor.downloader.Downloader;
 
 import java.io.File;
 import java.util.concurrent.TimeUnit;
@@ -39,7 +39,7 @@ public class DebugApp extends App {
 
     @Override
     protected Downloader getDownloader() {
-        return org.schabi.newpipe.Downloader.init(new OkHttpClient.Builder()
+        return DownloaderImpl.init(new OkHttpClient.Builder()
                 .addNetworkInterceptor(new StethoInterceptor()));
     }
 

app/src/main/AndroidManifest.xml

@@ -29,7 +29,7 @@
             </intent-filter>
         </activity>
 
-        <receiver android:name="android.support.v4.media.session.MediaButtonReceiver" >
+        <receiver android:name="androidx.media.session.MediaButtonReceiver" >
             <intent-filter>
                 <action android:name="android.intent.action.MEDIA_BUTTON" />
             </intent-filter>
@@ -115,7 +115,7 @@
             android:label="@string/reCaptchaActivity"/>
 
         <provider
-            android:name="android.support.v4.content.FileProvider"
+            android:name="androidx.core.content.FileProvider"
             android:authorities="${applicationId}.provider"
             android:exported="false"
             android:grantUriPermissions="true">
@@ -153,6 +153,7 @@
                 <!-- channel prefix -->
                 <data android:pathPrefix="/channel/"/>
                 <data android:pathPrefix="/user/"/>
+                <data android:pathPrefix="/c/"/>
                 <!-- playlist prefix -->
                 <data android:pathPrefix="/playlist"/>
             </intent-filter>

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

@@ -1,116 +0,0 @@
-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/com/google/android/material/appbar/FlingBehavior.java

@@ -0,0 +1,82 @@
+package com.google.android.material.appbar;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.MotionEvent;
+import android.widget.OverScroller;
+
+import androidx.annotation.Nullable;
+import androidx.coordinatorlayout.widget.CoordinatorLayout;
+
+import java.lang.reflect.Field;
+
+// check this https://stackoverflow.com/questions/56849221/recyclerview-fling-causes-laggy-while-appbarlayout-is-scrolling/57997489#57997489
+public final class FlingBehavior extends AppBarLayout.Behavior {
+
+    public FlingBehavior(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    @Override
+    public boolean onInterceptTouchEvent(CoordinatorLayout parent, AppBarLayout child, MotionEvent ev) {
+        switch (ev.getActionMasked()) {
+            case MotionEvent.ACTION_DOWN:
+                // remove reference to old nested scrolling child
+                resetNestedScrollingChild();
+                // Stop fling when your finger touches the screen
+                stopAppBarLayoutFling();
+                break;
+            default:
+                break;
+        }
+        return super.onInterceptTouchEvent(parent, child, ev);
+    }
+
+    @Nullable
+    private OverScroller getScrollerField() {
+        try {
+            Class<?> headerBehaviorType = this.getClass().getSuperclass().getSuperclass().getSuperclass();
+            if (headerBehaviorType != null) {
+                Field field = headerBehaviorType.getDeclaredField("scroller");
+                field.setAccessible(true);
+                return ((OverScroller) field.get(this));
+            }
+        } catch (NoSuchFieldException | IllegalAccessException e) {
+            // ?
+        }
+        return null;
+    }
+
+    @Nullable
+    private Field getLastNestedScrollingChildRefField() {
+        try {
+            Class<?> headerBehaviorType = this.getClass().getSuperclass().getSuperclass();
+            if (headerBehaviorType != null) {
+                Field field = headerBehaviorType.getDeclaredField("lastNestedScrollingChildRef");
+                field.setAccessible(true);
+                return field;
+            }
+        } catch (NoSuchFieldException e) {
+            // ?
+        }
+        return null;
+    }
+
+    private void resetNestedScrollingChild(){
+        Field field = getLastNestedScrollingChildRefField();
+        if(field != null){
+            try {
+                Object value = field.get(this);
+                if(value != null) field.set(this, null);
+            } catch (IllegalAccessException e) {
+                // ?
+            }
+        }
+    }
+
+    private void stopAppBarLayoutFling() {
+        OverScroller scroller = getScrollerField();
+        if (scroller != null) scroller.forceFinished(true);
+    }
+
+}

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

@@ -6,10 +6,10 @@ 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;
 
+import androidx.annotation.Nullable;
+
 import com.nostra13.universalimageloader.cache.memory.impl.LRULimitedMemoryCache;
 import com.nostra13.universalimageloader.core.ImageLoader;
 import com.nostra13.universalimageloader.core.ImageLoaderConfiguration;
@@ -21,14 +21,15 @@ import org.acra.config.ACRAConfiguration;
 import org.acra.config.ACRAConfigurationException;
 import org.acra.config.ConfigurationBuilder;
 import org.acra.sender.ReportSenderFactory;
-import org.schabi.newpipe.extractor.Downloader;
 import org.schabi.newpipe.extractor.NewPipe;
-import org.schabi.newpipe.extractor.utils.Localization;
+import org.schabi.newpipe.extractor.downloader.Downloader;
 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.ExtractorHelper;
+import org.schabi.newpipe.util.Localization;
+import org.schabi.newpipe.util.ServiceHelper;
 import org.schabi.newpipe.util.StateSaver;
 
 import java.io.IOException;
@@ -96,10 +97,15 @@ public class App extends Application {
         SettingsActivity.initSettings(this);
 
         NewPipe.init(getDownloader(),
-                org.schabi.newpipe.util.Localization.getPreferredExtractorLocal(this));
+                Localization.getPreferredLocalization(this),
+                Localization.getPreferredContentCountry(this));
+        Localization.init();
+
         StateSaver.init(this);
         initNotificationChannel();
 
+        ServiceHelper.initServices(this);
+
         // Initialize image loader
         ImageLoader.getInstance().init(getImageLoaderConfigurations(10, 50));
 
@@ -110,7 +116,7 @@ public class App extends Application {
     }
 
     protected Downloader getDownloader() {
-        return org.schabi.newpipe.Downloader.init(null);
+        return DownloaderImpl.init(null);
     }
 
     private void configureRxJavaErrorHandler() {

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

@@ -2,10 +2,10 @@ package org.schabi.newpipe;
 
 import android.content.Context;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.appcompat.app.AppCompatActivity;
 import android.util.Log;
 import android.view.View;
 
@@ -107,6 +107,7 @@ public abstract class BaseFragment extends Fragment {
         if (DEBUG) Log.d(TAG, "setTitle() called with: title = [" + title + "]");
         if((!useAsFrontPage || mIsVisibleToUser)
             && (activity != null && activity.getSupportActionBar() != null)) {
+            activity.getSupportActionBar().setDisplayShowTitleEnabled(true);
             activity.getSupportActionBar().setTitle(title);
         }
     }

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

@@ -12,8 +12,8 @@ import android.net.ConnectivityManager;
 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 androidx.core.app.NotificationCompat;
+import androidx.core.app.NotificationManagerCompat;
 import android.util.Log;
 
 import org.json.JSONException;
@@ -21,13 +21,9 @@ 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;
@@ -38,7 +34,6 @@ import java.util.concurrent.TimeUnit;
 
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
-import okhttp3.RequestBody;
 import okhttp3.Response;
 
 /**

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

@@ -1,281 +0,0 @@
-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;
-
-
-/*
- * Created by Christian Schabesberger on 28.01.16.
- *
- * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
- * Downloader.java is part of NewPipe.
- *
- * NewPipe is free software: you can redistribute it and/or modify
- * 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 Downloader implements org.schabi.newpipe.extractor.Downloader {
-    public static final String USER_AGENT = "Mozilla/5.0 (Windows NT 6.1; WOW64; rv:43.0) Gecko/20100101 Firefox/43.0";
-
-    private static Downloader instance;
-    private String mCookies;
-    private final OkHttpClient client;
-
-    private Downloader(OkHttpClient.Builder builder) {
-        this.client = builder
-                .readTimeout(30, TimeUnit.SECONDS)
-                //.cache(new Cache(new File(context.getExternalCacheDir(), "okhttp"), 16 * 1024 * 1024))
-                .build();
-    }
-
-    /**
-     * It's recommended to call exactly once in the entire lifetime of the application.
-     *
-     * @param builder if null, default builder will be used
-     */
-    public static Downloader init(@Nullable OkHttpClient.Builder builder) {
-        return instance = new Downloader(builder != null ? builder : new OkHttpClient.Builder());
-    }
-
-    public static Downloader getInstance() {
-        return instance;
-    }
-
-    public String getCookies() {
-        return mCookies;
-    }
-
-    public void setCookies(String cookies) {
-        mCookies = cookies;
-    }
-
-    /**
-     * Get the size of the content that the url is pointing by firing a HEAD request.
-     *
-     * @param url an url pointing to the content
-     * @return the size of the content, in bytes
-     */
-    public long getContentLength(String url) throws IOException {
-        Response response = null;
-        try {
-            final Request request = new Request.Builder()
-                    .head().url(url)
-                    .addHeader("User-Agent", USER_AGENT)
-                    .build();
-            response = client.newCall(request).execute();
-
-            String contentLength = response.header("Content-Length");
-            return contentLength == null ? -1 : Long.parseLong(contentLength);
-        } catch (NumberFormatException e) {
-            throw new IOException("Invalid content length", e);
-        } finally {
-            if (response != null) {
-                response.close();
-            }
-        }
-    }
-
-    /**
-     * Download the text file at the supplied URL as in download(String),
-     * but set the HTTP header field "Accept-Language" to the supplied string.
-     *
-     * @param siteUrl  the URL of the text file to return the contents of
-     * @param 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, Localization localization) throws IOException, ReCaptchaException {
-        Map<String, String> requestProperties = new HashMap<>();
-        requestProperties.put("Accept-Language", localization.getLanguage());
-        return download(siteUrl, requestProperties);
-    }
-
-    /**
-     * Download the text file at the supplied URL as in download(String),
-     * but set the HTTP headers included in the customProperties map.
-     *
-     * @param siteUrl          the URL of the text file to return the contents of
-     * @param customProperties set request header properties
-     * @return the contents of the specified text file
-     * @throws IOException
-     */
-    @Override
-    public String download(String siteUrl, Map<String, String> customProperties) throws IOException, ReCaptchaException {
-        return getBody(siteUrl, customProperties).string();
-    }
-
-    public InputStream stream(String siteUrl) throws IOException {
-        try {
-            return getBody(siteUrl, Collections.emptyMap()).byteStream();
-        } catch (ReCaptchaException e) {
-            throw new IOException(e.getMessage(), e.getCause());
-        }
-    }
-
-    private ResponseBody getBody(String siteUrl, Map<String, String> customProperties) throws IOException, ReCaptchaException {
-        final Request.Builder requestBuilder = new Request.Builder()
-                .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);
-        }
-
-        final Request request = requestBuilder.build();
-        final Response response = client.newCall(request).execute();
-        final ResponseBody body = response.body();
-
-        if (response.code() == 429) {
-            throw new ReCaptchaException("reCaptcha Challenge requested", siteUrl);
-        }
-
-        if (body == null) {
-            response.close();
-            return null;
-        }
-
-        return body;
-    }
-
-    /**
-     * Download (via HTTP) the text file located at the supplied URL, and return its contents.
-     * Primarily intended for downloading web pages.
-     *
-     * @param siteUrl the URL of the text file to download
-     * @return the contents of the specified text file
-     */
-    @Override
-    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", siteUrl);
-        }
-
-        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", siteUrl);
-        }
-
-        if (body == null) {
-            response.close();
-            return null;
-        }
-
-        return new DownloadResponse(body.string(), response.headers().toMultimap());
-    }
-}

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

@@ -0,0 +1,219 @@
+package org.schabi.newpipe;
+
+import android.os.Build;
+import android.text.TextUtils;
+
+import org.schabi.newpipe.extractor.downloader.Downloader;
+import org.schabi.newpipe.extractor.downloader.Request;
+import org.schabi.newpipe.extractor.downloader.Response;
+import org.schabi.newpipe.extractor.exceptions.ReCaptchaException;
+import org.schabi.newpipe.util.TLSSocketFactoryCompat;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.security.KeyManagementException;
+import java.security.KeyStore;
+import java.security.KeyStoreException;
+import java.security.NoSuchAlgorithmException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+
+import javax.net.ssl.SSLSocketFactory;
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.TrustManagerFactory;
+import javax.net.ssl.X509TrustManager;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import okhttp3.CipherSuite;
+import okhttp3.ConnectionSpec;
+import okhttp3.OkHttpClient;
+import okhttp3.RequestBody;
+import okhttp3.ResponseBody;
+
+import static org.schabi.newpipe.MainActivity.DEBUG;
+
+public class DownloaderImpl extends Downloader {
+    public static final String USER_AGENT = "Mozilla/5.0 (Windows NT 6.1; WOW64; rv:43.0) Gecko/20100101 Firefox/43.0";
+
+    private static DownloaderImpl instance;
+    private String mCookies;
+    private OkHttpClient client;
+
+    private DownloaderImpl(OkHttpClient.Builder builder) {
+        if (Build.VERSION.SDK_INT == Build.VERSION_CODES.KITKAT) {
+            enableModernTLS(builder);
+        }
+        this.client = builder
+                .readTimeout(30, TimeUnit.SECONDS)
+                //.cache(new Cache(new File(context.getExternalCacheDir(), "okhttp"), 16 * 1024 * 1024))
+                .build();
+    }
+
+    /**
+     * It's recommended to call exactly once in the entire lifetime of the application.
+     *
+     * @param builder if null, default builder will be used
+     */
+    public static DownloaderImpl init(@Nullable OkHttpClient.Builder builder) {
+        return instance = new DownloaderImpl(builder != null ? builder : new OkHttpClient.Builder());
+    }
+
+    public static DownloaderImpl getInstance() {
+        return instance;
+    }
+
+    public String getCookies() {
+        return mCookies;
+    }
+
+    public void setCookies(String cookies) {
+        mCookies = cookies;
+    }
+
+    /**
+     * Get the size of the content that the url is pointing by firing a HEAD request.
+     *
+     * @param url an url pointing to the content
+     * @return the size of the content, in bytes
+     */
+    public long getContentLength(String url) throws IOException {
+        try {
+            final Response response = head(url);
+            return Long.parseLong(response.getHeader("Content-Length"));
+        } catch (NumberFormatException e) {
+            throw new IOException("Invalid content length", e);
+        } catch (ReCaptchaException e) {
+            throw new IOException(e);
+        }
+    }
+
+    public InputStream stream(String siteUrl) throws IOException {
+        try {
+            final okhttp3.Request.Builder requestBuilder = new okhttp3.Request.Builder()
+                    .method("GET", null).url(siteUrl)
+                    .addHeader("User-Agent", USER_AGENT);
+
+            if (!TextUtils.isEmpty(mCookies)) {
+                requestBuilder.addHeader("Cookie", mCookies);
+            }
+
+            final okhttp3.Request request = requestBuilder.build();
+            final okhttp3.Response response = client.newCall(request).execute();
+            final ResponseBody body = response.body();
+
+            if (response.code() == 429) {
+                throw new ReCaptchaException("reCaptcha Challenge requested", siteUrl);
+            }
+
+            if (body == null) {
+                response.close();
+                return null;
+            }
+
+            return body.byteStream();
+        } catch (ReCaptchaException e) {
+            throw new IOException(e.getMessage(), e.getCause());
+        }
+    }
+
+    @Override
+    public Response execute(@NonNull Request request) throws IOException, ReCaptchaException {
+        final String httpMethod = request.httpMethod();
+        final String url = request.url();
+        final Map<String, List<String>> headers = request.headers();
+        final byte[] dataToSend = request.dataToSend();
+
+        RequestBody requestBody = null;
+        if (dataToSend != null) {
+            requestBody = RequestBody.create(null, dataToSend);
+        }
+
+        final okhttp3.Request.Builder requestBuilder = new okhttp3.Request.Builder()
+                .method(httpMethod, requestBody).url(url)
+                .addHeader("User-Agent", USER_AGENT);
+
+        if (!TextUtils.isEmpty(mCookies)) {
+            requestBuilder.addHeader("Cookie", mCookies);
+        }
+
+        for (Map.Entry<String, List<String>> pair : headers.entrySet()) {
+            final String headerName = pair.getKey();
+            final List<String> headerValueList = pair.getValue();
+
+            if (headerValueList.size() > 1) {
+                requestBuilder.removeHeader(headerName);
+                for (String headerValue : headerValueList) {
+                    requestBuilder.addHeader(headerName, headerValue);
+                }
+            } else if (headerValueList.size() == 1) {
+                requestBuilder.header(headerName, headerValueList.get(0));
+            }
+
+        }
+
+        final okhttp3.Response response = client.newCall(requestBuilder.build()).execute();
+
+        if (response.code() == 429) {
+            response.close();
+
+            throw new ReCaptchaException("reCaptcha Challenge requested", url);
+        }
+
+        final ResponseBody body = response.body();
+        String responseBodyToReturn = null;
+
+        if (body != null) {
+            responseBodyToReturn = body.string();
+        }
+
+        return new Response(response.code(), response.message(), response.headers().toMultimap(), responseBodyToReturn);
+    }
+
+    /**
+     * Enable TLS 1.2 and 1.1 on Android Kitkat. This function is mostly taken from the documentation of
+     * OkHttpClient.Builder.sslSocketFactory(_,_)
+     * <p>
+     * If there is an error, the function will safely fall back to doing nothing and printing the error to the console.
+     *
+     * @param builder The HTTPClient Builder on which TLS is enabled on (will be modified in-place)
+     */
+    private static void enableModernTLS(OkHttpClient.Builder builder) {
+        try {
+            // get the default TrustManager
+            TrustManagerFactory trustManagerFactory = TrustManagerFactory.getInstance(
+                    TrustManagerFactory.getDefaultAlgorithm());
+            trustManagerFactory.init((KeyStore) null);
+            TrustManager[] trustManagers = trustManagerFactory.getTrustManagers();
+            if (trustManagers.length != 1 || !(trustManagers[0] instanceof X509TrustManager)) {
+                throw new IllegalStateException("Unexpected default trust managers:"
+                        + Arrays.toString(trustManagers));
+            }
+            X509TrustManager trustManager = (X509TrustManager) trustManagers[0];
+
+            // insert our own TLSSocketFactory
+            SSLSocketFactory sslSocketFactory = TLSSocketFactoryCompat.getInstance();
+
+            builder.sslSocketFactory(sslSocketFactory, trustManager);
+
+            // This will try to enable all modern CipherSuites(+2 more) that are supported on the device.
+            // Necessary because some servers (e.g. Framatube.org) don't support the old cipher suites.
+            // https://github.com/square/okhttp/issues/4053#issuecomment-402579554
+            List<CipherSuite> cipherSuites = new ArrayList<>();
+            cipherSuites.addAll(ConnectionSpec.MODERN_TLS.cipherSuites());
+            cipherSuites.add(CipherSuite.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA);
+            cipherSuites.add(CipherSuite.TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA);
+            ConnectionSpec legacyTLS = new ConnectionSpec.Builder(ConnectionSpec.MODERN_TLS)
+                    .cipherSuites(cipherSuites.toArray(new CipherSuite[0]))
+                    .build();
+
+            builder.connectionSpecs(Arrays.asList(legacyTLS, ConnectionSpec.CLEARTEXT));
+        } catch (KeyManagementException | NoSuchAlgorithmException | KeyStoreException e) {
+            if (DEBUG) e.printStackTrace();
+        }
+    }
+}

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

@@ -40,7 +40,7 @@ public class ImageDownloader extends BaseImageDownloader {
     }
 
     protected InputStream getStreamFromNetwork(String imageUri, Object extra) throws IOException {
-        final Downloader downloader = (Downloader) NewPipe.getDownloader();
+        final DownloaderImpl downloader = (DownloaderImpl) NewPipe.getDownloader();
         return downloader.stream(imageUri);
     }
 }

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

@@ -28,30 +28,38 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
 import android.preference.PreferenceManager;
-import android.support.annotation.NonNull;
-import android.support.design.widget.NavigationView;
-import android.support.v4.app.Fragment;
-import android.support.v4.view.GravityCompat;
-import android.support.v4.widget.DrawerLayout;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.ActionBarDrawerToggle;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
 import android.util.Log;
-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.Window;
 import android.view.WindowManager;
+import android.widget.AdapterView;
+import android.widget.ArrayAdapter;
 import android.widget.Button;
 import android.widget.ImageView;
+import android.widget.Spinner;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.ActionBarDrawerToggle;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+import androidx.core.view.GravityCompat;
+import androidx.drawerlayout.widget.DrawerLayout;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+
+import com.google.android.material.navigation.NavigationView;
+
 import org.schabi.newpipe.extractor.NewPipe;
+import org.schabi.newpipe.extractor.ServiceList;
 import org.schabi.newpipe.extractor.StreamingService;
 import org.schabi.newpipe.extractor.exceptions.ExtractionException;
+import org.schabi.newpipe.extractor.services.peertube.PeertubeInstance;
 import org.schabi.newpipe.fragments.BackPressable;
 import org.schabi.newpipe.fragments.MainFragment;
 import org.schabi.newpipe.fragments.detail.VideoDetailFragment;
@@ -60,11 +68,16 @@ import org.schabi.newpipe.report.ErrorActivity;
 import org.schabi.newpipe.util.Constants;
 import org.schabi.newpipe.util.KioskTranslator;
 import org.schabi.newpipe.util.NavigationHelper;
+import org.schabi.newpipe.util.PeertubeHelper;
 import org.schabi.newpipe.util.PermissionHelper;
 import org.schabi.newpipe.util.ServiceHelper;
 import org.schabi.newpipe.util.StateSaver;
+import org.schabi.newpipe.util.TLSSocketFactoryCompat;
 import org.schabi.newpipe.util.ThemeHelper;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class MainActivity extends AppCompatActivity {
     private static final String TAG = "MainActivity";
     public static final boolean DEBUG = !BuildConfig.BUILD_TYPE.equals("release");
@@ -73,6 +86,7 @@ public class MainActivity extends AppCompatActivity {
     private DrawerLayout drawer = null;
     private NavigationView drawerItems = null;
     private TextView headerServiceView = null;
+    private Button toggleServiceButton = null;
 
     private boolean servicesShown = false;
     private ImageView serviceArrow;
@@ -95,6 +109,11 @@ public class MainActivity extends AppCompatActivity {
     protected void onCreate(Bundle savedInstanceState) {
         if (DEBUG) Log.d(TAG, "onCreate() called with: savedInstanceState = [" + savedInstanceState + "]");
 
+        // enable TLS1.1/1.2 for kitkat devices, to fix download and play for mediaCCC sources
+        if (Build.VERSION.SDK_INT == Build.VERSION_CODES.KITKAT) {
+            TLSSocketFactoryCompat.setAsDefault();
+        }
+
         ThemeHelper.setTheme(this, ServiceHelper.getSelectedServiceId(this));
 
         super.onCreate(savedInstanceState);
@@ -266,8 +285,8 @@ public class MainActivity extends AppCompatActivity {
 
         serviceArrow = hView.findViewById(R.id.drawer_arrow);
         headerServiceView = hView.findViewById(R.id.drawer_header_service_view);
-        Button action = hView.findViewById(R.id.drawer_header_action_button);
-        action.setOnClickListener(view -> {
+        toggleServiceButton = hView.findViewById(R.id.drawer_header_action_button);
+        toggleServiceButton.setOnClickListener(view -> {
             toggleServices();
         });
     }
@@ -279,6 +298,7 @@ public class MainActivity extends AppCompatActivity {
         drawerItems.getMenu().removeGroup(R.id.menu_tabs_group);
         drawerItems.getMenu().removeGroup(R.id.menu_options_about_group);
 
+
         if(servicesShown) {
             showServices();
         } else {
@@ -297,13 +317,57 @@ public class MainActivity extends AppCompatActivity {
             final String title = s.getServiceInfo().getName() +
                     (ServiceHelper.isBeta(s) ? " (beta)" : "");
 
-            drawerItems.getMenu()
+            MenuItem menuItem = drawerItems.getMenu()
                     .add(R.id.menu_services_group, s.getServiceId(), ORDER, title)
                     .setIcon(ServiceHelper.getIcon(s.getServiceId()));
+
+            // peertube specifics
+            if(s.getServiceId() == 3){
+                enhancePeertubeMenu(s, menuItem);
+            }
         }
         drawerItems.getMenu().getItem(ServiceHelper.getSelectedServiceId(this)).setChecked(true);
     }
 
+    private void enhancePeertubeMenu(StreamingService s, MenuItem menuItem) {
+        PeertubeInstance currentInstace = PeertubeHelper.getCurrentInstance();
+        menuItem.setTitle(currentInstace.getName() + (ServiceHelper.isBeta(s) ? " (beta)" : ""));
+        Spinner spinner = (Spinner) LayoutInflater.from(this).inflate(R.layout.instance_spinner_layout, null);
+        List<PeertubeInstance> instances = PeertubeHelper.getInstanceList(this);
+        List<String> items = new ArrayList<>();
+        int defaultSelect = 0;
+        for(PeertubeInstance instance: instances){
+            items.add(instance.getName());
+            if(instance.getUrl().equals(currentInstace.getUrl())){
+                defaultSelect = items.size()-1;
+            }
+        }
+        ArrayAdapter<String> adapter = new ArrayAdapter<>(this, R.layout.instance_spinner_item, items);
+        adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
+        spinner.setAdapter(adapter);
+        spinner.setSelection(defaultSelect, false);
+        spinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+            @Override
+            public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
+                PeertubeInstance newInstance = instances.get(position);
+                if(newInstance.getUrl().equals(PeertubeHelper.getCurrentInstance().getUrl())) return;
+                PeertubeHelper.selectInstance(newInstance, getApplicationContext());
+                changeService(menuItem);
+                drawer.closeDrawers();
+                new Handler(Looper.getMainLooper()).postDelayed(() -> {
+                    getSupportFragmentManager().popBackStack(null, FragmentManager.POP_BACK_STACK_INCLUSIVE);
+                    recreate();
+                }, 300);
+            }
+
+            @Override
+            public void onNothingSelected(AdapterView<?> parent) {
+
+            }
+        });
+        menuItem.setActionView(spinner);
+    }
+
     private void showTabs() throws ExtractionException {
         serviceArrow.setImageResource(R.drawable.ic_arrow_down_white);
 
@@ -359,11 +423,14 @@ public class MainActivity extends AppCompatActivity {
 
         // close drawer on return, and don't show animation, so its looks like the drawer isn't open
         // when the user returns to MainActivity
-        drawer.closeDrawer(Gravity.START, false);
+        drawer.closeDrawer(GravityCompat.START, false);
         try {
             String selectedServiceName = NewPipe.getService(
                     ServiceHelper.getSelectedServiceId(this)).getServiceInfo().getName();
             headerServiceView.setText(selectedServiceName);
+            headerServiceView.post(() -> headerServiceView.setSelected(true));
+            toggleServiceButton.setContentDescription(
+                    getString(R.string.drawer_header_description) + selectedServiceName);
         } catch (Exception e) {
             ErrorActivity.reportUiError(this, e);
         }
@@ -557,6 +624,14 @@ public class MainActivity extends AppCompatActivity {
         }
     }
 
+    private void updateDrawerHeaderString(String content) {
+        NavigationView navigationView = findViewById(R.id.navigation);
+        View hView =  navigationView.getHeaderView(0);
+        Button action = hView.findViewById(R.id.drawer_header_action_button);
+
+        action.setContentDescription(content);
+    }
+
     private void handleIntent(Intent intent) {
         try {
             if (DEBUG) Log.d(TAG, "handleIntent() called with: intent = [" + intent + "]");

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

@@ -1,8 +1,8 @@
 package org.schabi.newpipe;
 
-import android.arch.persistence.room.Room;
+import androidx.room.Room;
 import android.content.Context;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.schabi.newpipe.database.AppDatabase;
 

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

@@ -5,13 +5,12 @@ import android.content.Intent;
 import android.graphics.Bitmap;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.v4.app.NavUtils;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
+import androidx.core.app.NavUtils;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
 import android.view.MenuItem;
 import android.webkit.CookieManager;
-import android.webkit.ValueCallback;
 import android.webkit.WebSettings;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
@@ -113,7 +112,7 @@ public class ReCaptchaActivity extends AppCompatActivity {
             // find cookies : s_gl & goojf and Add cookies to Downloader
             if (find_access_cookies(cookies)) {
                 // Give cookies to Downloader class
-                Downloader.getInstance().setCookies(mCookies);
+                DownloaderImpl.getInstance().setCookies(mCookies);
 
                 // Closing activity and return to parent
                 setResult(RESULT_OK);

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

@@ -9,12 +9,12 @@ import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
-import android.support.annotation.DrawableRes;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.NotificationCompat;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.DrawableRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.app.NotificationCompat;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AppCompatActivity;
 import android.text.TextUtils;
 import android.view.ContextThemeWrapper;
 import android.view.LayoutInflater;
@@ -26,6 +26,8 @@ import android.widget.RadioButton;
 import android.widget.RadioGroup;
 import android.widget.Toast;
 
+import androidx.fragment.app.FragmentManager;
+
 import org.schabi.newpipe.download.DownloadDialog;
 import org.schabi.newpipe.extractor.Info;
 import org.schabi.newpipe.extractor.NewPipe;
@@ -433,7 +435,7 @@ public class RouterActivity extends AppCompatActivity {
                     int selectedVideoStreamIndex = ListHelper.getDefaultResolutionIndex(this,
                             sortedVideoStreams);
 
-                    android.support.v4.app.FragmentManager fm = getSupportFragmentManager();
+                    FragmentManager fm = getSupportFragmentManager();
                     DownloadDialog downloadDialog = DownloadDialog.newInstance(result);
                     downloadDialog.setVideoStreams(sortedVideoStreams);
                     downloadDialog.setAudioStreams(result.getAudioStreams());

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

@@ -4,13 +4,15 @@ 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 com.google.android.material.tabs.TabLayout;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentPagerAdapter;
+import androidx.fragment.app.FragmentStatePagerAdapter;
+import androidx.viewpager.widget.PagerAdapter;
+import androidx.viewpager.widget.ViewPager;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -36,7 +38,6 @@ public class AboutActivity extends AppCompatActivity {
             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("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),
             new SoftwareComponent("RxAndroid", "2015", "The RxAndroid authors", "https://github.com/ReactiveX/RxAndroid", StandardLicenses.APACHE2),
@@ -45,12 +46,12 @@ public class AboutActivity extends AppCompatActivity {
     };
 
     /**
-     * The {@link android.support.v4.view.PagerAdapter} that will provide
+     * The {@link 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}.
+     * {@link FragmentStatePagerAdapter}.
      */
     private SectionsPagerAdapter mSectionsPagerAdapter;
 

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

@@ -5,8 +5,8 @@ import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
 import android.view.*;
 import android.widget.TextView;
 import org.schabi.newpipe.R;

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

@@ -4,8 +4,8 @@ import android.app.Activity;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.os.AsyncTask;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AlertDialog;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AlertDialog;
 import android.webkit.WebView;
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.util.ThemeHelper;

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

@@ -1,8 +1,8 @@
 package org.schabi.newpipe.database;
 
-import android.arch.persistence.room.Database;
-import android.arch.persistence.room.RoomDatabase;
-import android.arch.persistence.room.TypeConverters;
+import androidx.room.Database;
+import androidx.room.RoomDatabase;
+import androidx.room.TypeConverters;
 
 import org.schabi.newpipe.database.history.dao.SearchHistoryDAO;
 import org.schabi.newpipe.database.history.dao.StreamHistoryDAO;

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

@@ -1,10 +1,10 @@
 package org.schabi.newpipe.database;
 
-import android.arch.persistence.room.Dao;
-import android.arch.persistence.room.Delete;
-import android.arch.persistence.room.Insert;
-import android.arch.persistence.room.OnConflictStrategy;
-import android.arch.persistence.room.Update;
+import androidx.room.Dao;
+import androidx.room.Delete;
+import androidx.room.Insert;
+import androidx.room.OnConflictStrategy;
+import androidx.room.Update;
 
 import java.util.Collection;
 import java.util.List;

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

@@ -1,6 +1,6 @@
 package org.schabi.newpipe.database;
 
-import android.arch.persistence.room.TypeConverter;
+import androidx.room.TypeConverter;
 
 import org.schabi.newpipe.extractor.stream.StreamType;
 

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

@@ -1,8 +1,8 @@
 package org.schabi.newpipe.database;
 
-import android.arch.persistence.db.SupportSQLiteDatabase;
-import android.arch.persistence.room.migration.Migration;
-import android.support.annotation.NonNull;
+import androidx.sqlite.db.SupportSQLiteDatabase;
+import androidx.room.migration.Migration;
+import androidx.annotation.NonNull;
 import android.util.Log;
 
 import org.schabi.newpipe.BuildConfig;

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

@@ -1,8 +1,8 @@
 package org.schabi.newpipe.database.history.dao;
 
-import android.arch.persistence.room.Dao;
-import android.arch.persistence.room.Query;
-import android.support.annotation.Nullable;
+import androidx.room.Dao;
+import androidx.room.Query;
+import androidx.annotation.Nullable;
 
 import org.schabi.newpipe.database.history.model.SearchHistoryEntry;
 

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

@@ -1,9 +1,9 @@
 package org.schabi.newpipe.database.history.dao;
 
 
-import android.arch.persistence.room.Dao;
-import android.arch.persistence.room.Query;
-import android.support.annotation.Nullable;
+import androidx.room.Dao;
+import androidx.room.Query;
+import androidx.annotation.Nullable;
 
 import org.schabi.newpipe.database.history.model.StreamHistoryEntry;
 import org.schabi.newpipe.database.stream.StreamStatisticsEntry;

app/src/main/java/org/schabi/newpipe/database/history/model/SearchHistoryEntry.java

@@ -1,10 +1,10 @@
 package org.schabi.newpipe.database.history.model;
 
-import android.arch.persistence.room.ColumnInfo;
-import android.arch.persistence.room.Entity;
-import android.arch.persistence.room.Ignore;
-import android.arch.persistence.room.Index;
-import android.arch.persistence.room.PrimaryKey;
+import androidx.room.ColumnInfo;
+import androidx.room.Entity;
+import androidx.room.Ignore;
+import androidx.room.Index;
+import androidx.room.PrimaryKey;
 
 import java.util.Date;
 

app/src/main/java/org/schabi/newpipe/database/history/model/StreamHistoryEntity.java

@@ -1,17 +1,17 @@
 package org.schabi.newpipe.database.history.model;
 
-import android.arch.persistence.room.ColumnInfo;
-import android.arch.persistence.room.Entity;
-import android.arch.persistence.room.ForeignKey;
-import android.arch.persistence.room.Ignore;
-import android.arch.persistence.room.Index;
-import android.support.annotation.NonNull;
+import androidx.room.ColumnInfo;
+import androidx.room.Entity;
+import androidx.room.ForeignKey;
+import androidx.room.Ignore;
+import androidx.room.Index;
+import androidx.annotation.NonNull;
 
 import org.schabi.newpipe.database.stream.model.StreamEntity;
 
 import java.util.Date;
 
-import static android.arch.persistence.room.ForeignKey.CASCADE;
+import static androidx.room.ForeignKey.CASCADE;
 import static org.schabi.newpipe.database.history.model.StreamHistoryEntity.STREAM_HISTORY_TABLE;
 import static org.schabi.newpipe.database.history.model.StreamHistoryEntity.JOIN_STREAM_ID;
 import static org.schabi.newpipe.database.history.model.StreamHistoryEntity.STREAM_ACCESS_DATE;

app/src/main/java/org/schabi/newpipe/database/history/model/StreamHistoryEntry.java

@@ -1,6 +1,6 @@
 package org.schabi.newpipe.database.history.model;
 
-import android.arch.persistence.room.ColumnInfo;
+import androidx.room.ColumnInfo;
 
 import org.schabi.newpipe.database.stream.model.StreamEntity;
 import org.schabi.newpipe.extractor.stream.StreamType;

app/src/main/java/org/schabi/newpipe/database/playlist/PlaylistMetadataEntry.java

@@ -1,6 +1,6 @@
 package org.schabi.newpipe.database.playlist;
 
-import android.arch.persistence.room.ColumnInfo;
+import androidx.room.ColumnInfo;
 
 import static org.schabi.newpipe.database.playlist.model.PlaylistEntity.PLAYLIST_ID;
 import static org.schabi.newpipe.database.playlist.model.PlaylistEntity.PLAYLIST_NAME;

app/src/main/java/org/schabi/newpipe/database/playlist/PlaylistStreamEntry.java

@@ -1,6 +1,6 @@
 package org.schabi.newpipe.database.playlist;
 
-import android.arch.persistence.room.ColumnInfo;
+import androidx.room.ColumnInfo;
 
 import org.schabi.newpipe.database.LocalItem;
 import org.schabi.newpipe.database.playlist.model.PlaylistStreamEntity;

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

@@ -1,7 +1,7 @@
 package org.schabi.newpipe.database.playlist.dao;
 
-import android.arch.persistence.room.Dao;
-import android.arch.persistence.room.Query;
+import androidx.room.Dao;
+import androidx.room.Query;
 
 import org.schabi.newpipe.database.BasicDAO;
 import org.schabi.newpipe.database.playlist.model.PlaylistEntity;

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

@@ -1,8 +1,8 @@
 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 androidx.room.Dao;
+import androidx.room.Query;
+import androidx.room.Transaction;
 
 import org.schabi.newpipe.database.BasicDAO;
 import org.schabi.newpipe.database.playlist.model.PlaylistRemoteEntity;

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

@@ -1,8 +1,8 @@
 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 androidx.room.Dao;
+import androidx.room.Query;
+import androidx.room.Transaction;
 
 import org.schabi.newpipe.database.BasicDAO;
 import org.schabi.newpipe.database.playlist.PlaylistMetadataEntry;

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

@@ -1,9 +1,9 @@
 package org.schabi.newpipe.database.playlist.model;
 
-import android.arch.persistence.room.ColumnInfo;
-import android.arch.persistence.room.Entity;
-import android.arch.persistence.room.Index;
-import android.arch.persistence.room.PrimaryKey;
+import androidx.room.ColumnInfo;
+import androidx.room.Entity;
+import androidx.room.Index;
+import androidx.room.PrimaryKey;
 
 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

@@ -1,10 +1,12 @@
 package org.schabi.newpipe.database.playlist.model;
 
-import android.arch.persistence.room.ColumnInfo;
-import android.arch.persistence.room.Entity;
-import android.arch.persistence.room.Ignore;
-import android.arch.persistence.room.Index;
-import android.arch.persistence.room.PrimaryKey;
+import android.text.TextUtils;
+
+import androidx.room.ColumnInfo;
+import androidx.room.Entity;
+import androidx.room.Ignore;
+import androidx.room.Index;
+import androidx.room.PrimaryKey;
 
 import org.schabi.newpipe.database.playlist.PlaylistLocalItem;
 import org.schabi.newpipe.extractor.playlist.PlaylistInfo;
@@ -72,10 +74,16 @@ public class PlaylistRemoteEntity implements PlaylistLocalItem {
 
     @Ignore
     public boolean isIdenticalTo(final PlaylistInfo info) {
-        return getServiceId() == info.getServiceId() && getName().equals(info.getName()) &&
-                getStreamCount() == info.getStreamCount() && getUrl().equals(info.getUrl()) &&
-                getThumbnailUrl().equals(info.getThumbnailUrl()) &&
-                getUploader().equals(info.getUploaderName());
+        /*
+         * Returns boolean comparing the online playlist and the local copy.
+         * (False if info changed such as playlist name or track count)
+         */
+        return getServiceId() == info.getServiceId()
+                && getStreamCount() == info.getStreamCount()
+                && TextUtils.equals(getName(), info.getName())
+                && TextUtils.equals(getUrl(), info.getUrl())
+                && TextUtils.equals(getThumbnailUrl(), info.getThumbnailUrl())
+                && TextUtils.equals(getUploader(), info.getUploaderName());
     }
 
     public long getUid() {

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

@@ -1,13 +1,13 @@
 package org.schabi.newpipe.database.playlist.model;
 
-import android.arch.persistence.room.ColumnInfo;
-import android.arch.persistence.room.Entity;
-import android.arch.persistence.room.ForeignKey;
-import android.arch.persistence.room.Index;
+import androidx.room.ColumnInfo;
+import androidx.room.Entity;
+import androidx.room.ForeignKey;
+import androidx.room.Index;
 
 import org.schabi.newpipe.database.stream.model.StreamEntity;
 
-import static android.arch.persistence.room.ForeignKey.CASCADE;
+import static androidx.room.ForeignKey.CASCADE;
 import static org.schabi.newpipe.database.playlist.model.PlaylistStreamEntity.JOIN_INDEX;
 import static org.schabi.newpipe.database.playlist.model.PlaylistStreamEntity.JOIN_PLAYLIST_ID;
 import static org.schabi.newpipe.database.playlist.model.PlaylistStreamEntity.JOIN_STREAM_ID;

app/src/main/java/org/schabi/newpipe/database/stream/StreamStatisticsEntry.java

@@ -1,6 +1,6 @@
 package org.schabi.newpipe.database.stream;
 
-import android.arch.persistence.room.ColumnInfo;
+import androidx.room.ColumnInfo;
 
 import org.schabi.newpipe.database.LocalItem;
 import org.schabi.newpipe.database.history.model.StreamHistoryEntity;

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

@@ -1,10 +1,10 @@
 package org.schabi.newpipe.database.stream.dao;
 
-import android.arch.persistence.room.Dao;
-import android.arch.persistence.room.Insert;
-import android.arch.persistence.room.OnConflictStrategy;
-import android.arch.persistence.room.Query;
-import android.arch.persistence.room.Transaction;
+import androidx.room.Dao;
+import androidx.room.Insert;
+import androidx.room.OnConflictStrategy;
+import androidx.room.Query;
+import androidx.room.Transaction;
 
 import org.schabi.newpipe.database.BasicDAO;
 import org.schabi.newpipe.database.playlist.model.PlaylistStreamEntity;

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

@@ -1,10 +1,10 @@
 package org.schabi.newpipe.database.stream.dao;
 
-import android.arch.persistence.room.Dao;
-import android.arch.persistence.room.Insert;
-import android.arch.persistence.room.OnConflictStrategy;
-import android.arch.persistence.room.Query;
-import android.arch.persistence.room.Transaction;
+import androidx.room.Dao;
+import androidx.room.Insert;
+import androidx.room.OnConflictStrategy;
+import androidx.room.Query;
+import androidx.room.Transaction;
 
 import org.schabi.newpipe.database.BasicDAO;
 import org.schabi.newpipe.database.stream.model.StreamStateEntity;

app/src/main/java/org/schabi/newpipe/database/stream/model/StreamEntity.java

@@ -1,10 +1,10 @@
 package org.schabi.newpipe.database.stream.model;
 
-import android.arch.persistence.room.ColumnInfo;
-import android.arch.persistence.room.Entity;
-import android.arch.persistence.room.Ignore;
-import android.arch.persistence.room.Index;
-import android.arch.persistence.room.PrimaryKey;
+import androidx.room.ColumnInfo;
+import androidx.room.Entity;
+import androidx.room.Ignore;
+import androidx.room.Index;
+import androidx.room.PrimaryKey;
 
 import org.schabi.newpipe.extractor.stream.StreamInfo;
 import org.schabi.newpipe.extractor.stream.StreamInfoItem;

app/src/main/java/org/schabi/newpipe/database/stream/model/StreamStateEntity.java

@@ -1,14 +1,14 @@
 package org.schabi.newpipe.database.stream.model;
 
 
-import android.arch.persistence.room.ColumnInfo;
-import android.arch.persistence.room.Entity;
-import android.arch.persistence.room.ForeignKey;
-import android.support.annotation.Nullable;
+import androidx.room.ColumnInfo;
+import androidx.room.Entity;
+import androidx.room.ForeignKey;
+import androidx.annotation.Nullable;
 
 import java.util.concurrent.TimeUnit;
 
-import static android.arch.persistence.room.ForeignKey.CASCADE;
+import static androidx.room.ForeignKey.CASCADE;
 import static org.schabi.newpipe.database.stream.model.StreamStateEntity.JOIN_STREAM_ID;
 import static org.schabi.newpipe.database.stream.model.StreamStateEntity.STREAM_STATE_TABLE;
 

app/src/main/java/org/schabi/newpipe/database/subscription/SubscriptionDAO.java

@@ -1,10 +1,10 @@
 package org.schabi.newpipe.database.subscription;
 
-import android.arch.persistence.room.Dao;
-import android.arch.persistence.room.Insert;
-import android.arch.persistence.room.OnConflictStrategy;
-import android.arch.persistence.room.Query;
-import android.arch.persistence.room.Transaction;
+import androidx.room.Dao;
+import androidx.room.Insert;
+import androidx.room.OnConflictStrategy;
+import androidx.room.Query;
+import androidx.room.Transaction;
 
 import org.schabi.newpipe.database.BasicDAO;
 

app/src/main/java/org/schabi/newpipe/database/subscription/SubscriptionEntity.java

@@ -1,11 +1,11 @@
 package org.schabi.newpipe.database.subscription;
 
-import android.arch.persistence.room.ColumnInfo;
-import android.arch.persistence.room.Entity;
-import android.arch.persistence.room.Ignore;
-import android.arch.persistence.room.Index;
-import android.arch.persistence.room.PrimaryKey;
-import android.support.annotation.NonNull;
+import androidx.room.ColumnInfo;
+import androidx.room.Entity;
+import androidx.room.Ignore;
+import androidx.room.Index;
+import androidx.room.PrimaryKey;
+import androidx.annotation.NonNull;
 
 import org.schabi.newpipe.extractor.channel.ChannelInfo;
 import org.schabi.newpipe.extractor.channel.ChannelInfoItem;

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

@@ -3,9 +3,9 @@ package org.schabi.newpipe.download;
 import android.app.FragmentTransaction;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;

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

@@ -11,15 +11,15 @@ import android.os.Bundle;
 import android.os.Environment;
 import android.os.IBinder;
 import android.preference.PreferenceManager;
-import android.support.annotation.IdRes;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.StringRes;
-import android.support.v4.app.DialogFragment;
-import android.support.v4.provider.DocumentFile;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.view.menu.ActionMenuItemView;
-import android.support.v7.widget.Toolbar;
+import androidx.annotation.IdRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
+import androidx.fragment.app.DialogFragment;
+import androidx.documentfile.provider.DocumentFile;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.view.menu.ActionMenuItemView;
+import androidx.appcompat.widget.Toolbar;
 import android.util.Log;
 import android.util.SparseArray;
 import android.view.LayoutInflater;
@@ -38,14 +38,15 @@ import com.nononsenseapps.filepicker.Utils;
 
 import org.schabi.newpipe.MainActivity;
 import org.schabi.newpipe.R;
+import org.schabi.newpipe.RouterActivity;
 import org.schabi.newpipe.extractor.MediaFormat;
 import org.schabi.newpipe.extractor.NewPipe;
+import org.schabi.newpipe.extractor.localization.Localization;
 import org.schabi.newpipe.extractor.stream.AudioStream;
 import org.schabi.newpipe.extractor.stream.Stream;
 import org.schabi.newpipe.extractor.stream.StreamInfo;
 import org.schabi.newpipe.extractor.stream.SubtitlesStream;
 import org.schabi.newpipe.extractor.stream.VideoStream;
-import org.schabi.newpipe.extractor.utils.Localization;
 import org.schabi.newpipe.report.ErrorActivity;
 import org.schabi.newpipe.report.UserAction;
 import org.schabi.newpipe.settings.NewPipeSettings;
@@ -68,6 +69,7 @@ import java.util.Locale;
 import icepick.Icepick;
 import icepick.State;
 import io.reactivex.disposables.CompositeDisposable;
+import us.shandian.giga.get.MissionRecoveryInfo;
 import us.shandian.giga.io.StoredDirectoryHelper;
 import us.shandian.giga.io.StoredFileHelper;
 import us.shandian.giga.postprocessing.Postprocessing;
@@ -359,6 +361,7 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
         toolbar.setNavigationIcon(isLight ? R.drawable.ic_arrow_back_black_24dp : R.drawable.ic_arrow_back_white_24dp);
         toolbar.inflateMenu(R.menu.dialog_url);
         toolbar.setNavigationOnClickListener(v -> getDialog().dismiss());
+        toolbar.setNavigationContentDescription(R.string.cancel);
 
         okButton = toolbar.findViewById(R.id.okay);
         okButton.setEnabled(false);// disable until the download service connection is done
@@ -366,6 +369,9 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
         toolbar.setOnMenuItemClickListener(item -> {
             if (item.getItemId() == R.id.okay) {
                 prepareSelectedDownload();
+                if (getActivity() instanceof RouterActivity) {
+                    getActivity().finish();
+                }
                 return true;
             }
             return false;
@@ -487,35 +493,24 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
     }
 
     private int getSubtitleIndexBy(List<SubtitlesStream> streams) {
-        Localization loc = NewPipe.getPreferredLocalization();
+        final Localization preferredLocalization = NewPipe.getPreferredLocalization();
 
+        int candidate = 0;
         for (int i = 0; i < streams.size(); i++) {
-            Locale streamLocale = streams.get(i).getLocale();
-            String tag = streamLocale.getLanguage().concat("-").concat(streamLocale.getCountry());
-            if (tag.equalsIgnoreCase(loc.getLanguage())) {
-                return i;
+            final Locale streamLocale = streams.get(i).getLocale();
+
+            final boolean languageEquals = streamLocale.getLanguage() != null && preferredLocalization.getLanguageCode() != null &&
+                    streamLocale.getLanguage().equals(new Locale(preferredLocalization.getLanguageCode()).getLanguage());
+            final boolean countryEquals = streamLocale.getCountry() != null && streamLocale.getCountry().equals(preferredLocalization.getCountryCode());
+
+            if (languageEquals) {
+                if (countryEquals) return i;
+
+                candidate = i;
             }
         }
 
-        // fallback
-        // 1st loop match country & language
-        // 2nd loop match language only
-        int index = loc.getLanguage().indexOf("-");
-        String lang = index > 0 ? loc.getLanguage().substring(0, index) : loc.getLanguage();
-
-        for (int j = 0; j < 2; j++) {
-            for (int i = 0; i < streams.size(); i++) {
-                Locale streamLocale = streams.get(i).getLocale();
-
-                if (streamLocale.getLanguage().equalsIgnoreCase(lang)) {
-                    if (j > 0 || streamLocale.getCountry().equalsIgnoreCase(loc.getCountry())) {
-                        return i;
-                    }
-                }
-            }
-        }
-
-        return 0;
+        return candidate;
     }
 
     StoredDirectoryHelper mainStorageAudio = null;
@@ -564,8 +559,16 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
             case R.id.audio_button:
                 mainStorage = mainStorageAudio;
                 format = audioStreamsAdapter.getItem(selectedAudioIndex).getFormat();
-                mime = format.mimeType;
-                filename += format.suffix;
+                switch(format) {
+                    case WEBMA_OPUS:
+                        mime = "audio/ogg";
+                        filename += "opus";
+                        break;
+                    default:
+                        mime = format.mimeType;
+                        filename += format.suffix;
+                        break;
+                }
                 break;
             case R.id.video_button:
                 mainStorage = mainStorageVideo;
@@ -772,12 +775,13 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
         }
 
         Stream selectedStream;
+        Stream secondaryStream = null;
         char kind;
         int threads = threadsSeekBar.getProgress() + 1;
         String[] urls;
+        MissionRecoveryInfo[] recoveryInfo;
         String psName = null;
         String[] psArgs = null;
-        String secondaryStreamUrl = null;
         long nearLength = 0;
 
         // more download logic: select muxer, subtitle converter, etc.
@@ -788,18 +792,20 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
 
                 if (selectedStream.getFormat() == MediaFormat.M4A) {
                     psName = Postprocessing.ALGORITHM_M4A_NO_DASH;
+                } else if (selectedStream.getFormat() == MediaFormat.WEBMA_OPUS) {
+                    psName = Postprocessing.ALGORITHM_OGG_FROM_WEBM_DEMUXER;
                 }
                 break;
             case R.id.video_button:
                 kind = 'v';
                 selectedStream = videoStreamsAdapter.getItem(selectedVideoIndex);
 
-                SecondaryStreamHelper<AudioStream> secondaryStream = videoStreamsAdapter
+                SecondaryStreamHelper<AudioStream> secondary = videoStreamsAdapter
                         .getAllSecondary()
                         .get(wrappedVideoStreams.getStreamsList().indexOf(selectedStream));
 
-                if (secondaryStream != null) {
-                    secondaryStreamUrl = secondaryStream.getStream().getUrl();
+                if (secondary != null) {
+                    secondaryStream = secondary.getStream();
 
                     if (selectedStream.getFormat() == MediaFormat.MPEG_4)
                         psName = Postprocessing.ALGORITHM_MP4_FROM_DASH_MUXER;
@@ -811,8 +817,8 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
 
                     // set nearLength, only, if both sizes are fetched or known. This probably
                     // does not work on slow networks but is later updated in the downloader
-                    if (secondaryStream.getSizeInBytes() > 0 && videoSize > 0) {
-                        nearLength = secondaryStream.getSizeInBytes() + videoSize;
+                    if (secondary.getSizeInBytes() > 0 && videoSize > 0) {
+                        nearLength = secondary.getSizeInBytes() + videoSize;
                     }
                 }
                 break;
@@ -834,13 +840,25 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
                 return;
         }
 
-        if (secondaryStreamUrl == null) {
-            urls = new String[]{selectedStream.getUrl()};
+        if (secondaryStream == null) {
+            urls = new String[]{
+                    selectedStream.getUrl()
+            };
+            recoveryInfo = new MissionRecoveryInfo[]{
+                    new MissionRecoveryInfo(selectedStream)
+            };
         } else {
-            urls = new String[]{selectedStream.getUrl(), secondaryStreamUrl};
+            urls = new String[]{
+                    selectedStream.getUrl(), secondaryStream.getUrl()
+            };
+            recoveryInfo = new MissionRecoveryInfo[]{
+                    new MissionRecoveryInfo(selectedStream), new MissionRecoveryInfo(secondaryStream)
+            };
         }
 
-        DownloadManagerService.startMission(context, urls, storage, kind, threads, currentInfo.getUrl(), psName, psArgs, nearLength);
+        DownloadManagerService.startMission(
+                context, urls, storage, kind, threads, currentInfo.getUrl(), psName, psArgs, nearLength, recoveryInfo
+        );
 
         dismiss();
     }

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

@@ -1,10 +1,9 @@
 package org.schabi.newpipe.fragments;
 
 import android.content.Intent;
-import android.net.Uri;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.annotation.StringRes;
+import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
 import android.util.Log;
 import android.view.View;
 import android.widget.Button;

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

@@ -1,7 +1,7 @@
 package org.schabi.newpipe.fragments;
 
 import android.os.Bundle;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

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

@@ -1,7 +1,7 @@
 package org.schabi.newpipe.fragments;
 
 import android.os.Bundle;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

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

@@ -1,15 +1,7 @@
 package org.schabi.newpipe.fragments;
 
+import android.content.Context;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-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.ActionBar;
-import android.support.v7.app.AppCompatActivity;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -18,6 +10,17 @@ import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentStatePagerAdapter;
+import androidx.viewpager.widget.ViewPager;
+
+import com.google.android.material.tabs.TabLayout;
+
 import org.schabi.newpipe.BaseFragment;
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.extractor.exceptions.ExtractionException;
@@ -27,6 +30,7 @@ import org.schabi.newpipe.settings.tabs.Tab;
 import org.schabi.newpipe.settings.tabs.TabsManager;
 import org.schabi.newpipe.util.NavigationHelper;
 import org.schabi.newpipe.util.ServiceHelper;
+import org.schabi.newpipe.views.ScrollableTabLayout;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -34,7 +38,7 @@ import java.util.List;
 public class MainFragment extends BaseFragment implements TabLayout.OnTabSelectedListener {
     private ViewPager viewPager;
     private SelectedTabsPagerAdapter pagerAdapter;
-    private TabLayout tabLayout;
+    private ScrollableTabLayout tabLayout;
 
     private List<Tab> tabsList = new ArrayList<>();
     private TabsManager tabsManager;
@@ -50,32 +54,19 @@ public class MainFragment extends BaseFragment implements TabLayout.OnTabSelecte
         super.onCreate(savedInstanceState);
         setHasOptionsMenu(true);
 
-        destroyOldFragments();
-
         tabsManager = TabsManager.getManager(activity);
         tabsManager.setSavedTabsListener(() -> {
             if (DEBUG) {
                 Log.d(TAG, "TabsManager.SavedTabsChangeListener: onTabsChanged called, isResumed = " + isResumed());
             }
             if (isResumed()) {
-                updateTabs();
+                setupTabs();
             } else {
                 hasTabsChanged = true;
             }
         });
     }
 
-    private void destroyOldFragments() {
-        for (Fragment fragment : getChildFragmentManager().getFragments()) {
-            if (fragment != null) {
-                getChildFragmentManager()
-                        .beginTransaction()
-                        .remove(fragment)
-                        .commitNowAllowingStateLoss();
-            }
-        }
-    }
-
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
         return inflater.inflate(R.layout.fragment_main, container, false);
@@ -88,31 +79,24 @@ public class MainFragment extends BaseFragment implements TabLayout.OnTabSelecte
         tabLayout = rootView.findViewById(R.id.main_tab_layout);
         viewPager = rootView.findViewById(R.id.pager);
 
-        /*  Nested fragment, use child fragment here to maintain backstack in view pager. */
-        pagerAdapter = new SelectedTabsPagerAdapter(getChildFragmentManager());
-        viewPager.setAdapter(pagerAdapter);
-
         tabLayout.setupWithViewPager(viewPager);
         tabLayout.addOnTabSelectedListener(this);
-        updateTabs();
+
+        setupTabs();
     }
 
     @Override
     public void onResume() {
         super.onResume();
 
-        if (hasTabsChanged) {
-            hasTabsChanged = false;
-            updateTabs();
-        }
+        if (hasTabsChanged) setupTabs();
     }
 
     @Override
     public void onDestroy() {
         super.onDestroy();
         tabsManager.unsetSavedTabsListener();
-        pagerAdapter = null;
-        viewPager.setAdapter(pagerAdapter);
+        if (viewPager != null) viewPager.setAdapter(null);
     }
 
     /*//////////////////////////////////////////////////////////////////////////
@@ -152,33 +136,42 @@ public class MainFragment extends BaseFragment implements TabLayout.OnTabSelecte
     // Tabs
     //////////////////////////////////////////////////////////////////////////*/
 
-    public void updateTabs() {
+    public void setupTabs() {
         tabsList.clear();
         tabsList.addAll(tabsManager.getTabs());
-        pagerAdapter.notifyDataSetChanged();
 
-        viewPager.setOffscreenPageLimit(pagerAdapter.getCount());
-        updateTabsIcon();
-        updateCurrentTitle();
+        if (pagerAdapter == null || !pagerAdapter.sameTabs(tabsList)) {
+            pagerAdapter = new SelectedTabsPagerAdapter(requireContext(), getChildFragmentManager(), tabsList);
+        }
+        // Clear previous tabs/fragments and set new adapter
+        viewPager.setAdapter(pagerAdapter);
+        viewPager.setOffscreenPageLimit(tabsList.size());
+
+        updateTabsIconAndDescription();
+        updateTitleForTab(viewPager.getCurrentItem());
+
+        hasTabsChanged = false;
     }
 
-    private void updateTabsIcon() {
+    private void updateTabsIconAndDescription() {
         for (int i = 0; i < tabsList.size(); i++) {
             final TabLayout.Tab tabToSet = tabLayout.getTabAt(i);
             if (tabToSet != null) {
-                tabToSet.setIcon(tabsList.get(i).getTabIconRes(activity));
+                final Tab tab = tabsList.get(i);
+                tabToSet.setIcon(tab.getTabIconRes(requireContext()));
+                tabToSet.setContentDescription(tab.getTabName(requireContext()));
             }
         }
     }
 
-    private void updateCurrentTitle() {
-        setTitle(tabsList.get(viewPager.getCurrentItem()).getTabName(requireContext()));
+    private void updateTitleForTab(int tabPosition) {
+        setTitle(tabsList.get(tabPosition).getTabName(requireContext()));
     }
 
     @Override
     public void onTabSelected(TabLayout.Tab selectedTab) {
         if (DEBUG) Log.d(TAG, "onTabSelected() called with: selectedTab = [" + selectedTab + "]");
-        updateCurrentTitle();
+        updateTitleForTab(selectedTab.getPosition());
     }
 
     @Override
@@ -188,29 +181,33 @@ public class MainFragment extends BaseFragment implements TabLayout.OnTabSelecte
     @Override
     public void onTabReselected(TabLayout.Tab tab) {
         if (DEBUG) Log.d(TAG, "onTabReselected() called with: tab = [" + tab + "]");
-        updateCurrentTitle();
+        updateTitleForTab(tab.getPosition());
     }
 
-    private class SelectedTabsPagerAdapter extends FragmentPagerAdapter {
+    private static class SelectedTabsPagerAdapter extends FragmentStatePagerAdapter {
+        private final Context context;
+        private final List<Tab> internalTabsList;
 
-        private SelectedTabsPagerAdapter(FragmentManager fragmentManager) {
-            super(fragmentManager);
+        private SelectedTabsPagerAdapter(Context context, FragmentManager fragmentManager, List<Tab> tabsList) {
+            super(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT);
+            this.context = context;
+            this.internalTabsList = new ArrayList<>(tabsList);
         }
 
         @Override
         public Fragment getItem(int position) {
-            final Tab tab = tabsList.get(position);
+            final Tab tab = internalTabsList.get(position);
 
             Throwable throwable = null;
             Fragment fragment = null;
             try {
-                fragment = tab.getFragment();
+                fragment = tab.getFragment(context);
             } catch (ExtractionException e) {
                 throwable = e;
             }
 
             if (throwable != null) {
-                ErrorActivity.reportError(activity, throwable, activity.getClass(), null,
+                ErrorActivity.reportError(context, throwable, null, null,
                         ErrorActivity.ErrorInfo.make(UserAction.UI_ERROR, "none", "", R.string.app_ui_crash));
                 return new BlankFragment();
             }
@@ -231,15 +228,11 @@ public class MainFragment extends BaseFragment implements TabLayout.OnTabSelecte
 
         @Override
         public int getCount() {
-            return tabsList.size();
+            return internalTabsList.size();
         }
 
-        @Override
-        public void destroyItem(ViewGroup container, int position, Object object) {
-            getChildFragmentManager()
-                    .beginTransaction()
-                    .remove((Fragment) object)
-                    .commitNowAllowingStateLoss();
+        public boolean sameTabs(List<Tab> tabsToCompare) {
+            return internalTabsList.equals(tabsToCompare);
         }
     }
 }

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

@@ -1,8 +1,8 @@
 package org.schabi.newpipe.fragments;
 
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.StaggeredGridLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.recyclerview.widget.StaggeredGridLayoutManager;
 
 /**
  * Recycler view scroll listener which calls the method {@link #onScrolledDown(RecyclerView)}

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

@@ -1,9 +1,9 @@
 package org.schabi.newpipe.fragments.detail;
 
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentPagerAdapter;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentPagerAdapter;
 import android.view.ViewGroup;
 
 import java.util.ArrayList;

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

@@ -9,17 +9,17 @@ import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
-import android.support.annotation.DrawableRes;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.design.widget.AppBarLayout;
-import android.support.design.widget.TabLayout;
-import android.support.v4.app.Fragment;
-import android.support.v4.content.ContextCompat;
-import android.support.v4.view.ViewPager;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.DrawableRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import com.google.android.material.appbar.AppBarLayout;
+import com.google.android.material.tabs.TabLayout;
+import androidx.fragment.app.Fragment;
+import androidx.core.content.ContextCompat;
+import androidx.viewpager.widget.ViewPager;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AppCompatActivity;
 import android.text.Html;
 import android.text.Spanned;
 import android.text.TextUtils;
@@ -1067,7 +1067,13 @@ public class VideoDetailFragment
         uploaderThumb.setImageDrawable(ContextCompat.getDrawable(activity, R.drawable.buddy));
 
         if (info.getViewCount() >= 0) {
-            videoCountView.setText(Localization.localizeViewCount(activity, info.getViewCount()));
+            if (info.getStreamType().equals(StreamType.AUDIO_LIVE_STREAM)) {
+                videoCountView.setText(Localization.listeningCount(activity, info.getViewCount()));
+            } else if (info.getStreamType().equals(StreamType.LIVE_STREAM)) {
+                videoCountView.setText(Localization.watchingCount(activity, info.getViewCount()));
+            } else {
+                videoCountView.setText(Localization.localizeViewCount(activity, info.getViewCount()));
+            }
             videoCountView.setVisibility(View.VISIBLE);
         } else {
             videoCountView.setVisibility(View.GONE);
@@ -1120,9 +1126,15 @@ public class VideoDetailFragment
         videoTitleToggleArrow.setVisibility(View.VISIBLE);
         videoTitleToggleArrow.setImageResource(R.drawable.arrow_down);
         videoDescriptionRootLayout.setVisibility(View.GONE);
-        if (!TextUtils.isEmpty(info.getUploadDate())) {
-            videoUploadDateView.setText(Localization.localizeDate(activity, info.getUploadDate()));
+
+        if (info.getUploadDate() != null) {
+            videoUploadDateView.setText(Localization.localizeUploadDate(activity, info.getUploadDate().date().getTime()));
+            videoUploadDateView.setVisibility(View.VISIBLE);
+        } else {
+            videoUploadDateView.setText(null);
+            videoUploadDateView.setVisibility(View.GONE);
         }
+
         prepareDescription(info.getDescription());
         updateProgressInfo(info);
 

app/src/main/java/org/schabi/newpipe/fragments/list/BaseListFragment.java

@@ -7,12 +7,12 @@ import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
-import android.support.annotation.NonNull;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuInflater;

app/src/main/java/org/schabi/newpipe/fragments/list/BaseListInfoFragment.java

@@ -1,11 +1,12 @@
 package org.schabi.newpipe.fragments.list;
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.View;
 
+import androidx.annotation.NonNull;
+
 import org.schabi.newpipe.extractor.ListExtractor;
 import org.schabi.newpipe.extractor.ListInfo;
 import org.schabi.newpipe.util.Constants;
@@ -61,8 +62,10 @@ public abstract class BaseListInfoFragment<I extends ListInfo>
     @Override
     public void onDestroy() {
         super.onDestroy();
-        if (currentWorker != null) currentWorker.dispose();
-        currentWorker = null;
+        if (currentWorker != null) {
+            currentWorker.dispose();
+            currentWorker = null;
+        }
     }
 
     /*//////////////////////////////////////////////////////////////////////////
@@ -108,6 +111,8 @@ public abstract class BaseListInfoFragment<I extends ListInfo>
         super.startLoading(forceLoad);
 
         showListFooter(false);
+        infoListAdapter.clearStreamItemList();
+
         currentInfo = null;
         if (currentWorker != null) currentWorker.dispose();
         currentWorker = loadResult(forceLoad)

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

@@ -4,10 +4,10 @@ import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.app.ActionBar;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.content.ContextCompat;
+import androidx.appcompat.app.ActionBar;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -29,6 +29,7 @@ import org.schabi.newpipe.extractor.InfoItem;
 import org.schabi.newpipe.extractor.ListExtractor;
 import org.schabi.newpipe.extractor.NewPipe;
 import org.schabi.newpipe.extractor.channel.ChannelInfo;
+import org.schabi.newpipe.extractor.exceptions.ContentNotAvailableException;
 import org.schabi.newpipe.extractor.exceptions.ExtractionException;
 import org.schabi.newpipe.extractor.stream.StreamInfoItem;
 import org.schabi.newpipe.fragments.list.BaseListInfoFragment;
@@ -98,7 +99,7 @@ public class ChannelFragment extends BaseListInfoFragment<ChannelInfo> {
     @Override
     public void setUserVisibleHint(boolean isVisibleToUser) {
         super.setUserVisibleHint(isVisibleToUser);
-        if(activity != null
+        if (activity != null
                 && useAsFrontPage
                 && isVisibleToUser) {
             setTitle(currentInfo != null ? currentInfo.getName() : name);
@@ -152,7 +153,7 @@ public class ChannelFragment extends BaseListInfoFragment<ChannelInfo> {
     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
         super.onCreateOptionsMenu(menu, inflater);
         ActionBar supportActionBar = activity.getSupportActionBar();
-        if(useAsFrontPage && supportActionBar != null) {
+        if (useAsFrontPage && supportActionBar != null) {
             supportActionBar.setDisplayHomeAsUpEnabled(false);
         } else {
             inflater.inflate(R.menu.menu_channel, menu);
@@ -165,7 +166,7 @@ public class ChannelFragment extends BaseListInfoFragment<ChannelInfo> {
 
     private void openRssFeed() {
         final ChannelInfo info = currentInfo;
-        if(info != null) {
+        if (info != null) {
             Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(info.getFeedUrl()));
             startActivity(intent);
         }
@@ -178,10 +179,14 @@ public class ChannelFragment extends BaseListInfoFragment<ChannelInfo> {
                 openRssFeed();
                 break;
             case R.id.menu_item_openInBrowser:
-                ShareUtils.openUrlInBrowser(this.getContext(), currentInfo.getOriginalUrl());
+                if (currentInfo != null) {
+                    ShareUtils.openUrlInBrowser(this.getContext(), currentInfo.getOriginalUrl());
+                }
                 break;
             case R.id.menu_item_share:
-                ShareUtils.shareUrl(this.getContext(), name, currentInfo.getOriginalUrl());
+                if (currentInfo != null) {
+                    ShareUtils.shareUrl(this.getContext(), name, currentInfo.getOriginalUrl());
+                }
                 break;
             default:
                 return super.onOptionsItemSelected(item);
@@ -218,7 +223,7 @@ public class ChannelFragment extends BaseListInfoFragment<ChannelInfo> {
                 .debounce(100, TimeUnit.MILLISECONDS)
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe((List<SubscriptionEntity> subscriptionEntities) ->
-                        updateSubscribeButton(!subscriptionEntities.isEmpty())
+                                updateSubscribeButton(!subscriptionEntities.isEmpty())
                         , onError));
 
     }
@@ -359,9 +364,9 @@ public class ChannelFragment extends BaseListInfoFragment<ChannelInfo> {
 
         headerRootLayout.setVisibility(View.VISIBLE);
         imageLoader.displayImage(result.getBannerUrl(), headerChannelBanner,
-        		ImageDisplayConstants.DISPLAY_BANNER_OPTIONS);
+                ImageDisplayConstants.DISPLAY_BANNER_OPTIONS);
         imageLoader.displayImage(result.getAvatarUrl(), headerAvatarView,
-        		ImageDisplayConstants.DISPLAY_AVATAR_OPTIONS);
+                ImageDisplayConstants.DISPLAY_AVATAR_OPTIONS);
 
         headerSubscribersTextView.setVisibility(View.VISIBLE);
         if (result.getSubscriberCount() >= 0) {
@@ -397,8 +402,8 @@ public class ChannelFragment extends BaseListInfoFragment<ChannelInfo> {
 
     private PlayQueue getPlayQueue(final int index) {
         final List<StreamInfoItem> streamItems = new ArrayList<>();
-        for(InfoItem i : infoListAdapter.getItemsList()) {
-            if(i instanceof StreamInfoItem) {
+        for (InfoItem i : infoListAdapter.getItemsList()) {
+            if (i instanceof StreamInfoItem) {
                 streamItems.add((StreamInfoItem) i);
             }
         }
@@ -432,12 +437,16 @@ public class ChannelFragment extends BaseListInfoFragment<ChannelInfo> {
     protected boolean onError(Throwable exception) {
         if (super.onError(exception)) return true;
 
-        int errorId = exception instanceof ExtractionException ? R.string.parsing_error : R.string.general_error;
-        onUnrecoverableError(exception,
-                UserAction.REQUESTED_CHANNEL,
-                NewPipe.getNameOfService(serviceId),
-                url,
-                errorId);
+        if (exception instanceof ContentNotAvailableException) {
+            showError(getString(R.string.content_not_available), false);
+        } else {
+            int errorId = exception instanceof ExtractionException ? R.string.parsing_error : R.string.general_error;
+            onUnrecoverableError(exception,
+                    UserAction.REQUESTED_CHANNEL,
+                    NewPipe.getNameOfService(serviceId),
+                    url,
+                    errorId);
+        }
         return true;
     }
 

app/src/main/java/org/schabi/newpipe/fragments/list/comments/CommentsFragment.java

@@ -2,8 +2,8 @@ package org.schabi.newpipe.fragments.list.comments;
 
 import android.content.Context;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -93,7 +93,7 @@ public class CommentsFragment extends BaseListInfoFragment<CommentsInfo> {
     public void handleResult(@NonNull CommentsInfo result) {
         super.handleResult(result);
 
-        AnimationUtils.slideUp(getView(),120, 96, 0.06f);
+        AnimationUtils.slideUp(getView(),120, 150, 0.06f);
 
         if (!result.getErrors().isEmpty()) {
             showSnackBarError(result.getErrors(), UserAction.REQUESTED_COMMENTS, NewPipe.getNameOfService(result.getServiceId()), result.getUrl(), 0);

app/src/main/java/org/schabi/newpipe/fragments/list/kiosk/DefaultKioskFragment.java

@@ -0,0 +1,51 @@
+package org.schabi.newpipe.fragments.list.kiosk;
+
+import android.os.Bundle;
+
+import org.schabi.newpipe.extractor.NewPipe;
+import org.schabi.newpipe.extractor.exceptions.ExtractionException;
+import org.schabi.newpipe.extractor.kiosk.KioskList;
+import org.schabi.newpipe.report.UserAction;
+import org.schabi.newpipe.util.KioskTranslator;
+import org.schabi.newpipe.util.ServiceHelper;
+
+public class DefaultKioskFragment extends KioskFragment {
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        if (serviceId < 0) {
+            updateSelectedDefaultKiosk();
+        }
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+
+        if (serviceId != ServiceHelper.getSelectedServiceId(requireContext())) {
+            if (currentWorker != null) currentWorker.dispose();
+            updateSelectedDefaultKiosk();
+            reloadContent();
+        }
+    }
+
+    private void updateSelectedDefaultKiosk() {
+        try {
+            serviceId = ServiceHelper.getSelectedServiceId(requireContext());
+
+            final KioskList kioskList = NewPipe.getService(serviceId).getKioskList();
+            kioskId = kioskList.getDefaultKioskId();
+            url = kioskList.getListLinkHandlerFactoryByType(kioskId).fromId(kioskId).getUrl();
+
+            kioskTranslatedName = KioskTranslator.getTranslatedKioskName(kioskId, requireContext());
+            name = kioskTranslatedName;
+
+            currentInfo = null;
+            currentNextPageUrl = null;
+        } catch (ExtractionException e) {
+            onUnrecoverableError(e, UserAction.REQUESTED_KIOSK, "none", "Loading default kiosk from selected service", 0);
+        }
+    }
+}

app/src/main/java/org/schabi/newpipe/fragments/list/kiosk/KioskFragment.java

@@ -1,9 +1,11 @@
 package org.schabi.newpipe.fragments.list.kiosk;
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.app.ActionBar;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.ActionBar;
+
+import android.preference.PreferenceManager;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -17,10 +19,12 @@ import org.schabi.newpipe.extractor.StreamingService;
 import org.schabi.newpipe.extractor.exceptions.ExtractionException;
 import org.schabi.newpipe.extractor.kiosk.KioskInfo;
 import org.schabi.newpipe.extractor.linkhandler.ListLinkHandlerFactory;
+import org.schabi.newpipe.extractor.localization.ContentCountry;
 import org.schabi.newpipe.fragments.list.BaseListInfoFragment;
 import org.schabi.newpipe.report.UserAction;
 import org.schabi.newpipe.util.ExtractorHelper;
 import org.schabi.newpipe.util.KioskTranslator;
+import org.schabi.newpipe.util.Localization;
 
 import icepick.State;
 import io.reactivex.Single;
@@ -52,6 +56,8 @@ public class KioskFragment extends BaseListInfoFragment<KioskInfo> {
     @State
     protected String kioskId = "";
     protected String kioskTranslatedName;
+    @State
+    protected ContentCountry contentCountry;
 
 
     /*//////////////////////////////////////////////////////////////////////////
@@ -87,6 +93,7 @@ public class KioskFragment extends BaseListInfoFragment<KioskInfo> {
 
         kioskTranslatedName = KioskTranslator.getTranslatedKioskName(kioskId, activity);
         name = kioskTranslatedName;
+        contentCountry = Localization.getPreferredContentCountry(requireContext());
     }
 
     @Override
@@ -108,6 +115,15 @@ public class KioskFragment extends BaseListInfoFragment<KioskInfo> {
         return inflater.inflate(R.layout.fragment_kiosk, container, false);
     }
 
+    @Override
+    public void onResume() {
+        super.onResume();
+
+        if (!Localization.getPreferredContentCountry(requireContext()).equals(contentCountry)) {
+            reloadContent();
+        }
+    }
+
     /*//////////////////////////////////////////////////////////////////////////
     // Menu
     //////////////////////////////////////////////////////////////////////////*/
@@ -127,6 +143,7 @@ public class KioskFragment extends BaseListInfoFragment<KioskInfo> {
 
     @Override
     public Single<KioskInfo> loadResult(boolean forceReload) {
+        contentCountry = Localization.getPreferredContentCountry(requireContext());
         return ExtractorHelper.getKioskInfo(serviceId,
                 url,
                 forceReload);

app/src/main/java/org/schabi/newpipe/fragments/list/playlist/PlaylistFragment.java

@@ -3,10 +3,9 @@ package org.schabi.newpipe.fragments.list.playlist;
 import android.app.Activity;
 import android.content.Context;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -260,7 +259,7 @@ public class PlaylistFragment extends BaseListInfoFragment<PlaylistInfo> {
         animateView(headerRootLayout, true, 100);
         animateView(headerUploaderLayout, true, 300);
         headerUploaderLayout.setOnClickListener(null);
-        if (!TextUtils.isEmpty(result.getUploaderName())) {
+        if (!TextUtils.isEmpty(result.getUploaderName())) { // If we have an uploader : Put them into the ui
             headerUploaderName.setText(result.getUploaderName());
             if (!TextUtils.isEmpty(result.getUploaderUrl())) {
                 headerUploaderLayout.setOnClickListener(v -> {
@@ -274,6 +273,8 @@ public class PlaylistFragment extends BaseListInfoFragment<PlaylistInfo> {
                     }
                 });
             }
+        } else { // Else : say we have no uploader
+            headerUploaderName.setText(R.string.playlist_no_uploader);
         }
 
         playlistCtrl.setVisibility(View.VISIBLE);
@@ -445,4 +446,4 @@ public class PlaylistFragment extends BaseListInfoFragment<PlaylistInfo> {
         playlistBookmarkButton.setIcon(ThemeHelper.resolveResourceIdFromAttr(activity, iconAttr));
         playlistBookmarkButton.setTitle(titleRes);
     }
-}
+}

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

@@ -6,13 +6,13 @@ import android.content.Intent;
 import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.TooltipCompat;
-import android.support.v7.widget.helper.ItemTouchHelper;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AlertDialog;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.appcompat.widget.TooltipCompat;
+import androidx.recyclerview.widget.ItemTouchHelper;
 import android.text.Editable;
 import android.text.TextUtils;
 import android.text.TextWatcher;
@@ -73,7 +73,7 @@ import io.reactivex.disposables.Disposable;
 import io.reactivex.schedulers.Schedulers;
 import io.reactivex.subjects.PublishSubject;
 
-import static android.support.v7.widget.helper.ItemTouchHelper.Callback.makeMovementFlags;
+import static androidx.recyclerview.widget.ItemTouchHelper.Callback.makeMovementFlags;
 import static java.util.Arrays.asList;
 import static org.schabi.newpipe.util.AnimationUtils.animateView;
 

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

@@ -2,8 +2,8 @@ package org.schabi.newpipe.fragments.list.search;
 
 import android.content.Context;
 import android.content.res.TypedArray;
-import android.support.annotation.AttrRes;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.AttrRes;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/org/schabi/newpipe/fragments/list/videos/RelatedVideosFragment.java

@@ -4,8 +4,8 @@ import android.content.Context;
 import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;

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

@@ -1,7 +1,7 @@
 package org.schabi.newpipe.info_list;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.view.View;
 import android.view.ViewGroup;
 

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

@@ -3,8 +3,8 @@ package org.schabi.newpipe.info_list;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.DialogInterface;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.view.View;
 import android.widget.TextView;
 

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

@@ -1,10 +1,10 @@
 package org.schabi.newpipe.info_list;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/org/schabi/newpipe/info_list/holder/CommentsMiniInfoItemHolder.java

@@ -1,6 +1,6 @@
 package org.schabi.newpipe.info_list.holder;
 
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.text.util.Linkify;
 import android.view.ViewGroup;
 import android.widget.TextView;
@@ -14,6 +14,7 @@ import org.schabi.newpipe.local.history.HistoryRecordManager;
 import org.schabi.newpipe.report.ErrorActivity;
 import org.schabi.newpipe.util.CommentTextOnTouchListener;
 import org.schabi.newpipe.util.ImageDisplayConstants;
+import org.schabi.newpipe.util.Localization;
 import org.schabi.newpipe.util.NavigationHelper;
 
 import java.util.regex.Matcher;
@@ -101,10 +102,17 @@ public class CommentsMiniInfoItemHolder extends InfoItemHolder {
             ellipsize();
         }
 
-        if (null != item.getLikeCount()) {
+        if (item.getLikeCount() >= 0) {
             itemLikesCountView.setText(String.valueOf(item.getLikeCount()));
+        } else {
+            itemLikesCountView.setText("-");
+        }
+
+        if (item.getPublishedTime() != null) {
+            itemPublishedTime.setText(Localization.relativeTime(item.getPublishedTime().date()));
+        } else {
+            itemPublishedTime.setText(item.getTextualPublishedTime());
         }
-        itemPublishedTime.setText(item.getPublishedTime());
 
         itemView.setOnClickListener(view -> {
             toggleEllipsize();

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

@@ -1,6 +1,6 @@
 package org.schabi.newpipe.info_list.holder;
 
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.ViewGroup;
 

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

@@ -1,5 +1,6 @@
 package org.schabi.newpipe.info_list.holder;
 
+import android.preference.PreferenceManager;
 import android.text.TextUtils;
 import android.view.ViewGroup;
 import android.widget.TextView;
@@ -7,10 +8,13 @@ import android.widget.TextView;
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.extractor.InfoItem;
 import org.schabi.newpipe.extractor.stream.StreamInfoItem;
+import org.schabi.newpipe.extractor.stream.StreamType;
 import org.schabi.newpipe.info_list.InfoItemBuilder;
 import org.schabi.newpipe.local.history.HistoryRecordManager;
 import org.schabi.newpipe.util.Localization;
 
+import static org.schabi.newpipe.MainActivity.DEBUG;
+
 /*
  * Created by Christian Schabesberger on 01.08.16.
  * <p>
@@ -53,15 +57,38 @@ public class StreamInfoItemHolder extends StreamMiniInfoItemHolder {
     private String getStreamInfoDetailLine(final StreamInfoItem infoItem) {
         String viewsAndDate = "";
         if (infoItem.getViewCount() >= 0) {
-            viewsAndDate = Localization.shortViewCount(itemBuilder.getContext(), infoItem.getViewCount());
-        }
-        if (!TextUtils.isEmpty(infoItem.getUploadDate())) {
-            if (viewsAndDate.isEmpty()) {
-                viewsAndDate = infoItem.getUploadDate();
+            if (infoItem.getStreamType().equals(StreamType.AUDIO_LIVE_STREAM)) {
+                viewsAndDate = Localization.listeningCount(itemBuilder.getContext(), infoItem.getViewCount());
+            } else if (infoItem.getStreamType().equals(StreamType.LIVE_STREAM)) {
+                viewsAndDate = Localization.watchingCount(itemBuilder.getContext(), infoItem.getViewCount());
             } else {
-                viewsAndDate += " • " + infoItem.getUploadDate();
+                viewsAndDate = Localization.shortViewCount(itemBuilder.getContext(), infoItem.getViewCount());
             }
         }
+
+        final String uploadDate = getFormattedRelativeUploadDate(infoItem);
+        if (!TextUtils.isEmpty(uploadDate)) {
+            if (viewsAndDate.isEmpty()) {
+                return uploadDate;
+            }
+
+            return Localization.concatenateStrings(viewsAndDate, uploadDate);
+        }
+
         return viewsAndDate;
     }
+
+    private String getFormattedRelativeUploadDate(final StreamInfoItem infoItem) {
+        if (infoItem.getUploadDate() != null) {
+            String formattedRelativeTime = Localization.relativeTime(infoItem.getUploadDate().date());
+
+            if (DEBUG && PreferenceManager.getDefaultSharedPreferences(itemBuilder.getContext())
+                    .getBoolean(itemBuilder.getContext().getString(R.string.show_original_time_ago_key), false)) {
+                formattedRelativeTime += " (" + infoItem.getTextualUploadDate() + ")";
+            }
+            return formattedRelativeTime;
+        } else {
+            return infoItem.getTextualUploadDate();
+        }
+    }
 }

app/src/main/java/org/schabi/newpipe/info_list/holder/StreamMiniInfoItemHolder.java

@@ -1,6 +1,6 @@
 package org.schabi.newpipe.info_list.holder;
 
-import android.support.v4.content.ContextCompat;
+import androidx.core.content.ContextCompat;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;

app/src/main/java/org/schabi/newpipe/local/BaseLocalListFragment.java

@@ -5,11 +5,11 @@ import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
-import android.support.v4.app.Fragment;
-import android.support.v7.app.ActionBar;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.fragment.app.Fragment;
+import androidx.appcompat.app.ActionBar;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuInflater;

app/src/main/java/org/schabi/newpipe/local/HeaderFooterHolder.java

@@ -1,6 +1,6 @@
 package org.schabi.newpipe.local;
 
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.View;
 
 public class HeaderFooterHolder extends RecyclerView.ViewHolder {

app/src/main/java/org/schabi/newpipe/local/LocalItemListAdapter.java

@@ -1,10 +1,10 @@
 package org.schabi.newpipe.local;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/org/schabi/newpipe/local/bookmark/BookmarkFragment.java

@@ -3,9 +3,9 @@ package org.schabi.newpipe.local.bookmark;
 import android.app.AlertDialog;
 import android.os.Bundle;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.FragmentManager;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.FragmentManager;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/org/schabi/newpipe/local/dialog/PlaylistAppendDialog.java

@@ -1,15 +1,16 @@
 package org.schabi.newpipe.local.dialog;
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Toast;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
 import org.schabi.newpipe.NewPipeDatabase;
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.database.LocalItem;
@@ -152,6 +153,12 @@ public final class PlaylistAppendDialog extends PlaylistDialog {
         final Toast successToast = Toast.makeText(getContext(),
                 R.string.playlist_add_stream_success, Toast.LENGTH_SHORT);
 
+        if (playlist.thumbnailUrl.equals("drawable://" + R.drawable.dummy_thumbnail_playlist)) {
+            playlistDisposables.add(manager.changePlaylistThumbnail(playlist.uid, streams.get(0).getThumbnailUrl())
+                    .observeOn(AndroidSchedulers.mainThread())
+                    .subscribe(ignored -> successToast.show()));
+        }
+
         playlistDisposables.add(manager.appendToPlaylist(playlist.uid, streams)
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(ignored -> successToast.show()));

app/src/main/java/org/schabi/newpipe/local/dialog/PlaylistCreationDialog.java

@@ -3,8 +3,8 @@ package org.schabi.newpipe.local.dialog;
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.view.View;
 import android.widget.EditText;
 import android.widget.Toast;

app/src/main/java/org/schabi/newpipe/local/dialog/PlaylistDialog.java

@@ -2,9 +2,9 @@ package org.schabi.newpipe.local.dialog;
 
 import android.app.Dialog;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.DialogFragment;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.DialogFragment;
 import android.view.Window;
 
 import org.schabi.newpipe.database.stream.model.StreamEntity;

app/src/main/java/org/schabi/newpipe/local/feed/FeedFragment.java

@@ -2,9 +2,9 @@ package org.schabi.newpipe.local.feed;
 
 import android.os.Bundle;
 import android.os.Handler;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.app.ActionBar;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.ActionBar;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -183,7 +183,7 @@ public class FeedFragment extends BaseListFragment<List<SubscriptionEntity>, Voi
     }
 
     @Override
-    public void handleResult(@android.support.annotation.NonNull List<SubscriptionEntity> result) {
+    public void handleResult(@androidx.annotation.NonNull List<SubscriptionEntity> result) {
         super.handleResult(result);
 
         if (result.isEmpty()) {

app/src/main/java/org/schabi/newpipe/local/history/HistoryEntryAdapter.java

@@ -1,9 +1,9 @@
 package org.schabi.newpipe.local.history;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.RecyclerView;
 
 import org.schabi.newpipe.util.Localization;
 

app/src/main/java/org/schabi/newpipe/local/history/HistoryListener.java

@@ -1,6 +1,6 @@
 package org.schabi.newpipe.local.history;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import org.schabi.newpipe.extractor.stream.AudioStream;
 import org.schabi.newpipe.extractor.stream.StreamInfo;

app/src/main/java/org/schabi/newpipe/local/history/HistoryRecordManager.java

@@ -21,7 +21,7 @@ package org.schabi.newpipe.local.history;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.preference.PreferenceManager;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.schabi.newpipe.NewPipeDatabase;
 import org.schabi.newpipe.R;
@@ -51,7 +51,6 @@ import java.util.List;
 import io.reactivex.Completable;
 import io.reactivex.Flowable;
 import io.reactivex.Maybe;
-import io.reactivex.Scheduler;
 import io.reactivex.Single;
 import io.reactivex.schedulers.Schedulers;
 

app/src/main/java/org/schabi/newpipe/local/history/StatisticsPlaylistFragment.java

@@ -4,10 +4,10 @@ import android.app.Activity;
 import android.content.Context;
 import android.os.Bundle;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.design.widget.Snackbar;
-import android.support.v7.app.AlertDialog;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import com.google.android.material.snackbar.Snackbar;
+import androidx.appcompat.app.AlertDialog;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -22,7 +22,6 @@ import org.reactivestreams.Subscriber;
 import org.reactivestreams.Subscription;
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.database.LocalItem;
-import org.schabi.newpipe.database.playlist.PlaylistStreamEntry;
 import org.schabi.newpipe.database.stream.StreamStatisticsEntry;
 import org.schabi.newpipe.extractor.stream.StreamInfoItem;
 import org.schabi.newpipe.extractor.stream.StreamType;

app/src/main/java/org/schabi/newpipe/local/holder/LocalItemHolder.java

@@ -1,6 +1,6 @@
 package org.schabi.newpipe.local.holder;
 
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.ViewGroup;
 

app/src/main/java/org/schabi/newpipe/local/holder/LocalPlaylistStreamItemHolder.java

@@ -1,6 +1,6 @@
 package org.schabi.newpipe.local.holder;
 
-import android.support.v4.content.ContextCompat;
+import androidx.core.content.ContextCompat;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/org/schabi/newpipe/local/holder/LocalStatisticStreamItemHolder.java

@@ -1,7 +1,7 @@
 package org.schabi.newpipe.local.holder;
 
-import android.support.annotation.Nullable;
-import android.support.v4.content.ContextCompat;
+import androidx.annotation.Nullable;
+import androidx.core.content.ContextCompat;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;

app/src/main/java/org/schabi/newpipe/local/holder/RemotePlaylistItemHolder.java

@@ -10,6 +10,8 @@ import org.schabi.newpipe.local.history.HistoryRecordManager;
 import org.schabi.newpipe.util.ImageDisplayConstants;
 import org.schabi.newpipe.util.Localization;
 
+import android.text.TextUtils;
+
 import java.text.DateFormat;
 
 public class RemotePlaylistItemHolder extends PlaylistItemHolder {
@@ -28,8 +30,14 @@ public class RemotePlaylistItemHolder extends PlaylistItemHolder {
 
         itemTitleView.setText(item.getName());
         itemStreamCountView.setText(String.valueOf(item.getStreamCount()));
-        itemUploaderView.setText(Localization.concatenateStrings(item.getUploader(),
+        // Here is where the uploader name is set in the bookmarked playlists library
+        if (!TextUtils.isEmpty(item.getUploader())) {
+            itemUploaderView.setText(Localization.concatenateStrings(item.getUploader(),
                 NewPipe.getNameOfService(item.getServiceId())));
+        } else {
+            itemUploaderView.setText(NewPipe.getNameOfService(item.getServiceId()));
+        }
+
 
         itemBuilder.displayImage(item.getThumbnailUrl(), itemThumbnailView,
                 ImageDisplayConstants.DISPLAY_PLAYLIST_OPTIONS);

app/src/main/java/org/schabi/newpipe/local/playlist/LocalPlaylistFragment.java

@@ -4,11 +4,6 @@ import android.app.Activity;
 import android.content.Context;
 import android.os.Bundle;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.helper.ItemTouchHelper;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -18,6 +13,12 @@ import android.widget.EditText;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AlertDialog;
+import androidx.recyclerview.widget.ItemTouchHelper;
+import androidx.recyclerview.widget.RecyclerView;
+
 import org.reactivestreams.Subscriber;
 import org.reactivestreams.Subscription;
 import org.schabi.newpipe.NewPipeDatabase;
@@ -325,6 +326,16 @@ public class LocalPlaylistFragment extends BaseLocalListFragment<List<PlaylistSt
         headerBackgroundButton.setOnClickListener(view ->
                 NavigationHelper.playOnBackgroundPlayer(activity, getPlayQueue(), false));
 
+        headerPopupButton.setOnLongClickListener(view -> {
+            NavigationHelper.enqueueOnPopupPlayer(activity, getPlayQueue(), true);
+            return true;
+        });
+
+        headerBackgroundButton.setOnLongClickListener(view -> {
+            NavigationHelper.enqueueOnBackgroundPlayer(activity, getPlayQueue(), true);
+            return true;
+        });
+
         hideLoading();
     }
 
@@ -403,10 +414,25 @@ public class LocalPlaylistFragment extends BaseLocalListFragment<List<PlaylistSt
         disposables.add(disposable);
     }
 
+    private void updateThumbnailUrl() {
+        String newThumbnailUrl;
+
+        if (!itemListAdapter.getItemsList().isEmpty()) {
+            newThumbnailUrl = ((PlaylistStreamEntry) itemListAdapter.getItemsList().get(0)).thumbnailUrl;
+        } else {
+            newThumbnailUrl = "drawable://" + R.drawable.dummy_thumbnail_playlist;
+        }
+
+        changeThumbnailUrl(newThumbnailUrl);
+    }
+
     private void deleteItem(final PlaylistStreamEntry item) {
         if (itemListAdapter == null) return;
 
         itemListAdapter.removeItem(item);
+        if (playlistManager.getPlaylistThumbnail(playlistId).equals(item.thumbnailUrl))
+            updateThumbnailUrl();
+
         setVideoCount(itemListAdapter.getItemsList().size());
         saveChanges();
     }

app/src/main/java/org/schabi/newpipe/local/playlist/LocalPlaylistManager.java

@@ -1,6 +1,6 @@
 package org.schabi.newpipe.local.playlist;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import org.schabi.newpipe.database.AppDatabase;
 import org.schabi.newpipe.database.playlist.PlaylistMetadataEntry;
@@ -103,6 +103,10 @@ public class LocalPlaylistManager {
         return modifyPlaylist(playlistId, null, thumbnailUrl);
     }
 
+    public String getPlaylistThumbnail(final long playlistId) {
+        return playlistTable.getPlaylist(playlistId).blockingFirst().get(0).getThumbnailUrl();
+    }
+
     private Maybe<Integer> modifyPlaylist(final long playlistId,
                                           @Nullable final String name,
                                           @Nullable final String thumbnailUrl) {

app/src/main/java/org/schabi/newpipe/local/subscription/ImportConfirmationDialog.java

@@ -4,10 +4,10 @@ import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.DialogFragment;
-import android.support.v4.app.Fragment;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.DialogFragment;
+import androidx.fragment.app.Fragment;
 
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.util.ThemeHelper;

app/src/main/java/org/schabi/newpipe/local/subscription/ImportExportJsonHelper.java

@@ -19,7 +19,7 @@
 
 package org.schabi.newpipe.local.subscription;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import com.grack.nanojson.JsonAppendableWriter;
 import com.grack.nanojson.JsonArray;

app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionFragment.java

@@ -17,15 +17,15 @@ import android.os.Bundle;
 import android.os.Environment;
 import android.os.Parcelable;
 import android.preference.PreferenceManager;
-import android.support.annotation.DrawableRes;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.content.LocalBroadcastManager;
-import android.support.v7.app.ActionBar;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.DrawableRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.FragmentManager;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
+import androidx.appcompat.app.ActionBar;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;

app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionService.java

@@ -1,7 +1,7 @@
 package org.schabi.newpipe.local.subscription;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.util.Log;
 
 import org.schabi.newpipe.MainActivity;
@@ -93,7 +93,7 @@ public class SubscriptionService {
      * in the cooldown interval, only the latest changes are emitted to the subscribers.
      * This reduces the amount of observations caused by frequent updates to the database.
      */
-    @android.support.annotation.NonNull
+    @androidx.annotation.NonNull
     public Flowable<List<SubscriptionEntity>> getSubscription() {
         return subscription;
     }

app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionsImportFragment.java

@@ -3,11 +3,11 @@ package org.schabi.newpipe.local.subscription;
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.StringRes;
-import android.support.v4.text.util.LinkifyCompat;
-import android.support.v7.app.ActionBar;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
+import androidx.core.text.util.LinkifyCompat;
+import androidx.appcompat.app.ActionBar;
 import android.text.TextUtils;
 import android.text.util.Linkify;
 import android.view.LayoutInflater;

app/src/main/java/org/schabi/newpipe/local/subscription/services/BaseImportExportService.java

@@ -23,11 +23,11 @@ import android.app.Service;
 import android.content.Intent;
 import android.os.Build;
 import android.os.IBinder;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.StringRes;
-import android.support.v4.app.NotificationCompat;
-import android.support.v4.app.NotificationManagerCompat;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
+import androidx.core.app.NotificationCompat;
+import androidx.core.app.NotificationManagerCompat;
 import android.text.TextUtils;
 import android.widget.Toast;
 

app/src/main/java/org/schabi/newpipe/local/subscription/services/SubscriptionsExportService.java

@@ -20,7 +20,7 @@
 package org.schabi.newpipe.local.subscription.services;
 
 import android.content.Intent;
-import android.support.v4.content.LocalBroadcastManager;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 import android.text.TextUtils;
 import android.util.Log;
 

app/src/main/java/org/schabi/newpipe/local/subscription/services/SubscriptionsImportService.java

@@ -20,9 +20,9 @@
 package org.schabi.newpipe.local.subscription.services;
 
 import android.content.Intent;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.content.LocalBroadcastManager;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 import android.text.TextUtils;
 import android.util.Log;
 

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

@@ -25,12 +25,17 @@ import android.app.Service;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
+import android.content.SharedPreferences;
+import android.content.res.Resources;
 import android.graphics.Bitmap;
 import android.os.Build;
 import android.os.IBinder;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.NotificationCompat;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
+import androidx.core.app.NotificationCompat;
+
+import android.preference.PreferenceManager;
 import android.util.Log;
 import android.view.View;
 import android.widget.RemoteViews;
@@ -48,6 +53,7 @@ import org.schabi.newpipe.player.helper.LockManager;
 import org.schabi.newpipe.player.playqueue.PlayQueueItem;
 import org.schabi.newpipe.player.resolver.AudioPlaybackResolver;
 import org.schabi.newpipe.player.resolver.MediaSourceTag;
+import org.schabi.newpipe.util.BitmapUtils;
 import org.schabi.newpipe.util.NavigationHelper;
 import org.schabi.newpipe.util.ThemeHelper;
 
@@ -75,6 +81,7 @@ public final class BackgroundPlayer extends Service {
 
     private BasePlayerImpl basePlayerImpl;
     private LockManager lockManager;
+    private SharedPreferences sharedPreferences;
 
     /*//////////////////////////////////////////////////////////////////////////
     // Service-Activity Binder
@@ -95,6 +102,9 @@ public final class BackgroundPlayer extends Service {
 
     private boolean shouldUpdateOnProgress;
 
+    private static final int NOTIFICATION_UPDATES_BEFORE_RESET = 60;
+    private int timesNotificationUpdated;
+
     /*//////////////////////////////////////////////////////////////////////////
     // Service's LifeCycle
     //////////////////////////////////////////////////////////////////////////*/
@@ -104,6 +114,7 @@ public final class BackgroundPlayer extends Service {
         if (DEBUG) Log.d(TAG, "onCreate() called");
         notificationManager = ((NotificationManager) getSystemService(NOTIFICATION_SERVICE));
         lockManager = new LockManager(this);
+        sharedPreferences = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
 
         ThemeHelper.setTheme(this);
         basePlayerImpl = new BasePlayerImpl(this);
@@ -180,6 +191,7 @@ public final class BackgroundPlayer extends Service {
 
     private void resetNotification() {
         notBuilder = createNotification();
+        timesNotificationUpdated = 0;
     }
 
     private NotificationCompat.Builder createNotification() {
@@ -195,12 +207,45 @@ public final class BackgroundPlayer extends Service {
                 .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
                 .setCustomContentView(notRemoteView)
                 .setCustomBigContentView(bigNotRemoteView);
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            setLockScreenThumbnail(builder);
+        }
+
         if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.JELLY_BEAN) {
             builder.setPriority(NotificationCompat.PRIORITY_MAX);
         }
         return builder;
     }
 
+    @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
+    private void setLockScreenThumbnail(NotificationCompat.Builder builder) {
+        boolean isLockScreenThumbnailEnabled = sharedPreferences.getBoolean(
+                getString(R.string.enable_lock_screen_video_thumbnail_key),
+                true
+        );
+
+        if (isLockScreenThumbnailEnabled) {
+            basePlayerImpl.mediaSessionManager.setLockScreenArt(
+                    builder,
+                    getCenteredThumbnailBitmap()
+            );
+        } else {
+            basePlayerImpl.mediaSessionManager.clearLockScreenArt(builder);
+        }
+    }
+
+    @Nullable
+    private Bitmap getCenteredThumbnailBitmap() {
+        int screenWidth = Resources.getSystem().getDisplayMetrics().widthPixels;
+        int screenHeight = Resources.getSystem().getDisplayMetrics().heightPixels;
+
+        return BitmapUtils.centerCrop(
+                basePlayerImpl.getThumbnail(),
+                screenWidth,
+                screenHeight);
+    }
+
     private void setupNotification(RemoteViews remoteViews) {
         if (basePlayerImpl == null) return;
 
@@ -248,10 +293,13 @@ public final class BackgroundPlayer extends Service {
         //if (DEBUG) Log.d(TAG, "updateNotification() called with: drawableId = [" + drawableId + "]");
         if (notBuilder == null) return;
         if (drawableId != -1) {
-            if (notRemoteView != null) notRemoteView.setImageViewResource(R.id.notificationPlayPause, drawableId);
-            if (bigNotRemoteView != null) bigNotRemoteView.setImageViewResource(R.id.notificationPlayPause, drawableId);
+            if (notRemoteView != null)
+                notRemoteView.setImageViewResource(R.id.notificationPlayPause, drawableId);
+            if (bigNotRemoteView != null)
+                bigNotRemoteView.setImageViewResource(R.id.notificationPlayPause, drawableId);
         }
         notificationManager.notify(NOTIFICATION_ID, notBuilder.build());
+        timesNotificationUpdated++;
     }
 
     /*//////////////////////////////////////////////////////////////////////////
@@ -275,7 +323,8 @@ public final class BackgroundPlayer extends Service {
 
     protected class BasePlayerImpl extends BasePlayer {
 
-        @NonNull final private AudioPlaybackResolver resolver;
+        @NonNull
+        final private AudioPlaybackResolver resolver;
         private int cachedDuration;
         private String cachedDurationString;
 
@@ -294,8 +343,10 @@ public final class BackgroundPlayer extends Service {
             super.handleIntent(intent);
 
             resetNotification();
-            if (bigNotRemoteView != null) bigNotRemoteView.setProgressBar(R.id.notificationProgressBar, 100, 0, false);
-            if (notRemoteView != null) notRemoteView.setProgressBar(R.id.notificationProgressBar, 100, 0, false);
+            if (bigNotRemoteView != null)
+                bigNotRemoteView.setProgressBar(R.id.notificationProgressBar, 100, 0, false);
+            if (notRemoteView != null)
+                notRemoteView.setProgressBar(R.id.notificationProgressBar, 100, 0, false);
             startForeground(NOTIFICATION_ID, notBuilder.build());
         }
 
@@ -330,6 +381,7 @@ public final class BackgroundPlayer extends Service {
             updateNotificationThumbnail();
             updateNotification(-1);
         }
+
         /*//////////////////////////////////////////////////////////////////////////
         // States Implementation
         //////////////////////////////////////////////////////////////////////////*/
@@ -351,10 +403,15 @@ public final class BackgroundPlayer extends Service {
             updateProgress(currentProgress, duration, bufferPercent);
 
             if (!shouldUpdateOnProgress) return;
-            resetNotification();
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O /*Oreo*/) updateNotificationThumbnail();
+            if (timesNotificationUpdated > NOTIFICATION_UPDATES_BEFORE_RESET) {
+                resetNotification();
+
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O /*Oreo*/) {
+                    updateNotificationThumbnail();
+                }
+            }
             if (bigNotRemoteView != null) {
-                if(cachedDuration != duration) {
+                if (cachedDuration != duration) {
                     cachedDuration = duration;
                     cachedDurationString = getTimeString(duration);
                 }
@@ -382,8 +439,10 @@ public final class BackgroundPlayer extends Service {
         @Override
         public void destroy() {
             super.destroy();
-            if (notRemoteView != null) notRemoteView.setImageViewBitmap(R.id.notificationCover, null);
-            if (bigNotRemoteView != null) bigNotRemoteView.setImageViewBitmap(R.id.notificationCover, null);
+            if (notRemoteView != null)
+                notRemoteView.setImageViewBitmap(R.id.notificationCover, null);
+            if (bigNotRemoteView != null)
+                bigNotRemoteView.setImageViewBitmap(R.id.notificationCover, null);
         }
 
         /*//////////////////////////////////////////////////////////////////////////

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

@@ -28,12 +28,13 @@ import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.media.AudioManager;
 import android.preference.PreferenceManager;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 import android.util.Log;
 import android.view.View;
 import android.widget.Toast;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import com.google.android.exoplayer2.DefaultRenderersFactory;
 import com.google.android.exoplayer2.ExoPlaybackException;
 import com.google.android.exoplayer2.ExoPlayerFactory;
@@ -54,7 +55,7 @@ import com.nostra13.universalimageloader.core.assist.FailReason;
 import com.nostra13.universalimageloader.core.listener.ImageLoadingListener;
 
 import org.schabi.newpipe.BuildConfig;
-import org.schabi.newpipe.Downloader;
+import org.schabi.newpipe.DownloaderImpl;
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.extractor.stream.StreamInfo;
 import org.schabi.newpipe.local.history.HistoryRecordManager;
@@ -177,7 +178,6 @@ public abstract class BasePlayer implements
     // Player
     //////////////////////////////////////////////////////////////////////////*/
 
-    protected final static int FAST_FORWARD_REWIND_AMOUNT_MILLIS = 10000; // 10 Seconds
     protected final static int PLAY_PREV_ACTIVATION_LIMIT_MILLIS = 5000; // 5 seconds
     protected final static int PROGRESS_LOOP_INTERVAL_MILLIS = 500;
     protected final static int RECOVERY_SKIP_THRESHOLD_MILLIS = 3000; // 3 seconds
@@ -208,8 +208,8 @@ public abstract class BasePlayer implements
         this.progressUpdateReactor = new SerialDisposable();
         this.databaseUpdateReactor = new CompositeDisposable();
 
-        final String userAgent = Downloader.USER_AGENT;
-        final DefaultBandwidthMeter bandwidthMeter = new DefaultBandwidthMeter();
+        final String userAgent = DownloaderImpl.USER_AGENT;
+        final DefaultBandwidthMeter bandwidthMeter = new DefaultBandwidthMeter.Builder(context).build();
         this.dataSource = new PlayerDataSource(context, userAgent, bandwidthMeter);
 
         final TrackSelection.Factory trackSelectionFactory = PlayerHelper.getQualitySelector(context);
@@ -953,12 +953,19 @@ public abstract class BasePlayer implements
 
     public void onFastRewind() {
         if (DEBUG) Log.d(TAG, "onFastRewind() called");
-        seekBy(-FAST_FORWARD_REWIND_AMOUNT_MILLIS);
+        seekBy(-getSeekDuration());
     }
 
     public void onFastForward() {
         if (DEBUG) Log.d(TAG, "onFastForward() called");
-        seekBy(FAST_FORWARD_REWIND_AMOUNT_MILLIS);
+        seekBy(getSeekDuration());
+    }
+
+    private int getSeekDuration() {
+        final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
+        final String key = context.getString(R.string.seek_duration_key);
+        final String value = prefs.getString(key, context.getString(R.string.seek_duration_default_value));
+        return Integer.parseInt(value);
     }
 
     public void onPlayPrevious() {
@@ -1193,10 +1200,7 @@ public abstract class BasePlayer implements
     }
 
     public boolean isPlaying() {
-        if (simpleExoPlayer == null) return false;
-        final int state = simpleExoPlayer.getPlaybackState();
-        return (state == Player.STATE_READY || state == Player.STATE_BUFFERING)
-                && simpleExoPlayer.getPlayWhenReady();
+        return simpleExoPlayer != null && simpleExoPlayer.isPlaying();
     }
 
     @Player.RepeatMode