fix filters

Translated using Weblate (Catalan)
Currently translated at 100,0% (383 of 383 strings)
2025-09-22 10:00:55 +02:00 · 2018-07-22 13:55:17 +02:00 · 2018-07-22 12:41:26 +02:00 · 2018-07-22 11:40:53 +02:00 · 2018-07-22 11:01:08 +02:00 · 2018-07-22 10:57:42 +02:00
121 changed files with 5348 additions and 2050 deletions
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -15,6 +15,8 @@ Do not report crashes in the GitHub issue tracker. NewPipe has an automated cras
 * If you are an Android/Java developer, you are always welcome to fix/implement an issue/a feature yourself. PRs welcome!
 * We use English for development. Issues in other languages will be closed and ignored.
 * Please only add *one* issue at a time. Do not put multiple issues into one thread.
+* When reporting a bug please give us a context, and a description how to reproduce it.
+* Issues that only contain a generated bug report, but no describtion might be closed.

 ## Bug Fixing
 * If you want to help NewPipe to become free of bugs (this is our utopic goal for NewPipe), you can send us an email to tnp@newpipe.schabi.org to let me know that you intend to help. We'll send you further instructions. You may, on request, register at our [Sentry](https://sentry.schabi.org) instance (see section "Crash reporting" for more information.
@@ -28,7 +30,7 @@ Do not report crashes in the GitHub issue tracker. NewPipe has an automated cras
 * Stick to NewPipe's style conventions (well, just look the other code and then do it the same way :))
 * Do not bring non-free software (e.g., binary blobs) into the project. Also, make sure you do not introduce Google libraries.
 * Stick to [F-Droid contribution guidelines](https://f-droid.org/wiki/page/Inclusion_Policy)
-* Make changes on a separate branch, not on the master branch. This is commonly known as *feature branch workflow*. You may then send your changes as a pull request on GitHub. Patches to the email address mentioned in this document might not be considered, GitHub is the primary platform.
+* Make changes on a separate branch, not on the master branch. This is commonly known as *feature branch workflow*. You may then send your changes as a pull request on GitHub. Patches to the email address mentioned in this document might not be considered, GitHub is the primary platform. (This only affects you if you are a member of TeamNewPipe)
 * When submitting changes, you confirm that your code is licensed under the terms of the [GNU General Public License v3](https://www.gnu.org/licenses/gpl-3.0.html).
 * Please test (compile and run) your code before you submit changes! Ideally, provide test feedback in the PR description. Untested code will **not** be merged!
 * Try to figure out yourself why builds on our CI fail.
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,2 +1,3 @@
 - [ ] I carefully read the [contribution guidelines](https://github.com/TeamNewPipe/NewPipe/blob/HEAD/.github/CONTRIBUTING.md) and agree to them.
 - [ ] I checked if the issue/feature exists in the latest version.
+- [ ] I did use the [incredible bugreport to markdown converter](https://teamnewpipe.github.io/CrashReportToMarkdown/) to paste bug reports.
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,8 +8,8 @@ android {
        applicationId "org.schabi.newpipe"
        minSdkVersion 15
        targetSdkVersion 27
-        versionCode 62
-        versionName "0.13.3"
+        versionCode 65
+        versionName "0.13.6"

        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
        vectorDrawables.useSupportLibrary = true
@@ -42,10 +42,10 @@ android {

 ext {
    supportLibVersion = '27.1.1'
-    exoPlayerLibVersion = '2.7.3'
-    roomDbLibVersion = '1.0.0'
+    exoPlayerLibVersion = '2.8.2'
+    roomDbLibVersion = '1.1.1'
    leakCanaryLibVersion = '1.5.4'
-    okHttpLibVersion = '1.5.0'
+    okHttpLibVersion = '3.10.0'
    icepickLibVersion = '3.2.0'
    stethoLibVersion = '1.5.0'
 }
@@ -54,10 +54,10 @@ dependencies {
        exclude module: 'support-annotations'
    }

-    implementation 'com.github.TeamNewPipe:NewPipeExtractor:bf1c771'
+    implementation 'com.github.TeamNewPipe:NewPipeExtractor:1eff8c5708'

    testImplementation 'junit:junit:4.12'
-    testImplementation 'org.mockito:mockito-core:1.10.19'
+    testImplementation 'org.mockito:mockito-core:2.8.9'

    implementation "com.android.support:appcompat-v7:$supportLibVersion"
    implementation "com.android.support:support-v4:$supportLibVersion"
@@ -79,7 +79,7 @@ dependencies {
    debugImplementation "com.facebook.stetho:stetho-urlconnection:$stethoLibVersion"
    debugImplementation 'com.android.support:multidex:1.0.3'

-    implementation 'io.reactivex.rxjava2:rxjava:2.1.10'
+    implementation 'io.reactivex.rxjava2:rxjava:2.1.14'
    implementation 'io.reactivex.rxjava2:rxandroid:2.0.2'
    implementation 'com.jakewharton.rxbinding2:rxbinding:2.1.1'

@@ -93,6 +93,6 @@ dependencies {
    debugImplementation "com.squareup.leakcanary:leakcanary-android:$leakCanaryLibVersion"
    releaseImplementation "com.squareup.leakcanary:leakcanary-android-no-op:$leakCanaryLibVersion"

-    implementation 'com.squareup.okhttp3:okhttp:3.9.1'
-    debugImplementation "com.facebook.stetho:stetho-okhttp3:$okHttpLibVersion"
+    implementation "com.squareup.okhttp3:okhttp:$okHttpLibVersion"
+    debugImplementation "com.facebook.stetho:stetho-okhttp3:$stethoLibVersion"
 }
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -42,3 +42,9 @@
 -dontwarn javax.annotation.**
 # A resource is loaded with a relative path so the package of this class must be preserved.
 -keepnames class okhttp3.internal.publicsuffix.PublicSuffixDatabase
+-keepclassmembers class * implements java.io.Serializable {
+    static final long serialVersionUID;
+    !static !transient <fields>;
+    private void writeObject(java.io.ObjectOutputStream);
+    private void readObject(java.io.ObjectInputStream);
+}
--- a/app/src/main/java/org/schabi/newpipe/MainActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/MainActivity.java
@@ -61,6 +61,8 @@ import org.schabi.newpipe.util.ServiceHelper;
 import org.schabi.newpipe.util.StateSaver;
 import org.schabi.newpipe.util.ThemeHelper;

+import static org.schabi.newpipe.extractor.InfoItem.InfoType.PLAYLIST;
+
 public class MainActivity extends AppCompatActivity {
    private static final String TAG = "MainActivity";
    public static final boolean DEBUG = !BuildConfig.BUILD_TYPE.equals("release");
@@ -106,7 +108,19 @@ public class MainActivity extends AppCompatActivity {

        drawerItems.getMenu().getItem(ServiceHelper.getSelectedServiceId(this)).setChecked(true);

-        toggle = new ActionBarDrawerToggle(this, drawer, toolbar, R.string.drawer_open, R.string.drawer_close);
+        toggle = new ActionBarDrawerToggle(this, drawer, toolbar,
+                R.string.drawer_open, R.string.drawer_close) {
+            @Override
+            public void onDrawerClosed(View view) { super.onDrawerClosed(view); }
+
+            @Override
+            public void onDrawerOpened(View drawerView) { super.onDrawerOpened(drawerView); }
+
+            @Override
+            public void onDrawerSlide(View drawerView, float slideOffset) {
+                super.onDrawerSlide(drawerView, 0);
+            }
+        };
        toggle.syncState();
        drawer.addDrawerListener(toggle);
        drawer.addDrawerListener(new DrawerLayout.SimpleDrawerListener() {
@@ -133,13 +147,11 @@ public class MainActivity extends AppCompatActivity {


    private boolean changeService(MenuItem item) {
-        if (item.getGroupId() == R.id.menu_services_group) {
-            drawerItems.getMenu().getItem(ServiceHelper.getSelectedServiceId(this)).setChecked(false);
-            ServiceHelper.setSelectedServiceId(this, item.getItemId());
-            drawerItems.getMenu().getItem(ServiceHelper.getSelectedServiceId(this)).setChecked(true);
-        } else {
+        if (item.getGroupId() != R.id.menu_services_group)
            return false;
-        }
+        drawerItems.getMenu().getItem(ServiceHelper.getSelectedServiceId(this)).setChecked(false);
+        ServiceHelper.setSelectedServiceId(this, item.getItemId());
+        drawerItems.getMenu().getItem(ServiceHelper.getSelectedServiceId(this)).setChecked(true);
        drawer.closeDrawers();
        return true;
    }
@@ -382,31 +394,45 @@ public class MainActivity extends AppCompatActivity {
    }

    private void handleIntent(Intent intent) {
-        if (DEBUG) Log.d(TAG, "handleIntent() called with: intent = [" + intent + "]");
+        try {
+            if (DEBUG) Log.d(TAG, "handleIntent() called with: intent = [" + intent + "]");

-        if (intent.hasExtra(Constants.KEY_LINK_TYPE)) {
-            String url = intent.getStringExtra(Constants.KEY_URL);
-            int serviceId = intent.getIntExtra(Constants.KEY_SERVICE_ID, 0);
-            String title = intent.getStringExtra(Constants.KEY_TITLE);
-            switch (((StreamingService.LinkType) intent.getSerializableExtra(Constants.KEY_LINK_TYPE))) {
-                case STREAM:
-                    boolean autoPlay = intent.getBooleanExtra(VideoDetailFragment.AUTO_PLAY, false);
-                    NavigationHelper.openVideoDetailFragment(getSupportFragmentManager(), serviceId, url, title, autoPlay);
-                    break;
-                case CHANNEL:
-                    NavigationHelper.openChannelFragment(getSupportFragmentManager(), serviceId, url, title);
-                    break;
-                case PLAYLIST:
-                    NavigationHelper.openPlaylistFragment(getSupportFragmentManager(), serviceId, url, title);
-                    break;
+            if (intent.hasExtra(Constants.KEY_LINK_TYPE)) {
+                String url = intent.getStringExtra(Constants.KEY_URL);
+                int serviceId = intent.getIntExtra(Constants.KEY_SERVICE_ID, 0);
+                String title = intent.getStringExtra(Constants.KEY_TITLE);
+                switch (((StreamingService.LinkType) intent.getSerializableExtra(Constants.KEY_LINK_TYPE))) {
+                    case STREAM:
+                        boolean autoPlay = intent.getBooleanExtra(VideoDetailFragment.AUTO_PLAY, false);
+                        NavigationHelper.openVideoDetailFragment(getSupportFragmentManager(), serviceId, url, title, autoPlay);
+                        break;
+                    case CHANNEL:
+                        NavigationHelper.openChannelFragment(getSupportFragmentManager(),
+                                serviceId,
+                                url,
+                                title);
+                        break;
+                    case PLAYLIST:
+                        NavigationHelper.openPlaylistFragment(getSupportFragmentManager(),
+                                serviceId,
+                                url,
+                                title);
+                        break;
+                }
+            } else if (intent.hasExtra(Constants.KEY_OPEN_SEARCH)) {
+                String searchString = intent.getStringExtra(Constants.KEY_SEARCH_STRING);
+                if (searchString == null) searchString = "";
+                int serviceId = intent.getIntExtra(Constants.KEY_SERVICE_ID, 0);
+                NavigationHelper.openSearchFragment(
+                        getSupportFragmentManager(),
+                        serviceId,
+                        searchString);
+
+            } else {
+                NavigationHelper.gotoMainFragment(getSupportFragmentManager());
            }
-        } else if (intent.hasExtra(Constants.KEY_OPEN_SEARCH)) {
-            String searchQuery = intent.getStringExtra(Constants.KEY_QUERY);
-            if (searchQuery == null) searchQuery = "";
-            int serviceId = intent.getIntExtra(Constants.KEY_SERVICE_ID, 0);
-            NavigationHelper.openSearchFragment(getSupportFragmentManager(), serviceId, searchQuery);
-        } else {
-            NavigationHelper.gotoMainFragment(getSupportFragmentManager());
+        } catch (Exception e) {
+            ErrorActivity.reportUiError(this, e);
        }
    }
 }
--- a/app/src/main/java/org/schabi/newpipe/RouterActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/RouterActivity.java
@@ -1,14 +1,19 @@
 package org.schabi.newpipe;

+import android.annotation.SuppressLint;
+import android.app.FragmentManager;
 import android.app.IntentService;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.SharedPreferences;
+import android.content.pm.PackageManager;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
 import android.support.annotation.DrawableRes;
+import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
 import android.support.v4.app.NotificationCompat;
 import android.support.v7.app.AlertDialog;
 import android.support.v7.app.AppCompatActivity;
@@ -23,6 +28,7 @@ import android.widget.RadioButton;
 import android.widget.RadioGroup;
 import android.widget.Toast;

+import org.schabi.newpipe.download.DownloadDialog;
 import org.schabi.newpipe.extractor.Info;
 import org.schabi.newpipe.extractor.NewPipe;
 import org.schabi.newpipe.extractor.StreamingService;
@@ -31,6 +37,8 @@ import org.schabi.newpipe.extractor.channel.ChannelInfo;
 import org.schabi.newpipe.extractor.exceptions.ExtractionException;
 import org.schabi.newpipe.extractor.playlist.PlaylistInfo;
 import org.schabi.newpipe.extractor.stream.StreamInfo;
+import org.schabi.newpipe.extractor.stream.VideoStream;
+import org.schabi.newpipe.fragments.detail.VideoDetailFragment;
 import org.schabi.newpipe.player.helper.PlayerHelper;
 import org.schabi.newpipe.player.playqueue.ChannelPlayQueue;
 import org.schabi.newpipe.player.playqueue.PlayQueue;
@@ -38,16 +46,19 @@ import org.schabi.newpipe.player.playqueue.PlaylistPlayQueue;
 import org.schabi.newpipe.player.playqueue.SinglePlayQueue;
 import org.schabi.newpipe.report.UserAction;
 import org.schabi.newpipe.util.ExtractorHelper;
+import org.schabi.newpipe.util.ListHelper;
 import org.schabi.newpipe.util.NavigationHelper;
 import org.schabi.newpipe.util.PermissionHelper;
 import org.schabi.newpipe.util.ThemeHelper;

+import java.io.IOException;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Observer;

 import icepick.Icepick;
 import icepick.State;
@@ -77,6 +88,8 @@ public class RouterActivity extends AppCompatActivity {
    protected String currentUrl;
    protected CompositeDisposable disposables = new CompositeDisposable();

+    private boolean selectionIsDownload = false;
+
    @Override
    protected void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
@@ -104,7 +117,7 @@ public class RouterActivity extends AppCompatActivity {
    @Override
    protected void onStart() {
        super.onStart();
-
+        
        handleUrl(currentUrl);
    }

@@ -165,6 +178,7 @@ public class RouterActivity extends AppCompatActivity {
        final String videoPlayerKey = getString(R.string.video_player_key);
        final String backgroundPlayerKey = getString(R.string.background_player_key);
        final String popupPlayerKey = getString(R.string.popup_player_key);
+        final String downloadKey = getString(R.string.download_key);
        final String alwaysAskKey = getString(R.string.always_ask_open_action_key);

        if (selectedChoiceKey.equals(alwaysAskKey)) {
@@ -179,6 +193,8 @@ public class RouterActivity extends AppCompatActivity {
            }
        } else if (selectedChoiceKey.equals(showInfoKey)) {
            handleChoice(showInfoKey);
+        } else if (selectedChoiceKey.equals(downloadKey)) {
+            handleChoice(downloadKey);
        } else {
            final boolean isExtVideoEnabled = preferences.getBoolean(getString(R.string.use_external_video_player_key), false);
            final boolean isExtAudioEnabled = preferences.getBoolean(getString(R.string.use_external_audio_player_key), false);
@@ -236,7 +252,9 @@ public class RouterActivity extends AppCompatActivity {
                .setCancelable(true)
                .setNegativeButton(R.string.just_once, dialogButtonsClickListener)
                .setPositiveButton(R.string.always, dialogButtonsClickListener)
-                .setOnDismissListener((dialog) -> finish())
+                .setOnDismissListener((dialog) -> {
+                    if(!selectionIsDownload) finish();
+                })
                .create();

        //noinspection CodeBlock2Expr
@@ -316,6 +334,9 @@ public class RouterActivity extends AppCompatActivity {
                    resolveResourceIdFromAttr(context, R.attr.audio)));
        }

+        returnList.add(new AdapterChoiceItem(getString(R.string.download_key), getString(R.string.download),
+                resolveResourceIdFromAttr(context, R.attr.download)));
+
        return returnList;
    }

@@ -347,6 +368,14 @@ public class RouterActivity extends AppCompatActivity {
            return;
        }

+        if (selectedChoiceKey.equals(getString(R.string.download_key))) {
+            if (PermissionHelper.checkStoragePermissions(this, PermissionHelper.DOWNLOAD_DIALOG_REQUEST_CODE)) {
+                selectionIsDownload = true;
+                openDownloadDialog();
+            }
+            return;
+        }
+
        // stop and bypass FetcherService if InfoScreen was selected since
        // StreamDetailFragment can fetch data itself
        if (selectedChoiceKey.equals(getString(R.string.show_info_key))) {
@@ -373,6 +402,47 @@ public class RouterActivity extends AppCompatActivity {
        finish();
    }

+    @SuppressLint("CheckResult")
+    private void openDownloadDialog() {
+        ExtractorHelper.getStreamInfo(currentServiceId, currentUrl, true)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe((@NonNull StreamInfo result) -> {
+                    List<VideoStream> sortedVideoStreams = ListHelper.getSortedStreamVideosList(this,
+                            result.getVideoStreams(),
+                            result.getVideoOnlyStreams(),
+                            false);
+                    int selectedVideoStreamIndex = ListHelper.getDefaultResolutionIndex(this,
+                            sortedVideoStreams);
+
+                    android.support.v4.app.FragmentManager fm = getSupportFragmentManager();
+                    DownloadDialog downloadDialog = DownloadDialog.newInstance(result);
+                    downloadDialog.setVideoStreams(sortedVideoStreams);
+                    downloadDialog.setAudioStreams(result.getAudioStreams());
+                    downloadDialog.setSelectedVideoStream(selectedVideoStreamIndex);
+                    downloadDialog.show(fm, "downloadDialog");
+                    fm.executePendingTransactions();
+                    downloadDialog.getDialog().setOnDismissListener(dialog -> {
+                        finish();
+                    });
+                }, (@NonNull Throwable throwable) -> {
+                    onError();
+                });
+    }
+
+    @Override
+    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+        for (int i: grantResults){
+            if (i == PackageManager.PERMISSION_DENIED){
+                finish();
+                return;
+            }
+        }
+        if (requestCode == PermissionHelper.DOWNLOAD_DIALOG_REQUEST_CODE) {
+            openDownloadDialog();
+        }
+    }
+
    private static class AdapterChoiceItem {
        final String description, key;
        @DrawableRes final int icon;
--- a/app/src/main/java/org/schabi/newpipe/about/AboutActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/about/AboutActivity.java
@@ -128,47 +128,31 @@ public class AboutActivity extends AppCompatActivity {
        public View onCreateView(LayoutInflater inflater, ViewGroup container,
                                 Bundle savedInstanceState) {
            View rootView = inflater.inflate(R.layout.fragment_about, container, false);
+            Context context = this.getContext();
+
            TextView version = rootView.findViewById(R.id.app_version);
            version.setText(BuildConfig.VERSION_NAME);

            View githubLink = rootView.findViewById(R.id.github_link);
-            githubLink.setOnClickListener(new OnGithubLinkClickListener());
+            githubLink.setOnClickListener(nv -> openWebsite(context.getString(R.string.github_url), context));

            View donationLink = rootView.findViewById(R.id.donation_link);
-            donationLink.setOnClickListener(new OnDonationLinkClickListener());
+            donationLink.setOnClickListener(v -> openWebsite(context.getString(R.string.donation_url), context));

            View websiteLink = rootView.findViewById(R.id.website_link);
-            websiteLink.setOnClickListener(new OnWebsiteLinkClickListener());
+            websiteLink.setOnClickListener(nv -> openWebsite(context.getString(R.string.website_url), context));
+
+            View privacyPolicyLink = rootView.findViewById(R.id.privacy_policy_link);
+            privacyPolicyLink.setOnClickListener(v -> openWebsite(context.getString(R.string.privacy_policy_url), context));

            return rootView;
        }

-        private static class OnGithubLinkClickListener implements View.OnClickListener {
-            @Override
-            public void onClick(final View view) {
-                final Context context = view.getContext();
-                Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(context.getString(R.string.github_url)));
-                context.startActivity(intent);
-            }
+        private void openWebsite(String url, Context context) {
+            Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(url));
+            context.startActivity(intent);
        }

-        private static class OnDonationLinkClickListener implements View.OnClickListener {
-            @Override
-            public void onClick(final View view) {
-                final Context context = view.getContext();
-                Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(context.getString(R.string.donation_url)));
-                context.startActivity(intent);
-            }
-        }
-
-        private static class OnWebsiteLinkClickListener implements View.OnClickListener {
-            @Override
-            public void onClick(final View view) {
-                final Context context = view.getContext();
-                Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(context.getString(R.string.website_url)));
-                context.startActivity(intent);
-            }
-        }
    }


--- a/app/src/main/java/org/schabi/newpipe/about/LicenseFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/about/LicenseFragment.java
@@ -1,5 +1,6 @@
 package org.schabi.newpipe.about;

+import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
@@ -39,7 +40,7 @@ public class LicenseFragment extends Fragment {
     * @param license the license to show
     */
    public static void showLicense(Context context, License license) {
-        new LicenseFragmentHelper().execute(context, license);
+        new LicenseFragmentHelper((Activity) context).execute(license);
    }

    @Override
--- a/app/src/main/java/org/schabi/newpipe/about/LicenseFragmentHelper.java
+++ b/app/src/main/java/org/schabi/newpipe/about/LicenseFragmentHelper.java
@@ -1,8 +1,11 @@
 package org.schabi.newpipe.about;

+import android.app.Activity;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.os.AsyncTask;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
 import android.support.v7.app.AlertDialog;
 import android.webkit.WebView;
 import org.schabi.newpipe.R;
@@ -10,26 +13,46 @@ import org.schabi.newpipe.util.ThemeHelper;

 import java.io.BufferedReader;
 import java.io.InputStreamReader;
+import java.lang.ref.WeakReference;

 public class LicenseFragmentHelper extends AsyncTask<Object, Void, Integer> {

-    private Context context;
+    WeakReference<Activity> weakReference;
    private License license;

+    public LicenseFragmentHelper(@Nullable Activity activity) {
+        weakReference = new WeakReference<>(activity);
+    }
+
+    @Nullable
+    private Activity getActivity() {
+        Activity activity = weakReference.get();
+
+        if (activity != null && activity.isFinishing()) {
+            return null;
+        } else {
+            return activity;
+        }
+    }
+
    @Override
    protected Integer doInBackground(Object... objects) {
-        context = (Context) objects[0];
-        license = (License) objects[1];
+        license = (License) objects[0];
        return 1;
    }

    @Override
-    protected void onPostExecute(Integer result){
-        String webViewData = getFormattedLicense(context, license);
-        AlertDialog.Builder alert = new AlertDialog.Builder(context);
+    protected void onPostExecute(Integer result) {
+        Activity activity = getActivity();
+        if (activity == null) {
+            return;
+        }
+
+        String webViewData = getFormattedLicense(activity, license);
+        AlertDialog.Builder alert = new AlertDialog.Builder(activity);
        alert.setTitle(license.getName());

-        WebView wv = new WebView(context);
+        WebView wv = new WebView(activity);
        wv.loadData(webViewData, "text/html; charset=UTF-8", null);

        alert.setView(wv);
--- a/app/src/main/java/org/schabi/newpipe/database/playlist/model/PlaylistRemoteEntity.java
+++ b/app/src/main/java/org/schabi/newpipe/database/playlist/model/PlaylistRemoteEntity.java
@@ -71,6 +71,14 @@ public class PlaylistRemoteEntity implements PlaylistLocalItem {
                info.getUploaderName(), info.getStreamCount());
    }

+    @Ignore
+    public boolean isIdenticalTo(final PlaylistInfo info) {
+        return getServiceId() == info.getServiceId() && getName().equals(info.getName()) &&
+                getStreamCount() == info.getStreamCount() && getUrl().equals(info.getUrl()) &&
+                getThumbnailUrl().equals(info.getThumbnailUrl()) &&
+                getUploader().equals(info.getUploaderName());
+    }
+
    public long getUid() {
        return uid;
    }
--- a/app/src/main/java/org/schabi/newpipe/download/DeleteDownloadManager.java
+++ b/app/src/main/java/org/schabi/newpipe/download/DeleteDownloadManager.java
@@ -0,0 +1,158 @@
+package org.schabi.newpipe.download;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.design.widget.BaseTransientBottomBar;
+import android.support.design.widget.Snackbar;
+import android.view.View;
+
+import org.schabi.newpipe.R;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+import io.reactivex.Completable;
+import io.reactivex.Observable;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.disposables.Disposable;
+import io.reactivex.schedulers.Schedulers;
+import io.reactivex.subjects.PublishSubject;
+import us.shandian.giga.get.DownloadManager;
+import us.shandian.giga.get.DownloadMission;
+
+public class DeleteDownloadManager {
+
+    private static final String KEY_STATE = "delete_manager_state";
+
+    private View mView;
+    private HashSet<String> mPendingMap;
+    private List<Disposable> mDisposableList;
+    private DownloadManager mDownloadManager;
+    private PublishSubject<DownloadMission> publishSubject = PublishSubject.create();
+
+    DeleteDownloadManager(Activity activity) {
+        mPendingMap = new HashSet<>();
+        mDisposableList = new ArrayList<>();
+        mView = activity.findViewById(android.R.id.content);
+    }
+
+    public Observable<DownloadMission> getUndoObservable() {
+        return publishSubject;
+    }
+
+    public boolean contains(@NonNull DownloadMission mission) {
+        return mPendingMap.contains(mission.url);
+    }
+
+    public void add(@NonNull DownloadMission mission) {
+        mPendingMap.add(mission.url);
+
+        if (mPendingMap.size() == 1) {
+            showUndoDeleteSnackbar(mission);
+        }
+    }
+
+    public void setDownloadManager(@NonNull DownloadManager downloadManager) {
+        mDownloadManager = downloadManager;
+
+        if (mPendingMap.size() < 1) return;
+
+        showUndoDeleteSnackbar();
+    }
+
+    public void restoreState(@Nullable Bundle savedInstanceState) {
+        if (savedInstanceState == null) return;
+
+        List<String> list = savedInstanceState.getStringArrayList(KEY_STATE);
+        if (list != null) {
+            mPendingMap.addAll(list);
+        }
+    }
+
+    public void saveState(@Nullable Bundle outState) {
+        if (outState == null) return;
+
+        for (Disposable disposable : mDisposableList) {
+            disposable.dispose();
+        }
+
+        outState.putStringArrayList(KEY_STATE, new ArrayList<>(mPendingMap));
+    }
+
+    private void showUndoDeleteSnackbar() {
+        if (mPendingMap.size() < 1) return;
+
+        String url = mPendingMap.iterator().next();
+
+        for (int i = 0; i < mDownloadManager.getCount(); i++) {
+            DownloadMission mission = mDownloadManager.getMission(i);
+            if (url.equals(mission.url)) {
+                showUndoDeleteSnackbar(mission);
+                break;
+            }
+        }
+    }
+
+    private void showUndoDeleteSnackbar(@NonNull DownloadMission mission) {
+        final Snackbar snackbar = Snackbar.make(mView, mission.name, Snackbar.LENGTH_INDEFINITE);
+        final Disposable disposable = Observable.timer(3, TimeUnit.SECONDS)
+                .subscribeOn(AndroidSchedulers.mainThread())
+                .subscribe(l -> snackbar.dismiss());
+
+        mDisposableList.add(disposable);
+
+        snackbar.setAction(R.string.undo, v -> {
+            mPendingMap.remove(mission.url);
+            publishSubject.onNext(mission);
+            disposable.dispose();
+            snackbar.dismiss();
+        });
+
+        snackbar.addCallback(new BaseTransientBottomBar.BaseCallback<Snackbar>() {
+            @Override
+            public void onDismissed(Snackbar transientBottomBar, int event) {
+                if (!disposable.isDisposed()) {
+                    Completable.fromAction(() -> deletePending(mission))
+                            .subscribeOn(Schedulers.io())
+                            .subscribe();
+                }
+                mPendingMap.remove(mission.url);
+                snackbar.removeCallback(this);
+                mDisposableList.remove(disposable);
+                showUndoDeleteSnackbar();
+            }
+        });
+
+        snackbar.show();
+    }
+
+    public void deletePending() {
+        if (mPendingMap.size() < 1) return;
+
+        HashSet<Integer> idSet = new HashSet<>();
+        for (int i = 0; i < mDownloadManager.getCount(); i++) {
+            if (contains(mDownloadManager.getMission(i))) {
+                idSet.add(i);
+            }
+        }
+
+        for (Integer id : idSet) {
+            mDownloadManager.deleteMission(id);
+        }
+
+        mPendingMap.clear();
+    }
+
+    private void deletePending(@NonNull DownloadMission mission) {
+        for (int i = 0; i < mDownloadManager.getCount(); i++) {
+            if (mission.url.equals(mDownloadManager.getMission(i).url)) {
+                mDownloadManager.deleteMission(i);
+                break;
+            }
+        }
+    }
+}
--- a/app/src/main/java/org/schabi/newpipe/download/DownloadActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/download/DownloadActivity.java
@@ -15,12 +15,17 @@ import org.schabi.newpipe.R;
 import org.schabi.newpipe.settings.SettingsActivity;
 import org.schabi.newpipe.util.ThemeHelper;

+import io.reactivex.Completable;
+import io.reactivex.schedulers.Schedulers;
 import us.shandian.giga.service.DownloadManagerService;
 import us.shandian.giga.ui.fragment.AllMissionsFragment;
 import us.shandian.giga.ui.fragment.MissionsFragment;

 public class DownloadActivity extends AppCompatActivity {

+    private static final String MISSIONS_FRAGMENT_TAG = "fragment_tag";
+    private DeleteDownloadManager mDeleteDownloadManager;
+
    @Override
    protected void onCreate(Bundle savedInstanceState) {
        // Service
@@ -42,21 +47,35 @@ public class DownloadActivity extends AppCompatActivity {
            actionBar.setDisplayShowTitleEnabled(true);
        }

-        // Fragment
-        getWindow().getDecorView().getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
-            @Override
-            public void onGlobalLayout() {
-                updateFragments();
-                getWindow().getDecorView().getViewTreeObserver().removeGlobalOnLayoutListener(this);
-            }
-        });
+        mDeleteDownloadManager = new DeleteDownloadManager(this);
+        mDeleteDownloadManager.restoreState(savedInstanceState);
+
+        MissionsFragment fragment = (MissionsFragment) getFragmentManager().findFragmentByTag(MISSIONS_FRAGMENT_TAG);
+        if (fragment != null) {
+            fragment.setDeleteManager(mDeleteDownloadManager);
+        } else {
+            getWindow().getDecorView().getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
+                @Override
+                public void onGlobalLayout() {
+                    updateFragments();
+                    getWindow().getDecorView().getViewTreeObserver().removeGlobalOnLayoutListener(this);
+                }
+            });
+        }
+    }
+
+    @Override
+    protected void onSaveInstanceState(Bundle outState) {
+        mDeleteDownloadManager.saveState(outState);
+        super.onSaveInstanceState(outState);
    }

    private void updateFragments() {
-
        MissionsFragment fragment = new AllMissionsFragment();
+        fragment.setDeleteManager(mDeleteDownloadManager);
+
        getFragmentManager().beginTransaction()
-                .replace(R.id.frame, fragment)
+                .replace(R.id.frame, fragment, MISSIONS_FRAGMENT_TAG)
                .setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE)
                .commit();
    }
@@ -80,6 +99,7 @@ public class DownloadActivity extends AppCompatActivity {
            case R.id.action_settings: {
                Intent intent = new Intent(this, SettingsActivity.class);
                startActivity(intent);
+                deletePending();
                return true;
            }
            default:
@@ -87,4 +107,15 @@ public class DownloadActivity extends AppCompatActivity {
        }
    }

+    @Override
+    public void onBackPressed() {
+        super.onBackPressed();
+        deletePending();
+    }
+
+    private void deletePending() {
+        Completable.fromAction(mDeleteDownloadManager::deletePending)
+                .subscribeOn(Schedulers.io())
+                .subscribe();
+    }
 }
--- a/app/src/main/java/org/schabi/newpipe/fragments/MainFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/MainFragment.java
@@ -10,6 +10,7 @@ import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentPagerAdapter;
 import android.support.v4.view.ViewPager;
 import android.support.v7.app.ActionBar;
+import android.support.v7.app.AppCompatActivity;
 import android.support.v7.preference.PreferenceManager;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -127,7 +128,14 @@ public class MainFragment extends BaseFragment implements TabLayout.OnTabSelecte
    public boolean onOptionsItemSelected(MenuItem item) {
        switch (item.getItemId()) {
            case R.id.action_search:
-                NavigationHelper.openSearchFragment(getFragmentManager(), ServiceHelper.getSelectedServiceId(activity), "");
+                try {
+                    NavigationHelper.openSearchFragment(
+                            getFragmentManager(),
+                            ServiceHelper.getSelectedServiceId(activity),
+                            "");
+                } catch (Exception e) {
+                    ErrorActivity.reportUiError((AppCompatActivity) getActivity(), e);
+                }
                return true;
        }
        return super.onOptionsItemSelected(item);
@@ -226,7 +234,9 @@ public class MainFragment extends BaseFragment implements TabLayout.OnTabSelecte
                        FALLBACK_CHANNEL_URL);
                String name = preferences.getString(getString(R.string.main_page_selected_channel_name),
                        FALLBACK_CHANNEL_NAME);
-                ChannelFragment fragment = ChannelFragment.getInstance(serviceId, url, name);
+                ChannelFragment fragment = ChannelFragment.getInstance(serviceId,
+                        url,
+                        name);
                fragment.useAsFrontPage(true);
                return fragment;
            } else {
@@ -255,20 +265,13 @@ public class MainFragment extends BaseFragment implements TabLayout.OnTabSelecte
        for (final String ks : kl.getAvailableKiosks()) {
            menu.add(0, KIOSK_MENU_OFFSET + i, Menu.NONE,
                    KioskTranslator.getTranslatedKioskName(ks, getContext()))
-                    .setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
-                        @Override
-                        public boolean onMenuItemClick(MenuItem menuItem) {
+                    .setOnMenuItemClickListener(menuItem -> {
                            try {
                                NavigationHelper.openKioskFragment(getFragmentManager(), currentServiceId, ks);
                            } catch (Exception e) {
-                                ErrorActivity.reportError(activity, e,
-                                        activity.getClass(),
-                                        null,
-                                        ErrorActivity.ErrorInfo.make(UserAction.UI_ERROR,
-                                                "none", "", R.string.app_ui_crash));
+                                ErrorActivity.reportUiError((AppCompatActivity) getActivity(), e);
                            }
                            return true;
-                        }
                    });
            i++;
        }
--- a/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
@@ -17,6 +17,7 @@ import android.support.v4.content.ContextCompat;
 import android.support.v4.view.animation.FastOutSlowInInterpolator;
 import android.support.v7.app.ActionBar;
 import android.support.v7.app.AlertDialog;
+import android.support.v7.app.AppCompatActivity;
 import android.text.Html;
 import android.text.Spanned;
 import android.text.TextUtils;
@@ -54,14 +55,17 @@ import org.schabi.newpipe.extractor.InfoItem;
 import org.schabi.newpipe.extractor.NewPipe;
 import org.schabi.newpipe.extractor.exceptions.ContentNotAvailableException;
 import org.schabi.newpipe.extractor.exceptions.ParsingException;
-import org.schabi.newpipe.extractor.services.youtube.YoutubeStreamExtractor;
+import org.schabi.newpipe.extractor.services.youtube.extractors.YoutubeStreamExtractor;
 import org.schabi.newpipe.extractor.stream.AudioStream;
+import org.schabi.newpipe.extractor.stream.Stream;
 import org.schabi.newpipe.extractor.stream.StreamInfo;
 import org.schabi.newpipe.extractor.stream.StreamInfoItem;
 import org.schabi.newpipe.extractor.stream.StreamType;
 import org.schabi.newpipe.extractor.stream.VideoStream;
 import org.schabi.newpipe.fragments.BackPressable;
 import org.schabi.newpipe.fragments.BaseStateFragment;
+import org.schabi.newpipe.local.history.HistoryRecordManager;
+import org.schabi.newpipe.report.ErrorActivity;
 import org.schabi.newpipe.util.StreamItemAdapter;
 import org.schabi.newpipe.util.StreamItemAdapter.StreamSizeWrapper;
 import org.schabi.newpipe.local.dialog.PlaylistAppendDialog;
@@ -128,7 +132,7 @@ public class VideoDetailFragment

    private StreamInfo currentInfo;
    private Disposable currentWorker;
-    private CompositeDisposable disposables = new CompositeDisposable();
+    @NonNull private CompositeDisposable disposables = new CompositeDisposable();

    private List<VideoStream> sortedVideoStreams;
    private int selectedVideoStreamIndex = -1;
@@ -363,11 +367,15 @@ public class VideoDetailFragment
                if (TextUtils.isEmpty(currentInfo.getUploaderUrl())) {
                    Log.w(TAG, "Can't open channel because we got no channel URL");
                } else {
-                    NavigationHelper.openChannelFragment(
-                            getFragmentManager(),
-                            currentInfo.getServiceId(),
-                            currentInfo.getUploaderUrl(),
-                            currentInfo.getUploaderName());
+                    try {
+                        NavigationHelper.openChannelFragment(
+                                getFragmentManager(),
+                                currentInfo.getServiceId(),
+                                currentInfo.getUploaderUrl(),
+                                currentInfo.getUploaderName());
+                    } catch (Exception e) {
+                        ErrorActivity.reportUiError((AppCompatActivity) getActivity(), e);
+                    }
                }
                break;
            case R.id.detail_thumbnail_root_layout:
@@ -540,7 +548,8 @@ public class VideoDetailFragment
        final String[] commands = new String[]{
                context.getResources().getString(R.string.enqueue_on_background),
                context.getResources().getString(R.string.enqueue_on_popup),
-                context.getResources().getString(R.string.append_playlist)
+                context.getResources().getString(R.string.append_playlist),
+                context.getResources().getString(R.string.share)
        };

        final DialogInterface.OnClickListener actions = (DialogInterface dialogInterface, int i) -> {
@@ -557,6 +566,9 @@ public class VideoDetailFragment
                                .show(getFragmentManager(), TAG);
                    }
                    break;
+                case 3:
+                    shareUrl(item.getName(), item.getUrl());
+                    break;
                default:
                    break;
            }
@@ -872,10 +884,7 @@ public class VideoDetailFragment
        if (!useExternalAudioPlayer && android.os.Build.VERSION.SDK_INT >= 16) {
            openNormalBackgroundPlayer(append);
        } else {
-            NavigationHelper.playOnExternalPlayer(activity,
-                    currentInfo.getName(),
-                    currentInfo.getUploaderName(),
-                    audioStream);
+            startOnExternalPlayer(activity, currentInfo, audioStream);
        }
    }

@@ -902,10 +911,7 @@ public class VideoDetailFragment

        if (PreferenceManager.getDefaultSharedPreferences(activity)
                .getBoolean(this.getString(R.string.use_external_video_player_key), false)) {
-            NavigationHelper.playOnExternalPlayer(activity,
-                    currentInfo.getName(),
-                    currentInfo.getUploaderName(),
-                    selectedVideoStream);
+            startOnExternalPlayer(activity, currentInfo, selectedVideoStream);
        } else {
            openNormalPlayer(selectedVideoStream);
        }
@@ -949,6 +955,20 @@ public class VideoDetailFragment
        this.autoPlayEnabled = autoplay;
    }

+    private void startOnExternalPlayer(@NonNull final Context context,
+                                       @NonNull final StreamInfo info,
+                                       @NonNull final Stream selectedStream) {
+        NavigationHelper.playOnExternalPlayer(context, currentInfo.getName(),
+                currentInfo.getUploaderName(), selectedStream);
+
+        final HistoryRecordManager recordManager = new HistoryRecordManager(requireContext());
+        disposables.add(recordManager.onViewed(info).onErrorComplete()
+                .subscribe(
+                        ignored -> {/* successful */},
+                        error -> Log.e(TAG, "Register view failure: ", error)
+                ));
+    }
+
    @Nullable
    private VideoStream getSelectedVideoStream() {
        return sortedVideoStreams != null ? sortedVideoStreams.get(selectedVideoStreamIndex) : null;
--- a/app/src/main/java/org/schabi/newpipe/fragments/list/BaseListFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/list/BaseListFragment.java
@@ -6,6 +6,7 @@ import android.content.DialogInterface;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.v7.app.ActionBar;
+import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.util.Log;
@@ -24,6 +25,7 @@ import org.schabi.newpipe.local.dialog.PlaylistAppendDialog;
 import org.schabi.newpipe.info_list.InfoItemDialog;
 import org.schabi.newpipe.info_list.InfoListAdapter;
 import org.schabi.newpipe.player.playqueue.SinglePlayQueue;
+import org.schabi.newpipe.report.ErrorActivity;
 import org.schabi.newpipe.util.NavigationHelper;
 import org.schabi.newpipe.util.OnClickGesture;
 import org.schabi.newpipe.util.StateSaver;
@@ -152,18 +154,35 @@ public abstract class BaseListFragment<I, N> extends BaseStateFragment<I> implem
        infoListAdapter.setOnChannelSelectedListener(new OnClickGesture<ChannelInfoItem>() {
            @Override
            public void selected(ChannelInfoItem selectedItem) {
-                onItemSelected(selectedItem);
-                NavigationHelper.openChannelFragment(useAsFrontPage ? getParentFragment().getFragmentManager() : getFragmentManager(),
-                        selectedItem.getServiceId(), selectedItem.getUrl(), selectedItem.getName());
+                try {
+                    onItemSelected(selectedItem);
+                    NavigationHelper.openChannelFragment(useAsFrontPage ?
+                                    getParentFragment().getFragmentManager()
+                                    : getFragmentManager(),
+                            selectedItem.getServiceId(),
+                            selectedItem.getUrl(),
+                            selectedItem.getName());
+                } catch (Exception e) {
+                    ErrorActivity.reportUiError((AppCompatActivity) getActivity(), e);
+                }
            }
        });

        infoListAdapter.setOnPlaylistSelectedListener(new OnClickGesture<PlaylistInfoItem>() {
            @Override
            public void selected(PlaylistInfoItem selectedItem) {
-                onItemSelected(selectedItem);
-                NavigationHelper.openPlaylistFragment(useAsFrontPage ? getParentFragment().getFragmentManager() : getFragmentManager(),
-                        selectedItem.getServiceId(), selectedItem.getUrl(), selectedItem.getName());
+                try {
+                    onItemSelected(selectedItem);
+                    NavigationHelper.openPlaylistFragment(
+                            useAsFrontPage
+                                    ? getParentFragment().getFragmentManager()
+                                    : getFragmentManager(),
+                            selectedItem.getServiceId(),
+                            selectedItem.getUrl(),
+                            selectedItem.getName());
+                } catch (Exception e) {
+                    ErrorActivity.reportUiError((AppCompatActivity) getActivity(), e);
+                }
            }
        });

@@ -178,7 +197,9 @@ public abstract class BaseListFragment<I, N> extends BaseStateFragment<I> implem

    private void onStreamSelected(StreamInfoItem selectedItem) {
        onItemSelected(selectedItem);
-        NavigationHelper.openVideoDetailFragment(useAsFrontPage ? getParentFragment().getFragmentManager() : getFragmentManager(),
+        NavigationHelper.openVideoDetailFragment(useAsFrontPage
+                        ? getParentFragment().getFragmentManager()
+                        : getFragmentManager(),
                selectedItem.getServiceId(), selectedItem.getUrl(), selectedItem.getName());
    }

@@ -196,7 +217,8 @@ public abstract class BaseListFragment<I, N> extends BaseStateFragment<I> implem
        final String[] commands = new String[]{
                context.getResources().getString(R.string.enqueue_on_background),
                context.getResources().getString(R.string.enqueue_on_popup),
-                context.getResources().getString(R.string.append_playlist)
+                context.getResources().getString(R.string.append_playlist),
+                context.getResources().getString(R.string.share)
        };

        final DialogInterface.OnClickListener actions = (dialogInterface, i) -> {
@@ -213,6 +235,9 @@ public abstract class BaseListFragment<I, N> extends BaseStateFragment<I> implem
                                .show(getFragmentManager(), TAG);
                    }
                    break;
+                case 3:
+                    shareUrl(item.getName(), item.getUrl());
+                    break;
                default:
                    break;
            }
--- a/app/src/main/java/org/schabi/newpipe/fragments/list/BaseListInfoFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/list/BaseListInfoFragment.java
@@ -8,6 +8,9 @@ import android.view.View;

 import org.schabi.newpipe.extractor.ListExtractor;
 import org.schabi.newpipe.extractor.ListInfo;
+import org.schabi.newpipe.extractor.NewPipe;
+import org.schabi.newpipe.extractor.linkhandler.ListLinkHandler;
+import org.schabi.newpipe.extractor.linkhandler.LinkHandler;
 import org.schabi.newpipe.util.Constants;

 import java.util.Queue;
@@ -166,7 +169,6 @@ public abstract class BaseListInfoFragment<I extends ListInfo>
    public void handleResult(@NonNull I result) {
        super.handleResult(result);

-        url = result.getUrl();
        name = result.getName();
        setTitle(name);

--- a/app/src/main/java/org/schabi/newpipe/fragments/list/channel/ChannelFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/list/channel/ChannelFragment.java
@@ -33,6 +33,7 @@ import org.schabi.newpipe.extractor.NewPipe;
 import org.schabi.newpipe.extractor.channel.ChannelInfo;
 import org.schabi.newpipe.extractor.exceptions.ExtractionException;
 import org.schabi.newpipe.extractor.stream.StreamInfoItem;
+import org.schabi.newpipe.extractor.linkhandler.ListLinkHandler;
 import org.schabi.newpipe.fragments.list.BaseListInfoFragment;
 import org.schabi.newpipe.info_list.InfoItemDialog;
 import org.schabi.newpipe.local.dialog.PlaylistAppendDialog;
@@ -161,7 +162,8 @@ public class ChannelFragment extends BaseListInfoFragment<ChannelInfo> {
                context.getResources().getString(R.string.start_here_on_main),
                context.getResources().getString(R.string.start_here_on_background),
                context.getResources().getString(R.string.start_here_on_popup),
-                context.getResources().getString(R.string.append_playlist)
+                context.getResources().getString(R.string.append_playlist),
+                context.getResources().getString(R.string.share)
        };

        final DialogInterface.OnClickListener actions = new DialogInterface.OnClickListener() {
@@ -190,6 +192,9 @@ public class ChannelFragment extends BaseListInfoFragment<ChannelInfo> {
                                    .show(getFragmentManager(), TAG);
                        }
                        break;
+                    case 6:
+                        shareUrl(item.getName(), item.getUrl());
+                        break;
                    default:
                        break;
                }
@@ -497,7 +502,11 @@ public class ChannelFragment extends BaseListInfoFragment<ChannelInfo> {
        if (super.onError(exception)) return true;

        int errorId = exception instanceof ExtractionException ? R.string.parsing_error : R.string.general_error;
-        onUnrecoverableError(exception, UserAction.REQUESTED_CHANNEL, NewPipe.getNameOfService(serviceId), url, errorId);
+        onUnrecoverableError(exception,
+                UserAction.REQUESTED_CHANNEL,
+                NewPipe.getNameOfService(serviceId),
+                url,
+                errorId);
        return true;
    }

--- a/app/src/main/java/org/schabi/newpipe/fragments/list/kiosk/KioskFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/list/kiosk/KioskFragment.java
@@ -11,22 +11,20 @@ import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.TextView;

 import org.schabi.newpipe.R;
 import org.schabi.newpipe.extractor.ListExtractor;
 import org.schabi.newpipe.extractor.NewPipe;
 import org.schabi.newpipe.extractor.StreamingService;
-import org.schabi.newpipe.extractor.UrlIdHandler;
 import org.schabi.newpipe.extractor.exceptions.ExtractionException;
 import org.schabi.newpipe.extractor.kiosk.KioskInfo;
-import org.schabi.newpipe.extractor.stream.StreamInfoItem;
+import org.schabi.newpipe.extractor.linkhandler.ListLinkHandlerFactory;
+import org.schabi.newpipe.extractor.linkhandler.ListLinkHandler;
+import org.schabi.newpipe.extractor.linkhandler.LinkHandlerFactory;
 import org.schabi.newpipe.fragments.list.BaseListInfoFragment;
-import org.schabi.newpipe.info_list.InfoItemBuilder;
 import org.schabi.newpipe.report.UserAction;
 import org.schabi.newpipe.util.ExtractorHelper;
 import org.schabi.newpipe.util.KioskTranslator;
-import org.schabi.newpipe.util.NavigationHelper;

 import icepick.State;
 import io.reactivex.Single;
@@ -74,11 +72,10 @@ public class KioskFragment extends BaseListInfoFragment<KioskInfo> {
            throws ExtractionException {
        KioskFragment instance = new KioskFragment();
        StreamingService service = NewPipe.getService(serviceId);
-        UrlIdHandler kioskTypeUrlIdHandler = service.getKioskList()
-                .getUrlIdHandlerByType(kioskId);
+        ListLinkHandlerFactory kioskLinkHandlerFactory = service.getKioskList()
+                .getListLinkHandlerFactoryByType(kioskId);
        instance.setInitialData(serviceId,
-                kioskTypeUrlIdHandler.getUrl(kioskId),
-                kioskId);
+                kioskLinkHandlerFactory.fromId(kioskId).getUrl(), kioskId);
        instance.kioskId = kioskId;
        return instance;
    }
@@ -137,7 +134,10 @@ public class KioskFragment extends BaseListInfoFragment<KioskInfo> {
                .getDefaultSharedPreferences(activity)
                .getString(getString(R.string.content_country_key),
                        getString(R.string.default_country_value));
-        return ExtractorHelper.getKioskInfo(serviceId, url, contentCountry, forceReload);
+        return ExtractorHelper.getKioskInfo(serviceId,
+                url,
+                contentCountry,
+                forceReload);
    }

    @Override
@@ -146,7 +146,10 @@ public class KioskFragment extends BaseListInfoFragment<KioskInfo> {
                .getDefaultSharedPreferences(activity)
                .getString(getString(R.string.content_country_key),
                        getString(R.string.default_country_value));
-        return ExtractorHelper.getMoreKioskItems(serviceId, url, currentNextPageUrl, contentCountry);
+        return ExtractorHelper.getMoreKioskItems(serviceId,
+                url,
+                currentNextPageUrl,
+                contentCountry);
    }

    /*//////////////////////////////////////////////////////////////////////////
--- a/app/src/main/java/org/schabi/newpipe/fragments/list/playlist/PlaylistFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/list/playlist/PlaylistFragment.java
@@ -6,6 +6,7 @@ import android.content.DialogInterface;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
+import android.support.v7.app.AppCompatActivity;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -19,6 +20,7 @@ import android.widget.TextView;

 import org.reactivestreams.Subscriber;
 import org.reactivestreams.Subscription;
+import org.schabi.newpipe.App;
 import org.schabi.newpipe.NewPipeDatabase;
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.database.playlist.model.PlaylistRemoteEntity;
@@ -28,12 +30,14 @@ import org.schabi.newpipe.extractor.NewPipe;
 import org.schabi.newpipe.extractor.exceptions.ExtractionException;
 import org.schabi.newpipe.extractor.playlist.PlaylistInfo;
 import org.schabi.newpipe.extractor.stream.StreamInfoItem;
+import org.schabi.newpipe.extractor.linkhandler.ListLinkHandler;
 import org.schabi.newpipe.fragments.list.BaseListInfoFragment;
-import org.schabi.newpipe.local.playlist.RemotePlaylistManager;
 import org.schabi.newpipe.info_list.InfoItemDialog;
+import org.schabi.newpipe.local.playlist.RemotePlaylistManager;
 import org.schabi.newpipe.player.playqueue.PlayQueue;
 import org.schabi.newpipe.player.playqueue.PlaylistPlayQueue;
 import org.schabi.newpipe.player.playqueue.SinglePlayQueue;
+import org.schabi.newpipe.report.ErrorActivity;
 import org.schabi.newpipe.report.UserAction;
 import org.schabi.newpipe.util.ExtractorHelper;
 import org.schabi.newpipe.util.ImageDisplayConstants;
@@ -44,6 +48,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicBoolean;

+import io.reactivex.Flowable;
 import io.reactivex.Single;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.disposables.CompositeDisposable;
@@ -93,7 +98,8 @@ public class PlaylistFragment extends BaseListInfoFragment<PlaylistInfo> {
        super.onCreate(savedInstanceState);
        disposables = new CompositeDisposable();
        isBookmarkButtonReady = new AtomicBoolean(false);
-        remotePlaylistManager = new RemotePlaylistManager(NewPipeDatabase.getInstance(getContext()));
+        remotePlaylistManager = new RemotePlaylistManager(NewPipeDatabase.getInstance(
+                requireContext()));
    }

    @Override
@@ -142,6 +148,7 @@ public class PlaylistFragment extends BaseListInfoFragment<PlaylistInfo> {
                context.getResources().getString(R.string.start_here_on_main),
                context.getResources().getString(R.string.start_here_on_background),
                context.getResources().getString(R.string.start_here_on_popup),
+                context.getResources().getString(R.string.share)
        };

        final DialogInterface.OnClickListener actions = (dialogInterface, i) -> {
@@ -162,6 +169,9 @@ public class PlaylistFragment extends BaseListInfoFragment<PlaylistInfo> {
                case 4:
                    NavigationHelper.playOnPopupPlayer(activity, getPlayQueue(index));
                    break;
+                case 5:
+                    shareUrl(item.getName(), item.getUrl());
+                    break;
                default:
                    break;
            }
@@ -261,11 +271,16 @@ public class PlaylistFragment extends BaseListInfoFragment<PlaylistInfo> {
        if (!TextUtils.isEmpty(result.getUploaderName())) {
            headerUploaderName.setText(result.getUploaderName());
            if (!TextUtils.isEmpty(result.getUploaderUrl())) {
-                headerUploaderLayout.setOnClickListener(v ->
+                headerUploaderLayout.setOnClickListener(v -> {
+                    try {
                        NavigationHelper.openChannelFragment(getFragmentManager(),
-                                result.getServiceId(), result.getUploaderUrl(),
-                                result.getUploaderName())
-                );
+                                result.getServiceId(),
+                                result.getUploaderUrl(),
+                                result.getUploaderName());
+                    } catch (Exception e) {
+                        ErrorActivity.reportUiError((AppCompatActivity) getActivity(), e);
+                    }
+                });
            }
        }

@@ -281,14 +296,11 @@ public class PlaylistFragment extends BaseListInfoFragment<PlaylistInfo> {
        }

        remotePlaylistManager.getPlaylist(result)
+                .flatMap(lists -> getUpdateProcessor(lists, result), (lists, id) -> lists)
                .onBackpressureLatest()
                .observeOn(AndroidSchedulers.mainThread())
                .subscribe(getPlaylistBookmarkSubscriber());

-        remotePlaylistManager.onUpdate(result)
-                .subscribeOn(AndroidSchedulers.mainThread())
-                .subscribe(integer -> {/* Do nothing*/}, this::onError);
-
        headerPlayAllButton.setOnClickListener(view ->
                NavigationHelper.playOnMainPlayer(activity, getPlayQueue()));
        headerPopupButton.setOnClickListener(view ->
@@ -336,7 +348,11 @@ public class PlaylistFragment extends BaseListInfoFragment<PlaylistInfo> {
        if (super.onError(exception)) return true;

        int errorId = exception instanceof ExtractionException ? R.string.parsing_error : R.string.general_error;
-        onUnrecoverableError(exception, UserAction.REQUESTED_PLAYLIST, NewPipe.getNameOfService(serviceId), url, errorId);
+        onUnrecoverableError(exception,
+                UserAction.REQUESTED_PLAYLIST,
+                NewPipe.getNameOfService(serviceId),
+                url,
+                errorId);
        return true;
    }

@@ -344,6 +360,17 @@ public class PlaylistFragment extends BaseListInfoFragment<PlaylistInfo> {
    // Utils
    //////////////////////////////////////////////////////////////////////////*/

+    private Flowable<Integer> getUpdateProcessor(@NonNull List<PlaylistRemoteEntity> playlists,
+                                                 @NonNull PlaylistInfo result) {
+        final Flowable<Integer> noItemToUpdate = Flowable.just(/*noItemToUpdate=*/-1);
+        if (playlists.isEmpty()) return noItemToUpdate;
+
+        final PlaylistRemoteEntity playlistEntity = playlists.get(0);
+        if (playlistEntity.isIdenticalTo(result)) return noItemToUpdate;
+
+        return remotePlaylistManager.onUpdate(playlists.get(0).getUid(), result).toFlowable();
+    }
+
    private Subscriber<List<PlaylistRemoteEntity>> getPlaylistBookmarkSubscriber() {
        return new Subscriber<List<PlaylistRemoteEntity>>() {
            @Override
@@ -416,4 +443,4 @@ public class PlaylistFragment extends BaseListInfoFragment<PlaylistInfo> {
        playlistBookmarkButton.setIcon(ThemeHelper.resolveResourceIdFromAttr(activity, iconAttr));
        playlistBookmarkButton.setTitle(titleRes);
    }
-}
+}
--- a/app/src/main/java/org/schabi/newpipe/fragments/list/search/SearchFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/list/search/SearchFragment.java
--- a/app/src/main/java/org/schabi/newpipe/info_list/InfoListAdapter.java
+++ b/app/src/main/java/org/schabi/newpipe/info_list/InfoListAdapter.java
@@ -17,6 +17,7 @@ import org.schabi.newpipe.info_list.holder.PlaylistInfoItemHolder;
 import org.schabi.newpipe.info_list.holder.PlaylistMiniInfoItemHolder;
 import org.schabi.newpipe.info_list.holder.StreamInfoItemHolder;
 import org.schabi.newpipe.info_list.holder.StreamMiniInfoItemHolder;
+import org.schabi.newpipe.util.FallbackViewHolder;
 import org.schabi.newpipe.util.OnClickGesture;

 import java.util.ArrayList;
@@ -238,7 +239,7 @@ public class InfoListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
                return new PlaylistInfoItemHolder(infoItemBuilder, parent);
            default:
                Log.e(TAG, "Trollolo");
-                return null;
+                return new FallbackViewHolder(new View(parent.getContext()));
        }
    }

--- a/app/src/main/java/org/schabi/newpipe/local/LocalItemListAdapter.java
+++ b/app/src/main/java/org/schabi/newpipe/local/LocalItemListAdapter.java
@@ -14,6 +14,7 @@ import org.schabi.newpipe.local.holder.LocalPlaylistItemHolder;
 import org.schabi.newpipe.local.holder.LocalPlaylistStreamItemHolder;
 import org.schabi.newpipe.local.holder.LocalStatisticStreamItemHolder;
 import org.schabi.newpipe.local.holder.RemotePlaylistItemHolder;
+import org.schabi.newpipe.util.FallbackViewHolder;
 import org.schabi.newpipe.util.Localization;
 import org.schabi.newpipe.util.OnClickGesture;

@@ -225,7 +226,7 @@ public class LocalItemListAdapter extends RecyclerView.Adapter<RecyclerView.View
                return new LocalStatisticStreamItemHolder(localItemBuilder, parent);
            default:
                Log.e(TAG, "No view type has been considered for holder: [" + type + "]");
-                return null;
+                return new FallbackViewHolder(new View(parent.getContext()));
        }
    }

--- a/app/src/main/java/org/schabi/newpipe/local/bookmark/BookmarkFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/local/bookmark/BookmarkFragment.java
@@ -6,6 +6,7 @@ import android.os.Parcelable;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v4.app.FragmentManager;
+import android.support.v7.app.AppCompatActivity;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -19,9 +20,11 @@ import org.schabi.newpipe.database.LocalItem;
 import org.schabi.newpipe.database.playlist.PlaylistLocalItem;
 import org.schabi.newpipe.database.playlist.PlaylistMetadataEntry;
 import org.schabi.newpipe.database.playlist.model.PlaylistRemoteEntity;
+import org.schabi.newpipe.extractor.NewPipe;
 import org.schabi.newpipe.local.BaseLocalListFragment;
 import org.schabi.newpipe.local.playlist.LocalPlaylistManager;
 import org.schabi.newpipe.local.playlist.RemotePlaylistManager;
+import org.schabi.newpipe.report.ErrorActivity;
 import org.schabi.newpipe.report.UserAction;
 import org.schabi.newpipe.util.NavigationHelper;
 import org.schabi.newpipe.util.OnClickGesture;
@@ -99,19 +102,26 @@ public final class BookmarkFragment
        itemListAdapter.setSelectedListener(new OnClickGesture<LocalItem>() {
            @Override
            public void selected(LocalItem selectedItem) {
-                // Requires the parent fragment to find holder for fragment replacement
-                if (getParentFragment() == null) return;
-                final FragmentManager fragmentManager = getParentFragment().getFragmentManager();
+                try {
+                    // Requires the parent fragment to find holder for fragment replacement
+                    if (getParentFragment() == null) return;
+                    final FragmentManager fragmentManager = getParentFragment().getFragmentManager();

-                if (selectedItem instanceof PlaylistMetadataEntry) {
-                    final PlaylistMetadataEntry entry = ((PlaylistMetadataEntry) selectedItem);
-                    NavigationHelper.openLocalPlaylistFragment(fragmentManager, entry.uid,
-                            entry.name);
+                    if (selectedItem instanceof PlaylistMetadataEntry) {
+                        final PlaylistMetadataEntry entry = ((PlaylistMetadataEntry) selectedItem);
+                        NavigationHelper.openLocalPlaylistFragment(fragmentManager, entry.uid,
+                                entry.name);

-                } else if (selectedItem instanceof PlaylistRemoteEntity) {
-                    final PlaylistRemoteEntity entry = ((PlaylistRemoteEntity) selectedItem);
-                    NavigationHelper.openPlaylistFragment(fragmentManager, entry.getServiceId(),
-                            entry.getUrl(), entry.getName());
+                    } else if (selectedItem instanceof PlaylistRemoteEntity) {
+                        final PlaylistRemoteEntity entry = ((PlaylistRemoteEntity) selectedItem);
+                        NavigationHelper.openPlaylistFragment(
+                                fragmentManager,
+                                entry.getServiceId(),
+                                entry.getUrl(),
+                                entry.getName());
+                    }
+                } catch (Exception e) {
+                    ErrorActivity.reportUiError((AppCompatActivity) getActivity(), e);
                }
            }

--- a/app/src/main/java/org/schabi/newpipe/local/history/StatisticsPlaylistFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/local/history/StatisticsPlaylistFragment.java
@@ -298,6 +298,7 @@ public class StatisticsPlaylistFragment
                context.getResources().getString(R.string.start_here_on_background),
                context.getResources().getString(R.string.start_here_on_popup),
                context.getResources().getString(R.string.delete),
+                context.getResources().getString(R.string.share)
        };

        final DialogInterface.OnClickListener actions = (dialogInterface, i) -> {
@@ -321,6 +322,9 @@ public class StatisticsPlaylistFragment
                case 5:
                    deleteEntry(index);
                    break;
+                case 6:
+                    shareUrl(item.toStreamInfoItem().getName(), item.toStreamInfoItem().getUrl());
+                    break;
                default:
                    break;
            }
--- a/app/src/main/java/org/schabi/newpipe/local/playlist/LocalPlaylistFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/local/playlist/LocalPlaylistFragment.java
@@ -520,7 +520,8 @@ public class LocalPlaylistFragment extends BaseLocalListFragment<List<PlaylistSt
                context.getResources().getString(R.string.start_here_on_background),
                context.getResources().getString(R.string.start_here_on_popup),
                context.getResources().getString(R.string.set_as_playlist_thumbnail),
-                context.getResources().getString(R.string.delete)
+                context.getResources().getString(R.string.delete),
+                context.getResources().getString(R.string.share)
        };

        final DialogInterface.OnClickListener actions = (dialogInterface, i) -> {
@@ -549,6 +550,9 @@ public class LocalPlaylistFragment extends BaseLocalListFragment<List<PlaylistSt
                case 6:
                    deleteItem(item);
                    break;
+                case 7:
+                    shareUrl(item.toStreamInfoItem().getName(), item.toStreamInfoItem().getUrl());
+                    break;
                default:
                    break;
            }
--- a/app/src/main/java/org/schabi/newpipe/local/playlist/RemotePlaylistManager.java
+++ b/app/src/main/java/org/schabi/newpipe/local/playlist/RemotePlaylistManager.java
@@ -40,8 +40,11 @@ public class RemotePlaylistManager {
        }).subscribeOn(Schedulers.io());
    }

-    public Single<Integer> onUpdate(final PlaylistInfo playlistInfo) {
-        return Single.fromCallable(() -> playlistRemoteTable.update(new PlaylistRemoteEntity(playlistInfo)))
-                .subscribeOn(Schedulers.io());
+    public Single<Integer> onUpdate(final long playlistId, final PlaylistInfo playlistInfo) {
+        return Single.fromCallable(() -> {
+            PlaylistRemoteEntity playlist = new PlaylistRemoteEntity(playlistInfo);
+            playlist.setUid(playlistId);
+            return playlistRemoteTable.update(playlist);
+        }).subscribeOn(Schedulers.io());
    }
 }
--- a/app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionFragment.java
@@ -15,6 +15,7 @@ import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v4.content.LocalBroadcastManager;
 import android.support.v7.app.ActionBar;
+import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
@@ -38,6 +39,7 @@ import org.schabi.newpipe.extractor.exceptions.ExtractionException;
 import org.schabi.newpipe.extractor.subscription.SubscriptionExtractor;
 import org.schabi.newpipe.fragments.BaseStateFragment;
 import org.schabi.newpipe.info_list.InfoListAdapter;
+import org.schabi.newpipe.report.ErrorActivity;
 import org.schabi.newpipe.report.UserAction;
 import org.schabi.newpipe.local.subscription.services.SubscriptionsExportService;
 import org.schabi.newpipe.local.subscription.services.SubscriptionsImportService;
@@ -318,9 +320,15 @@ public class SubscriptionFragment extends BaseStateFragment<List<SubscriptionEnt
        infoListAdapter.setOnChannelSelectedListener(new OnClickGesture<ChannelInfoItem>() {
            @Override
            public void selected(ChannelInfoItem selectedItem) {
-                // Requires the parent fragment to find holder for fragment replacement
-                NavigationHelper.openChannelFragment(getParentFragment().getFragmentManager(),
-                        selectedItem.getServiceId(), selectedItem.getUrl(), selectedItem.getName());
+                try {
+                    // Requires the parent fragment to find holder for fragment replacement
+                    NavigationHelper.openChannelFragment(getParentFragment().getFragmentManager(),
+                            selectedItem.getServiceId(),
+                            selectedItem.getUrl(),
+                            selectedItem.getName());
+                } catch (Exception e) {
+                    ErrorActivity.reportUiError((AppCompatActivity) getActivity(), e);
+                }
            }
        });

--- a/app/src/main/java/org/schabi/newpipe/player/BackgroundPlayer.java
+++ b/app/src/main/java/org/schabi/newpipe/player/BackgroundPlayer.java
@@ -26,9 +26,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.graphics.Bitmap;
-import android.os.Build;
 import android.os.IBinder;
-import android.support.annotation.IntRange;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v4.app.NotificationCompat;
@@ -39,17 +37,16 @@ import android.widget.RemoteViews;
 import com.google.android.exoplayer2.PlaybackParameters;
 import com.google.android.exoplayer2.Player;
 import com.google.android.exoplayer2.source.MediaSource;
+import com.nostra13.universalimageloader.core.assist.FailReason;

 import org.schabi.newpipe.BuildConfig;
 import org.schabi.newpipe.R;
-import org.schabi.newpipe.extractor.MediaFormat;
-import org.schabi.newpipe.extractor.stream.AudioStream;
 import org.schabi.newpipe.extractor.stream.StreamInfo;
 import org.schabi.newpipe.player.event.PlayerEventListener;
 import org.schabi.newpipe.player.helper.LockManager;
-import org.schabi.newpipe.player.helper.PlayerHelper;
 import org.schabi.newpipe.player.playqueue.PlayQueueItem;
-import org.schabi.newpipe.util.ListHelper;
+import org.schabi.newpipe.player.resolver.AudioPlaybackResolver;
+import org.schabi.newpipe.player.resolver.MediaSourceTag;
 import org.schabi.newpipe.util.NavigationHelper;
 import org.schabi.newpipe.util.ThemeHelper;

@@ -94,7 +91,6 @@ public final class BackgroundPlayer extends Service {
    private NotificationCompat.Builder notBuilder;
    private RemoteViews notRemoteView;
    private RemoteViews bigNotRemoteView;
-    private final String setAlphaMethodName = (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) ? "setImageAlpha" : "setAlpha";

    private boolean shouldUpdateOnProgress;

@@ -192,7 +188,9 @@ public final class BackgroundPlayer extends Service {
                .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
                .setCustomContentView(notRemoteView)
                .setCustomBigContentView(bigNotRemoteView);
-        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.JELLY_BEAN) builder.setPriority(NotificationCompat.PRIORITY_MAX);
+        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.JELLY_BEAN) {
+            builder.setPriority(NotificationCompat.PRIORITY_MAX);
+        }
        return builder;
    }

@@ -249,15 +247,6 @@ public final class BackgroundPlayer extends Service {
        notificationManager.notify(NOTIFICATION_ID, notBuilder.build());
    }

-    private void setControlsOpacity(@IntRange(from = 0, to = 255) int opacity) {
-        if (notRemoteView != null) notRemoteView.setInt(R.id.notificationPlayPause, setAlphaMethodName, opacity);
-        if (bigNotRemoteView != null) bigNotRemoteView.setInt(R.id.notificationPlayPause, setAlphaMethodName, opacity);
-        if (notRemoteView != null) notRemoteView.setInt(R.id.notificationFForward, setAlphaMethodName, opacity);
-        if (bigNotRemoteView != null) bigNotRemoteView.setInt(R.id.notificationFForward, setAlphaMethodName, opacity);
-        if (notRemoteView != null) notRemoteView.setInt(R.id.notificationFRewind, setAlphaMethodName, opacity);
-        if (bigNotRemoteView != null) bigNotRemoteView.setInt(R.id.notificationFRewind, setAlphaMethodName, opacity);
-    }
-
    /*//////////////////////////////////////////////////////////////////////////
    // Utils
    //////////////////////////////////////////////////////////////////////////*/
@@ -279,8 +268,16 @@ public final class BackgroundPlayer extends Service {

    protected class BasePlayerImpl extends BasePlayer {

+        @NonNull final private AudioPlaybackResolver resolver;
+
        BasePlayerImpl(Context context) {
            super(context);
+            this.resolver = new AudioPlaybackResolver(context, dataSource);
+        }
+
+        @Override
+        public void initPlayer(boolean playOnReady) {
+            super.initPlayer(playOnReady);
        }

        @Override
@@ -293,30 +290,41 @@ public final class BackgroundPlayer extends Service {
            startForeground(NOTIFICATION_ID, notBuilder.build());
        }

-        @Override
-        public void initThumbnail(final String url) {
-            resetNotification();
-            if (notRemoteView != null) notRemoteView.setImageViewResource(R.id.notificationCover, R.drawable.dummy_thumbnail);
-            if (bigNotRemoteView != null) bigNotRemoteView.setImageViewResource(R.id.notificationCover, R.drawable.dummy_thumbnail);
-            updateNotification(-1);
-            super.initThumbnail(url);
+        /*//////////////////////////////////////////////////////////////////////////
+        // Thumbnail Loading
+        //////////////////////////////////////////////////////////////////////////*/
+
+        private void updateNotificationThumbnail() {
+            if (basePlayerImpl == null) return;
+            if (notRemoteView != null) {
+                notRemoteView.setImageViewBitmap(R.id.notificationCover,
+                        basePlayerImpl.getThumbnail());
+            }
+            if (bigNotRemoteView != null) {
+                bigNotRemoteView.setImageViewBitmap(R.id.notificationCover,
+                        basePlayerImpl.getThumbnail());
+            }
        }

        @Override
        public void onLoadingComplete(String imageUri, View view, Bitmap loadedImage) {
            super.onLoadingComplete(imageUri, view, loadedImage);
-
-            if (loadedImage != null) {
-                // rebuild notification here since remote view does not release bitmaps, causing memory leaks
-                resetNotification();
-
-                if (notRemoteView != null) notRemoteView.setImageViewBitmap(R.id.notificationCover, loadedImage);
-                if (bigNotRemoteView != null) bigNotRemoteView.setImageViewBitmap(R.id.notificationCover, loadedImage);
-
-                updateNotification(-1);
-            }
+            resetNotification();
+            updateNotificationThumbnail();
+            updateNotification(-1);
        }

+        @Override
+        public void onLoadingFailed(String imageUri, View view, FailReason failReason) {
+            super.onLoadingFailed(imageUri, view, failReason);
+            resetNotification();
+            updateNotificationThumbnail();
+            updateNotification(-1);
+        }
+        /*//////////////////////////////////////////////////////////////////////////
+        // States Implementation
+        //////////////////////////////////////////////////////////////////////////*/
+
        @Override
        public void onPrepared(boolean playWhenReady) {
            super.onPrepared(playWhenReady);
@@ -390,29 +398,18 @@ public final class BackgroundPlayer extends Service {
        // Playback Listener
        //////////////////////////////////////////////////////////////////////////*/

-        protected void onMetadataChanged(@NonNull final PlayQueueItem item,
-                                         @Nullable final StreamInfo info,
-                                         final int newPlayQueueIndex,
-                                         final boolean hasPlayQueueItemChanged) {
-            if (shouldUpdateOnProgress || hasPlayQueueItemChanged) {
-                resetNotification();
-                updateNotification(-1);
-                updateMetadata();
-            }
+        protected void onMetadataChanged(@NonNull final MediaSourceTag tag) {
+            super.onMetadataChanged(tag);
+            resetNotification();
+            updateNotificationThumbnail();
+            updateNotification(-1);
+            updateMetadata();
        }

        @Override
        @Nullable
        public MediaSource sourceOf(final PlayQueueItem item, final StreamInfo info) {
-            final MediaSource liveSource = super.sourceOf(item, info);
-            if (liveSource != null) return liveSource;
-
-            final int index = ListHelper.getDefaultAudioFormat(context, info.getAudioStreams());
-            if (index < 0 || index >= info.getAudioStreams().size()) return null;
-
-            final AudioStream audio = info.getAudioStreams().get(index);
-            return buildMediaSource(audio.getUrl(), PlayerHelper.cacheKeyOf(info, audio),
-                    MediaFormat.getSuffixById(audio.getFormatId()));
+            return resolver.resolve(info);
        }

        @Override
@@ -439,8 +436,8 @@ public final class BackgroundPlayer extends Service {
        }

        private void updateMetadata() {
-            if (activityListener != null && currentInfo != null) {
-                activityListener.onMetadataUpdate(currentInfo);
+            if (activityListener != null && getCurrentMetadata() != null) {
+                activityListener.onMetadataUpdate(getCurrentMetadata().getMetadata());
            }
        }

@@ -531,44 +528,36 @@ public final class BackgroundPlayer extends Service {
            updatePlayback();
        }

-        @Override
-        public void onBlocked() {
-            super.onBlocked();
-
-            setControlsOpacity(77);
-            updateNotification(-1);
-        }
-
        @Override
        public void onPlaying() {
            super.onPlaying();
-
-            setControlsOpacity(255);
+            resetNotification();
+            updateNotificationThumbnail();
            updateNotification(R.drawable.ic_pause_white);
-
            lockManager.acquireWifiAndCpu();
        }

        @Override
        public void onPaused() {
            super.onPaused();
-
+            resetNotification();
+            updateNotificationThumbnail();
            updateNotification(R.drawable.ic_play_arrow_white);
-
            lockManager.releaseWifiAndCpu();
        }

        @Override
        public void onCompleted() {
            super.onCompleted();
-
-            setControlsOpacity(255);
-
            resetNotification();
-            if (bigNotRemoteView != null) bigNotRemoteView.setProgressBar(R.id.notificationProgressBar, 100, 100, false);
-            if (notRemoteView != null) notRemoteView.setProgressBar(R.id.notificationProgressBar, 100, 100, false);
+            if (bigNotRemoteView != null) {
+                bigNotRemoteView.setProgressBar(R.id.notificationProgressBar, 100, 100, false);
+            }
+            if (notRemoteView != null) {
+                notRemoteView.setProgressBar(R.id.notificationProgressBar, 100, 100, false);
+            }
+            updateNotificationThumbnail();
            updateNotification(R.drawable.ic_replay_white);
-
            lockManager.releaseWifiAndCpu();
        }
    }
--- a/app/src/main/java/org/schabi/newpipe/player/BasePlayer.java
+++ b/app/src/main/java/org/schabi/newpipe/player/BasePlayer.java
--- a/app/src/main/java/org/schabi/newpipe/player/MainVideoPlayer.java
+++ b/app/src/main/java/org/schabi/newpipe/player/MainVideoPlayer.java
@@ -25,6 +25,7 @@ import android.content.SharedPreferences;
 import android.content.pm.ActivityInfo;
 import android.content.res.Configuration;
 import android.graphics.Color;
+import android.graphics.drawable.ColorDrawable;
 import android.media.AudioManager;
 import android.os.Build;
 import android.os.Bundle;
@@ -57,7 +58,6 @@ import com.google.android.exoplayer2.ui.AspectRatioFrameLayout;
 import com.google.android.exoplayer2.ui.SubtitleView;

 import org.schabi.newpipe.R;
-import org.schabi.newpipe.extractor.stream.StreamInfo;
 import org.schabi.newpipe.extractor.stream.VideoStream;
 import org.schabi.newpipe.fragments.OnScrollBelowItemsListener;
 import org.schabi.newpipe.player.helper.PlaybackParameterDialog;
@@ -66,6 +66,8 @@ import org.schabi.newpipe.player.playqueue.PlayQueueItem;
 import org.schabi.newpipe.player.playqueue.PlayQueueItemBuilder;
 import org.schabi.newpipe.player.playqueue.PlayQueueItemHolder;
 import org.schabi.newpipe.player.playqueue.PlayQueueItemTouchCallback;
+import org.schabi.newpipe.player.resolver.MediaSourceTag;
+import org.schabi.newpipe.player.resolver.VideoPlaybackResolver;
 import org.schabi.newpipe.util.AnimationUtils;
 import org.schabi.newpipe.util.ListHelper;
 import org.schabi.newpipe.util.NavigationHelper;
@@ -103,6 +105,7 @@ public final class MainVideoPlayer extends AppCompatActivity

    @Nullable private PlayerState playerState;
    private boolean isInMultiWindow;
+    private boolean isBackPressed;

    /*//////////////////////////////////////////////////////////////////////////
    // Activity LifeCycle
@@ -114,12 +117,17 @@ public final class MainVideoPlayer extends AppCompatActivity
        if (DEBUG) Log.d(TAG, "onCreate() called with: savedInstanceState = [" + savedInstanceState + "]");
        defaultPreferences = PreferenceManager.getDefaultSharedPreferences(this);
        ThemeHelper.setTheme(this);
+        getWindow().setBackgroundDrawable(new ColorDrawable(Color.BLACK));
        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) getWindow().setStatusBarColor(Color.BLACK);
        setVolumeControlStream(AudioManager.STREAM_MUSIC);

+        WindowManager.LayoutParams lp = getWindow().getAttributes();
+        lp.screenBrightness = PlayerHelper.getScreenBrightness(getApplicationContext());
+        getWindow().setAttributes(lp);
+
        hideSystemUi();
        setContentView(R.layout.activity_main_player);
-        playerImpl = new VideoPlayerImpl(this);
+        playerImpl = new  VideoPlayerImpl(this);
        playerImpl.setup(findViewById(android.R.id.content));

        if (savedInstanceState != null && savedInstanceState.get(KEY_SAVED_STATE) != null) {
@@ -146,7 +154,10 @@ public final class MainVideoPlayer extends AppCompatActivity
    protected void onNewIntent(Intent intent) {
        if (DEBUG) Log.d(TAG, "onNewIntent() called with: intent = [" + intent + "]");
        super.onNewIntent(intent);
-        playerImpl.handleIntent(intent);
+        if (intent != null) {
+            playerState = null;
+            playerImpl.handleIntent(intent);
+        }
    }

    @Override
@@ -171,7 +182,7 @@ public final class MainVideoPlayer extends AppCompatActivity
            playerImpl.setPlaybackQuality(playerState.getPlaybackQuality());
            playerImpl.initPlayback(playerState.getPlayQueue(), playerState.getRepeatMode(),
                    playerState.getPlaybackSpeed(), playerState.getPlaybackPitch(),
-                    playerState.wasPlaying());
+                    playerState.isPlaybackSkipSilence(), playerState.wasPlaying());
        }
    }

@@ -185,6 +196,12 @@ public final class MainVideoPlayer extends AppCompatActivity
        }
    }

+    @Override
+    public void onBackPressed() {
+        super.onBackPressed();
+        isBackPressed = true;
+    }
+
    @Override
    protected void onSaveInstanceState(Bundle outState) {
        if (DEBUG) Log.d(TAG, "onSaveInstanceState() called");
@@ -194,7 +211,8 @@ public final class MainVideoPlayer extends AppCompatActivity
        playerImpl.setRecovery();
        playerState = new PlayerState(playerImpl.getPlayQueue(), playerImpl.getRepeatMode(),
                playerImpl.getPlaybackSpeed(), playerImpl.getPlaybackPitch(),
-                playerImpl.getPlaybackQuality(), playerImpl.isPlaying());
+                playerImpl.getPlaybackQuality(), playerImpl.getPlaybackSkipSilence(),
+                playerImpl.isPlaying());
        StateSaver.tryToSave(isChangingConfigurations(), null, outState, this);
    }

@@ -202,7 +220,17 @@ public final class MainVideoPlayer extends AppCompatActivity
    protected void onStop() {
        if (DEBUG) Log.d(TAG, "onStop() called");
        super.onStop();
+        PlayerHelper.setScreenBrightness(getApplicationContext(),
+                getWindow().getAttributes().screenBrightness);
+
+        if (playerImpl == null) return;
+        if (!isBackPressed) {
+            playerImpl.minimize();
+        }
        playerImpl.destroy();
+
+        isInMultiWindow = false;
+        isBackPressed = false;
    }

    /*//////////////////////////////////////////////////////////////////////////
@@ -326,8 +354,11 @@ public final class MainVideoPlayer extends AppCompatActivity
    ////////////////////////////////////////////////////////////////////////////

    @Override
-    public void onPlaybackParameterChanged(float playbackTempo, float playbackPitch) {
-        if (playerImpl != null) playerImpl.setPlaybackParameters(playbackTempo, playbackPitch);
+    public void onPlaybackParameterChanged(float playbackTempo, float playbackPitch,
+                                           boolean playbackSkipSilence) {
+        if (playerImpl != null) {
+            playerImpl.setPlaybackParameters(playbackTempo, playbackPitch, playbackSkipSilence);
+        }
    }

    ///////////////////////////////////////////////////////////////////////////
@@ -432,6 +463,21 @@ public final class MainVideoPlayer extends AppCompatActivity
            switchPopupButton.setOnClickListener(this);
        }

+        public void minimize() {
+            switch (PlayerHelper.getMinimizeOnExitAction(context)) {
+                case PlayerHelper.MinimizeMode.MINIMIZE_ON_EXIT_MODE_BACKGROUND:
+                    onPlayBackgroundButtonClicked();
+                    break;
+                case PlayerHelper.MinimizeMode.MINIMIZE_ON_EXIT_MODE_POPUP:
+                    onFullScreenButtonClicked();
+                    break;
+                case PlayerHelper.MinimizeMode.MINIMIZE_ON_EXIT_MODE_NONE:
+                default:
+                    // No action
+                    break;
+            }
+        }
+
        /*//////////////////////////////////////////////////////////////////////////
        // ExoPlayer Video Listener
        //////////////////////////////////////////////////////////////////////////*/
@@ -452,14 +498,11 @@ public final class MainVideoPlayer extends AppCompatActivity
        // Playback Listener
        //////////////////////////////////////////////////////////////////////////*/

-        protected void onMetadataChanged(@NonNull final PlayQueueItem item,
-                                         @Nullable final StreamInfo info,
-                                         final int newPlayQueueIndex,
-                                         final boolean hasPlayQueueItemChanged) {
-            super.onMetadataChanged(item, info, newPlayQueueIndex, false);
+        protected void onMetadataChanged(@NonNull final MediaSourceTag tag) {
+            super.onMetadataChanged(tag);

-            titleTextView.setText(getVideoTitle());
-            channelTextView.setText(getUploaderName());
+            titleTextView.setText(tag.getMetadata().getName());
+            channelTextView.setText(tag.getMetadata().getUploaderName());
        }

        @Override
@@ -492,6 +535,7 @@ public final class MainVideoPlayer extends AppCompatActivity
                    this.getRepeatMode(),
                    this.getPlaybackSpeed(),
                    this.getPlaybackPitch(),
+                    this.getPlaybackSkipSilence(),
                    this.getPlaybackQuality()
            );
            context.startService(intent);
@@ -513,6 +557,7 @@ public final class MainVideoPlayer extends AppCompatActivity
                    this.getRepeatMode(),
                    this.getPlaybackSpeed(),
                    this.getPlaybackPitch(),
+                    this.getPlaybackSkipSilence(),
                    this.getPlaybackQuality()
            );
            context.startService(intent);
@@ -608,7 +653,8 @@ public final class MainVideoPlayer extends AppCompatActivity

        @Override
        public void onPlaybackSpeedClicked() {
-            PlaybackParameterDialog.newInstance(getPlaybackSpeed(), getPlaybackPitch())
+            PlaybackParameterDialog
+                    .newInstance(getPlaybackSpeed(), getPlaybackPitch(), getPlaybackSkipSilence())
                    .show(getSupportFragmentManager(), TAG);
        }

@@ -638,14 +684,19 @@ public final class MainVideoPlayer extends AppCompatActivity
        }

        @Override
-        protected int getDefaultResolutionIndex(final List<VideoStream> sortedVideos) {
-            return ListHelper.getDefaultResolutionIndex(context, sortedVideos);
-        }
+        protected VideoPlaybackResolver.QualityResolver getQualityResolver() {
+            return new VideoPlaybackResolver.QualityResolver() {
+                @Override
+                public int getDefaultResolutionIndex(List<VideoStream> sortedVideos) {
+                    return ListHelper.getDefaultResolutionIndex(context, sortedVideos);
+                }

-        @Override
-        protected int getOverrideResolutionIndex(final List<VideoStream> sortedVideos,
-                                                 final String playbackQuality) {
-            return ListHelper.getDefaultResolutionIndex(context, sortedVideos, playbackQuality);
+                @Override
+                public int getOverrideResolutionIndex(List<VideoStream> sortedVideos,
+                                                      String playbackQuality) {
+                    return ListHelper.getResolutionIndex(context, sortedVideos, playbackQuality);
+                }
+            };
        }

        /*//////////////////////////////////////////////////////////////////////////
@@ -669,7 +720,6 @@ public final class MainVideoPlayer extends AppCompatActivity
        @Override
        public void onBuffering() {
            super.onBuffering();
-            animatePlayButtons(false, 100);
            getRootView().setKeepScreenOn(true);
        }

@@ -845,7 +895,6 @@ public final class MainVideoPlayer extends AppCompatActivity
        @Override
        public boolean onDoubleTap(MotionEvent e) {
            if (DEBUG) Log.d(TAG, "onDoubleTap() called with: e = [" + e + "]" + "rawXy = " + e.getRawX() + ", " + e.getRawY() + ", xy = " + e.getX() + ", " + e.getY());
-            if (!playerImpl.isPlaying()) return false;

            if (e.getX() > playerImpl.getRootView().getWidth() * 2 / 3) {
                playerImpl.onFastForward();
@@ -882,7 +931,9 @@ public final class MainVideoPlayer extends AppCompatActivity
        private final boolean isPlayerGestureEnabled = PlayerHelper.isPlayerGestureEnabled(getApplicationContext());

        private final float stepsBrightness = 15, stepBrightness = (1f / stepsBrightness), minBrightness = .01f;
-        private float currentBrightness = .5f;
+        private float currentBrightness = getWindow().getAttributes().screenBrightness > 0
+                ? getWindow().getAttributes().screenBrightness
+                : 0.5f;

        private int currentVolume, maxVolume = playerImpl.getAudioReactor().getMaxVolume();
        private final float stepsVolume = 15, stepVolume = (float) Math.ceil(maxVolume / stepsVolume), minVolume = 0;
--- a/app/src/main/java/org/schabi/newpipe/player/PlayerState.java
+++ b/app/src/main/java/org/schabi/newpipe/player/PlayerState.java
@@ -14,21 +14,26 @@ public class PlayerState implements Serializable {
    private final float playbackSpeed;
    private final float playbackPitch;
    @Nullable private final String playbackQuality;
+    private final boolean playbackSkipSilence;
    private final boolean wasPlaying;

    PlayerState(@NonNull final PlayQueue playQueue, final int repeatMode,
-                 final float playbackSpeed, final float playbackPitch, final boolean wasPlaying) {
-        this(playQueue, repeatMode, playbackSpeed, playbackPitch, null, wasPlaying);
+                final float playbackSpeed, final float playbackPitch,
+                final boolean playbackSkipSilence, final boolean wasPlaying) {
+        this(playQueue, repeatMode, playbackSpeed, playbackPitch, null,
+                playbackSkipSilence, wasPlaying);
    }

    PlayerState(@NonNull final PlayQueue playQueue, final int repeatMode,
                final float playbackSpeed, final float playbackPitch,
-                @Nullable final String playbackQuality, final boolean wasPlaying) {
+                @Nullable final String playbackQuality, final boolean playbackSkipSilence,
+                final boolean wasPlaying) {
        this.playQueue = playQueue;
        this.repeatMode = repeatMode;
        this.playbackSpeed = playbackSpeed;
        this.playbackPitch = playbackPitch;
        this.playbackQuality = playbackQuality;
+        this.playbackSkipSilence = playbackSkipSilence;
        this.wasPlaying = wasPlaying;
    }

@@ -62,6 +67,10 @@ public class PlayerState implements Serializable {
        return playbackQuality;
    }

+    public boolean isPlaybackSkipSilence() {
+        return playbackSkipSilence;
+    }
+
    public boolean wasPlaying() {
        return wasPlaying;
    }
--- a/app/src/main/java/org/schabi/newpipe/player/PopupVideoPlayer.java
+++ b/app/src/main/java/org/schabi/newpipe/player/PopupVideoPlayer.java
--- a/Show More
+++ b/Show More