moved on to v0.11.3

Currently translated at 59.0% (144 of 244 strings)

.gitignore

@@ -10,3 +10,4 @@
 gradle.properties
 *~
 .weblate
+*.class

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

CheckTranslations.java

@@ -0,0 +1,131 @@
+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 Pattern p, e;
+
+    /**
+     * 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>|\"/>)");
+        e = Pattern.compile("(<string[\\sa-z_\\\"=]*)((><\\/string>|\\/>){1})");
+
+        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.");
+    }
+
+
+    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;
+
+        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();
+            if (remove && checkFailed) {
+                Files.write(f.toPath(), lines, Charset.forName("UTF-8"));
+            }
+        } catch (IOException e) {
+            System.out.println(e);
+        }
+    }
+}
+

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.
 

app/build.gradle

@@ -8,8 +8,8 @@ android {
         applicationId "org.schabi.newpipe"
         minSdkVersion 15
         targetSdkVersion 27
-        versionCode 42
-        versionName "0.11.1"
+        versionCode 44
+        versionName "0.11.3"
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
@@ -47,21 +47,24 @@ android {
     }
 }
 
+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:5f2d0cf6b5dfac2965b1cf400'
 
     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'
 

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

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

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;
@@ -219,6 +220,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 +241,21 @@ 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);
+    }
+
+    protected void shareUrl(String url) {
+        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)));
+    }
 }

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

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

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;

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

@@ -140,7 +140,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 +155,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 +168,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

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

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

@@ -105,7 +105,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);
             }
@@ -208,7 +208,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 +217,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 +229,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(url);
                 break;
             }
             default:
@@ -264,12 +252,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 +303,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 +331,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 +355,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 +428,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();
@@ -490,9 +478,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 +490,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);
         }
     }

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

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;
     }
 
     /*//////////////////////////////////////////////////////////////////////////
@@ -134,7 +150,11 @@ public class KioskFragment extends BaseListInfoFragment<KioskInfo> {
 
     @Override
     public Single<ListExtractor.NextItemsResult> loadMoreItemsLogic() {
-        return ExtractorHelper.getMoreKioskItems(serviceId, url, currentNextItemsUrl);
+        String contentCountry = PreferenceManager
+                .getDefaultSharedPreferences(activity)
+                .getString(getString(R.string.search_language_key),
+                        getString(R.string.default_language_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);
         }

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

@@ -12,6 +12,7 @@ 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;
@@ -98,13 +99,6 @@ 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();
@@ -146,6 +140,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 +162,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(url);
+                break;
+            }
+            default:
+                return super.onOptionsItemSelected(item);
+        }
+        return true;
+    }
+
+
     /*//////////////////////////////////////////////////////////////////////////
     // Contract
     //////////////////////////////////////////////////////////////////////////*/
@@ -181,13 +200,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 +214,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() {
@@ -235,9 +254,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 +266,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);
         }
     }

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

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

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

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

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,

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

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

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

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

@@ -177,7 +177,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);
@@ -393,7 +393,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.format));
         }
 
         @Override

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;
@@ -275,7 +276,7 @@ public final class PopupVideoPlayer extends Service {
 
         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 +402,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 +420,13 @@ 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(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    onFullScreenButtonClicked();
+                }
+            });
         }
 
         @Override
@@ -462,7 +471,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);

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

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

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

@@ -75,7 +75,13 @@ import static org.schabi.newpipe.util.AnimationUtils.animateView;
  * @author mauriciocolli
  */
 @SuppressWarnings({"WeakerAccess", "unused"})
-public abstract class VideoPlayer extends BasePlayer implements SimpleExoPlayer.VideoListener, SeekBar.OnSeekBarChangeListener, View.OnClickListener, Player.EventListener, PopupMenu.OnMenuItemClickListener, PopupMenu.OnDismissListener {
+public abstract class VideoPlayer extends BasePlayer
+        implements SimpleExoPlayer.VideoListener,
+        SeekBar.OnSeekBarChangeListener,
+        View.OnClickListener,
+        Player.EventListener,
+        PopupMenu.OnMenuItemClickListener,
+        PopupMenu.OnDismissListener {
     public static final boolean DEBUG = BasePlayer.DEBUG;
     public final String TAG;
 
@@ -282,12 +288,12 @@ public abstract class VideoPlayer extends BasePlayer implements SimpleExoPlayer.
         if (index < 0 || index >= videos.size()) return null;
         final VideoStream video = videos.get(index);
 
-        final MediaSource streamSource = buildMediaSource(video.url, MediaFormat.getSuffixById(video.format));
+        final MediaSource streamSource = buildMediaSource(video.getUrl(), MediaFormat.getSuffixById(video.format));
         final AudioStream audio = ListHelper.getHighestQualityAudio(info.audio_streams);
         if (!video.isVideoOnly || audio == null) return streamSource;
 
         // Merge with audio stream in case if video does not contain audio
-        final MediaSource audioSource = buildMediaSource(audio.url, MediaFormat.getSuffixById(audio.format));
+        final MediaSource audioSource = buildMediaSource(audio.getUrl(), MediaFormat.getSuffixById(audio.format));
         return new MergingMediaSource(streamSource, audioSource);
     }
 

app/src/main/java/org/schabi/newpipe/playlist/AbstractInfoPlayQueue.java

@@ -26,7 +26,7 @@ abstract class AbstractInfoPlayQueue<T extends ListInfo, U extends InfoItem> ext
     transient Disposable fetchReactor;
 
     AbstractInfoPlayQueue(final U item) {
-        this(item.service_id, item.url, null, Collections.<InfoItem>emptyList(), 0);
+        this(item.getServiceId(), item.getUrl(), null, Collections.<InfoItem>emptyList(), 0);
     }
 
     AbstractInfoPlayQueue(final int serviceId,

app/src/main/java/org/schabi/newpipe/playlist/PlayQueueItem.java

@@ -30,12 +30,12 @@ public class PlayQueueItem implements Serializable {
     private transient Single<StreamInfo> stream;
 
     PlayQueueItem(@NonNull final StreamInfo info) {
-        this(info.name, info.url, info.service_id, info.duration, info.thumbnail_url, info.uploader_name);
+        this(info.getName(), info.getUrl(), info.getServiceId(), info.duration, info.thumbnail_url, info.uploader_name);
         this.stream = Single.just(info);
     }
 
     PlayQueueItem(@NonNull final StreamInfoItem item) {
-        this(item.name, item.url, item.service_id, item.duration, item.thumbnail_url, item.uploader_name);
+        this(item.getName(), item.getUrl(), item.getServiceId(), item.duration, item.thumbnail_url, item.uploader_name);
     }
 
     private PlayQueueItem(final String name, final String url, final int serviceId,

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

@@ -143,16 +143,16 @@ public final class ExtractorHelper {
         return checkCache(forceLoad, serviceId, url, Single.fromCallable(new Callable<KioskInfo>() {
             @Override
             public KioskInfo call() throws Exception {
-                return KioskInfo.getInfo(NewPipe.getService(serviceId), url, contentCountry);
+                return KioskInfo.getInfo(NewPipe.getService(serviceId), url, toUpperCase(contentCountry));
             }
         }));
     }
 
-    public static Single<NextItemsResult> getMoreKioskItems(final int serviceId, final String url, final String nextStreamsUrl) {
+    public static Single<NextItemsResult> getMoreKioskItems(final int serviceId, final String url, final String nextStreamsUrl, final String contentCountry) {
         return Single.fromCallable(new Callable<NextItemsResult>() {
             @Override
             public NextItemsResult call() throws Exception {
-                return KioskInfo.getMoreItems(NewPipe.getService(serviceId), url, nextStreamsUrl);
+                return KioskInfo.getMoreItems(NewPipe.getService(serviceId), url, nextStreamsUrl, toUpperCase(contentCountry));
             }
         });
     }
@@ -267,4 +267,17 @@ public final class ExtractorHelper {
     public static boolean isInterruptedCaused(Throwable throwable) {
         return ExtractorHelper.hasExactCauseThrowable(throwable, InterruptedIOException.class, InterruptedException.class);
     }
+
+    public static String toUpperCase(String value) {
+        StringBuilder sb = new StringBuilder(value);
+        for (int index = 0; index < sb.length(); index++) {
+            char c = sb.charAt(index);
+            if (Character.isLowerCase(c)) {
+                sb.setCharAt(index, Character.toUpperCase(c));
+            } else {
+                sb.setCharAt(index, Character.toLowerCase(c));
+            }
+        }
+        return sb.toString();
+    }
 }