move on to v0.11.4

Add subject to shared URL's (fixes #975)

CheckTranslations.java

@@ -17,7 +17,8 @@ public final class CheckTranslations {
     private static boolean remove = false;
     private static int checks = 0;
     private static int matches = 0;
-    private static Pattern p, e;
+    private static int changes = 0;
+    private static Pattern p, pb, pe, e, o;
 
     /**
      * Search translated strings.xml files for empty item / plural tags
@@ -56,7 +57,10 @@ public final class CheckTranslations {
         }
 
         p = Pattern.compile("(<item quantity=\")(zero|one|two|three|few|many|other)(\"></item>|\"/>)");
+        pb = Pattern.compile("(<plurals[\\sa-zA-Z=\"]*>)");
+        pe = Pattern.compile("(</plurals>)");
         e = Pattern.compile("(<string[\\sa-z_\\\"=]*)((><\\/string>|\\/>){1})");
+        o = Pattern.compile("(<item quantity=\"other\">)[^</>]*(<\\/item>)");
 
         for (int i = 0; i < args.length; i++) {
             if (!args[i].equals("-d") && !args[i].equals("-p") && !args[i].equals("-e") && !args[i].equals("-r")) {
@@ -73,7 +77,9 @@ public final class CheckTranslations {
 
         System.out.println(checks + " files were checked.");
         System.out.println(matches + " corrupt lines detected.");
-        if (remove) System.out.println(matches + " corrupt lines removed.");
+        if (remove) {
+            System.out.println(matches + " corrupt lines removed and " + changes + " lines fixed.");
+        }
     }
 
 
@@ -101,7 +107,8 @@ public final class CheckTranslations {
 
         List<String> lines = new ArrayList<String>();
         boolean checkFailed = false;
-
+        boolean otherDetected = false;
+        boolean inPlurals = false;
         try (BufferedReader br = new BufferedReader(new FileReader(f))) {
             String line;
             int ln = 0;
@@ -120,6 +127,38 @@ public final class CheckTranslations {
                 }
             }
             br.close();
+            int pluralsLine = 0;
+            for (int i = 0; i < lines.size(); i++) {
+                if (o.matcher(lines.get(i)).find()) {
+                    otherDetected = true;
+                }
+                if (plurals && pb.matcher(lines.get(i)).find()) {
+                    inPlurals = true;
+                    pluralsLine = i;
+                } else if (plurals && pe.matcher(lines.get(i)).find()) {
+                    inPlurals = false;
+                    if (!otherDetected) {
+                        boolean b = false;
+                        check: for(int j = pluralsLine; j < i; j++) {
+                            if (lines.get(j).contains("many")) {
+                                b = true;
+                                pluralsLine = j;
+                                break check;
+                            }
+                        }
+                        if (remove && b) {
+                            if (debug) System.out.println("    Line " + (pluralsLine + 1) + " was " + ((remove) ? "changed" : "detected") + ": '" + lines.get(pluralsLine) + "'");
+                            lines.set(pluralsLine, lines.get(pluralsLine).replace("many", "other"));
+                            changes++;
+                            checkFailed = true;
+                        } else if (debug) {
+                            if (debug) System.out.println("    WARNING: Line " + (i + 1) + " - No <item quantity=\"other\"> found!");
+                        }
+                    }
+                    otherDetected = false;
+                }
+                 
+            }
             if (remove && checkFailed) {
                 Files.write(f.toPath(), lines, Charset.forName("UTF-8"));
             }

app/build.gradle

@@ -8,8 +8,8 @@ android {
         applicationId "org.schabi.newpipe"
         minSdkVersion 15
         targetSdkVersion 27
-        versionCode 44
-        versionName "0.11.3"
+        versionCode 45
+        versionName "0.11.4"
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
@@ -42,8 +42,8 @@ android {
         abortOnError false
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_7
-        targetCompatibility JavaVersion.VERSION_1_7
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
     }
 }
 
@@ -55,7 +55,7 @@ dependencies {
         exclude module: 'support-annotations'
     }
 
-    implementation 'com.github.TeamNewPipe:NewPipeExtractor:5f2d0cf6b5dfac2965b1cf400'
+    implementation 'com.github.TeamNewPipe:NewPipeExtractor:9de63f8c0a170a066'
 
     testImplementation 'junit:junit:4.12'
     testImplementation 'org.mockito:mockito-core:1.10.19'

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

@@ -18,9 +18,8 @@ public class RouterPopupActivity extends RouterActivity {
 
     @Override
     protected void handleUrl(String url) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M
-                && !PermissionHelper.checkSystemAlertWindowPermission(this)) {
-            Toast.makeText(this, R.string.msg_popup_permission, Toast.LENGTH_LONG).show();
+        if (!PermissionHelper.isPopupEnabled(this)) {
+            PermissionHelper.showPopupEnablementToast(this);
             finish();
             return;
         }

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

@@ -19,6 +19,7 @@ import org.schabi.newpipe.MainActivity;
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.ReCaptchaActivity;
 import org.schabi.newpipe.extractor.exceptions.ReCaptchaException;
+import org.schabi.newpipe.extractor.stream.StreamInfo;
 import org.schabi.newpipe.report.ErrorActivity;
 import org.schabi.newpipe.report.UserAction;
 import org.schabi.newpipe.util.ExtractorHelper;
@@ -249,12 +250,13 @@ public abstract class BaseStateFragment<I> extends BaseFragment implements ViewC
 
     protected void openUrlInBrowser(String url) {
         Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(url));
-        startActivity(intent);
+        startActivity(Intent.createChooser(intent, activity.getString(R.string.share_dialog_title)));
     }
 
-    protected void shareUrl(String url) {
+    protected void shareUrl(String subject, String url) {
         Intent intent = new Intent(Intent.ACTION_SEND);
         intent.setType("text/plain");
+        intent.putExtra(Intent.EXTRA_SUBJECT, subject);
         intent.putExtra(Intent.EXTRA_TEXT, url);
         startActivity(Intent.createChooser(intent, getString(R.string.share_dialog_title)));
     }

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

@@ -505,7 +505,7 @@ public class VideoDetailFragment extends BaseStateFragment<StreamInfo> implement
                         NavigationHelper.enqueueOnBackgroundPlayer(context, new SinglePlayQueue(item));
                         break;
                     case 1:
-                        NavigationHelper.enqueueOnPopupPlayer(context, new SinglePlayQueue(item));
+                        NavigationHelper.enqueueOnPopupPlayer(getActivity(), new SinglePlayQueue(item));
                         break;
                     default:
                         break;
@@ -623,12 +623,7 @@ public class VideoDetailFragment extends BaseStateFragment<StreamInfo> implement
         if (DEBUG) Log.d(TAG, "setupActionBarHandler() called with: info = [" + info + "]");
         sortedStreamVideosList = new ArrayList<>(ListHelper.getSortedStreamVideosList(activity, info.getVideoStreams(), info.getVideoOnlyStreams(), false));
         actionBarHandler.setupStreamList(sortedStreamVideosList, spinnerToolbar);
-        actionBarHandler.setOnShareListener(new ActionBarHandler.OnActionListener() {
-            @Override
-            public void onActionSelected(int selectedStreamId) {
-                shareUrl(info.getUrl());
-            }
-        });
+        actionBarHandler.setOnShareListener(selectedStreamId -> shareUrl(info.name, info.url));
 
         actionBarHandler.setOnOpenInBrowserListener(new ActionBarHandler.OnActionListener() {
             @Override
@@ -813,11 +808,8 @@ public class VideoDetailFragment extends BaseStateFragment<StreamInfo> implement
     }
 
     private void openPopupPlayer(final boolean append) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M && !PermissionHelper.checkSystemAlertWindowPermission(activity)) {
-            Toast toast = Toast.makeText(activity, R.string.msg_popup_permission, Toast.LENGTH_LONG);
-            TextView messageView = toast.getView().findViewById(android.R.id.message);
-            if (messageView != null) messageView.setGravity(Gravity.CENTER);
-            toast.show();
+        if (!PermissionHelper.isPopupEnabled(activity)) {
+            PermissionHelper.showPopupEnablementToast(activity);
             return;
         }
 

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

@@ -1,16 +1,21 @@
 package org.schabi.newpipe.fragments.list;
 
+import android.app.Activity;
 import android.content.Context;
 import android.content.DialogInterface;
+import android.os.Build;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.v7.app.ActionBar;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.util.Log;
+import android.view.Gravity;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.View;
+import android.widget.TextView;
+import android.widget.Toast;
 
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.extractor.InfoItem;
@@ -24,6 +29,7 @@ import org.schabi.newpipe.info_list.InfoItemDialog;
 import org.schabi.newpipe.info_list.InfoListAdapter;
 import org.schabi.newpipe.playlist.SinglePlayQueue;
 import org.schabi.newpipe.util.NavigationHelper;
+import org.schabi.newpipe.util.PermissionHelper;
 import org.schabi.newpipe.util.StateSaver;
 
 import java.util.List;
@@ -192,6 +198,7 @@ public abstract class BaseListFragment<I, N> extends BaseStateFragment<I> implem
 
     protected void showStreamDialog(final StreamInfoItem item) {
         final Context context = getContext();
+        final Activity activity = getActivity();
         if (context == null || context.getResources() == null || getActivity() == null) return;
 
         final String[] commands = new String[]{
@@ -207,7 +214,7 @@ public abstract class BaseListFragment<I, N> extends BaseStateFragment<I> implem
                         NavigationHelper.enqueueOnBackgroundPlayer(context, new SinglePlayQueue(item));
                         break;
                     case 1:
-                        NavigationHelper.enqueueOnPopupPlayer(context, new SinglePlayQueue(item));
+                        NavigationHelper.enqueueOnPopupPlayer(activity, new SinglePlayQueue(item));
                         break;
                     default:
                         break;

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

@@ -1,10 +1,10 @@
 package org.schabi.newpipe.fragments.list.channel;
 
+import android.app.Activity;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.net.Uri;
-import android.os.Build;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
@@ -12,7 +12,6 @@ import android.support.v4.content.ContextCompat;
 import android.support.v7.app.ActionBar;
 import android.text.TextUtils;
 import android.util.Log;
-import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -23,7 +22,6 @@ import android.widget.Button;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
-import android.widget.Toast;
 
 import com.jakewharton.rxbinding2.view.RxView;
 
@@ -153,6 +151,7 @@ public class ChannelFragment extends BaseListInfoFragment<ChannelInfo> {
 
     @Override
     protected void showStreamDialog(final StreamInfoItem item) {
+        final Activity activity = getActivity();
         final Context context = getContext();
         if (context == null || context.getResources() == null || getActivity() == null) return;
 
@@ -173,7 +172,7 @@ public class ChannelFragment extends BaseListInfoFragment<ChannelInfo> {
                         NavigationHelper.enqueueOnBackgroundPlayer(context, new SinglePlayQueue(item));
                         break;
                     case 1:
-                        NavigationHelper.enqueueOnPopupPlayer(context, new SinglePlayQueue(item));
+                        NavigationHelper.enqueueOnPopupPlayer(activity, new SinglePlayQueue(item));
                         break;
                     case 2:
                         NavigationHelper.playOnMainPlayer(context, getPlayQueue(index));
@@ -182,7 +181,7 @@ public class ChannelFragment extends BaseListInfoFragment<ChannelInfo> {
                         NavigationHelper.playOnBackgroundPlayer(context, getPlayQueue(index));
                         break;
                     case 4:
-                        NavigationHelper.playOnPopupPlayer(context, getPlayQueue(index));
+                        NavigationHelper.playOnPopupPlayer(activity, getPlayQueue(index));
                         break;
                     default:
                         break;
@@ -232,7 +231,7 @@ public class ChannelFragment extends BaseListInfoFragment<ChannelInfo> {
                 openUrlInBrowser(url);
                 break;
             case R.id.menu_item_share: {
-                shareUrl(url);
+                shareUrl(name, url);
                 break;
             }
             default:
@@ -454,13 +453,6 @@ public class ChannelFragment extends BaseListInfoFragment<ChannelInfo> {
         headerPopupButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M && !PermissionHelper.checkSystemAlertWindowPermission(activity)) {
-                    Toast toast = Toast.makeText(activity, R.string.msg_popup_permission, Toast.LENGTH_LONG);
-                    TextView messageView = toast.getView().findViewById(android.R.id.message);
-                    if (messageView != null) messageView.setGravity(Gravity.CENTER);
-                    toast.show();
-                    return;
-                }
                 NavigationHelper.playOnPopupPlayer(activity, getPlayQueue());
             }
         });

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

@@ -143,8 +143,8 @@ public class KioskFragment extends BaseListInfoFragment<KioskInfo> {
     public Single<KioskInfo> loadResult(boolean forceReload) {
         String contentCountry = PreferenceManager
                 .getDefaultSharedPreferences(activity)
-                .getString(getString(R.string.search_language_key),
-                        getString(R.string.default_language_value));
+                .getString(getString(R.string.content_country_key),
+                        getString(R.string.default_country_value));
         return ExtractorHelper.getKioskInfo(serviceId, url, contentCountry, forceReload);
     }
 
@@ -152,8 +152,8 @@ public class KioskFragment extends BaseListInfoFragment<KioskInfo> {
     public Single<ListExtractor.NextItemsResult> loadMoreItemsLogic() {
         String contentCountry = PreferenceManager
                 .getDefaultSharedPreferences(activity)
-                .getString(getString(R.string.search_language_key),
-                        getString(R.string.default_language_value));
+                .getString(getString(R.string.content_country_key),
+                        getString(R.string.default_country_value));
         return ExtractorHelper.getMoreKioskItems(serviceId, url, currentNextItemsUrl, contentCountry);
     }
 

app/src/main/java/org/schabi/newpipe/fragments/list/playlist/PlaylistFragment.java

@@ -1,14 +1,13 @@
 package org.schabi.newpipe.fragments.list.playlist;
 
+import android.app.Activity;
 import android.content.Context;
 import android.content.DialogInterface;
-import android.os.Build;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.text.TextUtils;
 import android.util.Log;
-import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -17,7 +16,6 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
-import android.widget.Toast;
 
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.extractor.ListExtractor;
@@ -33,7 +31,6 @@ import org.schabi.newpipe.playlist.SinglePlayQueue;
 import org.schabi.newpipe.report.UserAction;
 import org.schabi.newpipe.util.ExtractorHelper;
 import org.schabi.newpipe.util.NavigationHelper;
-import org.schabi.newpipe.util.PermissionHelper;
 
 import io.reactivex.Single;
 
@@ -102,6 +99,7 @@ public class PlaylistFragment extends BaseListInfoFragment<PlaylistInfo> {
     @Override
     protected void showStreamDialog(final StreamInfoItem item) {
         final Context context = getContext();
+        final Activity activity = getActivity();
         if (context == null || context.getResources() == null || getActivity() == null) return;
 
         final String[] commands = new String[]{
@@ -121,7 +119,7 @@ public class PlaylistFragment extends BaseListInfoFragment<PlaylistInfo> {
                         NavigationHelper.enqueueOnBackgroundPlayer(context, new SinglePlayQueue(item));
                         break;
                     case 1:
-                        NavigationHelper.enqueueOnPopupPlayer(context, new SinglePlayQueue(item));
+                        NavigationHelper.enqueueOnPopupPlayer(activity, new SinglePlayQueue(item));
                         break;
                     case 2:
                         NavigationHelper.playOnMainPlayer(context, getPlayQueue(index));
@@ -130,7 +128,7 @@ public class PlaylistFragment extends BaseListInfoFragment<PlaylistInfo> {
                         NavigationHelper.playOnBackgroundPlayer(context, getPlayQueue(index));
                         break;
                     case 4:
-                        NavigationHelper.playOnPopupPlayer(context, getPlayQueue(index));
+                        NavigationHelper.playOnPopupPlayer(activity, getPlayQueue(index));
                         break;
                     default:
                         break;
@@ -169,7 +167,7 @@ public class PlaylistFragment extends BaseListInfoFragment<PlaylistInfo> {
                 openUrlInBrowser(url);
                 break;
             case R.id.menu_item_share: {
-                shareUrl(url);
+                shareUrl(name, url);
                 break;
             }
             default:
@@ -230,13 +228,6 @@ public class PlaylistFragment extends BaseListInfoFragment<PlaylistInfo> {
         headerPopupButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M && !PermissionHelper.checkSystemAlertWindowPermission(activity)) {
-                    Toast toast = Toast.makeText(activity, R.string.msg_popup_permission, Toast.LENGTH_LONG);
-                    TextView messageView = toast.getView().findViewById(android.R.id.message);
-                    if (messageView != null) messageView.setGravity(Gravity.CENTER);
-                    toast.show();
-                    return;
-                }
                 NavigationHelper.playOnPopupPlayer(activity, getPlayQueue());
             }
         });

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

@@ -111,7 +111,7 @@ public class SearchFragment extends BaseListFragment<SearchResult, ListExtractor
 
     private int currentPage = 0;
     private int currentNextPage = 0;
-    private String searchLanguage;
+    private String contentCountry;
     private boolean isSuggestionsEnabled = true;
     private boolean isSearchHistoryEnabled = true;
 
@@ -176,7 +176,7 @@ public class SearchFragment extends BaseListFragment<SearchResult, ListExtractor
 
         SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(activity);
         isSuggestionsEnabled = preferences.getBoolean(getString(R.string.show_search_suggestions_key), true);
-        searchLanguage = preferences.getString(getString(R.string.search_language_key), getString(R.string.default_language_value));
+        contentCountry = preferences.getString(getString(R.string.content_country_key), getString(R.string.default_country_value));
     }
 
     @Override
@@ -619,7 +619,7 @@ public class SearchFragment extends BaseListFragment<SearchResult, ListExtractor
                             return local.materialize();
                         }
 
-                        final Observable<List<SuggestionItem>> network = ExtractorHelper.suggestionsFor(serviceId, query, searchLanguage).toObservable()
+                        final Observable<List<SuggestionItem>> network = ExtractorHelper.suggestionsFor(serviceId, query, contentCountry).toObservable()
                                 .map(new Function<List<String>, List<SuggestionItem>>() {
                                     @Override
                                     public List<SuggestionItem> apply(@io.reactivex.annotations.NonNull List<String> strings) throws Exception {
@@ -731,7 +731,7 @@ public class SearchFragment extends BaseListFragment<SearchResult, ListExtractor
         super.startLoading(forceLoad);
         if (disposables != null) disposables.clear();
         if (searchDisposable != null) searchDisposable.dispose();
-        searchDisposable = ExtractorHelper.searchFor(serviceId, searchQuery, currentPage, searchLanguage, filter)
+        searchDisposable = ExtractorHelper.searchFor(serviceId, searchQuery, currentPage, contentCountry, filter)
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(new Consumer<SearchResult>() {
@@ -755,7 +755,7 @@ public class SearchFragment extends BaseListFragment<SearchResult, ListExtractor
         showListFooter(true);
         if (searchDisposable != null) searchDisposable.dispose();
         currentNextPage = currentPage + 1;
-        searchDisposable = ExtractorHelper.getMoreSearchItems(serviceId, searchQuery, currentNextPage, searchLanguage, filter)
+        searchDisposable = ExtractorHelper.getMoreSearchItems(serviceId, searchQuery, currentNextPage, contentCountry, filter)
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(new Consumer<ListExtractor.NextItemsResult>() {

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

@@ -65,7 +65,6 @@ public final class BackgroundPlayer extends Service {
 
     public static final String ACTION_CLOSE = "org.schabi.newpipe.player.BackgroundPlayer.CLOSE";
     public static final String ACTION_PLAY_PAUSE = "org.schabi.newpipe.player.BackgroundPlayer.PLAY_PAUSE";
-    public static final String ACTION_OPEN_CONTROLS = "org.schabi.newpipe.player.BackgroundPlayer.OPEN_CONTROLS";
     public static final String ACTION_REPEAT = "org.schabi.newpipe.player.BackgroundPlayer.REPEAT";
     public static final String ACTION_PLAY_NEXT = "org.schabi.newpipe.player.BackgroundPlayer.ACTION_PLAY_NEXT";
     public static final String ACTION_PLAY_PREVIOUS = "org.schabi.newpipe.player.BackgroundPlayer.ACTION_PLAY_PREVIOUS";
@@ -195,11 +194,14 @@ public final class BackgroundPlayer extends Service {
                 PendingIntent.getBroadcast(this, NOTIFICATION_ID, new Intent(ACTION_PLAY_PAUSE), PendingIntent.FLAG_UPDATE_CURRENT));
         remoteViews.setOnClickPendingIntent(R.id.notificationStop,
                 PendingIntent.getBroadcast(this, NOTIFICATION_ID, new Intent(ACTION_CLOSE), PendingIntent.FLAG_UPDATE_CURRENT));
-        remoteViews.setOnClickPendingIntent(R.id.notificationContent,
-                PendingIntent.getBroadcast(this, NOTIFICATION_ID, new Intent(ACTION_OPEN_CONTROLS), PendingIntent.FLAG_UPDATE_CURRENT));
         remoteViews.setOnClickPendingIntent(R.id.notificationRepeat,
                 PendingIntent.getBroadcast(this, NOTIFICATION_ID, new Intent(ACTION_REPEAT), PendingIntent.FLAG_UPDATE_CURRENT));
 
+        // Starts background player activity -- attempts to unlock lockscreen
+        final Intent intent = NavigationHelper.getBackgroundPlayerActivityIntent(this);
+        remoteViews.setOnClickPendingIntent(R.id.notificationContent,
+                PendingIntent.getActivity(this, NOTIFICATION_ID, intent, PendingIntent.FLAG_UPDATE_CURRENT));
+
         if (basePlayerImpl.playQueue != null && basePlayerImpl.playQueue.size() > 1) {
             remoteViews.setInt(R.id.notificationFRewind, SET_IMAGE_RESOURCE_METHOD, R.drawable.exo_controls_previous);
             remoteViews.setInt(R.id.notificationFForward, SET_IMAGE_RESOURCE_METHOD, R.drawable.exo_controls_next);
@@ -393,7 +395,7 @@ public final class BackgroundPlayer extends Service {
             if (index < 0 || index >= info.audio_streams.size()) return null;
 
             final AudioStream audio = info.audio_streams.get(index);
-            return buildMediaSource(audio.getUrl(), MediaFormat.getSuffixById(audio.format));
+            return buildMediaSource(audio.getUrl(), MediaFormat.getSuffixById(audio.getFormatId()));
         }
 
         @Override
@@ -453,7 +455,6 @@ public final class BackgroundPlayer extends Service {
             super.setupBroadcastReceiver(intentFilter);
             intentFilter.addAction(ACTION_CLOSE);
             intentFilter.addAction(ACTION_PLAY_PAUSE);
-            intentFilter.addAction(ACTION_OPEN_CONTROLS);
             intentFilter.addAction(ACTION_REPEAT);
             intentFilter.addAction(ACTION_PLAY_PREVIOUS);
             intentFilter.addAction(ACTION_PLAY_NEXT);
@@ -478,9 +479,6 @@ public final class BackgroundPlayer extends Service {
                 case ACTION_PLAY_PAUSE:
                     onVideoPlayPause();
                     break;
-                case ACTION_OPEN_CONTROLS:
-                    NavigationHelper.openBackgroundPlayerControl(getApplicationContext());
-                    break;
                 case ACTION_REPEAT:
                     onRepeatClicked();
                     break;

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

@@ -1,9 +1,12 @@
 package org.schabi.newpipe.player;
 
 import android.content.Intent;
+import android.view.MenuItem;
 
 import org.schabi.newpipe.R;
 
+import static org.schabi.newpipe.player.BackgroundPlayer.ACTION_CLOSE;
+
 public final class BackgroundPlayerActivity extends ServicePlayerActivity {
 
     private static final String TAG = "BackgroundPlayerActivity";
@@ -36,4 +39,25 @@ public final class BackgroundPlayerActivity extends ServicePlayerActivity {
             ((BackgroundPlayer.BasePlayerImpl) player).removeActivityListener(this);
         }
     }
+
+    @Override
+    public int getPlayerOptionMenuResource() {
+        return R.menu.menu_play_queue_bg;
+    }
+
+    @Override
+    public boolean onPlayerOptionSelected(MenuItem item) {
+        if (item.getItemId() == R.id.action_switch_popup) {
+            this.player.setRecovery();
+            getApplicationContext().sendBroadcast(getPlayerShutdownIntent());
+            getApplicationContext().startService(getSwitchIntent(PopupVideoPlayer.class));
+            return true;
+        }
+        return false;
+    }
+
+    @Override
+    public Intent getPlayerShutdownIntent() {
+        return new Intent(ACTION_CLOSE);
+    }
 }

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

@@ -78,6 +78,7 @@ import static org.schabi.newpipe.util.AnimationUtils.animateView;
 public final class MainVideoPlayer extends Activity {
     private static final String TAG = ".MainVideoPlayer";
     private static final boolean DEBUG = BasePlayer.DEBUG;
+    private static final String PLAYER_STATE_INTENT = "player_state_intent";
 
     private GestureDetector gestureDetector;
 
@@ -99,19 +100,41 @@ public final class MainVideoPlayer extends Activity {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) getWindow().setStatusBarColor(Color.BLACK);
         setVolumeControlStream(AudioManager.STREAM_MUSIC);
 
-        if (getIntent() == null) {
+        final Intent intent;
+        if (savedInstanceState != null && savedInstanceState.getParcelable(PLAYER_STATE_INTENT) != null) {
+            intent = savedInstanceState.getParcelable(PLAYER_STATE_INTENT);
+        } else {
+            intent = getIntent();
+        }
+
+        if (intent == null) {
             Toast.makeText(this, R.string.general_error, Toast.LENGTH_SHORT).show();
             finish();
             return;
         }
 
-
-
         showSystemUi();
         setContentView(R.layout.activity_main_player);
         playerImpl = new VideoPlayerImpl(this);
         playerImpl.setup(findViewById(android.R.id.content));
-        playerImpl.handleIntent(getIntent());
+        playerImpl.handleIntent(intent);
+    }
+
+    @Override
+    protected void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+        if (this.playerImpl == null) return;
+
+        final Intent intent = NavigationHelper.getPlayerIntent(
+                getApplicationContext(),
+                this.getClass(),
+                this.playerImpl.getPlayQueue(),
+                this.playerImpl.getRepeatMode(),
+                this.playerImpl.getPlaybackSpeed(),
+                this.playerImpl.getPlaybackPitch(),
+                this.playerImpl.getPlaybackQuality()
+        );
+        outState.putParcelable(PLAYER_STATE_INTENT, intent);
     }
 
     @Override
@@ -448,12 +471,9 @@ public final class MainVideoPlayer extends Activity {
 
             if (getCurrentState() != STATE_COMPLETED) {
                 getControlsVisibilityHandler().removeCallbacksAndMessages(null);
-                animateView(getControlsRoot(), true, 300, 0, new Runnable() {
-                    @Override
-                    public void run() {
-                        if (getCurrentState() == STATE_PLAYING && !isSomePopupMenuVisible()) {
-                            hideControls(300, DEFAULT_CONTROLS_HIDE_TIME);
-                        }
+                animateView(getControlsRoot(), true, 300, 0, () -> {
+                    if (getCurrentState() == STATE_PLAYING && !isSomePopupMenuVisible()) {
+                        hideControls(300, DEFAULT_CONTROLS_HIDE_TIME);
                     }
                 });
             }
@@ -506,6 +526,7 @@ public final class MainVideoPlayer extends Activity {
         private void onScreenRotationClicked() {
             if (DEBUG) Log.d(TAG, "onScreenRotationClicked() called");
             toggleOrientation();
+            showControlsThenHide();
         }
 
         @Override
@@ -561,12 +582,9 @@ public final class MainVideoPlayer extends Activity {
         @Override
         public void onPlaying() {
             super.onPlaying();
-            animateView(playPauseButton, AnimationUtils.Type.SCALE_AND_ALPHA, false, 80, 0, new Runnable() {
-                @Override
-                public void run() {
-                    playPauseButton.setImageResource(R.drawable.ic_pause_white);
-                    animatePlayButtons(true, 200);
-                }
+            animateView(playPauseButton, AnimationUtils.Type.SCALE_AND_ALPHA, false, 80, 0, () -> {
+                playPauseButton.setImageResource(R.drawable.ic_pause_white);
+                animatePlayButtons(true, 200);
             });
             showSystemUi();
             getRootView().setKeepScreenOn(true);
@@ -575,12 +593,9 @@ public final class MainVideoPlayer extends Activity {
         @Override
         public void onPaused() {
             super.onPaused();
-            animateView(playPauseButton, AnimationUtils.Type.SCALE_AND_ALPHA, false, 80, 0, new Runnable() {
-                @Override
-                public void run() {
-                    playPauseButton.setImageResource(R.drawable.ic_play_arrow_white);
-                    animatePlayButtons(true, 200);
-                }
+            animateView(playPauseButton, AnimationUtils.Type.SCALE_AND_ALPHA, false, 80, 0, () -> {
+                playPauseButton.setImageResource(R.drawable.ic_play_arrow_white);
+                animatePlayButtons(true, 200);
             });
 
             showSystemUi();
@@ -598,12 +613,9 @@ public final class MainVideoPlayer extends Activity {
         @Override
         public void onCompleted() {
             showSystemUi();
-            animateView(playPauseButton, AnimationUtils.Type.SCALE_AND_ALPHA, false, 0, 0, new Runnable() {
-                @Override
-                public void run() {
-                    playPauseButton.setImageResource(R.drawable.ic_replay_white);
-                    animatePlayButtons(true, 300);
-                }
+            animateView(playPauseButton, AnimationUtils.Type.SCALE_AND_ALPHA, false, 0, 0, () -> {
+                playPauseButton.setImageResource(R.drawable.ic_replay_white);
+                animatePlayButtons(true, 300);
             });
 
             getRootView().setKeepScreenOn(false);
@@ -632,17 +644,10 @@ public final class MainVideoPlayer extends Activity {
         public void hideControls(final long duration, long delay) {
             if (DEBUG) Log.d(TAG, "hideControls() called with: delay = [" + delay + "]");
             getControlsVisibilityHandler().removeCallbacksAndMessages(null);
-            getControlsVisibilityHandler().postDelayed(new Runnable() {
-                @Override
-                public void run() {
-                    animateView(getControlsRoot(), false, duration, 0, new Runnable() {
-                        @Override
-                        public void run() {
-                            hideSystemUi();
-                        }
-                    });
-                }
-            }, delay);
+            getControlsVisibilityHandler().postDelayed(() ->
+                    animateView(getControlsRoot(), false, duration, 0, MainVideoPlayer.this::hideSystemUi),
+                    delay
+            );
         }
 
         private void updatePlaybackButtons() {
@@ -655,22 +660,19 @@ public final class MainVideoPlayer extends Activity {
 
         private void buildMoreOptionsMenu() {
             if (moreOptionsPopupMenu == null) return;
-            moreOptionsPopupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
-                @Override
-                public boolean onMenuItemClick(MenuItem menuItem) {
-                    switch (menuItem.getItemId()) {
-                        case R.id.toggleOrientation:
-                            onScreenRotationClicked();
-                            break;
-                        case R.id.switchPopup:
-                            onFullScreenButtonClicked();
-                            break;
-                        case R.id.switchBackground:
-                            onPlayBackgroundButtonClicked();
-                            break;
-                    }
-                    return false;
+            moreOptionsPopupMenu.setOnMenuItemClickListener(menuItem -> {
+                switch (menuItem.getItemId()) {
+                    case R.id.toggleOrientation:
+                        onScreenRotationClicked();
+                        break;
+                    case R.id.switchPopup:
+                        onFullScreenButtonClicked();
+                        break;
+                    case R.id.switchBackground:
+                        onPlayBackgroundButtonClicked();
+                        break;
                 }
+                return false;
             });
         }
 
@@ -692,12 +694,7 @@ public final class MainVideoPlayer extends Activity {
 
             playQueueAdapter.setSelectedListener(getOnSelectedListener());
 
-            itemsListCloseButton.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View view) {
-                    onQueueClosed();
-                }
-            });
+            itemsListCloseButton.setOnClickListener(view -> onQueueClosed());
         }
 
         private OnScrollBelowItemsListener getQueueScrollListener() {

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

@@ -66,9 +66,9 @@ import org.schabi.newpipe.extractor.services.youtube.YoutubeStreamExtractor;
 import org.schabi.newpipe.extractor.stream.StreamInfo;
 import org.schabi.newpipe.extractor.stream.VideoStream;
 import org.schabi.newpipe.player.event.PlayerEventListener;
+import org.schabi.newpipe.player.helper.LockManager;
 import org.schabi.newpipe.player.helper.PlayerHelper;
 import org.schabi.newpipe.player.old.PlayVideoActivity;
-import org.schabi.newpipe.player.helper.LockManager;
 import org.schabi.newpipe.playlist.PlayQueueItem;
 import org.schabi.newpipe.playlist.SinglePlayQueue;
 import org.schabi.newpipe.report.ErrorActivity;
@@ -84,7 +84,6 @@ import java.util.List;
 
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.disposables.Disposable;
-import io.reactivex.functions.Consumer;
 import io.reactivex.schedulers.Schedulers;
 
 import static org.schabi.newpipe.player.helper.PlayerHelper.isUsingOldPlayer;
@@ -102,7 +101,6 @@ public final class PopupVideoPlayer extends Service {
     private static final int NOTIFICATION_ID = 40028922;
     public static final String ACTION_CLOSE = "org.schabi.newpipe.player.PopupVideoPlayer.CLOSE";
     public static final String ACTION_PLAY_PAUSE = "org.schabi.newpipe.player.PopupVideoPlayer.PLAY_PAUSE";
-    public static final String ACTION_OPEN_CONTROLS = "org.schabi.newpipe.player.PopupVideoPlayer.OPEN_CONTROLS";
     public static final String ACTION_REPEAT = "org.schabi.newpipe.player.PopupVideoPlayer.REPEAT";
 
     private static final String POPUP_SAVED_WIDTH = "popup_saved_width";
@@ -169,17 +167,7 @@ public final class PopupVideoPlayer extends Service {
             currentWorker = ExtractorHelper.getStreamInfo(serviceId,url,false)
                     .subscribeOn(Schedulers.io())
                     .observeOn(AndroidSchedulers.mainThread())
-                    .subscribe(new Consumer<StreamInfo>() {
-                        @Override
-                        public void accept(@NonNull StreamInfo info) throws Exception {
-                            fetcherRunnable.onReceive(info);
-                        }
-                    }, new Consumer<Throwable>() {
-                        @Override
-                        public void accept(@NonNull Throwable throwable) throws Exception {
-                            fetcherRunnable.onError(throwable);
-                        }
-                    });
+                    .subscribe(fetcherRunnable::onReceive, fetcherRunnable::onError);
         } else {
             playerImpl.setStartedFromNewPipe(true);
             playerImpl.handleIntent(intent);
@@ -267,11 +255,14 @@ public final class PopupVideoPlayer extends Service {
                 PendingIntent.getBroadcast(this, NOTIFICATION_ID, new Intent(ACTION_PLAY_PAUSE), PendingIntent.FLAG_UPDATE_CURRENT));
         notRemoteView.setOnClickPendingIntent(R.id.notificationStop,
                 PendingIntent.getBroadcast(this, NOTIFICATION_ID, new Intent(ACTION_CLOSE), PendingIntent.FLAG_UPDATE_CURRENT));
-        notRemoteView.setOnClickPendingIntent(R.id.notificationContent,
-                PendingIntent.getBroadcast(this, NOTIFICATION_ID, new Intent(ACTION_OPEN_CONTROLS), PendingIntent.FLAG_UPDATE_CURRENT));
         notRemoteView.setOnClickPendingIntent(R.id.notificationRepeat,
                 PendingIntent.getBroadcast(this, NOTIFICATION_ID, new Intent(ACTION_REPEAT), PendingIntent.FLAG_UPDATE_CURRENT));
 
+        // Starts popup player activity -- attempts to unlock lockscreen
+        final Intent intent = NavigationHelper.getPopupPlayerActivityIntent(this);
+        notRemoteView.setOnClickPendingIntent(R.id.notificationContent,
+                PendingIntent.getActivity(this, NOTIFICATION_ID, intent, PendingIntent.FLAG_UPDATE_CURRENT));
+
         setRepeatModeRemote(notRemoteView, playerImpl.getRepeatMode());
 
         return new NotificationCompat.Builder(this, getString(R.string.notification_channel_id))
@@ -421,12 +412,7 @@ public final class PopupVideoPlayer extends Service {
             super.initViews(rootView);
             resizingIndicator = rootView.findViewById(R.id.resizing_indicator);
             fullScreenButton = rootView.findViewById(R.id.fullScreenButton);
-            fullScreenButton.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    onFullScreenButtonClicked();
-                }
-            });
+            fullScreenButton.setOnClickListener(v -> onFullScreenButtonClicked());
         }
 
         @Override
@@ -604,7 +590,6 @@ public final class PopupVideoPlayer extends Service {
             if (DEBUG) Log.d(TAG, "setupBroadcastReceiver() called with: intentFilter = [" + intentFilter + "]");
             intentFilter.addAction(ACTION_CLOSE);
             intentFilter.addAction(ACTION_PLAY_PAUSE);
-            intentFilter.addAction(ACTION_OPEN_CONTROLS);
             intentFilter.addAction(ACTION_REPEAT);
 
             intentFilter.addAction(Intent.ACTION_SCREEN_ON);
@@ -623,9 +608,6 @@ public final class PopupVideoPlayer extends Service {
                 case ACTION_PLAY_PAUSE:
                     onVideoPlayPause();
                     break;
-                case ACTION_OPEN_CONTROLS:
-                    NavigationHelper.openPopupPlayerControl(getApplicationContext());
-                    break;
                 case ACTION_REPEAT:
                     onRepeatClicked();
                     break;
@@ -899,37 +881,31 @@ public final class PopupVideoPlayer extends Service {
         }
 
         private void onReceive(final StreamInfo info) {
-            mainHandler.post(new Runnable() {
-                @Override
-                public void run() {
-                    final Intent intent = NavigationHelper.getPlayerIntent(getApplicationContext(),
-                            PopupVideoPlayer.class, new SinglePlayQueue(info));
-                    playerImpl.handleIntent(intent);
-                }
+            mainHandler.post(() -> {
+                final Intent intent = NavigationHelper.getPlayerIntent(getApplicationContext(),
+                        PopupVideoPlayer.class, new SinglePlayQueue(info));
+                playerImpl.handleIntent(intent);
             });
         }
 
         private void onError(final Throwable exception) {
             if (DEBUG) Log.d(TAG, "onError() called with: exception = [" + exception + "]");
             exception.printStackTrace();
-            mainHandler.post(new Runnable() {
-                @Override
-                public void run() {
-                    if (exception instanceof ReCaptchaException) {
-                        onReCaptchaException();
-                    } else if (exception instanceof IOException) {
-                        Toast.makeText(context, R.string.network_error, Toast.LENGTH_LONG).show();
-                    } else if (exception instanceof YoutubeStreamExtractor.GemaException) {
-                        Toast.makeText(context, R.string.blocked_by_gema, Toast.LENGTH_LONG).show();
-                    } else if (exception instanceof YoutubeStreamExtractor.LiveStreamException) {
-                        Toast.makeText(context, R.string.live_streams_not_supported, Toast.LENGTH_LONG).show();
-                    } else if (exception instanceof ContentNotAvailableException) {
-                        Toast.makeText(context, R.string.content_not_available, Toast.LENGTH_LONG).show();
-                    } else {
-                        int errorId = exception instanceof YoutubeStreamExtractor.DecryptException ? R.string.youtube_signature_decryption_error :
-                                exception instanceof ParsingException ? R.string.parsing_error : R.string.general_error;
-                        ErrorActivity.reportError(mainHandler, context, exception, MainActivity.class, null, ErrorActivity.ErrorInfo.make(UserAction.REQUESTED_STREAM, NewPipe.getNameOfService(serviceId), url, errorId));
-                    }
+            mainHandler.post(() -> {
+                if (exception instanceof ReCaptchaException) {
+                    onReCaptchaException();
+                } else if (exception instanceof IOException) {
+                    Toast.makeText(context, R.string.network_error, Toast.LENGTH_LONG).show();
+                } else if (exception instanceof YoutubeStreamExtractor.GemaException) {
+                    Toast.makeText(context, R.string.blocked_by_gema, Toast.LENGTH_LONG).show();
+                } else if (exception instanceof YoutubeStreamExtractor.LiveStreamException) {
+                    Toast.makeText(context, R.string.live_streams_not_supported, Toast.LENGTH_LONG).show();
+                } else if (exception instanceof ContentNotAvailableException) {
+                    Toast.makeText(context, R.string.content_not_available, Toast.LENGTH_LONG).show();
+                } else {
+                    int errorId = exception instanceof YoutubeStreamExtractor.DecryptException ? R.string.youtube_signature_decryption_error :
+                            exception instanceof ParsingException ? R.string.parsing_error : R.string.general_error;
+                    ErrorActivity.reportError(mainHandler, context, exception, MainActivity.class, null, ErrorActivity.ErrorInfo.make(UserAction.REQUESTED_STREAM, NewPipe.getNameOfService(serviceId), url, errorId));
                 }
             });
             stopSelf();

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

@@ -1,9 +1,12 @@
 package org.schabi.newpipe.player;
 
 import android.content.Intent;
+import android.view.MenuItem;
 
 import org.schabi.newpipe.R;
 
+import static org.schabi.newpipe.player.PopupVideoPlayer.ACTION_CLOSE;
+
 public final class PopupVideoPlayerActivity extends ServicePlayerActivity {
 
     private static final String TAG = "PopupVideoPlayerActivity";
@@ -36,4 +39,25 @@ public final class PopupVideoPlayerActivity extends ServicePlayerActivity {
             ((PopupVideoPlayer.VideoPlayerImpl) player).removeActivityListener(this);
         }
     }
+
+    @Override
+    public int getPlayerOptionMenuResource() {
+        return R.menu.menu_play_queue_popup;
+    }
+
+    @Override
+    public boolean onPlayerOptionSelected(MenuItem item) {
+        if (item.getItemId() == R.id.action_switch_background) {
+            this.player.setRecovery();
+            getApplicationContext().sendBroadcast(getPlayerShutdownIntent());
+            getApplicationContext().startService(getSwitchIntent(BackgroundPlayer.class));
+            return true;
+        }
+        return false;
+    }
+
+    @Override
+    public Intent getPlayerShutdownIntent() {
+        return new Intent(ACTION_CLOSE);
+    }
 }

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

@@ -100,6 +100,11 @@ public abstract class ServicePlayerActivity extends AppCompatActivity
 
     public abstract void stopPlayerListener();
 
+    public abstract int getPlayerOptionMenuResource();
+
+    public abstract boolean onPlayerOptionSelected(MenuItem item);
+
+    public abstract Intent getPlayerShutdownIntent();
     ////////////////////////////////////////////////////////////////////////////
     // Activity Lifecycle
     ////////////////////////////////////////////////////////////////////////////
@@ -134,6 +139,7 @@ public abstract class ServicePlayerActivity extends AppCompatActivity
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         getMenuInflater().inflate(R.menu.menu_play_queue, menu);
+        getMenuInflater().inflate(getPlayerOptionMenuResource(), menu);
         return true;
     }
 
@@ -153,8 +159,13 @@ public abstract class ServicePlayerActivity extends AppCompatActivity
             case R.id.action_system_audio:
                 startActivity(new Intent(Settings.ACTION_SOUND_SETTINGS));
                 return true;
+            case R.id.action_switch_main:
+                this.player.setRecovery();
+                getApplicationContext().sendBroadcast(getPlayerShutdownIntent());
+                getApplicationContext().startActivity(getSwitchIntent(MainVideoPlayer.class));
+                return true;
         }
-        return super.onOptionsItemSelected(item);
+        return onPlayerOptionSelected(item) || super.onOptionsItemSelected(item);
     }
 
     @Override
@@ -163,6 +174,17 @@ public abstract class ServicePlayerActivity extends AppCompatActivity
         unbind();
     }
 
+    protected Intent getSwitchIntent(final Class clazz) {
+        return NavigationHelper.getPlayerIntent(
+                getApplicationContext(),
+                clazz,
+                this.player.getPlayQueue(),
+                this.player.getRepeatMode(),
+                this.player.getPlaybackSpeed(),
+                this.player.getPlaybackPitch(),
+                null
+        );
+    }
     ////////////////////////////////////////////////////////////////////////////
     // Service Connection
     ////////////////////////////////////////////////////////////////////////////
@@ -288,14 +310,11 @@ public abstract class ServicePlayerActivity extends AppCompatActivity
             final float playbackSpeed = BasePlayer.PLAYBACK_SPEEDS[i];
             final String formattedSpeed = formatSpeed(playbackSpeed);
             final MenuItem item = playbackSpeedPopupMenu.getMenu().add(PLAYBACK_SPEED_POPUP_MENU_GROUP_ID, i, Menu.NONE, formattedSpeed);
-            item.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
-                @Override
-                public boolean onMenuItemClick(MenuItem menuItem) {
-                    if (player == null) return false;
+            item.setOnMenuItemClickListener(menuItem -> {
+                if (player == null) return false;
 
-                    player.setPlaybackSpeed(playbackSpeed);
-                    return true;
-                }
+                player.setPlaybackSpeed(playbackSpeed);
+                return true;
             });
         }
     }
@@ -308,14 +327,11 @@ public abstract class ServicePlayerActivity extends AppCompatActivity
             final float playbackPitch = BasePlayer.PLAYBACK_PITCHES[i];
             final String formattedPitch = formatPitch(playbackPitch);
             final MenuItem item = playbackPitchPopupMenu.getMenu().add(PLAYBACK_PITCH_POPUP_MENU_GROUP_ID, i, Menu.NONE, formattedPitch);
-            item.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
-                @Override
-                public boolean onMenuItemClick(MenuItem menuItem) {
-                    if (player == null) return false;
+            item.setOnMenuItemClickListener(menuItem -> {
+                if (player == null) return false;
 
-                    player.setPlaybackPitch(playbackPitch);
-                    return true;
-                }
+                player.setPlaybackPitch(playbackPitch);
+                return true;
             });
         }
     }
@@ -323,24 +339,18 @@ public abstract class ServicePlayerActivity extends AppCompatActivity
     private void buildItemPopupMenu(final PlayQueueItem item, final View view) {
         final PopupMenu menu = new PopupMenu(this, view);
         final MenuItem remove = menu.getMenu().add(RECYCLER_ITEM_POPUP_MENU_GROUP_ID, 0, Menu.NONE, R.string.play_queue_remove);
-        remove.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
-            @Override
-            public boolean onMenuItemClick(MenuItem menuItem) {
-                if (player == null) return false;
+        remove.setOnMenuItemClickListener(menuItem -> {
+            if (player == null) return false;
 
-                final int index = player.getPlayQueue().indexOf(item);
-                if (index != -1) player.getPlayQueue().remove(index);
-                return true;
-            }
+            final int index = player.getPlayQueue().indexOf(item);
+            if (index != -1) player.getPlayQueue().remove(index);
+            return true;
         });
 
         final MenuItem detail = menu.getMenu().add(RECYCLER_ITEM_POPUP_MENU_GROUP_ID, 1, Menu.NONE, R.string.play_queue_stream_detail);
-        detail.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
-            @Override
-            public boolean onMenuItemClick(MenuItem menuItem) {
-                onOpenDetail(item.getServiceId(), item.getUrl(), item.getTitle());
-                return true;
-            }
+        detail.setOnMenuItemClickListener(menuItem -> {
+            onOpenDetail(item.getServiceId(), item.getUrl(), item.getTitle());
+            return true;
         });
 
         menu.show();

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

@@ -382,7 +382,7 @@ public class ErrorActivity extends AppCompatActivity {
 
     private String getContentLangString() {
         return PreferenceManager.getDefaultSharedPreferences(this)
-                .getString(this.getString(R.string.search_language_key), "none");
+                .getString(this.getString(R.string.content_country_key), "none");
     }
 
     private String getOsString() {

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

@@ -57,13 +57,13 @@ public final class ExtractorHelper {
         }
     }
 
-    public static Single<SearchResult> searchFor(final int serviceId, final String query, final int pageNumber, final String searchLanguage, final SearchEngine.Filter filter) {
+    public static Single<SearchResult> searchFor(final int serviceId, final String query, final int pageNumber, final String contentCountry, final SearchEngine.Filter filter) {
         checkServiceId(serviceId);
         return Single.fromCallable(new Callable<SearchResult>() {
             @Override
             public SearchResult call() throws Exception {
                 return SearchResult.getSearchResult(NewPipe.getService(serviceId).getSearchEngine(),
-                        query, pageNumber, searchLanguage, filter);
+                        query, pageNumber, contentCountry, filter);
             }
         });
     }
@@ -79,12 +79,12 @@ public final class ExtractorHelper {
                 });
     }
 
-    public static Single<List<String>> suggestionsFor(final int serviceId, final String query, final String searchLanguage) {
+    public static Single<List<String>> suggestionsFor(final int serviceId, final String query, final String contentCountry) {
         checkServiceId(serviceId);
         return Single.fromCallable(new Callable<List<String>>() {
             @Override
             public List<String> call() throws Exception {
-                return NewPipe.getService(serviceId).getSuggestionExtractor().suggestionList(query, searchLanguage);
+                return NewPipe.getService(serviceId).getSuggestionExtractor().suggestionList(query, contentCountry);
             }
         });
     }
@@ -143,7 +143,8 @@ public final class ExtractorHelper {
         return checkCache(forceLoad, serviceId, url, Single.fromCallable(new Callable<KioskInfo>() {
             @Override
             public KioskInfo call() throws Exception {
-                return KioskInfo.getInfo(NewPipe.getService(serviceId), url, toUpperCase(contentCountry));
+                Log.e("---------", contentCountry);
+                return KioskInfo.getInfo(NewPipe.getService(serviceId), url, contentCountry);
             }
         }));
     }
@@ -152,7 +153,7 @@ public final class ExtractorHelper {
         return Single.fromCallable(new Callable<NextItemsResult>() {
             @Override
             public NextItemsResult call() throws Exception {
-                return KioskInfo.getMoreItems(NewPipe.getService(serviceId), url, nextStreamsUrl, toUpperCase(contentCountry));
+                return KioskInfo.getMoreItems(NewPipe.getService(serviceId), url, nextStreamsUrl, contentCountry);
             }
         });
     }
@@ -219,16 +220,20 @@ public final class ExtractorHelper {
         // as it will cause a infinite loop if it is
         Throwable cause, getCause = throwable;
 
+        // Check if throwable is a subclass of any of the filtered classes
+        final Class throwableClass = throwable.getClass();
         for (Class<?> causesEl : causesToCheck) {
-            if (throwable.getClass().isAssignableFrom(causesEl)) {
+            if (causesEl.isAssignableFrom(throwableClass)) {
                 return true;
             }
         }
 
+        // Iteratively checks if the root cause of the throwable is a subclass of the filtered class
         while ((cause = throwable.getCause()) != null && getCause != cause) {
             getCause = cause;
+            final Class causeClass = cause.getClass();
             for (Class<?> causesEl : causesToCheck) {
-                if (cause.getClass().isAssignableFrom(causesEl)) {
+                if (causesEl.isAssignableFrom(causeClass)) {
                     return true;
                 }
             }

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

@@ -1,7 +1,6 @@
 package org.schabi.newpipe.util;
 
 import android.app.Activity;
-import android.app.PendingIntent;
 import android.content.ActivityNotFoundException;
 import android.content.Context;
 import android.content.Intent;
@@ -21,9 +20,7 @@ import org.schabi.newpipe.download.DownloadActivity;
 import org.schabi.newpipe.extractor.NewPipe;
 import org.schabi.newpipe.extractor.ServiceList;
 import org.schabi.newpipe.extractor.StreamingService;
-import org.schabi.newpipe.extractor.channel.ChannelInfoItem;
 import org.schabi.newpipe.extractor.exceptions.ExtractionException;
-import org.schabi.newpipe.extractor.stream.StreamInfo;
 import org.schabi.newpipe.fragments.MainFragment;
 import org.schabi.newpipe.fragments.detail.VideoDetailFragment;
 import org.schabi.newpipe.fragments.list.channel.ChannelFragment;
@@ -46,8 +43,6 @@ import org.schabi.newpipe.settings.SettingsActivity;
 public class NavigationHelper {
     public static final String MAIN_FRAGMENT_TAG = "main_fragment_tag";
 
-    public static final int PENDING_INTENT_OPEN_PLAYER_ACTIVITY = 1546;
-
     /*//////////////////////////////////////////////////////////////////////////
     // Players
     //////////////////////////////////////////////////////////////////////////*/
@@ -92,9 +87,13 @@ public class NavigationHelper {
         context.startActivity(getPlayerIntent(context, MainVideoPlayer.class, queue));
     }
 
-    public static void playOnPopupPlayer(final Context context, final PlayQueue queue) {
-        Toast.makeText(context, R.string.popup_playing_toast, Toast.LENGTH_SHORT).show();
-        context.startService(getPlayerIntent(context, PopupVideoPlayer.class, queue));
+    public static void playOnPopupPlayer(final Activity activity, final PlayQueue queue) {
+        if (!PermissionHelper.isPopupEnabled(activity)) {
+            PermissionHelper.showPopupEnablementToast(activity);
+            return;
+        }
+        Toast.makeText(activity, R.string.popup_playing_toast, Toast.LENGTH_SHORT).show();
+        activity.startService(getPlayerIntent(activity, PopupVideoPlayer.class, queue));
     }
 
     public static void playOnBackgroundPlayer(final Context context, final PlayQueue queue) {
@@ -102,9 +101,13 @@ public class NavigationHelper {
         context.startService(getPlayerIntent(context, BackgroundPlayer.class, queue));
     }
 
-    public static void enqueueOnPopupPlayer(final Context context, final PlayQueue queue) {
-        Toast.makeText(context, R.string.popup_playing_append, Toast.LENGTH_SHORT).show();
-        context.startService(getPlayerEnqueueIntent(context, PopupVideoPlayer.class, queue));
+    public static void enqueueOnPopupPlayer(final Activity activity, final PlayQueue queue) {
+        if (!PermissionHelper.isPopupEnabled(activity)) {
+            PermissionHelper.showPopupEnablementToast(activity);
+            return;
+        }
+        Toast.makeText(activity, R.string.popup_playing_append, Toast.LENGTH_SHORT).show();
+        activity.startService(getPlayerEnqueueIntent(activity, PopupVideoPlayer.class, queue));
     }
 
     public static void enqueueOnBackgroundPlayer(final Context context, final PlayQueue queue) {
@@ -264,34 +267,22 @@ public class NavigationHelper {
         return true;
     }
 
-    public static void openBackgroundPlayerControl(final Context context) {
-        openServicePlayerControl(context, BackgroundPlayerActivity.class);
+    public static Intent getBackgroundPlayerActivityIntent(final Context context) {
+        return getServicePlayerActivityIntent(context, BackgroundPlayerActivity.class);
     }
 
-    public static void openPopupPlayerControl(final Context context) {
-        openServicePlayerControl(context, PopupVideoPlayerActivity.class);
+    public static Intent getPopupPlayerActivityIntent(final Context context) {
+        return getServicePlayerActivityIntent(context, PopupVideoPlayerActivity.class);
     }
 
-    private static void openServicePlayerControl(final Context context, final Class activityClass) {
-        Intent intent = getServicePlayerControlIntent(context, activityClass);
-        context.startActivity(intent);
-        context.sendBroadcast(new Intent(Intent.ACTION_CLOSE_SYSTEM_DIALOGS));
-    }
-
-    public static Intent getServicePlayerControlIntent(final Context context, final Class activityClass) {
-        final Intent intent = new Intent(context, activityClass);
+    private static Intent getServicePlayerActivityIntent(final Context context,
+                                                         final Class activityClass) {
+        Intent intent = new Intent(context, activityClass);
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) {
             intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         }
         return intent;
     }
-
-    public static PendingIntent getServicePlayerControlPendingIntent(final Context context, final Class activityClass) {
-        Intent intent = getServicePlayerControlIntent(context, activityClass);
-        PendingIntent pIntent = PendingIntent.getActivity(context, PENDING_INTENT_OPEN_PLAYER_ACTIVITY, intent, 0);
-        return pIntent;
-    }
-
     /*//////////////////////////////////////////////////////////////////////////
     // Link handling
     //////////////////////////////////////////////////////////////////////////*/

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

@@ -11,6 +11,11 @@ import android.provider.Settings;
 import android.support.annotation.RequiresApi;
 import android.support.v4.app.ActivityCompat;
 import android.support.v4.content.ContextCompat;
+import android.view.Gravity;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import org.schabi.newpipe.R;
 
 public class PermissionHelper {
     public static final int PERMISSION_WRITE_STORAGE = 778;
@@ -92,4 +97,16 @@ public class PermissionHelper {
             return false;
         }else return true;
     }
+
+    public static boolean isPopupEnabled(Activity activity) {
+        return Build.VERSION.SDK_INT < Build.VERSION_CODES.M ||
+                PermissionHelper.checkSystemAlertWindowPermission(activity);
+    }
+
+    public static void showPopupEnablementToast(Context context) {
+        Toast toast = Toast.makeText(context, R.string.msg_popup_permission, Toast.LENGTH_LONG);
+        TextView messageView = toast.getView().findViewById(android.R.id.message);
+        if (messageView != null) messageView.setGravity(Gravity.CENTER);
+        toast.show();
+    }
 }

app/src/main/res/layout/dialog_title.xml

@@ -31,10 +31,14 @@
         android:layout_below="@+id/itemTitleView"
         android:layout_alignParentLeft="true"
         android:layout_alignParentStart="true"
+        android:ellipsize="marquee"
+        android:fadingEdge="horizontal"
+        android:marqueeRepeatLimit="marquee_forever"
+        android:scrollHorizontally="true"
         android:singleLine="true"
         android:textAppearance="?android:attr/textAppearanceSmall"
         android:textSize="@dimen/video_item_search_uploader_text_size"
         android:visibility="gone"
         tools:visibility="visible"
-        tools:text="TYPE" />
+        tools:text="UPLOADER" />
 </RelativeLayout>

app/src/main/res/menu/menu_play_queue.xml

@@ -17,4 +17,9 @@
         android:orderInCategory="996"
         android:title="@string/play_queue_audio_settings"
         app:showAsAction="never"/>
+
+    <item android:id="@+id/action_switch_main"
+        android:orderInCategory="999"
+        android:title="@string/switch_to_main"
+        app:showAsAction="never"/>
 </menu>

app/src/main/res/menu/menu_play_queue_bg.xml

@@ -0,0 +1,10 @@
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:context="org.schabi.newpipe.history.HistoryActivity">
+
+    <item android:id="@+id/action_switch_popup"
+        android:orderInCategory="1999"
+        android:title="@string/switch_to_popup"
+        app:showAsAction="never"/>
+</menu>

app/src/main/res/menu/menu_play_queue_popup.xml

@@ -0,0 +1,10 @@
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:context="org.schabi.newpipe.history.HistoryActivity">
+
+    <item android:id="@+id/action_switch_background"
+        android:orderInCategory="1999"
+        android:title="@string/switch_to_background"
+        app:showAsAction="never"/>
+</menu>

app/src/main/res/menu/menu_videooptions.xml

@@ -6,16 +6,16 @@
     <item
         android:icon="@drawable/ic_screen_rotation_white"
         android:id="@+id/toggleOrientation"
-        android:title="Toggle orientation"
+        android:title="@string/toggle_orientation"
         app:showAsAction="always|withText" />
     <item
         android:icon="@drawable/ic_fullscreen_exit_white"
         android:id="@+id/switchPopup"
-        android:title="Switch to popup"
+        android:title="@string/switch_to_popup"
         app:showAsAction="always|withText" />
     <item android:icon="?audio"
         android:id="@+id/switchBackground"
-        android:title="Switch to background"
+        android:title="@string/switch_to_background"
         app:showAsAction="always|withText" />
 </menu>
 

app/src/main/res/values-ar/strings.xml

@@ -175,7 +175,13 @@
 
     <string name="no_subscribers">صفر لا تقم با الإختيار (في بعض اللغات) لأنها ليست \"حالة خاصة\" للأندرويد</string>
     <plurals name="subscribers">
-</plurals>
+	    <item quantity="zero">صفر</item>
+	    <item quantity="one">واحد</item>
+	    <item quantity="two">اثنان</item>
+	    <item quantity="few">قليل</item>
+	    <item quantity="many">كثير</item>
+	    <item quantity="other">أخرى</item>
+    </plurals>
 
     <string name="no_views">لاتوجد مشاهدات</string>
     <string name="no_videos">لاتوجد فديوهات</string>
@@ -257,4 +263,32 @@
     <string name="start_here_on_popup">تشغيل هنا في وضع النافذة المنبثقة</string>
 <string name="reCaptcha_title">تحدي ريكابتشا</string>
     <string name="hold_to_append">اضغط للإدراج بقائمة الانتظار</string>
+    <plurals name="views">
+	<item quantity="zero">صفر</item>
+	<item quantity="one">واحد</item>
+	<item quantity="two">اثنان</item>
+	<item quantity="few">قليل</item>
+	<item quantity="many">كثير</item>
+	<item quantity="other">أخرى</item>
+</plurals>
+
+    <plurals name="videos">
+	<item quantity="zero">صفر</item>
+	<item quantity="one">واحد</item>
+	<item quantity="two">اثنان</item>
+	<item quantity="few">قليل</item>
+	<item quantity="many">كثير</item>
+	<item quantity="other">أخرى</item>
+</plurals>
+
+    <string name="recaptcha_request_toast">إعادة طلب كلمة التحقق</string>
+
+    <string name="copyright" formatted="true">© %1$sبواسطة%2$sتحت%3$s</string>
+    <string name="kiosk_page_summary">صفحة الكشك</string>
+    <string name="select_a_kiosk">حدد كشك</string>
+
+    <string name="kiosk">كشك</string>
+    <string name="enqueue_on_background">إدراج بقائمة الانتظار على خلفية</string>
+    <string name="enqueue_on_popup">إدراج بقائمة الانتظار على المنبثقة</string>
+    <string name="start_here_on_background">ابدأ هنا على خلفية المصدر</string>
     </resources>

app/src/main/res/values-cs/strings.xml

@@ -204,7 +204,7 @@ otevření ve vyskakovacím okně</string>
     <plurals name="subscribers">
 	<item quantity="one">%s odběratel</item>
 	<item quantity="few">%s odběratelé</item>
-	<item quantity="many">%s odběratelů</item>
+	<item quantity="other">%s odběratelů</item>
 </plurals>
 
     <string name="no_views">Žádná zhlédnutí</string>
@@ -218,7 +218,7 @@ otevření ve vyskakovacím okně</string>
     <plurals name="videos">
 	<item quantity="one">%s video</item>
 	<item quantity="few">%s videa</item>
-	<item quantity="many">%s videí</item>
+	<item quantity="other">%s videí</item>
 </plurals>
 
     <string name="settings_category_downloads_title">Stahování</string>

app/src/main/res/values-es/strings.xml

@@ -34,7 +34,7 @@
 
     <string name="theme_title">Tema</string>
     <string name="dark_theme_title">Oscuro</string>
-    <string name="light_theme_title">Ligero</string>
+    <string name="light_theme_title">Claro</string>
 
     <string name="settings_category_appearance_title">Apariencia</string>
     <string name="settings_category_other_title">Otros</string>
@@ -127,7 +127,7 @@
     <string name="app_ui_crash">La interfaz de la app dejó de funcionar</string>
     <string name="info_labels">Lo sucedido:\\nSolicitud:\\nIdioma del contenido:\\nServicio:\\nHora GMT:\\nPaquete:\\nVersión:\\nVersión del S.O:\\nRango global de la IP:</string>
 
-    <string name="black_theme_title">Oscuro</string>
+    <string name="black_theme_title">Negro</string>
 
     <string name="all">Todo</string>
     <string name="channel">Canal</string>

app/src/main/res/values-pl/strings.xml

@@ -247,12 +247,12 @@
     <plurals name="subscribers">
 	<item quantity="one">%s subskrybent</item>
 	<item quantity="few">%s subskrybentów</item>
-	<item quantity="many">%s subskrybentów</item>
+	<item quantity="other">%s subskrybentów</item>
 </plurals>
 
     <plurals name="views">
 	<item quantity="one">%s odtworzenie</item>
-	<item quantity="many">%s odtworzeń</item>
+	<item quantity="other">%s odtworzeń</item>
 </plurals>
 
     <string name="no_videos">Brak filmów</string>

app/src/main/res/values-ru/strings.xml

@@ -236,21 +236,21 @@
     <plurals name="subscribers">
 	<item quantity="one">%s подписчик</item>
 	<item quantity="few">%s подписчика</item>
-	<item quantity="many">%s подписчиков</item>
+	<item quantity="other">%s подписчиков</item>
 </plurals>
 
     <string name="no_views">Нет просмотров</string>
     <plurals name="views">
 	<item quantity="one">%s просмотр</item>
 	<item quantity="few">%s просмотра</item>
-	<item quantity="many">%s просмотров</item>
+	<item quantity="other">%s просмотров</item>
 </plurals>
 
     <string name="no_videos">Нет видео</string>
     <plurals name="videos">
 	<item quantity="one">%s видео</item>
 	<item quantity="few">%s видео</item>
-	<item quantity="many">%s видео</item>
+	<item quantity="other">%s видео</item>
 </plurals>
 
     <string name="item_deleted">Элемент удалён</string>

app/src/main/res/values-sk/strings.xml

@@ -247,21 +247,21 @@ otvorenie okna na popredí</string>
     <plurals name="subscribers">
 	<item quantity="one">%s odberateľ</item>
 	<item quantity="few">%s odberatelia</item>
-	<item quantity="many">%s odberateľov</item>
+	<item quantity="other">%s odberateľov</item>
 </plurals>
 
     <string name="no_views">Žiadne zobrazenia</string>
     <plurals name="views">
 	<item quantity="one">%s zobrazenie</item>
 	<item quantity="few">%s zobrazenia</item>
-	<item quantity="many">%s zobrazení</item>
+	<item quantity="other">%s zobrazení</item>
 </plurals>
 
     <string name="no_videos">Žiadne videá</string>
     <plurals name="videos">
 	<item quantity="one">%s video</item>
 	<item quantity="few">%s videá</item>
-	<item quantity="many">%s videí</item>
+	<item quantity="other">%s videí</item>
 </plurals>
 
     <string name="item_deleted">Položka bola odstránená</string>

app/src/main/res/values-sv/strings.xml

@@ -242,7 +242,7 @@
     <string name="app_license_title">NewPipes licens</string>
     <string name="contribution_encouragement">Vad du än har för idéer gällande översättning, designändringar, kod rengöring eller riktigt tunga så är hjälp alltid välkommet. Ju mer som görs desto bättre blir det!</string>
     <string name="read_full_license">Läs hela licensen</string>
-    <string name="contribution_title">Bidrag</string>
+    <string name="contribution_title">Bidra</string>
 
     <string name="title_activity_history">Historik</string>
     <string name="title_history_search">Sökt</string>
@@ -266,7 +266,7 @@
 
     <string name="kiosk">Kiosk</string>
     <string name="trending">Trend</string>
-    <string name="top_50">Top 50</string>
+    <string name="top_50">Topp 50</string>
     <string name="new_and_hot">Aktuellt</string>
     <string name="title_activity_background_player">Bakgrunds-spelare</string>
     <string name="title_activity_popup_player">Popup-spelare</string>
@@ -279,4 +279,9 @@
     <string name="start_here_on_main">Börja spela här</string>
     <string name="start_here_on_background">Börja här i bakgrunden</string>
     <string name="start_here_on_popup">Börja här i popup</string>
-</resources>
+<string name="donation_title">Donera</string>
+    <string name="donation_encouragement">NewPipe utvecklas av frivilliga som spenderar sin fritid på att ge dig den bästa användarupplevelsen. Nu är det tid att ge tillbaka för att säkerställa att utvecklarna kan göra NewPipe ännu bättre medan de njuter av en kopp kaffe!</string>
+    <string name="give_back">Ge tillbaka</string>
+    <string name="website_title">Webbplats</string>
+    <string name="website_encouragement">För att få mer information och de senaste nyheterna om NewPipe, besök vår webbplats.</string>
+    </resources>