Merged remote and fixed conflicts

README.md

@@ -59,18 +59,17 @@ NewPipe does not use any Google framework libraries, or the YouTube API. It only
 * Search/Watch Playlists
 * Watch as queues Playlists
 * Queuing videos
+* Local playlists
+* Subtitles
+* Multi-service support (eg. SoundCloud in NewPipe Beta)
 
 ### Coming Features
 
-* Multiservice support (eg. SoundCloud)
-* Bookmarks
-* Subtitles support
-* livestream support
+* Livestream support
+* Cast to UPnP and Cast
+* Show comments
 * ... and many more
 
-### Multiservice support
-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, translations, design changes, code cleaning, or real heavy code changes, help is always welcome.
 The more is done the better it gets!

app/build.gradle

@@ -8,8 +8,8 @@ android {
         applicationId "org.schabi.newpipe"
         minSdkVersion 15
         targetSdkVersion 27
-        versionCode 47
-        versionName "0.11.6"
+        versionCode 48
+        versionName "0.12.0"
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
@@ -55,7 +55,7 @@ dependencies {
         exclude module: 'support-annotations'
     }
 
-    implementation 'com.github.TeamNewPipe:NewPipeExtractor:e51bc58a856dcf3'
+    implementation 'com.github.TeamNewPipe:NewPipeExtractor:f787b375e5fb6d'
 
     testImplementation 'junit:junit:4.12'
     testImplementation 'org.mockito:mockito-core:1.10.19'
@@ -72,8 +72,8 @@ dependencies {
     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:3.0.1'
-    implementation 'com.google.android.exoplayer:exoplayer:r2.5.4'
+    implementation 'com.nononsenseapps:filepicker:4.2.1'
+    implementation 'com.google.android.exoplayer:exoplayer:2.7.0'
 
     debugImplementation 'com.facebook.stetho:stetho:1.5.0'
     debugImplementation 'com.facebook.stetho:stetho-urlconnection:1.5.0'
@@ -93,4 +93,7 @@ dependencies {
     debugImplementation 'com.squareup.leakcanary:leakcanary-android:1.5.4'
     betaImplementation 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.4'
     releaseImplementation 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.4'
+
+    implementation 'com.squareup.okhttp3:okhttp:3.9.1'
+    debugImplementation 'com.facebook.stetho:stetho-okhttp3:1.5.0'
 }

app/proguard-rules.pro

@@ -35,3 +35,10 @@
     @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

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

@@ -7,16 +7,21 @@
 import android.support.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;
+
 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();
 
@@ -32,6 +37,12 @@ public void onCreate() {
         initStetho();
     }
 
+    @Override
+    protected Downloader getDownloader() {
+        return org.schabi.newpipe.Downloader.init(new OkHttpClient.Builder()
+                .addNetworkInterceptor(new StethoInterceptor()));
+    }
+
     private void initStetho() {
         // Create an InitializerBuilder
         Stetho.InitializerBuilder initializerBuilder =
@@ -54,6 +65,12 @@ private void initStetho() {
         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)

app/src/main/AndroidManifest.xml

@@ -44,6 +44,12 @@
             android:launchMode="singleTask"
             android:label="@string/title_activity_background_player"/>
 
+        <receiver android:name="org.schabi.newpipe.player.BackgroundPlayer$MediaButtonReceiver">
+            <intent-filter>
+                <action android:name="android.intent.action.MEDIA_BUTTON" />
+            </intent-filter>
+        </receiver>
+
         <activity
             android:name=".settings.SettingsActivity"
             android:label="@string/settings"/>
@@ -56,6 +62,9 @@
             android:name=".history.HistoryActivity"
             android:label="@string/title_activity_history"/>
 
+        <service android:name=".subscription.services.SubscriptionsImportService"/>
+        <service android:name=".subscription.services.SubscriptionsExportService"/>
+
         <activity
             android:name=".PanicResponderActivity"
             android:launchMode="singleInstance"
@@ -103,7 +112,7 @@
             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

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

@@ -19,6 +19,7 @@
 import org.acra.config.ACRAConfigurationException;
 import org.acra.config.ConfigurationBuilder;
 import org.acra.sender.ReportSenderFactory;
+import org.schabi.newpipe.extractor.Downloader;
 import org.schabi.newpipe.extractor.NewPipe;
 import org.schabi.newpipe.report.AcraReportSenderFactory;
 import org.schabi.newpipe.report.ErrorActivity;
@@ -30,9 +31,13 @@
 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;
@@ -83,8 +88,7 @@ public void onCreate() {
         // Initialize settings first because others inits can use its values
         SettingsActivity.initSettings(this);
 
-        NewPipe.init(Downloader.getInstance());
-        NewPipeDatabase.init(this);
+        NewPipe.init(getDownloader());
         StateSaver.init(this);
         initNotificationChannel();
 
@@ -94,35 +98,66 @@ public void onCreate() {
         configureRxJavaErrorHandler();
     }
 
+    protected Downloader getDownloader() {
+        return org.schabi.newpipe.Downloader.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 {
-                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()) {
-                        if (checkThrowable(element)) return;
-                    }
+                    errors = ((CompositeException) throwable).getExceptions();
+                } else {
+                    errors = Collections.singletonList(throwable);
                 }
 
-                if (checkThrowable(throwable)) return;
+                for (final Throwable error : errors) {
+                    if (isThrowableIgnored(error)) return;
+                    if (isThrowableCritical(error)) {
+                        reportException(error);
+                        return;
+                    }
+                }
 
-                // Throw uncaught exception that will trigger the report system
-                Thread.currentThread().getUncaughtExceptionHandler()
-                        .uncaughtException(Thread.currentThread(), throwable);
+                // 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 checkThrowable(@NonNull Throwable 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, InterruptedException.class, InterruptedIOException.class);
+                        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);
             }
         });
     }
@@ -132,6 +167,7 @@ private ImageLoaderConfiguration getImageLoaderConfigurations(final int memoryCa
         return new ImageLoaderConfiguration.Builder(this)
                 .memoryCache(new LRULimitedMemoryCache(memoryCacheSizeMb * 1024 * 1024))
                 .diskCacheSize(diskCacheSizeMb * 1024 * 1024)
+                .imageDownloader(new ImageDownloader(getApplicationContext()))
                 .build();
     }
 
@@ -177,4 +213,8 @@ public static RefWatcher getRefWatcher(Context context) {
     protected RefWatcher installLeakCanary() {
         return RefWatcher.DISABLED;
     }
+
+    protected boolean isDisposedRxExceptionsReported() {
+        return false;
+    }
 }

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

@@ -1,9 +1,7 @@
 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;
@@ -86,6 +84,17 @@ protected void initViews(View rootView, Bundle savedInstanceState) {
     protected void initListeners() {
     }
 
+    /*//////////////////////////////////////////////////////////////////////////
+    // Utils
+    //////////////////////////////////////////////////////////////////////////*/
+
+    public void setTitle(String title) {
+        if (DEBUG) Log.d(TAG, "setTitle() called with: title = [" + title + "]");
+        if (activity != null && activity.getSupportActionBar() != null) {
+            activity.getSupportActionBar().setTitle(title);
+        }
+    }
+
     /*//////////////////////////////////////////////////////////////////////////
     // DisplayImageOptions default configurations
     //////////////////////////////////////////////////////////////////////////*/