Merge branch 'fix-next-video' of git://github.com/mauriciocolli/NewPipe into strfx

Fix list in readme

.travis.yml

@@ -5,35 +5,15 @@ android:
   components:
     # The BuildTools version used by NewPipe
     - tools
-    - build-tools-23.0.3
+    - build-tools-25.0.0
 
     # The SDK version used to compile NewPipe
     - android-25
 
     # Additional components
-    - extra-android-support
     - extra-android-m2repository
-    - extra-google-m2repository
 
-    # Emulators
-    - sys-img-armeabi-v7a-android-21
-    - sys-img-armeabi-v7a-android-19
-    - sys-img-armeabi-v7a-android-15
-
-env:
-  global:
-    - ADB_INSTALL_TIMEOUT=8 # minutes (2 by default)
-    - GRADLE_OPTS=-Xmx512m # give gradle more memory since it seem to fail otherwise
-  matrix:
-    - ANDROID_TARGET=android-21  ANDROID_ABI=armeabi-v7a
-
-before_script:
-  - echo no | android create avd --force -n test -t $ANDROID_TARGET --abi $ANDROID_ABI
-  - emulator -avd test -no-skin -no-audio -no-window &
-  - android-wait-for-emulator
-  - adb shell input keyevent 82 &
-
-script: ./gradlew --info build connectedCheck
+script: ./gradlew -Dorg.gradle.jvmargs=-Xmx1536m assembleDebug lintDebug testDebugUnitTest
 
 licenses:
   - '.+'

README.md

@@ -37,23 +37,27 @@ NewPipe does not use any Google framework libraries, or the YouTube API. It only
 * Listen to YouTube videos (experimental)
 * Select the streaming player to watch the video with
 * Download videos 
-* Download audio only * Open a video in Kodi
+* Download audio only
+* Open a video in Kodi
 * Show Next/Related videos
 * Search YouTube in a specific language
 * Watch age restricted material
 * Display general information about channels
 * Search channels
+* Watch videos from a channel
+* Orbot/Tor support (not yet directly)
 
 ### Coming Features
 
-* Orbot/Tor support
 * Bookmarks
 * View history
 * Search history
 * Subscribe to channels
-* Watch videos from a channel
 * Search/Watch Playlists
 * Queeing videos
+* Subtitles support
+* 1080p support
+* livestream support
 * ... and many more
 
 ### Multiservice support

app/build.gradle

@@ -2,14 +2,14 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 25
-    buildToolsVersion '23.0.3'
+    buildToolsVersion '25.0.0'
 
     defaultConfig {
         applicationId "org.schabi.newpipe"
         minSdkVersion 15
         targetSdkVersion 25
-        versionCode 25
-        versionName "0.8.11"
+        versionCode 27
+        versionName "0.9.0"
     }
     buildTypes {
         release {
@@ -32,6 +32,9 @@ android {
 
 dependencies {
     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.1.0'
     compile 'com.android.support:support-v4:25.1.0'
     compile 'com.android.support:design:25.1.0'
@@ -42,11 +45,8 @@ dependencies {
     compile 'de.hdodenhof:circleimageview:2.0.0'
     compile 'com.nostra13.universalimageloader:universal-image-loader:1.9.5'
     compile 'com.github.nirhart:parallaxscroll:1.0'
-    compile 'com.google.android.exoplayer:exoplayer:r1.5.5'
     compile 'com.google.code.gson:gson:2.4'
     compile 'com.nononsenseapps:filepicker:3.0.0'
     compile 'ch.acra:acra:4.9.0'
-    testCompile 'junit:junit:4.12'
-    testCompile 'org.mockito:mockito-core:1.10.19'
-    testCompile 'org.json:json:20160810'
+    compile 'com.google.android.exoplayer:exoplayer:r2.3.1'
 }

app/src/main/AndroidManifest.xml

@@ -7,6 +7,7 @@
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <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"/>
 
     <application
         android:name=".App"
@@ -50,24 +51,7 @@
             android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
             android:label="@string/app_name"
             android:launchMode="singleInstance"
-            android:theme="@style/PlayerTheme">
-            <intent-filter>
-                <action android:name="org.schabi.newpipe.exoplayer.action.VIEW" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-
-                <data android:scheme="http" />
-                <data android:scheme="https" />
-                <data android:scheme="content" />
-                <data android:scheme="asset" />
-                <data android:scheme="file" />
-            </intent-filter>
-        </activity>
-
-        <service
-            android:name=".player.BackgroundPlayer"
-            android:exported="false"
-            android:label="@string/background_player_name" />
+            android:theme="@style/PlayerTheme"/>
 
         <activity
             android:name=".settings.SettingsActivity"
@@ -137,6 +121,7 @@
                 <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 -->
@@ -175,6 +160,67 @@
                 <data android:mimeType="text/plain" />
             </intent-filter>
         </activity>
+
+        <activity android:name=".PopupActivity"
+            android:theme="@android:style/Theme.NoDisplay"
+            android:label="@string/popup_mode_share_menu_title">
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <action android:name="android.media.action.MEDIA_PLAY_FROM_SEARCH" />
+                <action android:name="android.nfc.action.NDEF_DISCOVERED" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data android:scheme="http" />
+                <data android:scheme="https" />
+                <data android:host="youtube.com" />
+                <data android:host="m.youtube.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>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <action android:name="android.media.action.MEDIA_PLAY_FROM_SEARCH" />
+                <action android:name="android.nfc.action.NDEF_DISCOVERED" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data android:scheme="http" />
+                <data android:scheme="https" />
+                <data android:host="youtu.be" />
+                <data android:pathPrefix="/" />
+            </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" />
+
+                <data android:mimeType="text/plain" />
+            </intent-filter>
+        </activity>
+
+        <service android:name=".player.PopupVideoPlayer"/>
+
     </application>
 
-</manifest>
+</manifest>

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

@@ -19,7 +19,7 @@ import android.widget.Toast;
 
 import com.nostra13.universalimageloader.core.ImageLoader;
 
-import org.schabi.newpipe.detail.VideoItemDetailFragment;
+import org.schabi.newpipe.detail.VideoItemDetailActivity;
 import org.schabi.newpipe.extractor.NewPipe;
 import org.schabi.newpipe.extractor.StreamingService;
 import org.schabi.newpipe.extractor.channel.ChannelExtractor;
@@ -31,10 +31,12 @@ import org.schabi.newpipe.info_list.InfoListAdapter;
 import org.schabi.newpipe.report.ErrorActivity;
 import org.schabi.newpipe.settings.SettingsActivity;
 import org.schabi.newpipe.util.NavStack;
-import java.io.IOException;
-import static android.os.Build.VERSION.SDK_INT;
 import org.schabi.newpipe.util.ThemeHelper;
 
+import java.io.IOException;
+
+import static android.os.Build.VERSION.SDK_INT;
+
 
 /**
  * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
@@ -147,6 +149,7 @@ public class ChannelActivity extends AppCompatActivity {
             serviceId = savedInstanceState.getInt(NavStack.SERVICE_ID);
             NavStack.getInstance()
                     .restoreSavedInstanceState(savedInstanceState);
+            handleIntent(getIntent());
         }
 
     }
@@ -298,7 +301,7 @@ public class ChannelActivity extends AppCompatActivity {
                     postNewErrorToast(h, R.string.network_error);
                     ioe.printStackTrace();
                 } catch(ParsingException pe) {
-                    ErrorActivity.reportError(h, ChannelActivity.this, pe, VideoItemDetailFragment.class, null,
+                    ErrorActivity.reportError(h, ChannelActivity.this, pe, VideoItemDetailActivity.class, null,
                             ErrorActivity.ErrorInfo.make(ErrorActivity.REQUESTED_CHANNEL,
                                     service.getServiceInfo().name, channelUrl, R.string.parsing_error));
                     h.post(new Runnable() {
@@ -313,7 +316,7 @@ public class ChannelActivity extends AppCompatActivity {
                     if(service != null) {
                         name = service.getServiceInfo().name;
                     }
-                    ErrorActivity.reportError(h, ChannelActivity.this, ex, VideoItemDetailFragment.class, null,
+                    ErrorActivity.reportError(h, ChannelActivity.this, ex, VideoItemDetailActivity.class, null,
                             ErrorActivity.ErrorInfo.make(ErrorActivity.REQUESTED_CHANNEL,
                                     name, channelUrl, R.string.parsing_error));
                     h.post(new Runnable() {
@@ -324,7 +327,7 @@ public class ChannelActivity extends AppCompatActivity {
                     });
                     ex.printStackTrace();
                 } catch(Exception e) {
-                    ErrorActivity.reportError(h, ChannelActivity.this, e, VideoItemDetailFragment.class, null,
+                    ErrorActivity.reportError(h, ChannelActivity.this, e, VideoItemDetailActivity.class, null,
                             ErrorActivity.ErrorInfo.make(ErrorActivity.REQUESTED_CHANNEL,
                                     service.getServiceInfo().name, channelUrl, R.string.general_error));
                     h.post(new Runnable() {

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

@@ -85,9 +85,4 @@ public class MainActivity extends AppCompatActivity {
                 return super.onOptionsItemSelected(item);
         }
     }
-
-    @Override
-    public void onBackPressed() {
-        //ignore back
-    }
 }

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

@@ -0,0 +1,136 @@
+package org.schabi.newpipe;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Build;
+import android.os.Bundle;
+import android.util.Log;
+import android.widget.Toast;
+
+import org.schabi.newpipe.extractor.NewPipe;
+import org.schabi.newpipe.extractor.StreamingService;
+import org.schabi.newpipe.player.PopupVideoPlayer;
+import org.schabi.newpipe.util.NavStack;
+import org.schabi.newpipe.util.PermissionHelper;
+
+import java.util.Collection;
+import java.util.HashSet;
+
+/**
+ * This activity is thought to open video streams form an external app using the popup playser.
+ */
+
+public class PopupActivity extends Activity {
+    private static final String TAG = RouterActivity.class.toString();
+
+    /**
+     * Removes invisible separators (\p{Z}) and punctuation characters including
+     * brackets (\p{P}). See http://www.regular-expressions.info/unicode.html for
+     * more details.
+     */
+    private final static String REGEX_REMOVE_FROM_URL = "[\\p{Z}\\p{P}]";
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        handleIntent(getIntent());
+        finish();
+    }
+
+
+    private static String removeHeadingGibberish(final String input) {
+        int start = 0;
+        for (int i = input.indexOf("://") - 1; i >= 0; i--) {
+            if (!input.substring(i, i + 1).matches("\\p{L}")) {
+                start = i + 1;
+                break;
+            }
+        }
+        return input.substring(start, input.length());
+    }
+
+    private static String trim(final String input) {
+        if (input == null || input.length() < 1) {
+            return input;
+        } else {
+            String output = input;
+            while (output.length() > 0 && output.substring(0, 1).matches(REGEX_REMOVE_FROM_URL)) {
+                output = output.substring(1);
+            }
+            while (output.length() > 0
+                    && output.substring(output.length() - 1, output.length()).matches(REGEX_REMOVE_FROM_URL)) {
+                output = output.substring(0, output.length() - 1);
+            }
+            return output;
+        }
+    }
+
+    /**
+     * Retrieves all Strings which look remotely like URLs from a text.
+     * Used if NewPipe was called through share menu.
+     *
+     * @param sharedText text to scan for URLs.
+     * @return potential URLs
+     */
+    private String[] getUris(final String sharedText) {
+        final Collection<String> result = new HashSet<>();
+        if (sharedText != null) {
+            final String[] array = sharedText.split("\\p{Space}");
+            for (String s : array) {
+                s = trim(s);
+                if (s.length() != 0) {
+                    if (s.matches(".+://.+")) {
+                        result.add(removeHeadingGibberish(s));
+                    } else if (s.matches(".+\\..+")) {
+                        result.add("http://" + s);
+                    }
+                }
+            }
+        }
+        return result.toArray(new String[result.size()]);
+    }
+
+    private void handleIntent(Intent intent) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M
+                && !PermissionHelper.checkSystemAlertWindowPermission(this)) {
+            Toast.makeText(this, R.string.msg_popup_permission, Toast.LENGTH_LONG).show();
+            return;
+        }
+        String videoUrl = "";
+        StreamingService service = null;
+
+        // first gather data and find service
+        if (intent.getData() != null) {
+            // this means the video was called though another app
+            videoUrl = intent.getData().toString();
+        } else if (intent.getStringExtra(Intent.EXTRA_TEXT) != null) {
+            //this means that vidoe was called through share menu
+            String extraText = intent.getStringExtra(Intent.EXTRA_TEXT);
+            videoUrl = getUris(extraText)[0];
+        }
+
+        service = NewPipe.getServiceByUrl(videoUrl);
+        if (service == null) {
+            Toast.makeText(this, R.string.url_not_supported_toast, Toast.LENGTH_LONG)
+                    .show();
+            return;
+        } else {
+            Intent callIntent = new Intent();
+            switch (service.getLinkTypeByUrl(videoUrl)) {
+                case STREAM:
+                    callIntent.setClass(this, PopupVideoPlayer.class);
+                    break;
+                case PLAYLIST:
+                    Log.e(TAG, "NOT YET DEFINED");
+                    break;
+                default:
+                    Toast.makeText(this, R.string.url_not_supported_toast, Toast.LENGTH_LONG).show();
+                    return;
+            }
+
+            callIntent.putExtra(NavStack.URL, videoUrl);
+            callIntent.putExtra(NavStack.SERVICE_ID, service.getServiceId());
+            startService(callIntent);
+        }
+    }
+}

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

@@ -2,14 +2,12 @@ package org.schabi.newpipe;
 
 import android.app.Activity;
 import android.content.Intent;
-import android.preference.PreferenceManager;
-import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
+import android.preference.PreferenceManager;
 import android.util.Log;
 import android.widget.Toast;
 
 import org.schabi.newpipe.detail.VideoItemDetailActivity;
-import org.schabi.newpipe.detail.VideoItemDetailFragment;
 import org.schabi.newpipe.extractor.NewPipe;
 import org.schabi.newpipe.extractor.StreamingService;
 import org.schabi.newpipe.util.NavStack;
@@ -136,7 +134,7 @@ public class RouterActivity extends Activity {
                     break;
                 case STREAM:
                     callIntent.setClass(this, VideoItemDetailActivity.class);
-                    callIntent.putExtra(VideoItemDetailFragment.AUTO_PLAY,
+                    callIntent.putExtra(VideoItemDetailActivity.AUTO_PLAY,
                             PreferenceManager.getDefaultSharedPreferences(this)
                                     .getBoolean(
                                             getString(R.string.autoplay_through_intent_key), false));

app/src/main/java/org/schabi/newpipe/detail/ActionBarHandler.java

@@ -53,6 +53,7 @@ class ActionBarHandler {
     // those are edited directly. Typically VideoItemDetailFragment will implement those callbacks.
     private OnActionListener onShareListener;
     private OnActionListener onOpenInBrowserListener;
+    private OnActionListener onOpenInPopupListener;
     private OnActionListener onDownloadListener;
     private OnActionListener onPlayWithKodiListener;
     private OnActionListener onPlayAudioListener;
@@ -190,6 +191,12 @@ class ActionBarHandler {
                 activity.startActivity(intent);
                 return true;
             }
+            case R.id.menu_item_popup: {
+                if(onOpenInPopupListener != null) {
+                    onOpenInPopupListener.onActionSelected(selectedVideoStream);
+                }
+                return true;
+            }
             default:
                 Log.e(TAG, "Menu Item not known");
         }
@@ -208,6 +215,10 @@ class ActionBarHandler {
         onOpenInBrowserListener = listener;
     }
 
+    public void setOnOpenInPopupListener(OnActionListener listener) {
+        onOpenInPopupListener = listener;
+    }
+
     public void setOnDownloadListener(OnActionListener listener) {
         onDownloadListener = listener;
     }

app/src/main/java/org/schabi/newpipe/detail/StreamExtractorWorker.java

@@ -0,0 +1,250 @@
+package org.schabi.newpipe.detail;
+
+import android.app.Activity;
+import android.os.Handler;
+import android.util.Log;
+import android.view.View;
+
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.extractor.NewPipe;
+import org.schabi.newpipe.extractor.StreamingService;
+import org.schabi.newpipe.extractor.exceptions.ParsingException;
+import org.schabi.newpipe.extractor.exceptions.ReCaptchaException;
+import org.schabi.newpipe.extractor.services.youtube.YoutubeStreamExtractor;
+import org.schabi.newpipe.extractor.stream_info.StreamExtractor;
+import org.schabi.newpipe.extractor.stream_info.StreamInfo;
+import org.schabi.newpipe.report.ErrorActivity;
+
+import java.io.IOException;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+/**
+ * Extract {@link StreamInfo} with {@link StreamExtractor} from the given url of the given service
+ */
+@SuppressWarnings("WeakerAccess")
+public class StreamExtractorWorker extends Thread {
+    private static final String TAG = "StreamExtractorWorker";
+
+    private Activity activity;
+    private final String videoUrl;
+    private final int serviceId;
+    private OnStreamInfoReceivedListener callback;
+
+    private final AtomicBoolean isRunning = new AtomicBoolean(false);
+    private final Handler handler = new Handler();
+
+
+    public interface OnStreamInfoReceivedListener {
+        void onReceive(StreamInfo info);
+        void onError(int messageId);
+        void onReCaptchaException();
+        void onBlockedByGemaError();
+        void onContentErrorWithMessage(int messageId);
+        void onContentError();
+    }
+
+    public StreamExtractorWorker(Activity activity, String videoUrl, int serviceId, OnStreamInfoReceivedListener callback) {
+        this.serviceId = serviceId;
+        this.videoUrl = videoUrl;
+        this.activity = activity;
+        this.callback = callback;
+    }
+
+    /**
+     * Returns a new instance <b>already</b> started  of {@link StreamExtractorWorker}.<br>
+     * The caller is responsible to check if {@link StreamExtractorWorker#isRunning()}, or {@link StreamExtractorWorker#cancel()} it
+     *
+     * @param serviceId id of the request service
+     * @param url       videoUrl of the service (e.g. https://www.youtube.com/watch?v=HyHNuVaZJ-k)
+     * @param activity  activity for error reporting purposes
+     * @param callback  listener that will be called-back when events occur (check {@link OnStreamInfoReceivedListener})
+     * @return new instance already started of {@link StreamExtractorWorker}
+     */
+    public static StreamExtractorWorker startExtractorThread(int serviceId, String url, Activity activity, OnStreamInfoReceivedListener callback) {
+        StreamExtractorWorker extractorThread = getExtractorThread(serviceId, url, activity, callback);
+        extractorThread.start();
+        return extractorThread;
+    }
+
+    /**
+     * Returns a new instance of {@link StreamExtractorWorker}.<br>
+     * The caller is responsible to check if {@link StreamExtractorWorker#isRunning()}, or {@link StreamExtractorWorker#cancel()}
+     * when it doesn't need it anymore
+     * <p>
+     * <b>Note:</b> this instance is <b>not</b> started yet
+     *
+     * @param serviceId id of the request service
+     * @param url       videoUrl of the service (e.g. https://www.youtube.com/watch?v=HyHNuVaZJ-k)
+     * @param activity  activity for error reporting purposes
+     * @param callback  listener that will be called-back when events occur (check {@link OnStreamInfoReceivedListener})
+     * @return instance of {@link StreamExtractorWorker}
+     */
+    public static StreamExtractorWorker getExtractorThread(int serviceId, String url, Activity activity, OnStreamInfoReceivedListener callback) {
+        return new StreamExtractorWorker(activity, url, serviceId, callback);
+    }
+
+    @Override
+    //Just ignore the errors for now
+    @SuppressWarnings("ConstantConditions")
+    public void run() {
+        // TODO: Improve error checking
+        // and this method in general
+
+        StreamInfo streamInfo = null;
+        StreamingService service;
+        try {
+            service = NewPipe.getService(serviceId);
+        } catch (Exception e) {
+            e.printStackTrace();
+            ErrorActivity.reportError(handler, activity, e, VideoItemDetailActivity.class, null,
+                    ErrorActivity.ErrorInfo.make(ErrorActivity.REQUESTED_STREAM,
+                            "", videoUrl, R.string.could_not_get_stream));
+            return;
+        }
+        try {
+            isRunning.set(true);
+            StreamExtractor streamExtractor = service.getExtractorInstance(videoUrl);
+            streamInfo = StreamInfo.getVideoInfo(streamExtractor);
+
+            final StreamInfo info = streamInfo;
+            if (callback != null) handler.post(new Runnable() {
+                @Override
+                public void run() {
+                    callback.onReceive(info);
+                }
+            });
+            isRunning.set(false);
+            // look for errors during extraction
+            // this if statement only covers extra information.
+            // if these are not available or caused an error, they are just not available
+            // but don't render the stream information unusalbe.
+            if (streamInfo != null && !streamInfo.errors.isEmpty()) {
+                Log.e(TAG, "OCCURRED ERRORS DURING EXTRACTION:");
+                for (Throwable e : streamInfo.errors) {
+                    e.printStackTrace();
+                    Log.e(TAG, "------");
+                }
+
+                View rootView = activity != null ? activity.findViewById(R.id.video_item_detail) : null;
+                ErrorActivity.reportError(handler, activity,
+                        streamInfo.errors, null, rootView,
+                        ErrorActivity.ErrorInfo.make(ErrorActivity.REQUESTED_STREAM,
+                                service.getServiceInfo().name, videoUrl, 0 /* no message for the user */));
+            }
+
+            // These errors render the stream information unusable.
+        } catch (ReCaptchaException e) {
+            if (callback != null) handler.post(new Runnable() {
+                @Override
+                public void run() {
+                    callback.onReCaptchaException();
+                }
+            });
+        } catch (IOException e) {
+            if (callback != null) handler.post(new Runnable() {
+                @Override
+                public void run() {
+                    callback.onError(R.string.network_error);
+                }
+            });
+            if (callback != null) e.printStackTrace();
+        } catch (YoutubeStreamExtractor.DecryptException de) {
+            // custom service related exceptions
+            ErrorActivity.reportError(handler, activity, de, VideoItemDetailActivity.class, null,
+                    ErrorActivity.ErrorInfo.make(ErrorActivity.REQUESTED_STREAM,
+                            service.getServiceInfo().name, videoUrl, R.string.youtube_signature_decryption_error));
+            handler.post(new Runnable() {
+                @Override
+                public void run() {
+                    activity.finish();
+                }
+            });
+            de.printStackTrace();
+        } catch (YoutubeStreamExtractor.GemaException ge) {
+            if (callback != null) handler.post(new Runnable() {
+                @Override
+                public void run() {
+                    callback.onBlockedByGemaError();
+                }
+            });
+        } catch (YoutubeStreamExtractor.LiveStreamException e) {
+            if (callback != null) handler.post(new Runnable() {
+                @Override
+                public void run() {
+                    callback.onContentErrorWithMessage(R.string.live_streams_not_supported);
+                }
+            });
+        }
+        // ----------------------------------------
+        catch (StreamExtractor.ContentNotAvailableException e) {
+            if (callback != null) handler.post(new Runnable() {
+                @Override
+                public void run() {
+                    callback.onContentError();
+                }
+            });
+            e.printStackTrace();
+        } catch (StreamInfo.StreamExctractException e) {
+            if (!streamInfo.errors.isEmpty()) {
+                // !!! if this case ever kicks in someone gets kicked out !!!
+                ErrorActivity.reportError(handler, activity, e, VideoItemDetailActivity.class, null,
+                        ErrorActivity.ErrorInfo.make(ErrorActivity.REQUESTED_STREAM,
+                                service.getServiceInfo().name, videoUrl, R.string.could_not_get_stream));
+            } else {
+                ErrorActivity.reportError(handler, activity, streamInfo.errors, VideoItemDetailActivity.class, null,
+                        ErrorActivity.ErrorInfo.make(ErrorActivity.REQUESTED_STREAM,
+                                service.getServiceInfo().name, videoUrl, R.string.could_not_get_stream));
+            }
+            handler.post(new Runnable() {
+                @Override
+                public void run() {
+                    activity.finish();
+                }
+            });
+            e.printStackTrace();
+        } catch (ParsingException e) {
+            ErrorActivity.reportError(handler, activity, e, VideoItemDetailActivity.class, null,
+                    ErrorActivity.ErrorInfo.make(ErrorActivity.REQUESTED_STREAM,
+                            service.getServiceInfo().name, videoUrl, R.string.parsing_error));
+            handler.post(new Runnable() {
+                @Override
+                public void run() {
+                    activity.finish();
+                }
+            });
+            e.printStackTrace();
+        } catch (Exception e) {
+            ErrorActivity.reportError(handler, activity, e, VideoItemDetailActivity.class, null,
+                    ErrorActivity.ErrorInfo.make(ErrorActivity.REQUESTED_STREAM,
+                            service.getServiceInfo().name, videoUrl, R.string.general_error));
+            handler.post(new Runnable() {
+                @Override
+                public void run() {
+                    activity.finish();
+                }
+            });
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * Return true if the extraction is not completed yet
+     *
+     * @return the value of the AtomicBoolean {@link #isRunning}
+     */
+    public boolean isRunning() {
+        return isRunning.get();
+    }
+
+    /**
+     * Cancel this ExtractorThread, setting the callback to null, the AtomicBoolean {@link #isRunning} to false and interrupt this thread.
+     * <p>
+     * <b>Note:</b> Any I/O that is active in the moment that this method is called will be canceled and a Exception will be thrown, because of the {@link #interrupt()}.<br>
+     * This is useful when you don't want the resulting {@link StreamInfo} anymore, but don't want to waste bandwidth, otherwise it'd run till it receives the StreamInfo.
+     */
+    public void cancel() {
+        this.callback = null;
+        this.isRunning.set(false);
+        this.interrupt();
+    }
+}

app/src/main/java/org/schabi/newpipe/detail/StreamInfoWorker.java

@@ -1,230 +0,0 @@
-package org.schabi.newpipe.detail;
-
-import android.app.Activity;
-import android.os.Handler;
-import android.util.Log;
-import android.view.View;
-
-import org.schabi.newpipe.extractor.exceptions.ParsingException;
-import org.schabi.newpipe.extractor.exceptions.ReCaptchaException;
-import org.schabi.newpipe.extractor.stream_info.StreamExtractor;
-import org.schabi.newpipe.extractor.stream_info.StreamInfo;
-import org.schabi.newpipe.report.ErrorActivity;
-import org.schabi.newpipe.R;
-import org.schabi.newpipe.extractor.NewPipe;
-import org.schabi.newpipe.extractor.StreamingService;
-import org.schabi.newpipe.extractor.services.youtube.YoutubeStreamExtractor;
-
-import java.io.IOException;
-
-/**
- * Created by Christian Schabesberger on 02.08.16.
- *
- * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
- * StreamInfoWorker.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 StreamInfoWorker {
-
-    private static final String TAG = StreamInfoWorker.class.toString();
-
-    public interface OnStreamInfoReceivedListener {
-        void onReceive(StreamInfo info);
-        void onError(int messageId);
-        void onReCaptchaException();
-        void onBlockedByGemaError();
-        void onContentErrorWithMessage(int messageId);
-        void onContentError();
-    }
-
-    private class StreamExtractorRunnable implements Runnable {
-        private final Handler h = new Handler();
-        private StreamExtractor streamExtractor;
-        private final int serviceId;
-        private final String videoUrl;
-        private Activity a;
-
-        public StreamExtractorRunnable(Activity a, String videoUrl, int serviceId) {
-            this.serviceId = serviceId;
-            this.videoUrl = videoUrl;
-            this.a = a;
-        }
-
-        @Override
-        public void run() {
-            StreamInfo streamInfo = null;
-            StreamingService service = null;
-            try {
-                service = NewPipe.getService(serviceId);
-            } catch (Exception e) {
-                e.printStackTrace();
-                ErrorActivity.reportError(h, a, e, VideoItemDetailFragment.class, null,
-                        ErrorActivity.ErrorInfo.make(ErrorActivity.REQUESTED_STREAM,
-                                "", videoUrl, R.string.could_not_get_stream));
-                return;
-            }
-            try {
-                streamExtractor = service.getExtractorInstance(videoUrl);
-                streamInfo = StreamInfo.getVideoInfo(streamExtractor);
-
-                final StreamInfo info = streamInfo;
-                h.post(new Runnable() {
-                    @Override
-                    public void run() {
-                        onStreamInfoReceivedListener.onReceive(info);
-                    }
-                });
-
-                // look for errors during extraction
-                // this if statement only covers extra information.
-                // if these are not available or caused an error, they are just not available
-                // but don't render the stream information unusalbe.
-                if(streamInfo != null &&
-                        !streamInfo.errors.isEmpty()) {
-                    Log.e(TAG, "OCCURRED ERRORS DURING EXTRACTION:");
-                    for (Throwable e : streamInfo.errors) {
-                        e.printStackTrace();
-                        Log.e(TAG, "------");
-                    }
-
-                    View rootView = a != null ? a.findViewById(R.id.video_item_detail) : null;
-                    ErrorActivity.reportError(h, a,
-                            streamInfo.errors, null, rootView,
-                            ErrorActivity.ErrorInfo.make(ErrorActivity.REQUESTED_STREAM,
-                                    service.getServiceInfo().name, videoUrl, 0 /* no message for the user */));
-                }
-
-                // These errors render the stream information unusable.
-            } catch (ReCaptchaException e) {
-                h.post(new Runnable() {
-                    @Override
-                    public void run() {
-                        onStreamInfoReceivedListener.onReCaptchaException();
-                    }
-                });
-            } catch (IOException e) {
-                h.post(new Runnable() {
-                    @Override
-                    public void run() {
-                        onStreamInfoReceivedListener.onError(R.string.network_error);
-                    }
-                });
-                e.printStackTrace();
-            } catch (YoutubeStreamExtractor.DecryptException de) {
-                // custom service related exceptions
-                ErrorActivity.reportError(h, a, de, VideoItemDetailFragment.class, null,
-                        ErrorActivity.ErrorInfo.make(ErrorActivity.REQUESTED_STREAM,
-                                service.getServiceInfo().name, videoUrl, R.string.youtube_signature_decryption_error));
-                h.post(new Runnable() {
-                    @Override
-                    public void run() {
-                        a.finish();
-                    }
-                });
-                de.printStackTrace();
-            } catch (YoutubeStreamExtractor.GemaException ge) {
-                h.post(new Runnable() {
-                    @Override
-                    public void run() {
-                        onStreamInfoReceivedListener.onBlockedByGemaError();
-                    }
-                });
-            } catch(YoutubeStreamExtractor.LiveStreamException e) {
-                h.post(new Runnable() {
-                    @Override
-                    public void run() {
-                        onStreamInfoReceivedListener
-                                .onContentErrorWithMessage(R.string.live_streams_not_supported);
-                    }
-                });
-            }
-            // ----------------------------------------
-            catch(StreamExtractor.ContentNotAvailableException e) {
-                h.post(new Runnable() {
-                    @Override
-                    public void run() {
-                        onStreamInfoReceivedListener
-                                .onContentError();
-                    }
-                });
-                e.printStackTrace();
-            } catch(StreamInfo.StreamExctractException e) {
-                if(!streamInfo.errors.isEmpty()) {
-                    // !!! if this case ever kicks in someone gets kicked out !!!
-                    ErrorActivity.reportError(h, a, e, VideoItemDetailFragment.class, null,
-                            ErrorActivity.ErrorInfo.make(ErrorActivity.REQUESTED_STREAM,
-                                    service.getServiceInfo().name, videoUrl, R.string.could_not_get_stream));
-                } else {
-                    ErrorActivity.reportError(h, a, streamInfo.errors, VideoItemDetailFragment.class, null,
-                            ErrorActivity.ErrorInfo.make(ErrorActivity.REQUESTED_STREAM,
-                                    service.getServiceInfo().name, videoUrl, R.string.could_not_get_stream));
-                }
-                h.post(new Runnable() {
-                    @Override
-                    public void run() {
-                        a.finish();
-                    }
-                });
-                e.printStackTrace();
-            } catch (ParsingException e) {
-                ErrorActivity.reportError(h, a, e, VideoItemDetailFragment.class, null,
-                        ErrorActivity.ErrorInfo.make(ErrorActivity.REQUESTED_STREAM,
-                                service.getServiceInfo().name, videoUrl, R.string.parsing_error));
-                h.post(new Runnable() {
-                    @Override
-                    public void run() {
-                        a.finish();
-                    }
-                });
-                e.printStackTrace();
-            } catch(Exception e) {
-                ErrorActivity.reportError(h, a, e, VideoItemDetailFragment.class, null,
-                        ErrorActivity.ErrorInfo.make(ErrorActivity.REQUESTED_STREAM,
-                                service.getServiceInfo().name, videoUrl, R.string.general_error));
-                h.post(new Runnable() {
-                    @Override
-                    public void run() {
-                        a.finish();
-                    }
-                });
-                e.printStackTrace();
-            }
-        }
-    }
-
-    private static StreamInfoWorker streamInfoWorker = null;
-    private StreamExtractorRunnable runnable = null;
-    private OnStreamInfoReceivedListener onStreamInfoReceivedListener = null;
-
-    private StreamInfoWorker() {
-
-    }
-
-    public static StreamInfoWorker getInstance() {
-        return streamInfoWorker == null ? (streamInfoWorker = new StreamInfoWorker()) : streamInfoWorker;
-    }
-
-    public void search(int serviceId, String url, Activity a) {
-        runnable = new StreamExtractorRunnable(a, url, serviceId);
-        Thread thread = new Thread(runnable);
-        thread.start();
-    }
-
-    public void setOnStreamInfoReceivedListener(
-            OnStreamInfoReceivedListener onStreamInfoReceivedListener) {
-        this.onStreamInfoReceivedListener = onStreamInfoReceivedListener;
-    }
-}

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

@@ -26,7 +26,6 @@ import org.schabi.newpipe.ActivityCommunicator;
 import org.schabi.newpipe.BuildConfig;
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.detail.VideoItemDetailActivity;
-import org.schabi.newpipe.detail.VideoItemDetailFragment;
 import org.schabi.newpipe.util.NavStack;
 
 import java.io.IOException;
@@ -343,7 +342,7 @@ public class BackgroundPlayer extends Service /*implements MediaPlayer.OnPrepare
 
             /*
             NotificationCompat.Action pauseButton = new NotificationCompat.Action.Builder
-                    (R.drawable.ic_pause_white_24dp, "Pause", playPI).build();
+                    (R.drawable.ic_pause_white, "Pause", playPI).build();
             */
 
             PendingIntent playPI = PendingIntent.getBroadcast(owner, noteID,
@@ -465,7 +464,7 @@ public class BackgroundPlayer extends Service /*implements MediaPlayer.OnPrepare
                 RemoteViews views = getContentView(), bigViews = getBigContentView();
                 int imageSrc;
                 if(isPlaying) {
-                    imageSrc = R.drawable.ic_pause_white_24dp;
+                    imageSrc = R.drawable.ic_pause_white;
                 } else {
                     imageSrc = R.drawable.ic_play_circle_filled_white_24dp;
                 }

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

@@ -5,9 +5,8 @@ import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.pm.ActivityInfo;
 import android.content.res.Configuration;
-import android.graphics.drawable.Drawable;
-import android.media.MediaPlayer;
 import android.media.AudioManager;
+import android.media.MediaPlayer;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
@@ -28,7 +27,6 @@ import android.widget.MediaController;
 import android.widget.ProgressBar;
 import android.widget.VideoView;
 
-import org.schabi.newpipe.App;
 import org.schabi.newpipe.R;
 
 /**

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

@@ -0,0 +1,19 @@
+package org.schabi.newpipe.player;
+
+public interface StateInterface {
+    int STATE_LOADING = 123;
+    int STATE_PLAYING = 124;
+    int STATE_BUFFERING = 125;
+    int STATE_PAUSED = 126;
+    int STATE_PAUSED_SEEK = 127;
+    int STATE_COMPLETED = 128;
+
+    void changeState(int state);
+
+    void onLoading();
+    void onPlaying();
+    void onBuffering();
+    void onPaused();
+    void onPausedSeek();
+    void onCompleted();
+}

app/src/main/java/org/schabi/newpipe/player/exoplayer/EventLogger.java

@@ -1,214 +0,0 @@
-/*
- * Copyright (C) 2014 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.schabi.newpipe.player.exoplayer;
-
-import com.google.android.exoplayer.ExoPlayer;
-import com.google.android.exoplayer.MediaCodecTrackRenderer.DecoderInitializationException;
-import com.google.android.exoplayer.TimeRange;
-import com.google.android.exoplayer.audio.AudioTrack;
-import com.google.android.exoplayer.chunk.Format;
-import com.google.android.exoplayer.util.VerboseLogUtil;
-
-import android.media.MediaCodec.CryptoException;
-import android.os.SystemClock;
-import android.util.Log;
-
-import java.io.IOException;
-import java.text.NumberFormat;
-import java.util.Locale;
-
-/**
- * Logs player events using {@link Log}.
- */
-public class EventLogger implements NPExoPlayer.Listener, NPExoPlayer.InfoListener,
-    NPExoPlayer.InternalErrorListener {
-
-  private static final String TAG = "EventLogger";
-  private static final NumberFormat TIME_FORMAT;
-  static {
-    TIME_FORMAT = NumberFormat.getInstance(Locale.US);
-    TIME_FORMAT.setMinimumFractionDigits(2);
-    TIME_FORMAT.setMaximumFractionDigits(2);
-  }
-
-  private long sessionStartTimeMs;
-  private long[] loadStartTimeMs;
-  private long[] availableRangeValuesUs;
-
-  public EventLogger() {
-    loadStartTimeMs = new long[NPExoPlayer.RENDERER_COUNT];
-  }
-
-  public void startSession() {
-    sessionStartTimeMs = SystemClock.elapsedRealtime();
-    Log.d(TAG, "start [0]");
-  }
-
-  public void endSession() {
-    Log.d(TAG, "end [" + getSessionTimeString() + "]");
-  }
-
-  // NPExoPlayer.Listener
-
-  @Override
-  public void onStateChanged(boolean playWhenReady, int state) {
-    Log.d(TAG, "state [" + getSessionTimeString() + ", " + playWhenReady + ", "
-        + getStateString(state) + "]");
-  }
-
-  @Override
-  public void onError(Exception e) {
-    Log.e(TAG, "playerFailed [" + getSessionTimeString() + "]", e);
-  }
-
-  @Override
-  public void onVideoSizeChanged(int width, int height, int unappliedRotationDegrees,
-      float pixelWidthHeightRatio) {
-    Log.d(TAG, "videoSizeChanged [" + width + ", " + height + ", " + unappliedRotationDegrees
-        + ", " + pixelWidthHeightRatio + "]");
-  }
-
-  // NPExoPlayer.InfoListener
-
-  @Override
-  public void onBandwidthSample(int elapsedMs, long bytes, long bitrateEstimate) {
-    Log.d(TAG, "bandwidth [" + getSessionTimeString() + ", " + bytes + ", "
-        + getTimeString(elapsedMs) + ", " + bitrateEstimate + "]");
-  }
-
-  @Override
-  public void onDroppedFrames(int count, long elapsed) {
-    Log.d(TAG, "droppedFrames [" + getSessionTimeString() + ", " + count + "]");
-  }
-
-  @Override
-  public void onLoadStarted(int sourceId, long length, int type, int trigger, Format format,
-      long mediaStartTimeMs, long mediaEndTimeMs) {
-    loadStartTimeMs[sourceId] = SystemClock.elapsedRealtime();
-    if (VerboseLogUtil.isTagEnabled(TAG)) {
-      Log.v(TAG, "loadStart [" + getSessionTimeString() + ", " + sourceId + ", " + type
-          + ", " + mediaStartTimeMs + ", " + mediaEndTimeMs + "]");
-    }
-  }
-
-  @Override
-  public void onLoadCompleted(int sourceId, long bytesLoaded, int type, int trigger, Format format,
-       long mediaStartTimeMs, long mediaEndTimeMs, long elapsedRealtimeMs, long loadDurationMs) {
-    if (VerboseLogUtil.isTagEnabled(TAG)) {
-      long downloadTime = SystemClock.elapsedRealtime() - loadStartTimeMs[sourceId];
-      Log.v(TAG, "loadEnd [" + getSessionTimeString() + ", " + sourceId + ", " + downloadTime
-          + "]");
-    }
-  }
-
-  @Override
-  public void onVideoFormatEnabled(Format format, int trigger, long mediaTimeMs) {
-    Log.d(TAG, "videoFormat [" + getSessionTimeString() + ", " + format.id + ", "
-        + Integer.toString(trigger) + "]");
-  }
-
-  @Override
-  public void onAudioFormatEnabled(Format format, int trigger, long mediaTimeMs) {
-    Log.d(TAG, "audioFormat [" + getSessionTimeString() + ", " + format.id + ", "
-        + Integer.toString(trigger) + "]");
-  }
-
-  // NPExoPlayer.InternalErrorListener
-
-  @Override
-  public void onLoadError(int sourceId, IOException e) {
-    printInternalError("loadError", e);
-  }
-
-  @Override
-  public void onRendererInitializationError(Exception e) {
-    printInternalError("rendererInitError", e);
-  }
-
-  @Override
-  public void onDrmSessionManagerError(Exception e) {
-    printInternalError("drmSessionManagerError", e);
-  }
-
-  @Override
-  public void onDecoderInitializationError(DecoderInitializationException e) {
-    printInternalError("decoderInitializationError", e);
-  }
-
-  @Override
-  public void onAudioTrackInitializationError(AudioTrack.InitializationException e) {
-    printInternalError("audioTrackInitializationError", e);
-  }
-
-  @Override
-  public void onAudioTrackWriteError(AudioTrack.WriteException e) {
-    printInternalError("audioTrackWriteError", e);
-  }
-
-  @Override
-  public void onAudioTrackUnderrun(int bufferSize, long bufferSizeMs, long elapsedSinceLastFeedMs) {
-    printInternalError("audioTrackUnderrun [" + bufferSize + ", " + bufferSizeMs + ", "
-        + elapsedSinceLastFeedMs + "]", null);
-  }
-
-  @Override
-  public void onCryptoError(CryptoException e) {
-    printInternalError("cryptoError", e);
-  }
-
-  @Override
-  public void onDecoderInitialized(String decoderName, long elapsedRealtimeMs,
-      long initializationDurationMs) {
-    Log.d(TAG, "decoderInitialized [" + getSessionTimeString() + ", " + decoderName + "]");
-  }
-
-  @Override
-  public void onAvailableRangeChanged(int sourceId, TimeRange availableRange) {
-    availableRangeValuesUs = availableRange.getCurrentBoundsUs(availableRangeValuesUs);
-    Log.d(TAG, "availableRange [" + availableRange.isStatic() + ", " + availableRangeValuesUs[0]
-        + ", " + availableRangeValuesUs[1] + "]");
-  }
-
-  private void printInternalError(String type, Exception e) {
-    Log.e(TAG, "internalError [" + getSessionTimeString() + ", " + type + "]", e);
-  }
-
-  private String getStateString(int state) {
-    switch (state) {
-      case ExoPlayer.STATE_BUFFERING:
-        return "B";
-      case ExoPlayer.STATE_ENDED:
-        return "E";
-      case ExoPlayer.STATE_IDLE:
-        return "I";
-      case ExoPlayer.STATE_PREPARING:
-        return "P";
-      case ExoPlayer.STATE_READY:
-        return "R";
-      default:
-        return "?";
-    }
-  }
-
-  private String getSessionTimeString() {
-    return getTimeString(SystemClock.elapsedRealtime() - sessionStartTimeMs);
-  }
-
-  private String getTimeString(long timeMs) {
-    return TIME_FORMAT.format((timeMs) / 1000f);
-  }
-
-}

app/src/main/java/org/schabi/newpipe/player/exoplayer/ExtractorRendererBuilder.java

@@ -1,89 +0,0 @@
-/*
- * Copyright (C) 2014 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.schabi.newpipe.player.exoplayer;
-
-import org.schabi.newpipe.player.exoplayer.NPExoPlayer.RendererBuilder;
-
-import com.google.android.exoplayer.MediaCodecAudioTrackRenderer;
-import com.google.android.exoplayer.MediaCodecSelector;
-import com.google.android.exoplayer.MediaCodecVideoTrackRenderer;
-import com.google.android.exoplayer.TrackRenderer;
-import com.google.android.exoplayer.audio.AudioCapabilities;
-import com.google.android.exoplayer.extractor.Extractor;
-import com.google.android.exoplayer.extractor.ExtractorSampleSource;
-import com.google.android.exoplayer.text.TextTrackRenderer;
-import com.google.android.exoplayer.upstream.Allocator;
-import com.google.android.exoplayer.upstream.DataSource;
-import com.google.android.exoplayer.upstream.DefaultAllocator;
-import com.google.android.exoplayer.upstream.DefaultBandwidthMeter;
-import com.google.android.exoplayer.upstream.DefaultUriDataSource;
-
-import android.content.Context;
-import android.media.AudioManager;
-import android.media.MediaCodec;
-import android.net.Uri;
-
-/**
- * A {@link RendererBuilder} for streams that can be read using an {@link Extractor}.
- */
-public class ExtractorRendererBuilder implements RendererBuilder {
-
-  private static final int BUFFER_SEGMENT_SIZE = 64 * 1024;
-  private static final int BUFFER_SEGMENT_COUNT = 256;
-
-  private final Context context;
-  private final String userAgent;
-  private final Uri uri;
-
-  public ExtractorRendererBuilder(Context context, String userAgent, Uri uri) {
-    this.context = context;
-    this.userAgent = userAgent;
-    this.uri = uri;
-  }
-
-  @Override
-  public void buildRenderers(NPExoPlayer player) {
-    Allocator allocator = new DefaultAllocator(BUFFER_SEGMENT_SIZE);
-
-    // Build the video and audio renderers.
-    DefaultBandwidthMeter bandwidthMeter = new DefaultBandwidthMeter(player.getMainHandler(),
-        null);
-    DataSource dataSource = new DefaultUriDataSource(context, bandwidthMeter, userAgent);
-    ExtractorSampleSource sampleSource = new ExtractorSampleSource(uri, dataSource, allocator,
-        BUFFER_SEGMENT_COUNT * BUFFER_SEGMENT_SIZE);
-    MediaCodecVideoTrackRenderer videoRenderer = new MediaCodecVideoTrackRenderer(context,
-        sampleSource, MediaCodecSelector.DEFAULT, MediaCodec.VIDEO_SCALING_MODE_SCALE_TO_FIT, 5000,
-        player.getMainHandler(), player, 50);
-    MediaCodecAudioTrackRenderer audioRenderer = new MediaCodecAudioTrackRenderer(sampleSource,
-        MediaCodecSelector.DEFAULT, null, true, player.getMainHandler(), player,
-        AudioCapabilities.getCapabilities(context), AudioManager.STREAM_MUSIC);
-    TrackRenderer textRenderer = new TextTrackRenderer(sampleSource, player,
-        player.getMainHandler().getLooper());
-
-    // Invoke the callback.
-    TrackRenderer[] renderers = new TrackRenderer[NPExoPlayer.RENDERER_COUNT];
-    renderers[NPExoPlayer.TYPE_VIDEO] = videoRenderer;
-    renderers[NPExoPlayer.TYPE_AUDIO] = audioRenderer;
-    renderers[NPExoPlayer.TYPE_TEXT] = textRenderer;
-    player.onRenderers(renderers, bandwidthMeter);
-  }
-
-  @Override
-  public void cancel() {
-    // Do nothing.
-  }
-
-}

app/src/main/java/org/schabi/newpipe/player/exoplayer/HlsRendererBuilder.java

@@ -1,180 +0,0 @@
-/*
- * Copyright (C) 2014 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.schabi.newpipe.player.exoplayer;
-
-import org.schabi.newpipe.player.exoplayer.NPExoPlayer.RendererBuilder;
-
-import com.google.android.exoplayer.DefaultLoadControl;
-import com.google.android.exoplayer.LoadControl;
-import com.google.android.exoplayer.MediaCodecAudioTrackRenderer;
-import com.google.android.exoplayer.MediaCodecSelector;
-import com.google.android.exoplayer.MediaCodecVideoTrackRenderer;
-import com.google.android.exoplayer.TrackRenderer;
-import com.google.android.exoplayer.audio.AudioCapabilities;
-import com.google.android.exoplayer.hls.DefaultHlsTrackSelector;
-import com.google.android.exoplayer.hls.HlsChunkSource;
-import com.google.android.exoplayer.hls.HlsMasterPlaylist;
-import com.google.android.exoplayer.hls.HlsPlaylist;
-import com.google.android.exoplayer.hls.HlsPlaylistParser;
-import com.google.android.exoplayer.hls.HlsSampleSource;
-import com.google.android.exoplayer.hls.PtsTimestampAdjusterProvider;
-import com.google.android.exoplayer.metadata.Id3Parser;
-import com.google.android.exoplayer.metadata.MetadataTrackRenderer;
-import com.google.android.exoplayer.text.TextTrackRenderer;
-import com.google.android.exoplayer.text.eia608.Eia608TrackRenderer;
-import com.google.android.exoplayer.upstream.DataSource;
-import com.google.android.exoplayer.upstream.DefaultAllocator;
-import com.google.android.exoplayer.upstream.DefaultBandwidthMeter;
-import com.google.android.exoplayer.upstream.DefaultUriDataSource;
-import com.google.android.exoplayer.util.ManifestFetcher;
-import com.google.android.exoplayer.util.ManifestFetcher.ManifestCallback;
-
-import android.content.Context;
-import android.media.AudioManager;
-import android.media.MediaCodec;
-import android.os.Handler;
-
-import java.io.IOException;
-import java.util.Map;
-
-/**
- * A {@link RendererBuilder} for HLS.
- */
-public class HlsRendererBuilder implements RendererBuilder {
-
-  private static final int BUFFER_SEGMENT_SIZE = 64 * 1024;
-  private static final int MAIN_BUFFER_SEGMENTS = 256;
-  private static final int TEXT_BUFFER_SEGMENTS = 2;
-
-  private final Context context;
-  private final String userAgent;
-  private final String url;
-
-  private AsyncRendererBuilder currentAsyncBuilder;
-
-  public HlsRendererBuilder(Context context, String userAgent, String url) {
-    this.context = context;
-    this.userAgent = userAgent;
-    this.url = url;
-  }
-
-  @Override
-  public void buildRenderers(NPExoPlayer player) {
-    currentAsyncBuilder = new AsyncRendererBuilder(context, userAgent, url, player);
-    currentAsyncBuilder.init();
-  }
-
-  @Override
-  public void cancel() {
-    if (currentAsyncBuilder != null) {
-      currentAsyncBuilder.cancel();
-      currentAsyncBuilder = null;
-    }
-  }
-
-  private static final class AsyncRendererBuilder implements ManifestCallback<HlsPlaylist> {
-
-    private final Context context;
-    private final String userAgent;
-    private final String url;
-    private final NPExoPlayer player;
-    private final ManifestFetcher<HlsPlaylist> playlistFetcher;
-
-    private boolean canceled;
-
-    public AsyncRendererBuilder(Context context, String userAgent, String url, NPExoPlayer player) {
-      this.context = context;
-      this.userAgent = userAgent;
-      this.url = url;
-      this.player = player;
-      HlsPlaylistParser parser = new HlsPlaylistParser();
-      playlistFetcher = new ManifestFetcher<>(url, new DefaultUriDataSource(context, userAgent),
-          parser);
-    }
-
-    public void init() {
-      playlistFetcher.singleLoad(player.getMainHandler().getLooper(), this);
-    }
-
-    public void cancel() {
-      canceled = true;
-    }
-
-    @Override
-    public void onSingleManifestError(IOException e) {
-      if (canceled) {
-        return;
-      }
-
-      player.onRenderersError(e);
-    }
-
-    @Override
-    public void onSingleManifest(HlsPlaylist manifest) {
-      if (canceled) {
-        return;
-      }
-
-      Handler mainHandler = player.getMainHandler();
-      LoadControl loadControl = new DefaultLoadControl(new DefaultAllocator(BUFFER_SEGMENT_SIZE));
-      DefaultBandwidthMeter bandwidthMeter = new DefaultBandwidthMeter();
-      PtsTimestampAdjusterProvider timestampAdjusterProvider = new PtsTimestampAdjusterProvider();
-
-      // Build the video/audio/metadata renderers.
-      DataSource dataSource = new DefaultUriDataSource(context, bandwidthMeter, userAgent);
-      HlsChunkSource chunkSource = new HlsChunkSource(true /* isMaster */, dataSource, url,
-          manifest, DefaultHlsTrackSelector.newDefaultInstance(context), bandwidthMeter,
-          timestampAdjusterProvider, HlsChunkSource.ADAPTIVE_MODE_SPLICE);
-      HlsSampleSource sampleSource = new HlsSampleSource(chunkSource, loadControl,
-          MAIN_BUFFER_SEGMENTS * BUFFER_SEGMENT_SIZE, mainHandler, player, NPExoPlayer.TYPE_VIDEO);
-      MediaCodecVideoTrackRenderer videoRenderer = new MediaCodecVideoTrackRenderer(context,
-          sampleSource, MediaCodecSelector.DEFAULT, MediaCodec.VIDEO_SCALING_MODE_SCALE_TO_FIT,
-          5000, mainHandler, player, 50);
-      MediaCodecAudioTrackRenderer audioRenderer = new MediaCodecAudioTrackRenderer(sampleSource,
-          MediaCodecSelector.DEFAULT, null, true, player.getMainHandler(), player,
-          AudioCapabilities.getCapabilities(context), AudioManager.STREAM_MUSIC);
-      MetadataTrackRenderer<Map<String, Object>> id3Renderer = new MetadataTrackRenderer<>(
-          sampleSource, new Id3Parser(), player, mainHandler.getLooper());
-
-      // Build the text renderer, preferring Webvtt where available.
-      boolean preferWebvtt = false;
-      if (manifest instanceof HlsMasterPlaylist) {
-        preferWebvtt = !((HlsMasterPlaylist) manifest).subtitles.isEmpty();
-      }
-      TrackRenderer textRenderer;
-      if (preferWebvtt) {
-        DataSource textDataSource = new DefaultUriDataSource(context, bandwidthMeter, userAgent);
-        HlsChunkSource textChunkSource = new HlsChunkSource(false /* isMaster */, textDataSource,
-            url, manifest, DefaultHlsTrackSelector.newVttInstance(), bandwidthMeter,
-            timestampAdjusterProvider, HlsChunkSource.ADAPTIVE_MODE_SPLICE);
-        HlsSampleSource textSampleSource = new HlsSampleSource(textChunkSource, loadControl,
-            TEXT_BUFFER_SEGMENTS * BUFFER_SEGMENT_SIZE, mainHandler, player, NPExoPlayer.TYPE_TEXT);
-        textRenderer = new TextTrackRenderer(textSampleSource, player, mainHandler.getLooper());
-      } else {
-        textRenderer = new Eia608TrackRenderer(sampleSource, player, mainHandler.getLooper());
-      }
-
-      TrackRenderer[] renderers = new TrackRenderer[NPExoPlayer.RENDERER_COUNT];
-      renderers[NPExoPlayer.TYPE_VIDEO] = videoRenderer;
-      renderers[NPExoPlayer.TYPE_AUDIO] = audioRenderer;
-      renderers[NPExoPlayer.TYPE_METADATA] = id3Renderer;
-      renderers[NPExoPlayer.TYPE_TEXT] = textRenderer;
-      player.onRenderers(renderers, bandwidthMeter);
-    }
-
-  }
-
-}

app/src/main/java/org/schabi/newpipe/player/exoplayer/SmoothStreamingRendererBuilder.java

@@ -1,206 +0,0 @@
-/*
- * Copyright (C) 2014 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.schabi.newpipe.player.exoplayer;
-
-
-import org.schabi.newpipe.player.exoplayer.NPExoPlayer.RendererBuilder;
-
-import com.google.android.exoplayer.DefaultLoadControl;
-import com.google.android.exoplayer.LoadControl;
-import com.google.android.exoplayer.MediaCodecAudioTrackRenderer;
-import com.google.android.exoplayer.MediaCodecSelector;
-import com.google.android.exoplayer.MediaCodecVideoTrackRenderer;
-import com.google.android.exoplayer.TrackRenderer;
-import com.google.android.exoplayer.audio.AudioCapabilities;
-import com.google.android.exoplayer.chunk.ChunkSampleSource;
-import com.google.android.exoplayer.chunk.ChunkSource;
-import com.google.android.exoplayer.chunk.FormatEvaluator.AdaptiveEvaluator;
-import com.google.android.exoplayer.drm.DrmSessionManager;
-import com.google.android.exoplayer.drm.MediaDrmCallback;
-import com.google.android.exoplayer.drm.StreamingDrmSessionManager;
-import com.google.android.exoplayer.drm.UnsupportedDrmException;
-import com.google.android.exoplayer.smoothstreaming.DefaultSmoothStreamingTrackSelector;
-import com.google.android.exoplayer.smoothstreaming.SmoothStreamingChunkSource;
-import com.google.android.exoplayer.smoothstreaming.SmoothStreamingManifest;
-import com.google.android.exoplayer.smoothstreaming.SmoothStreamingManifestParser;
-import com.google.android.exoplayer.text.TextTrackRenderer;
-import com.google.android.exoplayer.upstream.DataSource;
-import com.google.android.exoplayer.upstream.DefaultAllocator;
-import com.google.android.exoplayer.upstream.DefaultBandwidthMeter;
-import com.google.android.exoplayer.upstream.DefaultHttpDataSource;
-import com.google.android.exoplayer.upstream.DefaultUriDataSource;
-import com.google.android.exoplayer.util.ManifestFetcher;
-import com.google.android.exoplayer.util.Util;
-
-import android.content.Context;
-import android.media.AudioManager;
-import android.media.MediaCodec;
-import android.os.Handler;
-
-import java.io.IOException;
-
-/**
- * A {@link RendererBuilder} for SmoothStreaming.
- */
-public class SmoothStreamingRendererBuilder implements RendererBuilder {
-
-  private static final int BUFFER_SEGMENT_SIZE = 64 * 1024;
-  private static final int VIDEO_BUFFER_SEGMENTS = 200;
-  private static final int AUDIO_BUFFER_SEGMENTS = 54;
-  private static final int TEXT_BUFFER_SEGMENTS = 2;
-  private static final int LIVE_EDGE_LATENCY_MS = 30000;
-
-  private final Context context;
-  private final String userAgent;
-  private final String url;
-  private final MediaDrmCallback drmCallback;
-
-  private AsyncRendererBuilder currentAsyncBuilder;
-
-  public SmoothStreamingRendererBuilder(Context context, String userAgent, String url,
-      MediaDrmCallback drmCallback) {
-    this.context = context;
-    this.userAgent = userAgent;
-    this.url = Util.toLowerInvariant(url).endsWith("/manifest") ? url : url + "/Manifest";
-    this.drmCallback = drmCallback;
-  }
-
-  @Override
-  public void buildRenderers(NPExoPlayer player) {
-    currentAsyncBuilder = new AsyncRendererBuilder(context, userAgent, url, drmCallback, player);
-    currentAsyncBuilder.init();
-  }
-
-  @Override
-  public void cancel() {
-    if (currentAsyncBuilder != null) {
-      currentAsyncBuilder.cancel();
-      currentAsyncBuilder = null;
-    }
-  }
-
-  private static final class AsyncRendererBuilder
-      implements ManifestFetcher.ManifestCallback<SmoothStreamingManifest> {
-
-    private final Context context;
-    private final String userAgent;
-    private final MediaDrmCallback drmCallback;
-    private final NPExoPlayer player;
-    private final ManifestFetcher<SmoothStreamingManifest> manifestFetcher;
-
-    private boolean canceled;
-
-    public AsyncRendererBuilder(Context context, String userAgent, String url,
-        MediaDrmCallback drmCallback, NPExoPlayer player) {
-      this.context = context;
-      this.userAgent = userAgent;
-      this.drmCallback = drmCallback;
-      this.player = player;
-      SmoothStreamingManifestParser parser = new SmoothStreamingManifestParser();
-      manifestFetcher = new ManifestFetcher<>(url, new DefaultHttpDataSource(userAgent, null),
-          parser);
-    }
-
-    public void init() {
-      manifestFetcher.singleLoad(player.getMainHandler().getLooper(), this);
-    }
-
-    public void cancel() {
-      canceled = true;
-    }
-
-    @Override
-    public void onSingleManifestError(IOException exception) {
-      if (canceled) {
-        return;
-      }
-
-      player.onRenderersError(exception);
-    }
-
-    @Override
-    public void onSingleManifest(SmoothStreamingManifest manifest) {
-      if (canceled) {
-        return;
-      }
-
-      Handler mainHandler = player.getMainHandler();
-      LoadControl loadControl = new DefaultLoadControl(new DefaultAllocator(BUFFER_SEGMENT_SIZE));
-      DefaultBandwidthMeter bandwidthMeter = new DefaultBandwidthMeter(mainHandler, player);
-
-      // Check drm support if necessary.
-      DrmSessionManager drmSessionManager = null;
-      if (manifest.protectionElement != null) {
-        if (Util.SDK_INT < 18) {
-          player.onRenderersError(
-              new UnsupportedDrmException(UnsupportedDrmException.REASON_UNSUPPORTED_SCHEME));
-          return;
-        }
-        try {
-          drmSessionManager = new StreamingDrmSessionManager(manifest.protectionElement.uuid,
-              player.getPlaybackLooper(), drmCallback, null, player.getMainHandler(), player);
-        } catch (UnsupportedDrmException e) {
-          player.onRenderersError(e);
-          return;
-        }
-      }
-
-      // Build the video renderer.
-      DataSource videoDataSource = new DefaultUriDataSource(context, bandwidthMeter, userAgent);
-      ChunkSource videoChunkSource = new SmoothStreamingChunkSource(manifestFetcher,
-          DefaultSmoothStreamingTrackSelector.newVideoInstance(context, true, false),
-          videoDataSource, new AdaptiveEvaluator(bandwidthMeter), LIVE_EDGE_LATENCY_MS);
-      ChunkSampleSource videoSampleSource = new ChunkSampleSource(videoChunkSource, loadControl,
-          VIDEO_BUFFER_SEGMENTS * BUFFER_SEGMENT_SIZE, mainHandler, player,
-          NPExoPlayer.TYPE_VIDEO);
-      TrackRenderer videoRenderer = new MediaCodecVideoTrackRenderer(context, videoSampleSource,
-          MediaCodecSelector.DEFAULT, MediaCodec.VIDEO_SCALING_MODE_SCALE_TO_FIT, 5000,
-          drmSessionManager, true, mainHandler, player, 50);
-
-      // Build the audio renderer.
-      DataSource audioDataSource = new DefaultUriDataSource(context, bandwidthMeter, userAgent);
-      ChunkSource audioChunkSource = new SmoothStreamingChunkSource(manifestFetcher,
-          DefaultSmoothStreamingTrackSelector.newAudioInstance(),
-          audioDataSource, null, LIVE_EDGE_LATENCY_MS);
-      ChunkSampleSource audioSampleSource = new ChunkSampleSource(audioChunkSource, loadControl,
-          AUDIO_BUFFER_SEGMENTS * BUFFER_SEGMENT_SIZE, mainHandler, player,
-          NPExoPlayer.TYPE_AUDIO);
-      TrackRenderer audioRenderer = new MediaCodecAudioTrackRenderer(audioSampleSource,
-          MediaCodecSelector.DEFAULT, drmSessionManager, true, mainHandler, player,
-          AudioCapabilities.getCapabilities(context), AudioManager.STREAM_MUSIC);
-
-      // Build the text renderer.
-      DataSource textDataSource = new DefaultUriDataSource(context, bandwidthMeter, userAgent);
-      ChunkSource textChunkSource = new SmoothStreamingChunkSource(manifestFetcher,
-          DefaultSmoothStreamingTrackSelector.newTextInstance(),
-          textDataSource, null, LIVE_EDGE_LATENCY_MS);
-      ChunkSampleSource textSampleSource = new ChunkSampleSource(textChunkSource, loadControl,
-          TEXT_BUFFER_SEGMENTS * BUFFER_SEGMENT_SIZE, mainHandler, player,
-          NPExoPlayer.TYPE_TEXT);
-      TrackRenderer textRenderer = new TextTrackRenderer(textSampleSource, player,
-          mainHandler.getLooper());
-
-      // Invoke the callback.
-      TrackRenderer[] renderers = new TrackRenderer[NPExoPlayer.RENDERER_COUNT];
-      renderers[NPExoPlayer.TYPE_VIDEO] = videoRenderer;
-      renderers[NPExoPlayer.TYPE_AUDIO] = audioRenderer;
-      renderers[NPExoPlayer.TYPE_TEXT] = textRenderer;
-      player.onRenderers(renderers, bandwidthMeter);
-    }
-
-  }
-
-}

app/src/main/java/org/schabi/newpipe/search_fragment/SearchInfoItemFragment.java

@@ -19,17 +19,14 @@ import android.view.inputmethod.InputMethodManager;
 import android.widget.ProgressBar;
 import android.widget.Toast;
 
-import org.schabi.newpipe.ChannelActivity;
+import org.schabi.newpipe.R;
 import org.schabi.newpipe.ReCaptchaActivity;
 import org.schabi.newpipe.extractor.NewPipe;
 import org.schabi.newpipe.extractor.search.SearchEngine;
 import org.schabi.newpipe.extractor.search.SearchResult;
 import org.schabi.newpipe.info_list.InfoItemBuilder;
-import org.schabi.newpipe.report.ErrorActivity;
-import org.schabi.newpipe.R;
-import org.schabi.newpipe.detail.VideoItemDetailActivity;
-import org.schabi.newpipe.detail.VideoItemDetailFragment;
 import org.schabi.newpipe.info_list.InfoListAdapter;
+import org.schabi.newpipe.report.ErrorActivity;
 import org.schabi.newpipe.util.NavStack;
 
 import java.util.EnumSet;

app/src/main/java/org/schabi/newpipe/util/NavStack.java

@@ -5,13 +5,10 @@ import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 import android.support.v4.app.NavUtils;
-import android.support.v7.app.AppCompatActivity;
-import android.util.Log;
 
 import org.schabi.newpipe.ChannelActivity;
 import org.schabi.newpipe.MainActivity;
 import org.schabi.newpipe.detail.VideoItemDetailActivity;
-import org.schabi.newpipe.detail.VideoItemDetailFragment;
 import org.schabi.newpipe.extractor.NewPipe;
 import org.schabi.newpipe.extractor.StreamingService;
 
@@ -73,10 +70,6 @@ public class NavStack {
         return instance;
     }
 
-    private void addEntry(String url, Class ac, int serviceId) {
-        stack.push(new NavEntry(url, serviceId));
-    }
-
     public void navBack(Activity activity) throws Exception {
         if(stack.size() == 0) { // if stack is already empty here, activity was probably called
             // from another app
@@ -120,7 +113,10 @@ public class NavStack {
     }
 
     private void openActivity(Context context, String url, int serviceId, Class acitivtyClass) {
-        stack.push(new NavEntry(url, serviceId));
+        //if last element has the same url do not push to stack again
+        if(stack.isEmpty() || !stack.peek().url.equals(url)) {
+            stack.push(new NavEntry(url, serviceId));
+        }
         Intent i = new Intent(context, acitivtyClass);
         i.putExtra(SERVICE_ID, serviceId);
         i.putExtra(URL, url);
@@ -144,6 +140,7 @@ public class NavStack {
 
     public void restoreSavedInstanceState(Bundle state) {
         ArrayList<String> sa = state.getStringArrayList(NAV_STACK);
+        stack.clear();
         for(String url : sa) {
             stack.push(new NavEntry(url, NewPipe.getServiceByUrl(url).getServiceId()));
         }

app/src/main/java/org/schabi/newpipe/util/PermissionHelper.java

@@ -2,8 +2,12 @@ package org.schabi.newpipe.util;
 
 import android.Manifest;
 import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
 import android.content.pm.PackageManager;
+import android.net.Uri;
 import android.os.Build;
+import android.provider.Settings;
 import android.support.annotation.RequiresApi;
 import android.support.v4.app.ActivityCompat;
 import android.support.v4.content.ContextCompat;
@@ -11,7 +15,7 @@ import android.support.v4.content.ContextCompat;
 public class PermissionHelper {
     public static final int PERMISSION_WRITE_STORAGE = 778;
     public static final int PERMISSION_READ_STORAGE = 777;
-
+    public static final int PERMISSION_SYSTEM_ALERT_WINDOW = 779;
 
 
     public static boolean checkStoragePermissions(Activity activity) {
@@ -65,4 +69,27 @@ public class PermissionHelper {
         }
         return true;
     }
+
+
+    /**
+     * In order to be able to draw over other apps, the permission android.permission.SYSTEM_ALERT_WINDOW have to be granted.
+     * <p>
+     * On < API 23 (MarshMallow) the permission was granted when the user installed the application (via AndroidManifest),
+     * on > 23, however, it have to start a activity asking the user if he agree.
+     * <p>
+     * This method just return if canDraw over other apps, if it doesn't, try to get the permission,
+     * it does not get the result of the startActivityForResult, if the user accept, the next time that he tries to open
+     * it will return true.
+     *
+     * @param activity context to startActivityForResult
+     * @return returns {@link Settings#canDrawOverlays(Context)}
+     **/
+    @RequiresApi(api = Build.VERSION_CODES.M)
+    public static boolean checkSystemAlertWindowPermission(Activity activity) {
+        if (!Settings.canDrawOverlays(activity)) {
+            Intent i = new Intent(Settings.ACTION_MANAGE_OVERLAY_PERMISSION, Uri.parse("package:" + activity.getPackageName()));
+            activity.startActivityForResult(i, PERMISSION_SYSTEM_ALERT_WINDOW);
+            return false;
+        }else return true;
+    }
 }

app/src/main/java/org/schabi/newpipe/util/ThemeHelper.java

@@ -7,18 +7,21 @@ import org.schabi.newpipe.R;
 
 public class ThemeHelper {
 
-    public static void setTheme(Context context, boolean mode) {
-        // mode is true for normal theme, false for no action bar theme.
-
+    /**
+     * Apply the selected theme (on NewPipe settings) in the context
+     *
+     * @param context               context that the theme will be applied
+     * @param useActionbarTheme     whether to use an action bar theme or not
+     */
+    public static void setTheme(Context context, boolean useActionbarTheme) {
         String themeKey = context.getString(R.string.theme_key);
-        //String lightTheme = context.getResources().getString(R.string.light_theme_title);
         String darkTheme = context.getResources().getString(R.string.dark_theme_title);
         String blackTheme = context.getResources().getString(R.string.black_theme_title);
 
         String sp = PreferenceManager.getDefaultSharedPreferences(context)
                 .getString(themeKey, context.getResources().getString(R.string.light_theme_title));
 
-        if (mode) {
+        if (useActionbarTheme) {
             if (sp.equals(darkTheme)) context.setTheme(R.style.DarkTheme);
             else if (sp.equals(blackTheme)) context.setTheme(R.style.BlackTheme);
             else context.setTheme(R.style.AppTheme);