Merge pull request #1654 from mauriciocolli/misc-fixes

Improve "selected tabs" and misc fixes

app/build.gradle

@@ -8,8 +8,8 @@ android {
         applicationId "org.schabi.newpipe"
         minSdkVersion 15
         targetSdkVersion 27
-        versionCode 66
-        versionName "0.13.7"
+        versionCode 67
+        versionName "0.14.0"
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
@@ -49,12 +49,13 @@ ext {
     icepickLibVersion = '3.2.0'
     stethoLibVersion = '1.5.0'
 }
+
 dependencies {
     androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2') {
         exclude module: 'support-annotations'
     }
 
-    implementation 'com.github.TeamNewPipe:NewPipeExtractor:1eff8c5708'
+    implementation 'com.github.TeamNewPipe:NewPipeExtractor:850670917fce'
 
     testImplementation 'junit:junit:4.12'
     testImplementation 'org.mockito:mockito-core:2.8.9'
@@ -93,6 +94,9 @@ dependencies {
     debugImplementation "com.squareup.leakcanary:leakcanary-android:$leakCanaryLibVersion"
     releaseImplementation "com.squareup.leakcanary:leakcanary-android-no-op:$leakCanaryLibVersion"
 
+
     implementation "com.squareup.okhttp3:okhttp:$okHttpLibVersion"
     debugImplementation "com.facebook.stetho:stetho-okhttp3:$stethoLibVersion"
+    implementation 'com.android.support.constraint:constraint-layout:1.1.2'
+    implementation 'com.android.support:cardview-v7:27.1.1'
 }

app/src/main/AndroidManifest.xml

@@ -76,10 +76,6 @@
             android:name=".about.AboutActivity"
             android:label="@string/title_activity_about"/>
 
-        <activity
-            android:name=".history.HistoryActivity"
-            android:label="@string/title_activity_history"/>
-
         <service android:name=".local.subscription.services.SubscriptionsImportService"/>
         <service android:name=".local.subscription.services.SubscriptionsExportService"/>
 
@@ -122,6 +118,7 @@
         <activity
             android:name=".ReCaptchaActivity"
             android:label="@string/reCaptchaActivity"/>
+        <activity android:name=".download.ExtSDDownloadFailedActivity" />
 
         <provider
             android:name="android.support.v4.content.FileProvider"

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

@@ -4,6 +4,7 @@ import android.content.Context;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentManager;
 import android.support.v7.app.AppCompatActivity;
 import android.util.Log;
 import android.view.View;
@@ -11,7 +12,10 @@ import android.view.View;
 import com.nostra13.universalimageloader.core.ImageLoader;
 import com.squareup.leakcanary.RefWatcher;
 
+import org.schabi.newpipe.report.UserAction;
+
 import icepick.Icepick;
+import icepick.State;
 
 public abstract class BaseFragment extends Fragment {
     protected final String TAG = getClass().getSimpleName() + "@" + Integer.toHexString(hashCode());
@@ -20,6 +24,15 @@ public abstract class BaseFragment extends Fragment {
     protected AppCompatActivity activity;
     public static final ImageLoader imageLoader = ImageLoader.getInstance();
 
+    //These values are used for controlling framgents when they are part of the frontpage
+    @State
+    protected boolean useAsFrontPage = false;
+    protected boolean mIsVisibleToUser = false;
+
+    public void useAsFrontPage(boolean value) {
+        useAsFrontPage = value;
+    }
+
     /*//////////////////////////////////////////////////////////////////////////
     // Fragment's Lifecycle
     //////////////////////////////////////////////////////////////////////////*/
@@ -72,6 +85,12 @@ public abstract class BaseFragment extends Fragment {
         if (refWatcher != null) refWatcher.watch(this);
     }
 
+    @Override
+    public void setUserVisibleHint(boolean isVisibleToUser) {
+        super.setUserVisibleHint(isVisibleToUser);
+        mIsVisibleToUser = isVisibleToUser;
+    }
+
     /*//////////////////////////////////////////////////////////////////////////
     // Init
     //////////////////////////////////////////////////////////////////////////*/
@@ -88,8 +107,15 @@ public abstract class BaseFragment extends Fragment {
 
     public void setTitle(String title) {
         if (DEBUG) Log.d(TAG, "setTitle() called with: title = [" + title + "]");
-        if (activity != null && activity.getSupportActionBar() != null) {
+        if((!useAsFrontPage || mIsVisibleToUser)
+            && (activity != null && activity.getSupportActionBar() != null)) {
             activity.getSupportActionBar().setTitle(title);
         }
     }
+
+    protected FragmentManager getFM() {
+        return getParentFragment() == null
+                ? getFragmentManager()
+                : getParentFragment().getFragmentManager();
+    }
 }

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

@@ -0,0 +1,38 @@
+package org.schabi.newpipe.download;
+
+import android.app.AlertDialog;
+import android.content.DialogInterface;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v7.app.AppCompatActivity;
+
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.settings.NewPipeSettings;
+import org.schabi.newpipe.util.ServiceHelper;
+import org.schabi.newpipe.util.ThemeHelper;
+
+public class ExtSDDownloadFailedActivity extends AppCompatActivity {
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        ThemeHelper.setTheme(this, ServiceHelper.getSelectedServiceId(this));
+    }
+
+    @Override
+    protected void onStart() {
+        super.onStart();
+        new AlertDialog.Builder(this)
+                .setTitle(R.string.download_to_sdcard_error_title)
+                .setMessage(R.string.download_to_sdcard_error_message)
+                .setPositiveButton(R.string.yes, (DialogInterface dialogInterface, int i) -> {
+                    NewPipeSettings.resetDownloadFolders(this);
+                    finish();
+                })
+                .setNegativeButton(R.string.cancel, (DialogInterface dialogInterface, int i) -> {
+                    dialogInterface.dismiss();
+                    finish();
+                })
+                .create()
+                .show();
+    }
+}

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

@@ -51,9 +51,6 @@ public abstract class BaseStateFragment<I> extends BaseFragment implements ViewC
     protected Button errorButtonRetry;
     protected TextView errorTextView;
 
-    @State
-    protected boolean useAsFrontPage = false;
-
     @Override
     public void onViewCreated(View rootView, Bundle savedInstanceState) {
         super.onViewCreated(rootView, savedInstanceState);
@@ -66,9 +63,6 @@ public abstract class BaseStateFragment<I> extends BaseFragment implements ViewC
         wasLoading.set(isLoading.get());
     }
 
-    public void useAsFrontPage(boolean value) {
-        useAsFrontPage = value;
-    }
 
     /*//////////////////////////////////////////////////////////////////////////
     // Init
@@ -93,12 +87,7 @@ public abstract class BaseStateFragment<I> extends BaseFragment implements ViewC
         RxView.clicks(errorButtonRetry)
                 .debounce(300, TimeUnit.MILLISECONDS)
                 .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new Consumer<Object>() {
-                    @Override
-                    public void accept(Object o) throws Exception {
-                        onRetryButtonClicked();
-                    }
-                });
+                .subscribe(o -> onRetryButtonClicked());
     }
 
     protected void onRetryButtonClicked() {

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

@@ -14,24 +14,16 @@ public class BlankFragment extends BaseFragment {
     @Nullable
     @Override
     public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, Bundle savedInstanceState) {
-        if(activity != null && activity.getSupportActionBar() != null) {
-            activity.getSupportActionBar()
-                    .setTitle("NewPipe");
-        }
+        setTitle("NewPipe");
         return inflater.inflate(R.layout.fragment_blank, container, false);
     }
 
     @Override
     public void setUserVisibleHint(boolean isVisibleToUser) {
         super.setUserVisibleHint(isVisibleToUser);
-        if(isVisibleToUser) {
-            if(activity != null && activity.getSupportActionBar() != null) {
-                activity.getSupportActionBar()
-                        .setTitle("NewPipe");
-            }
-            // leave this inline. Will make it harder for copy cats.
-            // If you are a Copy cat FUCK YOU.
-            // I WILL FIND YOU, AND I WILL ...
-        }
+        setTitle("NewPipe");
+        // leave this inline. Will make it harder for copy cats.
+        // If you are a Copy cat FUCK YOU.
+        // I WILL FIND YOU, AND I WILL ...
     }
 }

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

@@ -1227,10 +1227,10 @@ public class VideoDetailFragment
                 spinnerToolbar.setVisibility(View.GONE);
                 break;
             default:
+                if(info.getAudioStreams().isEmpty()) detailControlsBackground.setVisibility(View.GONE);
                 if (!info.getVideoStreams().isEmpty()
                         || !info.getVideoOnlyStreams().isEmpty()) break;
 
-                detailControlsBackground.setVisibility(View.GONE);
                 detailControlsPopup.setVisibility(View.GONE);
                 spinnerToolbar.setVisibility(View.GONE);
                 thumbnailPlayButton.setImageResource(R.drawable.ic_headset_white_24dp);

app/src/main/java/org/schabi/newpipe/fragments/list/BaseListFragment.java

@@ -156,9 +156,7 @@ public abstract class BaseListFragment<I, N> extends BaseStateFragment<I> implem
             public void selected(ChannelInfoItem selectedItem) {
                 try {
                     onItemSelected(selectedItem);
-                    NavigationHelper.openChannelFragment(useAsFrontPage ?
-                                    getParentFragment().getFragmentManager()
-                                    : getFragmentManager(),
+                    NavigationHelper.openChannelFragment(getFM(),
                             selectedItem.getServiceId(),
                             selectedItem.getUrl(),
                             selectedItem.getName());
@@ -173,10 +171,7 @@ public abstract class BaseListFragment<I, N> extends BaseStateFragment<I> implem
             public void selected(PlaylistInfoItem selectedItem) {
                 try {
                     onItemSelected(selectedItem);
-                    NavigationHelper.openPlaylistFragment(
-                            useAsFrontPage
-                                    ? getParentFragment().getFragmentManager()
-                                    : getFragmentManager(),
+                    NavigationHelper.openPlaylistFragment(getFM(),
                             selectedItem.getServiceId(),
                             selectedItem.getUrl(),
                             selectedItem.getName());
@@ -197,9 +192,7 @@ 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(getFM(),
                 selectedItem.getServiceId(), selectedItem.getUrl(), selectedItem.getName());
     }
 

app/src/main/java/org/schabi/newpipe/fragments/list/kiosk/KioskFragment.java

@@ -57,6 +57,7 @@ public class KioskFragment extends BaseListInfoFragment<KioskInfo> {
     protected String kioskId = "";
     protected String kioskTranslatedName;
 
+
     /*//////////////////////////////////////////////////////////////////////////
     // Views
     //////////////////////////////////////////////////////////////////////////*/
@@ -167,7 +168,9 @@ public class KioskFragment extends BaseListInfoFragment<KioskInfo> {
         super.handleResult(result);
 
         name = kioskTranslatedName;
-        setTitle(kioskTranslatedName);
+        if(!useAsFrontPage) {
+            setTitle(kioskTranslatedName);
+        }
 
         if (!result.getErrors().isEmpty()) {
             showSnackBarError(result.getErrors(),

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

@@ -365,7 +365,7 @@ public class SearchFragment
         int itemId = 0;
         boolean isFirstItem = true;
         final Context c = getContext();
-        for(String filter : service.getSearchQIHFactory().getAvailableContentFilter()) {
+        for(String filter : service.getSearchQHFactory().getAvailableContentFilter()) {
             menuItemToFilterName.put(itemId, filter);
             MenuItem item = menu.add(1,
                     itemId++,
@@ -575,8 +575,7 @@ public class SearchFragment
                                             .onNext(searchEditText.getText().toString()),
                                     throwable -> showSnackBarError(throwable,
                                             UserAction.DELETE_FROM_HISTORY, "none",
-                                            "Deleting item failed", R.string.general_error)
-                            );
+                                            "Deleting item failed", R.string.general_error));
                     disposables.add(onDelete);
                 })
                 .show();
@@ -837,7 +836,10 @@ public class SearchFragment
 
     @Override
     public void handleResult(@NonNull SearchInfo result) {
-        if (!result.getErrors().isEmpty()) {
+        final List<Throwable> exceptions = result.getErrors();
+        if (!exceptions.isEmpty()
+            && !(exceptions.size() == 1
+                && exceptions.get(0) instanceof SearchExtractor.NothingFoundException)){
             showSnackBarError(result.getErrors(), UserAction.SEARCHED,
                     NewPipe.getNameOfService(serviceId), searchString, 0);
         }
@@ -864,6 +866,7 @@ public class SearchFragment
         showListFooter(false);
         currentPageUrl = result.getNextPageUrl();
         infoListAdapter.addInfoItemList(result.getItems());
+        nextPageUrl = result.getNextPageUrl();
 
         if (!result.getErrors().isEmpty()) {
             showSnackBarError(result.getErrors(), UserAction.SEARCHED,

app/src/main/java/org/schabi/newpipe/local/bookmark/BookmarkFragment.java

@@ -6,7 +6,6 @@ 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;
@@ -20,11 +19,9 @@ 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;
@@ -69,11 +66,10 @@ public final class BookmarkFragment
     public View onCreateView(@NonNull LayoutInflater inflater,
                              @Nullable ViewGroup container,
                              Bundle savedInstanceState) {
-        if (activity != null && activity.getSupportActionBar() != null) {
-            activity.getSupportActionBar().setDisplayShowTitleEnabled(true);
-            activity.setTitle(R.string.tab_subscriptions);
-        }
 
+        if(!useAsFrontPage) {
+            setTitle(activity.getString(R.string.tab_bookmarks));
+        }
         return inflater.inflate(R.layout.fragment_bookmarks, container, false);
     }
 
@@ -102,26 +98,20 @@ public final class BookmarkFragment
         itemListAdapter.setSelectedListener(new OnClickGesture<LocalItem>() {
             @Override
             public void selected(LocalItem selectedItem) {
-                try {
-                    // Requires the parent fragment to find holder for fragment replacement
-                    if (getParentFragment() == null) return;
-                    final FragmentManager fragmentManager = getParentFragment().getFragmentManager();
+                final FragmentManager fragmentManager = getFM();
 
-                    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());
-                    }
-                } catch (Exception e) {
-                    ErrorActivity.reportUiError((AppCompatActivity) getActivity(), e);
+                } else if (selectedItem instanceof PlaylistRemoteEntity) {
+                    final PlaylistRemoteEntity entry = ((PlaylistRemoteEntity) selectedItem);
+                    NavigationHelper.openPlaylistFragment(
+                            fragmentManager,
+                            entry.getServiceId(),
+                            entry.getUrl(),
+                            entry.getName());
                 }
             }
 

app/src/main/java/org/schabi/newpipe/local/feed/FeedFragment.java

@@ -71,6 +71,10 @@ public class FeedFragment extends BaseListFragment<List<SubscriptionEntity>, Voi
 
     @Override
     public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, Bundle savedInstanceState) {
+
+        if(!useAsFrontPage) {
+            setTitle(activity.getString(R.string.fragment_whats_new));
+        }
         return inflater.inflate(R.layout.fragment_feed, container, false);
     }
 
@@ -105,20 +109,19 @@ public class FeedFragment extends BaseListFragment<List<SubscriptionEntity>, Voi
         super.onDestroyView();
     }
 
-    /*@Override
-    protected RecyclerView.LayoutManager getListLayoutManager() {
-        boolean isPortrait = getResources().getDisplayMetrics().heightPixels > getResources().getDisplayMetrics().widthPixels;
-        return new GridLayoutManager(activity, isPortrait ? 1 : 2);
-    }*/
+    @Override
+    public void setUserVisibleHint(boolean isVisibleToUser) {
+        super.setUserVisibleHint(isVisibleToUser);
+        if (activity != null && isVisibleToUser) {
+            setTitle(activity.getString(R.string.fragment_whats_new));
+        }
+    }
 
     @Override
     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
         super.onCreateOptionsMenu(menu, inflater);
 
         ActionBar supportActionBar = activity.getSupportActionBar();
-        if (supportActionBar != null) {
-            supportActionBar.setTitle(R.string.fragment_whats_new);
-        }
 
         if(useAsFrontPage) {
             supportActionBar.setDisplayShowTitleEnabled(true);
@@ -176,19 +179,9 @@ public class FeedFragment extends BaseListFragment<List<SubscriptionEntity>, Voi
         showLoading();
         showListFooter(true);
         subscriptionObserver = subscriptionService.getSubscription()
-                .onErrorReturnItem(Collections.<SubscriptionEntity>emptyList())
+                .onErrorReturnItem(Collections.emptyList())
                 .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new Consumer<List<SubscriptionEntity>>() {
-                    @Override
-                    public void accept(List<SubscriptionEntity> subscriptionEntities) throws Exception {
-                        handleResult(subscriptionEntities);
-                    }
-                }, new Consumer<Throwable>() {
-                    @Override
-                    public void accept(Throwable throwable) throws Exception {
-                        onError(throwable);
-                    }
-                });
+                .subscribe(this::handleResult, this::onError);
     }
 
     @Override
@@ -239,13 +232,12 @@ public class FeedFragment extends BaseListFragment<List<SubscriptionEntity>, Voi
                 if (!itemsLoaded.contains(subscriptionEntity.getServiceId() + subscriptionEntity.getUrl())) {
                     subscriptionService.getChannelInfo(subscriptionEntity)
                             .observeOn(AndroidSchedulers.mainThread())
-                            .onErrorComplete(new Predicate<Throwable>() {
-                                @Override
-                                public boolean test(@io.reactivex.annotations.NonNull Throwable throwable) throws Exception {
-                                    return FeedFragment.super.onError(throwable);
-                                }
-                            })
-                            .subscribe(getChannelInfoObserver(subscriptionEntity.getServiceId(), subscriptionEntity.getUrl()));
+                            .onErrorComplete(
+                                    (@io.reactivex.annotations.NonNull Throwable throwable) ->
+                                            FeedFragment.super.onError(throwable))
+                            .subscribe(
+                                    getChannelInfoObserver(subscriptionEntity.getServiceId(),
+                                            subscriptionEntity.getUrl()));
                 } else {
                     requestFeed(1);
                 }
@@ -316,7 +308,10 @@ public class FeedFragment extends BaseListFragment<List<SubscriptionEntity>, Voi
 
             @Override
             public void onError(Throwable exception) {
-                showSnackBarError(exception, UserAction.SUBSCRIPTION, NewPipe.getNameOfService(serviceId), url, 0);
+                showSnackBarError(exception,
+                        UserAction.SUBSCRIPTION,
+                        NewPipe.getNameOfService(serviceId),
+                        url, 0);
                 requestFeed(1);
                 onDone();
             }
@@ -361,12 +356,7 @@ public class FeedFragment extends BaseListFragment<List<SubscriptionEntity>, Voi
         delayHandler.removeCallbacksAndMessages(null);
         // Add a little of a delay when requesting more items because the cache is so fast,
         // that the view seems stuck to the user when he scroll to the bottom
-        delayHandler.postDelayed(new Runnable() {
-            @Override
-            public void run() {
-                requestFeed(FEED_LOAD_COUNT);
-            }
-        }, 300);
+        delayHandler.postDelayed(() -> requestFeed(FEED_LOAD_COUNT), 300);
     }
 
     @Override
@@ -423,7 +413,9 @@ public class FeedFragment extends BaseListFragment<List<SubscriptionEntity>, Voi
         int heightPixels = getResources().getDisplayMetrics().heightPixels;
         int itemHeightPixels = activity.getResources().getDimensionPixelSize(R.dimen.video_item_search_height);
 
-        int items = itemHeightPixels > 0 ? heightPixels / itemHeightPixels + OFF_SCREEN_ITEMS_COUNT : MIN_ITEMS_INITIAL_LOAD;
+        int items = itemHeightPixels > 0
+                ? heightPixels / itemHeightPixels + OFF_SCREEN_ITEMS_COUNT
+                : MIN_ITEMS_INITIAL_LOAD;
         return Math.max(MIN_ITEMS_INITIAL_LOAD, items);
     }
 
@@ -441,8 +433,14 @@ public class FeedFragment extends BaseListFragment<List<SubscriptionEntity>, Voi
     protected boolean onError(Throwable exception) {
         if (super.onError(exception)) return true;
 
-        int errorId = exception instanceof ExtractionException ? R.string.parsing_error : R.string.general_error;
-        onUnrecoverableError(exception, UserAction.SOMETHING_ELSE, "none", "Requesting feed", errorId);
+        int errorId = exception instanceof ExtractionException
+                ? R.string.parsing_error
+                : R.string.general_error;
+        onUnrecoverableError(exception,
+                UserAction.SOMETHING_ELSE,
+                "none",
+                "Requesting feed",
+                errorId);
         return true;
     }
 }

app/src/main/java/org/schabi/newpipe/local/history/StatisticsPlaylistFragment.java

@@ -21,6 +21,7 @@ import org.schabi.newpipe.R;
 import org.schabi.newpipe.database.LocalItem;
 import org.schabi.newpipe.database.stream.StreamStatisticsEntry;
 import org.schabi.newpipe.extractor.stream.StreamInfoItem;
+import org.schabi.newpipe.fragments.list.BaseListFragment;
 import org.schabi.newpipe.local.BaseLocalListFragment;
 import org.schabi.newpipe.info_list.InfoItemDialog;
 import org.schabi.newpipe.player.playqueue.PlayQueue;
@@ -73,7 +74,7 @@ public class StatisticsPlaylistFragment
                 return results;
             case MOST_PLAYED:
                 Collections.sort(results, (left, right) ->
-                        ((Long) right.watchCount).compareTo(left.watchCount));
+                        Long.compare(right.watchCount, left.watchCount));
                 return results;
             default: return null;
         }
@@ -96,6 +97,14 @@ public class StatisticsPlaylistFragment
         return inflater.inflate(R.layout.fragment_playlist, container, false);
     }
 
+    @Override
+    public void setUserVisibleHint(boolean isVisibleToUser) {
+        super.setUserVisibleHint(isVisibleToUser);
+        if (activity != null && isVisibleToUser) {
+            setTitle(activity.getString(R.string.title_activity_history));
+        }
+    }
+
     ///////////////////////////////////////////////////////////////////////////
     // Fragment LifeCycle - Views
     ///////////////////////////////////////////////////////////////////////////
@@ -103,7 +112,9 @@ public class StatisticsPlaylistFragment
     @Override
     protected void initViews(View rootView, Bundle savedInstanceState) {
         super.initViews(rootView, savedInstanceState);
-        setTitle(getString(R.string.title_last_played));
+        if(!useAsFrontPage) {
+            setTitle(getString(R.string.title_last_played));
+        }
     }
 
     @Override
@@ -129,8 +140,10 @@ public class StatisticsPlaylistFragment
             public void selected(LocalItem selectedItem) {
                 if (selectedItem instanceof StreamStatisticsEntry) {
                     final StreamStatisticsEntry item = (StreamStatisticsEntry) selectedItem;
-                    NavigationHelper.openVideoDetailFragment(getFragmentManager(),
-                            item.serviceId, item.url, item.title);
+                    NavigationHelper.openVideoDetailFragment(getFM(),
+                            item.serviceId,
+                            item.url,
+                            item.title);
                 }
             }
 
@@ -341,7 +354,7 @@ public class StatisticsPlaylistFragment
             final Disposable onDelete = recordManager.deleteStreamHistory(entry.streamId)
                     .observeOn(AndroidSchedulers.mainThread())
                     .subscribe(
-                            howManyDelted -> {
+                            howManyDeleted -> {
                                 if(getView() != null) {
                                     Snackbar.make(getView(), R.string.one_item_deleted,
                                             Snackbar.LENGTH_SHORT).show();

app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionFragment.java

@@ -13,6 +13,7 @@ import android.os.Parcelable;
 import android.support.annotation.DrawableRes;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
+import android.support.v4.app.FragmentManager;
 import android.support.v4.content.LocalBroadcastManager;
 import android.support.v7.app.ActionBar;
 import android.support.v7.app.AppCompatActivity;
@@ -209,7 +210,8 @@ public class SubscriptionFragment extends BaseStateFragment<List<SubscriptionEnt
     }
 
     private void setupImportFromItems(final ViewGroup listHolder) {
-        final View previousBackupItem = addItemView(getString(R.string.previous_export), ThemeHelper.resolveResourceIdFromAttr(getContext(), R.attr.ic_backup), listHolder);
+        final View previousBackupItem = addItemView(getString(R.string.previous_export),
+                ThemeHelper.resolveResourceIdFromAttr(getContext(), R.attr.ic_backup), listHolder);
         previousBackupItem.setOnClickListener(item -> onImportPreviousSelected());
 
         final int iconColor = ThemeHelper.isLightThemeSelected(getContext()) ? Color.BLACK : Color.WHITE;
@@ -241,8 +243,8 @@ public class SubscriptionFragment extends BaseStateFragment<List<SubscriptionEnt
     }
 
     private void onImportFromServiceSelected(int serviceId) {
-        if (getParentFragment() == null) return;
-        NavigationHelper.openSubscriptionsImportFragment(getParentFragment().getFragmentManager(), serviceId);
+        FragmentManager fragmentManager = getFM();
+        NavigationHelper.openSubscriptionsImportFragment(fragmentManager, serviceId);
     }
 
     private void onImportPreviousSelected() {
@@ -320,21 +322,19 @@ public class SubscriptionFragment extends BaseStateFragment<List<SubscriptionEnt
         infoListAdapter.setOnChannelSelectedListener(new OnClickGesture<ChannelInfoItem>() {
             @Override
             public void selected(ChannelInfoItem selectedItem) {
-                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);
-                }
+                final FragmentManager fragmentManager = getFM();
+                NavigationHelper.openChannelFragment(fragmentManager,
+                        selectedItem.getServiceId(),
+                        selectedItem.getUrl(),
+                        selectedItem.getName());
             }
         });
 
         //noinspection ConstantConditions
-        whatsNewItemListHeader.setOnClickListener(v ->
-                NavigationHelper.openWhatsNewFragment(getParentFragment().getFragmentManager()));
+        whatsNewItemListHeader.setOnClickListener(v -> {
+            FragmentManager fragmentManager = getFM();
+            NavigationHelper.openWhatsNewFragment(fragmentManager);
+        });
         importExportListHeader.setOnClickListener(v -> importExportOptions.switchState());
     }
 
@@ -405,10 +405,13 @@ public class SubscriptionFragment extends BaseStateFragment<List<SubscriptionEnt
 
     private List<InfoItem> getSubscriptionItems(List<SubscriptionEntity> subscriptions) {
         List<InfoItem> items = new ArrayList<>();
-        for (final SubscriptionEntity subscription : subscriptions) items.add(subscription.toChannelInfoItem());
+        for (final SubscriptionEntity subscription : subscriptions) {
+            items.add(subscription.toChannelInfoItem());
+        }
 
         Collections.sort(items,
-                (InfoItem o1, InfoItem o2) -> o1.getName().compareToIgnoreCase(o2.getName()));
+                (InfoItem o1, InfoItem o2) ->
+                        o1.getName().compareToIgnoreCase(o2.getName()));
         return items;
     }
 
@@ -437,7 +440,11 @@ public class SubscriptionFragment extends BaseStateFragment<List<SubscriptionEnt
         resetFragment();
         if (super.onError(exception)) return true;
 
-        onUnrecoverableError(exception, UserAction.SOMETHING_ELSE, "none", "Subscriptions", R.string.general_error);
+        onUnrecoverableError(exception,
+                UserAction.SOMETHING_ELSE,
+                "none",
+                "Subscriptions",
+                R.string.general_error);
         return true;
     }
 }

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

@@ -26,6 +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.NonNull;
 import android.support.annotation.Nullable;
@@ -343,6 +344,7 @@ public final class BackgroundPlayer extends Service {
 
             if (!shouldUpdateOnProgress) return;
             resetNotification();
+            if(Build.VERSION.SDK_INT >= 26 /*Oreo*/) updateNotificationThumbnail();
             if (bigNotRemoteView != null) {
                 bigNotRemoteView.setProgressBar(R.id.notificationProgressBar, duration, currentProgress, false);
                 bigNotRemoteView.setTextViewText(R.id.notificationTime, getTimeString(currentProgress) + " / " + getTimeString(duration));

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

@@ -51,6 +51,7 @@ import com.nostra13.universalimageloader.core.ImageLoader;
 import com.nostra13.universalimageloader.core.assist.FailReason;
 import com.nostra13.universalimageloader.core.listener.ImageLoadingListener;
 
+import org.schabi.newpipe.BuildConfig;
 import org.schabi.newpipe.Downloader;
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.extractor.stream.StreamInfo;
@@ -96,7 +97,7 @@ import static com.google.android.exoplayer2.Player.DISCONTINUITY_REASON_SEEK_ADJ
 public abstract class BasePlayer implements
         Player.EventListener, PlaybackListener, ImageLoadingListener {
 
-    public static final boolean DEBUG = true;
+    public static final boolean DEBUG = !BuildConfig.BUILD_TYPE.equals("release");
     @NonNull public static final String TAG = "BasePlayer";
 
     @NonNull final protected Context context;
@@ -172,7 +173,6 @@ public abstract class BasePlayer implements
         };
         this.intentFilter = new IntentFilter();
         setupBroadcastReceiver(intentFilter);
-        context.registerReceiver(broadcastReceiver, intentFilter);
 
         this.recordManager = new HistoryRecordManager(context);
 
@@ -209,6 +209,8 @@ public abstract class BasePlayer implements
         audioReactor = new AudioReactor(context, simpleExoPlayer);
         mediaSessionManager = new MediaSessionManager(context, simpleExoPlayer,
                 new BasePlayerMediaSession(this));
+
+        registerBroadcastReceiver();
     }
 
     public void initListeners() {}
@@ -359,11 +361,17 @@ public abstract class BasePlayer implements
         }
     }
 
-    public void unregisterBroadcastReceiver() {
+    protected void registerBroadcastReceiver() {
+        // Try to unregister current first
+        unregisterBroadcastReceiver();
+        context.registerReceiver(broadcastReceiver, intentFilter);
+    }
+
+    protected void unregisterBroadcastReceiver() {
         try {
             context.unregisterReceiver(broadcastReceiver);
         } catch (final IllegalArgumentException unregisteredException) {
-            Log.e(TAG, "Broadcast receiver already unregistered.", unregisteredException);
+            Log.w(TAG, "Broadcast receiver already unregistered (" + unregisteredException.getMessage() + ")");
         }
     }
 
@@ -1001,6 +1009,8 @@ public abstract class BasePlayer implements
         try {
             metadata = (MediaSourceTag) simpleExoPlayer.getCurrentTag();
         } catch (IndexOutOfBoundsException | ClassCastException error) {
+            if(DEBUG) Log.d(TAG, "Could not update metadata: " + error.getMessage());
+            if(DEBUG) error.printStackTrace();
             return;
         }
 
@@ -1087,6 +1097,9 @@ public abstract class BasePlayer implements
             return simpleExoPlayer.isCurrentWindowDynamic();
         } catch (@NonNull IndexOutOfBoundsException ignored) {
             // Why would this even happen =(
+            // But lets log it anyway. Save is save
+            if(DEBUG) Log.d(TAG, "Could not update metadata: " + ignored.getMessage());
+            if(DEBUG) ignored.printStackTrace();
             return false;
         }
     }

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

@@ -16,6 +16,7 @@ import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
+import android.view.ViewGroup;
 import android.widget.ImageButton;
 import android.widget.LinearLayout;
 import android.widget.PopupMenu;
@@ -562,6 +563,12 @@ public abstract class ServicePlayerActivity extends AppCompatActivity
         if (player != null) {
             progressLiveSync.setClickable(!player.isLiveEdge());
         }
+
+        // this will make shure progressCurrentTime has the same width as progressEndTime
+        final ViewGroup.LayoutParams endTimeParams = progressEndTime.getLayoutParams();
+        final ViewGroup.LayoutParams currentTimeParams = progressCurrentTime.getLayoutParams();
+        currentTimeParams.width = progressEndTime.getWidth();
+        progressCurrentTime.setLayoutParams(currentTimeParams);
     }
 
     @Override

app/src/main/java/org/schabi/newpipe/player/helper/PlayerHelper.java

@@ -251,10 +251,6 @@ public class PlayerHelper {
         return true;
     }
 
-    public static int getShutdownFlingVelocity(@NonNull final Context context) {
-        return 6000;
-    }
-
     public static int getTossFlingVelocity(@NonNull final Context context) {
         return 2500;
     }

app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueue.java

@@ -6,6 +6,7 @@ import android.util.Log;
 
 import org.reactivestreams.Subscriber;
 import org.reactivestreams.Subscription;
+import org.schabi.newpipe.BuildConfig;
 import org.schabi.newpipe.player.playqueue.events.AppendEvent;
 import org.schabi.newpipe.player.playqueue.events.ErrorEvent;
 import org.schabi.newpipe.player.playqueue.events.InitEvent;
@@ -41,7 +42,7 @@ import io.reactivex.subjects.BehaviorSubject;
 public abstract class PlayQueue implements Serializable {
     private final String TAG = "PlayQueue@" + Integer.toHexString(hashCode());
 
-    public static final boolean DEBUG = true;
+    public static final boolean DEBUG = !BuildConfig.BUILD_TYPE.equals("release");
 
     private ArrayList<PlayQueueItem> backup;
     private ArrayList<PlayQueueItem> streams;

app/src/main/java/org/schabi/newpipe/report/UserAction.java

@@ -15,7 +15,8 @@ public enum UserAction {
     REQUESTED_CHANNEL("requested channel"),
     REQUESTED_PLAYLIST("requested playlist"),
     REQUESTED_KIOSK("requested kiosk"),
-    DELETE_FROM_HISTORY("delete from history");
+    DELETE_FROM_HISTORY("delete from history"),
+    PLAY_STREAM("Play stream");
 
 
     private final String message;

app/src/main/java/org/schabi/newpipe/settings/ContentSettingsFragment.java

@@ -9,6 +9,7 @@ import android.os.Bundle;
 import android.preference.PreferenceManager;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
 import android.support.v7.preference.ListPreference;
 import android.support.v7.preference.Preference;
 import android.util.Log;
@@ -20,15 +21,12 @@ import com.nostra13.universalimageloader.core.ImageLoader;
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.extractor.NewPipe;
 import org.schabi.newpipe.extractor.StreamingService;
-import org.schabi.newpipe.extractor.exceptions.ExtractionException;
 import org.schabi.newpipe.report.ErrorActivity;
 import org.schabi.newpipe.report.UserAction;
-import org.schabi.newpipe.util.Constants;
 import org.schabi.newpipe.util.FilePickerActivityHelper;
 import org.schabi.newpipe.util.KioskTranslator;
 import org.schabi.newpipe.util.ZipHelper;
 
-import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
@@ -42,11 +40,8 @@ import java.util.Date;
 import java.util.Locale;
 import java.util.Map;
 import java.util.zip.ZipFile;
-import java.util.zip.ZipInputStream;
 import java.util.zip.ZipOutputStream;
 
-import static android.content.Context.MODE_PRIVATE;
-
 public class ContentSettingsFragment extends BasePreferenceFragment {
 
     private static final int REQUEST_IMPORT_PATH = 8945;
@@ -98,68 +93,6 @@ public class ContentSettingsFragment extends BasePreferenceFragment {
 
         addPreferencesFromResource(R.xml.content_settings);
 
-        final ListPreference mainPageContentPref =  (ListPreference) findPreference(getString(R.string.main_page_content_key));
-        mainPageContentPref.setOnPreferenceChangeListener((Preference preference, Object newValueO) -> {
-            final String newValue = newValueO.toString();
-
-            final String mainPrefOldValue =
-                    defaultPreferences.getString(getString(R.string.main_page_content_key), "blank_page");
-            final String mainPrefOldSummary = getMainPagePrefSummery(mainPrefOldValue, mainPageContentPref);
-
-            if(newValue.equals(getString(R.string.kiosk_page_key))) {
-                SelectKioskFragment selectKioskFragment = new SelectKioskFragment();
-                selectKioskFragment.setOnSelectedLisener((String kioskId, int service_id) -> {
-                    defaultPreferences.edit()
-                            .putInt(getString(R.string.main_page_selected_service), service_id).apply();
-                    defaultPreferences.edit()
-                            .putString(getString(R.string.main_page_selectd_kiosk_id), kioskId).apply();
-                    String serviceName = "";
-                    try {
-                        serviceName = NewPipe.getService(service_id).getServiceInfo().getName();
-                    } catch (ExtractionException e) {
-                        onError(e);
-                    }
-                    String kioskName = KioskTranslator.getTranslatedKioskName(kioskId,
-                            getContext());
-
-                    String summary =
-                            String.format(getString(R.string.service_kiosk_string),
-                                    serviceName,
-                                    kioskName);
-
-                    mainPageContentPref.setSummary(summary);
-                });
-                selectKioskFragment.setOnCancelListener(() -> {
-                    mainPageContentPref.setSummary(mainPrefOldSummary);
-                    mainPageContentPref.setValue(mainPrefOldValue);
-                });
-                selectKioskFragment.show(getFragmentManager(), "select_kiosk");
-            } else if(newValue.equals(getString(R.string.channel_page_key))) {
-                SelectChannelFragment selectChannelFragment = new SelectChannelFragment();
-                selectChannelFragment.setOnSelectedLisener((String url, String name, int service) -> {
-                    defaultPreferences.edit()
-                            .putInt(getString(R.string.main_page_selected_service), service).apply();
-                    defaultPreferences.edit()
-                            .putString(getString(R.string.main_page_selected_channel_url), url).apply();
-                    defaultPreferences.edit()
-                            .putString(getString(R.string.main_page_selected_channel_name), name).apply();
-
-                    mainPageContentPref.setSummary(name);
-                });
-                selectChannelFragment.setOnCancelListener(() -> {
-                    mainPageContentPref.setSummary(mainPrefOldSummary);
-                    mainPageContentPref.setValue(mainPrefOldValue);
-                });
-                selectChannelFragment.show(getFragmentManager(), "select_channel");
-            } else {
-                mainPageContentPref.setSummary(getMainPageSummeryByKey(newValue));
-            }
-
-            defaultPreferences.edit().putBoolean(Constants.KEY_MAIN_PAGE_CHANGE, true).apply();
-
-            return true;
-        });
-
         Preference importDataPreference = findPreference(getString(R.string.import_data));
         importDataPreference.setOnPreferenceClickListener((Preference p) -> {
             Intent i = new Intent(getActivity(), FilePickerActivityHelper.class)
@@ -349,66 +282,6 @@ public class ContentSettingsFragment extends BasePreferenceFragment {
         }
     }
 
-    @Override
-    public void onResume() {
-        super.onResume();
-
-        final String mainPageContentKey = getString(R.string.main_page_content_key);
-        final Preference mainPagePref = findPreference(getString(R.string.main_page_content_key));
-        final String bpk = getString(R.string.blank_page_key);
-        if(defaultPreferences.getString(mainPageContentKey, bpk)
-                .equals(getString(R.string.channel_page_key))) {
-            mainPagePref.setSummary(defaultPreferences.getString(getString(R.string.main_page_selected_channel_name), "error"));
-        } else if(defaultPreferences.getString(mainPageContentKey, bpk)
-                .equals(getString(R.string.kiosk_page_key))) {
-            try {
-                StreamingService service = NewPipe.getService(
-                        defaultPreferences.getInt(
-                                getString(R.string.main_page_selected_service), 0));
-
-                String kioskName = KioskTranslator.getTranslatedKioskName(
-                        defaultPreferences.getString(
-                                getString(R.string.main_page_selectd_kiosk_id), "Trending"),
-                        getContext());
-
-                String summary =
-                        String.format(getString(R.string.service_kiosk_string),
-                                service.getServiceInfo().getName(),
-                                kioskName);
-
-                mainPagePref.setSummary(summary);
-            } catch (Exception e) {
-                onError(e);
-            }
-        }
-    }
-
-    /*//////////////////////////////////////////////////////////////////////////
-    // Utils
-    //////////////////////////////////////////////////////////////////////////*/
-    private String getMainPagePrefSummery(final String mainPrefOldValue, final ListPreference mainPageContentPref) {
-        if(mainPrefOldValue.equals(getString(R.string.channel_page_key))) {
-            return defaultPreferences.getString(getString(R.string.main_page_selected_channel_name), "error");
-        } else {
-            return mainPageContentPref.getSummary().toString();
-        }
-    }
-
-    private int getMainPageSummeryByKey(final String key) {
-        if(key.equals(getString(R.string.blank_page_key))) {
-            return R.string.blank_page_summary;
-        } else if(key.equals(getString(R.string.kiosk_page_key))) {
-            return R.string.kiosk_page_summary;
-        } else if(key.equals(getString(R.string.feed_page_key))) {
-            return R.string.feed_page_summary;
-        } else if(key.equals(getString(R.string.subscription_page_key))) {
-            return R.string.subscription_page_summary;
-        } else if(key.equals(getString(R.string.channel_page_key))) {
-            return R.string.channel_page_summary;
-        }
-        return R.string.blank_page_summary;
-    }
-
     /*//////////////////////////////////////////////////////////////////////////
     // Error
     //////////////////////////////////////////////////////////////////////////*/

app/src/main/java/org/schabi/newpipe/settings/NewPipeSettings.java

@@ -71,7 +71,7 @@ public class NewPipeSettings {
     }
 
     public static File getVideoDownloadFolder(Context context) {
-        return getFolder(context, R.string.download_path_key, Environment.DIRECTORY_MOVIES);
+        return getDir(context, R.string.download_path_key, Environment.DIRECTORY_MOVIES);
     }
 
     public static String getVideoDownloadPath(Context context) {
@@ -81,7 +81,7 @@ public class NewPipeSettings {
     }
 
     public static File getAudioDownloadFolder(Context context) {
-        return getFolder(context, R.string.download_path_audio_key, Environment.DIRECTORY_MUSIC);
+        return getDir(context, R.string.download_path_audio_key, Environment.DIRECTORY_MUSIC);
     }
 
     public static String getAudioDownloadPath(Context context) {
@@ -90,21 +90,37 @@ public class NewPipeSettings {
         return prefs.getString(key, Environment.DIRECTORY_MUSIC);
     }
 
-    private static File getFolder(Context context, int keyID, String defaultDirectoryName) {
+    private static File getDir(Context context, int keyID, String defaultDirectoryName) {
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
         final String key = context.getString(keyID);
         String downloadPath = prefs.getString(key, null);
         if ((downloadPath != null) && (!downloadPath.isEmpty())) return new File(downloadPath.trim());
 
-        final File folder = getFolder(defaultDirectoryName);
+        final File dir = getDir(defaultDirectoryName);
         SharedPreferences.Editor spEditor = prefs.edit();
-        spEditor.putString(key, new File(folder, "NewPipe").getAbsolutePath());
+        spEditor.putString(key, getNewPipeChildFolderPathForDir(dir));
         spEditor.apply();
-        return folder;
+        return dir;
     }
 
     @NonNull
-    private static File getFolder(String defaultDirectoryName) {
+    private static File getDir(String defaultDirectoryName) {
         return new File(Environment.getExternalStorageDirectory(), defaultDirectoryName);
     }
+
+    public static void resetDownloadFolders(Context context) {
+        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
+        resetDownloadFolder(prefs, context.getString(R.string.download_path_audio_key), Environment.DIRECTORY_MUSIC);
+        resetDownloadFolder(prefs, context.getString(R.string.download_path_key), Environment.DIRECTORY_MOVIES);
+    }
+
+    private static void resetDownloadFolder(SharedPreferences prefs, String key, String defaultDirectoryName) {
+        SharedPreferences.Editor spEditor = prefs.edit();
+        spEditor.putString(key, getNewPipeChildFolderPathForDir(getDir(defaultDirectoryName)));
+        spEditor.apply();
+    }
+
+    private static String getNewPipeChildFolderPathForDir(File dir) {
+        return new File(dir, "NewPipe").getAbsolutePath();
+    }
 }

app/src/main/java/org/schabi/newpipe/settings/SelectChannelFragment.java

@@ -66,7 +66,7 @@ public class SelectChannelFragment extends DialogFragment {
     //////////////////////////////////////////////////////////////////////////*/
 
     public interface OnSelectedLisener {
-        void onChannelSelected(String url, String name, int service);
+        void onChannelSelected(int serviceId, String url, String name);
     }
     OnSelectedLisener onSelectedLisener = null;
     public void setOnSelectedLisener(OnSelectedLisener listener) {
@@ -126,7 +126,7 @@ public class SelectChannelFragment extends DialogFragment {
     private void clickedItem(int position) {
         if(onSelectedLisener != null) {
             SubscriptionEntity entry = subscriptions.get(position);
-            onSelectedLisener.onChannelSelected(entry.getUrl(), entry.getName(), entry.getServiceId());
+            onSelectedLisener.onChannelSelected(entry.getServiceId(), entry.getUrl(), entry.getName());
         }
         dismiss();
     }

app/src/main/java/org/schabi/newpipe/settings/SelectKioskFragment.java

@@ -56,7 +56,7 @@ public class SelectKioskFragment extends DialogFragment {
     //////////////////////////////////////////////////////////////////////////*/
 
     public interface OnSelectedLisener {
-        void onKioskSelected(String kioskId, int service_id);
+        void onKioskSelected(int serviceId, String kioskId, String kioskName);
     }
 
     OnSelectedLisener onSelectedLisener = null;
@@ -101,7 +101,7 @@ public class SelectKioskFragment extends DialogFragment {
 
     private void clickedItem(SelectKioskAdapter.Entry entry) {
         if(onSelectedLisener != null) {
-            onSelectedLisener.onKioskSelected(entry.kioskId, entry.serviceId);
+            onSelectedLisener.onKioskSelected(entry.serviceId, entry.kioskId, entry.kioskName);
         }
         dismiss();
     }

app/src/main/java/org/schabi/newpipe/settings/SettingsActivity.java

@@ -77,7 +77,8 @@ public class SettingsActivity extends AppCompatActivity implements BasePreferenc
                 finish();
             } else getSupportFragmentManager().popBackStack();
         }
-        return true;
+
+        return super.onOptionsItemSelected(item);
     }
 
     @Override

app/src/main/java/org/schabi/newpipe/settings/tabs/AddTabDialog.java

@@ -0,0 +1,94 @@
+package org.schabi.newpipe.settings.tabs;
+
+import android.app.AlertDialog;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.support.annotation.DrawableRes;
+import android.support.annotation.NonNull;
+import android.support.v7.widget.AppCompatImageView;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+import android.widget.TextView;
+
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.util.ThemeHelper;
+
+public class AddTabDialog {
+    private final AlertDialog dialog;
+
+    AddTabDialog(@NonNull final Context context,
+                 @NonNull final ChooseTabListItem[] items,
+                 @NonNull final DialogInterface.OnClickListener actions) {
+
+        dialog = new AlertDialog.Builder(context)
+                .setTitle(context.getString(R.string.tab_choose))
+                .setAdapter(new DialogListAdapter(context, items), actions)
+                .create();
+    }
+
+    public void show() {
+        dialog.show();
+    }
+
+    public static final class ChooseTabListItem {
+        final int tabId;
+        final String itemName;
+        @DrawableRes final int itemIcon;
+
+        ChooseTabListItem(Context context, Tab tab) {
+            this(tab.getTabId(), tab.getTabName(context), tab.getTabIconRes(context));
+        }
+
+        ChooseTabListItem(int tabId, String itemName, @DrawableRes int itemIcon) {
+            this.tabId = tabId;
+            this.itemName = itemName;
+            this.itemIcon = itemIcon;
+        }
+    }
+
+    private static class DialogListAdapter extends BaseAdapter {
+        private final LayoutInflater inflater;
+        private final ChooseTabListItem[] items;
+
+        @DrawableRes private final int fallbackIcon;
+
+        private DialogListAdapter(Context context, ChooseTabListItem[] items) {
+            this.inflater = LayoutInflater.from(context);
+            this.items = items;
+            this.fallbackIcon = ThemeHelper.resolveResourceIdFromAttr(context, R.attr.ic_hot);
+        }
+
+        @Override
+        public int getCount() {
+            return items.length;
+        }
+
+        @Override
+        public ChooseTabListItem getItem(int position) {
+            return items[position];
+        }
+
+        @Override
+        public long getItemId(int position) {
+            return getItem(position).tabId;
+        }
+
+        @Override
+        public View getView(int position, View convertView, ViewGroup parent) {
+            if (convertView == null) {
+                convertView = inflater.inflate(R.layout.list_choose_tabs_dialog, parent, false);
+            }
+
+            final ChooseTabListItem item = getItem(position);
+            final AppCompatImageView tabIconView = convertView.findViewById(R.id.tabIcon);
+            final TextView tabNameView = convertView.findViewById(R.id.tabName);
+
+            tabIconView.setImageResource(item.itemIcon > 0 ? item.itemIcon : fallbackIcon);
+            tabNameView.setText(item.itemName);
+
+            return convertView;
+        }
+    }
+}