move on to v0.9.9

Remove unused code

.github/CONTRIBUTING.md

@@ -5,13 +5,14 @@ READ THIS GUIDELINES CAREFULLY BEFORE CONTRIBUTING.
 
 ## 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 if a crash occurs.
 
 ## Issue reporting/feature request
 
 * 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
+* Use english
 
 ## 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. 

.gitignore

@@ -9,3 +9,4 @@
 /*.iml
 gradle.properties
 *~
+.weblate

.travis.yml

@@ -5,7 +5,7 @@ android:
   components:
     # The BuildTools version used by NewPipe
     - tools
-    - build-tools-25.0.0
+    - build-tools-25.0.2
 
     # The SDK version used to compile NewPipe
     - android-25

README.md

@@ -19,11 +19,16 @@ Project status:
 
 ## Screenshots
 
-[<img src="screenshots/screenshot_1.png" width=150>](screenshots/screenshot_1.png)
-[<img src="screenshots/screenshot_2.png" width=150>](screenshots/screenshot_2.png)
-[<img src="screenshots/screenshot_3.png" width=150>](screenshots/screenshot_3.png)
-[<img src="screenshots/screenshot_4.png" width=150>](screenshots/screenshot_4.png)
-[<img src="screenshots/screenshot_5.png" width=150>](screenshots/screenshot_5.png)
+[<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/screenshot_6.png" width=160>](screenshots/screenshot_6.png)
+[<img src="screenshots/screenshot_7.png" width=160>](screenshots/screenshot_7.png)
+[<img src="screenshots/screenshot_8.png" width=160>](screenshots/screenshot_8.png)
+[<img src="screenshots/screenshot_9.png" width=160>](screenshots/screenshot_9.png)
+
 
 ## Description
 
@@ -35,6 +40,7 @@ NewPipe does not use any Google framework libraries, or the YouTube API. It only
 * Display general information about a video
 * Watch YouTube videos
 * Listen to YouTube videos (experimental)
+* Popup mode (floating player)
 * Select the streaming player to watch the video with
 * Download videos 
 * Download audio only
@@ -46,6 +52,7 @@ NewPipe does not use any Google framework libraries, or the YouTube API. It only
 * Search channels
 * Watch videos from a channel
 * Orbot/Tor support (not yet directly)
+* 1080p/2k/4k support
 
 ### Coming Features
 
@@ -56,7 +63,6 @@ NewPipe does not use any Google framework libraries, or the YouTube API. It only
 * Search/Watch Playlists
 * Queeing videos
 * Subtitles support
-* 1080p support
 * livestream support
 * ... and many more
 

app/build.gradle

@@ -2,14 +2,16 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 25
-    buildToolsVersion '25.0.0'
+    buildToolsVersion '25.0.2'
 
     defaultConfig {
         applicationId "org.schabi.newpipe"
         minSdkVersion 15
         targetSdkVersion 25
-        versionCode 29
-        versionName "0.9.2"
+        versionCode 36
+        versionName "0.9.9"
+
+        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
         release {
@@ -31,22 +33,29 @@ android {
 }
 
 dependencies {
+    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2') {
+        exclude module: 'support-annotations'
+    }
+
+
     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'
-    compile 'com.android.support:recyclerview-v7:25.1.0'
+    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.google.code.gson:gson:2.7'
     compile 'org.jsoup:jsoup:1.8.3'
     compile 'org.mozilla:rhino:1.7.7'
-    compile 'info.guardianproject.netcipher:netcipher:1.2'
-    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.code.gson:gson:2.4'
-    compile 'com.nononsenseapps:filepicker:3.0.0'
     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 'com.github.nirhart:parallaxscroll:1.0'
+    compile 'com.nononsenseapps:filepicker:3.0.0'
     compile 'com.google.android.exoplayer:exoplayer:r2.3.1'
 }

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();
+    }
+}

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

@@ -20,10 +20,6 @@ package org.schabi.newpipe;
  * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import android.graphics.Bitmap;
-
-import java.util.List;
-
 /**
  * Singleton:
  * Used to send data between certain Activity/Services within the same process.
@@ -39,8 +35,5 @@ public class ActivityCommunicator {
         return activityCommunicator;
     }
 
-    // Thumbnail send from VideoItemDetailFragment to BackgroundPlayer
-    public volatile Bitmap backgroundPlayerThumbnail;
-
     public volatile Class returnActivity;
 }

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

@@ -14,7 +14,9 @@ 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 info.guardianproject.netcipher.NetCipher;
 import info.guardianproject.netcipher.proxy.OrbotHelper;
@@ -58,7 +60,7 @@ public class App extends Application {
         } catch(ACRAConfigurationException ace) {
             ace.printStackTrace();
             ErrorActivity.reportError(this, ace, null, null,
-                    ErrorActivity.ErrorInfo.make(ErrorActivity.SEARCHED,"none",
+                    ErrorActivity.ErrorInfo.make(UserAction.SEARCHED,"none",
                             "Could not initialize ACRA crash report", R.string.app_ui_crash));
         }
 
@@ -82,6 +84,8 @@ public class App extends Application {
         // DO NOT REMOVE THIS FUNCTION!!!
         // Otherwise downloadPathPreference has invalid value.
         SettingsActivity.initSettings(this);
+
+        ThemeHelper.setTheme(getApplicationContext());
     }
 
     /**

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

@@ -9,6 +9,7 @@ import com.nostra13.universalimageloader.core.listener.ImageLoadingListener;
 
 import org.schabi.newpipe.extractor.NewPipe;
 import org.schabi.newpipe.report.ErrorActivity;
+import org.schabi.newpipe.report.UserAction;
 
 /**
  * Created by Christian Schabesberger on 01.08.16.
@@ -49,7 +50,7 @@ public class ImageErrorLoadingListener implements ImageLoadingListener {
     public void onLoadingFailed(String imageUri, View view, FailReason failReason) {
         ErrorActivity.reportError(context,
                 failReason.getCause(), null, rootView,
-                ErrorActivity.ErrorInfo.make(ErrorActivity.LOAD_IMAGE,
+                ErrorActivity.ErrorInfo.make(UserAction.LOAD_IMAGE,
                         NewPipe.getNameOfService(serviceId), imageUri,
                         R.string.could_not_load_image));
     }

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

@@ -8,6 +8,7 @@ import android.os.Bundle;
 import android.support.v4.app.NavUtils;
 import android.support.v7.app.ActionBar;
 import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.Toolbar;
 import android.view.MenuItem;
 import android.webkit.CookieManager;
 import android.webkit.ValueCallback;
@@ -48,10 +49,15 @@ public class ReCaptchaActivity extends AppCompatActivity {
         // Set return to Cancel by default
         setResult(RESULT_CANCELED);
 
+        Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
+        setSupportActionBar(toolbar);
+
         ActionBar actionBar = getSupportActionBar();
-        actionBar.setDisplayHomeAsUpEnabled(true);
-        actionBar.setTitle(R.string.reCaptcha_title);
-        actionBar.setDisplayShowTitleEnabled(true);
+        if (actionBar != null) {
+            actionBar.setDisplayHomeAsUpEnabled(true);
+            actionBar.setTitle(R.string.reCaptcha_title);
+            actionBar.setDisplayShowTitleEnabled(true);
+        }
 
         WebView myWebView = (WebView) findViewById(R.id.reCaptchaWebView);
 

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

@@ -33,26 +33,39 @@ import java.util.HashSet;
  * to the part of the service which can handle the url.
  */
 public class RouterActivity extends Activity {
-    //private static final String TAG = "RouterActivity"
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        String videoUrl = getUrl(getIntent());
+        handleUrl(videoUrl);
+
+        finish();
+    }
+
+    protected void handleUrl(String url) {
+        try {
+            NavigationHelper.openByLink(this, url);
+        } catch (Exception e) {
+            Toast.makeText(this, R.string.url_not_supported_toast, Toast.LENGTH_LONG).show();
+        }
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Utils
+    //////////////////////////////////////////////////////////////////////////*/
 
     /**
      * 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 void handleIntent(Intent intent) {
-        String videoUrl = "";
+    protected final static String REGEX_REMOVE_FROM_URL = "[\\p{Z}\\p{P}]";
 
+    protected String getUrl(Intent intent) {
         // first gather data and find service
+        String videoUrl = null;
         if (intent.getData() != null) {
             // this means the video was called though another app
             videoUrl = intent.getData().toString();
@@ -62,14 +75,10 @@ public class RouterActivity extends Activity {
             videoUrl = getUris(extraText)[0];
         }
 
-        try {
-            NavigationHelper.openByLink(this, videoUrl);
-        } catch (Exception e) {
-            Toast.makeText(this, R.string.url_not_supported_toast, Toast.LENGTH_LONG).show();
-        }
+        return videoUrl;
     }
 
-    private static String removeHeadingGibberish(final String input) {
+    protected 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}")) {
@@ -80,7 +89,7 @@ public class RouterActivity extends Activity {
         return input.substring(start, input.length());
     }
 
-    private static String trim(final String input) {
+    protected String trim(final String input) {
         if (input == null || input.length() < 1) {
             return input;
         } else {
@@ -103,7 +112,7 @@ public class RouterActivity extends Activity {
      * @param sharedText text to scan for URLs.
      * @return potential URLs
      */
-    private String[] getUris(final String sharedText) {
+    protected String[] getUris(final String sharedText)  {
         final Collection<String> result = new HashSet<>();
         if (sharedText != null) {
             final String[] array = sharedText.split("\\p{Space}");

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

@@ -1,9 +1,7 @@
 package org.schabi.newpipe;
 
-import android.app.Activity;
 import android.content.Intent;
 import android.os.Build;
-import android.os.Bundle;
 import android.widget.Toast;
 
 import org.schabi.newpipe.extractor.NewPipe;
@@ -12,57 +10,26 @@ import org.schabi.newpipe.player.PopupVideoPlayer;
 import org.schabi.newpipe.util.Constants;
 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 player.
+ * Get the url from the intent and open a popup player
  */
-public class RouterPopupActivity extends Activity {
-    //private static final String TAG = "RouterPopupActivity";
-
-    /**
-     * 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}]";
+public class RouterPopupActivity extends RouterActivity {
 
     @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        handleIntent(getIntent());
-        finish();
-    }
-
-
-    private void handleIntent(Intent intent) {
+    protected void handleUrl(String url) {
         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;
-
-        // 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);
+        StreamingService service = NewPipe.getServiceByUrl(url);
         if (service == null) {
             Toast.makeText(this, R.string.url_not_supported_toast, Toast.LENGTH_LONG).show();
             return;
         }
 
         Intent callIntent = new Intent(this, PopupVideoPlayer.class);
-        switch (service.getLinkTypeByUrl(videoUrl)) {
+        switch (service.getLinkTypeByUrl(url)) {
             case STREAM:
                 break;
             default:
@@ -70,61 +37,8 @@ public class RouterPopupActivity extends Activity {
                 return;
         }
 
-        callIntent.putExtra(Constants.KEY_URL, videoUrl);
+        callIntent.putExtra(Constants.KEY_URL, url);
         callIntent.putExtra(Constants.KEY_SERVICE_ID, service.getServiceId());
         startService(callIntent);
     }
-
-    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()]);
-    }
-
 }

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

@@ -1,28 +0,0 @@
-package org.schabi.newpipe;
-
-import android.os.Bundle;
-import android.preference.PreferenceManager;
-import android.support.v7.app.AppCompatActivity;
-
-public class ThemableActivity extends AppCompatActivity {
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        if (PreferenceManager.getDefaultSharedPreferences(this)
-                    .getString("theme", getResources().getString(R.string.light_theme_title)).
-                            equals(getResources().getString(R.string.dark_theme_title)))  {
-                setTheme(R.style.DarkTheme);
-        }
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-        if (PreferenceManager.getDefaultSharedPreferences(this)
-                .getString("theme", getResources().getString(R.string.light_theme_title)).
-                        equals(getResources().getString(R.string.dark_theme_title)))  {
-            setTheme(R.style.DarkTheme);
-        }
-    }
-}

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

@@ -1,82 +1,46 @@
 package org.schabi.newpipe.download;
 
-import android.annotation.TargetApi;
-import android.app.AlertDialog;
 import android.app.FragmentTransaction;
-import android.content.Context;
 import android.content.Intent;
-import android.content.SharedPreferences;
 import android.os.Bundle;
-import android.preference.PreferenceManager;
-import android.support.v4.app.NavUtils;
 import android.support.v7.app.ActionBar;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
-import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
-import android.view.View;
 import android.view.ViewTreeObserver;
-import android.widget.AdapterView;
-import android.widget.EditText;
-import android.widget.RadioButton;
-import android.widget.SeekBar;
-import android.widget.TextView;
-import android.widget.Toast;
 
 import org.schabi.newpipe.R;
-import org.schabi.newpipe.report.ErrorActivity;
-import org.schabi.newpipe.settings.NewPipeSettings;
 import org.schabi.newpipe.settings.SettingsActivity;
 import org.schabi.newpipe.util.ThemeHelper;
 
-import java.io.File;
-import java.util.Vector;
-
 import us.shandian.giga.service.DownloadManagerService;
 import us.shandian.giga.ui.fragment.AllMissionsFragment;
 import us.shandian.giga.ui.fragment.MissionsFragment;
-import us.shandian.giga.util.CrashHandler;
-import us.shandian.giga.util.Utility;
 
-public class DownloadActivity extends AppCompatActivity implements AdapterView.OnItemClickListener {
-
-    public static final String INTENT_DOWNLOAD = "us.shandian.giga.intent.DOWNLOAD";
-
-    public static final String INTENT_LIST = "us.shandian.giga.intent.LIST";
-    public static final String THREADS = "threads";
-    private static final String TAG = DownloadActivity.class.toString();
-    private MissionsFragment mFragment;
-
-
-    private String mPendingUrl;
-    private SharedPreferences mPrefs;
+public class DownloadActivity extends AppCompatActivity {
 
     @Override
-    @TargetApi(21)
     protected void onCreate(Bundle savedInstanceState) {
-        CrashHandler.init(this);
-        CrashHandler.register();
-
         // Service
         Intent i = new Intent();
         i.setClass(this, DownloadManagerService.class);
         startService(i);
 
+        ThemeHelper.setTheme(this);
         super.onCreate(savedInstanceState);
-        ThemeHelper.setTheme(this, true);
         setContentView(R.layout.activity_downloader);
 
-        //noinspection ConstantConditions
+        Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
+        setSupportActionBar(toolbar);
 
-        // its ok if this fails, we will catch that error later, and send it as report
         ActionBar actionBar = getSupportActionBar();
-        actionBar.setDisplayHomeAsUpEnabled(true);
-        actionBar.setTitle(R.string.downloads_title);
-        actionBar.setDisplayShowTitleEnabled(true);
-
-        mPrefs = PreferenceManager.getDefaultSharedPreferences(this);
+        if (actionBar != null) {
+            actionBar.setDisplayHomeAsUpEnabled(true);
+            actionBar.setTitle(R.string.downloads_title);
+            actionBar.setDisplayShowTitleEnabled(true);
+        }
 
         // Fragment
         getWindow().getDecorView().getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
@@ -86,140 +50,17 @@ public class DownloadActivity extends AppCompatActivity implements AdapterView.O
                 getWindow().getDecorView().getViewTreeObserver().removeGlobalOnLayoutListener(this);
             }
         });
-
-        // Intent
-        if (getIntent().getAction() != null && getIntent().getAction().equals(INTENT_DOWNLOAD)) {
-            mPendingUrl = getIntent().getData().toString();
-        }
-    }
-
-    @Override
-    protected void onNewIntent(Intent intent) {
-        super.onNewIntent(intent);
-
-        if (intent.getAction().equals(INTENT_DOWNLOAD)) {
-            mPendingUrl = intent.getData().toString();
-        }
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-
-        if (mPendingUrl != null) {
-            showUrlDialog();
-            mPendingUrl = null;
-        }
     }
 
     private void updateFragments() {
 
-        mFragment = new AllMissionsFragment();
-
+        MissionsFragment fragment = new AllMissionsFragment();
         getFragmentManager().beginTransaction()
-                .replace(R.id.frame, mFragment)
+                .replace(R.id.frame, fragment)
                 .setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE)
                 .commit();
     }
 
-    private void showUrlDialog() {
-        // Create the view
-        LayoutInflater inflater = (LayoutInflater) getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-        View v = inflater.inflate(R.layout.dialog_url, null);
-        final EditText name = Utility.findViewById(v, R.id.file_name);
-        final TextView tCount = Utility.findViewById(v, R.id.threads_count);
-        final SeekBar threads = Utility.findViewById(v, R.id.threads);
-        final Toolbar toolbar = Utility.findViewById(v, R.id.toolbar);
-        final RadioButton audioButton = (RadioButton) Utility.findViewById(v, R.id.audio_button);
-
-
-        threads.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
-
-            @Override
-            public void onProgressChanged(SeekBar seekbar, int progress, boolean fromUser) {
-                tCount.setText(String.valueOf(progress + 1));
-            }
-
-            @Override
-            public void onStartTrackingTouch(SeekBar p1) {
-
-            }
-
-            @Override
-            public void onStopTrackingTouch(SeekBar p1) {
-
-            }
-
-        });
-
-        int def = mPrefs.getInt(THREADS, 4);
-        threads.setProgress(def - 1);
-        tCount.setText(String.valueOf(def));
-
-        name.setText(getIntent().getStringExtra("fileName"));
-
-        toolbar.setTitle(R.string.add);
-        toolbar.setNavigationIcon(R.drawable.ic_arrow_back_black_24dp);
-        toolbar.inflateMenu(R.menu.dialog_url);
-
-        // Show the dialog
-        final AlertDialog dialog = new AlertDialog.Builder(this)
-                .setCancelable(true)
-                .setView(v)
-                .create();
-
-        dialog.show();
-
-        toolbar.setNavigationOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                dialog.dismiss();
-            }
-        });
-
-        toolbar.setOnMenuItemClickListener(new Toolbar.OnMenuItemClickListener() {
-            @Override
-            public boolean onMenuItemClick(MenuItem item) {
-                if (item.getItemId() == R.id.okay) {
-
-                    String location;
-                    if(audioButton.isChecked()) {
-                        location = NewPipeSettings.getAudioDownloadPath(DownloadActivity.this);
-                    } else {
-                        location = NewPipeSettings.getVideoDownloadPath(DownloadActivity.this);
-                    }
-
-                    String fName = name.getText().toString().trim();
-
-                    File f = new File(location, fName);
-                    if (f.exists()) {
-                        Toast.makeText(DownloadActivity.this, R.string.msg_exists, Toast.LENGTH_SHORT).show();
-                    } else {
-                        DownloadManagerService.startMission(
-                                DownloadActivity.this,
-                                getIntent().getData().toString(), location, fName,
-                                audioButton.isChecked(), threads.getProgress() + 1);
-                        mFragment.notifyChange();
-
-                        mPrefs.edit().putInt(THREADS, threads.getProgress() + 1).commit();
-                        mPendingUrl = null;
-                        dialog.dismiss();
-                    }
-
-                    return true;
-                } else {
-                    return false;
-                }
-            }
-        });
-
-    }
-
-    @Override
-    public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-
-    }
-
     public boolean onCreateOptionsMenu(Menu menu) {
         super.onCreateOptionsMenu(menu);
         MenuInflater inflater = getMenuInflater();
@@ -231,9 +72,7 @@ public class DownloadActivity extends AppCompatActivity implements AdapterView.O
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
-        int id = item.getItemId();
-
-        switch (id) {
+        switch (item.getItemId()) {
             case android.R.id.home: {
                 onBackPressed();
                 return true;

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

@@ -1,165 +0,0 @@
-package org.schabi.newpipe.download;
-
-import android.app.NotificationManager;
-import android.content.Context;
-import android.graphics.drawable.BitmapDrawable;
-import android.graphics.drawable.Drawable;
-import android.os.AsyncTask;
-import android.support.v4.app.NotificationCompat;
-import android.util.Log;
-
-import org.schabi.newpipe.R;
-
-import java.io.BufferedInputStream;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.HttpURLConnection;
-
-import javax.net.ssl.HttpsURLConnection;
-
-import info.guardianproject.netcipher.NetCipher;
-
-/**
- * Created by Christian Schabesberger on 14.08.15.
- *
- * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
- * FileDownloader.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/>.
- */
-
-
-// TODO: FOR HEAVEN SAKE !!! DO NOT SIMPLY USE ASYNCTASK. MAKE THIS A PROPER SERVICE !!!
-public class FileDownloader extends AsyncTask<Void, Integer, Void> {
-    public static final String TAG = "FileDownloader";
-
-
-    private NotificationManager nm;
-    private NotificationCompat.Builder builder;
-    private int notifyId = 0x1234;
-    private int fileSize = 0xffffffff;
-
-    private final Context context;
-    private final String fileURL;
-    private final File saveFilePath;
-    private final String title;
-
-    private final String debugContext;
-
-    public FileDownloader(Context context, String fileURL, File saveFilePath, String title) {
-        this.context = context;
-        this.fileURL = fileURL;
-        this.saveFilePath = saveFilePath;
-        this.title = title;
-
-        this.debugContext = "'" + fileURL +
-                "' => '" + saveFilePath + "'";
-    }
-
-    /**
-     * Downloads a file from a URL in the background using an {@link AsyncTask}.
-     *
-     * @param fileURL      HTTP URL of the file to be downloaded
-     * @param saveFilePath path of the directory to save the file
-     * @param title
-     * @throws IOException
-     */
-    public static void downloadFile(final Context context, final String fileURL, final File saveFilePath, String title) {
-        new FileDownloader(context, fileURL, saveFilePath, title).execute();
-    }
-
-    /** AsyncTask impl: executed in gui thread */
-    @Override
-    protected void onPreExecute() {
-        super.onPreExecute();
-        nm = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
-        Drawable icon = context.getResources().getDrawable(R.mipmap.ic_launcher);
-        builder = new NotificationCompat.Builder(context)
-                .setSmallIcon(android.R.drawable.stat_sys_download)
-                .setLargeIcon(((BitmapDrawable) icon).getBitmap())
-                .setContentTitle(saveFilePath.getName())
-                .setContentText(saveFilePath.getAbsolutePath())
-                .setProgress(fileSize, 0, false);
-        nm.notify(notifyId, builder.build());
-    }
-
-    /** AsyncTask impl: executed in background thread does the download */
-    @Override
-    protected Void doInBackground(Void... voids) {
-        HttpsURLConnection con = null;
-        InputStream inputStream = null;
-        FileOutputStream outputStream = null;
-        try {
-            con = NetCipher.getHttpsURLConnection(fileURL);
-            int responseCode = con.getResponseCode();
-
-            // always check HTTP response code first
-            if (responseCode == HttpURLConnection.HTTP_OK) {
-                fileSize = con.getContentLength();
-                inputStream = new BufferedInputStream(con.getInputStream());
-                outputStream = new FileOutputStream(saveFilePath);
-
-                int bufferSize = 8192;
-                int downloaded = 0;
-
-                int bytesRead = -1;
-                byte[] buffer = new byte[bufferSize];
-                while ((bytesRead = inputStream.read(buffer)) != -1) {
-                    outputStream.write(buffer, 0, bytesRead);
-                    downloaded += bytesRead;
-                    if (downloaded % 50000 < bufferSize) {
-                        publishProgress(downloaded);
-                    }
-                }
-
-                publishProgress(bufferSize);
-
-            } else {
-                Log.i(TAG, "No file to download. Server replied HTTP code: " + responseCode);
-            }
-        } catch (IOException e) {
-            Log.e(TAG, "No file to download. Server replied HTTP code: ", e);
-            e.printStackTrace();
-        } finally {
-            try {
-                if (outputStream != null) {
-                    outputStream.close();
-                }
-                if (inputStream != null) {
-                    inputStream.close();
-                }
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-            if (con != null) {
-                con.disconnect();
-            }
-        }
-        return null;
-    }
-
-    @Override
-    protected void onProgressUpdate(Integer... progress) {
-        builder.setProgress(fileSize, progress[0], false);
-        nm.notify(notifyId, builder.build());
-    }
-
-    @Override
-    protected void onPostExecute(Void aVoid) {
-        super.onPostExecute(aVoid);
-        nm.cancel(notifyId);
-    }
-}

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

@@ -0,0 +1,177 @@
+package org.schabi.newpipe.fragments;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.graphics.Rect;
+import android.os.Bundle;
+import android.support.annotation.AttrRes;
+import android.support.v4.app.Fragment;
+import android.support.v4.view.ViewCompat;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.Toolbar;
+import android.util.Log;
+import android.view.Gravity;
+import android.view.View;
+import android.widget.Button;
+import android.widget.ProgressBar;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import com.nostra13.universalimageloader.core.DisplayImageOptions;
+import com.nostra13.universalimageloader.core.ImageLoader;
+import com.nostra13.universalimageloader.core.display.FadeInBitmapDisplayer;
+
+import org.schabi.newpipe.MainActivity;
+import org.schabi.newpipe.R;
+
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import static org.schabi.newpipe.util.AnimationUtils.animateView;
+
+public abstract class BaseFragment extends Fragment {
+    protected final String TAG = "BaseFragment@" + Integer.toHexString(hashCode());
+    protected static final boolean DEBUG = MainActivity.DEBUG;
+
+    protected AppCompatActivity activity;
+
+    protected AtomicBoolean isLoading = new AtomicBoolean(false);
+    protected AtomicBoolean wasLoading = new AtomicBoolean(false);
+
+    protected static final ImageLoader imageLoader = ImageLoader.getInstance();
+    protected static final DisplayImageOptions displayImageOptions =
+            new DisplayImageOptions.Builder().displayer(new FadeInBitmapDisplayer(400)).cacheInMemory(false).build();
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Views
+    //////////////////////////////////////////////////////////////////////////*/
+
+    protected Toolbar toolbar;
+
+    protected View errorPanel;
+    protected Button errorButtonRetry;
+    protected TextView errorTextView;
+    protected ProgressBar loadingProgressBar;
+    //protected SwipeRefreshLayout swipeRefreshLayout;
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Fragment's Lifecycle
+    //////////////////////////////////////////////////////////////////////////*/
+
+    @Override
+    public void onAttach(Context context) {
+        super.onAttach(context);
+        if (DEBUG) Log.d(TAG, "onAttach() called with: context = [" + context + "]");
+
+        activity = (AppCompatActivity) context;
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        if (DEBUG) Log.d(TAG, "onCreate() called with: savedInstanceState = [" + savedInstanceState + "]");
+
+        isLoading.set(false);
+        setHasOptionsMenu(true);
+    }
+
+    @Override
+    public void onViewCreated(View rootView, Bundle savedInstanceState) {
+        if (DEBUG) Log.d(TAG, "onViewCreated() called with: rootView = [" + rootView + "], savedInstanceState = [" + savedInstanceState + "]");
+        initViews(rootView, savedInstanceState);
+        initListeners();
+        wasLoading.set(false);
+    }
+
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        if (DEBUG) Log.d(TAG, "onDestroyView() called");
+        toolbar = null;
+
+        errorPanel = null;
+        errorButtonRetry = null;
+        errorTextView = null;
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Init
+    //////////////////////////////////////////////////////////////////////////*/
+
+    protected void initViews(View rootView, Bundle savedInstanceState) {
+        toolbar = (Toolbar) activity.findViewById(R.id.toolbar);
+
+        loadingProgressBar = (ProgressBar) rootView.findViewById(R.id.loading_progress_bar);
+        //swipeRefreshLayout = (SwipeRefreshLayout) rootView.findViewById(R.id.swipe_refresh);
+
+        errorPanel = rootView.findViewById(R.id.error_panel);
+        errorButtonRetry = (Button) rootView.findViewById(R.id.error_button_retry);
+        errorTextView = (TextView) rootView.findViewById(R.id.error_message_view);
+    }
+
+    protected void initListeners() {
+        errorButtonRetry.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                onRetryButtonClicked();
+            }
+        });
+    }
+
+    protected abstract void reloadContent();
+
+    protected void onRetryButtonClicked() {
+        if (DEBUG) Log.d(TAG, "onRetryButtonClicked() called");
+        reloadContent();
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Utils
+    //////////////////////////////////////////////////////////////////////////*/
+
+    protected void setErrorMessage(String message, boolean showRetryButton) {
+        if (errorTextView == null || activity == null) return;
+
+        errorTextView.setText(message);
+        if (showRetryButton) animateView(errorButtonRetry, true, 300);
+        else animateView(errorButtonRetry, false, 0);
+
+        animateView(errorPanel, true, 300);
+        isLoading.set(false);
+
+        animateView(loadingProgressBar, false, 200);
+    }
+
+    protected int getResourceIdFromAttr(@AttrRes int attr) {
+        TypedArray a = activity.getTheme().obtainStyledAttributes(new int[]{attr});
+        int attributeResourceId = a.getResourceId(0, 0);
+        a.recycle();
+        return attributeResourceId;
+    }
+
+    public static void showMenuTooltip(View v, String message) {
+        final int[] screenPos = new int[2];
+        final Rect displayFrame = new Rect();
+        v.getLocationOnScreen(screenPos);
+        v.getWindowVisibleDisplayFrame(displayFrame);
+
+        final Context context = v.getContext();
+        final int width = v.getWidth();
+        final int height = v.getHeight();
+        final int midy = screenPos[1] + height / 2;
+        int referenceX = screenPos[0] + width / 2;
+        if (ViewCompat.getLayoutDirection(v) == View.LAYOUT_DIRECTION_LTR) {
+            final int screenWidth = context.getResources().getDisplayMetrics().widthPixels;
+            referenceX = screenWidth - referenceX; // mirror
+        }
+        Toast cheatSheet = Toast.makeText(context, message, Toast.LENGTH_SHORT);
+        if (midy < displayFrame.height()) {
+            // Show along the top; follow action buttons
+            cheatSheet.setGravity(Gravity.TOP | Gravity.END, referenceX,
+                    screenPos[1] + height - displayFrame.top);
+        } else {
+            // Show along the bottom center
+            cheatSheet.setGravity(Gravity.BOTTOM | Gravity.CENTER_HORIZONTAL, 0, height);
+        }
+        cheatSheet.show();
+    }
+}

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

@@ -0,0 +1,77 @@
+package org.schabi.newpipe.fragments;
+
+import android.content.Context;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
+import android.support.v7.app.ActionBar;
+import android.support.v7.app.AppCompatActivity;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+
+import org.schabi.newpipe.MainActivity;
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.util.NavigationHelper;
+
+public class MainFragment extends Fragment {
+    private final String TAG = "MainFragment@" + Integer.toHexString(hashCode());
+    private static final boolean DEBUG = MainActivity.DEBUG;
+
+    private AppCompatActivity activity;
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Fragment's LifeCycle
+    //////////////////////////////////////////////////////////////////////////*/
+
+    @Override
+    public void onAttach(Context context) {
+        super.onAttach(context);
+        if (DEBUG) Log.d(TAG, "onAttach() called with: context = [" + context + "]");
+        activity = ((AppCompatActivity) context);
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        if (DEBUG) Log.d(TAG, "onCreate() called with: savedInstanceState = [" + savedInstanceState + "]");
+        setHasOptionsMenu(true);
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        if (DEBUG) Log.d(TAG, "onCreateView() called with: inflater = [" + inflater + "], container = [" + container + "], savedInstanceState = [" + savedInstanceState + "]");
+        return inflater.inflate(R.layout.fragment_main, container, false);
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Menu
+    //////////////////////////////////////////////////////////////////////////*/
+
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        super.onCreateOptionsMenu(menu, inflater);
+        if (DEBUG) Log.d(TAG, "onCreateOptionsMenu() called with: menu = [" + menu + "], inflater = [" + inflater + "]");
+        inflater.inflate(R.menu.main_fragment_menu, menu);
+
+        ActionBar supportActionBar = activity.getSupportActionBar();
+        if (supportActionBar != null) {
+            supportActionBar.setDisplayShowTitleEnabled(false);
+            supportActionBar.setDisplayHomeAsUpEnabled(false);
+        }
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.action_search:
+                NavigationHelper.openSearchFragment(getFragmentManager(), 0, "");
+                return true;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+}

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

@@ -1,10 +0,0 @@
-package org.schabi.newpipe.fragments;
-
-import org.schabi.newpipe.extractor.StreamingService;
-
-/**
- * Interface for communication purposes between activity and fragment
- */
-public interface OnItemSelectedListener {
-    void onItemSelected(StreamingService.LinkType linkType, int serviceId, String url, String name);
-}

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

@@ -2,16 +2,16 @@ package org.schabi.newpipe.fragments.detail;
 
 import android.content.SharedPreferences;
 import android.preference.PreferenceManager;
-import android.support.v7.app.ActionBar;
 import android.support.v7.app.AppCompatActivity;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
-import android.widget.ArrayAdapter;
+import android.view.View;
+import android.widget.AdapterView;
+import android.widget.Spinner;
 
 import org.schabi.newpipe.R;
-import org.schabi.newpipe.extractor.MediaFormat;
 import org.schabi.newpipe.extractor.stream_info.VideoStream;
 import org.schabi.newpipe.util.Utils;
 
@@ -19,27 +19,28 @@ import java.util.List;
 
 /**
  * Created by Christian Schabesberger on 18.08.15.
- *
+ * <p>
  * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
  * DetailsMenuHandler.java is part of NewPipe.
- *
+ * <p>
  * 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.
- *
+ * <p>
  * 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.
- *
+ * <p>
  * You should have received a copy of the GNU General Public License
  * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 
+@SuppressWarnings("WeakerAccess")
 class ActionBarHandler {
-    private static final String TAG = ActionBarHandler.class.toString();
+    private static final String TAG = "ActionBarHandler";
 
     private AppCompatActivity activity;
     private int selectedVideoStream = -1;
@@ -52,11 +53,8 @@ class ActionBarHandler {
     // those are edited directly. Typically VideoDetailFragment will implement those callbacks.
     private OnActionListener onShareListener;
     private OnActionListener onOpenInBrowserListener;
-    private OnActionListener onOpenInPopupListener;
     private OnActionListener onDownloadListener;
     private OnActionListener onPlayWithKodiListener;
-    private OnActionListener onPlayAudioListener;
-
 
     // Triggered when a stream related action is triggered.
     public interface OnActionListener {
@@ -67,46 +65,25 @@ class ActionBarHandler {
         this.activity = activity;
     }
 
-    @SuppressWarnings({"deprecation", "ConstantConditions"})
-    public void setupNavMenu(AppCompatActivity activity) {
-        this.activity = activity;
-        try {
-            activity.getSupportActionBar().setNavigationMode(ActionBar.NAVIGATION_MODE_LIST);
-        } catch (NullPointerException e) {
-            e.printStackTrace();
-        }
-    }
+    public void setupStreamList(final List<VideoStream> videoStreams, Spinner toolbarSpinner) {
+        if (activity == null) return;
 
-    public void setupStreamList(final List<VideoStream> videoStreams) {
-        if (activity != null) {
-            selectedVideoStream = 0;
+        selectedVideoStream = Utils.getDefaultResolution(activity, videoStreams);
 
-
-            // this array will be shown in the dropdown menu for selecting the stream/resolution.
-            String[] itemArray = new String[videoStreams.size()];
-            for (int i = 0; i < videoStreams.size(); i++) {
-                VideoStream item = videoStreams.get(i);
-                itemArray[i] = MediaFormat.getNameById(item.format) + " " + item.resolution;
+        boolean isExternalPlayerEnabled = PreferenceManager.getDefaultSharedPreferences(activity).getBoolean(activity.getString(R.string.use_external_video_player_key), false);
+        toolbarSpinner.setAdapter(new SpinnerToolbarAdapter(activity, videoStreams, isExternalPlayerEnabled));
+        toolbarSpinner.setSelection(selectedVideoStream);
+        toolbarSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+            @Override
+            public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
+                selectedVideoStream = position;
             }
-            int defaultResolution = Utils.getPreferredResolution(activity, videoStreams);
 
-            ArrayAdapter<String> itemAdapter = new ArrayAdapter<>(activity.getBaseContext(),
-                    android.R.layout.simple_spinner_dropdown_item, itemArray);
+            @Override
+            public void onNothingSelected(AdapterView<?> parent) {
+            }
+        });
 
-            ActionBar ab = activity.getSupportActionBar();
-            //todo: make this throwsable
-            assert ab != null : "Could not get actionbar";
-            ab.setListNavigationCallbacks(itemAdapter
-                    , new ActionBar.OnNavigationListener() {
-                @Override
-                public boolean onNavigationItemSelected(int itemPosition, long itemId) {
-                    selectedVideoStream = (int) itemId;
-                    return true;
-                }
-            });
-
-            ab.setSelectedNavigationItem(defaultResolution);
-        }
     }
 
     public void setupMenu(Menu menu, MenuInflater inflater) {
@@ -116,55 +93,40 @@ class ActionBarHandler {
         // appcompat itemsinflater.inflate(R.menu.videoitem_detail, menu);
 
         defaultPreferences = PreferenceManager.getDefaultSharedPreferences(activity);
-        inflater.inflate(R.menu.videoitem_detail, menu);
+        inflater.inflate(R.menu.video_detail_menu, menu);
 
-        showPlayWithKodiAction(defaultPreferences
-                .getBoolean(activity.getString(R.string.show_play_with_kodi_key), false));
+        updateItemsVisibility();
+    }
+
+    public void updateItemsVisibility(){
+        showPlayWithKodiAction(defaultPreferences.getBoolean(activity.getString(R.string.show_play_with_kodi_key), false));
     }
 
     public boolean onItemSelected(MenuItem item) {
         int id = item.getItemId();
         switch (id) {
             case R.id.menu_item_share: {
-                    /*
-                    Intent intent = new Intent();
-                    intent.setAction(Intent.ACTION_SEND);
-                    intent.putExtra(Intent.EXTRA_TEXT, websiteUrl);
-                    intent.setType("text/plain");
-                    activity.startActivity(Intent.createChooser(intent, activity.getString(R.string.share_dialog_title)));
-                    */
-                if(onShareListener != null) {
+                if (onShareListener != null) {
                     onShareListener.onActionSelected(selectedVideoStream);
                 }
                 return true;
             }
             case R.id.menu_item_openInBrowser: {
-                if(onOpenInBrowserListener != null) {
+                if (onOpenInBrowserListener != null) {
                     onOpenInBrowserListener.onActionSelected(selectedVideoStream);
                 }
+                return true;
             }
-            return true;
             case R.id.menu_item_download:
-                if(onDownloadListener != null) {
+                if (onDownloadListener != null) {
                     onDownloadListener.onActionSelected(selectedVideoStream);
                 }
                 return true;
             case R.id.action_play_with_kodi:
-                if(onPlayWithKodiListener != null) {
+                if (onPlayWithKodiListener != null) {
                     onPlayWithKodiListener.onActionSelected(selectedVideoStream);
                 }
                 return true;
-            case R.id.menu_item_play_audio:
-                if(onPlayAudioListener != null) {
-                    onPlayAudioListener.onActionSelected(selectedVideoStream);
-                }
-                return true;
-            case R.id.menu_item_popup: {
-                if(onOpenInPopupListener != null) {
-                    onOpenInPopupListener.onActionSelected(selectedVideoStream);
-                }
-                return true;
-            }
             default:
                 Log.e(TAG, "Menu Item not known");
         }
@@ -183,10 +145,6 @@ class ActionBarHandler {
         onOpenInBrowserListener = listener;
     }
 
-    public void setOnOpenInPopupListener(OnActionListener listener) {
-        onOpenInPopupListener = listener;
-    }
-
     public void setOnDownloadListener(OnActionListener listener) {
         onDownloadListener = listener;
     }
@@ -195,14 +153,6 @@ class ActionBarHandler {
         onPlayWithKodiListener = listener;
     }
 
-    public void setOnPlayAudioListener(OnActionListener listener) {
-        onPlayAudioListener = listener;
-    }
-
-    public void showAudioAction(boolean visible) {
-        menu.findItem(R.id.menu_item_play_audio).setVisible(visible);
-    }
-
     public void showDownloadAction(boolean visible) {
         menu.findItem(R.id.menu_item_download).setVisible(visible);
     }

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

@@ -0,0 +1,74 @@
+package org.schabi.newpipe.fragments.detail;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+import android.widget.ImageView;
+import android.widget.Spinner;
+import android.widget.TextView;
+
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.extractor.MediaFormat;
+import org.schabi.newpipe.extractor.stream_info.VideoStream;
+
+import java.util.List;
+
+public class SpinnerToolbarAdapter extends BaseAdapter {
+    private final List<VideoStream> videoStreams;
+    private final boolean showIconNoAudio;
+
+    private final Context context;
+
+    public SpinnerToolbarAdapter(Context context, List<VideoStream> videoStreams, boolean showIconNoAudio) {
+        this.context = context;
+        this.videoStreams = videoStreams;
+        this.showIconNoAudio = showIconNoAudio;
+    }
+
+    @Override
+    public int getCount() {
+        return videoStreams.size();
+    }
+
+    @Override
+    public Object getItem(int position) {
+        return videoStreams.get(position);
+    }
+
+    @Override
+    public long getItemId(int position) {
+        return position;
+    }
+
+    @Override
+    public View getDropDownView(int position, View convertView, ViewGroup parent) {
+        return getCustomView(position, convertView, parent, true);
+    }
+
+    @Override
+    public View getView(int position, View convertView, ViewGroup parent) {
+        return getCustomView(((Spinner) parent).getSelectedItemPosition(), convertView, parent, false);
+    }
+
+    private View getCustomView(int position, View convertView, ViewGroup parent, boolean isDropdownItem) {
+        if (convertView == null) {
+            convertView = LayoutInflater.from(context).inflate(R.layout.resolutions_spinner_item, parent, false);
+        }
+
+        ImageView woSoundIcon = (ImageView) convertView.findViewById(R.id.wo_sound_icon);
+        TextView text = (TextView) convertView.findViewById(android.R.id.text1);
+        VideoStream item = (VideoStream) getItem(position);
+        text.setText(MediaFormat.getNameById(item.format) + " " + item.resolution);
+
+        int visibility = !showIconNoAudio ? View.GONE
+                : item.isVideoOnly ? View.VISIBLE
+                : isDropdownItem ? View.INVISIBLE
+                : View.GONE;
+        woSoundIcon.setVisibility(visibility);
+
+        return convertView;
+    }
+
+}

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

@@ -1,11 +1,14 @@
 package org.schabi.newpipe.fragments.detail;
 
+import org.schabi.newpipe.extractor.stream_info.StreamInfo;
+
 import java.io.Serializable;
 
 
 @SuppressWarnings("WeakerAccess")
 public class StackItem implements Serializable {
     private String title, url;
+    private StreamInfo info;
 
     public StackItem(String url, String title) {
         this.title = title;
@@ -24,6 +27,14 @@ public class StackItem implements Serializable {
         return url;
     }
 
+    public void setInfo(StreamInfo info) {
+        this.info = info;
+    }
+
+    public StreamInfo getInfo() {
+        return info;
+    }
+
     @Override
     public String toString() {
         return getUrl() + " > " + getTitle();

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

@@ -0,0 +1,85 @@
+package org.schabi.newpipe.fragments.detail;
+
+import android.support.annotation.NonNull;
+import android.text.TextUtils;
+import android.util.Log;
+
+import org.schabi.newpipe.MainActivity;
+import org.schabi.newpipe.extractor.stream_info.StreamInfo;
+
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+
+
+@SuppressWarnings("WeakerAccess")
+public class StreamInfoCache {
+    private static String TAG = "StreamInfoCache@";
+    private static final boolean DEBUG = MainActivity.DEBUG;
+    private static final StreamInfoCache instance = new StreamInfoCache();
+    private static final int MAX_ITEMS_ON_CACHE = 20;
+
+    private final LinkedHashMap<String, StreamInfo> myCache = new LinkedHashMap<>();
+
+    private StreamInfoCache() {
+        TAG += "" + Integer.toHexString(hashCode());
+    }
+
+    public static StreamInfoCache getInstance() {
+        if (DEBUG) Log.d(TAG, "getInstance() called");
+        return instance;
+    }
+
+    public boolean hasKey(@NonNull String url) {
+        if (DEBUG) Log.d(TAG, "hasKey() called with: url = [" + url + "]");
+        return !TextUtils.isEmpty(url) && myCache.containsKey(url) && myCache.get(url) != null;
+    }
+
+    public StreamInfo getFromKey(@NonNull String url) {
+        if (DEBUG) Log.d(TAG, "getFromKey() called with: url = [" + url + "]");
+        return myCache.get(url);
+    }
+
+    public void putInfo(@NonNull StreamInfo info) {
+        if (DEBUG) Log.d(TAG, "putInfo() called with: info = [" + info + "]");
+        putInfo(info.webpage_url, info);
+    }
+
+    public void putInfo(@NonNull String url, @NonNull StreamInfo info) {
+        if (DEBUG) Log.d(TAG, "putInfo() called with: url = [" + url + "], info = [" + info + "]");
+        myCache.put(url, info);
+    }
+
+    public void removeInfo(@NonNull StreamInfo info) {
+        if (DEBUG) Log.d(TAG, "removeInfo() called with: info = [" + info + "]");
+        myCache.remove(info.webpage_url);
+    }
+
+    public void removeInfo(@NonNull String url) {
+        if (DEBUG) Log.d(TAG, "removeInfo() called with: url = [" + url + "]");
+        myCache.remove(url);
+    }
+
+    @SuppressWarnings("unused")
+    public void clearCache() {
+        if (DEBUG) Log.d(TAG, "clearCache() called");
+        myCache.clear();
+    }
+
+    public void removeOldEntries() {
+        if (DEBUG) Log.d(TAG, "removeOldEntries() called , size = " + getSize());
+        if (getSize() > MAX_ITEMS_ON_CACHE) {
+            Iterator<String> iterator = myCache.keySet().iterator();
+            while (iterator.hasNext()) {
+                iterator.next();
+                iterator.remove();
+                if (DEBUG) Log.d(TAG, "getSize() = " + getSize());
+                if (getSize() <= MAX_ITEMS_ON_CACHE) break;
+            }
+        }
+    }
+
+    public int getSize() {
+        return myCache.size();
+    }
+
+}

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

@@ -0,0 +1,33 @@
+package org.schabi.newpipe.fragments.search;
+
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+
+/**
+ * Recycler view scroll listener which calls the method {@link #onScrolledDown(RecyclerView)}
+ * if the view is scrolled below the last item.
+ */
+public abstract class OnScrollBelowItemsListener extends RecyclerView.OnScrollListener {
+
+    @Override
+    public void onScrolled(RecyclerView recyclerView, int dx, int dy) {
+        super.onScrolled(recyclerView, dx, dy);
+        //check for scroll down
+        if (dy > 0) {
+            int pastVisibleItems, visibleItemCount, totalItemCount;
+            LinearLayoutManager layoutManager = (LinearLayoutManager) recyclerView.getLayoutManager();
+            visibleItemCount = recyclerView.getLayoutManager().getChildCount();
+            totalItemCount = recyclerView.getLayoutManager().getItemCount();
+            pastVisibleItems = layoutManager.findFirstVisibleItemPosition();
+            if ((visibleItemCount + pastVisibleItems) >= totalItemCount) {
+                onScrolledDown(recyclerView);
+            }
+        }
+    }
+
+    /**
+     * Called when the recycler view is scrolled below the last item.
+     * @param recyclerView the recycler view
+     */
+    public abstract void onScrolledDown(RecyclerView recyclerView);
+}

app/src/main/java/org/schabi/newpipe/fragments/search/SearchSuggestionListener.java

@@ -1,49 +0,0 @@
-package org.schabi.newpipe.fragments.search;
-
-import android.support.v7.widget.SearchView;
-
-/**
- * Created by Christian Schabesberger on 02.08.16.
- *
- * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
- * SearchSuggestionListener.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 SearchSuggestionListener implements SearchView.OnSuggestionListener{
-
-    private final SearchView searchView;
-    private final SuggestionListAdapter adapter;
-
-    public SearchSuggestionListener(SearchView searchView, SuggestionListAdapter adapter) {
-        this.searchView = searchView;
-        this.adapter = adapter;
-    }
-
-    @Override
-    public boolean onSuggestionSelect(int position) {
-        String suggestion = adapter.getSuggestion(position);
-        searchView.setQuery(suggestion,true);
-        return false;
-    }
-
-    @Override
-    public boolean onSuggestionClick(int position) {
-        String suggestion = adapter.getSuggestion(position);
-        searchView.setQuery(suggestion,true);
-        return false;
-    }
-}

app/src/main/java/org/schabi/newpipe/fragments/search/SearchWorker.java

@@ -1,216 +0,0 @@
-package org.schabi.newpipe.fragments.search;
-
-import android.app.Activity;
-import android.content.SharedPreferences;
-import android.os.Handler;
-import android.preference.PreferenceManager;
-import android.util.Log;
-import android.view.View;
-
-import org.schabi.newpipe.R;
-import org.schabi.newpipe.extractor.NewPipe;
-import org.schabi.newpipe.extractor.exceptions.ExtractionException;
-import org.schabi.newpipe.extractor.exceptions.ReCaptchaException;
-import org.schabi.newpipe.extractor.search.SearchEngine;
-import org.schabi.newpipe.extractor.search.SearchResult;
-import org.schabi.newpipe.report.ErrorActivity;
-
-import java.io.IOException;
-import java.util.EnumSet;
-
-/**
- * Created by Christian Schabesberger on 02.08.16.
- *
- * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
- * SearchWorker.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 SearchWorker {
-    private static final String TAG = SearchWorker.class.toString();
-
-    public interface SearchWorkerResultListener {
-        void onResult(SearchResult result);
-        void onNothingFound(final int stringResource);
-        void onError(String message);
-        void onReCaptchaChallenge();
-    }
-
-    private class ResultRunnable implements Runnable {
-        private final SearchResult result;
-        private int requestId = 0;
-        public ResultRunnable(SearchResult result, int requestId) {
-            this.result = result;
-            this.requestId = requestId;
-        }
-        @Override
-        public void run() {
-            if(this.requestId == SearchWorker.this.requestId) {
-                searchWorkerResultListener.onResult(result);
-            }
-        }
-    }
-
-    private class SearchRunnable implements Runnable {
-        public static final String YOUTUBE = "Youtube";
-        private final String query;
-        private final int page;
-        private final EnumSet<SearchEngine.Filter> filter;
-        final Handler h = new Handler();
-        private volatile boolean runs = true;
-        private Activity a = null;
-        private int serviceId = -1;
-        public SearchRunnable(int serviceId,
-                              String query,
-                              int page,
-                              EnumSet<SearchEngine.Filter> filter,
-                              Activity activity,
-                              int requestId) {
-            this.serviceId = serviceId;
-            this.query = query;
-            this.page = page;
-            this.filter = filter;
-            this.a = activity;
-        }
-        void terminate() {
-            runs = false;
-        }
-        @Override
-        public void run() {
-            final String serviceName = NewPipe.getNameOfService(serviceId);
-            SearchResult result = null;
-            SearchEngine engine = null;
-
-            try {
-                engine = NewPipe.getService(serviceId)
-                        .getSearchEngineInstance();
-            } catch(ExtractionException e) {
-                ErrorActivity.reportError(h, a, e, null, null,
-                        ErrorActivity.ErrorInfo.make(ErrorActivity.SEARCHED,
-                                Integer.toString(serviceId), query, R.string.general_error));
-                return;
-            }
-
-            try {
-                SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(a);
-                String searchLanguageKey = a.getString(R.string.search_language_key);
-                String searchLanguage = sp.getString(searchLanguageKey,
-                        a.getString(R.string.default_language_value));
-                result = SearchResult
-                        .getSearchResult(engine, query, page, searchLanguage, filter);
-                if(runs) {
-                    h.post(new ResultRunnable(result, requestId));
-                }
-
-                // look for errors during extraction
-                // soft errors:
-                View rootView = a.findViewById(android.R.id.content);
-                if(result != null &&
-                        !result.errors.isEmpty()) {
-                    Log.e(TAG, "OCCURRED ERRORS DURING SEARCH EXTRACTION:");
-                    for(Throwable e : result.errors) {
-                        e.printStackTrace();
-                        Log.e(TAG, "------");
-                    }
-
-                    if(result.resultList.isEmpty()&& !result.errors.isEmpty()) {
-                        // if it compleatly failes dont show snackbar, instead show error directlry
-                        ErrorActivity.reportError(h, a, result.errors, null, null,
-                                ErrorActivity.ErrorInfo.make(ErrorActivity.SEARCHED,
-                                        serviceName, query, R.string.parsing_error));
-                    } else {
-                        // if it partly show snackbar
-                        ErrorActivity.reportError(h, a, result.errors, null, rootView,
-                                ErrorActivity.ErrorInfo.make(ErrorActivity.SEARCHED,
-                                        serviceName, query, R.string.light_parsing_error));
-                    }
-                }
-                // hard errors:
-            } catch (ReCaptchaException e) {
-                h.post(new Runnable() {
-                    @Override
-                    public void run() {
-                        searchWorkerResultListener.onReCaptchaChallenge();
-                    }
-                });
-            } catch(IOException e) {
-                h.post(new Runnable() {
-                    @Override
-                    public void run() {
-                        searchWorkerResultListener.onNothingFound(R.string.network_error);
-                    }
-                });
-                e.printStackTrace();
-            } catch(final SearchEngine.NothingFoundException e) {
-                h.post(new Runnable() {
-                    @Override
-                    public void run() {
-                        searchWorkerResultListener.onError(e.getMessage());
-                    }
-                });
-            } catch(ExtractionException e) {
-                ErrorActivity.reportError(h, a, e, null, null,
-                        ErrorActivity.ErrorInfo.make(ErrorActivity.SEARCHED,
-                                serviceName, query, R.string.parsing_error));
-                //postNewErrorToast(h, R.string.parsing_error);
-                e.printStackTrace();
-
-            } catch(Exception e) {
-                ErrorActivity.reportError(h, a, e, null, null,
-                        ErrorActivity.ErrorInfo.make(ErrorActivity.SEARCHED,
-                        /* todo: this shoudl not be assigned static */ YOUTUBE, query, R.string.general_error));
-
-                e.printStackTrace();
-            }
-        }
-    }
-
-    private static SearchWorker searchWorker = null;
-    private SearchWorkerResultListener searchWorkerResultListener = null;
-    private SearchRunnable runnable = null;
-    private int requestId = 0;     //prevents running requests that have already ben expired
-
-    public static SearchWorker getInstance() {
-        return searchWorker == null ? (searchWorker = new SearchWorker()) : searchWorker;
-    }
-
-    public void setSearchWorkerResultListener(SearchWorkerResultListener listener) {
-        searchWorkerResultListener = listener;
-    }
-
-    private SearchWorker() {
-
-    }
-
-    public void search(int serviceId,
-                       String query,
-                       int page,
-                       Activity a,
-                       EnumSet<SearchEngine.Filter> filter) {
-        if(runnable != null) {
-            terminate();
-        }
-        runnable = new SearchRunnable(serviceId, query, page, filter, a, requestId);
-        Thread thread = new Thread(runnable);
-        thread.start();
-    }
-
-    public void terminate() {
-        if (runnable == null) return;
-        requestId++;
-        runnable.terminate();
-    }
-}