fix filters

Currently translated at 100,0% (383 of 383 strings)

.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.

.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.

app/build.gradle

@@ -8,8 +8,8 @@ android {
         applicationId "org.schabi.newpipe"
         minSdkVersion 15
         targetSdkVersion 27
-        versionCode 61
-        versionName "0.13.2"
+        versionCode 65
+        versionName "0.13.6"
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
@@ -41,11 +41,11 @@ android {
 }
 
 ext {
-    supportLibVersion = '27.1.0'
-    exoPlayerLibVersion = '2.7.3'
-    roomDbLibVersion = '1.0.0'
+    supportLibVersion = '27.1.1'
+    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,11 +54,10 @@ dependencies {
         exclude module: 'support-annotations'
     }
 
-    implementation 'com.github.TeamNewPipe:NewPipeExtractor:77a74b8'
-
+    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"
@@ -66,7 +65,6 @@ dependencies {
     implementation "com.android.support:recyclerview-v7:$supportLibVersion"
     implementation "com.android.support:preference-v14:$supportLibVersion"
 
-    implementation 'com.google.code.gson:gson:2.8.2'
     implementation 'ch.acra:acra:4.9.2'
 
     implementation 'com.nostra13.universalimageloader:universal-image-loader:1.9.5'
@@ -81,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'
 
@@ -95,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"
 }

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

app/src/main/AndroidManifest.xml

@@ -80,8 +80,8 @@
             android:name=".history.HistoryActivity"
             android:label="@string/title_activity_history"/>
 
-        <service android:name=".subscription.services.SubscriptionsImportService"/>
-        <service android:name=".subscription.services.SubscriptionsExportService"/>
+        <service android:name=".local.subscription.services.SubscriptionsImportService"/>
+        <service android:name=".local.subscription.services.SubscriptionsExportService"/>
 
         <activity
             android:name=".PanicResponderActivity"

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;
     }
@@ -151,7 +163,8 @@ public class MainActivity extends AppCompatActivity {
 
         settings.setOnClickListener(view -> NavigationHelper.openSettings(this));
         downloads.setOnClickListener(view ->NavigationHelper.openDownloads(this));
-        history.setOnClickListener(view -> NavigationHelper.openHistory(this));
+        history.setOnClickListener(view ->
+                NavigationHelper.openStatisticFragment(getSupportFragmentManager()));
     }
 
     private void setupDrawerHeader() {
@@ -327,16 +340,16 @@ public class MainActivity extends AppCompatActivity {
             case android.R.id.home:
                 onHomeButtonPressed();
                 return true;
-            case R.id.action_settings:
-                NavigationHelper.openSettings(this);
-                return true;
             case R.id.action_show_downloads:
                 return NavigationHelper.openDownloads(this);
+            case R.id.action_history:
+                NavigationHelper.openStatisticFragment(getSupportFragmentManager());
+                return true;
             case R.id.action_about:
                 NavigationHelper.openAbout(this);
                 return true;
-            case R.id.action_history:
-                NavigationHelper.openHistory(this);
+            case R.id.action_settings:
+                NavigationHelper.openSettings(this);
                 return true;
             default:
                 return super.onOptionsItemSelected(item);
@@ -381,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);
         }
     }
 }

app/src/main/java/org/schabi/newpipe/about/AboutActivity.java

@@ -32,7 +32,6 @@ public class AboutActivity extends AppCompatActivity {
             new SoftwareComponent("Giga Get", "2014", "Peter Cai", "https://github.com/PaperAirplane-Dev-Team/GigaGet", StandardLicenses.GPL2),
             new SoftwareComponent("NewPipe Extractor", "2017", "Christian Schabesberger", "https://github.com/TeamNewPipe/NewPipeExtractor", StandardLicenses.GPL3),
             new SoftwareComponent("Jsoup", "2017", "Jonathan Hedley", "https://github.com/jhy/jsoup", StandardLicenses.MIT),
-            new SoftwareComponent("Google Gson", "2008", "Google Inc", "https://github.com/google/gson", StandardLicenses.APACHE2),
             new SoftwareComponent("Rhino", "2015", "Mozilla", "https://www.mozilla.org/rhino/", StandardLicenses.MPL2),
             new SoftwareComponent("ACRA", "2013", "Kevin Gaudin", "http://www.acra.ch", StandardLicenses.APACHE2),
             new SoftwareComponent("Universal Image Loader", "2011 - 2015", "Sergey Tarasevich", "https://github.com/nostra13/Android-Universal-Image-Loader", StandardLicenses.APACHE2),
@@ -129,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);
-            }
-        }
     }
 
 

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

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);

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;
     }

app/src/main/java/org/schabi/newpipe/database/stream/model/StreamEntity.java

@@ -9,7 +9,7 @@ import android.arch.persistence.room.PrimaryKey;
 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.playlist.PlayQueueItem;
+import org.schabi.newpipe.player.playqueue.PlayQueueItem;
 import org.schabi.newpipe.util.Constants;
 
 import java.io.Serializable;

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

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

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

@@ -239,7 +239,8 @@ public abstract class BaseStateFragment<I> extends BaseFragment implements ViewC
         if (rootView == null && getView() != null) rootView = getView();
         if (rootView == null) return;
 
-        ErrorActivity.reportError(getContext(), exception, MainActivity.class, rootView, ErrorActivity.ErrorInfo.make(userAction, serviceName, request, errorId));
+        ErrorActivity.reportError(getContext(), exception, MainActivity.class, rootView,
+                ErrorActivity.ErrorInfo.make(userAction, serviceName, request, errorId));
     }
 
     /*//////////////////////////////////////////////////////////////////////////

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;
@@ -27,10 +28,10 @@ import org.schabi.newpipe.extractor.ServiceList;
 import org.schabi.newpipe.extractor.StreamingService;
 import org.schabi.newpipe.extractor.kiosk.KioskList;
 import org.schabi.newpipe.fragments.list.channel.ChannelFragment;
-import org.schabi.newpipe.fragments.list.feed.FeedFragment;
+import org.schabi.newpipe.local.feed.FeedFragment;
 import org.schabi.newpipe.fragments.list.kiosk.KioskFragment;
-import org.schabi.newpipe.fragments.local.bookmark.BookmarkFragment;
-import org.schabi.newpipe.fragments.subscription.SubscriptionFragment;
+import org.schabi.newpipe.local.bookmark.BookmarkFragment;
+import org.schabi.newpipe.local.subscription.SubscriptionFragment;
 import org.schabi.newpipe.report.ErrorActivity;
 import org.schabi.newpipe.report.UserAction;
 import org.schabi.newpipe.util.KioskTranslator;
@@ -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++;
         }

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,25 +55,28 @@ 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.fragments.local.dialog.PlaylistAppendDialog;
+import org.schabi.newpipe.local.dialog.PlaylistAppendDialog;
 import org.schabi.newpipe.info_list.InfoItemBuilder;
 import org.schabi.newpipe.info_list.InfoItemDialog;
 import org.schabi.newpipe.player.MainVideoPlayer;
 import org.schabi.newpipe.player.PopupVideoPlayer;
 import org.schabi.newpipe.player.helper.PlayerHelper;
 import org.schabi.newpipe.player.old.PlayVideoActivity;
-import org.schabi.newpipe.playlist.PlayQueue;
-import org.schabi.newpipe.playlist.SinglePlayQueue;
+import org.schabi.newpipe.player.playqueue.PlayQueue;
+import org.schabi.newpipe.player.playqueue.SinglePlayQueue;
 import org.schabi.newpipe.report.UserAction;
 import org.schabi.newpipe.util.Constants;
 import org.schabi.newpipe.util.ExtractorHelper;
@@ -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;

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;
@@ -20,10 +21,11 @@ import org.schabi.newpipe.extractor.playlist.PlaylistInfoItem;
 import org.schabi.newpipe.extractor.stream.StreamInfoItem;
 import org.schabi.newpipe.fragments.BaseStateFragment;
 import org.schabi.newpipe.fragments.OnScrollBelowItemsListener;
-import org.schabi.newpipe.fragments.local.dialog.PlaylistAppendDialog;
+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.playlist.SinglePlayQueue;
+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;
@@ -140,9 +142,7 @@ public abstract class BaseListFragment<I, N> extends BaseStateFragment<I> implem
         infoListAdapter.setOnStreamSelectedListener(new OnClickGesture<StreamInfoItem>() {
             @Override
             public void selected(StreamInfoItem selectedItem) {
-                onItemSelected(selectedItem);
-                NavigationHelper.openVideoDetailFragment(useAsFrontPage ? getParentFragment().getFragmentManager() : getFragmentManager(),
-                        selectedItem.getServiceId(), selectedItem.getUrl(), selectedItem.getName());
+                onStreamSelected(selectedItem);
             }
 
             @Override
@@ -154,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,6 +195,14 @@ public abstract class BaseListFragment<I, N> extends BaseStateFragment<I> implem
         });
     }
 
+    private void onStreamSelected(StreamInfoItem selectedItem) {
+        onItemSelected(selectedItem);
+        NavigationHelper.openVideoDetailFragment(useAsFrontPage
+                        ? getParentFragment().getFragmentManager()
+                        : getFragmentManager(),
+                selectedItem.getServiceId(), selectedItem.getUrl(), selectedItem.getName());
+    }
+
     protected void onScrollToBottom() {
         if (hasMoreItems() && !isLoading.get()) {
             loadMoreItems();
@@ -192,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) -> {
@@ -209,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;
             }
@@ -216,6 +245,7 @@ public abstract class BaseListFragment<I, N> extends BaseStateFragment<I> implem
 
         new InfoItemDialog(getActivity(), item, commands, actions).show();
     }
+
     /*//////////////////////////////////////////////////////////////////////////
     // Menu
     //////////////////////////////////////////////////////////////////////////*/

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);
 

app/src/main/java/org/schabi/newpipe/fragments/list/channel/ChannelFragment.java

@@ -32,17 +32,16 @@ import org.schabi.newpipe.extractor.ListExtractor;
 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.Stream;
-import org.schabi.newpipe.extractor.stream.StreamInfo;
 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.fragments.local.dialog.PlaylistAppendDialog;
 import org.schabi.newpipe.info_list.InfoItemDialog;
-import org.schabi.newpipe.playlist.ChannelPlayQueue;
-import org.schabi.newpipe.playlist.PlayQueue;
-import org.schabi.newpipe.playlist.SinglePlayQueue;
+import org.schabi.newpipe.local.dialog.PlaylistAppendDialog;
+import org.schabi.newpipe.player.playqueue.ChannelPlayQueue;
+import org.schabi.newpipe.player.playqueue.PlayQueue;
+import org.schabi.newpipe.player.playqueue.SinglePlayQueue;
 import org.schabi.newpipe.report.UserAction;
-import org.schabi.newpipe.subscription.SubscriptionService;
+import org.schabi.newpipe.local.subscription.SubscriptionService;
 import org.schabi.newpipe.util.AnimationUtils;
 import org.schabi.newpipe.util.ExtractorHelper;
 import org.schabi.newpipe.util.ImageDisplayConstants;
@@ -163,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() {
@@ -192,6 +192,9 @@ public class ChannelFragment extends BaseListInfoFragment<ChannelInfo> {
                                     .show(getFragmentManager(), TAG);
                         }
                         break;
+                    case 6:
+                        shareUrl(item.getName(), item.getUrl());
+                        break;
                     default:
                         break;
                 }
@@ -499,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;
     }
 

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);
     }
 
     /*//////////////////////////////////////////////////////////////////////////

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;
@@ -27,14 +29,15 @@ import org.schabi.newpipe.extractor.ListExtractor;
 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.StreamInfo;
 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.fragments.local.RemotePlaylistManager;
 import org.schabi.newpipe.info_list.InfoItemDialog;
-import org.schabi.newpipe.playlist.PlayQueue;
-import org.schabi.newpipe.playlist.PlaylistPlayQueue;
-import org.schabi.newpipe.playlist.SinglePlayQueue;
+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;
@@ -45,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;
@@ -94,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
@@ -143,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) -> {
@@ -163,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;
             }
@@ -262,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);
+                    }
+                });
             }
         }
 
@@ -282,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 ->
@@ -337,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;
     }
 
@@ -345,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
@@ -417,4 +443,4 @@ public class PlaylistFragment extends BaseListInfoFragment<PlaylistInfo> {
         playlistBookmarkButton.setIcon(ThemeHelper.resolveResourceIdFromAttr(activity, iconAttr));
         playlistBookmarkButton.setTitle(titleRes);
     }
-}
+}

app/src/main/java/org/schabi/newpipe/fragments/list/search/SuggestionListAdapter.java

@@ -63,24 +63,15 @@ public class SuggestionListAdapter extends RecyclerView.Adapter<SuggestionListAd
     public void onBindViewHolder(SuggestionItemHolder holder, int position) {
         final SuggestionItem currentItem = getItem(position);
         holder.updateFrom(currentItem);
-        holder.queryView.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                if (listener != null) listener.onSuggestionItemSelected(currentItem);
-            }
+        holder.queryView.setOnClickListener(v -> {
+            if (listener != null) listener.onSuggestionItemSelected(currentItem);
         });
-        holder.queryView.setOnLongClickListener(new View.OnLongClickListener() {
-            @Override
-            public boolean onLongClick(View v) {
+        holder.queryView.setOnLongClickListener(v -> {
                 if (listener != null) listener.onSuggestionItemLongClick(currentItem);
                 return true;
-            }
         });
-        holder.insertView.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                if (listener != null) listener.onSuggestionItemInserted(currentItem);
-            }
+        holder.insertView.setOnClickListener(v -> {
+            if (listener != null) listener.onSuggestionItemInserted(currentItem);
         });
     }
 

app/src/main/java/org/schabi/newpipe/fragments/local/bookmark/LastPlayedFragment.java

@@ -1,21 +0,0 @@
-package org.schabi.newpipe.fragments.local.bookmark;
-
-import org.schabi.newpipe.R;
-import org.schabi.newpipe.database.stream.StreamStatisticsEntry;
-
-import java.util.Collections;
-import java.util.List;
-
-public final class LastPlayedFragment extends StatisticsPlaylistFragment {
-    @Override
-    protected String getName() {
-        return getString(R.string.title_last_played);
-    }
-
-    @Override
-    protected List<StreamStatisticsEntry> processResult(List<StreamStatisticsEntry> results)  {
-        Collections.sort(results, (left, right) ->
-                right.latestAccessDate.compareTo(left.latestAccessDate));
-        return results;
-    }
-}

app/src/main/java/org/schabi/newpipe/fragments/local/bookmark/MostPlayedFragment.java

@@ -1,22 +0,0 @@
-package org.schabi.newpipe.fragments.local.bookmark;
-
-import org.schabi.newpipe.R;
-import org.schabi.newpipe.database.stream.StreamStatisticsEntry;
-
-import java.util.Collections;
-import java.util.List;
-
-public final class MostPlayedFragment extends StatisticsPlaylistFragment {
-    @Override
-    protected String getName() {
-        return getString(R.string.title_most_played);
-    }
-
-    @Override
-    protected List<StreamStatisticsEntry> processResult(List<StreamStatisticsEntry> results)  {
-        Collections.sort(results, (left, right) ->
-                ((Long) right.watchCount).compareTo(left.watchCount));
-        return results;
-    }
-
-}

app/src/main/java/org/schabi/newpipe/history/HistoryActivity.java

@@ -1,141 +0,0 @@
-package org.schabi.newpipe.history;
-
-import android.content.Intent;
-import android.os.Bundle;
-import android.support.design.widget.FloatingActionButton;
-import android.support.design.widget.TabLayout;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentPagerAdapter;
-import android.support.v4.app.FragmentStatePagerAdapter;
-import android.support.v4.view.ViewPager;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
-import android.view.Menu;
-import android.view.MenuItem;
-
-import com.jakewharton.rxbinding2.view.RxView;
-
-import org.schabi.newpipe.R;
-import org.schabi.newpipe.settings.SettingsActivity;
-import org.schabi.newpipe.util.ThemeHelper;
-
-import io.reactivex.android.schedulers.AndroidSchedulers;
-
-public class HistoryActivity extends AppCompatActivity {
-
-    private static final String TAG = "HistoryActivity";
-    /**
-     * The {@link android.support.v4.view.PagerAdapter} that will provide
-     * fragments for each of the sections. We use a
-     * {@link FragmentPagerAdapter} derivative, which will keep every
-     * loaded fragment in memory. If this becomes too memory intensive, it
-     * may be best to switch to a
-     * {@link android.support.v4.app.FragmentStatePagerAdapter}.
-     */
-    private SectionsPagerAdapter mSectionsPagerAdapter;
-
-    /**
-     * The {@link ViewPager} that will host the section contents.
-     */
-    private ViewPager mViewPager;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        ThemeHelper.setTheme(this);
-        setContentView(R.layout.activity_history);
-
-        Toolbar toolbar = findViewById(R.id.toolbar);
-        setSupportActionBar(toolbar);
-        if (getSupportActionBar() != null) {
-            getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-            getSupportActionBar().setTitle(R.string.title_activity_history);
-        }
-        // Create the adapter that will return a fragment for each of the three
-        // primary sections of the activity.
-        mSectionsPagerAdapter = new SectionsPagerAdapter(getSupportFragmentManager());
-
-        // Set up the ViewPager with the sections adapter.
-        mViewPager = findViewById(R.id.container);
-        mViewPager.setAdapter(mSectionsPagerAdapter);
-
-        TabLayout tabLayout = findViewById(R.id.tabs);
-        tabLayout.setupWithViewPager(mViewPager);
-
-        final FloatingActionButton fab = findViewById(R.id.fab);
-        RxView.clicks(fab)
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(ignored -> {
-                    int currentItem = mViewPager.getCurrentItem();
-                    HistoryFragment fragment = (HistoryFragment) mSectionsPagerAdapter
-                            .instantiateItem(mViewPager, currentItem);
-                    fragment.onHistoryCleared();
-                });
-    }
-
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        // Inflate the menu; this adds items to the action bar if it is present.
-        getMenuInflater().inflate(R.menu.menu_history, menu);
-        return true;
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-            case android.R.id.home:
-                finish();
-                return true;
-            case R.id.action_settings:
-                Intent intent = new Intent(this, SettingsActivity.class);
-                startActivity(intent);
-                return true;
-        }
-        return super.onOptionsItemSelected(item);
-    }
-
-    /**
-     * A {@link FragmentPagerAdapter} that returns a fragment corresponding to
-     * one of the sections/tabs/pages.
-     */
-    public class SectionsPagerAdapter extends FragmentStatePagerAdapter {
-
-        public SectionsPagerAdapter(FragmentManager fm) {
-            super(fm);
-        }
-
-        @Override
-        public Fragment getItem(int position) {
-            Fragment fragment;
-            switch (position) {
-                case 0:
-                    fragment = SearchHistoryFragment.newInstance();
-                    break;
-                case 1:
-                    fragment = WatchHistoryFragment.newInstance();
-                    break;
-                default:
-                    throw new IllegalArgumentException("position: " + position);
-            }
-            return fragment;
-        }
-
-        @Override
-        public CharSequence getPageTitle(int position) {
-            switch (position) {
-                case 0:
-                    return getString(R.string.title_history_search);
-                case 1:
-                    return getString(R.string.title_history_view);
-            }
-            throw new IllegalArgumentException("position: " + position);
-        }
-
-        @Override
-        public int getCount() {
-            // Show 3 total pages.
-            return 2;
-        }
-    }
-}

app/src/main/java/org/schabi/newpipe/history/SearchHistoryFragment.java

@@ -1,145 +0,0 @@
-package org.schabi.newpipe.history;
-
-import android.content.Context;
-import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.StringRes;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.widget.RecyclerView;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.TextView;
-
-import org.schabi.newpipe.R;
-import org.schabi.newpipe.database.history.model.SearchHistoryEntry;
-import org.schabi.newpipe.extractor.NewPipe;
-import org.schabi.newpipe.util.Localization;
-import org.schabi.newpipe.util.NavigationHelper;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-
-import io.reactivex.Flowable;
-import io.reactivex.Single;
-import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.disposables.Disposable;
-
-public class SearchHistoryFragment extends HistoryFragment<SearchHistoryEntry> {
-
-    @NonNull
-    public static SearchHistoryFragment newInstance() {
-        return new SearchHistoryFragment();
-    }
-
-    @Override
-    public void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-    }
-
-    @NonNull
-    @Override
-    protected SearchHistoryAdapter createAdapter() {
-        return new SearchHistoryAdapter(getContext());
-    }
-
-    @Override
-    protected Single<List<Long>> insert(Collection<SearchHistoryEntry> entries) {
-        return historyRecordManager.insertSearches(entries);
-    }
-
-    @Override
-    protected Single<Integer> delete(Collection<SearchHistoryEntry> entries) {
-        return historyRecordManager.deleteSearches(entries);
-    }
-
-    @NonNull
-    @Override
-    protected Flowable<List<SearchHistoryEntry>> getAll() {
-        return historyRecordManager.getSearchHistory();
-    }
-
-    @StringRes
-    @Override
-    int getEnabledConfigKey() {
-        return R.string.enable_search_history_key;
-    }
-
-    @Override
-    public void onHistoryItemClick(final SearchHistoryEntry historyItem) {
-        NavigationHelper.openSearch(getContext(), historyItem.getServiceId(),
-                historyItem.getSearch());
-    }
-
-    @Override
-    public void onHistoryItemLongClick(final SearchHistoryEntry item) {
-        if (activity == null) return;
-
-        new AlertDialog.Builder(activity)
-                .setTitle(item.getSearch())
-                .setMessage(R.string.delete_item_search_history)
-                .setCancelable(true)
-                .setNeutralButton(R.string.cancel, null)
-                .setPositiveButton(R.string.delete_one, (dialog, i) -> {
-                    final Disposable onDelete = historyRecordManager
-                            .deleteSearches(Collections.singleton(item))
-                            .observeOn(AndroidSchedulers.mainThread())
-                            .subscribe(
-                                    ignored -> {/*successful*/},
-                                    error -> Log.e(TAG, "Search history Delete One failed:", error)
-                            );
-                    disposables.add(onDelete);
-                    makeSnackbar(R.string.item_deleted);
-                })
-                .setNegativeButton(R.string.delete_all, (dialog, i) -> {
-                    final Disposable onDeleteAll = historyRecordManager
-                            .deleteSearchHistory(item.getSearch())
-                            .observeOn(AndroidSchedulers.mainThread())
-                            .subscribe(
-                                    ignored -> {/*successful*/},
-                                    error -> Log.e(TAG, "Search history Delete All failed:", error)
-                            );
-                    disposables.add(onDeleteAll);
-                    makeSnackbar(R.string.item_deleted);
-                })
-                .show();
-    }
-
-    private static class ViewHolder extends RecyclerView.ViewHolder {
-        private final TextView search;
-        private final TextView info;
-
-        public ViewHolder(View itemView) {
-            super(itemView);
-            search = itemView.findViewById(R.id.search);
-            info = itemView.findViewById(R.id.info);
-        }
-    }
-
-    protected class SearchHistoryAdapter extends HistoryEntryAdapter<SearchHistoryEntry, ViewHolder> {
-
-        SearchHistoryAdapter(Context context) {
-            super(context);
-        }
-
-        @Override
-        public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
-            LayoutInflater inflater = LayoutInflater.from(parent.getContext());
-            View rootView = inflater.inflate(R.layout.item_search_history, parent, false);
-            return new ViewHolder(rootView);
-        }
-
-        @Override
-        void onBindViewHolder(ViewHolder holder, SearchHistoryEntry entry, int position) {
-            holder.search.setText(entry.getSearch());
-
-            final String info = Localization.concatenateStrings(
-                    getFormattedDate(entry.getCreationDate()),
-                    NewPipe.getNameOfService(entry.getServiceId()));
-            holder.info.setText(info);
-        }
-    }
-}

app/src/main/java/org/schabi/newpipe/history/WatchHistoryFragment.java

@@ -1,171 +0,0 @@
-package org.schabi.newpipe.history;
-
-
-import android.content.Context;
-import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.StringRes;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.widget.RecyclerView;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import com.nostra13.universalimageloader.core.ImageLoader;
-
-import org.schabi.newpipe.R;
-import org.schabi.newpipe.database.history.model.StreamHistoryEntry;
-import org.schabi.newpipe.info_list.holder.StreamInfoItemHolder;
-import org.schabi.newpipe.util.ImageDisplayConstants;
-import org.schabi.newpipe.util.Localization;
-import org.schabi.newpipe.util.NavigationHelper;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-
-import io.reactivex.Flowable;
-import io.reactivex.Single;
-import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.disposables.Disposable;
-
-
-public class WatchHistoryFragment extends HistoryFragment<StreamHistoryEntry> {
-
-    @NonNull
-    public static WatchHistoryFragment newInstance() {
-        return new WatchHistoryFragment();
-    }
-
-    @Override
-    public void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-    }
-
-    @StringRes
-    @Override
-    int getEnabledConfigKey() {
-        return R.string.enable_watch_history_key;
-    }
-
-    @NonNull
-    @Override
-    protected StreamHistoryAdapter createAdapter() {
-        return new StreamHistoryAdapter(getContext());
-    }
-
-    @Override
-    protected Single<List<Long>> insert(Collection<StreamHistoryEntry> entries) {
-        return historyRecordManager.insertStreamHistory(entries);
-    }
-
-    @Override
-    protected Single<Integer> delete(Collection<StreamHistoryEntry> entries) {
-        return historyRecordManager.deleteStreamHistory(entries);
-    }
-
-    @NonNull
-    @Override
-    protected Flowable<List<StreamHistoryEntry>> getAll() {
-        return historyRecordManager.getStreamHistory();
-    }
-
-    @Override
-    public void onHistoryItemClick(StreamHistoryEntry historyItem) {
-        NavigationHelper.openVideoDetail(getContext(), historyItem.serviceId, historyItem.url,
-                historyItem.title);
-    }
-
-    @Override
-    public void onHistoryItemLongClick(StreamHistoryEntry item) {
-        new AlertDialog.Builder(activity)
-                .setTitle(item.title)
-                .setMessage(R.string.delete_stream_history_prompt)
-                .setCancelable(true)
-                .setNeutralButton(R.string.cancel, null)
-                .setPositiveButton(R.string.delete_one, (dialog, i) -> {
-                    final Disposable onDelete = historyRecordManager
-                            .deleteStreamHistory(Collections.singleton(item))
-                            .observeOn(AndroidSchedulers.mainThread())
-                            .subscribe(
-                                    ignored -> {/*successful*/},
-                                    error -> Log.e(TAG, "Watch history Delete One failed:", error)
-                            );
-                    disposables.add(onDelete);
-                    makeSnackbar(R.string.item_deleted);
-                })
-                .setNegativeButton(R.string.delete_all, (dialog, i) -> {
-                    final Disposable onDeleteAll = historyRecordManager
-                            .deleteStreamHistory(item.streamId)
-                            .observeOn(AndroidSchedulers.mainThread())
-                            .subscribe(
-                                    ignored -> {/*successful*/},
-                                    error -> Log.e(TAG, "Watch history Delete All failed:", error)
-                            );
-                    disposables.add(onDeleteAll);
-                    makeSnackbar(R.string.item_deleted);
-                })
-                .show();
-    }
-
-    private static class StreamHistoryAdapter extends HistoryEntryAdapter<StreamHistoryEntry, ViewHolder> {
-
-        StreamHistoryAdapter(Context context) {
-            super(context);
-        }
-
-        @Override
-        public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
-            LayoutInflater inflater = LayoutInflater.from(parent.getContext());
-            View itemView = inflater.inflate(R.layout.list_stream_item, parent, false);
-            return new ViewHolder(itemView);
-        }
-
-        @Override
-        public void onViewRecycled(ViewHolder holder) {
-            holder.itemView.setOnClickListener(null);
-            ImageLoader.getInstance()
-                    .cancelDisplayTask(holder.thumbnailView);
-        }
-
-        @Override
-        void onBindViewHolder(ViewHolder holder, StreamHistoryEntry entry, int position) {
-            final String formattedDate = getFormattedDate(entry.accessDate);
-            final String info;
-            if (entry.repeatCount > 1) {
-                info = Localization.concatenateStrings(formattedDate,
-                        getFormattedViewString(entry.repeatCount));
-            } else {
-                info = formattedDate;
-            }
-
-            holder.info.setText(info);
-            holder.streamTitle.setText(entry.title);
-            holder.uploader.setText(entry.uploader);
-            holder.duration.setText(Localization.getDurationString(entry.duration));
-            ImageLoader.getInstance().displayImage(entry.thumbnailUrl, holder.thumbnailView,
-                    ImageDisplayConstants.DISPLAY_THUMBNAIL_OPTIONS);
-        }
-    }
-
-    private static class ViewHolder extends RecyclerView.ViewHolder {
-        private final TextView info;
-        private final TextView streamTitle;
-        private final ImageView thumbnailView;
-        private final TextView uploader;
-        private final TextView duration;
-
-        public ViewHolder(View itemView) {
-            super(itemView);
-            thumbnailView = itemView.findViewById(R.id.itemThumbnailView);
-            info = itemView.findViewById(R.id.itemAdditionalDetails);
-            streamTitle = itemView.findViewById(R.id.itemVideoTitleView);
-            uploader = itemView.findViewById(R.id.itemUploaderView);
-            duration = itemView.findViewById(R.id.itemDurationView);
-        }
-    }
-}

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

app/src/main/java/org/schabi/newpipe/local/BaseLocalListFragment.java

@@ -1,4 +1,4 @@
-package org.schabi.newpipe.fragments.local.bookmark;
+package org.schabi.newpipe.local;
 
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
@@ -13,7 +13,6 @@ import android.view.View;
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.fragments.BaseStateFragment;
 import org.schabi.newpipe.fragments.list.ListViewContract;
-import org.schabi.newpipe.fragments.local.LocalItemListAdapter;
 
 import static org.schabi.newpipe.util.AnimationUtils.animateView;