downgrade gralde wrapper to 4.2

Translated using Weblate (Chinese (Hong Kong))
Currently translated at 68.9% (142 of 206 strings)
2025-09-19 23:40:51 +02:00 · 2017-10-23 14:59:30 +02:00 · 2017-10-22 09:44:44 +02:00 · 2017-10-21 01:46:12 +02:00 · 2017-10-19 22:34:40 +02:00 · 2017-10-19 22:34:36 +02:00
364 changed files with 20548 additions and 10856 deletions
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -1,39 +1,43 @@
 NewPipe contribution guidelines
 ===============================

-READ THIS GUIDELINES CAREFULLY BEFORE CONTRIBUTING.
+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 if a crash occures.
+Do not report crashes in the GitHub issue tracker. NewPipe has an automated crash report system that will ask you to send a report 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 request
+## Issue reporting/feature requests

-* Search the [existing issues](https://github.com/theScrabi/NewPipe/issues) first to make sure your issue/feature hasn't been reported/requested before
-* Check if this issue/feature is already fixed/implemented in the repository
-* If you are an android/java developer you are always welcome to fix/implement an issue/a feature yourself
+* 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
+* 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.

-## Bugfixing
-* If you want to help NewPipe getting bug free, you can send me a mail to tnp@newpipe.schabi.org to let me know that you intent to help, and than register at our [sentry](https://support.schabi.org) setup. 
+## 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.

 ## Translation

-* NewPipe can be translated on [weblate](https://hosted.weblate.org/projects/newpipe/strings/)
+* 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 style guidelines (just look the other code and than do it the same way :) )
-* Do not bring nonfree software/binary blobs into the project (keep it google free)
-* Stick to [f-droid contribution guidelines](https://f-droid.org/wiki/page/Inclusion_Policy)
-* Make changes on a separate branch, not on the master branch (Feature-branching)
-* When submitting changes, you agree that your code will be licensed under GPLv3
-* Please test (compile and run) your code before you submit changes!!!
-* Try to figure out you selves why CI fails, or why a merge request collides
-* Please maintain your code after you contributed it.
-* Respond yourselves if someone request changes or notifies issues
+* 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.
+* 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.
+* When submitting changes, you confirm that your code is licensed under the terms of the [GNU General Public License v3](https://www.gnu.org/licenses/gpl-3.0.html).
+* Please test (compile and run) your code before you submit changes! Ideally, provide test feedback in the PR description. Untested code will **not** be merged!
+* Try to figure out yourself why builds on our CI fail.
+* Make sure your PR is up-to-date with the rest of the code. Often, a simple click on "Update branch" will do the job, but if not, you are asked to merge the master branch manually and resolve the problems on your own. That will make the maintainers' jobs way easier.
+* Please show intention to maintain your features and code after you contributed it. Unmaintained code is a hassle for the core developers, and just adds work. If you do not intend to maintain features you contributed, please think again about sumission, or clearly state that in the description of your PR.
+* Respond yourselves if someone requests changes or otherwise raises issues about your PRs.

 ## Communication

 * WE DO NOW HAVE A MAILING LIST: [newpipe@list.schabi.org](https://list.schabi.org/cgi-bin/mailman/listinfo/newpipe).
-* If you want to get in contact with me or one of our other contributors you can send me an email at tnp(at)schabi.org
-* Feel free to post suggestions, changes, ideas etc!
+* There is an IRC channel on Freenode which is regularly visited by the core team and other developers: [#newpipe](irc:irc.freenode.net/newpipe). [Click here for Webchat](https://webchat.freenode.net/?channels=newpipe)!
+* If you want to get in touch with the core team or one of our other contributors you can send an email to tnp(at)schabi.org. Please do not send issue reports, they will be ignored and remain unanswered! Use the GitHub issue tracker described above!
+* Feel free to post suggestions, changes, ideas etc. on GitHub, IRC or the mailing list!
--- a/.github/PULL_REQUEST_TEAMPLATE.md
+++ b/.github/PULL_REQUEST_TEAMPLATE.md
@@ -1 +0,0 @@
-[ ] I carefully reed the [contribution guidelines](https://github.com/TeamNewPipe/NewPipe/blob/HEAD/.github/CONTRIBUTING.md) and agree to them.
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1 @@
+- [ ] I carefully reed the [contribution guidelines](https://github.com/TeamNewPipe/NewPipe/blob/HEAD/.github/CONTRIBUTING.md) and agree to them.
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@
 /*.iml
 gradle.properties
 *~
+.weblate
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,16 +5,12 @@ android:
  components:
    # The BuildTools version used by NewPipe
    - tools
-    - build-tools-25.0.2
+    - build-tools-26.0.1

    # The SDK version used to compile NewPipe
-    - android-25
-
-    # Additional components
-    - extra-android-m2repository
+    - android-26

 script: ./gradlew -Dorg.gradle.jvmargs=-Xmx1536m assembleDebug lintDebug testDebugUnitTest

 licenses:
  - '.+'
-
--- a/README.md
+++ b/README.md
@@ -1,29 +1,32 @@
+<p align="center"><a href="https://newpipe.schabi.org"><img src="assets/new_pipe_icon_5.png" width="150"/></a></p> 
+<h2 align="center"><b>NewPipe</b></h2>
+<h4 align="center">A free lightweight YouTube frontend for Android.</h4>
+<p align="center"><a href="https://f-droid.org/packages/org.schabi.newpipe/"><img src="https://f-droid.org/wiki/images/0/06/F-Droid-button_get-it-on.png"/></a></p> 
+
+<p align="center">
+<a href="https://github.com/TeamNewPipe/NewPipe" alt="GitHub release"><img src="https://img.shields.io/github/release/TeamNewPipe/NewPipe.svg" /></a>
+<a href="https://www.gnu.org/licenses/gpl-3.0" alt="License: GPL v3"><img src="https://img.shields.io/badge/License-GPL%20v3-blue.svg" /></a>
+<a href="https://travis-ci.org/TeamNewPipe/NewPipe" alt="Build Status"><img src="https://travis-ci.org/TeamNewPipe/NewPipe.svg" /></a>
+<a href="https://hosted.weblate.org/engage/NewPipe/" alt="Translation Status"><img src="https://hosted.weblate.org/widgets/NewPipe/-/svg-badge.svg" /></a>
+<a href="http://webchat.freenode.net/?channels=%23newpipe" alt="IRC channel: #newpipe"><img src="https://img.shields.io/badge/IRC%20chat-%23newpipe-brightgreen.svg" /></a>
+</p>
+<hr />
+<p align="center"><a href="#screenshots">Screenshots</a> &bull; <a href="#description">Description</a> &bull; <a href="#features">Features</a> &bull; <a href="#contribution">Contribution</a> &bull; <a href="#donate">Donate</a> &bull; <a href="#license">License</a></p>
+<hr />
 WARNING: PUTTING NEWPIPE OR ANY FORK OF IT INTO GOOGLE PLAYSTORE VIOLATES THEIR TERMS OF CONDITIONS.

-# NewPipe
-NewPipe: A free lightweight Youtube frontend for Android.  
-
-[![NewPipe](app/src/main/res/mipmap-xhdpi/ic_launcher.png)](https://newpipe.schabi.org)
-[![F-Droid](https://f-droid.org/wiki/images/0/06/F-Droid-button_get-it-on.png)](https://f-droid.org/repository/browse/?fdfilter=newpipe&fdid=org.schabi.newpipe)
-
-
-Project status:
-[![Translation Status](https://hosted.weblate.org/widgets/NewPipe/-/svg-badge.svg)](https://hosted.weblate.org/engage/NewPipe/)
-[![Build Status](https://travis-ci.org/TeamNewPipe/NewPipe.svg)](https://travis-ci.org/TeamNewPipe/NewPipe)
-
-## Donate
-![Bitcoin](https://bitcoin.org/img/icons/logotop.svg)
-![BitcoinQR](assets/16A9J59ahMRqkLSZjhYj33n9j3fMztFxnh.png)
-
-`16A9J59ahMRqkLSZjhYj33n9j3fMztFxnh`
-
 ## Screenshots

-[<img src="screenshots/screenshot_1.png" width=160>](screenshots/screenshot_1.png)
-[<img src="screenshots/screenshot_2.png" width=160>](screenshots/screenshot_2.png)
-[<img src="screenshots/screenshot_3.png" width=160>](screenshots/screenshot_3.png)
-[<img src="screenshots/screenshot_4.png" width=160>](screenshots/screenshot_4.png)
-[<img src="screenshots/screenshot_5.png" width=160>](screenshots/screenshot_5.png)
+[<img src="screenshots/shot_1.png" width=160>](screenshots/shot_1.png)
+[<img src="screenshots/shot_2.png" width=160>](screenshots/shot_2.png)
+[<img src="screenshots/shot_3.png" width=160>](screenshots/shot_3.png)
+[<img src="screenshots/shot_4.png" width=160>](screenshots/shot_4.png)
+[<img src="screenshots/shot_5.png" width=160>](screenshots/shot_5.png)
+[<img src="screenshots/shot_6.png" width=160>](screenshots/shot_6.png)
+[<img src="screenshots/shot_7.png" width=160>](screenshots/shot_7.png)
+[<img src="screenshots/shot_8.png" width=160>](screenshots/shot_8.png)
+[<img src="screenshots/shot_9.png" width=160>](screenshots/shot_9.png)
+[<img src="screenshots/shot_10.png" width=160>](screenshots/shot_10.png)

 ## Description

@@ -34,7 +37,7 @@ NewPipe does not use any Google framework libraries, or the YouTube API. It only
 * Search videos
 * Display general information about a video
 * Watch YouTube videos
-* Listen to YouTube videos (experimental)
+* Listen to YouTube videos
 * Popup mode (floating player)
 * Select the streaming player to watch the video with
 * Download videos 
@@ -42,21 +45,23 @@ NewPipe does not use any Google framework libraries, or the YouTube API. It only
 * Open a video in Kodi
 * Show Next/Related videos
 * Search YouTube in a specific language
-* Watch age restricted material
+* Watch/Block age restricted material
 * Display general information about channels
 * Search channels
 * Watch videos from a channel
 * Orbot/Tor support (not yet directly)
 * 1080p/2k/4k support
+* View history
+* Subscribe to channels
+* Search history
+* Search/Watch Playlists

 ### Coming Features

+* Multiservice support (eg. SoundCloud)
 * Bookmarks
-* View history
-* Search history
-* Subscribe to channels
-* Search/Watch Playlists
-* Queeing videos
+* Watch as queues Playlists
+* Queuing videos
 * Subtitles support
 * livestream support
 * ... and many more
@@ -65,11 +70,27 @@ NewPipe does not use any Google framework libraries, or the YouTube API. It only
 Although NewPipe only supports YouTube at the moment, it's designed to support many more streaming services. The plan is, that NewPipe will get such support by the version 2.0.

 ## Contribution
-Whether you have ideas, translation, design changes, code cleaning, or real heavy code changes, help is always welcome.
+Whether you have ideas, translations, design changes, code cleaning, or real heavy code changes, help is always welcome.
 The more is done the better it gets!

 If you'd like to get involved, check our [contribution notes](.github/CONTRIBUTING.md).

+## Donate
+If you like NewPipe we'd be happy about a donation. You can either donate via Bitcoin or BountySource. For further information about donating to NewPipe, please visit our [website](https://newpipe.schabi.org/donate/).
+
+<table>
+<tr>
+<td><img src="https://bitcoin.org/img/icons/logotop.svg" alt="Bitcoin" /></td>
+<td><img src="assets/bitcoin_qr_code.png" alt="Bitcoin QR Code" width="100px"/></td>
+<td><samp>16A9J59ahMRqkLSZjhYj33n9j3fMztFxnh</samp></td>
+</tr>
+<tr>
+<td><a href="https://www.bountysource.com/teams/newpipe"><img src="https://upload.wikimedia.org/wikipedia/commons/thumb/2/22/Bountysource.png/320px-Bountysource.png" alz="Bountysource" width="190px" /></a></td>
+<td><a href="https://www.bountysource.com/teams/newpipe"><img src="assets/bountysource_qr_code.png" alt="Visit NewPipe at bountysource.com" width="100px"/></a></td>
+<td><a href="https://www.bountysource.com/teams/newpipe/issues"><img src="https://img.shields.io/bountysource/team/newpipe/activity.svg?colorB=cd201f" height="30px" alt="Check out how many bounties you can earn." /></a></td>
+</tr>
+</table>
+
 ## License
 [![GNU GPLv3 Image](https://www.gnu.org/graphics/gplv3-127x51.png)](http://www.gnu.org/licenses/gpl-3.0.en.html)  

--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,21 +1,34 @@
 apply plugin: 'com.android.application'

 android {
-    compileSdkVersion 25
-    buildToolsVersion '25.0.2'
+    compileSdkVersion 26
+    buildToolsVersion '26.0.1'

    defaultConfig {
        applicationId "org.schabi.newpipe"
        minSdkVersion 15
-        targetSdkVersion 25
-        versionCode 32
-        versionName "0.9.5"
+        targetSdkVersion 26
+        versionCode 39
+        versionName "0.10.1"
+
+        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        vectorDrawables.useSupportLibrary = true
    }
    buildTypes {
        release {
-            minifyEnabled false
+            minifyEnabled true
+            shrinkResources true
            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
        }
+        debug {
+            multiDexEnabled true
+
+            debuggable true
+            applicationIdSuffix ".debug"
+        }
+        beta {
+            applicationIdSuffix ".beta"
+        }
    }

    lintOptions {
@@ -31,24 +44,42 @@ android {
 }

 dependencies {
+    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2') {
+        exclude module: 'support-annotations'
+    }
+
+    compile 'com.github.TeamNewPipe:NewPipeExtractor:1df3f67'
+
    testCompile 'junit:junit:4.12'
    testCompile 'org.mockito:mockito-core:1.10.19'
-    testCompile 'org.json:json:20160810'

-    compile 'com.android.support:appcompat-v7:25.3.1'
-    compile 'com.android.support:support-v4:25.3.1'
-    compile 'com.android.support:design:25.3.1'
-    compile 'com.android.support:recyclerview-v7:25.3.1'
+    compile 'com.android.support:appcompat-v7:26.0.1'
+    compile 'com.android.support:support-v4:26.0.1'
+    compile 'com.android.support:design:26.0.1'
+    compile 'com.android.support:recyclerview-v7:26.0.1'
+    compile 'com.android.support:preference-v14:26.0.1'

    compile 'com.google.code.gson:gson:2.7'
-    compile 'org.jsoup:jsoup:1.8.3'
-    compile 'org.mozilla:rhino:1.7.7'
    compile 'ch.acra:acra:4.9.0'
-    compile 'info.guardianproject.netcipher:netcipher:1.2'

    compile 'com.nostra13.universalimageloader:universal-image-loader:1.9.5'
-    compile 'de.hdodenhof:circleimageview:2.0.0'
+    compile 'de.hdodenhof:circleimageview:2.1.0'
    compile 'com.github.nirhart:parallaxscroll:1.0'
-    compile 'com.nononsenseapps:filepicker:3.0.0'
-    compile 'com.google.android.exoplayer:exoplayer:r2.3.1'
+    compile 'com.nononsenseapps:filepicker:3.0.1'
+    compile 'com.google.android.exoplayer:exoplayer:r2.5.1'
+
+    debugCompile 'com.facebook.stetho:stetho:1.5.0'
+    debugCompile 'com.facebook.stetho:stetho-urlconnection:1.5.0'
+    debugCompile 'com.android.support:multidex:1.0.1'
+
+    compile 'io.reactivex.rxjava2:rxjava:2.1.2'
+    compile 'io.reactivex.rxjava2:rxandroid:2.0.1'
+    compile 'com.jakewharton.rxbinding2:rxbinding:2.0.0'
+
+    compile 'android.arch.persistence.room:runtime:1.0.0-alpha8'
+    compile 'android.arch.persistence.room:rxjava2:1.0.0-alpha8'
+    annotationProcessor 'android.arch.persistence.room:compiler:1.0.0-alpha8'
+
+    compile 'frankiesardo:icepick:3.2.0'
+    provided 'frankiesardo:icepick-processor:3.2.0'
 }
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -15,3 +15,23 @@
 #-keepclassmembers class fqcn.of.javascript.interface.for.webview {
 #   public *;
 #}
+
+-dontobfuscate
+-keep class org.mozilla.javascript.** { *; }
+
+-keep class org.mozilla.classfile.ClassFileWriter
+-keep class com.google.android.exoplayer2.** { *; }
+
+-dontwarn org.mozilla.javascript.tools.**
+-dontwarn android.arch.util.paging.CountedDataSource
+-dontwarn android.arch.persistence.room.paging.LimitOffsetDataSource
+
+
+# Rules for icepick. Copy paste from https://github.com/frankiesardo/icepick
+-dontwarn icepick.**
+-keep class icepick.** { *; }
+-keep class **$$Icepick { *; }
+-keepclasseswithmembernames class * {
+    @icepick.* <fields>;
+}
+-keepnames class * { @icepick.State *;}
--- a/app/src/androidTest/java/org/schabi/newpipe/report/ErrorInfoTest.java
+++ b/app/src/androidTest/java/org/schabi/newpipe/report/ErrorInfoTest.java
@@ -0,0 +1,37 @@
+package org.schabi.newpipe.report;
+
+import android.os.Parcel;
+import android.support.test.filters.LargeTest;
+import android.support.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.report.ErrorActivity.ErrorInfo;
+
+import static org.junit.Assert.assertEquals;
+
+/**
+ * Instrumented tests for {@link ErrorInfo}
+ */
+@RunWith(AndroidJUnit4.class)
+@LargeTest
+public class ErrorInfoTest {
+
+    @Test
+    public void errorInfo_testParcelable() {
+        ErrorInfo info = ErrorInfo.make(UserAction.USER_REPORT, "youtube", "request", R.string.general_error);
+        // Obtain a Parcel object and write the parcelable object to it:
+        Parcel parcel = Parcel.obtain();
+        info.writeToParcel(parcel, 0);
+        parcel.setDataPosition(0);
+        ErrorInfo infoFromParcel = ErrorInfo.CREATOR.createFromParcel(parcel);
+
+        assertEquals(UserAction.USER_REPORT, infoFromParcel.userAction);
+        assertEquals("youtube", infoFromParcel.serviceName);
+        assertEquals("request", infoFromParcel.request);
+        assertEquals(R.string.general_error, infoFromParcel.message);
+
+        parcel.recycle();
+    }
+}
--- a/app/src/beta/AndroidManifest.xml
+++ b/app/src/beta/AndroidManifest.xml
@@ -0,0 +1,10 @@
+<?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>
--- a/app/src/beta/res/mipmap-hdpi/ic_launcher.png
+++ b/app/src/beta/res/mipmap-hdpi/ic_launcher.png
--- a/app/src/beta/res/mipmap-mdpi/ic_launcher.png
+++ b/app/src/beta/res/mipmap-mdpi/ic_launcher.png
--- a/app/src/beta/res/mipmap-xhdpi/ic_launcher.png
+++ b/app/src/beta/res/mipmap-xhdpi/ic_launcher.png
--- a/app/src/beta/res/mipmap-xxhdpi/ic_launcher.png
+++ b/app/src/beta/res/mipmap-xxhdpi/ic_launcher.png
--- a/app/src/beta/res/mipmap-xxxhdpi/ic_launcher.png
+++ b/app/src/beta/res/mipmap-xxxhdpi/ic_launcher.png
--- a/app/src/debug/AndroidManifest.xml
+++ b/app/src/debug/AndroidManifest.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    package="org.schabi.newpipe">
+
+    <application
+        android:name=".DebugApp"
+        android:label="NewPipe Debug"
+        tools:replace="android:name, android:label">
+        <activity
+            android:name=".MainActivity"
+            android:label="NewPipe Debug"
+            tools:replace="android:label"/>
+    </application>
+
+</manifest>
--- a/app/src/debug/java/org/schabi/newpipe/DebugApp.java
+++ b/app/src/debug/java/org/schabi/newpipe/DebugApp.java
@@ -0,0 +1,45 @@
+package org.schabi.newpipe;
+
+import android.content.Context;
+import android.support.multidex.MultiDex;
+
+import com.facebook.stetho.Stetho;
+
+public class DebugApp extends App {
+    private static final String TAG = DebugApp.class.toString();
+
+    @Override
+    protected void attachBaseContext(Context base) {
+        super.attachBaseContext(base);
+        MultiDex.install(this);
+    }
+
+    @Override
+    public void onCreate() {
+        super.onCreate();
+
+        initStetho();
+    }
+
+    private void initStetho() {
+        // Create an InitializerBuilder
+        Stetho.InitializerBuilder initializerBuilder =
+                Stetho.newInitializerBuilder(this);
+
+        // Enable Chrome DevTools
+        initializerBuilder.enableWebKitInspector(
+                Stetho.defaultInspectorModulesProvider(this)
+        );
+
+        // Enable command line interface
+        initializerBuilder.enableDumpapp(
+                Stetho.defaultDumperPluginsProvider(getApplicationContext())
+        );
+
+        // Use the InitializerBuilder to generate an Initializer
+        Stetho.Initializer initializer = initializerBuilder.build();
+
+        // Initialize Stetho with the Initializer
+        Stetho.initialize(initializer);
+    }
+}
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
--- a/app/src/main/assets/apache2.html
+++ b/app/src/main/assets/apache2.html
@@ -0,0 +1,162 @@
+<!doctype html>
+<html lang="en">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>Apache License - Version 2.0, January 2004</title>
+</head>
+<body>
+<p>Apache License<br>Version 2.0, January 2004<br>
+    <a href="http://www.apache.org/licenses/">http://www.apache.org/licenses/</a> </p>
+<p>TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION</p>
+<p><strong><a name="definitions">1. Definitions</a></strong>.</p>
+<p>"License" shall mean the terms and conditions for use, reproduction, and
+    distribution as defined by Sections 1 through 9 of this document.</p>
+<p>"Licensor" shall mean the copyright owner or entity authorized by the
+    copyright owner that is granting the License.</p>
+<p>"Legal Entity" shall mean the union of the acting entity and all other
+    entities that control, are controlled by, or are under common control with
+    that entity. For the purposes of this definition, "control" means (i) the
+    power, direct or indirect, to cause the direction or management of such
+    entity, whether by contract or otherwise, or (ii) ownership of fifty
+    percent (50%) or more of the outstanding shares, or (iii) beneficial
+    ownership of such entity.</p>
+<p>"You" (or "Your") shall mean an individual or Legal Entity exercising
+    permissions granted by this License.</p>
+<p>"Source" form shall mean the preferred form for making modifications,
+    including but not limited to software source code, documentation source,
+    and configuration files.</p>
+<p>"Object" form shall mean any form resulting from mechanical transformation
+    or translation of a Source form, including but not limited to compiled
+    object code, generated documentation, and conversions to other media types.</p>
+<p>"Work" shall mean the work of authorship, whether in Source or Object form,
+    made available under the License, as indicated by a copyright notice that
+    is included in or attached to the work (an example is provided in the
+    Appendix below).</p>
+<p>"Derivative Works" shall mean any work, whether in Source or Object form,
+    that is based on (or derived from) the Work and for which the editorial
+    revisions, annotations, elaborations, or other modifications represent, as
+    a whole, an original work of authorship. For the purposes of this License,
+    Derivative Works shall not include works that remain separable from, or
+    merely link (or bind by name) to the interfaces of, the Work and Derivative
+    Works thereof.</p>
+<p>"Contribution" shall mean any work of authorship, including the original
+    version of the Work and any modifications or additions to that Work or
+    Derivative Works thereof, that is intentionally submitted to Licensor for
+    inclusion in the Work by the copyright owner or by an individual or Legal
+    Entity authorized to submit on behalf of the copyright owner. For the
+    purposes of this definition, "submitted" means any form of electronic,
+    verbal, or written communication sent to the Licensor or its
+    representatives, including but not limited to communication on electronic
+    mailing lists, source code control systems, and issue tracking systems that
+    are managed by, or on behalf of, the Licensor for the purpose of discussing
+    and improving the Work, but excluding communication that is conspicuously
+    marked or otherwise designated in writing by the copyright owner as "Not a
+    Contribution."</p>
+<p>"Contributor" shall mean Licensor and any individual or Legal Entity on
+    behalf of whom a Contribution has been received by Licensor and
+    subsequently incorporated within the Work.</p>
+<p><strong><a name="copyright">2. Grant of Copyright License</a></strong>. Subject to the
+    terms and conditions of this License, each Contributor hereby grants to You
+    a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+    copyright license to reproduce, prepare Derivative Works of, publicly
+    display, publicly perform, sublicense, and distribute the Work and such
+    Derivative Works in Source or Object form.</p>
+<p><strong><a name="patent">3. Grant of Patent License</a></strong>. Subject to the terms
+    and conditions of this License, each Contributor hereby grants to You a
+    perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+    (except as stated in this section) patent license to make, have made, use,
+    offer to sell, sell, import, and otherwise transfer the Work, where such
+    license applies only to those patent claims licensable by such Contributor
+    that are necessarily infringed by their Contribution(s) alone or by
+    combination of their Contribution(s) with the Work to which such
+    Contribution(s) was submitted. If You institute patent litigation against
+    any entity (including a cross-claim or counterclaim in a lawsuit) alleging
+    that the Work or a Contribution incorporated within the Work constitutes
+    direct or contributory patent infringement, then any patent licenses
+    granted to You under this License for that Work shall terminate as of the
+    date such litigation is filed.</p>
+<p><strong><a name="redistribution">4. Redistribution</a></strong>. You may reproduce and
+    distribute copies of the Work or Derivative Works thereof in any medium,
+    with or without modifications, and in Source or Object form, provided that
+    You meet the following conditions:</p>
+<ol style="list-style: lower-latin;">
+    <li>You must give any other recipients of the Work or Derivative Works a
+        copy of this License; and</li>
+
+    <li>You must cause any modified files to carry prominent notices stating
+        that You changed the files; and</li>
+
+    <li>You must retain, in the Source form of any Derivative Works that You
+        distribute, all copyright, patent, trademark, and attribution notices from
+        the Source form of the Work, excluding those notices that do not pertain to
+        any part of the Derivative Works; and</li>
+
+    <li>If the Work includes a "NOTICE" text file as part of its distribution,
+        then any Derivative Works that You distribute must include a readable copy
+        of the attribution notices contained within such NOTICE file, excluding
+        those notices that do not pertain to any part of the Derivative Works, in
+        at least one of the following places: within a NOTICE text file distributed
+        as part of the Derivative Works; within the Source form or documentation,
+        if provided along with the Derivative Works; or, within a display generated
+        by the Derivative Works, if and wherever such third-party notices normally
+        appear. The contents of the NOTICE file are for informational purposes only
+        and do not modify the License. You may add Your own attribution notices
+        within Derivative Works that You distribute, alongside or as an addendum to
+        the NOTICE text from the Work, provided that such additional attribution
+        notices cannot be construed as modifying the License.
+        <br/>
+        <br/>
+        You may add Your own copyright statement to Your modifications and may
+        provide additional or different license terms and conditions for use,
+        reproduction, or distribution of Your modifications, or for any such
+        Derivative Works as a whole, provided Your use, reproduction, and
+        distribution of the Work otherwise complies with the conditions stated in
+        this License.
+    </li>
+
+</ol>
+
+<p><strong><a name="contributions">5. Submission of Contributions</a></strong>. Unless You
+    explicitly state otherwise, any Contribution intentionally submitted for
+    inclusion in the Work by You to the Licensor shall be under the terms and
+    conditions of this License, without any additional terms or conditions.
+    Notwithstanding the above, nothing herein shall supersede or modify the
+    terms of any separate license agreement you may have executed with Licensor
+    regarding such Contributions.</p>
+<p><strong><a name="trademarks">6. Trademarks</a></strong>. This License does not grant
+    permission to use the trade names, trademarks, service marks, or product
+    names of the Licensor, except as required for reasonable and customary use
+    in describing the origin of the Work and reproducing the content of the
+    NOTICE file.</p>
+<p><strong><a name="no-warranty">7. Disclaimer of Warranty</a></strong>. Unless required by
+    applicable law or agreed to in writing, Licensor provides the Work (and
+    each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT
+    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including,
+    without limitation, any warranties or conditions of TITLE,
+    NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You
+    are solely responsible for determining the appropriateness of using or
+    redistributing the Work and assume any risks associated with Your exercise
+    of permissions under this License.</p>
+<p><strong><a name="no-liability">8. Limitation of Liability</a></strong>. In no event and
+    under no legal theory, whether in tort (including negligence), contract, or
+    otherwise, unless required by applicable law (such as deliberate and
+    grossly negligent acts) or agreed to in writing, shall any Contributor be
+    liable to You for damages, including any direct, indirect, special,
+    incidental, or consequential damages of any character arising as a result
+    of this License or out of the use or inability to use the Work (including
+    but not limited to damages for loss of goodwill, work stoppage, computer
+    failure or malfunction, or any and all other commercial damages or losses),
+    even if such Contributor has been advised of the possibility of such
+    damages.</p>
+<p><strong><a name="additional">9. Accepting Warranty or Additional Liability</a></strong>.
+    While redistributing the Work or Derivative Works thereof, You may choose
+    to offer, and charge a fee for, acceptance of support, warranty, indemnity,
+    or other liability obligations and/or rights consistent with this License.
+    However, in accepting such obligations, You may act only on Your own behalf
+    and on Your sole responsibility, not on behalf of any other Contributor,
+    and only if You agree to indemnify, defend, and hold each Contributor
+    harmless for any liability incurred by, or claims asserted against, such
+    Contributor by reason of your accepting any such warranty or additional
+    liability.</p>
+</body>
+</html>
--- a/app/src/main/assets/gpl_2.html
+++ b/app/src/main/assets/gpl_2.html
--- a/app/src/main/assets/gpl_3.html
+++ b/app/src/main/assets/gpl_3.html
--- a/app/src/main/assets/mit.html
+++ b/app/src/main/assets/mit.html
@@ -0,0 +1,26 @@
+<html>
+<head></head>
+<body>
+<p>Copyright (c) &lt;year&gt; &lt;copyright holders&gt;</p>
+
+<p>Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:</p>
+
+<p>
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.</p>
+<p>
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.<br />
+NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.</p>
+</body>
+</html>
--- a/app/src/main/assets/mpl2.html
+++ b/app/src/main/assets/mpl2.html
--- a/app/src/main/java/org/schabi/newpipe/ActivityCommunicator.java
+++ b/app/src/main/java/org/schabi/newpipe/ActivityCommunicator.java
@@ -1,6 +1,6 @@
 package org.schabi.newpipe;

-/**
+/*
 * Created by Christian Schabesberger on 24.12.15.
 *
 * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
--- a/app/src/main/java/org/schabi/newpipe/App.java
+++ b/app/src/main/java/org/schabi/newpipe/App.java
@@ -1,7 +1,11 @@
 package org.schabi.newpipe;

 import android.app.Application;
+import android.app.NotificationChannel;
+import android.app.NotificationManager;
 import android.content.Context;
+import android.os.Build;
+import android.util.Log;

 import com.nostra13.universalimageloader.core.ImageLoader;
 import com.nostra13.universalimageloader.core.ImageLoaderConfiguration;
@@ -14,13 +18,22 @@ import org.acra.sender.ReportSenderFactory;
 import org.schabi.newpipe.extractor.NewPipe;
 import org.schabi.newpipe.report.AcraReportSenderFactory;
 import org.schabi.newpipe.report.ErrorActivity;
+import org.schabi.newpipe.report.UserAction;
 import org.schabi.newpipe.settings.SettingsActivity;
-import org.schabi.newpipe.util.ThemeHelper;
+import org.schabi.newpipe.util.ExtractorHelper;
+import org.schabi.newpipe.util.StateSaver;

-import info.guardianproject.netcipher.NetCipher;
-import info.guardianproject.netcipher.proxy.OrbotHelper;
+import java.io.IOException;
+import java.io.InterruptedIOException;
+import java.net.SocketException;

-/**
+import io.reactivex.annotations.NonNull;
+import io.reactivex.exceptions.CompositeException;
+import io.reactivex.exceptions.UndeliverableException;
+import io.reactivex.functions.Consumer;
+import io.reactivex.plugins.RxJavaPlugins;
+
+/*
 * Copyright (C) Hans-Christoph Steiner 2016 <hans@eds.org>
 * App.java is part of NewPipe.
 *
@@ -39,73 +52,101 @@ import info.guardianproject.netcipher.proxy.OrbotHelper;
 */

 public class App extends Application {
-    private static final String TAG = App.class.toString();
+    protected static final String TAG = App.class.toString();

-    private static boolean useTor;
+    @SuppressWarnings("unchecked")
+    private static final Class<? extends ReportSenderFactory>[] reportSenderFactoryClasses = new Class[]{AcraReportSenderFactory.class};

-    final Class<? extends ReportSenderFactory>[] reportSenderFactoryClasses
-            = new Class[]{AcraReportSenderFactory.class};
+    @Override
+    protected void attachBaseContext(Context base) {
+        super.attachBaseContext(base);
+
+        initACRA();
+    }

    @Override
    public void onCreate() {
        super.onCreate();

-        // init crashreport
-        try {
-            final ACRAConfiguration acraConfig = new ConfigurationBuilder(this)
-                    .setReportSenderFactoryClasses(reportSenderFactoryClasses)
-                    .build();
-            ACRA.init(this, acraConfig);
-        } catch(ACRAConfigurationException ace) {
-            ace.printStackTrace();
-            ErrorActivity.reportError(this, ace, null, null,
-                    ErrorActivity.ErrorInfo.make(ErrorActivity.SEARCHED,"none",
-                            "Could not initialize ACRA crash report", R.string.app_ui_crash));
-        }
+        // Initialize settings first because others inits can use its values
+        SettingsActivity.initSettings(this);

-        //init NewPipe
        NewPipe.init(Downloader.getInstance());
+        NewPipeDatabase.init(this);
+        StateSaver.init(this);
+        initNotificationChannel();

        // Initialize image loader
        ImageLoaderConfiguration config = new ImageLoaderConfiguration.Builder(this).build();
        ImageLoader.getInstance().init(config);

-        /*
-        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
-        if(prefs.getBoolean(getString(R.string.use_tor_key), false)) {
-            OrbotHelper.requestStartTor(this);
-            configureTor(true);
-        } else {
-            configureTor(false);
-        }*/
-        configureTor(false);
-
-        // DO NOT REMOVE THIS FUNCTION!!!
-        // Otherwise downloadPathPreference has invalid value.
-        SettingsActivity.initSettings(this);
-
-        ThemeHelper.setTheme(getApplicationContext());
+        configureRxJavaErrorHandler();
    }

-    /**
-     * Set the proxy settings based on whether Tor should be enabled or not.
-     */
-    public static void configureTor(boolean enabled) {
-        useTor = enabled;
-        if (useTor) {
-            NetCipher.useTor();
-        } else {
-            NetCipher.setProxy(null);
+    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 {
+                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();
+                }
+
+                if (throwable instanceof CompositeException) {
+                    for (Throwable element : ((CompositeException) throwable).getExceptions()) {
+                        if (checkThrowable(element)) return;
+                    }
+                }
+
+                if (checkThrowable(throwable)) return;
+
+                // 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 void initACRA() {
+        try {
+            final ACRAConfiguration acraConfig = new ConfigurationBuilder(this)
+                    .setReportSenderFactoryClasses(reportSenderFactoryClasses)
+                    .setBuildConfigClass(BuildConfig.class)
+                    .build();
+            ACRA.init(this, acraConfig);
+        } catch (ACRAConfigurationException ace) {
+            ace.printStackTrace();
+            ErrorActivity.reportError(this, ace, null, null, ErrorActivity.ErrorInfo.make(UserAction.SOMETHING_ELSE, "none",
+                    "Could not initialize ACRA crash report", R.string.app_ui_crash));
        }
    }

-    public static void checkStartTor(Context context) {
-        if (useTor) {
-            OrbotHelper.requestStartTor(context);
+    public void initNotificationChannel() {
+        if (Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.O) {
+            return;
        }
-    }

-    public static boolean isUsingTor() {
-        return useTor;
+        final String id = getString(R.string.notification_channel_id);
+        final CharSequence name = getString(R.string.notification_channel_name);
+        final String description = getString(R.string.notification_channel_description);
+
+        // Keep this below DEFAULT to avoid making noise on every notification update
+        final int importance = NotificationManager.IMPORTANCE_LOW;
+
+        NotificationChannel mChannel = new NotificationChannel(id, name, importance);
+        mChannel.setDescription(description);
+
+        NotificationManager mNotificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
+        mNotificationManager.createNotificationChannel(mChannel);
    }
 }
--- a/app/src/main/java/org/schabi/newpipe/BaseFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/BaseFragment.java
@@ -0,0 +1,121 @@
+package org.schabi.newpipe;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.os.Bundle;
+import android.support.annotation.AttrRes;
+import android.support.annotation.NonNull;
+import android.support.v4.app.Fragment;
+import android.support.v7.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 icepick.Icepick;
+
+public abstract class BaseFragment extends Fragment {
+    protected final String TAG = getClass().getSimpleName() + "@" + Integer.toHexString(hashCode());
+    protected boolean DEBUG = MainActivity.DEBUG;
+
+    protected AppCompatActivity activity;
+    public static final ImageLoader imageLoader = ImageLoader.getInstance();
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Fragment's Lifecycle
+    //////////////////////////////////////////////////////////////////////////*/
+
+    @Override
+    public void onAttach(Context context) {
+        super.onAttach(context);
+        activity = (AppCompatActivity) context;
+    }
+
+    @Override
+    public void onDetach() {
+        super.onDetach();
+        activity = null;
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        if (DEBUG) Log.d(TAG, "onCreate() called with: savedInstanceState = [" + savedInstanceState + "]");
+        super.onCreate(savedInstanceState);
+        Icepick.restoreInstanceState(this, savedInstanceState);
+        if (savedInstanceState != null) onRestoreInstanceState(savedInstanceState);
+    }
+
+
+    @Override
+    public void onViewCreated(View rootView, Bundle savedInstanceState) {
+        super.onViewCreated(rootView, savedInstanceState);
+        if (DEBUG) {
+            Log.d(TAG, "onViewCreated() called with: rootView = [" + rootView + "], savedInstanceState = [" + savedInstanceState + "]");
+        }
+        initViews(rootView, savedInstanceState);
+        initListeners();
+    }
+
+    @Override
+    public void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+        Icepick.saveInstanceState(this, outState);
+    }
+
+    protected void onRestoreInstanceState(@NonNull Bundle savedInstanceState) {
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Init
+    //////////////////////////////////////////////////////////////////////////*/
+
+    protected void initViews(View rootView, Bundle savedInstanceState) {
+    }
+
+    protected void initListeners() {
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Utils
+    //////////////////////////////////////////////////////////////////////////*/
+
+    protected final int resolveResourceIdFromAttr(@AttrRes int attr) {
+        TypedArray a = activity.getTheme().obtainStyledAttributes(new int[]{attr});
+        int attributeResourceId = a.getResourceId(0, 0);
+        a.recycle();
+        return attributeResourceId;
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // DisplayImageOptions default configurations
+    //////////////////////////////////////////////////////////////////////////*/
+
+    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();
+}
--- a/app/src/main/java/org/schabi/newpipe/Downloader.java
+++ b/app/src/main/java/org/schabi/newpipe/Downloader.java
@@ -1,12 +1,15 @@
 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.net.UnknownHostException;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
@@ -14,7 +17,7 @@ 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>
@@ -35,16 +38,17 @@ import javax.net.ssl.HttpsURLConnection;
 */

 public class Downloader implements org.schabi.newpipe.extractor.Downloader {
-    
-    private static final String USER_AGENT = "Mozilla/5.0 (Windows NT 6.1; WOW64; rv:43.0) Gecko/20100101 Firefox/43.0";
+
+    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() {}
+    private Downloader() {
+    }

    public static Downloader getInstance() {
-        if(instance == null) {
+        if (instance == null) {
            synchronized (Downloader.class) {
                if (instance == null) {
                    instance = new Downloader();
@@ -62,41 +66,66 @@ public class Downloader implements org.schabi.newpipe.extractor.Downloader {
        return Downloader.mCookies;
    }

-    /**Download the text file at the supplied URL as in download(String),
+    /**
+     * 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 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*/
+     * @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 header field "Accept-Language" to the supplied string.
-     * @param siteUrl the URL of the text file to return the contents of
+    /**
+     * 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*/
+     * @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());
+        while (it.hasNext()) {
+            Map.Entry pair = (Map.Entry) it.next();
+            con.setRequestProperty((String) pair.getKey(), (String) pair.getValue());
        }
        return dl(con);
    }

-    /**Common functionality between download(String url) and download(String url, String language)*/
+    /**
+     * 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);

@@ -104,17 +133,19 @@ public class Downloader implements org.schabi.newpipe.extractor.Downloader {
                con.setRequestProperty("Cookie", getCookies());
            }

-            in = new BufferedReader(
-                    new InputStreamReader(con.getInputStream()));
-            String inputLine;
+            in = new BufferedReader(new InputStreamReader(con.getInputStream()));

-            while((inputLine = in.readLine()) != null) {
+            String inputLine;
+            while ((inputLine = in.readLine()) != null) {
                response.append(inputLine);
            }
-        } catch(UnknownHostException uhe) {//thrown when there's no internet connection
-            throw new IOException("unknown host or no network", uhe);
-            //Toast.makeText(getActivity(), uhe.getMessage(), Toast.LENGTH_LONG).show();
-        } catch(Exception e) {
+        } 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
@@ -123,24 +154,14 @@ public class Downloader implements org.schabi.newpipe.extractor.Downloader {
            if (con.getResponseCode() == 429) {
                throw new ReCaptchaException("reCaptcha Challenge requested");
            }
-            throw new IOException(e);
+
+            throw new IOException(con.getResponseCode() + " " + con.getResponseMessage(), e);
        } finally {
-            if(in != null) {
+            if (in != null) {
                in.close();
            }
        }

        return response.toString();
    }
-
-    /**Download (via HTTP) the text file located at the supplied URL, and return its contents.
-     * Primarily intended for downloading web pages.
-     * @param siteUrl the URL of the text file to download
-     * @return the contents of the specified text file*/
-    public String download(String siteUrl) throws IOException, ReCaptchaException {
-        URL url = new URL(siteUrl);
-        HttpsURLConnection con = (HttpsURLConnection) url.openConnection();
-        //HttpsURLConnection con = NetCipher.getHttpsURLConnection(url);
-        return dl(con);
-    }
 }
--- a/app/src/main/java/org/schabi/newpipe/ExitActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/ExitActivity.java
@@ -7,7 +7,7 @@ import android.content.Intent;
 import android.os.Build;
 import android.os.Bundle;

-/**
+/*
 * Copyright (C) Hans-Christoph Steiner 2016 <hans@eds.org>
 * ExitActivity.java is part of NewPipe.
 *
--- a/app/src/main/java/org/schabi/newpipe/ImageErrorLoadingListener.java
+++ b/app/src/main/java/org/schabi/newpipe/ImageErrorLoadingListener.java
@@ -1,64 +0,0 @@
-package org.schabi.newpipe;
-
-import android.content.Context;
-import android.graphics.Bitmap;
-import android.view.View;
-
-import com.nostra13.universalimageloader.core.assist.FailReason;
-import com.nostra13.universalimageloader.core.listener.ImageLoadingListener;
-
-import org.schabi.newpipe.extractor.NewPipe;
-import org.schabi.newpipe.report.ErrorActivity;
-
-/**
- * Created by Christian Schabesberger on 01.08.16.
- *
- * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
- * StreamInfoItemViewCreator.java is part of NewPipe.
- *
- * NewPipe is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * NewPipe is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-public class ImageErrorLoadingListener implements ImageLoadingListener {
-
-    private int serviceId = -1;
-    private Context context = null;
-    private View rootView = null;
-
-    public ImageErrorLoadingListener(Context context, View rootView, int serviceId) {
-        this.context = context;
-        this.serviceId= serviceId;
-        this.rootView = rootView;
-    }
-
-    @Override
-    public void onLoadingStarted(String imageUri, View view) {}
-
-    @Override
-    public void onLoadingFailed(String imageUri, View view, FailReason failReason) {
-        ErrorActivity.reportError(context,
-                failReason.getCause(), null, rootView,
-                ErrorActivity.ErrorInfo.make(ErrorActivity.LOAD_IMAGE,
-                        NewPipe.getNameOfService(serviceId), imageUri,
-                        R.string.could_not_load_image));
-    }
-
-    @Override
-    public void onLoadingComplete(String imageUri, View view, Bitmap loadedImage) {
-
-    }
-
-    @Override
-    public void onLoadingCancelled(String imageUri, View view) {}
-}
--- a/app/src/main/java/org/schabi/newpipe/Localization.java
+++ b/app/src/main/java/org/schabi/newpipe/Localization.java
@@ -1,96 +0,0 @@
-package org.schabi.newpipe;
-
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.content.res.Resources;
-import android.preference.PreferenceManager;
-
-import java.text.DateFormat;
-import java.text.NumberFormat;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.Locale;
-
-/**
- * Created by chschtsch on 12/29/15.
- *
- * Copyright (C) Gregory Arkhipov 2015
- * Localization.java is part of NewPipe.
- *
- * NewPipe is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * NewPipe is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-public class Localization {
-
-    private Localization() {
-    }
-
-    public static Locale getPreferredLocale(Context context) {
-        SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(context);
-
-        String languageCode = sp.getString(String.valueOf(R.string.search_language_key),
-                context.getString(R.string.default_language_value));
-
-        if(languageCode.length() == 2) {
-            return new Locale(languageCode);
-        }
-        else if(languageCode.contains("_")) {
-            String country = languageCode
-                    .substring(languageCode.indexOf("_"), languageCode.length());
-            return new Locale(languageCode.substring(0, 2), country);
-        }
-        return Locale.getDefault();
-    }
-
-    public static String localizeViewCount(long viewCount, Context context) {
-        Locale locale = getPreferredLocale(context);
-
-        Resources res = context.getResources();
-        String viewsString = res.getString(R.string.view_count_text);
-
-        NumberFormat nf = NumberFormat.getInstance(locale);
-        String formattedViewCount = nf.format(viewCount);
-        return String.format(viewsString, formattedViewCount);
-    }
-
-    public static String localizeNumber(long number, Context context) {
-        Locale locale = getPreferredLocale(context);
-        NumberFormat nf = NumberFormat.getInstance(locale);
-        return nf.format(number);
-    }
-
-    private static String formatDate(String date, Context context) {
-        Locale locale = getPreferredLocale(context);
-        SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
-        Date datum = null;
-        try {
-            datum = formatter.parse(date);
-        } catch (ParseException e) {
-            e.printStackTrace();
-        }
-
-        DateFormat df = DateFormat.getDateInstance(DateFormat.MEDIUM, locale);
-
-        return df.format(datum);
-    }
-
-    public static String localizeDate(String date, Context context) {
-        Resources res = context.getResources();
-        String dateString = res.getString(R.string.upload_date_text);
-
-        String formattedDate = formatDate(date, context);
-        return String.format(dateString, formattedDate);
-    }
-}
--- a/app/src/main/java/org/schabi/newpipe/MainActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/MainActivity.java
--- a/app/src/main/java/org/schabi/newpipe/NewPipeDatabase.java
+++ b/app/src/main/java/org/schabi/newpipe/NewPipeDatabase.java
@@ -0,0 +1,31 @@
+package org.schabi.newpipe;
+
+import android.arch.persistence.room.Room;
+import android.content.Context;
+import android.support.annotation.NonNull;
+
+import org.schabi.newpipe.database.AppDatabase;
+
+import static org.schabi.newpipe.database.AppDatabase.DATABASE_NAME;
+
+public final class NewPipeDatabase {
+
+    private static AppDatabase databaseInstance;
+
+    private NewPipeDatabase() {
+        //no instance
+    }
+
+    public static void init(Context context) {
+        databaseInstance = Room.databaseBuilder(context.getApplicationContext(),
+                AppDatabase.class, DATABASE_NAME
+        ).build();
+    }
+
+    @NonNull
+    public static AppDatabase getInstance() {
+        if (databaseInstance == null) throw new RuntimeException("Database not initialized");
+
+        return databaseInstance;
+    }
+}
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				`[ ] I carefully reed the [contribution guidelines](https://github.com/TeamNewPipe/NewPipe/blob/HEAD/.github/CONTRIBUTING.md) and agree to them.`
				`@@ -0,0 +1 @@`
				`- [ ] I carefully reed the [contribution guidelines](https://github.com/TeamNewPipe/NewPipe/blob/HEAD/.github/CONTRIBUTING.md) and agree to them.`