Release 0.18.6 (860)

Currently translated at 100.0% (533 of 533 strings)

.github/CONTRIBUTING.md

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

.github/FUNDING.yml

@@ -0,0 +1 @@
+liberapay: TeamNewPipe

.github/ISSUE_TEMPLATE.md

@@ -1,2 +1,3 @@
 - [ ] I carefully read the [contribution guidelines](https://github.com/TeamNewPipe/NewPipe/blob/HEAD/.github/CONTRIBUTING.md) and agree to them.
 - [ ] I checked if the issue/feature exists in the latest version.
+- [ ] I did use the [incredible bugreport to markdown converter](https://teamnewpipe.github.io/CrashReportToMarkdown/) to paste bug reports.

.gitignore

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

.travis.yml

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

CheckTranslations.java

@@ -1,131 +0,0 @@
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileReader;
-import java.io.IOException;
-import java.util.regex.*;
-import java.util.Arrays;
-import java.util.List;
-import java.util.ArrayList;
-import java.nio.file.Files;
-import java.nio.charset.Charset;
-
-public final class CheckTranslations {
-
-    private static boolean debug = false;
-    private static boolean plurals = false;
-    private static boolean empty = false;
-    private static boolean remove = false;
-    private static int checks = 0;
-    private static int matches = 0;
-    private static Pattern p, e;
-
-    /**
-     * Search translated strings.xml files for empty item / plural tags
-     * and remove them.
-     * @param args directories which contain string.xml files (in any subdirectory)
-     *             -e option to find all empty string tags
-     *             -p option to find all empty plurals and item tags
-     *             -r option to remove all occurrences from the files
-     *             -d option to see more details
-     */
-    public static void main(String[] args) {
-        if (args.length < 1 || (args[0].equals("-d") && args.length < 2)) {  
-            System.out.println("Not enough arguments");
-            return;
-        }
-        for (int i = 0; i < args.length; i++) {
-            switch (args[i]) {
-                case "-d":
-                    debug = true;
-                    break;
-                case "-p":
-                    plurals = true;
-                    break;
-                case "-e":
-                    empty = true;
-                    break;
-                case "-r":
-                    remove = true;
-                    break;
-            }
-        }
-        
-        if (!plurals && !empty) {
-            plurals = true;
-            empty = true;
-        }
-
-        p = Pattern.compile("(<item quantity=\")(zero|one|two|three|few|many|other)(\"></item>|\"/>)");
-        e = Pattern.compile("(<string[\\sa-z_\\\"=]*)((><\\/string>|\\/>){1})");
-
-        for (int i = 0; i < args.length; i++) {
-            if (!args[i].equals("-d") && !args[i].equals("-p") && !args[i].equals("-e") && !args[i].equals("-r")) {
-                File f = new File(args[i]);
-                if (f.exists() && !f.isDirectory()) {
-                    checkFile(f);
-                } else if (f.isDirectory()) {
-                    checkFiles(f.listFiles());
-                } else {
-                    System.out.println("'" + args[i] + "' does not exist!");
-                }
-            }
-        }
-
-        System.out.println(checks + " files were checked.");
-        System.out.println(matches + " corrupt lines detected.");
-        if (remove) System.out.println(matches + " corrupt lines removed.");
-    }
-
-
-    private static void checkFiles(File[] f) {
-        for (int i = 0; i < f.length; i++) {
-            if (f[i].exists() && !f[i].isDirectory()) {
-                if (f[i].toString().contains("strings.xml")) {
-                    checkFile(f[i]);
-                }
-            } else if (f[i].isDirectory()) {
-                checkFiles(f[i].listFiles());
-            }
-        }
-    }
-
-    private static void checkFile(File f) {
-        // Do not check our original English strings to cause no unwanted changes
-        // Btw. there should not be empty plural/item tags
-        if (f.toString().contains("values/strings.xml")) {
-            return;
-        }
-        if (debug) System.out.println("Checking " + f.toString());
-        checks++;
-
-
-        List<String> lines = new ArrayList<String>();
-        boolean checkFailed = false;
-
-        try (BufferedReader br = new BufferedReader(new FileReader(f))) {
-            String line;
-            int ln = 0;
-            while ((line = br.readLine()) != null) {
-                ln++;
-                if (plurals && p.matcher(line).find()) {
-                    matches++;
-                    if (debug) System.out.println("    Line " + ln + " was " + ((remove) ? "removed" : "detected") + ": '" + line + "'");
-                    checkFailed = true;
-                } else if (empty && e.matcher(line).find()) {
-                    matches++;
-                    checkFailed = true;
-                    if (debug) System.out.println("    Line " + ln + " was " + ((remove) ? "removed" : "detected") + ": '" + line + "'");
-                } else {
-                    if (remove) lines.add(line);
-                }
-            }
-            br.close();
-            if (remove && checkFailed) {
-                Files.write(f.toPath(), lines, Charset.forName("UTF-8"));
-            }
-        } catch (IOException e) {
-            System.out.println(e);
-        }
-    }
-}
-

app/.gitignore

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

app/build.gradle

@@ -1,38 +1,35 @@
 apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-android-extensions'
+apply plugin: 'kotlin-kapt'
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
-    buildToolsVersion '27.0.1'
+    buildToolsVersion '28.0.3'
 
     defaultConfig {
         applicationId "org.schabi.newpipe"
-        minSdkVersion 15
+        minSdkVersion 19
-        targetSdkVersion 27
+        targetSdkVersion 28
-        versionCode 44
+        versionCode 860
-        versionName "0.11.3"
+        versionName "0.18.6"
 
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
     }
+
     buildTypes {
         release {
             minifyEnabled true
             shrinkResources true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
+
         debug {
             multiDexEnabled true
-
             debuggable true
             applicationIdSuffix ".debug"
         }
-        beta {
-            minifyEnabled true
-            shrinkResources true
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-
-            applicationIdSuffix ".beta"
-        }
     }
 
     lintOptions {
@@ -41,52 +38,78 @@ android {
         // but continue the build even when errors are found:
         abortOnError false
     }
+
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_7
+        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_7
+        targetCompatibility JavaVersion.VERSION_1_8
     }
 }
 
 ext {
-    supportLibVersion = '27.0.2'
+    androidxLibVersion = '1.0.0'
+    exoPlayerLibVersion = '2.10.8'
+    roomDbLibVersion = '2.1.0'
+    leakCanaryLibVersion = '1.5.4' //1.6.1
+    okHttpLibVersion = '3.12.6'
+    icepickLibVersion = '3.2.0'
+    stethoLibVersion = '1.5.0'
+    markwonVersion = '4.2.1'
 }
+
 dependencies {
-    androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.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:5f2d0cf6b5dfac2965b1cf400'
 
+    implementation 'com.github.TeamNewPipe:NewPipeExtractor:6446abc6d'
     testImplementation 'junit:junit:4.12'
-    testImplementation 'org.mockito:mockito-core:1.10.19'
+    testImplementation 'org.mockito:mockito-core:2.23.0'
 
-    implementation "com.android.support:appcompat-v7:$supportLibVersion"
+    implementation 'androidx.appcompat:appcompat:1.1.0'
-    implementation "com.android.support:support-v4:$supportLibVersion"
+    implementation "androidx.legacy:legacy-support-v4:${androidxLibVersion}"
-    implementation "com.android.support:design:$supportLibVersion"
+    implementation "com.google.android.material:material:${androidxLibVersion}"
-    implementation "com.android.support:recyclerview-v7:$supportLibVersion"
+    implementation "androidx.recyclerview:recyclerview:${androidxLibVersion}"
-    implementation "com.android.support:preference-v14:$supportLibVersion"
+    implementation "androidx.legacy:legacy-preference-v14:${androidxLibVersion}"
+    implementation "androidx.cardview:cardview:${androidxLibVersion}"
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
 
-    implementation 'com.google.code.gson:gson:2.8.2'
+    // Originally in NewPipeExtractor
-    implementation 'ch.acra:acra:4.9.2'
+    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.nononsenseapps:filepicker:3.0.1'
-    implementation 'com.google.android.exoplayer:exoplayer:r2.5.4'
 
-    debugImplementation 'com.facebook.stetho:stetho:1.5.0'
+    implementation "com.google.android.exoplayer:exoplayer:${exoPlayerLibVersion}"
-    debugImplementation 'com.facebook.stetho:stetho-urlconnection:1.5.0'
+    implementation "com.google.android.exoplayer:extension-mediasession:${exoPlayerLibVersion}"
-    debugImplementation 'com.android.support:multidex:1.0.2'
 
-    implementation 'io.reactivex.rxjava2:rxjava:2.1.7'
+    debugImplementation "com.facebook.stetho:stetho:${stethoLibVersion}"
-    implementation 'io.reactivex.rxjava2:rxandroid:2.0.1'
+    debugImplementation "com.facebook.stetho:stetho-urlconnection:${stethoLibVersion}"
-    implementation 'com.jakewharton.rxbinding2:rxbinding:2.0.0'
+    debugImplementation 'androidx.multidex:multidex:2.0.1'
 
-    implementation 'android.arch.persistence.room:runtime:1.0.0'
+    implementation 'io.reactivex.rxjava2:rxjava:2.2.2'
-    implementation 'android.arch.persistence.room:rxjava2:1.0.0'
+    implementation 'io.reactivex.rxjava2:rxandroid:2.1.0'
-    annotationProcessor 'android.arch.persistence.room:compiler:1.0.0'
+    implementation 'com.jakewharton.rxbinding2:rxbinding:2.1.1'
+    implementation 'org.ocpsoft.prettytime:prettytime:4.0.3.Final'
 
-    implementation 'frankiesardo:icepick:3.2.0'
+    implementation "androidx.room:room-runtime:${roomDbLibVersion}"
-    annotationProcessor 'frankiesardo:icepick-processor:3.2.0'
+    implementation "androidx.room:room-rxjava2:${roomDbLibVersion}"
+    kapt "androidx.room:room-compiler:${roomDbLibVersion}"
+
+    implementation "frankiesardo:icepick:${icepickLibVersion}"
+    kapt "frankiesardo:icepick-processor:${icepickLibVersion}"
+
+    debugImplementation "com.squareup.leakcanary:leakcanary-android:${leakCanaryLibVersion}"
+    releaseImplementation "com.squareup.leakcanary:leakcanary-android-no-op:${leakCanaryLibVersion}"
+
+    implementation "com.squareup.okhttp3:okhttp:${okHttpLibVersion}"
+    debugImplementation "com.facebook.stetho:stetho-okhttp3:${stethoLibVersion}"
+
+    implementation "io.noties.markwon:core:${markwonVersion}"
+    implementation "io.noties.markwon:linkify:${markwonVersion}"
 }

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
@@ -35,3 +38,16 @@
     @icepick.* <fields>;
 }
 -keepnames class * { @icepick.State *;}
+
+# Rules for OkHttp. Copy paste from https://github.com/square/okhttp
+-dontwarn okhttp3.**
+-dontwarn okio.**
+-dontwarn javax.annotation.**
+# A resource is loaded with a relative path so the package of this class must be preserved.
+-keepnames class okhttp3.internal.publicsuffix.PublicSuffixDatabase
+-keepclassmembers class * implements java.io.Serializable {
+    static final long serialVersionUID;
+    !static !transient <fields>;
+    private void writeObject(java.io.ObjectOutputStream);
+    private void readObject(java.io.ObjectInputStream);
+}

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

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

app/src/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 androidx.test.filters.LargeTest;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

app/src/beta/AndroidManifest.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools">
-
-    <application
-        android:label="NewPipe Beta"
-        tools:replace="android:label">
-    </application>
-
-</manifest>

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

@@ -1,9 +1,26 @@
 package org.schabi.newpipe;
 
 import android.content.Context;
-import android.support.multidex.MultiDex;
+import android.content.SharedPreferences;
+import android.preference.PreferenceManager;
+import androidx.annotation.NonNull;
+import androidx.multidex.MultiDex;
 
 import com.facebook.stetho.Stetho;
+import com.facebook.stetho.okhttp3.StethoInterceptor;
+import com.squareup.leakcanary.AndroidHeapDumper;
+import com.squareup.leakcanary.DefaultLeakDirectoryProvider;
+import com.squareup.leakcanary.HeapDumper;
+import com.squareup.leakcanary.LeakCanary;
+import com.squareup.leakcanary.LeakDirectoryProvider;
+import com.squareup.leakcanary.RefWatcher;
+
+import org.schabi.newpipe.extractor.downloader.Downloader;
+
+import java.io.File;
+import java.util.concurrent.TimeUnit;
+
+import okhttp3.OkHttpClient;
 
 public class DebugApp extends App {
     private static final String TAG = DebugApp.class.toString();
@@ -17,10 +34,15 @@ public class DebugApp extends App {
     @Override
     public void onCreate() {
         super.onCreate();
-
         initStetho();
     }
 
+    @Override
+    protected Downloader getDownloader() {
+        return DownloaderImpl.init(new OkHttpClient.Builder()
+                .addNetworkInterceptor(new StethoInterceptor()));
+    }
+
     private void initStetho() {
         // Create an InitializerBuilder
         Stetho.InitializerBuilder initializerBuilder =
@@ -42,4 +64,41 @@ public class DebugApp extends App {
         // Initialize Stetho with the Initializer
         Stetho.initialize(initializer);
     }
+
+    @Override
+    protected boolean isDisposedRxExceptionsReported() {
+        return PreferenceManager.getDefaultSharedPreferences(this)
+                .getBoolean(getString(R.string.allow_disposed_exceptions_key), false);
+    }
+
+    @Override
+    protected RefWatcher installLeakCanary() {
+        return LeakCanary.refWatcher(this)
+                .heapDumper(new ToggleableHeapDumper(this))
+                // give each object 10 seconds to be gc'ed, before leak canary gets nosy on it
+                .watchDelay(10, TimeUnit.SECONDS)
+                .buildAndInstall();
+    }
+
+    public static class ToggleableHeapDumper implements HeapDumper {
+        private final HeapDumper dumper;
+        private final SharedPreferences preferences;
+        private final String dumpingAllowanceKey;
+
+        ToggleableHeapDumper(@NonNull final Context context) {
+            LeakDirectoryProvider leakDirectoryProvider = new DefaultLeakDirectoryProvider(context);
+            this.dumper = new AndroidHeapDumper(context, leakDirectoryProvider);
+            this.preferences = PreferenceManager.getDefaultSharedPreferences(context);
+            this.dumpingAllowanceKey = context.getString(R.string.allow_heap_dumping_key);
+        }
+
+        private boolean isDumpingAllowed() {
+            return preferences.getBoolean(dumpingAllowanceKey, false);
+        }
+
+        @Override
+        public File dumpHeap() {
+            return isDumpingAllowed() ? dumper.dumpHeap() : HeapDumper.RETRY_LATER;
+        }
+    }
 }

app/src/main/AndroidManifest.xml

@@ -9,6 +9,7 @@
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
 
     <application
         android:name=".App"
@@ -16,7 +17,7 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:logo="@mipmap/ic_launcher"
-        android:theme="@style/DarkTheme"
+        android:theme="@style/OpeningTheme"
         tools:ignore="AllowBackup">
         <activity
             android:name=".MainActivity"
@@ -28,15 +29,19 @@
             </intent-filter>
         </activity>
 
-        <activity
+        <receiver android:name="androidx.media.session.MediaButtonReceiver" >
-            android:name=".player.old.PlayVideoActivity"
+            <intent-filter>
-            android:configChanges="orientation|keyboardHidden|screenSize"
+                <action android:name="android.intent.action.MEDIA_BUTTON" />
-            android:theme="@style/VideoPlayerTheme"
+            </intent-filter>
-            tools:ignore="UnusedAttribute"/>
+        </receiver>
 
         <service
             android:name=".player.BackgroundPlayer"
-            android:exported="false"/>
+            android:exported="false">
+            <intent-filter>
+                <action android:name="android.intent.action.MEDIA_BUTTON" />
+            </intent-filter>
+        </service>
 
         <activity
             android:name=".player.BackgroundPlayerActivity"
@@ -57,7 +62,7 @@
             android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
             android:label="@string/app_name"
             android:launchMode="singleTask"
-            android:theme="@style/PlayerTheme"/>
+            android:theme="@style/VideoPlayerTheme"/>
 
         <activity
             android:name=".settings.SettingsActivity"
@@ -67,9 +72,8 @@
             android:name=".about.AboutActivity"
             android:label="@string/title_activity_about"/>
 
-        <activity
+        <service android:name=".local.subscription.services.SubscriptionsImportService"/>
-            android:name=".history.HistoryActivity"
+        <service android:name=".local.subscription.services.SubscriptionsExportService"/>
-            android:label="@string/title_activity_history"/>
 
         <activity
             android:name=".PanicResponderActivity"
@@ -109,22 +113,26 @@
 
         <activity
             android:name=".ReCaptchaActivity"
-            android:label="@string/reCaptchaActivity"/>
+            android:label="@string/recaptcha"/>
 
         <provider
-            android:name="android.support.v4.content.FileProvider"
+            android:name="androidx.core.content.FileProvider"
             android:authorities="${applicationId}.provider"
             android:exported="false"
             android:grantUriPermissions="true">
             <meta-data
                 android:name="android.support.FILE_PROVIDER_PATHS"
-                android:resource="@xml/provider_paths"/>
+                android:resource="@xml/nnf_provider_paths"/>
         </provider>
 
         <activity
             android:name=".RouterActivity"
+            android:excludeFromRecents="true"
+            android:label="@string/preferred_open_action_share_menu_title"
             android:taskAffinity=""
-            android:theme="@android:style/Theme.NoDisplay">
+            android:theme="@style/RouterActivityThemeDark">
+
+            <!-- Youtube filter -->
             <intent-filter>
                 <action android:name="android.intent.action.VIEW"/>
                 <action android:name="android.media.action.MEDIA_PLAY_FROM_SEARCH"/>
@@ -146,6 +154,7 @@
                 <!-- channel prefix -->
                 <data android:pathPrefix="/channel/"/>
                 <data android:pathPrefix="/user/"/>
+                <data android:pathPrefix="/c/"/>
                 <!-- playlist prefix -->
                 <data android:pathPrefix="/playlist"/>
             </intent-filter>
@@ -170,22 +179,24 @@
                 <category android:name="android.intent.category.DEFAULT"/>
                 <category android:name="android.intent.category.BROWSABLE"/>
 
+                <data android:scheme="http"/>
+                <data android:scheme="https"/>
+                <data android:host="www.youtube-nocookie.com"/>
+                <data android:pathPrefix="/embed/"/>
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW"/>
+                <action android:name="android.media.action.MEDIA_PLAY_FROM_SEARCH"/>
+                <action android:name="android.nfc.action.NDEF_DISCOVERED"/>
+
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.BROWSABLE"/>
+
                 <data android:scheme="vnd.youtube"/>
                 <data android:scheme="vnd.youtube.launch"/>
             </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.SEND"/>
 
-                <category android:name="android.intent.category.DEFAULT"/>
+            <!-- Hooktube filter -->
-
-                <data android:mimeType="text/plain"/>
-            </intent-filter>
-        </activity>
-        <activity
-            android:name=".RouterPopupActivity"
-            android:label="@string/popup_mode_share_menu_title"
-            android:taskAffinity=""
-            android:theme="@style/PopupPermissionsTheme">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW"/>
                 <action android:name="android.media.action.MEDIA_PLAY_FROM_SEARCH"/>
@@ -196,15 +207,18 @@
 
                 <data android:scheme="http"/>
                 <data android:scheme="https"/>
-                <data android:host="youtube.com"/>
+                <data android:host="hooktube.com"/>
-                <data android:host="m.youtube.com"/>
+                <data android:host="*.hooktube.com"/>
-                <data android:host="www.youtube.com"/>
                 <!-- video prefix -->
                 <data android:pathPrefix="/v/"/>
                 <data android:pathPrefix="/embed/"/>
                 <data android:pathPrefix="/watch"/>
-                <data android:pathPrefix="/attribution_link"/>
+                <!-- channel prefix -->
+                <data android:pathPrefix="/channel/"/>
+                <data android:pathPrefix="/user/"/>
             </intent-filter>
+
+            <!-- Invidious filter -->
             <intent-filter>
                 <action android:name="android.intent.action.VIEW"/>
                 <action android:name="android.media.action.MEDIA_PLAY_FROM_SEARCH"/>
@@ -215,9 +229,32 @@
 
                 <data android:scheme="http"/>
                 <data android:scheme="https"/>
-                <data android:host="youtu.be"/>
+                <data android:host="invidio.us"/>
-                <data android:pathPrefix="/"/>
+                <data android:host="dev.invidio.us"/>
+                <data android:host="www.invidio.us"/>
+                <data android:host="invidious.snopyta.org"/>
+                <data android:host="de.invidious.snopyta.org"/>
+                <data android:host="fi.invidious.snopyta.org"/>
+                <data android:host="vid.wxzm.sx"/>
+                <data android:host="invidious.kabi.tk"/>
+                <data android:host="invidiou.sh"/>
+                <data android:host="www.invidiou.sh"/>
+                <data android:host="no.invidiou.sh"/>
+                <data android:host="invidious.enkirton.net"/>
+                <data android:host="tube.poal.co"/>
+                <data android:host="invidious.13ad.de"/>
+                <data android:host="yt.elukerio.org"/>
+                <!-- video prefix -->
+                <data android:pathPrefix="/embed/"/>
+                <data android:pathPrefix="/watch"/>
+                <!-- channel prefix -->
+                <data android:pathPrefix="/channel/"/>
+                <data android:pathPrefix="/user/"/>
+                <!-- playlist prefix -->
+                <data android:pathPrefix="/playlist"/>
             </intent-filter>
+
+            <!-- Soundcloud filter -->
             <intent-filter>
                 <action android:name="android.intent.action.VIEW"/>
                 <action android:name="android.media.action.MEDIA_PLAY_FROM_SEARCH"/>
@@ -226,14 +263,24 @@
                 <category android:name="android.intent.category.DEFAULT"/>
                 <category android:name="android.intent.category.BROWSABLE"/>
 
-                <data android:scheme="vnd.youtube"/>
+                <data android:scheme="http"/>
-                <data android:scheme="vnd.youtube.launch"/>
+                <data android:scheme="https"/>
+                <data android:host="soundcloud.com"/>
+                <data android:host="m.soundcloud.com"/>
+                <data android:host="www.soundcloud.com"/>
+                <data android:pathPrefix="/"/>
             </intent-filter>
+
+            <!-- Share filter -->
             <intent-filter>
                 <action android:name="android.intent.action.SEND"/>
                 <category android:name="android.intent.category.DEFAULT"/>
                 <data android:mimeType="text/plain"/>
             </intent-filter>
         </activity>
+
+        <service
+            android:name=".RouterActivity$FetcherService"
+            android:exported="false"/>
     </application>
-</manifest>
+</manifest>

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

@@ -1,5 +1,6 @@
 package org.schabi.newpipe;
 
+import android.annotation.TargetApi;
 import android.app.Application;
 import android.app.NotificationChannel;
 import android.app.NotificationManager;
@@ -7,8 +8,13 @@ import android.content.Context;
 import android.os.Build;
 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;
+import com.squareup.leakcanary.LeakCanary;
+import com.squareup.leakcanary.RefWatcher;
 
 import org.acra.ACRA;
 import org.acra.config.ACRAConfiguration;
@@ -16,19 +22,26 @@ import org.acra.config.ACRAConfigurationException;
 import org.acra.config.ConfigurationBuilder;
 import org.acra.sender.ReportSenderFactory;
 import org.schabi.newpipe.extractor.NewPipe;
+import org.schabi.newpipe.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;
 import java.io.InterruptedIOException;
 import java.net.SocketException;
+import java.util.Collections;
+import java.util.List;
 
 import io.reactivex.annotations.NonNull;
 import io.reactivex.exceptions.CompositeException;
+import io.reactivex.exceptions.MissingBackpressureException;
+import io.reactivex.exceptions.OnErrorNotImplementedException;
 import io.reactivex.exceptions.UndeliverableException;
 import io.reactivex.functions.Consumer;
 import io.reactivex.plugins.RxJavaPlugins;
@@ -53,9 +66,12 @@ import io.reactivex.plugins.RxJavaPlugins;
 
 public class App extends Application {
     protected static final String TAG = App.class.toString();
+    private RefWatcher refWatcher;
+    private static App app;
 
     @SuppressWarnings("unchecked")
-    private static final Class<? extends ReportSenderFactory>[] reportSenderFactoryClasses = new Class[]{AcraReportSenderFactory.class};
+    private static final Class<? extends ReportSenderFactory>[]
+            reportSenderFactoryClasses = new Class[]{AcraReportSenderFactory.class};
 
     @Override
     protected void attachBaseContext(Context base) {
@@ -68,54 +84,109 @@ public class App extends Application {
     public void onCreate() {
         super.onCreate();
 
+        if (LeakCanary.isInAnalyzerProcess(this)) {
+            // This process is dedicated to LeakCanary for heap analysis.
+            // You should not init your app in this process.
+            return;
+        }
+        refWatcher = installLeakCanary();
+
+        app = this;
+
         // Initialize settings first because others inits can use its values
         SettingsActivity.initSettings(this);
 
-        NewPipe.init(Downloader.getInstance());
+        NewPipe.init(getDownloader(),
-        NewPipeDatabase.init(this);
+                Localization.getPreferredLocalization(this),
+                Localization.getPreferredContentCountry(this));
+        Localization.init(getApplicationContext());
+
         StateSaver.init(this);
         initNotificationChannel();
 
+        ServiceHelper.initServices(this);
+
         // Initialize image loader
-        ImageLoaderConfiguration config = new ImageLoaderConfiguration.Builder(this).build();
+        ImageLoader.getInstance().init(getImageLoaderConfigurations(10, 50));
-        ImageLoader.getInstance().init(config);
 
         configureRxJavaErrorHandler();
+
+        // Check for new version
+        new CheckForNewAppVersionTask().execute();
+    }
+
+    protected Downloader getDownloader() {
+        return DownloaderImpl.init(null);
     }
 
     private void configureRxJavaErrorHandler() {
         // https://github.com/ReactiveX/RxJava/wiki/What's-different-in-2.0#error-handling
         RxJavaPlugins.setErrorHandler(new Consumer<Throwable>() {
             @Override
-            public void accept(@NonNull Throwable throwable) throws Exception {
+            public void accept(@NonNull Throwable throwable) {
-                Log.e(TAG, "RxJavaPlugins.ErrorHandler called with -> : throwable = [" + throwable.getClass().getName() + "]");
+                Log.e(TAG, "RxJavaPlugins.ErrorHandler called with -> : " +
+                        "throwable = [" + throwable.getClass().getName() + "]");
 
                 if (throwable instanceof UndeliverableException) {
                     // As UndeliverableException is a wrapper, get the cause of it to get the "real" exception
                     throwable = throwable.getCause();
                 }
 
+                final List<Throwable> errors;
                 if (throwable instanceof CompositeException) {
-                    for (Throwable element : ((CompositeException) throwable).getExceptions()) {
+                    errors = ((CompositeException) throwable).getExceptions();
-                        if (checkThrowable(element)) return;
+                } else {
+                    errors = Collections.singletonList(throwable);
+                }
+
+                for (final Throwable error : errors) {
+                    if (isThrowableIgnored(error)) return;
+                    if (isThrowableCritical(error)) {
+                        reportException(error);
+                        return;
                     }
                 }
 
-                if (checkThrowable(throwable)) return;
+                // Out-of-lifecycle exceptions should only be reported if a debug user wishes so,
+                // When exception is not reported, log it
+                if (isDisposedRxExceptionsReported()) {
+                    reportException(throwable);
+                } else {
+                    Log.e(TAG, "RxJavaPlugin: Undeliverable Exception received: ", throwable);
+                }
+            }
 
+            private boolean isThrowableIgnored(@NonNull final Throwable throwable) {
+                // Don't crash the application over a simple network problem
+                return ExtractorHelper.hasAssignableCauseThrowable(throwable,
+                        IOException.class, SocketException.class, // network api cancellation
+                        InterruptedException.class, InterruptedIOException.class); // blocking code disposed
+            }
+
+            private boolean isThrowableCritical(@NonNull final Throwable throwable) {
+                // Though these exceptions cannot be ignored
+                return ExtractorHelper.hasAssignableCauseThrowable(throwable,
+                        NullPointerException.class, IllegalArgumentException.class, // bug in app
+                        OnErrorNotImplementedException.class, MissingBackpressureException.class,
+                        IllegalStateException.class); // bug in operator
+            }
+
+            private void reportException(@NonNull final Throwable throwable) {
                 // Throw uncaught exception that will trigger the report system
                 Thread.currentThread().getUncaughtExceptionHandler()
                         .uncaughtException(Thread.currentThread(), throwable);
             }
-
-            private boolean checkThrowable(@NonNull Throwable throwable) {
-                // Don't crash the application over a simple network problem
-                return ExtractorHelper.hasAssignableCauseThrowable(throwable,
-                        IOException.class, SocketException.class, InterruptedException.class, InterruptedIOException.class);
-            }
         });
     }
 
+    private ImageLoaderConfiguration getImageLoaderConfigurations(final int memoryCacheSizeMb,
+                                                                  final int diskCacheSizeMb) {
+        return new ImageLoaderConfiguration.Builder(this)
+                .memoryCache(new LRULimitedMemoryCache(memoryCacheSizeMb * 1024 * 1024))
+                .diskCacheSize(diskCacheSizeMb * 1024 * 1024)
+                .imageDownloader(new ImageDownloader(getApplicationContext()))
+                .build();
+    }
 
     private void initACRA() {
         try {
@@ -126,7 +197,11 @@ public class App extends Application {
             ACRA.init(this, acraConfig);
         } catch (ACRAConfigurationException ace) {
             ace.printStackTrace();
-            ErrorActivity.reportError(this, ace, null, null, ErrorActivity.ErrorInfo.make(UserAction.SOMETHING_ELSE, "none",
+            ErrorActivity.reportError(this,
+                    ace,
+                    null,
+                    null,
+                    ErrorActivity.ErrorInfo.make(UserAction.SOMETHING_ELSE, "none",
                     "Could not initialize ACRA crash report", R.string.app_ui_crash));
         }
     }
@@ -146,7 +221,51 @@ public class App extends Application {
         NotificationChannel mChannel = new NotificationChannel(id, name, importance);
         mChannel.setDescription(description);
 
-        NotificationManager mNotificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
+        NotificationManager mNotificationManager =
+                (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
         mNotificationManager.createNotificationChannel(mChannel);
+
+        setUpUpdateNotificationChannel(importance);
+    }
+
+    /**
+     * Set up notification channel for app update.
+     * @param importance
+     */
+    @TargetApi(Build.VERSION_CODES.O)
+    private void setUpUpdateNotificationChannel(int importance) {
+
+        final String appUpdateId
+                = getString(R.string.app_update_notification_channel_id);
+        final CharSequence appUpdateName
+                = getString(R.string.app_update_notification_channel_name);
+        final String appUpdateDescription
+                = getString(R.string.app_update_notification_channel_description);
+
+        NotificationChannel appUpdateChannel
+                = new NotificationChannel(appUpdateId, appUpdateName, importance);
+        appUpdateChannel.setDescription(appUpdateDescription);
+
+        NotificationManager appUpdateNotificationManager
+                = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
+        appUpdateNotificationManager.createNotificationChannel(appUpdateChannel);
+    }
+
+    @Nullable
+    public static RefWatcher getRefWatcher(Context context) {
+        final App application = (App) context.getApplicationContext();
+        return application.refWatcher;
+    }
+
+    protected RefWatcher installLeakCanary() {
+        return RefWatcher.DISABLED;
+    }
+
+    protected boolean isDisposedRxExceptionsReported() {
+        return false;
+    }
+
+    public static App getApp() {
+        return app;
     }
 }

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

@@ -1,28 +1,36 @@
 package org.schabi.newpipe;
 
 import android.content.Context;
-import android.content.res.TypedArray;
 import android.os.Bundle;
-import android.support.annotation.AttrRes;
+import androidx.annotation.NonNull;
-import android.support.annotation.NonNull;
+import androidx.fragment.app.Fragment;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.FragmentManager;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.util.Log;
 import android.view.View;
 
-import com.nostra13.universalimageloader.core.DisplayImageOptions;
 import com.nostra13.universalimageloader.core.ImageLoader;
-import com.nostra13.universalimageloader.core.display.FadeInBitmapDisplayer;
+import com.squareup.leakcanary.RefWatcher;
 
 import icepick.Icepick;
+import icepick.State;
 
 public abstract class BaseFragment extends Fragment {
     protected final String TAG = getClass().getSimpleName() + "@" + Integer.toHexString(hashCode());
-    protected boolean DEBUG = MainActivity.DEBUG;
+    protected final boolean DEBUG = MainActivity.DEBUG;
 
     protected AppCompatActivity activity;
     public static final ImageLoader imageLoader = ImageLoader.getInstance();
 
+    //These values are used for controlling framgents when they are part of the frontpage
+    @State
+    protected boolean useAsFrontPage = false;
+    protected boolean mIsVisibleToUser = false;
+
+    public void useAsFrontPage(boolean value) {
+        useAsFrontPage = value;
+    }
+
     /*//////////////////////////////////////////////////////////////////////////
     // Fragment's Lifecycle
     //////////////////////////////////////////////////////////////////////////*/
@@ -67,6 +75,20 @@ public abstract class BaseFragment extends Fragment {
     protected void onRestoreInstanceState(@NonNull Bundle savedInstanceState) {
     }
 
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+
+        RefWatcher refWatcher = App.getRefWatcher(getActivity());
+        if (refWatcher != null) refWatcher.watch(this);
+    }
+
+    @Override
+    public void setUserVisibleHint(boolean isVisibleToUser) {
+        super.setUserVisibleHint(isVisibleToUser);
+        mIsVisibleToUser = isVisibleToUser;
+    }
+
     /*//////////////////////////////////////////////////////////////////////////
     // Init
     //////////////////////////////////////////////////////////////////////////*/
@@ -81,41 +103,18 @@ public abstract class BaseFragment extends Fragment {
     // Utils
     //////////////////////////////////////////////////////////////////////////*/
 
-    protected final int resolveResourceIdFromAttr(@AttrRes int attr) {
+    public void setTitle(String title) {
-        TypedArray a = activity.getTheme().obtainStyledAttributes(new int[]{attr});
+        if (DEBUG) Log.d(TAG, "setTitle() called with: title = [" + title + "]");
-        int attributeResourceId = a.getResourceId(0, 0);
+        if((!useAsFrontPage || mIsVisibleToUser)
-        a.recycle();
+            && (activity != null && activity.getSupportActionBar() != null)) {
-        return attributeResourceId;
+            activity.getSupportActionBar().setDisplayShowTitleEnabled(true);
+            activity.getSupportActionBar().setTitle(title);
+        }
     }
 
-    /*//////////////////////////////////////////////////////////////////////////
+    protected FragmentManager getFM() {
-    // DisplayImageOptions default configurations
+        return getParentFragment() == null
-    //////////////////////////////////////////////////////////////////////////*/
+                ? getFragmentManager()
-
+                : getParentFragment().getFragmentManager();
-    public static final DisplayImageOptions BASE_OPTIONS =
+    }
-            new DisplayImageOptions.Builder().cacheInMemory(true).build();
-
-    public static final DisplayImageOptions DISPLAY_AVATAR_OPTIONS =
-            new DisplayImageOptions.Builder()
-                    .cloneFrom(BASE_OPTIONS)
-                    .showImageOnLoading(R.drawable.buddy)
-                    .showImageForEmptyUri(R.drawable.buddy)
-                    .showImageOnFail(R.drawable.buddy)
-                    .build();
-
-    public static final DisplayImageOptions DISPLAY_THUMBNAIL_OPTIONS =
-            new DisplayImageOptions.Builder()
-                    .cloneFrom(BASE_OPTIONS)
-                    .displayer(new FadeInBitmapDisplayer(250))
-                    .showImageForEmptyUri(R.drawable.dummy_thumbnail)
-                    .showImageOnFail(R.drawable.dummy_thumbnail)
-                    .build();
-
-    public static final DisplayImageOptions DISPLAY_BANNER_OPTIONS =
-            new DisplayImageOptions.Builder()
-                    .cloneFrom(BASE_OPTIONS)
-                    .showImageOnLoading(R.drawable.channel_banner)
-                    .showImageForEmptyUri(R.drawable.channel_banner)
-                    .showImageOnFail(R.drawable.channel_banner)
-                    .build();
 }

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

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

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

@@ -1,167 +0,0 @@
-package org.schabi.newpipe;
-
-import android.util.Log;
-
-import org.schabi.newpipe.extractor.exceptions.ReCaptchaException;
-import org.schabi.newpipe.util.ExtractorHelper;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.InterruptedIOException;
-import java.net.URL;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-import javax.net.ssl.HttpsURLConnection;
-
-
-/*
- * 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 String mCookies = "";
-
-    private static Downloader instance = null;
-
-    private Downloader() {
-    }
-
-    public static Downloader getInstance() {
-        if (instance == null) {
-            synchronized (Downloader.class) {
-                if (instance == null) {
-                    instance = new Downloader();
-                }
-            }
-        }
-        return instance;
-    }
-
-    public static synchronized void setCookies(String cookies) {
-        Downloader.mCookies = cookies;
-    }
-
-    public static synchronized String getCookies() {
-        return Downloader.mCookies;
-    }
-
-    /**
-     * Download the text file at the supplied URL as in download(String),
-     * but set the HTTP header field "Accept-Language" to the supplied string.
-     *
-     * @param siteUrl  the URL of the text file to return the contents of
-     * @param language the language (usually a 2-character code) to set as the preferred language
-     * @return the contents of the specified text file
-     */
-    @Override
-    public String download(String siteUrl, String language) throws IOException, ReCaptchaException {
-        Map<String, String> requestProperties = new HashMap<>();
-        requestProperties.put("Accept-Language", language);
-        return download(siteUrl, requestProperties);
-    }
-
-    /**
-     * Download the text file at the supplied URL as in download(String),
-     * but set the HTTP 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 {
-        URL url = new URL(siteUrl);
-        HttpsURLConnection con = (HttpsURLConnection) url.openConnection();
-        Iterator it = customProperties.entrySet().iterator();
-        while (it.hasNext()) {
-            Map.Entry pair = (Map.Entry) it.next();
-            con.setRequestProperty((String) pair.getKey(), (String) pair.getValue());
-        }
-        return dl(con);
-    }
-
-    /**
-     * 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 {
-        URL url = new URL(siteUrl);
-        HttpsURLConnection con = (HttpsURLConnection) url.openConnection();
-        //HttpsURLConnection con = NetCipher.getHttpsURLConnection(url);
-        return dl(con);
-    }
-
-    /**
-     * Common functionality between download(String url) and download(String url, String language)
-     */
-    private static String dl(HttpsURLConnection con) throws IOException, ReCaptchaException {
-        StringBuilder response = new StringBuilder();
-        BufferedReader in = null;
-
-        try {
-            con.setReadTimeout(30 * 1000);// 30s
-            con.setRequestMethod("GET");
-            con.setRequestProperty("User-Agent", USER_AGENT);
-
-            if (getCookies().length() > 0) {
-                con.setRequestProperty("Cookie", getCookies());
-            }
-
-            in = new BufferedReader(new InputStreamReader(con.getInputStream()));
-
-            String inputLine;
-            while ((inputLine = in.readLine()) != null) {
-                response.append(inputLine);
-            }
-        } catch (Exception e) {
-            Log.e("Downloader", "dl() ----- Exception thrown → " + e.getClass().getName());
-
-            if (ExtractorHelper.isInterruptedCaused(e)) {
-                throw new InterruptedIOException(e.getMessage());
-            }
-
-            /*
-             * HTTP 429 == Too Many Request
-             * Receive from Youtube.com = ReCaptcha challenge request
-             * See : https://github.com/rg3/youtube-dl/issues/5138
-             */
-            if (con.getResponseCode() == 429) {
-                throw new ReCaptchaException("reCaptcha Challenge requested");
-            }
-
-            throw new IOException(con.getResponseCode() + " " + con.getResponseMessage(), e);
-        } finally {
-            if (in != null) {
-                in.close();
-            }
-        }
-
-        return response.toString();
-    }
-}

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

@@ -0,0 +1,220 @@
+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 10.0; WOW64; rv:68.0) Gecko/20100101 Firefox/68.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();
+        }
+
+        final String latestUrl = response.request().url().toString();
+        return new Response(response.code(), response.message(), response.headers().toMultimap(), responseBodyToReturn, latestUrl);
+    }
+
+    /**
+     * 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

@@ -0,0 +1,46 @@
+package org.schabi.newpipe;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.content.res.Resources;
+import android.preference.PreferenceManager;
+
+import com.nostra13.universalimageloader.core.download.BaseImageDownloader;
+
+import org.schabi.newpipe.extractor.NewPipe;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+public class ImageDownloader extends BaseImageDownloader {
+    private final Resources resources;
+    private final SharedPreferences preferences;
+    private final String downloadThumbnailKey;
+
+    public ImageDownloader(Context context) {
+        super(context);
+        this.resources = context.getResources();
+        this.preferences = PreferenceManager.getDefaultSharedPreferences(context);
+        this.downloadThumbnailKey = context.getString(R.string.download_thumbnail_key);
+    }
+
+    private boolean isDownloadingThumbnail() {
+        return preferences.getBoolean(downloadThumbnailKey, true);
+    }
+
+    @SuppressLint("ResourceType")
+    @Override
+    public InputStream getStream(String imageUri, Object extra) throws IOException {
+        if (isDownloadingThumbnail()) {
+            return super.getStream(imageUri, extra);
+        } else {
+            return resources.openRawResource(R.drawable.dummy_thumbnail_dark);
+        }
+    }
+
+    protected InputStream getStreamFromNetwork(String imageUri, Object extra) throws IOException {
+        final DownloaderImpl downloader = (DownloaderImpl) NewPipe.getDownloader();
+        return downloader.stream(imageUri);
+    }
+}

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

@@ -1,31 +1,42 @@
 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;
 
 import static org.schabi.newpipe.database.AppDatabase.DATABASE_NAME;
+import static org.schabi.newpipe.database.Migrations.MIGRATION_11_12;
 
 public final class NewPipeDatabase {
 
-    private static AppDatabase databaseInstance;
+    private static volatile AppDatabase databaseInstance;
 
     private NewPipeDatabase() {
         //no instance
     }
 
-    public static void init(Context context) {
+    private static AppDatabase getDatabase(Context context) {
-        databaseInstance = Room.databaseBuilder(context.getApplicationContext(),
+        return Room
-                AppDatabase.class, DATABASE_NAME
+                .databaseBuilder(context.getApplicationContext(), AppDatabase.class, DATABASE_NAME)
-        ).build();
+                .addMigrations(MIGRATION_11_12)
+                .fallbackToDestructiveMigration()
+                .build();
     }
 
     @NonNull
-    public static AppDatabase getInstance() {
+    public static AppDatabase getInstance(@NonNull Context context) {
-        if (databaseInstance == null) throw new RuntimeException("Database not initialized");
+        AppDatabase result = databaseInstance;
+        if (result == null) {
+            synchronized (NewPipeDatabase.class) {
+                result = databaseInstance;
+                if (result == null) {
+                    databaseInstance = (result = getDatabase(context));
+                }
+            }
+        }
 
-        return databaseInstance;
+        return result;
     }
 }

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

@@ -1,21 +1,25 @@
 package org.schabi.newpipe;
 
-import android.app.Activity;
 import android.content.Intent;
-import android.graphics.Bitmap;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.v4.app.NavUtils;
+import androidx.core.app.NavUtils;
-import android.support.v7.app.ActionBar;
+import androidx.appcompat.app.ActionBar;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
+import androidx.appcompat.widget.Toolbar;
+
+import android.util.Log;
+import android.view.Menu;
 import android.view.MenuItem;
 import android.webkit.CookieManager;
-import android.webkit.ValueCallback;
 import android.webkit.WebSettings;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
 
+import org.schabi.newpipe.util.ThemeHelper;
+
+import androidx.annotation.NonNull;
+
 /*
  * Created by beneth <bmauduit@beneth.fr> on 06.12.16.
  *
@@ -37,121 +41,130 @@ import android.webkit.WebViewClient;
  */
 public class ReCaptchaActivity extends AppCompatActivity {
     public static final int RECAPTCHA_REQUEST = 10;
-
+    public static final String RECAPTCHA_URL_EXTRA = "recaptcha_url_extra";
     public static final String TAG = ReCaptchaActivity.class.toString();
     public static final String YT_URL = "https://www.youtube.com";
 
+    private WebView webView;
+    private String foundCookies = "";
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
+        ThemeHelper.setTheme(this);
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_recaptcha);
-
-        // Set return to Cancel by default
-        setResult(RESULT_CANCELED);
-
         Toolbar toolbar = findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
 
-        ActionBar actionBar = getSupportActionBar();
+        String url = getIntent().getStringExtra(RECAPTCHA_URL_EXTRA);
-        if (actionBar != null) {
+        if (url == null || url.isEmpty()) {
-            actionBar.setDisplayHomeAsUpEnabled(true);
+            url = YT_URL;
-            actionBar.setTitle(R.string.reCaptcha_title);
-            actionBar.setDisplayShowTitleEnabled(true);
         }
 
-        WebView myWebView = findViewById(R.id.reCaptchaWebView);
+        // set return to Cancel by default
+        setResult(RESULT_CANCELED);
 
-        // Enable Javascript
+
-        WebSettings webSettings = myWebView.getSettings();
+        webView = findViewById(R.id.reCaptchaWebView);
+
+        // enable Javascript
+        WebSettings webSettings = webView.getSettings();
         webSettings.setJavaScriptEnabled(true);
 
-        ReCaptchaWebViewClient webClient = new ReCaptchaWebViewClient(this);
+        webView.setWebViewClient(new WebViewClient() {
-        myWebView.setWebViewClient(webClient);
+            @Override
+            public void onPageFinished(WebView view, String url) {
+                super.onPageFinished(view, url);
+                handleCookies(url);
+            }
+        });
 
-        // Cleaning cache, history and cookies from webView
+        // cleaning cache, history and cookies from webView
-        myWebView.clearCache(true);
+        webView.clearCache(true);
-        myWebView.clearHistory();
+        webView.clearHistory();
         android.webkit.CookieManager cookieManager = CookieManager.getInstance();
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            cookieManager.removeAllCookies(new ValueCallback<Boolean>() {
+            cookieManager.removeAllCookies(aBoolean -> {});
-                @Override
-                public void onReceiveValue(Boolean aBoolean) {}
-            });
         } else {
             cookieManager.removeAllCookie();
         }
 
-        myWebView.loadUrl(YT_URL);
+        webView.loadUrl(url);
     }
 
-    private class ReCaptchaWebViewClient extends WebViewClient {
+    @Override
-        private Activity context;
+    public boolean onCreateOptionsMenu(Menu menu) {
-        private String mCookies;
+        getMenuInflater().inflate(R.menu.menu_recaptcha, menu);
 
-        ReCaptchaWebViewClient(Activity ctx) {
+        ActionBar actionBar = getSupportActionBar();
-            context = ctx;
+        if (actionBar != null) {
+            actionBar.setDisplayHomeAsUpEnabled(false);
+            actionBar.setTitle(R.string.title_activity_recaptcha);
+            actionBar.setSubtitle(R.string.subtitle_activity_recaptcha);
         }
 
-        @Override
+        return true;
-        public void onPageStarted(WebView view, String url, Bitmap favicon) {
+    }
-            // TODO: Start Loader
-            super.onPageStarted(view, url, favicon);
-        }
 
-        @Override
+    @Override
-        public void onPageFinished(WebView view, String url) {
+    public void onBackPressed() {
-            String cookies = CookieManager.getInstance().getCookie(url);
+        saveCookiesAndFinish();
-
-            // TODO: Stop Loader
-
-            // find cookies : s_gl & goojf and Add cookies to Downloader
-            if (find_access_cookies(cookies)) {
-                // Give cookies to Downloader class
-                Downloader.setCookies(mCookies);
-
-                // Closing activity and return to parent
-                setResult(RESULT_OK);
-                finish();
-            }
-        }
-
-        private boolean find_access_cookies(String cookies) {
-            boolean ret = false;
-            String c_s_gl = "";
-            String c_goojf = "";
-
-            String[] parts = cookies.split("; ");
-            for (String part : parts) {
-                if (part.trim().startsWith("s_gl")) {
-                    c_s_gl = part.trim();
-                }
-                if (part.trim().startsWith("goojf")) {
-                    c_goojf = part.trim();
-                }
-            }
-            if (c_s_gl.length() > 0 && c_goojf.length() > 0) {
-                ret = true;
-                //mCookies = c_s_gl + "; " + c_goojf;
-                // Youtube seems to also need the other cookies:
-                mCookies = cookies;
-            }
-
-            return ret;
-        }
     }
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         int id = item.getItemId();
         switch (id) {
-            case android.R.id.home: {
+            case R.id.menu_item_done:
-                Intent intent = new Intent(this, org.schabi.newpipe.MainActivity.class);
+                saveCookiesAndFinish();
-                intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
-                NavUtils.navigateUpTo(this, intent);
                 return true;
-            }
             default:
                 return false;
         }
     }
+
+    private void saveCookiesAndFinish() {
+        handleCookies(webView.getUrl()); // try to get cookies of unclosed page
+        if (!foundCookies.isEmpty()) {
+            // give cookies to Downloader class
+            DownloaderImpl.getInstance().setCookies(foundCookies);
+            setResult(RESULT_OK);
+        }
+
+        Intent intent = new Intent(this, org.schabi.newpipe.MainActivity.class);
+        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+        NavUtils.navigateUpTo(this, intent);
+    }
+
+
+
+    private void handleCookies(String url) {
+        String cookies = CookieManager.getInstance().getCookie(url);
+        if (MainActivity.DEBUG) Log.d(TAG, "handleCookies: url=" + url + "; cookies=" + (cookies == null ? "null" : cookies));
+        if (cookies == null) return;
+
+        addYoutubeCookies(cookies);
+        // add other methods to extract cookies here
+    }
+
+    private void addYoutubeCookies(@NonNull String cookies) {
+        if (cookies.contains("s_gl=") || cookies.contains("goojf=") || cookies.contains("VISITOR_INFO1_LIVE=")) {
+            // youtube seems to also need the other cookies:
+            addCookie(cookies);
+        }
+    }
+
+    private void addCookie(String cookie) {
+        if (foundCookies.contains(cookie)) {
+            return;
+        }
+
+        if (foundCookies.isEmpty() || foundCookies.endsWith("; ")) {
+            foundCookies += cookie;
+        } else if (foundCookies.endsWith(";")) {
+            foundCookies += " " + cookie;
+        } else {
+            foundCookies += "; " + cookie;
+        }
+    }
 }