move on to v0.11.4

Merge branch 'dev' of github.com:teamnewpipe/NewPipe into dev
forece select activity when opening with browser
2025-09-20 11:20:52 +02:00 · 2018-01-09 14:11:37 +01:00 · 2018-01-09 14:02:39 +01:00 · 2018-01-09 14:02:32 +01:00 · 2018-01-09 13:53:29 +01:00 · 2018-01-09 13:51:14 +01:00
81 changed files with 2872 additions and 686 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@
 gradle.properties
 *~
 .weblate
+*.class
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,6 +10,8 @@ android:
    # The SDK version used to compile NewPipe
    - android-27

+before_install: 
+  - yes | sdkmanager "platforms;android-27"
 script: ./gradlew -Dorg.gradle.jvmargs=-Xmx1536m assembleDebug lintDebug testDebugUnitTest

 licenses:
--- a/CheckTranslations.java
+++ b/CheckTranslations.java
@@ -0,0 +1,170 @@
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import java.util.regex.*;
+import java.util.Arrays;
+import java.util.List;
+import java.util.ArrayList;
+import java.nio.file.Files;
+import java.nio.charset.Charset;
+
+public final class CheckTranslations {
+
+    private static boolean debug = false;
+    private static boolean plurals = false;
+    private static boolean empty = false;
+    private static boolean remove = false;
+    private static int checks = 0;
+    private static int matches = 0;
+    private static int changes = 0;
+    private static Pattern p, pb, pe, e, o;
+
+    /**
+     * Search translated strings.xml files for empty item / plural tags
+     * and remove them.
+     * @param args directories which contain string.xml files (in any subdirectory)
+     *             -e option to find all empty string tags
+     *             -p option to find all empty plurals and item tags
+     *             -r option to remove all occurrences from the files
+     *             -d option to see more details
+     */
+    public static void main(String[] args) {
+        if (args.length < 1 || (args[0].equals("-d") && args.length < 2)) {  
+            System.out.println("Not enough arguments");
+            return;
+        }
+        for (int i = 0; i < args.length; i++) {
+            switch (args[i]) {
+                case "-d":
+                    debug = true;
+                    break;
+                case "-p":
+                    plurals = true;
+                    break;
+                case "-e":
+                    empty = true;
+                    break;
+                case "-r":
+                    remove = true;
+                    break;
+            }
+        }
+        
+        if (!plurals && !empty) {
+            plurals = true;
+            empty = true;
+        }
+
+        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")) {
+                File f = new File(args[i]);
+                if (f.exists() && !f.isDirectory()) {
+                    checkFile(f);
+                } else if (f.isDirectory()) {
+                    checkFiles(f.listFiles());
+                } else {
+                    System.out.println("'" + args[i] + "' does not exist!");
+                }
+            }
+        }
+
+        System.out.println(checks + " files were checked.");
+        System.out.println(matches + " corrupt lines detected.");
+        if (remove) {
+            System.out.println(matches + " corrupt lines removed and " + changes + " lines fixed.");
+        }
+    }
+
+
+    private static void checkFiles(File[] f) {
+        for (int i = 0; i < f.length; i++) {
+            if (f[i].exists() && !f[i].isDirectory()) {
+                if (f[i].toString().contains("strings.xml")) {
+                    checkFile(f[i]);
+                }
+            } else if (f[i].isDirectory()) {
+                checkFiles(f[i].listFiles());
+            }
+        }
+    }
+
+    private static void checkFile(File f) {
+        // Do not check our original English strings to cause no unwanted changes
+        // Btw. there should not be empty plural/item tags
+        if (f.toString().contains("values/strings.xml")) {
+            return;
+        }
+        if (debug) System.out.println("Checking " + f.toString());
+        checks++;
+
+
+        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;
+            while ((line = br.readLine()) != null) {
+                ln++;
+                if (plurals && p.matcher(line).find()) {
+                    matches++;
+                    if (debug) System.out.println("    Line " + ln + " was " + ((remove) ? "removed" : "detected") + ": '" + line + "'");
+                    checkFailed = true;
+                } else if (empty && e.matcher(line).find()) {
+                    matches++;
+                    checkFailed = true;
+                    if (debug) System.out.println("    Line " + ln + " was " + ((remove) ? "removed" : "detected") + ": '" + line + "'");
+                } else {
+                    if (remove) lines.add(line);
+                }
+            }
+            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"));
+            }
+        } catch (IOException e) {
+            System.out.println(e);
+        }
+    }
+}
+
--- a/README.md
+++ b/README.md
@@ -13,6 +13,7 @@
 </p>
 <hr />
 <p align="center"><a href="#screenshots">Screenshots</a> &bull; <a href="#description">Description</a> &bull; <a href="#features">Features</a> &bull; <a href="#contribution">Contribution</a> &bull; <a href="#donate">Donate</a> &bull; <a href="#license">License</a></p>
+<p align="center"><a href="https://newpipe.schabi.org">Website</a> &bull; <a href="https://newpipe.schabi.org/blog/">Blog</a>  &bull; <a href="https://newpipe.schabi.org/press/">Press</a></p>
 <hr />
 WARNING: PUTTING NEWPIPE OR ANY FORK OF IT INTO GOOGLE PLAYSTORE VIOLATES THEIR TERMS OF CONDITIONS.

--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,8 +8,8 @@ android {
        applicationId "org.schabi.newpipe"
        minSdkVersion 15
        targetSdkVersion 27
-        versionCode 42
-        versionName "0.11.1"
+        versionCode 45
+        versionName "0.11.4"

        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
        vectorDrawables.useSupportLibrary = true
@@ -42,26 +42,29 @@ android {
        abortOnError false
    }
    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_7
-        targetCompatibility JavaVersion.VERSION_1_7
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
    }
 }

+ext {
+    supportLibVersion = '27.0.2'
+}
 dependencies {
    androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2') {
        exclude module: 'support-annotations'
    }

-    implementation 'com.github.TeamNewPipe:NewPipeExtractor:17ce9f537e8df'
+    implementation 'com.github.TeamNewPipe:NewPipeExtractor:9de63f8c0a170a066'

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

-    implementation 'com.android.support:appcompat-v7:27.0.1'
-    implementation 'com.android.support:support-v4:27.0.1'
-    implementation 'com.android.support:design:27.0.1'
-    implementation 'com.android.support:recyclerview-v7:27.0.1'
-    implementation 'com.android.support:preference-v14:27.0.1'
+    implementation "com.android.support:appcompat-v7:$supportLibVersion"
+    implementation "com.android.support:support-v4:$supportLibVersion"
+    implementation "com.android.support:design:$supportLibVersion"
+    implementation "com.android.support:recyclerview-v7:$supportLibVersion"
+    implementation "com.android.support:preference-v14:$supportLibVersion"

    implementation 'com.google.code.gson:gson:2.8.2'
    implementation 'ch.acra:acra:4.9.2'
@@ -76,7 +79,7 @@ dependencies {
    debugImplementation 'com.facebook.stetho:stetho-urlconnection:1.5.0'
    debugImplementation 'com.android.support:multidex:1.0.2'

-    implementation 'io.reactivex.rxjava2:rxjava:2.1.6'
+    implementation 'io.reactivex.rxjava2:rxjava:2.1.7'
    implementation 'io.reactivex.rxjava2:rxandroid:2.0.1'
    implementation 'com.jakewharton.rxbinding2:rxbinding:2.0.0'

--- a/app/src/main/java/org/schabi/newpipe/RouterPopupActivity.java
+++ b/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;
        }
--- a/app/src/main/java/org/schabi/newpipe/database/history/model/WatchHistoryEntry.java
+++ b/app/src/main/java/org/schabi/newpipe/database/history/model/WatchHistoryEntry.java
@@ -48,7 +48,7 @@ public class WatchHistoryEntry extends HistoryEntry {
    }

    public WatchHistoryEntry(StreamInfo streamInfo) {
-        this(new Date(), streamInfo.service_id, streamInfo.name, streamInfo.url,
+        this(new Date(), streamInfo.getServiceId(), streamInfo.getName(), streamInfo.getUrl(),
                streamInfo.id, streamInfo.thumbnail_url, streamInfo.uploader_name, streamInfo.duration);
    }

--- a/app/src/main/java/org/schabi/newpipe/download/DownloadDialog.java
+++ b/app/src/main/java/org/schabi/newpipe/download/DownloadDialog.java
@@ -108,8 +108,8 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
        super.onViewCreated(view, savedInstanceState);
        nameEditText = view.findViewById(R.id.file_name);
-        nameEditText.setText(FilenameUtils.createFilename(getContext(), currentInfo.name));
-        selectedAudioIndex = ListHelper.getDefaultAudioFormat(getContext(), currentInfo.audio_streams);
+        nameEditText.setText(FilenameUtils.createFilename(getContext(), currentInfo.getName()));
+        selectedAudioIndex = ListHelper.getDefaultAudioFormat(getContext(), currentInfo.getAudioStreams());

        streamsSpinner = view.findViewById(R.id.quality_spinner);
        streamsSpinner.setOnItemSelectedListener(this);
@@ -183,7 +183,7 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
        String[] items = new String[audioStreams.size()];
        for (int i = 0; i < audioStreams.size(); i++) {
            AudioStream audioStream = audioStreams.get(i);
-            items[i] = MediaFormat.getNameById(audioStream.format) + " " + audioStream.average_bitrate + "kbps";
+            items[i] = audioStream.getFormat().getName() + " " + audioStream.getAverageBitrate() + "kbps";
        }

        ArrayAdapter<String> itemAdapter = new ArrayAdapter<>(getContext(), android.R.layout.simple_spinner_dropdown_item, items);
@@ -242,7 +242,7 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
        RadioButton audioButton = view.findViewById(R.id.audio_button);
        RadioButton videoButton = view.findViewById(R.id.video_button);

-        if (currentInfo.audio_streams == null || currentInfo.audio_streams.size() == 0) {
+        if (currentInfo.getAudioStreams() == null || currentInfo.getAudioStreams().size() == 0) {
            audioButton.setVisibility(View.GONE);
            videoButton.setChecked(true);
        } else if (sortedStreamVideosList == null || sortedStreamVideosList.size() == 0) {
@@ -256,14 +256,18 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
        String url, location;

        String fileName = nameEditText.getText().toString().trim();
-        if (fileName.isEmpty()) fileName = FilenameUtils.createFilename(getContext(), currentInfo.name);
+        if (fileName.isEmpty()) fileName = FilenameUtils.createFilename(getContext(), currentInfo.getName());

        boolean isAudio = radioVideoAudioGroup.getCheckedRadioButtonId() == R.id.audio_button;
-        url = isAudio ? currentInfo.audio_streams.get(selectedAudioIndex).url : sortedStreamVideosList.get(selectedVideoIndex).url;
-        location = isAudio ? NewPipeSettings.getAudioDownloadPath(getContext()) : NewPipeSettings.getVideoDownloadPath(getContext());
-
-        if (isAudio) fileName += "." + MediaFormat.getSuffixById(currentInfo.audio_streams.get(selectedAudioIndex).format);
-        else fileName += "." + MediaFormat.getSuffixById(sortedStreamVideosList.get(selectedVideoIndex).format);
+        if (isAudio) {
+            url = currentInfo.getAudioStreams().get(selectedAudioIndex).getUrl();
+            location = NewPipeSettings.getAudioDownloadPath(getContext());
+            fileName += "." + currentInfo.getAudioStreams().get(selectedAudioIndex).getFormat().getSuffix();
+        } else {
+            url = sortedStreamVideosList.get(selectedVideoIndex).getUrl();
+            location = NewPipeSettings.getVideoDownloadPath(getContext());
+            fileName += "." + sortedStreamVideosList.get(selectedVideoIndex).getFormat().getSuffix();
+        }

        DownloadManagerService.startMission(getContext(), url, location, fileName, isAudio, threadsSeekBar.getProgress() + 1);
        getDialog().dismiss();
--- a/app/src/main/java/org/schabi/newpipe/fragments/BaseStateFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/BaseStateFragment.java
@@ -1,6 +1,7 @@
 package org.schabi.newpipe.fragments;

 import android.content.Intent;
+import android.net.Uri;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.annotation.StringRes;
@@ -18,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;
@@ -219,6 +221,7 @@ public abstract class BaseStateFragment<I> extends BaseFragment implements ViewC

        if (serviceName == null) serviceName = "none";
        if (request == null) request = "none";
+
        ErrorActivity.reportError(getContext(), exception, MainActivity.class, null, ErrorActivity.ErrorInfo.make(userAction, serviceName, request, errorId));
    }

@@ -239,4 +242,22 @@ public abstract class BaseStateFragment<I> extends BaseFragment implements ViewC

        ErrorActivity.reportError(getContext(), exception, MainActivity.class, rootView, ErrorActivity.ErrorInfo.make(userAction, serviceName, request, errorId));
    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Utils
+    //////////////////////////////////////////////////////////////////////////*/
+
+
+    protected void openUrlInBrowser(String url) {
+        Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(url));
+        startActivity(Intent.createChooser(intent, activity.getString(R.string.share_dialog_title)));
+    }
+
+    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)));
+    }
 }
--- a/app/src/main/java/org/schabi/newpipe/fragments/MainFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/MainFragment.java
@@ -2,6 +2,7 @@ package org.schabi.newpipe.fragments;

 import android.content.SharedPreferences;
 import android.os.Bundle;
+import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.design.widget.TabLayout;
 import android.support.v4.app.Fragment;
@@ -30,30 +31,28 @@ import org.schabi.newpipe.fragments.list.kiosk.KioskFragment;
 import org.schabi.newpipe.fragments.subscription.SubscriptionFragment;
 import org.schabi.newpipe.report.ErrorActivity;
 import org.schabi.newpipe.report.UserAction;
-import org.schabi.newpipe.util.Constants;
 import org.schabi.newpipe.util.KioskTranslator;
 import org.schabi.newpipe.util.NavigationHelper;
 import org.schabi.newpipe.util.ThemeHelper;

-import java.util.concurrent.ExecutionException;
-
 public class MainFragment extends BaseFragment implements TabLayout.OnTabSelectedListener {
    private ViewPager viewPager;
    private boolean showBlankTab = false;

-    private static final int FALLBACK_SERVICE_ID = 0; // Youtbe
+    public int currentServiceId = -1;
+
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Constants
+    //////////////////////////////////////////////////////////////////////////*/
+
+
+    private static final int FALLBACK_SERVICE_ID = 0; // Youtube
    private static final String FALLBACK_CHANNEL_URL =
            "https://www.youtube.com/channel/UC-9-kyTW8ZkZNDHQJ6FgpwQ";
    private static final String FALLBACK_CHANNEL_NAME = "Music";
    private static final String FALLBACK_KIOSK_ID = "Trending";
-
-    public int currentServiceId = -1;
-
-    /*//////////////////////////////////////////////////////////////////////////
-    // Konst
-    //////////////////////////////////////////////////////////////////////////*/
-
-    private static final int KIOSK_MENU_OFFSETT = 2000;
+    private static final int KIOSK_MENU_OFFSET = 2000;

    /*//////////////////////////////////////////////////////////////////////////
    // Fragment's LifeCycle
@@ -66,7 +65,7 @@ public class MainFragment extends BaseFragment implements TabLayout.OnTabSelecte
    }

    @Override
-    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
        currentServiceId = Integer.parseInt(PreferenceManager.getDefaultSharedPreferences(getActivity())
                .getString(getString(R.string.current_service_key), "0"));
        return inflater.inflate(R.layout.fragment_main, container, false);
@@ -86,27 +85,27 @@ public class MainFragment extends BaseFragment implements TabLayout.OnTabSelecte

        tabLayout.setupWithViewPager(viewPager);

-        if(ThemeHelper.isLightThemeSelected(getActivity())) {
+        int channelIcon;
+        int whatsHotIcon;
+
+        if (ThemeHelper.isLightThemeSelected(getActivity())) {
            tabLayout.setBackgroundColor(getResources().getColor(R.color.light_youtube_primary_color));
+            channelIcon = R.drawable.ic_channel_black_24dp;
+            whatsHotIcon = R.drawable.ic_whatshot_black_24dp;
+        } else {
+            channelIcon = R.drawable.ic_channel_white_24dp;
+            whatsHotIcon = R.drawable.ic_whatshot_white_24dp;
        }

-       if(PreferenceManager.getDefaultSharedPreferences(getActivity())
+
+        if (PreferenceManager.getDefaultSharedPreferences(getActivity())
                .getString(getString(R.string.main_page_content_key), getString(R.string.blank_page_key))
                .equals(getString(R.string.subscription_page_key))) {
-           if(ThemeHelper.isLightThemeSelected(getActivity())) {
-               tabLayout.getTabAt(0).setIcon(R.drawable.ic_channel_black_24dp);
-           } else{
-               tabLayout.getTabAt(0).setIcon(R.drawable.ic_channel_white_24dp);
-           }
-       } else {
-           if(ThemeHelper.isLightThemeSelected(getActivity())) {
-               tabLayout.getTabAt(0).setIcon(R.drawable.ic_whatshot_black_24dp);
-               tabLayout.getTabAt(1).setIcon(R.drawable.ic_channel_black_24dp);
-           } else {
-               tabLayout.getTabAt(0).setIcon(R.drawable.ic_whatshot_white_24dp);
-               tabLayout.getTabAt(1).setIcon(R.drawable.ic_channel_white_24dp);
-           }
-       }
+            tabLayout.getTabAt(0).setIcon(channelIcon);
+        } else {
+            tabLayout.getTabAt(0).setIcon(whatsHotIcon);
+            tabLayout.getTabAt(1).setIcon(channelIcon);
+        }
    }

    /*//////////////////////////////////////////////////////////////////////////
@@ -182,7 +181,7 @@ public class MainFragment extends BaseFragment implements TabLayout.OnTabSelecte
                            .equals(getString(R.string.subscription_page_key))) {
                        return new SubscriptionFragment();
                    } else {
-                        return getMainPageFramgent();
+                        return getMainPageFragment();
                    }
                case 1:
                    return new SubscriptionFragment();
@@ -213,7 +212,7 @@ public class MainFragment extends BaseFragment implements TabLayout.OnTabSelecte
    // Main page content
    //////////////////////////////////////////////////////////////////////////*/

-    private Fragment getMainPageFramgent() {
+    private Fragment getMainPageFragment() {
        try {
            SharedPreferences preferences =
                    PreferenceManager.getDefaultSharedPreferences(getActivity());
@@ -268,7 +267,7 @@ public class MainFragment extends BaseFragment implements TabLayout.OnTabSelecte
        KioskList kl = service.getKioskList();
        int i = 0;
        for(final String ks : kl.getAvailableKiosks()) {
-            menu.add(0, KIOSK_MENU_OFFSETT + i, Menu.NONE,
+            menu.add(0, KIOSK_MENU_OFFSET + i, Menu.NONE,
                    KioskTranslator.getTranslatedKioskName(ks, getContext()))
                    .setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
                        @Override
--- a/app/src/main/java/org/schabi/newpipe/fragments/detail/SpinnerToolbarAdapter.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/detail/SpinnerToolbarAdapter.java
@@ -60,7 +60,7 @@ public class SpinnerToolbarAdapter extends BaseAdapter {
        ImageView woSoundIcon = convertView.findViewById(R.id.wo_sound_icon);
        TextView text = convertView.findViewById(android.R.id.text1);
        VideoStream item = (VideoStream) getItem(position);
-        text.setText(MediaFormat.getNameById(item.format) + " " + item.resolution);
+        text.setText(item.getFormat().getName() + " " + item.getResolution());

        int visibility = !showIconNoAudio ? View.GONE
                : item.isVideoOnly ? View.VISIBLE
--- a/app/src/main/java/org/schabi/newpipe/fragments/detail/StackItem.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/detail/StackItem.java
@@ -4,7 +4,8 @@ import java.io.Serializable;

 class StackItem implements Serializable {
    private int serviceId;
-    private String title, url;
+    private String title;
+    private String url;

    StackItem(int serviceId, String url, String title) {
        this.serviceId = serviceId;
--- a/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
--- a/app/src/main/java/org/schabi/newpipe/fragments/list/BaseListFragment.java
+++ b/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;
@@ -140,7 +146,7 @@ public abstract class BaseListFragment<I, N> extends BaseStateFragment<I> implem
                onItemSelected(selectedItem);
                NavigationHelper.openVideoDetailFragment(
                        useAsFrontPage?getParentFragment().getFragmentManager():getFragmentManager(),
-                        selectedItem.service_id, selectedItem.url, selectedItem.name);
+                        selectedItem.getServiceId(), selectedItem.getUrl(), selectedItem.getName());
            }

            @Override
@@ -155,7 +161,7 @@ public abstract class BaseListFragment<I, N> extends BaseStateFragment<I> implem
                onItemSelected(selectedItem);
                NavigationHelper.openChannelFragment(
                        useAsFrontPage?getParentFragment().getFragmentManager():getFragmentManager(),
-                        selectedItem.service_id, selectedItem.url, selectedItem.name);
+                        selectedItem.getServiceId(), selectedItem.getUrl(), selectedItem.getName());
            }

            @Override
@@ -168,7 +174,7 @@ public abstract class BaseListFragment<I, N> extends BaseStateFragment<I> implem
                onItemSelected(selectedItem);
                NavigationHelper.openPlaylistFragment(
                        useAsFrontPage?getParentFragment().getFragmentManager():getFragmentManager(),
-                        selectedItem.service_id, selectedItem.url, selectedItem.name);
+                        selectedItem.getServiceId(), selectedItem.getUrl(), selectedItem.getName());
            }

            @Override
@@ -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;
--- a/app/src/main/java/org/schabi/newpipe/fragments/list/BaseListInfoFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/list/BaseListInfoFragment.java
@@ -190,8 +190,8 @@ public abstract class BaseListInfoFragment<I extends ListInfo> extends BaseListF
    public void handleResult(@NonNull I result) {
        super.handleResult(result);

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

        if (infoListAdapter.getItemsList().size() == 0) {
--- a/app/src/main/java/org/schabi/newpipe/fragments/list/channel/ChannelFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/list/channel/ChannelFragment.java
@@ -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;

@@ -105,7 +103,7 @@ public class ChannelFragment extends BaseListInfoFragment<ChannelInfo> {
                && useAsFrontPage
                && isVisibleToUser) {
            try {
-                activity.getSupportActionBar().setTitle(currentInfo.name);
+                activity.getSupportActionBar().setTitle(currentInfo.getName());
            } catch (Exception e) {
                onError(e);
            }
@@ -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;
@@ -208,7 +207,7 @@ public class ChannelFragment extends BaseListInfoFragment<ChannelInfo> {
            if (DEBUG) Log.d(TAG, "onCreateOptionsMenu() called with: menu = [" + menu + "], inflater = [" + inflater + "]");
            menuRssButton = menu.findItem(R.id.menu_item_rss);
            if (currentInfo != null) {
-                menuRssButton.setVisible(!TextUtils.isEmpty(currentInfo.feed_url));
+                menuRssButton.setVisible(!TextUtils.isEmpty(currentInfo.getFeedUrl()));
            }

        }
@@ -217,23 +216,11 @@ public class ChannelFragment extends BaseListInfoFragment<ChannelInfo> {
    private void openRssFeed() {
        final ChannelInfo info = currentInfo;
        if(info != null) {
-            Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(info.feed_url));
+            Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(info.getFeedUrl()));
            startActivity(intent);
        }
    }

-    private void openChannelUriInBrowser() {
-        Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(url));
-        startActivity(intent);
-    }
-
-    private void shareChannelUri() {
-        Intent intent = new Intent(Intent.ACTION_SEND);
-        intent.setType("text/plain");
-        intent.putExtra(Intent.EXTRA_TEXT, url);
-        startActivity(Intent.createChooser(intent, getString(R.string.share_dialog_title)));
-    }
-
    @Override
    public boolean onOptionsItemSelected(MenuItem item) {
        switch (item.getItemId()) {
@@ -241,10 +228,10 @@ public class ChannelFragment extends BaseListInfoFragment<ChannelInfo> {
                openRssFeed();
                break;
            case R.id.menu_item_openInBrowser:
-                openChannelUriInBrowser();
+                openUrlInBrowser(url);
                break;
            case R.id.menu_item_share: {
-                shareChannelUri();
+                shareUrl(name, url);
                break;
            }
            default:
@@ -264,12 +251,12 @@ public class ChannelFragment extends BaseListInfoFragment<ChannelInfo> {
            @Override
            public void accept(Throwable throwable) throws Exception {
                animateView(headerSubscribeButton, false, 100);
-                showSnackBarError(throwable, UserAction.SUBSCRIPTION, NewPipe.getNameOfService(currentInfo.service_id), "Get subscription status", 0);
+                showSnackBarError(throwable, UserAction.SUBSCRIPTION, NewPipe.getNameOfService(currentInfo.getServiceId()), "Get subscription status", 0);
            }
        };

        final Observable<List<SubscriptionEntity>> observable = subscriptionService.subscriptionTable()
-                .getSubscription(info.service_id, info.url)
+                .getSubscription(info.getServiceId(), info.getUrl())
                .toObservable();

        disposables.add(observable
@@ -315,14 +302,14 @@ public class ChannelFragment extends BaseListInfoFragment<ChannelInfo> {
        final Action onComplete = new Action() {
            @Override
            public void run() throws Exception {
-                if (DEBUG) Log.d(TAG, "Updated subscription: " + info.url);
+                if (DEBUG) Log.d(TAG, "Updated subscription: " + info.getUrl());
            }
        };

        final Consumer<Throwable> onError = new Consumer<Throwable>() {
            @Override
            public void accept(@NonNull Throwable throwable) throws Exception {
-                onUnrecoverableError(throwable, UserAction.SUBSCRIPTION, NewPipe.getNameOfService(info.service_id), "Updating Subscription for " + info.url, R.string.subscription_update_failed);
+                onUnrecoverableError(throwable, UserAction.SUBSCRIPTION, NewPipe.getNameOfService(info.getServiceId()), "Updating Subscription for " + info.getUrl(), R.string.subscription_update_failed);
            }
        };

@@ -343,7 +330,7 @@ public class ChannelFragment extends BaseListInfoFragment<ChannelInfo> {
        final Consumer<Throwable> onError = new Consumer<Throwable>() {
            @Override
            public void accept(@NonNull Throwable throwable) throws Exception {
-                onUnrecoverableError(throwable, UserAction.SUBSCRIPTION, NewPipe.getNameOfService(currentInfo.service_id), "Subscription Change", R.string.subscription_change_failed);
+                onUnrecoverableError(throwable, UserAction.SUBSCRIPTION, NewPipe.getNameOfService(currentInfo.getServiceId()), "Subscription Change", R.string.subscription_change_failed);
            }
        };

@@ -367,9 +354,9 @@ public class ChannelFragment extends BaseListInfoFragment<ChannelInfo> {
                if (subscriptionEntities.isEmpty()) {
                    if (DEBUG) Log.d(TAG, "No subscription to this channel!");
                    SubscriptionEntity channel = new SubscriptionEntity();
-                    channel.setServiceId(info.service_id);
-                    channel.setUrl(info.url);
-                    channel.setData(info.name, info.avatar_url, info.description, info.subscriber_count);
+                    channel.setServiceId(info.getServiceId());
+                    channel.setUrl(info.getUrl());
+                    channel.setData(info.getName(), info.getAvatarUrl(), info.getDescription(), info.getSubscriberCount());
                    subscribeButtonMonitor = monitorSubscribeButton(headerSubscribeButton, mapOnSubscribe(channel));
                } else {
                    if (DEBUG) Log.d(TAG, "Found subscription to this channel!");
@@ -440,16 +427,16 @@ public class ChannelFragment extends BaseListInfoFragment<ChannelInfo> {
        imageLoader.displayImage(result.banner_url, headerChannelBanner, DISPLAY_BANNER_OPTIONS);
        imageLoader.displayImage(result.avatar_url, headerAvatarView, DISPLAY_AVATAR_OPTIONS);

-        if (result.subscriber_count != -1) {
-            headerSubscribersTextView.setText(Localization.localizeSubscribersCount(activity, result.subscriber_count));
+        if (result.getSubscriberCount() != -1) {
+            headerSubscribersTextView.setText(Localization.localizeSubscribersCount(activity, result.getSubscriberCount()));
            headerSubscribersTextView.setVisibility(View.VISIBLE);
        } else headerSubscribersTextView.setVisibility(View.GONE);

-        if (menuRssButton != null) menuRssButton.setVisible(!TextUtils.isEmpty(result.feed_url));
+        if (menuRssButton != null) menuRssButton.setVisible(!TextUtils.isEmpty(result.getFeedUrl()));
        playlistCtrl.setVisibility(View.VISIBLE);

        if (!result.errors.isEmpty()) {
-            showSnackBarError(result.errors, UserAction.REQUESTED_CHANNEL, NewPipe.getNameOfService(result.service_id), result.url, 0);
+            showSnackBarError(result.errors, UserAction.REQUESTED_CHANNEL, NewPipe.getNameOfService(result.getServiceId()), result.getUrl(), 0);
        }

        if (disposables != null) disposables.clear();
@@ -466,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());
            }
        });
@@ -490,9 +470,9 @@ public class ChannelFragment extends BaseListInfoFragment<ChannelInfo> {

    private PlayQueue getPlayQueue(final int index) {
        return new ChannelPlayQueue(
-                currentInfo.service_id,
-                currentInfo.url,
-                currentInfo.next_streams_url,
+                currentInfo.getServiceId(),
+                currentInfo.getUrl(),
+                currentInfo.getNextStreamsUrl(),
                infoListAdapter.getItemsList(),
                index
        );
@@ -502,8 +482,8 @@ public class ChannelFragment extends BaseListInfoFragment<ChannelInfo> {
    public void handleNextItems(ListExtractor.NextItemsResult result) {
        super.handleNextItems(result);

-        if (!result.errors.isEmpty()) {
-            showSnackBarError(result.errors, UserAction.REQUESTED_CHANNEL, NewPipe.getNameOfService(serviceId),
+        if (!result.getErrors().isEmpty()) {
+            showSnackBarError(result.getErrors(), UserAction.REQUESTED_CHANNEL, NewPipe.getNameOfService(serviceId),
                    "Get next page of: " + url, R.string.general_error);
        }
    }
--- a/app/src/main/java/org/schabi/newpipe/fragments/list/feed/FeedFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/list/feed/FeedFragment.java
@@ -297,12 +297,12 @@ public class FeedFragment extends BaseListFragment<List<SubscriptionEntity>, Voi
            // Called only when response is non-empty
            @Override
            public void onSuccess(final ChannelInfo channelInfo) {
-                if (infoListAdapter == null || channelInfo.related_streams.isEmpty()) {
+                if (infoListAdapter == null || channelInfo.getRelatedStreams().isEmpty()) {
                    onDone();
                    return;
                }

-                final InfoItem item = channelInfo.related_streams.get(0);
+                final InfoItem item = channelInfo.getRelatedStreams().get(0);
                // Keep requesting new items if the current one already exists
                boolean itemExists = doesItemExist(infoListAdapter.getItemsList(), item);
                if (!itemExists) {
@@ -412,9 +412,9 @@ public class FeedFragment extends BaseListFragment<List<SubscriptionEntity>, Voi
    private boolean doesItemExist(final List<InfoItem> items, final InfoItem item) {
        for (final InfoItem existingItem : items) {
            if (existingItem.info_type == item.info_type &&
-                    existingItem.service_id == item.service_id &&
-                    existingItem.name.equals(item.name) &&
-                    existingItem.url.equals(item.url)) return true;
+                    existingItem.getServiceId() == item.getServiceId() &&
+                    existingItem.getName().equals(item.getName()) &&
+                    existingItem.getUrl().equals(item.getUrl())) return true;
        }
        return false;
    }
--- a/app/src/main/java/org/schabi/newpipe/fragments/list/kiosk/KioskFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/list/kiosk/KioskFragment.java
@@ -5,6 +5,7 @@ import android.preference.PreferenceManager;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v7.app.ActionBar;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -57,14 +58,10 @@ public class KioskFragment extends BaseListInfoFragment<KioskInfo> {
    @State
    protected String kioskId = "";

-
    /*//////////////////////////////////////////////////////////////////////////
    // Views
    //////////////////////////////////////////////////////////////////////////*/

-    private View headerRootLayout;
-    private TextView headerTitleView;
-
    public static KioskFragment getInstance(int serviceId)
            throws ExtractionException {
        return getInstance(serviceId, NewPipe.getService(serviceId)
@@ -89,21 +86,40 @@ public class KioskFragment extends BaseListInfoFragment<KioskInfo> {
    // LifeCycle
    //////////////////////////////////////////////////////////////////////////*/

+    @Override
+    public void onActivityCreated(Bundle savedState) {
+        super.onActivityCreated(savedState);
+        try {
+            activity.getSupportActionBar()
+                    .setTitle(KioskTranslator.getTranslatedKioskName(kioskId, getActivity()));
+        } catch (Exception e) {
+            onUnrecoverableError(e, UserAction.UI_ERROR,
+                    "none",
+                    "none", R.string.app_ui_crash);
+        }
+    }
+
    @Override
    public void setUserVisibleHint(boolean isVisibleToUser) {
        super.setUserVisibleHint(isVisibleToUser);
-        if(useAsFrontPage && isVisibleToUser) {
+        if(useAsFrontPage && isVisibleToUser && activity != null) {
            try {
-                activity.getSupportActionBar().setTitle(KioskTranslator.getTranslatedKioskName(kioskId, getActivity()));
+                activity.getSupportActionBar()
+                        .setTitle(KioskTranslator.getTranslatedKioskName(kioskId, getActivity()));
            } catch (Exception e) {
-                onError(e);
+                onUnrecoverableError(e, UserAction.UI_ERROR,
+                        "none",
+                        "none", R.string.app_ui_crash);
            }
        }
    }

    @Override
    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        return inflater.inflate(R.layout.fragment_kiosk, container, false);
+        View view = inflater.inflate(R.layout.fragment_kiosk, container, false);
+        activity.getSupportActionBar()
+                .setTitle(KioskTranslator.getTranslatedKioskName(kioskId, getActivity()));
+        return view;
    }

    /*//////////////////////////////////////////////////////////////////////////
@@ -127,14 +143,18 @@ 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);
    }

    @Override
    public Single<ListExtractor.NextItemsResult> loadMoreItemsLogic() {
-        return ExtractorHelper.getMoreKioskItems(serviceId, url, currentNextItemsUrl);
+        String contentCountry = PreferenceManager
+                .getDefaultSharedPreferences(activity)
+                .getString(getString(R.string.content_country_key),
+                        getString(R.string.default_country_value));
+        return ExtractorHelper.getMoreKioskItems(serviceId, url, currentNextItemsUrl, contentCountry);
    }

    /*//////////////////////////////////////////////////////////////////////////
@@ -155,10 +175,10 @@ public class KioskFragment extends BaseListInfoFragment<KioskInfo> {
        ActionBar supportActionBar = activity.getSupportActionBar();
        supportActionBar.setTitle(title);

-        if (!result.errors.isEmpty()) {
-            showSnackBarError(result.errors,
+        if (!result.getErrors().isEmpty()) {
+            showSnackBarError(result.getErrors(),
                    UserAction.REQUESTED_PLAYLIST,
-                    NewPipe.getNameOfService(result.service_id), result.url, 0);
+                    NewPipe.getNameOfService(result.getServiceId()), result.getUrl(), 0);
        }
    }

@@ -166,8 +186,8 @@ public class KioskFragment extends BaseListInfoFragment<KioskInfo> {
    public void handleNextItems(ListExtractor.NextItemsResult result) {
        super.handleNextItems(result);

-        if (!result.errors.isEmpty()) {
-            showSnackBarError(result.errors,
+        if (!result.getErrors().isEmpty()) {
+            showSnackBarError(result.getErrors(),
                    UserAction.REQUESTED_PLAYLIST, NewPipe.getNameOfService(serviceId)
                    , "Get next page of: " + url, 0);
        }
--- a/app/src/main/java/org/schabi/newpipe/fragments/list/playlist/PlaylistFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/list/playlist/PlaylistFragment.java
@@ -1,22 +1,21 @@
 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;
+import android.view.MenuItem;
 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;
@@ -32,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;

@@ -98,16 +96,10 @@ public class PlaylistFragment extends BaseListInfoFragment<PlaylistInfo> {
        infoListAdapter.useMiniItemVariants(true);
    }

-    @Override
-    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-        if (DEBUG) Log.d(TAG, "onCreateOptionsMenu() called with: menu = [" + menu + "], inflater = [" + inflater + "]");
-        super.onCreateOptionsMenu(menu, inflater);
-        inflater.inflate(R.menu.menu_playlist, menu);
-    }
-
    @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[]{
@@ -127,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));
@@ -136,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;
@@ -146,6 +138,14 @@ public class PlaylistFragment extends BaseListInfoFragment<PlaylistInfo> {

        new InfoItemDialog(getActivity(), item, commands, actions).show();
    }
+
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        if (DEBUG) Log.d(TAG, "onCreateOptionsMenu() called with: menu = [" + menu + "], inflater = [" + inflater + "]");
+        super.onCreateOptionsMenu(menu, inflater);
+        inflater.inflate(R.menu.menu_playlist, menu);
+    }
+
    /*//////////////////////////////////////////////////////////////////////////
    // Load and handle
    //////////////////////////////////////////////////////////////////////////*/
@@ -160,6 +160,23 @@ public class PlaylistFragment extends BaseListInfoFragment<PlaylistInfo> {
        return ExtractorHelper.getPlaylistInfo(serviceId, url, forceLoad);
    }

+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.menu_item_openInBrowser:
+                openUrlInBrowser(url);
+                break;
+            case R.id.menu_item_share: {
+                shareUrl(name, url);
+                break;
+            }
+            default:
+                return super.onOptionsItemSelected(item);
+        }
+        return true;
+    }
+
+
    /*//////////////////////////////////////////////////////////////////////////
    // Contract
    //////////////////////////////////////////////////////////////////////////*/
@@ -181,13 +198,13 @@ public class PlaylistFragment extends BaseListInfoFragment<PlaylistInfo> {
        animateView(headerRootLayout, true, 100);
        animateView(headerUploaderLayout, true, 300);
        headerUploaderLayout.setOnClickListener(null);
-        if (!TextUtils.isEmpty(result.uploader_name)) {
-            headerUploaderName.setText(result.uploader_name);
-            if (!TextUtils.isEmpty(result.uploader_url)) {
+        if (!TextUtils.isEmpty(result.getUploaderName())) {
+            headerUploaderName.setText(result.getUploaderName());
+            if (!TextUtils.isEmpty(result.getUploaderUrl())) {
                headerUploaderLayout.setOnClickListener(new View.OnClickListener() {
                    @Override
                    public void onClick(View v) {
-                        NavigationHelper.openChannelFragment(getFragmentManager(), result.service_id, result.uploader_url, result.uploader_name);
+                        NavigationHelper.openChannelFragment(getFragmentManager(), result.getServiceId(), result.getUploaderUrl(), result.getUploaderName());
                    }
                });
            }
@@ -195,11 +212,11 @@ public class PlaylistFragment extends BaseListInfoFragment<PlaylistInfo> {

        playlistCtrl.setVisibility(View.VISIBLE);

-        imageLoader.displayImage(result.uploader_avatar_url, headerUploaderAvatar, DISPLAY_AVATAR_OPTIONS);
+        imageLoader.displayImage(result.getUploaderAvatarUrl(), headerUploaderAvatar, DISPLAY_AVATAR_OPTIONS);
        headerStreamCount.setText(getResources().getQuantityString(R.plurals.videos, (int) result.stream_count, (int) result.stream_count));

-        if (!result.errors.isEmpty()) {
-            showSnackBarError(result.errors, UserAction.REQUESTED_PLAYLIST, NewPipe.getNameOfService(result.service_id), result.url, 0);
+        if (!result.getErrors().isEmpty()) {
+            showSnackBarError(result.getErrors(), UserAction.REQUESTED_PLAYLIST, NewPipe.getNameOfService(result.getServiceId()), result.getUrl(), 0);
        }

        headerPlayAllButton.setOnClickListener(new View.OnClickListener() {
@@ -211,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());
            }
        });
@@ -235,9 +245,9 @@ public class PlaylistFragment extends BaseListInfoFragment<PlaylistInfo> {

    private PlayQueue getPlayQueue(final int index) {
        return new PlaylistPlayQueue(
-                currentInfo.service_id,
-                currentInfo.url,
-                currentInfo.next_streams_url,
+                currentInfo.getServiceId(),
+                currentInfo.getUrl(),
+                currentInfo.getNextStreamsUrl(),
                infoListAdapter.getItemsList(),
                index
        );
@@ -247,8 +257,8 @@ public class PlaylistFragment extends BaseListInfoFragment<PlaylistInfo> {
    public void handleNextItems(ListExtractor.NextItemsResult result) {
        super.handleNextItems(result);

-        if (!result.errors.isEmpty()) {
-            showSnackBarError(result.errors, UserAction.REQUESTED_PLAYLIST, NewPipe.getNameOfService(serviceId)
+        if (!result.getErrors().isEmpty()) {
+            showSnackBarError(result.getErrors(), UserAction.REQUESTED_PLAYLIST, NewPipe.getNameOfService(serviceId)
                    , "Get next page of: " + url, 0);
        }
    }
--- a/app/src/main/java/org/schabi/newpipe/fragments/list/search/SearchFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/list/search/SearchFragment.java
@@ -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>() {
@@ -861,8 +861,8 @@ public class SearchFragment extends BaseListFragment<SearchResult, ListExtractor
        lastSearchedQuery = searchQuery;

        if (infoListAdapter.getItemsList().size() == 0) {
-            if (result.resultList.size() > 0) {
-                infoListAdapter.addInfoItemList(result.resultList);
+            if (!result.getResults().isEmpty()) {
+                infoListAdapter.addInfoItemList(result.getResults());
            } else {
                infoListAdapter.clearStreamItemList();
                showEmptyState();
@@ -876,11 +876,11 @@ public class SearchFragment extends BaseListFragment<SearchResult, ListExtractor
    @Override
    public void handleNextItems(ListExtractor.NextItemsResult result) {
        showListFooter(false);
-        currentPage = Integer.parseInt(result.nextItemsUrl);
-        infoListAdapter.addInfoItemList(result.nextItemsList);
+        currentPage = Integer.parseInt(result.getNextItemsUrl());
+        infoListAdapter.addInfoItemList(result.getNextItemsList());

-        if (!result.errors.isEmpty()) {
-            showSnackBarError(result.errors, UserAction.SEARCHED, NewPipe.getNameOfService(serviceId)
+        if (!result.getErrors().isEmpty()) {
+            showSnackBarError(result.getErrors(), UserAction.SEARCHED, NewPipe.getNameOfService(serviceId)
                    , "\"" + searchQuery + "\" → page " + currentPage, 0);
        }
        super.handleNextItems(result);
--- a/app/src/main/java/org/schabi/newpipe/fragments/subscription/SubscriptionFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/subscription/SubscriptionFragment.java
@@ -129,7 +129,7 @@ public class SubscriptionFragment extends BaseStateFragment<List<SubscriptionEnt
            @Override
            public void selected(ChannelInfoItem selectedItem) {
                // Requires the parent fragment to find holder for fragment replacement
-                NavigationHelper.openChannelFragment(getParentFragment().getFragmentManager(), selectedItem.service_id, selectedItem.url, selectedItem.name);
+                NavigationHelper.openChannelFragment(getParentFragment().getFragmentManager(), selectedItem.getServiceId(), selectedItem.url, selectedItem.getName());

            }

--- a/app/src/main/java/org/schabi/newpipe/fragments/subscription/SubscriptionService.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/subscription/SubscriptionService.java
@@ -112,7 +112,7 @@ public class SubscriptionService {
                    // Subscriber count changes very often, making this check almost unnecessary.
                    // Consider removing it later.
                    if (!isSubscriptionUpToDate(info, subscription)) {
-                        subscription.setData(info.name, info.avatar_url, info.description, info.subscriber_count);
+                        subscription.setData(info.getName(), info.getAvatarUrl(), info.getDescription(), info.getSubscriberCount());

                        return update(subscription);
                    }
@@ -122,7 +122,7 @@ public class SubscriptionService {
            }
        };

-        return subscriptionTable().getSubscription(info.service_id, info.url)
+        return subscriptionTable().getSubscription(info.getServiceId(), info.getUrl())
                .firstOrError()
                .flatMapCompletable(update);
    }
@@ -137,11 +137,11 @@ public class SubscriptionService {
    }

    private boolean isSubscriptionUpToDate(final ChannelInfo info, final SubscriptionEntity entity) {
-        return info.url.equals(entity.getUrl()) &&
-                info.service_id == entity.getServiceId() &&
-                info.name.equals(entity.getName()) &&
-                info.avatar_url.equals(entity.getAvatarUrl()) &&
-                info.description.equals(entity.getDescription()) &&
-                info.subscriber_count == entity.getSubscriberCount();
+        return info.getUrl().equals(entity.getUrl()) &&
+                info.getServiceId() == entity.getServiceId() &&
+                info.getName().equals(entity.getName()) &&
+                info.getAvatarUrl().equals(entity.getAvatarUrl()) &&
+                info.getDescription().equals(entity.getDescription()) &&
+                info.getSubscriberCount() == entity.getSubscriberCount();
    }
 }
--- a/app/src/main/java/org/schabi/newpipe/info_list/InfoItemDialog.java
+++ b/app/src/main/java/org/schabi/newpipe/info_list/InfoItemDialog.java
@@ -19,7 +19,7 @@ public class InfoItemDialog {
                          @NonNull final StreamInfoItem info,
                          @NonNull final String[] commands,
                          @NonNull final DialogInterface.OnClickListener actions) {
-        this(activity, commands, actions, info.name, info.uploader_name);
+        this(activity, commands, actions, info.getName(), info.uploader_name);
    }

    public InfoItemDialog(@NonNull final Activity activity,
--- a/app/src/main/java/org/schabi/newpipe/info_list/holder/ChannelMiniInfoItemHolder.java
+++ b/app/src/main/java/org/schabi/newpipe/info_list/holder/ChannelMiniInfoItemHolder.java
@@ -36,7 +36,7 @@ public class ChannelMiniInfoItemHolder extends InfoItemHolder {
        if (!(infoItem instanceof ChannelInfoItem)) return;
        final ChannelInfoItem item = (ChannelInfoItem) infoItem;

-        itemTitleView.setText(item.name);
+        itemTitleView.setText(item.getName());
        itemAdditionalDetailView.setText(getDetailLine(item));

        itemBuilder.getImageLoader()
--- a/app/src/main/java/org/schabi/newpipe/info_list/holder/PlaylistInfoItemHolder.java
+++ b/app/src/main/java/org/schabi/newpipe/info_list/holder/PlaylistInfoItemHolder.java
@@ -32,7 +32,7 @@ public class PlaylistInfoItemHolder extends InfoItemHolder {
        if (!(infoItem instanceof PlaylistInfoItem)) return;
        final PlaylistInfoItem item = (PlaylistInfoItem) infoItem;

-        itemTitleView.setText(item.name);
+        itemTitleView.setText(item.getName());
        itemStreamCountView.setText(item.stream_count + "");
        itemUploaderView.setText(item.uploader_name);

--- a/app/src/main/java/org/schabi/newpipe/info_list/holder/StreamMiniInfoItemHolder.java
+++ b/app/src/main/java/org/schabi/newpipe/info_list/holder/StreamMiniInfoItemHolder.java
@@ -40,7 +40,7 @@ public class StreamMiniInfoItemHolder extends InfoItemHolder {
        if (!(infoItem instanceof StreamInfoItem)) return;
        final StreamInfoItem item = (StreamInfoItem) infoItem;

-        itemVideoTitleView.setText(item.name);
+        itemVideoTitleView.setText(item.getName());
        itemUploaderView.setText(item.uploader_name);

        if (item.duration > 0) {
--- a/app/src/main/java/org/schabi/newpipe/player/BackgroundPlayer.java
+++ b/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";
@@ -177,7 +176,7 @@ public final class BackgroundPlayer extends Service {

        NotificationCompat.Builder builder = new NotificationCompat.Builder(this, getString(R.string.notification_channel_id))
                .setOngoing(true)
-                .setSmallIcon(R.drawable.ic_play_circle_filled_white_24dp)
+                .setSmallIcon(R.drawable.ic_newpipe_triangle_white)
                .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
                .setCustomContentView(notRemoteView)
                .setCustomBigContentView(bigNotRemoteView);
@@ -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.url, 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;
--- a/app/src/main/java/org/schabi/newpipe/player/BackgroundPlayerActivity.java
+++ b/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);
+    }
 }
--- a/app/src/main/java/org/schabi/newpipe/player/MainVideoPlayer.java
+++ b/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() {
--- a/app/src/main/java/org/schabi/newpipe/player/PopupVideoPlayer.java
+++ b/app/src/main/java/org/schabi/newpipe/player/PopupVideoPlayer.java
@@ -44,6 +44,7 @@ import android.view.Gravity;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.WindowManager;
+import android.widget.ImageButton;
 import android.widget.PopupMenu;
 import android.widget.RemoteViews;
 import android.widget.SeekBar;
@@ -65,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;
@@ -83,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;
@@ -101,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";
@@ -168,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);
@@ -266,16 +255,19 @@ 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))
                .setOngoing(true)
-                .setSmallIcon(R.drawable.ic_play_arrow_white)
+                .setSmallIcon(R.drawable.ic_newpipe_triangle_white)
                .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
                .setContent(notRemoteView);
    }
@@ -401,6 +393,7 @@ public final class PopupVideoPlayer extends Service {

    protected class VideoPlayerImpl extends VideoPlayer {
        private TextView resizingIndicator;
+        private ImageButton fullScreenButton;

        @Override
        public void handleIntent(Intent intent) {
@@ -418,6 +411,8 @@ public final class PopupVideoPlayer extends Service {
        public void initViews(View rootView) {
            super.initViews(rootView);
            resizingIndicator = rootView.findViewById(R.id.resizing_indicator);
+            fullScreenButton = rootView.findViewById(R.id.fullScreenButton);
+            fullScreenButton.setOnClickListener(v -> onFullScreenButtonClicked());
        }

        @Override
@@ -462,7 +457,7 @@ public final class PopupVideoPlayer extends Service {
            } else {
                intent = new Intent(PopupVideoPlayer.this, PlayVideoActivity.class)
                        .putExtra(PlayVideoActivity.VIDEO_TITLE, getVideoTitle())
-                        .putExtra(PlayVideoActivity.STREAM_URL, getSelectedVideoStream().url)
+                        .putExtra(PlayVideoActivity.STREAM_URL, getSelectedVideoStream().getUrl())
                        .putExtra(PlayVideoActivity.VIDEO_URL, getVideoUrl())
                        .putExtra(PlayVideoActivity.START_POSITION, Math.round(getPlayer().getCurrentPosition() / 1000f));
                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
@@ -595,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);
@@ -614,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;
@@ -890,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();
--- a/app/src/main/java/org/schabi/newpipe/player/PopupVideoPlayerActivity.java
+++ b/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);
+    }
 }
--- a/app/src/main/java/org/schabi/newpipe/player/ServicePlayerActivity.java
+++ b/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();
@@ -529,7 +539,7 @@ public abstract class ServicePlayerActivity extends AppCompatActivity
    @Override
    public void onMetadataUpdate(StreamInfo info) {
        if (info != null) {
-            metadataTitle.setText(info.name);
+            metadataTitle.setText(info.getName());
            metadataArtist.setText(info.uploader_name);
            scrollToSelected();
        }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Christian Schabesberger	ada0cee656	move on to v0.11.4	2018-01-09 14:11:37 +01:00
Christian Schabesberger	6dde524d2c	Merge branch 'dev' of github.com:teamnewpipe/NewPipe into dev	2018-01-09 14:02:39 +01:00
Christian Schabesberger	6a631e1915	forece select activity when opening with browser	2018-01-09 14:02:32 +01:00
Christian Schabesberger	bb6fa343cf	Merge pull request #976 from coffeemakr/feature-share-subject Add subject to shared URL's (fixes #975)	2018-01-09 13:53:29 +01:00
Christian Schabesberger	7557acde6c	Merge pull request #977 from TobiGr/TranslationChecker-Fix Fix crash due to no "other" item in plurals	2018-01-09 13:51:14 +01:00
TobiGr	25ed8952f9	Fix crash due to no "other" item in plurals	2018-01-09 13:24:50 +01:00
Coffeemakr	b93d94b0bd	Add subject to shared URL's (fixes #975 )	2018-01-09 12:41:30 +01:00
Christian Schabesberger	33d75fd2fb	switch languageCode to content country	2018-01-09 12:25:40 +01:00
Christian Schabesberger	28a9855fd2	add countrycodes	2018-01-09 11:33:17 +01:00
Christian Schabesberger	9aad07621c	fix many/other problem	2018-01-09 10:28:28 +01:00
Christian Schabesberger	384cde6eaa	fix weblate merge failure	2018-01-08 13:29:25 +01:00
Sebastian Rasmussen	5ae98661ad	Translated using Weblate (Swedish) Currently translated at 100.0% (244 of 244 strings)	2018-01-08 13:21:19 +01:00
Alberto Moshpirit	8f4d9ceca9	Translated using Weblate (Spanish) Currently translated at 100.0% (244 of 244 strings)	2018-01-08 13:21:15 +01:00
Christian Schabesberger	83d9a1233e	horrible hack for fixing channel load next page foo	2018-01-06 20:39:33 +01:00
thami simo	522a287d79	Translated using Weblate (Arabic) Currently translated at 96.3% (235 of 244 strings)	2018-01-06 17:21:06 +01:00
Sebastian Rasmussen	e052d4660d	Translated using Weblate (Swedish) Currently translated at 100.0% (244 of 244 strings)	2018-01-06 17:21:03 +01:00
John Zhen Mo	39b0b2f032	-Added player conversion to background and popup players. -[#919] Fixed custom notification does not trigger unlocking on lockscreen. -[#947] Fixes player crashing on internet outage, issue partially addressed. -Fixed main player losing state after destroy while in background. -Fixed main player controls not hiding automatically after orientation change. -Fixed dialog uploader not marqueeing when too long. -Fixed popup permission throwing NPE on BaseList. -Refactored popup permissions to start in NavigationHelper. -Extracted hardcoded string for player menus. -Bump Java version to 1.8. -Some lambda conversions.	2018-01-03 22:53:38 -08:00
Christian Schabesberger	0223d6d200	moved on to v0.11.3	2018-01-04 05:34:19 +01:00
Christian Schabesberger	808ce72078	fix share menu for playlists	2018-01-04 05:28:01 +01:00
Christian Schabesberger	3a84c47176	hopefully fix plurals	2018-01-04 04:56:45 +01:00
Weblate	20c2426128	Merge remote-tracking branch 'origin/dev' into dev	2017-12-30 19:06:47 +01:00
Phạm Nguyễn Hoàng	bf11d4c9fa	Translated using Weblate (Vietnamese) Currently translated at 59.0% (144 of 244 strings)	2017-12-30 19:06:47 +01:00
Matej U	783c0f79d7	Translated using Weblate (Slovenian) Currently translated at 91.8% (224 of 244 strings)	2017-12-30 19:06:46 +01:00
Ivan Krušlin	98b94bd9c4	Translated using Weblate (Croatian) Currently translated at 97.1% (237 of 244 strings)	2017-12-30 19:06:44 +01:00
Rex_sa	ff0178f965	Translated using Weblate (Arabic) Currently translated at 91.8% (224 of 244 strings)	2017-12-30 19:06:41 +01:00
Schabi	7f88c3d0a9	roleback wrong fix	2017-12-30 00:27:29 +01:00
Schabi	11e8e38f2c	setup context for making notifications open via setContextIntent()	2017-12-29 17:29:15 +01:00
Schabi	50c5314eaf	fix yt trending content language	2017-12-29 15:02:23 +01:00
Schabi	a7a76d4f58	add beta 2 logo	2017-12-26 14:48:06 +01:00
Schabi	4df4f68fe1	Merge branch 'dev'	2017-12-24 12:17:55 +01:00
Schabi	7db8d37137	update extractor and move on to version v0.11.2	2017-12-24 12:17:41 +01:00
Christian Schabesberger	b7503a7d81	Merge pull request #936 from TobiGr/readme-website Add website, blog and press kit to README.MD	2017-12-23 17:47:59 +01:00
Schabi	9f5d4034e3	fix fullscreen button on popup	2017-12-23 17:34:47 +01:00
Tobias Groza	3c941f6c4b	Add website, blog and press kit to README.MD	2017-12-23 16:35:40 +01:00
Christian Schabesberger	ec8fff421a	fix avatar not vissible on info screen bug	2017-12-22 16:53:43 +01:00
Christian Schabesberger	a47a0b5432	Merge pull request #904 from Jawnnypoo/tweaks Pull up support lib version so all always match	2017-12-22 15:25:33 +01:00
Christian Schabesberger	96ba46f21d	Merge pull request #931 from TobiGr/notification-icon Change notification bar icon for popup and background player	2017-12-21 16:03:15 +01:00
Ariel Shulman	90f48d5817	Translated using Weblate (Hebrew) Currently translated at 100.0% (244 of 244 strings)	2017-12-20 23:47:19 +01:00
Jonas	7288dd097a	Translated using Weblate (Spanish) Currently translated at 100.0% (244 of 244 strings)	2017-12-20 17:02:16 +01:00
TobiGr	0119d62a35	change notification bar icon for popup and background player	2017-12-20 16:29:32 +01:00
Kompiuterių meistras +37060040	4d6ab73fa9	Translated using Weblate (Lithuanian) Currently translated at 100.0% (244 of 244 strings)	2017-12-20 13:06:09 +01:00
anonymous	f58c95840a	Translated using Weblate (Lithuanian) Currently translated at 60.6% (148 of 244 strings)	2017-12-20 11:04:43 +01:00
Weblate	ecf24f81ec	Merge remote-tracking branch 'origin/dev' into dev	2017-12-18 14:15:55 +01:00
Rex_sa	dd3306a940	Translated using Weblate (Arabic) Currently translated at 91.3% (223 of 244 strings)	2017-12-18 14:15:52 +01:00
Claudio Maradonna	bbb2b98f27	Translated using Weblate (Italian) Currently translated at 100.0% (244 of 244 strings)	2017-12-18 14:15:32 +01:00
Christian Schabesberger	bc7332780d	fix show rending before page was loaded	2017-12-17 12:55:30 +01:00
Joseph Kim	6f3bc3ac8f	Translated using Weblate (Korean) Currently translated at 99.5% (243 of 244 strings)	2017-12-14 11:48:42 +01:00
Weblate	cd04d869b7	Merge remote-tracking branch 'origin/dev' into dev	2017-12-12 15:49:41 +01:00
Eduardo Caron	909e15cbdd	Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (244 of 244 strings)	2017-12-12 15:49:31 +01:00
Christian Schabesberger	33fa30ab78	Merge branch 'feature-small-code-improvements' of https://github.com/coffeemakr/NewPipe into coffe	2017-12-11 18:06:38 +01:00
Anthony MARGERAND	44933ac17a	Translated using Weblate (French) Currently translated at 100.0% (244 of 244 strings)	2017-12-10 16:35:06 +01:00
Coffeemakr	bb2af96deb	Use getters for extractor items	2017-12-10 11:07:51 +01:00
Coffeemakr	1fe6da14ea	Small code improvements	2017-12-10 11:07:08 +01:00
Weblate	b7b9653c21	Merge remote-tracking branch 'origin/dev' into dev	2017-12-09 18:07:20 +01:00
alekksander	8adc5918f8	Translated using Weblate (Polish) Currently translated at 100.0% (244 of 244 strings)	2017-12-09 18:07:19 +01:00
Tobias Groza	0db593b1bb	Translated using Weblate (German) Currently translated at 100.0% (244 of 244 strings)	2017-12-09 18:07:10 +01:00
Christian Schabesberger	a0c9dbeb78	Merge pull request #910 from coffeemakr/bugfix-integrate-extractor Fix failing test	2017-12-09 17:36:13 +01:00
Nathan Follens	61d5546d89	Translated using Weblate (Dutch) Currently translated at 100.0% (244 of 244 strings)	2017-12-09 14:30:18 +01:00
alekksander	f97b7c943b	Translated using Weblate (Polish) Currently translated at 100.0% (244 of 244 strings)	2017-12-09 13:58:19 +01:00
Duppadaadadii	97549b633b	Translated using Weblate (Finnish) Currently translated at 100.0% (244 of 244 strings)	2017-12-09 10:54:55 +01:00
Sérgio Marques	1949e4a9d4	Translated using Weblate (Portuguese) Currently translated at 93.4% (228 of 244 strings)	2017-12-09 02:49:06 +01:00
Coffeemakr	ecb5f7a5ba	Try Travis' solution	2017-12-08 20:26:44 +01:00
Emanuele Petriglia	6021f72cf0	Translated using Weblate (Italian) Currently translated at 99.1% (242 of 244 strings)	2017-12-08 16:49:42 +01:00
nailyk	c00ef74f96	Translated using Weblate (French) Currently translated at 99.5% (243 of 244 strings)	2017-12-08 14:46:23 +01:00
Coffeemakr	962e070150	Use Mediaformat objects instead of ids for tests	2017-12-08 13:57:44 +01:00
r2308145	221cbf5e07	Translated using Weblate (Czech) Currently translated at 100.0% (244 of 244 strings)	2017-12-08 13:45:20 +01:00
John	91ff301d53	Pull up support lib version so all always match	2017-12-06 18:19:56 -06:00
Christian Schabesberger	c485e7e167	merge master	2017-11-05 21:00:05 +01:00
Christian Schabesberger	71a8361580	merge dev	2017-11-05 20:59:17 +01:00
Christian Schabesberger	3d1cc348c8	fix getUploaderName() and move on to v0.10.2	2017-10-31 19:47:46 +01:00